12 Feb '13
The branch, master has been updated
via 088c4242b88e732f26b1feeb00d63bcd0a7d7133 (commit)
from b944cf8137aca2ee93358eb169dcb8a3c9cd0d99 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 088c4242b88e732f26b1feeb00d63bcd0a7d7133
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Tue Feb 12 19:28:35 2013 +0100
move changelog entries from 4.0.1.0 to 4.0.0.2
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index d4fba2a..7580877 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,10 +3,6 @@ x2goclient (4.0.1.0-0~x2go1) UNRELEASED; urgency=low
[ Mike Gabriel ]
* Continue new feature development...
- [ Oleksandr Shneyder ]
- * Terminating nxproxy from X2Go Client if connection to server lost. (Fixes: #100)
- * fixing building x2goplugin
-
-- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 30 Dec 2012 15:41:04 +0100
x2goclient (4.0.0.2-0~x2go1) UNRELEASED; urgency=low
@@ -26,6 +22,9 @@ x2goclient (4.0.0.2-0~x2go1) UNRELEASED; urgency=low
- Support for session key "usebrokerpassforproxy" - use broker pass for
authentication on proxy.
- Fix X2Go Logo.
+ - Terminate nxproxy from X2Go Client if connection to server is lost.
+ (Fixes: #100)
+ - Fix building x2goplugin.
-- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 30 Dec 2012 15:41:04 +0100
hooks/post-receive
--
x2goclient.git (X2Go Client)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goclient.git" (X2Go Client).
1
0
12 Feb '13
The branch, master has been updated
via b944cf8137aca2ee93358eb169dcb8a3c9cd0d99 (commit)
from 105718a5586358f5c933a7eaed5ec57ae806164c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b944cf8137aca2ee93358eb169dcb8a3c9cd0d99
Author: Oleksandr Shneyder <o.shneyder(a)phoca-gmbh.de>
Date: Tue Feb 12 15:07:17 2013 +0100
fixing building x2goplugin
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 1 +
ongetpass.cpp | 2 ++
2 files changed, 3 insertions(+)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 66d9265..d4fba2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ x2goclient (4.0.1.0-0~x2go1) UNRELEASED; urgency=low
[ Oleksandr Shneyder ]
* Terminating nxproxy from X2Go Client if connection to server lost. (Fixes: #100)
+ * fixing building x2goplugin
-- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 30 Dec 2012 15:41:04 +0100
diff --git a/ongetpass.cpp b/ongetpass.cpp
index a30ce3e..b2da89e 100644
--- a/ongetpass.cpp
+++ b/ongetpass.cpp
@@ -60,7 +60,9 @@ int x2goMain ( int argc, char *argv[] )
args=app.arguments();
if ( args.count() >1 && args[1]=="--dialog" )
{
+#ifdef CFGCLIENT
ONMainWindow::installTranslator();
+#endif
QString type=args[2];
QString caption=args[4];
caption=caption.replace ( "NX","X2Go" );
hooks/post-receive
--
x2goclient.git (X2Go Client)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goclient.git" (X2Go Client).
1
0
12 Feb '13
The branch, master has been updated
via 05b39338cc4460b2b699876c314f20b1f0a4e203 (commit)
from d1c5a9ada4697a3014ccb150ae3480dce52ee689 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 05b39338cc4460b2b699876c314f20b1f0a4e203
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Tue Feb 12 11:36:27 2013 +0100
Continue development...
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 6 ++++++
pyhoca/wxgui/__init__.py | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index e7fa888..8d034eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pyhoca-gui (0.4.0.1-0~x2go1) UNRELEASED; urgency=low
+
+ * Continue development...
+
+ -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 12 Feb 2013 11:36:05 +0100
+
pyhoca-gui (0.4.0.0-0~x2go1) unstable; urgency=low
[ Orion Poplawski ]
diff --git a/pyhoca/wxgui/__init__.py b/pyhoca/wxgui/__init__.py
index 2391726..016bae2 100644
--- a/pyhoca/wxgui/__init__.py
+++ b/pyhoca/wxgui/__init__.py
@@ -18,6 +18,6 @@
# Free Software Foundation, Inc.,
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-__VERSION__ = '0.4.0.0'
+__VERSION__ = '0.4.0.1'
from frontend import *
hooks/post-receive
--
pyhoca-gui.git (Python X2Go Client (wxPython GUI))
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).
1
0
12 Feb '13
The branch, build-baikal has been created
at d1c5a9ada4697a3014ccb150ae3480dce52ee689 (commit)
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
hooks/post-receive
--
pyhoca-gui.git (Python X2Go Client (wxPython GUI))
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).
1
0
The branch, build-main has been updated
via d1c5a9ada4697a3014ccb150ae3480dce52ee689 (commit)
via b17acf68af467dfbbedb4081f2374337752d3b25 (commit)
via 7caa1adddc92a52365f1df8a348dd6005ab05589 (commit)
via e03d857ea2dfabacde68f844dfe92dd228aacaff (commit)
via f8e4f0889adc9af1e992629269774bff7c059e6c (commit)
via d20c1ff2e1434597d4436160bed261e92b40c87f (commit)
via 6378e74760b442195b860cd07d75b0e4da9c5799 (commit)
via f700b5663966586c05466681e025356c27699be4 (commit)
via acb5f6ad49f5d090e964fb9599a3287b996f5a82 (commit)
via bc1975447d4047a3eb15488600aa6daa01cffc83 (commit)
via 4a1c098d95ab1338d728a70900af505d627cd776 (commit)
via 62f7559cb17b58285a94bdb177aabbfc6cbd335b (commit)
via b0b8ce7cd29479e918cb0dc67c4eb52e002eff5a (commit)
via 2f9612560ebd32b4c8eff509b01df4b62c5bd62e (commit)
via 182ddd913abe269e81ea9ed9b40e864c01ed3956 (commit)
via eb0e84833731df507cc881f4719a60b991ac2f82 (commit)
via 80d2ae04d400e872207b7c0dfe49ef7e1acd86cf (commit)
via 9ebfd501f59c20e078cf0f95bf0b14daf167be65 (commit)
via 1a18dfa337ef8d4a1283baf437ebe61c998b7de6 (commit)
via 3f31b3f34c63acb46f45e1d5c29557d70dd72a54 (commit)
via f346d474b4719b1acf6d000999fa7bccbece3b45 (commit)
via a32d510c50d78d4702f15cdd52b247026e81caf3 (commit)
via 14d5da8ef18086f2aec9022f72c8ae8f8272b708 (commit)
via 36368f8fec64279369f5995b2fc4557879af9530 (commit)
via a996bc1dea22a6ae478950c01a4c7b8d5071e146 (commit)
via 998681706a0bab44a804006dbf7d447f0135f5dd (commit)
via da10c3f29e2ccd66841fa53c99dfe7f6ef9d196f (commit)
via 24209b1fba93f57b12ceca86ecc03c8eaaf03285 (commit)
via 907d0d4f596483030ff50ff782c3e891e999c721 (commit)
via 38e314a38c4c8d6f2fddf1bd0abe19ca4dcf755c (commit)
via fe95730586539746001eb4528f92fb8f8fad9f9e (commit)
via 1948e8169b99592e0eef389e2c5ceb178364b9f2 (commit)
via d7469c3a8e395de6fbdcf5a514c5ed5ce48c57ec (commit)
via 4966ddd53b72e3e3a6563c74198155efeae871e2 (commit)
via 40cf50288c994d3e9b899d52fa09890283dc11dc (commit)
via a49b9792b2e97c5eca68d87aed401520ccf8153a (commit)
via 9bf44904a1accecde884fd32e61413d75d68e073 (commit)
via 51f6e18ddb78fc74cca3f496281549ea54015d20 (commit)
via ff2c5020c462c1ee05ef32b82c60dd6ccf22777e (commit)
via 9f6c08f94d52c5c662fcfae91c2da524521ace4c (commit)
via 1f9b6304ae56a69d46c6748f221ed326f48065aa (commit)
via c867d1838cbeb2cd08588e46ca29a2679f25159d (commit)
via 6aad78f748de23f72065f4c09232f3447df27df9 (commit)
via 82047923404f6b180002ec9dfa009c1022e17856 (commit)
via d2ac0cf2f987699d35a4b4f37566f9d4804a95c2 (commit)
via 9d9e83cfdd5e0e5af32444f29ef851812dca21bd (commit)
via 019efe7d6b347dd6000439aa160167ab4a8c5b70 (commit)
via 0f59714897461a03842b7bcac86af829090beba8 (commit)
via e1a487a2ed85645c738fe890a9f7d42c5b71e0d9 (commit)
via f118f7f1e63aaaed92eea96af2dcd77f16a0094c (commit)
via 585505ea7f8e333c343161286521545f29ace7e9 (commit)
via 0b4cf0d09b946d208da1a7ac4ed98e18ed2b0336 (commit)
via 1905006936b073dc6c754f8617b2e5196146ca85 (commit)
via 38b545056110856358a2273b0a6dc53235ffb403 (commit)
via 9f686cd31031ad4289bb4d149c84ba8c6cf81e0d (commit)
via 15f0c51a56f92d212c81b5d73b4b53239e351dc6 (commit)
via c2e233584ebfc0d361028c68f2d54fdbb7844372 (commit)
via 0916a6aec0281fa70dfcfa4a1edc0d3d0c56a8cc (commit)
via 6d1945340163f63a971625d0c5c5259a38620299 (commit)
via aee40cd57c0925f62589eab444d0505c94245793 (commit)
via 6fd80fce8bb01b6b3c6fa59eaaf7f35cae0f6cb2 (commit)
via ad6f58f4462ebd6acb1852da0f92cfaa8d750689 (commit)
via 737d6a3753e7cfbe5f6e426f7eaace93054f4bf8 (commit)
via f35e93e867eb8f1dbbee9ad80fe0380be012df7d (commit)
via 25d052f9bc81227a3f003b42fce7b9c7f28e094e (commit)
via 37bcd7313d83bfb955389364dd4ae027eed7b18a (commit)
via c85f513591a76765f9b8c91edf6832dbfa1f2935 (commit)
via 0495527e0f57cf2f2395ac9d4d9d145fde7a3e8c (commit)
via 7b964e05e25cceb1d96eccc7c2f28de4fc7b3fc5 (commit)
via b40455ddce61dc0f8eab116018b2378d1f84ca66 (commit)
via 450197e2ac67b5e90e22f1b37912653e93e6a6f8 (commit)
via 490ca0fd74802eef615fdede4e91ca657822482f (commit)
via a28643bee58961bbe0e21e3f48351647a3d343eb (commit)
via 180484c4a26461ce3916920af70a3d496d3f58b4 (commit)
via 052916c4ea0d523a6db253b4f0ffe394d932aab9 (commit)
via 1a1ab1dbd055d31ec639da9ddf815afc7a55d86f (commit)
via 6cdc40a31c8ca51ac9feade208cea13a9157308c (commit)
via 51c52fb1b0d3f94c6cc9c1d42fe5f84674e6026e (commit)
via 2037b4b649e534bd8fdae6b4b907963eec0feed2 (commit)
via 876801678c0a337bfe6d2eb58f79d957ad102b32 (commit)
via 04f5e0f727bb0886dd28c868419ea4dfdbd491f0 (commit)
from 074593a51c7470bc814a6b87b7bb81b26021014e (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:
Makefile.docupload | 2 +-
README | 9 +-
README.Unity | 6 +-
TODO | 7 +-
build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo | Bin 541 -> 550 bytes
build/mo/da/LC_MESSAGES/PyHoca-GUI.mo | Bin 23577 -> 27534 bytes
build/mo/de/LC_MESSAGES/PyHoca-GUI.mo | Bin 25283 -> 29214 bytes
build/mo/en/LC_MESSAGES/PyHoca-GUI.mo | Bin 23662 -> 27342 bytes
build/mo/es/LC_MESSAGES/PyHoca-GUI.mo | Bin 25344 -> 29270 bytes
build/mo/fr/LC_MESSAGES/PyHoca-GUI.mo | Bin 541 -> 546 bytes
build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo | Bin 24244 -> 27993 bytes
build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo | Bin 23844 -> 27862 bytes
build/mo/ru/LC_MESSAGES/PyHoca-GUI.mo | Bin 28871 -> 34172 bytes
build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo | Bin 23642 -> 27336 bytes
debian/changelog | 74 ++
debian/control | 10 +-
debian/copyright | 8 +-
debian/pyhoca-gui.links | 3 +
debian/rules | 2 +-
desktop/pyhoca-gui.desktop | 2 +-
.../PyHoca/32x32/{auth_success.png => success.png} | Bin 1572 -> 1572 bytes
icons/PyHoca/64x64/{audio_error.png => error.png} | Bin 3973 -> 3973 bytes
.../PyHoca/64x64/{auth_success.png => success.png} | Bin 3213 -> 3213 bytes
...r-network.svg => gnome-dev-printer-network.png} | 0
icons_symlinked/PyHoca/32x32/session_printing.png | 1 +
icons_symlinked/PyHoca/32x32/session_printing.svg | 1 -
.../PyHoca/32x32/{auth_success.png => success.png} | 0
.../{32x32/audio_error.png => 64x64/error.png} | 0
.../{32x32/auth_success.png => 64x64/success.png} | 0
man/man1/pyhoca-gui.1 | 16 +-
nsis_template.py | 4 +-
po/POTFILES.in | 2 +
po/PyHoca-GUI.pot | 793 ++++++++++------
po/bg.po | 793 ++++++++++------
po/da.po | 956 ++++++++++++--------
po/de.po | 876 +++++++++++-------
po/en.po | 863 +++++++++++-------
po/es.po | 914 ++++++++++++-------
po/fr.po | 793 ++++++++++------
po/nb_NO.po | 871 +++++++++++-------
po/nl.po | 893 +++++++++++-------
po/ru.po | 874 +++++++++++-------
po/sv.po | 863 +++++++++++-------
pyhoca-gui | 42 +-
pyhoca/__init__.py | 4 +-
pyhoca/wxgui/__init__.py | 6 +-
pyhoca/wxgui/about.py | 6 +-
pyhoca/wxgui/basepath.py | 4 +-
pyhoca/wxgui/frontend.py | 340 +++++--
pyhoca/wxgui/listdesktops.py | 277 ++++++
pyhoca/wxgui/logon.py | 28 +-
pyhoca/wxgui/menus_taskbar.py | 96 +-
pyhoca/wxgui/messages.py | 1 -
pyhoca/wxgui/notify.py | 5 +-
pyhoca/wxgui/printingprefs.py | 5 +-
pyhoca/wxgui/profilemanager.py | 645 ++++++-------
pyhoca/wxgui/serverinfo.py | 224 +++++
pyhoca/wxgui/sessiontitle.py | 8 +-
pyhoca/wxgui/splash.py | 4 +-
pyhoca/wxgui/taskbar.py | 10 +-
setup.py | 23 +-
61 files changed, 7312 insertions(+), 4052 deletions(-)
copy icons/PyHoca/32x32/{auth_success.png => success.png} (100%)
copy icons/PyHoca/64x64/{audio_error.png => error.png} (100%)
copy icons/PyHoca/64x64/{auth_success.png => success.png} (100%)
rename icons_symlinked/PyHoca/32x32/{gnome-dev-printer-network.svg => gnome-dev-printer-network.png} (100%)
create mode 120000 icons_symlinked/PyHoca/32x32/session_printing.png
delete mode 120000 icons_symlinked/PyHoca/32x32/session_printing.svg
copy icons_symlinked/PyHoca/32x32/{auth_success.png => success.png} (100%)
copy icons_symlinked/PyHoca/{32x32/audio_error.png => 64x64/error.png} (100%)
copy icons_symlinked/PyHoca/{32x32/auth_success.png => 64x64/success.png} (100%)
create mode 100644 pyhoca/wxgui/listdesktops.py
create mode 100644 pyhoca/wxgui/serverinfo.py
The diff of changes is:
diff --git a/Makefile.docupload b/Makefile.docupload
index fc1204c..2f5754d 100644
--- a/Makefile.docupload
+++ b/Makefile.docupload
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
# Makefile.docupload file - for pyhoca-gui
-# Copyright 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>, GPLv3 applies to this file
+# Copyright 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>, GPLv3 applies to this file
VERSION=`head -n1 debian/changelog | sed 's,.*(\(.*\)).*,\1,' | cut -d"-" -f1`
DOC_HOST=code.x2go.org
diff --git a/README b/README
index 17b0438..c51178c 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
-pyhoca-gui - Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
- Copyright (C) 2010-2012 by Dick Kniep <dick.kniep(a)lindix.nl>
+pyhoca-gui - Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+ Copyright (C) 2010-2013 by Dick Kniep <dick.kniep(a)lindix.nl>
Published under the terms of the GNU Affero General Public License.
See http://www.gnu.org/licenses/gpl.html for a recent copy.
@@ -20,7 +20,10 @@ See http://www.gnu.org/licenses/gpl.html for a recent copy.
* session management (start/resume/suspend/terminate)
* profile management
* audio, printing, local folder sharing
+* MIME drop box support
+* desktop sharing support
* connect throug SSH proxy host (by forward tunneling)
+* session configuration fully compatible with X2Go Client
=== How to use it ===
@@ -34,7 +37,7 @@ Please refer to the TODO file that has been shipped with pyhoca-gui.
Thanks in advance for your feedback and contributions,
-Kiel (Germany) & LJ Almere Haven (Netherlands), 20110701
+Kiel (Germany) & LJ Almere Haven (Netherlands), 20130128
Dick Kniep <dick.kniep(a)lindix.nl>
Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
diff --git a/README.Unity b/README.Unity
index c8d7b11..9a61a48 100644
--- a/README.Unity
+++ b/README.Unity
@@ -1,5 +1,5 @@
-pyhoca-gui - Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
- Copyright (C) 2010-2012 by Dick Kniep <dick.kniep(a)lindix.nl>
+pyhoca-gui - Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+ Copyright (C) 2010-2013 by Dick Kniep <dick.kniep(a)lindix.nl>
Published under the terms of the GNU Affero General Public License.
See http://www.gnu.org/licenses/gpl.html for a recent copy.
@@ -31,4 +31,4 @@ replace "YOUR_APPLICATION" with the application you want to whitelist (in our ca
"pyhoca-gui").
light+love
-Mike Gabriel, 20120531
\ No newline at end of file
+Mike Gabriel, 20120531
diff --git a/TODO b/TODO
index 66c8987..11dcf7d 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,5 @@
-pyhoca-gui - Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
- Copyright (C) 2010-2012 by Dick Kniep <dick.kniep(a)lindix.nl>
+pyhoca-gui - Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+ Copyright (C) 2010-2013 by Dick Kniep <dick.kniep(a)lindix.nl>
Published under the terms of the GNU Affero General Public License.
See http://www.gnu.org/licenses/gpl.html for a recent copy.
@@ -8,7 +8,6 @@ See http://www.gnu.org/licenses/gpl.html for a recent copy.
* profile manager (Windows registry based)
* options manager
-* shadow session support
=== pyhoca-gui Wishlist ===
@@ -17,7 +16,7 @@ See http://www.gnu.org/licenses/gpl.html for a recent copy.
If you find any issues with this programme please let me know.
-Kiel (Germany) & LJ Almere Haven (Netherlands), 20110701
+Kiel (Germany) & LJ Almere Haven (Netherlands), 20130128
Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Dick Kniep <dick.kniep(a)lindix.nl>
diff --git a/build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo
index bf0afb2..c5bb426 100644
Binary files a/build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo differ
diff --git a/build/mo/da/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/da/LC_MESSAGES/PyHoca-GUI.mo
index 10b1f79..3736a42 100644
Binary files a/build/mo/da/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/da/LC_MESSAGES/PyHoca-GUI.mo differ
diff --git a/build/mo/de/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/de/LC_MESSAGES/PyHoca-GUI.mo
index 8872247..55816a6 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 a731337..b5e5988 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 a93603c..1dad1be 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/fr/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/fr/LC_MESSAGES/PyHoca-GUI.mo
index 2d0340f..a785280 100644
Binary files a/build/mo/fr/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/fr/LC_MESSAGES/PyHoca-GUI.mo differ
diff --git a/build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo
index 1957d79..5115804 100644
Binary files a/build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo differ
diff --git a/build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo
index 2337493..30183bc 100644
Binary files a/build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo differ
diff --git a/build/mo/ru/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/ru/LC_MESSAGES/PyHoca-GUI.mo
index e334ec7..c0494a8 100644
Binary files a/build/mo/ru/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/ru/LC_MESSAGES/PyHoca-GUI.mo differ
diff --git a/build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo
index 2843da1..3b7ba95 100644
Binary files a/build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo differ
diff --git a/debian/changelog b/debian/changelog
index c042ddf..e7fa888 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,77 @@
+pyhoca-gui (0.4.0.0-0~x2go1) unstable; urgency=low
+
+ [ Orion Poplawski ]
+ * New upstream version (0.4.0.0):
+ - Importing all of pyhoca.wxgui in setup.py causes rpmbuild problems due to
+ DISPLAY not being set. It is overkill as well, causing extra dependencies
+ to be installed at build time. (Fixes: #91).
+
+ [ Mike Gabriel ]
+ * Bump version to 0.4.0.0.
+ * WARNING: starting with version 0.4.0.0 of PyHoca-GUI, PyHoca-CLI and Python
+ X2Go, all class identifiers are now X2Go..., not X2go... anymore.
+ * New upstream version (0.4.0.0):
+ - Add rules to setup.py that install PyHoca-GUI's data files under Linux
+ (i.e. icons, images, man page, etc.). Thanks to Orion Poplawski for
+ coming up with an inspiring patch. (Fixes: #92).
+ - Add support for exporting session profiles and session profile groups.
+ - Translation source file (.pot) updated. Update of en.po and de.po.
+ - Drop SSH proxy tunnel configuration parameter. Adapt PyHoca-GUI to the
+ way X2GoClient configures the SSH proxy settings. (Fixes: #85).
+ - Add cmdline option --add-to-known-hosts. Add SSH host keys automatically
+ to the client's known_hosts file.
+ - Add checkbox for unique host key aliases feature to session profile
+ manager.
+ - Show ,,Start RDP sessions'' in menu if RDP (X2Go-proxied) has been
+ selected as command.
+ - Give control of auto-starting and auto-resuming fully into the hands
+ of the session profiles. No extra cmdline options needed anymore to
+ activate auto-starting/-resuming of sessions.
+ - Add support for desktop sharing in PyHoca-GUI. Requires X2Go Server
+ 4.1.0.0 and above. (Fixes: #37).
+ - Filter out other session types than desktop sessions from the list
+ of sharable desktops.
+ - Add dialog box that shows server information (components, add-ons,
+ features, versions).
+ - Add ÂģApplyÂĢ to session profile manager window.
+ - Add another tab ÂģMediaÂĢ to session profile configuration window.
+ Makes the windows display on netbook screens again (Fixes: #13).
+ - Become aware of multiple PyHoca-GUI processes being allowed.
+ Pre-requisited, that each instance runs on its own $DISPLAY
+ ($DISPLAY detection yet unfinished).
+ - Fix print dialog box: update the configuration from the GUI widgets
+ before handing it over to some calling agent.
+ * /debian/control:
+ + Thanks to Orion's patch in bug #91 we can drop many build dependencies.
+ + Versioned Depend: on python-x2go (>= 0.4.0.0-0~).
+ + Add gnome-colors-common to Build-Depends.
+
+ [ Christoffer Krakou ]
+ * New upstream version (0.4.0.0):
+ - Update Danish translation file.
+
+ [ Daniel Lindgren ]
+ * New upstream version (0.4.0.0):
+ - Update Swedish translation file.
+
+ [ Dick Kniep ]
+ * New upstream version (0.4.0.0):
+ - Update Dutch translation file.
+
+ [ Ricardo DÃaz MartÃn ]
+ * New upstream version (0.4.0.0):
+ - Update Spanish translation file.
+
+ [ Terje Andersen ]
+ * New upstream version (0.4.0.0):
+ - Update Bokmal (Norway) translation file.
+
+ [ Oleksandr Shneyder ]
+ * New upstream version (0.4.0.0):
+ - Update russian translation file.
+
+ -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 12 Feb 2013 11:10:06 +0100
+
pyhoca-gui (0.2.1.1-0~x2go1) unstable; urgency=low
* New upstream version (0.2.1.1):
diff --git a/debian/control b/debian/control
index 3d1c1de..9666a0e 100644
--- a/debian/control
+++ b/debian/control
@@ -12,13 +12,7 @@ Build-Depends:
python-setuptools,
python-support,
python-distutils-extra,
- python-paramiko,
- python-x2go,
- wx-common (>=2.8.10.0),
- python-wxtools (>=2.8.10.0),
- python-notify,
- python-argparse,
- python-setproctitle
+ gnome-colors-common,
Standards-Version: 3.9.3
Homepage: http://code.x2go.org/releases/source/pyhoca-gui
Vcs-Git: git://code.x2go.org/pyhoca-gui.git
@@ -30,7 +24,7 @@ Architecture: all
Depends:
${misc:Depends},
python,
- python-x2go (>=0.2.1.1-0~),
+ python-x2go (>=0.4.0.0-0~),
python-argparse,
python-notify,
python-setproctitle,
diff --git a/debian/copyright b/debian/copyright
index 0e1df55..aa9f10a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,12 +4,12 @@ Upstream-Contact: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Source: http://wiki.x2go.org
Files: *
-Copyright: 2010-2012, Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
- 2010-2012, Dick Kniep <dick.kniep(a)lindix.nl>
+Copyright: 2010-2013, Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+ 2010-2013, Dick Kniep <dick.kniep(a)lindix.nl>
License: AGPL-3+
Files: Makefile.docupload
-Copyright: 2010-2012, Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+Copyright: 2010-2013, Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
License: GPL-3+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -31,7 +31,7 @@ License: GPL-3+
`/usr/share/common-licenses/GPL-3'.
Files: debian/*
-Copyright: 2010-2012, Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+Copyright: 2010-2013, Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
License: GPL-2+
PyHoca-GUI Debian packaging is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as published by
diff --git a/debian/pyhoca-gui.links b/debian/pyhoca-gui.links
index e594c99..2e576ba 100644
--- a/debian/pyhoca-gui.links
+++ b/debian/pyhoca-gui.links
@@ -25,6 +25,7 @@
/usr/share/icons/PyHoca/32x32/dialog-warning.png /usr/share/icons/PyHoca/32x32/profile_warning.png
/usr/share/icons/gnome-colors-common/32x32/actions/edit-delete.png /usr/share/icons/PyHoca/32x32/edit-delete.png
/usr/share/icons/PyHoca/32x32/dialog-apply.png /usr/share/icons/PyHoca/32x32/auth_success.png
+/usr/share/icons/PyHoca/32x32/dialog-apply.png /usr/share/icons/PyHoca/32x32/success.png
/usr/share/icons/PyHoca/32x32/edit-delete.png /usr/share/icons/PyHoca/32x32/profile_delete.png
/usr/share/icons/gnome-colors-common/32x32/actions/document-save.png /usr/share/icons/PyHoca/32x32/document-save.png
/usr/share/icons/PyHoca/32x32/dialog-error.png /usr/share/icons/PyHoca/32x32/session_error.png
@@ -46,7 +47,9 @@
/usr/share/icons/PyHoca/64x64/dialog-error.png /usr/share/icons/PyHoca/64x64/auth_error.png
/usr/share/icons/PyHoca/64x64/dialog-warning.png /usr/share/icons/PyHoca/64x64/profile_warning.png
/usr/share/icons/PyHoca/64x64/dialog-apply.png /usr/share/icons/PyHoca/64x64/auth_success.png
+/usr/share/icons/PyHoca/64x64/dialog-apply.png /usr/share/icons/PyHoca/64x64/success.png
/usr/share/icons/PyHoca/64x64/dialog-error.png /usr/share/icons/PyHoca/64x64/session_error.png
+/usr/share/icons/PyHoca/64x64/dialog-error.png /usr/share/icons/PyHoca/64x64/error.png
/usr/share/icons/PyHoca/64x64/dialog-error.png /usr/share/icons/PyHoca/64x64/audio_error.png
/usr/share/icons/PyHoca/64x64/dialog-error.png /usr/share/icons/PyHoca/64x64/profile_error.png
/usr/share/icons/PyHoca/scalable/dialog-error.svg /usr/share/icons/PyHoca/scalable/audio_error.svg
diff --git a/debian/rules b/debian/rules
index 4e0c6f5..ee16508 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
# debian/rules file - for pyhoca-gui
# Based on sample debian/rules file - for GNU Hello (1.3).
-# Copyright 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
WITH_PYTHON2 = $(shell test -f /usr/bin/dh_python2 && echo "--with python2")
diff --git a/desktop/pyhoca-gui.desktop b/desktop/pyhoca-gui.desktop
index 2c53624..13b9ae8 100644
--- a/desktop/pyhoca-gui.desktop
+++ b/desktop/pyhoca-gui.desktop
@@ -9,4 +9,4 @@ X-HildonDesk-ShowInToolbar=true
X-Osso-Type=application/x-executable
Terminal=false
Type=Application
-Categories=GNOME;KDE;Network
+Categories=GNOME;KDE;Network;
diff --git a/icons/PyHoca/32x32/auth_success.png b/icons/PyHoca/32x32/success.png
similarity index 100%
copy from icons/PyHoca/32x32/auth_success.png
copy to icons/PyHoca/32x32/success.png
diff --git a/icons/PyHoca/64x64/audio_error.png b/icons/PyHoca/64x64/error.png
similarity index 100%
copy from icons/PyHoca/64x64/audio_error.png
copy to icons/PyHoca/64x64/error.png
diff --git a/icons/PyHoca/64x64/auth_success.png b/icons/PyHoca/64x64/success.png
similarity index 100%
copy from icons/PyHoca/64x64/auth_success.png
copy to icons/PyHoca/64x64/success.png
diff --git a/icons_symlinked/PyHoca/32x32/gnome-dev-printer-network.svg b/icons_symlinked/PyHoca/32x32/gnome-dev-printer-network.png
similarity index 100%
rename from icons_symlinked/PyHoca/32x32/gnome-dev-printer-network.svg
rename to icons_symlinked/PyHoca/32x32/gnome-dev-printer-network.png
diff --git a/icons_symlinked/PyHoca/32x32/session_printing.png b/icons_symlinked/PyHoca/32x32/session_printing.png
new file mode 120000
index 0000000..70a342f
--- /dev/null
+++ b/icons_symlinked/PyHoca/32x32/session_printing.png
@@ -0,0 +1 @@
+gnome-dev-printer-network.png
\ No newline at end of file
diff --git a/icons_symlinked/PyHoca/32x32/session_printing.svg b/icons_symlinked/PyHoca/32x32/session_printing.svg
deleted file mode 120000
index 519c84b..0000000
--- a/icons_symlinked/PyHoca/32x32/session_printing.svg
+++ /dev/null
@@ -1 +0,0 @@
-gnome-dev-printer-network.svg
\ No newline at end of file
diff --git a/icons_symlinked/PyHoca/32x32/auth_success.png b/icons_symlinked/PyHoca/32x32/success.png
similarity index 100%
copy from icons_symlinked/PyHoca/32x32/auth_success.png
copy to icons_symlinked/PyHoca/32x32/success.png
diff --git a/icons_symlinked/PyHoca/32x32/audio_error.png b/icons_symlinked/PyHoca/64x64/error.png
similarity index 100%
copy from icons_symlinked/PyHoca/32x32/audio_error.png
copy to icons_symlinked/PyHoca/64x64/error.png
diff --git a/icons_symlinked/PyHoca/32x32/auth_success.png b/icons_symlinked/PyHoca/64x64/success.png
similarity index 100%
copy from icons_symlinked/PyHoca/32x32/auth_success.png
copy to icons_symlinked/PyHoca/64x64/success.png
diff --git a/man/man1/pyhoca-gui.1 b/man/man1/pyhoca-gui.1
index 1f73aff..97eeb65 100644
--- a/man/man1/pyhoca-gui.1
+++ b/man/man1/pyhoca-gui.1
@@ -5,7 +5,7 @@
\\$2 \(la\\$1\(ra\\$3
..
.if \n(.g .mso www.tmac
-.TH pyhoca-gui 1 "May 2012" "Version 0.1.2.x" "X2Go Application"
+.TH pyhoca-gui 1 "Feb 2013" "Version 0.4.x.y" "X2Go Application"
.SH NAME
pyhoca-gui \- graphical X2Go client applet written in Python
.SH SYNOPSIS
@@ -54,7 +54,7 @@ Enable debugging output.
Enable debugging code of the unterlying Python X2Go module.
.TP
\*(T<\fB\-\-libdebug-sftpxfer\fR\*(T>
-Enable debugging code of Python X2go's sFTP server code (very verbose, and it may even reveal promiscuous data).
+Enable debugging code of Python X2Go's sFTP server code (very verbose, and it may even reveal promiscuous data).
.SH GUI OPTIONS
.TP
\*(T<\fB\-P, \-\-session-profile\fR\*(T>
@@ -95,14 +95,22 @@ Restrict functionality of \fBpyhoca-gui\fR's main session manager icon that is s
switch limits the icon 's functionality to a right-click menu that allows one to raise the ,,About'' window and exit the application. On
left-click only a minimal session menu is shown.
.TP
+\*(T<\fB\-\-add-to-known-hosts\fR\*(T>
+Automatically add host key fingerprint to .ssh/known_hosts in case of "authenticity of server can't be established" (without user interaction).
+
+Handle this option with care: Using it lessens the security/integrity of your SSH client setup.
+.TP
\*(T<\fB\-\-start-on-connect\fR\*(T>
-Start a session directly after authentication (only if no suspended sessions are available).
+DEPRECATED: Start a session directly after authentication (only if no suspended sessions are available). This switch is now fully controlled from within
+the session profiles. This option itself remains here for compatibility with older versions of \fBPyHoca-GUI\fR.
.TP
\*(T<\fB\-\-exit-on-disconnect\fR\*(T>
Exit \fBpyhoca-gui\fR cleanly once a session has been disconnected.
.TP
\*(T<\fB\-\-resume-on-connect, \-\-resume-newest-on-connect\fR\*(T>
-After authentication directly auto-resume the newest available running/suspended session.
+DEPRECATED: After authentication directly auto-resume the newest available running/suspended session. This switch is now fully controlled from within
+the session profiles, resuming the newest session is the hard-coded default. However, you can influence the resuming behaviour with the next two command line options. This option itself remains here
+for compatibility with older versions of \fBPyHoca-GUI\fR.
.TP
\*(T<\fB\-\-resume-oldest-on-connect\fR\*(T>
After authentication directly auto-resume the oldest available running/suspended session.
diff --git a/nsis_template.py b/nsis_template.py
index e9db9eb..a148959 100644
--- a/nsis_template.py
+++ b/nsis_template.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
# PyHoca is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -266,7 +266,7 @@ Section "$STARTMENU_LINKS"
CreateShortCut "$SMPROGRAMS\\{program_name}\\{program_name} ($WITHOUT_PULSEAUDIO).lnk" "$INSTDIR\\{program_name}.exe" "--quiet --start-xserver --lang $LC_MESSAGES" "$INSTDIR\\icons\\{program_name}.ico" 0
CreateShortCut "$SMPROGRAMS\\{program_name}\\{program_name} (debug).lnk" "$INSTDIR\\{program_name}.exe" "--debug --libdebug --start-xserver --start-pulseaudio --lang $LC_MESSAGES" "$INSTDIR\\icons\\{program_name}.ico" 0
CreateShortCut "$SMPROGRAMS\\{program_name}\\{program_name} ($WITHOUT_PULSEAUDIO, debug).lnk" "$INSTDIR\\{program_name}.exe" "--debug --libdebug --start-xserver --lang $LC_MESSAGES" "$INSTDIR\\icons\\{program_name}.ico" 0
- CreateShortCut "$SMPROGRAMS\\{program_name}\\X2go Website.lnk" "http://www.x2go.org" "" "$INSTDIR\\icons\\pyhoca_x2go-logo-ubuntu.ico" 0
+ CreateShortCut "$SMPROGRAMS\\{program_name}\\X2Go Website.lnk" "http://www.x2go.org" "" "$INSTDIR\\icons\\pyhoca_x2go-logo-ubuntu.ico" 0
CreateShortCut "$SMPROGRAMS\\{program_name}\\Uninstall.lnk" "$INSTDIR\\uninstall.exe" "" "$INSTDIR\\uninstall.exe" 0
SectionEnd
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 391b5ad..bb97283 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,6 +4,7 @@ pyhoca/wxgui/logon.py
pyhoca/wxgui/taskbar.py
pyhoca/wxgui/__init__.py
pyhoca/wxgui/profilemanager.py
+pyhoca/wxgui/listdesktops.py
pyhoca/wxgui/menus_taskbar.py
pyhoca/wxgui/about.py
pyhoca/wxgui/basepath.py
@@ -11,4 +12,5 @@ pyhoca/wxgui/frontend.py
pyhoca/wxgui/messages.py
pyhoca/wxgui/printingprefs.py
pyhoca/wxgui/sessiontitle.py
+pyhoca/wxgui/serverinfo.py
pyhoca-gui
diff --git a/po/PyHoca-GUI.pot b/po/PyHoca-GUI.pot
index c011b74..ceb618c 100644
--- a/po/PyHoca-GUI.pot
+++ b/po/PyHoca-GUI.pot
@@ -8,13 +8,13 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 14:25+0100\n"
+"POT-Creation-Date: 2013-01-29 22:21+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: ../pyhoca/wxgui/logon.py:86
@@ -35,7 +35,7 @@ msgid "Authenticate"
msgstr ""
#: ../pyhoca/wxgui/logon.py:107
-msgid " Start SSH tunnel "
+msgid "Start SSH tunnel"
msgstr ""
#: ../pyhoca/wxgui/logon.py:115
@@ -46,23 +46,23 @@ msgstr ""
msgid "SSH proxy server login"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:127 ../pyhoca/wxgui/profilemanager.py:350
-#: ../pyhoca/wxgui/messages.py:131 ../pyhoca/wxgui/printingprefs.py:147
-#: ../pyhoca/wxgui/sessiontitle.py:85
+#: ../pyhoca/wxgui/logon.py:127 ../pyhoca/wxgui/profilemanager.py:373
+#: ../pyhoca/wxgui/listdesktops.py:99 ../pyhoca/wxgui/messages.py:130
+#: ../pyhoca/wxgui/printingprefs.py:147 ../pyhoca/wxgui/sessiontitle.py:85
msgid "Cancel"
msgstr ""
#: ../pyhoca/wxgui/logon.py:297 ../pyhoca/wxgui/logon.py:339
-#: ../pyhoca/wxgui/frontend.py:606
+#: ../pyhoca/wxgui/frontend.py:612
#, python-format
msgid "%s - connect failure"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:606
+#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:612
msgid "User is not allowed to start X2Go sessions!"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:303 ../pyhoca/wxgui/frontend.py:613
+#: ../pyhoca/wxgui/logon.py:303 ../pyhoca/wxgui/frontend.py:619
#, python-format
msgid "%s - connect"
msgstr ""
@@ -88,28 +88,28 @@ msgstr ""
msgid "Authentication to the SSH proxy server failed!"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:376 ../pyhoca/wxgui/frontend.py:664
+#: ../pyhoca/wxgui/logon.py:376 ../pyhoca/wxgui/frontend.py:670
#, python-format
msgid "%s - socket error"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:383 ../pyhoca/wxgui/frontend.py:643
-#: ../pyhoca/wxgui/frontend.py:650
+#: ../pyhoca/wxgui/logon.py:383 ../pyhoca/wxgui/frontend.py:649
+#: ../pyhoca/wxgui/frontend.py:656
#, python-format
msgid "%s - host key error"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:384 ../pyhoca/wxgui/frontend.py:643
+#: ../pyhoca/wxgui/logon.py:384 ../pyhoca/wxgui/frontend.py:649
msgid ""
"The remote server's host key is invalid or has not been accepted by the user"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:391 ../pyhoca/wxgui/frontend.py:685
+#: ../pyhoca/wxgui/logon.py:391 ../pyhoca/wxgui/frontend.py:691
#, python-format
msgid "%s - missing home directory"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:392 ../pyhoca/wxgui/frontend.py:685
+#: ../pyhoca/wxgui/logon.py:392 ../pyhoca/wxgui/frontend.py:691
msgid "The remote user's home directory does not exist."
msgstr ""
@@ -118,12 +118,12 @@ msgstr ""
msgid "%s - key error"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:407 ../pyhoca/wxgui/frontend.py:692
+#: ../pyhoca/wxgui/logon.py:407 ../pyhoca/wxgui/frontend.py:698
#, python-format
msgid "%s - auth error"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:415 ../pyhoca/wxgui/frontend.py:636
+#: ../pyhoca/wxgui/logon.py:415 ../pyhoca/wxgui/frontend.py:642
#, python-format
msgid "%s - SSH error"
msgstr ""
@@ -147,7 +147,7 @@ msgstr ""
#: ../pyhoca/wxgui/taskbar.py:93
#, python-format
msgid ""
-"PyHoca-GUI (Python X2goClient)\n"
+"PyHoca-GUI (Python X2Go Client)\n"
"Currently connecting you to remote X2Go server ,,%s''"
msgstr ""
@@ -159,7 +159,7 @@ msgstr ""
#: ../pyhoca/wxgui/taskbar.py:107
msgid ""
-"PyHoca-GUI (Python X2goClient)\n"
+"PyHoca-GUI (Python X2Go Client)\n"
"Client for connecting you to a remote X2Go server"
msgstr ""
@@ -196,745 +196,806 @@ msgid "Single Application"
msgstr ""
#: ../pyhoca/wxgui/profilemanager.py:87
-msgid "XDMCP Query"
+msgid "Share desktop session (SHADOW)"
msgstr ""
#: ../pyhoca/wxgui/profilemanager.py:88
-msgid "Windows Terminal Server (X2Go-proxied RDP)"
+msgid "XDMCP Query"
msgstr ""
#: ../pyhoca/wxgui/profilemanager.py:89
+msgid "Windows Terminal Server (X2Go-proxied RDP)"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:90
msgid "Windows Terminal Server (Direct RDP)"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/profilemanager.py:224
+#: ../pyhoca/wxgui/profilemanager.py:91 ../pyhoca/wxgui/profilemanager.py:243
msgid "Custom command"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:95 ../pyhoca/wxgui/menus_taskbar.py:393
+#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:406
msgid "Internet Browser"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:394
+#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:407
msgid "Email Client"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:395
+#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:408
msgid "Office"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:396
+#: ../pyhoca/wxgui/profilemanager.py:99 ../pyhoca/wxgui/menus_taskbar.py:409
msgid "Terminal"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:116
+#: ../pyhoca/wxgui/profilemanager.py:117
msgid "Open file with system's default application"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:117
+#: ../pyhoca/wxgui/profilemanager.py:118
msgid "Open application chooser dialog"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:118
+#: ../pyhoca/wxgui/profilemanager.py:119
msgid "Save incoming file as ..."
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:146
+#: ../pyhoca/wxgui/profilemanager.py:147
msgid "settings derived from "
msgstr ""
#. boxes for all tabs
-#: ../pyhoca/wxgui/profilemanager.py:167
+#: ../pyhoca/wxgui/profilemanager.py:186
msgid "Session Title"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:168
+#: ../pyhoca/wxgui/profilemanager.py:187
msgid "Session Window"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:169
+#: ../pyhoca/wxgui/profilemanager.py:188
msgid "Session Startup"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:170
+#: ../pyhoca/wxgui/profilemanager.py:189
msgid "Server"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:171
+#: ../pyhoca/wxgui/profilemanager.py:190
msgid "Proxy"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:172
+#: ../pyhoca/wxgui/profilemanager.py:191
msgid "Connection Link Speed"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:173
+#: ../pyhoca/wxgui/profilemanager.py:192
msgid "Compression"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:174
+#: ../pyhoca/wxgui/profilemanager.py:193
msgid "Display"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:175
+#: ../pyhoca/wxgui/profilemanager.py:194
msgid "Keyboard"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:176
+#: ../pyhoca/wxgui/profilemanager.py:195
msgid "Sound"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:177
+#: ../pyhoca/wxgui/profilemanager.py:196
msgid "Printing"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:178
+#: ../pyhoca/wxgui/profilemanager.py:197
msgid "Folder Exports"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:179
+#: ../pyhoca/wxgui/profilemanager.py:198
msgid "File Import"
msgstr ""
#. ##
#. ## widgets for the PROFILE tab
#. ##
-#: ../pyhoca/wxgui/profilemanager.py:184
+#: ../pyhoca/wxgui/profilemanager.py:203
msgid "Name"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:191
+#: ../pyhoca/wxgui/profilemanager.py:210
msgid "Set session window title"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:192
+#: ../pyhoca/wxgui/profilemanager.py:211
msgid "Use a default session window title"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:193
+#: ../pyhoca/wxgui/profilemanager.py:212
msgid "Custom session window title"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:212
+#: ../pyhoca/wxgui/profilemanager.py:231
msgid "Window Icon"
msgstr ""
#. ##
#. ## widgets for the SESSION tab
#. ##
-#: ../pyhoca/wxgui/profilemanager.py:218
+#: ../pyhoca/wxgui/profilemanager.py:237
msgid "Start session automatically after login"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:219
+#: ../pyhoca/wxgui/profilemanager.py:238
#, python-format
-msgid "Login automatically after %s has started"
+msgid "Login automatically after %s has started (needs --auto-connect)"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:220
+#: ../pyhoca/wxgui/profilemanager.py:239
msgid "Type"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:222
+#: ../pyhoca/wxgui/profilemanager.py:241
msgid "Application"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:226
+#: ../pyhoca/wxgui/profilemanager.py:245
msgid "XDMCP server"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:228
+#: ../pyhoca/wxgui/profilemanager.py:247
msgid "RDP server"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:230
+#: ../pyhoca/wxgui/profilemanager.py:249
msgid "RDP options"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:232
+#: ../pyhoca/wxgui/profilemanager.py:251
msgid "Integrate remote application(s) into local desktop (rootless mode)"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:233
+#: ../pyhoca/wxgui/profilemanager.py:252
msgid "Menu of published applications"
msgstr ""
#. ##
#. ## widgets for the CONNECTION tab
#. ##
-#: ../pyhoca/wxgui/profilemanager.py:240 ../pyhoca/wxgui/profilemanager.py:253
+#: ../pyhoca/wxgui/profilemanager.py:259 ../pyhoca/wxgui/profilemanager.py:273
msgid "User"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:242 ../pyhoca/wxgui/profilemanager.py:260
+#: ../pyhoca/wxgui/profilemanager.py:261 ../pyhoca/wxgui/profilemanager.py:280
msgid "Host"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:244 ../pyhoca/wxgui/profilemanager.py:262
+#: ../pyhoca/wxgui/profilemanager.py:263 ../pyhoca/wxgui/profilemanager.py:282
msgid "Port"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:246
+#: ../pyhoca/wxgui/profilemanager.py:265
msgid "Key"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:249
+#: ../pyhoca/wxgui/profilemanager.py:268
msgid "Discover SSH keys or use SSH agent for X2Go authentication"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:251
+#: ../pyhoca/wxgui/profilemanager.py:270
msgid "Enable forwarding of SSH authentication agent connections"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:252
+#: ../pyhoca/wxgui/profilemanager.py:271
+msgid "Store SSH host keys under (unique) X2Go session profile ID"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:272
msgid "Server behind SSH proxy"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:255
+#: ../pyhoca/wxgui/profilemanager.py:275
msgid "Use same username for X2Go and proxy host"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:256
+#: ../pyhoca/wxgui/profilemanager.py:276
msgid "Use same authentication for X2Go and proxy host"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:257
+#: ../pyhoca/wxgui/profilemanager.py:277
msgid "Key file"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:264
-msgid "SSH Proxy Tunnel"
-msgstr ""
-
-#: ../pyhoca/wxgui/profilemanager.py:270
+#: ../pyhoca/wxgui/profilemanager.py:284
msgid "Discover SSH keys or use SSH agent for proxy authentication"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:273
+#: ../pyhoca/wxgui/profilemanager.py:287
msgid "Modem"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:274
+#: ../pyhoca/wxgui/profilemanager.py:288
msgid "ISDN"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:275
+#: ../pyhoca/wxgui/profilemanager.py:289
msgid "ADSL"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:276
+#: ../pyhoca/wxgui/profilemanager.py:290
msgid "WAN"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:277
+#: ../pyhoca/wxgui/profilemanager.py:291
msgid "LAN"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:279
+#: ../pyhoca/wxgui/profilemanager.py:293
msgid "Method"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:281
+#: ../pyhoca/wxgui/profilemanager.py:295
msgid "Image quality"
msgstr ""
#. ##
-#. ## wigdets for the SETTINGS tab
+#. ## wigdets for the IO tab
#. ##
-#: ../pyhoca/wxgui/profilemanager.py:287
+#: ../pyhoca/wxgui/profilemanager.py:301
msgid "Fullscreen"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:288
+#: ../pyhoca/wxgui/profilemanager.py:302
msgid "Maximized"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:289
+#: ../pyhoca/wxgui/profilemanager.py:303
msgid "Custom Size"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:294
+#: ../pyhoca/wxgui/profilemanager.py:308
msgid "Set display DPI"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:296
+#: ../pyhoca/wxgui/profilemanager.py:310
msgid "Do not set (use server-side tools to configure the keyboard)"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:297
+#: ../pyhoca/wxgui/profilemanager.py:311
msgid ""
"Automatically detect and use client-side keyboard configuration inside the "
"session"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:298
+#: ../pyhoca/wxgui/profilemanager.py:312
msgid "Use custom keyboard settings as provided below"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:299
+#: ../pyhoca/wxgui/profilemanager.py:313
msgid "Keyboard model"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:301
+#: ../pyhoca/wxgui/profilemanager.py:315
msgid "Layout"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:303
+#: ../pyhoca/wxgui/profilemanager.py:317
msgid "Layout variant"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:305
+#. ##
+#. ## wigdets for the MEDIA tab
+#. ##
+#: ../pyhoca/wxgui/profilemanager.py:323
msgid "Enable sound support"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:306
+#: ../pyhoca/wxgui/profilemanager.py:324
msgid "Pulse Audio"
msgstr ""
#. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated.
#. However, config files can contain an Arts configuration, so we will honour this
-#: ../pyhoca/wxgui/profilemanager.py:310
+#: ../pyhoca/wxgui/profilemanager.py:328
msgid "Arts (not supported)"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:313
+#: ../pyhoca/wxgui/profilemanager.py:331
msgid "esd"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:314
+#: ../pyhoca/wxgui/profilemanager.py:332
msgid "Use default sound port"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:315
+#: ../pyhoca/wxgui/profilemanager.py:333
msgid "Custom sound port"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:318
+#: ../pyhoca/wxgui/profilemanager.py:336
+msgid "Client Side printing"
+msgstr ""
+
+#. ##
+#. ## wigdets for the SHARING tab
+#. ##
+#: ../pyhoca/wxgui/profilemanager.py:342
msgid "Use local folder sharing"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:319
+#: ../pyhoca/wxgui/profilemanager.py:343
msgid "Store share list at end of session"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:320
+#: ../pyhoca/wxgui/profilemanager.py:344
msgid "Path"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:323 ../pyhoca/wxgui/profilemanager.py:344
+#: ../pyhoca/wxgui/profilemanager.py:347 ../pyhoca/wxgui/profilemanager.py:366
msgid "Add"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:325
+#: ../pyhoca/wxgui/profilemanager.py:349
msgid "Local Path"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:326
+#: ../pyhoca/wxgui/profilemanager.py:350
msgid "Connect Method"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:327
+#: ../pyhoca/wxgui/profilemanager.py:351
msgid "Delete"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:329
+#: ../pyhoca/wxgui/profilemanager.py:353
msgid "Convert between client and server encodings"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:330
+#: ../pyhoca/wxgui/profilemanager.py:354
msgid "Client encoding"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:332
+#: ../pyhoca/wxgui/profilemanager.py:356
msgid "Server encoding"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:335
+#: ../pyhoca/wxgui/profilemanager.py:359
msgid "Use file MIME box for local file import"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:336
+#: ../pyhoca/wxgui/profilemanager.py:360
msgid "Extensions"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:338
+#: ../pyhoca/wxgui/profilemanager.py:362
msgid "Action"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:341
-msgid "Client Side printing"
-msgstr ""
-
-#: ../pyhoca/wxgui/profilemanager.py:345
+#: ../pyhoca/wxgui/profilemanager.py:367
msgid "Defaults"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:347
+#: ../pyhoca/wxgui/profilemanager.py:369
msgid "Save"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:348
+#: ../pyhoca/wxgui/profilemanager.py:370
msgid "Reset"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:401
-#: ../pyhoca/wxgui/profilemanager.py:1124
-#: ../pyhoca/wxgui/profilemanager.py:2268
+#: ../pyhoca/wxgui/profilemanager.py:372 ../pyhoca/wxgui/printingprefs.py:143
+msgid "Apply"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:423
+#: ../pyhoca/wxgui/profilemanager.py:1135
+#: ../pyhoca/wxgui/profilemanager.py:2303
msgid "automatically"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:403
-#: ../pyhoca/wxgui/profilemanager.py:1126
+#: ../pyhoca/wxgui/profilemanager.py:425
+#: ../pyhoca/wxgui/profilemanager.py:1137
msgid "manually"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:412
+#: ../pyhoca/wxgui/profilemanager.py:434
msgid "PyHoca-GUI Profile Manager - new profile"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:414
+#: ../pyhoca/wxgui/profilemanager.py:436
#, python-format
msgid "PyHoca-GUI Profile Manager - %s (connected)"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:416
+#: ../pyhoca/wxgui/profilemanager.py:438
#, python-format
msgid "PyHoca-GUI Profile Manager - %s"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:797
+#: ../pyhoca/wxgui/profilemanager.py:804
msgid "Profile"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:798
+#: ../pyhoca/wxgui/profilemanager.py:805
msgid "Session"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:799
+#: ../pyhoca/wxgui/profilemanager.py:806
msgid "Connection"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:800
+#: ../pyhoca/wxgui/profilemanager.py:807
msgid "Link Quality"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:801
-msgid "Settings"
+#: ../pyhoca/wxgui/profilemanager.py:808
+msgid "Input/Output"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:802
+#: ../pyhoca/wxgui/profilemanager.py:809
+msgid "Media"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:810
msgid "Sharing"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:988
+#: ../pyhoca/wxgui/profilemanager.py:989
msgid "<xkbtype>"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:989
+#: ../pyhoca/wxgui/profilemanager.py:990
msgid "<xkblayout>"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:990
+#: ../pyhoca/wxgui/profilemanager.py:991
msgid "<xkbvariant>"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:1444
+#: ../pyhoca/wxgui/profilemanager.py:1449
msgid "Icon Files (*.png)|*.png|All files (*.*)|*"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:1447
+#: ../pyhoca/wxgui/profilemanager.py:1452
msgid "Choose an icon for this session profile"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:1816
+#: ../pyhoca/wxgui/profilemanager.py:1895
msgid "All files (*.*)|*"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:1818
-#: ../pyhoca/wxgui/profilemanager.py:1842
+#: ../pyhoca/wxgui/profilemanager.py:1897
+#: ../pyhoca/wxgui/profilemanager.py:1921
msgid "Choose a public SSH key"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:2220
+#: ../pyhoca/wxgui/profilemanager.py:2255
msgid "Choose a folder to share within a session"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:2348
-#: ../pyhoca/wxgui/profilemanager.py:2351
-#: ../pyhoca/wxgui/profilemanager.py:2354
-#: ../pyhoca/wxgui/profilemanager.py:2359
-#: ../pyhoca/wxgui/profilemanager.py:2369 ../pyhoca/wxgui/menus_taskbar.py:117
+#: ../pyhoca/wxgui/profilemanager.py:2383
+#: ../pyhoca/wxgui/profilemanager.py:2386
+#: ../pyhoca/wxgui/profilemanager.py:2389 ../pyhoca/wxgui/menus_taskbar.py:122
msgid "Profile Manager"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:2348
+#: ../pyhoca/wxgui/profilemanager.py:2383
msgid "Profile name is missing, profile unusable!!!"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:2351
-#: ../pyhoca/wxgui/profilemanager.py:2354
+#: ../pyhoca/wxgui/profilemanager.py:2386
+#: ../pyhoca/wxgui/profilemanager.py:2389
#, python-format
msgid "Profile name %s already exists!!!"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:2359
-msgid "The SSH proxy configuration is incomplete. Try again."
-msgstr ""
-
-#: ../pyhoca/wxgui/profilemanager.py:2369
-#, python-format
-msgid ""
-"Another session profile (%s) already uses [%s]:%s for binding a local SSH "
-"proxy to.\n"
-"Please change the SSH proxy settings accordingly."
-msgstr ""
-
-#: ../pyhoca/wxgui/profilemanager.py:2396
+#: ../pyhoca/wxgui/profilemanager.py:2416
#, python-format
msgid "%s - profile added"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:2397
+#: ../pyhoca/wxgui/profilemanager.py:2417
msgid "A new session profile has been added."
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:2401
+#: ../pyhoca/wxgui/profilemanager.py:2421
#, python-format
msgid "%s - modified"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:2402
+#: ../pyhoca/wxgui/profilemanager.py:2422
msgid "Changes to profile have been saved."
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:74
+#: ../pyhoca/wxgui/listdesktops.py:82
+#, python-format
+msgid "Share Desktop Session - %s"
+msgstr ""
+
+#: ../pyhoca/wxgui/listdesktops.py:84
+msgid "Select one of the available desktop sessions on this server"
+msgstr ""
+
+#: ../pyhoca/wxgui/listdesktops.py:90
+msgid "View session only"
+msgstr ""
+
+#: ../pyhoca/wxgui/listdesktops.py:91
+msgid "Gain full access"
+msgstr ""
+
+#: ../pyhoca/wxgui/listdesktops.py:95
+msgid "Share Desktop"
+msgstr ""
+
+#: ../pyhoca/wxgui/listdesktops.py:98
+msgid "Refresh list"
+msgstr ""
+
+#: ../pyhoca/wxgui/menus_taskbar.py:76
msgid "Edit Profile"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:77
+#: ../pyhoca/wxgui/menus_taskbar.py:79
msgid "Use as Template for New Profile"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:78
+#: ../pyhoca/wxgui/menus_taskbar.py:81
+msgid "Export Profile"
+msgstr ""
+
+#: ../pyhoca/wxgui/menus_taskbar.py:82
msgid "Delete Profile"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:106
+#: ../pyhoca/wxgui/menus_taskbar.py:111
#, python-format
msgid "About %s (%s)..."
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:132
+#: ../pyhoca/wxgui/menus_taskbar.py:137
msgid "Manage Session Profile"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:141
+#: ../pyhoca/wxgui/menus_taskbar.py:146
msgid "Printing Preferences"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:147
+#: ../pyhoca/wxgui/menus_taskbar.py:152
msgid "Client Options"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:783
-#: ../pyhoca/wxgui/menus_taskbar.py:975
+#: ../pyhoca/wxgui/menus_taskbar.py:160 ../pyhoca/wxgui/menus_taskbar.py:828
+#: ../pyhoca/wxgui/menus_taskbar.py:1033
msgid "E&xit"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:227
+#: ../pyhoca/wxgui/menus_taskbar.py:232
msgid "Window title"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:233 ../pyhoca/wxgui/menus_taskbar.py:608
+#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:631
msgid "Resume Session"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:235
+#: ../pyhoca/wxgui/menus_taskbar.py:240
msgid "Resume Session (not possible)"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:246
+#: ../pyhoca/wxgui/menus_taskbar.py:251
msgid "Transfer Session"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:248
+#: ../pyhoca/wxgui/menus_taskbar.py:253
msgid "Transfer Session (not possible)"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:252 ../pyhoca/wxgui/menus_taskbar.py:599
+#: ../pyhoca/wxgui/menus_taskbar.py:258 ../pyhoca/wxgui/menus_taskbar.py:622
msgid "Suspend Session (and disconnect/exit)"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:254 ../pyhoca/wxgui/menus_taskbar.py:601
+#: ../pyhoca/wxgui/menus_taskbar.py:260 ../pyhoca/wxgui/menus_taskbar.py:624
msgid "Suspend Session (and disconnect)"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:256 ../pyhoca/wxgui/menus_taskbar.py:603
+#: ../pyhoca/wxgui/menus_taskbar.py:262 ../pyhoca/wxgui/menus_taskbar.py:626
msgid "Suspend Session"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:262 ../pyhoca/wxgui/menus_taskbar.py:612
+#: ../pyhoca/wxgui/menus_taskbar.py:268 ../pyhoca/wxgui/menus_taskbar.py:635
msgid "Terminate Session (and disconnect/exit)"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:264 ../pyhoca/wxgui/menus_taskbar.py:614
+#: ../pyhoca/wxgui/menus_taskbar.py:270 ../pyhoca/wxgui/menus_taskbar.py:637
msgid "Terminate Session (and disconnect)"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:266 ../pyhoca/wxgui/menus_taskbar.py:616
+#: ../pyhoca/wxgui/menus_taskbar.py:272 ../pyhoca/wxgui/menus_taskbar.py:639
msgid "Terminate Session"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:270 ../pyhoca/wxgui/menus_taskbar.py:596
-msgid "Refresh menu tree"
+#: ../pyhoca/wxgui/menus_taskbar.py:275
+msgid "End Desktop Sharing (and disconnect/exit)"
+msgstr ""
+
+#: ../pyhoca/wxgui/menus_taskbar.py:277
+msgid "End Desktop Sharing (and disconnect)"
msgstr ""
#: ../pyhoca/wxgui/menus_taskbar.py:279
+msgid "End Desktop Sharing"
+msgstr ""
+
+#: ../pyhoca/wxgui/menus_taskbar.py:283 ../pyhoca/wxgui/menus_taskbar.py:619
+msgid "Refresh menu tree"
+msgstr ""
+
+#: ../pyhoca/wxgui/menus_taskbar.py:292
msgid "Rename Session Window"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:280
+#: ../pyhoca/wxgui/menus_taskbar.py:293
msgid "Show Session Window"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:322
+#: ../pyhoca/wxgui/menus_taskbar.py:335
msgid "&Share custom local folder"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:337
+#: ../pyhoca/wxgui/menus_taskbar.py:350
msgid "Share:"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:346
+#: ../pyhoca/wxgui/menus_taskbar.py:359
msgid "Unshare:"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:354
+#: ../pyhoca/wxgui/menus_taskbar.py:367
msgid "Unshare &all local folders"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:360
+#: ../pyhoca/wxgui/menus_taskbar.py:373
msgid "Restore shares in next session"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:440
+#: ../pyhoca/wxgui/menus_taskbar.py:453
msgid "Multimedia"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:441
+#: ../pyhoca/wxgui/menus_taskbar.py:454
msgid "Development"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:442
+#: ../pyhoca/wxgui/menus_taskbar.py:455
msgid "Education"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:443
+#: ../pyhoca/wxgui/menus_taskbar.py:456
msgid "Games"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:444
+#: ../pyhoca/wxgui/menus_taskbar.py:457
msgid "Graphics"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:445
+#: ../pyhoca/wxgui/menus_taskbar.py:458
msgid "Internet"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:446
+#: ../pyhoca/wxgui/menus_taskbar.py:459
msgid "Office Applications"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:447
+#: ../pyhoca/wxgui/menus_taskbar.py:460
msgid "System"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:448
+#: ../pyhoca/wxgui/menus_taskbar.py:461
msgid "Utilities"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:449
+#: ../pyhoca/wxgui/menus_taskbar.py:462
msgid "Other Applications"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:521 ../pyhoca/wxgui/menus_taskbar.py:533
+#: ../pyhoca/wxgui/menus_taskbar.py:535 ../pyhoca/wxgui/menus_taskbar.py:547
#, python-format
msgid "Connect %s"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:527
+#: ../pyhoca/wxgui/menus_taskbar.py:541
msgid "Currently connecting..."
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:541
+#: ../pyhoca/wxgui/menus_taskbar.py:556
msgid "Start &new Desktop Session"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:546 ../pyhoca/wxgui/menus_taskbar.py:684
+#: ../pyhoca/wxgui/menus_taskbar.py:560 ../pyhoca/wxgui/menus_taskbar.py:660
+msgid "Start Desktop Sharing Session"
+msgstr ""
+
+#: ../pyhoca/wxgui/menus_taskbar.py:566 ../pyhoca/wxgui/menus_taskbar.py:710
msgid "Retrieving Application Menu..."
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:550 ../pyhoca/wxgui/menus_taskbar.py:687
+#: ../pyhoca/wxgui/menus_taskbar.py:570 ../pyhoca/wxgui/menus_taskbar.py:713
msgid "Retrieve Application Menu"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:553
+#: ../pyhoca/wxgui/menus_taskbar.py:573
+msgid "Start &new RDP Session"
+msgstr ""
+
+#: ../pyhoca/wxgui/menus_taskbar.py:576
msgid "Start &new Session"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:633
+#: ../pyhoca/wxgui/menus_taskbar.py:656
msgid "Launch Single Application"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:671
+#: ../pyhoca/wxgui/menus_taskbar.py:697
msgid "Manage Application Menu"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:714
+#: ../pyhoca/wxgui/menus_taskbar.py:752
msgid "Running"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:716
+#: ../pyhoca/wxgui/menus_taskbar.py:754
msgid "Suspended"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:735
+#: ../pyhoca/wxgui/menus_taskbar.py:773
msgid "&Clean all sessions"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:741
+#: ../pyhoca/wxgui/menus_taskbar.py:779
msgid "Customize &profile"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:756
+#: ../pyhoca/wxgui/menus_taskbar.py:794
msgid "Shared &folders"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:768
+#: ../pyhoca/wxgui/menus_taskbar.py:806
+msgid "Server Information"
+msgstr ""
+
+#: ../pyhoca/wxgui/menus_taskbar.py:813
msgid "&Disconnect from Server"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:775
+#: ../pyhoca/wxgui/menus_taskbar.py:820
msgid "Suspend Session and E&xit application"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:779
+#: ../pyhoca/wxgui/menus_taskbar.py:824
msgid "Disconnect and E&xit application"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:833
+#: ../pyhoca/wxgui/menus_taskbar.py:878
msgid "Add Profile"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:909
+#: ../pyhoca/wxgui/menus_taskbar.py:954
msgid "No session profiles defined"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:945
-msgid "Start/Resume Session"
+#: ../pyhoca/wxgui/menus_taskbar.py:965
+msgid "Export all Profiles"
+msgstr ""
+
+#: ../pyhoca/wxgui/menus_taskbar.py:967
+msgid "Export Profile Group"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:945
+#: ../pyhoca/wxgui/menus_taskbar.py:1003
msgid "Connect Server"
msgstr ""
@@ -943,61 +1004,61 @@ msgstr ""
msgid "About %s ..."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:459
+#: ../pyhoca/wxgui/frontend.py:465
msgid "Suspending sessions and exiting application..."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:462
+#: ../pyhoca/wxgui/frontend.py:468
#, python-format
msgid "Disconnecting %s and exiting application..."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:464
+#: ../pyhoca/wxgui/frontend.py:470
msgid "Exiting application..."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:562
+#: ../pyhoca/wxgui/frontend.py:568
#, python-format
msgid "%s - server warning"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:562
+#: ../pyhoca/wxgui/frontend.py:568
msgid "The X2Go Server does not publish an application menu."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:613
+#: ../pyhoca/wxgui/frontend.py:619
msgid "SSH key authentication has been successful."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:650
+#: ../pyhoca/wxgui/frontend.py:656
msgid ""
"The SSH proxy's host key is invalid or has not been accepted by the user"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:671
+#: ../pyhoca/wxgui/frontend.py:677
#, python-format
msgid "%s - EOF error"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:671
+#: ../pyhoca/wxgui/frontend.py:677
msgid "Authentication protocol communication incomplete! Try again..."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:678
+#: ../pyhoca/wxgui/frontend.py:684
#, python-format
msgid "%s - auth key error"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:699
+#: ../pyhoca/wxgui/frontend.py:705
msgid "An unknown error occurred during authentication!"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:728
+#: ../pyhoca/wxgui/frontend.py:734
#, python-format
msgid "%s: DirectRDP not supported yet"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:729
+#: ../pyhoca/wxgui/frontend.py:735
#, python-format
msgid ""
"We apologize for the inconvenience...\n"
@@ -1005,60 +1066,134 @@ msgid ""
"Session profiles of type ,,DirectRDP'' are not\n"
"supported by %s (%s), yet!!\n"
"\n"
-"DirectRDP support will be available in %s (>= 0.2.2.0)."
+"DirectRDP support will be available in %s (>= 1.0.0.0)."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:741
+#: ../pyhoca/wxgui/frontend.py:747
msgid "Unknown session profile, configure before using it..."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:1332
+#: ../pyhoca/wxgui/frontend.py:778
+#, python-format
+msgid "Desktop Sharing with %s not supported by server"
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:779
+#, python-format
+msgid ""
+"We apologize for the inconvenience...\n"
+"\n"
+"Session profiles of type ,,SHADOW'' are not\n"
+"supported by X2Go Server (v%s)!!!\n"
+"\n"
+"Desktop Sharing with %s requires\n"
+"X2Go Server 4.1.0.0 and above."
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:837 ../pyhoca/wxgui/frontend.py:1488
#, python-format
msgid "%s - session warning"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:798
+#: ../pyhoca/wxgui/frontend.py:837
#, python-format
msgid "Execution of command ,,%s'' failed."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:939
+#: ../pyhoca/wxgui/frontend.py:978
msgid "Cleaning X2Go sessions..."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:974
+#: ../pyhoca/wxgui/frontend.py:1026
#, python-format
msgid "%s - disconnect"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:974
+#: ../pyhoca/wxgui/frontend.py:1026
msgid "X2Go Profile is now disconnected."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:995
+#: ../pyhoca/wxgui/frontend.py:1047
msgid "New Session Profile"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1047
+#: ../pyhoca/wxgui/frontend.py:1102
#, python-format
msgid "Really Delete Session Profile ,,%s''?"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1053
+#: ../pyhoca/wxgui/frontend.py:1108
#, python-format
msgid "%s - profile deleted"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1053
+#: ../pyhoca/wxgui/frontend.py:1108
msgid "The session profile has been deleted."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1071
+#: ../pyhoca/wxgui/frontend.py:1137
+#, python-format
+msgid "%s - export session profiles"
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:1142
+#, python-format
+msgid "%s - export session profile"
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:1154
+#, python-format
+msgid "%s: Export file already exists"
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:1155
+#, python-format
+msgid ""
+"The file Âģ%sÂĢ already exists in this folder.\n"
+"\n"
+"Do you want to replace it?"
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:1176
+#, python-format
+msgid "%s - profiles exported"
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:1176
+#, python-format
+msgid "Successfully exported session profile group Âģ%sÂĢ to file Âģ%sÂĢ."
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:1178
+#, python-format
+msgid "%s - profile exported"
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:1178
+#, python-format
+msgid "Successfully exported single session profile Âģ%sÂĢ to file Âģ%sÂĢ."
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:1182
+#, python-format
+msgid "%s: Exporting session profile(s) failed"
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:1183
+#, python-format
+msgid ""
+"The selected session profile(s) could not be exported to the \n"
+"file Âģ%sÂĢ.\n"
+"\n"
+"Check for common problems (disk full, insufficient access, etc.)."
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:1202
#, python-format
msgid "%s - share local folder with sessions of this profile"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1224
+#: ../pyhoca/wxgui/frontend.py:1355
#, python-format
msgid ""
"The authenticity of host [%s]:%s can't be established.\n"
@@ -1067,148 +1202,169 @@ msgid ""
"Are you sure you want to continue connecting?"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1232
+#: ../pyhoca/wxgui/frontend.py:1363
#, python-format
msgid "%s: Confirm Host Authorization"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1277
+#: ../pyhoca/wxgui/frontend.py:1409
#, python-format
msgid "%s - channel error"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1277
+#: ../pyhoca/wxgui/frontend.py:1409
#, python-format
msgid ""
"Lost connection to server %s unexpectedly! Try to re-authenticate to the "
"server..."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1295 ../pyhoca/wxgui/frontend.py:1313
-#: ../pyhoca/wxgui/frontend.py:1315 ../pyhoca/wxgui/frontend.py:1351
+#: ../pyhoca/wxgui/frontend.py:1426 ../pyhoca/wxgui/frontend.py:1469
+#: ../pyhoca/wxgui/frontend.py:1471 ../pyhoca/wxgui/frontend.py:1507
#, python-format
msgid "%s - session failure"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1295
+#: ../pyhoca/wxgui/frontend.py:1426
msgid "The session startup failed."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1313
+#: ../pyhoca/wxgui/frontend.py:1439
+#, python-format
+msgid "%s - timeout"
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:1439
+msgid ""
+"The server took long to provide a list of sharable desktops.\n"
+"This can happen from time to time, please try again"
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:1451
+#, python-format
+msgid "%s - desktop sharing failed"
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:1451
+#, python-format
+msgid "The desktop %s is not available for sharing (anymore)."
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:1469
#, python-format
msgid "The command ,,%s'' is not available on X2Go server."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1315
+#: ../pyhoca/wxgui/frontend.py:1471
#, python-format
msgid ""
"The command ,,%s'' is not available on X2Go server\n"
"%s."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1332
+#: ../pyhoca/wxgui/frontend.py:1488
#, python-format
msgid ""
"Reverse TCP port forwarding request for session %s to server port %s has "
"been denied."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1351
+#: ../pyhoca/wxgui/frontend.py:1507
#, python-format
msgid ""
"Forwarding tunnel request to [%s]:%s for session %s was denied by remote "
-"X2go/SSH server. Session startup failed."
+"X2Go/SSH server. Session startup failed."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1370
+#: ../pyhoca/wxgui/frontend.py:1526
#, python-format
msgid "%s - audio warning"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1370
+#: ../pyhoca/wxgui/frontend.py:1526
msgid ""
"The X2Go PulseAudio system is not available within Remote Desktop sessions."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1377 ../pyhoca/wxgui/frontend.py:1384
+#: ../pyhoca/wxgui/frontend.py:1533 ../pyhoca/wxgui/frontend.py:1540
#, python-format
msgid "%s - audio error"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1377
+#: ../pyhoca/wxgui/frontend.py:1533
msgid "The X2Go PulseAudio system could not be started."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1384
+#: ../pyhoca/wxgui/frontend.py:1540
msgid "The X2Go PulseAudio system has died unexpectedly."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1396
+#: ../pyhoca/wxgui/frontend.py:1552
#, python-format
msgid "%s - audio problem"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1396
+#: ../pyhoca/wxgui/frontend.py:1552
#, python-format
msgid ""
"The audio connection could not be set up for this session.\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1408
+#: ../pyhoca/wxgui/frontend.py:1564
#, python-format
msgid "%s - client-side printing not available"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1408
+#: ../pyhoca/wxgui/frontend.py:1564
#, python-format
msgid ""
"The server denies client-side printing from within this session.\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1420
+#: ../pyhoca/wxgui/frontend.py:1576
#, python-format
msgid "%s - MIME box not available"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1420
+#: ../pyhoca/wxgui/frontend.py:1576
#, python-format
msgid ""
"The server does not support the X2Go MIME box.\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1432
+#: ../pyhoca/wxgui/frontend.py:1588
#, python-format
msgid "%s - client-side folders not sharable"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1432
+#: ../pyhoca/wxgui/frontend.py:1588
#, python-format
msgid ""
"The server denies client-side folder sharing with this session.\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1444
+#: ../pyhoca/wxgui/frontend.py:1600
#, python-format
msgid "%s - client resources not sharable"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1444
+#: ../pyhoca/wxgui/frontend.py:1600
#, python-format
msgid ""
"Client-side folders and printers cannot be shared with this session.\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1463 ../pyhoca/wxgui/frontend.py:1465
+#: ../pyhoca/wxgui/frontend.py:1619 ../pyhoca/wxgui/frontend.py:1621
#, python-format
msgid "%s - print error"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1463
+#: ../pyhoca/wxgui/frontend.py:1619
#, python-format
msgid ""
"%s\n"
@@ -1216,7 +1372,7 @@ msgid ""
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1465
+#: ../pyhoca/wxgui/frontend.py:1621
#, python-format
msgid ""
"%s\n"
@@ -1224,88 +1380,88 @@ msgid ""
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1480 ../pyhoca/wxgui/frontend.py:1495
+#: ../pyhoca/wxgui/frontend.py:1636 ../pyhoca/wxgui/frontend.py:1651
#, python-format
msgid "%s - start"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1480
+#: ../pyhoca/wxgui/frontend.py:1636
#, python-format
msgid ""
"New X2Go session starting up...\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1495
+#: ../pyhoca/wxgui/frontend.py:1651
#, python-format
msgid ""
"Another client started X2Go session\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1510 ../pyhoca/wxgui/frontend.py:1525
+#: ../pyhoca/wxgui/frontend.py:1666 ../pyhoca/wxgui/frontend.py:1681
#, python-format
msgid "%s - resume"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1510
+#: ../pyhoca/wxgui/frontend.py:1666
#, python-format
msgid ""
"Resuming X2Go session...\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1525
+#: ../pyhoca/wxgui/frontend.py:1681
#, python-format
msgid ""
"Another client resumed X2Go session\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1540
+#: ../pyhoca/wxgui/frontend.py:1696
#, python-format
msgid "%s - running"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1540
+#: ../pyhoca/wxgui/frontend.py:1696
#, python-format
msgid ""
"Found already running session\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1560
+#: ../pyhoca/wxgui/frontend.py:1716
#, python-format
msgid "%s - suspend"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1560
+#: ../pyhoca/wxgui/frontend.py:1716
#, python-format
msgid ""
"X2Go Session has been suspended\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1587
+#: ../pyhoca/wxgui/frontend.py:1743
#, python-format
msgid "%s - terminate"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1587
+#: ../pyhoca/wxgui/frontend.py:1743
#, python-format
msgid ""
"X2Go Session has terminated\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/messages.py:73
+#: ../pyhoca/wxgui/messages.py:72
#, python-format
msgid ""
"Are you really sure you want to\n"
"delete the session profile ,,%s''?"
msgstr ""
-#: ../pyhoca/wxgui/messages.py:74
+#: ../pyhoca/wxgui/messages.py:73
#, python-format
msgid ""
"PyHoca-GUI is already running for user ,,%s''!\n"
@@ -1315,15 +1471,15 @@ msgid ""
"notification area/systray."
msgstr ""
-#: ../pyhoca/wxgui/messages.py:107
+#: ../pyhoca/wxgui/messages.py:106
msgid "Yes"
msgstr ""
-#: ../pyhoca/wxgui/messages.py:108
+#: ../pyhoca/wxgui/messages.py:107
msgid "No"
msgstr ""
-#: ../pyhoca/wxgui/messages.py:125 ../pyhoca/wxgui/printingprefs.py:142
+#: ../pyhoca/wxgui/messages.py:124 ../pyhoca/wxgui/printingprefs.py:142
msgid "Ok"
msgstr ""
@@ -1389,10 +1545,6 @@ msgstr ""
msgid "Custom print command"
msgstr ""
-#: ../pyhoca/wxgui/printingprefs.py:143
-msgid "Apply"
-msgstr ""
-
#: ../pyhoca/wxgui/printingprefs.py:145
msgid "Print"
msgstr ""
@@ -1425,3 +1577,44 @@ msgstr ""
#: ../pyhoca/wxgui/sessiontitle.py:83
msgid "OK"
msgstr ""
+
+#: ../pyhoca/wxgui/serverinfo.py:76
+#, python-format
+msgid "Server Information - %s"
+msgstr ""
+
+#: ../pyhoca/wxgui/serverinfo.py:78
+#, python-format
+msgid ""
+"Session Profile: %s\n"
+"\n"
+"List of X2Go Server components, add-ons and their versions..."
+msgstr ""
+
+#: ../pyhoca/wxgui/serverinfo.py:83
+msgid "Refresh"
+msgstr ""
+
+#: ../pyhoca/wxgui/serverinfo.py:84
+msgid "Close"
+msgstr ""
+
+#: ../pyhoca/wxgui/serverinfo.py:153
+msgid "X2Go Server"
+msgstr ""
+
+#: ../pyhoca/wxgui/serverinfo.py:154
+msgid "Server Core"
+msgstr ""
+
+#: ../pyhoca/wxgui/serverinfo.py:162
+msgid "Server Extensions"
+msgstr ""
+
+#: ../pyhoca/wxgui/serverinfo.py:168
+msgid "X2Go Server Add-ons"
+msgstr ""
+
+#: ../pyhoca/wxgui/serverinfo.py:172
+msgid "X2Go Server Features"
+msgstr ""
diff --git a/po/bg.po b/po/bg.po
index 194fc9c..4d1d4a3 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -1,5 +1,5 @@
# PyHoca-GUI / i18n.
-# Copyright (C) 2010-2012 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
# Dick Kniep <dick.kniep(a)lindix.nl>
# This file is distributed under the same license as the PyHoca-GUI package.
# Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>, 2011.
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PyHoca-GUI VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 14:25+0100\n"
+"POT-Creation-Date: 2013-01-29 22:21+0100\n"
"PO-Revision-Date: 2011-09-17 02:17+0100\n"
"Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n"
"Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n"
@@ -39,7 +39,7 @@ msgid "Authenticate"
msgstr ""
#: ../pyhoca/wxgui/logon.py:107
-msgid " Start SSH tunnel "
+msgid "Start SSH tunnel"
msgstr ""
#: ../pyhoca/wxgui/logon.py:115
@@ -50,23 +50,23 @@ msgstr ""
msgid "SSH proxy server login"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:127 ../pyhoca/wxgui/profilemanager.py:350
-#: ../pyhoca/wxgui/messages.py:131 ../pyhoca/wxgui/printingprefs.py:147
-#: ../pyhoca/wxgui/sessiontitle.py:85
+#: ../pyhoca/wxgui/logon.py:127 ../pyhoca/wxgui/profilemanager.py:373
+#: ../pyhoca/wxgui/listdesktops.py:99 ../pyhoca/wxgui/messages.py:130
+#: ../pyhoca/wxgui/printingprefs.py:147 ../pyhoca/wxgui/sessiontitle.py:85
msgid "Cancel"
msgstr ""
#: ../pyhoca/wxgui/logon.py:297 ../pyhoca/wxgui/logon.py:339
-#: ../pyhoca/wxgui/frontend.py:606
+#: ../pyhoca/wxgui/frontend.py:612
#, python-format
msgid "%s - connect failure"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:606
+#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:612
msgid "User is not allowed to start X2Go sessions!"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:303 ../pyhoca/wxgui/frontend.py:613
+#: ../pyhoca/wxgui/logon.py:303 ../pyhoca/wxgui/frontend.py:619
#, python-format
msgid "%s - connect"
msgstr ""
@@ -92,28 +92,28 @@ msgstr ""
msgid "Authentication to the SSH proxy server failed!"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:376 ../pyhoca/wxgui/frontend.py:664
+#: ../pyhoca/wxgui/logon.py:376 ../pyhoca/wxgui/frontend.py:670
#, python-format
msgid "%s - socket error"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:383 ../pyhoca/wxgui/frontend.py:643
-#: ../pyhoca/wxgui/frontend.py:650
+#: ../pyhoca/wxgui/logon.py:383 ../pyhoca/wxgui/frontend.py:649
+#: ../pyhoca/wxgui/frontend.py:656
#, python-format
msgid "%s - host key error"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:384 ../pyhoca/wxgui/frontend.py:643
+#: ../pyhoca/wxgui/logon.py:384 ../pyhoca/wxgui/frontend.py:649
msgid ""
"The remote server's host key is invalid or has not been accepted by the user"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:391 ../pyhoca/wxgui/frontend.py:685
+#: ../pyhoca/wxgui/logon.py:391 ../pyhoca/wxgui/frontend.py:691
#, python-format
msgid "%s - missing home directory"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:392 ../pyhoca/wxgui/frontend.py:685
+#: ../pyhoca/wxgui/logon.py:392 ../pyhoca/wxgui/frontend.py:691
msgid "The remote user's home directory does not exist."
msgstr ""
@@ -122,12 +122,12 @@ msgstr ""
msgid "%s - key error"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:407 ../pyhoca/wxgui/frontend.py:692
+#: ../pyhoca/wxgui/logon.py:407 ../pyhoca/wxgui/frontend.py:698
#, python-format
msgid "%s - auth error"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:415 ../pyhoca/wxgui/frontend.py:636
+#: ../pyhoca/wxgui/logon.py:415 ../pyhoca/wxgui/frontend.py:642
#, python-format
msgid "%s - SSH error"
msgstr ""
@@ -151,7 +151,7 @@ msgstr ""
#: ../pyhoca/wxgui/taskbar.py:93
#, python-format
msgid ""
-"PyHoca-GUI (Python X2goClient)\n"
+"PyHoca-GUI (Python X2Go Client)\n"
"Currently connecting you to remote X2Go server ,,%s''"
msgstr ""
@@ -163,7 +163,7 @@ msgstr ""
#: ../pyhoca/wxgui/taskbar.py:107
msgid ""
-"PyHoca-GUI (Python X2goClient)\n"
+"PyHoca-GUI (Python X2Go Client)\n"
"Client for connecting you to a remote X2Go server"
msgstr ""
@@ -200,745 +200,806 @@ msgid "Single Application"
msgstr ""
#: ../pyhoca/wxgui/profilemanager.py:87
-msgid "XDMCP Query"
+msgid "Share desktop session (SHADOW)"
msgstr ""
#: ../pyhoca/wxgui/profilemanager.py:88
-msgid "Windows Terminal Server (X2Go-proxied RDP)"
+msgid "XDMCP Query"
msgstr ""
#: ../pyhoca/wxgui/profilemanager.py:89
+msgid "Windows Terminal Server (X2Go-proxied RDP)"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:90
msgid "Windows Terminal Server (Direct RDP)"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/profilemanager.py:224
+#: ../pyhoca/wxgui/profilemanager.py:91 ../pyhoca/wxgui/profilemanager.py:243
msgid "Custom command"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:95 ../pyhoca/wxgui/menus_taskbar.py:393
+#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:406
msgid "Internet Browser"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:394
+#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:407
msgid "Email Client"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:395
+#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:408
msgid "Office"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:396
+#: ../pyhoca/wxgui/profilemanager.py:99 ../pyhoca/wxgui/menus_taskbar.py:409
msgid "Terminal"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:116
+#: ../pyhoca/wxgui/profilemanager.py:117
msgid "Open file with system's default application"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:117
+#: ../pyhoca/wxgui/profilemanager.py:118
msgid "Open application chooser dialog"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:118
+#: ../pyhoca/wxgui/profilemanager.py:119
msgid "Save incoming file as ..."
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:146
+#: ../pyhoca/wxgui/profilemanager.py:147
msgid "settings derived from "
msgstr ""
#. boxes for all tabs
-#: ../pyhoca/wxgui/profilemanager.py:167
+#: ../pyhoca/wxgui/profilemanager.py:186
msgid "Session Title"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:168
+#: ../pyhoca/wxgui/profilemanager.py:187
msgid "Session Window"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:169
+#: ../pyhoca/wxgui/profilemanager.py:188
msgid "Session Startup"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:170
+#: ../pyhoca/wxgui/profilemanager.py:189
msgid "Server"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:171
+#: ../pyhoca/wxgui/profilemanager.py:190
msgid "Proxy"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:172
+#: ../pyhoca/wxgui/profilemanager.py:191
msgid "Connection Link Speed"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:173
+#: ../pyhoca/wxgui/profilemanager.py:192
msgid "Compression"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:174
+#: ../pyhoca/wxgui/profilemanager.py:193
msgid "Display"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:175
+#: ../pyhoca/wxgui/profilemanager.py:194
msgid "Keyboard"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:176
+#: ../pyhoca/wxgui/profilemanager.py:195
msgid "Sound"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:177
+#: ../pyhoca/wxgui/profilemanager.py:196
msgid "Printing"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:178
+#: ../pyhoca/wxgui/profilemanager.py:197
msgid "Folder Exports"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:179
+#: ../pyhoca/wxgui/profilemanager.py:198
msgid "File Import"
msgstr ""
#. ##
#. ## widgets for the PROFILE tab
#. ##
-#: ../pyhoca/wxgui/profilemanager.py:184
+#: ../pyhoca/wxgui/profilemanager.py:203
msgid "Name"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:191
+#: ../pyhoca/wxgui/profilemanager.py:210
msgid "Set session window title"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:192
+#: ../pyhoca/wxgui/profilemanager.py:211
msgid "Use a default session window title"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:193
+#: ../pyhoca/wxgui/profilemanager.py:212
msgid "Custom session window title"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:212
+#: ../pyhoca/wxgui/profilemanager.py:231
msgid "Window Icon"
msgstr ""
#. ##
#. ## widgets for the SESSION tab
#. ##
-#: ../pyhoca/wxgui/profilemanager.py:218
+#: ../pyhoca/wxgui/profilemanager.py:237
msgid "Start session automatically after login"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:219
+#: ../pyhoca/wxgui/profilemanager.py:238
#, python-format
-msgid "Login automatically after %s has started"
+msgid "Login automatically after %s has started (needs --auto-connect)"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:220
+#: ../pyhoca/wxgui/profilemanager.py:239
msgid "Type"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:222
+#: ../pyhoca/wxgui/profilemanager.py:241
msgid "Application"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:226
+#: ../pyhoca/wxgui/profilemanager.py:245
msgid "XDMCP server"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:228
+#: ../pyhoca/wxgui/profilemanager.py:247
msgid "RDP server"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:230
+#: ../pyhoca/wxgui/profilemanager.py:249
msgid "RDP options"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:232
+#: ../pyhoca/wxgui/profilemanager.py:251
msgid "Integrate remote application(s) into local desktop (rootless mode)"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:233
+#: ../pyhoca/wxgui/profilemanager.py:252
msgid "Menu of published applications"
msgstr ""
#. ##
#. ## widgets for the CONNECTION tab
#. ##
-#: ../pyhoca/wxgui/profilemanager.py:240 ../pyhoca/wxgui/profilemanager.py:253
+#: ../pyhoca/wxgui/profilemanager.py:259 ../pyhoca/wxgui/profilemanager.py:273
msgid "User"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:242 ../pyhoca/wxgui/profilemanager.py:260
+#: ../pyhoca/wxgui/profilemanager.py:261 ../pyhoca/wxgui/profilemanager.py:280
msgid "Host"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:244 ../pyhoca/wxgui/profilemanager.py:262
+#: ../pyhoca/wxgui/profilemanager.py:263 ../pyhoca/wxgui/profilemanager.py:282
msgid "Port"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:246
+#: ../pyhoca/wxgui/profilemanager.py:265
msgid "Key"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:249
+#: ../pyhoca/wxgui/profilemanager.py:268
msgid "Discover SSH keys or use SSH agent for X2Go authentication"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:251
+#: ../pyhoca/wxgui/profilemanager.py:270
msgid "Enable forwarding of SSH authentication agent connections"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:252
+#: ../pyhoca/wxgui/profilemanager.py:271
+msgid "Store SSH host keys under (unique) X2Go session profile ID"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:272
msgid "Server behind SSH proxy"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:255
+#: ../pyhoca/wxgui/profilemanager.py:275
msgid "Use same username for X2Go and proxy host"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:256
+#: ../pyhoca/wxgui/profilemanager.py:276
msgid "Use same authentication for X2Go and proxy host"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:257
+#: ../pyhoca/wxgui/profilemanager.py:277
msgid "Key file"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:264
-msgid "SSH Proxy Tunnel"
-msgstr ""
-
-#: ../pyhoca/wxgui/profilemanager.py:270
+#: ../pyhoca/wxgui/profilemanager.py:284
msgid "Discover SSH keys or use SSH agent for proxy authentication"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:273
+#: ../pyhoca/wxgui/profilemanager.py:287
msgid "Modem"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:274
+#: ../pyhoca/wxgui/profilemanager.py:288
msgid "ISDN"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:275
+#: ../pyhoca/wxgui/profilemanager.py:289
msgid "ADSL"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:276
+#: ../pyhoca/wxgui/profilemanager.py:290
msgid "WAN"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:277
+#: ../pyhoca/wxgui/profilemanager.py:291
msgid "LAN"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:279
+#: ../pyhoca/wxgui/profilemanager.py:293
msgid "Method"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:281
+#: ../pyhoca/wxgui/profilemanager.py:295
msgid "Image quality"
msgstr ""
#. ##
-#. ## wigdets for the SETTINGS tab
+#. ## wigdets for the IO tab
#. ##
-#: ../pyhoca/wxgui/profilemanager.py:287
+#: ../pyhoca/wxgui/profilemanager.py:301
msgid "Fullscreen"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:288
+#: ../pyhoca/wxgui/profilemanager.py:302
msgid "Maximized"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:289
+#: ../pyhoca/wxgui/profilemanager.py:303
msgid "Custom Size"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:294
+#: ../pyhoca/wxgui/profilemanager.py:308
msgid "Set display DPI"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:296
+#: ../pyhoca/wxgui/profilemanager.py:310
msgid "Do not set (use server-side tools to configure the keyboard)"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:297
+#: ../pyhoca/wxgui/profilemanager.py:311
msgid ""
"Automatically detect and use client-side keyboard configuration inside the "
"session"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:298
+#: ../pyhoca/wxgui/profilemanager.py:312
msgid "Use custom keyboard settings as provided below"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:299
+#: ../pyhoca/wxgui/profilemanager.py:313
msgid "Keyboard model"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:301
+#: ../pyhoca/wxgui/profilemanager.py:315
msgid "Layout"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:303
+#: ../pyhoca/wxgui/profilemanager.py:317
msgid "Layout variant"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:305
+#. ##
+#. ## wigdets for the MEDIA tab
+#. ##
+#: ../pyhoca/wxgui/profilemanager.py:323
msgid "Enable sound support"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:306
+#: ../pyhoca/wxgui/profilemanager.py:324
msgid "Pulse Audio"
msgstr ""
#. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated.
#. However, config files can contain an Arts configuration, so we will honour this
-#: ../pyhoca/wxgui/profilemanager.py:310
+#: ../pyhoca/wxgui/profilemanager.py:328
msgid "Arts (not supported)"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:313
+#: ../pyhoca/wxgui/profilemanager.py:331
msgid "esd"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:314
+#: ../pyhoca/wxgui/profilemanager.py:332
msgid "Use default sound port"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:315
+#: ../pyhoca/wxgui/profilemanager.py:333
msgid "Custom sound port"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:318
+#: ../pyhoca/wxgui/profilemanager.py:336
+msgid "Client Side printing"
+msgstr ""
+
+#. ##
+#. ## wigdets for the SHARING tab
+#. ##
+#: ../pyhoca/wxgui/profilemanager.py:342
msgid "Use local folder sharing"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:319
+#: ../pyhoca/wxgui/profilemanager.py:343
msgid "Store share list at end of session"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:320
+#: ../pyhoca/wxgui/profilemanager.py:344
msgid "Path"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:323 ../pyhoca/wxgui/profilemanager.py:344
+#: ../pyhoca/wxgui/profilemanager.py:347 ../pyhoca/wxgui/profilemanager.py:366
msgid "Add"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:325
+#: ../pyhoca/wxgui/profilemanager.py:349
msgid "Local Path"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:326
+#: ../pyhoca/wxgui/profilemanager.py:350
msgid "Connect Method"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:327
+#: ../pyhoca/wxgui/profilemanager.py:351
msgid "Delete"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:329
+#: ../pyhoca/wxgui/profilemanager.py:353
msgid "Convert between client and server encodings"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:330
+#: ../pyhoca/wxgui/profilemanager.py:354
msgid "Client encoding"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:332
+#: ../pyhoca/wxgui/profilemanager.py:356
msgid "Server encoding"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:335
+#: ../pyhoca/wxgui/profilemanager.py:359
msgid "Use file MIME box for local file import"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:336
+#: ../pyhoca/wxgui/profilemanager.py:360
msgid "Extensions"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:338
+#: ../pyhoca/wxgui/profilemanager.py:362
msgid "Action"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:341
-msgid "Client Side printing"
-msgstr ""
-
-#: ../pyhoca/wxgui/profilemanager.py:345
+#: ../pyhoca/wxgui/profilemanager.py:367
msgid "Defaults"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:347
+#: ../pyhoca/wxgui/profilemanager.py:369
msgid "Save"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:348
+#: ../pyhoca/wxgui/profilemanager.py:370
msgid "Reset"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:401
-#: ../pyhoca/wxgui/profilemanager.py:1124
-#: ../pyhoca/wxgui/profilemanager.py:2268
+#: ../pyhoca/wxgui/profilemanager.py:372 ../pyhoca/wxgui/printingprefs.py:143
+msgid "Apply"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:423
+#: ../pyhoca/wxgui/profilemanager.py:1135
+#: ../pyhoca/wxgui/profilemanager.py:2303
msgid "automatically"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:403
-#: ../pyhoca/wxgui/profilemanager.py:1126
+#: ../pyhoca/wxgui/profilemanager.py:425
+#: ../pyhoca/wxgui/profilemanager.py:1137
msgid "manually"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:412
+#: ../pyhoca/wxgui/profilemanager.py:434
msgid "PyHoca-GUI Profile Manager - new profile"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:414
+#: ../pyhoca/wxgui/profilemanager.py:436
#, python-format
msgid "PyHoca-GUI Profile Manager - %s (connected)"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:416
+#: ../pyhoca/wxgui/profilemanager.py:438
#, python-format
msgid "PyHoca-GUI Profile Manager - %s"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:797
+#: ../pyhoca/wxgui/profilemanager.py:804
msgid "Profile"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:798
+#: ../pyhoca/wxgui/profilemanager.py:805
msgid "Session"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:799
+#: ../pyhoca/wxgui/profilemanager.py:806
msgid "Connection"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:800
+#: ../pyhoca/wxgui/profilemanager.py:807
msgid "Link Quality"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:801
-msgid "Settings"
+#: ../pyhoca/wxgui/profilemanager.py:808
+msgid "Input/Output"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:802
+#: ../pyhoca/wxgui/profilemanager.py:809
+msgid "Media"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:810
msgid "Sharing"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:988
+#: ../pyhoca/wxgui/profilemanager.py:989
msgid "<xkbtype>"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:989
+#: ../pyhoca/wxgui/profilemanager.py:990
msgid "<xkblayout>"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:990
+#: ../pyhoca/wxgui/profilemanager.py:991
msgid "<xkbvariant>"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:1444
+#: ../pyhoca/wxgui/profilemanager.py:1449
msgid "Icon Files (*.png)|*.png|All files (*.*)|*"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:1447
+#: ../pyhoca/wxgui/profilemanager.py:1452
msgid "Choose an icon for this session profile"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:1816
+#: ../pyhoca/wxgui/profilemanager.py:1895
msgid "All files (*.*)|*"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:1818
-#: ../pyhoca/wxgui/profilemanager.py:1842
+#: ../pyhoca/wxgui/profilemanager.py:1897
+#: ../pyhoca/wxgui/profilemanager.py:1921
msgid "Choose a public SSH key"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:2220
+#: ../pyhoca/wxgui/profilemanager.py:2255
msgid "Choose a folder to share within a session"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:2348
-#: ../pyhoca/wxgui/profilemanager.py:2351
-#: ../pyhoca/wxgui/profilemanager.py:2354
-#: ../pyhoca/wxgui/profilemanager.py:2359
-#: ../pyhoca/wxgui/profilemanager.py:2369 ../pyhoca/wxgui/menus_taskbar.py:117
+#: ../pyhoca/wxgui/profilemanager.py:2383
+#: ../pyhoca/wxgui/profilemanager.py:2386
+#: ../pyhoca/wxgui/profilemanager.py:2389 ../pyhoca/wxgui/menus_taskbar.py:122
msgid "Profile Manager"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:2348
+#: ../pyhoca/wxgui/profilemanager.py:2383
msgid "Profile name is missing, profile unusable!!!"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:2351
-#: ../pyhoca/wxgui/profilemanager.py:2354
+#: ../pyhoca/wxgui/profilemanager.py:2386
+#: ../pyhoca/wxgui/profilemanager.py:2389
#, python-format
msgid "Profile name %s already exists!!!"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:2359
-msgid "The SSH proxy configuration is incomplete. Try again."
-msgstr ""
-
-#: ../pyhoca/wxgui/profilemanager.py:2369
-#, python-format
-msgid ""
-"Another session profile (%s) already uses [%s]:%s for binding a local SSH "
-"proxy to.\n"
-"Please change the SSH proxy settings accordingly."
-msgstr ""
-
-#: ../pyhoca/wxgui/profilemanager.py:2396
+#: ../pyhoca/wxgui/profilemanager.py:2416
#, python-format
msgid "%s - profile added"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:2397
+#: ../pyhoca/wxgui/profilemanager.py:2417
msgid "A new session profile has been added."
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:2401
+#: ../pyhoca/wxgui/profilemanager.py:2421
#, python-format
msgid "%s - modified"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:2402
+#: ../pyhoca/wxgui/profilemanager.py:2422
msgid "Changes to profile have been saved."
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:74
+#: ../pyhoca/wxgui/listdesktops.py:82
+#, python-format
+msgid "Share Desktop Session - %s"
+msgstr ""
+
+#: ../pyhoca/wxgui/listdesktops.py:84
+msgid "Select one of the available desktop sessions on this server"
+msgstr ""
+
+#: ../pyhoca/wxgui/listdesktops.py:90
+msgid "View session only"
+msgstr ""
+
+#: ../pyhoca/wxgui/listdesktops.py:91
+msgid "Gain full access"
+msgstr ""
+
+#: ../pyhoca/wxgui/listdesktops.py:95
+msgid "Share Desktop"
+msgstr ""
+
+#: ../pyhoca/wxgui/listdesktops.py:98
+msgid "Refresh list"
+msgstr ""
+
+#: ../pyhoca/wxgui/menus_taskbar.py:76
msgid "Edit Profile"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:77
+#: ../pyhoca/wxgui/menus_taskbar.py:79
msgid "Use as Template for New Profile"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:78
+#: ../pyhoca/wxgui/menus_taskbar.py:81
+msgid "Export Profile"
+msgstr ""
+
+#: ../pyhoca/wxgui/menus_taskbar.py:82
msgid "Delete Profile"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:106
+#: ../pyhoca/wxgui/menus_taskbar.py:111
#, python-format
msgid "About %s (%s)..."
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:132
+#: ../pyhoca/wxgui/menus_taskbar.py:137
msgid "Manage Session Profile"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:141
+#: ../pyhoca/wxgui/menus_taskbar.py:146
msgid "Printing Preferences"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:147
+#: ../pyhoca/wxgui/menus_taskbar.py:152
msgid "Client Options"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:783
-#: ../pyhoca/wxgui/menus_taskbar.py:975
+#: ../pyhoca/wxgui/menus_taskbar.py:160 ../pyhoca/wxgui/menus_taskbar.py:828
+#: ../pyhoca/wxgui/menus_taskbar.py:1033
msgid "E&xit"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:227
+#: ../pyhoca/wxgui/menus_taskbar.py:232
msgid "Window title"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:233 ../pyhoca/wxgui/menus_taskbar.py:608
+#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:631
msgid "Resume Session"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:235
+#: ../pyhoca/wxgui/menus_taskbar.py:240
msgid "Resume Session (not possible)"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:246
+#: ../pyhoca/wxgui/menus_taskbar.py:251
msgid "Transfer Session"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:248
+#: ../pyhoca/wxgui/menus_taskbar.py:253
msgid "Transfer Session (not possible)"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:252 ../pyhoca/wxgui/menus_taskbar.py:599
+#: ../pyhoca/wxgui/menus_taskbar.py:258 ../pyhoca/wxgui/menus_taskbar.py:622
msgid "Suspend Session (and disconnect/exit)"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:254 ../pyhoca/wxgui/menus_taskbar.py:601
+#: ../pyhoca/wxgui/menus_taskbar.py:260 ../pyhoca/wxgui/menus_taskbar.py:624
msgid "Suspend Session (and disconnect)"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:256 ../pyhoca/wxgui/menus_taskbar.py:603
+#: ../pyhoca/wxgui/menus_taskbar.py:262 ../pyhoca/wxgui/menus_taskbar.py:626
msgid "Suspend Session"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:262 ../pyhoca/wxgui/menus_taskbar.py:612
+#: ../pyhoca/wxgui/menus_taskbar.py:268 ../pyhoca/wxgui/menus_taskbar.py:635
msgid "Terminate Session (and disconnect/exit)"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:264 ../pyhoca/wxgui/menus_taskbar.py:614
+#: ../pyhoca/wxgui/menus_taskbar.py:270 ../pyhoca/wxgui/menus_taskbar.py:637
msgid "Terminate Session (and disconnect)"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:266 ../pyhoca/wxgui/menus_taskbar.py:616
+#: ../pyhoca/wxgui/menus_taskbar.py:272 ../pyhoca/wxgui/menus_taskbar.py:639
msgid "Terminate Session"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:270 ../pyhoca/wxgui/menus_taskbar.py:596
-msgid "Refresh menu tree"
+#: ../pyhoca/wxgui/menus_taskbar.py:275
+msgid "End Desktop Sharing (and disconnect/exit)"
+msgstr ""
+
+#: ../pyhoca/wxgui/menus_taskbar.py:277
+msgid "End Desktop Sharing (and disconnect)"
msgstr ""
#: ../pyhoca/wxgui/menus_taskbar.py:279
+msgid "End Desktop Sharing"
+msgstr ""
+
+#: ../pyhoca/wxgui/menus_taskbar.py:283 ../pyhoca/wxgui/menus_taskbar.py:619
+msgid "Refresh menu tree"
+msgstr ""
+
+#: ../pyhoca/wxgui/menus_taskbar.py:292
msgid "Rename Session Window"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:280
+#: ../pyhoca/wxgui/menus_taskbar.py:293
msgid "Show Session Window"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:322
+#: ../pyhoca/wxgui/menus_taskbar.py:335
msgid "&Share custom local folder"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:337
+#: ../pyhoca/wxgui/menus_taskbar.py:350
msgid "Share:"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:346
+#: ../pyhoca/wxgui/menus_taskbar.py:359
msgid "Unshare:"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:354
+#: ../pyhoca/wxgui/menus_taskbar.py:367
msgid "Unshare &all local folders"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:360
+#: ../pyhoca/wxgui/menus_taskbar.py:373
msgid "Restore shares in next session"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:440
+#: ../pyhoca/wxgui/menus_taskbar.py:453
msgid "Multimedia"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:441
+#: ../pyhoca/wxgui/menus_taskbar.py:454
msgid "Development"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:442
+#: ../pyhoca/wxgui/menus_taskbar.py:455
msgid "Education"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:443
+#: ../pyhoca/wxgui/menus_taskbar.py:456
msgid "Games"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:444
+#: ../pyhoca/wxgui/menus_taskbar.py:457
msgid "Graphics"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:445
+#: ../pyhoca/wxgui/menus_taskbar.py:458
msgid "Internet"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:446
+#: ../pyhoca/wxgui/menus_taskbar.py:459
msgid "Office Applications"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:447
+#: ../pyhoca/wxgui/menus_taskbar.py:460
msgid "System"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:448
+#: ../pyhoca/wxgui/menus_taskbar.py:461
msgid "Utilities"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:449
+#: ../pyhoca/wxgui/menus_taskbar.py:462
msgid "Other Applications"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:521 ../pyhoca/wxgui/menus_taskbar.py:533
+#: ../pyhoca/wxgui/menus_taskbar.py:535 ../pyhoca/wxgui/menus_taskbar.py:547
#, python-format
msgid "Connect %s"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:527
+#: ../pyhoca/wxgui/menus_taskbar.py:541
msgid "Currently connecting..."
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:541
+#: ../pyhoca/wxgui/menus_taskbar.py:556
msgid "Start &new Desktop Session"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:546 ../pyhoca/wxgui/menus_taskbar.py:684
+#: ../pyhoca/wxgui/menus_taskbar.py:560 ../pyhoca/wxgui/menus_taskbar.py:660
+msgid "Start Desktop Sharing Session"
+msgstr ""
+
+#: ../pyhoca/wxgui/menus_taskbar.py:566 ../pyhoca/wxgui/menus_taskbar.py:710
msgid "Retrieving Application Menu..."
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:550 ../pyhoca/wxgui/menus_taskbar.py:687
+#: ../pyhoca/wxgui/menus_taskbar.py:570 ../pyhoca/wxgui/menus_taskbar.py:713
msgid "Retrieve Application Menu"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:553
+#: ../pyhoca/wxgui/menus_taskbar.py:573
+msgid "Start &new RDP Session"
+msgstr ""
+
+#: ../pyhoca/wxgui/menus_taskbar.py:576
msgid "Start &new Session"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:633
+#: ../pyhoca/wxgui/menus_taskbar.py:656
msgid "Launch Single Application"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:671
+#: ../pyhoca/wxgui/menus_taskbar.py:697
msgid "Manage Application Menu"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:714
+#: ../pyhoca/wxgui/menus_taskbar.py:752
msgid "Running"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:716
+#: ../pyhoca/wxgui/menus_taskbar.py:754
msgid "Suspended"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:735
+#: ../pyhoca/wxgui/menus_taskbar.py:773
msgid "&Clean all sessions"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:741
+#: ../pyhoca/wxgui/menus_taskbar.py:779
msgid "Customize &profile"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:756
+#: ../pyhoca/wxgui/menus_taskbar.py:794
msgid "Shared &folders"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:768
+#: ../pyhoca/wxgui/menus_taskbar.py:806
+msgid "Server Information"
+msgstr ""
+
+#: ../pyhoca/wxgui/menus_taskbar.py:813
msgid "&Disconnect from Server"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:775
+#: ../pyhoca/wxgui/menus_taskbar.py:820
msgid "Suspend Session and E&xit application"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:779
+#: ../pyhoca/wxgui/menus_taskbar.py:824
msgid "Disconnect and E&xit application"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:833
+#: ../pyhoca/wxgui/menus_taskbar.py:878
msgid "Add Profile"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:909
+#: ../pyhoca/wxgui/menus_taskbar.py:954
msgid "No session profiles defined"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:945
-msgid "Start/Resume Session"
+#: ../pyhoca/wxgui/menus_taskbar.py:965
+msgid "Export all Profiles"
+msgstr ""
+
+#: ../pyhoca/wxgui/menus_taskbar.py:967
+msgid "Export Profile Group"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:945
+#: ../pyhoca/wxgui/menus_taskbar.py:1003
msgid "Connect Server"
msgstr ""
@@ -947,61 +1008,61 @@ msgstr ""
msgid "About %s ..."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:459
+#: ../pyhoca/wxgui/frontend.py:465
msgid "Suspending sessions and exiting application..."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:462
+#: ../pyhoca/wxgui/frontend.py:468
#, python-format
msgid "Disconnecting %s and exiting application..."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:464
+#: ../pyhoca/wxgui/frontend.py:470
msgid "Exiting application..."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:562
+#: ../pyhoca/wxgui/frontend.py:568
#, python-format
msgid "%s - server warning"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:562
+#: ../pyhoca/wxgui/frontend.py:568
msgid "The X2Go Server does not publish an application menu."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:613
+#: ../pyhoca/wxgui/frontend.py:619
msgid "SSH key authentication has been successful."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:650
+#: ../pyhoca/wxgui/frontend.py:656
msgid ""
"The SSH proxy's host key is invalid or has not been accepted by the user"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:671
+#: ../pyhoca/wxgui/frontend.py:677
#, python-format
msgid "%s - EOF error"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:671
+#: ../pyhoca/wxgui/frontend.py:677
msgid "Authentication protocol communication incomplete! Try again..."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:678
+#: ../pyhoca/wxgui/frontend.py:684
#, python-format
msgid "%s - auth key error"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:699
+#: ../pyhoca/wxgui/frontend.py:705
msgid "An unknown error occurred during authentication!"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:728
+#: ../pyhoca/wxgui/frontend.py:734
#, python-format
msgid "%s: DirectRDP not supported yet"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:729
+#: ../pyhoca/wxgui/frontend.py:735
#, python-format
msgid ""
"We apologize for the inconvenience...\n"
@@ -1009,60 +1070,134 @@ msgid ""
"Session profiles of type ,,DirectRDP'' are not\n"
"supported by %s (%s), yet!!\n"
"\n"
-"DirectRDP support will be available in %s (>= 0.2.2.0)."
+"DirectRDP support will be available in %s (>= 1.0.0.0)."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:741
+#: ../pyhoca/wxgui/frontend.py:747
msgid "Unknown session profile, configure before using it..."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:1332
+#: ../pyhoca/wxgui/frontend.py:778
+#, python-format
+msgid "Desktop Sharing with %s not supported by server"
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:779
+#, python-format
+msgid ""
+"We apologize for the inconvenience...\n"
+"\n"
+"Session profiles of type ,,SHADOW'' are not\n"
+"supported by X2Go Server (v%s)!!!\n"
+"\n"
+"Desktop Sharing with %s requires\n"
+"X2Go Server 4.1.0.0 and above."
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:837 ../pyhoca/wxgui/frontend.py:1488
#, python-format
msgid "%s - session warning"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:798
+#: ../pyhoca/wxgui/frontend.py:837
#, python-format
msgid "Execution of command ,,%s'' failed."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:939
+#: ../pyhoca/wxgui/frontend.py:978
msgid "Cleaning X2Go sessions..."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:974
+#: ../pyhoca/wxgui/frontend.py:1026
#, python-format
msgid "%s - disconnect"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:974
+#: ../pyhoca/wxgui/frontend.py:1026
msgid "X2Go Profile is now disconnected."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:995
+#: ../pyhoca/wxgui/frontend.py:1047
msgid "New Session Profile"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1047
+#: ../pyhoca/wxgui/frontend.py:1102
#, python-format
msgid "Really Delete Session Profile ,,%s''?"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1053
+#: ../pyhoca/wxgui/frontend.py:1108
#, python-format
msgid "%s - profile deleted"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1053
+#: ../pyhoca/wxgui/frontend.py:1108
msgid "The session profile has been deleted."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1071
+#: ../pyhoca/wxgui/frontend.py:1137
+#, python-format
+msgid "%s - export session profiles"
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:1142
+#, python-format
+msgid "%s - export session profile"
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:1154
+#, python-format
+msgid "%s: Export file already exists"
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:1155
+#, python-format
+msgid ""
+"The file Âģ%sÂĢ already exists in this folder.\n"
+"\n"
+"Do you want to replace it?"
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:1176
+#, python-format
+msgid "%s - profiles exported"
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:1176
+#, python-format
+msgid "Successfully exported session profile group Âģ%sÂĢ to file Âģ%sÂĢ."
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:1178
+#, python-format
+msgid "%s - profile exported"
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:1178
+#, python-format
+msgid "Successfully exported single session profile Âģ%sÂĢ to file Âģ%sÂĢ."
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:1182
+#, python-format
+msgid "%s: Exporting session profile(s) failed"
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:1183
+#, python-format
+msgid ""
+"The selected session profile(s) could not be exported to the \n"
+"file Âģ%sÂĢ.\n"
+"\n"
+"Check for common problems (disk full, insufficient access, etc.)."
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:1202
#, python-format
msgid "%s - share local folder with sessions of this profile"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1224
+#: ../pyhoca/wxgui/frontend.py:1355
#, python-format
msgid ""
"The authenticity of host [%s]:%s can't be established.\n"
@@ -1071,148 +1206,169 @@ msgid ""
"Are you sure you want to continue connecting?"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1232
+#: ../pyhoca/wxgui/frontend.py:1363
#, python-format
msgid "%s: Confirm Host Authorization"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1277
+#: ../pyhoca/wxgui/frontend.py:1409
#, python-format
msgid "%s - channel error"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1277
+#: ../pyhoca/wxgui/frontend.py:1409
#, python-format
msgid ""
"Lost connection to server %s unexpectedly! Try to re-authenticate to the "
"server..."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1295 ../pyhoca/wxgui/frontend.py:1313
-#: ../pyhoca/wxgui/frontend.py:1315 ../pyhoca/wxgui/frontend.py:1351
+#: ../pyhoca/wxgui/frontend.py:1426 ../pyhoca/wxgui/frontend.py:1469
+#: ../pyhoca/wxgui/frontend.py:1471 ../pyhoca/wxgui/frontend.py:1507
#, python-format
msgid "%s - session failure"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1295
+#: ../pyhoca/wxgui/frontend.py:1426
msgid "The session startup failed."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1313
+#: ../pyhoca/wxgui/frontend.py:1439
+#, python-format
+msgid "%s - timeout"
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:1439
+msgid ""
+"The server took long to provide a list of sharable desktops.\n"
+"This can happen from time to time, please try again"
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:1451
+#, python-format
+msgid "%s - desktop sharing failed"
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:1451
+#, python-format
+msgid "The desktop %s is not available for sharing (anymore)."
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:1469
#, python-format
msgid "The command ,,%s'' is not available on X2Go server."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1315
+#: ../pyhoca/wxgui/frontend.py:1471
#, python-format
msgid ""
"The command ,,%s'' is not available on X2Go server\n"
"%s."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1332
+#: ../pyhoca/wxgui/frontend.py:1488
#, python-format
msgid ""
"Reverse TCP port forwarding request for session %s to server port %s has "
"been denied."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1351
+#: ../pyhoca/wxgui/frontend.py:1507
#, python-format
msgid ""
"Forwarding tunnel request to [%s]:%s for session %s was denied by remote "
-"X2go/SSH server. Session startup failed."
+"X2Go/SSH server. Session startup failed."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1370
+#: ../pyhoca/wxgui/frontend.py:1526
#, python-format
msgid "%s - audio warning"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1370
+#: ../pyhoca/wxgui/frontend.py:1526
msgid ""
"The X2Go PulseAudio system is not available within Remote Desktop sessions."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1377 ../pyhoca/wxgui/frontend.py:1384
+#: ../pyhoca/wxgui/frontend.py:1533 ../pyhoca/wxgui/frontend.py:1540
#, python-format
msgid "%s - audio error"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1377
+#: ../pyhoca/wxgui/frontend.py:1533
msgid "The X2Go PulseAudio system could not be started."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1384
+#: ../pyhoca/wxgui/frontend.py:1540
msgid "The X2Go PulseAudio system has died unexpectedly."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1396
+#: ../pyhoca/wxgui/frontend.py:1552
#, python-format
msgid "%s - audio problem"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1396
+#: ../pyhoca/wxgui/frontend.py:1552
#, python-format
msgid ""
"The audio connection could not be set up for this session.\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1408
+#: ../pyhoca/wxgui/frontend.py:1564
#, python-format
msgid "%s - client-side printing not available"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1408
+#: ../pyhoca/wxgui/frontend.py:1564
#, python-format
msgid ""
"The server denies client-side printing from within this session.\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1420
+#: ../pyhoca/wxgui/frontend.py:1576
#, python-format
msgid "%s - MIME box not available"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1420
+#: ../pyhoca/wxgui/frontend.py:1576
#, python-format
msgid ""
"The server does not support the X2Go MIME box.\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1432
+#: ../pyhoca/wxgui/frontend.py:1588
#, python-format
msgid "%s - client-side folders not sharable"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1432
+#: ../pyhoca/wxgui/frontend.py:1588
#, python-format
msgid ""
"The server denies client-side folder sharing with this session.\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1444
+#: ../pyhoca/wxgui/frontend.py:1600
#, python-format
msgid "%s - client resources not sharable"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1444
+#: ../pyhoca/wxgui/frontend.py:1600
#, python-format
msgid ""
"Client-side folders and printers cannot be shared with this session.\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1463 ../pyhoca/wxgui/frontend.py:1465
+#: ../pyhoca/wxgui/frontend.py:1619 ../pyhoca/wxgui/frontend.py:1621
#, python-format
msgid "%s - print error"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1463
+#: ../pyhoca/wxgui/frontend.py:1619
#, python-format
msgid ""
"%s\n"
@@ -1220,7 +1376,7 @@ msgid ""
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1465
+#: ../pyhoca/wxgui/frontend.py:1621
#, python-format
msgid ""
"%s\n"
@@ -1228,88 +1384,88 @@ msgid ""
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1480 ../pyhoca/wxgui/frontend.py:1495
+#: ../pyhoca/wxgui/frontend.py:1636 ../pyhoca/wxgui/frontend.py:1651
#, python-format
msgid "%s - start"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1480
+#: ../pyhoca/wxgui/frontend.py:1636
#, python-format
msgid ""
"New X2Go session starting up...\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1495
+#: ../pyhoca/wxgui/frontend.py:1651
#, python-format
msgid ""
"Another client started X2Go session\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1510 ../pyhoca/wxgui/frontend.py:1525
+#: ../pyhoca/wxgui/frontend.py:1666 ../pyhoca/wxgui/frontend.py:1681
#, python-format
msgid "%s - resume"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1510
+#: ../pyhoca/wxgui/frontend.py:1666
#, python-format
msgid ""
"Resuming X2Go session...\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1525
+#: ../pyhoca/wxgui/frontend.py:1681
#, python-format
msgid ""
"Another client resumed X2Go session\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1540
+#: ../pyhoca/wxgui/frontend.py:1696
#, python-format
msgid "%s - running"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1540
+#: ../pyhoca/wxgui/frontend.py:1696
#, python-format
msgid ""
"Found already running session\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1560
+#: ../pyhoca/wxgui/frontend.py:1716
#, python-format
msgid "%s - suspend"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1560
+#: ../pyhoca/wxgui/frontend.py:1716
#, python-format
msgid ""
"X2Go Session has been suspended\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1587
+#: ../pyhoca/wxgui/frontend.py:1743
#, python-format
msgid "%s - terminate"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1587
+#: ../pyhoca/wxgui/frontend.py:1743
#, python-format
msgid ""
"X2Go Session has terminated\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/messages.py:73
+#: ../pyhoca/wxgui/messages.py:72
#, python-format
msgid ""
"Are you really sure you want to\n"
"delete the session profile ,,%s''?"
msgstr ""
-#: ../pyhoca/wxgui/messages.py:74
+#: ../pyhoca/wxgui/messages.py:73
#, python-format
msgid ""
"PyHoca-GUI is already running for user ,,%s''!\n"
@@ -1319,15 +1475,15 @@ msgid ""
"notification area/systray."
msgstr ""
-#: ../pyhoca/wxgui/messages.py:107
+#: ../pyhoca/wxgui/messages.py:106
msgid "Yes"
msgstr ""
-#: ../pyhoca/wxgui/messages.py:108
+#: ../pyhoca/wxgui/messages.py:107
msgid "No"
msgstr ""
-#: ../pyhoca/wxgui/messages.py:125 ../pyhoca/wxgui/printingprefs.py:142
+#: ../pyhoca/wxgui/messages.py:124 ../pyhoca/wxgui/printingprefs.py:142
msgid "Ok"
msgstr ""
@@ -1393,10 +1549,6 @@ msgstr ""
msgid "Custom print command"
msgstr ""
-#: ../pyhoca/wxgui/printingprefs.py:143
-msgid "Apply"
-msgstr ""
-
#: ../pyhoca/wxgui/printingprefs.py:145
msgid "Print"
msgstr ""
@@ -1429,3 +1581,44 @@ msgstr ""
#: ../pyhoca/wxgui/sessiontitle.py:83
msgid "OK"
msgstr ""
+
+#: ../pyhoca/wxgui/serverinfo.py:76
+#, python-format
+msgid "Server Information - %s"
+msgstr ""
+
+#: ../pyhoca/wxgui/serverinfo.py:78
+#, python-format
+msgid ""
+"Session Profile: %s\n"
+"\n"
+"List of X2Go Server components, add-ons and their versions..."
+msgstr ""
+
+#: ../pyhoca/wxgui/serverinfo.py:83
+msgid "Refresh"
+msgstr ""
+
+#: ../pyhoca/wxgui/serverinfo.py:84
+msgid "Close"
+msgstr ""
+
+#: ../pyhoca/wxgui/serverinfo.py:153
+msgid "X2Go Server"
+msgstr ""
+
+#: ../pyhoca/wxgui/serverinfo.py:154
+msgid "Server Core"
+msgstr ""
+
+#: ../pyhoca/wxgui/serverinfo.py:162
+msgid "Server Extensions"
+msgstr ""
+
+#: ../pyhoca/wxgui/serverinfo.py:168
+msgid "X2Go Server Add-ons"
+msgstr ""
+
+#: ../pyhoca/wxgui/serverinfo.py:172
+msgid "X2Go Server Features"
+msgstr ""
diff --git a/po/da.po b/po/da.po
index ab9e1af..3ee4d24 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: PyHoca-GUI 0.2.0.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 14:25+0100\n"
-"PO-Revision-Date: 2012-12-07 13:16+0100\n"
+"POT-Creation-Date: 2013-01-29 22:21+0100\n"
+"PO-Revision-Date: 2013-01-29 16:38+0100\n"
"Last-Translator: Christoffer Krakou <christoffer(a)fleten.net>\n"
"Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n"
"Language: \n"
@@ -23,13 +23,11 @@ msgstr ""
msgid "%s (via %s)"
msgstr "%s (via %s)"
-#: ../pyhoca/wxgui/logon.py:90
-#: ../pyhoca/wxgui/logon.py:102
+#: ../pyhoca/wxgui/logon.py:90 ../pyhoca/wxgui/logon.py:102
msgid "Username"
msgstr "Brugernavn"
-#: ../pyhoca/wxgui/logon.py:92
-#: ../pyhoca/wxgui/logon.py:104
+#: ../pyhoca/wxgui/logon.py:92 ../pyhoca/wxgui/logon.py:104
msgid "Password"
msgstr "Kodeord"
@@ -38,8 +36,8 @@ msgid "Authenticate"
msgstr "AutentificÊr"
#: ../pyhoca/wxgui/logon.py:107
-msgid " Start SSH tunnel "
-msgstr " Start SSH tunnel"
+msgid "Start SSH tunnel"
+msgstr "Start SSH tunnel"
#: ../pyhoca/wxgui/logon.py:115
msgid "Session login"
@@ -49,28 +47,23 @@ msgstr "Sessionslogin"
msgid "SSH proxy server login"
msgstr "SSH proxy server login"
-#: ../pyhoca/wxgui/logon.py:127
-#: ../pyhoca/wxgui/profilemanager.py:350
-#: ../pyhoca/wxgui/messages.py:131
-#: ../pyhoca/wxgui/printingprefs.py:147
-#: ../pyhoca/wxgui/sessiontitle.py:85
+#: ../pyhoca/wxgui/logon.py:127 ../pyhoca/wxgui/profilemanager.py:373
+#: ../pyhoca/wxgui/listdesktops.py:99 ../pyhoca/wxgui/messages.py:130
+#: ../pyhoca/wxgui/printingprefs.py:147 ../pyhoca/wxgui/sessiontitle.py:85
msgid "Cancel"
msgstr "AnnullÊr"
-#: ../pyhoca/wxgui/logon.py:297
-#: ../pyhoca/wxgui/logon.py:339
-#: ../pyhoca/wxgui/frontend.py:606
+#: ../pyhoca/wxgui/logon.py:297 ../pyhoca/wxgui/logon.py:339
+#: ../pyhoca/wxgui/frontend.py:612
#, python-format
msgid "%s - connect failure"
msgstr "%s - forbindelsesfejl"
-#: ../pyhoca/wxgui/logon.py:298
-#: ../pyhoca/wxgui/frontend.py:606
+#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:612
msgid "User is not allowed to start X2Go sessions!"
msgstr "Bruger har ikke rettigheder til at starte X2Go sessioner!"
-#: ../pyhoca/wxgui/logon.py:303
-#: ../pyhoca/wxgui/frontend.py:613
+#: ../pyhoca/wxgui/logon.py:303 ../pyhoca/wxgui/frontend.py:619
#, python-format
msgid "%s - connect"
msgstr "%s - forbind"
@@ -96,32 +89,29 @@ msgstr "%s - SSH proxy"
msgid "Authentication to the SSH proxy server failed!"
msgstr "Autentificering mod SSH proxy server mislykkedes!"
-#: ../pyhoca/wxgui/logon.py:376
-#: ../pyhoca/wxgui/frontend.py:664
+#: ../pyhoca/wxgui/logon.py:376 ../pyhoca/wxgui/frontend.py:670
#, python-format
msgid "%s - socket error"
msgstr "%s - socket fejl"
-#: ../pyhoca/wxgui/logon.py:383
-#: ../pyhoca/wxgui/frontend.py:643
-#: ../pyhoca/wxgui/frontend.py:650
+#: ../pyhoca/wxgui/logon.py:383 ../pyhoca/wxgui/frontend.py:649
+#: ../pyhoca/wxgui/frontend.py:656
#, python-format
msgid "%s - host key error"
msgstr "%s - vÃĻrtsnøgle fejl"
-#: ../pyhoca/wxgui/logon.py:384
-#: ../pyhoca/wxgui/frontend.py:643
-msgid "The remote server's host key is invalid or has not been accepted by the user"
-msgstr "Fjernserverens vÃĻrtsnøgle er ugyldig eller blev ikke accepteret af brugeren"
+#: ../pyhoca/wxgui/logon.py:384 ../pyhoca/wxgui/frontend.py:649
+msgid ""
+"The remote server's host key is invalid or has not been accepted by the user"
+msgstr ""
+"Fjernserverens vÃĻrtsnøgle er ugyldig eller blev ikke accepteret af brugeren"
-#: ../pyhoca/wxgui/logon.py:391
-#: ../pyhoca/wxgui/frontend.py:685
+#: ../pyhoca/wxgui/logon.py:391 ../pyhoca/wxgui/frontend.py:691
#, python-format
msgid "%s - missing home directory"
msgstr "%s - manglende hjemmemappe"
-#: ../pyhoca/wxgui/logon.py:392
-#: ../pyhoca/wxgui/frontend.py:685
+#: ../pyhoca/wxgui/logon.py:392 ../pyhoca/wxgui/frontend.py:691
msgid "The remote user's home directory does not exist."
msgstr "Fjernbrugerens hjemmemappe eksisterer ikke"
@@ -130,14 +120,12 @@ msgstr "Fjernbrugerens hjemmemappe eksisterer ikke"
msgid "%s - key error"
msgstr "%s - nøglefejl"
-#: ../pyhoca/wxgui/logon.py:407
-#: ../pyhoca/wxgui/frontend.py:692
+#: ../pyhoca/wxgui/logon.py:407 ../pyhoca/wxgui/frontend.py:698
#, python-format
msgid "%s - auth error"
msgstr "%s - auth fejl"
-#: ../pyhoca/wxgui/logon.py:415
-#: ../pyhoca/wxgui/frontend.py:636
+#: ../pyhoca/wxgui/logon.py:415 ../pyhoca/wxgui/frontend.py:642
#, python-format
msgid "%s - SSH error"
msgstr "%s - SSH fejl"
@@ -163,10 +151,10 @@ msgstr ""
#: ../pyhoca/wxgui/taskbar.py:93
#, python-format
msgid ""
-"PyHoca-GUI (Python X2goClient)\n"
+"PyHoca-GUI (Python X2Go Client)\n"
"Currently connecting you to remote X2Go server ,,%s''"
msgstr ""
-"PyHoca-GUI (Python X2goClient)\n"
+"PyHoca-GUI (Python X2Go Client)\n"
"Forbinder dig til X2Go server ,,%s''"
#: ../pyhoca/wxgui/taskbar.py:103
@@ -179,10 +167,10 @@ msgstr ""
#: ../pyhoca/wxgui/taskbar.py:107
msgid ""
-"PyHoca-GUI (Python X2goClient)\n"
+"PyHoca-GUI (Python X2Go Client)\n"
"Client for connecting you to a remote X2Go server"
msgstr ""
-"PyHoca-GUI (Python X2goClient)\n"
+"PyHoca-GUI (Python X2Go Client)\n"
"Klient til at forbinde dig til en X2Go server"
#: ../pyhoca/wxgui/profilemanager.py:79
@@ -218,829 +206,872 @@ msgid "Single Application"
msgstr "Enkelt Applikation"
#: ../pyhoca/wxgui/profilemanager.py:87
+msgid "Share desktop session (SHADOW)"
+msgstr "Del skrivebords session (SHADOW)"
+
+#: ../pyhoca/wxgui/profilemanager.py:88
msgid "XDMCP Query"
msgstr "XDMCP Forespørgsel"
-#: ../pyhoca/wxgui/profilemanager.py:88
+#: ../pyhoca/wxgui/profilemanager.py:89
msgid "Windows Terminal Server (X2Go-proxied RDP)"
msgstr "Windows Terminal Server (RDP igennem X2Go-proxy)"
-#: ../pyhoca/wxgui/profilemanager.py:89
+#: ../pyhoca/wxgui/profilemanager.py:90
msgid "Windows Terminal Server (Direct RDP)"
msgstr "Windows Terminal Server (Direkte RDP)"
-#: ../pyhoca/wxgui/profilemanager.py:90
-#: ../pyhoca/wxgui/profilemanager.py:224
+#: ../pyhoca/wxgui/profilemanager.py:91 ../pyhoca/wxgui/profilemanager.py:243
msgid "Custom command"
msgstr "Tilpasset kommando"
-#: ../pyhoca/wxgui/profilemanager.py:95
-#: ../pyhoca/wxgui/menus_taskbar.py:393
+#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:406
msgid "Internet Browser"
msgstr "Internet Browser"
-#: ../pyhoca/wxgui/profilemanager.py:96
-#: ../pyhoca/wxgui/menus_taskbar.py:394
+#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:407
msgid "Email Client"
msgstr "Email Klient"
-#: ../pyhoca/wxgui/profilemanager.py:97
-#: ../pyhoca/wxgui/menus_taskbar.py:395
+#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:408
msgid "Office"
msgstr "Kontorsoftware"
-#: ../pyhoca/wxgui/profilemanager.py:98
-#: ../pyhoca/wxgui/menus_taskbar.py:396
+#: ../pyhoca/wxgui/profilemanager.py:99 ../pyhoca/wxgui/menus_taskbar.py:409
msgid "Terminal"
msgstr "Terminal"
-#: ../pyhoca/wxgui/profilemanager.py:116
+#: ../pyhoca/wxgui/profilemanager.py:117
msgid "Open file with system's default application"
msgstr "Ã
ben fil med systemets standard-applikation"
-#: ../pyhoca/wxgui/profilemanager.py:117
+#: ../pyhoca/wxgui/profilemanager.py:118
msgid "Open application chooser dialog"
msgstr "Ã
ben applikationsvÃĻlger"
-#: ../pyhoca/wxgui/profilemanager.py:118
+#: ../pyhoca/wxgui/profilemanager.py:119
msgid "Save incoming file as ..."
msgstr "Gem indkommende fil som ..."
-#: ../pyhoca/wxgui/profilemanager.py:146
+#: ../pyhoca/wxgui/profilemanager.py:147
msgid "settings derived from "
msgstr "indstillinger taget fra"
#. boxes for all tabs
-#: ../pyhoca/wxgui/profilemanager.py:167
+#: ../pyhoca/wxgui/profilemanager.py:186
msgid "Session Title"
msgstr "Sesstionstitel"
-#: ../pyhoca/wxgui/profilemanager.py:168
+#: ../pyhoca/wxgui/profilemanager.py:187
msgid "Session Window"
msgstr "Sessionsvindue"
-#: ../pyhoca/wxgui/profilemanager.py:169
+#: ../pyhoca/wxgui/profilemanager.py:188
msgid "Session Startup"
msgstr "Sessionsstart"
-#: ../pyhoca/wxgui/profilemanager.py:170
+#: ../pyhoca/wxgui/profilemanager.py:189
msgid "Server"
msgstr "Server"
-#: ../pyhoca/wxgui/profilemanager.py:171
+#: ../pyhoca/wxgui/profilemanager.py:190
msgid "Proxy"
msgstr "Proxy"
-#: ../pyhoca/wxgui/profilemanager.py:172
+#: ../pyhoca/wxgui/profilemanager.py:191
msgid "Connection Link Speed"
msgstr "Forbindelseshastighed"
-#: ../pyhoca/wxgui/profilemanager.py:173
+#: ../pyhoca/wxgui/profilemanager.py:192
msgid "Compression"
msgstr "Komprimering"
-#: ../pyhoca/wxgui/profilemanager.py:174
+#: ../pyhoca/wxgui/profilemanager.py:193
msgid "Display"
msgstr "Display"
-#: ../pyhoca/wxgui/profilemanager.py:175
+#: ../pyhoca/wxgui/profilemanager.py:194
msgid "Keyboard"
msgstr "Tastatur"
-#: ../pyhoca/wxgui/profilemanager.py:176
+#: ../pyhoca/wxgui/profilemanager.py:195
msgid "Sound"
msgstr "Lyd"
-#: ../pyhoca/wxgui/profilemanager.py:177
+#: ../pyhoca/wxgui/profilemanager.py:196
msgid "Printing"
msgstr "Udskrift"
-#: ../pyhoca/wxgui/profilemanager.py:178
+#: ../pyhoca/wxgui/profilemanager.py:197
msgid "Folder Exports"
msgstr "Mappeeksporteringer"
-#: ../pyhoca/wxgui/profilemanager.py:179
+#: ../pyhoca/wxgui/profilemanager.py:198
msgid "File Import"
msgstr "Filimporteringer"
#. ##
#. ## widgets for the PROFILE tab
#. ##
-#: ../pyhoca/wxgui/profilemanager.py:184
+#: ../pyhoca/wxgui/profilemanager.py:203
msgid "Name"
msgstr "Navn"
-#: ../pyhoca/wxgui/profilemanager.py:191
+#: ../pyhoca/wxgui/profilemanager.py:210
msgid "Set session window title"
msgstr "Indstil sessionsvinduets titel"
-#: ../pyhoca/wxgui/profilemanager.py:192
+#: ../pyhoca/wxgui/profilemanager.py:211
msgid "Use a default session window title"
msgstr "Brug standardtitel til sessionsvindue"
-#: ../pyhoca/wxgui/profilemanager.py:193
+#: ../pyhoca/wxgui/profilemanager.py:212
msgid "Custom session window title"
msgstr "Tilpasset titel til sessionsvindue"
-#: ../pyhoca/wxgui/profilemanager.py:212
+#: ../pyhoca/wxgui/profilemanager.py:231
msgid "Window Icon"
msgstr "Vinduesikon"
#. ##
#. ## widgets for the SESSION tab
#. ##
-#: ../pyhoca/wxgui/profilemanager.py:218
+#: ../pyhoca/wxgui/profilemanager.py:237
msgid "Start session automatically after login"
msgstr "Start session automatisk efter login"
-#: ../pyhoca/wxgui/profilemanager.py:219
+#: ../pyhoca/wxgui/profilemanager.py:238
#, python-format
-msgid "Login automatically after %s has started"
-msgstr "Log ind automatisk efter at %s er startet"
+msgid "Login automatically after %s has started (needs --auto-connect)"
+msgstr "Log ind automatisk efter at %s er startet (skal bruge --auto-connect)"
-#: ../pyhoca/wxgui/profilemanager.py:220
+#: ../pyhoca/wxgui/profilemanager.py:239
msgid "Type"
msgstr "Type"
-#: ../pyhoca/wxgui/profilemanager.py:222
+#: ../pyhoca/wxgui/profilemanager.py:241
msgid "Application"
msgstr "Applikation"
-#: ../pyhoca/wxgui/profilemanager.py:226
+#: ../pyhoca/wxgui/profilemanager.py:245
msgid "XDMCP server"
msgstr "XDMCP server"
-#: ../pyhoca/wxgui/profilemanager.py:228
+#: ../pyhoca/wxgui/profilemanager.py:247
msgid "RDP server"
msgstr "RDP server"
-#: ../pyhoca/wxgui/profilemanager.py:230
+#: ../pyhoca/wxgui/profilemanager.py:249
msgid "RDP options"
msgstr "RDP indstillinger"
-#: ../pyhoca/wxgui/profilemanager.py:232
+#: ../pyhoca/wxgui/profilemanager.py:251
msgid "Integrate remote application(s) into local desktop (rootless mode)"
msgstr "IntegrÊr fjernapplikationer med lokalt skrivebord (rootless mode)"
-#: ../pyhoca/wxgui/profilemanager.py:233
+#: ../pyhoca/wxgui/profilemanager.py:252
msgid "Menu of published applications"
msgstr "Menu med udgivne applikationer"
#. ##
#. ## widgets for the CONNECTION tab
#. ##
-#: ../pyhoca/wxgui/profilemanager.py:240
-#: ../pyhoca/wxgui/profilemanager.py:253
+#: ../pyhoca/wxgui/profilemanager.py:259 ../pyhoca/wxgui/profilemanager.py:273
msgid "User"
msgstr "Bruger"
-#: ../pyhoca/wxgui/profilemanager.py:242
-#: ../pyhoca/wxgui/profilemanager.py:260
+#: ../pyhoca/wxgui/profilemanager.py:261 ../pyhoca/wxgui/profilemanager.py:280
msgid "Host"
msgstr "Host"
-#: ../pyhoca/wxgui/profilemanager.py:244
-#: ../pyhoca/wxgui/profilemanager.py:262
+#: ../pyhoca/wxgui/profilemanager.py:263 ../pyhoca/wxgui/profilemanager.py:282
msgid "Port"
msgstr "Port"
-#: ../pyhoca/wxgui/profilemanager.py:246
+#: ../pyhoca/wxgui/profilemanager.py:265
msgid "Key"
msgstr "Nøgle"
-#: ../pyhoca/wxgui/profilemanager.py:249
+#: ../pyhoca/wxgui/profilemanager.py:268
msgid "Discover SSH keys or use SSH agent for X2Go authentication"
msgstr "Opdag SSH nøgler eller brug SSH agent til X2Go autentificering"
-#: ../pyhoca/wxgui/profilemanager.py:251
+#: ../pyhoca/wxgui/profilemanager.py:270
msgid "Enable forwarding of SSH authentication agent connections"
msgstr "Aktiver forwarding af SSH autentificeringsagentens forbindelser"
-#: ../pyhoca/wxgui/profilemanager.py:252
+#: ../pyhoca/wxgui/profilemanager.py:271
+msgid "Store SSH host keys under (unique) X2Go session profile ID"
+msgstr "Gem SSH vÃĻrtsnøgle under (unik) X2Go sessionsprofil's ID"
+
+#: ../pyhoca/wxgui/profilemanager.py:272
msgid "Server behind SSH proxy"
msgstr "Server bag SSH proxy"
-#: ../pyhoca/wxgui/profilemanager.py:255
+#: ../pyhoca/wxgui/profilemanager.py:275
msgid "Use same username for X2Go and proxy host"
msgstr "Brug samme brugernavn til X2Go og proxy host"
-#: ../pyhoca/wxgui/profilemanager.py:256
+#: ../pyhoca/wxgui/profilemanager.py:276
msgid "Use same authentication for X2Go and proxy host"
msgstr "Brug samme autentificering til X2Go og proxy host"
-#: ../pyhoca/wxgui/profilemanager.py:257
+#: ../pyhoca/wxgui/profilemanager.py:277
msgid "Key file"
msgstr "Nøglefil"
-#: ../pyhoca/wxgui/profilemanager.py:264
-msgid "SSH Proxy Tunnel"
-msgstr "SSH Proxy Tunnel"
-
-#: ../pyhoca/wxgui/profilemanager.py:270
+#: ../pyhoca/wxgui/profilemanager.py:284
msgid "Discover SSH keys or use SSH agent for proxy authentication"
msgstr "Opdag SSH nøgler eller brug SSH agent til proxyauthentificering "
-#: ../pyhoca/wxgui/profilemanager.py:273
+#: ../pyhoca/wxgui/profilemanager.py:287
msgid "Modem"
msgstr "Modem"
-#: ../pyhoca/wxgui/profilemanager.py:274
+#: ../pyhoca/wxgui/profilemanager.py:288
msgid "ISDN"
msgstr "ISDN"
-#: ../pyhoca/wxgui/profilemanager.py:275
+#: ../pyhoca/wxgui/profilemanager.py:289
msgid "ADSL"
msgstr "ADSL"
-#: ../pyhoca/wxgui/profilemanager.py:276
+#: ../pyhoca/wxgui/profilemanager.py:290
msgid "WAN"
msgstr "WAN"
-#: ../pyhoca/wxgui/profilemanager.py:277
+#: ../pyhoca/wxgui/profilemanager.py:291
msgid "LAN"
msgstr "LAN"
-#: ../pyhoca/wxgui/profilemanager.py:279
+#: ../pyhoca/wxgui/profilemanager.py:293
msgid "Method"
msgstr "Metode"
-#: ../pyhoca/wxgui/profilemanager.py:281
+#: ../pyhoca/wxgui/profilemanager.py:295
msgid "Image quality"
msgstr "Billedkvalitet"
#. ##
-#. ## wigdets for the SETTINGS tab
+#. ## wigdets for the IO tab
#. ##
-#: ../pyhoca/wxgui/profilemanager.py:287
+#: ../pyhoca/wxgui/profilemanager.py:301
msgid "Fullscreen"
msgstr "FuldskÃĻrm"
-#: ../pyhoca/wxgui/profilemanager.py:288
+#: ../pyhoca/wxgui/profilemanager.py:302
msgid "Maximized"
msgstr "Maximeret"
-#: ../pyhoca/wxgui/profilemanager.py:289
+#: ../pyhoca/wxgui/profilemanager.py:303
msgid "Custom Size"
msgstr "TIlpasset størrelse"
-#: ../pyhoca/wxgui/profilemanager.py:294
+#: ../pyhoca/wxgui/profilemanager.py:308
msgid "Set display DPI"
msgstr "Indstil display-DPI"
-#: ../pyhoca/wxgui/profilemanager.py:296
+#: ../pyhoca/wxgui/profilemanager.py:310
msgid "Do not set (use server-side tools to configure the keyboard)"
-msgstr "Indstil ikke (brug server-side vÃĻrktøjer til at konfigurere tastaturet)"
+msgstr ""
+"Indstil ikke (brug server-side vÃĻrktøjer til at konfigurere tastaturet)"
-#: ../pyhoca/wxgui/profilemanager.py:297
-msgid "Automatically detect and use client-side keyboard configuration inside the session"
+#: ../pyhoca/wxgui/profilemanager.py:311
+msgid ""
+"Automatically detect and use client-side keyboard configuration inside the "
+"session"
msgstr "Indstil automatisk tastaturet under sessionen"
-#: ../pyhoca/wxgui/profilemanager.py:298
+#: ../pyhoca/wxgui/profilemanager.py:312
msgid "Use custom keyboard settings as provided below"
msgstr "Brug tilpasset tastaturindstillinger som vist nedenfor"
-#: ../pyhoca/wxgui/profilemanager.py:299
+#: ../pyhoca/wxgui/profilemanager.py:313
msgid "Keyboard model"
msgstr "Tastaturmodel"
-#: ../pyhoca/wxgui/profilemanager.py:301
+#: ../pyhoca/wxgui/profilemanager.py:315
msgid "Layout"
msgstr "Layout"
-#: ../pyhoca/wxgui/profilemanager.py:303
+#: ../pyhoca/wxgui/profilemanager.py:317
msgid "Layout variant"
msgstr "Layoutvariant"
-#: ../pyhoca/wxgui/profilemanager.py:305
+#. ##
+#. ## wigdets for the MEDIA tab
+#. ##
+#: ../pyhoca/wxgui/profilemanager.py:323
msgid "Enable sound support"
msgstr "Aktiver lyd"
-#: ../pyhoca/wxgui/profilemanager.py:306
+#: ../pyhoca/wxgui/profilemanager.py:324
msgid "Pulse Audio"
msgstr "Pulse Audio"
#. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated.
#. However, config files can contain an Arts configuration, so we will honour this
-#: ../pyhoca/wxgui/profilemanager.py:310
+#: ../pyhoca/wxgui/profilemanager.py:328
msgid "Arts (not supported)"
msgstr "Arts (ikke understøttet)"
-#: ../pyhoca/wxgui/profilemanager.py:313
+#: ../pyhoca/wxgui/profilemanager.py:331
msgid "esd"
msgstr "esd"
-#: ../pyhoca/wxgui/profilemanager.py:314
+#: ../pyhoca/wxgui/profilemanager.py:332
msgid "Use default sound port"
msgstr "Brug standardport til lyd"
-#: ../pyhoca/wxgui/profilemanager.py:315
+#: ../pyhoca/wxgui/profilemanager.py:333
msgid "Custom sound port"
msgstr "Tilpasset lydport"
-#: ../pyhoca/wxgui/profilemanager.py:318
+#: ../pyhoca/wxgui/profilemanager.py:336
+msgid "Client Side printing"
+msgstr "Klient udskrift"
+
+#. ##
+#. ## wigdets for the SHARING tab
+#. ##
+#: ../pyhoca/wxgui/profilemanager.py:342
msgid "Use local folder sharing"
msgstr "Brug lokal mappedeling"
-#: ../pyhoca/wxgui/profilemanager.py:319
+#: ../pyhoca/wxgui/profilemanager.py:343
msgid "Store share list at end of session"
msgstr "Gem delemappeliste nÃĨr sessionen slutter"
-#: ../pyhoca/wxgui/profilemanager.py:320
+#: ../pyhoca/wxgui/profilemanager.py:344
msgid "Path"
msgstr "Sti"
-#: ../pyhoca/wxgui/profilemanager.py:323
-#: ../pyhoca/wxgui/profilemanager.py:344
+#: ../pyhoca/wxgui/profilemanager.py:347 ../pyhoca/wxgui/profilemanager.py:366
msgid "Add"
msgstr "Tilføj"
-#: ../pyhoca/wxgui/profilemanager.py:325
+#: ../pyhoca/wxgui/profilemanager.py:349
msgid "Local Path"
msgstr "Local Sti"
-#: ../pyhoca/wxgui/profilemanager.py:326
+#: ../pyhoca/wxgui/profilemanager.py:350
msgid "Connect Method"
msgstr "Forbindelsesmetode"
-#: ../pyhoca/wxgui/profilemanager.py:327
+#: ../pyhoca/wxgui/profilemanager.py:351
msgid "Delete"
msgstr "Slet"
-#: ../pyhoca/wxgui/profilemanager.py:329
+#: ../pyhoca/wxgui/profilemanager.py:353
msgid "Convert between client and server encodings"
msgstr "Konverter encoding mellem klient og server"
-#: ../pyhoca/wxgui/profilemanager.py:330
+#: ../pyhoca/wxgui/profilemanager.py:354
msgid "Client encoding"
msgstr "Klient encoding"
-#: ../pyhoca/wxgui/profilemanager.py:332
+#: ../pyhoca/wxgui/profilemanager.py:356
msgid "Server encoding"
msgstr "Server encoding"
-#: ../pyhoca/wxgui/profilemanager.py:335
+#: ../pyhoca/wxgui/profilemanager.py:359
msgid "Use file MIME box for local file import"
msgstr "Brug fil MIME box til lokal filimportering"
-#: ../pyhoca/wxgui/profilemanager.py:336
+#: ../pyhoca/wxgui/profilemanager.py:360
msgid "Extensions"
msgstr "Udvidelser"
-#: ../pyhoca/wxgui/profilemanager.py:338
+#: ../pyhoca/wxgui/profilemanager.py:362
msgid "Action"
msgstr "Handling"
-#: ../pyhoca/wxgui/profilemanager.py:341
-msgid "Client Side printing"
-msgstr "Klient udskrift"
-
-#: ../pyhoca/wxgui/profilemanager.py:345
+#: ../pyhoca/wxgui/profilemanager.py:367
msgid "Defaults"
msgstr "Standard"
-#: ../pyhoca/wxgui/profilemanager.py:347
+#: ../pyhoca/wxgui/profilemanager.py:369
msgid "Save"
msgstr "Gem"
-#: ../pyhoca/wxgui/profilemanager.py:348
+#: ../pyhoca/wxgui/profilemanager.py:370
msgid "Reset"
msgstr "Nulstil"
-#: ../pyhoca/wxgui/profilemanager.py:401
-#: ../pyhoca/wxgui/profilemanager.py:1124
-#: ../pyhoca/wxgui/profilemanager.py:2268
+#: ../pyhoca/wxgui/profilemanager.py:372 ../pyhoca/wxgui/printingprefs.py:143
+msgid "Apply"
+msgstr "Anvend"
+
+#: ../pyhoca/wxgui/profilemanager.py:423
+#: ../pyhoca/wxgui/profilemanager.py:1135
+#: ../pyhoca/wxgui/profilemanager.py:2303
msgid "automatically"
msgstr "automatisk"
-#: ../pyhoca/wxgui/profilemanager.py:403
-#: ../pyhoca/wxgui/profilemanager.py:1126
+#: ../pyhoca/wxgui/profilemanager.py:425
+#: ../pyhoca/wxgui/profilemanager.py:1137
msgid "manually"
msgstr "manuelt"
-#: ../pyhoca/wxgui/profilemanager.py:412
+#: ../pyhoca/wxgui/profilemanager.py:434
msgid "PyHoca-GUI Profile Manager - new profile"
msgstr "PyHoca-Gui Profilmanager - ny profil"
-#: ../pyhoca/wxgui/profilemanager.py:414
+#: ../pyhoca/wxgui/profilemanager.py:436
#, python-format
msgid "PyHoca-GUI Profile Manager - %s (connected)"
msgstr "PyHoca-GUI Profilmanager - %s (forbundet)"
-#: ../pyhoca/wxgui/profilemanager.py:416
+#: ../pyhoca/wxgui/profilemanager.py:438
#, python-format
msgid "PyHoca-GUI Profile Manager - %s"
msgstr "PyHoca-GUI Profilmanager - %s"
-#: ../pyhoca/wxgui/profilemanager.py:797
+#: ../pyhoca/wxgui/profilemanager.py:804
msgid "Profile"
msgstr "Profil"
-#: ../pyhoca/wxgui/profilemanager.py:798
+#: ../pyhoca/wxgui/profilemanager.py:805
msgid "Session"
msgstr "Session"
-#: ../pyhoca/wxgui/profilemanager.py:799
+#: ../pyhoca/wxgui/profilemanager.py:806
msgid "Connection"
msgstr "Forbindelse"
-#: ../pyhoca/wxgui/profilemanager.py:800
+#: ../pyhoca/wxgui/profilemanager.py:807
msgid "Link Quality"
msgstr "Link Kvalitet"
-#: ../pyhoca/wxgui/profilemanager.py:801
-msgid "Settings"
-msgstr "Indstillinger"
+#: ../pyhoca/wxgui/profilemanager.py:808
+msgid "Input/Output"
+msgstr "Input/Output"
+
+#: ../pyhoca/wxgui/profilemanager.py:809
+msgid "Media"
+msgstr "Medie"
-#: ../pyhoca/wxgui/profilemanager.py:802
+#: ../pyhoca/wxgui/profilemanager.py:810
msgid "Sharing"
msgstr "Deling"
-#: ../pyhoca/wxgui/profilemanager.py:988
+#: ../pyhoca/wxgui/profilemanager.py:989
msgid "<xkbtype>"
msgstr "<xkbtype>"
-#: ../pyhoca/wxgui/profilemanager.py:989
+#: ../pyhoca/wxgui/profilemanager.py:990
msgid "<xkblayout>"
msgstr "<xkblayout>"
-#: ../pyhoca/wxgui/profilemanager.py:990
+#: ../pyhoca/wxgui/profilemanager.py:991
msgid "<xkbvariant>"
msgstr "<xkbvariant>"
-#: ../pyhoca/wxgui/profilemanager.py:1444
+#: ../pyhoca/wxgui/profilemanager.py:1449
msgid "Icon Files (*.png)|*.png|All files (*.*)|*"
msgstr "Ikonfiler (*.png)|*.png|Alle filer (*.*)|*"
-#: ../pyhoca/wxgui/profilemanager.py:1447
+#: ../pyhoca/wxgui/profilemanager.py:1452
msgid "Choose an icon for this session profile"
msgstr "VÃĻlg et ikon til denne sessionsprofil"
-#: ../pyhoca/wxgui/profilemanager.py:1816
+#: ../pyhoca/wxgui/profilemanager.py:1895
msgid "All files (*.*)|*"
msgstr "Alle Filer (*.*)|*"
-#: ../pyhoca/wxgui/profilemanager.py:1818
-#: ../pyhoca/wxgui/profilemanager.py:1842
+#: ../pyhoca/wxgui/profilemanager.py:1897
+#: ../pyhoca/wxgui/profilemanager.py:1921
msgid "Choose a public SSH key"
msgstr "VÃĻlg offentlig SSH nøgle"
-#: ../pyhoca/wxgui/profilemanager.py:2220
+#: ../pyhoca/wxgui/profilemanager.py:2255
msgid "Choose a folder to share within a session"
msgstr "VÃĻlg en mappe som skal deles i en session"
-#: ../pyhoca/wxgui/profilemanager.py:2348
-#: ../pyhoca/wxgui/profilemanager.py:2351
-#: ../pyhoca/wxgui/profilemanager.py:2354
-#: ../pyhoca/wxgui/profilemanager.py:2359
-#: ../pyhoca/wxgui/profilemanager.py:2369
-#: ../pyhoca/wxgui/menus_taskbar.py:117
+#: ../pyhoca/wxgui/profilemanager.py:2383
+#: ../pyhoca/wxgui/profilemanager.py:2386
+#: ../pyhoca/wxgui/profilemanager.py:2389 ../pyhoca/wxgui/menus_taskbar.py:122
msgid "Profile Manager"
msgstr "Profilmanager"
-#: ../pyhoca/wxgui/profilemanager.py:2348
+#: ../pyhoca/wxgui/profilemanager.py:2383
msgid "Profile name is missing, profile unusable!!!"
msgstr "Profilnavnet mangler, profilen er ubrugelig!"
-#: ../pyhoca/wxgui/profilemanager.py:2351
-#: ../pyhoca/wxgui/profilemanager.py:2354
+#: ../pyhoca/wxgui/profilemanager.py:2386
+#: ../pyhoca/wxgui/profilemanager.py:2389
#, python-format
msgid "Profile name %s already exists!!!"
msgstr "Profilnavnet %s eksisterer i forvejen"
-#: ../pyhoca/wxgui/profilemanager.py:2359
-msgid "The SSH proxy configuration is incomplete. Try again."
-msgstr "SSH proxy konfigurationen er ikke komplet. Prøv igen"
-
-#: ../pyhoca/wxgui/profilemanager.py:2369
-#, python-format
-msgid ""
-"Another session profile (%s) already uses [%s]:%s for binding a local SSH proxy to.\n"
-"Please change the SSH proxy settings accordingly."
-msgstr ""
-"En anden sessionsprofil (%s) bruger i forvejen [%s]:%s til at binde en lokal proxy.\n"
-"Tilpas venligst SSH proxy indstillingerne."
-
-#: ../pyhoca/wxgui/profilemanager.py:2396
+#: ../pyhoca/wxgui/profilemanager.py:2416
#, python-format
msgid "%s - profile added"
msgstr "%s - profil tilføjet"
-#: ../pyhoca/wxgui/profilemanager.py:2397
+#: ../pyhoca/wxgui/profilemanager.py:2417
msgid "A new session profile has been added."
msgstr "A ny sessionsprofil er blevet tilføjet"
-#: ../pyhoca/wxgui/profilemanager.py:2401
+#: ../pyhoca/wxgui/profilemanager.py:2421
#, python-format
msgid "%s - modified"
msgstr "%s - modificeret"
-#: ../pyhoca/wxgui/profilemanager.py:2402
+#: ../pyhoca/wxgui/profilemanager.py:2422
msgid "Changes to profile have been saved."
msgstr "Ãndringerne i profilen er blevet gemt"
-#: ../pyhoca/wxgui/menus_taskbar.py:74
+#: ../pyhoca/wxgui/listdesktops.py:82
+#, python-format
+msgid "Share Desktop Session - %s"
+msgstr "Del Desktop session - %s"
+
+#: ../pyhoca/wxgui/listdesktops.py:84
+msgid "Select one of the available desktop sessions on this server"
+msgstr "VÃĻlg en af de tilgÃĻngelige skrivebordssessioner pÃĨ denne server"
+
+#: ../pyhoca/wxgui/listdesktops.py:90
+msgid "View session only"
+msgstr "Observer session"
+
+#: ../pyhoca/wxgui/listdesktops.py:91
+msgid "Gain full access"
+msgstr "Erhverv fuld adgang"
+
+#: ../pyhoca/wxgui/listdesktops.py:95
+msgid "Share Desktop"
+msgstr "Del skrivebord"
+
+#: ../pyhoca/wxgui/listdesktops.py:98
+msgid "Refresh list"
+msgstr "Opfrisk liste"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:76
msgid "Edit Profile"
msgstr "Rediger Profil"
-#: ../pyhoca/wxgui/menus_taskbar.py:77
+#: ../pyhoca/wxgui/menus_taskbar.py:79
msgid "Use as Template for New Profile"
msgstr "Brug som Skabelon til Ny Profil"
-#: ../pyhoca/wxgui/menus_taskbar.py:78
+#: ../pyhoca/wxgui/menus_taskbar.py:81
+msgid "Export Profile"
+msgstr "Eksporter Profil"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:82
msgid "Delete Profile"
msgstr "Slet Profil"
-#: ../pyhoca/wxgui/menus_taskbar.py:106
+#: ../pyhoca/wxgui/menus_taskbar.py:111
#, python-format
msgid "About %s (%s)..."
msgstr "Om %s (%s)"
-#: ../pyhoca/wxgui/menus_taskbar.py:132
+#: ../pyhoca/wxgui/menus_taskbar.py:137
msgid "Manage Session Profile"
msgstr "HÃĨndter Sessionsprofil"
-#: ../pyhoca/wxgui/menus_taskbar.py:141
+#: ../pyhoca/wxgui/menus_taskbar.py:146
msgid "Printing Preferences"
msgstr "Printerindstillinger"
-#: ../pyhoca/wxgui/menus_taskbar.py:147
+#: ../pyhoca/wxgui/menus_taskbar.py:152
msgid "Client Options"
msgstr "Klientparamentre"
-#: ../pyhoca/wxgui/menus_taskbar.py:155
-#: ../pyhoca/wxgui/menus_taskbar.py:783
-#: ../pyhoca/wxgui/menus_taskbar.py:975
+#: ../pyhoca/wxgui/menus_taskbar.py:160 ../pyhoca/wxgui/menus_taskbar.py:828
+#: ../pyhoca/wxgui/menus_taskbar.py:1033
msgid "E&xit"
msgstr "E&xit"
-#: ../pyhoca/wxgui/menus_taskbar.py:227
+#: ../pyhoca/wxgui/menus_taskbar.py:232
msgid "Window title"
msgstr "Vinduestitel"
-#: ../pyhoca/wxgui/menus_taskbar.py:233
-#: ../pyhoca/wxgui/menus_taskbar.py:608
+#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:631
msgid "Resume Session"
msgstr "FortsÃĻt Session"
-#: ../pyhoca/wxgui/menus_taskbar.py:235
+#: ../pyhoca/wxgui/menus_taskbar.py:240
msgid "Resume Session (not possible)"
msgstr "FortsÃĻt Session (ikke muligt)"
-#: ../pyhoca/wxgui/menus_taskbar.py:246
+#: ../pyhoca/wxgui/menus_taskbar.py:251
msgid "Transfer Session"
msgstr "Overfør Session"
-#: ../pyhoca/wxgui/menus_taskbar.py:248
+#: ../pyhoca/wxgui/menus_taskbar.py:253
msgid "Transfer Session (not possible)"
msgstr "Overfør Session (ikke muligt)"
-#: ../pyhoca/wxgui/menus_taskbar.py:252
-#: ../pyhoca/wxgui/menus_taskbar.py:599
+#: ../pyhoca/wxgui/menus_taskbar.py:258 ../pyhoca/wxgui/menus_taskbar.py:622
msgid "Suspend Session (and disconnect/exit)"
msgstr "SuspendÊr Session (og afbryd forbindelse/luk)"
-#: ../pyhoca/wxgui/menus_taskbar.py:254
-#: ../pyhoca/wxgui/menus_taskbar.py:601
+#: ../pyhoca/wxgui/menus_taskbar.py:260 ../pyhoca/wxgui/menus_taskbar.py:624
msgid "Suspend Session (and disconnect)"
msgstr "SuspendÊr Session (og afbryd forbindelse)"
-#: ../pyhoca/wxgui/menus_taskbar.py:256
-#: ../pyhoca/wxgui/menus_taskbar.py:603
+#: ../pyhoca/wxgui/menus_taskbar.py:262 ../pyhoca/wxgui/menus_taskbar.py:626
msgid "Suspend Session"
msgstr "SuspendÊr Session"
-#: ../pyhoca/wxgui/menus_taskbar.py:262
-#: ../pyhoca/wxgui/menus_taskbar.py:612
+#: ../pyhoca/wxgui/menus_taskbar.py:268 ../pyhoca/wxgui/menus_taskbar.py:635
msgid "Terminate Session (and disconnect/exit)"
msgstr "TerminÊr Session (og afbryd forbindelse/luk)"
-#: ../pyhoca/wxgui/menus_taskbar.py:264
-#: ../pyhoca/wxgui/menus_taskbar.py:614
+#: ../pyhoca/wxgui/menus_taskbar.py:270 ../pyhoca/wxgui/menus_taskbar.py:637
msgid "Terminate Session (and disconnect)"
msgstr "TerminÊr Session (og afbryd forbindelse)"
-#: ../pyhoca/wxgui/menus_taskbar.py:266
-#: ../pyhoca/wxgui/menus_taskbar.py:616
+#: ../pyhoca/wxgui/menus_taskbar.py:272 ../pyhoca/wxgui/menus_taskbar.py:639
msgid "Terminate Session"
msgstr "TerminÊr Session"
-#: ../pyhoca/wxgui/menus_taskbar.py:270
-#: ../pyhoca/wxgui/menus_taskbar.py:596
+#: ../pyhoca/wxgui/menus_taskbar.py:275
+msgid "End Desktop Sharing (and disconnect/exit)"
+msgstr "Stop Skrivebordsdeling (og afbryd forbindelse/luk)"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:277
+msgid "End Desktop Sharing (and disconnect)"
+msgstr "Stop Skrivebordsdeling (og afbryd forbindelse)"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:279
+msgid "End Desktop Sharing"
+msgstr "Stop Skrivebordsdeling"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:283 ../pyhoca/wxgui/menus_taskbar.py:619
msgid "Refresh menu tree"
msgstr "Opfrisk menu"
-#: ../pyhoca/wxgui/menus_taskbar.py:279
+#: ../pyhoca/wxgui/menus_taskbar.py:292
msgid "Rename Session Window"
msgstr "Omdøb Sessionsvindue"
-#: ../pyhoca/wxgui/menus_taskbar.py:280
+#: ../pyhoca/wxgui/menus_taskbar.py:293
msgid "Show Session Window"
msgstr "Vis Sessionsvindue"
-#: ../pyhoca/wxgui/menus_taskbar.py:322
+#: ../pyhoca/wxgui/menus_taskbar.py:335
msgid "&Share custom local folder"
msgstr "&Del tilpasset lokal mappe"
-#: ../pyhoca/wxgui/menus_taskbar.py:337
+#: ../pyhoca/wxgui/menus_taskbar.py:350
msgid "Share:"
msgstr "Del:"
-#: ../pyhoca/wxgui/menus_taskbar.py:346
+#: ../pyhoca/wxgui/menus_taskbar.py:359
msgid "Unshare:"
msgstr "Afbryd Deling:"
-#: ../pyhoca/wxgui/menus_taskbar.py:354
+#: ../pyhoca/wxgui/menus_taskbar.py:367
msgid "Unshare &all local folders"
msgstr "Afbryd deling af &alle lokale mapper"
-#: ../pyhoca/wxgui/menus_taskbar.py:360
+#: ../pyhoca/wxgui/menus_taskbar.py:373
msgid "Restore shares in next session"
msgstr "Genopret delemapper i nÃĻste session"
-#: ../pyhoca/wxgui/menus_taskbar.py:440
+#: ../pyhoca/wxgui/menus_taskbar.py:453
msgid "Multimedia"
msgstr "Multimedie"
-#: ../pyhoca/wxgui/menus_taskbar.py:441
+#: ../pyhoca/wxgui/menus_taskbar.py:454
msgid "Development"
msgstr "Udvikling"
-#: ../pyhoca/wxgui/menus_taskbar.py:442
+#: ../pyhoca/wxgui/menus_taskbar.py:455
msgid "Education"
msgstr "Undervisning"
-#: ../pyhoca/wxgui/menus_taskbar.py:443
+#: ../pyhoca/wxgui/menus_taskbar.py:456
msgid "Games"
msgstr "Spil"
-#: ../pyhoca/wxgui/menus_taskbar.py:444
+#: ../pyhoca/wxgui/menus_taskbar.py:457
msgid "Graphics"
msgstr "Grafik"
-#: ../pyhoca/wxgui/menus_taskbar.py:445
+#: ../pyhoca/wxgui/menus_taskbar.py:458
msgid "Internet"
msgstr "Internet"
-#: ../pyhoca/wxgui/menus_taskbar.py:446
+#: ../pyhoca/wxgui/menus_taskbar.py:459
msgid "Office Applications"
msgstr "Kontorprogrammer"
-#: ../pyhoca/wxgui/menus_taskbar.py:447
+#: ../pyhoca/wxgui/menus_taskbar.py:460
msgid "System"
msgstr "System"
-#: ../pyhoca/wxgui/menus_taskbar.py:448
+#: ../pyhoca/wxgui/menus_taskbar.py:461
msgid "Utilities"
msgstr "VÃĻrktøjer"
-#: ../pyhoca/wxgui/menus_taskbar.py:449
+#: ../pyhoca/wxgui/menus_taskbar.py:462
msgid "Other Applications"
msgstr "Andre Programmer"
-#: ../pyhoca/wxgui/menus_taskbar.py:521
-#: ../pyhoca/wxgui/menus_taskbar.py:533
+#: ../pyhoca/wxgui/menus_taskbar.py:535 ../pyhoca/wxgui/menus_taskbar.py:547
#, python-format
msgid "Connect %s"
msgstr "Forbind %s"
-#: ../pyhoca/wxgui/menus_taskbar.py:527
+#: ../pyhoca/wxgui/menus_taskbar.py:541
msgid "Currently connecting..."
msgstr "Forbinder..."
-#: ../pyhoca/wxgui/menus_taskbar.py:541
+#: ../pyhoca/wxgui/menus_taskbar.py:556
msgid "Start &new Desktop Session"
msgstr "Start &ny Skrivebordssession"
-#: ../pyhoca/wxgui/menus_taskbar.py:546
-#: ../pyhoca/wxgui/menus_taskbar.py:684
+#: ../pyhoca/wxgui/menus_taskbar.py:560 ../pyhoca/wxgui/menus_taskbar.py:660
+msgid "Start Desktop Sharing Session"
+msgstr "Start Skrivebordsdeling"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:566 ../pyhoca/wxgui/menus_taskbar.py:710
msgid "Retrieving Application Menu..."
msgstr "Henter Applikationsmenu"
-#: ../pyhoca/wxgui/menus_taskbar.py:550
-#: ../pyhoca/wxgui/menus_taskbar.py:687
+#: ../pyhoca/wxgui/menus_taskbar.py:570 ../pyhoca/wxgui/menus_taskbar.py:713
msgid "Retrieve Application Menu"
msgstr "Hent Applikationsmenu"
-#: ../pyhoca/wxgui/menus_taskbar.py:553
+#: ../pyhoca/wxgui/menus_taskbar.py:573
+msgid "Start &new RDP Session"
+msgstr "Start &ny RDP Session"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:576
msgid "Start &new Session"
msgstr "Start &ny Session"
-#: ../pyhoca/wxgui/menus_taskbar.py:633
+#: ../pyhoca/wxgui/menus_taskbar.py:656
msgid "Launch Single Application"
msgstr "Start en enkelt Applikation"
-#: ../pyhoca/wxgui/menus_taskbar.py:671
+#: ../pyhoca/wxgui/menus_taskbar.py:697
msgid "Manage Application Menu"
msgstr "HÃĨndter Applikationsmenu"
-#: ../pyhoca/wxgui/menus_taskbar.py:714
+#: ../pyhoca/wxgui/menus_taskbar.py:752
msgid "Running"
msgstr "Kører"
-#: ../pyhoca/wxgui/menus_taskbar.py:716
+#: ../pyhoca/wxgui/menus_taskbar.py:754
msgid "Suspended"
msgstr "Suspenderet"
-#: ../pyhoca/wxgui/menus_taskbar.py:735
+#: ../pyhoca/wxgui/menus_taskbar.py:773
msgid "&Clean all sessions"
msgstr "&Rens alle sessioner"
-#: ../pyhoca/wxgui/menus_taskbar.py:741
+#: ../pyhoca/wxgui/menus_taskbar.py:779
msgid "Customize &profile"
msgstr "Tilpas &profil"
-#: ../pyhoca/wxgui/menus_taskbar.py:756
+#: ../pyhoca/wxgui/menus_taskbar.py:794
msgid "Shared &folders"
msgstr "Delte &mapper"
-#: ../pyhoca/wxgui/menus_taskbar.py:768
+#: ../pyhoca/wxgui/menus_taskbar.py:806
+msgid "Server Information"
+msgstr "Serverinformation"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:813
msgid "&Disconnect from Server"
msgstr "&Afbryd forbindelse til Server"
-#: ../pyhoca/wxgui/menus_taskbar.py:775
+#: ../pyhoca/wxgui/menus_taskbar.py:820
msgid "Suspend Session and E&xit application"
msgstr "SuspendÊr Session og L&uk applikation"
-#: ../pyhoca/wxgui/menus_taskbar.py:779
+#: ../pyhoca/wxgui/menus_taskbar.py:824
msgid "Disconnect and E&xit application"
msgstr "Afbryd forbindese og L&uk programmet"
-#: ../pyhoca/wxgui/menus_taskbar.py:833
+#: ../pyhoca/wxgui/menus_taskbar.py:878
msgid "Add Profile"
msgstr "Tilføj Profil"
-#: ../pyhoca/wxgui/menus_taskbar.py:909
+#: ../pyhoca/wxgui/menus_taskbar.py:954
msgid "No session profiles defined"
msgstr "Ingen sessionsprofiler er defineret"
-#: ../pyhoca/wxgui/menus_taskbar.py:945
-msgid "Start/Resume Session"
-msgstr "Start/Genoptag Session"
+#: ../pyhoca/wxgui/menus_taskbar.py:965
+msgid "Export all Profiles"
+msgstr "Eksporter alle profiler"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:967
+msgid "Export Profile Group"
+msgstr "Eksporter Profilgruppe"
-#: ../pyhoca/wxgui/menus_taskbar.py:945
+#: ../pyhoca/wxgui/menus_taskbar.py:1003
msgid "Connect Server"
msgstr "Forbind Server"
-#: ../pyhoca/wxgui/about.py:78
-#: ../pyhoca/wxgui/about.py:80
+#: ../pyhoca/wxgui/about.py:78 ../pyhoca/wxgui/about.py:80
#, python-format
msgid "About %s ..."
msgstr "Om %s"
-#: ../pyhoca/wxgui/frontend.py:459
+#: ../pyhoca/wxgui/frontend.py:465
msgid "Suspending sessions and exiting application..."
msgstr "Suspenderer sessioner og lukker programmet"
-#: ../pyhoca/wxgui/frontend.py:462
+#: ../pyhoca/wxgui/frontend.py:468
#, python-format
msgid "Disconnecting %s and exiting application..."
msgstr "Afbryder forbindelsen %s og lukker programmet"
-#: ../pyhoca/wxgui/frontend.py:464
+#: ../pyhoca/wxgui/frontend.py:470
msgid "Exiting application..."
msgstr "Lukker programmet..."
-#: ../pyhoca/wxgui/frontend.py:562
+#: ../pyhoca/wxgui/frontend.py:568
#, python-format
msgid "%s - server warning"
msgstr "%s - serveradvarsel"
-#: ../pyhoca/wxgui/frontend.py:562
+#: ../pyhoca/wxgui/frontend.py:568
msgid "The X2Go Server does not publish an application menu."
msgstr "X2Go serveren udgiver ikke en applikationsmenu"
-#: ../pyhoca/wxgui/frontend.py:613
+#: ../pyhoca/wxgui/frontend.py:619
msgid "SSH key authentication has been successful."
msgstr "SSH nøgleautentificering lykkedes"
-#: ../pyhoca/wxgui/frontend.py:650
-msgid "The SSH proxy's host key is invalid or has not been accepted by the user"
-msgstr "SSH proxy'ens vÃĻrstnøgle er ugyldig eller er ikke blevet accepteret af brugeren"
+#: ../pyhoca/wxgui/frontend.py:656
+msgid ""
+"The SSH proxy's host key is invalid or has not been accepted by the user"
+msgstr ""
+"SSH proxy'ens vÃĻrstnøgle er ugyldig eller er ikke blevet accepteret af "
+"brugeren"
-#: ../pyhoca/wxgui/frontend.py:671
+#: ../pyhoca/wxgui/frontend.py:677
#, python-format
msgid "%s - EOF error"
msgstr "%s - EOF fejl"
-#: ../pyhoca/wxgui/frontend.py:671
+#: ../pyhoca/wxgui/frontend.py:677
msgid "Authentication protocol communication incomplete! Try again..."
msgstr "Autentifikationsprotokollens kommunikation er ukomplet! Prøv igen..."
-#: ../pyhoca/wxgui/frontend.py:678
+#: ../pyhoca/wxgui/frontend.py:684
#, python-format
msgid "%s - auth key error"
msgstr "%s - auth nøglefejl"
-#: ../pyhoca/wxgui/frontend.py:699
+#: ../pyhoca/wxgui/frontend.py:705
msgid "An unknown error occurred during authentication!"
msgstr "Der opstod en ukendt fejl under autentificeringen!"
-#: ../pyhoca/wxgui/frontend.py:728
+#: ../pyhoca/wxgui/frontend.py:734
#, python-format
msgid "%s: DirectRDP not supported yet"
msgstr "%s: DirektRDP er ikke undersøttet endnu"
-#: ../pyhoca/wxgui/frontend.py:729
+#: ../pyhoca/wxgui/frontend.py:735
#, python-format
msgid ""
"We apologize for the inconvenience...\n"
@@ -1048,67 +1079,154 @@ msgid ""
"Session profiles of type ,,DirectRDP'' are not\n"
"supported by %s (%s), yet!!\n"
"\n"
-"DirectRDP support will be available in %s (>= 0.2.2.0)."
+"DirectRDP support will be available in %s (>= 1.0.0.0)."
msgstr ""
"Vi undskylder ulejligheden...\n"
"\n"
"Sessionsprofiler af typen ,,DirectRDP'' er ikke\n"
"understøttet af %s (%s), endnu!!\n"
"\n"
-"DirectRDP understøttelse vil vÃĻre tilgÃĻngelig i %s (>= 0.2.2.0)."
+"DirectRDP understøttelse vil vÃĻre tilgÃĻngelig i %s (>= 1.0.0.0)."
-#: ../pyhoca/wxgui/frontend.py:741
+#: ../pyhoca/wxgui/frontend.py:747
msgid "Unknown session profile, configure before using it..."
msgstr "Ukendt sessionsprofil, konfigurÊr den før brug..."
-#: ../pyhoca/wxgui/frontend.py:798
-#: ../pyhoca/wxgui/frontend.py:1332
+#: ../pyhoca/wxgui/frontend.py:778
+#, python-format
+msgid "Desktop Sharing with %s not supported by server"
+msgstr "Skrivebordsdeling med %s er ikke understøttet af server"
+
+#: ../pyhoca/wxgui/frontend.py:779
+#, python-format
+msgid ""
+"We apologize for the inconvenience...\n"
+"\n"
+"Session profiles of type ,,SHADOW'' are not\n"
+"supported by X2Go Server (v%s)!!!\n"
+"\n"
+"Desktop Sharing with %s requires\n"
+"X2Go Server 4.1.0.0 and above."
+msgstr ""
+"Vi undskylder ulejligheden...\n"
+"\n"
+"Sessionsprofiler af typen ,,SHADOW'' er ikke\n"
+"understøttet af X2Goserver (v%s)!!!\n"
+"\n"
+"Skrivebordsdeling med %s krÃĻver \n"
+"X2Go Server 4.1.0.0 eller højere"
+
+#: ../pyhoca/wxgui/frontend.py:837 ../pyhoca/wxgui/frontend.py:1488
#, python-format
msgid "%s - session warning"
msgstr "%s - sessionsadvarsel"
-#: ../pyhoca/wxgui/frontend.py:798
+#: ../pyhoca/wxgui/frontend.py:837
#, python-format
msgid "Execution of command ,,%s'' failed."
msgstr "Eksekvering af kommandoen ,,%s'' fejlede"
-#: ../pyhoca/wxgui/frontend.py:939
+#: ../pyhoca/wxgui/frontend.py:978
msgid "Cleaning X2Go sessions..."
msgstr "Renser X2Go sessioner..."
-#: ../pyhoca/wxgui/frontend.py:974
+#: ../pyhoca/wxgui/frontend.py:1026
#, python-format
msgid "%s - disconnect"
msgstr "%s - afbryd forbindelse"
-#: ../pyhoca/wxgui/frontend.py:974
+#: ../pyhoca/wxgui/frontend.py:1026
msgid "X2Go Profile is now disconnected."
msgstr "X2Go Profil er nu afbrudt"
-#: ../pyhoca/wxgui/frontend.py:995
+#: ../pyhoca/wxgui/frontend.py:1047
msgid "New Session Profile"
msgstr "Ny Sessionsprofil"
-#: ../pyhoca/wxgui/frontend.py:1047
+#: ../pyhoca/wxgui/frontend.py:1102
#, python-format
msgid "Really Delete Session Profile ,,%s''?"
msgstr "Er du sikker pÃĨ at du vil slette Sessionsprofilen ,,%s''?"
-#: ../pyhoca/wxgui/frontend.py:1053
+#: ../pyhoca/wxgui/frontend.py:1108
#, python-format
msgid "%s - profile deleted"
msgstr "%s - profil slettet"
-#: ../pyhoca/wxgui/frontend.py:1053
+#: ../pyhoca/wxgui/frontend.py:1108
msgid "The session profile has been deleted."
msgstr "Sessionsprofilen er blevet slettet"
-#: ../pyhoca/wxgui/frontend.py:1071
+#: ../pyhoca/wxgui/frontend.py:1137
+#, python-format
+msgid "%s - export session profiles"
+msgstr "%s - Eksporter sessionsprofiler"
+
+#: ../pyhoca/wxgui/frontend.py:1142
+#, python-format
+msgid "%s - export session profile"
+msgstr "%s - eksporter sessionsprofil"
+
+#: ../pyhoca/wxgui/frontend.py:1154
+#, python-format
+msgid "%s: Export file already exists"
+msgstr "5s: Eksportfil findes allerede"
+
+#: ../pyhoca/wxgui/frontend.py:1155
+#, python-format
+msgid ""
+"The file Âģ%sÂĢ already exists in this folder.\n"
+"\n"
+"Do you want to replace it?"
+msgstr ""
+"Filen Âģ%sÂĢ eksisterer allerede i denne mappe.\n"
+"\n"
+"Vil du erstatte den?"
+
+#: ../pyhoca/wxgui/frontend.py:1176
+#, python-format
+msgid "%s - profiles exported"
+msgstr "%s - profiler eksporteret"
+
+#: ../pyhoca/wxgui/frontend.py:1176
+#, python-format
+msgid "Successfully exported session profile group Âģ%sÂĢ to file Âģ%sÂĢ."
+msgstr "Eksporterede sessionsprofilens gruppe Âģ%sÂĢ til filen Âģ%sÂĢ."
+
+#: ../pyhoca/wxgui/frontend.py:1178
+#, python-format
+msgid "%s - profile exported"
+msgstr "%s - profil eksporteret"
+
+#: ../pyhoca/wxgui/frontend.py:1178
+#, python-format
+msgid "Successfully exported single session profile Âģ%sÂĢ to file Âģ%sÂĢ."
+msgstr "Eksporterede sessionsprofilen Âģ%sÂĢ til filen Âģ%sÂĢ."
+
+#: ../pyhoca/wxgui/frontend.py:1182
+#, python-format
+msgid "%s: Exporting session profile(s) failed"
+msgstr "%s: Eksport af Sessionsprofil(er) fejlede"
+
+#: ../pyhoca/wxgui/frontend.py:1183
+#, python-format
+msgid ""
+"The selected session profile(s) could not be exported to the \n"
+"file Âģ%sÂĢ.\n"
+"\n"
+"Check for common problems (disk full, insufficient access, etc.)."
+msgstr ""
+"Den valgte sessionsprofil kunne ikke eksporteres til\n"
+"filen Âģ%sÂĢ.\n"
+"\n"
+"Check for almindelige problemer (Fuld disk, utilstrÃĻkkelig adgang osv.)."
+
+#: ../pyhoca/wxgui/frontend.py:1202
#, python-format
msgid "%s - share local folder with sessions of this profile"
msgstr "%s - del lokale mappe med sessioner i denne profil"
-#: ../pyhoca/wxgui/frontend.py:1224
+#: ../pyhoca/wxgui/frontend.py:1355
#, python-format
msgid ""
"The authenticity of host [%s]:%s can't be established.\n"
@@ -1121,39 +1239,63 @@ msgstr ""
"\n"
"Are you sure you want to continue connecting?"
-#: ../pyhoca/wxgui/frontend.py:1232
+#: ../pyhoca/wxgui/frontend.py:1363
#, python-format
msgid "%s: Confirm Host Authorization"
msgstr "%s: BekrÃĻft VÃĻrtsautorisering"
-#: ../pyhoca/wxgui/frontend.py:1277
+#: ../pyhoca/wxgui/frontend.py:1409
#, python-format
msgid "%s - channel error"
msgstr "%s - kanalfejl"
-#: ../pyhoca/wxgui/frontend.py:1277
+#: ../pyhoca/wxgui/frontend.py:1409
#, python-format
-msgid "Lost connection to server %s unexpectedly! Try to re-authenticate to the server..."
-msgstr "Mistede forbindelsen til server %s! Prøv at re-autentificere til serveren..."
+msgid ""
+"Lost connection to server %s unexpectedly! Try to re-authenticate to the "
+"server..."
+msgstr ""
+"Mistede forbindelsen til server %s! Prøv at re-autentificere til serveren..."
-#: ../pyhoca/wxgui/frontend.py:1295
-#: ../pyhoca/wxgui/frontend.py:1313
-#: ../pyhoca/wxgui/frontend.py:1315
-#: ../pyhoca/wxgui/frontend.py:1351
+#: ../pyhoca/wxgui/frontend.py:1426 ../pyhoca/wxgui/frontend.py:1469
+#: ../pyhoca/wxgui/frontend.py:1471 ../pyhoca/wxgui/frontend.py:1507
#, python-format
msgid "%s - session failure"
msgstr "%s - sessionen fejlede"
-#: ../pyhoca/wxgui/frontend.py:1295
+#: ../pyhoca/wxgui/frontend.py:1426
msgid "The session startup failed."
msgstr "Sessionsopstarten fejlede"
-#: ../pyhoca/wxgui/frontend.py:1313
+#: ../pyhoca/wxgui/frontend.py:1439
+#, python-format
+msgid "%s - timeout"
+msgstr "%s - timeout"
+
+#: ../pyhoca/wxgui/frontend.py:1439
+msgid ""
+"The server took long to provide a list of sharable desktops.\n"
+"This can happen from time to time, please try again"
+msgstr ""
+"Serveren tog lang tid om at uddele en liste over delbare skriveborde.\n"
+"Dette kan ske fra tid til anden, prøv venligst igen"
+
+#: ../pyhoca/wxgui/frontend.py:1451
+#, python-format
+msgid "%s - desktop sharing failed"
+msgstr "%s - skrivebordsdeling fejlede"
+
+#: ../pyhoca/wxgui/frontend.py:1451
+#, python-format
+msgid "The desktop %s is not available for sharing (anymore)."
+msgstr "Skrivebordet %s er ikke tilgÃĻngeligt som delt ressource"
+
+#: ../pyhoca/wxgui/frontend.py:1469
#, python-format
msgid "The command ,,%s'' is not available on X2Go server."
msgstr "Kommandoen ,,%s'' er ikke tilgÃĻngelig pÃĨ X2Go server"
-#: ../pyhoca/wxgui/frontend.py:1315
+#: ../pyhoca/wxgui/frontend.py:1471
#, python-format
msgid ""
"The command ,,%s'' is not available on X2Go server\n"
@@ -1162,45 +1304,54 @@ msgstr ""
"Kommandoen ,,%s'' er ikke tilgÃĻngelig pÃĨ X2Go server\n"
"%s."
-#: ../pyhoca/wxgui/frontend.py:1332
+#: ../pyhoca/wxgui/frontend.py:1488
#, python-format
-msgid "Reverse TCP port forwarding request for session %s to server port %s has been denied."
-msgstr "Omvendt TCP port forwarding forespørgsel for session %s til serverport %s blev afvist"
+msgid ""
+"Reverse TCP port forwarding request for session %s to server port %s has "
+"been denied."
+msgstr ""
+"Omvendt TCP port forwarding forespørgsel for session %s til serverport %s "
+"blev afvist"
-#: ../pyhoca/wxgui/frontend.py:1351
+#: ../pyhoca/wxgui/frontend.py:1507
#, python-format
-msgid "Forwarding tunnel request to [%s]:%s for session %s was denied by remote X2go/SSH server. Session startup failed."
-msgstr "Forwarding tunnel forespørgsler til [%s]:%s til session %s blev nÃĻgtet af X2Go/SSH fjernserveren. Sessionsstartop fejlede."
+msgid ""
+"Forwarding tunnel request to [%s]:%s for session %s was denied by remote "
+"X2Go/SSH server. Session startup failed."
+msgstr ""
+"Forwarding tunnel forespørgsler til [%s]:%s til session %s blev nÃĻgtet af "
+"X2Go/SSH fjernserveren. Sessionsstartop fejlede."
-#: ../pyhoca/wxgui/frontend.py:1370
+#: ../pyhoca/wxgui/frontend.py:1526
#, python-format
msgid "%s - audio warning"
msgstr "%s - lydadvarsel"
-#: ../pyhoca/wxgui/frontend.py:1370
-msgid "The X2Go PulseAudio system is not available within Remote Desktop sessions."
-msgstr "X2Go PulseAudio systemet er ikke tilgÃĻngeligt i Remote Desktop sessioner"
+#: ../pyhoca/wxgui/frontend.py:1526
+msgid ""
+"The X2Go PulseAudio system is not available within Remote Desktop sessions."
+msgstr ""
+"X2Go PulseAudio systemet er ikke tilgÃĻngeligt i Remote Desktop sessioner"
-#: ../pyhoca/wxgui/frontend.py:1377
-#: ../pyhoca/wxgui/frontend.py:1384
+#: ../pyhoca/wxgui/frontend.py:1533 ../pyhoca/wxgui/frontend.py:1540
#, python-format
msgid "%s - audio error"
msgstr "%s - lydfejl"
-#: ../pyhoca/wxgui/frontend.py:1377
+#: ../pyhoca/wxgui/frontend.py:1533
msgid "The X2Go PulseAudio system could not be started."
msgstr "X2Go PulseAudio systemet kunne ikke startes"
-#: ../pyhoca/wxgui/frontend.py:1384
+#: ../pyhoca/wxgui/frontend.py:1540
msgid "The X2Go PulseAudio system has died unexpectedly."
msgstr "X2Go PulseAudio systemet døde uforventet"
-#: ../pyhoca/wxgui/frontend.py:1396
+#: ../pyhoca/wxgui/frontend.py:1552
#, python-format
msgid "%s - audio problem"
msgstr "%s - lydproblem"
-#: ../pyhoca/wxgui/frontend.py:1396
+#: ../pyhoca/wxgui/frontend.py:1552
#, python-format
msgid ""
"The audio connection could not be set up for this session.\n"
@@ -1209,12 +1360,12 @@ msgstr ""
"Lydforbindelsen kunne ikke opsÃĻttes for denne session.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1408
+#: ../pyhoca/wxgui/frontend.py:1564
#, python-format
msgid "%s - client-side printing not available"
msgstr "%s - klient-udskrift ikke tilgÃĻngeligt"
-#: ../pyhoca/wxgui/frontend.py:1408
+#: ../pyhoca/wxgui/frontend.py:1564
#, python-format
msgid ""
"The server denies client-side printing from within this session.\n"
@@ -1223,12 +1374,12 @@ msgstr ""
"Serveren nÃĻgter klient-udskrift fra denne session.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1420
+#: ../pyhoca/wxgui/frontend.py:1576
#, python-format
msgid "%s - MIME box not available"
msgstr "%s - MIME box ikke tilgÃĻngelig"
-#: ../pyhoca/wxgui/frontend.py:1420
+#: ../pyhoca/wxgui/frontend.py:1576
#, python-format
msgid ""
"The server does not support the X2Go MIME box.\n"
@@ -1237,12 +1388,12 @@ msgstr ""
"Serveren undersøtter ikke X2Go MIME boxen.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1432
+#: ../pyhoca/wxgui/frontend.py:1588
#, python-format
msgid "%s - client-side folders not sharable"
msgstr "%s - klientmapper ikke delbare"
-#: ../pyhoca/wxgui/frontend.py:1432
+#: ../pyhoca/wxgui/frontend.py:1588
#, python-format
msgid ""
"The server denies client-side folder sharing with this session.\n"
@@ -1251,12 +1402,12 @@ msgstr ""
"Serveren nÃĻgter klientmappe-deling i denne session.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1444
+#: ../pyhoca/wxgui/frontend.py:1600
#, python-format
msgid "%s - client resources not sharable"
msgstr "%s - klientressourcer ikke delbare"
-#: ../pyhoca/wxgui/frontend.py:1444
+#: ../pyhoca/wxgui/frontend.py:1600
#, python-format
msgid ""
"Client-side folders and printers cannot be shared with this session.\n"
@@ -1265,13 +1416,12 @@ msgstr ""
"Klientprintere og mapper kan ikke deles i denne session.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1463
-#: ../pyhoca/wxgui/frontend.py:1465
+#: ../pyhoca/wxgui/frontend.py:1619 ../pyhoca/wxgui/frontend.py:1621
#, python-format
msgid "%s - print error"
msgstr "%s - printerfejl"
-#: ../pyhoca/wxgui/frontend.py:1463
+#: ../pyhoca/wxgui/frontend.py:1619
#, python-format
msgid ""
"%s\n"
@@ -1282,7 +1432,7 @@ msgstr ""
"... fejlede pÃĨ printer %s pga. session\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1465
+#: ../pyhoca/wxgui/frontend.py:1621
#, python-format
msgid ""
"%s\n"
@@ -1293,13 +1443,12 @@ msgstr ""
"...skyldes session\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1480
-#: ../pyhoca/wxgui/frontend.py:1495
+#: ../pyhoca/wxgui/frontend.py:1636 ../pyhoca/wxgui/frontend.py:1651
#, python-format
msgid "%s - start"
msgstr "%s - start"
-#: ../pyhoca/wxgui/frontend.py:1480
+#: ../pyhoca/wxgui/frontend.py:1636
#, python-format
msgid ""
"New X2Go session starting up...\n"
@@ -1308,7 +1457,7 @@ msgstr ""
"Ny X2Go session starter...\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1495
+#: ../pyhoca/wxgui/frontend.py:1651
#, python-format
msgid ""
"Another client started X2Go session\n"
@@ -1317,13 +1466,12 @@ msgstr ""
"En anden klient startede X2Go session\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1510
-#: ../pyhoca/wxgui/frontend.py:1525
+#: ../pyhoca/wxgui/frontend.py:1666 ../pyhoca/wxgui/frontend.py:1681
#, python-format
msgid "%s - resume"
msgstr "%s - fortsÃĻt"
-#: ../pyhoca/wxgui/frontend.py:1510
+#: ../pyhoca/wxgui/frontend.py:1666
#, python-format
msgid ""
"Resuming X2Go session...\n"
@@ -1332,7 +1480,7 @@ msgstr ""
"Genoptager X2Go session...\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1525
+#: ../pyhoca/wxgui/frontend.py:1681
#, python-format
msgid ""
"Another client resumed X2Go session\n"
@@ -1341,12 +1489,12 @@ msgstr ""
"En anden klient genoptog X2Go session\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1540
+#: ../pyhoca/wxgui/frontend.py:1696
#, python-format
msgid "%s - running"
msgstr "%s - kører"
-#: ../pyhoca/wxgui/frontend.py:1540
+#: ../pyhoca/wxgui/frontend.py:1696
#, python-format
msgid ""
"Found already running session\n"
@@ -1355,12 +1503,12 @@ msgstr ""
"Fandt igangvÃĻrende session\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1560
+#: ../pyhoca/wxgui/frontend.py:1716
#, python-format
msgid "%s - suspend"
msgstr "%s - suspender"
-#: ../pyhoca/wxgui/frontend.py:1560
+#: ../pyhoca/wxgui/frontend.py:1716
#, python-format
msgid ""
"X2Go Session has been suspended\n"
@@ -1369,12 +1517,12 @@ msgstr ""
"X2Go session er blevet suspenderet\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1587
+#: ../pyhoca/wxgui/frontend.py:1743
#, python-format
msgid "%s - terminate"
msgstr "%s - terminer"
-#: ../pyhoca/wxgui/frontend.py:1587
+#: ../pyhoca/wxgui/frontend.py:1743
#, python-format
msgid ""
"X2Go Session has terminated\n"
@@ -1383,7 +1531,7 @@ msgstr ""
"X2Go session er blevet termineret\n"
"%s"
-#: ../pyhoca/wxgui/messages.py:73
+#: ../pyhoca/wxgui/messages.py:72
#, python-format
msgid ""
"Are you really sure you want to\n"
@@ -1392,7 +1540,7 @@ msgstr ""
"Er du sikke rpÃĨ at du vil \n"
"slette sessionsprofilen ,,%s''?"
-#: ../pyhoca/wxgui/messages.py:74
+#: ../pyhoca/wxgui/messages.py:73
#, python-format
msgid ""
"PyHoca-GUI is already running for user ,,%s''!\n"
@@ -1407,16 +1555,15 @@ msgstr ""
"bruger. PyHoca-GUI ikonet kan findes i dit skrivebord's\n"
"notifikationsomrÃĨde/systray"
-#: ../pyhoca/wxgui/messages.py:107
+#: ../pyhoca/wxgui/messages.py:106
msgid "Yes"
msgstr "Ja"
-#: ../pyhoca/wxgui/messages.py:108
+#: ../pyhoca/wxgui/messages.py:107
msgid "No"
msgstr "Nej"
-#: ../pyhoca/wxgui/messages.py:125
-#: ../pyhoca/wxgui/printingprefs.py:142
+#: ../pyhoca/wxgui/messages.py:124 ../pyhoca/wxgui/printingprefs.py:142
msgid "Ok"
msgstr "Ok"
@@ -1482,10 +1629,6 @@ msgstr "Brug denne printer"
msgid "Custom print command"
msgstr "Tilpasser printerkommando"
-#: ../pyhoca/wxgui/printingprefs.py:143
-msgid "Apply"
-msgstr "Anvend"
-
#: ../pyhoca/wxgui/printingprefs.py:145
msgid "Print"
msgstr "Udskriv"
@@ -1519,6 +1662,79 @@ msgstr "Skift sessionsitel til"
msgid "OK"
msgstr "OK"
+#: ../pyhoca/wxgui/serverinfo.py:76
+#, python-format
+msgid "Server Information - %s"
+msgstr "Server Information - %s"
+
+#: ../pyhoca/wxgui/serverinfo.py:78
+#, python-format
+msgid ""
+"Session Profile: %s\n"
+"\n"
+"List of X2Go Server components, add-ons and their versions..."
+msgstr ""
+"Sessionsprofil: %s\n"
+"\n"
+"Liste over X2Go server komponenter, tilføjelser og deres versioner"
+
+#: ../pyhoca/wxgui/serverinfo.py:83
+msgid "Refresh"
+msgstr "Opfrisk"
+
+#: ../pyhoca/wxgui/serverinfo.py:84
+msgid "Close"
+msgstr "Luk"
+
+#: ../pyhoca/wxgui/serverinfo.py:153
+msgid "X2Go Server"
+msgstr "X2Go Server"
+
+#: ../pyhoca/wxgui/serverinfo.py:154
+msgid "Server Core"
+msgstr "Serverkerne"
+
+#: ../pyhoca/wxgui/serverinfo.py:162
+msgid "Server Extensions"
+msgstr "Server Udvidelser"
+
+#: ../pyhoca/wxgui/serverinfo.py:168
+msgid "X2Go Server Add-ons"
+msgstr "X2Go Server Tilføjelser"
+
+#: ../pyhoca/wxgui/serverinfo.py:172
+msgid "X2Go Server Features"
+msgstr "X2Go Server Features"
+
+#~ msgid "Settings"
+#~ msgstr "Indstillinger"
+
+#, fuzzy
+#~ msgid "%s (%s)\n"
+#~ msgstr "%s (via %s)"
+
+#, fuzzy
+#~ msgid "Connect to another Desktop Session"
+#~ msgstr "Start &ny Skrivebordssession"
+
+#~ msgid "Start/Resume Session"
+#~ msgstr "Start/Genoptag Session"
+
+#~ msgid "SSH Proxy Tunnel"
+#~ msgstr "SSH Proxy Tunnel"
+
+#~ msgid "The SSH proxy configuration is incomplete. Try again."
+#~ msgstr "SSH proxy konfigurationen er ikke komplet. Prøv igen"
+
+#~ msgid ""
+#~ "Another session profile (%s) already uses [%s]:%s for binding a local SSH "
+#~ "proxy to.\n"
+#~ "Please change the SSH proxy settings accordingly."
+#~ msgstr ""
+#~ "En anden sessionsprofil (%s) bruger i forvejen [%s]:%s til at binde en "
+#~ "lokal proxy.\n"
+#~ "Tilpas venligst SSH proxy indstillingerne."
+
#, fuzzy
#~ msgid "Remember shared folders"
#~ msgstr "Delte &mapper"
diff --git a/po/de.po b/po/de.po
index 3ee236d..9aa393f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,5 +1,5 @@
# PyHoca-GUI / i18n.
-# Copyright (C) 2010-2012 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
# Dick Kniep <dick.kniep(a)lindix.nl>
# This file is distributed under the same license as the PyHoca-GUI package.
# Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>, 2011.
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: PyHoca-GUI VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 14:25+0100\n"
-"PO-Revision-Date: 2012-11-26 14:23+0100\n"
+"POT-Creation-Date: 2013-01-29 22:21+0100\n"
+"PO-Revision-Date: 2013-01-22 07:37+0100\n"
"Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n"
"Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n"
"Language: \n"
@@ -38,7 +38,7 @@ msgid "Authenticate"
msgstr "Anmelden"
#: ../pyhoca/wxgui/logon.py:107
-msgid " Start SSH tunnel "
+msgid "Start SSH tunnel"
msgstr "SSH Tunnel aufbauen"
#: ../pyhoca/wxgui/logon.py:115
@@ -49,23 +49,23 @@ msgstr "Sitzungslogin"
msgid "SSH proxy server login"
msgstr "Anmeldung an SSH Proxy"
-#: ../pyhoca/wxgui/logon.py:127 ../pyhoca/wxgui/profilemanager.py:350
-#: ../pyhoca/wxgui/messages.py:131 ../pyhoca/wxgui/printingprefs.py:147
-#: ../pyhoca/wxgui/sessiontitle.py:85
+#: ../pyhoca/wxgui/logon.py:127 ../pyhoca/wxgui/profilemanager.py:373
+#: ../pyhoca/wxgui/listdesktops.py:99 ../pyhoca/wxgui/messages.py:130
+#: ../pyhoca/wxgui/printingprefs.py:147 ../pyhoca/wxgui/sessiontitle.py:85
msgid "Cancel"
msgstr "Abbrechen"
#: ../pyhoca/wxgui/logon.py:297 ../pyhoca/wxgui/logon.py:339
-#: ../pyhoca/wxgui/frontend.py:606
+#: ../pyhoca/wxgui/frontend.py:612
#, python-format
msgid "%s - connect failure"
msgstr "%s - Verbindung fehlgeschlagen"
-#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:606
+#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:612
msgid "User is not allowed to start X2Go sessions!"
msgstr "Benutzer darf keine X2Go Sitzungen starten!"
-#: ../pyhoca/wxgui/logon.py:303 ../pyhoca/wxgui/frontend.py:613
+#: ../pyhoca/wxgui/logon.py:303 ../pyhoca/wxgui/frontend.py:619
#, python-format
msgid "%s - connect"
msgstr "%s - verbinden"
@@ -91,30 +91,30 @@ msgstr "%s - SSH Proxy"
msgid "Authentication to the SSH proxy server failed!"
msgstr "Anmeldung am SSH Proxy Server ist fehlgeschlagen"
-#: ../pyhoca/wxgui/logon.py:376 ../pyhoca/wxgui/frontend.py:664
+#: ../pyhoca/wxgui/logon.py:376 ../pyhoca/wxgui/frontend.py:670
#, python-format
msgid "%s - socket error"
msgstr "%s - Socket-Fehler"
-#: ../pyhoca/wxgui/logon.py:383 ../pyhoca/wxgui/frontend.py:643
-#: ../pyhoca/wxgui/frontend.py:650
+#: ../pyhoca/wxgui/logon.py:383 ../pyhoca/wxgui/frontend.py:649
+#: ../pyhoca/wxgui/frontend.py:656
#, python-format
msgid "%s - host key error"
msgstr "%s - ungÃŧltiger Server-SchlÃŧssel"
-#: ../pyhoca/wxgui/logon.py:384 ../pyhoca/wxgui/frontend.py:643
+#: ../pyhoca/wxgui/logon.py:384 ../pyhoca/wxgui/frontend.py:649
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:391 ../pyhoca/wxgui/frontend.py:685
+#: ../pyhoca/wxgui/logon.py:391 ../pyhoca/wxgui/frontend.py:691
#, python-format
msgid "%s - missing home directory"
msgstr "%s - Benutzerverzeichnis nicht vorhanden"
-#: ../pyhoca/wxgui/logon.py:392 ../pyhoca/wxgui/frontend.py:685
+#: ../pyhoca/wxgui/logon.py:392 ../pyhoca/wxgui/frontend.py:691
msgid "The remote user's home directory does not exist."
msgstr ""
"Das serverseitige Benutzerverzeichnis (HOME-Verzeichnis) existiert nicht."
@@ -124,12 +124,12 @@ msgstr ""
msgid "%s - key error"
msgstr "%s - ungÃŧltiger SchlÃŧssel"
-#: ../pyhoca/wxgui/logon.py:407 ../pyhoca/wxgui/frontend.py:692
+#: ../pyhoca/wxgui/logon.py:407 ../pyhoca/wxgui/frontend.py:698
#, python-format
msgid "%s - auth error"
msgstr "%s - Anmeldefehler"
-#: ../pyhoca/wxgui/logon.py:415 ../pyhoca/wxgui/frontend.py:636
+#: ../pyhoca/wxgui/logon.py:415 ../pyhoca/wxgui/frontend.py:642
#, python-format
msgid "%s - SSH error"
msgstr "%s - SSH-Fehler"
@@ -155,10 +155,10 @@ msgstr ""
#: ../pyhoca/wxgui/taskbar.py:93
#, python-format
msgid ""
-"PyHoca-GUI (Python X2goClient)\n"
+"PyHoca-GUI (Python X2Go Client)\n"
"Currently connecting you to remote X2Go server ,,%s''"
msgstr ""
-"PyHoca-GUI (Python X2goClient)\n"
+"PyHoca-GUI (Python X2Go Client)\n"
"Verbindungsaufbau zu X2Go Server ,,%s'' läuft"
#: ../pyhoca/wxgui/taskbar.py:103
@@ -169,10 +169,10 @@ msgstr "Verbinden mit X2Go Server..."
#: ../pyhoca/wxgui/taskbar.py:107
msgid ""
-"PyHoca-GUI (Python X2goClient)\n"
+"PyHoca-GUI (Python X2Go Client)\n"
"Client for connecting you to a remote X2Go server"
msgstr ""
-"PyHoca-GUI (Python X2goClient)\n"
+"PyHoca-GUI (Python X2Go Client)\n"
"Verbindungen zu entferntem X2Go Server aufbauen"
#: ../pyhoca/wxgui/profilemanager.py:79
@@ -208,276 +208,281 @@ msgid "Single Application"
msgstr "Einzelne Anwendung"
#: ../pyhoca/wxgui/profilemanager.py:87
+msgid "Share desktop session (SHADOW)"
+msgstr "Desktopsharing Sitzung (SHADOW)"
+
+#: ../pyhoca/wxgui/profilemanager.py:88
msgid "XDMCP Query"
msgstr "XDMCP-Serveranfrage (Query)"
-#: ../pyhoca/wxgui/profilemanager.py:88
+#: ../pyhoca/wxgui/profilemanager.py:89
msgid "Windows Terminal Server (X2Go-proxied RDP)"
msgstr "Windows Terminalserver (RDP via X2Go-Proxy)"
-#: ../pyhoca/wxgui/profilemanager.py:89
+#: ../pyhoca/wxgui/profilemanager.py:90
msgid "Windows Terminal Server (Direct RDP)"
msgstr "Windows Terminal Server (Direktes RDP)"
-#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/profilemanager.py:224
+#: ../pyhoca/wxgui/profilemanager.py:91 ../pyhoca/wxgui/profilemanager.py:243
msgid "Custom command"
msgstr "Benutzerdef. Kommando"
-#: ../pyhoca/wxgui/profilemanager.py:95 ../pyhoca/wxgui/menus_taskbar.py:393
+#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:406
msgid "Internet Browser"
msgstr "Internetbrowser"
-#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:394
+#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:407
msgid "Email Client"
msgstr "E-Mail Programm"
-#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:395
+#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:408
msgid "Office"
msgstr "BÃŧroprogramm (Office)"
-#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:396
+#: ../pyhoca/wxgui/profilemanager.py:99 ../pyhoca/wxgui/menus_taskbar.py:409
msgid "Terminal"
msgstr "Terminalkonsole"
-#: ../pyhoca/wxgui/profilemanager.py:116
+#: ../pyhoca/wxgui/profilemanager.py:117
msgid "Open file with system's default application"
msgstr "Mit Standardanwendung des Systems Ãļffnen"
-#: ../pyhoca/wxgui/profilemanager.py:117
+#: ../pyhoca/wxgui/profilemanager.py:118
msgid "Open application chooser dialog"
msgstr "Auswahldialog Ãļffnen, um Anwendung auszuwählen"
-#: ../pyhoca/wxgui/profilemanager.py:118
+#: ../pyhoca/wxgui/profilemanager.py:119
msgid "Save incoming file as ..."
msgstr "Eingehende Datei speichern unter ..."
-#: ../pyhoca/wxgui/profilemanager.py:146
+#: ../pyhoca/wxgui/profilemanager.py:147
msgid "settings derived from "
msgstr "Einstellungen Ãŧbernommen von"
#. boxes for all tabs
-#: ../pyhoca/wxgui/profilemanager.py:167
+#: ../pyhoca/wxgui/profilemanager.py:186
msgid "Session Title"
msgstr "Sitzungstitel"
-#: ../pyhoca/wxgui/profilemanager.py:168
+#: ../pyhoca/wxgui/profilemanager.py:187
msgid "Session Window"
msgstr "Sitzungsfenster"
-#: ../pyhoca/wxgui/profilemanager.py:169
+#: ../pyhoca/wxgui/profilemanager.py:188
msgid "Session Startup"
msgstr "Sitzungsstart"
-#: ../pyhoca/wxgui/profilemanager.py:170
+#: ../pyhoca/wxgui/profilemanager.py:189
msgid "Server"
msgstr "Server"
-#: ../pyhoca/wxgui/profilemanager.py:171
+#: ../pyhoca/wxgui/profilemanager.py:190
msgid "Proxy"
msgstr "Proxy"
-#: ../pyhoca/wxgui/profilemanager.py:172
+#: ../pyhoca/wxgui/profilemanager.py:191
msgid "Connection Link Speed"
msgstr "Verbindungsgeschwindigkeit"
-#: ../pyhoca/wxgui/profilemanager.py:173
+#: ../pyhoca/wxgui/profilemanager.py:192
msgid "Compression"
msgstr "Komprimierung"
-#: ../pyhoca/wxgui/profilemanager.py:174
+#: ../pyhoca/wxgui/profilemanager.py:193
msgid "Display"
msgstr "Anzeige"
-#: ../pyhoca/wxgui/profilemanager.py:175
+#: ../pyhoca/wxgui/profilemanager.py:194
msgid "Keyboard"
msgstr "Tastatur"
-#: ../pyhoca/wxgui/profilemanager.py:176
+#: ../pyhoca/wxgui/profilemanager.py:195
msgid "Sound"
msgstr "Audio"
-#: ../pyhoca/wxgui/profilemanager.py:177
+#: ../pyhoca/wxgui/profilemanager.py:196
msgid "Printing"
msgstr "Drucken"
-#: ../pyhoca/wxgui/profilemanager.py:178
+#: ../pyhoca/wxgui/profilemanager.py:197
msgid "Folder Exports"
msgstr "Ordnerfreigabe"
-#: ../pyhoca/wxgui/profilemanager.py:179
+#: ../pyhoca/wxgui/profilemanager.py:198
msgid "File Import"
msgstr "Dateiimport"
#. ##
#. ## widgets for the PROFILE tab
#. ##
-#: ../pyhoca/wxgui/profilemanager.py:184
+#: ../pyhoca/wxgui/profilemanager.py:203
msgid "Name"
msgstr "Name"
-#: ../pyhoca/wxgui/profilemanager.py:191
+#: ../pyhoca/wxgui/profilemanager.py:210
msgid "Set session window title"
msgstr "Sitzungsfenstertitel setzen"
-#: ../pyhoca/wxgui/profilemanager.py:192
+#: ../pyhoca/wxgui/profilemanager.py:211
msgid "Use a default session window title"
msgstr "Standardtitel fÃŧr Sitzungsfenster"
-#: ../pyhoca/wxgui/profilemanager.py:193
+#: ../pyhoca/wxgui/profilemanager.py:212
msgid "Custom session window title"
msgstr "Sitzungstitel anpassen"
-#: ../pyhoca/wxgui/profilemanager.py:212
+#: ../pyhoca/wxgui/profilemanager.py:231
msgid "Window Icon"
msgstr "Fenstersymbol"
#. ##
#. ## widgets for the SESSION tab
#. ##
-#: ../pyhoca/wxgui/profilemanager.py:218
+#: ../pyhoca/wxgui/profilemanager.py:237
msgid "Start session automatically after login"
msgstr "Sitzung nach Anmeldung automatisch starten"
-#: ../pyhoca/wxgui/profilemanager.py:219
+#: ../pyhoca/wxgui/profilemanager.py:238
#, python-format
-msgid "Login automatically after %s has started"
-msgstr "Automatisch anmelden nach %s Programmstart"
+msgid "Login automatically after %s has started (needs --auto-connect)"
+msgstr "Automatisch anmelden nach %s Programmstart (nur mit --auto-connect)"
-#: ../pyhoca/wxgui/profilemanager.py:220
+#: ../pyhoca/wxgui/profilemanager.py:239
msgid "Type"
msgstr "Typ"
-#: ../pyhoca/wxgui/profilemanager.py:222
+#: ../pyhoca/wxgui/profilemanager.py:241
msgid "Application"
msgstr "Anwendung"
-#: ../pyhoca/wxgui/profilemanager.py:226
+#: ../pyhoca/wxgui/profilemanager.py:245
msgid "XDMCP server"
msgstr "XDMCP Server"
-#: ../pyhoca/wxgui/profilemanager.py:228
+#: ../pyhoca/wxgui/profilemanager.py:247
msgid "RDP server"
msgstr "RDP Server"
-#: ../pyhoca/wxgui/profilemanager.py:230
+#: ../pyhoca/wxgui/profilemanager.py:249
msgid "RDP options"
msgstr "RDP Optionen"
-#: ../pyhoca/wxgui/profilemanager.py:232
+#: ../pyhoca/wxgui/profilemanager.py:251
msgid "Integrate remote application(s) into local desktop (rootless mode)"
msgstr ""
"Serverseitige Anwendung(en) in lokalen Desktop integrieren (sog. rootless "
"Modus)"
-#: ../pyhoca/wxgui/profilemanager.py:233
+#: ../pyhoca/wxgui/profilemanager.py:252
msgid "Menu of published applications"
msgstr "MenÃŧ mit Server-publizierten Anwendungen"
#. ##
#. ## widgets for the CONNECTION tab
#. ##
-#: ../pyhoca/wxgui/profilemanager.py:240 ../pyhoca/wxgui/profilemanager.py:253
+#: ../pyhoca/wxgui/profilemanager.py:259 ../pyhoca/wxgui/profilemanager.py:273
msgid "User"
msgstr "Benutzer"
-#: ../pyhoca/wxgui/profilemanager.py:242 ../pyhoca/wxgui/profilemanager.py:260
+#: ../pyhoca/wxgui/profilemanager.py:261 ../pyhoca/wxgui/profilemanager.py:280
msgid "Host"
msgstr "Hostname"
-#: ../pyhoca/wxgui/profilemanager.py:244 ../pyhoca/wxgui/profilemanager.py:262
+#: ../pyhoca/wxgui/profilemanager.py:263 ../pyhoca/wxgui/profilemanager.py:282
msgid "Port"
msgstr "Port"
-#: ../pyhoca/wxgui/profilemanager.py:246
+#: ../pyhoca/wxgui/profilemanager.py:265
msgid "Key"
msgstr "SchlÃŧssel"
-#: ../pyhoca/wxgui/profilemanager.py:249
+#: ../pyhoca/wxgui/profilemanager.py:268
msgid "Discover SSH keys or use SSH agent for X2Go authentication"
msgstr "Finde SSH SchlÃŧssel oder verwende SSH Agent fÃŧr X2Go-Anmeldung"
-#: ../pyhoca/wxgui/profilemanager.py:251
+#: ../pyhoca/wxgui/profilemanager.py:270
msgid "Enable forwarding of SSH authentication agent connections"
msgstr "Weiterleitung von SSH Agent Authentifizierungsanfragen"
-#: ../pyhoca/wxgui/profilemanager.py:252
+#: ../pyhoca/wxgui/profilemanager.py:271
+msgid "Store SSH host keys under (unique) X2Go session profile ID"
+msgstr ""
+"SSH Host-SchlÃŧssel unter der (eindeutigen) X2Go Sitzungsprofil-ID speichern"
+
+#: ../pyhoca/wxgui/profilemanager.py:272
msgid "Server behind SSH proxy"
msgstr "Server hinter SSH-Proxy"
-#: ../pyhoca/wxgui/profilemanager.py:255
+#: ../pyhoca/wxgui/profilemanager.py:275
msgid "Use same username for X2Go and proxy host"
msgstr "Verwende gleichen Anmeldenamen fÃŧr X2Go Server und Proxy"
-#: ../pyhoca/wxgui/profilemanager.py:256
+#: ../pyhoca/wxgui/profilemanager.py:276
msgid "Use same authentication for X2Go and proxy host"
msgstr "Verwende die gleichen Anmeldeinformationen fÃŧr X2Go Server und Proxy"
-#: ../pyhoca/wxgui/profilemanager.py:257
+#: ../pyhoca/wxgui/profilemanager.py:277
msgid "Key file"
msgstr "SchlÃŧssel"
-#: ../pyhoca/wxgui/profilemanager.py:264
-msgid "SSH Proxy Tunnel"
-msgstr "SSH-Proxytunnel"
-
-#: ../pyhoca/wxgui/profilemanager.py:270
+#: ../pyhoca/wxgui/profilemanager.py:284
msgid "Discover SSH keys or use SSH agent for proxy authentication"
-msgstr "Find SSH SchlÃŧssel oder verwende SSH Agent fÃŧr Proxy-Anmeldung"
+msgstr "Finde SSH SchlÃŧssel oder verwende SSH Agent fÃŧr Proxy-Anmeldung"
-#: ../pyhoca/wxgui/profilemanager.py:273
+#: ../pyhoca/wxgui/profilemanager.py:287
msgid "Modem"
msgstr "Modem"
-#: ../pyhoca/wxgui/profilemanager.py:274
+#: ../pyhoca/wxgui/profilemanager.py:288
msgid "ISDN"
msgstr "ISDN"
-#: ../pyhoca/wxgui/profilemanager.py:275
+#: ../pyhoca/wxgui/profilemanager.py:289
msgid "ADSL"
msgstr "ADSL"
-#: ../pyhoca/wxgui/profilemanager.py:276
+#: ../pyhoca/wxgui/profilemanager.py:290
msgid "WAN"
msgstr "WAN"
-#: ../pyhoca/wxgui/profilemanager.py:277
+#: ../pyhoca/wxgui/profilemanager.py:291
msgid "LAN"
msgstr "LAN"
-#: ../pyhoca/wxgui/profilemanager.py:279
+#: ../pyhoca/wxgui/profilemanager.py:293
msgid "Method"
msgstr "Methode"
-#: ../pyhoca/wxgui/profilemanager.py:281
+#: ../pyhoca/wxgui/profilemanager.py:295
msgid "Image quality"
msgstr "Bildqualität"
#. ##
-#. ## wigdets for the SETTINGS tab
+#. ## wigdets for the IO tab
#. ##
-#: ../pyhoca/wxgui/profilemanager.py:287
+#: ../pyhoca/wxgui/profilemanager.py:301
msgid "Fullscreen"
msgstr "Vollbild"
-#: ../pyhoca/wxgui/profilemanager.py:288
+#: ../pyhoca/wxgui/profilemanager.py:302
msgid "Maximized"
msgstr "Maximiert"
-#: ../pyhoca/wxgui/profilemanager.py:289
+#: ../pyhoca/wxgui/profilemanager.py:303
msgid "Custom Size"
msgstr "Benutzerdefinierte GrÃļÃe"
-#: ../pyhoca/wxgui/profilemanager.py:294
+#: ../pyhoca/wxgui/profilemanager.py:308
msgid "Set display DPI"
msgstr "DPI-Wert fÃŧr Anzeige setzen"
-#: ../pyhoca/wxgui/profilemanager.py:296
+#: ../pyhoca/wxgui/profilemanager.py:310
msgid "Do not set (use server-side tools to configure the keyboard)"
msgstr ""
"Keine Einstellungen (zum Konfigurieren der Tastatur mÃŧssen Server-seitige "
"Tools verwendet werden)"
-#: ../pyhoca/wxgui/profilemanager.py:297
+#: ../pyhoca/wxgui/profilemanager.py:311
msgid ""
"Automatically detect and use client-side keyboard configuration inside the "
"session"
@@ -485,478 +490,533 @@ msgstr ""
"Tastaturkonfiguration dieses Computers automatisch erkennen und in der "
"Sitzung verwenden"
-#: ../pyhoca/wxgui/profilemanager.py:298
+#: ../pyhoca/wxgui/profilemanager.py:312
msgid "Use custom keyboard settings as provided below"
msgstr "Tastatureinstellungen der Sitzung wie folgt anpassen"
-#: ../pyhoca/wxgui/profilemanager.py:299
+#: ../pyhoca/wxgui/profilemanager.py:313
msgid "Keyboard model"
msgstr "Tastaturmodell"
-#: ../pyhoca/wxgui/profilemanager.py:301
+#: ../pyhoca/wxgui/profilemanager.py:315
msgid "Layout"
msgstr "Layout"
-#: ../pyhoca/wxgui/profilemanager.py:303
+#: ../pyhoca/wxgui/profilemanager.py:317
msgid "Layout variant"
msgstr "Layoutvariante"
-#: ../pyhoca/wxgui/profilemanager.py:305
+#. ##
+#. ## wigdets for the MEDIA tab
+#. ##
+#: ../pyhoca/wxgui/profilemanager.py:323
msgid "Enable sound support"
msgstr "AudiounterstÃŧtzung aktivieren"
-#: ../pyhoca/wxgui/profilemanager.py:306
+#: ../pyhoca/wxgui/profilemanager.py:324
msgid "Pulse Audio"
msgstr "Pulse Audio"
#. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated.
#. However, config files can contain an Arts configuration, so we will honour this
-#: ../pyhoca/wxgui/profilemanager.py:310
+#: ../pyhoca/wxgui/profilemanager.py:328
msgid "Arts (not supported)"
msgstr "Arts (nicht unterstÃŧtzt)"
-#: ../pyhoca/wxgui/profilemanager.py:313
+#: ../pyhoca/wxgui/profilemanager.py:331
msgid "esd"
msgstr "esd"
-#: ../pyhoca/wxgui/profilemanager.py:314
+#: ../pyhoca/wxgui/profilemanager.py:332
msgid "Use default sound port"
msgstr "Standard Audio-Port verwenden"
-#: ../pyhoca/wxgui/profilemanager.py:315
+#: ../pyhoca/wxgui/profilemanager.py:333
msgid "Custom sound port"
msgstr "Benutzerdefinierter Audio-Port"
-#: ../pyhoca/wxgui/profilemanager.py:318
+#: ../pyhoca/wxgui/profilemanager.py:336
+msgid "Client Side printing"
+msgstr "UnterstÃŧtzung fÃŧr lokale Druckeranbindung"
+
+#. ##
+#. ## wigdets for the SHARING tab
+#. ##
+#: ../pyhoca/wxgui/profilemanager.py:342
msgid "Use local folder sharing"
msgstr "Lokale Ordnerfreigabe verwenden"
-#: ../pyhoca/wxgui/profilemanager.py:319
+#: ../pyhoca/wxgui/profilemanager.py:343
msgid "Store share list at end of session"
msgstr "Freigabenliste nach Sitzungsende speichern"
-#: ../pyhoca/wxgui/profilemanager.py:320
+#: ../pyhoca/wxgui/profilemanager.py:344
msgid "Path"
msgstr "Pfad"
-#: ../pyhoca/wxgui/profilemanager.py:323 ../pyhoca/wxgui/profilemanager.py:344
+#: ../pyhoca/wxgui/profilemanager.py:347 ../pyhoca/wxgui/profilemanager.py:366
msgid "Add"
msgstr "HinzufÃŧgen"
-#: ../pyhoca/wxgui/profilemanager.py:325
+#: ../pyhoca/wxgui/profilemanager.py:349
msgid "Local Path"
msgstr "Lokaler Pfad"
-#: ../pyhoca/wxgui/profilemanager.py:326
+#: ../pyhoca/wxgui/profilemanager.py:350
msgid "Connect Method"
msgstr "Verbindungsart"
-#: ../pyhoca/wxgui/profilemanager.py:327
+#: ../pyhoca/wxgui/profilemanager.py:351
msgid "Delete"
msgstr "Entfernen"
-#: ../pyhoca/wxgui/profilemanager.py:329
+#: ../pyhoca/wxgui/profilemanager.py:353
msgid "Convert between client and server encodings"
msgstr "Zeichenkodierung zwischen Server und Client Ãŧbersetzen"
-#: ../pyhoca/wxgui/profilemanager.py:330
+#: ../pyhoca/wxgui/profilemanager.py:354
msgid "Client encoding"
msgstr "Zeichenkodierung Client"
-#: ../pyhoca/wxgui/profilemanager.py:332
+#: ../pyhoca/wxgui/profilemanager.py:356
msgid "Server encoding"
msgstr "Server"
-#: ../pyhoca/wxgui/profilemanager.py:335
+#: ../pyhoca/wxgui/profilemanager.py:359
msgid "Use file MIME box for local file import"
msgstr "MIME-Box fÃŧr lokalen Dateiimport verwenden"
-#: ../pyhoca/wxgui/profilemanager.py:336
+#: ../pyhoca/wxgui/profilemanager.py:360
msgid "Extensions"
msgstr "Erweiterungen"
-#: ../pyhoca/wxgui/profilemanager.py:338
+#: ../pyhoca/wxgui/profilemanager.py:362
msgid "Action"
msgstr "Aktion"
-#: ../pyhoca/wxgui/profilemanager.py:341
-msgid "Client Side printing"
-msgstr "UnterstÃŧtzung fÃŧr lokale Druckeranbindung"
-
-#: ../pyhoca/wxgui/profilemanager.py:345
+#: ../pyhoca/wxgui/profilemanager.py:367
msgid "Defaults"
msgstr "Standardwerte"
-#: ../pyhoca/wxgui/profilemanager.py:347
+#: ../pyhoca/wxgui/profilemanager.py:369
msgid "Save"
msgstr "Speichern"
-#: ../pyhoca/wxgui/profilemanager.py:348
+#: ../pyhoca/wxgui/profilemanager.py:370
msgid "Reset"
msgstr "ZurÃŧcksetzen"
-#: ../pyhoca/wxgui/profilemanager.py:401
-#: ../pyhoca/wxgui/profilemanager.py:1124
-#: ../pyhoca/wxgui/profilemanager.py:2268
+#: ../pyhoca/wxgui/profilemanager.py:372 ../pyhoca/wxgui/printingprefs.py:143
+msgid "Apply"
+msgstr "Anwenden"
+
+#: ../pyhoca/wxgui/profilemanager.py:423
+#: ../pyhoca/wxgui/profilemanager.py:1135
+#: ../pyhoca/wxgui/profilemanager.py:2303
msgid "automatically"
msgstr "automatisch"
-#: ../pyhoca/wxgui/profilemanager.py:403
-#: ../pyhoca/wxgui/profilemanager.py:1126
+#: ../pyhoca/wxgui/profilemanager.py:425
+#: ../pyhoca/wxgui/profilemanager.py:1137
msgid "manually"
msgstr "manuell"
-#: ../pyhoca/wxgui/profilemanager.py:412
+#: ../pyhoca/wxgui/profilemanager.py:434
msgid "PyHoca-GUI Profile Manager - new profile"
msgstr "PyHoca-GUI Profilmanager - neues Sitzungsprofil"
-#: ../pyhoca/wxgui/profilemanager.py:414
+#: ../pyhoca/wxgui/profilemanager.py:436
#, python-format
msgid "PyHoca-GUI Profile Manager - %s (connected)"
msgstr "PyHoca-GUI Profilmanager - %s (verbunden)"
-#: ../pyhoca/wxgui/profilemanager.py:416
+#: ../pyhoca/wxgui/profilemanager.py:438
#, python-format
msgid "PyHoca-GUI Profile Manager - %s"
msgstr "PyHoca-GUI Profilmanager - %s"
-#: ../pyhoca/wxgui/profilemanager.py:797
+#: ../pyhoca/wxgui/profilemanager.py:804
msgid "Profile"
msgstr "Profil"
-#: ../pyhoca/wxgui/profilemanager.py:798
+#: ../pyhoca/wxgui/profilemanager.py:805
msgid "Session"
msgstr "Sitzung"
-#: ../pyhoca/wxgui/profilemanager.py:799
+#: ../pyhoca/wxgui/profilemanager.py:806
msgid "Connection"
msgstr "Verbindung"
-#: ../pyhoca/wxgui/profilemanager.py:800
+#: ../pyhoca/wxgui/profilemanager.py:807
msgid "Link Quality"
msgstr "Verbindungsqualität"
-#: ../pyhoca/wxgui/profilemanager.py:801
-msgid "Settings"
-msgstr "Einstellungen"
+#: ../pyhoca/wxgui/profilemanager.py:808
+msgid "Input/Output"
+msgstr "Ein-/Ausgabe"
+
+#: ../pyhoca/wxgui/profilemanager.py:809
+msgid "Media"
+msgstr "Medien"
-#: ../pyhoca/wxgui/profilemanager.py:802
+#: ../pyhoca/wxgui/profilemanager.py:810
msgid "Sharing"
msgstr "Freigaben"
-#: ../pyhoca/wxgui/profilemanager.py:988
+#: ../pyhoca/wxgui/profilemanager.py:989
msgid "<xkbtype>"
msgstr "pc105/de"
-#: ../pyhoca/wxgui/profilemanager.py:989
+#: ../pyhoca/wxgui/profilemanager.py:990
msgid "<xkblayout>"
msgstr "de"
-#: ../pyhoca/wxgui/profilemanager.py:990
+#: ../pyhoca/wxgui/profilemanager.py:991
msgid "<xkbvariant>"
msgstr "nodeadkeys"
-#: ../pyhoca/wxgui/profilemanager.py:1444
+#: ../pyhoca/wxgui/profilemanager.py:1449
msgid "Icon Files (*.png)|*.png|All files (*.*)|*"
msgstr "Icon Dateien (*.png)|*.png|Alle Dateien (*.*)|*"
-#: ../pyhoca/wxgui/profilemanager.py:1447
+#: ../pyhoca/wxgui/profilemanager.py:1452
msgid "Choose an icon for this session profile"
msgstr "Sitzungs-Icon fÃŧr dieses Sitzungsprofil auswählen"
-#: ../pyhoca/wxgui/profilemanager.py:1816
+#: ../pyhoca/wxgui/profilemanager.py:1895
msgid "All files (*.*)|*"
msgstr "Alle Dateien (*.*)|*"
-#: ../pyhoca/wxgui/profilemanager.py:1818
-#: ../pyhoca/wxgui/profilemanager.py:1842
+#: ../pyhoca/wxgui/profilemanager.py:1897
+#: ../pyhoca/wxgui/profilemanager.py:1921
msgid "Choose a public SSH key"
msgstr "Ãffentlichen SSH-SchlÃŧssel auswählen"
-#: ../pyhoca/wxgui/profilemanager.py:2220
+#: ../pyhoca/wxgui/profilemanager.py:2255
msgid "Choose a folder to share within a session"
msgstr "Ordner zur Freigabe fÃŧr Sitzungen auswählen"
-#: ../pyhoca/wxgui/profilemanager.py:2348
-#: ../pyhoca/wxgui/profilemanager.py:2351
-#: ../pyhoca/wxgui/profilemanager.py:2354
-#: ../pyhoca/wxgui/profilemanager.py:2359
-#: ../pyhoca/wxgui/profilemanager.py:2369 ../pyhoca/wxgui/menus_taskbar.py:117
+#: ../pyhoca/wxgui/profilemanager.py:2383
+#: ../pyhoca/wxgui/profilemanager.py:2386
+#: ../pyhoca/wxgui/profilemanager.py:2389 ../pyhoca/wxgui/menus_taskbar.py:122
msgid "Profile Manager"
msgstr "Profilmanager"
-#: ../pyhoca/wxgui/profilemanager.py:2348
+#: ../pyhoca/wxgui/profilemanager.py:2383
msgid "Profile name is missing, profile unusable!!!"
msgstr "Der Profilname fehlt, Profil so nicht verwendbar!!!"
-#: ../pyhoca/wxgui/profilemanager.py:2351
-#: ../pyhoca/wxgui/profilemanager.py:2354
+#: ../pyhoca/wxgui/profilemanager.py:2386
+#: ../pyhoca/wxgui/profilemanager.py:2389
#, python-format
msgid "Profile name %s already exists!!!"
msgstr "Ein Sitzungsprofil mit dem Namen %s existiert bereits!!!"
-#: ../pyhoca/wxgui/profilemanager.py:2359
-msgid "The SSH proxy configuration is incomplete. Try again."
-msgstr ""
-"Die SSH Proxy Konfiguration ist unvollständig. Bitte nochmal versuchen."
-
-#: ../pyhoca/wxgui/profilemanager.py:2369
-#, python-format
-msgid ""
-"Another session profile (%s) already uses [%s]:%s for binding a local SSH "
-"proxy to.\n"
-"Please change the SSH proxy settings accordingly."
-msgstr ""
-"Ein anderes Profil (%s) verwendet die Socketadresse [%s]:%s bereits, um "
-"einen lokalen SSH Proxy Port daran zu binden. Bitte die SSH Proxy "
-"Einstellungen entsprechend ändern."
-
-#: ../pyhoca/wxgui/profilemanager.py:2396
+#: ../pyhoca/wxgui/profilemanager.py:2416
#, python-format
msgid "%s - profile added"
msgstr "%s - Profil hinzugefÃŧgt"
-#: ../pyhoca/wxgui/profilemanager.py:2397
+#: ../pyhoca/wxgui/profilemanager.py:2417
msgid "A new session profile has been added."
msgstr "Ein neues Sitzungsprofil wurde hinzugefÃŧgt."
-#: ../pyhoca/wxgui/profilemanager.py:2401
+#: ../pyhoca/wxgui/profilemanager.py:2421
#, python-format
msgid "%s - modified"
msgstr "%s - modifiziert"
-#: ../pyhoca/wxgui/profilemanager.py:2402
+#: ../pyhoca/wxgui/profilemanager.py:2422
msgid "Changes to profile have been saved."
msgstr "Ãnderungen am Profil wurden Ãŧbernommen."
-#: ../pyhoca/wxgui/menus_taskbar.py:74
+#: ../pyhoca/wxgui/listdesktops.py:82
+#, python-format
+msgid "Share Desktop Session - %s"
+msgstr "Desktopsharing Sitzung - %s"
+
+#: ../pyhoca/wxgui/listdesktops.py:84
+msgid "Select one of the available desktop sessions on this server"
+msgstr ""
+"Bitte eine der verfÃŧgbaren Desktop-Sitzungen auf diesem\n"
+"Server auswählen"
+
+#: ../pyhoca/wxgui/listdesktops.py:90
+msgid "View session only"
+msgstr "Sitzung nur betrachten"
+
+#: ../pyhoca/wxgui/listdesktops.py:91
+msgid "Gain full access"
+msgstr "Vollzugriff erhalten"
+
+#: ../pyhoca/wxgui/listdesktops.py:95
+msgid "Share Desktop"
+msgstr "Desktopsharing starten"
+
+#: ../pyhoca/wxgui/listdesktops.py:98
+msgid "Refresh list"
+msgstr "Liste aktualisieren"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:76
msgid "Edit Profile"
msgstr "Sitzungsprofil bearbeiten"
-#: ../pyhoca/wxgui/menus_taskbar.py:77
+#: ../pyhoca/wxgui/menus_taskbar.py:79
msgid "Use as Template for New Profile"
msgstr "Als Vorlage fÃŧr neues Profil verwenden"
-#: ../pyhoca/wxgui/menus_taskbar.py:78
+#: ../pyhoca/wxgui/menus_taskbar.py:81
+msgid "Export Profile"
+msgstr "Sitzungsprofil exportieren"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:82
msgid "Delete Profile"
msgstr "Sitzungsprofil lÃļschen"
-#: ../pyhoca/wxgui/menus_taskbar.py:106
+#: ../pyhoca/wxgui/menus_taskbar.py:111
#, python-format
msgid "About %s (%s)..."
msgstr "Ãber %s (%s) ..."
-#: ../pyhoca/wxgui/menus_taskbar.py:132
+#: ../pyhoca/wxgui/menus_taskbar.py:137
msgid "Manage Session Profile"
msgstr "Sitzungsprofil verwalten"
-#: ../pyhoca/wxgui/menus_taskbar.py:141
+#: ../pyhoca/wxgui/menus_taskbar.py:146
msgid "Printing Preferences"
msgstr "Druckeinstellungen"
-#: ../pyhoca/wxgui/menus_taskbar.py:147
+#: ../pyhoca/wxgui/menus_taskbar.py:152
msgid "Client Options"
msgstr "Optionen"
-#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:783
-#: ../pyhoca/wxgui/menus_taskbar.py:975
+#: ../pyhoca/wxgui/menus_taskbar.py:160 ../pyhoca/wxgui/menus_taskbar.py:828
+#: ../pyhoca/wxgui/menus_taskbar.py:1033
msgid "E&xit"
msgstr "&Beenden"
-#: ../pyhoca/wxgui/menus_taskbar.py:227
+#: ../pyhoca/wxgui/menus_taskbar.py:232
msgid "Window title"
msgstr "Fenstertitel"
-#: ../pyhoca/wxgui/menus_taskbar.py:233 ../pyhoca/wxgui/menus_taskbar.py:608
+#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:631
msgid "Resume Session"
msgstr "Sitzung fortsetzen"
-#: ../pyhoca/wxgui/menus_taskbar.py:235
+#: ../pyhoca/wxgui/menus_taskbar.py:240
msgid "Resume Session (not possible)"
msgstr "Sitzung fortsetzen (nicht mÃļglich)"
-#: ../pyhoca/wxgui/menus_taskbar.py:246
+#: ../pyhoca/wxgui/menus_taskbar.py:251
msgid "Transfer Session"
msgstr "Sitzung Ãŧbernehmen"
-#: ../pyhoca/wxgui/menus_taskbar.py:248
+#: ../pyhoca/wxgui/menus_taskbar.py:253
msgid "Transfer Session (not possible)"
msgstr "Sitzung Ãŧbernehmen (nicht mÃļglich)"
-#: ../pyhoca/wxgui/menus_taskbar.py:252 ../pyhoca/wxgui/menus_taskbar.py:599
+#: ../pyhoca/wxgui/menus_taskbar.py:258 ../pyhoca/wxgui/menus_taskbar.py:622
msgid "Suspend Session (and disconnect/exit)"
msgstr "Sitzung anhalten (und Verbindung trenen / Anwendung beenden)"
-#: ../pyhoca/wxgui/menus_taskbar.py:254 ../pyhoca/wxgui/menus_taskbar.py:601
+#: ../pyhoca/wxgui/menus_taskbar.py:260 ../pyhoca/wxgui/menus_taskbar.py:624
msgid "Suspend Session (and disconnect)"
msgstr "Sitzungen anhalten (und Verbindung trennen)"
-#: ../pyhoca/wxgui/menus_taskbar.py:256 ../pyhoca/wxgui/menus_taskbar.py:603
+#: ../pyhoca/wxgui/menus_taskbar.py:262 ../pyhoca/wxgui/menus_taskbar.py:626
msgid "Suspend Session"
msgstr "Sitzung anhalten"
-#: ../pyhoca/wxgui/menus_taskbar.py:262 ../pyhoca/wxgui/menus_taskbar.py:612
+#: ../pyhoca/wxgui/menus_taskbar.py:268 ../pyhoca/wxgui/menus_taskbar.py:635
msgid "Terminate Session (and disconnect/exit)"
msgstr "Sitzung beenden (und Verbindung trennen / Anwendung beenden)"
-#: ../pyhoca/wxgui/menus_taskbar.py:264 ../pyhoca/wxgui/menus_taskbar.py:614
+#: ../pyhoca/wxgui/menus_taskbar.py:270 ../pyhoca/wxgui/menus_taskbar.py:637
msgid "Terminate Session (and disconnect)"
msgstr "Sitzung beenden (und Verbindung trennen)"
-#: ../pyhoca/wxgui/menus_taskbar.py:266 ../pyhoca/wxgui/menus_taskbar.py:616
+#: ../pyhoca/wxgui/menus_taskbar.py:272 ../pyhoca/wxgui/menus_taskbar.py:639
msgid "Terminate Session"
msgstr "Sitzung beenden"
-#: ../pyhoca/wxgui/menus_taskbar.py:270 ../pyhoca/wxgui/menus_taskbar.py:596
+#: ../pyhoca/wxgui/menus_taskbar.py:275
+msgid "End Desktop Sharing (and disconnect/exit)"
+msgstr "Desktopsharing beenden (und Verbindung trennen / Anwendung beenden)"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:277
+msgid "End Desktop Sharing (and disconnect)"
+msgstr "Desktopsharing beenden (und Verbindung trennen)"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:279
+msgid "End Desktop Sharing"
+msgstr "Desktopsharing beenden"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:283 ../pyhoca/wxgui/menus_taskbar.py:619
msgid "Refresh menu tree"
msgstr "MenÃŧbaum aktualisieren"
-#: ../pyhoca/wxgui/menus_taskbar.py:279
+#: ../pyhoca/wxgui/menus_taskbar.py:292
msgid "Rename Session Window"
msgstr "Sitzungsfenster umbenennen"
-#: ../pyhoca/wxgui/menus_taskbar.py:280
+#: ../pyhoca/wxgui/menus_taskbar.py:293
msgid "Show Session Window"
msgstr "Sitzungsfenster anzeigen"
-#: ../pyhoca/wxgui/menus_taskbar.py:322
+#: ../pyhoca/wxgui/menus_taskbar.py:335
msgid "&Share custom local folder"
msgstr "Lokalen Ordner fÃŧr &Freigabe wählen"
-#: ../pyhoca/wxgui/menus_taskbar.py:337
+#: ../pyhoca/wxgui/menus_taskbar.py:350
msgid "Share:"
msgstr "Freigeben:"
-#: ../pyhoca/wxgui/menus_taskbar.py:346
+#: ../pyhoca/wxgui/menus_taskbar.py:359
msgid "Unshare:"
msgstr "Aushängen:"
-#: ../pyhoca/wxgui/menus_taskbar.py:354
+#: ../pyhoca/wxgui/menus_taskbar.py:367
msgid "Unshare &all local folders"
msgstr "Alle aushängen"
-#: ../pyhoca/wxgui/menus_taskbar.py:360
+#: ../pyhoca/wxgui/menus_taskbar.py:373
msgid "Restore shares in next session"
msgstr "Freigaben in nächster Sitzung wiederherstellen"
-#: ../pyhoca/wxgui/menus_taskbar.py:440
+#: ../pyhoca/wxgui/menus_taskbar.py:453
msgid "Multimedia"
msgstr "Multimedia"
-#: ../pyhoca/wxgui/menus_taskbar.py:441
+#: ../pyhoca/wxgui/menus_taskbar.py:454
msgid "Development"
msgstr "Entwicklung"
-#: ../pyhoca/wxgui/menus_taskbar.py:442
+#: ../pyhoca/wxgui/menus_taskbar.py:455
msgid "Education"
msgstr "Bildung"
-#: ../pyhoca/wxgui/menus_taskbar.py:443
+#: ../pyhoca/wxgui/menus_taskbar.py:456
msgid "Games"
msgstr "Spiele"
-#: ../pyhoca/wxgui/menus_taskbar.py:444
+#: ../pyhoca/wxgui/menus_taskbar.py:457
msgid "Graphics"
msgstr "Grafik"
-#: ../pyhoca/wxgui/menus_taskbar.py:445
+#: ../pyhoca/wxgui/menus_taskbar.py:458
msgid "Internet"
msgstr "Internet"
-#: ../pyhoca/wxgui/menus_taskbar.py:446
+#: ../pyhoca/wxgui/menus_taskbar.py:459
msgid "Office Applications"
msgstr "BÃŧroanwendungen"
-#: ../pyhoca/wxgui/menus_taskbar.py:447
+#: ../pyhoca/wxgui/menus_taskbar.py:460
msgid "System"
msgstr "System"
-#: ../pyhoca/wxgui/menus_taskbar.py:448
+#: ../pyhoca/wxgui/menus_taskbar.py:461
msgid "Utilities"
msgstr "Dienstprogramme"
-#: ../pyhoca/wxgui/menus_taskbar.py:449
+#: ../pyhoca/wxgui/menus_taskbar.py:462
msgid "Other Applications"
msgstr "Weitere Anwendungen"
-#: ../pyhoca/wxgui/menus_taskbar.py:521 ../pyhoca/wxgui/menus_taskbar.py:533
+#: ../pyhoca/wxgui/menus_taskbar.py:535 ../pyhoca/wxgui/menus_taskbar.py:547
#, python-format
msgid "Connect %s"
msgstr "Mit %s verbinden"
-#: ../pyhoca/wxgui/menus_taskbar.py:527
+#: ../pyhoca/wxgui/menus_taskbar.py:541
msgid "Currently connecting..."
msgstr "Verbindung wird aufgebaut..."
-#: ../pyhoca/wxgui/menus_taskbar.py:541
+#: ../pyhoca/wxgui/menus_taskbar.py:556
msgid "Start &new Desktop Session"
msgstr "&Neue Desktopsitzung starten"
-#: ../pyhoca/wxgui/menus_taskbar.py:546 ../pyhoca/wxgui/menus_taskbar.py:684
+#: ../pyhoca/wxgui/menus_taskbar.py:560 ../pyhoca/wxgui/menus_taskbar.py:660
+msgid "Start Desktop Sharing Session"
+msgstr "Desktopsharing Sitzung starten"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:566 ../pyhoca/wxgui/menus_taskbar.py:710
msgid "Retrieving Application Menu..."
msgstr "Hole AnwendungsmenÃŧ..."
-#: ../pyhoca/wxgui/menus_taskbar.py:550 ../pyhoca/wxgui/menus_taskbar.py:687
+#: ../pyhoca/wxgui/menus_taskbar.py:570 ../pyhoca/wxgui/menus_taskbar.py:713
msgid "Retrieve Application Menu"
msgstr "Hole AnwendungsmenÃŧ"
-#: ../pyhoca/wxgui/menus_taskbar.py:553
+#: ../pyhoca/wxgui/menus_taskbar.py:573
+msgid "Start &new RDP Session"
+msgstr "&Neue RDP-Sitzung starten"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:576
msgid "Start &new Session"
msgstr "&Neue Sitzung starten"
-#: ../pyhoca/wxgui/menus_taskbar.py:633
+#: ../pyhoca/wxgui/menus_taskbar.py:656
msgid "Launch Single Application"
msgstr "Einzelne Anwendung starten"
-#: ../pyhoca/wxgui/menus_taskbar.py:671
+#: ../pyhoca/wxgui/menus_taskbar.py:697
msgid "Manage Application Menu"
msgstr "AnwendungsmenÃŧ verwalten"
-#: ../pyhoca/wxgui/menus_taskbar.py:714
+#: ../pyhoca/wxgui/menus_taskbar.py:752
msgid "Running"
msgstr "aktiv"
-#: ../pyhoca/wxgui/menus_taskbar.py:716
+#: ../pyhoca/wxgui/menus_taskbar.py:754
msgid "Suspended"
msgstr "angehalten"
-#: ../pyhoca/wxgui/menus_taskbar.py:735
+#: ../pyhoca/wxgui/menus_taskbar.py:773
msgid "&Clean all sessions"
msgstr "Alle Sitzungen beenden"
-#: ../pyhoca/wxgui/menus_taskbar.py:741
+#: ../pyhoca/wxgui/menus_taskbar.py:779
msgid "Customize &profile"
msgstr "Sitzungsprofil anpassen"
-#: ../pyhoca/wxgui/menus_taskbar.py:756
+#: ../pyhoca/wxgui/menus_taskbar.py:794
msgid "Shared &folders"
msgstr "Freigegebene Ordner"
-#: ../pyhoca/wxgui/menus_taskbar.py:768
+#: ../pyhoca/wxgui/menus_taskbar.py:806
+msgid "Server Information"
+msgstr "Server-Information"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:813
msgid "&Disconnect from Server"
msgstr "Von Server trennen"
-#: ../pyhoca/wxgui/menus_taskbar.py:775
+#: ../pyhoca/wxgui/menus_taskbar.py:820
msgid "Suspend Session and E&xit application"
msgstr "Sitzung anhalten und Anwendung beenden"
-#: ../pyhoca/wxgui/menus_taskbar.py:779
+#: ../pyhoca/wxgui/menus_taskbar.py:824
msgid "Disconnect and E&xit application"
msgstr "Verbindung Trennen und Anwendung schlieÃen"
-#: ../pyhoca/wxgui/menus_taskbar.py:833
+#: ../pyhoca/wxgui/menus_taskbar.py:878
msgid "Add Profile"
msgstr "Sitzungsprofil hinzufÃŧgen"
-#: ../pyhoca/wxgui/menus_taskbar.py:909
+#: ../pyhoca/wxgui/menus_taskbar.py:954
msgid "No session profiles defined"
msgstr "keine Sitzungsprofile definiert"
-#: ../pyhoca/wxgui/menus_taskbar.py:945
-msgid "Start/Resume Session"
-msgstr "Sitzung starten/fortsetzen"
+#: ../pyhoca/wxgui/menus_taskbar.py:965
+msgid "Export all Profiles"
+msgstr "Alle Sitzungsprofile exportieren"
-#: ../pyhoca/wxgui/menus_taskbar.py:945
+#: ../pyhoca/wxgui/menus_taskbar.py:967
+msgid "Export Profile Group"
+msgstr "Sitzungsprofilgruppe exportieren"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:1003
msgid "Connect Server"
msgstr "Serververbindung aufbauen"
@@ -965,65 +1025,65 @@ msgstr "Serververbindung aufbauen"
msgid "About %s ..."
msgstr "Ãber %s ..."
-#: ../pyhoca/wxgui/frontend.py:459
+#: ../pyhoca/wxgui/frontend.py:465
msgid "Suspending sessions and exiting application..."
msgstr "Sitzungen werden angehalten und Programm beendet..."
-#: ../pyhoca/wxgui/frontend.py:462
+#: ../pyhoca/wxgui/frontend.py:468
#, python-format
msgid "Disconnecting %s and exiting application..."
msgstr "Trenne %s und schlieÃe Anwendung..."
-#: ../pyhoca/wxgui/frontend.py:464
+#: ../pyhoca/wxgui/frontend.py:470
msgid "Exiting application..."
msgstr "Programm wird beendet..."
-#: ../pyhoca/wxgui/frontend.py:562
+#: ../pyhoca/wxgui/frontend.py:568
#, python-format
msgid "%s - server warning"
msgstr "%s - Serverwarnung"
-#: ../pyhoca/wxgui/frontend.py:562
+#: ../pyhoca/wxgui/frontend.py:568
msgid "The X2Go Server does not publish an application menu."
msgstr "Der X2Go-Server publiziert kein AnwendungsmenÃŧ."
-#: ../pyhoca/wxgui/frontend.py:613
+#: ../pyhoca/wxgui/frontend.py:619
msgid "SSH key authentication has been successful."
msgstr "Authentifizierung mit SSH SchlÃŧssel war erfolgreich."
-#: ../pyhoca/wxgui/frontend.py:650
+#: ../pyhoca/wxgui/frontend.py:656
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:671
+#: ../pyhoca/wxgui/frontend.py:677
#, python-format
msgid "%s - EOF error"
msgstr "%s - EOF-Fehler"
-#: ../pyhoca/wxgui/frontend.py:671
+#: ../pyhoca/wxgui/frontend.py:677
msgid "Authentication protocol communication incomplete! Try again..."
msgstr ""
"Kommunikation während Authentifizierungsprotokoll unvollständig! Nochmal "
"versuchen..."
-#: ../pyhoca/wxgui/frontend.py:678
+#: ../pyhoca/wxgui/frontend.py:684
#, python-format
msgid "%s - auth key error"
msgstr "%s - ungÃŧltiger BenutzerschlÃŧssel"
-#: ../pyhoca/wxgui/frontend.py:699
+#: ../pyhoca/wxgui/frontend.py:705
msgid "An unknown error occurred during authentication!"
msgstr "Ein unbekannter Fehler ist während der Serveranmeldung aufgetreten!"
-#: ../pyhoca/wxgui/frontend.py:728
+#: ../pyhoca/wxgui/frontend.py:734
#, python-format
msgid "%s: DirectRDP not supported yet"
msgstr "%s: DirectRDP noch nicht unterstÃŧtzt"
-#: ../pyhoca/wxgui/frontend.py:729
+#: ../pyhoca/wxgui/frontend.py:735
#, python-format
msgid ""
"We apologize for the inconvenience...\n"
@@ -1031,66 +1091,158 @@ msgid ""
"Session profiles of type ,,DirectRDP'' are not\n"
"supported by %s (%s), yet!!\n"
"\n"
-"DirectRDP support will be available in %s (>= 0.2.2.0)."
+"DirectRDP support will be available in %s (>= 1.0.0.0)."
msgstr ""
"Entschuldigung...\n"
"\n"
"Sitzungsprofile vom Typ ,,DirectRDP'' werden momentan von\n"
"%s (%s) noch nicht unterstÃŧtzt!!\n"
"\n"
-"DirectRDP wird in %s (>= 0.2.2.0) verfÃŧgbar sein."
+"DirectRDP wird in %s (>= 1.0.0.0) verfÃŧgbar sein."
-#: ../pyhoca/wxgui/frontend.py:741
+#: ../pyhoca/wxgui/frontend.py:747
msgid "Unknown session profile, configure before using it..."
msgstr "Unbekanntes Sitzungsprofil, vor Benutzung bitte einrichten..."
-#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:1332
+#: ../pyhoca/wxgui/frontend.py:778
+#, python-format
+msgid "Desktop Sharing with %s not supported by server"
+msgstr "Desktopsharing mit %s wird vom Server nicht unterstÃŧtzt"
+
+#: ../pyhoca/wxgui/frontend.py:779
+#, python-format
+msgid ""
+"We apologize for the inconvenience...\n"
+"\n"
+"Session profiles of type ,,SHADOW'' are not\n"
+"supported by X2Go Server (v%s)!!!\n"
+"\n"
+"Desktop Sharing with %s requires\n"
+"X2Go Server 4.1.0.0 and above."
+msgstr ""
+"Entschuldigung...\n"
+"\n"
+"Sitzungsprofile vom Typ ,,SHADOW'' werden vom\n"
+"X2Go Server (v%s) nicht unterstÃŧtzt!!\n"
+"\n"
+"Desktopsharing mit %s erfordert\n"
+"X2Go Server 4.1.0.0 oder hÃļher."
+
+#: ../pyhoca/wxgui/frontend.py:837 ../pyhoca/wxgui/frontend.py:1488
#, python-format
msgid "%s - session warning"
msgstr "%s - Sitzungsfunktion eingeschränkt"
-#: ../pyhoca/wxgui/frontend.py:798
+#: ../pyhoca/wxgui/frontend.py:837
#, python-format
msgid "Execution of command ,,%s'' failed."
msgstr "Das AusfÃŧhren des Befehls ,,%s'' ist fehlgeschlagen."
-#: ../pyhoca/wxgui/frontend.py:939
+#: ../pyhoca/wxgui/frontend.py:978
msgid "Cleaning X2Go sessions..."
msgstr "Beende X2Go Sitzungen..."
-#: ../pyhoca/wxgui/frontend.py:974
+#: ../pyhoca/wxgui/frontend.py:1026
#, python-format
msgid "%s - disconnect"
msgstr "%s - trennen"
-#: ../pyhoca/wxgui/frontend.py:974
+#: ../pyhoca/wxgui/frontend.py:1026
msgid "X2Go Profile is now disconnected."
msgstr "X2Go Profil ist nun nicht mehr verbunden."
-#: ../pyhoca/wxgui/frontend.py:995
+#: ../pyhoca/wxgui/frontend.py:1047
msgid "New Session Profile"
msgstr "Neues Sitzungsprofil"
-#: ../pyhoca/wxgui/frontend.py:1047
+#: ../pyhoca/wxgui/frontend.py:1102
#, python-format
msgid "Really Delete Session Profile ,,%s''?"
msgstr "Das Sitzungsprofil ,,%s'' wirklich lÃļschen?"
-#: ../pyhoca/wxgui/frontend.py:1053
+#: ../pyhoca/wxgui/frontend.py:1108
#, python-format
msgid "%s - profile deleted"
msgstr "%s - Profil gelÃļscht"
-#: ../pyhoca/wxgui/frontend.py:1053
+#: ../pyhoca/wxgui/frontend.py:1108
msgid "The session profile has been deleted."
msgstr "Das Sitzungsprofil wurde gelÃļscht."
-#: ../pyhoca/wxgui/frontend.py:1071
+#: ../pyhoca/wxgui/frontend.py:1137
+#, python-format
+msgid "%s - export session profiles"
+msgstr "%s - Sitzungsprofile exportieren"
+
+#: ../pyhoca/wxgui/frontend.py:1142
+#, python-format
+msgid "%s - export session profile"
+msgstr "%s - Sitzungsprofil exportieren"
+
+#: ../pyhoca/wxgui/frontend.py:1154
+#, python-format
+msgid "%s: Export file already exists"
+msgstr "%s: Export-Datei existiert bereits"
+
+#: ../pyhoca/wxgui/frontend.py:1155
+#, python-format
+msgid ""
+"The file Âģ%sÂĢ already exists in this folder.\n"
+"\n"
+"Do you want to replace it?"
+msgstr ""
+"Die Datei ,,%s'' existiert bereits in diesem Ordner.\n"
+"\n"
+"Soll die Datei ersetzt werden?"
+
+#: ../pyhoca/wxgui/frontend.py:1176
+#, python-format
+msgid "%s - profiles exported"
+msgstr "%s - Sitzungsprofilexport"
+
+#: ../pyhoca/wxgui/frontend.py:1176
+#, python-format
+msgid "Successfully exported session profile group Âģ%sÂĢ to file Âģ%sÂĢ."
+msgstr ""
+"Der Export der Sitzungsprofilgruppe ,,%s'' in Datei ,,%s'' war erfolgreich."
+
+#: ../pyhoca/wxgui/frontend.py:1178
+#, python-format
+msgid "%s - profile exported"
+msgstr "%s - Sitzungsprofilexport"
+
+#: ../pyhoca/wxgui/frontend.py:1178
+#, python-format
+msgid "Successfully exported single session profile Âģ%sÂĢ to file Âģ%sÂĢ."
+msgstr ""
+"Der Export des einzelnen Sitzungsprofils ,,%s'' in Datei ,,%s'' war "
+"erfolgreich."
+
+#: ../pyhoca/wxgui/frontend.py:1182
+#, python-format
+msgid "%s: Exporting session profile(s) failed"
+msgstr "%s: Export von Sitzungsprofil(en) ist fehlgeschlagen"
+
+#: ../pyhoca/wxgui/frontend.py:1183
+#, python-format
+msgid ""
+"The selected session profile(s) could not be exported to the \n"
+"file Âģ%sÂĢ.\n"
+"\n"
+"Check for common problems (disk full, insufficient access, etc.)."
+msgstr ""
+"Die/das ausgewählte(n) Sitzungsprofil(e) konnte(n) nicht exportiert\n"
+"werden in Datei ,,%s''.\n"
+"\n"
+"Bitte häufige Fehlerursachen prÃŧfen (Datenträger voll, unzureichender "
+"Zugriff, usw)."
+
+#: ../pyhoca/wxgui/frontend.py:1202
#, 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:1224
+#: ../pyhoca/wxgui/frontend.py:1355
#, python-format
msgid ""
"The authenticity of host [%s]:%s can't be established.\n"
@@ -1103,17 +1255,17 @@ msgstr ""
"\n"
"Sind Sie sicher, dass sie fortfahren mÃļchten? "
-#: ../pyhoca/wxgui/frontend.py:1232
+#: ../pyhoca/wxgui/frontend.py:1363
#, python-format
msgid "%s: Confirm Host Authorization"
msgstr "%s: Echtheit des Servers bestätigen"
-#: ../pyhoca/wxgui/frontend.py:1277
+#: ../pyhoca/wxgui/frontend.py:1409
#, python-format
msgid "%s - channel error"
msgstr "%s - Verbindungsfehler"
-#: ../pyhoca/wxgui/frontend.py:1277
+#: ../pyhoca/wxgui/frontend.py:1409
#, python-format
msgid ""
"Lost connection to server %s unexpectedly! Try to re-authenticate to the "
@@ -1122,22 +1274,45 @@ msgstr ""
"Die Verbindung zum Server %s wurde unerwartet unterbrochen! Bitte versuchen "
"Sie, sich neu am Server anzumelden..."
-#: ../pyhoca/wxgui/frontend.py:1295 ../pyhoca/wxgui/frontend.py:1313
-#: ../pyhoca/wxgui/frontend.py:1315 ../pyhoca/wxgui/frontend.py:1351
+#: ../pyhoca/wxgui/frontend.py:1426 ../pyhoca/wxgui/frontend.py:1469
+#: ../pyhoca/wxgui/frontend.py:1471 ../pyhoca/wxgui/frontend.py:1507
#, python-format
msgid "%s - session failure"
msgstr "%s - Verbindung fehlgeschlagen"
-#: ../pyhoca/wxgui/frontend.py:1295
+#: ../pyhoca/wxgui/frontend.py:1426
msgid "The session startup failed."
msgstr "Der Start der Sitzung ist fehlgeschlagen."
-#: ../pyhoca/wxgui/frontend.py:1313
+#: ../pyhoca/wxgui/frontend.py:1439
+#, python-format
+msgid "%s - timeout"
+msgstr "%s - ZeitÃŧberschreitung"
+
+#: ../pyhoca/wxgui/frontend.py:1439
+msgid ""
+"The server took long to provide a list of sharable desktops.\n"
+"This can happen from time to time, please try again"
+msgstr ""
+"Der Server hat in der erlaubten Zeit keine Desktop-Liste geliefert.\n"
+"Dies kann manchmal vorkommen, bitte noch einmal versuchen."
+
+#: ../pyhoca/wxgui/frontend.py:1451
+#, python-format
+msgid "%s - desktop sharing failed"
+msgstr "%s - Desktopsharing fehlgeschlagen"
+
+#: ../pyhoca/wxgui/frontend.py:1451
+#, python-format
+msgid "The desktop %s is not available for sharing (anymore)."
+msgstr "Der Desktop %s ist fÃŧr Desktopsharing nicht (mehr) verfÃŧgbar."
+
+#: ../pyhoca/wxgui/frontend.py:1469
#, python-format
msgid "The command ,,%s'' is not available on X2Go server."
msgstr "Der Befehl ,,%s'' ist auf dem X2Go Server nicht verfÃŧgbar."
-#: ../pyhoca/wxgui/frontend.py:1315
+#: ../pyhoca/wxgui/frontend.py:1471
#, python-format
msgid ""
"The command ,,%s'' is not available on X2Go server\n"
@@ -1146,7 +1321,7 @@ msgstr ""
"Der Befehl ,,%s'' ist auf dem X2Go Server nicht verfÃŧgbar\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1332
+#: ../pyhoca/wxgui/frontend.py:1488
#, python-format
msgid ""
"Reverse TCP port forwarding request for session %s to server port %s has "
@@ -1155,46 +1330,46 @@ msgstr ""
"Eine Reverse TCP Port Weiterleitungsanfrage fÃŧr Sitzung %s an Serverport %s "
"wurde vom X2Go Server abgelehnt."
-#: ../pyhoca/wxgui/frontend.py:1351
+#: ../pyhoca/wxgui/frontend.py:1507
#, python-format
msgid ""
"Forwarding tunnel request to [%s]:%s for session %s was denied by remote "
-"X2go/SSH server. Session startup failed."
+"X2Go/SSH server. Session startup failed."
msgstr ""
-"SSH Forwarding Tunnel zu [%s]:%s wurde fÃŧr Sitzung %s vom X2go/SSH Server "
+"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:1370
+#: ../pyhoca/wxgui/frontend.py:1526
#, python-format
msgid "%s - audio warning"
msgstr "%s - Warnung Audiosystem"
-#: ../pyhoca/wxgui/frontend.py:1370
+#: ../pyhoca/wxgui/frontend.py:1526
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:1377 ../pyhoca/wxgui/frontend.py:1384
+#: ../pyhoca/wxgui/frontend.py:1533 ../pyhoca/wxgui/frontend.py:1540
#, python-format
msgid "%s - audio error"
msgstr "%s - Audiofehler"
-#: ../pyhoca/wxgui/frontend.py:1377
+#: ../pyhoca/wxgui/frontend.py:1533
msgid "The X2Go PulseAudio system could not be started."
msgstr "Das X2Go PulseAudio System konnte nicht gestartet werden."
-#: ../pyhoca/wxgui/frontend.py:1384
+#: ../pyhoca/wxgui/frontend.py:1540
msgid "The X2Go PulseAudio system has died unexpectedly."
msgstr "Das X2Go PulseAudio System ist soeben abgestÃŧrzt."
-#: ../pyhoca/wxgui/frontend.py:1396
+#: ../pyhoca/wxgui/frontend.py:1552
#, python-format
msgid "%s - audio problem"
msgstr "%s - Audioproblem"
-#: ../pyhoca/wxgui/frontend.py:1396
+#: ../pyhoca/wxgui/frontend.py:1552
#, python-format
msgid ""
"The audio connection could not be set up for this session.\n"
@@ -1203,12 +1378,12 @@ msgstr ""
"Die Audio-Verbindung fÃŧr diese Sitzung konnte nicht aufgebaut werden.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1408
+#: ../pyhoca/wxgui/frontend.py:1564
#, python-format
msgid "%s - client-side printing not available"
msgstr "%s - Client-seitiges Drucken nicht verfÃŧgbar"
-#: ../pyhoca/wxgui/frontend.py:1408
+#: ../pyhoca/wxgui/frontend.py:1564
#, python-format
msgid ""
"The server denies client-side printing from within this session.\n"
@@ -1218,12 +1393,12 @@ msgstr ""
"Server verweigert die Verbindung.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1420
+#: ../pyhoca/wxgui/frontend.py:1576
#, python-format
msgid "%s - MIME box not available"
msgstr "%s - MIME box nicht verfÃŧgbar"
-#: ../pyhoca/wxgui/frontend.py:1420
+#: ../pyhoca/wxgui/frontend.py:1576
#, python-format
msgid ""
"The server does not support the X2Go MIME box.\n"
@@ -1232,12 +1407,12 @@ msgstr ""
"Der Server unterstÃŧtzt die X2Go MIME box nicht.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1432
+#: ../pyhoca/wxgui/frontend.py:1588
#, python-format
msgid "%s - client-side folders not sharable"
msgstr "%s - keine Freigabe Client-seitiger Ordner"
-#: ../pyhoca/wxgui/frontend.py:1432
+#: ../pyhoca/wxgui/frontend.py:1588
#, python-format
msgid ""
"The server denies client-side folder sharing with this session.\n"
@@ -1247,12 +1422,12 @@ msgstr ""
"Server verweigert die Verbindung.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1444
+#: ../pyhoca/wxgui/frontend.py:1600
#, python-format
msgid "%s - client resources not sharable"
msgstr "%s - keine Client-seitigen Ordner- und Druckerfreigaben mÃļglich"
-#: ../pyhoca/wxgui/frontend.py:1444
+#: ../pyhoca/wxgui/frontend.py:1600
#, python-format
msgid ""
"Client-side folders and printers cannot be shared with this session.\n"
@@ -1262,12 +1437,12 @@ msgstr ""
"werden.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1463 ../pyhoca/wxgui/frontend.py:1465
+#: ../pyhoca/wxgui/frontend.py:1619 ../pyhoca/wxgui/frontend.py:1621
#, python-format
msgid "%s - print error"
msgstr "%s - Druckfehler"
-#: ../pyhoca/wxgui/frontend.py:1463
+#: ../pyhoca/wxgui/frontend.py:1619
#, python-format
msgid ""
"%s\n"
@@ -1278,7 +1453,7 @@ msgstr ""
"...verursacht an Drucker durch Sitzung\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1465
+#: ../pyhoca/wxgui/frontend.py:1621
#, python-format
msgid ""
"%s\n"
@@ -1289,12 +1464,12 @@ msgstr ""
"...verursacht von Sitzung\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1480 ../pyhoca/wxgui/frontend.py:1495
+#: ../pyhoca/wxgui/frontend.py:1636 ../pyhoca/wxgui/frontend.py:1651
#, python-format
msgid "%s - start"
msgstr "%s - starten"
-#: ../pyhoca/wxgui/frontend.py:1480
+#: ../pyhoca/wxgui/frontend.py:1636
#, python-format
msgid ""
"New X2Go session starting up...\n"
@@ -1303,7 +1478,7 @@ msgstr ""
"Neue X2Go Sitzung wird gestartet...\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1495
+#: ../pyhoca/wxgui/frontend.py:1651
#, python-format
msgid ""
"Another client started X2Go session\n"
@@ -1312,12 +1487,12 @@ msgstr ""
"Ein anderes X2Go Programm hat diese Sitzung gestartet\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1510 ../pyhoca/wxgui/frontend.py:1525
+#: ../pyhoca/wxgui/frontend.py:1666 ../pyhoca/wxgui/frontend.py:1681
#, python-format
msgid "%s - resume"
msgstr "%s - fortsetzen"
-#: ../pyhoca/wxgui/frontend.py:1510
+#: ../pyhoca/wxgui/frontend.py:1666
#, python-format
msgid ""
"Resuming X2Go session...\n"
@@ -1326,7 +1501,7 @@ msgstr ""
"X2Go Sitzung wird fortgesetzt...\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1525
+#: ../pyhoca/wxgui/frontend.py:1681
#, python-format
msgid ""
"Another client resumed X2Go session\n"
@@ -1335,12 +1510,12 @@ msgstr ""
"Eine andere X2Go Anwendung hat die Sitzung fortgesetzt\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1540
+#: ../pyhoca/wxgui/frontend.py:1696
#, python-format
msgid "%s - running"
msgstr "%s - aktiv"
-#: ../pyhoca/wxgui/frontend.py:1540
+#: ../pyhoca/wxgui/frontend.py:1696
#, python-format
msgid ""
"Found already running session\n"
@@ -1349,12 +1524,12 @@ msgstr ""
"Bereits aktive Sitzung gefunden\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1560
+#: ../pyhoca/wxgui/frontend.py:1716
#, python-format
msgid "%s - suspend"
msgstr "%s - anhalten"
-#: ../pyhoca/wxgui/frontend.py:1560
+#: ../pyhoca/wxgui/frontend.py:1716
#, python-format
msgid ""
"X2Go Session has been suspended\n"
@@ -1363,12 +1538,12 @@ msgstr ""
"X2Go Sitzung wurde angehalten\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1587
+#: ../pyhoca/wxgui/frontend.py:1743
#, python-format
msgid "%s - terminate"
msgstr "%s - beenden"
-#: ../pyhoca/wxgui/frontend.py:1587
+#: ../pyhoca/wxgui/frontend.py:1743
#, python-format
msgid ""
"X2Go Session has terminated\n"
@@ -1377,7 +1552,7 @@ msgstr ""
"X2Go Sitzung wurde beendet\n"
"%s"
-#: ../pyhoca/wxgui/messages.py:73
+#: ../pyhoca/wxgui/messages.py:72
#, python-format
msgid ""
"Are you really sure you want to\n"
@@ -1387,7 +1562,7 @@ msgstr ""
"das Sitzungsprofil ,,%s''\n"
"wirklich lÃļschen mÃļchten?"
-#: ../pyhoca/wxgui/messages.py:74
+#: ../pyhoca/wxgui/messages.py:73
#, python-format
msgid ""
"PyHoca-GUI is already running for user ,,%s''!\n"
@@ -1402,15 +1577,15 @@ msgstr ""
"gestartet werden. Das PyHoca-GUI Icon befindet sich auf\n"
"Ihrem Desktop in der Benachrichtigungsleiste."
-#: ../pyhoca/wxgui/messages.py:107
+#: ../pyhoca/wxgui/messages.py:106
msgid "Yes"
msgstr "Ja"
-#: ../pyhoca/wxgui/messages.py:108
+#: ../pyhoca/wxgui/messages.py:107
msgid "No"
msgstr "Nein"
-#: ../pyhoca/wxgui/messages.py:125 ../pyhoca/wxgui/printingprefs.py:142
+#: ../pyhoca/wxgui/messages.py:124 ../pyhoca/wxgui/printingprefs.py:142
msgid "Ok"
msgstr "OK"
@@ -1476,10 +1651,6 @@ msgstr "Hier drucken"
msgid "Custom print command"
msgstr "Benutzerdef. Druckkommando"
-#: ../pyhoca/wxgui/printingprefs.py:143
-msgid "Apply"
-msgstr "Anwenden"
-
#: ../pyhoca/wxgui/printingprefs.py:145
msgid "Print"
msgstr "Drucken"
@@ -1513,12 +1684,82 @@ msgstr "Sitzungsfenster umbenennen in"
msgid "OK"
msgstr "Ok"
+#: ../pyhoca/wxgui/serverinfo.py:76
+#, python-format
+msgid "Server Information - %s"
+msgstr "Server-Informationen - %s"
+
+#: ../pyhoca/wxgui/serverinfo.py:78
+#, python-format
+msgid ""
+"Session Profile: %s\n"
+"\n"
+"List of X2Go Server components, add-ons and their versions..."
+msgstr ""
+"Sitzungsprofil: %s\n"
+"\n"
+"Liste der X2Go Server Komponenten, Add-Ons und Versionsnummern..."
+
+#: ../pyhoca/wxgui/serverinfo.py:83
+msgid "Refresh"
+msgstr "Aktualisieren"
+
+#: ../pyhoca/wxgui/serverinfo.py:84
+msgid "Close"
+msgstr "SchlieÃen"
+
+#: ../pyhoca/wxgui/serverinfo.py:153
+msgid "X2Go Server"
+msgstr "X2Go Server"
+
+#: ../pyhoca/wxgui/serverinfo.py:154
+msgid "Server Core"
+msgstr "Server-Kern"
+
+#: ../pyhoca/wxgui/serverinfo.py:162
+msgid "Server Extensions"
+msgstr "Server-Erweiterungen"
+
+#: ../pyhoca/wxgui/serverinfo.py:168
+msgid "X2Go Server Add-ons"
+msgstr "X2Go Server Add-Ons"
+
+#: ../pyhoca/wxgui/serverinfo.py:172
+msgid "X2Go Server Features"
+msgstr "Besondere X2Go Server Merkmale"
+
+#~ msgid "Settings"
+#~ msgstr "Einstellungen"
+
#, fuzzy
-#~ msgid "Remember shared folders"
-#~ msgstr "Freigegebene Ordner"
+#~ msgid "%s (%s)\n"
+#~ msgstr "%s (via %s)"
+
+#, fuzzy
+#~ msgid "Connect to another Desktop Session"
+#~ msgstr "&Neue Desktopsitzung starten"
+
+#~ msgid "Start/Resume Session"
+#~ msgstr "Sitzung starten/fortsetzen"
+
+#~ msgid "SSH Proxy Tunnel"
+#~ msgstr "SSH-Proxytunnel"
+
+#~ msgid "The SSH proxy configuration is incomplete. Try again."
+#~ msgstr ""
+#~ "Die SSH Proxy Konfiguration ist unvollständig. Bitte nochmal versuchen."
+
+#~ msgid ""
+#~ "Another session profile (%s) already uses [%s]:%s for binding a local SSH "
+#~ "proxy to.\n"
+#~ "Please change the SSH proxy settings accordingly."
+#~ msgstr ""
+#~ "Ein anderes Profil (%s) verwendet die Socketadresse [%s]:%s bereits, um "
+#~ "einen lokalen SSH Proxy Port daran zu binden. Bitte die SSH Proxy "
+#~ "Einstellungen entsprechend ändern."
#, fuzzy
-#~ msgid "Shared Resources"
+#~ msgid "Remember shared folders"
#~ msgstr "Freigegebene Ordner"
#~ msgid "RSA/DSA private key"
@@ -1555,9 +1796,6 @@ msgstr "Ok"
#~ msgid "%s - connect error"
#~ msgstr "%s - Verbindungsfehler"
-#~ msgid "new session profile"
-#~ msgstr "neues Sitzungsprofil"
-
#~ msgid "Exiting..."
#~ msgstr "Programm wird beendet..."
diff --git a/po/en.po b/po/en.po
index f706bbb..4338629 100644
--- a/po/en.po
+++ b/po/en.po
@@ -1,5 +1,5 @@
# PyHoca-GUI / i18n.
-# Copyright (C) 2010-2012 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
# Dick Kniep <dick.kniep(a)lindix.nl>
# This file is distributed under the same license as the PyHoca-GUI package.
# Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>, 2011.
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: PyHoca-GUI VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 14:25+0100\n"
-"PO-Revision-Date: 2012-11-26 14:22+0100\n"
+"POT-Creation-Date: 2013-01-29 22:21+0100\n"
+"PO-Revision-Date: 2013-01-22 07:36+0100\n"
"Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n"
"Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n"
"Language: \n"
@@ -38,8 +38,8 @@ msgid "Authenticate"
msgstr "Authenticate"
#: ../pyhoca/wxgui/logon.py:107
-msgid " Start SSH tunnel "
-msgstr " Start SSH tunnel "
+msgid "Start SSH tunnel"
+msgstr "Start SSH tunnel"
#: ../pyhoca/wxgui/logon.py:115
msgid "Session login"
@@ -49,23 +49,23 @@ msgstr "Session login"
msgid "SSH proxy server login"
msgstr "SSH proxy server login"
-#: ../pyhoca/wxgui/logon.py:127 ../pyhoca/wxgui/profilemanager.py:350
-#: ../pyhoca/wxgui/messages.py:131 ../pyhoca/wxgui/printingprefs.py:147
-#: ../pyhoca/wxgui/sessiontitle.py:85
+#: ../pyhoca/wxgui/logon.py:127 ../pyhoca/wxgui/profilemanager.py:373
+#: ../pyhoca/wxgui/listdesktops.py:99 ../pyhoca/wxgui/messages.py:130
+#: ../pyhoca/wxgui/printingprefs.py:147 ../pyhoca/wxgui/sessiontitle.py:85
msgid "Cancel"
msgstr "Cancel"
#: ../pyhoca/wxgui/logon.py:297 ../pyhoca/wxgui/logon.py:339
-#: ../pyhoca/wxgui/frontend.py:606
+#: ../pyhoca/wxgui/frontend.py:612
#, python-format
msgid "%s - connect failure"
msgstr "%s - connect failure"
-#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:606
+#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:612
msgid "User is not allowed to start X2Go sessions!"
msgstr "User is not allowed to start X2Go sessions!"
-#: ../pyhoca/wxgui/logon.py:303 ../pyhoca/wxgui/frontend.py:613
+#: ../pyhoca/wxgui/logon.py:303 ../pyhoca/wxgui/frontend.py:619
#, python-format
msgid "%s - connect"
msgstr "%s - connect"
@@ -91,29 +91,29 @@ msgstr "%s - SSH proxy"
msgid "Authentication to the SSH proxy server failed!"
msgstr "Authentication to the SSH proxy server failed!"
-#: ../pyhoca/wxgui/logon.py:376 ../pyhoca/wxgui/frontend.py:664
+#: ../pyhoca/wxgui/logon.py:376 ../pyhoca/wxgui/frontend.py:670
#, python-format
msgid "%s - socket error"
msgstr "%s - socket error"
-#: ../pyhoca/wxgui/logon.py:383 ../pyhoca/wxgui/frontend.py:643
-#: ../pyhoca/wxgui/frontend.py:650
+#: ../pyhoca/wxgui/logon.py:383 ../pyhoca/wxgui/frontend.py:649
+#: ../pyhoca/wxgui/frontend.py:656
#, python-format
msgid "%s - host key error"
msgstr "%s - host key error"
-#: ../pyhoca/wxgui/logon.py:384 ../pyhoca/wxgui/frontend.py:643
+#: ../pyhoca/wxgui/logon.py:384 ../pyhoca/wxgui/frontend.py:649
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:391 ../pyhoca/wxgui/frontend.py:685
+#: ../pyhoca/wxgui/logon.py:391 ../pyhoca/wxgui/frontend.py:691
#, python-format
msgid "%s - missing home directory"
msgstr "%s - missing home directory"
-#: ../pyhoca/wxgui/logon.py:392 ../pyhoca/wxgui/frontend.py:685
+#: ../pyhoca/wxgui/logon.py:392 ../pyhoca/wxgui/frontend.py:691
msgid "The remote user's home directory does not exist."
msgstr "The remote user's home directory does not exist."
@@ -122,12 +122,12 @@ msgstr "The remote user's home directory does not exist."
msgid "%s - key error"
msgstr "%s - key error"
-#: ../pyhoca/wxgui/logon.py:407 ../pyhoca/wxgui/frontend.py:692
+#: ../pyhoca/wxgui/logon.py:407 ../pyhoca/wxgui/frontend.py:698
#, python-format
msgid "%s - auth error"
msgstr "%s - auth error"
-#: ../pyhoca/wxgui/logon.py:415 ../pyhoca/wxgui/frontend.py:636
+#: ../pyhoca/wxgui/logon.py:415 ../pyhoca/wxgui/frontend.py:642
#, python-format
msgid "%s - SSH error"
msgstr "%s - SSH error"
@@ -153,10 +153,10 @@ msgstr ""
#: ../pyhoca/wxgui/taskbar.py:93
#, python-format
msgid ""
-"PyHoca-GUI (Python X2goClient)\n"
+"PyHoca-GUI (Python X2Go Client)\n"
"Currently connecting you to remote X2Go server ,,%s''"
msgstr ""
-"PyHoca-GUI (Python X2goClient)\n"
+"PyHoca-GUI (Python X2Go Client)\n"
"Currently connecting you to remote X2Go server ,,%s''"
#: ../pyhoca/wxgui/taskbar.py:103
@@ -169,10 +169,10 @@ msgstr ""
#: ../pyhoca/wxgui/taskbar.py:107
msgid ""
-"PyHoca-GUI (Python X2goClient)\n"
+"PyHoca-GUI (Python X2Go Client)\n"
"Client for connecting you to a remote X2Go server"
msgstr ""
-"PyHoca-GUI (Python X2goClient)\n"
+"PyHoca-GUI (Python X2Go Client)\n"
"Client for connecting you to a remote X2Go server"
#: ../pyhoca/wxgui/profilemanager.py:79
@@ -208,272 +208,276 @@ msgid "Single Application"
msgstr "Single Application"
#: ../pyhoca/wxgui/profilemanager.py:87
+msgid "Share desktop session (SHADOW)"
+msgstr "Share desktop session (SHADOW)"
+
+#: ../pyhoca/wxgui/profilemanager.py:88
msgid "XDMCP Query"
msgstr "XDMCP Query"
-#: ../pyhoca/wxgui/profilemanager.py:88
+#: ../pyhoca/wxgui/profilemanager.py:89
msgid "Windows Terminal Server (X2Go-proxied RDP)"
msgstr "Windows Terminal Server (X2Go-proxied RDP)"
-#: ../pyhoca/wxgui/profilemanager.py:89
+#: ../pyhoca/wxgui/profilemanager.py:90
msgid "Windows Terminal Server (Direct RDP)"
msgstr "Windows Terminal Server (Direct RDP)"
-#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/profilemanager.py:224
+#: ../pyhoca/wxgui/profilemanager.py:91 ../pyhoca/wxgui/profilemanager.py:243
msgid "Custom command"
msgstr "Custom command"
-#: ../pyhoca/wxgui/profilemanager.py:95 ../pyhoca/wxgui/menus_taskbar.py:393
+#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:406
msgid "Internet Browser"
msgstr "Internet Browser"
-#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:394
+#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:407
msgid "Email Client"
msgstr "Email Client"
-#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:395
+#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:408
msgid "Office"
msgstr "Office"
-#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:396
+#: ../pyhoca/wxgui/profilemanager.py:99 ../pyhoca/wxgui/menus_taskbar.py:409
msgid "Terminal"
msgstr "Terminal"
-#: ../pyhoca/wxgui/profilemanager.py:116
+#: ../pyhoca/wxgui/profilemanager.py:117
msgid "Open file with system's default application"
msgstr "Open file with system's default application"
-#: ../pyhoca/wxgui/profilemanager.py:117
+#: ../pyhoca/wxgui/profilemanager.py:118
msgid "Open application chooser dialog"
msgstr "Open application chooser dialog"
-#: ../pyhoca/wxgui/profilemanager.py:118
+#: ../pyhoca/wxgui/profilemanager.py:119
msgid "Save incoming file as ..."
msgstr "Save incoming file as ..."
-#: ../pyhoca/wxgui/profilemanager.py:146
+#: ../pyhoca/wxgui/profilemanager.py:147
msgid "settings derived from "
msgstr "settings derived from "
#. boxes for all tabs
-#: ../pyhoca/wxgui/profilemanager.py:167
+#: ../pyhoca/wxgui/profilemanager.py:186
msgid "Session Title"
msgstr "Session Title"
-#: ../pyhoca/wxgui/profilemanager.py:168
+#: ../pyhoca/wxgui/profilemanager.py:187
msgid "Session Window"
msgstr "Session Window"
-#: ../pyhoca/wxgui/profilemanager.py:169
+#: ../pyhoca/wxgui/profilemanager.py:188
msgid "Session Startup"
msgstr "Session Startup"
-#: ../pyhoca/wxgui/profilemanager.py:170
+#: ../pyhoca/wxgui/profilemanager.py:189
msgid "Server"
msgstr "Server"
-#: ../pyhoca/wxgui/profilemanager.py:171
+#: ../pyhoca/wxgui/profilemanager.py:190
msgid "Proxy"
msgstr "Proxy"
-#: ../pyhoca/wxgui/profilemanager.py:172
+#: ../pyhoca/wxgui/profilemanager.py:191
msgid "Connection Link Speed"
msgstr "Connection Link Speed"
-#: ../pyhoca/wxgui/profilemanager.py:173
+#: ../pyhoca/wxgui/profilemanager.py:192
msgid "Compression"
msgstr "Compression"
-#: ../pyhoca/wxgui/profilemanager.py:174
+#: ../pyhoca/wxgui/profilemanager.py:193
msgid "Display"
msgstr "Display"
-#: ../pyhoca/wxgui/profilemanager.py:175
+#: ../pyhoca/wxgui/profilemanager.py:194
msgid "Keyboard"
msgstr "Keyboard"
-#: ../pyhoca/wxgui/profilemanager.py:176
+#: ../pyhoca/wxgui/profilemanager.py:195
msgid "Sound"
msgstr "Sound"
-#: ../pyhoca/wxgui/profilemanager.py:177
+#: ../pyhoca/wxgui/profilemanager.py:196
msgid "Printing"
msgstr "Printing"
-#: ../pyhoca/wxgui/profilemanager.py:178
+#: ../pyhoca/wxgui/profilemanager.py:197
msgid "Folder Exports"
msgstr "Folder Exports"
-#: ../pyhoca/wxgui/profilemanager.py:179
+#: ../pyhoca/wxgui/profilemanager.py:198
msgid "File Import"
msgstr "File Import"
#. ##
#. ## widgets for the PROFILE tab
#. ##
-#: ../pyhoca/wxgui/profilemanager.py:184
+#: ../pyhoca/wxgui/profilemanager.py:203
msgid "Name"
msgstr "Name"
-#: ../pyhoca/wxgui/profilemanager.py:191
+#: ../pyhoca/wxgui/profilemanager.py:210
msgid "Set session window title"
msgstr "Set session window title"
-#: ../pyhoca/wxgui/profilemanager.py:192
+#: ../pyhoca/wxgui/profilemanager.py:211
msgid "Use a default session window title"
msgstr "Use a default session window title"
-#: ../pyhoca/wxgui/profilemanager.py:193
+#: ../pyhoca/wxgui/profilemanager.py:212
msgid "Custom session window title"
msgstr "Custom session window title"
-#: ../pyhoca/wxgui/profilemanager.py:212
+#: ../pyhoca/wxgui/profilemanager.py:231
msgid "Window Icon"
msgstr "Window Icon"
#. ##
#. ## widgets for the SESSION tab
#. ##
-#: ../pyhoca/wxgui/profilemanager.py:218
+#: ../pyhoca/wxgui/profilemanager.py:237
msgid "Start session automatically after login"
msgstr "Start session automatically after login"
-#: ../pyhoca/wxgui/profilemanager.py:219
+#: ../pyhoca/wxgui/profilemanager.py:238
#, python-format
-msgid "Login automatically after %s has started"
-msgstr "Login automatically after %s has started"
+msgid "Login automatically after %s has started (needs --auto-connect)"
+msgstr "Login automatically after %s has started (needs --auto-connect)"
-#: ../pyhoca/wxgui/profilemanager.py:220
+#: ../pyhoca/wxgui/profilemanager.py:239
msgid "Type"
msgstr "Type"
-#: ../pyhoca/wxgui/profilemanager.py:222
+#: ../pyhoca/wxgui/profilemanager.py:241
msgid "Application"
msgstr "Application"
-#: ../pyhoca/wxgui/profilemanager.py:226
+#: ../pyhoca/wxgui/profilemanager.py:245
msgid "XDMCP server"
msgstr "XDMCP server"
-#: ../pyhoca/wxgui/profilemanager.py:228
+#: ../pyhoca/wxgui/profilemanager.py:247
msgid "RDP server"
msgstr "RDP server"
-#: ../pyhoca/wxgui/profilemanager.py:230
+#: ../pyhoca/wxgui/profilemanager.py:249
msgid "RDP options"
msgstr "RDP options"
-#: ../pyhoca/wxgui/profilemanager.py:232
+#: ../pyhoca/wxgui/profilemanager.py:251
msgid "Integrate remote application(s) into local desktop (rootless mode)"
msgstr "ntegrate remote application(s) into local desktop (rootless mode)"
-#: ../pyhoca/wxgui/profilemanager.py:233
+#: ../pyhoca/wxgui/profilemanager.py:252
msgid "Menu of published applications"
msgstr "Menu of published applications"
#. ##
#. ## widgets for the CONNECTION tab
#. ##
-#: ../pyhoca/wxgui/profilemanager.py:240 ../pyhoca/wxgui/profilemanager.py:253
+#: ../pyhoca/wxgui/profilemanager.py:259 ../pyhoca/wxgui/profilemanager.py:273
msgid "User"
msgstr "User"
-#: ../pyhoca/wxgui/profilemanager.py:242 ../pyhoca/wxgui/profilemanager.py:260
+#: ../pyhoca/wxgui/profilemanager.py:261 ../pyhoca/wxgui/profilemanager.py:280
msgid "Host"
msgstr "Host"
-#: ../pyhoca/wxgui/profilemanager.py:244 ../pyhoca/wxgui/profilemanager.py:262
+#: ../pyhoca/wxgui/profilemanager.py:263 ../pyhoca/wxgui/profilemanager.py:282
msgid "Port"
msgstr "Port"
-#: ../pyhoca/wxgui/profilemanager.py:246
+#: ../pyhoca/wxgui/profilemanager.py:265
msgid "Key"
msgstr "Key"
-#: ../pyhoca/wxgui/profilemanager.py:249
+#: ../pyhoca/wxgui/profilemanager.py:268
msgid "Discover SSH keys or use SSH agent for X2Go authentication"
msgstr "Discover SSH keys or use SSH agent for X2Go authentication"
-#: ../pyhoca/wxgui/profilemanager.py:251
+#: ../pyhoca/wxgui/profilemanager.py:270
msgid "Enable forwarding of SSH authentication agent connections"
msgstr "Enable forwarding of SSH authentication agent connections"
-#: ../pyhoca/wxgui/profilemanager.py:252
+#: ../pyhoca/wxgui/profilemanager.py:271
+msgid "Store SSH host keys under (unique) X2Go session profile ID"
+msgstr "Store SSH host keys under (unique) X2Go session profile ID"
+
+#: ../pyhoca/wxgui/profilemanager.py:272
msgid "Server behind SSH proxy"
msgstr "Server behind SSH proxy"
-#: ../pyhoca/wxgui/profilemanager.py:255
+#: ../pyhoca/wxgui/profilemanager.py:275
msgid "Use same username for X2Go and proxy host"
msgstr "Use same username for X2Go and proxy host"
-#: ../pyhoca/wxgui/profilemanager.py:256
+#: ../pyhoca/wxgui/profilemanager.py:276
msgid "Use same authentication for X2Go and proxy host"
msgstr "Use same authentication for X2Go and proxy host"
-#: ../pyhoca/wxgui/profilemanager.py:257
+#: ../pyhoca/wxgui/profilemanager.py:277
msgid "Key file"
msgstr "Key file"
-#: ../pyhoca/wxgui/profilemanager.py:264
-msgid "SSH Proxy Tunnel"
-msgstr "SSH Proxy Tunnel"
-
-#: ../pyhoca/wxgui/profilemanager.py:270
+#: ../pyhoca/wxgui/profilemanager.py:284
msgid "Discover SSH keys or use SSH agent for proxy authentication"
msgstr "Discover SSH keys or use SSH agent for proxy authentication"
-#: ../pyhoca/wxgui/profilemanager.py:273
+#: ../pyhoca/wxgui/profilemanager.py:287
msgid "Modem"
msgstr "Modem"
-#: ../pyhoca/wxgui/profilemanager.py:274
+#: ../pyhoca/wxgui/profilemanager.py:288
msgid "ISDN"
msgstr "ISDN"
-#: ../pyhoca/wxgui/profilemanager.py:275
+#: ../pyhoca/wxgui/profilemanager.py:289
msgid "ADSL"
msgstr "ADSL"
-#: ../pyhoca/wxgui/profilemanager.py:276
+#: ../pyhoca/wxgui/profilemanager.py:290
msgid "WAN"
msgstr "WAN"
-#: ../pyhoca/wxgui/profilemanager.py:277
+#: ../pyhoca/wxgui/profilemanager.py:291
msgid "LAN"
msgstr "LAN"
-#: ../pyhoca/wxgui/profilemanager.py:279
+#: ../pyhoca/wxgui/profilemanager.py:293
msgid "Method"
msgstr "Method"
-#: ../pyhoca/wxgui/profilemanager.py:281
+#: ../pyhoca/wxgui/profilemanager.py:295
msgid "Image quality"
msgstr "Image quality"
#. ##
-#. ## wigdets for the SETTINGS tab
+#. ## wigdets for the IO tab
#. ##
-#: ../pyhoca/wxgui/profilemanager.py:287
+#: ../pyhoca/wxgui/profilemanager.py:301
msgid "Fullscreen"
msgstr "Fullscreen"
-#: ../pyhoca/wxgui/profilemanager.py:288
+#: ../pyhoca/wxgui/profilemanager.py:302
msgid "Maximized"
msgstr "Maximized"
-#: ../pyhoca/wxgui/profilemanager.py:289
+#: ../pyhoca/wxgui/profilemanager.py:303
msgid "Custom Size"
msgstr "Custom Size"
-#: ../pyhoca/wxgui/profilemanager.py:294
+#: ../pyhoca/wxgui/profilemanager.py:308
msgid "Set display DPI"
msgstr "Set display DPI"
-#: ../pyhoca/wxgui/profilemanager.py:296
+#: ../pyhoca/wxgui/profilemanager.py:310
msgid "Do not set (use server-side tools to configure the keyboard)"
msgstr "Do not set (use server-side tools to configure the keyboard)"
-#: ../pyhoca/wxgui/profilemanager.py:297
+#: ../pyhoca/wxgui/profilemanager.py:311
msgid ""
"Automatically detect and use client-side keyboard configuration inside the "
"session"
@@ -481,477 +485,531 @@ msgstr ""
"Automatically detect and use client-side keyboard configuration inside the "
"session"
-#: ../pyhoca/wxgui/profilemanager.py:298
+#: ../pyhoca/wxgui/profilemanager.py:312
msgid "Use custom keyboard settings as provided below"
msgstr "Use custom keyboard settings as provided below"
-#: ../pyhoca/wxgui/profilemanager.py:299
+#: ../pyhoca/wxgui/profilemanager.py:313
msgid "Keyboard model"
msgstr "Keyboard model"
-#: ../pyhoca/wxgui/profilemanager.py:301
+#: ../pyhoca/wxgui/profilemanager.py:315
msgid "Layout"
msgstr "Layout"
-#: ../pyhoca/wxgui/profilemanager.py:303
+#: ../pyhoca/wxgui/profilemanager.py:317
msgid "Layout variant"
msgstr "Layout variant"
-#: ../pyhoca/wxgui/profilemanager.py:305
+#. ##
+#. ## wigdets for the MEDIA tab
+#. ##
+#: ../pyhoca/wxgui/profilemanager.py:323
msgid "Enable sound support"
msgstr "Enable sound support"
-#: ../pyhoca/wxgui/profilemanager.py:306
+#: ../pyhoca/wxgui/profilemanager.py:324
msgid "Pulse Audio"
msgstr "Pulse Audio"
#. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated.
#. However, config files can contain an Arts configuration, so we will honour this
-#: ../pyhoca/wxgui/profilemanager.py:310
+#: ../pyhoca/wxgui/profilemanager.py:328
msgid "Arts (not supported)"
msgstr "Arts (not supported)"
-#: ../pyhoca/wxgui/profilemanager.py:313
+#: ../pyhoca/wxgui/profilemanager.py:331
msgid "esd"
msgstr "esd"
-#: ../pyhoca/wxgui/profilemanager.py:314
+#: ../pyhoca/wxgui/profilemanager.py:332
msgid "Use default sound port"
msgstr "Use default sound port"
-#: ../pyhoca/wxgui/profilemanager.py:315
+#: ../pyhoca/wxgui/profilemanager.py:333
msgid "Custom sound port"
msgstr "Custom sound port"
-#: ../pyhoca/wxgui/profilemanager.py:318
+#: ../pyhoca/wxgui/profilemanager.py:336
+msgid "Client Side printing"
+msgstr "Client Side printing"
+
+#. ##
+#. ## wigdets for the SHARING tab
+#. ##
+#: ../pyhoca/wxgui/profilemanager.py:342
msgid "Use local folder sharing"
msgstr "Use local folder sharing"
-#: ../pyhoca/wxgui/profilemanager.py:319
+#: ../pyhoca/wxgui/profilemanager.py:343
msgid "Store share list at end of session"
msgstr "Store share list at end of session"
-#: ../pyhoca/wxgui/profilemanager.py:320
+#: ../pyhoca/wxgui/profilemanager.py:344
msgid "Path"
msgstr "Path"
-#: ../pyhoca/wxgui/profilemanager.py:323 ../pyhoca/wxgui/profilemanager.py:344
+#: ../pyhoca/wxgui/profilemanager.py:347 ../pyhoca/wxgui/profilemanager.py:366
msgid "Add"
msgstr "Add"
-#: ../pyhoca/wxgui/profilemanager.py:325
+#: ../pyhoca/wxgui/profilemanager.py:349
msgid "Local Path"
msgstr "Local Path"
-#: ../pyhoca/wxgui/profilemanager.py:326
+#: ../pyhoca/wxgui/profilemanager.py:350
msgid "Connect Method"
msgstr "Connect Method"
-#: ../pyhoca/wxgui/profilemanager.py:327
+#: ../pyhoca/wxgui/profilemanager.py:351
msgid "Delete"
msgstr "Delete"
-#: ../pyhoca/wxgui/profilemanager.py:329
+#: ../pyhoca/wxgui/profilemanager.py:353
msgid "Convert between client and server encodings"
msgstr "Convert between client and server encodings"
-#: ../pyhoca/wxgui/profilemanager.py:330
+#: ../pyhoca/wxgui/profilemanager.py:354
msgid "Client encoding"
msgstr "Client encoding"
-#: ../pyhoca/wxgui/profilemanager.py:332
+#: ../pyhoca/wxgui/profilemanager.py:356
msgid "Server encoding"
msgstr "Server encoding"
-#: ../pyhoca/wxgui/profilemanager.py:335
+#: ../pyhoca/wxgui/profilemanager.py:359
msgid "Use file MIME box for local file import"
msgstr "Use file MIME box for local file import"
-#: ../pyhoca/wxgui/profilemanager.py:336
+#: ../pyhoca/wxgui/profilemanager.py:360
msgid "Extensions"
msgstr "Extensions"
-#: ../pyhoca/wxgui/profilemanager.py:338
+#: ../pyhoca/wxgui/profilemanager.py:362
msgid "Action"
msgstr "Action"
-#: ../pyhoca/wxgui/profilemanager.py:341
-msgid "Client Side printing"
-msgstr "Client Side printing"
-
-#: ../pyhoca/wxgui/profilemanager.py:345
+#: ../pyhoca/wxgui/profilemanager.py:367
msgid "Defaults"
msgstr "Defaults"
-#: ../pyhoca/wxgui/profilemanager.py:347
+#: ../pyhoca/wxgui/profilemanager.py:369
msgid "Save"
msgstr "Save"
-#: ../pyhoca/wxgui/profilemanager.py:348
+#: ../pyhoca/wxgui/profilemanager.py:370
msgid "Reset"
msgstr "Reset"
-#: ../pyhoca/wxgui/profilemanager.py:401
-#: ../pyhoca/wxgui/profilemanager.py:1124
-#: ../pyhoca/wxgui/profilemanager.py:2268
+#: ../pyhoca/wxgui/profilemanager.py:372 ../pyhoca/wxgui/printingprefs.py:143
+msgid "Apply"
+msgstr "Apply"
+
+#: ../pyhoca/wxgui/profilemanager.py:423
+#: ../pyhoca/wxgui/profilemanager.py:1135
+#: ../pyhoca/wxgui/profilemanager.py:2303
msgid "automatically"
msgstr "automatically"
-#: ../pyhoca/wxgui/profilemanager.py:403
-#: ../pyhoca/wxgui/profilemanager.py:1126
+#: ../pyhoca/wxgui/profilemanager.py:425
+#: ../pyhoca/wxgui/profilemanager.py:1137
msgid "manually"
msgstr "manually"
-#: ../pyhoca/wxgui/profilemanager.py:412
+#: ../pyhoca/wxgui/profilemanager.py:434
msgid "PyHoca-GUI Profile Manager - new profile"
msgstr "PyHoca-GUI Profile Manager - new profile"
-#: ../pyhoca/wxgui/profilemanager.py:414
+#: ../pyhoca/wxgui/profilemanager.py:436
#, python-format
msgid "PyHoca-GUI Profile Manager - %s (connected)"
msgstr "PyHoca-GUI Profile Manager - %s (connected)"
-#: ../pyhoca/wxgui/profilemanager.py:416
+#: ../pyhoca/wxgui/profilemanager.py:438
#, python-format
msgid "PyHoca-GUI Profile Manager - %s"
msgstr "PyHoca-GUI Profile Manager - %s"
-#: ../pyhoca/wxgui/profilemanager.py:797
+#: ../pyhoca/wxgui/profilemanager.py:804
msgid "Profile"
msgstr "Profile"
-#: ../pyhoca/wxgui/profilemanager.py:798
+#: ../pyhoca/wxgui/profilemanager.py:805
msgid "Session"
msgstr "Session"
-#: ../pyhoca/wxgui/profilemanager.py:799
+#: ../pyhoca/wxgui/profilemanager.py:806
msgid "Connection"
msgstr "Connection"
-#: ../pyhoca/wxgui/profilemanager.py:800
+#: ../pyhoca/wxgui/profilemanager.py:807
msgid "Link Quality"
msgstr "Link Quality"
-#: ../pyhoca/wxgui/profilemanager.py:801
-msgid "Settings"
-msgstr "Settings"
+#: ../pyhoca/wxgui/profilemanager.py:808
+msgid "Input/Output"
+msgstr "Input/Output"
+
+#: ../pyhoca/wxgui/profilemanager.py:809
+msgid "Media"
+msgstr "Media"
-#: ../pyhoca/wxgui/profilemanager.py:802
+#: ../pyhoca/wxgui/profilemanager.py:810
msgid "Sharing"
msgstr "Sharing"
-#: ../pyhoca/wxgui/profilemanager.py:988
+#: ../pyhoca/wxgui/profilemanager.py:989
msgid "<xkbtype>"
msgstr "pc105/us"
-#: ../pyhoca/wxgui/profilemanager.py:989
+#: ../pyhoca/wxgui/profilemanager.py:990
msgid "<xkblayout>"
msgstr "us"
-#: ../pyhoca/wxgui/profilemanager.py:990
+#: ../pyhoca/wxgui/profilemanager.py:991
msgid "<xkbvariant>"
msgstr "basic"
-#: ../pyhoca/wxgui/profilemanager.py:1444
+#: ../pyhoca/wxgui/profilemanager.py:1449
msgid "Icon Files (*.png)|*.png|All files (*.*)|*"
msgstr "Icon Files (*.png)|*.png|All files (*.*)|*"
-#: ../pyhoca/wxgui/profilemanager.py:1447
+#: ../pyhoca/wxgui/profilemanager.py:1452
msgid "Choose an icon for this session profile"
msgstr "Choose an icon for this session profile"
-#: ../pyhoca/wxgui/profilemanager.py:1816
+#: ../pyhoca/wxgui/profilemanager.py:1895
msgid "All files (*.*)|*"
msgstr "All files (*.*)|*"
-#: ../pyhoca/wxgui/profilemanager.py:1818
-#: ../pyhoca/wxgui/profilemanager.py:1842
+#: ../pyhoca/wxgui/profilemanager.py:1897
+#: ../pyhoca/wxgui/profilemanager.py:1921
msgid "Choose a public SSH key"
msgstr "Choose a public SSH key"
-#: ../pyhoca/wxgui/profilemanager.py:2220
+#: ../pyhoca/wxgui/profilemanager.py:2255
msgid "Choose a folder to share within a session"
msgstr "Choose a folder to share within a session"
-#: ../pyhoca/wxgui/profilemanager.py:2348
-#: ../pyhoca/wxgui/profilemanager.py:2351
-#: ../pyhoca/wxgui/profilemanager.py:2354
-#: ../pyhoca/wxgui/profilemanager.py:2359
-#: ../pyhoca/wxgui/profilemanager.py:2369 ../pyhoca/wxgui/menus_taskbar.py:117
+#: ../pyhoca/wxgui/profilemanager.py:2383
+#: ../pyhoca/wxgui/profilemanager.py:2386
+#: ../pyhoca/wxgui/profilemanager.py:2389 ../pyhoca/wxgui/menus_taskbar.py:122
msgid "Profile Manager"
msgstr "Profile Manager"
-#: ../pyhoca/wxgui/profilemanager.py:2348
+#: ../pyhoca/wxgui/profilemanager.py:2383
msgid "Profile name is missing, profile unusable!!!"
msgstr "Profile name is missing, profile unusable!!!"
-#: ../pyhoca/wxgui/profilemanager.py:2351
-#: ../pyhoca/wxgui/profilemanager.py:2354
+#: ../pyhoca/wxgui/profilemanager.py:2386
+#: ../pyhoca/wxgui/profilemanager.py:2389
#, python-format
msgid "Profile name %s already exists!!!"
msgstr "Profile name %s already exists!!!"
-#: ../pyhoca/wxgui/profilemanager.py:2359
-msgid "The SSH proxy configuration is incomplete. Try again."
-msgstr "The SSH proxy configuration is incomplete. Try again."
-
-#: ../pyhoca/wxgui/profilemanager.py:2369
-#, python-format
-msgid ""
-"Another session profile (%s) already uses [%s]:%s for binding a local SSH "
-"proxy to.\n"
-"Please change the SSH proxy settings accordingly."
-msgstr ""
-"Another session profile (%s) already uses [%s]:%s for binding a local SSH "
-"proxy to.\n"
-"Please change the SSH proxy settings accordingly."
-
-#: ../pyhoca/wxgui/profilemanager.py:2396
+#: ../pyhoca/wxgui/profilemanager.py:2416
#, python-format
msgid "%s - profile added"
msgstr "%s - profile added"
-#: ../pyhoca/wxgui/profilemanager.py:2397
+#: ../pyhoca/wxgui/profilemanager.py:2417
msgid "A new session profile has been added."
msgstr "A new session profile has been added."
-#: ../pyhoca/wxgui/profilemanager.py:2401
+#: ../pyhoca/wxgui/profilemanager.py:2421
#, python-format
msgid "%s - modified"
msgstr "%s - modified"
-#: ../pyhoca/wxgui/profilemanager.py:2402
+#: ../pyhoca/wxgui/profilemanager.py:2422
msgid "Changes to profile have been saved."
msgstr "Changes to profile have been saved."
-#: ../pyhoca/wxgui/menus_taskbar.py:74
+#: ../pyhoca/wxgui/listdesktops.py:82
+#, python-format
+msgid "Share Desktop Session - %s"
+msgstr "Share Desktop Session - %s"
+
+#: ../pyhoca/wxgui/listdesktops.py:84
+msgid "Select one of the available desktop sessions on this server"
+msgstr "Select one of the available desktop sessions on this server"
+
+#: ../pyhoca/wxgui/listdesktops.py:90
+msgid "View session only"
+msgstr "View session only"
+
+#: ../pyhoca/wxgui/listdesktops.py:91
+msgid "Gain full access"
+msgstr "Gain full access"
+
+#: ../pyhoca/wxgui/listdesktops.py:95
+msgid "Share Desktop"
+msgstr "Share Desktop"
+
+#: ../pyhoca/wxgui/listdesktops.py:98
+msgid "Refresh list"
+msgstr "Refresh list"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:76
msgid "Edit Profile"
msgstr "Edit Profile"
-#: ../pyhoca/wxgui/menus_taskbar.py:77
+#: ../pyhoca/wxgui/menus_taskbar.py:79
msgid "Use as Template for New Profile"
msgstr "Use as Template for New Profile"
-#: ../pyhoca/wxgui/menus_taskbar.py:78
+#: ../pyhoca/wxgui/menus_taskbar.py:81
+msgid "Export Profile"
+msgstr "Export Profile"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:82
msgid "Delete Profile"
msgstr "Delete Profile"
-#: ../pyhoca/wxgui/menus_taskbar.py:106
+#: ../pyhoca/wxgui/menus_taskbar.py:111
#, python-format
msgid "About %s (%s)..."
msgstr "About %s (%s) ..."
-#: ../pyhoca/wxgui/menus_taskbar.py:132
+#: ../pyhoca/wxgui/menus_taskbar.py:137
msgid "Manage Session Profile"
msgstr "Manage Session Profile"
-#: ../pyhoca/wxgui/menus_taskbar.py:141
+#: ../pyhoca/wxgui/menus_taskbar.py:146
msgid "Printing Preferences"
msgstr "Printing Preferences"
-#: ../pyhoca/wxgui/menus_taskbar.py:147
+#: ../pyhoca/wxgui/menus_taskbar.py:152
msgid "Client Options"
msgstr "Client Options"
-#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:783
-#: ../pyhoca/wxgui/menus_taskbar.py:975
+#: ../pyhoca/wxgui/menus_taskbar.py:160 ../pyhoca/wxgui/menus_taskbar.py:828
+#: ../pyhoca/wxgui/menus_taskbar.py:1033
msgid "E&xit"
msgstr "E&xit"
-#: ../pyhoca/wxgui/menus_taskbar.py:227
+#: ../pyhoca/wxgui/menus_taskbar.py:232
msgid "Window title"
msgstr "Window title"
-#: ../pyhoca/wxgui/menus_taskbar.py:233 ../pyhoca/wxgui/menus_taskbar.py:608
+#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:631
msgid "Resume Session"
msgstr "Resume Session"
-#: ../pyhoca/wxgui/menus_taskbar.py:235
+#: ../pyhoca/wxgui/menus_taskbar.py:240
msgid "Resume Session (not possible)"
msgstr "Resume Session (not possible)"
-#: ../pyhoca/wxgui/menus_taskbar.py:246
+#: ../pyhoca/wxgui/menus_taskbar.py:251
msgid "Transfer Session"
msgstr "Transfer Session"
-#: ../pyhoca/wxgui/menus_taskbar.py:248
+#: ../pyhoca/wxgui/menus_taskbar.py:253
msgid "Transfer Session (not possible)"
msgstr "Transfer Session (not possible)"
-#: ../pyhoca/wxgui/menus_taskbar.py:252 ../pyhoca/wxgui/menus_taskbar.py:599
+#: ../pyhoca/wxgui/menus_taskbar.py:258 ../pyhoca/wxgui/menus_taskbar.py:622
msgid "Suspend Session (and disconnect/exit)"
msgstr "Suspend Session (and disconnect/exit)"
-#: ../pyhoca/wxgui/menus_taskbar.py:254 ../pyhoca/wxgui/menus_taskbar.py:601
+#: ../pyhoca/wxgui/menus_taskbar.py:260 ../pyhoca/wxgui/menus_taskbar.py:624
msgid "Suspend Session (and disconnect)"
msgstr "Suspend Session (and disconnect)"
-#: ../pyhoca/wxgui/menus_taskbar.py:256 ../pyhoca/wxgui/menus_taskbar.py:603
+#: ../pyhoca/wxgui/menus_taskbar.py:262 ../pyhoca/wxgui/menus_taskbar.py:626
msgid "Suspend Session"
msgstr "Suspend Session"
-#: ../pyhoca/wxgui/menus_taskbar.py:262 ../pyhoca/wxgui/menus_taskbar.py:612
+#: ../pyhoca/wxgui/menus_taskbar.py:268 ../pyhoca/wxgui/menus_taskbar.py:635
msgid "Terminate Session (and disconnect/exit)"
msgstr "Terminate Session (and disconnect/exit)"
-#: ../pyhoca/wxgui/menus_taskbar.py:264 ../pyhoca/wxgui/menus_taskbar.py:614
+#: ../pyhoca/wxgui/menus_taskbar.py:270 ../pyhoca/wxgui/menus_taskbar.py:637
msgid "Terminate Session (and disconnect)"
msgstr "Terminate Session (and disconnect)"
-#: ../pyhoca/wxgui/menus_taskbar.py:266 ../pyhoca/wxgui/menus_taskbar.py:616
+#: ../pyhoca/wxgui/menus_taskbar.py:272 ../pyhoca/wxgui/menus_taskbar.py:639
msgid "Terminate Session"
msgstr "Terminate Session"
-#: ../pyhoca/wxgui/menus_taskbar.py:270 ../pyhoca/wxgui/menus_taskbar.py:596
+#: ../pyhoca/wxgui/menus_taskbar.py:275
+msgid "End Desktop Sharing (and disconnect/exit)"
+msgstr "End Desktop Sharing (and disconnect/exit)"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:277
+msgid "End Desktop Sharing (and disconnect)"
+msgstr "End Desktop Sharing (and disconnect)"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:279
+msgid "End Desktop Sharing"
+msgstr "End Desktop Sharing"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:283 ../pyhoca/wxgui/menus_taskbar.py:619
msgid "Refresh menu tree"
msgstr "Refresh menu tree"
-#: ../pyhoca/wxgui/menus_taskbar.py:279
+#: ../pyhoca/wxgui/menus_taskbar.py:292
msgid "Rename Session Window"
msgstr "Rename Session Window"
-#: ../pyhoca/wxgui/menus_taskbar.py:280
+#: ../pyhoca/wxgui/menus_taskbar.py:293
msgid "Show Session Window"
msgstr "Show Session Window"
-#: ../pyhoca/wxgui/menus_taskbar.py:322
+#: ../pyhoca/wxgui/menus_taskbar.py:335
msgid "&Share custom local folder"
msgstr "&Share custom local folder"
-#: ../pyhoca/wxgui/menus_taskbar.py:337
+#: ../pyhoca/wxgui/menus_taskbar.py:350
msgid "Share:"
msgstr "Share:"
-#: ../pyhoca/wxgui/menus_taskbar.py:346
+#: ../pyhoca/wxgui/menus_taskbar.py:359
msgid "Unshare:"
msgstr "Unshare:"
-#: ../pyhoca/wxgui/menus_taskbar.py:354
+#: ../pyhoca/wxgui/menus_taskbar.py:367
msgid "Unshare &all local folders"
msgstr "Unshare &all local folders"
-#: ../pyhoca/wxgui/menus_taskbar.py:360
+#: ../pyhoca/wxgui/menus_taskbar.py:373
msgid "Restore shares in next session"
msgstr "Restore shares in next session"
-#: ../pyhoca/wxgui/menus_taskbar.py:440
+#: ../pyhoca/wxgui/menus_taskbar.py:453
msgid "Multimedia"
msgstr "Multimedia"
-#: ../pyhoca/wxgui/menus_taskbar.py:441
+#: ../pyhoca/wxgui/menus_taskbar.py:454
msgid "Development"
msgstr "Development"
-#: ../pyhoca/wxgui/menus_taskbar.py:442
+#: ../pyhoca/wxgui/menus_taskbar.py:455
msgid "Education"
msgstr "Education"
-#: ../pyhoca/wxgui/menus_taskbar.py:443
+#: ../pyhoca/wxgui/menus_taskbar.py:456
msgid "Games"
msgstr "Games"
-#: ../pyhoca/wxgui/menus_taskbar.py:444
+#: ../pyhoca/wxgui/menus_taskbar.py:457
msgid "Graphics"
msgstr "Graphics"
-#: ../pyhoca/wxgui/menus_taskbar.py:445
+#: ../pyhoca/wxgui/menus_taskbar.py:458
msgid "Internet"
msgstr "Internet"
-#: ../pyhoca/wxgui/menus_taskbar.py:446
+#: ../pyhoca/wxgui/menus_taskbar.py:459
msgid "Office Applications"
msgstr "Office Applications"
-#: ../pyhoca/wxgui/menus_taskbar.py:447
+#: ../pyhoca/wxgui/menus_taskbar.py:460
msgid "System"
msgstr "System"
-#: ../pyhoca/wxgui/menus_taskbar.py:448
+#: ../pyhoca/wxgui/menus_taskbar.py:461
msgid "Utilities"
msgstr "Utilities"
-#: ../pyhoca/wxgui/menus_taskbar.py:449
+#: ../pyhoca/wxgui/menus_taskbar.py:462
msgid "Other Applications"
msgstr "Other Applications"
-#: ../pyhoca/wxgui/menus_taskbar.py:521 ../pyhoca/wxgui/menus_taskbar.py:533
+#: ../pyhoca/wxgui/menus_taskbar.py:535 ../pyhoca/wxgui/menus_taskbar.py:547
#, python-format
msgid "Connect %s"
msgstr "Connect %s"
-#: ../pyhoca/wxgui/menus_taskbar.py:527
+#: ../pyhoca/wxgui/menus_taskbar.py:541
msgid "Currently connecting..."
msgstr "Currently connecting..."
-#: ../pyhoca/wxgui/menus_taskbar.py:541
+#: ../pyhoca/wxgui/menus_taskbar.py:556
msgid "Start &new Desktop Session"
msgstr "Start &new Desktop Session"
-#: ../pyhoca/wxgui/menus_taskbar.py:546 ../pyhoca/wxgui/menus_taskbar.py:684
+#: ../pyhoca/wxgui/menus_taskbar.py:560 ../pyhoca/wxgui/menus_taskbar.py:660
+msgid "Start Desktop Sharing Session"
+msgstr "Start Desktop Sharing Session"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:566 ../pyhoca/wxgui/menus_taskbar.py:710
msgid "Retrieving Application Menu..."
msgstr "Retrieving Application Menu..."
-#: ../pyhoca/wxgui/menus_taskbar.py:550 ../pyhoca/wxgui/menus_taskbar.py:687
+#: ../pyhoca/wxgui/menus_taskbar.py:570 ../pyhoca/wxgui/menus_taskbar.py:713
msgid "Retrieve Application Menu"
msgstr "Retrieve Application Menu"
-#: ../pyhoca/wxgui/menus_taskbar.py:553
+#: ../pyhoca/wxgui/menus_taskbar.py:573
+msgid "Start &new RDP Session"
+msgstr "Start &new RDP Session"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:576
msgid "Start &new Session"
msgstr "Start &new Session"
-#: ../pyhoca/wxgui/menus_taskbar.py:633
+#: ../pyhoca/wxgui/menus_taskbar.py:656
msgid "Launch Single Application"
msgstr "Launch Single Application"
-#: ../pyhoca/wxgui/menus_taskbar.py:671
+#: ../pyhoca/wxgui/menus_taskbar.py:697
msgid "Manage Application Menu"
msgstr "Manage Application Menu"
-#: ../pyhoca/wxgui/menus_taskbar.py:714
+#: ../pyhoca/wxgui/menus_taskbar.py:752
msgid "Running"
msgstr "Running"
-#: ../pyhoca/wxgui/menus_taskbar.py:716
+#: ../pyhoca/wxgui/menus_taskbar.py:754
msgid "Suspended"
msgstr "Suspended"
-#: ../pyhoca/wxgui/menus_taskbar.py:735
+#: ../pyhoca/wxgui/menus_taskbar.py:773
msgid "&Clean all sessions"
msgstr "&Clean all sessions"
-#: ../pyhoca/wxgui/menus_taskbar.py:741
+#: ../pyhoca/wxgui/menus_taskbar.py:779
msgid "Customize &profile"
msgstr "Customize &profile"
-#: ../pyhoca/wxgui/menus_taskbar.py:756
+#: ../pyhoca/wxgui/menus_taskbar.py:794
msgid "Shared &folders"
msgstr "Shared &folders"
-#: ../pyhoca/wxgui/menus_taskbar.py:768
+#: ../pyhoca/wxgui/menus_taskbar.py:806
+msgid "Server Information"
+msgstr "Server Information"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:813
msgid "&Disconnect from Server"
msgstr "&Disconnect from Server"
-#: ../pyhoca/wxgui/menus_taskbar.py:775
+#: ../pyhoca/wxgui/menus_taskbar.py:820
msgid "Suspend Session and E&xit application"
msgstr "Suspend Session and E&xit application"
-#: ../pyhoca/wxgui/menus_taskbar.py:779
+#: ../pyhoca/wxgui/menus_taskbar.py:824
msgid "Disconnect and E&xit application"
msgstr "Disconnect and E&xit application"
-#: ../pyhoca/wxgui/menus_taskbar.py:833
+#: ../pyhoca/wxgui/menus_taskbar.py:878
msgid "Add Profile"
msgstr "Add Profile"
-#: ../pyhoca/wxgui/menus_taskbar.py:909
+#: ../pyhoca/wxgui/menus_taskbar.py:954
msgid "No session profiles defined"
msgstr "No session profiles defined"
-#: ../pyhoca/wxgui/menus_taskbar.py:945
-msgid "Start/Resume Session"
-msgstr "Start/Resume Session"
+#: ../pyhoca/wxgui/menus_taskbar.py:965
+msgid "Export all Profiles"
+msgstr "Export all Profiles"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:967
+msgid "Export Profile Group"
+msgstr "Export Profile Group"
-#: ../pyhoca/wxgui/menus_taskbar.py:945
+#: ../pyhoca/wxgui/menus_taskbar.py:1003
msgid "Connect Server"
msgstr "Connect Server"
@@ -960,62 +1018,62 @@ msgstr "Connect Server"
msgid "About %s ..."
msgstr "About %s ..."
-#: ../pyhoca/wxgui/frontend.py:459
+#: ../pyhoca/wxgui/frontend.py:465
msgid "Suspending sessions and exiting application..."
msgstr "Suspending sessions and exiting application..."
-#: ../pyhoca/wxgui/frontend.py:462
+#: ../pyhoca/wxgui/frontend.py:468
#, python-format
msgid "Disconnecting %s and exiting application..."
msgstr "Disconnecting %s and exiting application..."
-#: ../pyhoca/wxgui/frontend.py:464
+#: ../pyhoca/wxgui/frontend.py:470
msgid "Exiting application..."
msgstr "Exiting Application..."
-#: ../pyhoca/wxgui/frontend.py:562
+#: ../pyhoca/wxgui/frontend.py:568
#, python-format
msgid "%s - server warning"
msgstr "%s - server warning"
-#: ../pyhoca/wxgui/frontend.py:562
+#: ../pyhoca/wxgui/frontend.py:568
msgid "The X2Go Server does not publish an application menu."
msgstr "The X2Go Server does not publish an application menu."
-#: ../pyhoca/wxgui/frontend.py:613
+#: ../pyhoca/wxgui/frontend.py:619
msgid "SSH key authentication has been successful."
msgstr "SSH key authentication has been successful."
-#: ../pyhoca/wxgui/frontend.py:650
+#: ../pyhoca/wxgui/frontend.py:656
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:671
+#: ../pyhoca/wxgui/frontend.py:677
#, python-format
msgid "%s - EOF error"
msgstr "%s - EOF error"
-#: ../pyhoca/wxgui/frontend.py:671
+#: ../pyhoca/wxgui/frontend.py:677
msgid "Authentication protocol communication incomplete! Try again..."
msgstr "Authentication protocol communication incomplete! Try again..."
-#: ../pyhoca/wxgui/frontend.py:678
+#: ../pyhoca/wxgui/frontend.py:684
#, python-format
msgid "%s - auth key error"
msgstr "%s - auth key error"
-#: ../pyhoca/wxgui/frontend.py:699
+#: ../pyhoca/wxgui/frontend.py:705
msgid "An unknown error occurred during authentication!"
msgstr "An unknown error occurred during authentication!"
-#: ../pyhoca/wxgui/frontend.py:728
+#: ../pyhoca/wxgui/frontend.py:734
#, python-format
msgid "%s: DirectRDP not supported yet"
msgstr "%s: DirectRDP not supported yet"
-#: ../pyhoca/wxgui/frontend.py:729
+#: ../pyhoca/wxgui/frontend.py:735
#, python-format
msgid ""
"We apologize for the inconvenience...\n"
@@ -1023,66 +1081,154 @@ msgid ""
"Session profiles of type ,,DirectRDP'' are not\n"
"supported by %s (%s), yet!!\n"
"\n"
-"DirectRDP support will be available in %s (>= 0.2.2.0)."
+"DirectRDP support will be available in %s (>= 1.0.0.0)."
msgstr ""
"We apologize for the inconvenience...\n"
"\n"
"Session profiles of type ,,DirectRDP'' are not\n"
"supported by %s (%s), yet!!\n"
"\n"
-"DirectRDP support will be available in %s (>= 0.2.2.0)."
+"DirectRDP support will be available in %s (>= 1.0.0.0)."
-#: ../pyhoca/wxgui/frontend.py:741
+#: ../pyhoca/wxgui/frontend.py:747
msgid "Unknown session profile, configure before using it..."
msgstr "Unknown session profile, configure before using it..."
-#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:1332
+#: ../pyhoca/wxgui/frontend.py:778
+#, python-format
+msgid "Desktop Sharing with %s not supported by server"
+msgstr "Desktop Sharing with %s not supported by server"
+
+#: ../pyhoca/wxgui/frontend.py:779
+#, python-format
+msgid ""
+"We apologize for the inconvenience...\n"
+"\n"
+"Session profiles of type ,,SHADOW'' are not\n"
+"supported by X2Go Server (v%s)!!!\n"
+"\n"
+"Desktop Sharing with %s requires\n"
+"X2Go Server 4.1.0.0 and above."
+msgstr ""
+"We apologize for the inconvenience...\n"
+"\n"
+"Session profiles of type ,,SHADOW'' are not\n"
+"supported by X2Go Server (v%s)!!!\n"
+"\n"
+"Desktop Sharing with %s requires\n"
+"X2Go Server 4.1.0.0 and above."
+
+#: ../pyhoca/wxgui/frontend.py:837 ../pyhoca/wxgui/frontend.py:1488
#, python-format
msgid "%s - session warning"
msgstr "%s - session warning"
-#: ../pyhoca/wxgui/frontend.py:798
+#: ../pyhoca/wxgui/frontend.py:837
#, python-format
msgid "Execution of command ,,%s'' failed."
msgstr "Execution of command ,,%s'' failed."
-#: ../pyhoca/wxgui/frontend.py:939
+#: ../pyhoca/wxgui/frontend.py:978
msgid "Cleaning X2Go sessions..."
msgstr "Cleaning X2Go sessions..."
-#: ../pyhoca/wxgui/frontend.py:974
+#: ../pyhoca/wxgui/frontend.py:1026
#, python-format
msgid "%s - disconnect"
msgstr "%s - disconnect"
-#: ../pyhoca/wxgui/frontend.py:974
+#: ../pyhoca/wxgui/frontend.py:1026
msgid "X2Go Profile is now disconnected."
msgstr "X2Go Profile is now disconnected."
-#: ../pyhoca/wxgui/frontend.py:995
+#: ../pyhoca/wxgui/frontend.py:1047
msgid "New Session Profile"
msgstr "New Session Profile"
-#: ../pyhoca/wxgui/frontend.py:1047
+#: ../pyhoca/wxgui/frontend.py:1102
#, python-format
msgid "Really Delete Session Profile ,,%s''?"
msgstr "Really Delete Session Profile ,,%s''?"
-#: ../pyhoca/wxgui/frontend.py:1053
+#: ../pyhoca/wxgui/frontend.py:1108
#, python-format
msgid "%s - profile deleted"
msgstr "%s - profile deleted"
-#: ../pyhoca/wxgui/frontend.py:1053
+#: ../pyhoca/wxgui/frontend.py:1108
msgid "The session profile has been deleted."
msgstr "The session profile has been deleted."
-#: ../pyhoca/wxgui/frontend.py:1071
+#: ../pyhoca/wxgui/frontend.py:1137
+#, python-format
+msgid "%s - export session profiles"
+msgstr "%s - export session profiles"
+
+#: ../pyhoca/wxgui/frontend.py:1142
+#, python-format
+msgid "%s - export session profile"
+msgstr "%s - export session profile"
+
+#: ../pyhoca/wxgui/frontend.py:1154
+#, python-format
+msgid "%s: Export file already exists"
+msgstr "%s: Export file already exists"
+
+#: ../pyhoca/wxgui/frontend.py:1155
+#, python-format
+msgid ""
+"The file Âģ%sÂĢ already exists in this folder.\n"
+"\n"
+"Do you want to replace it?"
+msgstr ""
+"The file Âģ%sÂĢ already exists in this folder.\n"
+"\n"
+"Do you want to replace it?"
+
+#: ../pyhoca/wxgui/frontend.py:1176
+#, python-format
+msgid "%s - profiles exported"
+msgstr "%s - profiles exported"
+
+#: ../pyhoca/wxgui/frontend.py:1176
+#, python-format
+msgid "Successfully exported session profile group Âģ%sÂĢ to file Âģ%sÂĢ."
+msgstr "Successfully exported session profile group Âģ%sÂĢ to file Âģ%sÂĢ."
+
+#: ../pyhoca/wxgui/frontend.py:1178
+#, python-format
+msgid "%s - profile exported"
+msgstr "%s - profile exported"
+
+#: ../pyhoca/wxgui/frontend.py:1178
+#, python-format
+msgid "Successfully exported single session profile Âģ%sÂĢ to file Âģ%sÂĢ."
+msgstr "Successfully exported single session profile Âģ%sÂĢ to file Âģ%sÂĢ."
+
+#: ../pyhoca/wxgui/frontend.py:1182
+#, python-format
+msgid "%s: Exporting session profile(s) failed"
+msgstr "%s: Exporting session profile(s) failed"
+
+#: ../pyhoca/wxgui/frontend.py:1183
+#, python-format
+msgid ""
+"The selected session profile(s) could not be exported to the \n"
+"file Âģ%sÂĢ.\n"
+"\n"
+"Check for common problems (disk full, insufficient access, etc.)."
+msgstr ""
+"The selected session profile(s) could not be exported to the \n"
+"file Âģ%sÂĢ.\n"
+"\n"
+"Check for common problems (disk full, insufficient access, etc.)."
+
+#: ../pyhoca/wxgui/frontend.py:1202
#, 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:1224
+#: ../pyhoca/wxgui/frontend.py:1355
#, python-format
msgid ""
"The authenticity of host [%s]:%s can't be established.\n"
@@ -1095,17 +1241,17 @@ msgstr ""
"\n"
"Are you sure you want to continue connecting?"
-#: ../pyhoca/wxgui/frontend.py:1232
+#: ../pyhoca/wxgui/frontend.py:1363
#, python-format
msgid "%s: Confirm Host Authorization"
msgstr "%s: Confirm Host Authorization"
-#: ../pyhoca/wxgui/frontend.py:1277
+#: ../pyhoca/wxgui/frontend.py:1409
#, python-format
msgid "%s - channel error"
msgstr "%s - channel error"
-#: ../pyhoca/wxgui/frontend.py:1277
+#: ../pyhoca/wxgui/frontend.py:1409
#, python-format
msgid ""
"Lost connection to server %s unexpectedly! Try to re-authenticate to the "
@@ -1114,22 +1260,45 @@ msgstr ""
"Lost connection to server %s unexpectedly! Try to re-authenticate to the "
"server..."
-#: ../pyhoca/wxgui/frontend.py:1295 ../pyhoca/wxgui/frontend.py:1313
-#: ../pyhoca/wxgui/frontend.py:1315 ../pyhoca/wxgui/frontend.py:1351
+#: ../pyhoca/wxgui/frontend.py:1426 ../pyhoca/wxgui/frontend.py:1469
+#: ../pyhoca/wxgui/frontend.py:1471 ../pyhoca/wxgui/frontend.py:1507
#, python-format
msgid "%s - session failure"
msgstr "%s - session failure"
-#: ../pyhoca/wxgui/frontend.py:1295
+#: ../pyhoca/wxgui/frontend.py:1426
msgid "The session startup failed."
msgstr "The session startup failed."
-#: ../pyhoca/wxgui/frontend.py:1313
+#: ../pyhoca/wxgui/frontend.py:1439
+#, python-format
+msgid "%s - timeout"
+msgstr "%s - timeout"
+
+#: ../pyhoca/wxgui/frontend.py:1439
+msgid ""
+"The server took long to provide a list of sharable desktops.\n"
+"This can happen from time to time, please try again"
+msgstr ""
+"The server took long to provide a list of sharable desktops.\n"
+"This can happen from time to time, please try again"
+
+#: ../pyhoca/wxgui/frontend.py:1451
+#, python-format
+msgid "%s - desktop sharing failed"
+msgstr "%s - desktop sharing failed"
+
+#: ../pyhoca/wxgui/frontend.py:1451
+#, python-format
+msgid "The desktop %s is not available for sharing (anymore)."
+msgstr "The desktop %s is not available for sharing (anymore)."
+
+#: ../pyhoca/wxgui/frontend.py:1469
#, python-format
msgid "The command ,,%s'' is not available on X2Go server."
msgstr "The command ,,%s'' is not available on X2Go server."
-#: ../pyhoca/wxgui/frontend.py:1315
+#: ../pyhoca/wxgui/frontend.py:1471
#, python-format
msgid ""
"The command ,,%s'' is not available on X2Go server\n"
@@ -1138,7 +1307,7 @@ msgstr ""
"The command ,,%s'' is not available on X2Go server\n"
"%s."
-#: ../pyhoca/wxgui/frontend.py:1332
+#: ../pyhoca/wxgui/frontend.py:1488
#, python-format
msgid ""
"Reverse TCP port forwarding request for session %s to server port %s has "
@@ -1147,45 +1316,45 @@ msgstr ""
"Reverse TCP port forwarding request for session %s to server port %s has "
"been denied."
-#: ../pyhoca/wxgui/frontend.py:1351
+#: ../pyhoca/wxgui/frontend.py:1507
#, python-format
msgid ""
"Forwarding tunnel request to [%s]:%s for session %s was denied by remote "
-"X2go/SSH server. Session startup failed."
+"X2Go/SSH server. Session startup failed."
msgstr ""
"Forwarding tunnel request to [%s]:%s for session %s was denied by remote "
-"X2go/SSH server. Session startup failed."
+"X2Go/SSH server. Session startup failed."
-#: ../pyhoca/wxgui/frontend.py:1370
+#: ../pyhoca/wxgui/frontend.py:1526
#, python-format
msgid "%s - audio warning"
msgstr "%s - audio warning"
-#: ../pyhoca/wxgui/frontend.py:1370
+#: ../pyhoca/wxgui/frontend.py:1526
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:1377 ../pyhoca/wxgui/frontend.py:1384
+#: ../pyhoca/wxgui/frontend.py:1533 ../pyhoca/wxgui/frontend.py:1540
#, python-format
msgid "%s - audio error"
msgstr "%s - audio error"
-#: ../pyhoca/wxgui/frontend.py:1377
+#: ../pyhoca/wxgui/frontend.py:1533
msgid "The X2Go PulseAudio system could not be started."
msgstr "The X2Go PulseAudio system could not be started."
-#: ../pyhoca/wxgui/frontend.py:1384
+#: ../pyhoca/wxgui/frontend.py:1540
msgid "The X2Go PulseAudio system has died unexpectedly."
msgstr "The X2Go PulseAudio system has died unexpectedly."
-#: ../pyhoca/wxgui/frontend.py:1396
+#: ../pyhoca/wxgui/frontend.py:1552
#, python-format
msgid "%s - audio problem"
msgstr "%s - audio problem"
-#: ../pyhoca/wxgui/frontend.py:1396
+#: ../pyhoca/wxgui/frontend.py:1552
#, python-format
msgid ""
"The audio connection could not be set up for this session.\n"
@@ -1194,12 +1363,12 @@ msgstr ""
"The audio connection could not be set up for this session.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1408
+#: ../pyhoca/wxgui/frontend.py:1564
#, python-format
msgid "%s - client-side printing not available"
msgstr "%s - client-side printing not available"
-#: ../pyhoca/wxgui/frontend.py:1408
+#: ../pyhoca/wxgui/frontend.py:1564
#, python-format
msgid ""
"The server denies client-side printing from within this session.\n"
@@ -1208,12 +1377,12 @@ msgstr ""
"The server denies client-side printing from within this session.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1420
+#: ../pyhoca/wxgui/frontend.py:1576
#, python-format
msgid "%s - MIME box not available"
msgstr "%s - MIME box not available"
-#: ../pyhoca/wxgui/frontend.py:1420
+#: ../pyhoca/wxgui/frontend.py:1576
#, python-format
msgid ""
"The server does not support the X2Go MIME box.\n"
@@ -1222,12 +1391,12 @@ msgstr ""
"The server does not support the X2Go MIME box.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1432
+#: ../pyhoca/wxgui/frontend.py:1588
#, python-format
msgid "%s - client-side folders not sharable"
msgstr "%s - client-side folders not sharable"
-#: ../pyhoca/wxgui/frontend.py:1432
+#: ../pyhoca/wxgui/frontend.py:1588
#, python-format
msgid ""
"The server denies client-side folder sharing with this session.\n"
@@ -1236,12 +1405,12 @@ msgstr ""
"The server denies client-side folder sharing with this session.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1444
+#: ../pyhoca/wxgui/frontend.py:1600
#, python-format
msgid "%s - client resources not sharable"
msgstr "%s - client resources not sharable"
-#: ../pyhoca/wxgui/frontend.py:1444
+#: ../pyhoca/wxgui/frontend.py:1600
#, python-format
msgid ""
"Client-side folders and printers cannot be shared with this session.\n"
@@ -1250,12 +1419,12 @@ msgstr ""
"Client-side folders and printers cannot be shared with this session.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1463 ../pyhoca/wxgui/frontend.py:1465
+#: ../pyhoca/wxgui/frontend.py:1619 ../pyhoca/wxgui/frontend.py:1621
#, python-format
msgid "%s - print error"
msgstr "%s - print error"
-#: ../pyhoca/wxgui/frontend.py:1463
+#: ../pyhoca/wxgui/frontend.py:1619
#, python-format
msgid ""
"%s\n"
@@ -1266,7 +1435,7 @@ msgstr ""
"...caused on printer %s by session\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1465
+#: ../pyhoca/wxgui/frontend.py:1621
#, python-format
msgid ""
"%s\n"
@@ -1277,12 +1446,12 @@ msgstr ""
"...caused by session\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1480 ../pyhoca/wxgui/frontend.py:1495
+#: ../pyhoca/wxgui/frontend.py:1636 ../pyhoca/wxgui/frontend.py:1651
#, python-format
msgid "%s - start"
msgstr "%s - start"
-#: ../pyhoca/wxgui/frontend.py:1480
+#: ../pyhoca/wxgui/frontend.py:1636
#, python-format
msgid ""
"New X2Go session starting up...\n"
@@ -1291,7 +1460,7 @@ msgstr ""
"New X2Go session starting up...\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1495
+#: ../pyhoca/wxgui/frontend.py:1651
#, python-format
msgid ""
"Another client started X2Go session\n"
@@ -1300,12 +1469,12 @@ msgstr ""
"Another client started X2Go session\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1510 ../pyhoca/wxgui/frontend.py:1525
+#: ../pyhoca/wxgui/frontend.py:1666 ../pyhoca/wxgui/frontend.py:1681
#, python-format
msgid "%s - resume"
msgstr "%s - resume"
-#: ../pyhoca/wxgui/frontend.py:1510
+#: ../pyhoca/wxgui/frontend.py:1666
#, python-format
msgid ""
"Resuming X2Go session...\n"
@@ -1314,7 +1483,7 @@ msgstr ""
"Resuming X2Go session...\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1525
+#: ../pyhoca/wxgui/frontend.py:1681
#, python-format
msgid ""
"Another client resumed X2Go session\n"
@@ -1323,12 +1492,12 @@ msgstr ""
"Another client resumed X2Go session\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1540
+#: ../pyhoca/wxgui/frontend.py:1696
#, python-format
msgid "%s - running"
msgstr "%s - running"
-#: ../pyhoca/wxgui/frontend.py:1540
+#: ../pyhoca/wxgui/frontend.py:1696
#, python-format
msgid ""
"Found already running session\n"
@@ -1337,12 +1506,12 @@ msgstr ""
"Found already running session\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1560
+#: ../pyhoca/wxgui/frontend.py:1716
#, python-format
msgid "%s - suspend"
msgstr "%s - suspend"
-#: ../pyhoca/wxgui/frontend.py:1560
+#: ../pyhoca/wxgui/frontend.py:1716
#, python-format
msgid ""
"X2Go Session has been suspended\n"
@@ -1351,12 +1520,12 @@ msgstr ""
"X2Go Session has been suspended\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1587
+#: ../pyhoca/wxgui/frontend.py:1743
#, python-format
msgid "%s - terminate"
msgstr "%s - terminate"
-#: ../pyhoca/wxgui/frontend.py:1587
+#: ../pyhoca/wxgui/frontend.py:1743
#, python-format
msgid ""
"X2Go Session has terminated\n"
@@ -1365,7 +1534,7 @@ msgstr ""
"X2Go Session has terminated\n"
"%s"
-#: ../pyhoca/wxgui/messages.py:73
+#: ../pyhoca/wxgui/messages.py:72
#, python-format
msgid ""
"Are you really sure you want to\n"
@@ -1374,7 +1543,7 @@ msgstr ""
"Are you really sure you want to\n"
"delete the session profile ,,%s''?"
-#: ../pyhoca/wxgui/messages.py:74
+#: ../pyhoca/wxgui/messages.py:73
#, python-format
msgid ""
"PyHoca-GUI is already running for user ,,%s''!\n"
@@ -1389,15 +1558,15 @@ msgstr ""
"user. The PyHoca-GUI icon can be found in your desktops's\n"
"notification area/systray."
-#: ../pyhoca/wxgui/messages.py:107
+#: ../pyhoca/wxgui/messages.py:106
msgid "Yes"
msgstr "Yes"
-#: ../pyhoca/wxgui/messages.py:108
+#: ../pyhoca/wxgui/messages.py:107
msgid "No"
msgstr "No"
-#: ../pyhoca/wxgui/messages.py:125 ../pyhoca/wxgui/printingprefs.py:142
+#: ../pyhoca/wxgui/messages.py:124 ../pyhoca/wxgui/printingprefs.py:142
msgid "Ok"
msgstr "Ok"
@@ -1463,10 +1632,6 @@ msgstr "Use this printer"
msgid "Custom print command"
msgstr "Custom print command"
-#: ../pyhoca/wxgui/printingprefs.py:143
-msgid "Apply"
-msgstr "Apply"
-
#: ../pyhoca/wxgui/printingprefs.py:145
msgid "Print"
msgstr "Print"
@@ -1500,12 +1665,77 @@ msgstr "Change session title to"
msgid "OK"
msgstr "OK"
+#: ../pyhoca/wxgui/serverinfo.py:76
+#, python-format
+msgid "Server Information - %s"
+msgstr "Server Information - %s"
+
+#: ../pyhoca/wxgui/serverinfo.py:78
+#, python-format
+msgid ""
+"Session Profile: %s\n"
+"\n"
+"List of X2Go Server components, add-ons and their versions..."
+msgstr ""
+"Session Profile: %s\n"
+"\n"
+"List of X2Go Server components, add-ons and their versions..."
+
+#: ../pyhoca/wxgui/serverinfo.py:83
+msgid "Refresh"
+msgstr "Refresh"
+
+#: ../pyhoca/wxgui/serverinfo.py:84
+msgid "Close"
+msgstr "Close"
+
+#: ../pyhoca/wxgui/serverinfo.py:153
+msgid "X2Go Server"
+msgstr "X2Go Server"
+
+#: ../pyhoca/wxgui/serverinfo.py:154
+msgid "Server Core"
+msgstr " Server Core"
+
+#: ../pyhoca/wxgui/serverinfo.py:162
+msgid "Server Extensions"
+msgstr "Server Extensions"
+
+#: ../pyhoca/wxgui/serverinfo.py:168
+msgid "X2Go Server Add-ons"
+msgstr "X2Go Server Add-ons"
+
+#: ../pyhoca/wxgui/serverinfo.py:172
+msgid "X2Go Server Features"
+msgstr "X2Go Server Features"
+
+#~ msgid "Settings"
+#~ msgstr "Settings"
+
#, fuzzy
-#~ msgid "Remember shared folders"
-#~ msgstr "Shared &folders"
+#~ msgid "%s (%s)\n"
+#~ msgstr "%s (via %s)"
+
+#~ msgid "Start/Resume Session"
+#~ msgstr "Start/Resume Session"
+
+#~ msgid "SSH Proxy Tunnel"
+#~ msgstr "SSH Proxy Tunnel"
+
+#~ msgid "The SSH proxy configuration is incomplete. Try again."
+#~ msgstr "The SSH proxy configuration is incomplete. Try again."
+
+#~ msgid ""
+#~ "Another session profile (%s) already uses [%s]:%s for binding a local SSH "
+#~ "proxy to.\n"
+#~ "Please change the SSH proxy settings accordingly."
+#~ msgstr ""
+#~ "Another session profile (%s) already uses [%s]:%s for binding a local SSH "
+#~ "proxy to.\n"
+#~ "Please change the SSH proxy settings accordingly."
#, fuzzy
-#~ msgid "Shared Resources"
+#~ msgid "Remember shared folders"
#~ msgstr "Shared &folders"
#~ msgid "RSA/DSA private key"
@@ -1542,9 +1772,6 @@ msgstr "OK"
#~ msgid "%s - connect error"
#~ msgstr "%s - connect error"
-#~ msgid "new session profile"
-#~ msgstr "new session profile"
-
#~ msgid "Exiting..."
#~ msgstr "Exiting..."
diff --git a/po/es.po b/po/es.po
index 1574d9f..6104e83 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,5 +1,5 @@
# PyHoca-GUI / i18n.
-# Copyright (C) 2010-2012 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
# Dick Kniep <dick.kniep(a)lindix.nl>
# This file is distributed under the same license as the PyHoca-GUI package.
#
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: PyHoca-GUI VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 14:25+0100\n"
-"PO-Revision-Date: 2012-11-26 14:23+0100\n"
-"Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n"
+"POT-Creation-Date: 2013-01-29 22:21+0100\n"
+"PO-Revision-Date: 2013-01-24 09:59-0000\n"
+"Last-Translator: Ricardo DÃaz <oceanosoftlapalma(a)gmail.com>\n"
"Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
@@ -23,7 +23,9 @@ msgstr ""
"X-Poedit-Country: SPAIN\n"
"X-Poedit-SourceCharset: utf-8\n"
"X-Generator: Lokalize 1.2\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Language: es_ES\n"
+"X-Source-Language: C\n"
#: ../pyhoca/wxgui/logon.py:86
#, python-format
@@ -43,8 +45,8 @@ msgid "Authenticate"
msgstr "Autenticar"
#: ../pyhoca/wxgui/logon.py:107
-msgid " Start SSH tunnel "
-msgstr " Iniciar tunel SSH "
+msgid "Start SSH tunnel"
+msgstr "Iniciar tunel SSH"
#: ../pyhoca/wxgui/logon.py:115
msgid "Session login"
@@ -54,23 +56,23 @@ msgstr "Inicio de sesiÃŗn"
msgid "SSH proxy server login"
msgstr "Inicio de sesiÃŗn en el servidor proxy SSH"
-#: ../pyhoca/wxgui/logon.py:127 ../pyhoca/wxgui/profilemanager.py:350
-#: ../pyhoca/wxgui/messages.py:131 ../pyhoca/wxgui/printingprefs.py:147
-#: ../pyhoca/wxgui/sessiontitle.py:85
+#: ../pyhoca/wxgui/logon.py:127 ../pyhoca/wxgui/profilemanager.py:373
+#: ../pyhoca/wxgui/listdesktops.py:99 ../pyhoca/wxgui/messages.py:130
+#: ../pyhoca/wxgui/printingprefs.py:147 ../pyhoca/wxgui/sessiontitle.py:85
msgid "Cancel"
msgstr "Cancelar"
#: ../pyhoca/wxgui/logon.py:297 ../pyhoca/wxgui/logon.py:339
-#: ../pyhoca/wxgui/frontend.py:606
+#: ../pyhoca/wxgui/frontend.py:612
#, python-format
msgid "%s - connect failure"
msgstr "%s - fallo en la conexiÃŗn"
-#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:606
+#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:612
msgid "User is not allowed to start X2Go sessions!"
-msgstr "ÂĄEl usuario no tiene permisos para iniciar sesiones X2go!"
+msgstr "ÂĄEl usuario no tiene permisos para iniciar sesiones X2Go!"
-#: ../pyhoca/wxgui/logon.py:303 ../pyhoca/wxgui/frontend.py:613
+#: ../pyhoca/wxgui/logon.py:303 ../pyhoca/wxgui/frontend.py:619
#, python-format
msgid "%s - connect"
msgstr "%s - conectado"
@@ -96,44 +98,44 @@ msgstr "%s - proxy SSH"
msgid "Authentication to the SSH proxy server failed!"
msgstr "ÂĄNombre de usuario o contraseÃąa errÃŗneo en el servidor proxy SSH!"
-#: ../pyhoca/wxgui/logon.py:376 ../pyhoca/wxgui/frontend.py:664
+#: ../pyhoca/wxgui/logon.py:376 ../pyhoca/wxgui/frontend.py:670
#, python-format
msgid "%s - socket error"
msgstr "%s - error de socket"
-#: ../pyhoca/wxgui/logon.py:383 ../pyhoca/wxgui/frontend.py:643
-#: ../pyhoca/wxgui/frontend.py:650
+#: ../pyhoca/wxgui/logon.py:383 ../pyhoca/wxgui/frontend.py:649
+#: ../pyhoca/wxgui/frontend.py:656
#, python-format
msgid "%s - host key error"
msgstr "%s - error en la clave del equipo"
-#: ../pyhoca/wxgui/logon.py:384 ../pyhoca/wxgui/frontend.py:643
+#: ../pyhoca/wxgui/logon.py:384 ../pyhoca/wxgui/frontend.py:649
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:391 ../pyhoca/wxgui/frontend.py:685
+#: ../pyhoca/wxgui/logon.py:391 ../pyhoca/wxgui/frontend.py:691
#, python-format
msgid "%s - missing home directory"
msgstr "%s - carpeta home desconocida"
-#: ../pyhoca/wxgui/logon.py:392 ../pyhoca/wxgui/frontend.py:685
+#: ../pyhoca/wxgui/logon.py:392 ../pyhoca/wxgui/frontend.py:691
msgid "The remote user's home directory does not exist."
-msgstr "La carpeta home del usuario no existe en el servidor"
+msgstr "La carpeta home del usuario no existe en el servidor."
#: ../pyhoca/wxgui/logon.py:399
#, python-format
msgid "%s - key error"
msgstr "%s - error en la clave"
-#: ../pyhoca/wxgui/logon.py:407 ../pyhoca/wxgui/frontend.py:692
+#: ../pyhoca/wxgui/logon.py:407 ../pyhoca/wxgui/frontend.py:698
#, python-format
msgid "%s - auth error"
msgstr "%s - error en la autenticaciÃŗn"
-#: ../pyhoca/wxgui/logon.py:415 ../pyhoca/wxgui/frontend.py:636
+#: ../pyhoca/wxgui/logon.py:415 ../pyhoca/wxgui/frontend.py:642
#, python-format
msgid "%s - SSH error"
msgstr "%s - error de SSH"
@@ -160,10 +162,10 @@ msgstr ""
#: ../pyhoca/wxgui/taskbar.py:93
#, python-format
msgid ""
-"PyHoca-GUI (Python X2goClient)\n"
+"PyHoca-GUI (Python X2Go Client)\n"
"Currently connecting you to remote X2Go server ,,%s''"
msgstr ""
-"PyHoca-GUI (Python X2goClient)\n"
+"PyHoca-GUI (Python X2Go Client)\n"
"Conectando con tu servidor remoto X2Go \"%s\""
#: ../pyhoca/wxgui/taskbar.py:103
@@ -176,11 +178,11 @@ msgstr ""
#: ../pyhoca/wxgui/taskbar.py:107
msgid ""
-"PyHoca-GUI (Python X2goClient)\n"
+"PyHoca-GUI (Python X2Go Client)\n"
"Client for connecting you to a remote X2Go server"
msgstr ""
-"PyHoca-GUI (Python X2goClient)\n"
-"Cliente para conexiones remotas a servidores X2go"
+"PyHoca-GUI (Python X2Go Client)\n"
+"Cliente para conexiones remotas a servidores X2Go"
#: ../pyhoca/wxgui/profilemanager.py:79
msgid "GNOME Desktop (GNOME)"
@@ -215,276 +217,282 @@ msgid "Single Application"
msgstr "AplicaciÃŗn"
#: ../pyhoca/wxgui/profilemanager.py:87
+msgid "Share desktop session (SHADOW)"
+msgstr "Compartir escritorio (SHADOW)"
+
+#: ../pyhoca/wxgui/profilemanager.py:88
msgid "XDMCP Query"
msgstr "XDMCP Query"
-#: ../pyhoca/wxgui/profilemanager.py:88
+#: ../pyhoca/wxgui/profilemanager.py:89
msgid "Windows Terminal Server (X2Go-proxied RDP)"
msgstr "Windows Terminal Server (RDP sobre X2Go)"
-#: ../pyhoca/wxgui/profilemanager.py:89
+#: ../pyhoca/wxgui/profilemanager.py:90
msgid "Windows Terminal Server (Direct RDP)"
msgstr "Windows Terminal Server (RDP Directo)"
-#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/profilemanager.py:224
+#: ../pyhoca/wxgui/profilemanager.py:91 ../pyhoca/wxgui/profilemanager.py:243
msgid "Custom command"
msgstr "Comando personalizado"
-#: ../pyhoca/wxgui/profilemanager.py:95 ../pyhoca/wxgui/menus_taskbar.py:393
+#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:406
msgid "Internet Browser"
msgstr "Navegador web"
-#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:394
+#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:407
msgid "Email Client"
msgstr "Cliente de Correo"
-#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:395
+#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:408
msgid "Office"
msgstr "Office"
-#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:396
+#: ../pyhoca/wxgui/profilemanager.py:99 ../pyhoca/wxgui/menus_taskbar.py:409
msgid "Terminal"
msgstr "Terminal"
-#: ../pyhoca/wxgui/profilemanager.py:116
+#: ../pyhoca/wxgui/profilemanager.py:117
msgid "Open file with system's default application"
msgstr "Abrir archivo con la aplicaciÃŗn por defecto"
-#: ../pyhoca/wxgui/profilemanager.py:117
+#: ../pyhoca/wxgui/profilemanager.py:118
msgid "Open application chooser dialog"
msgstr "Abrir selector de aplicaciones"
-#: ../pyhoca/wxgui/profilemanager.py:118
+#: ../pyhoca/wxgui/profilemanager.py:119
msgid "Save incoming file as ..."
msgstr "Guardar archivo recibido como ..."
-#: ../pyhoca/wxgui/profilemanager.py:146
+#: ../pyhoca/wxgui/profilemanager.py:147
msgid "settings derived from "
msgstr "configuraciones recuperadas de "
#. boxes for all tabs
-#: ../pyhoca/wxgui/profilemanager.py:167
+#: ../pyhoca/wxgui/profilemanager.py:186
msgid "Session Title"
msgstr "TÃtulo de la SesiÃŗn"
-#: ../pyhoca/wxgui/profilemanager.py:168
+#: ../pyhoca/wxgui/profilemanager.py:187
msgid "Session Window"
msgstr "Ventana de SesiÃŗn"
-#: ../pyhoca/wxgui/profilemanager.py:169
+#: ../pyhoca/wxgui/profilemanager.py:188
msgid "Session Startup"
msgstr "Inicio de SesiÃŗn"
-#: ../pyhoca/wxgui/profilemanager.py:170
+#: ../pyhoca/wxgui/profilemanager.py:189
msgid "Server"
msgstr "Servidor"
-#: ../pyhoca/wxgui/profilemanager.py:171
+#: ../pyhoca/wxgui/profilemanager.py:190
msgid "Proxy"
msgstr "Proxy"
-#: ../pyhoca/wxgui/profilemanager.py:172
+#: ../pyhoca/wxgui/profilemanager.py:191
msgid "Connection Link Speed"
msgstr "Velocidad de conexiÃŗn"
-#: ../pyhoca/wxgui/profilemanager.py:173
+#: ../pyhoca/wxgui/profilemanager.py:192
msgid "Compression"
msgstr "CompresiÃŗn"
-#: ../pyhoca/wxgui/profilemanager.py:174
+#: ../pyhoca/wxgui/profilemanager.py:193
msgid "Display"
msgstr "Pantalla"
-#: ../pyhoca/wxgui/profilemanager.py:175
+#: ../pyhoca/wxgui/profilemanager.py:194
msgid "Keyboard"
msgstr "Teclado"
-#: ../pyhoca/wxgui/profilemanager.py:176
+#: ../pyhoca/wxgui/profilemanager.py:195
msgid "Sound"
msgstr "Sonido"
-#: ../pyhoca/wxgui/profilemanager.py:177
+#: ../pyhoca/wxgui/profilemanager.py:196
msgid "Printing"
msgstr "Impresora"
-#: ../pyhoca/wxgui/profilemanager.py:178
+#: ../pyhoca/wxgui/profilemanager.py:197
msgid "Folder Exports"
msgstr "Carpeta de Exportaciones"
-#: ../pyhoca/wxgui/profilemanager.py:179
+#: ../pyhoca/wxgui/profilemanager.py:198
msgid "File Import"
msgstr "Importar Archivo"
#. ##
#. ## widgets for the PROFILE tab
#. ##
-#: ../pyhoca/wxgui/profilemanager.py:184
+#: ../pyhoca/wxgui/profilemanager.py:203
msgid "Name"
msgstr "Nombre"
-#: ../pyhoca/wxgui/profilemanager.py:191
+#: ../pyhoca/wxgui/profilemanager.py:210
msgid "Set session window title"
msgstr "Establecer tÃtulo de la sesiÃŗn"
-#: ../pyhoca/wxgui/profilemanager.py:192
+#: ../pyhoca/wxgui/profilemanager.py:211
msgid "Use a default session window title"
msgstr "Usar tÃtulo de sesiÃŗn por defecto"
-#: ../pyhoca/wxgui/profilemanager.py:193
+#: ../pyhoca/wxgui/profilemanager.py:212
msgid "Custom session window title"
msgstr "TÃtulo de sesiÃŗn personalizado"
-#: ../pyhoca/wxgui/profilemanager.py:212
+#: ../pyhoca/wxgui/profilemanager.py:231
msgid "Window Icon"
msgstr "Icono de la ventana"
#. ##
#. ## widgets for the SESSION tab
#. ##
-#: ../pyhoca/wxgui/profilemanager.py:218
+#: ../pyhoca/wxgui/profilemanager.py:237
msgid "Start session automatically after login"
msgstr "Iniciar sesiÃŗn automÃĄticamente tras el login"
-#: ../pyhoca/wxgui/profilemanager.py:219
+#: ../pyhoca/wxgui/profilemanager.py:238
#, python-format
-msgid "Login automatically after %s has started"
-msgstr "El inicio de sesiÃŗn automÃĄtico ha comenzado tras %s"
+msgid "Login automatically after %s has started (needs --auto-connect)"
+msgstr ""
+"El inicio de sesiÃŗn automÃĄtico ha comenzado tras %s (se necesita --auto-"
+"connect)"
-#: ../pyhoca/wxgui/profilemanager.py:220
+#: ../pyhoca/wxgui/profilemanager.py:239
msgid "Type"
msgstr "Tipo"
-#: ../pyhoca/wxgui/profilemanager.py:222
+#: ../pyhoca/wxgui/profilemanager.py:241
msgid "Application"
msgstr "AplicaciÃŗn"
-#: ../pyhoca/wxgui/profilemanager.py:226
+#: ../pyhoca/wxgui/profilemanager.py:245
msgid "XDMCP server"
msgstr "Servidor XDMCP"
-#: ../pyhoca/wxgui/profilemanager.py:228
+#: ../pyhoca/wxgui/profilemanager.py:247
msgid "RDP server"
msgstr "Servidor RDP"
-#: ../pyhoca/wxgui/profilemanager.py:230
+#: ../pyhoca/wxgui/profilemanager.py:249
msgid "RDP options"
msgstr "Opciones RDP"
-#: ../pyhoca/wxgui/profilemanager.py:232
+#: ../pyhoca/wxgui/profilemanager.py:251
msgid "Integrate remote application(s) into local desktop (rootless mode)"
msgstr "Integrar aplicaciones en el escritorio local (modo rootless)"
-#: ../pyhoca/wxgui/profilemanager.py:233
+#: ../pyhoca/wxgui/profilemanager.py:252
msgid "Menu of published applications"
msgstr "MenÃē de aplicaciones publicadas"
#. ##
#. ## widgets for the CONNECTION tab
#. ##
-#: ../pyhoca/wxgui/profilemanager.py:240 ../pyhoca/wxgui/profilemanager.py:253
+#: ../pyhoca/wxgui/profilemanager.py:259 ../pyhoca/wxgui/profilemanager.py:273
msgid "User"
msgstr "Usuario"
-#: ../pyhoca/wxgui/profilemanager.py:242 ../pyhoca/wxgui/profilemanager.py:260
+#: ../pyhoca/wxgui/profilemanager.py:261 ../pyhoca/wxgui/profilemanager.py:280
msgid "Host"
msgstr "Host"
-#: ../pyhoca/wxgui/profilemanager.py:244 ../pyhoca/wxgui/profilemanager.py:262
+#: ../pyhoca/wxgui/profilemanager.py:263 ../pyhoca/wxgui/profilemanager.py:282
msgid "Port"
msgstr "Puerto"
-#: ../pyhoca/wxgui/profilemanager.py:246
+#: ../pyhoca/wxgui/profilemanager.py:265
msgid "Key"
msgstr "Clave"
-#: ../pyhoca/wxgui/profilemanager.py:249
+#: ../pyhoca/wxgui/profilemanager.py:268
msgid "Discover SSH keys or use SSH agent for X2Go authentication"
msgstr "Descubrir clave SSH o usar el agente SSH para la autenticaciÃŗn X2Go"
-#: ../pyhoca/wxgui/profilemanager.py:251
+#: ../pyhoca/wxgui/profilemanager.py:270
msgid "Enable forwarding of SSH authentication agent connections"
msgstr "Activar reenvÃo de autenticaciÃŗn SSH a travÊs del agente de conexiones"
-#: ../pyhoca/wxgui/profilemanager.py:252
+#: ../pyhoca/wxgui/profilemanager.py:271
+msgid "Store SSH host keys under (unique) X2Go session profile ID"
+msgstr "Alamcenar las claves SSH del equipo en el ID de sesiÃŗn X2go"
+
+#: ../pyhoca/wxgui/profilemanager.py:272
msgid "Server behind SSH proxy"
msgstr "Servidor detrÃĄs del proxy SSH"
-#: ../pyhoca/wxgui/profilemanager.py:255
+#: ../pyhoca/wxgui/profilemanager.py:275
msgid "Use same username for X2Go and proxy host"
msgstr "Usar el mismo nombre de usuario para los servidores proxy y X2Go"
-#: ../pyhoca/wxgui/profilemanager.py:256
+#: ../pyhoca/wxgui/profilemanager.py:276
msgid "Use same authentication for X2Go and proxy host"
msgstr "Usar la misma autenticaciÃŗn para los servidores proxy y X2Go"
-#: ../pyhoca/wxgui/profilemanager.py:257
+#: ../pyhoca/wxgui/profilemanager.py:277
msgid "Key file"
msgstr "Clave"
-#: ../pyhoca/wxgui/profilemanager.py:264
-msgid "SSH Proxy Tunnel"
-msgstr "Tunel Proxy SSH"
-
-#: ../pyhoca/wxgui/profilemanager.py:270
+#: ../pyhoca/wxgui/profilemanager.py:284
msgid "Discover SSH keys or use SSH agent for proxy authentication"
msgstr ""
"Descubrir las claves SSH o usar el agente SSH para la autenticaciÃŗn en el "
"proxy"
-#: ../pyhoca/wxgui/profilemanager.py:273
+#: ../pyhoca/wxgui/profilemanager.py:287
msgid "Modem"
msgstr "MÃŗdem"
-#: ../pyhoca/wxgui/profilemanager.py:274
+#: ../pyhoca/wxgui/profilemanager.py:288
msgid "ISDN"
msgstr "ISDN"
-#: ../pyhoca/wxgui/profilemanager.py:275
+#: ../pyhoca/wxgui/profilemanager.py:289
msgid "ADSL"
msgstr "ADSL"
-#: ../pyhoca/wxgui/profilemanager.py:276
+#: ../pyhoca/wxgui/profilemanager.py:290
msgid "WAN"
msgstr "WAN"
-#: ../pyhoca/wxgui/profilemanager.py:277
+#: ../pyhoca/wxgui/profilemanager.py:291
msgid "LAN"
msgstr "LAN"
-#: ../pyhoca/wxgui/profilemanager.py:279
+#: ../pyhoca/wxgui/profilemanager.py:293
msgid "Method"
msgstr "MÊtodo"
-#: ../pyhoca/wxgui/profilemanager.py:281
+#: ../pyhoca/wxgui/profilemanager.py:295
msgid "Image quality"
msgstr "Calidad de imagen"
#. ##
-#. ## wigdets for the SETTINGS tab
+#. ## wigdets for the IO tab
#. ##
-#: ../pyhoca/wxgui/profilemanager.py:287
+#: ../pyhoca/wxgui/profilemanager.py:301
msgid "Fullscreen"
msgstr "Pantalla Completa"
-#: ../pyhoca/wxgui/profilemanager.py:288
+#: ../pyhoca/wxgui/profilemanager.py:302
msgid "Maximized"
msgstr "Maximizada"
-#: ../pyhoca/wxgui/profilemanager.py:289
+#: ../pyhoca/wxgui/profilemanager.py:303
msgid "Custom Size"
msgstr "TamaÃąo Personalizado"
-#: ../pyhoca/wxgui/profilemanager.py:294
+#: ../pyhoca/wxgui/profilemanager.py:308
msgid "Set display DPI"
msgstr "Establecer DPI"
-#: ../pyhoca/wxgui/profilemanager.py:296
+#: ../pyhoca/wxgui/profilemanager.py:310
msgid "Do not set (use server-side tools to configure the keyboard)"
msgstr ""
"No establecido (usar las herramientas del lado del servidor para configurar "
"el teclado)"
-#: ../pyhoca/wxgui/profilemanager.py:297
+#: ../pyhoca/wxgui/profilemanager.py:311
msgid ""
"Automatically detect and use client-side keyboard configuration inside the "
"session"
@@ -492,479 +500,531 @@ msgstr ""
"Detectar automÃĄticamente y usar la configuraciÃŗn de teclado del lado del "
"cliente en la sesiÃŗn remota"
-#: ../pyhoca/wxgui/profilemanager.py:298
+#: ../pyhoca/wxgui/profilemanager.py:312
msgid "Use custom keyboard settings as provided below"
msgstr "Ussar configuraciÃŗn de teclado personalizada"
-#: ../pyhoca/wxgui/profilemanager.py:299
+#: ../pyhoca/wxgui/profilemanager.py:313
msgid "Keyboard model"
msgstr "Modelo de teclado"
-#: ../pyhoca/wxgui/profilemanager.py:301
+#: ../pyhoca/wxgui/profilemanager.py:315
msgid "Layout"
msgstr "Capa"
-#: ../pyhoca/wxgui/profilemanager.py:303
+#: ../pyhoca/wxgui/profilemanager.py:317
msgid "Layout variant"
msgstr "Variante de la capa"
-#: ../pyhoca/wxgui/profilemanager.py:305
+#. ##
+#. ## wigdets for the MEDIA tab
+#. ##
+#: ../pyhoca/wxgui/profilemanager.py:323
msgid "Enable sound support"
msgstr "Activar soporte de sonido"
-#: ../pyhoca/wxgui/profilemanager.py:306
+#: ../pyhoca/wxgui/profilemanager.py:324
msgid "Pulse Audio"
msgstr "Pulse Audio"
#. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated.
#. However, config files can contain an Arts configuration, so we will honour this
-#: ../pyhoca/wxgui/profilemanager.py:310
+#: ../pyhoca/wxgui/profilemanager.py:328
msgid "Arts (not supported)"
msgstr "Arts (sin soporte)"
-#: ../pyhoca/wxgui/profilemanager.py:313
+#: ../pyhoca/wxgui/profilemanager.py:331
msgid "esd"
msgstr "esd"
-#: ../pyhoca/wxgui/profilemanager.py:314
+#: ../pyhoca/wxgui/profilemanager.py:332
msgid "Use default sound port"
msgstr "Usar puerto de sonido por defecto"
-#: ../pyhoca/wxgui/profilemanager.py:315
+#: ../pyhoca/wxgui/profilemanager.py:333
msgid "Custom sound port"
msgstr "Puerto de sonido personalizado"
-#: ../pyhoca/wxgui/profilemanager.py:318
+#: ../pyhoca/wxgui/profilemanager.py:336
+msgid "Client Side printing"
+msgstr "ImpresiÃŗn local"
+
+#. ##
+#. ## wigdets for the SHARING tab
+#. ##
+#: ../pyhoca/wxgui/profilemanager.py:342
msgid "Use local folder sharing"
msgstr "Compartir carpetas locales"
-#: ../pyhoca/wxgui/profilemanager.py:319
+#: ../pyhoca/wxgui/profilemanager.py:343
msgid "Store share list at end of session"
msgstr "Almacenar la lista de comparticiones al final de la sesiÃŗn%s"
-#: ../pyhoca/wxgui/profilemanager.py:320
+#: ../pyhoca/wxgui/profilemanager.py:344
msgid "Path"
msgstr "Ruta"
-#: ../pyhoca/wxgui/profilemanager.py:323 ../pyhoca/wxgui/profilemanager.py:344
+#: ../pyhoca/wxgui/profilemanager.py:347 ../pyhoca/wxgui/profilemanager.py:366
msgid "Add"
msgstr "AÃąadir"
-#: ../pyhoca/wxgui/profilemanager.py:325
+#: ../pyhoca/wxgui/profilemanager.py:349
msgid "Local Path"
msgstr "Ruta Local"
-#: ../pyhoca/wxgui/profilemanager.py:326
+#: ../pyhoca/wxgui/profilemanager.py:350
msgid "Connect Method"
msgstr "MÊtodo de ConexiÃŗn"
-#: ../pyhoca/wxgui/profilemanager.py:327
+#: ../pyhoca/wxgui/profilemanager.py:351
msgid "Delete"
msgstr "Eliminar"
-#: ../pyhoca/wxgui/profilemanager.py:329
+#: ../pyhoca/wxgui/profilemanager.py:353
msgid "Convert between client and server encodings"
msgstr "Convertir codificaciones entre cliente y servidor"
-#: ../pyhoca/wxgui/profilemanager.py:330
+#: ../pyhoca/wxgui/profilemanager.py:354
msgid "Client encoding"
msgstr "CodificaciÃŗn del cliente"
-#: ../pyhoca/wxgui/profilemanager.py:332
+#: ../pyhoca/wxgui/profilemanager.py:356
msgid "Server encoding"
msgstr "CodificaciÃŗn del Servidor"
-#: ../pyhoca/wxgui/profilemanager.py:335
+#: ../pyhoca/wxgui/profilemanager.py:359
msgid "Use file MIME box for local file import"
msgstr "Usar tipo de archivo MIME para la importaciÃŗn local"
-#: ../pyhoca/wxgui/profilemanager.py:336
+#: ../pyhoca/wxgui/profilemanager.py:360
msgid "Extensions"
msgstr "Extensiones"
-#: ../pyhoca/wxgui/profilemanager.py:338
+#: ../pyhoca/wxgui/profilemanager.py:362
msgid "Action"
msgstr "AcciÃŗn"
-#: ../pyhoca/wxgui/profilemanager.py:341
-msgid "Client Side printing"
-msgstr "ImpresiÃŗn local"
-
-#: ../pyhoca/wxgui/profilemanager.py:345
+#: ../pyhoca/wxgui/profilemanager.py:367
msgid "Defaults"
msgstr "Valores por defecto"
-#: ../pyhoca/wxgui/profilemanager.py:347
+#: ../pyhoca/wxgui/profilemanager.py:369
msgid "Save"
msgstr "Guardar"
-#: ../pyhoca/wxgui/profilemanager.py:348
+#: ../pyhoca/wxgui/profilemanager.py:370
msgid "Reset"
msgstr "Reiniciar"
-#: ../pyhoca/wxgui/profilemanager.py:401
-#: ../pyhoca/wxgui/profilemanager.py:1124
-#: ../pyhoca/wxgui/profilemanager.py:2268
+#: ../pyhoca/wxgui/profilemanager.py:372 ../pyhoca/wxgui/printingprefs.py:143
+msgid "Apply"
+msgstr "Aplicar"
+
+#: ../pyhoca/wxgui/profilemanager.py:423
+#: ../pyhoca/wxgui/profilemanager.py:1135
+#: ../pyhoca/wxgui/profilemanager.py:2303
msgid "automatically"
msgstr "automÃĄticamente"
-#: ../pyhoca/wxgui/profilemanager.py:403
-#: ../pyhoca/wxgui/profilemanager.py:1126
+#: ../pyhoca/wxgui/profilemanager.py:425
+#: ../pyhoca/wxgui/profilemanager.py:1137
msgid "manually"
msgstr "manualmente"
-#: ../pyhoca/wxgui/profilemanager.py:412
+#: ../pyhoca/wxgui/profilemanager.py:434
msgid "PyHoca-GUI Profile Manager - new profile"
msgstr "PyHoca-GUI Gestor de Perfiles - nuevo perfil"
-#: ../pyhoca/wxgui/profilemanager.py:414
+#: ../pyhoca/wxgui/profilemanager.py:436
#, python-format
msgid "PyHoca-GUI Profile Manager - %s (connected)"
msgstr "PyHoca-GUI Gestor de Perfiles - %s (conectado)"
-#: ../pyhoca/wxgui/profilemanager.py:416
+#: ../pyhoca/wxgui/profilemanager.py:438
#, python-format
msgid "PyHoca-GUI Profile Manager - %s"
msgstr "PyHoca-GUI Gestor de Perfiles - %s"
-#: ../pyhoca/wxgui/profilemanager.py:797
+#: ../pyhoca/wxgui/profilemanager.py:804
msgid "Profile"
msgstr "Perfil"
-#: ../pyhoca/wxgui/profilemanager.py:798
+#: ../pyhoca/wxgui/profilemanager.py:805
msgid "Session"
msgstr "SesiÃŗn"
-#: ../pyhoca/wxgui/profilemanager.py:799
+#: ../pyhoca/wxgui/profilemanager.py:806
msgid "Connection"
msgstr "ConexiÃŗn"
-#: ../pyhoca/wxgui/profilemanager.py:800
+#: ../pyhoca/wxgui/profilemanager.py:807
msgid "Link Quality"
msgstr "Calidad del enlace"
-#: ../pyhoca/wxgui/profilemanager.py:801
-msgid "Settings"
-msgstr "Opciones"
+#: ../pyhoca/wxgui/profilemanager.py:808
+msgid "Input/Output"
+msgstr "Entrada/Salida"
+
+#: ../pyhoca/wxgui/profilemanager.py:809
+msgid "Media"
+msgstr "Medios"
-#: ../pyhoca/wxgui/profilemanager.py:802
+#: ../pyhoca/wxgui/profilemanager.py:810
msgid "Sharing"
msgstr "Compartir"
-#: ../pyhoca/wxgui/profilemanager.py:988
+#: ../pyhoca/wxgui/profilemanager.py:989
msgid "<xkbtype>"
msgstr "<xkbtype>"
-#: ../pyhoca/wxgui/profilemanager.py:989
+#: ../pyhoca/wxgui/profilemanager.py:990
msgid "<xkblayout>"
msgstr "<xkblayout>"
-#: ../pyhoca/wxgui/profilemanager.py:990
+#: ../pyhoca/wxgui/profilemanager.py:991
msgid "<xkbvariant>"
msgstr "<xkbvariant>"
-#: ../pyhoca/wxgui/profilemanager.py:1444
+#: ../pyhoca/wxgui/profilemanager.py:1449
msgid "Icon Files (*.png)|*.png|All files (*.*)|*"
msgstr "Iconos (*.png)|*.png|Todos (*.*)|*"
-#: ../pyhoca/wxgui/profilemanager.py:1447
+#: ../pyhoca/wxgui/profilemanager.py:1452
msgid "Choose an icon for this session profile"
msgstr "Elige un icono para este perfil de sesiÃŗn"
-#: ../pyhoca/wxgui/profilemanager.py:1816
+#: ../pyhoca/wxgui/profilemanager.py:1895
msgid "All files (*.*)|*"
msgstr "Todos (*.*)|*"
-#: ../pyhoca/wxgui/profilemanager.py:1818
-#: ../pyhoca/wxgui/profilemanager.py:1842
+#: ../pyhoca/wxgui/profilemanager.py:1897
+#: ../pyhoca/wxgui/profilemanager.py:1921
msgid "Choose a public SSH key"
msgstr "Elige una clave pÃēblica SSH"
-#: ../pyhoca/wxgui/profilemanager.py:2220
+#: ../pyhoca/wxgui/profilemanager.py:2255
msgid "Choose a folder to share within a session"
msgstr "Elige la carpeta que quieres compartir en la conexiÃŗn"
-#: ../pyhoca/wxgui/profilemanager.py:2348
-#: ../pyhoca/wxgui/profilemanager.py:2351
-#: ../pyhoca/wxgui/profilemanager.py:2354
-#: ../pyhoca/wxgui/profilemanager.py:2359
-#: ../pyhoca/wxgui/profilemanager.py:2369 ../pyhoca/wxgui/menus_taskbar.py:117
+#: ../pyhoca/wxgui/profilemanager.py:2383
+#: ../pyhoca/wxgui/profilemanager.py:2386
+#: ../pyhoca/wxgui/profilemanager.py:2389 ../pyhoca/wxgui/menus_taskbar.py:122
msgid "Profile Manager"
msgstr "Gestor de Perfiles"
-#: ../pyhoca/wxgui/profilemanager.py:2348
+#: ../pyhoca/wxgui/profilemanager.py:2383
msgid "Profile name is missing, profile unusable!!!"
msgstr "ÂĄÂĄÂĄNombre de pefil no encontrado o no vÃĄlido!!!"
-#: ../pyhoca/wxgui/profilemanager.py:2351
-#: ../pyhoca/wxgui/profilemanager.py:2354
+#: ../pyhoca/wxgui/profilemanager.py:2386
+#: ../pyhoca/wxgui/profilemanager.py:2389
#, python-format
msgid "Profile name %s already exists!!!"
msgstr "El perfil de usuario %s ya existe!!!"
-#: ../pyhoca/wxgui/profilemanager.py:2359
-msgid "The SSH proxy configuration is incomplete. Try again."
-msgstr ""
-"El protocolo de autenticaciÃŗn de comunicaciones estÃĄ incompleto. IntÊntalo "
-"otra vez."
-
-#: ../pyhoca/wxgui/profilemanager.py:2369
-#, python-format
-msgid ""
-"Another session profile (%s) already uses [%s]:%s for binding a local SSH "
-"proxy to.\n"
-"Please change the SSH proxy settings accordingly."
-msgstr ""
-"Existe otro perfil de sesiÃŗn (%s) que ya estÃĄ usando [%s]:%s para el enlace "
-"al proxy SSH local.\n"
-"Por favor, cambia los parÃĄmetros del proxy SSH en base a esta informaciÃŗn."
-
-#: ../pyhoca/wxgui/profilemanager.py:2396
+#: ../pyhoca/wxgui/profilemanager.py:2416
#, python-format
msgid "%s - profile added"
msgstr "%s - perfil aÃąadido"
-#: ../pyhoca/wxgui/profilemanager.py:2397
+#: ../pyhoca/wxgui/profilemanager.py:2417
msgid "A new session profile has been added."
msgstr "Se ha aÃąadido un nuevo perfil de sesiÃŗn."
-#: ../pyhoca/wxgui/profilemanager.py:2401
+#: ../pyhoca/wxgui/profilemanager.py:2421
#, python-format
msgid "%s - modified"
msgstr "%s - modificado"
-#: ../pyhoca/wxgui/profilemanager.py:2402
+#: ../pyhoca/wxgui/profilemanager.py:2422
msgid "Changes to profile have been saved."
msgstr "Se han guardado los cambios en el perfil."
-#: ../pyhoca/wxgui/menus_taskbar.py:74
+#: ../pyhoca/wxgui/listdesktops.py:82
+#, python-format
+msgid "Share Desktop Session - %s"
+msgstr "Compartir sesiÃŗn de escritorio - %s"
+
+#: ../pyhoca/wxgui/listdesktops.py:84
+msgid "Select one of the available desktop sessions on this server"
+msgstr "Elegir una de las sesiones de escritorio disponibles en el servidor"
+
+#: ../pyhoca/wxgui/listdesktops.py:90
+msgid "View session only"
+msgstr "Ver sÃŗlo la sesiÃŗn"
+
+#: ../pyhoca/wxgui/listdesktops.py:91
+msgid "Gain full access"
+msgstr "Obtener acceso completo"
+
+#: ../pyhoca/wxgui/listdesktops.py:95
+msgid "Share Desktop"
+msgstr "Compartir Escritorio"
+
+#: ../pyhoca/wxgui/listdesktops.py:98
+msgid "Refresh list"
+msgstr "Actualizar lista"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:76
msgid "Edit Profile"
msgstr "Editar Perfil"
-#: ../pyhoca/wxgui/menus_taskbar.py:77
+#: ../pyhoca/wxgui/menus_taskbar.py:79
msgid "Use as Template for New Profile"
msgstr "Usar como Plantilla para Nuevos Perfiles"
-#: ../pyhoca/wxgui/menus_taskbar.py:78
+#: ../pyhoca/wxgui/menus_taskbar.py:81
+msgid "Export Profile"
+msgstr "Exportar Perfil"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:82
msgid "Delete Profile"
msgstr "Borrar Perfil"
-#: ../pyhoca/wxgui/menus_taskbar.py:106
+#: ../pyhoca/wxgui/menus_taskbar.py:111
#, python-format
msgid "About %s (%s)..."
msgstr "Acerca de %s (%s) ..."
-#: ../pyhoca/wxgui/menus_taskbar.py:132
+#: ../pyhoca/wxgui/menus_taskbar.py:137
msgid "Manage Session Profile"
msgstr "Gestionar Perfil de SesiÃŗn"
-#: ../pyhoca/wxgui/menus_taskbar.py:141
+#: ../pyhoca/wxgui/menus_taskbar.py:146
msgid "Printing Preferences"
msgstr "Preferencias de impresiÃŗn"
-#: ../pyhoca/wxgui/menus_taskbar.py:147
+#: ../pyhoca/wxgui/menus_taskbar.py:152
msgid "Client Options"
msgstr "Opciones del Cliente"
-#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:783
-#: ../pyhoca/wxgui/menus_taskbar.py:975
+#: ../pyhoca/wxgui/menus_taskbar.py:160 ../pyhoca/wxgui/menus_taskbar.py:828
+#: ../pyhoca/wxgui/menus_taskbar.py:1033
msgid "E&xit"
msgstr "S&alir"
-#: ../pyhoca/wxgui/menus_taskbar.py:227
+#: ../pyhoca/wxgui/menus_taskbar.py:232
msgid "Window title"
msgstr "TÃtulo de la ventana"
-#: ../pyhoca/wxgui/menus_taskbar.py:233 ../pyhoca/wxgui/menus_taskbar.py:608
+#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:631
msgid "Resume Session"
msgstr "Retomar SesiÃŗn"
-#: ../pyhoca/wxgui/menus_taskbar.py:235
+#: ../pyhoca/wxgui/menus_taskbar.py:240
msgid "Resume Session (not possible)"
msgstr "Retomar SesiÃŗn (no disponible)"
-#: ../pyhoca/wxgui/menus_taskbar.py:246
+#: ../pyhoca/wxgui/menus_taskbar.py:251
msgid "Transfer Session"
msgstr "Transferir SesiÃŗn"
-#: ../pyhoca/wxgui/menus_taskbar.py:248
+#: ../pyhoca/wxgui/menus_taskbar.py:253
msgid "Transfer Session (not possible)"
msgstr "Transferir SesiÃŗn (no disponible)"
-#: ../pyhoca/wxgui/menus_taskbar.py:252 ../pyhoca/wxgui/menus_taskbar.py:599
+#: ../pyhoca/wxgui/menus_taskbar.py:258 ../pyhoca/wxgui/menus_taskbar.py:622
msgid "Suspend Session (and disconnect/exit)"
msgstr "Suspender SesiÃŗn (y desconectar/salir)"
-#: ../pyhoca/wxgui/menus_taskbar.py:254 ../pyhoca/wxgui/menus_taskbar.py:601
+#: ../pyhoca/wxgui/menus_taskbar.py:260 ../pyhoca/wxgui/menus_taskbar.py:624
msgid "Suspend Session (and disconnect)"
msgstr "Suspender SesiÃŗn (y desconectar)"
-#: ../pyhoca/wxgui/menus_taskbar.py:256 ../pyhoca/wxgui/menus_taskbar.py:603
+#: ../pyhoca/wxgui/menus_taskbar.py:262 ../pyhoca/wxgui/menus_taskbar.py:626
msgid "Suspend Session"
msgstr "Suspender SesiÃŗn"
-#: ../pyhoca/wxgui/menus_taskbar.py:262 ../pyhoca/wxgui/menus_taskbar.py:612
+#: ../pyhoca/wxgui/menus_taskbar.py:268 ../pyhoca/wxgui/menus_taskbar.py:635
msgid "Terminate Session (and disconnect/exit)"
msgstr "Finalizar SesiÃŗn (y desconectar/salir)"
-#: ../pyhoca/wxgui/menus_taskbar.py:264 ../pyhoca/wxgui/menus_taskbar.py:614
+#: ../pyhoca/wxgui/menus_taskbar.py:270 ../pyhoca/wxgui/menus_taskbar.py:637
msgid "Terminate Session (and disconnect)"
msgstr "Finalizar SesiÃŗn (y desconectar)"
-#: ../pyhoca/wxgui/menus_taskbar.py:266 ../pyhoca/wxgui/menus_taskbar.py:616
+#: ../pyhoca/wxgui/menus_taskbar.py:272 ../pyhoca/wxgui/menus_taskbar.py:639
msgid "Terminate Session"
msgstr "Finalizar SesiÃŗn"
-#: ../pyhoca/wxgui/menus_taskbar.py:270 ../pyhoca/wxgui/menus_taskbar.py:596
+#: ../pyhoca/wxgui/menus_taskbar.py:275
+msgid "End Desktop Sharing (and disconnect/exit)"
+msgstr "Finalizar Compartir Escritorio (y desconectar/salir)"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:277
+msgid "End Desktop Sharing (and disconnect)"
+msgstr "Finalizar Compartir Escritorio (y desconectar)"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:279
+msgid "End Desktop Sharing"
+msgstr "FinalizÃŗ Compartir Escritorio"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:283 ../pyhoca/wxgui/menus_taskbar.py:619
msgid "Refresh menu tree"
msgstr "Actualizar ÃĄrbol de menÃēs"
-#: ../pyhoca/wxgui/menus_taskbar.py:279
+#: ../pyhoca/wxgui/menus_taskbar.py:292
msgid "Rename Session Window"
msgstr "Renombrar la Ventana de la SesiÃŗn"
-#: ../pyhoca/wxgui/menus_taskbar.py:280
+#: ../pyhoca/wxgui/menus_taskbar.py:293
msgid "Show Session Window"
msgstr "Mostrar la Ventana de la SesiÃŗn"
-#: ../pyhoca/wxgui/menus_taskbar.py:322
+#: ../pyhoca/wxgui/menus_taskbar.py:335
msgid "&Share custom local folder"
msgstr "Compartir carpeta per&sonalizada local"
-#: ../pyhoca/wxgui/menus_taskbar.py:337
+#: ../pyhoca/wxgui/menus_taskbar.py:350
msgid "Share:"
msgstr "Compartir:"
-#: ../pyhoca/wxgui/menus_taskbar.py:346
+#: ../pyhoca/wxgui/menus_taskbar.py:359
msgid "Unshare:"
msgstr "No compartido:"
-#: ../pyhoca/wxgui/menus_taskbar.py:354
+#: ../pyhoca/wxgui/menus_taskbar.py:367
msgid "Unshare &all local folders"
msgstr "Dejar de compartir tod&as las carpetas locales"
-#: ../pyhoca/wxgui/menus_taskbar.py:360
+#: ../pyhoca/wxgui/menus_taskbar.py:373
msgid "Restore shares in next session"
msgstr "Restaurar comparticiones en la prÃŗxima sesiÃŗn"
-#: ../pyhoca/wxgui/menus_taskbar.py:440
+#: ../pyhoca/wxgui/menus_taskbar.py:453
msgid "Multimedia"
msgstr "Multimedia"
-#: ../pyhoca/wxgui/menus_taskbar.py:441
+#: ../pyhoca/wxgui/menus_taskbar.py:454
msgid "Development"
msgstr "Desarrollo"
-#: ../pyhoca/wxgui/menus_taskbar.py:442
+#: ../pyhoca/wxgui/menus_taskbar.py:455
msgid "Education"
msgstr "EducaciÃŗn"
-#: ../pyhoca/wxgui/menus_taskbar.py:443
+#: ../pyhoca/wxgui/menus_taskbar.py:456
msgid "Games"
msgstr "Juegos"
-#: ../pyhoca/wxgui/menus_taskbar.py:444
+#: ../pyhoca/wxgui/menus_taskbar.py:457
msgid "Graphics"
msgstr "GrÃĄficos"
-#: ../pyhoca/wxgui/menus_taskbar.py:445
+#: ../pyhoca/wxgui/menus_taskbar.py:458
msgid "Internet"
msgstr "Internet"
-#: ../pyhoca/wxgui/menus_taskbar.py:446
+#: ../pyhoca/wxgui/menus_taskbar.py:459
msgid "Office Applications"
msgstr "OfimÃĄtica"
-#: ../pyhoca/wxgui/menus_taskbar.py:447
+#: ../pyhoca/wxgui/menus_taskbar.py:460
msgid "System"
msgstr "Sistema"
-#: ../pyhoca/wxgui/menus_taskbar.py:448
+#: ../pyhoca/wxgui/menus_taskbar.py:461
msgid "Utilities"
msgstr "Utilidades"
-#: ../pyhoca/wxgui/menus_taskbar.py:449
+#: ../pyhoca/wxgui/menus_taskbar.py:462
msgid "Other Applications"
msgstr "Otras Aplicaciones"
-#: ../pyhoca/wxgui/menus_taskbar.py:521 ../pyhoca/wxgui/menus_taskbar.py:533
+#: ../pyhoca/wxgui/menus_taskbar.py:535 ../pyhoca/wxgui/menus_taskbar.py:547
#, python-format
msgid "Connect %s"
msgstr "Conectar %s"
-#: ../pyhoca/wxgui/menus_taskbar.py:527
+#: ../pyhoca/wxgui/menus_taskbar.py:541
msgid "Currently connecting..."
msgstr "Conectando..."
-#: ../pyhoca/wxgui/menus_taskbar.py:541
+#: ../pyhoca/wxgui/menus_taskbar.py:556
msgid "Start &new Desktop Session"
msgstr "Iniciar &nueva SesiÃŗn de Escritorio"
-#: ../pyhoca/wxgui/menus_taskbar.py:546 ../pyhoca/wxgui/menus_taskbar.py:684
+#: ../pyhoca/wxgui/menus_taskbar.py:560 ../pyhoca/wxgui/menus_taskbar.py:660
+msgid "Start Desktop Sharing Session"
+msgstr "Iniciar Compartir Escritorio"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:566 ../pyhoca/wxgui/menus_taskbar.py:710
msgid "Retrieving Application Menu..."
msgstr "Recuperando MenÃē de AplicaciÃŗn..."
-#: ../pyhoca/wxgui/menus_taskbar.py:550 ../pyhoca/wxgui/menus_taskbar.py:687
+#: ../pyhoca/wxgui/menus_taskbar.py:570 ../pyhoca/wxgui/menus_taskbar.py:713
msgid "Retrieve Application Menu"
msgstr "Recibido MenÃē de AplicaciÃŗn"
-#: ../pyhoca/wxgui/menus_taskbar.py:553
+#: ../pyhoca/wxgui/menus_taskbar.py:573
+msgid "Start &new RDP Session"
+msgstr "Iniciar &nueva SesiÃŗn RDP"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:576
msgid "Start &new Session"
msgstr "Iniciar &nueva SesiÃŗn"
-#: ../pyhoca/wxgui/menus_taskbar.py:633
+#: ../pyhoca/wxgui/menus_taskbar.py:656
msgid "Launch Single Application"
msgstr "Ejecutar la aplicaciÃŗn"
-#: ../pyhoca/wxgui/menus_taskbar.py:671
+#: ../pyhoca/wxgui/menus_taskbar.py:697
msgid "Manage Application Menu"
msgstr "Gestionar el MenÃē de la AplicaciÃŗn"
-#: ../pyhoca/wxgui/menus_taskbar.py:714
+#: ../pyhoca/wxgui/menus_taskbar.py:752
msgid "Running"
msgstr "Activa"
-#: ../pyhoca/wxgui/menus_taskbar.py:716
+#: ../pyhoca/wxgui/menus_taskbar.py:754
msgid "Suspended"
msgstr "Suspendida"
-#: ../pyhoca/wxgui/menus_taskbar.py:735
+#: ../pyhoca/wxgui/menus_taskbar.py:773
msgid "&Clean all sessions"
msgstr "&Limpiar el registro de sesiones"
-#: ../pyhoca/wxgui/menus_taskbar.py:741
+#: ../pyhoca/wxgui/menus_taskbar.py:779
msgid "Customize &profile"
msgstr "Configurar &perfil"
-#: ../pyhoca/wxgui/menus_taskbar.py:756
+#: ../pyhoca/wxgui/menus_taskbar.py:794
msgid "Shared &folders"
msgstr "Compartir &carpetas"
-#: ../pyhoca/wxgui/menus_taskbar.py:768
+#: ../pyhoca/wxgui/menus_taskbar.py:806
+msgid "Server Information"
+msgstr "InformaciÃŗn del Servidor"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:813
msgid "&Disconnect from Server"
msgstr "&Desconectar del servidor"
-#: ../pyhoca/wxgui/menus_taskbar.py:775
+#: ../pyhoca/wxgui/menus_taskbar.py:820
msgid "Suspend Session and E&xit application"
msgstr "Suspender SesiÃŗn y Salir (e&xit) de la aplicaciÃŗn"
-#: ../pyhoca/wxgui/menus_taskbar.py:779
+#: ../pyhoca/wxgui/menus_taskbar.py:824
msgid "Disconnect and E&xit application"
msgstr "Desconectar y Salir (e&xit) de la aplicaciÃŗn"
-#: ../pyhoca/wxgui/menus_taskbar.py:833
+#: ../pyhoca/wxgui/menus_taskbar.py:878
msgid "Add Profile"
msgstr "AÃąadir Perfil"
-#: ../pyhoca/wxgui/menus_taskbar.py:909
+#: ../pyhoca/wxgui/menus_taskbar.py:954
msgid "No session profiles defined"
msgstr "No se han definido perfiles de sesiÃŗn"
-#: ../pyhoca/wxgui/menus_taskbar.py:945
-msgid "Start/Resume Session"
-msgstr "Iniciar/Retomar SesiÃŗn"
+#: ../pyhoca/wxgui/menus_taskbar.py:965
+msgid "Export all Profiles"
+msgstr "Exportar todos los Perfiles"
-#: ../pyhoca/wxgui/menus_taskbar.py:945
+#: ../pyhoca/wxgui/menus_taskbar.py:967
+msgid "Export Profile Group"
+msgstr "Exportar Perfil de Grupo"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:1003
msgid "Connect Server"
msgstr "Conectar con el Servidor"
@@ -973,65 +1033,65 @@ msgstr "Conectar con el Servidor"
msgid "About %s ..."
msgstr "Acerca de %s ..."
-#: ../pyhoca/wxgui/frontend.py:459
+#: ../pyhoca/wxgui/frontend.py:465
msgid "Suspending sessions and exiting application..."
msgstr "Suspendiendo sesiones y saliendo de las aplicaciones..."
-#: ../pyhoca/wxgui/frontend.py:462
+#: ../pyhoca/wxgui/frontend.py:468
#, python-format
msgid "Disconnecting %s and exiting application..."
msgstr "Desconectando %s y saliendo de las aplicaciones..."
-#: ../pyhoca/wxgui/frontend.py:464
+#: ../pyhoca/wxgui/frontend.py:470
msgid "Exiting application..."
msgstr "Saliendo de la aplicaciÃŗn..."
-#: ../pyhoca/wxgui/frontend.py:562
+#: ../pyhoca/wxgui/frontend.py:568
#, python-format
msgid "%s - server warning"
msgstr "%s - advertencia del servidor"
-#: ../pyhoca/wxgui/frontend.py:562
+#: ../pyhoca/wxgui/frontend.py:568
msgid "The X2Go Server does not publish an application menu."
-msgstr "El servidor X2GO no publica menÃē de la aplicaciÃŗn"
+msgstr "El servidor X2GO no publica menÃē de la aplicaciÃŗn."
-#: ../pyhoca/wxgui/frontend.py:613
+#: ../pyhoca/wxgui/frontend.py:619
msgid "SSH key authentication has been successful."
msgstr "Se ha iniciado sesiÃŗn con Êxito usando la clave SSH."
-#: ../pyhoca/wxgui/frontend.py:650
+#: ../pyhoca/wxgui/frontend.py:656
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:671
+#: ../pyhoca/wxgui/frontend.py:677
#, python-format
msgid "%s - EOF error"
msgstr "%s - error EOF"
-#: ../pyhoca/wxgui/frontend.py:671
+#: ../pyhoca/wxgui/frontend.py:677
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:678
+#: ../pyhoca/wxgui/frontend.py:684
#, python-format
msgid "%s - auth key error"
msgstr "%s - error en la clave de identificaciÃŗn"
-#: ../pyhoca/wxgui/frontend.py:699
+#: ../pyhoca/wxgui/frontend.py:705
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:728
+#: ../pyhoca/wxgui/frontend.py:734
#, python-format
msgid "%s: DirectRDP not supported yet"
msgstr "%s; Sin soporte DirectRDP todavÃa"
-#: ../pyhoca/wxgui/frontend.py:729
+#: ../pyhoca/wxgui/frontend.py:735
#, python-format
msgid ""
"We apologize for the inconvenience...\n"
@@ -1039,66 +1099,154 @@ msgid ""
"Session profiles of type ,,DirectRDP'' are not\n"
"supported by %s (%s), yet!!\n"
"\n"
-"DirectRDP support will be available in %s (>= 0.2.2.0)."
+"DirectRDP support will be available in %s (>= 1.0.0.0)."
msgstr ""
"Pedimos disculpas por los inconvenientes\n"
"\n"
"Los perfiles de sesiÃŗn del tipo \"DirectRDP\" no estÃĄn\n"
"soportados por %s (%s) todavÃa\n"
"\n"
-"El soporte DirectRDP estarÃĄ disponible en %s (>= 0.2.2.0)."
+"El soporte DirectRDP estarÃĄ disponible en %s (>= 1.0.0.0)."
-#: ../pyhoca/wxgui/frontend.py:741
+#: ../pyhoca/wxgui/frontend.py:747
msgid "Unknown session profile, configure before using it..."
-msgstr "Perfil de SesiÃŗn Desconocido, configÃēralo antes de usar..."
+msgstr "Perfil de sesiÃŗn desconocido, configÃēralo antes de usar..."
+
+#: ../pyhoca/wxgui/frontend.py:778
+#, python-format
+msgid "Desktop Sharing with %s not supported by server"
+msgstr "Compartir Escritorio con %s no estÃĄ soportado por el servidor"
+
+#: ../pyhoca/wxgui/frontend.py:779
+#, python-format
+msgid ""
+"We apologize for the inconvenience...\n"
+"\n"
+"Session profiles of type ,,SHADOW'' are not\n"
+"supported by X2Go Server (v%s)!!!\n"
+"\n"
+"Desktop Sharing with %s requires\n"
+"X2Go Server 4.1.0.0 and above."
+msgstr ""
+"Pedimos disculpas por los inconvenientes\n"
+"\n"
+"Los perfiles de sesiÃŗn del tipo \"SHADOW\" no estÃĄn\n"
+"soportados por %s (%s) todavÃa\n"
+"\n"
+"El soporte Compartir Escritorio con %s requiere X2Go Server 4.1.0.0 o "
+"superior."
-#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:1332
+#: ../pyhoca/wxgui/frontend.py:837 ../pyhoca/wxgui/frontend.py:1488
#, python-format
msgid "%s - session warning"
msgstr "%s - advertencia de la sesiÃŗn"
-#: ../pyhoca/wxgui/frontend.py:798
+#: ../pyhoca/wxgui/frontend.py:837
#, python-format
msgid "Execution of command ,,%s'' failed."
msgstr "Fallo al ejecutar el comando \"%s\"."
-#: ../pyhoca/wxgui/frontend.py:939
+#: ../pyhoca/wxgui/frontend.py:978
msgid "Cleaning X2Go sessions..."
msgstr "Limpiando sesiones X2Go..."
-#: ../pyhoca/wxgui/frontend.py:974
+#: ../pyhoca/wxgui/frontend.py:1026
#, python-format
msgid "%s - disconnect"
msgstr "%s - desconectado"
-#: ../pyhoca/wxgui/frontend.py:974
+#: ../pyhoca/wxgui/frontend.py:1026
msgid "X2Go Profile is now disconnected."
msgstr "Se ha desconectado el Perfil X2Go."
-#: ../pyhoca/wxgui/frontend.py:995
+#: ../pyhoca/wxgui/frontend.py:1047
msgid "New Session Profile"
msgstr "Nuevo Perfil de SesiÃŗn"
-#: ../pyhoca/wxgui/frontend.py:1047
+#: ../pyhoca/wxgui/frontend.py:1102
#, python-format
msgid "Really Delete Session Profile ,,%s''?"
msgstr "Eliminar el Perfil de SesiÃŗn \"%s''?"
-#: ../pyhoca/wxgui/frontend.py:1053
+#: ../pyhoca/wxgui/frontend.py:1108
#, python-format
msgid "%s - profile deleted"
msgstr "%s - perfil eliminado"
-#: ../pyhoca/wxgui/frontend.py:1053
+#: ../pyhoca/wxgui/frontend.py:1108
msgid "The session profile has been deleted."
msgstr "Se ha eliminado el perfil de sesiÃŗn."
-#: ../pyhoca/wxgui/frontend.py:1071
+#: ../pyhoca/wxgui/frontend.py:1137
+#, python-format
+msgid "%s - export session profiles"
+msgstr "%s - exportar perfiles de sesiÃŗn"
+
+#: ../pyhoca/wxgui/frontend.py:1142
+#, python-format
+msgid "%s - export session profile"
+msgstr "%s - exportar perfil de sesiÃŗn"
+
+#: ../pyhoca/wxgui/frontend.py:1154
+#, python-format
+msgid "%s: Export file already exists"
+msgstr "%s: El archivo de exportaciÃŗn ya existe"
+
+#: ../pyhoca/wxgui/frontend.py:1155
+#, python-format
+msgid ""
+"The file Âģ%sÂĢ already exists in this folder.\n"
+"\n"
+"Do you want to replace it?"
+msgstr ""
+"El archivo \"%s\" ya existe en esa carpeta.\n"
+"\n"
+"ÂŋQuieres reemplazarlo?"
+
+#: ../pyhoca/wxgui/frontend.py:1176
+#, python-format
+msgid "%s - profiles exported"
+msgstr "%s - perfiles exportados"
+
+#: ../pyhoca/wxgui/frontend.py:1176
+#, python-format
+msgid "Successfully exported session profile group Âģ%sÂĢ to file Âģ%sÂĢ."
+msgstr ""
+"Se ha exportado el grupo de perfiles de sesiÃŗn \"%s\" al archivo \"%s\"."
+
+#: ../pyhoca/wxgui/frontend.py:1178
+#, python-format
+msgid "%s - profile exported"
+msgstr "%s - perfil exportado"
+
+#: ../pyhoca/wxgui/frontend.py:1178
+#, python-format
+msgid "Successfully exported single session profile Âģ%sÂĢ to file Âģ%sÂĢ."
+msgstr "Se ha exportado el perfil de sesiÃŗn \"%s\" al archivo \"%s\"."
+
+#: ../pyhoca/wxgui/frontend.py:1182
+#, python-format
+msgid "%s: Exporting session profile(s) failed"
+msgstr "%s: La exportaciÃŗn del perfil de sesiÃŗn o sesiones ha fallado"
+
+#: ../pyhoca/wxgui/frontend.py:1183
+#, python-format
+msgid ""
+"The selected session profile(s) could not be exported to the \n"
+"file Âģ%sÂĢ.\n"
+"\n"
+"Check for common problems (disk full, insufficient access, etc.)."
+msgstr ""
+"El perfil o perfiles de sesiÃŗn no pueden ser exportados al \n"
+"archivo \"%s\".\n"
+"Comprueba problemas comunes (disco lleno, sin permisos, etc.)."
+
+#: ../pyhoca/wxgui/frontend.py:1202
#, 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:1224
+#: ../pyhoca/wxgui/frontend.py:1355
#, python-format
msgid ""
"The authenticity of host [%s]:%s can't be established.\n"
@@ -1111,17 +1259,17 @@ msgstr ""
"\n"
"ÂŋContinuar con la conexiÃŗn?"
-#: ../pyhoca/wxgui/frontend.py:1232
+#: ../pyhoca/wxgui/frontend.py:1363
#, python-format
msgid "%s: Confirm Host Authorization"
msgstr "%s: Se confirma la autorizaciÃŗn del equipo"
-#: ../pyhoca/wxgui/frontend.py:1277
+#: ../pyhoca/wxgui/frontend.py:1409
#, python-format
msgid "%s - channel error"
msgstr "%s - error en el canal"
-#: ../pyhoca/wxgui/frontend.py:1277
+#: ../pyhoca/wxgui/frontend.py:1409
#, python-format
msgid ""
"Lost connection to server %s unexpectedly! Try to re-authenticate to the "
@@ -1130,31 +1278,55 @@ msgstr ""
"ÂĄLa conexiÃŗn con el servidor %s ha finalizado inesperadamente! Intenta "
"iniciar sesiÃŗn nuevamente..."
-#: ../pyhoca/wxgui/frontend.py:1295 ../pyhoca/wxgui/frontend.py:1313
-#: ../pyhoca/wxgui/frontend.py:1315 ../pyhoca/wxgui/frontend.py:1351
+#: ../pyhoca/wxgui/frontend.py:1426 ../pyhoca/wxgui/frontend.py:1469
+#: ../pyhoca/wxgui/frontend.py:1471 ../pyhoca/wxgui/frontend.py:1507
#, python-format
msgid "%s - session failure"
msgstr "%s - fallo en la sesiÃŗn"
-#: ../pyhoca/wxgui/frontend.py:1295
+#: ../pyhoca/wxgui/frontend.py:1426
msgid "The session startup failed."
-msgstr "El inicio de sesiÃŗn ha fallado"
+msgstr "El inicio de sesiÃŗn ha fallado."
-#: ../pyhoca/wxgui/frontend.py:1313
+#: ../pyhoca/wxgui/frontend.py:1439
+#, python-format
+msgid "%s - timeout"
+msgstr "%s - tiempo de espera agotado"
+
+#: ../pyhoca/wxgui/frontend.py:1439
+msgid ""
+"The server took long to provide a list of sharable desktops.\n"
+"This can happen from time to time, please try again"
+msgstr ""
+"Al servidor le llevÃŗ mucho tiempo para devolver la lista de escritorios "
+"compartidos.\n"
+"Esto es algo poco frecuente. IntÊntalo de nuevo"
+
+#: ../pyhoca/wxgui/frontend.py:1451
+#, python-format
+msgid "%s - desktop sharing failed"
+msgstr "%s - fallo al compartir el escritorio"
+
+#: ../pyhoca/wxgui/frontend.py:1451
+#, python-format
+msgid "The desktop %s is not available for sharing (anymore)."
+msgstr "El escritorio %s no estÃĄ disponible para ser compartido."
+
+#: ../pyhoca/wxgui/frontend.py:1469
#, python-format
msgid "The command ,,%s'' is not available on X2Go server."
msgstr "El comando \"%s'' no estÃĄ presente en el servidor X2Go."
-#: ../pyhoca/wxgui/frontend.py:1315
+#: ../pyhoca/wxgui/frontend.py:1471
#, python-format
msgid ""
"The command ,,%s'' is not available on X2Go server\n"
"%s."
msgstr ""
-"El comando \"%s\" no estÃĄ disponible en el servidor X2go\n"
+"El comando \"%s\" no estÃĄ disponible en el servidor X2Go\n"
"%s."
-#: ../pyhoca/wxgui/frontend.py:1332
+#: ../pyhoca/wxgui/frontend.py:1488
#, python-format
msgid ""
"Reverse TCP port forwarding request for session %s to server port %s has "
@@ -1163,46 +1335,46 @@ 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:1351
+#: ../pyhoca/wxgui/frontend.py:1507
#, python-format
msgid ""
"Forwarding tunnel request to [%s]:%s for session %s was denied by remote "
-"X2go/SSH server. Session startup failed."
+"X2Go/SSH server. Session startup failed."
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."
+"servidor X2Go/SSH . Fallo en el inicio de sesiÃŗn."
-#: ../pyhoca/wxgui/frontend.py:1370
+#: ../pyhoca/wxgui/frontend.py:1526
#, python-format
msgid "%s - audio warning"
msgstr "%s - advertencia en el sistema de audio"
-#: ../pyhoca/wxgui/frontend.py:1370
+#: ../pyhoca/wxgui/frontend.py:1526
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"
+"Remote Desktop."
-#: ../pyhoca/wxgui/frontend.py:1377 ../pyhoca/wxgui/frontend.py:1384
+#: ../pyhoca/wxgui/frontend.py:1533 ../pyhoca/wxgui/frontend.py:1540
#, python-format
msgid "%s - audio error"
msgstr "%s - error en el audio"
-#: ../pyhoca/wxgui/frontend.py:1377
+#: ../pyhoca/wxgui/frontend.py:1533
msgid "The X2Go PulseAudio system could not be started."
-msgstr "El sistema X2Go PulseAudio no puede iniciarse"
+msgstr "El sistema X2Go PulseAudio no puede iniciarse."
-#: ../pyhoca/wxgui/frontend.py:1384
+#: ../pyhoca/wxgui/frontend.py:1540
msgid "The X2Go PulseAudio system has died unexpectedly."
-msgstr "El sistema X2Go PulseAudio ha finalizado inesperadamente"
+msgstr "El sistema X2Go PulseAudio ha finalizado inesperadamente."
-#: ../pyhoca/wxgui/frontend.py:1396
+#: ../pyhoca/wxgui/frontend.py:1552
#, python-format
msgid "%s - audio problem"
msgstr "%s - problema en el audio"
-#: ../pyhoca/wxgui/frontend.py:1396
+#: ../pyhoca/wxgui/frontend.py:1552
#, python-format
msgid ""
"The audio connection could not be set up for this session.\n"
@@ -1211,13 +1383,13 @@ msgstr ""
"La conexiÃŗn de audio puede que no estÊ configurada para esta sesiÃŗn.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1408
+#: ../pyhoca/wxgui/frontend.py:1564
#, python-format
msgid "%s - client-side printing not available"
msgstr ""
"%s - el sistema de impresiÃŗn en el lado del cliente no estÃĄ disponible -"
-#: ../pyhoca/wxgui/frontend.py:1408
+#: ../pyhoca/wxgui/frontend.py:1564
#, python-format
msgid ""
"The server denies client-side printing from within this session.\n"
@@ -1226,12 +1398,12 @@ msgstr ""
"El servidor no permite la impresiÃŗn del lado del cliente para esta sesiÃŗn.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1420
+#: ../pyhoca/wxgui/frontend.py:1576
#, python-format
msgid "%s - MIME box not available"
msgstr "%s - No estÃĄ disponible el contexto MIME"
-#: ../pyhoca/wxgui/frontend.py:1420
+#: ../pyhoca/wxgui/frontend.py:1576
#, python-format
msgid ""
"The server does not support the X2Go MIME box.\n"
@@ -1240,12 +1412,12 @@ msgstr ""
"El servidor no soporta el contexto X2Go MIME.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1432
+#: ../pyhoca/wxgui/frontend.py:1588
#, python-format
msgid "%s - client-side folders not sharable"
msgstr "%s - las carpetas del lado del cliente no estÃĄn compartidas"
-#: ../pyhoca/wxgui/frontend.py:1432
+#: ../pyhoca/wxgui/frontend.py:1588
#, python-format
msgid ""
"The server denies client-side folder sharing with this session.\n"
@@ -1255,12 +1427,12 @@ msgstr ""
"sesiÃŗn.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1444
+#: ../pyhoca/wxgui/frontend.py:1600
#, python-format
msgid "%s - client resources not sharable"
msgstr "%s - el recurso del cliente no estÃĄ marcado como compartido"
-#: ../pyhoca/wxgui/frontend.py:1444
+#: ../pyhoca/wxgui/frontend.py:1600
#, python-format
msgid ""
"Client-side folders and printers cannot be shared with this session.\n"
@@ -1270,12 +1442,12 @@ msgstr ""
"permitidas en esta sesiÃŗn.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1463 ../pyhoca/wxgui/frontend.py:1465
+#: ../pyhoca/wxgui/frontend.py:1619 ../pyhoca/wxgui/frontend.py:1621
#, python-format
msgid "%s - print error"
msgstr "%s - error de impresiÃŗn"
-#: ../pyhoca/wxgui/frontend.py:1463
+#: ../pyhoca/wxgui/frontend.py:1619
#, python-format
msgid ""
"%s\n"
@@ -1286,7 +1458,7 @@ msgstr ""
"...provocado en la impresora %s por la sesiÃŗn\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1465
+#: ../pyhoca/wxgui/frontend.py:1621
#, python-format
msgid ""
"%s\n"
@@ -1297,12 +1469,12 @@ msgstr ""
"...provocado por la sesiÃŗn\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1480 ../pyhoca/wxgui/frontend.py:1495
+#: ../pyhoca/wxgui/frontend.py:1636 ../pyhoca/wxgui/frontend.py:1651
#, python-format
msgid "%s - start"
msgstr "%s - inicio"
-#: ../pyhoca/wxgui/frontend.py:1480
+#: ../pyhoca/wxgui/frontend.py:1636
#, python-format
msgid ""
"New X2Go session starting up...\n"
@@ -1311,21 +1483,21 @@ msgstr ""
"Iniciando nueva sesiÃŗn X2Go...\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1495
+#: ../pyhoca/wxgui/frontend.py:1651
#, python-format
msgid ""
"Another client started X2Go session\n"
"%s"
msgstr ""
-"Otro cliente ha iniciado sesiÃŗn X2go\n"
+"Otro cliente ha iniciado sesiÃŗn X2Go\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1510 ../pyhoca/wxgui/frontend.py:1525
+#: ../pyhoca/wxgui/frontend.py:1666 ../pyhoca/wxgui/frontend.py:1681
#, python-format
msgid "%s - resume"
msgstr "%s - retornar a la sesiÃŗn"
-#: ../pyhoca/wxgui/frontend.py:1510
+#: ../pyhoca/wxgui/frontend.py:1666
#, python-format
msgid ""
"Resuming X2Go session...\n"
@@ -1334,21 +1506,21 @@ msgstr ""
"Retornando sesiÃŗn X2Go...\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1525
+#: ../pyhoca/wxgui/frontend.py:1681
#, python-format
msgid ""
"Another client resumed X2Go session\n"
"%s"
msgstr ""
-"Otro cliente retornÃŗ a la sesiÃŗn X2go\n"
+"Otro cliente retornÃŗ a la sesiÃŗn X2Go\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1540
+#: ../pyhoca/wxgui/frontend.py:1696
#, python-format
msgid "%s - running"
msgstr "%s - en ejecuciÃŗn"
-#: ../pyhoca/wxgui/frontend.py:1540
+#: ../pyhoca/wxgui/frontend.py:1696
#, python-format
msgid ""
"Found already running session\n"
@@ -1357,42 +1529,42 @@ msgstr ""
"La sesiÃŗn ya estÃĄ en ejecuciÃŗn\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1560
+#: ../pyhoca/wxgui/frontend.py:1716
#, python-format
msgid "%s - suspend"
msgstr "%s - suspender"
-#: ../pyhoca/wxgui/frontend.py:1560
+#: ../pyhoca/wxgui/frontend.py:1716
#, python-format
msgid ""
"X2Go Session has been suspended\n"
"%s"
msgstr ""
-"Se ha suspendido la SesiÃŗn X2go\n"
+"Se ha suspendido la SesiÃŗn X2Go\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1587
+#: ../pyhoca/wxgui/frontend.py:1743
#, python-format
msgid "%s - terminate"
msgstr "%s - finalizar"
-#: ../pyhoca/wxgui/frontend.py:1587
+#: ../pyhoca/wxgui/frontend.py:1743
#, python-format
msgid ""
"X2Go Session has terminated\n"
"%s"
msgstr ""
-"Se ha finalizado la sesiÃŗn X2go\n"
+"Se ha finalizado la sesiÃŗn X2Go\n"
"%s"
-#: ../pyhoca/wxgui/messages.py:73
+#: ../pyhoca/wxgui/messages.py:72
#, python-format
msgid ""
"Are you really sure you want to\n"
"delete the session profile ,,%s''?"
msgstr "ÂŋEliminar el perfil de sesiÃŗn \"%s\"?"
-#: ../pyhoca/wxgui/messages.py:74
+#: ../pyhoca/wxgui/messages.py:73
#, python-format
msgid ""
"PyHoca-GUI is already running for user ,,%s''!\n"
@@ -1406,15 +1578,15 @@ msgstr ""
"SÃŗlo se permite una instancia de PyHoca-GUI por usuario.\n"
"El icono de PyHoca-GUI se encuentra en el area de notificaciÃŗn."
-#: ../pyhoca/wxgui/messages.py:107
+#: ../pyhoca/wxgui/messages.py:106
msgid "Yes"
msgstr "SÃ"
-#: ../pyhoca/wxgui/messages.py:108
+#: ../pyhoca/wxgui/messages.py:107
msgid "No"
msgstr "No"
-#: ../pyhoca/wxgui/messages.py:125 ../pyhoca/wxgui/printingprefs.py:142
+#: ../pyhoca/wxgui/messages.py:124 ../pyhoca/wxgui/printingprefs.py:142
msgid "Ok"
msgstr "Ok"
@@ -1480,10 +1652,6 @@ msgstr "Usar esta impresora"
msgid "Custom print command"
msgstr "Comando de impresiÃŗn personalizado"
-#: ../pyhoca/wxgui/printingprefs.py:143
-msgid "Apply"
-msgstr "Aplicar"
-
#: ../pyhoca/wxgui/printingprefs.py:145
msgid "Print"
msgstr "Imprimir"
@@ -1517,12 +1685,80 @@ msgstr "Cambiar tÃtulo de la sesiÃŗn a"
msgid "OK"
msgstr "Ok"
-#, fuzzy
-#~ msgid "Remember shared folders"
-#~ msgstr "Compartir &carpetas"
+#: ../pyhoca/wxgui/serverinfo.py:76
+#, python-format
+msgid "Server Information - %s"
+msgstr "InformaciÃŗn del Servidor - %s"
-#, fuzzy
-#~ msgid "Shared Resources"
+#: ../pyhoca/wxgui/serverinfo.py:78
+#, python-format
+msgid ""
+"Session Profile: %s\n"
+"\n"
+"List of X2Go Server components, add-ons and their versions..."
+msgstr ""
+"Perfil de SesiÃŗn: %s\n"
+"\n"
+"Listado de componentes del servidor X2Go, mÃŗdulos y versiones..."
+
+#: ../pyhoca/wxgui/serverinfo.py:83
+msgid "Refresh"
+msgstr "Actualizar"
+
+#: ../pyhoca/wxgui/serverinfo.py:84
+msgid "Close"
+msgstr "Cerrar"
+
+#: ../pyhoca/wxgui/serverinfo.py:153
+msgid "X2Go Server"
+msgstr "X2Go Server"
+
+#: ../pyhoca/wxgui/serverinfo.py:154
+msgid "Server Core"
+msgstr "Server Core"
+
+#: ../pyhoca/wxgui/serverinfo.py:162
+msgid "Server Extensions"
+msgstr "Extensiones del Servidor"
+
+#: ../pyhoca/wxgui/serverinfo.py:168
+msgid "X2Go Server Add-ons"
+msgstr "AÃąadidos al servidor X2Go"
+
+#: ../pyhoca/wxgui/serverinfo.py:172
+msgid "X2Go Server Features"
+msgstr "CaracterÃsticas del servidor X2Go"
+
+#~ msgid "Settings"
+#~ msgstr "Opciones"
+
+#~ msgid "%s (%s)\n"
+#~ msgstr "%s (vÃa %s)"
+
+#~ msgid "Connect to another Desktop Session"
+#~ msgstr "Iniciar &nueva SesiÃŗn de Escritorio"
+
+#~ msgid "Start/Resume Session"
+#~ msgstr "Iniciar/Retomar SesiÃŗn"
+
+#~ msgid "SSH Proxy Tunnel"
+#~ msgstr "Tunel Proxy SSH"
+
+#~ msgid "The SSH proxy configuration is incomplete. Try again."
+#~ msgstr ""
+#~ "El protocolo de autenticaciÃŗn de comunicaciones estÃĄ incompleto. "
+#~ "IntÊntalo otra vez."
+
+#~ msgid ""
+#~ "Another session profile (%s) already uses [%s]:%s for binding a local SSH "
+#~ "proxy to.\n"
+#~ "Please change the SSH proxy settings accordingly."
+#~ msgstr ""
+#~ "Existe otro perfil de sesiÃŗn (%s) que ya estÃĄ usando [%s]:%s para el "
+#~ "enlace al proxy SSH local.\n"
+#~ "Por favor, cambia los parÃĄmetros del proxy SSH en base a esta informaciÃŗn."
+
+#~ msgid "Remember shared folders"
#~ msgstr "Compartir &carpetas"
#~ msgid "RSA/DSA private key"
@@ -1534,21 +1770,15 @@ msgstr "Ok"
#~ msgid "Keyboard layout"
#~ msgstr "MÃĄscara de teclado"
-#, fuzzy
#~ msgid "%s - DNS error"
#~ msgstr "%s - error en la clave"
#~ msgid "%s - connect error"
#~ msgstr "%s - error en la conexiÃŗn"
-#~ msgid "new session profile"
-#~ msgstr "Nuevo Perfil de SesiÃŗn"
-
-#, fuzzy
#~ msgid "Unknown Session Profile"
#~ msgstr "Nuevo Perfil de SesiÃŗn"
-#, fuzzy
#~ msgid "Retrieving Application menu..."
#~ msgstr "AplicaciÃŗn"
@@ -1561,11 +1791,9 @@ msgstr "Ok"
#~ msgid "Icon"
#~ msgstr "Icono"
-#, fuzzy
#~ msgid "All session profiles are connected"
#~ msgstr "No se han definido perfiles de sesiÃŗn"
-#, fuzzy
#~ msgid "New Profile"
#~ msgstr "Perfil "
diff --git a/po/fr.po b/po/fr.po
index 636eff8..59c7a24 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,5 +1,5 @@
# PyHoca-GUI / i18n.
-# Copyright (C) 2010-2012 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
# Dick Kniep <dick.kniep(a)lindix.nl>
# This file is distributed under the same license as the PyHoca-GUI package.
# Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>, 2011.
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PyHoca-GUI VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 14:25+0100\n"
+"POT-Creation-Date: 2013-01-29 22:21+0100\n"
"PO-Revision-Date: 2011-09-17 02:17+0100\n"
"Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n"
"Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n"
@@ -39,7 +39,7 @@ msgid "Authenticate"
msgstr ""
#: ../pyhoca/wxgui/logon.py:107
-msgid " Start SSH tunnel "
+msgid "Start SSH tunnel"
msgstr ""
#: ../pyhoca/wxgui/logon.py:115
@@ -50,23 +50,23 @@ msgstr ""
msgid "SSH proxy server login"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:127 ../pyhoca/wxgui/profilemanager.py:350
-#: ../pyhoca/wxgui/messages.py:131 ../pyhoca/wxgui/printingprefs.py:147
-#: ../pyhoca/wxgui/sessiontitle.py:85
+#: ../pyhoca/wxgui/logon.py:127 ../pyhoca/wxgui/profilemanager.py:373
+#: ../pyhoca/wxgui/listdesktops.py:99 ../pyhoca/wxgui/messages.py:130
+#: ../pyhoca/wxgui/printingprefs.py:147 ../pyhoca/wxgui/sessiontitle.py:85
msgid "Cancel"
msgstr ""
#: ../pyhoca/wxgui/logon.py:297 ../pyhoca/wxgui/logon.py:339
-#: ../pyhoca/wxgui/frontend.py:606
+#: ../pyhoca/wxgui/frontend.py:612
#, python-format
msgid "%s - connect failure"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:606
+#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:612
msgid "User is not allowed to start X2Go sessions!"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:303 ../pyhoca/wxgui/frontend.py:613
+#: ../pyhoca/wxgui/logon.py:303 ../pyhoca/wxgui/frontend.py:619
#, python-format
msgid "%s - connect"
msgstr ""
@@ -92,28 +92,28 @@ msgstr ""
msgid "Authentication to the SSH proxy server failed!"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:376 ../pyhoca/wxgui/frontend.py:664
+#: ../pyhoca/wxgui/logon.py:376 ../pyhoca/wxgui/frontend.py:670
#, python-format
msgid "%s - socket error"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:383 ../pyhoca/wxgui/frontend.py:643
-#: ../pyhoca/wxgui/frontend.py:650
+#: ../pyhoca/wxgui/logon.py:383 ../pyhoca/wxgui/frontend.py:649
+#: ../pyhoca/wxgui/frontend.py:656
#, python-format
msgid "%s - host key error"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:384 ../pyhoca/wxgui/frontend.py:643
+#: ../pyhoca/wxgui/logon.py:384 ../pyhoca/wxgui/frontend.py:649
msgid ""
"The remote server's host key is invalid or has not been accepted by the user"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:391 ../pyhoca/wxgui/frontend.py:685
+#: ../pyhoca/wxgui/logon.py:391 ../pyhoca/wxgui/frontend.py:691
#, python-format
msgid "%s - missing home directory"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:392 ../pyhoca/wxgui/frontend.py:685
+#: ../pyhoca/wxgui/logon.py:392 ../pyhoca/wxgui/frontend.py:691
msgid "The remote user's home directory does not exist."
msgstr ""
@@ -122,12 +122,12 @@ msgstr ""
msgid "%s - key error"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:407 ../pyhoca/wxgui/frontend.py:692
+#: ../pyhoca/wxgui/logon.py:407 ../pyhoca/wxgui/frontend.py:698
#, python-format
msgid "%s - auth error"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:415 ../pyhoca/wxgui/frontend.py:636
+#: ../pyhoca/wxgui/logon.py:415 ../pyhoca/wxgui/frontend.py:642
#, python-format
msgid "%s - SSH error"
msgstr ""
@@ -151,7 +151,7 @@ msgstr ""
#: ../pyhoca/wxgui/taskbar.py:93
#, python-format
msgid ""
-"PyHoca-GUI (Python X2goClient)\n"
+"PyHoca-GUI (Python X2Go Client)\n"
"Currently connecting you to remote X2Go server ,,%s''"
msgstr ""
@@ -163,7 +163,7 @@ msgstr ""
#: ../pyhoca/wxgui/taskbar.py:107
msgid ""
-"PyHoca-GUI (Python X2goClient)\n"
+"PyHoca-GUI (Python X2Go Client)\n"
"Client for connecting you to a remote X2Go server"
msgstr ""
@@ -200,745 +200,806 @@ msgid "Single Application"
msgstr ""
#: ../pyhoca/wxgui/profilemanager.py:87
-msgid "XDMCP Query"
+msgid "Share desktop session (SHADOW)"
msgstr ""
#: ../pyhoca/wxgui/profilemanager.py:88
-msgid "Windows Terminal Server (X2Go-proxied RDP)"
+msgid "XDMCP Query"
msgstr ""
#: ../pyhoca/wxgui/profilemanager.py:89
+msgid "Windows Terminal Server (X2Go-proxied RDP)"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:90
msgid "Windows Terminal Server (Direct RDP)"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/profilemanager.py:224
+#: ../pyhoca/wxgui/profilemanager.py:91 ../pyhoca/wxgui/profilemanager.py:243
msgid "Custom command"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:95 ../pyhoca/wxgui/menus_taskbar.py:393
+#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:406
msgid "Internet Browser"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:394
+#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:407
msgid "Email Client"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:395
+#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:408
msgid "Office"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:396
+#: ../pyhoca/wxgui/profilemanager.py:99 ../pyhoca/wxgui/menus_taskbar.py:409
msgid "Terminal"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:116
+#: ../pyhoca/wxgui/profilemanager.py:117
msgid "Open file with system's default application"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:117
+#: ../pyhoca/wxgui/profilemanager.py:118
msgid "Open application chooser dialog"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:118
+#: ../pyhoca/wxgui/profilemanager.py:119
msgid "Save incoming file as ..."
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:146
+#: ../pyhoca/wxgui/profilemanager.py:147
msgid "settings derived from "
msgstr ""
#. boxes for all tabs
-#: ../pyhoca/wxgui/profilemanager.py:167
+#: ../pyhoca/wxgui/profilemanager.py:186
msgid "Session Title"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:168
+#: ../pyhoca/wxgui/profilemanager.py:187
msgid "Session Window"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:169
+#: ../pyhoca/wxgui/profilemanager.py:188
msgid "Session Startup"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:170
+#: ../pyhoca/wxgui/profilemanager.py:189
msgid "Server"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:171
+#: ../pyhoca/wxgui/profilemanager.py:190
msgid "Proxy"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:172
+#: ../pyhoca/wxgui/profilemanager.py:191
msgid "Connection Link Speed"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:173
+#: ../pyhoca/wxgui/profilemanager.py:192
msgid "Compression"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:174
+#: ../pyhoca/wxgui/profilemanager.py:193
msgid "Display"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:175
+#: ../pyhoca/wxgui/profilemanager.py:194
msgid "Keyboard"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:176
+#: ../pyhoca/wxgui/profilemanager.py:195
msgid "Sound"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:177
+#: ../pyhoca/wxgui/profilemanager.py:196
msgid "Printing"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:178
+#: ../pyhoca/wxgui/profilemanager.py:197
msgid "Folder Exports"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:179
+#: ../pyhoca/wxgui/profilemanager.py:198
msgid "File Import"
msgstr ""
#. ##
#. ## widgets for the PROFILE tab
#. ##
-#: ../pyhoca/wxgui/profilemanager.py:184
+#: ../pyhoca/wxgui/profilemanager.py:203
msgid "Name"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:191
+#: ../pyhoca/wxgui/profilemanager.py:210
msgid "Set session window title"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:192
+#: ../pyhoca/wxgui/profilemanager.py:211
msgid "Use a default session window title"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:193
+#: ../pyhoca/wxgui/profilemanager.py:212
msgid "Custom session window title"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:212
+#: ../pyhoca/wxgui/profilemanager.py:231
msgid "Window Icon"
msgstr ""
#. ##
#. ## widgets for the SESSION tab
#. ##
-#: ../pyhoca/wxgui/profilemanager.py:218
+#: ../pyhoca/wxgui/profilemanager.py:237
msgid "Start session automatically after login"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:219
+#: ../pyhoca/wxgui/profilemanager.py:238
#, python-format
-msgid "Login automatically after %s has started"
+msgid "Login automatically after %s has started (needs --auto-connect)"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:220
+#: ../pyhoca/wxgui/profilemanager.py:239
msgid "Type"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:222
+#: ../pyhoca/wxgui/profilemanager.py:241
msgid "Application"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:226
+#: ../pyhoca/wxgui/profilemanager.py:245
msgid "XDMCP server"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:228
+#: ../pyhoca/wxgui/profilemanager.py:247
msgid "RDP server"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:230
+#: ../pyhoca/wxgui/profilemanager.py:249
msgid "RDP options"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:232
+#: ../pyhoca/wxgui/profilemanager.py:251
msgid "Integrate remote application(s) into local desktop (rootless mode)"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:233
+#: ../pyhoca/wxgui/profilemanager.py:252
msgid "Menu of published applications"
msgstr ""
#. ##
#. ## widgets for the CONNECTION tab
#. ##
-#: ../pyhoca/wxgui/profilemanager.py:240 ../pyhoca/wxgui/profilemanager.py:253
+#: ../pyhoca/wxgui/profilemanager.py:259 ../pyhoca/wxgui/profilemanager.py:273
msgid "User"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:242 ../pyhoca/wxgui/profilemanager.py:260
+#: ../pyhoca/wxgui/profilemanager.py:261 ../pyhoca/wxgui/profilemanager.py:280
msgid "Host"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:244 ../pyhoca/wxgui/profilemanager.py:262
+#: ../pyhoca/wxgui/profilemanager.py:263 ../pyhoca/wxgui/profilemanager.py:282
msgid "Port"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:246
+#: ../pyhoca/wxgui/profilemanager.py:265
msgid "Key"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:249
+#: ../pyhoca/wxgui/profilemanager.py:268
msgid "Discover SSH keys or use SSH agent for X2Go authentication"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:251
+#: ../pyhoca/wxgui/profilemanager.py:270
msgid "Enable forwarding of SSH authentication agent connections"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:252
+#: ../pyhoca/wxgui/profilemanager.py:271
+msgid "Store SSH host keys under (unique) X2Go session profile ID"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:272
msgid "Server behind SSH proxy"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:255
+#: ../pyhoca/wxgui/profilemanager.py:275
msgid "Use same username for X2Go and proxy host"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:256
+#: ../pyhoca/wxgui/profilemanager.py:276
msgid "Use same authentication for X2Go and proxy host"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:257
+#: ../pyhoca/wxgui/profilemanager.py:277
msgid "Key file"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:264
-msgid "SSH Proxy Tunnel"
-msgstr ""
-
-#: ../pyhoca/wxgui/profilemanager.py:270
+#: ../pyhoca/wxgui/profilemanager.py:284
msgid "Discover SSH keys or use SSH agent for proxy authentication"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:273
+#: ../pyhoca/wxgui/profilemanager.py:287
msgid "Modem"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:274
+#: ../pyhoca/wxgui/profilemanager.py:288
msgid "ISDN"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:275
+#: ../pyhoca/wxgui/profilemanager.py:289
msgid "ADSL"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:276
+#: ../pyhoca/wxgui/profilemanager.py:290
msgid "WAN"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:277
+#: ../pyhoca/wxgui/profilemanager.py:291
msgid "LAN"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:279
+#: ../pyhoca/wxgui/profilemanager.py:293
msgid "Method"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:281
+#: ../pyhoca/wxgui/profilemanager.py:295
msgid "Image quality"
msgstr ""
#. ##
-#. ## wigdets for the SETTINGS tab
+#. ## wigdets for the IO tab
#. ##
-#: ../pyhoca/wxgui/profilemanager.py:287
+#: ../pyhoca/wxgui/profilemanager.py:301
msgid "Fullscreen"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:288
+#: ../pyhoca/wxgui/profilemanager.py:302
msgid "Maximized"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:289
+#: ../pyhoca/wxgui/profilemanager.py:303
msgid "Custom Size"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:294
+#: ../pyhoca/wxgui/profilemanager.py:308
msgid "Set display DPI"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:296
+#: ../pyhoca/wxgui/profilemanager.py:310
msgid "Do not set (use server-side tools to configure the keyboard)"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:297
+#: ../pyhoca/wxgui/profilemanager.py:311
msgid ""
"Automatically detect and use client-side keyboard configuration inside the "
"session"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:298
+#: ../pyhoca/wxgui/profilemanager.py:312
msgid "Use custom keyboard settings as provided below"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:299
+#: ../pyhoca/wxgui/profilemanager.py:313
msgid "Keyboard model"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:301
+#: ../pyhoca/wxgui/profilemanager.py:315
msgid "Layout"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:303
+#: ../pyhoca/wxgui/profilemanager.py:317
msgid "Layout variant"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:305
+#. ##
+#. ## wigdets for the MEDIA tab
+#. ##
+#: ../pyhoca/wxgui/profilemanager.py:323
msgid "Enable sound support"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:306
+#: ../pyhoca/wxgui/profilemanager.py:324
msgid "Pulse Audio"
msgstr ""
#. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated.
#. However, config files can contain an Arts configuration, so we will honour this
-#: ../pyhoca/wxgui/profilemanager.py:310
+#: ../pyhoca/wxgui/profilemanager.py:328
msgid "Arts (not supported)"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:313
+#: ../pyhoca/wxgui/profilemanager.py:331
msgid "esd"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:314
+#: ../pyhoca/wxgui/profilemanager.py:332
msgid "Use default sound port"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:315
+#: ../pyhoca/wxgui/profilemanager.py:333
msgid "Custom sound port"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:318
+#: ../pyhoca/wxgui/profilemanager.py:336
+msgid "Client Side printing"
+msgstr ""
+
+#. ##
+#. ## wigdets for the SHARING tab
+#. ##
+#: ../pyhoca/wxgui/profilemanager.py:342
msgid "Use local folder sharing"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:319
+#: ../pyhoca/wxgui/profilemanager.py:343
msgid "Store share list at end of session"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:320
+#: ../pyhoca/wxgui/profilemanager.py:344
msgid "Path"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:323 ../pyhoca/wxgui/profilemanager.py:344
+#: ../pyhoca/wxgui/profilemanager.py:347 ../pyhoca/wxgui/profilemanager.py:366
msgid "Add"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:325
+#: ../pyhoca/wxgui/profilemanager.py:349
msgid "Local Path"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:326
+#: ../pyhoca/wxgui/profilemanager.py:350
msgid "Connect Method"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:327
+#: ../pyhoca/wxgui/profilemanager.py:351
msgid "Delete"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:329
+#: ../pyhoca/wxgui/profilemanager.py:353
msgid "Convert between client and server encodings"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:330
+#: ../pyhoca/wxgui/profilemanager.py:354
msgid "Client encoding"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:332
+#: ../pyhoca/wxgui/profilemanager.py:356
msgid "Server encoding"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:335
+#: ../pyhoca/wxgui/profilemanager.py:359
msgid "Use file MIME box for local file import"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:336
+#: ../pyhoca/wxgui/profilemanager.py:360
msgid "Extensions"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:338
+#: ../pyhoca/wxgui/profilemanager.py:362
msgid "Action"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:341
-msgid "Client Side printing"
-msgstr ""
-
-#: ../pyhoca/wxgui/profilemanager.py:345
+#: ../pyhoca/wxgui/profilemanager.py:367
msgid "Defaults"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:347
+#: ../pyhoca/wxgui/profilemanager.py:369
msgid "Save"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:348
+#: ../pyhoca/wxgui/profilemanager.py:370
msgid "Reset"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:401
-#: ../pyhoca/wxgui/profilemanager.py:1124
-#: ../pyhoca/wxgui/profilemanager.py:2268
+#: ../pyhoca/wxgui/profilemanager.py:372 ../pyhoca/wxgui/printingprefs.py:143
+msgid "Apply"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:423
+#: ../pyhoca/wxgui/profilemanager.py:1135
+#: ../pyhoca/wxgui/profilemanager.py:2303
msgid "automatically"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:403
-#: ../pyhoca/wxgui/profilemanager.py:1126
+#: ../pyhoca/wxgui/profilemanager.py:425
+#: ../pyhoca/wxgui/profilemanager.py:1137
msgid "manually"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:412
+#: ../pyhoca/wxgui/profilemanager.py:434
msgid "PyHoca-GUI Profile Manager - new profile"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:414
+#: ../pyhoca/wxgui/profilemanager.py:436
#, python-format
msgid "PyHoca-GUI Profile Manager - %s (connected)"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:416
+#: ../pyhoca/wxgui/profilemanager.py:438
#, python-format
msgid "PyHoca-GUI Profile Manager - %s"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:797
+#: ../pyhoca/wxgui/profilemanager.py:804
msgid "Profile"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:798
+#: ../pyhoca/wxgui/profilemanager.py:805
msgid "Session"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:799
+#: ../pyhoca/wxgui/profilemanager.py:806
msgid "Connection"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:800
+#: ../pyhoca/wxgui/profilemanager.py:807
msgid "Link Quality"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:801
-msgid "Settings"
+#: ../pyhoca/wxgui/profilemanager.py:808
+msgid "Input/Output"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:802
+#: ../pyhoca/wxgui/profilemanager.py:809
+msgid "Media"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:810
msgid "Sharing"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:988
+#: ../pyhoca/wxgui/profilemanager.py:989
msgid "<xkbtype>"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:989
+#: ../pyhoca/wxgui/profilemanager.py:990
msgid "<xkblayout>"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:990
+#: ../pyhoca/wxgui/profilemanager.py:991
msgid "<xkbvariant>"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:1444
+#: ../pyhoca/wxgui/profilemanager.py:1449
msgid "Icon Files (*.png)|*.png|All files (*.*)|*"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:1447
+#: ../pyhoca/wxgui/profilemanager.py:1452
msgid "Choose an icon for this session profile"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:1816
+#: ../pyhoca/wxgui/profilemanager.py:1895
msgid "All files (*.*)|*"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:1818
-#: ../pyhoca/wxgui/profilemanager.py:1842
+#: ../pyhoca/wxgui/profilemanager.py:1897
+#: ../pyhoca/wxgui/profilemanager.py:1921
msgid "Choose a public SSH key"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:2220
+#: ../pyhoca/wxgui/profilemanager.py:2255
msgid "Choose a folder to share within a session"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:2348
-#: ../pyhoca/wxgui/profilemanager.py:2351
-#: ../pyhoca/wxgui/profilemanager.py:2354
-#: ../pyhoca/wxgui/profilemanager.py:2359
-#: ../pyhoca/wxgui/profilemanager.py:2369 ../pyhoca/wxgui/menus_taskbar.py:117
+#: ../pyhoca/wxgui/profilemanager.py:2383
+#: ../pyhoca/wxgui/profilemanager.py:2386
+#: ../pyhoca/wxgui/profilemanager.py:2389 ../pyhoca/wxgui/menus_taskbar.py:122
msgid "Profile Manager"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:2348
+#: ../pyhoca/wxgui/profilemanager.py:2383
msgid "Profile name is missing, profile unusable!!!"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:2351
-#: ../pyhoca/wxgui/profilemanager.py:2354
+#: ../pyhoca/wxgui/profilemanager.py:2386
+#: ../pyhoca/wxgui/profilemanager.py:2389
#, python-format
msgid "Profile name %s already exists!!!"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:2359
-msgid "The SSH proxy configuration is incomplete. Try again."
-msgstr ""
-
-#: ../pyhoca/wxgui/profilemanager.py:2369
-#, python-format
-msgid ""
-"Another session profile (%s) already uses [%s]:%s for binding a local SSH "
-"proxy to.\n"
-"Please change the SSH proxy settings accordingly."
-msgstr ""
-
-#: ../pyhoca/wxgui/profilemanager.py:2396
+#: ../pyhoca/wxgui/profilemanager.py:2416
#, python-format
msgid "%s - profile added"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:2397
+#: ../pyhoca/wxgui/profilemanager.py:2417
msgid "A new session profile has been added."
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:2401
+#: ../pyhoca/wxgui/profilemanager.py:2421
#, python-format
msgid "%s - modified"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:2402
+#: ../pyhoca/wxgui/profilemanager.py:2422
msgid "Changes to profile have been saved."
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:74
+#: ../pyhoca/wxgui/listdesktops.py:82
+#, python-format
+msgid "Share Desktop Session - %s"
+msgstr ""
+
+#: ../pyhoca/wxgui/listdesktops.py:84
+msgid "Select one of the available desktop sessions on this server"
+msgstr ""
+
+#: ../pyhoca/wxgui/listdesktops.py:90
+msgid "View session only"
+msgstr ""
+
+#: ../pyhoca/wxgui/listdesktops.py:91
+msgid "Gain full access"
+msgstr ""
+
+#: ../pyhoca/wxgui/listdesktops.py:95
+msgid "Share Desktop"
+msgstr ""
+
+#: ../pyhoca/wxgui/listdesktops.py:98
+msgid "Refresh list"
+msgstr ""
+
+#: ../pyhoca/wxgui/menus_taskbar.py:76
msgid "Edit Profile"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:77
+#: ../pyhoca/wxgui/menus_taskbar.py:79
msgid "Use as Template for New Profile"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:78
+#: ../pyhoca/wxgui/menus_taskbar.py:81
+msgid "Export Profile"
+msgstr ""
+
+#: ../pyhoca/wxgui/menus_taskbar.py:82
msgid "Delete Profile"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:106
+#: ../pyhoca/wxgui/menus_taskbar.py:111
#, python-format
msgid "About %s (%s)..."
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:132
+#: ../pyhoca/wxgui/menus_taskbar.py:137
msgid "Manage Session Profile"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:141
+#: ../pyhoca/wxgui/menus_taskbar.py:146
msgid "Printing Preferences"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:147
+#: ../pyhoca/wxgui/menus_taskbar.py:152
msgid "Client Options"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:783
-#: ../pyhoca/wxgui/menus_taskbar.py:975
+#: ../pyhoca/wxgui/menus_taskbar.py:160 ../pyhoca/wxgui/menus_taskbar.py:828
+#: ../pyhoca/wxgui/menus_taskbar.py:1033
msgid "E&xit"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:227
+#: ../pyhoca/wxgui/menus_taskbar.py:232
msgid "Window title"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:233 ../pyhoca/wxgui/menus_taskbar.py:608
+#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:631
msgid "Resume Session"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:235
+#: ../pyhoca/wxgui/menus_taskbar.py:240
msgid "Resume Session (not possible)"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:246
+#: ../pyhoca/wxgui/menus_taskbar.py:251
msgid "Transfer Session"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:248
+#: ../pyhoca/wxgui/menus_taskbar.py:253
msgid "Transfer Session (not possible)"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:252 ../pyhoca/wxgui/menus_taskbar.py:599
+#: ../pyhoca/wxgui/menus_taskbar.py:258 ../pyhoca/wxgui/menus_taskbar.py:622
msgid "Suspend Session (and disconnect/exit)"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:254 ../pyhoca/wxgui/menus_taskbar.py:601
+#: ../pyhoca/wxgui/menus_taskbar.py:260 ../pyhoca/wxgui/menus_taskbar.py:624
msgid "Suspend Session (and disconnect)"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:256 ../pyhoca/wxgui/menus_taskbar.py:603
+#: ../pyhoca/wxgui/menus_taskbar.py:262 ../pyhoca/wxgui/menus_taskbar.py:626
msgid "Suspend Session"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:262 ../pyhoca/wxgui/menus_taskbar.py:612
+#: ../pyhoca/wxgui/menus_taskbar.py:268 ../pyhoca/wxgui/menus_taskbar.py:635
msgid "Terminate Session (and disconnect/exit)"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:264 ../pyhoca/wxgui/menus_taskbar.py:614
+#: ../pyhoca/wxgui/menus_taskbar.py:270 ../pyhoca/wxgui/menus_taskbar.py:637
msgid "Terminate Session (and disconnect)"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:266 ../pyhoca/wxgui/menus_taskbar.py:616
+#: ../pyhoca/wxgui/menus_taskbar.py:272 ../pyhoca/wxgui/menus_taskbar.py:639
msgid "Terminate Session"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:270 ../pyhoca/wxgui/menus_taskbar.py:596
-msgid "Refresh menu tree"
+#: ../pyhoca/wxgui/menus_taskbar.py:275
+msgid "End Desktop Sharing (and disconnect/exit)"
+msgstr ""
+
+#: ../pyhoca/wxgui/menus_taskbar.py:277
+msgid "End Desktop Sharing (and disconnect)"
msgstr ""
#: ../pyhoca/wxgui/menus_taskbar.py:279
+msgid "End Desktop Sharing"
+msgstr ""
+
+#: ../pyhoca/wxgui/menus_taskbar.py:283 ../pyhoca/wxgui/menus_taskbar.py:619
+msgid "Refresh menu tree"
+msgstr ""
+
+#: ../pyhoca/wxgui/menus_taskbar.py:292
msgid "Rename Session Window"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:280
+#: ../pyhoca/wxgui/menus_taskbar.py:293
msgid "Show Session Window"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:322
+#: ../pyhoca/wxgui/menus_taskbar.py:335
msgid "&Share custom local folder"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:337
+#: ../pyhoca/wxgui/menus_taskbar.py:350
msgid "Share:"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:346
+#: ../pyhoca/wxgui/menus_taskbar.py:359
msgid "Unshare:"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:354
+#: ../pyhoca/wxgui/menus_taskbar.py:367
msgid "Unshare &all local folders"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:360
+#: ../pyhoca/wxgui/menus_taskbar.py:373
msgid "Restore shares in next session"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:440
+#: ../pyhoca/wxgui/menus_taskbar.py:453
msgid "Multimedia"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:441
+#: ../pyhoca/wxgui/menus_taskbar.py:454
msgid "Development"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:442
+#: ../pyhoca/wxgui/menus_taskbar.py:455
msgid "Education"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:443
+#: ../pyhoca/wxgui/menus_taskbar.py:456
msgid "Games"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:444
+#: ../pyhoca/wxgui/menus_taskbar.py:457
msgid "Graphics"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:445
+#: ../pyhoca/wxgui/menus_taskbar.py:458
msgid "Internet"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:446
+#: ../pyhoca/wxgui/menus_taskbar.py:459
msgid "Office Applications"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:447
+#: ../pyhoca/wxgui/menus_taskbar.py:460
msgid "System"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:448
+#: ../pyhoca/wxgui/menus_taskbar.py:461
msgid "Utilities"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:449
+#: ../pyhoca/wxgui/menus_taskbar.py:462
msgid "Other Applications"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:521 ../pyhoca/wxgui/menus_taskbar.py:533
+#: ../pyhoca/wxgui/menus_taskbar.py:535 ../pyhoca/wxgui/menus_taskbar.py:547
#, python-format
msgid "Connect %s"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:527
+#: ../pyhoca/wxgui/menus_taskbar.py:541
msgid "Currently connecting..."
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:541
+#: ../pyhoca/wxgui/menus_taskbar.py:556
msgid "Start &new Desktop Session"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:546 ../pyhoca/wxgui/menus_taskbar.py:684
+#: ../pyhoca/wxgui/menus_taskbar.py:560 ../pyhoca/wxgui/menus_taskbar.py:660
+msgid "Start Desktop Sharing Session"
+msgstr ""
+
+#: ../pyhoca/wxgui/menus_taskbar.py:566 ../pyhoca/wxgui/menus_taskbar.py:710
msgid "Retrieving Application Menu..."
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:550 ../pyhoca/wxgui/menus_taskbar.py:687
+#: ../pyhoca/wxgui/menus_taskbar.py:570 ../pyhoca/wxgui/menus_taskbar.py:713
msgid "Retrieve Application Menu"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:553
+#: ../pyhoca/wxgui/menus_taskbar.py:573
+msgid "Start &new RDP Session"
+msgstr ""
+
+#: ../pyhoca/wxgui/menus_taskbar.py:576
msgid "Start &new Session"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:633
+#: ../pyhoca/wxgui/menus_taskbar.py:656
msgid "Launch Single Application"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:671
+#: ../pyhoca/wxgui/menus_taskbar.py:697
msgid "Manage Application Menu"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:714
+#: ../pyhoca/wxgui/menus_taskbar.py:752
msgid "Running"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:716
+#: ../pyhoca/wxgui/menus_taskbar.py:754
msgid "Suspended"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:735
+#: ../pyhoca/wxgui/menus_taskbar.py:773
msgid "&Clean all sessions"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:741
+#: ../pyhoca/wxgui/menus_taskbar.py:779
msgid "Customize &profile"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:756
+#: ../pyhoca/wxgui/menus_taskbar.py:794
msgid "Shared &folders"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:768
+#: ../pyhoca/wxgui/menus_taskbar.py:806
+msgid "Server Information"
+msgstr ""
+
+#: ../pyhoca/wxgui/menus_taskbar.py:813
msgid "&Disconnect from Server"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:775
+#: ../pyhoca/wxgui/menus_taskbar.py:820
msgid "Suspend Session and E&xit application"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:779
+#: ../pyhoca/wxgui/menus_taskbar.py:824
msgid "Disconnect and E&xit application"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:833
+#: ../pyhoca/wxgui/menus_taskbar.py:878
msgid "Add Profile"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:909
+#: ../pyhoca/wxgui/menus_taskbar.py:954
msgid "No session profiles defined"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:945
-msgid "Start/Resume Session"
+#: ../pyhoca/wxgui/menus_taskbar.py:965
+msgid "Export all Profiles"
+msgstr ""
+
+#: ../pyhoca/wxgui/menus_taskbar.py:967
+msgid "Export Profile Group"
msgstr ""
-#: ../pyhoca/wxgui/menus_taskbar.py:945
+#: ../pyhoca/wxgui/menus_taskbar.py:1003
msgid "Connect Server"
msgstr ""
@@ -947,61 +1008,61 @@ msgstr ""
msgid "About %s ..."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:459
+#: ../pyhoca/wxgui/frontend.py:465
msgid "Suspending sessions and exiting application..."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:462
+#: ../pyhoca/wxgui/frontend.py:468
#, python-format
msgid "Disconnecting %s and exiting application..."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:464
+#: ../pyhoca/wxgui/frontend.py:470
msgid "Exiting application..."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:562
+#: ../pyhoca/wxgui/frontend.py:568
#, python-format
msgid "%s - server warning"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:562
+#: ../pyhoca/wxgui/frontend.py:568
msgid "The X2Go Server does not publish an application menu."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:613
+#: ../pyhoca/wxgui/frontend.py:619
msgid "SSH key authentication has been successful."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:650
+#: ../pyhoca/wxgui/frontend.py:656
msgid ""
"The SSH proxy's host key is invalid or has not been accepted by the user"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:671
+#: ../pyhoca/wxgui/frontend.py:677
#, python-format
msgid "%s - EOF error"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:671
+#: ../pyhoca/wxgui/frontend.py:677
msgid "Authentication protocol communication incomplete! Try again..."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:678
+#: ../pyhoca/wxgui/frontend.py:684
#, python-format
msgid "%s - auth key error"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:699
+#: ../pyhoca/wxgui/frontend.py:705
msgid "An unknown error occurred during authentication!"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:728
+#: ../pyhoca/wxgui/frontend.py:734
#, python-format
msgid "%s: DirectRDP not supported yet"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:729
+#: ../pyhoca/wxgui/frontend.py:735
#, python-format
msgid ""
"We apologize for the inconvenience...\n"
@@ -1009,60 +1070,134 @@ msgid ""
"Session profiles of type ,,DirectRDP'' are not\n"
"supported by %s (%s), yet!!\n"
"\n"
-"DirectRDP support will be available in %s (>= 0.2.2.0)."
+"DirectRDP support will be available in %s (>= 1.0.0.0)."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:741
+#: ../pyhoca/wxgui/frontend.py:747
msgid "Unknown session profile, configure before using it..."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:1332
+#: ../pyhoca/wxgui/frontend.py:778
+#, python-format
+msgid "Desktop Sharing with %s not supported by server"
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:779
+#, python-format
+msgid ""
+"We apologize for the inconvenience...\n"
+"\n"
+"Session profiles of type ,,SHADOW'' are not\n"
+"supported by X2Go Server (v%s)!!!\n"
+"\n"
+"Desktop Sharing with %s requires\n"
+"X2Go Server 4.1.0.0 and above."
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:837 ../pyhoca/wxgui/frontend.py:1488
#, python-format
msgid "%s - session warning"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:798
+#: ../pyhoca/wxgui/frontend.py:837
#, python-format
msgid "Execution of command ,,%s'' failed."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:939
+#: ../pyhoca/wxgui/frontend.py:978
msgid "Cleaning X2Go sessions..."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:974
+#: ../pyhoca/wxgui/frontend.py:1026
#, python-format
msgid "%s - disconnect"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:974
+#: ../pyhoca/wxgui/frontend.py:1026
msgid "X2Go Profile is now disconnected."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:995
+#: ../pyhoca/wxgui/frontend.py:1047
msgid "New Session Profile"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1047
+#: ../pyhoca/wxgui/frontend.py:1102
#, python-format
msgid "Really Delete Session Profile ,,%s''?"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1053
+#: ../pyhoca/wxgui/frontend.py:1108
#, python-format
msgid "%s - profile deleted"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1053
+#: ../pyhoca/wxgui/frontend.py:1108
msgid "The session profile has been deleted."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1071
+#: ../pyhoca/wxgui/frontend.py:1137
+#, python-format
+msgid "%s - export session profiles"
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:1142
+#, python-format
+msgid "%s - export session profile"
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:1154
+#, python-format
+msgid "%s: Export file already exists"
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:1155
+#, python-format
+msgid ""
+"The file Âģ%sÂĢ already exists in this folder.\n"
+"\n"
+"Do you want to replace it?"
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:1176
+#, python-format
+msgid "%s - profiles exported"
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:1176
+#, python-format
+msgid "Successfully exported session profile group Âģ%sÂĢ to file Âģ%sÂĢ."
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:1178
+#, python-format
+msgid "%s - profile exported"
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:1178
+#, python-format
+msgid "Successfully exported single session profile Âģ%sÂĢ to file Âģ%sÂĢ."
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:1182
+#, python-format
+msgid "%s: Exporting session profile(s) failed"
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:1183
+#, python-format
+msgid ""
+"The selected session profile(s) could not be exported to the \n"
+"file Âģ%sÂĢ.\n"
+"\n"
+"Check for common problems (disk full, insufficient access, etc.)."
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:1202
#, python-format
msgid "%s - share local folder with sessions of this profile"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1224
+#: ../pyhoca/wxgui/frontend.py:1355
#, python-format
msgid ""
"The authenticity of host [%s]:%s can't be established.\n"
@@ -1071,148 +1206,169 @@ msgid ""
"Are you sure you want to continue connecting?"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1232
+#: ../pyhoca/wxgui/frontend.py:1363
#, python-format
msgid "%s: Confirm Host Authorization"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1277
+#: ../pyhoca/wxgui/frontend.py:1409
#, python-format
msgid "%s - channel error"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1277
+#: ../pyhoca/wxgui/frontend.py:1409
#, python-format
msgid ""
"Lost connection to server %s unexpectedly! Try to re-authenticate to the "
"server..."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1295 ../pyhoca/wxgui/frontend.py:1313
-#: ../pyhoca/wxgui/frontend.py:1315 ../pyhoca/wxgui/frontend.py:1351
+#: ../pyhoca/wxgui/frontend.py:1426 ../pyhoca/wxgui/frontend.py:1469
+#: ../pyhoca/wxgui/frontend.py:1471 ../pyhoca/wxgui/frontend.py:1507
#, python-format
msgid "%s - session failure"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1295
+#: ../pyhoca/wxgui/frontend.py:1426
msgid "The session startup failed."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1313
+#: ../pyhoca/wxgui/frontend.py:1439
+#, python-format
+msgid "%s - timeout"
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:1439
+msgid ""
+"The server took long to provide a list of sharable desktops.\n"
+"This can happen from time to time, please try again"
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:1451
+#, python-format
+msgid "%s - desktop sharing failed"
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:1451
+#, python-format
+msgid "The desktop %s is not available for sharing (anymore)."
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:1469
#, python-format
msgid "The command ,,%s'' is not available on X2Go server."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1315
+#: ../pyhoca/wxgui/frontend.py:1471
#, python-format
msgid ""
"The command ,,%s'' is not available on X2Go server\n"
"%s."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1332
+#: ../pyhoca/wxgui/frontend.py:1488
#, python-format
msgid ""
"Reverse TCP port forwarding request for session %s to server port %s has "
"been denied."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1351
+#: ../pyhoca/wxgui/frontend.py:1507
#, python-format
msgid ""
"Forwarding tunnel request to [%s]:%s for session %s was denied by remote "
-"X2go/SSH server. Session startup failed."
+"X2Go/SSH server. Session startup failed."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1370
+#: ../pyhoca/wxgui/frontend.py:1526
#, python-format
msgid "%s - audio warning"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1370
+#: ../pyhoca/wxgui/frontend.py:1526
msgid ""
"The X2Go PulseAudio system is not available within Remote Desktop sessions."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1377 ../pyhoca/wxgui/frontend.py:1384
+#: ../pyhoca/wxgui/frontend.py:1533 ../pyhoca/wxgui/frontend.py:1540
#, python-format
msgid "%s - audio error"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1377
+#: ../pyhoca/wxgui/frontend.py:1533
msgid "The X2Go PulseAudio system could not be started."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1384
+#: ../pyhoca/wxgui/frontend.py:1540
msgid "The X2Go PulseAudio system has died unexpectedly."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1396
+#: ../pyhoca/wxgui/frontend.py:1552
#, python-format
msgid "%s - audio problem"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1396
+#: ../pyhoca/wxgui/frontend.py:1552
#, python-format
msgid ""
"The audio connection could not be set up for this session.\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1408
+#: ../pyhoca/wxgui/frontend.py:1564
#, python-format
msgid "%s - client-side printing not available"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1408
+#: ../pyhoca/wxgui/frontend.py:1564
#, python-format
msgid ""
"The server denies client-side printing from within this session.\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1420
+#: ../pyhoca/wxgui/frontend.py:1576
#, python-format
msgid "%s - MIME box not available"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1420
+#: ../pyhoca/wxgui/frontend.py:1576
#, python-format
msgid ""
"The server does not support the X2Go MIME box.\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1432
+#: ../pyhoca/wxgui/frontend.py:1588
#, python-format
msgid "%s - client-side folders not sharable"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1432
+#: ../pyhoca/wxgui/frontend.py:1588
#, python-format
msgid ""
"The server denies client-side folder sharing with this session.\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1444
+#: ../pyhoca/wxgui/frontend.py:1600
#, python-format
msgid "%s - client resources not sharable"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1444
+#: ../pyhoca/wxgui/frontend.py:1600
#, python-format
msgid ""
"Client-side folders and printers cannot be shared with this session.\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1463 ../pyhoca/wxgui/frontend.py:1465
+#: ../pyhoca/wxgui/frontend.py:1619 ../pyhoca/wxgui/frontend.py:1621
#, python-format
msgid "%s - print error"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1463
+#: ../pyhoca/wxgui/frontend.py:1619
#, python-format
msgid ""
"%s\n"
@@ -1220,7 +1376,7 @@ msgid ""
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1465
+#: ../pyhoca/wxgui/frontend.py:1621
#, python-format
msgid ""
"%s\n"
@@ -1228,88 +1384,88 @@ msgid ""
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1480 ../pyhoca/wxgui/frontend.py:1495
+#: ../pyhoca/wxgui/frontend.py:1636 ../pyhoca/wxgui/frontend.py:1651
#, python-format
msgid "%s - start"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1480
+#: ../pyhoca/wxgui/frontend.py:1636
#, python-format
msgid ""
"New X2Go session starting up...\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1495
+#: ../pyhoca/wxgui/frontend.py:1651
#, python-format
msgid ""
"Another client started X2Go session\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1510 ../pyhoca/wxgui/frontend.py:1525
+#: ../pyhoca/wxgui/frontend.py:1666 ../pyhoca/wxgui/frontend.py:1681
#, python-format
msgid "%s - resume"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1510
+#: ../pyhoca/wxgui/frontend.py:1666
#, python-format
msgid ""
"Resuming X2Go session...\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1525
+#: ../pyhoca/wxgui/frontend.py:1681
#, python-format
msgid ""
"Another client resumed X2Go session\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1540
+#: ../pyhoca/wxgui/frontend.py:1696
#, python-format
msgid "%s - running"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1540
+#: ../pyhoca/wxgui/frontend.py:1696
#, python-format
msgid ""
"Found already running session\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1560
+#: ../pyhoca/wxgui/frontend.py:1716
#, python-format
msgid "%s - suspend"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1560
+#: ../pyhoca/wxgui/frontend.py:1716
#, python-format
msgid ""
"X2Go Session has been suspended\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1587
+#: ../pyhoca/wxgui/frontend.py:1743
#, python-format
msgid "%s - terminate"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1587
+#: ../pyhoca/wxgui/frontend.py:1743
#, python-format
msgid ""
"X2Go Session has terminated\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/messages.py:73
+#: ../pyhoca/wxgui/messages.py:72
#, python-format
msgid ""
"Are you really sure you want to\n"
"delete the session profile ,,%s''?"
msgstr ""
-#: ../pyhoca/wxgui/messages.py:74
+#: ../pyhoca/wxgui/messages.py:73
#, python-format
msgid ""
"PyHoca-GUI is already running for user ,,%s''!\n"
@@ -1319,15 +1475,15 @@ msgid ""
"notification area/systray."
msgstr ""
-#: ../pyhoca/wxgui/messages.py:107
+#: ../pyhoca/wxgui/messages.py:106
msgid "Yes"
msgstr ""
-#: ../pyhoca/wxgui/messages.py:108
+#: ../pyhoca/wxgui/messages.py:107
msgid "No"
msgstr ""
-#: ../pyhoca/wxgui/messages.py:125 ../pyhoca/wxgui/printingprefs.py:142
+#: ../pyhoca/wxgui/messages.py:124 ../pyhoca/wxgui/printingprefs.py:142
msgid "Ok"
msgstr ""
@@ -1393,10 +1549,6 @@ msgstr ""
msgid "Custom print command"
msgstr ""
-#: ../pyhoca/wxgui/printingprefs.py:143
-msgid "Apply"
-msgstr ""
-
#: ../pyhoca/wxgui/printingprefs.py:145
msgid "Print"
msgstr ""
@@ -1429,3 +1581,44 @@ msgstr ""
#: ../pyhoca/wxgui/sessiontitle.py:83
msgid "OK"
msgstr ""
+
+#: ../pyhoca/wxgui/serverinfo.py:76
+#, python-format
+msgid "Server Information - %s"
+msgstr ""
+
+#: ../pyhoca/wxgui/serverinfo.py:78
+#, python-format
+msgid ""
+"Session Profile: %s\n"
+"\n"
+"List of X2Go Server components, add-ons and their versions..."
+msgstr ""
+
+#: ../pyhoca/wxgui/serverinfo.py:83
+msgid "Refresh"
+msgstr ""
+
+#: ../pyhoca/wxgui/serverinfo.py:84
+msgid "Close"
+msgstr ""
+
+#: ../pyhoca/wxgui/serverinfo.py:153
+msgid "X2Go Server"
+msgstr ""
+
+#: ../pyhoca/wxgui/serverinfo.py:154
+msgid "Server Core"
+msgstr ""
+
+#: ../pyhoca/wxgui/serverinfo.py:162
+msgid "Server Extensions"
+msgstr ""
+
+#: ../pyhoca/wxgui/serverinfo.py:168
+msgid "X2Go Server Add-ons"
+msgstr ""
+
+#: ../pyhoca/wxgui/serverinfo.py:172
+msgid "X2Go Server Features"
+msgstr ""
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 0a8c4cd..7652968 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -1,5 +1,5 @@
# PyHoca-GUI / i18n.
-# Copyright (C) 2010-2012 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
# Dick Kniep <dick.kniep(a)lindix.nl>
# This file is distributed under the same license as the PyHoca-GUI package.
# Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>, 2011.
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: PyHoca-GUI VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 14:25+0100\n"
-"PO-Revision-Date: 2012-11-26 14:24+0100\n"
-"Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n"
+"POT-Creation-Date: 2013-01-29 22:21+0100\n"
+"PO-Revision-Date: 2013-01-23 23:07+0100\n"
+"Last-Translator: Terje Andersen <teranders(a)gmail.com>\n"
"Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n"
"Language: nb_NO\n"
"MIME-Version: 1.0\n"
@@ -38,8 +38,8 @@ msgid "Authenticate"
msgstr "Autentiser"
#: ../pyhoca/wxgui/logon.py:107
-msgid " Start SSH tunnel "
-msgstr " Start SSH tunnel "
+msgid "Start SSH tunnel"
+msgstr "Start SSH tunnel"
#: ../pyhoca/wxgui/logon.py:115
msgid "Session login"
@@ -49,23 +49,23 @@ msgstr "Sesjons innlogging"
msgid "SSH proxy server login"
msgstr "logg inn via en SSH mellomtjener"
-#: ../pyhoca/wxgui/logon.py:127 ../pyhoca/wxgui/profilemanager.py:350
-#: ../pyhoca/wxgui/messages.py:131 ../pyhoca/wxgui/printingprefs.py:147
-#: ../pyhoca/wxgui/sessiontitle.py:85
+#: ../pyhoca/wxgui/logon.py:127 ../pyhoca/wxgui/profilemanager.py:373
+#: ../pyhoca/wxgui/listdesktops.py:99 ../pyhoca/wxgui/messages.py:130
+#: ../pyhoca/wxgui/printingprefs.py:147 ../pyhoca/wxgui/sessiontitle.py:85
msgid "Cancel"
msgstr "Avbryt"
#: ../pyhoca/wxgui/logon.py:297 ../pyhoca/wxgui/logon.py:339
-#: ../pyhoca/wxgui/frontend.py:606
+#: ../pyhoca/wxgui/frontend.py:612
#, python-format
msgid "%s - connect failure"
msgstr "%s - tilkoblingsfeil"
-#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:606
+#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:612
msgid "User is not allowed to start X2Go sessions!"
msgstr "Bruker kontoen har ikke tillatelse til ÃĨ starte X2Go sesjoner!"
-#: ../pyhoca/wxgui/logon.py:303 ../pyhoca/wxgui/frontend.py:613
+#: ../pyhoca/wxgui/logon.py:303 ../pyhoca/wxgui/frontend.py:619
#, python-format
msgid "%s - connect"
msgstr "%s - koble til"
@@ -91,30 +91,30 @@ msgstr "%s - ssh mellomtjener"
msgid "Authentication to the SSH proxy server failed!"
msgstr "Autentiseringenen til SSH mellomtjeneren feilet!"
-#: ../pyhoca/wxgui/logon.py:376 ../pyhoca/wxgui/frontend.py:664
+#: ../pyhoca/wxgui/logon.py:376 ../pyhoca/wxgui/frontend.py:670
#, python-format
msgid "%s - socket error"
msgstr "%s - sokkel feil"
-#: ../pyhoca/wxgui/logon.py:383 ../pyhoca/wxgui/frontend.py:643
-#: ../pyhoca/wxgui/frontend.py:650
+#: ../pyhoca/wxgui/logon.py:383 ../pyhoca/wxgui/frontend.py:649
+#: ../pyhoca/wxgui/frontend.py:656
#, python-format
msgid "%s - host key error"
msgstr "%s - verts nøkkel feil"
-#: ../pyhoca/wxgui/logon.py:384 ../pyhoca/wxgui/frontend.py:643
+#: ../pyhoca/wxgui/logon.py:384 ../pyhoca/wxgui/frontend.py:649
msgid ""
"The remote server's host key is invalid or has not been accepted by the user"
msgstr ""
"Den eksterne serverens verts nøkkel er ugyldig, eller ikke blitt akseptert "
"av brukeren"
-#: ../pyhoca/wxgui/logon.py:391 ../pyhoca/wxgui/frontend.py:685
+#: ../pyhoca/wxgui/logon.py:391 ../pyhoca/wxgui/frontend.py:691
#, python-format
msgid "%s - missing home directory"
msgstr "%s - mangler hjemmekatalog"
-#: ../pyhoca/wxgui/logon.py:392 ../pyhoca/wxgui/frontend.py:685
+#: ../pyhoca/wxgui/logon.py:392 ../pyhoca/wxgui/frontend.py:691
msgid "The remote user's home directory does not exist."
msgstr "Brukerens hjemmekatalog pÃĨ den eksterne serveren finnes ikke."
@@ -123,12 +123,12 @@ msgstr "Brukerens hjemmekatalog pÃĨ den eksterne serveren finnes ikke."
msgid "%s - key error"
msgstr "%s - nøkkel feil"
-#: ../pyhoca/wxgui/logon.py:407 ../pyhoca/wxgui/frontend.py:692
+#: ../pyhoca/wxgui/logon.py:407 ../pyhoca/wxgui/frontend.py:698
#, python-format
msgid "%s - auth error"
msgstr "%s - autentiseringens feil"
-#: ../pyhoca/wxgui/logon.py:415 ../pyhoca/wxgui/frontend.py:636
+#: ../pyhoca/wxgui/logon.py:415 ../pyhoca/wxgui/frontend.py:642
#, python-format
msgid "%s - SSH error"
msgstr "%s - SSH feil"
@@ -154,10 +154,10 @@ msgstr ""
#: ../pyhoca/wxgui/taskbar.py:93
#, python-format
msgid ""
-"PyHoca-GUI (Python X2goClient)\n"
+"PyHoca-GUI (Python X2Go Client)\n"
"Currently connecting you to remote X2Go server ,,%s''"
msgstr ""
-"PyHoca-GUI (Python X2goClient)\n"
+"PyHoca-GUI (Python X2Go Client)\n"
"Holder pÃĨ med ÃĨ koble deg til X2Go serveren ,,%s''"
#: ../pyhoca/wxgui/taskbar.py:103
@@ -170,10 +170,10 @@ msgstr ""
#: ../pyhoca/wxgui/taskbar.py:107
msgid ""
-"PyHoca-GUI (Python X2goClient)\n"
+"PyHoca-GUI (Python X2Go Client)\n"
"Client for connecting you to a remote X2Go server"
msgstr ""
-"PyHoca-GUI (Python X2goClient)\n"
+"PyHoca-GUI (Python X2Go Client)\n"
"Klient for ÃĨ koble deg til en ekstern X2Go server"
#: ../pyhoca/wxgui/profilemanager.py:79
@@ -209,274 +209,278 @@ msgid "Single Application"
msgstr "Enkelt applikasjon"
#: ../pyhoca/wxgui/profilemanager.py:87
+msgid "Share desktop session (SHADOW)"
+msgstr "Del skrivebordssesjon (skygge)"
+
+#: ../pyhoca/wxgui/profilemanager.py:88
msgid "XDMCP Query"
msgstr "XDMCP spørring"
-#: ../pyhoca/wxgui/profilemanager.py:88
+#: ../pyhoca/wxgui/profilemanager.py:89
msgid "Windows Terminal Server (X2Go-proxied RDP)"
msgstr "Windows Terminal Server (RDP via X2Go-proxy)"
-#: ../pyhoca/wxgui/profilemanager.py:89
+#: ../pyhoca/wxgui/profilemanager.py:90
msgid "Windows Terminal Server (Direct RDP)"
msgstr "Windows Terminal Server (Direkte RDP)"
-#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/profilemanager.py:224
+#: ../pyhoca/wxgui/profilemanager.py:91 ../pyhoca/wxgui/profilemanager.py:243
msgid "Custom command"
msgstr "Selvvalgt kommando"
-#: ../pyhoca/wxgui/profilemanager.py:95 ../pyhoca/wxgui/menus_taskbar.py:393
+#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:406
msgid "Internet Browser"
msgstr "Nettleser"
-#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:394
+#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:407
msgid "Email Client"
msgstr "Epost klient"
-#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:395
+#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:408
msgid "Office"
msgstr "Kontor"
-#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:396
+#: ../pyhoca/wxgui/profilemanager.py:99 ../pyhoca/wxgui/menus_taskbar.py:409
msgid "Terminal"
msgstr "Terminal"
-#: ../pyhoca/wxgui/profilemanager.py:116
+#: ../pyhoca/wxgui/profilemanager.py:117
msgid "Open file with system's default application"
msgstr "Ã
pne filen med systems foretrukne applikasjon"
-#: ../pyhoca/wxgui/profilemanager.py:117
+#: ../pyhoca/wxgui/profilemanager.py:118
msgid "Open application chooser dialog"
msgstr "Ã
pne applikasjonsvelger dialog"
-#: ../pyhoca/wxgui/profilemanager.py:118
+#: ../pyhoca/wxgui/profilemanager.py:119
msgid "Save incoming file as ..."
msgstr "Lagre innkommende fil som ..."
-#: ../pyhoca/wxgui/profilemanager.py:146
+#: ../pyhoca/wxgui/profilemanager.py:147
msgid "settings derived from "
msgstr "innstillinger arvet fra"
#. boxes for all tabs
-#: ../pyhoca/wxgui/profilemanager.py:167
+#: ../pyhoca/wxgui/profilemanager.py:186
msgid "Session Title"
msgstr "Sesjonstittel"
-#: ../pyhoca/wxgui/profilemanager.py:168
+#: ../pyhoca/wxgui/profilemanager.py:187
msgid "Session Window"
msgstr "Sesjonsvindu"
-#: ../pyhoca/wxgui/profilemanager.py:169
+#: ../pyhoca/wxgui/profilemanager.py:188
msgid "Session Startup"
msgstr "Sesjon oppstart"
-#: ../pyhoca/wxgui/profilemanager.py:170
+#: ../pyhoca/wxgui/profilemanager.py:189
msgid "Server"
msgstr "Server"
-#: ../pyhoca/wxgui/profilemanager.py:171
+#: ../pyhoca/wxgui/profilemanager.py:190
msgid "Proxy"
msgstr "Proxy"
-#: ../pyhoca/wxgui/profilemanager.py:172
+#: ../pyhoca/wxgui/profilemanager.py:191
msgid "Connection Link Speed"
msgstr "Tilkoblingens forbindelseshastighet"
-#: ../pyhoca/wxgui/profilemanager.py:173
+#: ../pyhoca/wxgui/profilemanager.py:192
msgid "Compression"
msgstr "Kompresjon"
-#: ../pyhoca/wxgui/profilemanager.py:174
+#: ../pyhoca/wxgui/profilemanager.py:193
msgid "Display"
msgstr "Skjerm"
-#: ../pyhoca/wxgui/profilemanager.py:175
+#: ../pyhoca/wxgui/profilemanager.py:194
msgid "Keyboard"
msgstr "Tastatur"
-#: ../pyhoca/wxgui/profilemanager.py:176
+#: ../pyhoca/wxgui/profilemanager.py:195
msgid "Sound"
msgstr "Lyd"
-#: ../pyhoca/wxgui/profilemanager.py:177
+#: ../pyhoca/wxgui/profilemanager.py:196
msgid "Printing"
msgstr "Utskrift"
-#: ../pyhoca/wxgui/profilemanager.py:178
+#: ../pyhoca/wxgui/profilemanager.py:197
msgid "Folder Exports"
msgstr "Mappe eksporter"
-#: ../pyhoca/wxgui/profilemanager.py:179
+#: ../pyhoca/wxgui/profilemanager.py:198
msgid "File Import"
msgstr "Fil import"
#. ##
#. ## widgets for the PROFILE tab
#. ##
-#: ../pyhoca/wxgui/profilemanager.py:184
+#: ../pyhoca/wxgui/profilemanager.py:203
msgid "Name"
msgstr "Navn"
-#: ../pyhoca/wxgui/profilemanager.py:191
+#: ../pyhoca/wxgui/profilemanager.py:210
msgid "Set session window title"
msgstr "Angi sesjons vindustittel"
-#: ../pyhoca/wxgui/profilemanager.py:192
+#: ../pyhoca/wxgui/profilemanager.py:211
msgid "Use a default session window title"
msgstr "Benytt standard sesjons vindustittel"
-#: ../pyhoca/wxgui/profilemanager.py:193
+#: ../pyhoca/wxgui/profilemanager.py:212
msgid "Custom session window title"
msgstr "Tilpasset sesjon vindustittel"
-#: ../pyhoca/wxgui/profilemanager.py:212
+#: ../pyhoca/wxgui/profilemanager.py:231
msgid "Window Icon"
msgstr "Vindusikon"
#. ##
#. ## widgets for the SESSION tab
#. ##
-#: ../pyhoca/wxgui/profilemanager.py:218
+#: ../pyhoca/wxgui/profilemanager.py:237
msgid "Start session automatically after login"
msgstr "Start sesjonen automatisk etter innlogging"
-#: ../pyhoca/wxgui/profilemanager.py:219
+#: ../pyhoca/wxgui/profilemanager.py:238
#, python-format
-msgid "Login automatically after %s has started"
-msgstr "Logg inn automatisk etter at %s har startet"
+msgid "Login automatically after %s has started (needs --auto-connect)"
+msgstr "Logg inn automatisk etter at %s har startet (trenger -auto-connect)"
-#: ../pyhoca/wxgui/profilemanager.py:220
+#: ../pyhoca/wxgui/profilemanager.py:239
msgid "Type"
msgstr "Type"
-#: ../pyhoca/wxgui/profilemanager.py:222
+#: ../pyhoca/wxgui/profilemanager.py:241
msgid "Application"
msgstr "Applikasjon"
-#: ../pyhoca/wxgui/profilemanager.py:226
+#: ../pyhoca/wxgui/profilemanager.py:245
msgid "XDMCP server"
msgstr "XDMCP server"
-#: ../pyhoca/wxgui/profilemanager.py:228
+#: ../pyhoca/wxgui/profilemanager.py:247
msgid "RDP server"
msgstr "RDP server"
-#: ../pyhoca/wxgui/profilemanager.py:230
+#: ../pyhoca/wxgui/profilemanager.py:249
msgid "RDP options"
msgstr "RDP alternativer"
-#: ../pyhoca/wxgui/profilemanager.py:232
+#: ../pyhoca/wxgui/profilemanager.py:251
msgid "Integrate remote application(s) into local desktop (rootless mode)"
msgstr ""
"Integrer eksterne applikasjon(er) inn i det lokale skrivebordet (rotløs "
"modus)"
-#: ../pyhoca/wxgui/profilemanager.py:233
+#: ../pyhoca/wxgui/profilemanager.py:252
msgid "Menu of published applications"
msgstr "Meny med publiserte applikasjoner"
#. ##
#. ## widgets for the CONNECTION tab
#. ##
-#: ../pyhoca/wxgui/profilemanager.py:240 ../pyhoca/wxgui/profilemanager.py:253
+#: ../pyhoca/wxgui/profilemanager.py:259 ../pyhoca/wxgui/profilemanager.py:273
msgid "User"
msgstr "Bruker"
-#: ../pyhoca/wxgui/profilemanager.py:242 ../pyhoca/wxgui/profilemanager.py:260
+#: ../pyhoca/wxgui/profilemanager.py:261 ../pyhoca/wxgui/profilemanager.py:280
msgid "Host"
msgstr "Vert"
-#: ../pyhoca/wxgui/profilemanager.py:244 ../pyhoca/wxgui/profilemanager.py:262
+#: ../pyhoca/wxgui/profilemanager.py:263 ../pyhoca/wxgui/profilemanager.py:282
msgid "Port"
msgstr "Port"
-#: ../pyhoca/wxgui/profilemanager.py:246
+#: ../pyhoca/wxgui/profilemanager.py:265
msgid "Key"
msgstr "Nøkkel"
-#: ../pyhoca/wxgui/profilemanager.py:249
+#: ../pyhoca/wxgui/profilemanager.py:268
msgid "Discover SSH keys or use SSH agent for X2Go authentication"
msgstr "Oppdag SSH nøkler, eller bruk SSH agent for X2Go autentisering"
-#: ../pyhoca/wxgui/profilemanager.py:251
+#: ../pyhoca/wxgui/profilemanager.py:270
msgid "Enable forwarding of SSH authentication agent connections"
msgstr "Aktiver videresending av SSH autentiseringen for agent tilkoblinger"
-#: ../pyhoca/wxgui/profilemanager.py:252
+#: ../pyhoca/wxgui/profilemanager.py:271
+msgid "Store SSH host keys under (unique) X2Go session profile ID"
+msgstr "Lagre SSH vertsnøkler under en (unik) X2Go sesjonsprofil ID"
+
+#: ../pyhoca/wxgui/profilemanager.py:272
msgid "Server behind SSH proxy"
msgstr "Server bak SSH mellomtjeneren"
-#: ../pyhoca/wxgui/profilemanager.py:255
+#: ../pyhoca/wxgui/profilemanager.py:275
msgid "Use same username for X2Go and proxy host"
msgstr "Bruk samme brukernavn for X2Go og proxyserveren"
-#: ../pyhoca/wxgui/profilemanager.py:256
+#: ../pyhoca/wxgui/profilemanager.py:276
msgid "Use same authentication for X2Go and proxy host"
msgstr "Bruk samme autentisering for X2Go og proxyserveren"
-#: ../pyhoca/wxgui/profilemanager.py:257
+#: ../pyhoca/wxgui/profilemanager.py:277
msgid "Key file"
msgstr "Nøkkelfil"
-#: ../pyhoca/wxgui/profilemanager.py:264
-msgid "SSH Proxy Tunnel"
-msgstr "SSH mellomtjener tunnel"
-
-#: ../pyhoca/wxgui/profilemanager.py:270
+#: ../pyhoca/wxgui/profilemanager.py:284
msgid "Discover SSH keys or use SSH agent for proxy authentication"
msgstr "Oppdag SSH nøkler, eller bruk SSH agent for proxy autentisering"
-#: ../pyhoca/wxgui/profilemanager.py:273
+#: ../pyhoca/wxgui/profilemanager.py:287
msgid "Modem"
msgstr "Modem"
-#: ../pyhoca/wxgui/profilemanager.py:274
+#: ../pyhoca/wxgui/profilemanager.py:288
msgid "ISDN"
msgstr "ISDN"
-#: ../pyhoca/wxgui/profilemanager.py:275
+#: ../pyhoca/wxgui/profilemanager.py:289
msgid "ADSL"
msgstr "ADSL"
-#: ../pyhoca/wxgui/profilemanager.py:276
+#: ../pyhoca/wxgui/profilemanager.py:290
msgid "WAN"
msgstr "WAN"
-#: ../pyhoca/wxgui/profilemanager.py:277
+#: ../pyhoca/wxgui/profilemanager.py:291
msgid "LAN"
msgstr "LAN"
-#: ../pyhoca/wxgui/profilemanager.py:279
+#: ../pyhoca/wxgui/profilemanager.py:293
msgid "Method"
msgstr "Metode"
-#: ../pyhoca/wxgui/profilemanager.py:281
+#: ../pyhoca/wxgui/profilemanager.py:295
msgid "Image quality"
msgstr "Bildekvalitet"
#. ##
-#. ## wigdets for the SETTINGS tab
+#. ## wigdets for the IO tab
#. ##
-#: ../pyhoca/wxgui/profilemanager.py:287
+#: ../pyhoca/wxgui/profilemanager.py:301
msgid "Fullscreen"
msgstr "Fullskjerm"
-#: ../pyhoca/wxgui/profilemanager.py:288
+#: ../pyhoca/wxgui/profilemanager.py:302
msgid "Maximized"
msgstr "Maksimert"
-#: ../pyhoca/wxgui/profilemanager.py:289
+#: ../pyhoca/wxgui/profilemanager.py:303
msgid "Custom Size"
msgstr "Egentilpasset størrelse"
-#: ../pyhoca/wxgui/profilemanager.py:294
+#: ../pyhoca/wxgui/profilemanager.py:308
msgid "Set display DPI"
msgstr "Sett skjermens DPI"
-#: ../pyhoca/wxgui/profilemanager.py:296
+#: ../pyhoca/wxgui/profilemanager.py:310
msgid "Do not set (use server-side tools to configure the keyboard)"
msgstr "Ikke angi (benytt server-side verktøy for ÃĨ konfigurere tastaturet)"
-#: ../pyhoca/wxgui/profilemanager.py:297
+#: ../pyhoca/wxgui/profilemanager.py:311
msgid ""
"Automatically detect and use client-side keyboard configuration inside the "
"session"
@@ -484,477 +488,531 @@ msgstr ""
"Automatisk oppdag og benytt klient-side konfigurasjon for tastaturet inne i "
"sesjonen"
-#: ../pyhoca/wxgui/profilemanager.py:298
+#: ../pyhoca/wxgui/profilemanager.py:312
msgid "Use custom keyboard settings as provided below"
msgstr "Benytt tilpasset innstillinger for tastaturoppsett som gitt nedenfor"
-#: ../pyhoca/wxgui/profilemanager.py:299
+#: ../pyhoca/wxgui/profilemanager.py:313
msgid "Keyboard model"
msgstr "Tastaturmodell"
-#: ../pyhoca/wxgui/profilemanager.py:301
+#: ../pyhoca/wxgui/profilemanager.py:315
msgid "Layout"
msgstr "Utforming"
-#: ../pyhoca/wxgui/profilemanager.py:303
+#: ../pyhoca/wxgui/profilemanager.py:317
msgid "Layout variant"
msgstr "Utformingsvariant"
-#: ../pyhoca/wxgui/profilemanager.py:305
+#. ##
+#. ## wigdets for the MEDIA tab
+#. ##
+#: ../pyhoca/wxgui/profilemanager.py:323
msgid "Enable sound support"
msgstr "Aktiver lydstøtte"
-#: ../pyhoca/wxgui/profilemanager.py:306
+#: ../pyhoca/wxgui/profilemanager.py:324
msgid "Pulse Audio"
msgstr "Pulse Audio"
#. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated.
#. However, config files can contain an Arts configuration, so we will honour this
-#: ../pyhoca/wxgui/profilemanager.py:310
+#: ../pyhoca/wxgui/profilemanager.py:328
msgid "Arts (not supported)"
msgstr "Arts (ikke supportert)"
-#: ../pyhoca/wxgui/profilemanager.py:313
+#: ../pyhoca/wxgui/profilemanager.py:331
msgid "esd"
msgstr "esd"
-#: ../pyhoca/wxgui/profilemanager.py:314
+#: ../pyhoca/wxgui/profilemanager.py:332
msgid "Use default sound port"
msgstr "Benytt standard lydport"
-#: ../pyhoca/wxgui/profilemanager.py:315
+#: ../pyhoca/wxgui/profilemanager.py:333
msgid "Custom sound port"
msgstr "Selvvalgt lydport"
-#: ../pyhoca/wxgui/profilemanager.py:318
+#: ../pyhoca/wxgui/profilemanager.py:336
+msgid "Client Side printing"
+msgstr "Klientside utskrift"
+
+#. ##
+#. ## wigdets for the SHARING tab
+#. ##
+#: ../pyhoca/wxgui/profilemanager.py:342
msgid "Use local folder sharing"
msgstr "Benytt lokal mappedeling"
-#: ../pyhoca/wxgui/profilemanager.py:319
+#: ../pyhoca/wxgui/profilemanager.py:343
msgid "Store share list at end of session"
msgstr "Lagre listen over delte mapper ved sesjonsavslutning%s"
-#: ../pyhoca/wxgui/profilemanager.py:320
+#: ../pyhoca/wxgui/profilemanager.py:344
msgid "Path"
msgstr "Sti"
-#: ../pyhoca/wxgui/profilemanager.py:323 ../pyhoca/wxgui/profilemanager.py:344
+#: ../pyhoca/wxgui/profilemanager.py:347 ../pyhoca/wxgui/profilemanager.py:366
msgid "Add"
msgstr "Legg til"
-#: ../pyhoca/wxgui/profilemanager.py:325
+#: ../pyhoca/wxgui/profilemanager.py:349
msgid "Local Path"
msgstr "Lokal sti"
-#: ../pyhoca/wxgui/profilemanager.py:326
+#: ../pyhoca/wxgui/profilemanager.py:350
msgid "Connect Method"
msgstr "Tilkoblingsmetode"
-#: ../pyhoca/wxgui/profilemanager.py:327
+#: ../pyhoca/wxgui/profilemanager.py:351
msgid "Delete"
msgstr "Slett"
-#: ../pyhoca/wxgui/profilemanager.py:329
+#: ../pyhoca/wxgui/profilemanager.py:353
msgid "Convert between client and server encodings"
msgstr "Konverter tegnkodingen mellom klient og server"
-#: ../pyhoca/wxgui/profilemanager.py:330
+#: ../pyhoca/wxgui/profilemanager.py:354
msgid "Client encoding"
msgstr "Klientens tegnkode"
-#: ../pyhoca/wxgui/profilemanager.py:332
+#: ../pyhoca/wxgui/profilemanager.py:356
msgid "Server encoding"
msgstr "Serverens tegnkode"
-#: ../pyhoca/wxgui/profilemanager.py:335
+#: ../pyhoca/wxgui/profilemanager.py:359
msgid "Use file MIME box for local file import"
msgstr "Benytt filens MIME boks for lokal fil import"
-#: ../pyhoca/wxgui/profilemanager.py:336
+#: ../pyhoca/wxgui/profilemanager.py:360
msgid "Extensions"
msgstr "Utvidelser"
-#: ../pyhoca/wxgui/profilemanager.py:338
+#: ../pyhoca/wxgui/profilemanager.py:362
msgid "Action"
msgstr "Handling"
-#: ../pyhoca/wxgui/profilemanager.py:341
-msgid "Client Side printing"
-msgstr "Klientside utskrift"
-
-#: ../pyhoca/wxgui/profilemanager.py:345
+#: ../pyhoca/wxgui/profilemanager.py:367
msgid "Defaults"
msgstr "Standard"
-#: ../pyhoca/wxgui/profilemanager.py:347
+#: ../pyhoca/wxgui/profilemanager.py:369
msgid "Save"
msgstr "Lagre"
-#: ../pyhoca/wxgui/profilemanager.py:348
+#: ../pyhoca/wxgui/profilemanager.py:370
msgid "Reset"
msgstr "Resett"
-#: ../pyhoca/wxgui/profilemanager.py:401
-#: ../pyhoca/wxgui/profilemanager.py:1124
-#: ../pyhoca/wxgui/profilemanager.py:2268
+#: ../pyhoca/wxgui/profilemanager.py:372 ../pyhoca/wxgui/printingprefs.py:143
+msgid "Apply"
+msgstr "PÃĨfør"
+
+#: ../pyhoca/wxgui/profilemanager.py:423
+#: ../pyhoca/wxgui/profilemanager.py:1135
+#: ../pyhoca/wxgui/profilemanager.py:2303
msgid "automatically"
msgstr "automatisk"
-#: ../pyhoca/wxgui/profilemanager.py:403
-#: ../pyhoca/wxgui/profilemanager.py:1126
+#: ../pyhoca/wxgui/profilemanager.py:425
+#: ../pyhoca/wxgui/profilemanager.py:1137
msgid "manually"
msgstr "manuelt"
-#: ../pyhoca/wxgui/profilemanager.py:412
+#: ../pyhoca/wxgui/profilemanager.py:434
msgid "PyHoca-GUI Profile Manager - new profile"
msgstr "PyHoca-GUI Profil hÃĨndterer - ny profil"
-#: ../pyhoca/wxgui/profilemanager.py:414
+#: ../pyhoca/wxgui/profilemanager.py:436
#, python-format
msgid "PyHoca-GUI Profile Manager - %s (connected)"
msgstr "PyHoca-GUI Profil hÃĨndterer - %s (tilkoblet)"
-#: ../pyhoca/wxgui/profilemanager.py:416
+#: ../pyhoca/wxgui/profilemanager.py:438
#, python-format
msgid "PyHoca-GUI Profile Manager - %s"
msgstr "PyHoca-GUI Profil hÃĨndterer - %s"
-#: ../pyhoca/wxgui/profilemanager.py:797
+#: ../pyhoca/wxgui/profilemanager.py:804
msgid "Profile"
msgstr "Profil"
-#: ../pyhoca/wxgui/profilemanager.py:798
+#: ../pyhoca/wxgui/profilemanager.py:805
msgid "Session"
msgstr "Sesjon"
-#: ../pyhoca/wxgui/profilemanager.py:799
+#: ../pyhoca/wxgui/profilemanager.py:806
msgid "Connection"
msgstr "Tilkobling"
-#: ../pyhoca/wxgui/profilemanager.py:800
+#: ../pyhoca/wxgui/profilemanager.py:807
msgid "Link Quality"
msgstr "Koblingskvalitet"
-#: ../pyhoca/wxgui/profilemanager.py:801
-msgid "Settings"
-msgstr "Innstillinger"
+#: ../pyhoca/wxgui/profilemanager.py:808
+msgid "Input/Output"
+msgstr "Inndata/Utdata"
+
+#: ../pyhoca/wxgui/profilemanager.py:809
+msgid "Media"
+msgstr "Media"
-#: ../pyhoca/wxgui/profilemanager.py:802
+#: ../pyhoca/wxgui/profilemanager.py:810
msgid "Sharing"
msgstr "Deling"
-#: ../pyhoca/wxgui/profilemanager.py:988
+#: ../pyhoca/wxgui/profilemanager.py:989
msgid "<xkbtype>"
msgstr "<xkbtype>"
-#: ../pyhoca/wxgui/profilemanager.py:989
+#: ../pyhoca/wxgui/profilemanager.py:990
msgid "<xkblayout>"
msgstr "<xkblayout>"
-#: ../pyhoca/wxgui/profilemanager.py:990
+#: ../pyhoca/wxgui/profilemanager.py:991
msgid "<xkbvariant>"
msgstr "<xkbvariant>"
-#: ../pyhoca/wxgui/profilemanager.py:1444
+#: ../pyhoca/wxgui/profilemanager.py:1449
msgid "Icon Files (*.png)|*.png|All files (*.*)|*"
msgstr "Ikonfiler(*.png)|*.png|Alle filer (*.*)|*"
-#: ../pyhoca/wxgui/profilemanager.py:1447
+#: ../pyhoca/wxgui/profilemanager.py:1452
msgid "Choose an icon for this session profile"
msgstr "Velg et ikon for denne sesjonsprofilen"
-#: ../pyhoca/wxgui/profilemanager.py:1816
+#: ../pyhoca/wxgui/profilemanager.py:1895
msgid "All files (*.*)|*"
msgstr "Alle filer (*.*)|*"
-#: ../pyhoca/wxgui/profilemanager.py:1818
-#: ../pyhoca/wxgui/profilemanager.py:1842
+#: ../pyhoca/wxgui/profilemanager.py:1897
+#: ../pyhoca/wxgui/profilemanager.py:1921
msgid "Choose a public SSH key"
msgstr "Velg en offentlig SSH nøkkel"
-#: ../pyhoca/wxgui/profilemanager.py:2220
+#: ../pyhoca/wxgui/profilemanager.py:2255
msgid "Choose a folder to share within a session"
msgstr "Velg en mappe som skal deles i en sesjon"
-#: ../pyhoca/wxgui/profilemanager.py:2348
-#: ../pyhoca/wxgui/profilemanager.py:2351
-#: ../pyhoca/wxgui/profilemanager.py:2354
-#: ../pyhoca/wxgui/profilemanager.py:2359
-#: ../pyhoca/wxgui/profilemanager.py:2369 ../pyhoca/wxgui/menus_taskbar.py:117
+#: ../pyhoca/wxgui/profilemanager.py:2383
+#: ../pyhoca/wxgui/profilemanager.py:2386
+#: ../pyhoca/wxgui/profilemanager.py:2389 ../pyhoca/wxgui/menus_taskbar.py:122
msgid "Profile Manager"
msgstr "Profil hÃĨndterer"
-#: ../pyhoca/wxgui/profilemanager.py:2348
+#: ../pyhoca/wxgui/profilemanager.py:2383
msgid "Profile name is missing, profile unusable!!!"
msgstr "Profilnavnet mangler, profilen er ubrukelig!"
-#: ../pyhoca/wxgui/profilemanager.py:2351
-#: ../pyhoca/wxgui/profilemanager.py:2354
+#: ../pyhoca/wxgui/profilemanager.py:2386
+#: ../pyhoca/wxgui/profilemanager.py:2389
#, python-format
msgid "Profile name %s already exists!!!"
msgstr "Profilnavnet %s eksisterer allerede!"
-#: ../pyhoca/wxgui/profilemanager.py:2359
-msgid "The SSH proxy configuration is incomplete. Try again."
-msgstr "SSH mellomtjener konfigurasjonen er ufullstendig. Forsøk igjen."
-
-#: ../pyhoca/wxgui/profilemanager.py:2369
-#, python-format
-msgid ""
-"Another session profile (%s) already uses [%s]:%s for binding a local SSH "
-"proxy to.\n"
-"Please change the SSH proxy settings accordingly."
-msgstr ""
-"En annen sesjonsprofil (%s) benytter allerede [%s]:%s for ÃĨ portbinde en "
-"lokal SSH mellomtjener.\n"
-"Vennligst endre SSH mellomtjener innstillingene tilsvarende."
-
-#: ../pyhoca/wxgui/profilemanager.py:2396
+#: ../pyhoca/wxgui/profilemanager.py:2416
#, python-format
msgid "%s - profile added"
msgstr "%s - profil lagt til"
-#: ../pyhoca/wxgui/profilemanager.py:2397
+#: ../pyhoca/wxgui/profilemanager.py:2417
msgid "A new session profile has been added."
msgstr "En ny sesjonsprofil har blitt lagt til."
-#: ../pyhoca/wxgui/profilemanager.py:2401
+#: ../pyhoca/wxgui/profilemanager.py:2421
#, python-format
msgid "%s - modified"
msgstr "%s - endret"
-#: ../pyhoca/wxgui/profilemanager.py:2402
+#: ../pyhoca/wxgui/profilemanager.py:2422
msgid "Changes to profile have been saved."
msgstr "Endringer til profilen har blitt lagret."
-#: ../pyhoca/wxgui/menus_taskbar.py:74
+#: ../pyhoca/wxgui/listdesktops.py:82
+#, python-format
+msgid "Share Desktop Session - %s"
+msgstr "Del skrivebordssesjon - %s"
+
+#: ../pyhoca/wxgui/listdesktops.py:84
+msgid "Select one of the available desktop sessions on this server"
+msgstr "Velg en av de tilgjengelige skrivebordssesjonene pÃĨ denne serveren"
+
+#: ../pyhoca/wxgui/listdesktops.py:90
+msgid "View session only"
+msgstr "Bare vis sesjonen"
+
+#: ../pyhoca/wxgui/listdesktops.py:91
+msgid "Gain full access"
+msgstr "FÃĨ full tilgang"
+
+#: ../pyhoca/wxgui/listdesktops.py:95
+msgid "Share Desktop"
+msgstr "Del skrivebord"
+
+#: ../pyhoca/wxgui/listdesktops.py:98
+msgid "Refresh list"
+msgstr "Oppfrisk listen"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:76
msgid "Edit Profile"
msgstr "Rediger profil"
-#: ../pyhoca/wxgui/menus_taskbar.py:77
+#: ../pyhoca/wxgui/menus_taskbar.py:79
msgid "Use as Template for New Profile"
msgstr "Benytt som mal for en ny profil"
-#: ../pyhoca/wxgui/menus_taskbar.py:78
+#: ../pyhoca/wxgui/menus_taskbar.py:81
+msgid "Export Profile"
+msgstr "Eksporter profil"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:82
msgid "Delete Profile"
msgstr "Slett profil"
-#: ../pyhoca/wxgui/menus_taskbar.py:106
+#: ../pyhoca/wxgui/menus_taskbar.py:111
#, python-format
msgid "About %s (%s)..."
msgstr "Om %s (%s) ..."
-#: ../pyhoca/wxgui/menus_taskbar.py:132
+#: ../pyhoca/wxgui/menus_taskbar.py:137
msgid "Manage Session Profile"
msgstr "HÃĨndter sesjonsprofil"
-#: ../pyhoca/wxgui/menus_taskbar.py:141
+#: ../pyhoca/wxgui/menus_taskbar.py:146
msgid "Printing Preferences"
msgstr "Utksriftsinnstillinger"
-#: ../pyhoca/wxgui/menus_taskbar.py:147
+#: ../pyhoca/wxgui/menus_taskbar.py:152
msgid "Client Options"
msgstr "Klient alternativer"
-#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:783
-#: ../pyhoca/wxgui/menus_taskbar.py:975
+#: ../pyhoca/wxgui/menus_taskbar.py:160 ../pyhoca/wxgui/menus_taskbar.py:828
+#: ../pyhoca/wxgui/menus_taskbar.py:1033
msgid "E&xit"
msgstr "&Avslutt"
-#: ../pyhoca/wxgui/menus_taskbar.py:227
+#: ../pyhoca/wxgui/menus_taskbar.py:232
msgid "Window title"
msgstr "Vindustittel"
-#: ../pyhoca/wxgui/menus_taskbar.py:233 ../pyhoca/wxgui/menus_taskbar.py:608
+#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:631
msgid "Resume Session"
msgstr "Gjenoppta sesjon"
-#: ../pyhoca/wxgui/menus_taskbar.py:235
+#: ../pyhoca/wxgui/menus_taskbar.py:240
msgid "Resume Session (not possible)"
msgstr "Gjenoppta sesjon (ikke mulig)"
-#: ../pyhoca/wxgui/menus_taskbar.py:246
+#: ../pyhoca/wxgui/menus_taskbar.py:251
msgid "Transfer Session"
msgstr "Overfør sesjon"
-#: ../pyhoca/wxgui/menus_taskbar.py:248
+#: ../pyhoca/wxgui/menus_taskbar.py:253
msgid "Transfer Session (not possible)"
msgstr "Overfør sesjon (ikke mulig)"
-#: ../pyhoca/wxgui/menus_taskbar.py:252 ../pyhoca/wxgui/menus_taskbar.py:599
+#: ../pyhoca/wxgui/menus_taskbar.py:258 ../pyhoca/wxgui/menus_taskbar.py:622
msgid "Suspend Session (and disconnect/exit)"
msgstr "Koble fra sesjonen (og avslutte)"
-#: ../pyhoca/wxgui/menus_taskbar.py:254 ../pyhoca/wxgui/menus_taskbar.py:601
+#: ../pyhoca/wxgui/menus_taskbar.py:260 ../pyhoca/wxgui/menus_taskbar.py:624
msgid "Suspend Session (and disconnect)"
msgstr "Koble fra sesjonen"
-#: ../pyhoca/wxgui/menus_taskbar.py:256 ../pyhoca/wxgui/menus_taskbar.py:603
+#: ../pyhoca/wxgui/menus_taskbar.py:262 ../pyhoca/wxgui/menus_taskbar.py:626
msgid "Suspend Session"
msgstr "Frakoble sesjon"
-#: ../pyhoca/wxgui/menus_taskbar.py:262 ../pyhoca/wxgui/menus_taskbar.py:612
+#: ../pyhoca/wxgui/menus_taskbar.py:268 ../pyhoca/wxgui/menus_taskbar.py:635
msgid "Terminate Session (and disconnect/exit)"
msgstr "Avslutte sesjonen (og "
-#: ../pyhoca/wxgui/menus_taskbar.py:264 ../pyhoca/wxgui/menus_taskbar.py:614
+#: ../pyhoca/wxgui/menus_taskbar.py:270 ../pyhoca/wxgui/menus_taskbar.py:637
msgid "Terminate Session (and disconnect)"
msgstr "Avslutte sesjon (og koble fra)"
-#: ../pyhoca/wxgui/menus_taskbar.py:266 ../pyhoca/wxgui/menus_taskbar.py:616
+#: ../pyhoca/wxgui/menus_taskbar.py:272 ../pyhoca/wxgui/menus_taskbar.py:639
msgid "Terminate Session"
msgstr "Avslutte sesjon"
-#: ../pyhoca/wxgui/menus_taskbar.py:270 ../pyhoca/wxgui/menus_taskbar.py:596
+#: ../pyhoca/wxgui/menus_taskbar.py:275
+msgid "End Desktop Sharing (and disconnect/exit)"
+msgstr "Avslutt skrivebordsdeling (og koble fra/avslutte)"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:277
+msgid "End Desktop Sharing (and disconnect)"
+msgstr "Avslutt skrivebordsdeling (og koble fra)"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:279
+msgid "End Desktop Sharing"
+msgstr "Avslutt skrivebordsdeling"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:283 ../pyhoca/wxgui/menus_taskbar.py:619
msgid "Refresh menu tree"
msgstr "Oppfrisk menytreet"
-#: ../pyhoca/wxgui/menus_taskbar.py:279
+#: ../pyhoca/wxgui/menus_taskbar.py:292
msgid "Rename Session Window"
msgstr "Omdøp sesjonsvinduet"
-#: ../pyhoca/wxgui/menus_taskbar.py:280
+#: ../pyhoca/wxgui/menus_taskbar.py:293
msgid "Show Session Window"
msgstr "Vis sesjonsvindu"
-#: ../pyhoca/wxgui/menus_taskbar.py:322
+#: ../pyhoca/wxgui/menus_taskbar.py:335
msgid "&Share custom local folder"
msgstr "&Del selvvalgt lokal mappe"
-#: ../pyhoca/wxgui/menus_taskbar.py:337
+#: ../pyhoca/wxgui/menus_taskbar.py:350
msgid "Share:"
msgstr "Del:"
-#: ../pyhoca/wxgui/menus_taskbar.py:346
+#: ../pyhoca/wxgui/menus_taskbar.py:359
msgid "Unshare:"
msgstr "Stopp deling:"
-#: ../pyhoca/wxgui/menus_taskbar.py:354
+#: ../pyhoca/wxgui/menus_taskbar.py:367
msgid "Unshare &all local folders"
msgstr "Stopp deling pÃĨ a&lle lokale mapper"
-#: ../pyhoca/wxgui/menus_taskbar.py:360
+#: ../pyhoca/wxgui/menus_taskbar.py:373
msgid "Restore shares in next session"
msgstr "Gjenopprett delte mapper i neste sesjon"
-#: ../pyhoca/wxgui/menus_taskbar.py:440
+#: ../pyhoca/wxgui/menus_taskbar.py:453
msgid "Multimedia"
msgstr "Multimedia"
-#: ../pyhoca/wxgui/menus_taskbar.py:441
+#: ../pyhoca/wxgui/menus_taskbar.py:454
msgid "Development"
msgstr "Utvikling"
-#: ../pyhoca/wxgui/menus_taskbar.py:442
+#: ../pyhoca/wxgui/menus_taskbar.py:455
msgid "Education"
msgstr "OpplÃĻring"
-#: ../pyhoca/wxgui/menus_taskbar.py:443
+#: ../pyhoca/wxgui/menus_taskbar.py:456
msgid "Games"
msgstr "Spill"
-#: ../pyhoca/wxgui/menus_taskbar.py:444
+#: ../pyhoca/wxgui/menus_taskbar.py:457
msgid "Graphics"
msgstr "Grafikk"
-#: ../pyhoca/wxgui/menus_taskbar.py:445
+#: ../pyhoca/wxgui/menus_taskbar.py:458
msgid "Internet"
msgstr "Internett"
-#: ../pyhoca/wxgui/menus_taskbar.py:446
+#: ../pyhoca/wxgui/menus_taskbar.py:459
msgid "Office Applications"
msgstr "Kontorapplikasjoner"
-#: ../pyhoca/wxgui/menus_taskbar.py:447
+#: ../pyhoca/wxgui/menus_taskbar.py:460
msgid "System"
msgstr "System"
-#: ../pyhoca/wxgui/menus_taskbar.py:448
+#: ../pyhoca/wxgui/menus_taskbar.py:461
msgid "Utilities"
msgstr "Verktøy"
-#: ../pyhoca/wxgui/menus_taskbar.py:449
+#: ../pyhoca/wxgui/menus_taskbar.py:462
msgid "Other Applications"
msgstr "Andre applikasjoner"
-#: ../pyhoca/wxgui/menus_taskbar.py:521 ../pyhoca/wxgui/menus_taskbar.py:533
+#: ../pyhoca/wxgui/menus_taskbar.py:535 ../pyhoca/wxgui/menus_taskbar.py:547
#, python-format
msgid "Connect %s"
msgstr "Koble til %s"
-#: ../pyhoca/wxgui/menus_taskbar.py:527
+#: ../pyhoca/wxgui/menus_taskbar.py:541
msgid "Currently connecting..."
msgstr "Kobler til..."
-#: ../pyhoca/wxgui/menus_taskbar.py:541
+#: ../pyhoca/wxgui/menus_taskbar.py:556
msgid "Start &new Desktop Session"
-msgstr "Start &ny sesjon"
+msgstr "Start &ny skrivebordssesjon"
-#: ../pyhoca/wxgui/menus_taskbar.py:546 ../pyhoca/wxgui/menus_taskbar.py:684
+#: ../pyhoca/wxgui/menus_taskbar.py:560 ../pyhoca/wxgui/menus_taskbar.py:660
+msgid "Start Desktop Sharing Session"
+msgstr "Start sesjon for skrivebordsdeling"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:566 ../pyhoca/wxgui/menus_taskbar.py:710
msgid "Retrieving Application Menu..."
msgstr "Henter applikasjonsmenyen..."
-#: ../pyhoca/wxgui/menus_taskbar.py:550 ../pyhoca/wxgui/menus_taskbar.py:687
+#: ../pyhoca/wxgui/menus_taskbar.py:570 ../pyhoca/wxgui/menus_taskbar.py:713
msgid "Retrieve Application Menu"
msgstr "Hent applikasjonsmenyen"
-#: ../pyhoca/wxgui/menus_taskbar.py:553
+#: ../pyhoca/wxgui/menus_taskbar.py:573
+msgid "Start &new RDP Session"
+msgstr "Start &ny RDP sesjon"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:576
msgid "Start &new Session"
msgstr "Start &ny sesjon"
-#: ../pyhoca/wxgui/menus_taskbar.py:633
+#: ../pyhoca/wxgui/menus_taskbar.py:656
msgid "Launch Single Application"
msgstr "Start enkelt applikasjon"
-#: ../pyhoca/wxgui/menus_taskbar.py:671
+#: ../pyhoca/wxgui/menus_taskbar.py:697
msgid "Manage Application Menu"
msgstr "Administrer applkasjonsmenyen"
-#: ../pyhoca/wxgui/menus_taskbar.py:714
+#: ../pyhoca/wxgui/menus_taskbar.py:752
msgid "Running"
msgstr "Aktiv"
-#: ../pyhoca/wxgui/menus_taskbar.py:716
+#: ../pyhoca/wxgui/menus_taskbar.py:754
msgid "Suspended"
msgstr "Frakoblet"
-#: ../pyhoca/wxgui/menus_taskbar.py:735
+#: ../pyhoca/wxgui/menus_taskbar.py:773
msgid "&Clean all sessions"
msgstr "&Rensk opp alle sesjoner"
-#: ../pyhoca/wxgui/menus_taskbar.py:741
+#: ../pyhoca/wxgui/menus_taskbar.py:779
msgid "Customize &profile"
msgstr "TIlpass &profil"
-#: ../pyhoca/wxgui/menus_taskbar.py:756
+#: ../pyhoca/wxgui/menus_taskbar.py:794
msgid "Shared &folders"
msgstr "Delte &mapper"
-#: ../pyhoca/wxgui/menus_taskbar.py:768
+#: ../pyhoca/wxgui/menus_taskbar.py:806
+msgid "Server Information"
+msgstr "Serverinformasjon"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:813
msgid "&Disconnect from Server"
msgstr "&Koble fra serveren"
-#: ../pyhoca/wxgui/menus_taskbar.py:775
+#: ../pyhoca/wxgui/menus_taskbar.py:820
msgid "Suspend Session and E&xit application"
msgstr "Koble fra sesjonen og &Avslutt applikasjonen"
-#: ../pyhoca/wxgui/menus_taskbar.py:779
+#: ../pyhoca/wxgui/menus_taskbar.py:824
msgid "Disconnect and E&xit application"
msgstr "Koble fra sesjonen og &Avslutt applikasjonen"
-#: ../pyhoca/wxgui/menus_taskbar.py:833
+#: ../pyhoca/wxgui/menus_taskbar.py:878
msgid "Add Profile"
msgstr "Legg til profil"
-#: ../pyhoca/wxgui/menus_taskbar.py:909
+#: ../pyhoca/wxgui/menus_taskbar.py:954
msgid "No session profiles defined"
msgstr "Ingen sesjonsprofiler er definert"
-#: ../pyhoca/wxgui/menus_taskbar.py:945
-msgid "Start/Resume Session"
-msgstr "Start/gjenoppta sesjon"
+#: ../pyhoca/wxgui/menus_taskbar.py:965
+msgid "Export all Profiles"
+msgstr "Eksporter alle profiler"
-#: ../pyhoca/wxgui/menus_taskbar.py:945
+#: ../pyhoca/wxgui/menus_taskbar.py:967
+msgid "Export Profile Group"
+msgstr "Eksporter profilgruppe"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:1003
msgid "Connect Server"
msgstr "Koble til server"
@@ -963,64 +1021,64 @@ msgstr "Koble til server"
msgid "About %s ..."
msgstr "Om %s ..."
-#: ../pyhoca/wxgui/frontend.py:459
+#: ../pyhoca/wxgui/frontend.py:465
msgid "Suspending sessions and exiting application..."
msgstr "Koble fra sesjonene og avslutt applikasjonen..."
-#: ../pyhoca/wxgui/frontend.py:462
+#: ../pyhoca/wxgui/frontend.py:468
#, python-format
msgid "Disconnecting %s and exiting application..."
msgstr "Kobler fra %s og avslutter applikasjonen..."
-#: ../pyhoca/wxgui/frontend.py:464
+#: ../pyhoca/wxgui/frontend.py:470
msgid "Exiting application..."
msgstr "Avslutter applikasjonen..."
-#: ../pyhoca/wxgui/frontend.py:562
+#: ../pyhoca/wxgui/frontend.py:568
#, python-format
msgid "%s - server warning"
msgstr "%s - server advarsel"
-#: ../pyhoca/wxgui/frontend.py:562
+#: ../pyhoca/wxgui/frontend.py:568
msgid "The X2Go Server does not publish an application menu."
msgstr "X2Go serveren publiserer ikke en applikasjonsmeny"
-#: ../pyhoca/wxgui/frontend.py:613
+#: ../pyhoca/wxgui/frontend.py:619
msgid "SSH key authentication has been successful."
msgstr "SSH nøkkel autentisering var vellykket."
-#: ../pyhoca/wxgui/frontend.py:650
+#: ../pyhoca/wxgui/frontend.py:656
msgid ""
"The SSH proxy's host key is invalid or has not been accepted by the user"
msgstr ""
"SSH mellomtjenerens vertsnøkkel er ugyldig, eller har ikke blitt akseptert "
"av brukeren"
-#: ../pyhoca/wxgui/frontend.py:671
+#: ../pyhoca/wxgui/frontend.py:677
#, python-format
msgid "%s - EOF error"
msgstr "%s - EOF feil"
-#: ../pyhoca/wxgui/frontend.py:671
+#: ../pyhoca/wxgui/frontend.py:677
msgid "Authentication protocol communication incomplete! Try again..."
msgstr ""
"Autentiseringens protokoll kommunikasjon er ufullstendig! Forsøk igjen."
-#: ../pyhoca/wxgui/frontend.py:678
+#: ../pyhoca/wxgui/frontend.py:684
#, python-format
msgid "%s - auth key error"
msgstr "%s - Feil med autentiseringsnøkkel"
-#: ../pyhoca/wxgui/frontend.py:699
+#: ../pyhoca/wxgui/frontend.py:705
msgid "An unknown error occurred during authentication!"
msgstr "En ukjent feil oppstod under autentiseringen! "
-#: ../pyhoca/wxgui/frontend.py:728
+#: ../pyhoca/wxgui/frontend.py:734
#, python-format
msgid "%s: DirectRDP not supported yet"
msgstr "%s: Direkte RDP er ikke støttet enda"
-#: ../pyhoca/wxgui/frontend.py:729
+#: ../pyhoca/wxgui/frontend.py:735
#, python-format
msgid ""
"We apologize for the inconvenience...\n"
@@ -1028,66 +1086,155 @@ msgid ""
"Session profiles of type ,,DirectRDP'' are not\n"
"supported by %s (%s), yet!!\n"
"\n"
-"DirectRDP support will be available in %s (>= 0.2.2.0)."
+"DirectRDP support will be available in %s (>= 1.0.0.0)."
msgstr ""
"Vi beklager for det inntrufne... \n"
"\n"
"Sesjonsprofiler av typen ,,DirectRDP'' er ikke\n"
"støttet av %s (%s), enda!\n"
"\n"
-"DirectRDP støtte vil vÃĻre tilgjengelig i %s (>= 0.2.2.0)."
+"DirectRDP støtte vil vÃĻre tilgjengelig i %s (>= 1.0.0.0)."
-#: ../pyhoca/wxgui/frontend.py:741
+#: ../pyhoca/wxgui/frontend.py:747
msgid "Unknown session profile, configure before using it..."
msgstr "Ukjent sesjonsprofil, konfigurer den først..."
-#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:1332
+#: ../pyhoca/wxgui/frontend.py:778
+#, python-format
+msgid "Desktop Sharing with %s not supported by server"
+msgstr "Deling av skrivebord med %s er ikke støttet av serveren"
+
+#: ../pyhoca/wxgui/frontend.py:779
+#, python-format
+msgid ""
+"We apologize for the inconvenience...\n"
+"\n"
+"Session profiles of type ,,SHADOW'' are not\n"
+"supported by X2Go Server (v%s)!!!\n"
+"\n"
+"Desktop Sharing with %s requires\n"
+"X2Go Server 4.1.0.0 and above."
+msgstr ""
+"Vi beklager for det inntrufne... \n"
+"\n"
+"Sesjonsprofiler av typen ,,Skygge'' er ikke\n"
+"støttet av X2Go Server (%s), enda!\n"
+"\n"
+"Skrivebordsdeling med %s krever\n"
+"X2Go Server 4.1.0.0, eller nyere."
+
+#: ../pyhoca/wxgui/frontend.py:837 ../pyhoca/wxgui/frontend.py:1488
#, python-format
msgid "%s - session warning"
msgstr "%s - advarsel om sesjon"
-#: ../pyhoca/wxgui/frontend.py:798
+#: ../pyhoca/wxgui/frontend.py:837
#, python-format
msgid "Execution of command ,,%s'' failed."
msgstr "Utførelsen av kommandoen \"%s\" feilet."
-#: ../pyhoca/wxgui/frontend.py:939
+#: ../pyhoca/wxgui/frontend.py:978
msgid "Cleaning X2Go sessions..."
msgstr "Rensker opp i X2Go sesjoner..."
-#: ../pyhoca/wxgui/frontend.py:974
+#: ../pyhoca/wxgui/frontend.py:1026
#, python-format
msgid "%s - disconnect"
msgstr "%s - koble fra"
-#: ../pyhoca/wxgui/frontend.py:974
+#: ../pyhoca/wxgui/frontend.py:1026
msgid "X2Go Profile is now disconnected."
msgstr "X2Go profilen er nÃĨ frakoblet."
-#: ../pyhoca/wxgui/frontend.py:995
+#: ../pyhoca/wxgui/frontend.py:1047
msgid "New Session Profile"
msgstr "Ny sesjonsprofil"
-#: ../pyhoca/wxgui/frontend.py:1047
+#: ../pyhoca/wxgui/frontend.py:1102
#, python-format
msgid "Really Delete Session Profile ,,%s''?"
msgstr "Virkelig slette sesjonsprofilen \"%s\"?"
-#: ../pyhoca/wxgui/frontend.py:1053
+#: ../pyhoca/wxgui/frontend.py:1108
#, python-format
msgid "%s - profile deleted"
msgstr "%s - profilen er slettet"
-#: ../pyhoca/wxgui/frontend.py:1053
+#: ../pyhoca/wxgui/frontend.py:1108
msgid "The session profile has been deleted."
msgstr "Sesjonsprofilen har blitt slettet."
-#: ../pyhoca/wxgui/frontend.py:1071
+#: ../pyhoca/wxgui/frontend.py:1137
+#, python-format
+msgid "%s - export session profiles"
+msgstr "%s - eksporter sesjonsprofiler"
+
+#: ../pyhoca/wxgui/frontend.py:1142
+#, python-format
+msgid "%s - export session profile"
+msgstr "%s - eksporter sesjonsprofil"
+
+#: ../pyhoca/wxgui/frontend.py:1154
+#, python-format
+msgid "%s: Export file already exists"
+msgstr "%s: Eksportfilen eksisterer allerede"
+
+#: ../pyhoca/wxgui/frontend.py:1155
+#, python-format
+msgid ""
+"The file Âģ%sÂĢ already exists in this folder.\n"
+"\n"
+"Do you want to replace it?"
+msgstr ""
+"Filen \"%s\" eksisteren allerede i denne mappen.\n"
+"\n"
+"Vil du overskrive den?"
+
+#: ../pyhoca/wxgui/frontend.py:1176
+#, python-format
+msgid "%s - profiles exported"
+msgstr "%s - profilene ble eksportert"
+
+#: ../pyhoca/wxgui/frontend.py:1176
+#, python-format
+msgid "Successfully exported session profile group Âģ%sÂĢ to file Âģ%sÂĢ."
+msgstr ""
+"Eksporten av sesjonsprofilgruppen \"%s\" til filen \"%s\" var vellykket."
+
+#: ../pyhoca/wxgui/frontend.py:1178
+#, python-format
+msgid "%s - profile exported"
+msgstr "%s - profilen er eksportert"
+
+#: ../pyhoca/wxgui/frontend.py:1178
+#, python-format
+msgid "Successfully exported single session profile Âģ%sÂĢ to file Âģ%sÂĢ."
+msgstr "Eksporten av sesjonsprofilen \"%s\" til filen \"%s\" var vellykket."
+
+#: ../pyhoca/wxgui/frontend.py:1182
+#, python-format
+msgid "%s: Exporting session profile(s) failed"
+msgstr "%s: Eksporteringen av sesjonsprofil(er) feilet"
+
+#: ../pyhoca/wxgui/frontend.py:1183
+#, python-format
+msgid ""
+"The selected session profile(s) could not be exported to the \n"
+"file Âģ%sÂĢ.\n"
+"\n"
+"Check for common problems (disk full, insufficient access, etc.)."
+msgstr ""
+"Valgt sesjonsprofil(er) kunne ikke bli eksportert til \n"
+"filen \"%s\".\n"
+"\n"
+"Sjekk for vanlige feil (full disk, manglende tilgang, o.l.)."
+
+#: ../pyhoca/wxgui/frontend.py:1202
#, python-format
msgid "%s - share local folder with sessions of this profile"
msgstr "%s - del lokal mappe med sesjoner av denne profilen"
-#: ../pyhoca/wxgui/frontend.py:1224
+#: ../pyhoca/wxgui/frontend.py:1355
#, python-format
msgid ""
"The authenticity of host [%s]:%s can't be established.\n"
@@ -1100,17 +1247,17 @@ msgstr ""
"\n"
"Er du sikker pÃĨ at du vil fortsette tilkoblingen?"
-#: ../pyhoca/wxgui/frontend.py:1232
+#: ../pyhoca/wxgui/frontend.py:1363
#, python-format
msgid "%s: Confirm Host Authorization"
msgstr "%s: Verifiser vert autorisasjonen"
-#: ../pyhoca/wxgui/frontend.py:1277
+#: ../pyhoca/wxgui/frontend.py:1409
#, python-format
msgid "%s - channel error"
msgstr "%s - feil med kanalen"
-#: ../pyhoca/wxgui/frontend.py:1277
+#: ../pyhoca/wxgui/frontend.py:1409
#, python-format
msgid ""
"Lost connection to server %s unexpectedly! Try to re-authenticate to the "
@@ -1119,22 +1266,46 @@ msgstr ""
"Mistet uventet forbindelsen til server %s ! Forsøk ÃĨ autentisiere deg pÃĨ "
"nytt til serveren..."
-#: ../pyhoca/wxgui/frontend.py:1295 ../pyhoca/wxgui/frontend.py:1313
-#: ../pyhoca/wxgui/frontend.py:1315 ../pyhoca/wxgui/frontend.py:1351
+#: ../pyhoca/wxgui/frontend.py:1426 ../pyhoca/wxgui/frontend.py:1469
+#: ../pyhoca/wxgui/frontend.py:1471 ../pyhoca/wxgui/frontend.py:1507
#, python-format
msgid "%s - session failure"
msgstr "%s - sesjonsfeil"
-#: ../pyhoca/wxgui/frontend.py:1295
+#: ../pyhoca/wxgui/frontend.py:1426
msgid "The session startup failed."
msgstr "Oppstart av sesjonen feilet."
-#: ../pyhoca/wxgui/frontend.py:1313
+#: ../pyhoca/wxgui/frontend.py:1439
+#, python-format
+msgid "%s - timeout"
+msgstr "%s - tidsavbrudd"
+
+#: ../pyhoca/wxgui/frontend.py:1439
+msgid ""
+"The server took long to provide a list of sharable desktops.\n"
+"This can happen from time to time, please try again"
+msgstr ""
+"Serveren brukte for lang tid med ÃĨ komme med listen over \n"
+"skrivebord som det er mulig ÃĨ dele.\n"
+"Dette kan noen ganger skje, vennligst forsøk igjen."
+
+#: ../pyhoca/wxgui/frontend.py:1451
+#, python-format
+msgid "%s - desktop sharing failed"
+msgstr "%s - skrivebordsdelingen feilet"
+
+#: ../pyhoca/wxgui/frontend.py:1451
+#, python-format
+msgid "The desktop %s is not available for sharing (anymore)."
+msgstr "Skrivebordet %s er ikke tilgjengelig for deling (lenger)."
+
+#: ../pyhoca/wxgui/frontend.py:1469
#, python-format
msgid "The command ,,%s'' is not available on X2Go server."
msgstr "Kommandoen \"%s\" er ikke tilgjengelig pÃĨ X2Go serveren."
-#: ../pyhoca/wxgui/frontend.py:1315
+#: ../pyhoca/wxgui/frontend.py:1471
#, python-format
msgid ""
"The command ,,%s'' is not available on X2Go server\n"
@@ -1143,7 +1314,7 @@ msgstr ""
"Kommandoen \"%s\" er ikke tilgjengelig pÃĨ X2Go server\n"
"%s."
-#: ../pyhoca/wxgui/frontend.py:1332
+#: ../pyhoca/wxgui/frontend.py:1488
#, python-format
msgid ""
"Reverse TCP port forwarding request for session %s to server port %s has "
@@ -1152,46 +1323,46 @@ msgstr ""
"Revers TCP port videresendingsforespørselen for sesjon %s til server port %s "
"har blitt avvist."
-#: ../pyhoca/wxgui/frontend.py:1351
+#: ../pyhoca/wxgui/frontend.py:1507
#, python-format
msgid ""
"Forwarding tunnel request to [%s]:%s for session %s was denied by remote "
-"X2go/SSH server. Session startup failed."
+"X2Go/SSH server. Session startup failed."
msgstr ""
"Tunnel videresendingsforespørsel til [%s]:%s for sesjon %s ble avvist av den "
"eksterne X2Go/SSH serveren. Oppstart av sesjonen feilet."
-#: ../pyhoca/wxgui/frontend.py:1370
+#: ../pyhoca/wxgui/frontend.py:1526
#, python-format
msgid "%s - audio warning"
msgstr "%s - advarsel om lyd"
-#: ../pyhoca/wxgui/frontend.py:1370
+#: ../pyhoca/wxgui/frontend.py:1526
msgid ""
"The X2Go PulseAudio system is not available within Remote Desktop sessions."
msgstr ""
"X2Go PulseAudio systemet er ikke tilgjengelig inne i Terminal server "
"sesjoner (RDP)."
-#: ../pyhoca/wxgui/frontend.py:1377 ../pyhoca/wxgui/frontend.py:1384
+#: ../pyhoca/wxgui/frontend.py:1533 ../pyhoca/wxgui/frontend.py:1540
#, python-format
msgid "%s - audio error"
msgstr "%s - feil med lyden"
-#: ../pyhoca/wxgui/frontend.py:1377
+#: ../pyhoca/wxgui/frontend.py:1533
msgid "The X2Go PulseAudio system could not be started."
msgstr "X2Go PulseAudio systemet kan ikke bli startet."
-#: ../pyhoca/wxgui/frontend.py:1384
+#: ../pyhoca/wxgui/frontend.py:1540
msgid "The X2Go PulseAudio system has died unexpectedly."
msgstr "X2Go PulseAudio systemet har uventet stoppet."
-#: ../pyhoca/wxgui/frontend.py:1396
+#: ../pyhoca/wxgui/frontend.py:1552
#, python-format
msgid "%s - audio problem"
msgstr "%s - problem med lyden"
-#: ../pyhoca/wxgui/frontend.py:1396
+#: ../pyhoca/wxgui/frontend.py:1552
#, python-format
msgid ""
"The audio connection could not be set up for this session.\n"
@@ -1200,12 +1371,12 @@ msgstr ""
"Klarte ikke ÃĨ sette opp lydforbindelsen for denne sesjonen.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1408
+#: ../pyhoca/wxgui/frontend.py:1564
#, python-format
msgid "%s - client-side printing not available"
msgstr "%s - klient-side utskrift er ikke tilgjengelig"
-#: ../pyhoca/wxgui/frontend.py:1408
+#: ../pyhoca/wxgui/frontend.py:1564
#, python-format
msgid ""
"The server denies client-side printing from within this session.\n"
@@ -1214,12 +1385,12 @@ msgstr ""
"Serveren nekter klient-side utskrift innenfra denne sesjonen.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1420
+#: ../pyhoca/wxgui/frontend.py:1576
#, python-format
msgid "%s - MIME box not available"
msgstr "%s - MIME boks ikke tilgjengelig"
-#: ../pyhoca/wxgui/frontend.py:1420
+#: ../pyhoca/wxgui/frontend.py:1576
#, python-format
msgid ""
"The server does not support the X2Go MIME box.\n"
@@ -1228,12 +1399,12 @@ msgstr ""
"Serveren støtter ikke X2Go MIME boks.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1432
+#: ../pyhoca/wxgui/frontend.py:1588
#, python-format
msgid "%s - client-side folders not sharable"
msgstr "%s - klient-side mapper er ikke mulig ÃĨ dele"
-#: ../pyhoca/wxgui/frontend.py:1432
+#: ../pyhoca/wxgui/frontend.py:1588
#, python-format
msgid ""
"The server denies client-side folder sharing with this session.\n"
@@ -1242,12 +1413,12 @@ msgstr ""
"Serveren nekter klient-side mapperdeling med denne sesjonen.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1444
+#: ../pyhoca/wxgui/frontend.py:1600
#, python-format
msgid "%s - client resources not sharable"
msgstr "%s - klient ressurser er ikke mulig ÃĨ dele"
-#: ../pyhoca/wxgui/frontend.py:1444
+#: ../pyhoca/wxgui/frontend.py:1600
#, python-format
msgid ""
"Client-side folders and printers cannot be shared with this session.\n"
@@ -1256,12 +1427,12 @@ msgstr ""
"Klient-side mapper og skrivere kan ikke bli delt med denne sesjonen.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1463 ../pyhoca/wxgui/frontend.py:1465
+#: ../pyhoca/wxgui/frontend.py:1619 ../pyhoca/wxgui/frontend.py:1621
#, python-format
msgid "%s - print error"
msgstr "%s - feil ved utskrift"
-#: ../pyhoca/wxgui/frontend.py:1463
+#: ../pyhoca/wxgui/frontend.py:1619
#, python-format
msgid ""
"%s\n"
@@ -1272,7 +1443,7 @@ msgstr ""
"...oppstod pÃĨ skriver %s fra sesjon\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1465
+#: ../pyhoca/wxgui/frontend.py:1621
#, python-format
msgid ""
"%s\n"
@@ -1283,12 +1454,12 @@ msgstr ""
"...oppstod fra sesjon\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1480 ../pyhoca/wxgui/frontend.py:1495
+#: ../pyhoca/wxgui/frontend.py:1636 ../pyhoca/wxgui/frontend.py:1651
#, python-format
msgid "%s - start"
msgstr "%s - start"
-#: ../pyhoca/wxgui/frontend.py:1480
+#: ../pyhoca/wxgui/frontend.py:1636
#, python-format
msgid ""
"New X2Go session starting up...\n"
@@ -1297,7 +1468,7 @@ msgstr ""
"Ny X2Go sesjon starter opp...\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1495
+#: ../pyhoca/wxgui/frontend.py:1651
#, python-format
msgid ""
"Another client started X2Go session\n"
@@ -1306,12 +1477,12 @@ msgstr ""
"En annen klient startet X2Go sesjon\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1510 ../pyhoca/wxgui/frontend.py:1525
+#: ../pyhoca/wxgui/frontend.py:1666 ../pyhoca/wxgui/frontend.py:1681
#, python-format
msgid "%s - resume"
msgstr "%s - gjenoppta"
-#: ../pyhoca/wxgui/frontend.py:1510
+#: ../pyhoca/wxgui/frontend.py:1666
#, python-format
msgid ""
"Resuming X2Go session...\n"
@@ -1320,7 +1491,7 @@ msgstr ""
"Gjenopptar X2Go sesjon...\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1525
+#: ../pyhoca/wxgui/frontend.py:1681
#, python-format
msgid ""
"Another client resumed X2Go session\n"
@@ -1329,12 +1500,12 @@ msgstr ""
"En annen klient gjenopptok X2Go sesjon\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1540
+#: ../pyhoca/wxgui/frontend.py:1696
#, python-format
msgid "%s - running"
msgstr "%s - aktiv"
-#: ../pyhoca/wxgui/frontend.py:1540
+#: ../pyhoca/wxgui/frontend.py:1696
#, python-format
msgid ""
"Found already running session\n"
@@ -1343,12 +1514,12 @@ msgstr ""
"Fant allerede kjørende sesjon\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1560
+#: ../pyhoca/wxgui/frontend.py:1716
#, python-format
msgid "%s - suspend"
msgstr "%s - koble fra"
-#: ../pyhoca/wxgui/frontend.py:1560
+#: ../pyhoca/wxgui/frontend.py:1716
#, python-format
msgid ""
"X2Go Session has been suspended\n"
@@ -1357,12 +1528,12 @@ msgstr ""
"X2Go sesjonen har blitt frakoblet\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1587
+#: ../pyhoca/wxgui/frontend.py:1743
#, python-format
msgid "%s - terminate"
msgstr "%s - avslutt"
-#: ../pyhoca/wxgui/frontend.py:1587
+#: ../pyhoca/wxgui/frontend.py:1743
#, python-format
msgid ""
"X2Go Session has terminated\n"
@@ -1371,7 +1542,7 @@ msgstr ""
"X2Go sesjonen har blitt avsluttet\n"
"%s"
-#: ../pyhoca/wxgui/messages.py:73
+#: ../pyhoca/wxgui/messages.py:72
#, python-format
msgid ""
"Are you really sure you want to\n"
@@ -1380,7 +1551,7 @@ msgstr ""
"Er du helt sikker pÃĨ at du ønser ÃĨ\n"
"slette valgt sesjonsprofil \"%s\"?"
-#: ../pyhoca/wxgui/messages.py:74
+#: ../pyhoca/wxgui/messages.py:73
#, python-format
msgid ""
"PyHoca-GUI is already running for user ,,%s''!\n"
@@ -1395,15 +1566,15 @@ msgstr ""
"bruker. PyHoca-GUI ikonet kan bli funnet i ditt\n"
"skrivebords systemkurv omrÃĨde."
-#: ../pyhoca/wxgui/messages.py:107
+#: ../pyhoca/wxgui/messages.py:106
msgid "Yes"
msgstr "Ja"
-#: ../pyhoca/wxgui/messages.py:108
+#: ../pyhoca/wxgui/messages.py:107
msgid "No"
msgstr "Nei"
-#: ../pyhoca/wxgui/messages.py:125 ../pyhoca/wxgui/printingprefs.py:142
+#: ../pyhoca/wxgui/messages.py:124 ../pyhoca/wxgui/printingprefs.py:142
msgid "Ok"
msgstr "Ok"
@@ -1469,10 +1640,6 @@ msgstr "Benytt denne skriveren"
msgid "Custom print command"
msgstr "Selvvalgt kommando for utskrift"
-#: ../pyhoca/wxgui/printingprefs.py:143
-msgid "Apply"
-msgstr "PÃĨfør"
-
#: ../pyhoca/wxgui/printingprefs.py:145
msgid "Print"
msgstr "Skriv ut"
@@ -1506,12 +1673,81 @@ msgstr "Endre sesjonstittelen til"
msgid "OK"
msgstr "OK"
+#: ../pyhoca/wxgui/serverinfo.py:76
+#, python-format
+msgid "Server Information - %s"
+msgstr "Serverinformasjon - %s"
+
+#: ../pyhoca/wxgui/serverinfo.py:78
+#, python-format
+msgid ""
+"Session Profile: %s\n"
+"\n"
+"List of X2Go Server components, add-ons and their versions..."
+msgstr ""
+"Sesjonsprofil: %s\n"
+"\n"
+"Liste over X2Go Server komponenter, tillegg og deres versjoner..."
+
+#: ../pyhoca/wxgui/serverinfo.py:83
+msgid "Refresh"
+msgstr "Oppfrisk"
+
+#: ../pyhoca/wxgui/serverinfo.py:84
+msgid "Close"
+msgstr "Lukk"
+
+#: ../pyhoca/wxgui/serverinfo.py:153
+msgid "X2Go Server"
+msgstr "X2Go Server"
+
+#: ../pyhoca/wxgui/serverinfo.py:154
+msgid "Server Core"
+msgstr "Server kjerne"
+
+#: ../pyhoca/wxgui/serverinfo.py:162
+msgid "Server Extensions"
+msgstr "Server utvidelser"
+
+#: ../pyhoca/wxgui/serverinfo.py:168
+msgid "X2Go Server Add-ons"
+msgstr "X2Go Server tillegg"
+
+#: ../pyhoca/wxgui/serverinfo.py:172
+msgid "X2Go Server Features"
+msgstr "X2Go Server Funksjoner"
+
+#~ msgid "Settings"
+#~ msgstr "Innstillinger"
+
#, fuzzy
-#~ msgid "Remember shared folders"
-#~ msgstr "Delte &mapper"
+#~ msgid "%s (%s)\n"
+#~ msgstr "%s (via %s)"
#, fuzzy
-#~ msgid "Shared Resources"
+#~ msgid "Connect to another Desktop Session"
+#~ msgstr "Start &ny sesjon"
+
+#~ msgid "Start/Resume Session"
+#~ msgstr "Start/gjenoppta sesjon"
+
+#~ msgid "SSH Proxy Tunnel"
+#~ msgstr "SSH mellomtjener tunnel"
+
+#~ msgid "The SSH proxy configuration is incomplete. Try again."
+#~ msgstr "SSH mellomtjener konfigurasjonen er ufullstendig. Forsøk igjen."
+
+#~ msgid ""
+#~ "Another session profile (%s) already uses [%s]:%s for binding a local SSH "
+#~ "proxy to.\n"
+#~ "Please change the SSH proxy settings accordingly."
+#~ msgstr ""
+#~ "En annen sesjonsprofil (%s) benytter allerede [%s]:%s for ÃĨ portbinde en "
+#~ "lokal SSH mellomtjener.\n"
+#~ "Vennligst endre SSH mellomtjener innstillingene tilsvarende."
+
+#, fuzzy
+#~ msgid "Remember shared folders"
#~ msgstr "Delte &mapper"
#~ msgid "RSA/DSA private key"
@@ -1536,9 +1772,6 @@ msgstr "OK"
#~ msgid "%s - connect error"
#~ msgstr "%s - tilkoblings feil"
-#~ msgid "new session profile"
-#~ msgstr "ny sesjonsprofil"
-
#, fuzzy
#~ msgid "Unknown Session Profile"
#~ msgstr "Ny sesjonsprofil"
diff --git a/po/nl.po b/po/nl.po
index af1e219..eee1336 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,5 +1,5 @@
# PyHoca-GUI / i18n.
-# Copyright (C) 2010-2012 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
# Dick Kniep <dick.kniep(a)lindix.nl>
# This file is distributed under the same license as the PyHoca-GUI package.
# Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>, 2011.
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: PyHoca-GUI VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 14:25+0100\n"
-"PO-Revision-Date: 2012-11-26 14:23+0100\n"
+"POT-Creation-Date: 2013-01-29 22:21+0100\n"
+"PO-Revision-Date: 2013-01-29 20:57+0100\n"
"Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n"
"Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n"
"Language: \n"
@@ -38,8 +38,8 @@ msgid "Authenticate"
msgstr "Aanmelden"
#: ../pyhoca/wxgui/logon.py:107
-msgid " Start SSH tunnel "
-msgstr " Start SSH Tunnel "
+msgid "Start SSH tunnel"
+msgstr "Start SSH Tunnel"
#: ../pyhoca/wxgui/logon.py:115
msgid "Session login"
@@ -49,23 +49,23 @@ msgstr "Sessie login"
msgid "SSH proxy server login"
msgstr "Login via SSH Proxy"
-#: ../pyhoca/wxgui/logon.py:127 ../pyhoca/wxgui/profilemanager.py:350
-#: ../pyhoca/wxgui/messages.py:131 ../pyhoca/wxgui/printingprefs.py:147
-#: ../pyhoca/wxgui/sessiontitle.py:85
+#: ../pyhoca/wxgui/logon.py:127 ../pyhoca/wxgui/profilemanager.py:373
+#: ../pyhoca/wxgui/listdesktops.py:99 ../pyhoca/wxgui/messages.py:130
+#: ../pyhoca/wxgui/printingprefs.py:147 ../pyhoca/wxgui/sessiontitle.py:85
msgid "Cancel"
msgstr "Afbreken"
#: ../pyhoca/wxgui/logon.py:297 ../pyhoca/wxgui/logon.py:339
-#: ../pyhoca/wxgui/frontend.py:606
+#: ../pyhoca/wxgui/frontend.py:612
#, python-format
msgid "%s - connect failure"
msgstr "%s - verbinden mislukt"
-#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:606
+#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:612
msgid "User is not allowed to start X2Go sessions!"
msgstr "Gebruiker mag geen X2Go sessie starten!"
-#: ../pyhoca/wxgui/logon.py:303 ../pyhoca/wxgui/frontend.py:613
+#: ../pyhoca/wxgui/logon.py:303 ../pyhoca/wxgui/frontend.py:619
#, python-format
msgid "%s - connect"
msgstr "%s - verbinden"
@@ -91,30 +91,30 @@ msgstr "%s - SSH Proxy"
msgid "Authentication to the SSH proxy server failed!"
msgstr "Authenticatie via SSH Proxy Server mislukt!"
-#: ../pyhoca/wxgui/logon.py:376 ../pyhoca/wxgui/frontend.py:664
+#: ../pyhoca/wxgui/logon.py:376 ../pyhoca/wxgui/frontend.py:670
#, python-format
msgid "%s - socket error"
msgstr "%s - socket fout"
-#: ../pyhoca/wxgui/logon.py:383 ../pyhoca/wxgui/frontend.py:643
-#: ../pyhoca/wxgui/frontend.py:650
+#: ../pyhoca/wxgui/logon.py:383 ../pyhoca/wxgui/frontend.py:649
+#: ../pyhoca/wxgui/frontend.py:656
#, python-format
msgid "%s - host key error"
msgstr "%s - server sleutel fout"
-#: ../pyhoca/wxgui/logon.py:384 ../pyhoca/wxgui/frontend.py:643
+#: ../pyhoca/wxgui/logon.py:384 ../pyhoca/wxgui/frontend.py:649
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:391 ../pyhoca/wxgui/frontend.py:685
+#: ../pyhoca/wxgui/logon.py:391 ../pyhoca/wxgui/frontend.py:691
#, python-format
msgid "%s - missing home directory"
msgstr "%s - home directory niet aanwezig"
-#: ../pyhoca/wxgui/logon.py:392 ../pyhoca/wxgui/frontend.py:685
+#: ../pyhoca/wxgui/logon.py:392 ../pyhoca/wxgui/frontend.py:691
msgid "The remote user's home directory does not exist."
msgstr "De home directory op afstand van de gebruiker bestaat niet"
@@ -123,12 +123,12 @@ msgstr "De home directory op afstand van de gebruiker bestaat niet"
msgid "%s - key error"
msgstr "%s - sleutel fout"
-#: ../pyhoca/wxgui/logon.py:407 ../pyhoca/wxgui/frontend.py:692
+#: ../pyhoca/wxgui/logon.py:407 ../pyhoca/wxgui/frontend.py:698
#, python-format
msgid "%s - auth error"
msgstr "%s - authenticatie fout"
-#: ../pyhoca/wxgui/logon.py:415 ../pyhoca/wxgui/frontend.py:636
+#: ../pyhoca/wxgui/logon.py:415 ../pyhoca/wxgui/frontend.py:642
#, python-format
msgid "%s - SSH error"
msgstr "%s - sleutel fout"
@@ -154,10 +154,10 @@ msgstr ""
#: ../pyhoca/wxgui/taskbar.py:93
#, python-format
msgid ""
-"PyHoca-GUI (Python X2goClient)\n"
+"PyHoca-GUI (Python X2Go Client)\n"
"Currently connecting you to remote X2Go server ,,%s''"
msgstr ""
-"PyHoca-GUI (Python X2goClient)\n"
+"PyHoca-GUI (Python X2Go Client)\n"
"Verbinding met X2Go server ,,%s'' wordt gemaakt"
#: ../pyhoca/wxgui/taskbar.py:103
@@ -168,10 +168,10 @@ msgstr "Bezig je te verbinden met X2Go ..."
#: ../pyhoca/wxgui/taskbar.py:107
msgid ""
-"PyHoca-GUI (Python X2goClient)\n"
+"PyHoca-GUI (Python X2Go Client)\n"
"Client for connecting you to a remote X2Go server"
msgstr ""
-"PyHoca-GUI (Python X2goClient)\n"
+"PyHoca-GUI (Python X2Go Client)\n"
"Verbinding met remote X2Go server aan het opbouwen"
#: ../pyhoca/wxgui/profilemanager.py:79
@@ -207,751 +207,806 @@ msgid "Single Application"
msgstr "Enkelvoudige Applicatie"
#: ../pyhoca/wxgui/profilemanager.py:87
+msgid "Share desktop session (SHADOW)"
+msgstr "Delen desktop sessie (SHADOW)"
+
+#: ../pyhoca/wxgui/profilemanager.py:88
msgid "XDMCP Query"
msgstr "XDMCP Query"
-#: ../pyhoca/wxgui/profilemanager.py:88
+#: ../pyhoca/wxgui/profilemanager.py:89
msgid "Windows Terminal Server (X2Go-proxied RDP)"
msgstr "Windows Terminalserver (via X2Go-proxy)"
-#: ../pyhoca/wxgui/profilemanager.py:89
+#: ../pyhoca/wxgui/profilemanager.py:90
msgid "Windows Terminal Server (Direct RDP)"
msgstr "Windows Terminalserver (via X2Go-proxy)"
-#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/profilemanager.py:224
+#: ../pyhoca/wxgui/profilemanager.py:91 ../pyhoca/wxgui/profilemanager.py:243
msgid "Custom command"
msgstr "Speciaal Commando"
-#: ../pyhoca/wxgui/profilemanager.py:95 ../pyhoca/wxgui/menus_taskbar.py:393
+#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:406
msgid "Internet Browser"
msgstr "Internetbrowser"
-#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:394
+#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:407
msgid "Email Client"
msgstr "E-Mail Programma"
-#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:395
+#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:408
msgid "Office"
msgstr "Office"
-#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:396
+#: ../pyhoca/wxgui/profilemanager.py:99 ../pyhoca/wxgui/menus_taskbar.py:409
msgid "Terminal"
msgstr "Terminal"
-#: ../pyhoca/wxgui/profilemanager.py:116
+#: ../pyhoca/wxgui/profilemanager.py:117
msgid "Open file with system's default application"
msgstr "Open bestand met het geassocieerde programma"
-#: ../pyhoca/wxgui/profilemanager.py:117
+#: ../pyhoca/wxgui/profilemanager.py:118
msgid "Open application chooser dialog"
msgstr "Open dialoog, om Applicatie te kiezen"
-#: ../pyhoca/wxgui/profilemanager.py:118
+#: ../pyhoca/wxgui/profilemanager.py:119
msgid "Save incoming file as ..."
msgstr "Opslaan bestand als ..."
-#: ../pyhoca/wxgui/profilemanager.py:146
+#: ../pyhoca/wxgui/profilemanager.py:147
msgid "settings derived from "
msgstr "configuratie afgeleid van"
#. boxes for all tabs
-#: ../pyhoca/wxgui/profilemanager.py:167
+#: ../pyhoca/wxgui/profilemanager.py:186
msgid "Session Title"
msgstr "Sessie naam"
-#: ../pyhoca/wxgui/profilemanager.py:168
+#: ../pyhoca/wxgui/profilemanager.py:187
msgid "Session Window"
msgstr "Sessie Window"
-#: ../pyhoca/wxgui/profilemanager.py:169
+#: ../pyhoca/wxgui/profilemanager.py:188
msgid "Session Startup"
msgstr "Sessie start"
-#: ../pyhoca/wxgui/profilemanager.py:170
+#: ../pyhoca/wxgui/profilemanager.py:189
msgid "Server"
msgstr "Server"
-#: ../pyhoca/wxgui/profilemanager.py:171
+#: ../pyhoca/wxgui/profilemanager.py:190
msgid "Proxy"
msgstr "Proxy"
-#: ../pyhoca/wxgui/profilemanager.py:172
+#: ../pyhoca/wxgui/profilemanager.py:191
msgid "Connection Link Speed"
msgstr "Verbindings snelheid"
-#: ../pyhoca/wxgui/profilemanager.py:173
+#: ../pyhoca/wxgui/profilemanager.py:192
msgid "Compression"
msgstr "Compressie"
-#: ../pyhoca/wxgui/profilemanager.py:174
+#: ../pyhoca/wxgui/profilemanager.py:193
msgid "Display"
msgstr "Display"
-#: ../pyhoca/wxgui/profilemanager.py:175
+#: ../pyhoca/wxgui/profilemanager.py:194
msgid "Keyboard"
msgstr "Toetsenbord"
-#: ../pyhoca/wxgui/profilemanager.py:176
+#: ../pyhoca/wxgui/profilemanager.py:195
msgid "Sound"
msgstr "Geluid"
-#: ../pyhoca/wxgui/profilemanager.py:177
+#: ../pyhoca/wxgui/profilemanager.py:196
msgid "Printing"
msgstr "Afdrukken"
-#: ../pyhoca/wxgui/profilemanager.py:178
+#: ../pyhoca/wxgui/profilemanager.py:197
msgid "Folder Exports"
msgstr "Map export"
-#: ../pyhoca/wxgui/profilemanager.py:179
+#: ../pyhoca/wxgui/profilemanager.py:198
msgid "File Import"
msgstr "Bestands import"
#. ##
#. ## widgets for the PROFILE tab
#. ##
-#: ../pyhoca/wxgui/profilemanager.py:184
+#: ../pyhoca/wxgui/profilemanager.py:203
msgid "Name"
msgstr "Naam"
-#: ../pyhoca/wxgui/profilemanager.py:191
+#: ../pyhoca/wxgui/profilemanager.py:210
msgid "Set session window title"
msgstr "Stel sessiescherm titel in"
-#: ../pyhoca/wxgui/profilemanager.py:192
+#: ../pyhoca/wxgui/profilemanager.py:211
msgid "Use a default session window title"
msgstr "Gebruik een standaard sessienaam"
-#: ../pyhoca/wxgui/profilemanager.py:193
+#: ../pyhoca/wxgui/profilemanager.py:212
msgid "Custom session window title"
msgstr "Aangepaste sessienaam"
-#: ../pyhoca/wxgui/profilemanager.py:212
+#: ../pyhoca/wxgui/profilemanager.py:231
msgid "Window Icon"
msgstr "Scherm icoon"
#. ##
#. ## widgets for the SESSION tab
#. ##
-#: ../pyhoca/wxgui/profilemanager.py:218
+#: ../pyhoca/wxgui/profilemanager.py:237
msgid "Start session automatically after login"
msgstr "Start sessie automatisch na login"
-#: ../pyhoca/wxgui/profilemanager.py:219
+#: ../pyhoca/wxgui/profilemanager.py:238
#, python-format
-msgid "Login automatically after %s has started"
-msgstr "Login automatisch nadat %s is gestart"
+msgid "Login automatically after %s has started (needs --auto-connect)"
+msgstr "Login automatisch nadat %s is gestart (heeft --auto-connect nodig)"
-#: ../pyhoca/wxgui/profilemanager.py:220
+#: ../pyhoca/wxgui/profilemanager.py:239
msgid "Type"
msgstr "Type"
-#: ../pyhoca/wxgui/profilemanager.py:222
+#: ../pyhoca/wxgui/profilemanager.py:241
msgid "Application"
msgstr "Applicatie"
-#: ../pyhoca/wxgui/profilemanager.py:226
+#: ../pyhoca/wxgui/profilemanager.py:245
msgid "XDMCP server"
msgstr "XDMCP Server"
-#: ../pyhoca/wxgui/profilemanager.py:228
+#: ../pyhoca/wxgui/profilemanager.py:247
msgid "RDP server"
msgstr "RDP Server"
-#: ../pyhoca/wxgui/profilemanager.py:230
+#: ../pyhoca/wxgui/profilemanager.py:249
msgid "RDP options"
msgstr "RDP Opties"
-#: ../pyhoca/wxgui/profilemanager.py:232
+#: ../pyhoca/wxgui/profilemanager.py:251
msgid "Integrate remote application(s) into local desktop (rootless mode)"
msgstr "Integreer remote toepassing in de lokale desktop (rootless mode)"
-#: ../pyhoca/wxgui/profilemanager.py:233
+#: ../pyhoca/wxgui/profilemanager.py:252
msgid "Menu of published applications"
msgstr "Menu met gepubliceerde applicaties"
#. ##
#. ## widgets for the CONNECTION tab
#. ##
-#: ../pyhoca/wxgui/profilemanager.py:240 ../pyhoca/wxgui/profilemanager.py:253
+#: ../pyhoca/wxgui/profilemanager.py:259 ../pyhoca/wxgui/profilemanager.py:273
msgid "User"
msgstr "Gebruiker"
-#: ../pyhoca/wxgui/profilemanager.py:242 ../pyhoca/wxgui/profilemanager.py:260
+#: ../pyhoca/wxgui/profilemanager.py:261 ../pyhoca/wxgui/profilemanager.py:280
msgid "Host"
msgstr "Host"
-#: ../pyhoca/wxgui/profilemanager.py:244 ../pyhoca/wxgui/profilemanager.py:262
+#: ../pyhoca/wxgui/profilemanager.py:263 ../pyhoca/wxgui/profilemanager.py:282
msgid "Port"
msgstr "Port"
-#: ../pyhoca/wxgui/profilemanager.py:246
+#: ../pyhoca/wxgui/profilemanager.py:265
msgid "Key"
msgstr "Sleutel"
-#: ../pyhoca/wxgui/profilemanager.py:249
+#: ../pyhoca/wxgui/profilemanager.py:268
msgid "Discover SSH keys or use SSH agent for X2Go authentication"
msgstr "Gebruik SSH agent voor authenticatie of zoek SSH sleutels"
-#: ../pyhoca/wxgui/profilemanager.py:251
+#: ../pyhoca/wxgui/profilemanager.py:270
msgid "Enable forwarding of SSH authentication agent connections"
msgstr "Gebruik SSH forwarding van SSH authenticatie agent"
-#: ../pyhoca/wxgui/profilemanager.py:252
+#: ../pyhoca/wxgui/profilemanager.py:271
+msgid "Store SSH host keys under (unique) X2Go session profile ID"
+msgstr "Sla SSH host keys op onder (uniek) X2Go sessie profiel"
+
+#: ../pyhoca/wxgui/profilemanager.py:272
msgid "Server behind SSH proxy"
msgstr "Server achter SSH-Proxy"
-#: ../pyhoca/wxgui/profilemanager.py:255
+#: ../pyhoca/wxgui/profilemanager.py:275
msgid "Use same username for X2Go and proxy host"
msgstr "Gebruik zelfde gebruikersnaam voor X2Go en de SSH Proxy"
-#: ../pyhoca/wxgui/profilemanager.py:256
+#: ../pyhoca/wxgui/profilemanager.py:276
msgid "Use same authentication for X2Go and proxy host"
msgstr "Gebruik dezelfde authenticatie voor X2Go en de SSH Proxy"
-#: ../pyhoca/wxgui/profilemanager.py:257
+#: ../pyhoca/wxgui/profilemanager.py:277
msgid "Key file"
msgstr "Sleutel"
-#: ../pyhoca/wxgui/profilemanager.py:264
-msgid "SSH Proxy Tunnel"
-msgstr "SSH Proxy Tunnel"
-
-#: ../pyhoca/wxgui/profilemanager.py:270
+#: ../pyhoca/wxgui/profilemanager.py:284
msgid "Discover SSH keys or use SSH agent for proxy authentication"
msgstr "Gebruik SSH agent voor proxy authenticatie of zoek SSH sleutels"
-#: ../pyhoca/wxgui/profilemanager.py:273
+#: ../pyhoca/wxgui/profilemanager.py:287
msgid "Modem"
msgstr "Modem"
-#: ../pyhoca/wxgui/profilemanager.py:274
+#: ../pyhoca/wxgui/profilemanager.py:288
msgid "ISDN"
msgstr "ISDN"
-#: ../pyhoca/wxgui/profilemanager.py:275
+#: ../pyhoca/wxgui/profilemanager.py:289
msgid "ADSL"
msgstr "ADSL"
-#: ../pyhoca/wxgui/profilemanager.py:276
+#: ../pyhoca/wxgui/profilemanager.py:290
msgid "WAN"
msgstr "WAN"
-#: ../pyhoca/wxgui/profilemanager.py:277
+#: ../pyhoca/wxgui/profilemanager.py:291
msgid "LAN"
msgstr "LAN"
-#: ../pyhoca/wxgui/profilemanager.py:279
+#: ../pyhoca/wxgui/profilemanager.py:293
msgid "Method"
msgstr "Methode"
-#: ../pyhoca/wxgui/profilemanager.py:281
+#: ../pyhoca/wxgui/profilemanager.py:295
msgid "Image quality"
msgstr "Beeldkwaliteit"
#. ##
-#. ## wigdets for the SETTINGS tab
+#. ## wigdets for the IO tab
#. ##
-#: ../pyhoca/wxgui/profilemanager.py:287
+#: ../pyhoca/wxgui/profilemanager.py:301
msgid "Fullscreen"
msgstr "Fullscreen"
-#: ../pyhoca/wxgui/profilemanager.py:288
+#: ../pyhoca/wxgui/profilemanager.py:302
msgid "Maximized"
msgstr "Maximaliseered"
-#: ../pyhoca/wxgui/profilemanager.py:289
+#: ../pyhoca/wxgui/profilemanager.py:303
msgid "Custom Size"
msgstr "Grootte instellen"
-#: ../pyhoca/wxgui/profilemanager.py:294
+#: ../pyhoca/wxgui/profilemanager.py:308
msgid "Set display DPI"
msgstr "DPI-waarde instellen"
-#: ../pyhoca/wxgui/profilemanager.py:296
+#: ../pyhoca/wxgui/profilemanager.py:310
msgid "Do not set (use server-side tools to configure the keyboard)"
msgstr "Uitzetten (gebruik server-side tools om het toetsenbord in te stellen)"
-#: ../pyhoca/wxgui/profilemanager.py:297
+#: ../pyhoca/wxgui/profilemanager.py:311
msgid ""
"Automatically detect and use client-side keyboard configuration inside the "
"session"
msgstr "Gebruik automatisch gedetecteerd toetsenbord in de sessie"
-#: ../pyhoca/wxgui/profilemanager.py:298
+#: ../pyhoca/wxgui/profilemanager.py:312
msgid "Use custom keyboard settings as provided below"
msgstr "Gebruik de onderstaande speciale toetsenbord instellingen"
-#: ../pyhoca/wxgui/profilemanager.py:299
+#: ../pyhoca/wxgui/profilemanager.py:313
msgid "Keyboard model"
msgstr "Toetsenbord model"
-#: ../pyhoca/wxgui/profilemanager.py:301
+#: ../pyhoca/wxgui/profilemanager.py:315
msgid "Layout"
msgstr "Layout"
-#: ../pyhoca/wxgui/profilemanager.py:303
+#: ../pyhoca/wxgui/profilemanager.py:317
msgid "Layout variant"
msgstr "Layout variant"
-#: ../pyhoca/wxgui/profilemanager.py:305
+#. ##
+#. ## wigdets for the MEDIA tab
+#. ##
+#: ../pyhoca/wxgui/profilemanager.py:323
msgid "Enable sound support"
msgstr "Geluid gebruiken"
-#: ../pyhoca/wxgui/profilemanager.py:306
+#: ../pyhoca/wxgui/profilemanager.py:324
msgid "Pulse Audio"
msgstr "Pulse Audio"
#. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated.
#. However, config files can contain an Arts configuration, so we will honour this
-#: ../pyhoca/wxgui/profilemanager.py:310
+#: ../pyhoca/wxgui/profilemanager.py:328
msgid "Arts (not supported)"
msgstr "Arts (niet ondersteund)"
-#: ../pyhoca/wxgui/profilemanager.py:313
+#: ../pyhoca/wxgui/profilemanager.py:331
msgid "esd"
msgstr "esd"
-#: ../pyhoca/wxgui/profilemanager.py:314
+#: ../pyhoca/wxgui/profilemanager.py:332
msgid "Use default sound port"
msgstr "Standaard Audio-Port gebruiken"
-#: ../pyhoca/wxgui/profilemanager.py:315
+#: ../pyhoca/wxgui/profilemanager.py:333
msgid "Custom sound port"
msgstr "Speciale Audio-Port"
-#: ../pyhoca/wxgui/profilemanager.py:318
+#: ../pyhoca/wxgui/profilemanager.py:336
+msgid "Client Side printing"
+msgstr "Afdrukken via deze computer"
+
+#. ##
+#. ## wigdets for the SHARING tab
+#. ##
+#: ../pyhoca/wxgui/profilemanager.py:342
msgid "Use local folder sharing"
msgstr "Delen van lokale mappen"
-#: ../pyhoca/wxgui/profilemanager.py:319
-#, fuzzy
+#: ../pyhoca/wxgui/profilemanager.py:343
msgid "Store share list at end of session"
-msgstr ""
-"Een andere X2Go-client heeft deze sessie gestart\n"
-"%s"
+msgstr "Sla de lijst met te delen informatie wanneer de sessie eindigt"
-#: ../pyhoca/wxgui/profilemanager.py:320
+#: ../pyhoca/wxgui/profilemanager.py:344
msgid "Path"
msgstr "Pad"
-#: ../pyhoca/wxgui/profilemanager.py:323 ../pyhoca/wxgui/profilemanager.py:344
+#: ../pyhoca/wxgui/profilemanager.py:347 ../pyhoca/wxgui/profilemanager.py:366
msgid "Add"
msgstr "Toevoegen"
-#: ../pyhoca/wxgui/profilemanager.py:325
+#: ../pyhoca/wxgui/profilemanager.py:349
msgid "Local Path"
msgstr "Lokaal Pad"
-#: ../pyhoca/wxgui/profilemanager.py:326
+#: ../pyhoca/wxgui/profilemanager.py:350
msgid "Connect Method"
msgstr "Verbindingsmethode"
-#: ../pyhoca/wxgui/profilemanager.py:327
+#: ../pyhoca/wxgui/profilemanager.py:351
msgid "Delete"
msgstr "Verwijderen"
-#: ../pyhoca/wxgui/profilemanager.py:329
+#: ../pyhoca/wxgui/profilemanager.py:353
msgid "Convert between client and server encodings"
msgstr "Encoding tussen client en server vertalen"
-#: ../pyhoca/wxgui/profilemanager.py:330
+#: ../pyhoca/wxgui/profilemanager.py:354
msgid "Client encoding"
msgstr "Client encoding"
-#: ../pyhoca/wxgui/profilemanager.py:332
+#: ../pyhoca/wxgui/profilemanager.py:356
msgid "Server encoding"
msgstr "Server encoding"
-#: ../pyhoca/wxgui/profilemanager.py:335
+#: ../pyhoca/wxgui/profilemanager.py:359
msgid "Use file MIME box for local file import"
msgstr "Importeren lokale bestanden via MIME box"
-#: ../pyhoca/wxgui/profilemanager.py:336
+#: ../pyhoca/wxgui/profilemanager.py:360
msgid "Extensions"
msgstr "Uitbreidingen"
-#: ../pyhoca/wxgui/profilemanager.py:338
+#: ../pyhoca/wxgui/profilemanager.py:362
msgid "Action"
msgstr "Actie"
-#: ../pyhoca/wxgui/profilemanager.py:341
-msgid "Client Side printing"
-msgstr "Afdrukken via deze computer"
-
-#: ../pyhoca/wxgui/profilemanager.py:345
+#: ../pyhoca/wxgui/profilemanager.py:367
msgid "Defaults"
msgstr "Standaardwaarden"
-#: ../pyhoca/wxgui/profilemanager.py:347
+#: ../pyhoca/wxgui/profilemanager.py:369
msgid "Save"
msgstr "Opslaan"
-#: ../pyhoca/wxgui/profilemanager.py:348
+#: ../pyhoca/wxgui/profilemanager.py:370
msgid "Reset"
msgstr "Reset"
-#: ../pyhoca/wxgui/profilemanager.py:401
-#: ../pyhoca/wxgui/profilemanager.py:1124
-#: ../pyhoca/wxgui/profilemanager.py:2268
+#: ../pyhoca/wxgui/profilemanager.py:372 ../pyhoca/wxgui/printingprefs.py:143
+msgid "Apply"
+msgstr "Toepassen"
+
+#: ../pyhoca/wxgui/profilemanager.py:423
+#: ../pyhoca/wxgui/profilemanager.py:1135
+#: ../pyhoca/wxgui/profilemanager.py:2303
msgid "automatically"
msgstr "automatisch"
-#: ../pyhoca/wxgui/profilemanager.py:403
-#: ../pyhoca/wxgui/profilemanager.py:1126
+#: ../pyhoca/wxgui/profilemanager.py:425
+#: ../pyhoca/wxgui/profilemanager.py:1137
msgid "manually"
msgstr "handmatig"
-#: ../pyhoca/wxgui/profilemanager.py:412
+#: ../pyhoca/wxgui/profilemanager.py:434
msgid "PyHoca-GUI Profile Manager - new profile"
msgstr "PyHoca-GUI Profiel manager - nieuw profiel"
-#: ../pyhoca/wxgui/profilemanager.py:414
+#: ../pyhoca/wxgui/profilemanager.py:436
#, python-format
msgid "PyHoca-GUI Profile Manager - %s (connected)"
msgstr "PyHoca-GUI Profiel manager - %s (verbonden)"
-#: ../pyhoca/wxgui/profilemanager.py:416
+#: ../pyhoca/wxgui/profilemanager.py:438
#, python-format
msgid "PyHoca-GUI Profile Manager - %s"
msgstr "PyHoca-GUI Profiel manager - %s"
-#: ../pyhoca/wxgui/profilemanager.py:797
+#: ../pyhoca/wxgui/profilemanager.py:804
msgid "Profile"
msgstr "Profiel"
-#: ../pyhoca/wxgui/profilemanager.py:798
+#: ../pyhoca/wxgui/profilemanager.py:805
msgid "Session"
msgstr "Sessie"
-#: ../pyhoca/wxgui/profilemanager.py:799
+#: ../pyhoca/wxgui/profilemanager.py:806
msgid "Connection"
msgstr "Verbinding"
-#: ../pyhoca/wxgui/profilemanager.py:800
+#: ../pyhoca/wxgui/profilemanager.py:807
msgid "Link Quality"
msgstr "Verbindingskwaliteit"
-#: ../pyhoca/wxgui/profilemanager.py:801
-msgid "Settings"
-msgstr "Instellingen"
+#: ../pyhoca/wxgui/profilemanager.py:808
+msgid "Input/Output"
+msgstr "Input/Output"
+
+#: ../pyhoca/wxgui/profilemanager.py:809
+msgid "Media"
+msgstr "Multimedia"
-#: ../pyhoca/wxgui/profilemanager.py:802
+#: ../pyhoca/wxgui/profilemanager.py:810
msgid "Sharing"
msgstr "Delen"
-#: ../pyhoca/wxgui/profilemanager.py:988
+#: ../pyhoca/wxgui/profilemanager.py:989
msgid "<xkbtype>"
msgstr "pc105/us"
-#: ../pyhoca/wxgui/profilemanager.py:989
+#: ../pyhoca/wxgui/profilemanager.py:990
msgid "<xkblayout>"
msgstr "us"
-#: ../pyhoca/wxgui/profilemanager.py:990
+#: ../pyhoca/wxgui/profilemanager.py:991
msgid "<xkbvariant>"
msgstr "intl"
-#: ../pyhoca/wxgui/profilemanager.py:1444
+#: ../pyhoca/wxgui/profilemanager.py:1449
msgid "Icon Files (*.png)|*.png|All files (*.*)|*"
msgstr "Icon Bestanden (*.png)|*.png|Alle Bestanden (*.*)|*"
-#: ../pyhoca/wxgui/profilemanager.py:1447
+#: ../pyhoca/wxgui/profilemanager.py:1452
msgid "Choose an icon for this session profile"
msgstr "Icon voor dit Profiel kiezen"
-#: ../pyhoca/wxgui/profilemanager.py:1816
+#: ../pyhoca/wxgui/profilemanager.py:1895
msgid "All files (*.*)|*"
msgstr "Alle Bestanden (*.*)|*"
-#: ../pyhoca/wxgui/profilemanager.py:1818
-#: ../pyhoca/wxgui/profilemanager.py:1842
+#: ../pyhoca/wxgui/profilemanager.py:1897
+#: ../pyhoca/wxgui/profilemanager.py:1921
msgid "Choose a public SSH key"
msgstr "Kies een public SSH-key"
-#: ../pyhoca/wxgui/profilemanager.py:2220
+#: ../pyhoca/wxgui/profilemanager.py:2255
msgid "Choose a folder to share within a session"
msgstr "Kies een map om te delen"
-#: ../pyhoca/wxgui/profilemanager.py:2348
-#: ../pyhoca/wxgui/profilemanager.py:2351
-#: ../pyhoca/wxgui/profilemanager.py:2354
-#: ../pyhoca/wxgui/profilemanager.py:2359
-#: ../pyhoca/wxgui/profilemanager.py:2369 ../pyhoca/wxgui/menus_taskbar.py:117
+#: ../pyhoca/wxgui/profilemanager.py:2383
+#: ../pyhoca/wxgui/profilemanager.py:2386
+#: ../pyhoca/wxgui/profilemanager.py:2389 ../pyhoca/wxgui/menus_taskbar.py:122
msgid "Profile Manager"
msgstr "Profiel manager"
-#: ../pyhoca/wxgui/profilemanager.py:2348
+#: ../pyhoca/wxgui/profilemanager.py:2383
msgid "Profile name is missing, profile unusable!!!"
msgstr "Profiel naam ontbreekt, kan niet gebruikt worden!!!"
-#: ../pyhoca/wxgui/profilemanager.py:2351
-#: ../pyhoca/wxgui/profilemanager.py:2354
+#: ../pyhoca/wxgui/profilemanager.py:2386
+#: ../pyhoca/wxgui/profilemanager.py:2389
#, python-format
msgid "Profile name %s already exists!!!"
msgstr "Profiel %s bestaat al"
-#: ../pyhoca/wxgui/profilemanager.py:2359
-msgid "The SSH proxy configuration is incomplete. Try again."
-msgstr "SSH Proxy Configuratie is niet volledig! Opnieuw proberen..."
-
-#: ../pyhoca/wxgui/profilemanager.py:2369
-#, python-format
-msgid ""
-"Another session profile (%s) already uses [%s]:%s for binding a local SSH "
-"proxy to.\n"
-"Please change the SSH proxy settings accordingly."
-msgstr ""
-"Een ander profiel (%s) gebruikt [%s]:%s voor de verbinding met een lokale "
-"SSH proxy.\n"
-"Verander de SSH proxy instelling om dit probleem te verhelpen."
-
-#: ../pyhoca/wxgui/profilemanager.py:2396
+#: ../pyhoca/wxgui/profilemanager.py:2416
#, python-format
msgid "%s - profile added"
msgstr "%s - Profiel toegevoegd"
-#: ../pyhoca/wxgui/profilemanager.py:2397
+#: ../pyhoca/wxgui/profilemanager.py:2417
msgid "A new session profile has been added."
msgstr "Een nieuw Profiel is toegevoegd"
-#: ../pyhoca/wxgui/profilemanager.py:2401
+#: ../pyhoca/wxgui/profilemanager.py:2421
#, python-format
msgid "%s - modified"
msgstr "%s - gewijzigd"
-#: ../pyhoca/wxgui/profilemanager.py:2402
+#: ../pyhoca/wxgui/profilemanager.py:2422
msgid "Changes to profile have been saved."
msgstr "Wijzigingen in het profiel zijn opgeslagen."
-#: ../pyhoca/wxgui/menus_taskbar.py:74
+#: ../pyhoca/wxgui/listdesktops.py:82
+#, python-format
+msgid "Share Desktop Session - %s"
+msgstr "Delen desktop sessie - %s"
+
+#: ../pyhoca/wxgui/listdesktops.py:84
+msgid "Select one of the available desktop sessions on this server"
+msgstr "Kies ÊÊn van de beschikbare desktop sessies op deze server"
+
+#: ../pyhoca/wxgui/listdesktops.py:90
+msgid "View session only"
+msgstr "Alleen sessie bekijken"
+
+#: ../pyhoca/wxgui/listdesktops.py:91
+msgid "Gain full access"
+msgstr "Volledige toegang"
+
+#: ../pyhoca/wxgui/listdesktops.py:95
+msgid "Share Desktop"
+msgstr "Delen desktop"
+
+#: ../pyhoca/wxgui/listdesktops.py:98
+msgid "Refresh list"
+msgstr "Ververs lijst"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:76
msgid "Edit Profile"
msgstr "Profiel bijwerken"
-#: ../pyhoca/wxgui/menus_taskbar.py:77
+#: ../pyhoca/wxgui/menus_taskbar.py:79
msgid "Use as Template for New Profile"
msgstr "Gebruik als sjabloon voor een nieuw profiel"
-#: ../pyhoca/wxgui/menus_taskbar.py:78
+#: ../pyhoca/wxgui/menus_taskbar.py:81
+msgid "Export Profile"
+msgstr "Export profiel"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:82
msgid "Delete Profile"
msgstr "Profiel verwijderen"
-#: ../pyhoca/wxgui/menus_taskbar.py:106
+#: ../pyhoca/wxgui/menus_taskbar.py:111
#, python-format
msgid "About %s (%s)..."
msgstr "About %s (%s) ..."
-#: ../pyhoca/wxgui/menus_taskbar.py:132
+#: ../pyhoca/wxgui/menus_taskbar.py:137
msgid "Manage Session Profile"
msgstr "Onderhoud sessieprofiel"
-#: ../pyhoca/wxgui/menus_taskbar.py:141
+#: ../pyhoca/wxgui/menus_taskbar.py:146
msgid "Printing Preferences"
msgstr "Voorkeur voor afdrukken"
-#: ../pyhoca/wxgui/menus_taskbar.py:147
+#: ../pyhoca/wxgui/menus_taskbar.py:152
msgid "Client Options"
msgstr "Opties"
-#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:783
-#: ../pyhoca/wxgui/menus_taskbar.py:975
+#: ../pyhoca/wxgui/menus_taskbar.py:160 ../pyhoca/wxgui/menus_taskbar.py:828
+#: ../pyhoca/wxgui/menus_taskbar.py:1033
msgid "E&xit"
msgstr "&Beeindigen"
-#: ../pyhoca/wxgui/menus_taskbar.py:227
+#: ../pyhoca/wxgui/menus_taskbar.py:232
msgid "Window title"
msgstr "Scherm titel"
-#: ../pyhoca/wxgui/menus_taskbar.py:233 ../pyhoca/wxgui/menus_taskbar.py:608
+#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:631
msgid "Resume Session"
msgstr "Sessie hervatten"
-#: ../pyhoca/wxgui/menus_taskbar.py:235
+#: ../pyhoca/wxgui/menus_taskbar.py:240
msgid "Resume Session (not possible)"
msgstr "Sessie hervatten (niet mogelijk)"
-#: ../pyhoca/wxgui/menus_taskbar.py:246
+#: ../pyhoca/wxgui/menus_taskbar.py:251
msgid "Transfer Session"
msgstr "Sessie overnemen"
-#: ../pyhoca/wxgui/menus_taskbar.py:248
+#: ../pyhoca/wxgui/menus_taskbar.py:253
msgid "Transfer Session (not possible)"
msgstr "Sessie overnemen (niet mogelijk)"
-#: ../pyhoca/wxgui/menus_taskbar.py:252 ../pyhoca/wxgui/menus_taskbar.py:599
+#: ../pyhoca/wxgui/menus_taskbar.py:258 ../pyhoca/wxgui/menus_taskbar.py:622
msgid "Suspend Session (and disconnect/exit)"
msgstr "Suspend Sessie (en Verbinding verbreken / e&xit)"
-#: ../pyhoca/wxgui/menus_taskbar.py:254 ../pyhoca/wxgui/menus_taskbar.py:601
+#: ../pyhoca/wxgui/menus_taskbar.py:260 ../pyhoca/wxgui/menus_taskbar.py:624
msgid "Suspend Session (and disconnect)"
msgstr "Suspend Sessie (en Verbinding verbreken)"
-#: ../pyhoca/wxgui/menus_taskbar.py:256 ../pyhoca/wxgui/menus_taskbar.py:603
+#: ../pyhoca/wxgui/menus_taskbar.py:262 ../pyhoca/wxgui/menus_taskbar.py:626
msgid "Suspend Session"
msgstr "Suspend Sessie"
-#: ../pyhoca/wxgui/menus_taskbar.py:262 ../pyhoca/wxgui/menus_taskbar.py:612
+#: ../pyhoca/wxgui/menus_taskbar.py:268 ../pyhoca/wxgui/menus_taskbar.py:635
msgid "Terminate Session (and disconnect/exit)"
msgstr "Sessie beÃĢindigen (en Verbinding verbreken / e&xit)"
-#: ../pyhoca/wxgui/menus_taskbar.py:264 ../pyhoca/wxgui/menus_taskbar.py:614
+#: ../pyhoca/wxgui/menus_taskbar.py:270 ../pyhoca/wxgui/menus_taskbar.py:637
msgid "Terminate Session (and disconnect)"
msgstr "Sessie beÃĢindigen (en Verbinding verbreken)"
-#: ../pyhoca/wxgui/menus_taskbar.py:266 ../pyhoca/wxgui/menus_taskbar.py:616
+#: ../pyhoca/wxgui/menus_taskbar.py:272 ../pyhoca/wxgui/menus_taskbar.py:639
msgid "Terminate Session"
msgstr "Sessie beÃĢindigen"
-#: ../pyhoca/wxgui/menus_taskbar.py:270 ../pyhoca/wxgui/menus_taskbar.py:596
+#: ../pyhoca/wxgui/menus_taskbar.py:275
+msgid "End Desktop Sharing (and disconnect/exit)"
+msgstr "BeÃĢindig delen van de desktop (en verbreek verbinding/afsluiten)"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:277
+msgid "End Desktop Sharing (and disconnect)"
+msgstr "BeÃĢindig delen van de desktop (en verbreek verbinding)"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:279
+msgid "End Desktop Sharing"
+msgstr "BeÃĢindig delen van de desktop"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:283 ../pyhoca/wxgui/menus_taskbar.py:619
msgid "Refresh menu tree"
msgstr "Ververs menu"
-#: ../pyhoca/wxgui/menus_taskbar.py:279
+#: ../pyhoca/wxgui/menus_taskbar.py:292
msgid "Rename Session Window"
msgstr "Hernoem sessie"
-#: ../pyhoca/wxgui/menus_taskbar.py:280
+#: ../pyhoca/wxgui/menus_taskbar.py:293
msgid "Show Session Window"
msgstr "Toon sessiescherm"
-#: ../pyhoca/wxgui/menus_taskbar.py:322
+#: ../pyhoca/wxgui/menus_taskbar.py:335
msgid "&Share custom local folder"
msgstr "Delen lokale &map"
-#: ../pyhoca/wxgui/menus_taskbar.py:337
+#: ../pyhoca/wxgui/menus_taskbar.py:350
msgid "Share:"
msgstr "Delen:"
-#: ../pyhoca/wxgui/menus_taskbar.py:346
+#: ../pyhoca/wxgui/menus_taskbar.py:359
msgid "Unshare:"
msgstr "Niet meer delen"
-#: ../pyhoca/wxgui/menus_taskbar.py:354
+#: ../pyhoca/wxgui/menus_taskbar.py:367
msgid "Unshare &all local folders"
msgstr "Niet langer delen alle lokale &mappen"
-#: ../pyhoca/wxgui/menus_taskbar.py:360
+#: ../pyhoca/wxgui/menus_taskbar.py:373
msgid "Restore shares in next session"
-msgstr ""
+msgstr "Herstel gedeelde mappen in de volgende sessie"
-#: ../pyhoca/wxgui/menus_taskbar.py:440
+#: ../pyhoca/wxgui/menus_taskbar.py:453
msgid "Multimedia"
msgstr "Multimedia"
-#: ../pyhoca/wxgui/menus_taskbar.py:441
+#: ../pyhoca/wxgui/menus_taskbar.py:454
msgid "Development"
msgstr "Ontwikkeling"
-#: ../pyhoca/wxgui/menus_taskbar.py:442
+#: ../pyhoca/wxgui/menus_taskbar.py:455
msgid "Education"
msgstr "Opleiding"
-#: ../pyhoca/wxgui/menus_taskbar.py:443
+#: ../pyhoca/wxgui/menus_taskbar.py:456
msgid "Games"
msgstr "Spelletjes"
-#: ../pyhoca/wxgui/menus_taskbar.py:444
+#: ../pyhoca/wxgui/menus_taskbar.py:457
msgid "Graphics"
msgstr "Graphics"
-#: ../pyhoca/wxgui/menus_taskbar.py:445
+#: ../pyhoca/wxgui/menus_taskbar.py:458
msgid "Internet"
msgstr "Internet"
-#: ../pyhoca/wxgui/menus_taskbar.py:446
+#: ../pyhoca/wxgui/menus_taskbar.py:459
msgid "Office Applications"
msgstr "Kantoor applicaties"
-#: ../pyhoca/wxgui/menus_taskbar.py:447
+#: ../pyhoca/wxgui/menus_taskbar.py:460
msgid "System"
msgstr "Systeem"
-#: ../pyhoca/wxgui/menus_taskbar.py:448
+#: ../pyhoca/wxgui/menus_taskbar.py:461
msgid "Utilities"
msgstr "Hulpmiddelen"
-#: ../pyhoca/wxgui/menus_taskbar.py:449
+#: ../pyhoca/wxgui/menus_taskbar.py:462
msgid "Other Applications"
msgstr "Andere applicaties"
-#: ../pyhoca/wxgui/menus_taskbar.py:521 ../pyhoca/wxgui/menus_taskbar.py:533
+#: ../pyhoca/wxgui/menus_taskbar.py:535 ../pyhoca/wxgui/menus_taskbar.py:547
#, python-format
msgid "Connect %s"
msgstr "Verbind %s"
-#: ../pyhoca/wxgui/menus_taskbar.py:527
+#: ../pyhoca/wxgui/menus_taskbar.py:541
msgid "Currently connecting..."
msgstr "Nu aan het verbinden..."
-#: ../pyhoca/wxgui/menus_taskbar.py:541
+#: ../pyhoca/wxgui/menus_taskbar.py:556
msgid "Start &new Desktop Session"
msgstr "&Nieuwe Desktop Sessie starten"
-#: ../pyhoca/wxgui/menus_taskbar.py:546 ../pyhoca/wxgui/menus_taskbar.py:684
+#: ../pyhoca/wxgui/menus_taskbar.py:560 ../pyhoca/wxgui/menus_taskbar.py:660
+msgid "Start Desktop Sharing Session"
+msgstr "Start delen van de desktop"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:566 ../pyhoca/wxgui/menus_taskbar.py:710
msgid "Retrieving Application Menu..."
msgstr "Bezig met ophalen applicatiemenu..."
-#: ../pyhoca/wxgui/menus_taskbar.py:550 ../pyhoca/wxgui/menus_taskbar.py:687
+#: ../pyhoca/wxgui/menus_taskbar.py:570 ../pyhoca/wxgui/menus_taskbar.py:713
msgid "Retrieve Application Menu"
msgstr "Haal applicatiemenu op"
-#: ../pyhoca/wxgui/menus_taskbar.py:553
+#: ../pyhoca/wxgui/menus_taskbar.py:573
+msgid "Start &new RDP Session"
+msgstr "&Nieuwe RDP Sessie starten"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:576
msgid "Start &new Session"
msgstr "&Nieuwe Sessie starten"
-#: ../pyhoca/wxgui/menus_taskbar.py:633
+#: ../pyhoca/wxgui/menus_taskbar.py:656
msgid "Launch Single Application"
msgstr "Enkelvoudige Applicatie starten"
-#: ../pyhoca/wxgui/menus_taskbar.py:671
+#: ../pyhoca/wxgui/menus_taskbar.py:697
msgid "Manage Application Menu"
msgstr "Onderhoud applicatie menu"
-#: ../pyhoca/wxgui/menus_taskbar.py:714
+#: ../pyhoca/wxgui/menus_taskbar.py:752
msgid "Running"
msgstr "Aktief"
-#: ../pyhoca/wxgui/menus_taskbar.py:716
+#: ../pyhoca/wxgui/menus_taskbar.py:754
msgid "Suspended"
msgstr "Suspended"
-#: ../pyhoca/wxgui/menus_taskbar.py:735
+#: ../pyhoca/wxgui/menus_taskbar.py:773
msgid "&Clean all sessions"
msgstr "Alle Sessies beÃĢindigen"
-#: ../pyhoca/wxgui/menus_taskbar.py:741
+#: ../pyhoca/wxgui/menus_taskbar.py:779
msgid "Customize &profile"
msgstr "Sessieprofiel wijzigen"
-#: ../pyhoca/wxgui/menus_taskbar.py:756
+#: ../pyhoca/wxgui/menus_taskbar.py:794
msgid "Shared &folders"
msgstr "Delen &mappen"
-#: ../pyhoca/wxgui/menus_taskbar.py:768
+#: ../pyhoca/wxgui/menus_taskbar.py:806
+msgid "Server Information"
+msgstr "Server informatie"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:813
msgid "&Disconnect from Server"
msgstr "&Verbinding verbreken"
-#: ../pyhoca/wxgui/menus_taskbar.py:775
+#: ../pyhoca/wxgui/menus_taskbar.py:820
msgid "Suspend Session and E&xit application"
msgstr "Suspend Sessie en e&xit"
-#: ../pyhoca/wxgui/menus_taskbar.py:779
+#: ../pyhoca/wxgui/menus_taskbar.py:824
msgid "Disconnect and E&xit application"
msgstr "verbinding verbreken en e&xit"
-#: ../pyhoca/wxgui/menus_taskbar.py:833
+#: ../pyhoca/wxgui/menus_taskbar.py:878
msgid "Add Profile"
msgstr "Profiel toevoegen"
-#: ../pyhoca/wxgui/menus_taskbar.py:909
+#: ../pyhoca/wxgui/menus_taskbar.py:954
msgid "No session profiles defined"
msgstr "Geen Profiel gedefinieerd"
-#: ../pyhoca/wxgui/menus_taskbar.py:945
-msgid "Start/Resume Session"
-msgstr "Sessie starten/hervatten"
+#: ../pyhoca/wxgui/menus_taskbar.py:965
+msgid "Export all Profiles"
+msgstr "Export alle profielen"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:967
+msgid "Export Profile Group"
+msgstr "Export profielgroep"
-#: ../pyhoca/wxgui/menus_taskbar.py:945
+#: ../pyhoca/wxgui/menus_taskbar.py:1003
msgid "Connect Server"
msgstr "Verbinden met Server"
@@ -960,63 +1015,63 @@ msgstr "Verbinden met Server"
msgid "About %s ..."
msgstr "About %s ..."
-#: ../pyhoca/wxgui/frontend.py:459
+#: ../pyhoca/wxgui/frontend.py:465
msgid "Suspending sessions and exiting application..."
msgstr "Bezig met suspend van sessie en afsluiten van applicatie"
-#: ../pyhoca/wxgui/frontend.py:462
+#: ../pyhoca/wxgui/frontend.py:468
#, python-format
msgid "Disconnecting %s and exiting application..."
msgstr "Bezig met verbreken verbinding %s en afsluiten applicatie..."
-#: ../pyhoca/wxgui/frontend.py:464
+#: ../pyhoca/wxgui/frontend.py:470
msgid "Exiting application..."
msgstr "Afsluiten van applicatie..."
-#: ../pyhoca/wxgui/frontend.py:562
+#: ../pyhoca/wxgui/frontend.py:568
#, python-format
msgid "%s - server warning"
msgstr "%s - server waarschuwing"
-#: ../pyhoca/wxgui/frontend.py:562
+#: ../pyhoca/wxgui/frontend.py:568
msgid "The X2Go Server does not publish an application menu."
-msgstr "De X2go server publiceert geen applicatie menu"
+msgstr "De X2Go server publiceert geen applicatie menu"
-#: ../pyhoca/wxgui/frontend.py:613
+#: ../pyhoca/wxgui/frontend.py:619
msgid "SSH key authentication has been successful."
msgstr "SSH-key authenticatie is gelukt."
-#: ../pyhoca/wxgui/frontend.py:650
+#: ../pyhoca/wxgui/frontend.py:656
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:671
+#: ../pyhoca/wxgui/frontend.py:677
#, python-format
msgid "%s - EOF error"
msgstr "%s - EOF fout"
-#: ../pyhoca/wxgui/frontend.py:671
+#: ../pyhoca/wxgui/frontend.py:677
msgid "Authentication protocol communication incomplete! Try again..."
msgstr "Authenticatie was niet volledig! Opnieuw proberen..."
-#: ../pyhoca/wxgui/frontend.py:678
+#: ../pyhoca/wxgui/frontend.py:684
#, python-format
msgid "%s - auth key error"
msgstr "%s - Verbindingsfout met auth. key"
-#: ../pyhoca/wxgui/frontend.py:699
+#: ../pyhoca/wxgui/frontend.py:705
msgid "An unknown error occurred during authentication!"
msgstr "Een onbekende fout is bij de authenticatie opgetreden"
-#: ../pyhoca/wxgui/frontend.py:728
+#: ../pyhoca/wxgui/frontend.py:734
#, python-format
msgid "%s: DirectRDP not supported yet"
msgstr "%s: DirectRDP wordt nog niet ondersteund"
-#: ../pyhoca/wxgui/frontend.py:729
+#: ../pyhoca/wxgui/frontend.py:735
#, python-format
msgid ""
"We apologize for the inconvenience...\n"
@@ -1024,66 +1079,154 @@ msgid ""
"Session profiles of type ,,DirectRDP'' are not\n"
"supported by %s (%s), yet!!\n"
"\n"
-"DirectRDP support will be available in %s (>= 0.2.2.0)."
+"DirectRDP support will be available in %s (>= 1.0.0.0)."
msgstr ""
"Excuses voor het ongemak...\n"
"\n"
"Sessie profielen voor DirectRDP worden door\n"
"%s (%s) nog niet ondersteund!!\n"
"\n"
-"DirectRDP wordt ondersteund in %s (>= 0.2.2.0)."
+"DirectRDP wordt ondersteund in %s (>= 1.0.0.0)."
-#: ../pyhoca/wxgui/frontend.py:741
+#: ../pyhoca/wxgui/frontend.py:747
msgid "Unknown session profile, configure before using it..."
msgstr "Onekend sessie profiel, stel dit in voordat je het gebruikt..."
-#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:1332
+#: ../pyhoca/wxgui/frontend.py:778
+#, python-format
+msgid "Desktop Sharing with %s not supported by server"
+msgstr "Delen van de desktop met %s wordt niet ondersteund door de server"
+
+#: ../pyhoca/wxgui/frontend.py:779
+#, python-format
+msgid ""
+"We apologize for the inconvenience...\n"
+"\n"
+"Session profiles of type ,,SHADOW'' are not\n"
+"supported by X2Go Server (v%s)!!!\n"
+"\n"
+"Desktop Sharing with %s requires\n"
+"X2Go Server 4.1.0.0 and above."
+msgstr ""
+"Excuses voor het ongemak...\n"
+"\n"
+"Sessie profielen met het ,,SHADOW'' type worden \n"
+"door X2Go server nog niet ondersteund\n"
+"\n"
+"Delen van de desktop met %s wordt ondersteund\n"
+"vanaf X2Go Server 4.1.0.0 en hoger"
+
+#: ../pyhoca/wxgui/frontend.py:837 ../pyhoca/wxgui/frontend.py:1488
#, python-format
msgid "%s - session warning"
msgstr "%s - sessie waarschuwing"
-#: ../pyhoca/wxgui/frontend.py:798
+#: ../pyhoca/wxgui/frontend.py:837
#, python-format
msgid "Execution of command ,,%s'' failed."
msgstr "Uitvoering van commando \"%s\" faalde"
-#: ../pyhoca/wxgui/frontend.py:939
+#: ../pyhoca/wxgui/frontend.py:978
msgid "Cleaning X2Go sessions..."
msgstr "Opschonen X2Go sessies..."
-#: ../pyhoca/wxgui/frontend.py:974
+#: ../pyhoca/wxgui/frontend.py:1026
#, python-format
msgid "%s - disconnect"
msgstr "%s - verbinding verbreken"
-#: ../pyhoca/wxgui/frontend.py:974
+#: ../pyhoca/wxgui/frontend.py:1026
msgid "X2Go Profile is now disconnected."
msgstr "X2Go Profiel is nu niet meer verbonden."
-#: ../pyhoca/wxgui/frontend.py:995
+#: ../pyhoca/wxgui/frontend.py:1047
msgid "New Session Profile"
msgstr "Nieuw Profiel"
-#: ../pyhoca/wxgui/frontend.py:1047
+#: ../pyhoca/wxgui/frontend.py:1102
#, python-format
msgid "Really Delete Session Profile ,,%s''?"
msgstr "Verwijder sessie profiel ,,%s''?"
-#: ../pyhoca/wxgui/frontend.py:1053
+#: ../pyhoca/wxgui/frontend.py:1108
#, python-format
msgid "%s - profile deleted"
msgstr "%s - Profiel is verwijderd!"
-#: ../pyhoca/wxgui/frontend.py:1053
+#: ../pyhoca/wxgui/frontend.py:1108
msgid "The session profile has been deleted."
msgstr "Het sessie profiel is verwijderd."
-#: ../pyhoca/wxgui/frontend.py:1071
+#: ../pyhoca/wxgui/frontend.py:1137
+#, python-format
+msgid "%s - export session profiles"
+msgstr "%s - export sessie profielen"
+
+#: ../pyhoca/wxgui/frontend.py:1142
+#, python-format
+msgid "%s - export session profile"
+msgstr "%s - export sessie profiel"
+
+#: ../pyhoca/wxgui/frontend.py:1154
+#, python-format
+msgid "%s: Export file already exists"
+msgstr "%s: Export file bestaat al"
+
+#: ../pyhoca/wxgui/frontend.py:1155
+#, python-format
+msgid ""
+"The file Âģ%sÂĢ already exists in this folder.\n"
+"\n"
+"Do you want to replace it?"
+msgstr ""
+"Het bestand Âģ%sÂĢ bestaat al in deze map\n"
+"\n"
+"Wilt u het vervangen?"
+
+#: ../pyhoca/wxgui/frontend.py:1176
+#, python-format
+msgid "%s - profiles exported"
+msgstr "%s - Profielen geÃĢxporteerd"
+
+#: ../pyhoca/wxgui/frontend.py:1176
+#, python-format
+msgid "Successfully exported session profile group Âģ%sÂĢ to file Âģ%sÂĢ."
+msgstr "Exporteren van sessieprofiel groep Âģ%sÂĢ naar file Âģ%sÂĢ geslaagd"
+
+#: ../pyhoca/wxgui/frontend.py:1178
+#, python-format
+msgid "%s - profile exported"
+msgstr "%s - Profiel is geÃĢxporteerd"
+
+#: ../pyhoca/wxgui/frontend.py:1178
+#, python-format
+msgid "Successfully exported single session profile Âģ%sÂĢ to file Âģ%sÂĢ."
+msgstr "Exporteren van sessieprofiel Âģ%sÂĢ naar file Âģ%sÂĢ geslaagd"
+
+#: ../pyhoca/wxgui/frontend.py:1182
+#, python-format
+msgid "%s: Exporting session profile(s) failed"
+msgstr "%s: Export van sessie profiel mislukt"
+
+#: ../pyhoca/wxgui/frontend.py:1183
+#, python-format
+msgid ""
+"The selected session profile(s) could not be exported to the \n"
+"file Âģ%sÂĢ.\n"
+"\n"
+"Check for common problems (disk full, insufficient access, etc.)."
+msgstr ""
+"Het geselecteerde profiel kon niet worden geÃĢxporteerd \n"
+"naar Âģ%sÂĢ.\n"
+"\n"
+"Controleer of er voldoende schijfruimte is en of u toegang hebt"
+
+#: ../pyhoca/wxgui/frontend.py:1202
#, python-format
msgid "%s - share local folder with sessions of this profile"
msgstr "%s - deel lokale map met dit Profiel"
-#: ../pyhoca/wxgui/frontend.py:1224
+#: ../pyhoca/wxgui/frontend.py:1355
#, python-format
msgid ""
"The authenticity of host [%s]:%s can't be established.\n"
@@ -1096,17 +1239,17 @@ msgstr ""
"\n"
"Weet u zeker dat u de verbinding wilt maken?"
-#: ../pyhoca/wxgui/frontend.py:1232
+#: ../pyhoca/wxgui/frontend.py:1363
#, python-format
msgid "%s: Confirm Host Authorization"
msgstr "%s: Bevestig dat de Host geautoriseerd is"
-#: ../pyhoca/wxgui/frontend.py:1277
+#: ../pyhoca/wxgui/frontend.py:1409
#, python-format
msgid "%s - channel error"
msgstr "%s - Verbindingsfout (channel error)"
-#: ../pyhoca/wxgui/frontend.py:1277
+#: ../pyhoca/wxgui/frontend.py:1409
#, python-format
msgid ""
"Lost connection to server %s unexpectedly! Try to re-authenticate to the "
@@ -1115,22 +1258,45 @@ msgstr ""
"De Verbinding met de server %s werd onverwacht verbroken! Probeer om u "
"opnieuw aan te melden..."
-#: ../pyhoca/wxgui/frontend.py:1295 ../pyhoca/wxgui/frontend.py:1313
-#: ../pyhoca/wxgui/frontend.py:1315 ../pyhoca/wxgui/frontend.py:1351
+#: ../pyhoca/wxgui/frontend.py:1426 ../pyhoca/wxgui/frontend.py:1469
+#: ../pyhoca/wxgui/frontend.py:1471 ../pyhoca/wxgui/frontend.py:1507
#, python-format
msgid "%s - session failure"
msgstr "%s - sessie fout"
-#: ../pyhoca/wxgui/frontend.py:1295
+#: ../pyhoca/wxgui/frontend.py:1426
msgid "The session startup failed."
msgstr "Opstarten van de sessie is mislukt"
-#: ../pyhoca/wxgui/frontend.py:1313
+#: ../pyhoca/wxgui/frontend.py:1439
+#, python-format
+msgid "%s - timeout"
+msgstr "%s - timeout"
+
+#: ../pyhoca/wxgui/frontend.py:1439
+msgid ""
+"The server took long to provide a list of sharable desktops.\n"
+"This can happen from time to time, please try again"
+msgstr ""
+"Het duurde te lang om de lijst met deelbare desktops op te halen\n"
+"Dit gebeurt soms, probeer het nogmaals"
+
+#: ../pyhoca/wxgui/frontend.py:1451
+#, python-format
+msgid "%s - desktop sharing failed"
+msgstr "%s - delen van de desktop mislukte"
+
+#: ../pyhoca/wxgui/frontend.py:1451
+#, python-format
+msgid "The desktop %s is not available for sharing (anymore)."
+msgstr "De %s desktop kan niet (meer) gedeeld worden"
+
+#: ../pyhoca/wxgui/frontend.py:1469
#, python-format
msgid "The command ,,%s'' is not available on X2Go server."
msgstr "Het commando ,,%s'' is niet beschikbaar op de X2Go server."
-#: ../pyhoca/wxgui/frontend.py:1315
+#: ../pyhoca/wxgui/frontend.py:1471
#, python-format
msgid ""
"The command ,,%s'' is not available on X2Go server\n"
@@ -1139,54 +1305,54 @@ msgstr ""
"Het commando ,,%s'' is niet beschikbaar op de X2Go server\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1332
+#: ../pyhoca/wxgui/frontend.py:1488
#, python-format
msgid ""
"Reverse TCP port forwarding request for session %s to server port %s has "
"been denied."
msgstr ""
-"Reverse TCP port forwarding request for session %s to server port %s has "
-"been denied."
+"Reverse TCP port forwarding request voor sessie %s naar server port %s niet "
+"toegestaan"
-#: ../pyhoca/wxgui/frontend.py:1351
+#: ../pyhoca/wxgui/frontend.py:1507
#, python-format
msgid ""
"Forwarding tunnel request to [%s]:%s for session %s was denied by remote "
-"X2go/SSH server. Session startup failed."
+"X2Go/SSH server. Session startup failed."
msgstr ""
-"Forwarding tunnel request to [%s]:%s for session %s was denied by remote "
-"X2go/SSH server. Session startup failed."
+"Forwarding tunnel request naar [%s]:%s voor sessie %s niet toegestaan door "
+"remote X2Go/SSH server. Het starten van de sessie is mislukt."
-#: ../pyhoca/wxgui/frontend.py:1370
+#: ../pyhoca/wxgui/frontend.py:1526
#, python-format
msgid "%s - audio warning"
msgstr "%s - audio waarschuwing"
-#: ../pyhoca/wxgui/frontend.py:1370
+#: ../pyhoca/wxgui/frontend.py:1526
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:1377 ../pyhoca/wxgui/frontend.py:1384
+#: ../pyhoca/wxgui/frontend.py:1533 ../pyhoca/wxgui/frontend.py:1540
#, python-format
msgid "%s - audio error"
msgstr "%s - audio fout"
-#: ../pyhoca/wxgui/frontend.py:1377
+#: ../pyhoca/wxgui/frontend.py:1533
msgid "The X2Go PulseAudio system could not be started."
msgstr "Het X2Go PulseAudio systeem kon niet gestart worden"
-#: ../pyhoca/wxgui/frontend.py:1384
+#: ../pyhoca/wxgui/frontend.py:1540
msgid "The X2Go PulseAudio system has died unexpectedly."
msgstr "Het X2Go PulseAudio systeem is gecrashed"
-#: ../pyhoca/wxgui/frontend.py:1396
+#: ../pyhoca/wxgui/frontend.py:1552
#, python-format
msgid "%s - audio problem"
msgstr "%s - audio probleem"
-#: ../pyhoca/wxgui/frontend.py:1396
+#: ../pyhoca/wxgui/frontend.py:1552
#, python-format
msgid ""
"The audio connection could not be set up for this session.\n"
@@ -1195,36 +1361,36 @@ msgstr ""
"De audio verbinding kon niet worden gemaakt voor deze sessie.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1408
+#: ../pyhoca/wxgui/frontend.py:1564
#, python-format
msgid "%s - client-side printing not available"
msgstr "%s - client-side print systeem niet beschikbaar"
-#: ../pyhoca/wxgui/frontend.py:1408
+#: ../pyhoca/wxgui/frontend.py:1564
#, python-format
msgid ""
"The server denies client-side printing from within this session.\n"
"%s"
msgstr "De server staat client-side printing niet toe"
-#: ../pyhoca/wxgui/frontend.py:1420
+#: ../pyhoca/wxgui/frontend.py:1576
#, python-format
msgid "%s - MIME box not available"
msgstr "%s- MIME box is niet beschikbaar"
-#: ../pyhoca/wxgui/frontend.py:1420
+#: ../pyhoca/wxgui/frontend.py:1576
#, python-format
msgid ""
"The server does not support the X2Go MIME box.\n"
"%s"
msgstr "De server ondersteunt geen X2Go MIME box"
-#: ../pyhoca/wxgui/frontend.py:1432
+#: ../pyhoca/wxgui/frontend.py:1588
#, python-format
msgid "%s - client-side folders not sharable"
msgstr "%s - client-side mappen worden niet gedeeld"
-#: ../pyhoca/wxgui/frontend.py:1432
+#: ../pyhoca/wxgui/frontend.py:1588
#, python-format
msgid ""
"The server denies client-side folder sharing with this session.\n"
@@ -1233,12 +1399,12 @@ msgstr ""
"De server staat client-side mappen deling in deze sessie niet toe.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1444
+#: ../pyhoca/wxgui/frontend.py:1600
#, python-format
msgid "%s - client resources not sharable"
msgstr "%s - client bronnen kunnen niet gedeeld worden"
-#: ../pyhoca/wxgui/frontend.py:1444
+#: ../pyhoca/wxgui/frontend.py:1600
#, python-format
msgid ""
"Client-side folders and printers cannot be shared with this session.\n"
@@ -1247,12 +1413,12 @@ msgstr ""
"Client-side mappen en printers kunnen niet gedeeld worden in deze sessie.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1463 ../pyhoca/wxgui/frontend.py:1465
+#: ../pyhoca/wxgui/frontend.py:1619 ../pyhoca/wxgui/frontend.py:1621
#, python-format
msgid "%s - print error"
msgstr "%s - Printfout"
-#: ../pyhoca/wxgui/frontend.py:1463
+#: ../pyhoca/wxgui/frontend.py:1619
#, python-format
msgid ""
"%s\n"
@@ -1263,7 +1429,7 @@ msgstr ""
"...veroorzaakt door printer %s in sessie\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1465
+#: ../pyhoca/wxgui/frontend.py:1621
#, python-format
msgid ""
"%s\n"
@@ -1274,12 +1440,12 @@ msgstr ""
"...veroorzaakt door sessie\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1480 ../pyhoca/wxgui/frontend.py:1495
+#: ../pyhoca/wxgui/frontend.py:1636 ../pyhoca/wxgui/frontend.py:1651
#, python-format
msgid "%s - start"
msgstr "%s - Start"
-#: ../pyhoca/wxgui/frontend.py:1480
+#: ../pyhoca/wxgui/frontend.py:1636
#, python-format
msgid ""
"New X2Go session starting up...\n"
@@ -1288,7 +1454,7 @@ msgstr ""
"Nieuwe X2Go sessie wordt gestart...\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1495
+#: ../pyhoca/wxgui/frontend.py:1651
#, python-format
msgid ""
"Another client started X2Go session\n"
@@ -1297,12 +1463,12 @@ msgstr ""
"Een andere X2Go-client heeft deze sessie gestart\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1510 ../pyhoca/wxgui/frontend.py:1525
+#: ../pyhoca/wxgui/frontend.py:1666 ../pyhoca/wxgui/frontend.py:1681
#, python-format
msgid "%s - resume"
msgstr "%s - hervatten"
-#: ../pyhoca/wxgui/frontend.py:1510
+#: ../pyhoca/wxgui/frontend.py:1666
#, python-format
msgid ""
"Resuming X2Go session...\n"
@@ -1311,7 +1477,7 @@ msgstr ""
"X2Go Sessie wordt hervat...\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1525
+#: ../pyhoca/wxgui/frontend.py:1681
#, python-format
msgid ""
"Another client resumed X2Go session\n"
@@ -1320,12 +1486,12 @@ msgstr ""
"Een andere X2Go-client heeft de Sessie hervat\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1540
+#: ../pyhoca/wxgui/frontend.py:1696
#, python-format
msgid "%s - running"
msgstr "%s - actief"
-#: ../pyhoca/wxgui/frontend.py:1540
+#: ../pyhoca/wxgui/frontend.py:1696
#, python-format
msgid ""
"Found already running session\n"
@@ -1334,12 +1500,12 @@ msgstr ""
"Reeds actieve sessie gevonden\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1560
+#: ../pyhoca/wxgui/frontend.py:1716
#, python-format
msgid "%s - suspend"
msgstr "%s - suspend"
-#: ../pyhoca/wxgui/frontend.py:1560
+#: ../pyhoca/wxgui/frontend.py:1716
#, python-format
msgid ""
"X2Go Session has been suspended\n"
@@ -1348,12 +1514,12 @@ msgstr ""
"X2Go Sessie is suspended\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1587
+#: ../pyhoca/wxgui/frontend.py:1743
#, python-format
msgid "%s - terminate"
msgstr "%s - beÃĢindigen"
-#: ../pyhoca/wxgui/frontend.py:1587
+#: ../pyhoca/wxgui/frontend.py:1743
#, python-format
msgid ""
"X2Go Session has terminated\n"
@@ -1362,7 +1528,7 @@ msgstr ""
"X2Go Sessie wordt beÃĢindigd\n"
"%s"
-#: ../pyhoca/wxgui/messages.py:73
+#: ../pyhoca/wxgui/messages.py:72
#, python-format
msgid ""
"Are you really sure you want to\n"
@@ -1371,7 +1537,7 @@ msgstr ""
"Weet u zeker dat u het sessie\n"
"profiel ,,%s'' wilt verwijderen??"
-#: ../pyhoca/wxgui/messages.py:74
+#: ../pyhoca/wxgui/messages.py:73
#, python-format
msgid ""
"PyHoca-GUI is already running for user ,,%s''!\n"
@@ -1386,15 +1552,15 @@ msgstr ""
"Het Pyhoca-GUI icoontje kan gevonden worden in de\n"
"taakbalk van uw desktop."
-#: ../pyhoca/wxgui/messages.py:107
+#: ../pyhoca/wxgui/messages.py:106
msgid "Yes"
msgstr "Ja"
-#: ../pyhoca/wxgui/messages.py:108
+#: ../pyhoca/wxgui/messages.py:107
msgid "No"
msgstr "Nee"
-#: ../pyhoca/wxgui/messages.py:125 ../pyhoca/wxgui/printingprefs.py:142
+#: ../pyhoca/wxgui/messages.py:124 ../pyhoca/wxgui/printingprefs.py:142
msgid "Ok"
msgstr "Ok"
@@ -1460,10 +1626,6 @@ msgstr "Gebruik deze printer"
msgid "Custom print command"
msgstr "Afdruk commando"
-#: ../pyhoca/wxgui/printingprefs.py:143
-msgid "Apply"
-msgstr "Toepassen"
-
#: ../pyhoca/wxgui/printingprefs.py:145
msgid "Print"
msgstr "Afdrukken"
@@ -1497,13 +1659,79 @@ msgstr "Wijzig sessie naam naar"
msgid "OK"
msgstr "OK"
-#, fuzzy
-#~ msgid "Remember shared folders"
-#~ msgstr "Delen &mappen"
+#: ../pyhoca/wxgui/serverinfo.py:76
+#, python-format
+msgid "Server Information - %s"
+msgstr "Server informatie - %s"
+
+#: ../pyhoca/wxgui/serverinfo.py:78
+#, python-format
+msgid ""
+"Session Profile: %s\n"
+"\n"
+"List of X2Go Server components, add-ons and their versions..."
+msgstr ""
+"Sessie profiel: %s\n"
+"\n"
+"Lijst met X2Go Server componenten, add-ons and hun versies..."
+
+#: ../pyhoca/wxgui/serverinfo.py:83
+msgid "Refresh"
+msgstr "Ververs"
+
+#: ../pyhoca/wxgui/serverinfo.py:84
+msgid "Close"
+msgstr "Afsluiten"
+
+#: ../pyhoca/wxgui/serverinfo.py:153
+msgid "X2Go Server"
+msgstr "X2Go Server"
+
+#: ../pyhoca/wxgui/serverinfo.py:154
+msgid "Server Core"
+msgstr "Server Kern"
+
+#: ../pyhoca/wxgui/serverinfo.py:162
+msgid "Server Extensions"
+msgstr "Server Uitbreidingen"
+
+#: ../pyhoca/wxgui/serverinfo.py:168
+msgid "X2Go Server Add-ons"
+msgstr "X2Go Server extra's"
+
+#: ../pyhoca/wxgui/serverinfo.py:172
+msgid "X2Go Server Features"
+msgstr "X2go Server mogelijkheden"
+
+#~ msgid "Settings"
+#~ msgstr "Instellingen"
+
+#~ msgid "%s (%s)\n"
+#~ msgstr "%s (via %s)"
-#, fuzzy
-#~ msgid "Shared Resources"
-#~ msgstr "Delen &mappen"
+#~ msgid "Connect to another Desktop Session"
+#~ msgstr "Verbind met een andere Sessie"
+
+#~ msgid "Start/Resume Session"
+#~ msgstr "Sessie starten/hervatten"
+
+#~ msgid "SSH Proxy Tunnel"
+#~ msgstr "SSH Proxy Tunnel"
+
+#~ msgid "The SSH proxy configuration is incomplete. Try again."
+#~ msgstr "SSH Proxy Configuratie is niet volledig! Opnieuw proberen..."
+
+#~ msgid ""
+#~ "Another session profile (%s) already uses [%s]:%s for binding a local SSH "
+#~ "proxy to.\n"
+#~ "Please change the SSH proxy settings accordingly."
+#~ msgstr ""
+#~ "Een ander profiel (%s) gebruikt [%s]:%s voor de verbinding met een lokale "
+#~ "SSH proxy.\n"
+#~ "Verander de SSH proxy instelling om dit probleem te verhelpen."
+
+#~ msgid "Remember shared folders"
+#~ msgstr "Bewaar gedeelde mappen"
#~ msgid "RSA/DSA private key"
#~ msgstr "Private RSA/DSA Key"
@@ -1539,16 +1767,11 @@ msgstr "OK"
#~ msgid "%s - connect error"
#~ msgstr "%s - Verbindingsfout"
-#~ msgid "new session profile"
-#~ msgstr "Nieuw Profiel"
-
-#, fuzzy
#~ msgid "Unknown Session Profile"
-#~ msgstr "Nieuw Profiel"
+#~ msgstr "Onbekend sessie profiel"
-#, fuzzy
#~ msgid "Retrieving Application menu..."
-#~ msgstr "Enkelvoudige Applicatie"
+#~ msgstr "Applicatie menu aan het ophalen..."
#~ msgid "RDP settings"
#~ msgstr "RDP instellingen"
@@ -1563,7 +1786,7 @@ msgstr "OK"
#~ msgstr "Alle profielen zijn verbonden"
#~ msgid "New Profile"
-#~ msgstr "Profiel"
+#~ msgstr "Nieuw Profiel"
#~ msgid "%s - print job"
#~ msgstr "%s - print job"
diff --git a/po/ru.po b/po/ru.po
index 531b6c0..9914fd6 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,18 +1,18 @@
# PyHoca-GUI / i18n.
-# Copyright (C) 2010-2012 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
# Dick Kniep <dick.kniep(a)lindix.nl>
# This file is distributed under the same license as the PyHoca-GUI package.
#
# Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>, 2011.
-# Oleksandr Shneyder <o.shneyder(a)phoca-gmbh.de>, 2012.
+# Oleksandr Shneyder <o.shneyder(a)phoca-gmbh.de>, 2012, 2013.
msgid ""
msgstr ""
"Project-Id-Version: PyHoca-GUI VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 14:25+0100\n"
-"PO-Revision-Date: 2012-11-19 13:51+0100\n"
+"POT-Creation-Date: 2013-01-29 22:21+0100\n"
+"PO-Revision-Date: 2013-01-28 13:39+0100\n"
"Last-Translator: Oleksandr Shneyder <o.shneyder(a)phoca-gmbh.de>\n"
-"Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n"
+"Language-Team: German <x2go-i18n(a)lists.berlios.de>\n"
"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -44,8 +44,8 @@ msgid "Authenticate"
msgstr "ĐвŅĐžŅиСОваŅŅ"
#: ../pyhoca/wxgui/logon.py:107
-msgid " Start SSH tunnel "
-msgstr " ХОСдаŅŅ SSH ŅŅĐŊĐŊĐĩĐģŅ "
+msgid "Start SSH tunnel"
+msgstr "ХОСдаŅŅ SSH ŅŅĐŊĐŊĐĩĐģŅ"
#: ../pyhoca/wxgui/logon.py:115
msgid "Session login"
@@ -55,23 +55,23 @@ msgstr "ĐĐžĐŗиĐŊ ŅĐĩŅŅии"
msgid "SSH proxy server login"
msgstr "ĐĐžĐŗиĐŊ SSH ĐŋŅĐžĐēŅи ŅĐĩŅвĐĩŅĐ°"
-#: ../pyhoca/wxgui/logon.py:127 ../pyhoca/wxgui/profilemanager.py:350
-#: ../pyhoca/wxgui/messages.py:131 ../pyhoca/wxgui/printingprefs.py:147
-#: ../pyhoca/wxgui/sessiontitle.py:85
+#: ../pyhoca/wxgui/logon.py:127 ../pyhoca/wxgui/profilemanager.py:373
+#: ../pyhoca/wxgui/listdesktops.py:99 ../pyhoca/wxgui/messages.py:130
+#: ../pyhoca/wxgui/printingprefs.py:147 ../pyhoca/wxgui/sessiontitle.py:85
msgid "Cancel"
msgstr "ĐŅĐŧĐĩĐŊĐ°"
#: ../pyhoca/wxgui/logon.py:297 ../pyhoca/wxgui/logon.py:339
-#: ../pyhoca/wxgui/frontend.py:606
+#: ../pyhoca/wxgui/frontend.py:612
#, python-format
msgid "%s - connect failure"
msgstr "%s - ĐžŅийĐēĐ° ŅĐžĐĩдиĐŊĐĩĐŊиŅ"
-#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:606
+#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:612
msgid "User is not allowed to start X2Go sessions!"
msgstr "ĐĐžĐģŅСОваŅĐĩĐģŅ ĐŊĐĩ ŅаСŅĐĩŅĐĩĐŊĐž ĐžŅĐēŅŅваŅŅ X2Go ŅĐĩŅŅии!"
-#: ../pyhoca/wxgui/logon.py:303 ../pyhoca/wxgui/frontend.py:613
+#: ../pyhoca/wxgui/logon.py:303 ../pyhoca/wxgui/frontend.py:619
#, python-format
msgid "%s - connect"
msgstr "%s - ŅĐžĐĩдиĐŊĐĩĐŊиĐĩ"
@@ -97,28 +97,28 @@ msgstr "%s - SSH ĐŋŅĐžĐēŅи"
msgid "Authentication to the SSH proxy server failed!"
msgstr "ĐŅийĐēĐ° авŅĐžŅиСаŅии ĐŊĐ° ĐŋŅĐžĐēŅи ŅĐĩŅвĐĩŅĐĩ SSH!"
-#: ../pyhoca/wxgui/logon.py:376 ../pyhoca/wxgui/frontend.py:664
+#: ../pyhoca/wxgui/logon.py:376 ../pyhoca/wxgui/frontend.py:670
#, python-format
msgid "%s - socket error"
msgstr "%s - ĐžŅийĐēĐ° ŅĐžĐēĐĩŅĐ°"
-#: ../pyhoca/wxgui/logon.py:383 ../pyhoca/wxgui/frontend.py:643
-#: ../pyhoca/wxgui/frontend.py:650
+#: ../pyhoca/wxgui/logon.py:383 ../pyhoca/wxgui/frontend.py:649
+#: ../pyhoca/wxgui/frontend.py:656
#, python-format
msgid "%s - host key error"
msgstr "%s - ĐžŅийĐēĐ° ĐēĐģŅŅĐ° Ņ
ĐžŅŅĐ°"
-#: ../pyhoca/wxgui/logon.py:384 ../pyhoca/wxgui/frontend.py:643
+#: ../pyhoca/wxgui/logon.py:384 ../pyhoca/wxgui/frontend.py:649
msgid ""
"The remote server's host key is invalid or has not been accepted by the user"
msgstr "ĐŖĐ´Đ°ĐģĐĩĐŊĐŊŅĐš ŅĐĩŅвĐĩŅĐŊŅĐš ĐēĐģŅŅ ĐŊĐĩĐ´ĐĩĐšŅŅвиŅĐĩĐģĐĩĐŊ и ĐŊĐĩ ĐąŅĐģ ĐŋŅиĐŊŅŅ ĐŋĐžĐģŅСОваŅĐĩĐģĐĩĐŧ"
-#: ../pyhoca/wxgui/logon.py:391 ../pyhoca/wxgui/frontend.py:685
+#: ../pyhoca/wxgui/logon.py:391 ../pyhoca/wxgui/frontend.py:691
#, python-format
msgid "%s - missing home directory"
msgstr "%s - Đ´ĐžĐŧĐ°ŅĐŊиК ĐēĐ°ŅĐ°ĐģĐžĐŗ ĐžŅŅŅŅŅŅвŅĐĩŅ"
-#: ../pyhoca/wxgui/logon.py:392 ../pyhoca/wxgui/frontend.py:685
+#: ../pyhoca/wxgui/logon.py:392 ../pyhoca/wxgui/frontend.py:691
msgid "The remote user's home directory does not exist."
msgstr "ĐĐžĐŧĐ°ŅĐŊиК ĐēĐ°ŅĐ°ĐģĐžĐŗ ŅĐ´Đ°ĐģĐĩĐŊĐŊĐžĐŗĐž ĐŋĐžĐģŅСОваŅĐĩĐģŅ ĐŊĐĩ ŅŅŅĐĩŅŅвŅĐĩŅ."
@@ -127,12 +127,12 @@ msgstr "ĐĐžĐŧĐ°ŅĐŊиК ĐēĐ°ŅĐ°ĐģĐžĐŗ ŅĐ´Đ°ĐģĐĩĐŊĐŊĐžĐŗĐž ĐŋĐžĐģŅСОваŅ
msgid "%s - key error"
msgstr "%s - ĐžŅийĐēĐ° ĐēĐģŅŅĐ°"
-#: ../pyhoca/wxgui/logon.py:407 ../pyhoca/wxgui/frontend.py:692
+#: ../pyhoca/wxgui/logon.py:407 ../pyhoca/wxgui/frontend.py:698
#, python-format
msgid "%s - auth error"
msgstr "%s - ĐžŅийĐēĐ° авŅĐžŅиСаŅии"
-#: ../pyhoca/wxgui/logon.py:415 ../pyhoca/wxgui/frontend.py:636
+#: ../pyhoca/wxgui/logon.py:415 ../pyhoca/wxgui/frontend.py:642
#, python-format
msgid "%s - SSH error"
msgstr "%s - ĐžŅийĐēĐ° SSH"
@@ -158,10 +158,10 @@ msgstr ""
#: ../pyhoca/wxgui/taskbar.py:93
#, python-format
msgid ""
-"PyHoca-GUI (Python X2goClient)\n"
+"PyHoca-GUI (Python X2Go Client)\n"
"Currently connecting you to remote X2Go server ,,%s''"
msgstr ""
-"PyHoca-GUI (Python X2goClient)\n"
+"PyHoca-GUI (Python X2Go Client)\n"
"ĐĄĐžĐĩдиĐŊŅĐĩŅ ĐĐ°Ņ Ņ ŅĐ´Đ°ĐģĐĩĐŊĐŊŅĐŧ ŅĐĩŅвĐĩŅĐžĐŧ X2Go ,,%s''"
#: ../pyhoca/wxgui/taskbar.py:103
@@ -172,10 +172,10 @@ msgstr "ĐĄĐžĐĩдиĐŊŅĐĩŅ ĐĐ°Ņ Ņ X2Go..."
#: ../pyhoca/wxgui/taskbar.py:107
msgid ""
-"PyHoca-GUI (Python X2goClient)\n"
+"PyHoca-GUI (Python X2Go Client)\n"
"Client for connecting you to a remote X2Go server"
msgstr ""
-"PyHoca-GUI (Python X2goClient)\n"
+"PyHoca-GUI (Python X2Go Client)\n"
"ĐĐģŅ ŅĐžĐĩдиĐŊĐĩĐŊиŅ Ņ ŅĐ´Đ°ĐģĐĩĐŊĐŊŅĐŧ ŅĐĩŅвĐĩŅĐžĐŧ X2Go"
#: ../pyhoca/wxgui/profilemanager.py:79
@@ -211,755 +211,810 @@ msgid "Single Application"
msgstr "ĐŅиĐģĐžĐļĐĩĐŊиŅ"
#: ../pyhoca/wxgui/profilemanager.py:87
+msgid "Share desktop session (SHADOW)"
+msgstr "ĐŅиŅĐžĐĩдиĐŊиŅŅŅŅ Đē ŅŅŅĐĩŅŅвŅŅŅĐĩĐš ŅĐĩŅŅии (SHADOW)"
+
+#: ../pyhoca/wxgui/profilemanager.py:88
msgid "XDMCP Query"
msgstr "XDMCP ĐĐ°ĐŋŅĐžŅ"
-#: ../pyhoca/wxgui/profilemanager.py:88
+#: ../pyhoca/wxgui/profilemanager.py:89
msgid "Windows Terminal Server (X2Go-proxied RDP)"
msgstr "ĐĄĐĩŅвĐĩŅ ŅĐĩŅĐŧиĐŊĐ°ĐģОв Windows (RDP ŅĐĩŅĐĩС X2Go ĐŋŅĐžĐēŅи)"
-#: ../pyhoca/wxgui/profilemanager.py:89
+#: ../pyhoca/wxgui/profilemanager.py:90
msgid "Windows Terminal Server (Direct RDP)"
msgstr "ĐĄĐĩŅвĐĩŅ ŅĐĩŅĐŧиĐŊĐ°ĐģОв Windows (ĐŋŅŅĐŧĐžĐĩ RDP ŅĐžĐĩдиĐŊĐĩĐŊиĐĩ)"
-#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/profilemanager.py:224
+#: ../pyhoca/wxgui/profilemanager.py:91 ../pyhoca/wxgui/profilemanager.py:243
msgid "Custom command"
msgstr "ĐĐžĐŧĐ°ĐŊĐ´Đ° ĐŋĐžĐģŅСОваŅĐĩĐģŅ"
-#: ../pyhoca/wxgui/profilemanager.py:95 ../pyhoca/wxgui/menus_taskbar.py:393
+#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:406
msgid "Internet Browser"
msgstr "ĐĐĩĐą-ĐąŅĐžŅСĐĩŅ"
-#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:394
+#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:407
msgid "Email Client"
msgstr "ĐĐžŅŅОвŅĐš ĐēĐģиĐĩĐŊŅ"
-#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:395
+#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:408
msgid "Office"
msgstr "ĐŅиŅ"
-#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:396
+#: ../pyhoca/wxgui/profilemanager.py:99 ../pyhoca/wxgui/menus_taskbar.py:409
msgid "Terminal"
msgstr "ĐĸĐĩŅĐŧиĐŊĐ°Đģ"
-#: ../pyhoca/wxgui/profilemanager.py:116
+#: ../pyhoca/wxgui/profilemanager.py:117
msgid "Open file with system's default application"
msgstr "ĐŅĐēŅŅŅŅ ŅĐ°ĐšĐģ Ņ ĐŋŅиĐģĐžĐļĐĩĐŊиĐĩĐŧ ĐŋĐž ŅĐŧĐžĐģŅĐ°ĐŊиŅ"
-#: ../pyhoca/wxgui/profilemanager.py:117
+#: ../pyhoca/wxgui/profilemanager.py:118
msgid "Open application chooser dialog"
msgstr "ĐŅĐēŅŅŅŅ диаĐģĐžĐŗ вŅйОŅĐ° ĐŋŅиĐģĐžĐļĐĩĐŊиŅ"
-#: ../pyhoca/wxgui/profilemanager.py:118
+#: ../pyhoca/wxgui/profilemanager.py:119
msgid "Save incoming file as ..."
msgstr "ĐĄĐžŅ
ŅĐ°ĐŊиŅŅ ŅĐ°ĐšĐģ ĐēĐ°Đē ..."
-#: ../pyhoca/wxgui/profilemanager.py:146
+#: ../pyhoca/wxgui/profilemanager.py:147
msgid "settings derived from "
msgstr "ĐŊĐ°ŅŅŅОКĐēи иĐŧĐŋĐžŅŅиŅОваĐŊŅ иС "
#. boxes for all tabs
-#: ../pyhoca/wxgui/profilemanager.py:167
+#: ../pyhoca/wxgui/profilemanager.py:186
msgid "Session Title"
msgstr "ĐĐ°ĐŗĐžĐģОвОĐē ŅĐĩŅŅии"
-#: ../pyhoca/wxgui/profilemanager.py:168
+#: ../pyhoca/wxgui/profilemanager.py:187
msgid "Session Window"
msgstr "ĐĐēĐŊĐž ŅĐĩŅŅии"
-#: ../pyhoca/wxgui/profilemanager.py:169
+#: ../pyhoca/wxgui/profilemanager.py:188
msgid "Session Startup"
msgstr "ĐĐ°ĐŋŅŅĐē ŅĐĩŅŅии"
-#: ../pyhoca/wxgui/profilemanager.py:170
+#: ../pyhoca/wxgui/profilemanager.py:189
msgid "Server"
msgstr "ĐĄĐĩŅвĐĩŅ"
-#: ../pyhoca/wxgui/profilemanager.py:171
+#: ../pyhoca/wxgui/profilemanager.py:190
msgid "Proxy"
msgstr "ĐŅĐžĐēŅи"
-#: ../pyhoca/wxgui/profilemanager.py:172
+#: ../pyhoca/wxgui/profilemanager.py:191
msgid "Connection Link Speed"
msgstr "ĐĄĐēĐžŅĐžŅŅŅ ŅĐžĐĩдиĐŊĐĩĐŊиŅ"
-#: ../pyhoca/wxgui/profilemanager.py:173
+#: ../pyhoca/wxgui/profilemanager.py:192
msgid "Compression"
msgstr "ĐĄĐļĐ°ŅиĐĩ"
-#: ../pyhoca/wxgui/profilemanager.py:174
+#: ../pyhoca/wxgui/profilemanager.py:193
msgid "Display"
msgstr "ĐиŅĐŋĐģĐĩĐš"
-#: ../pyhoca/wxgui/profilemanager.py:175
+#: ../pyhoca/wxgui/profilemanager.py:194
msgid "Keyboard"
msgstr "ĐĐģавиаŅŅŅĐ°"
-#: ../pyhoca/wxgui/profilemanager.py:176
+#: ../pyhoca/wxgui/profilemanager.py:195
msgid "Sound"
msgstr "ĐвŅĐē"
-#: ../pyhoca/wxgui/profilemanager.py:177
+#: ../pyhoca/wxgui/profilemanager.py:196
msgid "Printing"
msgstr "ĐĐĩŅĐ°ŅŅ"
-#: ../pyhoca/wxgui/profilemanager.py:178
+#: ../pyhoca/wxgui/profilemanager.py:197
msgid "Folder Exports"
msgstr "ĐĐēŅĐŋĐžŅŅ ĐēĐ°ŅĐ°ĐģĐžĐŗОв"
-#: ../pyhoca/wxgui/profilemanager.py:179
+#: ../pyhoca/wxgui/profilemanager.py:198
msgid "File Import"
msgstr "ĐĐŧĐŋĐžŅŅ ŅĐ°ĐšĐģОв"
#. ##
#. ## widgets for the PROFILE tab
#. ##
-#: ../pyhoca/wxgui/profilemanager.py:184
+#: ../pyhoca/wxgui/profilemanager.py:203
msgid "Name"
msgstr "ĐĐŧŅ"
-#: ../pyhoca/wxgui/profilemanager.py:191
+#: ../pyhoca/wxgui/profilemanager.py:210
msgid "Set session window title"
msgstr "ĐŖŅŅĐ°ĐŊОвиŅŅ СаĐŗĐžĐģОвОĐē ĐžĐēĐŊĐ° ŅĐĩŅŅии"
-#: ../pyhoca/wxgui/profilemanager.py:192
+#: ../pyhoca/wxgui/profilemanager.py:211
msgid "Use a default session window title"
msgstr "ĐŅĐŋĐžĐģŅСОваŅŅ СаĐŗĐžĐģОвОĐē ĐžĐēĐŊĐ° ŅĐĩŅŅии ĐŋĐž ŅĐŧĐžĐģŅĐ°ĐŊиŅ"
-#: ../pyhoca/wxgui/profilemanager.py:193
+#: ../pyhoca/wxgui/profilemanager.py:212
msgid "Custom session window title"
msgstr "ĐŅОиСвОĐģŅĐŊŅĐš СаĐŗĐžĐģОвОĐē ĐžĐēĐŊĐ° ŅĐĩŅŅии"
-#: ../pyhoca/wxgui/profilemanager.py:212
+#: ../pyhoca/wxgui/profilemanager.py:231
msgid "Window Icon"
msgstr "ĐиĐēŅĐžĐŗŅĐ°ĐŧĐŧĐ°"
#. ##
#. ## widgets for the SESSION tab
#. ##
-#: ../pyhoca/wxgui/profilemanager.py:218
+#: ../pyhoca/wxgui/profilemanager.py:237
msgid "Start session automatically after login"
msgstr "ĐĐ°ĐŋŅŅĐēĐ°ŅŅ ŅĐĩŅŅиŅ авŅĐžĐŧĐ°ŅиŅĐĩŅĐēи ĐŋĐžŅĐģĐĩ вŅ
Ода"
-#: ../pyhoca/wxgui/profilemanager.py:219
+#: ../pyhoca/wxgui/profilemanager.py:238
#, python-format
-msgid "Login automatically after %s has started"
-msgstr "ĐвŅĐžĐŧĐ°ŅиŅĐĩŅĐēиК вŅ
Од ĐŋĐžŅĐģĐĩ СаĐŋŅŅĐēĐ° %s"
+msgid "Login automatically after %s has started (needs --auto-connect)"
+msgstr "ĐвŅĐžĐŧĐ°ŅиŅĐĩŅĐēиК вŅ
Од ĐŋĐžŅĐģĐĩ СаĐŋŅŅĐēĐ° %s (ŅŅĐĩĐąŅĐĩŅŅŅ ĐžĐŋŅиŅ --auto-connect)"
-#: ../pyhoca/wxgui/profilemanager.py:220
+#: ../pyhoca/wxgui/profilemanager.py:239
msgid "Type"
msgstr "ĐĸиĐŋ"
-#: ../pyhoca/wxgui/profilemanager.py:222
+#: ../pyhoca/wxgui/profilemanager.py:241
msgid "Application"
msgstr "ĐŅиĐģĐžĐļĐĩĐŊиĐĩ"
-#: ../pyhoca/wxgui/profilemanager.py:226
+#: ../pyhoca/wxgui/profilemanager.py:245
msgid "XDMCP server"
msgstr "XDMCP ŅĐĩŅвĐĩŅ"
-#: ../pyhoca/wxgui/profilemanager.py:228
+#: ../pyhoca/wxgui/profilemanager.py:247
msgid "RDP server"
msgstr "RDP ŅĐĩŅвĐĩŅ"
-#: ../pyhoca/wxgui/profilemanager.py:230
+#: ../pyhoca/wxgui/profilemanager.py:249
msgid "RDP options"
msgstr "ĐĐŋŅии RDP"
-#: ../pyhoca/wxgui/profilemanager.py:232
+#: ../pyhoca/wxgui/profilemanager.py:251
msgid "Integrate remote application(s) into local desktop (rootless mode)"
msgstr "ĐĐŊŅĐĩĐŗŅиŅОваŅŅ ŅĐ´Đ°ĐģĐĩĐŊĐŊĐžĐĩ ĐŋŅиĐģĐžĐļĐĩĐŊиĐĩ в ĐģĐžĐēĐ°ĐģŅĐŊŅĐš Đ´ĐĩŅĐēŅĐžĐŋ"
-#: ../pyhoca/wxgui/profilemanager.py:233
+#: ../pyhoca/wxgui/profilemanager.py:252
msgid "Menu of published applications"
msgstr "ĐĐĩĐŊŅ ŅĐ´Đ°ĐģĐĩĐŊĐŊŅŅ
ĐŋŅиĐģĐžĐļĐĩĐŊиК"
#. ##
#. ## widgets for the CONNECTION tab
#. ##
-#: ../pyhoca/wxgui/profilemanager.py:240 ../pyhoca/wxgui/profilemanager.py:253
+#: ../pyhoca/wxgui/profilemanager.py:259 ../pyhoca/wxgui/profilemanager.py:273
msgid "User"
msgstr "ĐĐžĐģŅСОваŅĐĩĐģŅ"
-#: ../pyhoca/wxgui/profilemanager.py:242 ../pyhoca/wxgui/profilemanager.py:260
+#: ../pyhoca/wxgui/profilemanager.py:261 ../pyhoca/wxgui/profilemanager.py:280
msgid "Host"
msgstr "ĐĨĐžŅŅ"
-#: ../pyhoca/wxgui/profilemanager.py:244 ../pyhoca/wxgui/profilemanager.py:262
+#: ../pyhoca/wxgui/profilemanager.py:263 ../pyhoca/wxgui/profilemanager.py:282
msgid "Port"
msgstr "ĐĐžŅŅ"
-#: ../pyhoca/wxgui/profilemanager.py:246
+#: ../pyhoca/wxgui/profilemanager.py:265
msgid "Key"
msgstr "ĐĐģŅŅ"
-#: ../pyhoca/wxgui/profilemanager.py:249
+#: ../pyhoca/wxgui/profilemanager.py:268
msgid "Discover SSH keys or use SSH agent for X2Go authentication"
msgstr ""
"ĐвŅĐžĐŧĐ°ŅиŅĐĩŅĐēи ĐžĐŋŅĐĩĐ´ĐĩĐģŅŅŅ SSH ĐēĐģŅŅи иĐģи иŅĐŋĐžĐģŅСОваŅŅ SSH Đ°ĐŗĐĩĐŊŅ Đ´ĐģŅ "
"Đ°ŅŅĐĩĐŊŅиŅиĐēĐ°Ņии"
-#: ../pyhoca/wxgui/profilemanager.py:251
+#: ../pyhoca/wxgui/profilemanager.py:270
msgid "Enable forwarding of SSH authentication agent connections"
msgstr "РаСŅĐĩŅиŅŅ ŅĐĩŅŅĐ°ĐŊŅĐģŅŅиŅ ŅĐžĐĩдиĐŊĐĩĐŊиК Đ°ĐŗĐĩĐŊŅĐ° SSH"
-#: ../pyhoca/wxgui/profilemanager.py:252
+#: ../pyhoca/wxgui/profilemanager.py:271
+msgid "Store SSH host keys under (unique) X2Go session profile ID"
+msgstr "ĐĄĐžŅ
ŅĐ°ĐŊŅŅŅ SSH ĐēĐģŅŅ ŅĐĩŅвĐĩŅĐ° Ņ ŅĐŊиĐēĐ°ĐģŅĐŊŅĐŧ ID ĐŋŅĐžŅиĐģŅ ŅĐĩŅŅии"
+
+#: ../pyhoca/wxgui/profilemanager.py:272
msgid "Server behind SSH proxy"
msgstr "ĐĄĐĩŅвĐĩŅ Са SSH ĐŋŅĐžĐēŅи"
-#: ../pyhoca/wxgui/profilemanager.py:255
+#: ../pyhoca/wxgui/profilemanager.py:275
msgid "Use same username for X2Go and proxy host"
msgstr "ĐŅĐŋĐžĐģŅСОваŅŅ ŅĐž ĐļĐĩ иĐŧŅ ĐŋĐžĐģŅСОваŅĐĩĐģŅ, ŅŅĐž и ĐŊĐ° ŅĐĩŅвĐĩŅĐĩ X2Go"
-#: ../pyhoca/wxgui/profilemanager.py:256
+#: ../pyhoca/wxgui/profilemanager.py:276
msgid "Use same authentication for X2Go and proxy host"
msgstr "ĐŅĐŋĐžĐģŅСОваŅŅ ŅĐžŅ ĐļĐĩ ĐŋĐ°ŅĐžĐģŅ, ŅŅĐž и ĐŊĐ° ŅĐĩŅвĐĩŅĐĩ X2Go"
-#: ../pyhoca/wxgui/profilemanager.py:257
+#: ../pyhoca/wxgui/profilemanager.py:277
msgid "Key file"
msgstr "ФаКĐģ ĐēĐģŅŅĐ°"
-#: ../pyhoca/wxgui/profilemanager.py:264
-msgid "SSH Proxy Tunnel"
-msgstr "SSH ĐŋŅĐžĐēŅи ŅŅĐŊĐŊĐĩĐģŅ"
-
-#: ../pyhoca/wxgui/profilemanager.py:270
+#: ../pyhoca/wxgui/profilemanager.py:284
msgid "Discover SSH keys or use SSH agent for proxy authentication"
msgstr ""
"ĐвŅĐžĐŧĐ°ŅиŅĐĩŅĐēи ĐžĐŋŅĐĩĐ´ĐĩĐģŅŅŅ SSH ĐēĐģŅŅи иĐģи иŅĐŋĐžĐģŅСОваŅŅ SSH Đ°ĐŗĐĩĐŊŅ Đ´ĐģŅ "
"Đ°ŅŅĐĩĐŊŅиŅиĐēĐ°Ņии ĐŊĐ° ĐŋŅĐžĐēŅи ŅĐĩŅвĐĩŅĐĩ"
-#: ../pyhoca/wxgui/profilemanager.py:273
+#: ../pyhoca/wxgui/profilemanager.py:287
msgid "Modem"
msgstr "ĐОдĐĩĐŧ"
-#: ../pyhoca/wxgui/profilemanager.py:274
+#: ../pyhoca/wxgui/profilemanager.py:288
msgid "ISDN"
msgstr "ISDN"
-#: ../pyhoca/wxgui/profilemanager.py:275
+#: ../pyhoca/wxgui/profilemanager.py:289
msgid "ADSL"
msgstr "ADSL"
-#: ../pyhoca/wxgui/profilemanager.py:276
+#: ../pyhoca/wxgui/profilemanager.py:290
msgid "WAN"
msgstr "WAN"
-#: ../pyhoca/wxgui/profilemanager.py:277
+#: ../pyhoca/wxgui/profilemanager.py:291
msgid "LAN"
msgstr "LAN"
-#: ../pyhoca/wxgui/profilemanager.py:279
+#: ../pyhoca/wxgui/profilemanager.py:293
msgid "Method"
msgstr "ĐĐĩŅОд"
-#: ../pyhoca/wxgui/profilemanager.py:281
+#: ../pyhoca/wxgui/profilemanager.py:295
msgid "Image quality"
msgstr "ĐĐ°ŅĐĩŅŅвО иСОйŅĐ°ĐļĐĩĐŊиŅ"
#. ##
-#. ## wigdets for the SETTINGS tab
+#. ## wigdets for the IO tab
#. ##
-#: ../pyhoca/wxgui/profilemanager.py:287
+#: ../pyhoca/wxgui/profilemanager.py:301
msgid "Fullscreen"
msgstr "ĐĐžĐģĐŊĐžŅĐēŅĐ°ĐŊĐŊŅĐš ŅĐĩĐļиĐŧ"
-#: ../pyhoca/wxgui/profilemanager.py:288
+#: ../pyhoca/wxgui/profilemanager.py:302
msgid "Maximized"
msgstr "ĐĐ°ĐēŅиĐŧĐ°ĐģŅĐŊŅĐš ŅаСĐŧĐĩŅ"
-#: ../pyhoca/wxgui/profilemanager.py:289
+#: ../pyhoca/wxgui/profilemanager.py:303
msgid "Custom Size"
msgstr "ĐŅŅĐŗОК ŅаСĐŧĐĩŅ"
-#: ../pyhoca/wxgui/profilemanager.py:294
+#: ../pyhoca/wxgui/profilemanager.py:308
msgid "Set display DPI"
msgstr "ĐŖŅŅĐ°ĐŊОвиŅŅ DPI"
-#: ../pyhoca/wxgui/profilemanager.py:296
+#: ../pyhoca/wxgui/profilemanager.py:310
msgid "Do not set (use server-side tools to configure the keyboard)"
msgstr "ĐĐĩ ŅŅŅĐ°ĐŊавĐģиваŅŅ (ĐēĐžĐŊŅиĐŗŅŅĐ°ŅиŅ ĐŊĐ° ŅŅĐžŅĐžĐŊĐĩ ŅĐĩŅвĐĩŅĐ°)"
-#: ../pyhoca/wxgui/profilemanager.py:297
+#: ../pyhoca/wxgui/profilemanager.py:311
msgid ""
"Automatically detect and use client-side keyboard configuration inside the "
"session"
msgstr "авŅĐžĐŧĐ°ŅиŅĐĩŅĐēи ĐžĐŋŅĐĩĐ´ĐĩĐģŅŅŅ и иŅĐŋĐžĐģŅСОваŅŅ ŅŅŅĐ°ĐŊОвĐēи ĐŊĐ° ŅŅĐžŅĐžĐŊĐĩ ŅĐĩŅвĐĩŅĐ°"
-#: ../pyhoca/wxgui/profilemanager.py:298
+#: ../pyhoca/wxgui/profilemanager.py:312
msgid "Use custom keyboard settings as provided below"
msgstr "ĐŅĐŋĐžĐģŅСОваŅŅ ŅĐģĐĩĐ´ŅŅŅиĐĩ ŅŅŅĐ°ĐŊОвĐēи"
-#: ../pyhoca/wxgui/profilemanager.py:299
+#: ../pyhoca/wxgui/profilemanager.py:313
msgid "Keyboard model"
msgstr "ĐОдĐĩĐģŅ"
-#: ../pyhoca/wxgui/profilemanager.py:301
+#: ../pyhoca/wxgui/profilemanager.py:315
msgid "Layout"
msgstr "Đ Đ°ŅĐēĐģĐ°Đ´ĐēĐ°"
-#: ../pyhoca/wxgui/profilemanager.py:303
+#: ../pyhoca/wxgui/profilemanager.py:317
msgid "Layout variant"
msgstr "ĐĐ°ŅиаĐŊŅ ŅĐ°ŅĐēĐģĐ°Đ´Đēи"
-#: ../pyhoca/wxgui/profilemanager.py:305
+#. ##
+#. ## wigdets for the MEDIA tab
+#. ##
+#: ../pyhoca/wxgui/profilemanager.py:323
msgid "Enable sound support"
msgstr "ĐĐēŅивиŅОваŅŅ СвŅĐē"
-#: ../pyhoca/wxgui/profilemanager.py:306
+#: ../pyhoca/wxgui/profilemanager.py:324
msgid "Pulse Audio"
msgstr "Pulse Audio"
#. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated.
#. However, config files can contain an Arts configuration, so we will honour this
-#: ../pyhoca/wxgui/profilemanager.py:310
+#: ../pyhoca/wxgui/profilemanager.py:328
msgid "Arts (not supported)"
msgstr "Arts (ĐŊĐĩ ĐŋОддĐĩŅĐļиваĐĩŅŅŅ)"
-#: ../pyhoca/wxgui/profilemanager.py:313
+#: ../pyhoca/wxgui/profilemanager.py:331
msgid "esd"
msgstr "esd"
-#: ../pyhoca/wxgui/profilemanager.py:314
+#: ../pyhoca/wxgui/profilemanager.py:332
msgid "Use default sound port"
msgstr "ĐвŅĐēОвОК ĐŋĐžŅŅ ĐŋĐž ŅĐŧĐžĐģŅĐ°ĐŊиŅ"
-#: ../pyhoca/wxgui/profilemanager.py:315
+#: ../pyhoca/wxgui/profilemanager.py:333
msgid "Custom sound port"
msgstr "ĐŅŅĐŗОК СвŅĐēОвОК ĐŋĐžŅŅ"
-#: ../pyhoca/wxgui/profilemanager.py:318
+#: ../pyhoca/wxgui/profilemanager.py:336
+msgid "Client Side printing"
+msgstr "ĐĐĩŅĐ°ŅŅ ĐŊĐ° ŅŅĐžŅĐžĐŊĐĩ ĐēĐģиĐĩĐŊŅĐ°"
+
+#. ##
+#. ## wigdets for the SHARING tab
+#. ##
+#: ../pyhoca/wxgui/profilemanager.py:342
msgid "Use local folder sharing"
msgstr "ĐĐžŅŅŅĐŋ Đē ĐģĐžĐēĐ°ĐģŅĐŊŅĐŧ ĐēĐ°ŅĐ°ĐģĐžĐŗĐ°Đŧ"
-#: ../pyhoca/wxgui/profilemanager.py:319
-#, fuzzy
+#: ../pyhoca/wxgui/profilemanager.py:343
msgid "Store share list at end of session"
-msgstr ""
-"ĐŅŅĐŗОК ĐēĐģиĐĩĐŊŅ СаĐŋŅŅĐēĐ°ĐĩŅ ŅĐĩŅŅиŅ X2Go\n"
-"%s"
+msgstr "ĐĄĐžŅ
ŅĐ°ĐŊиŅŅ ŅĐŋиŅĐžĐē ŅĐēŅĐŋĐžŅŅиŅŅĐĩĐŧŅŅ
ĐēĐ°ŅĐ°ĐģĐžĐŗОв ĐŋĐž СавĐĩŅŅĐĩĐŊиŅ ŅĐĩŅŅии"
-#: ../pyhoca/wxgui/profilemanager.py:320
+#: ../pyhoca/wxgui/profilemanager.py:344
msgid "Path"
msgstr "ĐŅŅŅ"
-#: ../pyhoca/wxgui/profilemanager.py:323 ../pyhoca/wxgui/profilemanager.py:344
+#: ../pyhoca/wxgui/profilemanager.py:347 ../pyhoca/wxgui/profilemanager.py:366
msgid "Add"
msgstr "ĐОйавиŅŅ"
-#: ../pyhoca/wxgui/profilemanager.py:325
+#: ../pyhoca/wxgui/profilemanager.py:349
msgid "Local Path"
msgstr "ĐĐžĐēĐ°ĐģŅĐŊŅĐš ĐŋŅŅŅ"
-#: ../pyhoca/wxgui/profilemanager.py:326
+#: ../pyhoca/wxgui/profilemanager.py:350
msgid "Connect Method"
msgstr "ĐĐĩŅОд ĐŋОдĐēĐģŅŅĐĩĐŊиŅ"
-#: ../pyhoca/wxgui/profilemanager.py:327
+#: ../pyhoca/wxgui/profilemanager.py:351
msgid "Delete"
msgstr "ĐŖĐ´Đ°ĐģиŅŅ"
-#: ../pyhoca/wxgui/profilemanager.py:329
+#: ../pyhoca/wxgui/profilemanager.py:353
msgid "Convert between client and server encodings"
msgstr "ĐОдиŅОвĐēĐ° иĐŧĐĩĐŊ ŅĐ°ĐšĐģОв"
-#: ../pyhoca/wxgui/profilemanager.py:330
+#: ../pyhoca/wxgui/profilemanager.py:354
msgid "Client encoding"
msgstr "ĐĐ° ŅŅĐžŅĐžĐŊĐĩ ĐēĐģиĐĩĐŊŅĐ°"
-#: ../pyhoca/wxgui/profilemanager.py:332
+#: ../pyhoca/wxgui/profilemanager.py:356
msgid "Server encoding"
msgstr "ĐĐ° ŅŅĐžŅĐžĐŊĐĩ ŅĐĩŅвĐĩŅĐ°"
-#: ../pyhoca/wxgui/profilemanager.py:335
+#: ../pyhoca/wxgui/profilemanager.py:359
msgid "Use file MIME box for local file import"
msgstr "ĐŅĐŋĐžĐģŅСОваŅŅ MIME box Đ´ĐģŅ иĐŧĐŋĐžŅŅĐ° ĐģĐžĐēĐ°ĐģŅĐŊŅŅ
ŅĐ°ĐšĐģОв"
-#: ../pyhoca/wxgui/profilemanager.py:336
+#: ../pyhoca/wxgui/profilemanager.py:360
msgid "Extensions"
msgstr "Đ Đ°ŅŅиŅĐĩĐŊиŅ"
-#: ../pyhoca/wxgui/profilemanager.py:338
+#: ../pyhoca/wxgui/profilemanager.py:362
msgid "Action"
msgstr "ĐĐĩĐšŅŅвиĐĩ"
-#: ../pyhoca/wxgui/profilemanager.py:341
-msgid "Client Side printing"
-msgstr "ĐĐĩŅĐ°ŅŅ ĐŊĐ° ŅŅĐžŅĐžĐŊĐĩ ĐēĐģиĐĩĐŊŅĐ°"
-
-#: ../pyhoca/wxgui/profilemanager.py:345
+#: ../pyhoca/wxgui/profilemanager.py:367
msgid "Defaults"
msgstr "ĐĐž ŅĐŧĐžĐģŅĐ°ĐŊиŅ"
-#: ../pyhoca/wxgui/profilemanager.py:347
+#: ../pyhoca/wxgui/profilemanager.py:369
msgid "Save"
msgstr "ĐĄĐžŅ
ŅĐ°ĐŊиŅŅ"
-#: ../pyhoca/wxgui/profilemanager.py:348
+#: ../pyhoca/wxgui/profilemanager.py:370
msgid "Reset"
msgstr "ĐĐžŅŅŅĐ°ĐŊОвиŅŅ"
-#: ../pyhoca/wxgui/profilemanager.py:401
-#: ../pyhoca/wxgui/profilemanager.py:1124
-#: ../pyhoca/wxgui/profilemanager.py:2268
+#: ../pyhoca/wxgui/profilemanager.py:372 ../pyhoca/wxgui/printingprefs.py:143
+msgid "Apply"
+msgstr "ĐŅиĐŧĐĩĐŊиŅŅ"
+
+#: ../pyhoca/wxgui/profilemanager.py:423
+#: ../pyhoca/wxgui/profilemanager.py:1135
+#: ../pyhoca/wxgui/profilemanager.py:2303
msgid "automatically"
msgstr "авŅĐžĐŧĐ°ŅиŅĐĩŅĐēи"
-#: ../pyhoca/wxgui/profilemanager.py:403
-#: ../pyhoca/wxgui/profilemanager.py:1126
+#: ../pyhoca/wxgui/profilemanager.py:425
+#: ../pyhoca/wxgui/profilemanager.py:1137
msgid "manually"
msgstr "вŅŅŅĐŊŅŅ"
-#: ../pyhoca/wxgui/profilemanager.py:412
+#: ../pyhoca/wxgui/profilemanager.py:434
msgid "PyHoca-GUI Profile Manager - new profile"
msgstr "PyHoca-GUI Profile Manager - ĐŊОвŅĐš ĐŋŅĐžŅиĐģŅ"
-#: ../pyhoca/wxgui/profilemanager.py:414
+#: ../pyhoca/wxgui/profilemanager.py:436
#, python-format
msgid "PyHoca-GUI Profile Manager - %s (connected)"
msgstr "PyHoca-GUI Profile Manager - %s (ŅĐžĐĩдиĐŊĐĩĐŊиĐĩ)"
-#: ../pyhoca/wxgui/profilemanager.py:416
+#: ../pyhoca/wxgui/profilemanager.py:438
#, python-format
msgid "PyHoca-GUI Profile Manager - %s"
msgstr "PyHoca-GUI Profile Manager - %s"
-#: ../pyhoca/wxgui/profilemanager.py:797
+#: ../pyhoca/wxgui/profilemanager.py:804
msgid "Profile"
msgstr "ĐŅĐžŅиĐģŅ"
-#: ../pyhoca/wxgui/profilemanager.py:798
+#: ../pyhoca/wxgui/profilemanager.py:805
msgid "Session"
msgstr "ĐĄĐĩŅŅиŅ"
-#: ../pyhoca/wxgui/profilemanager.py:799
+#: ../pyhoca/wxgui/profilemanager.py:806
msgid "Connection"
msgstr "ĐĄĐžĐĩдиĐŊĐĩĐŊиĐĩ"
-#: ../pyhoca/wxgui/profilemanager.py:800
+#: ../pyhoca/wxgui/profilemanager.py:807
msgid "Link Quality"
msgstr "ĐĐ°ŅĐĩŅŅвО ŅĐžĐĩдиĐŊĐĩĐŊиŅ"
-#: ../pyhoca/wxgui/profilemanager.py:801
-msgid "Settings"
-msgstr "ĐŖŅŅĐ°ĐŊОвĐēи"
+#: ../pyhoca/wxgui/profilemanager.py:808
+msgid "Input/Output"
+msgstr "ĐвОд/ĐŅвОд"
+
+#: ../pyhoca/wxgui/profilemanager.py:809
+msgid "Media"
+msgstr "ĐĐĩдиа"
-#: ../pyhoca/wxgui/profilemanager.py:802
+#: ../pyhoca/wxgui/profilemanager.py:810
msgid "Sharing"
msgstr "ĐĐžŅŅŅĐŋ"
-#: ../pyhoca/wxgui/profilemanager.py:988
+#: ../pyhoca/wxgui/profilemanager.py:989
msgid "<xkbtype>"
msgstr "<xkbtype>"
-#: ../pyhoca/wxgui/profilemanager.py:989
+#: ../pyhoca/wxgui/profilemanager.py:990
msgid "<xkblayout>"
msgstr "<xkblayout>"
-#: ../pyhoca/wxgui/profilemanager.py:990
+#: ../pyhoca/wxgui/profilemanager.py:991
msgid "<xkbvariant>"
msgstr "<xkbvariant>"
-#: ../pyhoca/wxgui/profilemanager.py:1444
+#: ../pyhoca/wxgui/profilemanager.py:1449
msgid "Icon Files (*.png)|*.png|All files (*.*)|*"
msgstr "ĐŅĐ°ŅиŅĐĩŅĐēиĐĩ ŅĐ°ĐšĐģŅ (*.png)|*.png|ĐŅĐĩ ŅĐ°ĐšĐģŅ (*.*)|*"
-#: ../pyhoca/wxgui/profilemanager.py:1447
+#: ../pyhoca/wxgui/profilemanager.py:1452
msgid "Choose an icon for this session profile"
msgstr "ĐŅĐąŅĐ°ŅŅ ĐŋиĐēŅĐžĐŗŅĐ°ĐŧĐŧŅ"
-#: ../pyhoca/wxgui/profilemanager.py:1816
+#: ../pyhoca/wxgui/profilemanager.py:1895
msgid "All files (*.*)|*"
msgstr "ĐŅĐĩ ŅĐ°ĐšĐģŅ (*.*)|*"
-#: ../pyhoca/wxgui/profilemanager.py:1818
-#: ../pyhoca/wxgui/profilemanager.py:1842
+#: ../pyhoca/wxgui/profilemanager.py:1897
+#: ../pyhoca/wxgui/profilemanager.py:1921
msgid "Choose a public SSH key"
msgstr "ĐŅĐąŅĐ°ŅŅ ĐŋŅĐąĐģиŅĐŊŅĐš ĐēĐģŅŅ SSH"
-#: ../pyhoca/wxgui/profilemanager.py:2220
+#: ../pyhoca/wxgui/profilemanager.py:2255
msgid "Choose a folder to share within a session"
msgstr "ĐŅĐąŅĐ°ŅŅ ŅĐēŅĐŋĐžŅŅиŅŅĐĩĐŧŅĐš ĐēĐ°ŅĐ°ĐģĐžĐŗ"
-#: ../pyhoca/wxgui/profilemanager.py:2348
-#: ../pyhoca/wxgui/profilemanager.py:2351
-#: ../pyhoca/wxgui/profilemanager.py:2354
-#: ../pyhoca/wxgui/profilemanager.py:2359
-#: ../pyhoca/wxgui/profilemanager.py:2369 ../pyhoca/wxgui/menus_taskbar.py:117
+#: ../pyhoca/wxgui/profilemanager.py:2383
+#: ../pyhoca/wxgui/profilemanager.py:2386
+#: ../pyhoca/wxgui/profilemanager.py:2389 ../pyhoca/wxgui/menus_taskbar.py:122
msgid "Profile Manager"
msgstr "Profile Manager"
-#: ../pyhoca/wxgui/profilemanager.py:2348
+#: ../pyhoca/wxgui/profilemanager.py:2383
msgid "Profile name is missing, profile unusable!!!"
msgstr "ĐĐŧŅ ĐŋŅĐžŅиĐģŅ ĐŊĐĩ ŅŅŅĐ°ĐŊОвĐģĐĩĐŊĐž!!!"
-#: ../pyhoca/wxgui/profilemanager.py:2351
-#: ../pyhoca/wxgui/profilemanager.py:2354
+#: ../pyhoca/wxgui/profilemanager.py:2386
+#: ../pyhoca/wxgui/profilemanager.py:2389
#, python-format
msgid "Profile name %s already exists!!!"
msgstr "ĐŅĐžŅиĐģŅ Ņ иĐŧĐĩĐŊĐĩĐŧ %s ŅĐļĐĩ ŅŅŅĐĩŅŅвŅĐĩŅ!!!"
-#: ../pyhoca/wxgui/profilemanager.py:2359
-msgid "The SSH proxy configuration is incomplete. Try again."
-msgstr "ĐĐžĐŊŅиĐŗŅŅĐ°ŅиŅ SSH ĐŋŅĐžĐēŅи ĐŊĐĩ СавĐĩŅŅĐĩĐŊĐ°. ĐĐžĐŋŅОйŅĐšŅĐĩ ĐĩŅĐĩ ŅаС."
-
-#: ../pyhoca/wxgui/profilemanager.py:2369
-#, python-format
-msgid ""
-"Another session profile (%s) already uses [%s]:%s for binding a local SSH "
-"proxy to.\n"
-"Please change the SSH proxy settings accordingly."
-msgstr ""
-"ĐŅŅĐŗОК ĐŋŅĐžŅиĐģŅ (%s) иŅĐŋĐžĐģŅСŅĐĩŅ [%s]:%s Đ´ĐģŅ ĐŋŅивŅСĐēи Đē ĐģĐžĐēĐ°ĐģŅĐŊĐžĐŧŅ SSH "
-"ĐŋŅĐžĐēŅи.\n"
-"ĐСĐŧĐĩĐŊиŅĐĩ ĐŊĐ°ŅŅŅОКĐēи SSH ĐŋŅĐžĐēŅи."
-
-#: ../pyhoca/wxgui/profilemanager.py:2396
+#: ../pyhoca/wxgui/profilemanager.py:2416
#, python-format
msgid "%s - profile added"
msgstr "%s - ĐŋŅĐžŅиĐģŅ дОйавĐģĐĩĐŊ"
-#: ../pyhoca/wxgui/profilemanager.py:2397
+#: ../pyhoca/wxgui/profilemanager.py:2417
msgid "A new session profile has been added."
msgstr "ĐОвŅĐš ĐŋŅĐžŅиĐģŅ ŅĐĩŅŅии дОйавĐģĐĩĐŊ."
-#: ../pyhoca/wxgui/profilemanager.py:2401
+#: ../pyhoca/wxgui/profilemanager.py:2421
#, python-format
msgid "%s - modified"
msgstr "%s - ĐŧОдиŅиŅиŅОваĐŊ"
-#: ../pyhoca/wxgui/profilemanager.py:2402
+#: ../pyhoca/wxgui/profilemanager.py:2422
msgid "Changes to profile have been saved."
msgstr "ĐСĐŧĐĩĐŊĐĩĐŊиŅ в ĐŋŅĐžŅиĐģĐĩ ŅĐžŅ
ŅĐ°ĐŊĐĩĐŊŅ."
-#: ../pyhoca/wxgui/menus_taskbar.py:74
+#: ../pyhoca/wxgui/listdesktops.py:82
+#, python-format
+msgid "Share Desktop Session - %s"
+msgstr "ĐŋŅиŅĐžĐĩдиĐŊиŅŅŅŅ Đē ŅŅŅĐĩŅŅвŅŅŅĐĩĐš ŅĐĩŅŅии - %s"
+
+#: ../pyhoca/wxgui/listdesktops.py:84
+msgid "Select one of the available desktop sessions on this server"
+msgstr "ĐŅĐąĐĩŅиŅĐĩ ОдĐŊŅ иС Đ´ĐžŅŅŅĐŋĐŊŅŅ
ŅĐĩŅŅиК ĐŊĐ° ŅĐĩŅвĐĩŅĐĩ"
+
+#: ../pyhoca/wxgui/listdesktops.py:90
+msgid "View session only"
+msgstr "ĐĸĐžĐģŅĐēĐž ĐŋŅĐžŅĐŧĐžŅŅ ŅĐĩŅŅии"
+
+#: ../pyhoca/wxgui/listdesktops.py:91
+msgid "Gain full access"
+msgstr "ĐŅĐēŅŅŅŅ ĐŋĐžĐģĐŊŅĐš Đ´ĐžŅŅŅĐŋ"
+
+#: ../pyhoca/wxgui/listdesktops.py:95
+msgid "Share Desktop"
+msgstr "РаСдĐĩĐģиŅŅ ĐĐĩŅĐēŅĐžĐŋ"
+
+#: ../pyhoca/wxgui/listdesktops.py:98
+msgid "Refresh list"
+msgstr "ĐĐąĐŊОвиŅŅ ŅĐŋиŅĐžĐē"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:76
msgid "Edit Profile"
msgstr "Đ ĐĩĐ´Đ°ĐēŅиŅОваŅŅ ĐŋŅĐžŅиĐģŅ"
-#: ../pyhoca/wxgui/menus_taskbar.py:77
+#: ../pyhoca/wxgui/menus_taskbar.py:79
msgid "Use as Template for New Profile"
msgstr "ĐŅĐŋĐžĐģŅСОваŅŅ в ĐēĐ°ŅĐĩŅŅвĐĩ ŅĐ°ĐąĐģĐžĐŊĐ° Đ´ĐģŅ ĐŊОвОĐŗĐž ĐŋŅĐžŅиĐģŅ"
-#: ../pyhoca/wxgui/menus_taskbar.py:78
+#: ../pyhoca/wxgui/menus_taskbar.py:81
+msgid "Export Profile"
+msgstr "ĐĐēŅĐŋĐžŅŅ ĐŋŅĐžŅиĐģŅ"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:82
msgid "Delete Profile"
msgstr "ĐŖĐ´Đ°ĐģиŅŅ ĐŋŅĐžŅиĐģŅ"
-#: ../pyhoca/wxgui/menus_taskbar.py:106
+#: ../pyhoca/wxgui/menus_taskbar.py:111
#, python-format
msgid "About %s (%s)..."
msgstr "Đ %s (%s)..."
-#: ../pyhoca/wxgui/menus_taskbar.py:132
+#: ../pyhoca/wxgui/menus_taskbar.py:137
msgid "Manage Session Profile"
msgstr "ĐŖĐŋŅавĐģĐĩĐŊиĐĩ ĐŋŅĐžŅиĐģĐĩĐŧ ŅĐĩŅŅии"
-#: ../pyhoca/wxgui/menus_taskbar.py:141
+#: ../pyhoca/wxgui/menus_taskbar.py:146
msgid "Printing Preferences"
msgstr "ĐŖŅŅĐ°ĐŊОвĐēи ĐŋĐĩŅĐ°Ņи"
-#: ../pyhoca/wxgui/menus_taskbar.py:147
+#: ../pyhoca/wxgui/menus_taskbar.py:152
msgid "Client Options"
msgstr "ĐĐŋŅии ĐēĐģиĐĩĐŊŅĐ°"
-#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:783
-#: ../pyhoca/wxgui/menus_taskbar.py:975
+#: ../pyhoca/wxgui/menus_taskbar.py:160 ../pyhoca/wxgui/menus_taskbar.py:828
+#: ../pyhoca/wxgui/menus_taskbar.py:1033
msgid "E&xit"
msgstr "ĐŅ&Ņ
Од"
-#: ../pyhoca/wxgui/menus_taskbar.py:227
+#: ../pyhoca/wxgui/menus_taskbar.py:232
msgid "Window title"
msgstr "ĐĐ°ĐŗĐžĐģОвОĐē ĐžĐēĐŊĐ°"
-#: ../pyhoca/wxgui/menus_taskbar.py:233 ../pyhoca/wxgui/menus_taskbar.py:608
+#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:631
msgid "Resume Session"
msgstr "ĐĐžŅŅŅĐ°ĐŊОвиŅŅ ŅĐĩŅŅиŅ"
-#: ../pyhoca/wxgui/menus_taskbar.py:235
+#: ../pyhoca/wxgui/menus_taskbar.py:240
msgid "Resume Session (not possible)"
msgstr "ĐĐžŅŅŅĐ°ĐŊОвиŅŅ ŅĐĩŅŅиŅ (ĐŊĐĩвОСĐŧĐžĐļĐŊĐž)"
-#: ../pyhoca/wxgui/menus_taskbar.py:246
+#: ../pyhoca/wxgui/menus_taskbar.py:251
msgid "Transfer Session"
msgstr "ĐĸŅĐ°ĐŊŅŅĐĩŅ ŅĐĩŅŅии"
-#: ../pyhoca/wxgui/menus_taskbar.py:248
+#: ../pyhoca/wxgui/menus_taskbar.py:253
msgid "Transfer Session (not possible)"
msgstr "ĐĸŅĐ°ĐŊŅŅĐĩŅ ŅĐĩŅŅии (ĐŊĐĩвОСĐŧĐžĐļĐĩĐŊ)"
-#: ../pyhoca/wxgui/menus_taskbar.py:252 ../pyhoca/wxgui/menus_taskbar.py:599
+#: ../pyhoca/wxgui/menus_taskbar.py:258 ../pyhoca/wxgui/menus_taskbar.py:622
msgid "Suspend Session (and disconnect/exit)"
msgstr "ĐŅĐĩŅваŅŅ ŅĐĩŅŅиŅ (и ŅаСŅĐĩдиĐŊиŅŅ/вŅĐšŅи)"
-#: ../pyhoca/wxgui/menus_taskbar.py:254 ../pyhoca/wxgui/menus_taskbar.py:601
+#: ../pyhoca/wxgui/menus_taskbar.py:260 ../pyhoca/wxgui/menus_taskbar.py:624
msgid "Suspend Session (and disconnect)"
msgstr "ĐŅĐĩŅваŅŅ ŅĐĩŅŅиŅ (и ŅаСŅĐĩдиĐŊиŅŅ)"
-#: ../pyhoca/wxgui/menus_taskbar.py:256 ../pyhoca/wxgui/menus_taskbar.py:603
+#: ../pyhoca/wxgui/menus_taskbar.py:262 ../pyhoca/wxgui/menus_taskbar.py:626
msgid "Suspend Session"
msgstr "ĐŅĐĩŅваŅŅ ŅĐĩŅŅиŅ"
-#: ../pyhoca/wxgui/menus_taskbar.py:262 ../pyhoca/wxgui/menus_taskbar.py:612
+#: ../pyhoca/wxgui/menus_taskbar.py:268 ../pyhoca/wxgui/menus_taskbar.py:635
msgid "Terminate Session (and disconnect/exit)"
msgstr "ĐавĐĩŅŅиŅŅ ŅĐĩŅŅиŅ (и ŅаСŅĐĩдиĐŊиŅŅ/вŅĐšŅи)"
-#: ../pyhoca/wxgui/menus_taskbar.py:264 ../pyhoca/wxgui/menus_taskbar.py:614
+#: ../pyhoca/wxgui/menus_taskbar.py:270 ../pyhoca/wxgui/menus_taskbar.py:637
msgid "Terminate Session (and disconnect)"
msgstr "ĐавĐĩŅŅиŅŅ ŅĐĩŅŅиŅ (и ŅаСŅĐĩдиĐŊиŅŅ)"
-#: ../pyhoca/wxgui/menus_taskbar.py:266 ../pyhoca/wxgui/menus_taskbar.py:616
+#: ../pyhoca/wxgui/menus_taskbar.py:272 ../pyhoca/wxgui/menus_taskbar.py:639
msgid "Terminate Session"
msgstr "ĐавĐĩŅŅиŅŅ ŅĐĩŅŅиŅ"
-#: ../pyhoca/wxgui/menus_taskbar.py:270 ../pyhoca/wxgui/menus_taskbar.py:596
+#: ../pyhoca/wxgui/menus_taskbar.py:275
+msgid "End Desktop Sharing (and disconnect/exit)"
+msgstr "ĐавĐĩŅŅиŅŅ ŅĐĩŅŅиŅ (и ŅаСŅĐĩдиĐŊиŅŅ/вŅĐšŅи)"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:277
+msgid "End Desktop Sharing (and disconnect)"
+msgstr "ĐавĐĩŅŅиŅŅ ŅĐĩŅŅиŅ (и ŅаСŅĐĩдиĐŊиŅŅ)"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:279
+msgid "End Desktop Sharing"
+msgstr "ĐавĐĩŅŅиŅŅ ŅĐĩŅŅиŅ"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:283 ../pyhoca/wxgui/menus_taskbar.py:619
msgid "Refresh menu tree"
msgstr "ĐĐąĐŊОвиŅŅ ĐŧĐĩĐŊŅ"
-#: ../pyhoca/wxgui/menus_taskbar.py:279
+#: ../pyhoca/wxgui/menus_taskbar.py:292
msgid "Rename Session Window"
msgstr "ĐĐĩŅĐĩиĐŧĐĩĐŊОваŅŅ ĐžĐēĐŊĐž ŅĐĩŅŅии"
-#: ../pyhoca/wxgui/menus_taskbar.py:280
+#: ../pyhoca/wxgui/menus_taskbar.py:293
msgid "Show Session Window"
msgstr "ĐĐžĐēаСаŅŅ ĐžĐēĐŊĐž ŅĐĩŅŅии"
-#: ../pyhoca/wxgui/menus_taskbar.py:322
+#: ../pyhoca/wxgui/menus_taskbar.py:335
msgid "&Share custom local folder"
msgstr "Đ&ĐēŅĐŋĐžŅŅ ĐŋŅОиСвОĐģŅĐŊĐžĐŗĐž ĐēĐ°ŅĐ°ĐģĐžĐŗĐ°"
-#: ../pyhoca/wxgui/menus_taskbar.py:337
+#: ../pyhoca/wxgui/menus_taskbar.py:350
msgid "Share:"
msgstr "ĐĐēŅĐŋĐžŅŅ:"
-#: ../pyhoca/wxgui/menus_taskbar.py:346
+#: ../pyhoca/wxgui/menus_taskbar.py:359
msgid "Unshare:"
msgstr "РаСŅĐĩдиĐŊиŅŅ:"
-#: ../pyhoca/wxgui/menus_taskbar.py:354
+#: ../pyhoca/wxgui/menus_taskbar.py:367
msgid "Unshare &all local folders"
msgstr "РаСŅĐĩдиĐŊиŅŅ &вŅĐĩ ĐēĐ°ŅĐ°ĐģĐžĐŗи"
-#: ../pyhoca/wxgui/menus_taskbar.py:360
+#: ../pyhoca/wxgui/menus_taskbar.py:373
msgid "Restore shares in next session"
-msgstr ""
+msgstr "ĐĐžŅŅŅĐ°ĐŊОвиŅŅ ŅĐēŅĐŋĐžŅŅиŅŅĐĩĐŧŅĐĩ ĐēĐ°ŅĐ°ĐģĐžĐŗи в ŅĐģĐĩĐ´ŅŅŅĐĩĐš ŅĐĩŅŅии"
-#: ../pyhoca/wxgui/menus_taskbar.py:440
+#: ../pyhoca/wxgui/menus_taskbar.py:453
msgid "Multimedia"
msgstr "ĐŅĐģŅŅиĐŧĐĩдиа"
-#: ../pyhoca/wxgui/menus_taskbar.py:441
+#: ../pyhoca/wxgui/menus_taskbar.py:454
msgid "Development"
msgstr "РаСŅайОŅĐēĐ°"
-#: ../pyhoca/wxgui/menus_taskbar.py:442
+#: ../pyhoca/wxgui/menus_taskbar.py:455
msgid "Education"
msgstr "ĐĐąŅаСОваĐŊиĐĩ"
-#: ../pyhoca/wxgui/menus_taskbar.py:443
+#: ../pyhoca/wxgui/menus_taskbar.py:456
msgid "Games"
msgstr "ĐĐŗŅŅ"
-#: ../pyhoca/wxgui/menus_taskbar.py:444
+#: ../pyhoca/wxgui/menus_taskbar.py:457
msgid "Graphics"
msgstr "ĐŅĐ°ŅиĐēĐ°"
-#: ../pyhoca/wxgui/menus_taskbar.py:445
+#: ../pyhoca/wxgui/menus_taskbar.py:458
msgid "Internet"
msgstr "ĐĐŊŅĐĩŅĐŊĐĩŅ"
-#: ../pyhoca/wxgui/menus_taskbar.py:446
+#: ../pyhoca/wxgui/menus_taskbar.py:459
msgid "Office Applications"
msgstr "ĐŅиŅĐŊŅĐĩ ĐŋŅиĐģĐžĐļĐĩĐŊиŅ"
-#: ../pyhoca/wxgui/menus_taskbar.py:447
+#: ../pyhoca/wxgui/menus_taskbar.py:460
msgid "System"
msgstr "ХиŅŅĐĩĐŧĐŊŅĐĩ"
-#: ../pyhoca/wxgui/menus_taskbar.py:448
+#: ../pyhoca/wxgui/menus_taskbar.py:461
msgid "Utilities"
msgstr "ĐŖŅиĐģиŅŅ"
-#: ../pyhoca/wxgui/menus_taskbar.py:449
+#: ../pyhoca/wxgui/menus_taskbar.py:462
msgid "Other Applications"
msgstr "ĐŅŅĐŗиĐĩ ĐŋŅĐžĐŗŅĐ°ĐŧĐŧŅ"
-#: ../pyhoca/wxgui/menus_taskbar.py:521 ../pyhoca/wxgui/menus_taskbar.py:533
+#: ../pyhoca/wxgui/menus_taskbar.py:535 ../pyhoca/wxgui/menus_taskbar.py:547
#, python-format
msgid "Connect %s"
msgstr "ĐĄĐžĐĩдиĐŊĐĩĐŊиĐĩ %s"
-#: ../pyhoca/wxgui/menus_taskbar.py:527
+#: ../pyhoca/wxgui/menus_taskbar.py:541
msgid "Currently connecting..."
msgstr "ĐĄĐžĐĩдиĐŊĐĩĐŊиĐĩ ..."
-#: ../pyhoca/wxgui/menus_taskbar.py:541
+#: ../pyhoca/wxgui/menus_taskbar.py:556
msgid "Start &new Desktop Session"
msgstr "ĐĐ°ĐŋŅŅŅиŅŅ &ĐŊОвŅŅ ŅĐĩŅŅиŅ"
-#: ../pyhoca/wxgui/menus_taskbar.py:546 ../pyhoca/wxgui/menus_taskbar.py:684
+#: ../pyhoca/wxgui/menus_taskbar.py:560 ../pyhoca/wxgui/menus_taskbar.py:660
+msgid "Start Desktop Sharing Session"
+msgstr "ĐĐ°ĐŋŅŅŅиŅŅ ŅĐĩŅŅиŅ ŅаСдĐĩĐģĐĩĐŊиŅ Đ´ĐĩŅĐēŅĐžĐŋĐ°"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:566 ../pyhoca/wxgui/menus_taskbar.py:710
msgid "Retrieving Application Menu..."
msgstr "ĐĐžĐģŅŅĐ°ĐĩĐŧ ĐŧĐĩĐŊŅ ĐŋŅиĐģĐžĐļĐĩĐŊиК..."
-#: ../pyhoca/wxgui/menus_taskbar.py:550 ../pyhoca/wxgui/menus_taskbar.py:687
+#: ../pyhoca/wxgui/menus_taskbar.py:570 ../pyhoca/wxgui/menus_taskbar.py:713
msgid "Retrieve Application Menu"
msgstr "ĐĐžĐģŅŅиŅŅ ĐŧĐĩĐŊŅ ĐŋŅиĐģĐžĐļĐĩĐŊиК"
-#: ../pyhoca/wxgui/menus_taskbar.py:553
+#: ../pyhoca/wxgui/menus_taskbar.py:573
+msgid "Start &new RDP Session"
+msgstr "ĐĐ°ĐŋŅŅŅиŅŅ &ĐŊОвŅŅ RDP ŅĐĩŅŅиŅ"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:576
msgid "Start &new Session"
msgstr "ĐĐ°ĐŋŅŅŅиŅŅ &ĐŊОвŅŅ ŅĐĩŅŅиŅ"
-#: ../pyhoca/wxgui/menus_taskbar.py:633
+#: ../pyhoca/wxgui/menus_taskbar.py:656
msgid "Launch Single Application"
msgstr "ĐĐ°ĐŋŅŅŅиŅŅ ĐŋŅиĐģĐžĐļĐĩĐŊиĐĩ"
-#: ../pyhoca/wxgui/menus_taskbar.py:671
+#: ../pyhoca/wxgui/menus_taskbar.py:697
msgid "Manage Application Menu"
msgstr "ĐŖĐŋŅавĐģĐĩĐŊиĐĩ ĐŧĐĩĐŊŅ ĐŋŅиĐģĐžĐļĐĩĐŊиК"
-#: ../pyhoca/wxgui/menus_taskbar.py:714
+#: ../pyhoca/wxgui/menus_taskbar.py:752
msgid "Running"
msgstr "ĐŅĐŋĐžĐģĐŊŅĐĩŅŅŅ"
-#: ../pyhoca/wxgui/menus_taskbar.py:716
+#: ../pyhoca/wxgui/menus_taskbar.py:754
msgid "Suspended"
msgstr "ĐŅиОŅŅĐ°ĐŊОвĐģĐĩĐŊĐž"
-#: ../pyhoca/wxgui/menus_taskbar.py:735
+#: ../pyhoca/wxgui/menus_taskbar.py:773
msgid "&Clean all sessions"
msgstr "&ĐŅиŅŅиŅŅ вŅĐĩ ŅĐĩŅŅии"
-#: ../pyhoca/wxgui/menus_taskbar.py:741
+#: ../pyhoca/wxgui/menus_taskbar.py:779
msgid "Customize &profile"
msgstr "ĐСĐŧĐĩĐŊиŅŅ &ĐŋŅĐžŅиĐģŅ"
-#: ../pyhoca/wxgui/menus_taskbar.py:756
+#: ../pyhoca/wxgui/menus_taskbar.py:794
msgid "Shared &folders"
msgstr "ĐĐēŅĐŋĐžŅŅ &ĐēĐ°ŅĐ°ĐģĐžĐŗОв"
-#: ../pyhoca/wxgui/menus_taskbar.py:768
+#: ../pyhoca/wxgui/menus_taskbar.py:806
+msgid "Server Information"
+msgstr "ĐĐŊŅĐžŅĐŧĐ°ŅиŅ Đž ŅĐĩŅвĐĩŅĐĩ"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:813
msgid "&Disconnect from Server"
msgstr "&ĐŅŅĐžĐĩдиĐŊиŅŅ ĐžŅ ŅĐĩŅвĐĩŅĐ°"
-#: ../pyhoca/wxgui/menus_taskbar.py:775
+#: ../pyhoca/wxgui/menus_taskbar.py:820
msgid "Suspend Session and E&xit application"
msgstr "&ĐŅĐĩŅваŅŅ ŅĐĩŅŅиŅ и ĐŋĐžĐēиĐŊŅŅŅ ĐŋŅĐžĐŗŅĐ°ĐŧĐŧŅ"
-#: ../pyhoca/wxgui/menus_taskbar.py:779
+#: ../pyhoca/wxgui/menus_taskbar.py:824
msgid "Disconnect and E&xit application"
msgstr "&РаСŅĐĩдиĐŊиŅŅ и ĐŋĐžĐēиĐŊŅŅŅ ĐŋŅĐžĐŗŅĐ°ĐŧĐŧŅ"
-#: ../pyhoca/wxgui/menus_taskbar.py:833
+#: ../pyhoca/wxgui/menus_taskbar.py:878
msgid "Add Profile"
msgstr "ĐОйавиŅŅ ĐŋŅĐžŅиĐģŅ"
-#: ../pyhoca/wxgui/menus_taskbar.py:909
+#: ../pyhoca/wxgui/menus_taskbar.py:954
msgid "No session profiles defined"
msgstr "ĐŅĐžŅиĐģи ĐŊĐĩ ĐžĐŋŅĐĩĐ´ĐĩĐģĐĩĐŊŅ"
-#: ../pyhoca/wxgui/menus_taskbar.py:945
-msgid "Start/Resume Session"
-msgstr "ĐĐ°ĐŋŅŅĐē/вОŅŅŅĐ°ĐŊОвĐģĐĩĐŊиĐĩ ŅĐĩŅŅии"
+#: ../pyhoca/wxgui/menus_taskbar.py:965
+msgid "Export all Profiles"
+msgstr "ĐĐēŅĐŋĐžŅŅиŅОваŅŅ вŅĐĩ ĐŋŅĐžŅиĐģи"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:967
+msgid "Export Profile Group"
+msgstr "ĐĐēŅĐŋĐžŅŅиŅОваŅŅ ĐŗŅŅĐŋĐŋŅ ĐŋŅĐžŅиĐģĐĩĐš"
-#: ../pyhoca/wxgui/menus_taskbar.py:945
+#: ../pyhoca/wxgui/menus_taskbar.py:1003
msgid "Connect Server"
msgstr "ĐĄĐžĐĩдиĐŊиŅŅ Ņ ŅĐĩŅвĐĩŅĐžĐŧ"
@@ -968,62 +1023,61 @@ msgstr "ĐĄĐžĐĩдиĐŊиŅŅ Ņ ŅĐĩŅвĐĩŅĐžĐŧ"
msgid "About %s ..."
msgstr "Đ %s ..."
-#: ../pyhoca/wxgui/frontend.py:459
+#: ../pyhoca/wxgui/frontend.py:465
msgid "Suspending sessions and exiting application..."
msgstr "ĐŅĐĩŅŅваĐĩĐŧ ŅĐĩŅŅиŅ и ĐŋĐžĐēидаĐĩĐŧ ĐŋŅĐžĐŗŅĐ°ĐŧĐŧŅ..."
-#: ../pyhoca/wxgui/frontend.py:462
+#: ../pyhoca/wxgui/frontend.py:468
#, python-format
msgid "Disconnecting %s and exiting application..."
msgstr "РаСŅĐĩдиĐŊŅĐĩĐŧ %s и ĐŋĐžĐēидаĐĩĐŧ ĐŋŅĐžĐŗŅĐ°ĐŧĐŧŅ..."
-#: ../pyhoca/wxgui/frontend.py:464
+#: ../pyhoca/wxgui/frontend.py:470
msgid "Exiting application..."
msgstr "ĐĐžĐēидаĐĩĐŧ ĐŋŅĐžĐŗŅĐ°ĐŧĐŧŅ..."
-#: ../pyhoca/wxgui/frontend.py:562
+#: ../pyhoca/wxgui/frontend.py:568
#, python-format
msgid "%s - server warning"
msgstr "%s - ĐŋŅĐĩĐ´ŅĐŋŅĐĩĐļĐ´ĐĩĐŊиĐĩ ŅĐĩŅвĐĩŅĐ°"
-#: ../pyhoca/wxgui/frontend.py:562
+#: ../pyhoca/wxgui/frontend.py:568
msgid "The X2Go Server does not publish an application menu."
msgstr "ĐĄĐĩŅвĐĩŅ X2Go ĐŊĐĩ ĐŋŅĐąĐģиĐēŅĐĩŅ ĐŧĐĩĐŊŅ ĐŋŅиĐģĐžĐļĐĩĐŊиК."
-#: ../pyhoca/wxgui/frontend.py:613
-#, fuzzy
+#: ../pyhoca/wxgui/frontend.py:619
msgid "SSH key authentication has been successful."
msgstr "ĐвŅĐžŅиСаŅиŅ ĐŋĐž ĐŋŅĐąĐģиŅĐŊĐžĐŧŅ ĐēĐģŅŅŅ СавĐĩŅŅĐĩĐŊĐ°."
-#: ../pyhoca/wxgui/frontend.py:650
+#: ../pyhoca/wxgui/frontend.py:656
msgid ""
"The SSH proxy's host key is invalid or has not been accepted by the user"
msgstr "SSH ĐŋŅĐžĐēŅи ĐēĐģŅŅ ĐŊĐĩĐ´ĐĩĐšŅŅвиŅĐĩĐģĐĩĐŊ и ĐŊĐĩ ĐąŅĐģ ĐŋŅиĐŊŅŅ ĐŋĐžĐģŅСОваŅĐĩĐģĐĩĐŧ"
-#: ../pyhoca/wxgui/frontend.py:671
+#: ../pyhoca/wxgui/frontend.py:677
#, python-format
msgid "%s - EOF error"
msgstr "%s - EOF ĐžŅийĐēĐ°"
-#: ../pyhoca/wxgui/frontend.py:671
+#: ../pyhoca/wxgui/frontend.py:677
msgid "Authentication protocol communication incomplete! Try again..."
msgstr "ĐŅийĐēĐ° авŅĐžŅиСаŅии! ĐĐžĐŋŅОйŅĐšŅĐĩ ĐĩŅĐĩ ŅаС..."
-#: ../pyhoca/wxgui/frontend.py:678
+#: ../pyhoca/wxgui/frontend.py:684
#, python-format
msgid "%s - auth key error"
msgstr "%s - ĐžŅийĐēĐ° ĐēĐģŅŅĐ°"
-#: ../pyhoca/wxgui/frontend.py:699
+#: ../pyhoca/wxgui/frontend.py:705
msgid "An unknown error occurred during authentication!"
msgstr "ĐĐĩиСвĐĩŅŅĐŊĐ°Ņ ĐžŅийĐēĐ° ĐŋŅи авŅĐžŅиСаŅии!"
-#: ../pyhoca/wxgui/frontend.py:728
+#: ../pyhoca/wxgui/frontend.py:734
#, python-format
msgid "%s: DirectRDP not supported yet"
msgstr "%s: DirectRDP ĐŋĐžĐēĐ° ĐŊĐĩ ĐŋОддĐĩŅĐļиваĐĩŅŅŅ"
-#: ../pyhoca/wxgui/frontend.py:729
+#: ../pyhoca/wxgui/frontend.py:735
#, python-format
msgid ""
"We apologize for the inconvenience...\n"
@@ -1031,66 +1085,153 @@ msgid ""
"Session profiles of type ,,DirectRDP'' are not\n"
"supported by %s (%s), yet!!\n"
"\n"
-"DirectRDP support will be available in %s (>= 0.2.2.0)."
+"DirectRDP support will be available in %s (>= 1.0.0.0)."
msgstr ""
"ĐŅиĐŊĐžŅиĐŧ ĐŊĐ°Ņи иСвиĐŊĐĩĐŊиŅ Са ĐŊĐĩŅдОйŅŅва...\n"
"\n"
"ĐŅĐžŅиĐģŅ ŅĐĩŅŅии ŅиĐŋĐ° ,,DirectRDP'' ĐŋĐžĐēĐ° ŅŅĐž\n"
"ĐŊĐĩ ĐŋОддĐĩŅĐļиваĐĩŅŅŅ %s (%s)!!\n"
"\n"
-"ĐОддĐĩŅĐļĐēĐ° DirectRDP ĐąŅĐ´ĐĩŅ Đ´ĐžŅŅŅĐŋĐŊĐ° в %s (>= 0.2.2.0)."
+"ĐОддĐĩŅĐļĐēĐ° DirectRDP ĐąŅĐ´ĐĩŅ Đ´ĐžŅŅŅĐŋĐŊĐ° в %s (>= 1.0.0.0)."
-#: ../pyhoca/wxgui/frontend.py:741
+#: ../pyhoca/wxgui/frontend.py:747
msgid "Unknown session profile, configure before using it..."
msgstr "ĐĐĩиСвĐĩŅŅĐŊŅĐš ĐŋŅĐžŅиĐģŅ ŅĐĩŅŅии..."
-#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:1332
+#: ../pyhoca/wxgui/frontend.py:778
+#, python-format
+msgid "Desktop Sharing with %s not supported by server"
+msgstr "РаСдĐĩĐģĐĩĐŊиĐĩ Đ´ĐĩŅĐēŅĐžĐŋĐ° Ņ %s ĐŊĐĩ ĐŋОддĐĩŅĐļиваĐĩŅŅŅ ŅĐĩŅвĐĩŅĐžĐŧ"
+
+#: ../pyhoca/wxgui/frontend.py:779
+#, python-format
+msgid ""
+"We apologize for the inconvenience...\n"
+"\n"
+"Session profiles of type ,,SHADOW'' are not\n"
+"supported by X2Go Server (v%s)!!!\n"
+"\n"
+"Desktop Sharing with %s requires\n"
+"X2Go Server 4.1.0.0 and above."
+msgstr ""
+"ĐŅиĐŊĐžŅиĐŧ ĐŊĐ°Ņи иСвиĐŊĐĩĐŊиŅ Са ĐŊĐĩŅдОйŅŅва...\n"
+"\n"
+"ĐŅĐžŅиĐģŅ ŅĐĩŅŅии ŅиĐŋĐ° ,,SHADOW'' \n"
+"ĐŊĐĩ ĐŋОддĐĩŅĐļиваĐĩŅŅŅ ŅĐĩŅвĐĩŅĐžĐŧ X2Go (v%s)!!!\n"
+"\n"
+"ĐĸŅĐĩĐąŅĐĩŅŅŅ ŅĐĩŅвĐĩŅ X2Go вĐĩŅŅии 4.1.0.0 иĐģи вŅŅĐĩ."
+
+#: ../pyhoca/wxgui/frontend.py:837 ../pyhoca/wxgui/frontend.py:1488
#, python-format
msgid "%s - session warning"
msgstr "%s - ĐŋŅĐĩĐ´ŅĐŋŅĐĩĐļĐ´ĐĩĐŊиĐĩ"
-#: ../pyhoca/wxgui/frontend.py:798
+#: ../pyhoca/wxgui/frontend.py:837
#, python-format
msgid "Execution of command ,,%s'' failed."
msgstr "ĐĐĩвОСĐŧĐžĐļĐŊĐž вŅĐŋĐžĐģĐŊиŅŅ ĐēĐžĐŧĐ°ĐŊĐ´Ņ ,,%s''."
-#: ../pyhoca/wxgui/frontend.py:939
+#: ../pyhoca/wxgui/frontend.py:978
msgid "Cleaning X2Go sessions..."
msgstr "ĐŅиŅĐ°ĐĩĐŧ ŅĐĩŅŅии X2Go..."
-#: ../pyhoca/wxgui/frontend.py:974
+#: ../pyhoca/wxgui/frontend.py:1026
#, python-format
msgid "%s - disconnect"
msgstr "%s - ŅаСŅĐĩдиĐŊĐĩĐŊиĐĩ"
-#: ../pyhoca/wxgui/frontend.py:974
+#: ../pyhoca/wxgui/frontend.py:1026
msgid "X2Go Profile is now disconnected."
msgstr "X2Go ĐŅĐžŅиĐģŅ ĐžŅŅĐžĐĩдиĐŊĐĩĐŊ."
-#: ../pyhoca/wxgui/frontend.py:995
+#: ../pyhoca/wxgui/frontend.py:1047
msgid "New Session Profile"
msgstr "ĐОвŅĐš ĐŋŅĐžŅиĐģŅ"
-#: ../pyhoca/wxgui/frontend.py:1047
+#: ../pyhoca/wxgui/frontend.py:1102
#, python-format
msgid "Really Delete Session Profile ,,%s''?"
msgstr "ĐŖĐ´Đ°ĐģиŅŅ ĐŋŅĐžŅиĐģŅ ,,%s''?"
-#: ../pyhoca/wxgui/frontend.py:1053
+#: ../pyhoca/wxgui/frontend.py:1108
#, python-format
msgid "%s - profile deleted"
msgstr "%s - ĐŋŅĐžŅиĐģŅ ŅĐ´Đ°ĐģĐĩĐŊ"
-#: ../pyhoca/wxgui/frontend.py:1053
+#: ../pyhoca/wxgui/frontend.py:1108
msgid "The session profile has been deleted."
msgstr "ĐŅĐžŅиĐģŅ ĐąŅĐģ ŅĐ´Đ°ĐģĐĩĐŊ."
-#: ../pyhoca/wxgui/frontend.py:1071
+#: ../pyhoca/wxgui/frontend.py:1137
+#, python-format
+msgid "%s - export session profiles"
+msgstr "%s - ŅĐēŅĐŋĐžŅŅ ĐŋŅĐžŅиĐģĐĩĐš ŅĐĩŅŅии"
+
+#: ../pyhoca/wxgui/frontend.py:1142
+#, python-format
+msgid "%s - export session profile"
+msgstr "%s - ŅĐēŅĐŋĐžŅŅ ĐŋŅĐžŅиĐģŅ ŅĐĩŅŅии"
+
+#: ../pyhoca/wxgui/frontend.py:1154
+#, python-format
+msgid "%s: Export file already exists"
+msgstr "%s: ФаКĐģ ŅĐļĐĩ ŅŅŅĐĩŅŅвŅĐĩŅ"
+
+#: ../pyhoca/wxgui/frontend.py:1155
+#, python-format
+msgid ""
+"The file Âģ%sÂĢ already exists in this folder.\n"
+"\n"
+"Do you want to replace it?"
+msgstr ""
+"ФаКĐģ Âģ%sÂĢ ŅĐļĐĩ ŅŅŅĐĩŅŅвŅĐĩŅ в ŅŅĐžĐŧ ĐēĐ°ŅĐ°ĐģĐžĐŗĐĩ.\n"
+"\n"
+"ĐĐĩŅĐĩĐŋиŅĐ°ŅŅ?"
+
+#: ../pyhoca/wxgui/frontend.py:1176
+#, python-format
+msgid "%s - profiles exported"
+msgstr "%s - ĐŋŅĐžŅиĐģи ŅĐēŅĐŋĐžŅŅиŅОваĐŊŅ"
+
+#: ../pyhoca/wxgui/frontend.py:1176
+#, python-format
+msgid "Successfully exported session profile group Âģ%sÂĢ to file Âģ%sÂĢ."
+msgstr "ĐŅŅĐŋĐŋĐ° ĐŋŅĐžŅиĐģĐĩĐš ŅĐĩŅŅиК Âģ%sÂĢ ŅŅĐŋĐĩŅĐŊĐž ŅĐēŅĐŋĐžŅŅиŅОваĐŊĐ° в ŅĐ°ĐšĐģ Âģ%sÂĢ."
+
+#: ../pyhoca/wxgui/frontend.py:1178
+#, python-format
+msgid "%s - profile exported"
+msgstr "%s - ĐŋŅĐžŅиĐģŅ ŅĐēŅĐŋĐžŅŅиŅОваĐŊ"
+
+#: ../pyhoca/wxgui/frontend.py:1178
+#, python-format
+msgid "Successfully exported single session profile Âģ%sÂĢ to file Âģ%sÂĢ."
+msgstr "ĐĄĐĩŅŅиŅ Âģ%sÂĢ ŅŅĐŋĐĩŅĐŊĐž ŅĐēŅĐŋĐžŅŅиŅОваĐŊĐ° в ŅĐ°ĐšĐģ Âģ%sÂĢ."
+
+#: ../pyhoca/wxgui/frontend.py:1182
+#, python-format
+msgid "%s: Exporting session profile(s) failed"
+msgstr "%s - ŅĐēŅĐŋĐžŅŅ ĐŋŅĐžŅиĐģŅ ŅĐĩŅŅии ĐŊĐĩ ŅĐ´Đ°ĐģŅŅ"
+
+#: ../pyhoca/wxgui/frontend.py:1183
+#, python-format
+msgid ""
+"The selected session profile(s) could not be exported to the \n"
+"file Âģ%sÂĢ.\n"
+"\n"
+"Check for common problems (disk full, insufficient access, etc.)."
+msgstr ""
+"ĐŅĐ´ĐĩĐģĐĩĐŊĐŊŅĐĩ ĐŋŅĐžŅиĐģи ŅĐĩŅŅиК ĐŊĐĩ ĐŧĐžĐŗŅŅ ĐąŅŅŅ ŅĐēŅĐŋĐžŅŅиŅОваĐŊŅ \n"
+"в file Âģ%sÂĢ.\n"
+"\n"
+"ĐŅОвĐĩŅŅŅĐĩ диŅĐēОвОĐĩ ĐŋŅĐžŅŅŅĐ°ĐŊŅŅвО и ĐŋŅава Đ´ĐžŅŅŅĐŋĐ°."
+
+#: ../pyhoca/wxgui/frontend.py:1202
#, python-format
msgid "%s - share local folder with sessions of this profile"
msgstr "%s - ŅĐēŅĐŋĐžŅŅиŅŅĐĩĐŧŅĐš ĐēĐ°ŅĐ°ĐģĐžĐŗ"
-#: ../pyhoca/wxgui/frontend.py:1224
+#: ../pyhoca/wxgui/frontend.py:1355
#, python-format
msgid ""
"The authenticity of host [%s]:%s can't be established.\n"
@@ -1103,39 +1244,63 @@ msgstr ""
"\n"
"ĐŅОдОĐģĐļиŅŅ ŅĐžĐĩдиĐŊĐĩĐŊиĐĩ?"
-#: ../pyhoca/wxgui/frontend.py:1232
+#: ../pyhoca/wxgui/frontend.py:1363
#, python-format
msgid "%s: Confirm Host Authorization"
msgstr "%s: ĐОдŅвĐĩŅдиŅĐĩ авŅĐžŅиСаŅиŅ Ņ
ĐžŅŅĐ°"
-#: ../pyhoca/wxgui/frontend.py:1277
+#: ../pyhoca/wxgui/frontend.py:1409
#, python-format
msgid "%s - channel error"
msgstr "%s - ĐžŅийĐēĐ° ĐēĐ°ĐŊĐ°ĐģĐ°"
-#: ../pyhoca/wxgui/frontend.py:1277
+#: ../pyhoca/wxgui/frontend.py:1409
#, python-format
msgid ""
"Lost connection to server %s unexpectedly! Try to re-authenticate to the "
"server..."
msgstr "ĐĄĐžĐĩдиĐŊĐĩĐŊиĐĩ Ņ ŅĐĩŅвĐĩŅĐžĐŧ %s ŅŅŅĐ°ŅĐĩĐŊĐž. ĐĐžĐŋŅŅĐ°ĐšŅĐĩŅŅ ŅĐžĐĩдиĐŊиŅŅŅŅ ĐĩŅĐĩ ŅаС..."
-#: ../pyhoca/wxgui/frontend.py:1295 ../pyhoca/wxgui/frontend.py:1313
-#: ../pyhoca/wxgui/frontend.py:1315 ../pyhoca/wxgui/frontend.py:1351
+#: ../pyhoca/wxgui/frontend.py:1426 ../pyhoca/wxgui/frontend.py:1469
+#: ../pyhoca/wxgui/frontend.py:1471 ../pyhoca/wxgui/frontend.py:1507
#, python-format
msgid "%s - session failure"
msgstr "%s - ĐžŅийĐēĐ° ŅĐĩŅŅии"
-#: ../pyhoca/wxgui/frontend.py:1295
+#: ../pyhoca/wxgui/frontend.py:1426
msgid "The session startup failed."
msgstr "ĐĐ°ĐŋŅŅĐē ŅĐĩŅŅии ĐŊĐĩ ŅĐ´Đ°ĐģŅŅ."
-#: ../pyhoca/wxgui/frontend.py:1313
+#: ../pyhoca/wxgui/frontend.py:1439
+#, python-format
+msgid "%s - timeout"
+msgstr "%s - ĐŋŅĐĩвŅŅĐĩĐŊиĐĩ иĐŊŅĐĩŅваĐģĐ° ĐžĐļидаĐŊиŅ"
+
+#: ../pyhoca/wxgui/frontend.py:1439
+msgid ""
+"The server took long to provide a list of sharable desktops.\n"
+"This can happen from time to time, please try again"
+msgstr ""
+"ĐĄĐĩŅвĐĩŅŅ ŅŅĐĩĐąŅĐĩŅŅŅ ŅĐģиŅĐēĐžĐŧ ĐŧĐŊĐžĐŗĐž вŅĐĩĐŧĐĩĐŊи Đ´ĐģŅ\n"
+"ĐŋŅĐĩĐ´ĐžŅŅавĐģĐĩĐŊиŅ ŅĐŋиŅĐēĐ° ŅĐĩŅŅиК.\n"
+"ĐŅĐž иĐŊĐžĐŗĐ´Đ° ŅĐģŅŅĐ°ĐĩŅŅŅ, ĐŋĐžĐŋŅŅĐ°ĐšŅĐĩŅŅ ĐĩŅĐĩ ŅаС"
+
+#: ../pyhoca/wxgui/frontend.py:1451
+#, python-format
+msgid "%s - desktop sharing failed"
+msgstr "%s - ŅаСдĐĩĐģĐĩĐŊиĐĩ Đ´ĐĩŅĐēŅĐžĐŋĐ° ĐŊĐĩ ŅĐ´Đ°ĐģĐžŅŅ"
+
+#: ../pyhoca/wxgui/frontend.py:1451
+#, python-format
+msgid "The desktop %s is not available for sharing (anymore)."
+msgstr "ĐĐĩŅĐēŅĐžĐŋ %s ĐŊĐĩĐ´ĐžŅŅŅĐŋĐĩĐŊ Đ´ĐģŅ ŅаСдĐĩĐģĐĩĐŊиŅ."
+
+#: ../pyhoca/wxgui/frontend.py:1469
#, python-format
msgid "The command ,,%s'' is not available on X2Go server."
msgstr "ĐĐžĐŧĐ°ĐŊĐ´Đ° ,,%s'' ĐŊĐĩĐ´ĐžŅŅŅĐŋĐŊĐ° ĐŊĐ° ŅĐĩŅвĐĩŅĐĩ X2Go."
-#: ../pyhoca/wxgui/frontend.py:1315
+#: ../pyhoca/wxgui/frontend.py:1471
#, python-format
msgid ""
"The command ,,%s'' is not available on X2Go server\n"
@@ -1144,7 +1309,7 @@ msgstr ""
"ĐĐžĐŧĐ°ĐŊĐ´Đ° ,,%s'' ĐŊĐĩĐ´ĐžŅŅŅĐŋĐŊĐ° ĐŊĐ° ŅĐĩŅвĐĩŅĐĩ X2Go\n"
"%s."
-#: ../pyhoca/wxgui/frontend.py:1332
+#: ../pyhoca/wxgui/frontend.py:1488
#, python-format
msgid ""
"Reverse TCP port forwarding request for session %s to server port %s has "
@@ -1152,44 +1317,44 @@ msgid ""
msgstr ""
"ĐĐ°ĐŋŅĐžŅ ŅĐĩŅŅĐ°ĐŊŅĐģŅŅии ĐŋĐžŅŅĐ° TCP Đ´ĐģŅ ŅĐĩŅŅии %s Đē ĐŋĐžŅŅŅ ŅĐĩŅвĐĩŅĐ° %S ĐąŅĐģ ĐžŅĐēĐģĐžĐŊĐĩĐŊ."
-#: ../pyhoca/wxgui/frontend.py:1351
+#: ../pyhoca/wxgui/frontend.py:1507
#, python-format
msgid ""
"Forwarding tunnel request to [%s]:%s for session %s was denied by remote "
-"X2go/SSH server. Session startup failed."
+"X2Go/SSH server. Session startup failed."
msgstr ""
"ĐĐ°ĐŋŅĐžŅ ŅŅĐŊĐŊĐĩĐģŅ Đē ŅĐĩŅвĐĩŅŅ [%s]:%s Đ´ĐģŅ ŅĐĩŅŅии %s ĐąŅĐģ ĐžŅĐēĐģĐžĐŊĐĩĐŊ ŅĐ´Đ°ĐģĐĩĐŊĐŊŅĐŧ "
-"ŅĐĩŅвĐĩŅĐžĐŧ X2go/SSH. ĐĐ°ĐŋŅŅĐē ŅĐĩŅŅии ĐŊĐĩ ŅĐ´Đ°ĐģŅŅ."
+"ŅĐĩŅвĐĩŅĐžĐŧ X2Go/SSH. ĐĐ°ĐŋŅŅĐē ŅĐĩŅŅии ĐŊĐĩ ŅĐ´Đ°ĐģŅŅ."
-#: ../pyhoca/wxgui/frontend.py:1370
+#: ../pyhoca/wxgui/frontend.py:1526
#, python-format
msgid "%s - audio warning"
msgstr "%s - ĐŋŅĐĩĐ´ŅĐŋŅĐĩĐļĐ´ĐĩĐŊиĐĩ audio"
-#: ../pyhoca/wxgui/frontend.py:1370
+#: ../pyhoca/wxgui/frontend.py:1526
msgid ""
"The X2Go PulseAudio system is not available within Remote Desktop sessions."
msgstr "ХиŅŅĐĩĐŧĐ° X2Go PulseAudio ĐŊĐĩĐ´ĐžŅŅŅĐŋĐŊĐ° в ŅĐĩŅŅиŅŅ
ŅĐ´Đ°ĐģĐĩĐŊĐŊĐžĐŗĐž Đ´ĐĩŅĐēŅĐžĐŋĐ°."
-#: ../pyhoca/wxgui/frontend.py:1377 ../pyhoca/wxgui/frontend.py:1384
+#: ../pyhoca/wxgui/frontend.py:1533 ../pyhoca/wxgui/frontend.py:1540
#, python-format
msgid "%s - audio error"
msgstr "%s - ĐžŅийĐēĐ° audio"
-#: ../pyhoca/wxgui/frontend.py:1377
+#: ../pyhoca/wxgui/frontend.py:1533
msgid "The X2Go PulseAudio system could not be started."
msgstr "ХиŅŅĐĩĐŧĐ° X2Go PulseAudio ĐŊĐĩ ĐŧĐžĐļĐĩŅ ĐąŅŅŅ СаĐŋŅŅĐĩĐŊĐ°."
-#: ../pyhoca/wxgui/frontend.py:1384
+#: ../pyhoca/wxgui/frontend.py:1540
msgid "The X2Go PulseAudio system has died unexpectedly."
msgstr "ХйОК ŅиŅŅĐĩĐŧŅ X2Go PulseAudio."
-#: ../pyhoca/wxgui/frontend.py:1396
+#: ../pyhoca/wxgui/frontend.py:1552
#, python-format
msgid "%s - audio problem"
msgstr "%s - ĐžŅийĐēĐ° audio"
-#: ../pyhoca/wxgui/frontend.py:1396
+#: ../pyhoca/wxgui/frontend.py:1552
#, python-format
msgid ""
"The audio connection could not be set up for this session.\n"
@@ -1199,12 +1364,12 @@ msgstr ""
"%s"
# %s - ĐŋĐĩŅĐ°ŅŅ ĐŊĐĩĐ´ĐžŅŅŅĐŋĐŊĐ°
-#: ../pyhoca/wxgui/frontend.py:1408
+#: ../pyhoca/wxgui/frontend.py:1564
#, python-format
msgid "%s - client-side printing not available"
msgstr "%s - ĐŋĐĩŅĐ°ŅŅ ĐŊĐĩĐ´ĐžŅŅŅĐŋĐŊĐ°"
-#: ../pyhoca/wxgui/frontend.py:1408
+#: ../pyhoca/wxgui/frontend.py:1564
#, python-format
msgid ""
"The server denies client-side printing from within this session.\n"
@@ -1213,12 +1378,12 @@ msgstr ""
"ĐĄĐĩŅвĐĩŅ ĐžŅĐēĐģĐžĐŊиĐģ ĐŋĐĩŅĐ°ŅŅ вĐŊŅŅŅи ŅŅОК ŅĐĩŅŅии.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1420
+#: ../pyhoca/wxgui/frontend.py:1576
#, python-format
msgid "%s - MIME box not available"
msgstr "%s - MIME box ĐŊĐĩĐ´ĐžŅŅŅĐŋĐĩĐŊ"
-#: ../pyhoca/wxgui/frontend.py:1420
+#: ../pyhoca/wxgui/frontend.py:1576
#, python-format
msgid ""
"The server does not support the X2Go MIME box.\n"
@@ -1227,12 +1392,12 @@ msgstr ""
"ĐĄĐĩŅвĐĩŅ ĐŊĐĩ ĐŋОддĐĩŅĐļиваĐĩŅ X2Go MIME box.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1432
+#: ../pyhoca/wxgui/frontend.py:1588
#, python-format
msgid "%s - client-side folders not sharable"
msgstr "%s - ĐēĐģиĐĩĐŊŅŅĐēиĐĩ ĐēĐ°ŅĐ°ĐģĐžĐŗи ĐŊĐĩ ŅĐēŅĐŋĐžŅиŅŅĐĩĐŧŅ"
-#: ../pyhoca/wxgui/frontend.py:1432
+#: ../pyhoca/wxgui/frontend.py:1588
#, python-format
msgid ""
"The server denies client-side folder sharing with this session.\n"
@@ -1241,12 +1406,12 @@ msgstr ""
"ĐĄĐĩŅвĐĩŅ ĐžŅĐēĐģĐžĐŊиĐģ ŅĐēŅĐŋĐžŅŅ ĐēĐ°ŅĐ°ĐģĐžĐŗОв вĐŊŅŅŅи ŅŅОК ŅĐĩŅŅии.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1444
+#: ../pyhoca/wxgui/frontend.py:1600
#, python-format
msgid "%s - client resources not sharable"
msgstr "%s - ĐēĐģиĐĩĐŊŅŅĐēиĐĩ ŅĐĩŅŅŅŅŅ ĐŊĐĩ ŅĐēŅĐŋĐžŅŅиŅŅĐĩĐŧŅ"
-#: ../pyhoca/wxgui/frontend.py:1444
+#: ../pyhoca/wxgui/frontend.py:1600
#, python-format
msgid ""
"Client-side folders and printers cannot be shared with this session.\n"
@@ -1256,12 +1421,12 @@ msgstr ""
"ŅŅОК ŅĐĩŅŅии.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1463 ../pyhoca/wxgui/frontend.py:1465
+#: ../pyhoca/wxgui/frontend.py:1619 ../pyhoca/wxgui/frontend.py:1621
#, python-format
msgid "%s - print error"
msgstr "%s - ĐžŅийĐēĐ° ĐŋĐĩŅĐ°Ņи"
-#: ../pyhoca/wxgui/frontend.py:1463
+#: ../pyhoca/wxgui/frontend.py:1619
#, python-format
msgid ""
"%s\n"
@@ -1272,7 +1437,7 @@ msgstr ""
"...ĐŊĐ° ĐŋŅиĐŊŅĐĩŅĐĩ %s в ŅĐĩŅŅии\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1465
+#: ../pyhoca/wxgui/frontend.py:1621
#, python-format
msgid ""
"%s\n"
@@ -1283,12 +1448,12 @@ msgstr ""
"...в ŅĐĩŅŅии\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1480 ../pyhoca/wxgui/frontend.py:1495
+#: ../pyhoca/wxgui/frontend.py:1636 ../pyhoca/wxgui/frontend.py:1651
#, python-format
msgid "%s - start"
msgstr "%s - ĐŋŅŅĐē"
-#: ../pyhoca/wxgui/frontend.py:1480
+#: ../pyhoca/wxgui/frontend.py:1636
#, python-format
msgid ""
"New X2Go session starting up...\n"
@@ -1297,7 +1462,7 @@ msgstr ""
"ĐОваŅ ŅĐĩŅŅиŅ X2Go СаĐŋŅŅĐēĐ°ĐĩŅŅŅ...\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1495
+#: ../pyhoca/wxgui/frontend.py:1651
#, python-format
msgid ""
"Another client started X2Go session\n"
@@ -1306,12 +1471,12 @@ msgstr ""
"ĐŅŅĐŗОК ĐēĐģиĐĩĐŊŅ СаĐŋŅŅĐēĐ°ĐĩŅ ŅĐĩŅŅиŅ X2Go\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1510 ../pyhoca/wxgui/frontend.py:1525
+#: ../pyhoca/wxgui/frontend.py:1666 ../pyhoca/wxgui/frontend.py:1681
#, python-format
msgid "%s - resume"
msgstr "%s - вОŅŅŅĐ°ĐŊОвиŅŅ"
-#: ../pyhoca/wxgui/frontend.py:1510
+#: ../pyhoca/wxgui/frontend.py:1666
#, python-format
msgid ""
"Resuming X2Go session...\n"
@@ -1320,7 +1485,7 @@ msgstr ""
"ĐĐžŅŅŅĐ°ĐŊавĐģиваĐĩĐŧ X2Go ŅĐĩŅŅиŅ...\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1525
+#: ../pyhoca/wxgui/frontend.py:1681
#, python-format
msgid ""
"Another client resumed X2Go session\n"
@@ -1329,12 +1494,12 @@ msgstr ""
"ĐŅŅĐŗОК ĐēĐģиĐĩĐŊŅ вОŅŅŅĐ°ĐŊавĐģиваĐĩŅ ŅĐĩŅŅиŅ X2Go\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1540
+#: ../pyhoca/wxgui/frontend.py:1696
#, python-format
msgid "%s - running"
msgstr "%s - вŅĐŋĐžĐģĐŊŅĐĩŅŅŅ"
-#: ../pyhoca/wxgui/frontend.py:1540
+#: ../pyhoca/wxgui/frontend.py:1696
#, python-format
msgid ""
"Found already running session\n"
@@ -1343,12 +1508,12 @@ msgstr ""
"ĐаКдĐĩĐŊĐ° ŅĐļĐĩ СаĐŋŅŅĐĩĐŊĐŊĐ°Ņ ŅĐĩŅŅиŅ\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1560
+#: ../pyhoca/wxgui/frontend.py:1716
#, python-format
msgid "%s - suspend"
msgstr "%s - ĐŋŅĐĩŅваŅŅ"
-#: ../pyhoca/wxgui/frontend.py:1560
+#: ../pyhoca/wxgui/frontend.py:1716
#, python-format
msgid ""
"X2Go Session has been suspended\n"
@@ -1357,12 +1522,12 @@ msgstr ""
"X2Go ŅĐĩŅŅиŅ ĐŋŅĐĩŅваĐŊĐ°\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1587
+#: ../pyhoca/wxgui/frontend.py:1743
#, python-format
msgid "%s - terminate"
msgstr "%s - СавĐĩŅŅиŅŅ"
-#: ../pyhoca/wxgui/frontend.py:1587
+#: ../pyhoca/wxgui/frontend.py:1743
#, python-format
msgid ""
"X2Go Session has terminated\n"
@@ -1371,14 +1536,14 @@ msgstr ""
"X2Go ŅĐĩŅŅиŅ СавĐĩŅŅĐĩĐŊĐ°\n"
"%s"
-#: ../pyhoca/wxgui/messages.py:73
+#: ../pyhoca/wxgui/messages.py:72
#, python-format
msgid ""
"Are you really sure you want to\n"
"delete the session profile ,,%s''?"
msgstr "ĐŖĐ´Đ°ĐģиŅŅ ĐŋŅĐžŅиĐģŅ ,,%s''?"
-#: ../pyhoca/wxgui/messages.py:74
+#: ../pyhoca/wxgui/messages.py:73
#, python-format
msgid ""
"PyHoca-GUI is already running for user ,,%s''!\n"
@@ -1392,15 +1557,15 @@ msgstr ""
"ĐиŅŅ ОдĐŊĐ° вĐĩŅŅиŅ PyHoca-GUI ĐŧĐžĐļĐĩŅ ĐąŅŅŅ СаĐŋŅŅĐĩĐŊĐ°\n"
" ĐŋĐžĐģŅСОваŅĐĩĐģĐĩĐŧ."
-#: ../pyhoca/wxgui/messages.py:107
+#: ../pyhoca/wxgui/messages.py:106
msgid "Yes"
msgstr "ĐĐ°"
-#: ../pyhoca/wxgui/messages.py:108
+#: ../pyhoca/wxgui/messages.py:107
msgid "No"
msgstr "ĐĐĩŅ"
-#: ../pyhoca/wxgui/messages.py:125 ../pyhoca/wxgui/printingprefs.py:142
+#: ../pyhoca/wxgui/messages.py:124 ../pyhoca/wxgui/printingprefs.py:142
msgid "Ok"
msgstr "ĐĐ"
@@ -1466,10 +1631,6 @@ msgstr "ĐŅĐŋĐžĐģŅСОваŅŅ ŅŅĐžŅ ĐŋŅиĐŊŅĐĩŅ"
msgid "Custom print command"
msgstr "ĐĐžĐŧĐ°ĐŊĐ´Đ° ĐŋĐĩŅĐ°Ņи"
-#: ../pyhoca/wxgui/printingprefs.py:143
-msgid "Apply"
-msgstr "ĐŅиĐŧĐĩĐŊиŅŅ"
-
#: ../pyhoca/wxgui/printingprefs.py:145
msgid "Print"
msgstr "ĐĐĩŅĐ°ŅŅ"
@@ -1503,6 +1664,79 @@ msgstr "ĐСĐŧĐĩĐŊиŅŅ СаĐŗĐžĐģОвОĐē ŅĐĩŅŅии ĐŊĐ°"
msgid "OK"
msgstr "ĐĐ"
+#: ../pyhoca/wxgui/serverinfo.py:76
+#, python-format
+msgid "Server Information - %s"
+msgstr "ĐĐŊŅĐžŅĐŧĐ°ŅиŅ Đž ŅĐĩŅвĐĩŅĐĩ - %s"
+
+#: ../pyhoca/wxgui/serverinfo.py:78
+#, python-format
+msgid ""
+"Session Profile: %s\n"
+"\n"
+"List of X2Go Server components, add-ons and their versions..."
+msgstr ""
+"ĐŅĐžŅиĐģŅ ŅĐĩŅŅии: %s\n"
+"\n"
+"ĐĄĐŋиŅĐžĐē ĐēĐžĐŧĐŋĐžĐŊĐĩĐŊŅОв ŅĐĩŅвĐĩŅĐ° X2Go, Đ´ĐžĐŋĐžĐģĐŊĐĩĐŊиК и иŅ
вĐĩŅŅиК..."
+
+#: ../pyhoca/wxgui/serverinfo.py:83
+msgid "Refresh"
+msgstr "ĐĐąĐŊОвиŅŅ"
+
+#: ../pyhoca/wxgui/serverinfo.py:84
+msgid "Close"
+msgstr "ĐĐ°ĐēŅŅŅŅ"
+
+#: ../pyhoca/wxgui/serverinfo.py:153
+msgid "X2Go Server"
+msgstr "ĐĄĐĩŅвĐĩŅ X2Go"
+
+#: ../pyhoca/wxgui/serverinfo.py:154
+msgid "Server Core"
+msgstr "ĐĄĐĩŅвĐĩŅ"
+
+#: ../pyhoca/wxgui/serverinfo.py:162
+msgid "Server Extensions"
+msgstr "Đ Đ°ŅŅиŅĐĩĐŊиŅ ŅĐĩŅвĐĩŅĐ°"
+
+#: ../pyhoca/wxgui/serverinfo.py:168
+msgid "X2Go Server Add-ons"
+msgstr "ĐĐžĐŋĐžĐģĐŊĐĩĐŊиŅ ŅĐĩŅвĐĩŅĐ° X2Go"
+
+#: ../pyhoca/wxgui/serverinfo.py:172
+msgid "X2Go Server Features"
+msgstr "ĐĐŋŅии ŅĐĩŅвĐĩŅĐ° X2Go"
+
+#~ msgid "Settings"
+#~ msgstr "ĐŖŅŅĐ°ĐŊОвĐēи"
+
+#, fuzzy
+#~ msgid "%s (%s)\n"
+#~ msgstr "%s (ŅĐĩŅĐĩС %s)"
+
+#, fuzzy
+#~ msgid "Connect to another Desktop Session"
+#~ msgstr "ĐĐ°ĐŋŅŅŅиŅŅ &ĐŊОвŅŅ ŅĐĩŅŅиŅ"
+
+#~ msgid "Start/Resume Session"
+#~ msgstr "ĐĐ°ĐŋŅŅĐē/вОŅŅŅĐ°ĐŊОвĐģĐĩĐŊиĐĩ ŅĐĩŅŅии"
+
+#~ msgid "SSH Proxy Tunnel"
+#~ msgstr "SSH ĐŋŅĐžĐēŅи ŅŅĐŊĐŊĐĩĐģŅ"
+
+#~ msgid "The SSH proxy configuration is incomplete. Try again."
+#~ msgstr "ĐĐžĐŊŅиĐŗŅŅĐ°ŅиŅ SSH ĐŋŅĐžĐēŅи ĐŊĐĩ СавĐĩŅŅĐĩĐŊĐ°. ĐĐžĐŋŅОйŅĐšŅĐĩ ĐĩŅĐĩ ŅаС."
+
+#~ msgid ""
+#~ "Another session profile (%s) already uses [%s]:%s for binding a local SSH "
+#~ "proxy to.\n"
+#~ "Please change the SSH proxy settings accordingly."
+#~ msgstr ""
+#~ "ĐŅŅĐŗОК ĐŋŅĐžŅиĐģŅ (%s) иŅĐŋĐžĐģŅСŅĐĩŅ [%s]:%s Đ´ĐģŅ ĐŋŅивŅСĐēи Đē ĐģĐžĐēĐ°ĐģŅĐŊĐžĐŧŅ SSH "
+#~ "ĐŋŅĐžĐēŅи.\n"
+#~ "ĐСĐŧĐĩĐŊиŅĐĩ ĐŊĐ°ŅŅŅОКĐēи SSH ĐŋŅĐžĐēŅи."
+
#~ msgid "RSA/DSA private key"
#~ msgstr "ĐģиŅĐŊŅĐš ĐēĐģŅŅ RSA/DSA"
diff --git a/po/sv.po b/po/sv.po
index c956385..ce72abf 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,5 +1,5 @@
# PyHoca-GUI / i18n.
-# Copyright (C) 2010-2012 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
# Dick Kniep <dick.kniep(a)lindix.nl>
# This file is distributed under the same license as the PyHoca-GUI package.
# Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>, 2011.
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: PyHoca-GUI VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 14:25+0100\n"
-"PO-Revision-Date: 2012-11-26 14:24+0100\n"
-"Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n"
+"POT-Creation-Date: 2013-01-29 22:21+0100\n"
+"PO-Revision-Date: 2013-01-26 08:37+0100\n"
+"Last-Translator: Daniel Lindgren <dali.spam(a)gmail.com>\n"
"Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n"
"Language: sv\n"
"MIME-Version: 1.0\n"
@@ -39,8 +39,8 @@ msgid "Authenticate"
msgstr "Autentisera"
#: ../pyhoca/wxgui/logon.py:107
-msgid " Start SSH tunnel "
-msgstr " Starta SSH-tunnel "
+msgid "Start SSH tunnel"
+msgstr "Starta SSH-tunnel"
#: ../pyhoca/wxgui/logon.py:115
msgid "Session login"
@@ -50,23 +50,23 @@ msgstr "Sessionsinloggning"
msgid "SSH proxy server login"
msgstr "SSH proxyserverinloggning"
-#: ../pyhoca/wxgui/logon.py:127 ../pyhoca/wxgui/profilemanager.py:350
-#: ../pyhoca/wxgui/messages.py:131 ../pyhoca/wxgui/printingprefs.py:147
-#: ../pyhoca/wxgui/sessiontitle.py:85
+#: ../pyhoca/wxgui/logon.py:127 ../pyhoca/wxgui/profilemanager.py:373
+#: ../pyhoca/wxgui/listdesktops.py:99 ../pyhoca/wxgui/messages.py:130
+#: ../pyhoca/wxgui/printingprefs.py:147 ../pyhoca/wxgui/sessiontitle.py:85
msgid "Cancel"
msgstr "Avbryt"
#: ../pyhoca/wxgui/logon.py:297 ../pyhoca/wxgui/logon.py:339
-#: ../pyhoca/wxgui/frontend.py:606
+#: ../pyhoca/wxgui/frontend.py:612
#, python-format
msgid "%s - connect failure"
msgstr "%s - anslutning misslyckades"
-#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:606
+#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:612
msgid "User is not allowed to start X2Go sessions!"
msgstr "Användaren har inte rätt att starta X2Go-sessioner!"
-#: ../pyhoca/wxgui/logon.py:303 ../pyhoca/wxgui/frontend.py:613
+#: ../pyhoca/wxgui/logon.py:303 ../pyhoca/wxgui/frontend.py:619
#, python-format
msgid "%s - connect"
msgstr "%s - anslut"
@@ -92,28 +92,28 @@ msgstr "%s - SSH-proxy"
msgid "Authentication to the SSH proxy server failed!"
msgstr "Autentisering till SSH-proxy misslyckades!"
-#: ../pyhoca/wxgui/logon.py:376 ../pyhoca/wxgui/frontend.py:664
+#: ../pyhoca/wxgui/logon.py:376 ../pyhoca/wxgui/frontend.py:670
#, python-format
msgid "%s - socket error"
msgstr "%s - socketfel"
-#: ../pyhoca/wxgui/logon.py:383 ../pyhoca/wxgui/frontend.py:643
-#: ../pyhoca/wxgui/frontend.py:650
+#: ../pyhoca/wxgui/logon.py:383 ../pyhoca/wxgui/frontend.py:649
+#: ../pyhoca/wxgui/frontend.py:656
#, python-format
msgid "%s - host key error"
msgstr "%s - fel pÃĨ serverns nyckel"
-#: ../pyhoca/wxgui/logon.py:384 ../pyhoca/wxgui/frontend.py:643
+#: ../pyhoca/wxgui/logon.py:384 ../pyhoca/wxgui/frontend.py:649
msgid ""
"The remote server's host key is invalid or has not been accepted by the user"
msgstr "Serverns nyckel är felaktig eller har inte accepterats av användaren"
-#: ../pyhoca/wxgui/logon.py:391 ../pyhoca/wxgui/frontend.py:685
+#: ../pyhoca/wxgui/logon.py:391 ../pyhoca/wxgui/frontend.py:691
#, python-format
msgid "%s - missing home directory"
msgstr "%s - hemkatalog saknas"
-#: ../pyhoca/wxgui/logon.py:392 ../pyhoca/wxgui/frontend.py:685
+#: ../pyhoca/wxgui/logon.py:392 ../pyhoca/wxgui/frontend.py:691
msgid "The remote user's home directory does not exist."
msgstr "Fjärranvändarens hemkatalog saknas."
@@ -122,12 +122,12 @@ msgstr "Fjärranvändarens hemkatalog saknas."
msgid "%s - key error"
msgstr "%s - nyckelfel"
-#: ../pyhoca/wxgui/logon.py:407 ../pyhoca/wxgui/frontend.py:692
+#: ../pyhoca/wxgui/logon.py:407 ../pyhoca/wxgui/frontend.py:698
#, python-format
msgid "%s - auth error"
msgstr "%s - autentiseringsfel"
-#: ../pyhoca/wxgui/logon.py:415 ../pyhoca/wxgui/frontend.py:636
+#: ../pyhoca/wxgui/logon.py:415 ../pyhoca/wxgui/frontend.py:642
#, python-format
msgid "%s - SSH error"
msgstr "%s - SSH-fel"
@@ -153,7 +153,7 @@ msgstr ""
#: ../pyhoca/wxgui/taskbar.py:93
#, python-format
msgid ""
-"PyHoca-GUI (Python X2goClient)\n"
+"PyHoca-GUI (Python X2Go Client)\n"
"Currently connecting you to remote X2Go server ,,%s''"
msgstr ""
"PyHoca-GUI (Python X2Go-klient)\n"
@@ -169,7 +169,7 @@ msgstr ""
#: ../pyhoca/wxgui/taskbar.py:107
msgid ""
-"PyHoca-GUI (Python X2goClient)\n"
+"PyHoca-GUI (Python X2Go Client)\n"
"Client for connecting you to a remote X2Go server"
msgstr ""
"PyHoca-GUI (Python X2Go-klient)\n"
@@ -208,273 +208,277 @@ msgid "Single Application"
msgstr "Applikation"
#: ../pyhoca/wxgui/profilemanager.py:87
+msgid "Share desktop session (SHADOW)"
+msgstr "Dela skrivbordssession (SHADOW)"
+
+#: ../pyhoca/wxgui/profilemanager.py:88
msgid "XDMCP Query"
msgstr "XDMCP"
-#: ../pyhoca/wxgui/profilemanager.py:88
+#: ../pyhoca/wxgui/profilemanager.py:89
msgid "Windows Terminal Server (X2Go-proxied RDP)"
msgstr "Windows Terminal Server (RDP-proxy)"
-#: ../pyhoca/wxgui/profilemanager.py:89
+#: ../pyhoca/wxgui/profilemanager.py:90
msgid "Windows Terminal Server (Direct RDP)"
msgstr "Windows Terminal Server (RDP-proxy)"
-#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/profilemanager.py:224
+#: ../pyhoca/wxgui/profilemanager.py:91 ../pyhoca/wxgui/profilemanager.py:243
msgid "Custom command"
msgstr "Anpassat kommando"
-#: ../pyhoca/wxgui/profilemanager.py:95 ../pyhoca/wxgui/menus_taskbar.py:393
+#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:406
msgid "Internet Browser"
msgstr "Webbbläsare"
-#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:394
+#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:407
msgid "Email Client"
msgstr "E-postklient"
-#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:395
+#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:408
msgid "Office"
msgstr "Office"
-#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:396
+#: ../pyhoca/wxgui/profilemanager.py:99 ../pyhoca/wxgui/menus_taskbar.py:409
msgid "Terminal"
msgstr "Terminal"
-#: ../pyhoca/wxgui/profilemanager.py:116
+#: ../pyhoca/wxgui/profilemanager.py:117
msgid "Open file with system's default application"
msgstr "Ãppna med systemets standardapplikation"
-#: ../pyhoca/wxgui/profilemanager.py:117
+#: ../pyhoca/wxgui/profilemanager.py:118
msgid "Open application chooser dialog"
msgstr "Ãppna applikationsväljare"
-#: ../pyhoca/wxgui/profilemanager.py:118
+#: ../pyhoca/wxgui/profilemanager.py:119
msgid "Save incoming file as ..."
msgstr "Spara inkommande fil som ..."
-#: ../pyhoca/wxgui/profilemanager.py:146
+#: ../pyhoca/wxgui/profilemanager.py:147
msgid "settings derived from "
msgstr "inställningar hämtade frÃĨn"
#. boxes for all tabs
-#: ../pyhoca/wxgui/profilemanager.py:167
+#: ../pyhoca/wxgui/profilemanager.py:186
msgid "Session Title"
msgstr "Sessionsnamn"
-#: ../pyhoca/wxgui/profilemanager.py:168
+#: ../pyhoca/wxgui/profilemanager.py:187
msgid "Session Window"
msgstr "SessionsfÃļnster"
-#: ../pyhoca/wxgui/profilemanager.py:169
+#: ../pyhoca/wxgui/profilemanager.py:188
msgid "Session Startup"
msgstr "Sessionsstart"
-#: ../pyhoca/wxgui/profilemanager.py:170
+#: ../pyhoca/wxgui/profilemanager.py:189
msgid "Server"
msgstr "Server"
-#: ../pyhoca/wxgui/profilemanager.py:171
+#: ../pyhoca/wxgui/profilemanager.py:190
msgid "Proxy"
msgstr "Proxy"
-#: ../pyhoca/wxgui/profilemanager.py:172
+#: ../pyhoca/wxgui/profilemanager.py:191
msgid "Connection Link Speed"
msgstr "Anslutningshastighet"
-#: ../pyhoca/wxgui/profilemanager.py:173
+#: ../pyhoca/wxgui/profilemanager.py:192
msgid "Compression"
msgstr "Komprimering"
-#: ../pyhoca/wxgui/profilemanager.py:174
+#: ../pyhoca/wxgui/profilemanager.py:193
msgid "Display"
msgstr "Skärm"
-#: ../pyhoca/wxgui/profilemanager.py:175
+#: ../pyhoca/wxgui/profilemanager.py:194
msgid "Keyboard"
msgstr "Tangentbord"
-#: ../pyhoca/wxgui/profilemanager.py:176
+#: ../pyhoca/wxgui/profilemanager.py:195
msgid "Sound"
msgstr "Ljud"
-#: ../pyhoca/wxgui/profilemanager.py:177
+#: ../pyhoca/wxgui/profilemanager.py:196
msgid "Printing"
msgstr "Utskrifter"
-#: ../pyhoca/wxgui/profilemanager.py:178
+#: ../pyhoca/wxgui/profilemanager.py:197
msgid "Folder Exports"
msgstr "Delade mappar"
-#: ../pyhoca/wxgui/profilemanager.py:179
+#: ../pyhoca/wxgui/profilemanager.py:198
msgid "File Import"
msgstr "Filimport"
#. ##
#. ## widgets for the PROFILE tab
#. ##
-#: ../pyhoca/wxgui/profilemanager.py:184
+#: ../pyhoca/wxgui/profilemanager.py:203
msgid "Name"
msgstr "Namn"
-#: ../pyhoca/wxgui/profilemanager.py:191
+#: ../pyhoca/wxgui/profilemanager.py:210
msgid "Set session window title"
msgstr "Ange fÃļnstertitel fÃļr session"
-#: ../pyhoca/wxgui/profilemanager.py:192
+#: ../pyhoca/wxgui/profilemanager.py:211
msgid "Use a default session window title"
msgstr "Använd standard fÃļnstertitel fÃļr session"
-#: ../pyhoca/wxgui/profilemanager.py:193
+#: ../pyhoca/wxgui/profilemanager.py:212
msgid "Custom session window title"
msgstr "Anpassad fÃļnstertitel fÃļr session"
-#: ../pyhoca/wxgui/profilemanager.py:212
+#: ../pyhoca/wxgui/profilemanager.py:231
msgid "Window Icon"
msgstr "FÃļnsterikon"
#. ##
#. ## widgets for the SESSION tab
#. ##
-#: ../pyhoca/wxgui/profilemanager.py:218
+#: ../pyhoca/wxgui/profilemanager.py:237
msgid "Start session automatically after login"
msgstr "Starta session automatiskt efter inloggning"
-#: ../pyhoca/wxgui/profilemanager.py:219
+#: ../pyhoca/wxgui/profilemanager.py:238
#, python-format
-msgid "Login automatically after %s has started"
-msgstr "Logga in automatiskt när %s har startat"
+msgid "Login automatically after %s has started (needs --auto-connect)"
+msgstr "Logga in automatiskt när %s har startat (--auto-connect mÃĨste anges)"
-#: ../pyhoca/wxgui/profilemanager.py:220
+#: ../pyhoca/wxgui/profilemanager.py:239
msgid "Type"
msgstr "Typ"
-#: ../pyhoca/wxgui/profilemanager.py:222
+#: ../pyhoca/wxgui/profilemanager.py:241
msgid "Application"
msgstr "Applikation"
-#: ../pyhoca/wxgui/profilemanager.py:226
+#: ../pyhoca/wxgui/profilemanager.py:245
msgid "XDMCP server"
msgstr "XDMCP-server"
-#: ../pyhoca/wxgui/profilemanager.py:228
+#: ../pyhoca/wxgui/profilemanager.py:247
msgid "RDP server"
msgstr "RDP-server"
-#: ../pyhoca/wxgui/profilemanager.py:230
+#: ../pyhoca/wxgui/profilemanager.py:249
msgid "RDP options"
msgstr "RDP-alternativ"
-#: ../pyhoca/wxgui/profilemanager.py:232
+#: ../pyhoca/wxgui/profilemanager.py:251
msgid "Integrate remote application(s) into local desktop (rootless mode)"
msgstr "Integrera fjärrapplikation i lokalt Skrivbord (rootless)"
-#: ../pyhoca/wxgui/profilemanager.py:233
+#: ../pyhoca/wxgui/profilemanager.py:252
msgid "Menu of published applications"
msgstr "Meny med publicerade applikationer"
#. ##
#. ## widgets for the CONNECTION tab
#. ##
-#: ../pyhoca/wxgui/profilemanager.py:240 ../pyhoca/wxgui/profilemanager.py:253
+#: ../pyhoca/wxgui/profilemanager.py:259 ../pyhoca/wxgui/profilemanager.py:273
msgid "User"
msgstr "Användare"
-#: ../pyhoca/wxgui/profilemanager.py:242 ../pyhoca/wxgui/profilemanager.py:260
+#: ../pyhoca/wxgui/profilemanager.py:261 ../pyhoca/wxgui/profilemanager.py:280
msgid "Host"
msgstr "Server"
-#: ../pyhoca/wxgui/profilemanager.py:244 ../pyhoca/wxgui/profilemanager.py:262
+#: ../pyhoca/wxgui/profilemanager.py:263 ../pyhoca/wxgui/profilemanager.py:282
msgid "Port"
msgstr "Port"
-#: ../pyhoca/wxgui/profilemanager.py:246
+#: ../pyhoca/wxgui/profilemanager.py:265
msgid "Key"
msgstr "Nyckel"
-#: ../pyhoca/wxgui/profilemanager.py:249
+#: ../pyhoca/wxgui/profilemanager.py:268
msgid "Discover SSH keys or use SSH agent for X2Go authentication"
msgstr "Upptäck SSH-nycklar eller använd SSH agent fÃļr X2Go autentisering"
-#: ../pyhoca/wxgui/profilemanager.py:251
+#: ../pyhoca/wxgui/profilemanager.py:270
msgid "Enable forwarding of SSH authentication agent connections"
msgstr "Aktivera vidarebefordran av anslutningar fÃļr SSH autentiseringsagent"
-#: ../pyhoca/wxgui/profilemanager.py:252
+#: ../pyhoca/wxgui/profilemanager.py:271
+msgid "Store SSH host keys under (unique) X2Go session profile ID"
+msgstr "Lagra SSH servernyckel under (unik) X2Go sessionsprofil-ID"
+
+#: ../pyhoca/wxgui/profilemanager.py:272
msgid "Server behind SSH proxy"
msgstr "Server bakom SSH-proxy"
-#: ../pyhoca/wxgui/profilemanager.py:255
+#: ../pyhoca/wxgui/profilemanager.py:275
msgid "Use same username for X2Go and proxy host"
msgstr "Använd samma användarnamn fÃļr X2Go och proxyserver"
-#: ../pyhoca/wxgui/profilemanager.py:256
+#: ../pyhoca/wxgui/profilemanager.py:276
msgid "Use same authentication for X2Go and proxy host"
msgstr "Använd samma autentisering fÃļr X2Go och proxyserver"
-#: ../pyhoca/wxgui/profilemanager.py:257
+#: ../pyhoca/wxgui/profilemanager.py:277
msgid "Key file"
msgstr "Nyckelfil"
-#: ../pyhoca/wxgui/profilemanager.py:264
-msgid "SSH Proxy Tunnel"
-msgstr "SSH proxytunnel"
-
-#: ../pyhoca/wxgui/profilemanager.py:270
+#: ../pyhoca/wxgui/profilemanager.py:284
msgid "Discover SSH keys or use SSH agent for proxy authentication"
msgstr "Upptäck SSH-nycklar eller använd SSH agent fÃļr proxyautentisering"
-#: ../pyhoca/wxgui/profilemanager.py:273
+#: ../pyhoca/wxgui/profilemanager.py:287
msgid "Modem"
msgstr "Modem"
-#: ../pyhoca/wxgui/profilemanager.py:274
+#: ../pyhoca/wxgui/profilemanager.py:288
msgid "ISDN"
msgstr "ISDN"
-#: ../pyhoca/wxgui/profilemanager.py:275
+#: ../pyhoca/wxgui/profilemanager.py:289
msgid "ADSL"
msgstr "ADSL"
-#: ../pyhoca/wxgui/profilemanager.py:276
+#: ../pyhoca/wxgui/profilemanager.py:290
msgid "WAN"
msgstr "WAN"
-#: ../pyhoca/wxgui/profilemanager.py:277
+#: ../pyhoca/wxgui/profilemanager.py:291
msgid "LAN"
msgstr "LAN"
-#: ../pyhoca/wxgui/profilemanager.py:279
+#: ../pyhoca/wxgui/profilemanager.py:293
msgid "Method"
msgstr "Metod"
-#: ../pyhoca/wxgui/profilemanager.py:281
+#: ../pyhoca/wxgui/profilemanager.py:295
msgid "Image quality"
msgstr "Bildkvalitet"
#. ##
-#. ## wigdets for the SETTINGS tab
+#. ## wigdets for the IO tab
#. ##
-#: ../pyhoca/wxgui/profilemanager.py:287
+#: ../pyhoca/wxgui/profilemanager.py:301
msgid "Fullscreen"
msgstr "Fullskärm"
-#: ../pyhoca/wxgui/profilemanager.py:288
+#: ../pyhoca/wxgui/profilemanager.py:302
msgid "Maximized"
msgstr "Maximerad"
-#: ../pyhoca/wxgui/profilemanager.py:289
+#: ../pyhoca/wxgui/profilemanager.py:303
msgid "Custom Size"
msgstr "Anpassad storlek"
-#: ../pyhoca/wxgui/profilemanager.py:294
+#: ../pyhoca/wxgui/profilemanager.py:308
msgid "Set display DPI"
msgstr "Ange skärmupplÃļsning (DPI)"
-#: ../pyhoca/wxgui/profilemanager.py:296
+#: ../pyhoca/wxgui/profilemanager.py:310
msgid "Do not set (use server-side tools to configure the keyboard)"
msgstr ""
"Konfigurera inte (använd verktyg pÃĨ server fÃļr att konfigurera tangentbord)"
-#: ../pyhoca/wxgui/profilemanager.py:297
+#: ../pyhoca/wxgui/profilemanager.py:311
msgid ""
"Automatically detect and use client-side keyboard configuration inside the "
"session"
@@ -482,477 +486,531 @@ msgstr ""
"Detektera automatiskt och använd klientinställningar fÃļr tangentbord i "
"session"
-#: ../pyhoca/wxgui/profilemanager.py:298
+#: ../pyhoca/wxgui/profilemanager.py:312
msgid "Use custom keyboard settings as provided below"
msgstr "Använd nedan angivna tangentbordsinställningar"
-#: ../pyhoca/wxgui/profilemanager.py:299
+#: ../pyhoca/wxgui/profilemanager.py:313
msgid "Keyboard model"
msgstr "Tangentbordsmodell"
-#: ../pyhoca/wxgui/profilemanager.py:301
+#: ../pyhoca/wxgui/profilemanager.py:315
msgid "Layout"
msgstr "Tangentbordslayout"
-#: ../pyhoca/wxgui/profilemanager.py:303
+#: ../pyhoca/wxgui/profilemanager.py:317
msgid "Layout variant"
msgstr "Variant"
-#: ../pyhoca/wxgui/profilemanager.py:305
+#. ##
+#. ## wigdets for the MEDIA tab
+#. ##
+#: ../pyhoca/wxgui/profilemanager.py:323
msgid "Enable sound support"
msgstr "Aktivera ljudstÃļd"
-#: ../pyhoca/wxgui/profilemanager.py:306
+#: ../pyhoca/wxgui/profilemanager.py:324
msgid "Pulse Audio"
msgstr "Pulse Audio"
#. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated.
#. However, config files can contain an Arts configuration, so we will honour this
-#: ../pyhoca/wxgui/profilemanager.py:310
+#: ../pyhoca/wxgui/profilemanager.py:328
msgid "Arts (not supported)"
msgstr "Arts (stÃļds ej)"
-#: ../pyhoca/wxgui/profilemanager.py:313
+#: ../pyhoca/wxgui/profilemanager.py:331
msgid "esd"
msgstr "esd"
-#: ../pyhoca/wxgui/profilemanager.py:314
+#: ../pyhoca/wxgui/profilemanager.py:332
msgid "Use default sound port"
msgstr "Använd standardport fÃļr ljud"
-#: ../pyhoca/wxgui/profilemanager.py:315
+#: ../pyhoca/wxgui/profilemanager.py:333
msgid "Custom sound port"
msgstr "Anpassad ljudport"
-#: ../pyhoca/wxgui/profilemanager.py:318
+#: ../pyhoca/wxgui/profilemanager.py:336
+msgid "Client Side printing"
+msgstr "StÃļd fÃļr utskrifter via klienten"
+
+#. ##
+#. ## wigdets for the SHARING tab
+#. ##
+#: ../pyhoca/wxgui/profilemanager.py:342
msgid "Use local folder sharing"
msgstr "Använd lokal mappdelning"
-#: ../pyhoca/wxgui/profilemanager.py:319
+#: ../pyhoca/wxgui/profilemanager.py:343
msgid "Store share list at end of session"
msgstr "Spara lista med delade mappar när sessionen avslutas"
-#: ../pyhoca/wxgui/profilemanager.py:320
+#: ../pyhoca/wxgui/profilemanager.py:344
msgid "Path"
msgstr "SÃļkväg"
-#: ../pyhoca/wxgui/profilemanager.py:323 ../pyhoca/wxgui/profilemanager.py:344
+#: ../pyhoca/wxgui/profilemanager.py:347 ../pyhoca/wxgui/profilemanager.py:366
msgid "Add"
msgstr "Lägg till"
-#: ../pyhoca/wxgui/profilemanager.py:325
+#: ../pyhoca/wxgui/profilemanager.py:349
msgid "Local Path"
msgstr "Lokal sÃļkväg"
-#: ../pyhoca/wxgui/profilemanager.py:326
+#: ../pyhoca/wxgui/profilemanager.py:350
msgid "Connect Method"
msgstr "Anslutningsmetod"
-#: ../pyhoca/wxgui/profilemanager.py:327
+#: ../pyhoca/wxgui/profilemanager.py:351
msgid "Delete"
msgstr "Radera"
-#: ../pyhoca/wxgui/profilemanager.py:329
+#: ../pyhoca/wxgui/profilemanager.py:353
msgid "Convert between client and server encodings"
msgstr "Konvertera kodtabell mellan klient och server"
-#: ../pyhoca/wxgui/profilemanager.py:330
+#: ../pyhoca/wxgui/profilemanager.py:354
msgid "Client encoding"
msgstr "Kodtabell klient"
-#: ../pyhoca/wxgui/profilemanager.py:332
+#: ../pyhoca/wxgui/profilemanager.py:356
msgid "Server encoding"
msgstr "Kodtabell server"
-#: ../pyhoca/wxgui/profilemanager.py:335
+#: ../pyhoca/wxgui/profilemanager.py:359
msgid "Use file MIME box for local file import"
msgstr "Använd MIME fÃļr lokal filimport"
-#: ../pyhoca/wxgui/profilemanager.py:336
+#: ../pyhoca/wxgui/profilemanager.py:360
msgid "Extensions"
msgstr "Filändelser"
-#: ../pyhoca/wxgui/profilemanager.py:338
+#: ../pyhoca/wxgui/profilemanager.py:362
msgid "Action"
msgstr "Hantering"
-#: ../pyhoca/wxgui/profilemanager.py:341
-msgid "Client Side printing"
-msgstr "StÃļd fÃļr utskrifter via klienten"
-
-#: ../pyhoca/wxgui/profilemanager.py:345
+#: ../pyhoca/wxgui/profilemanager.py:367
msgid "Defaults"
msgstr "Standard"
-#: ../pyhoca/wxgui/profilemanager.py:347
+#: ../pyhoca/wxgui/profilemanager.py:369
msgid "Save"
msgstr "Spara"
-#: ../pyhoca/wxgui/profilemanager.py:348
+#: ../pyhoca/wxgui/profilemanager.py:370
msgid "Reset"
msgstr "Ã
terställ"
-#: ../pyhoca/wxgui/profilemanager.py:401
-#: ../pyhoca/wxgui/profilemanager.py:1124
-#: ../pyhoca/wxgui/profilemanager.py:2268
+#: ../pyhoca/wxgui/profilemanager.py:372 ../pyhoca/wxgui/printingprefs.py:143
+msgid "Apply"
+msgstr "Verkställ"
+
+#: ../pyhoca/wxgui/profilemanager.py:423
+#: ../pyhoca/wxgui/profilemanager.py:1135
+#: ../pyhoca/wxgui/profilemanager.py:2303
msgid "automatically"
msgstr "automatisk"
-#: ../pyhoca/wxgui/profilemanager.py:403
-#: ../pyhoca/wxgui/profilemanager.py:1126
+#: ../pyhoca/wxgui/profilemanager.py:425
+#: ../pyhoca/wxgui/profilemanager.py:1137
msgid "manually"
msgstr "manuellt"
-#: ../pyhoca/wxgui/profilemanager.py:412
+#: ../pyhoca/wxgui/profilemanager.py:434
msgid "PyHoca-GUI Profile Manager - new profile"
msgstr "PyHoca-GUI Profilhanterare - ny profil"
-#: ../pyhoca/wxgui/profilemanager.py:414
+#: ../pyhoca/wxgui/profilemanager.py:436
#, python-format
msgid "PyHoca-GUI Profile Manager - %s (connected)"
msgstr " PyHoca-GUI Profilhanterare - %s (ansluten)"
-#: ../pyhoca/wxgui/profilemanager.py:416
+#: ../pyhoca/wxgui/profilemanager.py:438
#, python-format
msgid "PyHoca-GUI Profile Manager - %s"
msgstr "PyHoca-GUI Profilhanterare - %s"
-#: ../pyhoca/wxgui/profilemanager.py:797
+#: ../pyhoca/wxgui/profilemanager.py:804
msgid "Profile"
msgstr "Profil"
-#: ../pyhoca/wxgui/profilemanager.py:798
+#: ../pyhoca/wxgui/profilemanager.py:805
msgid "Session"
msgstr "Session"
-#: ../pyhoca/wxgui/profilemanager.py:799
+#: ../pyhoca/wxgui/profilemanager.py:806
msgid "Connection"
msgstr "Anslutning"
-#: ../pyhoca/wxgui/profilemanager.py:800
+#: ../pyhoca/wxgui/profilemanager.py:807
msgid "Link Quality"
msgstr "Länkkvalitet"
-#: ../pyhoca/wxgui/profilemanager.py:801
-msgid "Settings"
-msgstr "Inställningar"
+#: ../pyhoca/wxgui/profilemanager.py:808
+msgid "Input/Output"
+msgstr "In-/Utdata"
+
+#: ../pyhoca/wxgui/profilemanager.py:809
+msgid "Media"
+msgstr "Ljud och bild"
-#: ../pyhoca/wxgui/profilemanager.py:802
+#: ../pyhoca/wxgui/profilemanager.py:810
msgid "Sharing"
msgstr "Delning"
-#: ../pyhoca/wxgui/profilemanager.py:988
+#: ../pyhoca/wxgui/profilemanager.py:989
msgid "<xkbtype>"
msgstr "pc105"
-#: ../pyhoca/wxgui/profilemanager.py:989
+#: ../pyhoca/wxgui/profilemanager.py:990
msgid "<xkblayout>"
msgstr "se"
-#: ../pyhoca/wxgui/profilemanager.py:990
+#: ../pyhoca/wxgui/profilemanager.py:991
msgid "<xkbvariant>"
msgstr "se"
-#: ../pyhoca/wxgui/profilemanager.py:1444
+#: ../pyhoca/wxgui/profilemanager.py:1449
msgid "Icon Files (*.png)|*.png|All files (*.*)|*"
msgstr "Ikonfiler (*.png)|*.png|Alla filer (*.*)|*"
-#: ../pyhoca/wxgui/profilemanager.py:1447
+#: ../pyhoca/wxgui/profilemanager.py:1452
msgid "Choose an icon for this session profile"
msgstr "Välj en ikon fÃļr denna sessionsprofil"
-#: ../pyhoca/wxgui/profilemanager.py:1816
+#: ../pyhoca/wxgui/profilemanager.py:1895
msgid "All files (*.*)|*"
msgstr "Alla filer (*.*)|*"
-#: ../pyhoca/wxgui/profilemanager.py:1818
-#: ../pyhoca/wxgui/profilemanager.py:1842
+#: ../pyhoca/wxgui/profilemanager.py:1897
+#: ../pyhoca/wxgui/profilemanager.py:1921
msgid "Choose a public SSH key"
msgstr "Välj en public SSH-nyckel"
-#: ../pyhoca/wxgui/profilemanager.py:2220
+#: ../pyhoca/wxgui/profilemanager.py:2255
msgid "Choose a folder to share within a session"
msgstr "Välj en mapp att dela i en session"
-#: ../pyhoca/wxgui/profilemanager.py:2348
-#: ../pyhoca/wxgui/profilemanager.py:2351
-#: ../pyhoca/wxgui/profilemanager.py:2354
-#: ../pyhoca/wxgui/profilemanager.py:2359
-#: ../pyhoca/wxgui/profilemanager.py:2369 ../pyhoca/wxgui/menus_taskbar.py:117
+#: ../pyhoca/wxgui/profilemanager.py:2383
+#: ../pyhoca/wxgui/profilemanager.py:2386
+#: ../pyhoca/wxgui/profilemanager.py:2389 ../pyhoca/wxgui/menus_taskbar.py:122
msgid "Profile Manager"
msgstr "Profilhanterare"
-#: ../pyhoca/wxgui/profilemanager.py:2348
+#: ../pyhoca/wxgui/profilemanager.py:2383
msgid "Profile name is missing, profile unusable!!!"
msgstr "Profilnamn saknas, profil oanvändbar!"
-#: ../pyhoca/wxgui/profilemanager.py:2351
-#: ../pyhoca/wxgui/profilemanager.py:2354
+#: ../pyhoca/wxgui/profilemanager.py:2386
+#: ../pyhoca/wxgui/profilemanager.py:2389
#, python-format
msgid "Profile name %s already exists!!!"
msgstr "Profilen %s finns redan!"
-#: ../pyhoca/wxgui/profilemanager.py:2359
-msgid "The SSH proxy configuration is incomplete. Try again."
-msgstr "Konfigurationen av SSH-proxy är inte komplett. FÃļrsÃļk igen."
-
-#: ../pyhoca/wxgui/profilemanager.py:2369
-#, python-format
-msgid ""
-"Another session profile (%s) already uses [%s]:%s for binding a local SSH "
-"proxy to.\n"
-"Please change the SSH proxy settings accordingly."
-msgstr ""
-"En annan session (%s) använder redan [%s]:%s fÃļr att ansluta till lokal SSH-"
-"proxy.\n"
-"Ãndra konfiguration fÃļr SSH-proxy ."
-
-#: ../pyhoca/wxgui/profilemanager.py:2396
+#: ../pyhoca/wxgui/profilemanager.py:2416
#, python-format
msgid "%s - profile added"
msgstr "%s - profil tillagd"
-#: ../pyhoca/wxgui/profilemanager.py:2397
+#: ../pyhoca/wxgui/profilemanager.py:2417
msgid "A new session profile has been added."
msgstr "En ny sessionsprofil har lagts till."
-#: ../pyhoca/wxgui/profilemanager.py:2401
+#: ../pyhoca/wxgui/profilemanager.py:2421
#, python-format
msgid "%s - modified"
msgstr "%s - ändrad"
-#: ../pyhoca/wxgui/profilemanager.py:2402
+#: ../pyhoca/wxgui/profilemanager.py:2422
msgid "Changes to profile have been saved."
msgstr "Ãndringar av profil har sparats."
-#: ../pyhoca/wxgui/menus_taskbar.py:74
+#: ../pyhoca/wxgui/listdesktops.py:82
+#, python-format
+msgid "Share Desktop Session - %s"
+msgstr "Dela skrivbordssession - %s"
+
+#: ../pyhoca/wxgui/listdesktops.py:84
+msgid "Select one of the available desktop sessions on this server"
+msgstr "Välj en av de tillgängliga skrivbordssessionerna pÃĨ denna server"
+
+#: ../pyhoca/wxgui/listdesktops.py:90
+msgid "View session only"
+msgstr "Endast visa session"
+
+#: ../pyhoca/wxgui/listdesktops.py:91
+msgid "Gain full access"
+msgstr "ErhÃĨll full ÃĨtkomst"
+
+#: ../pyhoca/wxgui/listdesktops.py:95
+msgid "Share Desktop"
+msgstr "Dela skrivbord"
+
+#: ../pyhoca/wxgui/listdesktops.py:98
+msgid "Refresh list"
+msgstr "Uppdatera lista"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:76
msgid "Edit Profile"
msgstr "Redigera profil"
-#: ../pyhoca/wxgui/menus_taskbar.py:77
+#: ../pyhoca/wxgui/menus_taskbar.py:79
msgid "Use as Template for New Profile"
msgstr "Använd som mall fÃļr ny profil"
-#: ../pyhoca/wxgui/menus_taskbar.py:78
+#: ../pyhoca/wxgui/menus_taskbar.py:81
+msgid "Export Profile"
+msgstr "Exportera profil"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:82
msgid "Delete Profile"
msgstr "Radera profil"
-#: ../pyhoca/wxgui/menus_taskbar.py:106
+#: ../pyhoca/wxgui/menus_taskbar.py:111
#, python-format
msgid "About %s (%s)..."
msgstr "Om %s (%s)..."
-#: ../pyhoca/wxgui/menus_taskbar.py:132
+#: ../pyhoca/wxgui/menus_taskbar.py:137
msgid "Manage Session Profile"
msgstr "Hantera sessionsprofil"
-#: ../pyhoca/wxgui/menus_taskbar.py:141
+#: ../pyhoca/wxgui/menus_taskbar.py:146
msgid "Printing Preferences"
msgstr "Utskriftspreferenser"
-#: ../pyhoca/wxgui/menus_taskbar.py:147
+#: ../pyhoca/wxgui/menus_taskbar.py:152
msgid "Client Options"
msgstr "Klientalternativ"
-#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:783
-#: ../pyhoca/wxgui/menus_taskbar.py:975
+#: ../pyhoca/wxgui/menus_taskbar.py:160 ../pyhoca/wxgui/menus_taskbar.py:828
+#: ../pyhoca/wxgui/menus_taskbar.py:1033
msgid "E&xit"
msgstr "&Avsluta"
-#: ../pyhoca/wxgui/menus_taskbar.py:227
+#: ../pyhoca/wxgui/menus_taskbar.py:232
msgid "Window title"
msgstr "FÃļnstertitel"
-#: ../pyhoca/wxgui/menus_taskbar.py:233 ../pyhoca/wxgui/menus_taskbar.py:608
+#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:631
msgid "Resume Session"
msgstr "Ã
teranslut session"
-#: ../pyhoca/wxgui/menus_taskbar.py:235
+#: ../pyhoca/wxgui/menus_taskbar.py:240
msgid "Resume Session (not possible)"
msgstr "Ã
teranslut session (ej mÃļjligt)"
-#: ../pyhoca/wxgui/menus_taskbar.py:246
+#: ../pyhoca/wxgui/menus_taskbar.py:251
msgid "Transfer Session"
msgstr "Flytta session"
-#: ../pyhoca/wxgui/menus_taskbar.py:248
+#: ../pyhoca/wxgui/menus_taskbar.py:253
msgid "Transfer Session (not possible)"
msgstr "Flytta session (ej mÃļjligt)"
-#: ../pyhoca/wxgui/menus_taskbar.py:252 ../pyhoca/wxgui/menus_taskbar.py:599
+#: ../pyhoca/wxgui/menus_taskbar.py:258 ../pyhoca/wxgui/menus_taskbar.py:622
msgid "Suspend Session (and disconnect/exit)"
msgstr "FÃļrsätt session i vila och avsluta"
-#: ../pyhoca/wxgui/menus_taskbar.py:254 ../pyhoca/wxgui/menus_taskbar.py:601
+#: ../pyhoca/wxgui/menus_taskbar.py:260 ../pyhoca/wxgui/menus_taskbar.py:624
msgid "Suspend Session (and disconnect)"
msgstr "FÃļrsätt session i vila och koppla frÃĨn"
-#: ../pyhoca/wxgui/menus_taskbar.py:256 ../pyhoca/wxgui/menus_taskbar.py:603
+#: ../pyhoca/wxgui/menus_taskbar.py:262 ../pyhoca/wxgui/menus_taskbar.py:626
msgid "Suspend Session"
msgstr "FÃļrsätt session i vila"
-#: ../pyhoca/wxgui/menus_taskbar.py:262 ../pyhoca/wxgui/menus_taskbar.py:612
+#: ../pyhoca/wxgui/menus_taskbar.py:268 ../pyhoca/wxgui/menus_taskbar.py:635
msgid "Terminate Session (and disconnect/exit)"
msgstr "Avsluta session"
-#: ../pyhoca/wxgui/menus_taskbar.py:264 ../pyhoca/wxgui/menus_taskbar.py:614
+#: ../pyhoca/wxgui/menus_taskbar.py:270 ../pyhoca/wxgui/menus_taskbar.py:637
msgid "Terminate Session (and disconnect)"
msgstr "Koppla frÃĨn session"
-#: ../pyhoca/wxgui/menus_taskbar.py:266 ../pyhoca/wxgui/menus_taskbar.py:616
+#: ../pyhoca/wxgui/menus_taskbar.py:272 ../pyhoca/wxgui/menus_taskbar.py:639
msgid "Terminate Session"
msgstr "Avsluta session"
-#: ../pyhoca/wxgui/menus_taskbar.py:270 ../pyhoca/wxgui/menus_taskbar.py:596
+#: ../pyhoca/wxgui/menus_taskbar.py:275
+msgid "End Desktop Sharing (and disconnect/exit)"
+msgstr "Avsluta skrivbordsdelning (och koppla frÃĨn/avsluta)"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:277
+msgid "End Desktop Sharing (and disconnect)"
+msgstr "Avsluta skrivbordsdelning (och koppla frÃĨn)"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:279
+msgid "End Desktop Sharing"
+msgstr "Avsluta skrivbordsdelning"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:283 ../pyhoca/wxgui/menus_taskbar.py:619
msgid "Refresh menu tree"
msgstr "Uppdatera menyträd"
-#: ../pyhoca/wxgui/menus_taskbar.py:279
+#: ../pyhoca/wxgui/menus_taskbar.py:292
msgid "Rename Session Window"
msgstr "DÃļp om sessionsfÃļnster"
-#: ../pyhoca/wxgui/menus_taskbar.py:280
+#: ../pyhoca/wxgui/menus_taskbar.py:293
msgid "Show Session Window"
msgstr "Visa sessionsfÃļnster"
-#: ../pyhoca/wxgui/menus_taskbar.py:322
+#: ../pyhoca/wxgui/menus_taskbar.py:335
msgid "&Share custom local folder"
msgstr "&Dela anpassad lokal mapp"
-#: ../pyhoca/wxgui/menus_taskbar.py:337
+#: ../pyhoca/wxgui/menus_taskbar.py:350
msgid "Share:"
msgstr "Dela:"
-#: ../pyhoca/wxgui/menus_taskbar.py:346
+#: ../pyhoca/wxgui/menus_taskbar.py:359
msgid "Unshare:"
msgstr "Avsluta delning:"
-#: ../pyhoca/wxgui/menus_taskbar.py:354
+#: ../pyhoca/wxgui/menus_taskbar.py:367
msgid "Unshare &all local folders"
msgstr "Avsluta delning av lokala mappar"
-#: ../pyhoca/wxgui/menus_taskbar.py:360
+#: ../pyhoca/wxgui/menus_taskbar.py:373
msgid "Restore shares in next session"
msgstr "Ã
terställ delade mappar i nästa session"
-#: ../pyhoca/wxgui/menus_taskbar.py:440
+#: ../pyhoca/wxgui/menus_taskbar.py:453
msgid "Multimedia"
msgstr "Ljud och bild"
-#: ../pyhoca/wxgui/menus_taskbar.py:441
+#: ../pyhoca/wxgui/menus_taskbar.py:454
msgid "Development"
msgstr "Programmering"
-#: ../pyhoca/wxgui/menus_taskbar.py:442
+#: ../pyhoca/wxgui/menus_taskbar.py:455
msgid "Education"
msgstr "Utbildning"
-#: ../pyhoca/wxgui/menus_taskbar.py:443
+#: ../pyhoca/wxgui/menus_taskbar.py:456
msgid "Games"
msgstr "Spel"
-#: ../pyhoca/wxgui/menus_taskbar.py:444
+#: ../pyhoca/wxgui/menus_taskbar.py:457
msgid "Graphics"
msgstr "Grafik"
-#: ../pyhoca/wxgui/menus_taskbar.py:445
+#: ../pyhoca/wxgui/menus_taskbar.py:458
msgid "Internet"
msgstr "Internet"
-#: ../pyhoca/wxgui/menus_taskbar.py:446
+#: ../pyhoca/wxgui/menus_taskbar.py:459
msgid "Office Applications"
msgstr "Kontor"
-#: ../pyhoca/wxgui/menus_taskbar.py:447
+#: ../pyhoca/wxgui/menus_taskbar.py:460
msgid "System"
msgstr "System"
-#: ../pyhoca/wxgui/menus_taskbar.py:448
+#: ../pyhoca/wxgui/menus_taskbar.py:461
msgid "Utilities"
msgstr "Verktyg"
-#: ../pyhoca/wxgui/menus_taskbar.py:449
+#: ../pyhoca/wxgui/menus_taskbar.py:462
msgid "Other Applications"
msgstr "Ãvriga applikationer"
-#: ../pyhoca/wxgui/menus_taskbar.py:521 ../pyhoca/wxgui/menus_taskbar.py:533
+#: ../pyhoca/wxgui/menus_taskbar.py:535 ../pyhoca/wxgui/menus_taskbar.py:547
#, python-format
msgid "Connect %s"
msgstr "Anslut %s"
-#: ../pyhoca/wxgui/menus_taskbar.py:527
+#: ../pyhoca/wxgui/menus_taskbar.py:541
msgid "Currently connecting..."
msgstr "Anslutning pÃĨgÃĨr..."
-#: ../pyhoca/wxgui/menus_taskbar.py:541
+#: ../pyhoca/wxgui/menus_taskbar.py:556
msgid "Start &new Desktop Session"
msgstr "Starta &ny Skrivbordssession"
-#: ../pyhoca/wxgui/menus_taskbar.py:546 ../pyhoca/wxgui/menus_taskbar.py:684
+#: ../pyhoca/wxgui/menus_taskbar.py:560 ../pyhoca/wxgui/menus_taskbar.py:660
+msgid "Start Desktop Sharing Session"
+msgstr "Starta skrivbordsdelning"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:566 ../pyhoca/wxgui/menus_taskbar.py:710
msgid "Retrieving Application Menu..."
msgstr "Hämtar applikationsmeny..."
-#: ../pyhoca/wxgui/menus_taskbar.py:550 ../pyhoca/wxgui/menus_taskbar.py:687
+#: ../pyhoca/wxgui/menus_taskbar.py:570 ../pyhoca/wxgui/menus_taskbar.py:713
msgid "Retrieve Application Menu"
msgstr "Hämta applikationsmeny"
-#: ../pyhoca/wxgui/menus_taskbar.py:553
+#: ../pyhoca/wxgui/menus_taskbar.py:573
+msgid "Start &new RDP Session"
+msgstr "Starta &ny RDP session"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:576
msgid "Start &new Session"
msgstr "Starta &ny session"
-#: ../pyhoca/wxgui/menus_taskbar.py:633
+#: ../pyhoca/wxgui/menus_taskbar.py:656
msgid "Launch Single Application"
msgstr "Starta applikation"
-#: ../pyhoca/wxgui/menus_taskbar.py:671
+#: ../pyhoca/wxgui/menus_taskbar.py:697
msgid "Manage Application Menu"
msgstr "Hantera applikationsmeny"
-#: ../pyhoca/wxgui/menus_taskbar.py:714
+#: ../pyhoca/wxgui/menus_taskbar.py:752
msgid "Running"
msgstr "Aktiv"
-#: ../pyhoca/wxgui/menus_taskbar.py:716
+#: ../pyhoca/wxgui/menus_taskbar.py:754
msgid "Suspended"
msgstr "Vilande"
-#: ../pyhoca/wxgui/menus_taskbar.py:735
+#: ../pyhoca/wxgui/menus_taskbar.py:773
msgid "&Clean all sessions"
msgstr "&Rensa alla sessioner"
-#: ../pyhoca/wxgui/menus_taskbar.py:741
+#: ../pyhoca/wxgui/menus_taskbar.py:779
msgid "Customize &profile"
msgstr "Anpassa &profil"
-#: ../pyhoca/wxgui/menus_taskbar.py:756
+#: ../pyhoca/wxgui/menus_taskbar.py:794
msgid "Shared &folders"
msgstr "Delade &mappar"
-#: ../pyhoca/wxgui/menus_taskbar.py:768
+#: ../pyhoca/wxgui/menus_taskbar.py:806
+msgid "Server Information"
+msgstr "Serverinformation"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:813
msgid "&Disconnect from Server"
msgstr "&Koppla frÃĨn server"
-#: ../pyhoca/wxgui/menus_taskbar.py:775
+#: ../pyhoca/wxgui/menus_taskbar.py:820
msgid "Suspend Session and E&xit application"
msgstr "FÃļrsätt session i vila och avsluta"
-#: ../pyhoca/wxgui/menus_taskbar.py:779
+#: ../pyhoca/wxgui/menus_taskbar.py:824
msgid "Disconnect and E&xit application"
msgstr "Kopplar frÃĨn och &avsluta"
-#: ../pyhoca/wxgui/menus_taskbar.py:833
+#: ../pyhoca/wxgui/menus_taskbar.py:878
msgid "Add Profile"
msgstr "Lägg till profil"
-#: ../pyhoca/wxgui/menus_taskbar.py:909
+#: ../pyhoca/wxgui/menus_taskbar.py:954
msgid "No session profiles defined"
msgstr "Inga sessionsprofiler har definierats"
-#: ../pyhoca/wxgui/menus_taskbar.py:945
-msgid "Start/Resume Session"
-msgstr "Starta/ÃĨteranslut session"
+#: ../pyhoca/wxgui/menus_taskbar.py:965
+msgid "Export all Profiles"
+msgstr "Exportera alla profiler"
-#: ../pyhoca/wxgui/menus_taskbar.py:945
+#: ../pyhoca/wxgui/menus_taskbar.py:967
+msgid "Export Profile Group"
+msgstr "Exportera profilgrupp"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:1003
msgid "Connect Server"
msgstr "Anslut till server"
@@ -961,62 +1019,62 @@ msgstr "Anslut till server"
msgid "About %s ..."
msgstr "Om %s ..."
-#: ../pyhoca/wxgui/frontend.py:459
+#: ../pyhoca/wxgui/frontend.py:465
msgid "Suspending sessions and exiting application..."
msgstr "FÃļrsätter session i vila och avslutar..."
-#: ../pyhoca/wxgui/frontend.py:462
+#: ../pyhoca/wxgui/frontend.py:468
#, python-format
msgid "Disconnecting %s and exiting application..."
msgstr "Kopplar frÃĨn %s och avslutar applikation..."
-#: ../pyhoca/wxgui/frontend.py:464
+#: ../pyhoca/wxgui/frontend.py:470
msgid "Exiting application..."
msgstr "Avslutar applikation..."
-#: ../pyhoca/wxgui/frontend.py:562
+#: ../pyhoca/wxgui/frontend.py:568
#, python-format
msgid "%s - server warning"
msgstr "%s - servervarning"
-#: ../pyhoca/wxgui/frontend.py:562
+#: ../pyhoca/wxgui/frontend.py:568
msgid "The X2Go Server does not publish an application menu."
msgstr "X2Go-servern publicerar inte en applikationsmeny."
-#: ../pyhoca/wxgui/frontend.py:613
+#: ../pyhoca/wxgui/frontend.py:619
msgid "SSH key authentication has been successful."
msgstr "Autentisering med SSH-nyckel lyckades."
-#: ../pyhoca/wxgui/frontend.py:650
+#: ../pyhoca/wxgui/frontend.py:656
msgid ""
"The SSH proxy's host key is invalid or has not been accepted by the user"
msgstr ""
"SSH-proxyns nyckel är felaktig eller har inte accepterats av användaren"
-#: ../pyhoca/wxgui/frontend.py:671
+#: ../pyhoca/wxgui/frontend.py:677
#, python-format
msgid "%s - EOF error"
msgstr "%s - EOF fel"
-#: ../pyhoca/wxgui/frontend.py:671
+#: ../pyhoca/wxgui/frontend.py:677
msgid "Authentication protocol communication incomplete! Try again..."
msgstr "Autentisering slutfÃļrdes ej! Prova igen..."
-#: ../pyhoca/wxgui/frontend.py:678
+#: ../pyhoca/wxgui/frontend.py:684
#, python-format
msgid "%s - auth key error"
msgstr "%s - autentiseringsnyckel fel"
-#: ../pyhoca/wxgui/frontend.py:699
+#: ../pyhoca/wxgui/frontend.py:705
msgid "An unknown error occurred during authentication!"
msgstr "Ett okänt fel inträffade vid autentisering!"
-#: ../pyhoca/wxgui/frontend.py:728
+#: ../pyhoca/wxgui/frontend.py:734
#, python-format
msgid "%s: DirectRDP not supported yet"
msgstr "%s: DirectRDP stÃļds inte ännu"
-#: ../pyhoca/wxgui/frontend.py:729
+#: ../pyhoca/wxgui/frontend.py:735
#, python-format
msgid ""
"We apologize for the inconvenience...\n"
@@ -1024,66 +1082,154 @@ msgid ""
"Session profiles of type ,,DirectRDP'' are not\n"
"supported by %s (%s), yet!!\n"
"\n"
-"DirectRDP support will be available in %s (>= 0.2.2.0)."
+"DirectRDP support will be available in %s (>= 1.0.0.0)."
msgstr ""
"Vi ber om ursäkt...\n"
"\n"
"Sessionsprofiler av typen \"DirectRDP\" stÃļds inte\n"
"av %s (%s)!\n"
"\n"
-"StÃļd fÃļr DirectRDP kommer i %s (>=0.2.2.0)"
+"StÃļd fÃļr DirectRDP kommer i %s (>=1.0.0.0)"
-#: ../pyhoca/wxgui/frontend.py:741
+#: ../pyhoca/wxgui/frontend.py:747
msgid "Unknown session profile, configure before using it..."
msgstr "Okänd sessionsprofil, konfigurera fÃļre användning..."
-#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:1332
+#: ../pyhoca/wxgui/frontend.py:778
+#, python-format
+msgid "Desktop Sharing with %s not supported by server"
+msgstr "Skrivbordsdelning med %s stÃļds ej av server"
+
+#: ../pyhoca/wxgui/frontend.py:779
+#, python-format
+msgid ""
+"We apologize for the inconvenience...\n"
+"\n"
+"Session profiles of type ,,SHADOW'' are not\n"
+"supported by X2Go Server (v%s)!!!\n"
+"\n"
+"Desktop Sharing with %s requires\n"
+"X2Go Server 4.1.0.0 and above."
+msgstr ""
+"Vi ber om ursäkt...\n"
+"\n"
+"Sessionsprofiler av typen \"SHADOW\" stÃļds inte\n"
+"av X2Go Server (v%s)!\n"
+"\n"
+"StÃļd fÃļr skrivbordsdelning med %s kräver X2Go Server 4.1.0.0 eller hÃļgre."
+
+#: ../pyhoca/wxgui/frontend.py:837 ../pyhoca/wxgui/frontend.py:1488
#, python-format
msgid "%s - session warning"
msgstr "%s - sessionsvarning"
-#: ../pyhoca/wxgui/frontend.py:798
+#: ../pyhoca/wxgui/frontend.py:837
#, python-format
msgid "Execution of command ,,%s'' failed."
msgstr "Exekvering av kommando \"%s\" misslyckades."
-#: ../pyhoca/wxgui/frontend.py:939
+#: ../pyhoca/wxgui/frontend.py:978
msgid "Cleaning X2Go sessions..."
msgstr "Rensar X2Go-sessioner..."
-#: ../pyhoca/wxgui/frontend.py:974
+#: ../pyhoca/wxgui/frontend.py:1026
#, python-format
msgid "%s - disconnect"
msgstr "%s - koppla frÃĨn"
-#: ../pyhoca/wxgui/frontend.py:974
+#: ../pyhoca/wxgui/frontend.py:1026
msgid "X2Go Profile is now disconnected."
msgstr "X2Go-profil är nu frÃĨnkopplad"
-#: ../pyhoca/wxgui/frontend.py:995
+#: ../pyhoca/wxgui/frontend.py:1047
msgid "New Session Profile"
msgstr "Ny sessionsprofil"
-#: ../pyhoca/wxgui/frontend.py:1047
+#: ../pyhoca/wxgui/frontend.py:1102
#, python-format
msgid "Really Delete Session Profile ,,%s''?"
msgstr "Ãr du säker pÃĨ att du vill radera profil ,,%s''?"
-#: ../pyhoca/wxgui/frontend.py:1053
+#: ../pyhoca/wxgui/frontend.py:1108
#, python-format
msgid "%s - profile deleted"
msgstr "%s - profil raderad"
-#: ../pyhoca/wxgui/frontend.py:1053
+#: ../pyhoca/wxgui/frontend.py:1108
msgid "The session profile has been deleted."
msgstr "Profilen har raderats."
-#: ../pyhoca/wxgui/frontend.py:1071
+#: ../pyhoca/wxgui/frontend.py:1137
+#, python-format
+msgid "%s - export session profiles"
+msgstr "%s - exportera sessionsprofiler"
+
+#: ../pyhoca/wxgui/frontend.py:1142
+#, python-format
+msgid "%s - export session profile"
+msgstr "%s - exportera sessionsprofil"
+
+#: ../pyhoca/wxgui/frontend.py:1154
+#, python-format
+msgid "%s: Export file already exists"
+msgstr "%s: Exportfil finns redan"
+
+#: ../pyhoca/wxgui/frontend.py:1155
+#, python-format
+msgid ""
+"The file Âģ%sÂĢ already exists in this folder.\n"
+"\n"
+"Do you want to replace it?"
+msgstr ""
+"Filen Âģ%sÂĢ finns redan i denna mapp.\n"
+"\n"
+"Vill du skriva Ãļver den?"
+
+#: ../pyhoca/wxgui/frontend.py:1176
+#, python-format
+msgid "%s - profiles exported"
+msgstr "%s - profiler har exporterats"
+
+#: ../pyhoca/wxgui/frontend.py:1176
+#, python-format
+msgid "Successfully exported session profile group Âģ%sÂĢ to file Âģ%sÂĢ."
+msgstr "Export av sessionsprofilsgrupp Âģ%sÂĢ till fil Âģ%sÂĢ lyckades."
+
+#: ../pyhoca/wxgui/frontend.py:1178
+#, python-format
+msgid "%s - profile exported"
+msgstr "%s - profil har exporterats"
+
+#: ../pyhoca/wxgui/frontend.py:1178
+#, python-format
+msgid "Successfully exported single session profile Âģ%sÂĢ to file Âģ%sÂĢ."
+msgstr "Export av sessionsprofil Âģ%sÂĢ till fil Âģ%sÂĢ lyckades."
+
+#: ../pyhoca/wxgui/frontend.py:1182
+#, python-format
+msgid "%s: Exporting session profile(s) failed"
+msgstr "%s: Export av sessionsprofile(r) misslyckades"
+
+#: ../pyhoca/wxgui/frontend.py:1183
+#, python-format
+msgid ""
+"The selected session profile(s) could not be exported to the \n"
+"file Âģ%sÂĢ.\n"
+"\n"
+"Check for common problems (disk full, insufficient access, etc.)."
+msgstr ""
+"Vald(a) sessionsprofile(r) kunde ej exporteras till\n"
+"filen Âģ%sÂĢ.\n"
+"\n"
+"Kontrollera vanliga orsaker (slut diskutrymme, saknade skrivbehÃļrigheter, "
+"etc.)."
+
+#: ../pyhoca/wxgui/frontend.py:1202
#, python-format
msgid "%s - share local folder with sessions of this profile"
msgstr "%s - dela lokal mapp med sessioner som använder denna profil"
-#: ../pyhoca/wxgui/frontend.py:1224
+#: ../pyhoca/wxgui/frontend.py:1355
#, python-format
msgid ""
"The authenticity of host [%s]:%s can't be established.\n"
@@ -1096,17 +1242,17 @@ msgstr ""
"\n"
"Litar du pÃĨ denna nyckel?"
-#: ../pyhoca/wxgui/frontend.py:1232
+#: ../pyhoca/wxgui/frontend.py:1363
#, python-format
msgid "%s: Confirm Host Authorization"
msgstr "%s: Bekräfta tillägg av server"
-#: ../pyhoca/wxgui/frontend.py:1277
+#: ../pyhoca/wxgui/frontend.py:1409
#, python-format
msgid "%s - channel error"
msgstr "%s - kanalfel"
-#: ../pyhoca/wxgui/frontend.py:1277
+#: ../pyhoca/wxgui/frontend.py:1409
#, python-format
msgid ""
"Lost connection to server %s unexpectedly! Try to re-authenticate to the "
@@ -1114,22 +1260,45 @@ msgid ""
msgstr ""
"Anslutning till %s avslutades oväntat! FÃļrsÃļk ÃĨteransluta till server..."
-#: ../pyhoca/wxgui/frontend.py:1295 ../pyhoca/wxgui/frontend.py:1313
-#: ../pyhoca/wxgui/frontend.py:1315 ../pyhoca/wxgui/frontend.py:1351
+#: ../pyhoca/wxgui/frontend.py:1426 ../pyhoca/wxgui/frontend.py:1469
+#: ../pyhoca/wxgui/frontend.py:1471 ../pyhoca/wxgui/frontend.py:1507
#, python-format
msgid "%s - session failure"
msgstr "%s - session misslyckades"
-#: ../pyhoca/wxgui/frontend.py:1295
+#: ../pyhoca/wxgui/frontend.py:1426
msgid "The session startup failed."
msgstr "Sessionsstart misslyckades."
-#: ../pyhoca/wxgui/frontend.py:1313
+#: ../pyhoca/wxgui/frontend.py:1439
+#, python-format
+msgid "%s - timeout"
+msgstr "%s - timeout"
+
+#: ../pyhoca/wxgui/frontend.py:1439
+msgid ""
+"The server took long to provide a list of sharable desktops.\n"
+"This can happen from time to time, please try again"
+msgstr ""
+"Det tog lÃĨng tid att hämta listan Ãļver delbara skrivbord frÃĨn servern.\n"
+"FÃļrsÃļk igen"
+
+#: ../pyhoca/wxgui/frontend.py:1451
+#, python-format
+msgid "%s - desktop sharing failed"
+msgstr "%s - skrivbordsdelning misslyckades"
+
+#: ../pyhoca/wxgui/frontend.py:1451
+#, python-format
+msgid "The desktop %s is not available for sharing (anymore)."
+msgstr "Skrivbord %s är inte tillgängligt fÃļr delning."
+
+#: ../pyhoca/wxgui/frontend.py:1469
#, python-format
msgid "The command ,,%s'' is not available on X2Go server."
msgstr "Kommandot ,,%s'' finns inte pÃĨ X2Go-server."
-#: ../pyhoca/wxgui/frontend.py:1315
+#: ../pyhoca/wxgui/frontend.py:1471
#, python-format
msgid ""
"The command ,,%s'' is not available on X2Go server\n"
@@ -1138,7 +1307,7 @@ msgstr ""
"Kommandot ,,%s'' finns inte pÃĨ X2Go-server\n"
"%s."
-#: ../pyhoca/wxgui/frontend.py:1332
+#: ../pyhoca/wxgui/frontend.py:1488
#, python-format
msgid ""
"Reverse TCP port forwarding request for session %s to server port %s has "
@@ -1146,44 +1315,44 @@ msgid ""
msgstr ""
"Omvänd TCP port forwarding fÃļr session %s till serverport %s har nekats."
-#: ../pyhoca/wxgui/frontend.py:1351
+#: ../pyhoca/wxgui/frontend.py:1507
#, python-format
msgid ""
"Forwarding tunnel request to [%s]:%s for session %s was denied by remote "
-"X2go/SSH server. Session startup failed."
+"X2Go/SSH server. Session startup failed."
msgstr ""
"Begäran om tunnel till [%s]:%s fÃļr session %s nekades av X2Go/SSH-server. "
"Sessionsstart misslyckades."
-#: ../pyhoca/wxgui/frontend.py:1370
+#: ../pyhoca/wxgui/frontend.py:1526
#, python-format
msgid "%s - audio warning"
msgstr "%s - ljudvarning"
-#: ../pyhoca/wxgui/frontend.py:1370
+#: ../pyhoca/wxgui/frontend.py:1526
msgid ""
"The X2Go PulseAudio system is not available within Remote Desktop sessions."
msgstr "X2Go PulseAudio är inte tillgängligt i Remote Desktop-sessioner."
-#: ../pyhoca/wxgui/frontend.py:1377 ../pyhoca/wxgui/frontend.py:1384
+#: ../pyhoca/wxgui/frontend.py:1533 ../pyhoca/wxgui/frontend.py:1540
#, python-format
msgid "%s - audio error"
msgstr "%s - ljudfel"
-#: ../pyhoca/wxgui/frontend.py:1377
+#: ../pyhoca/wxgui/frontend.py:1533
msgid "The X2Go PulseAudio system could not be started."
msgstr "X2Go PulseAudio kunde ej startas."
-#: ../pyhoca/wxgui/frontend.py:1384
+#: ../pyhoca/wxgui/frontend.py:1540
msgid "The X2Go PulseAudio system has died unexpectedly."
msgstr "X2Go PulseAudio avslutades oväntat."
-#: ../pyhoca/wxgui/frontend.py:1396
+#: ../pyhoca/wxgui/frontend.py:1552
#, python-format
msgid "%s - audio problem"
msgstr "%s - ljudproblem"
-#: ../pyhoca/wxgui/frontend.py:1396
+#: ../pyhoca/wxgui/frontend.py:1552
#, python-format
msgid ""
"The audio connection could not be set up for this session.\n"
@@ -1192,12 +1361,12 @@ msgstr ""
"Anslutning fÃļr ljud kunde ej genomfÃļras fÃļr denna session.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1408
+#: ../pyhoca/wxgui/frontend.py:1564
#, python-format
msgid "%s - client-side printing not available"
msgstr "%s - klientdelade utskrifter ej tillgängliga"
-#: ../pyhoca/wxgui/frontend.py:1408
+#: ../pyhoca/wxgui/frontend.py:1564
#, python-format
msgid ""
"The server denies client-side printing from within this session.\n"
@@ -1206,12 +1375,12 @@ msgstr ""
"Servern tillÃĨter ej utskrifter via klient frÃĨn denna session.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1420
+#: ../pyhoca/wxgui/frontend.py:1576
#, python-format
msgid "%s - MIME box not available"
msgstr "%s - MIME ej tillgängligt"
-#: ../pyhoca/wxgui/frontend.py:1420
+#: ../pyhoca/wxgui/frontend.py:1576
#, python-format
msgid ""
"The server does not support the X2Go MIME box.\n"
@@ -1220,12 +1389,12 @@ msgstr ""
"Servern stÃļder ej X2Go MIME.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1432
+#: ../pyhoca/wxgui/frontend.py:1588
#, python-format
msgid "%s - client-side folders not sharable"
msgstr "%s - klientmappar ej delningsbara"
-#: ../pyhoca/wxgui/frontend.py:1432
+#: ../pyhoca/wxgui/frontend.py:1588
#, python-format
msgid ""
"The server denies client-side folder sharing with this session.\n"
@@ -1234,12 +1403,12 @@ msgstr ""
"Servern tillÃĨter ej klientdelade mappar i denna session.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1444
+#: ../pyhoca/wxgui/frontend.py:1600
#, python-format
msgid "%s - client resources not sharable"
msgstr "%s - klientresurser ej delningsbara"
-#: ../pyhoca/wxgui/frontend.py:1444
+#: ../pyhoca/wxgui/frontend.py:1600
#, python-format
msgid ""
"Client-side folders and printers cannot be shared with this session.\n"
@@ -1248,12 +1417,12 @@ msgstr ""
"Klientdelade mappar och utskrifter kan ej delas med denna session.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1463 ../pyhoca/wxgui/frontend.py:1465
+#: ../pyhoca/wxgui/frontend.py:1619 ../pyhoca/wxgui/frontend.py:1621
#, python-format
msgid "%s - print error"
msgstr "%s - utskriftsfel"
-#: ../pyhoca/wxgui/frontend.py:1463
+#: ../pyhoca/wxgui/frontend.py:1619
#, python-format
msgid ""
"%s\n"
@@ -1264,7 +1433,7 @@ msgstr ""
"... orsakat pÃĨ skrivare %s av session\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1465
+#: ../pyhoca/wxgui/frontend.py:1621
#, python-format
msgid ""
"%s\n"
@@ -1275,12 +1444,12 @@ msgstr ""
"...orsakat av session\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1480 ../pyhoca/wxgui/frontend.py:1495
+#: ../pyhoca/wxgui/frontend.py:1636 ../pyhoca/wxgui/frontend.py:1651
#, python-format
msgid "%s - start"
msgstr "%s - startar"
-#: ../pyhoca/wxgui/frontend.py:1480
+#: ../pyhoca/wxgui/frontend.py:1636
#, python-format
msgid ""
"New X2Go session starting up...\n"
@@ -1289,7 +1458,7 @@ msgstr ""
"Ny X2Go-session startar ...\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1495
+#: ../pyhoca/wxgui/frontend.py:1651
#, python-format
msgid ""
"Another client started X2Go session\n"
@@ -1298,12 +1467,12 @@ msgstr ""
"En annan klient startade X2Go-session\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1510 ../pyhoca/wxgui/frontend.py:1525
+#: ../pyhoca/wxgui/frontend.py:1666 ../pyhoca/wxgui/frontend.py:1681
#, python-format
msgid "%s - resume"
msgstr "%s - ÃĨteranslut"
-#: ../pyhoca/wxgui/frontend.py:1510
+#: ../pyhoca/wxgui/frontend.py:1666
#, python-format
msgid ""
"Resuming X2Go session...\n"
@@ -1312,7 +1481,7 @@ msgstr ""
"Ã
teransluter X2Go-session...\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1525
+#: ../pyhoca/wxgui/frontend.py:1681
#, python-format
msgid ""
"Another client resumed X2Go session\n"
@@ -1321,12 +1490,12 @@ msgstr ""
"En annan klient ÃĨteranslÃļt X2Go-session\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1540
+#: ../pyhoca/wxgui/frontend.py:1696
#, python-format
msgid "%s - running"
msgstr "%s - aktiv"
-#: ../pyhoca/wxgui/frontend.py:1540
+#: ../pyhoca/wxgui/frontend.py:1696
#, python-format
msgid ""
"Found already running session\n"
@@ -1335,12 +1504,12 @@ msgstr ""
"Hittade aktiv session\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1560
+#: ../pyhoca/wxgui/frontend.py:1716
#, python-format
msgid "%s - suspend"
msgstr "%s - vila"
-#: ../pyhoca/wxgui/frontend.py:1560
+#: ../pyhoca/wxgui/frontend.py:1716
#, python-format
msgid ""
"X2Go Session has been suspended\n"
@@ -1349,12 +1518,12 @@ msgstr ""
"X2Go-session har fÃļrsatts i vila\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1587
+#: ../pyhoca/wxgui/frontend.py:1743
#, python-format
msgid "%s - terminate"
msgstr "%s - avsluta"
-#: ../pyhoca/wxgui/frontend.py:1587
+#: ../pyhoca/wxgui/frontend.py:1743
#, python-format
msgid ""
"X2Go Session has terminated\n"
@@ -1363,7 +1532,7 @@ msgstr ""
"X2Go-session har avslutats\n"
"%s"
-#: ../pyhoca/wxgui/messages.py:73
+#: ../pyhoca/wxgui/messages.py:72
#, python-format
msgid ""
"Are you really sure you want to\n"
@@ -1372,7 +1541,7 @@ msgstr ""
"Ãr du säker pÃĨ att du vill\n"
"radera sessionsprofilen ,,%s''?"
-#: ../pyhoca/wxgui/messages.py:74
+#: ../pyhoca/wxgui/messages.py:73
#, python-format
msgid ""
"PyHoca-GUI is already running for user ,,%s''!\n"
@@ -1386,15 +1555,15 @@ msgstr ""
"Bara en instans av PyHoca-GUI kan startas per\n"
"användare. PyHoca-GUI-ikonen finns i systemfältet."
-#: ../pyhoca/wxgui/messages.py:107
+#: ../pyhoca/wxgui/messages.py:106
msgid "Yes"
msgstr "Ja"
-#: ../pyhoca/wxgui/messages.py:108
+#: ../pyhoca/wxgui/messages.py:107
msgid "No"
msgstr "Nej"
-#: ../pyhoca/wxgui/messages.py:125 ../pyhoca/wxgui/printingprefs.py:142
+#: ../pyhoca/wxgui/messages.py:124 ../pyhoca/wxgui/printingprefs.py:142
msgid "Ok"
msgstr "OK"
@@ -1460,10 +1629,6 @@ msgstr "Använd denna skrivare"
msgid "Custom print command"
msgstr "Anpassat utskriftskommando"
-#: ../pyhoca/wxgui/printingprefs.py:143
-msgid "Apply"
-msgstr "Verkställ"
-
#: ../pyhoca/wxgui/printingprefs.py:145
msgid "Print"
msgstr "Skriv ut"
@@ -1497,12 +1662,81 @@ msgstr "Ãndra sessionstitel till"
msgid "OK"
msgstr "OK"
+#: ../pyhoca/wxgui/serverinfo.py:76
+#, python-format
+msgid "Server Information - %s"
+msgstr "Serverinformation - %s"
+
+#: ../pyhoca/wxgui/serverinfo.py:78
+#, python-format
+msgid ""
+"Session Profile: %s\n"
+"\n"
+"List of X2Go Server components, add-ons and their versions..."
+msgstr ""
+"Sessionsprofil: %s\n"
+"\n"
+"Lista Ãļver X2Go Servers komponenter, tillägg och deras versioner..."
+
+#: ../pyhoca/wxgui/serverinfo.py:83
+msgid "Refresh"
+msgstr "Uppdatera"
+
+#: ../pyhoca/wxgui/serverinfo.py:84
+msgid "Close"
+msgstr "Stäng"
+
+#: ../pyhoca/wxgui/serverinfo.py:153
+msgid "X2Go Server"
+msgstr "X2Go Server"
+
+#: ../pyhoca/wxgui/serverinfo.py:154
+msgid "Server Core"
+msgstr "Server Core"
+
+#: ../pyhoca/wxgui/serverinfo.py:162
+msgid "Server Extensions"
+msgstr "Servertillägg"
+
+#: ../pyhoca/wxgui/serverinfo.py:168
+msgid "X2Go Server Add-ons"
+msgstr "X2Go Servertillägg"
+
+#: ../pyhoca/wxgui/serverinfo.py:172
+msgid "X2Go Server Features"
+msgstr "X2Go Serverfunktioner"
+
+#~ msgid "Settings"
+#~ msgstr "Inställningar"
+
#, fuzzy
-#~ msgid "Remember shared folders"
-#~ msgstr "Delade &mappar"
+#~ msgid "%s (%s)\n"
+#~ msgstr "%s (via %s)"
#, fuzzy
-#~ msgid "Shared Resources"
+#~ msgid "Connect to another Desktop Session"
+#~ msgstr "Starta &ny Skrivbordssession"
+
+#~ msgid "Start/Resume Session"
+#~ msgstr "Starta/ÃĨteranslut session"
+
+#~ msgid "SSH Proxy Tunnel"
+#~ msgstr "SSH proxytunnel"
+
+#~ msgid "The SSH proxy configuration is incomplete. Try again."
+#~ msgstr "Konfigurationen av SSH-proxy är inte komplett. FÃļrsÃļk igen."
+
+#~ msgid ""
+#~ "Another session profile (%s) already uses [%s]:%s for binding a local SSH "
+#~ "proxy to.\n"
+#~ "Please change the SSH proxy settings accordingly."
+#~ msgstr ""
+#~ "En annan session (%s) använder redan [%s]:%s fÃļr att ansluta till lokal "
+#~ "SSH-proxy.\n"
+#~ "Ãndra konfiguration fÃļr SSH-proxy ."
+
+#, fuzzy
+#~ msgid "Remember shared folders"
#~ msgstr "Delade &mappar"
#~ msgid "RSA/DSA private key"
@@ -1539,9 +1773,6 @@ msgstr "OK"
#~ msgid "%s - connect error"
#~ msgstr "%s - anslutning misslyckades"
-#~ msgid "new session profile"
-#~ msgstr "ny sessionsprofil"
-
#, fuzzy
#~ msgid "Unknown Session Profile"
#~ msgstr "Ny sessionsprofil"
diff --git a/pyhoca-gui b/pyhoca-gui
index 0486314..a516e9d 100755
--- a/pyhoca-gui
+++ b/pyhoca-gui
@@ -1,8 +1,8 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
-# Copyright (C) 2010-2012 by Dick Kniep <dick.kniep(a)lindix.nl>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Dick Kniep <dick.kniep(a)lindix.nl>
#
# PyHoca GUI is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -23,6 +23,7 @@ modules ={}
import sys
import os
+import re
PROG_NAME = os.path.basename(sys.argv[0]).replace('.exe', '')
PROG_PID = os.getpid()
@@ -98,8 +99,8 @@ from pyhoca.wxgui.basepath import locale_basepath
# Python X2Go modules
from x2go import CURRENT_LOCAL_USER as _CURRENT_LOCAL_USER
if _X2GOCLIENT_OS == 'Windows':
- from x2go import X2goClientXConfig as _X2goClientXConfig
-from x2go import X2goLogger as _X2goLogger
+ from x2go import X2GoClientXConfig as _X2GoClientXConfig
+from x2go import X2GoLogger as _X2GoLogger
from x2go import x2go_cleanup as _x2go_cleanup
# X2Go backends
@@ -129,7 +130,7 @@ VERSION_TEXT="""
%s[%s] - an X2Go GUI client written in Python
----------------------------------------------------------------------
developed by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
-sponsored by Dick Kniep <dick.kniep(a)lindix.nl> (2010-2012)
+sponsored by Dick Kniep <dick.kniep(a)lindix.nl> (2010-2013)
VERSION: %s
@@ -139,7 +140,23 @@ def check_running():
if _X2GOCLIENT_OS in ('Linux', 'Mac'):
p = subprocess.Popen(['ps', '-U', _CURRENT_LOCAL_USER, '-u', _CURRENT_LOCAL_USER], stdout=subprocess.PIPE)
psA_out = p.communicate()
- return psA_out[0].count(PROG_NAME) > 1
+ if psA_out[0].count(PROG_NAME) <= 1:
+ return False
+ else:
+ processes = psA_out[0].strip().strip('\n').strip().split('\n')
+ sep = re.compile('[\s]+')
+ processes_of_myself = [ sep.split(row) for row in processes if PROG_NAME in row and not str(PROG_PID) in row ]
+ print
+ print 'FIXME: We found at least one other PyHoca-GUI instance for this user,'
+ print 'but cannot (yet) tell if it/they is/are running on the same $DISPLAY'
+ print 'or some other $DISPLAY. PyHoca-GUI only allows one instance per $DISPLAY.'
+ print
+ print 'These are the other instances of PyHoca-GUI found for this user:'
+ for line in processes_of_myself:
+ print " ".join(line)
+ # FIXME: add $DISPLAY check here, only return False if no PyHoca-GUI instance is running on this $DISPLAY
+ # return False
+ return True
elif _X2GOCLIENT_OS == 'Windows':
import wmi
w = wmi.WMI()
@@ -167,7 +184,7 @@ def runtime_error(m, parser=None, exitcode=-1):
if _X2GOCLIENT_OS == 'Windows':
- _x = _X2goClientXConfig()
+ _x = _X2GoClientXConfig()
_known_xservers = _x.known_xservers
_installed_xservers = _x.installed_xservers
@@ -193,7 +210,7 @@ debug_options = [
{'args':['-d','--debug'], 'default': False, 'action': 'store_true', 'help': 'enable application debugging code', },
{'args':['--quiet'], 'default': False, 'action': 'store_true', 'help': 'disable any kind of log output', },
{'args':['--libdebug'], 'default': False, 'action': 'store_true', 'help': 'enable debugging code of the underlying Python X2Go module', },
- {'args':['--libdebug-sftpxfer'], 'default': False, 'action': 'store_true', 'help': 'enable debugging code of Python X2go\'s sFTP server code (very verbose, and even promiscuous)', },
+ {'args':['--libdebug-sftpxfer'], 'default': False, 'action': 'store_true', 'help': 'enable debugging code of Python X2Go\'s sFTP server code (very verbose, and even promiscuous)', },
{'args':['-V', '--version'], 'default': False, 'action': 'store_true', 'help': 'print version number and exit', },
]
x2go_gui_options = [
@@ -206,9 +223,10 @@ x2go_gui_options = [
{'args':['--tray-icon'], 'default': None, 'metavar': '<your-logo>', 'help': 'define an alternative system tray icon file (PNG files only, leave out file extension here, size 22x22 on Linux, 16x16 on Windows)', },
{'args':['--tray-icon-connecting'], 'default': None, 'metavar': '<your-logo-while-connecting>', 'help': 'define an alternative system tray icon file while connecting to a server (PNG files only, leave out file extension here, size 22x22 on Linux, 16x16 on Windows)', },
{'args':['--restricted-trayicon'], 'default': False, 'action': 'store_true', 'help': 'restricts session manager\'s main icon functionality to information window and application exit; on left-click only a minimal session menu is shown', },
- {'args':['--start-on-connect'], 'default': False, 'action': 'store_true', 'help': 'start a session directly after authentication if no session is currently running/suspended', },
+ {'args':['--add-to-known-hosts'], 'default': False, 'action': 'store_true', 'help': 'automatically add SSH host keys to the known_hosts files of the client-side user', },
+ {'args':['--start-on-connect'], 'default': False, 'action': 'store_true', 'help': 'This is now the hard-coded default. start a session directly after authentication if no session is currently running/suspended', },
{'args':['--exit-on-disconnect'], 'default': False, 'action': 'store_true', 'help': 'exit the session manager after a server connection has died', },
- {'args':['--resume-newest-on-connect', '--resume-on-connect'], 'default': False, 'action': 'store_true', 'help': 'on connect auto-resume the newest suspended session', },
+ {'args':['--resume-newest-on-connect', '--resume-on-connect'], 'default': False, 'action': 'store_true', 'help': 'This is now the hard-coded default. On connect auto-resume the newest suspended session', },
{'args':['--resume-oldest-on-connect'], 'default': False, 'action': 'store_true', 'help': 'on connect auto-resume the oldest suspended session', },
{'args':['--resume-all-on-connect'], 'default': False, 'action': 'store_true', 'help': 'auto-resume all suspended sessions on connect', },
{'args':['--disconnect-on-suspend'], 'default': False, 'action': 'store_true', 'help': 'disconnect a server if a session has been suspended', },
@@ -283,8 +301,8 @@ def parseargs():
a = p.parse_args()
- logger = _X2goLogger(tag=PROG_NAME)
- liblogger = _X2goLogger()
+ logger = _X2GoLogger(tag=PROG_NAME)
+ liblogger = _X2GoLogger()
if a.debug:
logger.set_loglevel_debug()
diff --git a/pyhoca/__init__.py b/pyhoca/__init__.py
index b25f36b..f04d824 100644
--- a/pyhoca/__init__.py
+++ b/pyhoca/__init__.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
-# Copyright (C) 2010-2012 by Dick Kniep <dick.kniep(a)lindix.nl>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Dick Kniep <dick.kniep(a)lindix.nl>
#
# PyHoca GUI is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
diff --git a/pyhoca/wxgui/__init__.py b/pyhoca/wxgui/__init__.py
index 467b22e..2391726 100644
--- a/pyhoca/wxgui/__init__.py
+++ b/pyhoca/wxgui/__init__.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
-# Copyright (C) 2010-2012 by Dick Kniep <dick.kniep(a)lindix.nl>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Dick Kniep <dick.kniep(a)lindix.nl>
#
# PyHoca GUI is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -18,6 +18,6 @@
# Free Software Foundation, Inc.,
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-__VERSION__ = '0.2.1.1'
+__VERSION__ = '0.4.0.0'
from frontend import *
diff --git a/pyhoca/wxgui/about.py b/pyhoca/wxgui/about.py
index 07ea039..a79c31f 100644
--- a/pyhoca/wxgui/about.py
+++ b/pyhoca/wxgui/about.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
-# Copyright (C) 2010-2012 by Dick Kniep <dick.kniep(a)lindix.nl>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Dick Kniep <dick.kniep(a)lindix.nl>
#
# PyHoca GUI is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -32,7 +32,7 @@ try:
wxversion.select('2.8')
except: pass
-# Python X2go
+# Python X2Go
import x2go
# wxPython
diff --git a/pyhoca/wxgui/basepath.py b/pyhoca/wxgui/basepath.py
index 118c70b..c324c9b 100644
--- a/pyhoca/wxgui/basepath.py
+++ b/pyhoca/wxgui/basepath.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
-# Copyright (C) 2010-2012 by Dick Kniep <dick.kniep(a)lindix.nl>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Dick Kniep <dick.kniep(a)lindix.nl>
#
# PyHoca GUI is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py
index a77672b..1cc930a 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
-# Copyright (C) 2010-2012 by Dick Kniep <dick.kniep(a)lindix.nl>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Dick Kniep <dick.kniep(a)lindix.nl>
#
# PyHoca GUI is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -36,7 +36,7 @@ except: pass
import os
-# Python X2go
+# Python X2Go
import x2go
import gevent
import gevent.monkey
@@ -59,6 +59,8 @@ import basepath
import messages
import splash
import sessiontitle
+import listdesktops
+import serverinfo
wx.SetDefaultPyEncoding("utf-8")
wx.InitAllImageHandlers()
@@ -90,7 +92,7 @@ wx.InitAllImageHandlers()
# signal.signal( signal.SIGINT, func )
-class PyHocaGUI(wx.App, x2go.X2goClient):
+class PyHocaGUI(wx.App, x2go.X2GoClient):
"""\
The main application instance.
@@ -125,12 +127,12 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
@param args: a class with properties representing the command-line options that are available to L{PyHocaGUI} instances.
@type args: C{argparse.ArgumentParser} (or similar)
- @param logger: you can pass an L{X2goLogger} object to the
- L{PyHocaCLI} constructor for logging application events
- @type logger: Python X2Go C{X2goLogger} instance
- @param liblogger: you can pass an L{X2goLogger} object to the
- L{PyHocaCLI} constructor for logging application events, this object is forwarded to the C{X2goClient} class in Python X2Go
- @type liblogger: Python X2Go C{X2goLogger} instance
+ @param logger: you can pass an L{X2GoLogger} object to the
+ L{PyHocaGUI} constructor for logging application events
+ @type logger: Python X2Go C{X2GoLogger} instance
+ @param liblogger: you can pass an L{X2GoLogger} object to the
+ L{PyHocaGUI} constructor for logging application events, this object is forwarded to the C{X2GoClient}. class in Python X2Go.
+ @type liblogger: Python X2Go C{X2GoLogger} instance
@param appname: name of the application instance
@type appname: C{str}
@param vendorname: name of the company distributing this application
@@ -145,17 +147,18 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
self.appname = appname
self.vendorname = vendorname
self.version = version
+ self._exiting = False
self.args = args
if logger is None:
- self._pyhoca_logger = x2go.X2goLogger(tag=self.appname)
+ self._pyhoca_logger = x2go.X2GoLogger(tag=self.appname)
else:
self._pyhoca_logger = copy.deepcopy(logger)
self._pyhoca_logger.tag = self.appname
if liblogger is None:
- self._pyhoca_liblogger = x2go.X2goLogger()
+ self._pyhoca_liblogger = x2go.X2GoLogger()
else:
self._pyhoca_liblogger = copy.deepcopy(liblogger)
@@ -217,7 +220,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
except:
self.logon_window_position_x = self.logon_window_position_y = None
- x2go.X2goClient.__init__(self, **_x2goclient_kwargs)
+ x2go.X2GoClient.__init__(self, **_x2goclient_kwargs)
wx.App.__init__(self, redirect=False, clearSigInt=False)
@@ -275,9 +278,10 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
"""
# cmd line options
+ self.add_to_known_hosts = self.args.add_to_known_hosts
self.auto_connect = self.args.auto_connect
- self.start_on_connect = self.args.start_on_connect
- self.resume_newest_on_connect = self.args.resume_newest_on_connect
+ self.start_on_connect = True
+ self.resume_newest_on_connect = True
self.resume_oldest_on_connect = self.args.resume_oldest_on_connect
self.resume_all_on_connect = self.args.resume_all_on_connect
self.exit_on_disconnect = self.args.exit_on_disconnect
@@ -312,6 +316,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
self._logon_windows = {}
self._hide_notifications_map = {}
self._eventid_profilenames_map = {}
+ self._eventid_exportprofiles_map = {}
self._eventid_sessionnames_map = {}
self._eventid_applications_map = {}
self._eventid_shared_folders_map = {}
@@ -342,7 +347,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
if not self.args.single_session_profile:
self.auto_connect = True
self._pyhoca_logger('opening default session profile %s' % profile_name, loglevel=x2go.log.loglevel_NOTICE)
- self._X2goClient__register_session(profile_name=profile_name, auto_connect=self.auto_connect)
+ self._X2GoClient__register_session(profile_name=profile_name, auto_connect=self.auto_connect)
if self.auto_connect:
gevent.spawn(self._auto_connect)
@@ -352,30 +357,30 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
Register all available session profiles on application start.
The auto-registration of all session profiles will trigger the auto-connect feature
- implemented in C{X2goClient} of Python X2Go.
+ implemented in C{X2GoClient} of Python X2Go.
"""
# wait for splash to appear
if not self.args.disable_splash:
gevent.sleep(1)
if not self.args.session_profile:
- self._X2goClient__register_all_session_profiles()
+ self._X2GoClient__register_all_session_profiles()
def session_auto_connect(self, session_uuid, **kwargs):
"""\
- Override C{X2goClient.session_auto_connect()} to always divert authentication to L{OnSessionAuthenticate}.
+ Override C{X2GoClient.session_auto_connect()} to always divert authentication to L{OnSessionAuthenticate}.
@param session_uuid: session UUID
@type session_uuid: C{str}
"""
- # override X2goClient method
+ # override X2GoClient method
if self.auto_connect and self.get_session(session_uuid).get_session_profile_option('auto_connect'):
self.HOOK_profile_auto_connect(self.get_session_profile_name(session_uuid))
def HOOK_profile_auto_connect(self, profile_name, **kwargs):
"""\
- Override C{X2goClient.HOOK_profile_auto_connect()} to always divert authentication to L{OnSessionAuthenticate}.
+ Override C{X2GoClient.HOOK_profile_auto_connect()} to always divert authentication to L{OnSessionAuthenticate}.
@param profile_name: session profile name
@type profile_name: C{str}
@@ -394,7 +399,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
def session_auto_start_or_resume(self, session_uuid, newest=True, oldest=False, all_suspended=False, **kwargs):
"""\
- Override C{X2goClient.session_auto_start_or_resume()} to differentiate between the application options
+ Override C{X2GoClient.session_auto_start_or_resume()} to differentiate between the application options
C{resume_newest_on_connect}, C{resume_oldest_on_connect} and C{resume_all_on_connect}.
@param profile_name: session profile name
@@ -402,12 +407,12 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
"""
if not self.get_session(session_uuid).published_applications:
- if self.resume_newest_on_connect:
- self._X2goClient__session_auto_start_or_resume(session_uuid, newest=True, start=self.start_on_connect, **kwargs)
- elif self.resume_oldest_on_connect:
- self._X2goClient__session_auto_start_or_resume(session_uuid, newest=False, oldest=True, start=self.start_on_connect, **kwargs)
- elif self.resume_all_on_connect:
- self._X2goClient__session_auto_start_or_resume(session_uuid, newest=False, all_suspended=True, start=self.start_on_connect, **kwargs)
+ if self.resume_oldest_on_connect:
+ self._X2GoClient__session_auto_start_or_resume(session_uuid, newest=False, oldest=True, start=self.start_on_connect, **kwargs)
+ if self.resume_all_on_connect:
+ self._X2GoClient__session_auto_start_or_resume(session_uuid, newest=False, all_suspended=True, start=self.start_on_connect, **kwargs)
+ elif self.resume_newest_on_connect:
+ self._X2GoClient__session_auto_start_or_resume(session_uuid, newest=True, start=self.start_on_connect, **kwargs)
def _exit_handler(self, *args):
"""\
@@ -429,10 +434,11 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
- close all associated windows
"""
+ self._exiting = True
# close open password dialogs (or other remaining windows)
for _win in self._sub_windows:
_win.Close()
- for session_obj in [ _s for _s in self._X2goClient__client_running_sessions(return_objects=True) if _s.is_associated() ]:
+ for session_obj in [ _s for _s in self._X2GoClient__client_running_sessions(return_objects=True) if _s.is_associated() ]:
profile_name = session_obj.get_profile_name()
if not self._hide_notifications_map.has_key(profile_name):
self._hide_notifications_map[profile_name] = []
@@ -479,18 +485,18 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
"""
if profile_name is None and session_uuid:
- profile_name = self._X2goClient__get_session_profile_name(session_uuid)
+ profile_name = self._X2GoClient__get_session_profile_name(session_uuid)
if not self._temp_launching_pubapp_locks.has_key(profile_name):
self._temp_launching_pubapp_locks[profile_name] = threading.Lock()
- if not self._X2goClient__client_connected_sessions_of_profile_name(profile_name):
+ if not self._X2GoClient__client_connected_sessions_of_profile_name(profile_name):
return None
if session_uuid is None and profile_name:
- session_uuid = self._X2goClient__client_connected_sessions_of_profile_name(profile_name, return_objects=False)[0]
+ session_uuid = self._X2GoClient__client_connected_sessions_of_profile_name(profile_name, return_objects=False)[0]
- connected_session = self._X2goClient__get_session(session_uuid)
+ connected_session = self._X2GoClient__get_session(session_uuid)
if connected_session.has_server_feature('X2GO_PUBLISHED_APPLICATIONS') and self.get_profile_config(profile_name)['published']:
if len(self.client_pubapp_sessions_of_profile_name(profile_name=profile_name)):
@@ -506,7 +512,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
### PyHoca-GUI does not support more than one session in published applications mode...
# suspend any running session that is in published applications mode (unless we are already associated with it)
- session_list = self._X2goClient__list_sessions(session_uuid=session_uuid, profile_name=profile_name)
+ session_list = self._X2GoClient__list_sessions(session_uuid=session_uuid, profile_name=profile_name)
if session_list:
pubapp_sessions_running = [ _sn for _sn in session_list.keys() if session_list[_sn].is_running() and session_list[_sn].is_published_applications_provider() ]
for session_name in pubapp_sessions_running:
@@ -517,7 +523,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
# be one)
if pubapp_sessions_running:
gevent.sleep(1)
- session_list = self._X2goClient__list_sessions(session_uuid=session_uuid, profile_name=profile_name, refresh_cache=True)
+ session_list = self._X2GoClient__list_sessions(session_uuid=session_uuid, profile_name=profile_name, refresh_cache=True)
if session_list:
pubapp_sessions_suspended = [ _sn for _sn in session_list.keys() if session_list[_sn].is_suspended() and session_list[_sn].is_published_applications_provider() ]
@@ -526,7 +532,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
if not pubapp_session_resumed:
# resume one single session in published applications mode immediately, if available
- pubapp_session = self._X2goClient__register_session(profile_name=profile_name,
+ pubapp_session = self._X2GoClient__register_session(profile_name=profile_name,
published_applications=True,
cmd='PUBLISHED',
session_type='published',
@@ -543,7 +549,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
if not pubapp_session_resumed:
- pubapp_session = self._X2goClient__register_session(profile_name=profile_name,
+ pubapp_session = self._X2GoClient__register_session(profile_name=profile_name,
published_applications=True,
cmd='PUBLISHED',
session_type='published',
@@ -579,7 +585,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
self._hide_notifications_map[profile_name] = []
gevent.spawn(self._init_pubapp_session, session_uuid)
- except x2go.X2goSessionRegistryException:
+ except x2go.X2GoSessionRegistryException:
# there might have been a disconnect event inbetween...
pass
@@ -596,13 +602,13 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
connect_failed = False
profile_name = self.get_session(session_uuid).get_profile_name()
try:
- _can_session_auto_connect = self._X2goClient__session_can_auto_connect(session_uuid)
- _can_sshproxy_auto_connect = self._X2goClient__session_can_sshproxy_auto_connect(session_uuid)
- _session_uses_sshproxy = self._X2goClient__session_uses_sshproxy(session_uuid)
- _session_reuses_sshproxy_authinfo = self._X2goClient__session_reuses_sshproxy_authinfo(session_uuid)
+ _can_session_auto_connect = self._X2GoClient__session_can_auto_connect(session_uuid)
+ _can_sshproxy_auto_connect = self._X2GoClient__session_can_sshproxy_auto_connect(session_uuid)
+ _session_uses_sshproxy = self._X2GoClient__session_uses_sshproxy(session_uuid)
+ _session_reuses_sshproxy_authinfo = self._X2GoClient__session_reuses_sshproxy_authinfo(session_uuid)
if _can_session_auto_connect:
- self._X2goClient__connect_session(session_uuid)
- if not self._X2goClient__server_valid_x2gouser(session_uuid):
+ self._X2GoClient__connect_session(session_uuid, add_to_known_hosts=self.add_to_known_hosts)
+ if not self._X2GoClient__server_valid_x2gouser(session_uuid):
self.notifier.send(_(u'%s - connect failure') % profile_name, _(u'User is not allowed to start X2Go sessions!'), icon='session_warning', timeout=10000)
self.OnServerDisconnect(evt)
try:
@@ -611,7 +617,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
pass
else:
self.notifier.send(_(u'%s - connect') % profile_name, _(u'SSH key authentication has been successful.'), icon='auth_success', timeout=4000)
- self._X2goClient__list_sessions(session_uuid, refresh_cache=True, update_sessionregistry=True)
+ self._X2GoClient__list_sessions(session_uuid, refresh_cache=True, update_sessionregistry=True)
self._post_authenticate(evt, session_uuid)
try:
self._temp_disabled_profile_names.remove(profile_name)
@@ -625,7 +631,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
self._pyhoca_logger('SSH key authentication to server failed, trying next auth-mechanism', loglevel=x2go.log.loglevel_INFO, )
_logon_window = logon.PyHocaGUI_DialogBoxPassword(self, profile_name, caller=self, )
self._logon_windows[profile_name] = _logon_window
- except x2go.X2goSSHProxyAuthenticationException:
+ except x2go.X2GoSSHProxyAuthenticationException:
self._pyhoca_logger('SSH key authentication for SSH proxy failed, trying next auth-mechanism', loglevel=x2go.log.loglevel_INFO, )
if _session_reuses_sshproxy_authinfo:
_logon_window = logon.PyHocaGUI_DialogBoxPassword(self, profile_name, caller=self, sshproxy_auth=False, )
@@ -639,14 +645,14 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
except ValueError:
pass
connect_failed = True
- except x2go.X2goHostKeyException, e:
+ except x2go.X2GoHostKeyException, e:
self.notifier.send(_(u'%s - host key error') % profile_name, _(u'The remote server\'s host key is invalid or has not been accepted by the user') + '!', icon='auth_error', timeout=4000)
try:
self._temp_disabled_profile_names.remove(profile_name)
except ValueError:
pass
connect_failed = True
- except x2go.X2goSSHProxyHostKeyException, e:
+ except x2go.X2GoSSHProxyHostKeyException, e:
self.notifier.send(_(u'%s - host key error') % profile_name, _(u'The SSH proxy\'s host key is invalid or has not been accepted by the user') + '!', icon='auth_error', timeout=4000)
try:
self._temp_disabled_profile_names.remove(profile_name)
@@ -674,21 +680,21 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
except ValueError:
pass
connect_failed = True
- except x2go.X2goSSHProxyException, e:
+ except x2go.X2GoSSHProxyException, e:
self.notifier.send(_(u'%s - auth key error') % profile_name, u'%s' % str(e), icon='auth_error', timeout=4000)
try:
self._temp_disabled_profile_names.remove(profile_name)
except ValueError:
pass
connect_failed = True
- except x2go.X2goRemoteHomeException, e:
- self.notifier.send(_(u'%s - missing home directory') % profile_name, _("The remote user's home directory does not exist."), icon='auth_error', timeout=4000)
+ except x2go.X2GoRemoteHomeException, e:
+ self.notifier.send(_(u'%s - missing home directory') % profile_name, _(u"The remote user's home directory does not exist."), icon='auth_error', timeout=4000)
try:
self._temp_disabled_profile_names.remove(profile_name)
except ValueError:
pass
connect_failed = True
- except x2go.X2goSessionException, e:
+ except x2go.X2GoSessionException, e:
self.notifier.send(_(u'%s - auth error') % profile_name, u'%s' % str(e), icon='auth_error', timeout=4000)
try:
self._temp_disabled_profile_names.remove(profile_name)
@@ -726,14 +732,14 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
if self.session_profiles.get_profile_config(profile_name)['directrdp']:
m = messages.PyHoca_MessageWindow_Ok(self,
title=_(u'%s: DirectRDP not supported yet') % self.appname,
- msg=_(u"We apologize for the inconvenience...\n\nSession profiles of type ,,DirectRDP'' are not\nsupported by %s (%s), yet!!\n\nDirectRDP support will be available in %s (>= 0.2.2.0).") % (self.appname, self.version, self.appname),
+ msg=_(u"We apologize for the inconvenience...\n\nSession profiles of type ,,DirectRDP'' are not\nsupported by %s (%s), yet!!\n\nDirectRDP support will be available in %s (>= 1.0.0.0).") % (self.appname, self.version, self.appname),
icon='warning',
profile_name=profile_name)
m.ShowModal()
return
self.taskbar.SetIconConnecting(profile_name)
if session_uuid is None:
- session_uuid = self._X2goClient__register_session(profile_name=profile_name)
+ session_uuid = self._X2GoClient__register_session(profile_name=profile_name)
if session_uuid:
self._temp_disabled_profile_names.append(profile_name)
gevent.spawn(self._do_authenticate, evt, session_uuid)
@@ -751,10 +757,43 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
"""
profile_name = self._eventid_profilenames_map[evt.GetId()]
- session_uuid = self._X2goClient__register_session(profile_name=profile_name, published_applications=False)
- if self._X2goClient__server_is_alive(session_uuid):
- gevent.spawn(self._X2goClient__start_session, session_uuid)
- self._X2goClient__list_sessions(session_uuid, refresh_cache=True)
+ session_uuid = self._X2GoClient__register_session(profile_name=profile_name, published_applications=False)
+ if self._X2GoClient__server_is_alive(session_uuid):
+ gevent.spawn(self._X2GoClient__start_session, session_uuid)
+ self._X2GoClient__list_sessions(session_uuid, refresh_cache=True)
+
+ def OnShadowSessionStart(self, evt):
+ """\
+ Gets called if the user requests to start a new X2Go session.
+
+ @param evt: event
+ @type evt: C{obj}
+
+ """
+ profile_name = self._eventid_profilenames_map[evt.GetId()]
+
+ server_version = self.get_server_versions(profile_name, 'x2goserver')
+ if not self.has_server_feature(profile_name, 'X2GO_LIST_SHADOWSESSIONS'):
+ m = messages.PyHoca_MessageWindow_Ok(self,
+ title=_(u'Desktop Sharing with %s not supported by server') % self.appname,
+ msg=_(u"We apologize for the inconvenience...\n\nSession profiles of type ,,SHADOW'' are not\nsupported by X2Go Server (v%s)!!!\n\nDesktop Sharing with %s requires\nX2Go Server 4.1.0.0 and above.") % (server_version, self.appname),
+ icon='warning',
+ profile_name=profile_name)
+ m.ShowModal()
+ return
+
+ listbox = listdesktops.PyHocaGUI_DialogBoxListDesktops(self, profile_name)
+ listbox.ShowModal()
+
+ if listbox.connect:
+
+ desktop = listbox.GetSelectedDesktop()
+ if desktop:
+ session_uuid = self._X2GoClient__register_session(profile_name=profile_name, published_applications=False)
+ if self._X2GoClient__server_is_alive(session_uuid):
+ gevent.spawn(self._X2GoClient__share_desktop_session, session_uuid, desktop=desktop, share_mode=listbox.share_mode, check_desktop_list=True)
+
+ listbox.Close()
def OnPubAppSessionStart(self, evt):
"""\
@@ -793,8 +832,8 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
_s = self.get_session_of_session_name(_session_name, return_object=True)
if _s is not None and _s.is_alive():
try:
- _s._X2goSession__exec_published_application(exec_name=_exec, timeout=40)
- except x2go.x2go_exceptions.X2goControlSessionException:
+ _s._X2GoSession__exec_published_application(exec_name=_exec, timeout=40)
+ except x2go.x2go_exceptions.X2GoControlSessionException:
self.notifier.send(_(u'%s - session warning') % profile_name, _(u'Execution of command ,,%s\'\' failed.') % _exec, icon='session_warning', timeout=10000)
except KeyError:
pass
@@ -809,10 +848,10 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
"""
profile_name = self._eventid_profilenames_map[evt.GetId()]
_application = self._eventid_applications_map[evt.GetId()]
- session_uuid = self._X2goClient__register_session(profile_name=profile_name, cmd=_application, session_type="application")
- if self._X2goClient__server_is_alive(session_uuid):
- gevent.spawn(self._X2goClient__start_session, session_uuid)
- self._X2goClient__list_sessions(session_uuid, refresh_cache=True)
+ session_uuid = self._X2GoClient__register_session(profile_name=profile_name, cmd=_application, session_type="application")
+ if self._X2GoClient__server_is_alive(session_uuid):
+ gevent.spawn(self._X2GoClient__start_session, session_uuid)
+ self._X2GoClient__list_sessions(session_uuid, refresh_cache=True)
def _disable_session_name(self, profile_name, session_name):
"""\
@@ -881,12 +920,12 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
"""
profile_name = self._eventid_profilenames_map[evt.GetId()]
- session_uuid = self._X2goClient__client_registered_sessions_of_profile_name(profile_name)[0]
+ session_uuid = self._X2GoClient__client_registered_sessions_of_profile_name(profile_name)[0]
session_name = self._eventid_sessionnames_map[evt.GetId()]
self._disable_session_name(profile_name, session_name)
- if self._X2goClient__server_is_alive(session_uuid):
- gevent.spawn(self._X2goClient__resume_session, session_name=session_name, match_profile_name=profile_name)
- self._X2goClient__list_sessions(session_uuid, refresh_cache=True)
+ if self._X2GoClient__server_is_alive(session_uuid):
+ gevent.spawn(self._X2GoClient__resume_session, session_name=session_name, match_profile_name=profile_name)
+ self._X2GoClient__list_sessions(session_uuid, refresh_cache=True)
self._eventid_sessionnames_map = {}
def OnSessionSuspend(self, evt):
@@ -898,10 +937,10 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
"""
profile_name = self._eventid_profilenames_map[evt.GetId()]
- session_uuid = self._X2goClient__client_registered_sessions_of_profile_name(profile_name)[0]
+ session_uuid = self._X2GoClient__client_registered_sessions_of_profile_name(profile_name)[0]
session_name = self._eventid_sessionnames_map[evt.GetId()]
self._disable_session_name(profile_name, session_name)
- gevent.spawn(self._X2goClient__suspend_session, session_uuid, session_name=session_name, match_profile_name=profile_name)
+ gevent.spawn(self._X2GoClient__suspend_session, session_uuid, session_name=session_name, match_profile_name=profile_name)
self._eventid_sessionnames_map = {}
if self.disconnect_on_suspend and self.get_session(session_uuid).has_terminal_session():
self.OnServerDisconnect(evt)
@@ -915,10 +954,10 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
"""
profile_name = self._eventid_profilenames_map[evt.GetId()]
- session_uuid = self._X2goClient__client_registered_sessions_of_profile_name(profile_name)[0]
+ session_uuid = self._X2GoClient__client_registered_sessions_of_profile_name(profile_name)[0]
session_name = self._eventid_sessionnames_map[evt.GetId()]
self._disable_session_name(profile_name, session_name)
- gevent.spawn(self._X2goClient__terminate_session, session_uuid, session_name=session_name, match_profile_name=profile_name)
+ gevent.spawn(self._X2GoClient__terminate_session, session_uuid, session_name=session_name, match_profile_name=profile_name)
self._eventid_sessionnames_map = {}
if self.disconnect_on_terminate and self.get_session(session_uuid).has_terminal_session():
self.OnServerDisconnect(evt)
@@ -932,9 +971,9 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
"""
profile_name = self._eventid_profilenames_map[evt.GetId()]
- session_uuid = self._X2goClient__client_registered_sessions_of_profile_name(profile_name)[0]
- session_list = self._X2goClient__list_sessions(session_uuid)
- if self._X2goClient__server_is_alive(session_uuid):
+ session_uuid = self._X2GoClient__client_registered_sessions_of_profile_name(profile_name)[0]
+ session_list = self._X2GoClient__list_sessions(session_uuid)
+ if self._X2GoClient__server_is_alive(session_uuid):
if session_list:
_notify_text = _(u'Cleaning X2Go sessions...')
if not self._hide_notifications_map.has_key(profile_name):
@@ -946,7 +985,20 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
self._hide_notifications_map[profile_name].append(session_name)
self._disable_session_name(profile_name, session_name)
self.notifier.send(profile_name, _notify_text, icon='session_cleanall', timeout=10000)
- gevent.spawn(self._X2goClient__clean_sessions, session_uuid, published_applications=False)
+ gevent.spawn(self._X2GoClient__clean_sessions, session_uuid, published_applications=False)
+
+ def OnViewServerInformation(self, evt):
+ """\
+ Gets called if the user disconnects from a selected session profile (i.e. X2Go server).
+
+ @param evt: event
+ @type evt: C{obj}
+
+ """
+ profile_name = self._eventid_profilenames_map[evt.GetId()]
+
+ serverinfobox = serverinfo.PyHocaGUI_DialogBoxServerInfo(self, profile_name)
+ serverinfobox.ShowModal()
def OnServerDisconnect(self, evt):
"""\
@@ -957,14 +1009,14 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
"""
profile_name = self._eventid_profilenames_map[evt.GetId()]
- session_uuids = self._X2goClient__client_registered_sessions_of_profile_name(profile_name)
+ session_uuids = self._X2GoClient__client_registered_sessions_of_profile_name(profile_name)
if session_uuids:
# disconnect all sessions of profile
- if self._X2goClient__server_is_alive(session_uuids[0]) and not self.args.single_session_profile:
- self._hide_notifications_map[profile_name] = self._X2goClient__client_running_sessions_of_profile_name(profile_name, return_session_names=True)
+ if self._X2GoClient__server_is_alive(session_uuids[0]) and not self.args.single_session_profile:
+ self._hide_notifications_map[profile_name] = self._X2GoClient__client_running_sessions_of_profile_name(profile_name, return_session_names=True)
- gevent.spawn(self._X2goClient__disconnect_profile, profile_name)
+ gevent.spawn(self._X2GoClient__disconnect_profile, profile_name)
if self.exit_on_disconnect:
self._pyhoca_logger('Exiting %s because %s got disconnected.' % (self.appname, profile_name), loglevel=x2go.loglevel_NOTICE)
@@ -1058,6 +1110,81 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
pass
self._temp_disabled_profile_names.remove(profile_name)
+ def OnProfileExport(self, evt):
+ """\
+ Gets called if the user request a session profile (group) export.
+
+ @param evt: event
+ @type evt: C{obj}
+
+ """
+ try:
+ profile_name = self._eventid_profilenames_map[evt.GetId()]
+ except KeyError:
+ profile_name = None
+
+ try:
+ profile_group = self._eventid_exportprofiles_map[evt.GetId()]
+ except KeyError:
+ profile_group = None
+
+ if profile_group:
+
+ # This returns a Python list of files that were selected.
+ filtered_profile_names = [ pn for pn in self._X2GoClient__get_profiles().profile_names if pn.startswith(unicode(profile_group)) ]
+
+ dlg = wx.FileDialog(
+ self.about, message=_(u"%s - export session profiles") % profile_group, defaultFile="%s.x2go" % profile_group.replace("/", "::"), wildcard="*.x2go", style=wx.FD_SAVE)
+
+ if profile_name:
+
+ dlg = wx.FileDialog(
+ self.about, message=_(u"%s - export session profile") % profile_name, defaultFile="%s.x2go" % profile_name, wildcard="*.x2go", style=wx.FD_SAVE)
+ filtered_profile_names = [profile_name]
+
+ # Show the dialog and retrieve the user response. If it is the OK response,
+ # process the data.
+ if dlg.ShowModal() == wx.ID_OK:
+
+ _export_file = dlg.GetPath()
+ if not _export_file.endswith(".x2go"): _export_file += ".x2go"
+
+ if os.path.exists(_export_file):
+ m = messages.PyHoca_MessageWindow_NoYes(self,
+ title=_(u'%s: Export file already exists') % self.appname,
+ msg=_(u"The file Âģ%sÂĢ already exists in this folder.\n\nDo you want to replace it?") % os.path.basename(_export_file),
+ icon='warning',
+ profile_name=profile_name)
+ m.ShowModal()
+ if not m.Yes(): return
+ else: os.remove(_export_file)
+
+ exported_sessions = x2go.X2GoSessionProfiles(config_files=[_export_file])
+ for profile_name in filtered_profile_names:
+ this_profile = self._X2GoClient__get_profile_config(profile_name)
+
+ # clean up session profile options that are unknown to Python X2Go
+ for key in copy.deepcopy(this_profile).keys():
+ if key not in x2go.defaults.X2GO_SESSIONPROFILE_DEFAULTS:
+ del this_profile[key]
+
+ exported_sessions.add_profile(**this_profile)
+
+ exported_sessions.write_user_config = True
+ if exported_sessions.write():
+ if profile_group:
+ self.notifier.send(_(u'%s - profiles exported') % profile_group, _(u'Successfully exported session profile group Âģ%sÂĢ to file Âģ%sÂĢ.') % (profile_group, os.path.basename(_export_file)), icon='success', timeout=10000)
+ elif profile_name:
+ self.notifier.send(_(u'%s - profile exported') % profile_name, _(u'Successfully exported single session profile Âģ%sÂĢ to file Âģ%sÂĢ.') % (profile_name, os.path.basename(_export_file)), icon='success', timeout=10000)
+ else:
+ self._pyhoca_logger('Exporting session profile(s) to file %s failed.' % _export_file, loglevel=x2go.loglevel_ERROR)
+ m = messages.PyHoca_MessageWindow_Ok(self,
+ title=_(u'%s: Exporting session profile(s) failed') % self.appname,
+ msg=_(u"The selected session profile(s) could not be exported to the \nfile Âģ%sÂĢ.\n\nCheck for common problems (disk full, insufficient access, etc.).") % os.path.normpath(_export_file),
+ icon='error',
+ profile_name=profile_name)
+ m.ShowModal()
+
def OnShareCustomLocalFolder(self, evt):
"""\
Gets called if the user chooses to share a non-configured local folder with the running X2Go session.
@@ -1077,7 +1204,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
# process the data.
if dlg.ShowModal() == wx.ID_OK:
# This returns a Python list of files that were selected.
- self._X2goClient__share_local_folder_with_session(profile_name=profile_name, folder_name=str(dlg.GetPath()))
+ self._X2GoClient__share_local_folder_with_session(profile_name=profile_name, folder_name=str(dlg.GetPath()))
def OnRememberSharedFolders(self, evt):
"""\
@@ -1101,7 +1228,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
"""
profile_name = self._eventid_profilenames_map[evt.GetId()]
- self._X2goClient__unshare_all_local_folders_from_profile(profile_name=profile_name)
+ self._X2GoClient__unshare_all_local_folders_from_profile(profile_name=profile_name)
def OnShareLocalFolder(self, evt):
"""\
@@ -1113,7 +1240,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
"""
profile_name = self._eventid_profilenames_map[evt.GetId()]
_share_folder = self._eventid_unshared_folders_map[evt.GetId()]
- self._X2goClient__share_local_folder(profile_name=profile_name, local_path=_share_folder)
+ self._X2GoClient__share_local_folder(profile_name=profile_name, local_path=_share_folder)
def OnUnshareLocalFolder(self, evt):
"""\
@@ -1125,7 +1252,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
"""
profile_name = self._eventid_profilenames_map[evt.GetId()]
_unshare_folder = self._eventid_shared_folders_map[evt.GetId()]
- self._X2goClient__unshare_local_folder_from_profile(profile_name=profile_name, local_path=_unshare_folder)
+ self._X2GoClient__unshare_local_folder_from_profile(profile_name=profile_name, local_path=_unshare_folder)
def OnListSessions(self, evt):
"""\
@@ -1158,7 +1285,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
"""
session_name = self._eventid_sessionnames_map[evt.GetId()]
- _s = self._X2goClient__get_session_of_session_name(session_name, return_object=True)
+ _s = self._X2GoClient__get_session_of_session_name(session_name, return_object=True)
_s.raise_session_window()
def OnAbout(self, evt):
@@ -1204,7 +1331,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
self.OnExit(evt)
##
- ## Python X2Go (X2goClient) interactive HOOK's...
+ ## Python X2Go (X2Go Client) interactive HOOK's...
##
def HOOK_check_host_dialog(self, profile_name='UNKNOWN', host='UNKNOWN', port=22, fingerprint='no fingerprint', fingerprint_type='RSA', **kwargs):
"""\
@@ -1266,7 +1393,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
return _print_action
##
- ## Python X2Go (X2goClient) notification HOOK's...
+ ## Python X2Go (X2Go Client) notification HOOK's...
##
# this hook gets called from Python X2Go classes if profile_name's control session has died...
@@ -1278,7 +1405,8 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
@type profile_name: C{str}
"""
- self.notifier.send(_(u'%s - channel error') % profile_name, _(u'Lost connection to server %s unexpectedly! Try to re-authenticate to the server...') % profile_name, icon='session_warning', timeout=10000)
+ if not self._exiting:
+ self.notifier.send(_(u'%s - channel error') % profile_name, _(u'Lost connection to server %s unexpectedly! Try to re-authenticate to the server...') % profile_name, icon='session_warning', timeout=10000)
try:
del self._temp_disabled_session_names[profile_name]
except KeyError:
@@ -1287,7 +1415,6 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
self.WakeUpIdle()
self.ExitMainLoop()
-
def HOOK_session_startup_failed(self, profile_name='UNKNOWN', **kwargs):
"""\
Notify about session startup failures.
@@ -1296,7 +1423,32 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
@type profile_name: C{str}
"""
- self.notifier.send(_(u'%s - session failure') % profile_name, _('The session startup failed.'), icon='session_error', timeout=10000)
+ self.notifier.send(_(u'%s - session failure') % profile_name, _(u'The session startup failed.'), icon='session_error', timeout=10000)
+ if self.exit_on_disconnect:
+ self.WakeUpIdle()
+ self.ExitMainLoop()
+
+ def HOOK_list_desktops_timeout(self, profile_name='UNKNOWN', **kwargs):
+ """\
+ Notify about x2golistdesktops timeout events.
+
+ @param profile_name: profile name of session that called this hook method
+ @type profile_name: C{str}
+
+ """
+ self.notifier.send(_(u'%s - timeout') % profile_name, _(u'The server took long to provide a list of sharable desktops.\nThis can happen from time to time, please try again'), icon='session_warning', timeout=10000)
+
+ def HOOK_no_such_desktop(self, profile_name='UNKNOWN', desktop='UNKNOWN', **kwargs):
+ """\
+ Notify that a before-seen sharable desktop is not available for sharing (anymore).
+
+ @param profile_name: profile name of session that called this hook method
+ @type profile_name: C{str}
+ @param desktop: the desktop identifier that was attemted to be shared
+ @type desktop: C{str}
+
+ """
+ self.notifier.send(_(u'%s - desktop sharing failed') % profile_name, _(u'The desktop %s is not available for sharing (anymore).') % desktop, icon='session_warning', timeout=10000)
if self.exit_on_disconnect:
self.WakeUpIdle()
self.ExitMainLoop()
@@ -1314,9 +1466,9 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
"""
if session_name == 'UNKNOWN':
- self.notifier.send(_(u'%s - session failure') % profile_name, _('The command ,,%s\'\' is not available on X2Go server.') % cmd, icon='session_error', timeout=10000)
+ self.notifier.send(_(u'%s - session failure') % profile_name, _(u'The command ,,%s\'\' is not available on X2Go server.') % cmd, icon='session_error', timeout=10000)
else:
- self.notifier.send(_(u'%s - session failure') % profile_name, _('The command ,,%s\'\' is not available on X2Go server\n%s.') % (cmd, session_name), icon='session_error', timeout=10000)
+ self.notifier.send(_(u'%s - session failure') % profile_name, _(u'The command ,,%s\'\' is not available on X2Go server\n%s.') % (cmd, session_name), icon='session_error', timeout=10000)
if self.exit_on_disconnect:
self.WakeUpIdle()
self.ExitMainLoop()
@@ -1352,7 +1504,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
@type chain_port: C{str}
"""
- self.notifier.send(_(u'%s - session failure') % profile_name, _(u'Forwarding tunnel request to [%s]:%s for session %s was denied by remote X2go/SSH server. Session startup failed.') % (chain_host, chain_port, session_name), icon='session_error', timeout=10000)
+ self.notifier.send(_(u'%s - session failure') % profile_name, _(u'Forwarding tunnel request to [%s]:%s for session %s was denied by remote X2Go/SSH server. Session startup failed.') % (chain_host, chain_port, session_name), icon='session_error', timeout=10000)
if not self._hide_notifications_map.has_key(profile_name):
self._hide_notifications_map[profile_name] = []
self._hide_notifications_map[profile_name].append(session_name)
@@ -1582,7 +1734,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
"""
self._enable_session_name(profile_name, session_name)
- # avoid notification if X2goClient.clean_sessions has been used to terminate sessions
+ # avoid notification if X2Go Client.clean_sessions has been used to terminate sessions
if self._hide_notifications_map.has_key(profile_name) and session_name in self._hide_notifications_map[profile_name]:
self._hide_notifications_map[profile_name].remove(session_name)
if not self._hide_notifications_map[profile_name]:
diff --git a/pyhoca/wxgui/listdesktops.py b/pyhoca/wxgui/listdesktops.py
new file mode 100644
index 0000000..6ea5bf0
--- /dev/null
+++ b/pyhoca/wxgui/listdesktops.py
@@ -0,0 +1,277 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Dick Kniep <dick.kniep(a)lindix.nl>
+#
+# PyHoca GUI is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# PyHoca GUI is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program; if not, write to the
+# Free Software Foundation, Inc.,
+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+modules ={}
+
+try:
+ import wxversion
+ wxversion.select('2.9')
+except: pass
+
+try:
+ import wxversion
+ wxversion.select('2.8')
+except: pass
+
+# Python X2Go
+import x2go
+
+# gevent
+import gevent
+import gevent.monkey
+gevent.monkey.patch_all()
+
+import wx
+import os
+import wx.lib.mixins.listctrl as listmix
+
+# PyHoca-GUI modules
+# ... NONE ...
+
+if os.environ.has_key('DESKTOP_SESSION'):
+ WINDOW_MANAGER = os.environ['DESKTOP_SESSION']
+else:
+ WINDOW_MANAGER = 'generic'
+
+class PyHocaGUI_DialogBoxListDesktops(wx.Dialog):
+ """\
+ Dialog box for selection from a list of sharable desktops.
+
+ """
+ def __init__(self, _PyHocaGUI, profile_name):
+ """\
+ Desktop list and selection dialog box (constructor).
+
+ @param _PyHocaGUI: the master/parent object of the application
+ @type _PyHocaGUI: C{obj}
+ @param profile_name: session profile name
+ @type profile_name: C{str}
+
+ """
+ self._PyHocaGUI = _PyHocaGUI
+ self._pyhoca_logger = self._PyHocaGUI._pyhoca_logger
+ self._pyhoca_logger('desktop list selection box started', loglevel=x2go.loglevel_INFO, )
+
+ self.connect = False
+ self.cancel = False
+
+ self.current_profile_name = profile_name
+ self.list_index = 0
+ self.listed_desktops = {}
+
+ wx.Dialog.__init__(self, None, id=-1, title=profile_name, style=wx.DEFAULT_FRAME_STYLE, )
+ self._PyHocaGUI._sub_windows.append(self)
+
+ self.SetTitle(_(u'Share Desktop Session - %s') % profile_name)
+
+ self.titleLbl = wx.StaticText(self, wx.ID_ANY, _(u'Select one of the available desktop sessions on this server')+':', size=(-1, -1))
+ self.desktopList = wx.ListCtrl(self, size=(420,140),
+ style=wx.LC_REPORT|wx.BORDER_SUNKEN|wx.LC_SINGLE_SEL)
+ self.desktopList.InsertColumn(0, 'Display')
+ self.desktopList.InsertColumn(1, 'User')
+
+ self.shareMode0 = wx.RadioButton(self, -1, _(u"View session only"), style=wx.RB_GROUP)
+ self.shareMode1 = wx.RadioButton(self, -1, _(u"Gain full access"))
+ self.share_mode = 0
+
+ ID_REFRESH = wx.NewId()
+ self.okBtn = wx.Button(self, wx.ID_OK, _(u'Share Desktop'), )
+ self.okBtn.SetDefault()
+ self.okBtn.Enable(False)
+ self.refreshBtn = wx.Button(self, ID_REFRESH, _(u'Refresh list'), )
+ self.cancelBtn = wx.Button(self, wx.ID_CANCEL, _(u'Cancel'), )
+
+ self.Bind(wx.EVT_LIST_ITEM_SELECTED, self.OnListClick, self.desktopList)
+ self.Bind(wx.EVT_BUTTON, self.OnOk, self.okBtn)
+ self.Bind(wx.EVT_BUTTON, self.OnRefreshDesktopList, self.refreshBtn)
+ self.Bind(wx.EVT_BUTTON, self.OnCancel, self.cancelBtn)
+
+ titleSizer = wx.BoxSizer(wx.HORIZONTAL)
+ listSizer = wx.BoxSizer(wx.HORIZONTAL)
+ modeSizer = wx.BoxSizer(wx.HORIZONTAL)
+ btnSizer = wx.BoxSizer(wx.HORIZONTAL)
+ mainSizer = wx.BoxSizer(wx.VERTICAL)
+
+ titleSizer.Add(self.titleLbl, 0, wx.ALL, 5)
+
+ listSizer.Add(self.desktopList, 0, wx.ALL|wx.EXPAND, 5)
+
+ modeSizer.Add(self.shareMode0, 0, wx.ALL, 5)
+ modeSizer.Add(self.shareMode1, 0, wx.ALL, 5)
+
+ btnSizer.Add(self.okBtn, 0, wx.ALL, 5)
+ btnSizer.Add(self.refreshBtn, 0, wx.ALL, 5)
+ btnSizer.Add(self.cancelBtn, 0, wx.ALL, 5)
+
+ mainSizer.Add(titleSizer, 0, wx.ALL, 5)
+ mainSizer.Add(listSizer, 0, wx.ALL|wx.EXPAND, 5)
+ mainSizer.Add(modeSizer, 0, wx.ALL, 5)
+ mainSizer.Add(btnSizer, 0, wx.ALL|wx.ALIGN_RIGHT, 5)
+
+ self.SetSizerAndFit(mainSizer)
+ self.Layout()
+
+ maxX, maxY = wx.GetDisplaySize()
+
+ # we will use the logon window position for this session re-titling windows, as well
+ 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', 'gnome-fallback', 'awesome', 'ubuntu', 'ubuntu-2d', 'openbox-gnome', )):
+
+ # automatically place logon Window for GNOME, awesome
+ move_x = maxX - (self.GetSize().GetWidth() + 20)
+ move_y = 35
+
+ else:
+
+ # 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._refreshDesktopList()
+
+ def ShowModal(self, **kwargs):
+ self._PyHocaGUI._sub_windows.append(self)
+ wx.Dialog.ShowModal(self, **kwargs)
+
+ def add_item(self, display, user):
+ self.listed_desktops.update({ self.list_index: '%s@%s' % (user, display) })
+ self.desktopList.InsertStringItem(self.list_index, display)
+ self.desktopList.SetStringItem(self.list_index, 1, user)
+ self.list_index += 1
+
+ def _refreshDesktopList(self):
+ self.desktopList.DeleteAllItems()
+ self.listed_desktops = {}
+ self.list_index = 0
+ desktops = self._PyHocaGUI._X2GoClient__list_desktops(profile_name=self.current_profile_name, exclude_session_types=['R', 'S', 'P'])
+ for desktop in desktops:
+ if len(desktop.split('@')) >= 2:
+ display = desktop.split('@')[0]
+ user = desktop.split('@')[1]
+ self.add_item(user, display)
+
+ def OnListClick(self, evt):
+ """\
+ Enable the Connect button only if a list item got clicked.
+
+ @param evt: event
+ @type evt: C{obj}
+
+ """
+ self.okBtn.Enable(True)
+
+ def OnRefreshDesktopList(self, evt):
+ """\
+ Gets called if the Refresh button gets pressed.
+
+ @param evt: event
+ @type evt: C{obj}
+
+ """
+ self._refreshDesktopList()
+
+ def OnOk(self, evt):
+ """\
+ Continue here, if the user clicks the Ok button in the dialog box.
+
+ @param evt: event
+ @type evt: C{obj}
+
+ """
+ self.Hide()
+ self.connect = True
+ self.share_mode = self.shareMode1.GetValue() and 1 or 0
+
+ def GetResult(self):
+ """\
+ Retrieve the result of the selection in the list box.
+
+ """
+ return self.desktopList.GetValue()
+
+ def OnCancel(self, evt):
+ """\
+ Continue here, if the user clicks the Cancel button in the dialog box.
+
+ @param evt: event
+ @type evt: C{obj}
+
+ """
+ self.Hide()
+ self.cancel = True
+
+ def Hide(self):
+ """\
+ When hiding the list desktops box, remove it from the list of open windows in the main application instance.
+
+ """
+ try:
+ self._PyHocaGUI._sub_windows.remove(self)
+ except (AttributeError, ValueError):
+ pass
+ self.Show(False)
+
+ def Close(self):
+ """\
+ Do some PyHocaGUI specific cleanup if this window gets destroyed.
+
+ """
+ try:
+ self._PyHocaGUI._sub_windows.remove(self)
+ except ValueError:
+ pass
+ try:
+ self._PyHocaGUI._temp_disabled_profile_names.remove(self.current_profile_name)
+ except ValueError:
+ pass
+ wx.Dialog.Close(self)
+ wx.Dialog.Destroy(self)
+
+ def GetSelectedItems(self):
+ """\
+ Gets the selected items for the list control.
+ Selection is returned as a list of selected indices,
+ low to high.
+
+ """
+ selection = []
+ idx = self.desktopList.GetFirstSelected()
+ selection.append(idx)
+ while len(selection) != self.desktopList.GetSelectedItemCount():
+ idx = self.desktopList.GetNextSelected(idx)
+ selection.append(idx)
+
+ return selection
+
+ def GetSelectedDesktop(self):
+ idx = self.GetSelectedItems()[0]
+ return self.listed_desktops[idx]
diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py
index fca8600..9a99ac0 100644
--- a/pyhoca/wxgui/logon.py
+++ b/pyhoca/wxgui/logon.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
-# Copyright (C) 2010-2012 by Dick Kniep <dick.kniep(a)lindix.nl>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Dick Kniep <dick.kniep(a)lindix.nl>
#
# PyHoca GUI is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -30,7 +30,7 @@ try:
wxversion.select('2.8')
except: pass
-# Python X2go
+# Python X2Go
import x2go
# gevent
@@ -104,7 +104,7 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog):
self.sshProxyPasswordLbl = wx.StaticText(self, wx.ID_ANY, _(u'Password')+':', size=(-1, -1))
self.sshProxyPasswordTxt = wx.TextCtrl(self, wx.ID_ANY, '', style=wx.TE_PROCESS_ENTER|wx.TE_PASSWORD, size=(120, -1))
self.sshProxyPasswordTxt.SetFocus()
- self.sshProxyLoginBtn = wx.Button(self, wx.ID_OK, _(u' Start SSH tunnel '))
+ self.sshProxyLoginBtn = wx.Button(self, wx.ID_OK, ' '+_(u'Start SSH tunnel')+' ')
self.sshProxyLoginBtn.SetDefault()
_tab_order.extend([self.sshProxyUserTxt, self.sshProxyPasswordTxt, self.sshProxyLoginBtn, ])
@@ -281,18 +281,18 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog):
sshproxy_force_password_auth = True
wx.BeginBusyCursor()
- session_uuid = self._PyHocaGUI._X2goClient__client_registered_sessions_of_profile_name(self.current_profile_name)[0]
+ session_uuid = self._PyHocaGUI._X2GoClient__client_registered_sessions_of_profile_name(self.current_profile_name)[0]
try:
- self._PyHocaGUI._X2goClient__connect_session(session_uuid,
+ self._PyHocaGUI._X2GoClient__connect_session(session_uuid,
username=username,
password=password,
force_password_auth=force_password_auth,
- add_to_known_hosts=False,
+ add_to_known_hosts=self._PyHocaGUI.add_to_known_hosts,
sshproxy_user=sshproxy_user,
sshproxy_password=sshproxy_password,
sshproxy_force_password_auth=sshproxy_force_password_auth,
)
- if not self._PyHocaGUI._X2goClient__server_valid_x2gouser(session_uuid):
+ if not self._PyHocaGUI._X2GoClient__server_valid_x2gouser(session_uuid):
self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name,
title=_(u'%s - connect failure') % self.current_profile_name,
text=_(u'User is not allowed to start X2Go sessions!'),
@@ -341,7 +341,7 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog):
icon='auth_failed')
connect_failed = True
- except x2go.X2goSSHProxyAuthenticationException:
+ except x2go.X2GoSSHProxyAuthenticationException:
try: wx.EndBusyCursor()
except: pass
self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name,
@@ -378,7 +378,7 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog):
icon='auth_error')
connect_failed = True
- except x2go.X2goHostKeyException, e:
+ except x2go.X2GoHostKeyException, e:
self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name,
title=_(u'%s - host key error') % self.current_profile_name,
text=_(u'The remote server\'s host key is invalid or has not been accepted by the user') + '!',
@@ -386,7 +386,7 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog):
timeout=4000)
connect_failed = True
- except x2go.X2goRemoteHomeException, e:
+ except x2go.X2GoRemoteHomeException, e:
self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name,
title=_(u'%s - missing home directory') % self.current_profile_name,
text=_("The remote user's home directory does not exist."),
@@ -394,7 +394,7 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog):
timeout=4000)
connect_failed = True
- except x2go.X2goSSHProxyException, e:
+ except x2go.X2GoSSHProxyException, e:
self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name,
title=_(u'%s - key error') % self.current_profile_name,
text='%s!' % str(e),
@@ -402,7 +402,7 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog):
timeout=4000)
connect_failed = True
- except x2go.X2goSessionException, e:
+ except x2go.X2GoSessionException, e:
self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name,
title=_(u'%s - auth error') % self.current_profile_name,
text='%s!' % str(e),
@@ -437,7 +437,7 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog):
self._PyHocaGUI.WakeUpIdle()
self._PyHocaGUI.ExitMainLoop()
- if self._PyHocaGUI._X2goClient__is_session_connected(session_uuid):
+ if self._PyHocaGUI._X2GoClient__is_session_connected(session_uuid):
self._PyHocaGUI._post_authenticate(evt, session_uuid)
self.sshproxy_started = False
try: del self._PyHocaGUI._logon_windows[self.current_profile_name]
diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py
index e7c07cf..cfcbe04 100644
--- a/pyhoca/wxgui/menus_taskbar.py
+++ b/pyhoca/wxgui/menus_taskbar.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
-# Copyright (C) 2010-2012 by Dick Kniep <dick.kniep(a)lindix.nl>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Dick Kniep <dick.kniep(a)lindix.nl>
#
# PyHoca GUI is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -64,21 +64,26 @@ class PyHocaGUI_Menu_TaskbarManageProfile(wx.Menu):
ID_EDITPROFILE = wx.NewId()
ID_COPYPROFILE = wx.NewId()
+ ID_EXPORTPROFILE = wx.NewId()
ID_DELETEPROFILE = wx.NewId()
# preparing profile_name information for the main PyHocaGUI instance
self._PyHocaGUI._eventid_profilenames_map[ID_EDITPROFILE] = \
self._PyHocaGUI._eventid_profilenames_map[ID_COPYPROFILE] = \
+ self._PyHocaGUI._eventid_profilenames_map[ID_EXPORTPROFILE] = \
self._PyHocaGUI._eventid_profilenames_map[ID_DELETEPROFILE] = profile_name
self.Append(text=_(u"Edit Profile"), id=ID_EDITPROFILE)
if not self._PyHocaGUI.args.single_session_profile:
self.AppendSeparator()
self.Append(text=_(u"Use as Template for New Profile"), id=ID_COPYPROFILE)
+ self.AppendSeparator()
+ self.Append(text=_(u"Export Profile"), id=ID_EXPORTPROFILE)
self.Append(text=_(u"Delete Profile"), id=ID_DELETEPROFILE)
self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnProfileEdit, id=ID_EDITPROFILE)
self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnProfileCopy, id=ID_COPYPROFILE)
+ self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnProfileExport, id=ID_EXPORTPROFILE)
self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnProfileDelete, id=ID_DELETEPROFILE)
@@ -173,7 +178,7 @@ class PyHocaGUI_Menu_TaskbarSessionActions(wx.Menu):
@type profile_name: C{str}
@param session_name: X2Go session name this submenu is for
@type session_name: C{str}
- @param session_info: session info object (C{X2goServerSessionInfo*} from Python X2Go)
+ @param session_info: session info object (C{X2GoServerSessionInfo*} from Python X2Go)
@type session_info: C{obj}
@param status: status of this session (R for running, S for suspended)
@type status: C{str}
@@ -248,22 +253,30 @@ class PyHocaGUI_Menu_TaskbarSessionActions(wx.Menu):
_ts = self.Append(text=_(u"Transfer Session (not possible)"), id=ID_TRANSFERSESSION_DISABLED)
_ts.Enable(False)
- if self._PyHocaGUI.disconnect_on_suspend and self._PyHocaGUI.exit_on_disconnect and _s.has_terminal_session():
- _ss = self.Append(text=_(u"Suspend Session (and disconnect/exit)"), id=ID_SUSPENDSESSION)
- elif self._PyHocaGUI.disconnect_on_suspend and _s.has_terminal_session():
- _ss = self.Append(text=_(u"Suspend Session (and disconnect)"), id=ID_SUSPENDSESSION)
+ if not _s.is_shadow_session():
+ if self._PyHocaGUI.disconnect_on_suspend and self._PyHocaGUI.exit_on_disconnect and _s.has_terminal_session():
+ _ss = self.Append(text=_(u"Suspend Session (and disconnect/exit)"), id=ID_SUSPENDSESSION)
+ elif self._PyHocaGUI.disconnect_on_suspend and _s.has_terminal_session():
+ _ss = self.Append(text=_(u"Suspend Session (and disconnect)"), id=ID_SUSPENDSESSION)
+ else:
+ _ss = self.Append(text=_(u"Suspend Session"), id=ID_SUSPENDSESSION)
+
+ if _s.is_published_applications_provider() and not self._PyHocaGUI.get_profile_config(profile_name)['published']:
+ _ss.Enable(False)
+ if not _s.is_shadow_session():
+ if self._PyHocaGUI.disconnect_on_terminate and self._PyHocaGUI.exit_on_disconnect and _s.has_terminal_session():
+ self.Append(text=_(u"Terminate Session (and disconnect/exit)"), id=ID_SUSPENDSESSION)
+ elif self._PyHocaGUI.disconnect_on_terminate and _s.has_terminal_session():
+ self.Append(text=_(u"Terminate Session (and disconnect)"), id=ID_TERMINATESESSION)
else:
- _ss = self.Append(text=_(u"Suspend Session"), id=ID_SUSPENDSESSION)
-
- if _s.is_published_applications_provider() and not self._PyHocaGUI.get_profile_config(profile_name)['published']:
- _ss.Enable(False)
-
- if self._PyHocaGUI.disconnect_on_terminate and self._PyHocaGUI.exit_on_disconnect and _s.has_terminal_session():
- self.Append(text=_(u"Terminate Session (and disconnect/exit)"), id=ID_SUSPENDSESSION)
- elif self._PyHocaGUI.disconnect_on_terminate and _s.has_terminal_session():
- self.Append(text=_(u"Terminate Session (and disconnect)"), id=ID_TERMINATESESSION)
+ self.Append(text=_(u"Terminate Session"), id=ID_TERMINATESESSION)
else:
- self.Append(text=_(u"Terminate Session"), id=ID_TERMINATESESSION)
+ if self._PyHocaGUI.disconnect_on_terminate and self._PyHocaGUI.exit_on_disconnect and _s.has_terminal_session():
+ self.Append(text=_(u"End Desktop Sharing (and disconnect/exit)"), id=ID_SUSPENDSESSION)
+ elif self._PyHocaGUI.disconnect_on_terminate and _s.has_terminal_session():
+ self.Append(text=_(u"End Desktop Sharing (and disconnect)"), id=ID_TERMINATESESSION)
+ else:
+ self.Append(text=_(u"End Desktop Sharing"), id=ID_TERMINATESESSION)
if _s is not None and _s.is_published_applications_provider() and self._PyHocaGUI.get_profile_config(profile_name)['published']:
self.AppendSeparator()
@@ -324,7 +337,7 @@ class PyHocaGUI_Menu_TaskbarProfileSharedFolders(wx.Menu):
self.AppendSeparator()
_exported_folders = self._PyHocaGUI.get_profile_config(profile_name, 'export')
- _shared_folders = self._PyHocaGUI._X2goClient__profile_get_shared_folders(profile_name=profile_name, check_list_mounts=True) or []
+ _shared_folders = self._PyHocaGUI._X2GoClient__profile_get_shared_folders(profile_name=profile_name, check_list_mounts=True) or []
_sharable_folders = []
for _folder_path in _exported_folders.keys():
@@ -509,6 +522,7 @@ class PyHocaGUI_Menu_TaskbarSessionProfile(wx.Menu):
ID_CONNECT=wx.NewId()
ID_PUBAPPSESSIONSTART=wx.NewId()
ID_SESSIONSTART=wx.NewId()
+ ID_SHADOWSESSIONSTART=wx.NewId()
ID_LAUNCHAPPLICATION = wx.NewId()
ID_CLEANSESSIONS = wx.NewId()
ID_EDITPROFILEWHILECONNECTED = wx.NewId()
@@ -535,11 +549,17 @@ class PyHocaGUI_Menu_TaskbarSessionProfile(wx.Menu):
else:
- self._PyHocaGUI._eventid_profilenames_map[ID_SESSIONSTART] = profile_name
+ self._PyHocaGUI._eventid_profilenames_map[ID_SESSIONSTART] = \
+ self._PyHocaGUI._eventid_profilenames_map[ID_SHADOWSESSIONSTART] = profile_name
if current_profile_config['command'] in x2go.defaults.X2GO_DESKTOPSESSIONS:
self.Append(id=ID_SESSIONSTART, text='%s (%s)' % (_(u"Start &new Desktop Session"), current_profile_config['command']))
self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnSessionStart, id=ID_SESSIONSTART)
+
+ elif current_profile_config['command'] == 'SHADOW':
+ start_shadow_session = self.Append(id=ID_SHADOWSESSIONSTART, text=_(u"Start Desktop Sharing Session"))
+ self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnShadowSessionStart, id=ID_SHADOWSESSIONSTART)
+
elif current_profile_config['command'] == '' and current_profile_config['published']:
_pub_app_start_item = None
if profile_name in self._PyHocaGUI._temp_launching_pubapp_profiles:
@@ -549,6 +569,9 @@ class PyHocaGUI_Menu_TaskbarSessionProfile(wx.Menu):
self._PyHocaGUI._eventid_profilenames_map[ID_PUBAPPSESSIONSTART] = profile_name
_pub_app_start_item = self.Append(id=ID_PUBAPPSESSIONSTART, text=_(u"Retrieve Application Menu"))
self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnPubAppSessionStart, id=ID_PUBAPPSESSIONSTART)
+ elif current_profile_config['command'] == 'RDP':
+ self.Append(id=ID_SESSIONSTART, text=_(u"Start &new RDP Session"))
+ self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnSessionStart, id=ID_SESSIONSTART)
else:
self.Append(id=ID_SESSIONSTART, text=_(u"Start &new Session"))
self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnSessionStart, id=ID_SESSIONSTART)
@@ -628,11 +651,14 @@ class PyHocaGUI_Menu_TaskbarSessionProfile(wx.Menu):
self._PyHocaGUI._eventid_profilenames_map[ID_LAUNCHAPPLICATION] = \
self._PyHocaGUI._eventid_profilenames_map[ID_CLEANSESSIONS] = profile_name
- if current_profile_config['applications'] and current_profile_config['command'] in x2go.defaults.X2GO_DESKTOPSESSIONS and not current_profile_config['published']:
+ if current_profile_config['applications'] and current_profile_config['command'] in x2go.defaults.X2GO_DESKTOPSESSIONS.keys() and not current_profile_config['published']:
self.AppendSeparator()
self.AppendMenu(id=ID_LAUNCHAPPLICATION, text=_(u"Launch Single Application"),
submenu=PyHocaGUI_Menu_LaunchSingleApplication(self._PyHocaGUI, caller=self, profile_name=profile_name)
)
+ if current_profile_config['command'] != 'SHADOW' and not self._PyHocaGUI.restricted_trayicon:
+ self.Append(id=ID_SHADOWSESSIONSTART, text=_(u"Start Desktop Sharing Session"))
+ self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnShadowSessionStart, id=ID_SHADOWSESSIONSTART)
if current_profile_config['published']:
@@ -758,7 +784,7 @@ class PyHocaGUI_Menu_TaskbarSessionProfile(wx.Menu):
self._PyHocaGUI._eventid_profilenames_map[ID_UNSHAREFOLDERS] = profile_name
if current_profile_config['useexports'] and \
- self._PyHocaGUI._X2goClient__profile_is_folder_sharing_available(profile_name=profile_name) and \
+ self._PyHocaGUI._X2GoClient__profile_is_folder_sharing_available(profile_name=profile_name) and \
self._PyHocaGUI.get_master_session(profile_name) is not None and \
self._PyHocaGUI.is_session_name_enabled(profile_name, self._PyHocaGUI.get_master_session(profile_name).get_session_name()):
@@ -773,6 +799,13 @@ class PyHocaGUI_Menu_TaskbarSessionProfile(wx.Menu):
_shared_folders.Enable(False)
+ if profile_name in self._PyHocaGUI.client_connected_profiles(return_profile_names=True) and not self._PyHocaGUI.restricted_trayicon:
+ self.AppendSeparator()
+ ID_SERVERINFO = wx.NewId()
+ self._PyHocaGUI._eventid_profilenames_map[ID_SERVERINFO] = profile_name
+ self.Append(id=ID_SERVERINFO, text=_(u"Server Information"))
+ self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnViewServerInformation, id=ID_SERVERINFO)
+
if profile_name in self._PyHocaGUI.client_connected_profiles(return_profile_names=True) and not self._PyHocaGUI.exit_on_disconnect:
self.AppendSeparator()
ID_DISCONNECT = wx.NewId()
@@ -886,8 +919,8 @@ class PyHocaGUI_Menu_TaskbarProfileNames(wx.Menu):
group_name=profile_group,
parent_group=_parent_group,
group_menus=True)
- )
+ )
if filter_profiles:
_profile_names = [ p for p in _profile_names if p not in filter_profiles ]
@@ -921,6 +954,19 @@ class PyHocaGUI_Menu_TaskbarProfileNames(wx.Menu):
_dummy = self.Append(text=_(u'No session profiles defined'), id=wx.NewId())
_dummy.Enable(False)
+ else:
+ if bind_method is None:
+ self.AppendSeparator()
+ _export_id = wx.NewId()
+ _export_group_name = "%s/%s" % (parent_group, group_name)
+ _export_group_name = _export_group_name.strip("/")
+ self._PyHocaGUI._eventid_exportprofiles_map[_export_id] = _export_group_name
+ if not group_name:
+ self.Append(text=_(u'Export all Profiles'), id=_export_id)
+ else:
+ self.Append(text=_(u'Export Profile Group'), id=_export_id)
+ self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnProfileExport, id=_export_id)
+
def OnUpdateUI(self, evt):
profile_name = self._PyHocaGUI._eventid_profilenames_map[evt.GetId()]
if profile_name in self._PyHocaGUI._temp_disabled_profile_names:
@@ -954,7 +1000,7 @@ class PyHocaGUI_Menu_TaskbarSessionManager(wx.Menu):
ID_AUTHENTICATE = wx.NewId()
ID_EXIT = wx.NewId()
- _auth_menu_text = self._PyHocaGUI.start_on_connect and _(u'Start/Resume Session') or _(u'Connect Server')
+ _auth_menu_text = _(u'Connect Server')
self.AppendMenu(id=ID_AUTHENTICATE,
text=_auth_menu_text,
submenu=PyHocaGUI_Menu_TaskbarProfileNames(self._PyHocaGUI,
@@ -969,7 +1015,7 @@ class PyHocaGUI_Menu_TaskbarSessionManager(wx.Menu):
_connected_sessions = False
for profile_name in _profile_names:
- if profile_name in self._PyHocaGUI._X2goClient__client_connected_sessions(return_profile_names=True):
+ if profile_name in self._PyHocaGUI._X2GoClient__client_connected_sessions(return_profile_names=True):
_connected_sessions = True
_this_id = wx.NewId()
@@ -978,7 +1024,7 @@ class PyHocaGUI_Menu_TaskbarSessionManager(wx.Menu):
self.AppendMenu(text=_menu_profile_name,
id=_this_id,
submenu=PyHocaGUI_Menu_TaskbarSessionProfile(self._PyHocaGUI, caller=self, profile_name=profile_name))
- except x2go.x2go_exceptions.X2goSessionRegistryException:
+ except x2go.x2go_exceptions.X2GoSessionRegistryException:
pass
if _connected_sessions:
diff --git a/pyhoca/wxgui/messages.py b/pyhoca/wxgui/messages.py
index 2fe0a10..721384d 100644
--- a/pyhoca/wxgui/messages.py
+++ b/pyhoca/wxgui/messages.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
# Copyright (C) 2010 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
diff --git a/pyhoca/wxgui/notify.py b/pyhoca/wxgui/notify.py
index 476842c..8a462b2 100644
--- a/pyhoca/wxgui/notify.py
+++ b/pyhoca/wxgui/notify.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
-# Copyright (C) 2010-2012 by Dick Kniep <dick.kniep(a)lindix.nl>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Dick Kniep <dick.kniep(a)lindix.nl>
#
# PyHoca GUI is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -18,7 +18,6 @@
# Free Software Foundation, Inc.,
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-import os
import wx
from x2go import X2GOCLIENT_OS
from x2go import log
diff --git a/pyhoca/wxgui/printingprefs.py b/pyhoca/wxgui/printingprefs.py
index f18cad7..1199ce0 100644
--- a/pyhoca/wxgui/printingprefs.py
+++ b/pyhoca/wxgui/printingprefs.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
-# Copyright (C) 2010-2012 by Dick Kniep <dick.kniep(a)lindix.nl>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Dick Kniep <dick.kniep(a)lindix.nl>
#
# PyHoca GUI is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -297,6 +297,7 @@ class PyHocaGUI_PrintingPreferences(wx.Dialog):
Retrieve the current print action.
"""
+ self.__update_from_screen()
return self.client_printing.get_print_action(reinit=True)
def get_print_action_properties(self):
diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py
index 0d3dde5..a97ca49 100644
--- a/pyhoca/wxgui/profilemanager.py
+++ b/pyhoca/wxgui/profilemanager.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
-# Copyright (C) 2010-2012 by Dick Kniep <dick.kniep(a)lindix.nl>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Dick Kniep <dick.kniep(a)lindix.nl>
#
# PyHoca GUI is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -84,6 +84,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
'XFCE': _(u'XFCE Desktop (XFCE)'),
'PUBLISHEDAPPLICATIONS': _(u'Published Applications'),
'APPLICATION': _(u'Single Application'),
+ 'SHADOW': _(u'Share desktop session (SHADOW)'),
'XDMCP': _(u'XDMCP Query'),
'RDP': _(u'Windows Terminal Server (X2Go-proxied RDP)'),
'DirectRDP': _(u'Windows Terminal Server (Direct RDP)'),
@@ -149,19 +150,37 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
# allow localization of the default keyboard settings
self.profile_name = self.profile_config['name'] = profile_name
+ # this code block is for compatibility of session profiles prior to 0.2.2.0:
+ _from_host = _from_port = _to_host = _to_port = None
+ if self.profile_config.has_key('sshproxytunnel'):
+ if self.profile_config['sshproxytunnel'].count(':') == 2:
+ _from_port, _to_host, _to_port = self.profile_config['sshproxytunnel'].split(':')
+ _from_host = 'localhost'
+ elif self.profile_config['sshproxytunnel'].count(':') == 3:
+ _from_host, _from_port, _to_host, _to_port = self.profile_config['sshproxytunnel'].split(':')
+
+ if _to_host: self.profile_config['host'] = _to_host
+ if _to_port: self.profile_config['sshport'] = int(_to_port)
+
+ self.profile_config['sshproxytunnel'] = 'DEPRECATED_CAN_BE_SAFELY_REMOVE'
+
# we create a backup dict of our profile_config immediately (for being able to reset erroneously made changes)
+ self.profile_config_orig = copy.deepcopy(self.profile_config)
self.profile_config_bak = copy.deepcopy(self.profile_config)
self._last_rdpclient = self.profile_config['rdpclient']
self._last_application = self.applicationChoices['TERMINAL']
- self.X2goTabs = wx.Notebook(self, -1, style=0)
- self.tab_Profile = wx.Panel(self.X2goTabs, -1)
- self.tab_Session = wx.Panel(self.X2goTabs, -1)
- self.tab_Connection = wx.Panel(self.X2goTabs, -1)
- self.tab_LinkQuality = wx.Panel(self.X2goTabs, -1)
- self.tab_Settings = wx.Panel(self.X2goTabs, -1)
- self.tab_SharedResources = wx.Panel(self.X2goTabs, -1)
+ self.config_saved = False
+
+ self.X2GoTabs = wx.Notebook(self, -1, style=0)
+ self.tab_Profile = wx.Panel(self.X2GoTabs, -1)
+ self.tab_Session = wx.Panel(self.X2GoTabs, -1)
+ self.tab_Connection = wx.Panel(self.X2GoTabs, -1)
+ self.tab_LinkQuality = wx.Panel(self.X2GoTabs, -1)
+ self.tab_IO = wx.Panel(self.X2GoTabs, -1)
+ self.tab_MediaResources = wx.Panel(self.X2GoTabs, -1)
+ self.tab_SharedResources = wx.Panel(self.X2GoTabs, -1)
# boxes for all tabs
self.staticbox_Profile = wx.StaticBox(self.tab_Profile, -1, ' %s ' % _(u'Session Title'))
@@ -171,10 +190,10 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.staticbox_Proxy = wx.StaticBox(self.tab_Connection, -1, ' %s ' % _(u"Proxy"))
self.staticbox_LinkSpeed = wx.StaticBox(self.tab_LinkQuality, -1, ' %s ' % _(u"Connection Link Speed"))
self.staticbox_Compression = wx.StaticBox(self.tab_LinkQuality, -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_SharedResources, -1, ' %s ' % _(u"Printing"))
+ self.staticbox_Display = wx.StaticBox(self.tab_IO, -1, ' %s ' % _(u"Display"))
+ self.staticbox_Keyboard = wx.StaticBox(self.tab_IO, -1, ' %s ' % _(u"Keyboard"))
+ self.staticbox_Sound = wx.StaticBox(self.tab_MediaResources, -1, ' %s ' % _(u"Sound"))
+ self.staticbox_Printing = wx.StaticBox(self.tab_MediaResources, -1, ' %s ' % _(u"Printing"))
self.staticbox_FolderSharing = wx.StaticBox(self.tab_SharedResources, -1, ' %s ' % _(u"Folder Exports"))
self.staticbox_FileMIMEbox = wx.StaticBox(self.tab_SharedResources, -1, ' %s ' % _(u"File Import"))
@@ -216,7 +235,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
### widgets for the SESSION tab
###
self.AutoStartSession = wx.CheckBox(self.tab_Session, -1, _(u"Start session automatically after login"))
- self.AutoConnectSessionProfile = wx.CheckBox(self.tab_Session, -1, _(u"Login automatically after %s has started") % self._PyHocaGUI.appname)
+ self.AutoConnectSessionProfile = wx.CheckBox(self.tab_Session, -1, _(u"Login automatically after %s has started (needs --auto-connect)") % self._PyHocaGUI.appname)
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")+": ")
@@ -249,6 +268,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.SSHAutoLogin = wx.CheckBox(self.tab_Connection, -1, _(u"Discover SSH keys or use SSH agent for X2Go authentication"))
if PARAMIKO_FEATURE['forward-ssh-agent']:
self.SSHForwardAuthAgent = wx.CheckBox(self.tab_Connection, -1, _(u"Enable forwarding of SSH authentication agent connections"))
+ self.UniqueHostKeyAliases = wx.CheckBox(self.tab_Connection, -1, _(u"Store SSH host keys under (unique) X2Go session profile ID"))
self.UseSSHProxy = wx.CheckBox(self.tab_Connection, -1, _(u"Server behind SSH proxy"))
self.SSHProxyUserLabel = wx.StaticText(self.tab_Connection, -1, _(u"User")+": ")
self.SSHProxyUser = wx.TextCtrl(self.tab_Connection, -1, "", size=wx.Size(80,20))
@@ -261,12 +281,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.SSHProxyHost = wx.TextCtrl(self.tab_Connection, -1, "", size=wx.Size(80,20))
self.SSHProxyPortLabel = wx.StaticText(self.tab_Connection, -1, _(u"Port")+": ")
self.SSHProxyPort = wx.SpinCtrl(self.tab_Connection, -1, "22", min=1, max=65534)
- self.SSHProxyTunnelLabel = wx.StaticText(self.tab_Connection, -1, _(u"SSH Proxy Tunnel")+": ")
- self.SSHProxyTunnelFromHost = wx.TextCtrl(self.tab_Connection, -1, "", size=wx.Size(200,20))
- self.SSHProxyTunnelFromPort = wx.SpinCtrl(self.tab_Connection, -1, "44444", min=1, max=65534)
- self.SSHProxyTunnelBetweenLabel = wx.StaticText(self.tab_Connection, -1, " -> ")
- self.SSHProxyTunnelToHost = wx.TextCtrl(self.tab_Connection, -1, "", size=wx.Size(200,20))
- self.SSHProxyTunnelToPort = wx.SpinCtrl(self.tab_Connection, -1, "22", min=1, max=65534)
self.SSHProxyAutoLogin = wx.CheckBox(self.tab_Connection, -1, _(u"Discover SSH keys or use SSH agent for proxy authentication"))
self.LinkSpeed = wx.Slider(self.tab_LinkQuality, -1, 0, 0, 4)
@@ -282,38 +296,48 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.ImageQuality = wx.SpinCtrl(self.tab_LinkQuality, -1, "9", min=0, max=9)
###
- ### wigdets for the SETTINGS tab
+ ### wigdets for the IO tab
+ ###
+ self.DisplayTypeFullscreen = wx.RadioButton(self.tab_IO, -1, _(u"Fullscreen"), style=wx.RB_GROUP)
+ self.DisplayTypeMaximize = wx.RadioButton(self.tab_IO, -1, _(u"Maximized"))
+ self.DisplayTypeCustom = wx.RadioButton(self.tab_IO, -1, _(u"Custom Size")+": ")
+ self.ScreenWidthLabel = wx.StaticText(self.tab_IO, -1, '')
+ self.ScreenWidth = wx.SpinCtrl(self.tab_IO, -1, "800", min=400, max=3000)
+ self.ScreenHeightLabel = wx.StaticText(self.tab_IO, -1, "x")
+ self.ScreenHeight = wx.SpinCtrl(self.tab_IO, -1, "600", min=500, max=3000)
+ self.SetDisplayDPI = wx.CheckBox(self.tab_IO, -1, _(u"Set display DPI")+": ")
+ self.DisplayDPI = wx.SpinCtrl(self.tab_IO, -1, "96", min=32, max=512)
+ self.DontSetKeyboard = wx.RadioButton(self.tab_IO, -1, label=_(u"Do not set (use server-side tools to configure the keyboard)"), style=wx.RB_GROUP)
+ self.AutoSetKeyboard = wx.RadioButton(self.tab_IO, -1, label=_(u"Automatically detect and use client-side keyboard configuration inside the session"))
+ self.CustomSetKeyboard = wx.RadioButton(self.tab_IO, -1, label=_(u"Use custom keyboard settings as provided below") + ": ")
+ self.KeyboardModelLabel = wx.StaticText(self.tab_IO, -1, _(u"Keyboard model")+": ")
+ self.KeyboardModel = wx.TextCtrl(self.tab_IO, -1, "")
+ self.KeyboardLayoutLabel = wx.StaticText(self.tab_IO, -1, _(u"Layout")+": ")
+ self.KeyboardLayout = wx.TextCtrl(self.tab_IO, -1, "")
+ self.KeyboardVariantLabel = wx.StaticText(self.tab_IO, -1, _(u"Layout variant")+": ")
+ self.KeyboardVariant = wx.TextCtrl(self.tab_IO, -1, "")
+
+ ###
+ ### wigdets for the MEDIA tab
###
- self.DisplayTypeFullscreen = wx.RadioButton(self.tab_Settings, -1, _(u"Fullscreen"), style=wx.RB_GROUP)
- self.DisplayTypeMaximize = wx.RadioButton(self.tab_Settings, -1, _(u"Maximized"))
- self.DisplayTypeCustom = wx.RadioButton(self.tab_Settings, -1, _(u"Custom Size")+": ")
- self.ScreenWidthLabel = wx.StaticText(self.tab_Settings, -1, '')
- self.ScreenWidth = wx.SpinCtrl(self.tab_Settings, -1, "800", min=400, max=3000)
- self.ScreenHeightLabel = wx.StaticText(self.tab_Settings, -1, "x")
- self.ScreenHeight = wx.SpinCtrl(self.tab_Settings, -1, "600", min=500, max=3000)
- self.SetDisplayDPI = wx.CheckBox(self.tab_Settings, -1, _(u"Set display DPI")+": ")
- self.DisplayDPI = wx.SpinCtrl(self.tab_Settings, -1, "96", min=32, max=512)
- self.DontSetKeyboard = wx.RadioButton(self.tab_Settings, -1, label=_(u"Do not set (use server-side tools to configure the keyboard)"), style=wx.RB_GROUP)
- self.AutoSetKeyboard = wx.RadioButton(self.tab_Settings, -1, label=_(u"Automatically detect and use client-side keyboard configuration inside the session"))
- self.CustomSetKeyboard = wx.RadioButton(self.tab_Settings, -1, label=_(u"Use custom keyboard settings as provided below") + ": ")
- self.KeyboardModelLabel = wx.StaticText(self.tab_Settings, -1, _(u"Keyboard model")+": ")
- self.KeyboardModel = wx.TextCtrl(self.tab_Settings, -1, "")
- self.KeyboardLayoutLabel = wx.StaticText(self.tab_Settings, -1, _(u"Layout")+": ")
- self.KeyboardLayout = wx.TextCtrl(self.tab_Settings, -1, "")
- self.KeyboardVariantLabel = wx.StaticText(self.tab_Settings, -1, _(u"Layout variant")+": ")
- self.KeyboardVariant = wx.TextCtrl(self.tab_Settings, -1, "")
- self.EnableSound = wx.CheckBox(self.tab_Settings, -1, _(u"Enable sound support"))
- self.PulseAudio = wx.RadioButton(self.tab_Settings, -1, _(u"Pulse Audio"), style=wx.RB_GROUP)
+ self.EnableSound = wx.CheckBox(self.tab_MediaResources, -1, _(u"Enable sound support"))
+ self.PulseAudio = wx.RadioButton(self.tab_MediaResources, -1, _(u"Pulse Audio"), style=wx.RB_GROUP)
# Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated.
# However, config files can contain an Arts configuration, so we will honour this
- self.Arts = wx.RadioButton(self.tab_Settings, -1, _(u"Arts (not supported)"))
+ self.Arts = wx.RadioButton(self.tab_MediaResources, -1, _(u"Arts (not supported)"))
self.Arts.Enable(False)
- self.Esd = wx.RadioButton(self.tab_Settings, -1, _(u"esd"))
- self.DefaultSoundPort = wx.CheckBox(self.tab_Settings, -1, _(u"Use default sound port"))
- self.SoundPortLabel = wx.StaticText(self.tab_Settings, -1, _(u"Custom sound port")+": ")
- self.SoundPort = wx.SpinCtrl(self.tab_Settings, -1, "4713", min=23, max=64889)
+ self.Esd = wx.RadioButton(self.tab_MediaResources, -1, _(u"esd"))
+ self.DefaultSoundPort = wx.CheckBox(self.tab_MediaResources, -1, _(u"Use default sound port"))
+ self.SoundPortLabel = wx.StaticText(self.tab_MediaResources, -1, _(u"Custom sound port")+": ")
+ self.SoundPort = wx.SpinCtrl(self.tab_MediaResources, -1, "4713", min=23, max=64889)
+
+ self.ClientSidePrinting = wx.CheckBox(self.tab_MediaResources, -1, _(u"Client Side printing"))
+
+ ###
+ ### wigdets for the SHARING tab
+ ###
self.UseLocalFolderSharing = wx.CheckBox(self.tab_SharedResources, -1, _(u"Use local folder sharing"))
self.RestoreSharedLocalFolders = wx.CheckBox(self.tab_SharedResources, -1, _(u"Store share list at end of session"))
@@ -338,8 +362,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.FileMIMEboxActionLabel = wx.StaticText(self.tab_SharedResources, -1, _(u"Action")+": ")
self.FileMIMEboxAction = wx.ComboBox(self.tab_SharedResources, -1, choices=self.mimeboxactionChoices.values(), style=wx.CB_DROPDOWN|wx.CB_READONLY)
- self.ClientSidePrinting = wx.CheckBox(self.tab_SharedResources, -1, _(u"Client Side printing"))
-
if self.action == 'ADD':
self.OKButton = wx.Button(self, -1, _(u"Add"))
self.DefaultButton = wx.Button(self, -1, _(u'Defaults'))
@@ -347,6 +369,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.OKButton = wx.Button(self, -1, _(u"Save"))
self.DefaultButton = wx.Button(self, -1, _(u'Reset'))
self.OKButton.SetDefault()
+ self.ApplyButton = wx.Button(self, -1, _(u"Apply"))
self.CancelButton = wx.Button(self, -1, _(u"Cancel"))
self.__set_properties()
@@ -367,8 +390,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.Bind(wx.EVT_CHECKBOX, self.OnSSHProxySameUser, self.SSHProxySameUser)
self.Bind(wx.EVT_CHECKBOX, self.OnSSHProxySamePassword, self.SSHProxySamePassword)
self.Bind(wx.EVT_CHECKBOX, self.OnSSHProxyAutoLogin, self.SSHProxyAutoLogin)
- self.Bind(wx.EVT_TEXT, self.OnUpdateSSHProxyTunnelFromHost, self.SSHProxyTunnelFromHost)
- self.Bind(wx.EVT_TEXT, self.OnUpdateSSHProxyTunnelFromPort, self.SSHProxyTunnelFromPort)
self.Bind(wx.EVT_COMBOBOX, self.OnCompressionSelected, self.Compression)
self.Bind(wx.EVT_RADIOBUTTON, self.OnSetDisplayFullscreen, self.DisplayTypeFullscreen)
self.Bind(wx.EVT_RADIOBUTTON, self.OnSetDisplayMaximize, self.DisplayTypeMaximize)
@@ -392,6 +413,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.Bind(wx.EVT_CHECKBOX, self.OnToggleLocalFolderSharing, self.UseLocalFolderSharing)
self.Bind(wx.EVT_CHECKBOX, self.OnToggleFileMIMEbox, self.UseFileMIMEbox)
self.Bind(wx.EVT_BUTTON, self.OnOKButton, self.OKButton)
+ self.Bind(wx.EVT_BUTTON, self.OnApplyButton, self.ApplyButton)
self.Bind(wx.EVT_BUTTON, self.OnCancel, self.CancelButton)
self.Bind(wx.EVT_BUTTON, self.OnDefault, self.DefaultButton)
@@ -458,11 +480,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.SSHProxyPortLabel.SetMinSize((-1, 16))
self.SSHProxyPort.SetMinSize((65, self._textfield_height))
self.SSHProxyKeyFile.SetMinSize((220, self._textfield_height))
- self.SSHProxyTunnelLabel.SetMinSize((-1, 16))
- self.SSHProxyTunnelFromPort.SetMinSize((65, self._textfield_height))
- self.SSHProxyTunnelToPort.SetMinSize((65, self._textfield_height))
- self.SSHProxyTunnelFromHost.SetMinSize((140, self._textfield_height))
- self.SSHProxyTunnelToHost.SetMinSize((140, self._textfield_height))
if X2GOCLIENT_OS == 'Windows':
self.LinkSpeed.SetMinSize((425, self._textfield_height))
else:
@@ -509,6 +526,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.FileMIMEboxExtensions.SetMinSize((_field_width, self._textfield_height))
self.OKButton.SetMinSize((-1, 30))
+ self.ApplyButton.SetMinSize((-1, 30))
self.CancelButton.SetMinSize((-1, 30))
self.DefaultButton.SetMinSize((-1, 30))
@@ -569,7 +587,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
## CONNECTION TAB
sizer_3 = wx.BoxSizer(wx.VERTICAL)
sizer_3_1 = wx.StaticBoxSizer(self.staticbox_Server, wx.VERTICAL)
- sizer_3_1_1 = wx.GridBagSizer(hgap=5,vgap=6)
+ sizer_3_1_1 = wx.GridBagSizer(hgap=6,vgap=6)
sizer_3_1_1.Add(self.UserNameLabel, pos=(0,0), flag=wx.ALIGN_CENTRE_VERTICAL)
sizer_3_1_1.Add(self.UserName, pos=(0,1))
sizer_3_1_1.Add((16,0), pos=(0,2))
@@ -583,7 +601,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
sizer_3_1_1.Add(self.SSHAutoLogin, pos=(2,0), span=(1,6), flag=wx.ALIGN_CENTRE_VERTICAL)
if PARAMIKO_FEATURE['forward-ssh-agent']:
sizer_3_1_1.Add(self.SSHForwardAuthAgent, pos=(3,0), span=(1,6), flag=wx.ALIGN_CENTRE_VERTICAL)
- sizer_3_1_1.Add(self.UseSSHProxy, pos=(4,0), span=(1,6), flag=wx.ALIGN_CENTRE_VERTICAL)
+ sizer_3_1_1.Add(self.UniqueHostKeyAliases, pos=(4,0), span=(1,6))
+ sizer_3_1_1.Add(self.UseSSHProxy, pos=(5,0), span=(1,6), flag=wx.ALIGN_CENTRE_VERTICAL)
sizer_3_1.Add(sizer_3_1_1, flag=wx.EXPAND|wx.ALL, border=7)
sizer_3_2 = wx.StaticBoxSizer(self.staticbox_Proxy, wx.VERTICAL)
@@ -601,23 +620,10 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
sizer_3_2_1.Add(self.SSHProxyPortLabel, pos=(3,3), flag=wx.ALIGN_CENTRE_VERTICAL)
sizer_3_2_1.Add(self.SSHProxyPort, pos=(3,4), span=(1,2), flag=wx.ALIGN_CENTRE_VERTICAL)
sizer_3_2_1.Add(self.SSHProxyAutoLogin, pos=(4,0), span=(1,6), flag=wx.ALIGN_CENTRE_VERTICAL)
- sizer_3_2_1_1 = wx.BoxSizer(wx.HORIZONTAL)
- sizer_3_2_1_1.Add(self.SSHProxyTunnelLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
- sizer_3_2_1_1.Add(self.SSHProxyTunnelFromHost, flag=wx.ALIGN_CENTRE_VERTICAL)
- sizer_3_2_1_1.Add((4, 0))
- sizer_3_2_1_1.Add(self.SSHProxyTunnelFromPort, flag=wx.ALIGN_CENTRE_VERTICAL)
- sizer_3_2_1_1.Add((8, 0))
- sizer_3_2_1_1.Add(self.SSHProxyTunnelBetweenLabel, flag=wx.ALIGN_CENTRE_VERTICAL|wx.ALIGN_CENTRE_HORIZONTAL)
- sizer_3_2_1_1.Add((8, 0))
- sizer_3_2_1_1.Add(self.SSHProxyTunnelToHost, flag=wx.ALIGN_CENTRE_VERTICAL)
- sizer_3_2_1_1.Add((4, 0))
- sizer_3_2_1_1.Add(self.SSHProxyTunnelToPort, flag=wx.ALIGN_CENTRE_VERTICAL)
- sizer_3_2_1_1.Add((0,32))
- sizer_3_2_1.Add(sizer_3_2_1_1, pos=(5,0), span=(1,6))
sizer_3_2.Add(sizer_3_2_1, flag=wx.EXPAND|wx.ALL, border=7)
sizer_3.Add(sizer_3_1, flag=wx.EXPAND|wx.ALL, border=5)
- sizer_3.Add(sizer_3_2, flag=wx.EXPAND|wx.ALL, border=5)
+ sizer_3.Add(sizer_3_2, proportion=1, flag=wx.EXPAND|wx.ALL, border=5)
self.tab_Connection.SetSizerAndFit(sizer_3)
self.tab_Connection.Layout()
@@ -649,14 +655,14 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
sizer_4_2_1_2.Add(self.ImageQuality)
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, proportion=1, flag=wx.EXPAND|wx.ALL, border=7)
+ 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, flag=wx.EXPAND|wx.ALL, border=5)
+ sizer_4.Add(sizer_4_2, proportion=1, flag=wx.EXPAND|wx.ALL, border=5)
self.tab_LinkQuality.SetSizerAndFit(sizer_4)
self.tab_LinkQuality.Layout()
- ## SETTINGS TAB
+ ## INPUT/OUTPUT TAB
sizer_5 = wx.BoxSizer(wx.VERTICAL)
sizer_5_1 = wx.StaticBoxSizer(self.staticbox_Display, wx.VERTICAL)
sizer_5_1_1 = wx.BoxSizer(wx.VERTICAL)
@@ -705,113 +711,116 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
sizer_5_2_1.Add(sizer_5_2_1_2)
sizer_5_2.Add(sizer_5_2_1, flag=wx.EXPAND|wx.ALL, border=7)
- sizer_5_3 = wx.StaticBoxSizer(self.staticbox_Sound, wx.VERTICAL)
- sizer_5_3_1 = wx.GridBagSizer(vgap=4, hgap=2)
- sizer_5_3_1.Add(self.EnableSound, pos=(0,0), span=(1,2), border=16, )
- sizer_5_3_1.Add(self.PulseAudio, pos=(1,0), flag=wx.RIGHT, border=16, )
- sizer_5_3_1.Add(self.Arts, pos=(2,0), flag=wx.RIGHT, border=16, )
- sizer_5_3_1.Add(self.Esd, pos=(3,0), flag=wx.RIGHT, border=16, )
- sizer_5_3_1.Add(self.DefaultSoundPort, pos=(1,1), )
- sizer_5_3_1_1 = wx.BoxSizer(wx.HORIZONTAL)
- sizer_5_3_1_1.Add(self.SoundPortLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
- sizer_5_3_1_1.Add((8, -1))
- sizer_5_3_1_1.Add(self.SoundPort, flag=wx.ALIGN_CENTRE_VERTICAL)
- sizer_5_3_1.Add(sizer_5_3_1_1, pos=(2,1), )
- sizer_5_3.Add(sizer_5_3_1, flag=wx.EXPAND|wx.ALL, border=7)
-
- sizer_5_4 = wx.StaticBoxSizer(self.staticbox_Printing, wx.VERTICAL)
- sizer_5_4.Add(self.ClientSidePrinting, flag=wx.EXPAND|wx.ALL, border=7)
-
sizer_5.Add(sizer_5_1, flag=wx.EXPAND|wx.ALL, border=5)
- sizer_5.Add(sizer_5_2, flag=wx.EXPAND|wx.ALL, border=5)
- sizer_5.Add(sizer_5_3, flag=wx.EXPAND|wx.ALL, border=5)
- sizer_5.Add(sizer_5_4, flag=wx.EXPAND|wx.ALL, border=5)
- self.tab_Settings.SetSizerAndFit(sizer_5)
- self.tab_Settings.Layout()
+ sizer_5.Add(sizer_5_2, proportion=1, flag=wx.EXPAND|wx.ALL, border=5)
+ self.tab_IO.SetSizerAndFit(sizer_5)
+ self.tab_IO.Layout()
- # RESOURCE SHARING TAB
+ # MEDIA TAB
sizer_6 = wx.BoxSizer(wx.VERTICAL)
- sizer_6_1 = wx.StaticBoxSizer(self.staticbox_FolderSharing, wx.VERTICAL)
- sizer_6_1_1 = wx.BoxSizer(wx.VERTICAL)
- sizer_6_1_1_1 = wx.GridBagSizer(vgap=1, hgap=3)
- sizer_6_1_1_1.Add(self.UseLocalFolderSharing, pos=(0,0))
- sizer_6_1_1_1.Add((32,-1), pos=(0,1))
- sizer_6_1_1_1.Add(self.RestoreSharedLocalFolders, pos=(0,2), flag=wx.ALIGN_RIGHT|wx.EXPAND)
- sizer_6_1_1_2 = wx.BoxSizer(wx.HORIZONTAL)
- sizer_6_1_1_2_1 = wx.BoxSizer(wx.HORIZONTAL)
- sizer_6_1_1_2_1.Add(self.SharedFolderPathLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
- sizer_6_1_1_2_1.Add(self.SharedFolderPath, flag=wx.ALIGN_CENTRE_VERTICAL|wx.LEFT, border=5)
- sizer_6_1_1_2_1.Add(self.SharedFolderPathBrowseButton, flag=wx.ALIGN_CENTRE_VERTICAL|wx.LEFT, border=2)
- sizer_6_1_1_2_2 = wx.BoxSizer(wx.HORIZONTAL)
- sizer_6_1_1_2_3 = wx.BoxSizer(wx.HORIZONTAL)
- sizer_6_1_1_2_3.Add(self.AddSharedFolderPathButton, flag=wx.ALIGN_CENTRE_VERTICAL)
- sizer_6_1_1_2_3.Add(self.DeleteSharedFolderPathButton, flag=wx.ALIGN_CENTRE_VERTICAL|wx.LEFT, border=2)
- sizer_6_1_1_2.Add(sizer_6_1_1_2_1, flag=wx.EXPAND|wx.ALIGN_LEFT)
- sizer_6_1_1_2.Add(sizer_6_1_1_2_2, proportion=1, flag=wx.EXPAND|wx.ALIGN_LEFT)
- sizer_6_1_1_2.Add(sizer_6_1_1_2_3, flag=wx.EXPAND|wx.ALIGN_RIGHT)
- sizer_6_1_1_3 = wx.BoxSizer(wx.HORIZONTAL)
- sizer_6_1_1_3.Add(self.SharedFoldersList, proportion=1, flag=wx.EXPAND)
- sizer_6_1_1.Add(sizer_6_1_1_1, flag=wx.EXPAND|wx.BOTTOM, border=12)
- sizer_6_1_1.Add(sizer_6_1_1_2, flag=wx.EXPAND)
- sizer_6_1_1.Add(sizer_6_1_1_3, flag=wx.EXPAND|wx.TOP|wx.BOTTOM, border=5)
- sizer_6_1_2 = wx.BoxSizer(wx.VERTICAL)
- sizer_6_1_2_1 = wx.BoxSizer(wx.HORIZONTAL)
- sizer_6_1_2_1.Add(self.UseEncodingConverter, flag=wx.BOTTOM, border=5)
- sizer_6_1_2_2 = wx.BoxSizer(wx.HORIZONTAL)
- sizer_6_1_2_2.Add(self.ClientEncodingLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
- sizer_6_1_2_2.Add((8,0))
- sizer_6_1_2_2.Add(self.ClientEncoding)
- sizer_6_1_2_2.Add((16,0))
- sizer_6_1_2_2.Add(self.ServerEncodingLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
- sizer_6_1_2_2.Add((8,0))
- sizer_6_1_2_2.Add(self.ServerEncoding)
- sizer_6_1_2.Add(sizer_6_1_2_1, flag=wx.EXPAND)
- sizer_6_1_2.Add(sizer_6_1_2_2, flag=wx.EXPAND)
+ sizer_6_1 = wx.StaticBoxSizer(self.staticbox_Sound, wx.VERTICAL)
+ sizer_6_1_1 = wx.GridBagSizer(vgap=4, hgap=2)
+ sizer_6_1_1.Add(self.EnableSound, pos=(0,0), span=(1,2), border=16, )
+ sizer_6_1_1.Add(self.PulseAudio, pos=(1,0), flag=wx.RIGHT, border=16, )
+ sizer_6_1_1.Add(self.Arts, pos=(2,0), flag=wx.RIGHT, border=16, )
+ sizer_6_1_1.Add(self.Esd, pos=(3,0), flag=wx.RIGHT, border=16, )
+ sizer_6_1_1.Add(self.DefaultSoundPort, pos=(1,1), )
+ sizer_6_1_1_1 = wx.BoxSizer(wx.HORIZONTAL)
+ sizer_6_1_1_1.Add(self.SoundPortLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
+ sizer_6_1_1_1.Add((8, -1))
+ sizer_6_1_1_1.Add(self.SoundPort, flag=wx.ALIGN_CENTRE_VERTICAL)
+ sizer_6_1_1.Add(sizer_6_1_1_1, pos=(2,1), )
sizer_6_1.Add(sizer_6_1_1, flag=wx.EXPAND|wx.ALL, border=7)
- sizer_6_1.Add(sizer_6_1_2, flag=wx.EXPAND|wx.ALL, border=7)
-
- sizer_6_2 = wx.StaticBoxSizer(self.staticbox_FileMIMEbox, wx.VERTICAL)
- sizer_6_2_1 = wx.BoxSizer(wx.VERTICAL)
- sizer_6_2_1_1 = wx.BoxSizer(wx.HORIZONTAL)
- sizer_6_2_1_1.Add(self.UseFileMIMEbox, flag=wx.BOTTOM, border=5)
- sizer_6_2_1_2 = wx.GridBagSizer(vgap=2, hgap=3)
- sizer_6_2_1_2.Add(self.FileMIMEboxActionLabel, pos=(0,0), flag=wx.ALIGN_CENTRE_VERTICAL)
- sizer_6_2_1_2.Add(self.FileMIMEboxAction, pos=(0,2))
- sizer_6_2_1_2.Add((8,0), pos=(0,1))
- sizer_6_2_1_2.Add((8,0), pos=(1,1))
- sizer_6_2_1_2.Add(self.FileMIMEboxExtensionsLabel, pos=(1,0), flag=wx.ALIGN_CENTRE_VERTICAL)
- sizer_6_2_1_2.Add(self.FileMIMEboxExtensions, pos=(1,2))
- sizer_6_2_1.Add(sizer_6_2_1_1, flag=wx.EXPAND)
- sizer_6_2_1.Add(sizer_6_2_1_2, flag=wx.EXPAND)
- sizer_6_2.Add(sizer_6_2_1, flag=wx.EXPAND|wx.ALL, border=7)
-
- sizer_6_3 = wx.StaticBoxSizer(self.staticbox_Printing, wx.VERTICAL)
- sizer_6_3.Add(self.ClientSidePrinting, flag=wx.EXPAND|wx.ALL, border=7)
+
+ sizer_6_2 = wx.StaticBoxSizer(self.staticbox_Printing, wx.VERTICAL)
+ sizer_6_2.Add(self.ClientSidePrinting, flag=wx.EXPAND|wx.ALL, border=7)
sizer_6.Add(sizer_6_1, flag=wx.EXPAND|wx.ALL, border=5)
- sizer_6.Add(sizer_6_2, flag=wx.EXPAND|wx.ALL, border=5)
- sizer_6.Add(sizer_6_3, flag=wx.EXPAND|wx.ALL, border=5)
- self.tab_SharedResources.SetSizerAndFit(sizer_6)
+ sizer_6.Add(sizer_6_2, proportion=1, flag=wx.EXPAND|wx.ALL, border=5)
+ self.tab_MediaResources.SetSizerAndFit(sizer_6)
+ self.tab_MediaResources.Layout()
+
+ # RESOURCE SHARING TAB
+ sizer_7 = wx.BoxSizer(wx.VERTICAL)
+ sizer_7_1 = wx.StaticBoxSizer(self.staticbox_FolderSharing, wx.VERTICAL)
+ sizer_7_1_1 = wx.BoxSizer(wx.VERTICAL)
+ sizer_7_1_1_1 = wx.GridBagSizer(vgap=1, hgap=3)
+ sizer_7_1_1_1.Add(self.UseLocalFolderSharing, pos=(0,0))
+ sizer_7_1_1_1.Add((32,-1), pos=(0,1))
+ sizer_7_1_1_1.Add(self.RestoreSharedLocalFolders, pos=(0,2), flag=wx.ALIGN_RIGHT|wx.EXPAND)
+ sizer_7_1_1_2 = wx.BoxSizer(wx.HORIZONTAL)
+ sizer_7_1_1_2_1 = wx.BoxSizer(wx.HORIZONTAL)
+ sizer_7_1_1_2_1.Add(self.SharedFolderPathLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
+ sizer_7_1_1_2_1.Add(self.SharedFolderPath, flag=wx.ALIGN_CENTRE_VERTICAL|wx.LEFT, border=5)
+ sizer_7_1_1_2_1.Add(self.SharedFolderPathBrowseButton, flag=wx.ALIGN_CENTRE_VERTICAL|wx.LEFT, border=2)
+ sizer_7_1_1_2_2 = wx.BoxSizer(wx.HORIZONTAL)
+ sizer_7_1_1_2_3 = wx.BoxSizer(wx.HORIZONTAL)
+ sizer_7_1_1_2_3.Add(self.AddSharedFolderPathButton, flag=wx.ALIGN_CENTRE_VERTICAL)
+ sizer_7_1_1_2_3.Add(self.DeleteSharedFolderPathButton, flag=wx.ALIGN_CENTRE_VERTICAL|wx.LEFT, border=2)
+ sizer_7_1_1_2.Add(sizer_7_1_1_2_1, flag=wx.EXPAND|wx.ALIGN_LEFT)
+ sizer_7_1_1_2.Add(sizer_7_1_1_2_2, proportion=1, flag=wx.EXPAND|wx.ALIGN_LEFT)
+ sizer_7_1_1_2.Add(sizer_7_1_1_2_3, flag=wx.EXPAND|wx.ALIGN_RIGHT)
+ sizer_7_1_1_3 = wx.BoxSizer(wx.HORIZONTAL)
+ sizer_7_1_1_3.Add(self.SharedFoldersList, proportion=1, flag=wx.EXPAND)
+ sizer_7_1_1.Add(sizer_7_1_1_1, flag=wx.EXPAND|wx.BOTTOM, border=12)
+ sizer_7_1_1.Add(sizer_7_1_1_2, flag=wx.EXPAND)
+ sizer_7_1_1.Add(sizer_7_1_1_3, flag=wx.EXPAND|wx.TOP|wx.BOTTOM, border=5)
+ sizer_7_1_2 = wx.BoxSizer(wx.VERTICAL)
+ sizer_7_1_2_1 = wx.BoxSizer(wx.HORIZONTAL)
+ sizer_7_1_2_1.Add(self.UseEncodingConverter, flag=wx.BOTTOM, border=5)
+ sizer_7_1_2_2 = wx.BoxSizer(wx.HORIZONTAL)
+ sizer_7_1_2_2.Add(self.ClientEncodingLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
+ sizer_7_1_2_2.Add((8,0))
+ sizer_7_1_2_2.Add(self.ClientEncoding)
+ sizer_7_1_2_2.Add((16,0))
+ sizer_7_1_2_2.Add(self.ServerEncodingLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
+ sizer_7_1_2_2.Add((8,0))
+ sizer_7_1_2_2.Add(self.ServerEncoding)
+ sizer_7_1_2.Add(sizer_7_1_2_1, flag=wx.EXPAND)
+ sizer_7_1_2.Add(sizer_7_1_2_2, flag=wx.EXPAND)
+ sizer_7_1.Add(sizer_7_1_1, flag=wx.EXPAND|wx.ALL, border=7)
+ sizer_7_1.Add(sizer_7_1_2, flag=wx.EXPAND|wx.ALL, border=7)
+
+ sizer_7_2 = wx.StaticBoxSizer(self.staticbox_FileMIMEbox, wx.VERTICAL)
+ sizer_7_2_1 = wx.BoxSizer(wx.VERTICAL)
+ sizer_7_2_1_1 = wx.BoxSizer(wx.HORIZONTAL)
+ sizer_7_2_1_1.Add(self.UseFileMIMEbox, flag=wx.BOTTOM, border=5)
+ sizer_7_2_1_2 = wx.GridBagSizer(vgap=2, hgap=3)
+ sizer_7_2_1_2.Add(self.FileMIMEboxActionLabel, pos=(0,0), flag=wx.ALIGN_CENTRE_VERTICAL)
+ sizer_7_2_1_2.Add(self.FileMIMEboxAction, pos=(0,2))
+ sizer_7_2_1_2.Add((8,0), pos=(0,1))
+ sizer_7_2_1_2.Add((8,0), pos=(1,1))
+ sizer_7_2_1_2.Add(self.FileMIMEboxExtensionsLabel, pos=(1,0), flag=wx.ALIGN_CENTRE_VERTICAL)
+ sizer_7_2_1_2.Add(self.FileMIMEboxExtensions, pos=(1,2))
+ sizer_7_2_1.Add(sizer_7_2_1_1, flag=wx.EXPAND)
+ sizer_7_2_1.Add(sizer_7_2_1_2, flag=wx.EXPAND)
+ sizer_7_2.Add(sizer_7_2_1, flag=wx.EXPAND|wx.ALL, border=7)
+
+ sizer_7.Add(sizer_7_1, flag=wx.EXPAND|wx.ALL, border=5)
+ sizer_7.Add(sizer_7_2, proportion=1, flag=wx.EXPAND|wx.ALL, border=5)
+ self.tab_SharedResources.SetSizerAndFit(sizer_7)
self.tab_SharedResources.Layout()
- self.X2goTabs.AddPage(self.tab_Profile, _(u"Profile"))
- self.X2goTabs.AddPage(self.tab_Session, _(u"Session"))
- self.X2goTabs.AddPage(self.tab_Connection, _(u"Connection"))
- self.X2goTabs.AddPage(self.tab_LinkQuality, _(u"Link Quality"))
- self.X2goTabs.AddPage(self.tab_Settings, _(u"Settings"))
- self.X2goTabs.AddPage(self.tab_SharedResources, _(u"Sharing"))
+ self.X2GoTabs.AddPage(self.tab_Profile, _(u"Profile"))
+ self.X2GoTabs.AddPage(self.tab_Session, _(u"Session"))
+ self.X2GoTabs.AddPage(self.tab_Connection, _(u"Connection"))
+ self.X2GoTabs.AddPage(self.tab_LinkQuality, _(u"Link Quality"))
+ self.X2GoTabs.AddPage(self.tab_IO, _(u"Input/Output"))
+ self.X2GoTabs.AddPage(self.tab_MediaResources, _(u"Media"))
+ self.X2GoTabs.AddPage(self.tab_SharedResources, _(u"Sharing"))
# 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 = wx.GridSizer(1, 4, 7, 14)
sizer_B_1.Add(self.OKButton)
+ sizer_B_1.Add(self.ApplyButton)
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, proportion=1, flag=wx.EXPAND|wx.FIXED_MINSIZE)
+ MainSizer.Add(self.X2GoTabs, proportion=1, flag=wx.EXPAND|wx.FIXED_MINSIZE)
MainSizer.Add(sizer_B, flag=wx.ALIGN_RIGHT)
self.SetSizerAndFit(MainSizer)
@@ -819,22 +828,19 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
max2_x, max2_y = self.tab_Session.GetBestSize()
max3_x, max3_y = self.tab_Connection.GetBestSize()
max4_x, max4_y = self.tab_LinkQuality.GetBestSize()
- max5_x, max5_y = self.tab_Settings.GetBestSize()
- max6_x, max6_y = self.tab_SharedResources.GetBestSize()
+ max5_x, max5_y = self.tab_IO.GetBestSize()
+ max6_x, max6_y = self.tab_MediaResources.GetBestSize()
+ max7_x, max7_y = self.tab_SharedResources.GetBestSize()
- #self.SetSize(self.GetBestSize() + self.X2goTabs.GetBestSize())
+ self.SetSize((max(max1_x, max2_x, max3_x, max4_x, max5_x, max6_x, max7_x) * 1.05, max(max1_y, max2_y, max3_y, max4_y, max5_y, max6_y, max7_y) * 1.10 + 50))
- if X2GOCLIENT_OS == "Windows":
- self.SetSize((max(max1_x, max2_x, max3_x, max4_x, max5_x) * 1.05, max(max1_y, max2_y, max3_y, max4_y, max5_y) * 1.10 + 50))
- else:
- self.SetSize((max(max1_x, max2_x, max3_x, max4_x, max5_x) * 1.05, max(max1_y, max2_y, max3_y, max4_y, max5_y) + 50))
self.SetAutoLayout(True)
self.Layout()
self.CentreOnScreen()
self.Show(True)
# derive ListCtrl widths from sizer information
- _sizer_width = sizer_6_1_1_3.GetSize().GetWidth()
+ _sizer_width = sizer_7_1_1_3.GetSize().GetWidth()
self.SharedFoldersList.SetColumnWidth(0, abs(_sizer_width*.7))
self.SharedFoldersList.SetColumnWidth(1, abs(_sizer_width*.3))
@@ -858,6 +864,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.SSHKeyFile.Enable(False)
self.SSHKeyFileBrowseButton.Enable(False)
self.UseSSHProxy.SetValue(self.profile_config['usesshproxy'])
+ self.UniqueHostKeyAliases.SetValue(self.profile_config['uniquehostkeyaliases'])
self.SSHProxyAutoLogin.SetValue(self.profile_config['sshproxyautologin'])
_ssh_proxy = self.profile_config['usesshproxy']
@@ -881,18 +888,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.SSHProxyUser.SetValue(self.profile_config['sshproxyuser'])
self.SSHProxyKeyFile.SetValue(self.profile_config['sshproxykeyfile'])
- _from_host = _from_port = _to_host = _to_port = None
- if self.profile_config['sshproxytunnel'].count(':') == 2:
- _from_port, _to_host, _to_port = self.profile_config['sshproxytunnel'].split(':')
- _from_host = 'localhost'
- elif self.profile_config['sshproxytunnel'].count(':') == 3:
- _from_host, _from_port, _to_host, _to_port = self.profile_config['sshproxytunnel'].split(':')
-
- if _from_host: self.SSHProxyTunnelFromHost.SetValue(_from_host)
- if _from_port: self.SSHProxyTunnelFromPort.SetValue(int(_from_port))
- if _to_host: self.SSHProxyTunnelToHost.SetValue(_to_host)
- if _to_port: self.SSHProxyTunnelToPort.SetValue(int(_to_port))
-
self.UseSSHProxy.SetValue(_ssh_proxy)
self.SSHProxySameUser.SetValue(self.profile_config['sshproxysameuser'])
self.SSHProxySamePassword.SetValue(self.profile_config['sshproxysamepass'])
@@ -921,6 +916,12 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
if _command == 'RDP' and self.profile_config['directrdp']:
self.SessionType.SetValue(self.sessionChoices['DirectRDP'])
self.Command.SetValue('')
+ elif _command == 'SHADOW':
+ self.SessionType.SetValue(self.sessionChoices[_command])
+ self.Application.SetValue('')
+ self.Command.SetValue('')
+ self.AutoStartSession.Enable(False)
+ self.AutoStartSession.SetValue(False)
elif _command in self.sessionChoices.keys():
self.SessionType.SetValue(self.sessionChoices[_command])
self.Application.SetValue('')
@@ -1008,27 +1009,12 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.KeyboardModel.Enable(True)
self.KeyboardVariant.Enable(True)
- self.EnableSound.SetValue(self.profile_config['sound'])
- self.DefaultSoundPort.SetValue(self.profile_config['defsndport'])
- self.SoundPort.SetValue(self.profile_config['sndport'])
- if self.profile_config['sound']:
- self.PulseAudio.Enable(True)
- self.Esd.Enable(True)
- self.DefaultSoundPort.Enable(True)
- if not self.profile_config['defsndport']:
- self.SoundPortLabel.Enable(True)
- self.SoundPort.Enable(True)
- else:
- self.SoundPortLabel.Enable(False)
- self.SoundPort.Enable(False)
+ if _command != 'SHADOW':
+ self.ClientSidePrinting.SetValue(self.profile_config['print'])
else:
- self.PulseAudio.Enable(False)
- self.Esd.Enable(False)
- self.DefaultSoundPort.Enable(False)
- self.SoundPortLabel.Enable(False)
- self.SoundPort.Enable(False)
-
- self.ClientSidePrinting.SetValue(self.profile_config['print'])
+ self.ClientSidePrinting.SetValue(False)
+ self.ClientSidePrinting.Enable(False)
+ self.staticbox_Printing.Enable(False)
if _command == 'RDP':
if self.profile_config['directrdp']:
@@ -1072,6 +1058,26 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.RDPOptionsLabel.Enable(False)
self.RDPOptions.Enable(False)
+ if _command != 'SHADOW':
+ self.EnableSound.SetValue(self.profile_config['sound'])
+ self.DefaultSoundPort.SetValue(self.profile_config['defsndport'])
+ self.SoundPort.SetValue(self.profile_config['sndport'])
+ if self.EnableSound.GetValue():
+ self.PulseAudio.Enable(True)
+ self.Esd.Enable(True)
+ self.DefaultSoundPort.Enable(True)
+ self._toggle_DefaultSoundPort()
+ else:
+ self.EnableSound.SetValue(False)
+ self.EnableSound.Enable(False)
+ self.PulseAudio.Enable(False)
+ self.Arts.Enable(False)
+ self.Esd.Enable(False)
+ self.DefaultSoundPort.Enable(False)
+ self.SoundPortLabel.Enable(False)
+ self.SoundPort.Enable(False)
+ self.staticbox_Sound.Enable(False)
+
self.XDMCPServer.SetValue(self.profile_config['xdmcpserver'])
self.DisplayTypeFullscreen.SetValue(self.profile_config['fullscreen'] and not self.profile_config['maxdim'])
@@ -1089,7 +1095,13 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
else:
self.DisplayDPI.Enable(True)
- self.UseLocalFolderSharing.SetValue(self.profile_config['useexports'])
+ if _command != 'SHADOW':
+ self.UseLocalFolderSharing.SetValue(self.profile_config['useexports'])
+ else:
+ self.UseLocalFolderSharing.SetValue(False)
+ self.UseLocalFolderSharing.Enable(False)
+ self.staticbox_FolderSharing.Enable(False)
+
self.RestoreSharedLocalFolders.SetValue(self.profile_config['restoreexports'])
self._toggle_localFolderSharing()
self.SharedFoldersList.DeleteAllItems()
@@ -1103,7 +1115,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
if ',' in self.profile_config['export']:
self.profile_config['export'] = self.profile_config['export'].replace(',', ';')
-
# strip off whitespaces and ";" from beginning and end of string
_shared_folders = self.profile_config['export'].strip().strip(';').strip()
# strip off '"' from beginning and end of string
@@ -1140,7 +1151,13 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.ServerEncoding.SetValue(self.profile_config['iconvto'])
self._toggle_useEncodingConverter()
- self.UseFileMIMEbox.SetValue(self.profile_config['usemimebox'])
+ if _command != 'SHADOW':
+ self.UseFileMIMEbox.SetValue(self.profile_config['usemimebox'])
+ else:
+ self.UseFileMIMEbox.SetValue(False)
+ self.UseFileMIMEbox.Enable(False)
+ self.staticbox_FileMIMEbox.Enable(False)
+
self.FileMIMEboxExtensions.SetValue(self.profile_config['mimeboxextensions'])
if self.profile_config['mimeboxaction'] in self.mimeboxactionChoices.keys():
self.FileMIMEboxAction.SetValue(self.mimeboxactionChoices[self.profile_config['mimeboxaction']])
@@ -1150,6 +1167,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.disable_EditConnected_options()
+ self._last_session_type = [ i for i in self.sessionChoices.keys() if self.sessionChoices[i] == self.SessionType.GetValue() ][0]
+
def _toggle_DisplayProperties(self):
"""\
Toggle display properties, depend on activation/deactivation of rootless session mode.
@@ -1230,6 +1249,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.SSHPort.Enable(False)
self.SSHKeyFileLabel.Enable(False)
self.SSHKeyFile.Enable(False)
+ self.UniqueHostKeyAliases.Enable(False)
self.SSHAutoLogin.Enable(False)
if PARAMIKO_FEATURE['forward-ssh-agent']:
self.SSHForwardAuthAgent.Enable(False)
@@ -1246,12 +1266,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.SSHProxyHost.Enable(False)
self.SSHProxyPortLabel.Enable(False)
self.SSHProxyPort.Enable(False)
- self.SSHProxyTunnelLabel.Enable(False)
- self.SSHProxyTunnelFromHost.Enable(False)
- self.SSHProxyTunnelFromPort.Enable(False)
- self.SSHProxyTunnelBetweenLabel.Enable(False)
- self.SSHProxyTunnelToHost.Enable(False)
- self.SSHProxyTunnelToPort.Enable(False)
self.SSHProxyAutoLogin.Enable(False)
@@ -1281,26 +1295,17 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.profile_config['icon'] = ':icons/128x128/x2gosession.png'
self.profile_config['user'] = self.UserName.GetValue()
self.profile_config['key'] = self.SSHKeyFile.GetValue()
- if self.UseSSHProxy.GetValue():
- self.profile_config['usesshproxy'] = True
- self.profile_config['host'] = self.SSHProxyTunnelFromHost.GetValue()
- self.profile_config['sshport'] = self.SSHProxyTunnelFromPort.GetValue()
- else:
- self.profile_config['usesshproxy'] = False
- self.profile_config['host'] = self.Host.GetValue()
- if _session_type != 'DirectRDP':
- self.profile_config['sshport'] = self.SSHPort.GetValue()
+ self.profile_config['host'] = self.Host.GetValue()
+ self.profile_config['usesshproxy'] = self.UseSSHProxy.GetValue()
+ if _session_type != 'DirectRDP':
+ self.profile_config['sshport'] = self.SSHPort.GetValue()
self.profile_config['sshproxysameuser'] = self.SSHProxySameUser.GetValue()
self.profile_config['sshproxysamepass'] = self.SSHProxySamePassword.GetValue()
self.profile_config['sshproxyhost'] = self.SSHProxyHost.GetValue()
self.profile_config['sshproxyport'] = self.SSHProxyPort.GetValue()
- self.profile_config['sshproxytunnel'] = '%s:%s:%s:%s' % (self.SSHProxyTunnelFromHost.GetValue(),
- self.SSHProxyTunnelFromPort.GetValue(),
- self.SSHProxyTunnelToHost.GetValue(),
- self.SSHProxyTunnelToPort.GetValue(),
- )
self.profile_config['sshproxyautologin'] = self.SSHProxyAutoLogin.GetValue()
+ self.profile_config['uniquehostkeyaliases'] = self.UniqueHostKeyAliases.GetValue()
if self.profile_config['sshproxysameuser']:
self.profile_config['sshproxyuser'] = ''
else:
@@ -1521,12 +1526,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.SSHProxyHost.Enable(False)
self.SSHProxyPortLabel.Enable(False)
self.SSHProxyPort.Enable(False)
- self.SSHProxyTunnelLabel.Enable(False)
- self.SSHProxyTunnelFromHost.Enable(False)
- self.SSHProxyTunnelFromPort.Enable(False)
- self.SSHProxyTunnelBetweenLabel.Enable(False)
- self.SSHProxyTunnelToHost.Enable(False)
- self.SSHProxyTunnelToPort.Enable(False)
self.SSHProxyAutoLogin.Enable(False)
self.LinkSpeed.Enable(False)
self.ModemLabel.Enable(False)
@@ -1566,14 +1565,11 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
@type event: C{obj}
"""
- if not self.UseSSHProxy.GetValue():
- self.HostLabel.Enable(True)
- self.Host.Enable(True)
- self.SSHPortLabel.Enable(True)
- self.SSHPort.Enable(True)
- self.SSHPort.SetValue(self.profile_config_bak['sshport'])
- else:
- self.SSHPort.SetValue(self.SSHProxyTunnelFromPort.GetValue())
+ self.HostLabel.Enable(True)
+ self.Host.Enable(True)
+ self.SSHPortLabel.Enable(True)
+ self.SSHPort.Enable(True)
+ self.SSHPort.SetValue(self.profile_config_bak['sshport'])
self.SSHAutoLogin.Enable(True)
if PARAMIKO_FEATURE['forward-ssh-agent']:
self.SSHForwardAuthAgent.Enable(True)
@@ -1623,6 +1619,44 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
"""
_session_type = [ i for i in self.sessionChoices.keys() if self.sessionChoices[i] == self.SessionType.GetValue() ][0]
+ if self._last_session_type == 'SHADOW':
+
+ self.EnableSound.SetValue(self.profile_config_bak['sound'])
+ self.RootlessSession.SetValue(self.profile_config_bak['rootless'])
+ self.UseLocalFolderSharing.SetValue(self.profile_config_bak['useexports'])
+ self.ClientSidePrinting.SetValue(self.profile_config_bak['print'])
+ self.UseFileMIMEbox.SetValue(self.profile_config_bak['usemimebox'])
+ self.AutoStartSession.SetValue(self.profile_config_bak['autostart'])
+
+ self.RootlessSession.Enable(True)
+
+ if self.EnableSound.GetValue():
+ self.PulseAudio.Enable(True)
+ self.Esd.Enable(True)
+ self.DefaultSoundPort.Enable(True)
+ self._toggle_DefaultSoundPort()
+ else:
+ self.PulseAudio.Enable(False)
+ self.Esd.Enable(False)
+ self.DefaultSoundPort.Enable(False)
+ self.SoundPortLabel.Enable(False)
+ self.SoundPort.Enable(False)
+
+ self.staticbox_Sound.Enable(True)
+
+ # no local folder sharing available
+ self.staticbox_FolderSharing.Enable(True)
+ self.UseLocalFolderSharing.Enable(True)
+ self._toggle_localFolderSharing()
+
+ # no printing available
+ self.ClientSidePrinting.Enable(True)
+ self.staticbox_Printing.Enable(True)
+
+ # no file MIME box available
+ self.UseFileMIMEbox.Enable(True)
+ self.staticbox_FileMIMEbox.Enable(True)
+
self.UsePublishedApplications.Enable(True)
self.AutoStartSession.Enable(True)
@@ -1752,9 +1786,54 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.AutoStartSession.SetValue(self._last_auto_start_value)
self._last_auto_start_value = None
+ if _session_type == 'SHADOW':
+
+ self.profile_config_bak['autostart'] = self.AutoStartSession.GetValue()
+ self.profile_config_bak['sound'] = self.EnableSound.GetValue()
+ self.profile_config_bak['rootless'] = self.RootlessSession.GetValue()
+ self.profile_config_bak['useexports'] = self.UseLocalFolderSharing.GetValue()
+ self.profile_config_bak['print'] = self.ClientSidePrinting.GetValue()
+ self.profile_config_bak['usemimebox'] = self.UseFileMIMEbox.GetValue()
+
+ self.AutoStartSession.SetValue(False)
+ self.AutoStartSession.Enable(False)
+
+ # shadow sessions are always desktop sessions
+ self.RootlessSession.SetValue(True)
+ self.RootlessSession.Enable(False)
+
+ # no sound available with SHADOW sessions
+ self.EnableSound.SetValue(False)
+ self.EnableSound.Enable(False)
+ self.PulseAudio.Enable(False)
+ self.Esd.Enable(False)
+ self.DefaultSoundPort.Enable(False)
+ self.SoundPortLabel.Enable(False)
+ self.SoundPort.Enable(False)
+ self.staticbox_Sound.Enable(False)
+
+ # no local folder sharing available
+ self.UseLocalFolderSharing.SetValue(False)
+ self.UseLocalFolderSharing.Enable(False)
+ self.staticbox_FolderSharing.Enable(False)
+ self._toggle_localFolderSharing()
+
+ # no printing available
+ self.ClientSidePrinting.SetValue(False)
+ self.ClientSidePrinting.Enable(False)
+ self.staticbox_Printing.Enable(False)
+
+ # no file MIME box available
+ self.UseFileMIMEbox.SetValue(False)
+ self.UseFileMIMEbox.Enable(False)
+ self.staticbox_FileMIMEbox.Enable(False)
+ self._toggle_useFileMIMEbox()
+
self._toggle_DisplayProperties()
self.disable_EditConnected_options()
+ self._last_session_type = _session_type
+
def OnCompressionSelected(self, event):
"""\
Gets called if another compression method gets selected.
@@ -1956,18 +2035,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
if self.SSHProxyAutoLogin.GetValue():
self.SSHProxyKeyFileLabel.Enable(False)
self.SSHProxyAutoLogin.Enable(True)
- self.SSHProxyTunnelLabel.Enable(True)
- self.SSHProxyTunnelFromHost.Enable(True)
- self.SSHProxyTunnelFromPort.Enable(True)
- self.SSHProxyTunnelBetweenLabel.Enable(True)
- self.SSHProxyTunnelToHost.Enable(True)
- self.SSHProxyTunnelToPort.Enable(True)
- self.Host.Enable(False)
- self.HostLabel.Enable(False)
- self.Host.SetValue(self.SSHProxyTunnelFromHost.GetValue())
- self.SSHPort.Enable(False)
- self.SSHPortLabel.Enable(False)
- self.SSHPort.SetValue(self.SSHProxyTunnelFromPort.GetValue())
else:
self.staticbox_Proxy.Enable(False)
self.SSHProxySameUser.Enable(False)
@@ -1981,39 +2048,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.SSHProxyKeyFileLabel.Enable(False)
self.SSHProxyKeyFile.Enable(False)
self.SSHProxyKeyFileBrowseButton.Enable(False)
- self.SSHProxyTunnelLabel.Enable(False)
- self.SSHProxyTunnelFromHost.Enable(False)
- self.SSHProxyTunnelFromPort.Enable(False)
- self.SSHProxyTunnelBetweenLabel.Enable(False)
- self.SSHProxyTunnelToHost.Enable(False)
- self.SSHProxyTunnelToPort.Enable(False)
self.SSHProxyAutoLogin.Enable(False)
- self.Host.Enable(True)
- self.HostLabel.Enable(True)
- self.Host.SetValue(self.profile_config_bak['host'])
- self.SSHPort.Enable(True)
- self.SSHPortLabel.Enable(True)
- self.SSHPort.SetValue(self.profile_config_bak['sshport'])
-
- def OnUpdateSSHProxyTunnelFromHost(self, event):
- """\
- Gets called whenever the ssh-proxy-tunnel-from-host gets modified.
-
- @param event: event
- @type event: C{obj}
-
- """
- self.Host.SetValue(self.SSHProxyTunnelFromHost.GetValue())
-
- def OnUpdateSSHProxyTunnelFromPort(self, event):
- """\
- Gets called whenever the ssh-proxy-tunnel-from-port gets modified.
-
- @param event: event
- @type event: C{obj}
-
- """
- self.SSHPort.SetValue(self.SSHProxyTunnelFromPort.GetValue())
def OnSetKeyboard(self, event):
"""\
@@ -2048,7 +2083,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.KeyboardModel.Enable(False)
self.KeyboardVariant.Enable(False)
- def OnSoundEnable(self, event): # wxGlade: X2goMaintProfile.<event_handler>
+ def OnSoundEnable(self, event):
"""\
Gets called whenever the enable-sound checkbox gets marked.
@@ -2352,26 +2387,11 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
elif self.profile_config['name'].strip() != self.profile_config_bak['name'] and self.profile_config['name'] in self.session_profiles.profile_names:
validateOk = False
self._PyHocaGUI.notifier.send(title=_(u'Profile Manager'), text=_(u'Profile name %s already exists!!!') % self.profile_config['name'].strip(), icon='profile_error')
- elif self.profile_config['usesshproxy'] and self.profile_config['name'] == self.profile_config_bak['name']:
- try:
- (from_host, from_port) = self.profile_config['sshproxytunnel'].split(':')[0:2]
- except ValueError:
- self._PyHocaGUI.notifier.send(title=_(u'Profile Manager'), text=_(u'The SSH proxy configuration is incomplete. Try again.'), icon='profile_error')
- for profile_name in [ p for p in self._PyHocaGUI.profile_names if p != self.profile_config['name'] ]:
- test_profile_config = self.session_profiles.get_profile_config(profile_name)
- if test_profile_config['usesshproxy']:
- try:
- (test_from_host, test_from_port) = test_profile_config['sshproxytunnel'].split(':')[0:2]
- except ValueError:
- continue
- if (from_host, from_port) == (test_from_host, test_from_port):
- validateOk = False
- self._PyHocaGUI.notifier.send(title=_(u'Profile Manager'), text=_(u'Another session profile (%s) already uses [%s]:%s for binding a local SSH proxy to.\nPlease change the SSH proxy settings accordingly.' % (profile_name.strip(), from_host, from_port)), icon='profile_warning')
return validateOk
- def OnOKButton(self, event):
+ def OnApplyButton(self, event):
"""\
- Gets called if the users clicks on the ,,Save'' button.
+ Gets called if the users clicks on the ,,Apply'' button.
@param event: event
@type event: C{obj}
@@ -2381,7 +2401,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.__update_from_screen()
if self.__validate():
- if self.profile_config != self.profile_config_bak:
+ if self.profile_config != self.profile_config_orig:
if self.action in ('ADD', 'COPY'):
self.profile_id = self.session_profiles.add_profile()
@@ -2406,10 +2426,25 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
try: wx.EndBusyCursor()
except: pass
- self.Close()
+
+ self.config_saved = True
+ self.profile_config_orig = copy.deepcopy(self.profile_config)
+ self.profile_config_bak = copy.deepcopy(self.profile_config)
else:
try: wx.EndBusyCursor()
except: pass
+ self.config_saved = False
+
+ def OnOKButton(self, event):
+ """\
+ Gets called if the users clicks on the ,,Save'' button.
+
+ @param event: event
+ @type event: C{obj}
+
+ """
+ self.OnApplyButton(event)
+ if self.config_saved: self.Close()
def OnCancel(self, event):
"""\
@@ -2429,7 +2464,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
@type event: C{obj}
"""
- self.profile_config = copy.deepcopy(self.profile_config_bak)
+ self.profile_config = copy.deepcopy(self.profile_config_orig)
self.__update_fields()
def Close(self):
diff --git a/pyhoca/wxgui/serverinfo.py b/pyhoca/wxgui/serverinfo.py
new file mode 100644
index 0000000..7a3ffba
--- /dev/null
+++ b/pyhoca/wxgui/serverinfo.py
@@ -0,0 +1,224 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Dick Kniep <dick.kniep(a)lindix.nl>
+#
+# PyHoca GUI is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# PyHoca GUI is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program; if not, write to the
+# Free Software Foundation, Inc.,
+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+modules ={}
+
+try:
+ import wxversion
+ wxversion.select('2.9')
+except: pass
+
+try:
+ import wxversion
+ wxversion.select('2.8')
+except: pass
+
+# Python X2Go
+import x2go
+
+# gevent
+import gevent
+import gevent.monkey
+gevent.monkey.patch_all()
+
+import wx
+import os
+
+# PyHoca-GUI modules
+# ... NONE ...
+
+if os.environ.has_key('DESKTOP_SESSION'):
+ WINDOW_MANAGER = os.environ['DESKTOP_SESSION']
+else:
+ WINDOW_MANAGER = 'generic'
+
+class PyHocaGUI_DialogBoxServerInfo(wx.Dialog):
+ """\
+ Simple dialog box for showing server information.
+
+ """
+ def __init__(self, _PyHocaGUI, profile_name):
+ """\
+ Server information dialog box (constructor).
+
+ @param _PyHocaGUI: the master/parent object of the application
+ @type _PyHocaGUI: C{obj}
+ @param profile_name: session profile name
+ @type profile_name: C{str}
+
+ """
+ self._PyHocaGUI = _PyHocaGUI
+ self._pyhoca_logger = self._PyHocaGUI._pyhoca_logger
+ self._pyhoca_logger('server info box started', loglevel=x2go.loglevel_INFO, )
+
+ self.current_profile_name = profile_name
+
+ wx.Dialog.__init__(self, None, id=-1, title=profile_name, style=wx.DEFAULT_FRAME_STYLE, )
+ self._PyHocaGUI._sub_windows.append(self)
+
+ self.SetTitle(_(u'Server Information - %s') % profile_name)
+
+ self.titleLbl = wx.StaticText(self, wx.ID_ANY, _(u'Session Profile: %s\n\nList of X2Go Server components, add-ons and their versions...') % self.current_profile_name, size=(-1, -1))
+
+ self.infoArea = wx.TextCtrl(self, id=-1, value="", size=(520,300), style=wx.TE_READONLY|wx.TE_MULTILINE|wx.SUNKEN_BORDER)
+
+ ID_REFRESH = wx.NewId()
+ self.refreshBtn = wx.Button(self, ID_REFRESH, _(u'Refresh'), )
+ self.cancelBtn = wx.Button(self, wx.ID_CANCEL, _(u'Close'), )
+
+ self.Bind(wx.EVT_BUTTON, self.OnRefreshServerInfo, self.refreshBtn)
+ self.Bind(wx.EVT_BUTTON, self.OnCancel, self.cancelBtn)
+
+ titleSizer = wx.BoxSizer(wx.HORIZONTAL)
+ infoSizer = wx.BoxSizer(wx.HORIZONTAL)
+ btnSizer = wx.BoxSizer(wx.HORIZONTAL)
+ mainSizer = wx.BoxSizer(wx.VERTICAL)
+
+ titleSizer.Add(self.titleLbl, 0, wx.ALL, 5)
+
+ infoSizer.Add(self.infoArea, 0, wx.ALL, 5)
+
+ btnSizer.Add(self.refreshBtn, 0, wx.ALL, 5)
+ btnSizer.Add(self.cancelBtn, 0, wx.ALL, 5)
+
+ mainSizer.Add(titleSizer, 0, wx.ALL, 5)
+ mainSizer.Add(infoSizer, 0, wx.ALL, 5)
+ mainSizer.Add(btnSizer, 0, wx.ALL|wx.ALIGN_RIGHT, 5)
+
+ self.SetSizerAndFit(mainSizer)
+ self.Layout()
+
+ maxX, maxY = wx.GetDisplaySize()
+
+ # we will use the logon window position for this session re-titling windows, as well
+ 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', 'gnome-fallback', 'awesome', 'ubuntu', 'ubuntu-2d', 'openbox-gnome', )):
+
+ # automatically place logon Window for GNOME, awesome
+ move_x = maxX - (self.GetSize().GetWidth() + 20)
+ move_y = 35
+
+ else:
+
+ # 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._refreshServerInfo()
+
+ def ShowModal(self, **kwargs):
+ self._PyHocaGUI._sub_windows.append(self)
+ wx.Dialog.ShowModal(self, **kwargs)
+
+ def _refreshServerInfo(self):
+
+ server_components = self._PyHocaGUI.get_server_components(self.current_profile_name, force=True)
+ server_extensions = [ k for k in server_components.keys() if k.startswith('x2goserver-') and k != 'x2goserver-common' ]
+ server_extensions.sort()
+ server_addons = [ k for k in server_components.keys() if not k.startswith('x2goserver') and k != 'x2goagent' ]
+ server_addons.sort()
+ server_features = self._PyHocaGUI.get_server_features(self.current_profile_name, force=True)
+ halftab = ' '
+ newline = '\n'
+
+ self.infoArea.AppendText(_(u'X2Go Server')+':'+2*newline)
+ self.infoArea.AppendText(halftab+_(u'Server Core')+':'+newline)
+ self.infoArea.AppendText(newline)
+ self.infoArea.AppendText(2*halftab+'%s (%s)\n' % ('x2goserver', server_components['x2goserver']))
+ if 'x2goserver-common' in server_components.keys():
+ self.infoArea.AppendText(2*halftab+'%s (%s)\n' % ('x2goserver-common', server_components['x2goserver-common']))
+ self.infoArea.AppendText(2*halftab+'%s (%s)\n' % ('x2goagent', server_components['x2goagent']))
+ self.infoArea.AppendText('\n')
+ if server_extensions:
+ self.infoArea.AppendText(halftab+_(u'Server Extensions')+':'+newline)
+ self.infoArea.AppendText(newline)
+ for comp in server_extensions:
+ self.infoArea.AppendText(2*halftab+'%s (%s)\n' % (comp, server_components[comp]))
+ self.infoArea.AppendText('\n')
+ if server_addons:
+ self.infoArea.AppendText(_(u'X2Go Server Add-ons')+':'+2*newline)
+ for comp in server_addons:
+ self.infoArea.AppendText(2*halftab+'%s (%s)\n' % (comp, server_components[comp]))
+ self.infoArea.AppendText('\n')
+ self.infoArea.AppendText(_(u'X2Go Server Features')+':'+2*newline)
+ for feature in server_features:
+ self.infoArea.AppendText(2*halftab+'%s\n' % (feature))
+ self.infoArea.ShowPosition(0)
+
+ def OnRefreshServerInfo(self, evt):
+ """\
+ Gets called if the Refresh button gets pressed.
+
+ @param evt: event
+ @type evt: C{obj}
+
+ """
+ self.infoArea.Clear()
+ self._refreshServerInfo()
+
+ def OnCancel(self, evt):
+ """\
+ Continue here, if the user clicks the Cancel button in the dialog box.
+
+ @param evt: event
+ @type evt: C{obj}
+
+ """
+ self.Hide()
+ self.cancel = True
+
+ def Hide(self):
+ """\
+ When hiding the server info box, remove it from the list of open windows in the main application instance.
+
+ """
+ try:
+ self._PyHocaGUI._sub_windows.remove(self)
+ except (AttributeError, ValueError):
+ pass
+ self.Show(False)
+
+ def Close(self):
+ """\
+ Do some PyHocaGUI specific cleanup if this window gets destroyed.
+
+ """
+ try:
+ self._PyHocaGUI._sub_windows.remove(self)
+ except ValueError:
+ pass
+ try:
+ self._PyHocaGUI._temp_disabled_profile_names.remove(self.current_profile_name)
+ except ValueError:
+ pass
+ wx.Dialog.Close(self)
+ wx.Dialog.Destroy(self)
diff --git a/pyhoca/wxgui/sessiontitle.py b/pyhoca/wxgui/sessiontitle.py
index 144380f..75d4ea8 100644
--- a/pyhoca/wxgui/sessiontitle.py
+++ b/pyhoca/wxgui/sessiontitle.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
-# Copyright (C) 2010-2012 by Dick Kniep <dick.kniep(a)lindix.nl>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Dick Kniep <dick.kniep(a)lindix.nl>
#
# PyHoca GUI is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -30,7 +30,7 @@ try:
wxversion.select('2.8')
except: pass
-# Python X2go
+# Python X2Go
import x2go
# gevent
@@ -144,7 +144,7 @@ class PyHocaGUI_DialogBoxSessionTitle(wx.Dialog):
"""
title = self.titleTxt.GetValue()
- _session = self._PyHocaGUI._X2goClient__get_session_of_session_name(session_name=self.current_session_name, return_object=True)
+ _session = self._PyHocaGUI._X2GoClient__get_session_of_session_name(session_name=self.current_session_name, return_object=True)
_session.set_session_window_title(title=title)
self.Close()
diff --git a/pyhoca/wxgui/splash.py b/pyhoca/wxgui/splash.py
index c7809d5..adb353c 100644
--- a/pyhoca/wxgui/splash.py
+++ b/pyhoca/wxgui/splash.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
-# Copyright (C) 2010-2012 by Dick Kniep <dick.kniep(a)lindix.nl>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Dick Kniep <dick.kniep(a)lindix.nl>
#
# PyHoca GUI is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
diff --git a/pyhoca/wxgui/taskbar.py b/pyhoca/wxgui/taskbar.py
index f79feca..03dda9f 100644
--- a/pyhoca/wxgui/taskbar.py
+++ b/pyhoca/wxgui/taskbar.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
-# Copyright (C) 2010-2012 by Dick Kniep <dick.kniep(a)lindix.nl>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Dick Kniep <dick.kniep(a)lindix.nl>
#
# PyHoca GUI is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -30,7 +30,7 @@ try:
wxversion.select('2.8')
except: pass
-# Python X2go
+# Python X2Go
import x2go
import gevent
@@ -90,7 +90,7 @@ class PyHocaGUI_TaskBarIcon(wx.TaskBarIcon):
else:
icon_name = self._PyHocaGUI.tray_icon_connecting or self._PyHocaGUI.tray_icon
self.icon = self.MakeIcon(icon_name=icon_name, fallback_name='pyhoca-trayicon')
- self.SetIcon(self.icon, _(u"PyHoca-GUI (Python X2goClient)\nCurrently connecting you to remote X2Go server ,,%s\'\'") % profile_name)
+ self.SetIcon(self.icon, _(u"PyHoca-GUI (Python X2Go Client)\nCurrently connecting you to remote X2Go server ,,%s\'\'") % profile_name)
def SetIconIdle(self):
"""\
@@ -104,7 +104,7 @@ class PyHocaGUI_TaskBarIcon(wx.TaskBarIcon):
else:
icon_name = self._PyHocaGUI.tray_icon
self.icon = self.MakeIcon(icon_name=icon_name, fallback_name='pyhoca-trayicon')
- self.SetIcon(self.icon, _(u"PyHoca-GUI (Python X2goClient)\nClient for connecting you to a remote X2Go server"))
+ self.SetIcon(self.icon, _(u"PyHoca-GUI (Python X2Go Client)\nClient for connecting you to a remote X2Go server"))
def CreateSessionManagerPopupMenu(self, evt):
"""\
diff --git a/setup.py b/setup.py
index 59db907..c4d045f 100755
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
# PyHoca is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -21,11 +21,13 @@
# import the PyHoca-GUI
import sys
import os
-import pyhoca.wxgui
PROGRAM_NAME = 'PyHoca-GUI'
PROGRAM_DESC = '%s is a cross-platform (Windows, MacOS X, Linux) graphical X2Go client.' % PROGRAM_NAME
-PROGRAM_VERSION = pyhoca.wxgui.__VERSION__
+for line in file(os.path.join('pyhoca', 'wxgui', '__init__.py')).readlines():
+ if (line.startswith('__VERSION__')):
+ exec(line.strip())
+PROGRAM_VERSION = __VERSION__
PROGRAM_ICON = "pixmaps/pyhoca_x2go-logo-ubuntu.ico"
LICENSE = 'AGPLv3+'
AUTHOR = 'Mike Gabriel, Dick Kniep'
@@ -170,6 +172,21 @@ elif platform.system() == 'Linux':
}
)
+ icon_files = datafilelist('{prefix}/share/icons/PyHoca'.format(prefix=sys.prefix), r'icons_symlinked/PyHoca')
+ img_files = [("{prefix}/share/img".format(prefix=sys.prefix), glob(r'img\\*.*'))]
+ desktop_files = [
+ ('{prefix}/share/applications'.format(prefix=sys.prefix), glob('desktop/*')),
+ ('{prefix}/share/pixmaps'.format(prefix=sys.prefix), glob('pixmaps/*.svg')),
+ ]
+ manpage_files = [
+ ('{prefix}/share/man/man1'.format(prefix=sys.prefix), glob('man/man1/*.1')),
+ ]
+ data_files.extend(icon_files +
+ img_files +
+ desktop_files +
+ manpage_files
+ )
+
setup(
name = PROGRAM_NAME,
version = PROGRAM_VERSION,
hooks/post-receive
--
pyhoca-gui.git (Python X2Go Client (wxPython GUI))
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).
1
0
12 Feb '13
The branch, master has been updated
via d1c5a9ada4697a3014ccb150ae3480dce52ee689 (commit)
from b17acf68af467dfbbedb4081f2374337752d3b25 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d1c5a9ada4697a3014ccb150ae3480dce52ee689
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Tue Feb 12 11:10:18 2013 +0100
release 0.4.0.0
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 5c6bba0..e7fa888 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-pyhoca-gui (0.4.0.0-0~x2go1) UNRELEASED; urgency=low
+pyhoca-gui (0.4.0.0-0~x2go1) unstable; urgency=low
[ Orion Poplawski ]
* New upstream version (0.4.0.0):
@@ -70,7 +70,7 @@ pyhoca-gui (0.4.0.0-0~x2go1) UNRELEASED; urgency=low
* New upstream version (0.4.0.0):
- Update russian translation file.
- -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 20 Dec 2012 08:51:50 +0100
+ -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 12 Feb 2013 11:10:06 +0100
pyhoca-gui (0.2.1.1-0~x2go1) unstable; urgency=low
hooks/post-receive
--
pyhoca-gui.git (Python X2Go Client (wxPython GUI))
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).
1
0
12 Feb '13
The branch, master has been updated
via a73faa46649f99b8cb1703c29706134a90ece31e (commit)
via 75dbd9497da545779f0d1ad1d3a56765c981e2e4 (commit)
from 720f39f4f42896c5633b612e69a01c7add4eaf95 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a73faa46649f99b8cb1703c29706134a90ece31e
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Tue Feb 12 09:00:29 2013 +0100
fix __doc__ strings
commit 75dbd9497da545779f0d1ad1d3a56765c981e2e4
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Tue Feb 12 08:55:54 2013 +0100
Continue development...
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 6 ++++++
x2go/__init__.py | 2 +-
x2go/client.py | 4 ++--
x2go/utils.py | 2 +-
4 files changed, 10 insertions(+), 4 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 65b9050..794f845 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-x2go (0.4.0.1-0~x2go2) UNRELEASED; urgency=low
+
+ * Continue development...
+
+ -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 12 Feb 2013 08:55:31 +0100
+
python-x2go (0.4.0.0-0~x2go1) unstable; urgency=low
[ Orion Poplawski ]
diff --git a/x2go/__init__.py b/x2go/__init__.py
index 340f24f..5b3b14b 100644
--- a/x2go/__init__.py
+++ b/x2go/__init__.py
@@ -183,7 +183,7 @@ Contact
"""
__NAME__ = 'python-x2go'
-__VERSION__ = '0.4.0.0'
+__VERSION__ = '0.4.0.1'
from gevent import monkey
monkey.patch_all()
diff --git a/x2go/client.py b/x2go/client.py
index c850e40..d554635 100644
--- a/x2go/client.py
+++ b/x2go/client.py
@@ -2671,10 +2671,10 @@ class X2GoClient(object):
@param refresh_cache: query the X2Go server directly and update the desktop list cache
with the new information
@type refresh_cache: C{bool}
- @param excluded_session_types: session types (e.g. "D", "R", "S" or "P") to be excluded from the
+ @param exclude_session_types: session types (e.g. "D", "R", "S" or "P") to be excluded from the
returned list of sharable desktops (this only works for sharing someone's own sessions, for
sharing other users' sessions, the X2Go Desktop Sharing decides on what is sharable and what not).
- @type excluded_session_types: C{list}
+ @type exclude_session_types: C{list}
@param raw: output the session list in X2Go's raw C{x2golistdesktops} format
@type raw: C{bool}
diff --git a/x2go/utils.py b/x2go/utils.py
index 03fd9a8..e8d80bc 100644
--- a/x2go/utils.py
+++ b/x2go/utils.py
@@ -787,7 +787,7 @@ class ProgressStatus(object):
def __iter__(self):
"""\
- Intialize the L{ProgresStatus} iterator object.
+ Intialize the L{ProgressStatus} iterator object.
"""
self.status = self.progress_func()
hooks/post-receive
--
python-x2go.git (Python X2Go Client API)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "python-x2go.git" (Python X2Go Client API).
1
0
12 Feb '13
The branch, build-baikal has been created
at 720f39f4f42896c5633b612e69a01c7add4eaf95 (commit)
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
hooks/post-receive
--
python-x2go.git (Python X2Go Client API)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "python-x2go.git" (Python X2Go Client API).
1
0
12 Feb '13
The branch, build-main has been updated
via 720f39f4f42896c5633b612e69a01c7add4eaf95 (commit)
via 1ddcf94e49415941d44f8a142d7863a4d2adcdea (commit)
via 810c1e98f0e38a4cc5364aac2f2832264bd56e58 (commit)
via a93d4f2646aa310295eacaf4f7c6b1bb2566c19e (commit)
via 79f1296a15b362e57161632519c796ea43994104 (commit)
via 5e85771f2aeb7d3095a72409b783e96934c788ef (commit)
via 4793f3a5cadfc7d922403601363b2a1d46ecfc2a (commit)
via 86055d5fdb0c0c94299946c95ffda6c468a89265 (commit)
via e1f9afda375bab994849fc1b3feeded185a926b4 (commit)
via 2fcc357335868fccc00f0d778c71f9924fa140eb (commit)
via eafc5bb4b22a5bee841bfd97313beaa496fac941 (commit)
via cb527b4b142bf337d50a026dd2a85eea4ccea923 (commit)
via 1ddcfcf9bbc3ba029a697b6b7914ccbf67ba71e5 (commit)
via 01ea13f9b472bf7139c0640fbddb1cf4309c0861 (commit)
via 3133baf8a3c0e8dc6d80bad8d5aef6b0d0f34862 (commit)
via eb0cf279859b9ac49f72cda07b8ca7730dfe7a7e (commit)
via 5415362f73739312014478cb6b382369dbd3d5c7 (commit)
via 4557a946e0a316c04d5f0c368c7137c2d15d8056 (commit)
via c30e67e43d69963013b04c27f73e641c671996a3 (commit)
via 7c04590d15e7b41656614a91288d538d28735066 (commit)
via 9a9712d918b999c87c2ff01b07b0526c3a855835 (commit)
via 42b3141237a11af183bc4e682292c7b49f408460 (commit)
via 2e09bcaacd788687daa35ce8379da22bc26bf6b7 (commit)
via 4b05f61aec2d1e9f8dfde42416be4883782c40b5 (commit)
via b014bae497840deba4b094e5fdee4e79478b989b (commit)
via 1d869290092c02881753955c061fa7f3ef085a62 (commit)
via 7914c64237973c66222fc35094ccc34b6d921063 (commit)
via e1b34e08af86bd3c56119cf467dfae5520c07fac (commit)
via cd14d38e23fb6cf8e7860a6f7290669301c874f4 (commit)
via 4de963ff56562f3fcb967ba2344d122e825aeb14 (commit)
via b1c28c749e6d34ae51d5169e360ba4f3409d1d81 (commit)
via f787a0620a5fee6cc9df2a53a92abb81d5a99880 (commit)
via a986b6081ff2f677036342e210ec9fac3d2f1331 (commit)
via 60047c179c15e332894d321f323270b0675093ad (commit)
via 2a9b2742b4f4386750758c6c67f6d003225f168a (commit)
via c4a24c0afc5ab8636f069c80c1c70c19df52d5d3 (commit)
via 61dc41b90989393423cac83e4bc7c4693f37299f (commit)
via 2dad37975a1de1ddc41c3d460dd7bfc64bd6ec87 (commit)
via 3710451867d4f079e6324b7e37ad8c2284c5a99d (commit)
via cee0cac37466c9ea792588f0a26f6842d104f8e4 (commit)
via 917cca2a6a1dbd6cf1105cf9b5329d76a7c99758 (commit)
via fe173b2649c28ede9348f4ed6bc6a926ffbe303a (commit)
via 35f6b967ab1eb0e5b6a9fa7bddc984ecbb16cd16 (commit)
via 2a1d3db9b452102cfa6479dc5b8349b08f82eb67 (commit)
via c6f5f43dbb00c79464a1de48fc910f1a6a3f57c5 (commit)
via 6618320451923230d75f1e9190dbff9502052b6a (commit)
from 36689cb17e965b1d5437e2235aebe639abe17831 (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:
Makefile.docupload | 4 +-
README | 30 +-
README.Trinity-Desktop | 2 +-
TODO | 2 +-
debian/changelog | 42 +-
debian/copyright | 8 +-
debian/rules | 4 +-
examples/x2go_resume_session.py | 4 +-
examples/x2go_start_session.py | 4 +-
.../x2go_start_session_with_progress_status.py | 6 +-
setup.py | 9 +-
x2go/__init__.py | 92 ++--
x2go/_paramiko.py | 2 +-
x2go/backends/__init__.py | 2 +-
x2go/backends/control/__init__.py | 6 +-
x2go/backends/control/_stdout.py | 231 ++++++---
x2go/backends/info/__init__.py | 10 +-
x2go/backends/info/_stdout.py | 112 ++++-
x2go/backends/printing/__init__.py | 10 +-
x2go/backends/printing/_file.py | 48 +-
x2go/backends/printing/_gconf.py | 24 +-
x2go/backends/printing/_winreg.py | 24 +-
x2go/backends/profiles/__init__.py | 12 +-
x2go/backends/profiles/_file.py | 92 ++--
x2go/backends/profiles/_gconf.py | 20 +-
x2go/backends/profiles/_httpsbroker.py | 20 +-
x2go/backends/profiles/_winreg.py | 20 +-
x2go/backends/proxy/__init__.py | 6 +-
x2go/backends/proxy/_nx3.py | 20 +-
x2go/backends/proxy/base.py | 36 +-
x2go/backends/settings/__init__.py | 10 +-
x2go/backends/settings/_file.py | 20 +-
x2go/backends/settings/_gconf.py | 22 +-
x2go/backends/settings/_winreg.py | 22 +-
x2go/backends/terminal/__init__.py | 6 +-
x2go/backends/terminal/_stdout.py | 221 +++++----
x2go/cache.py | 66 +--
x2go/checkhosts.py | 188 ++++---
x2go/cleanup.py | 14 +-
x2go/client.py | 518 ++++++++++++--------
x2go/defaults.py | 85 ++--
x2go/forward.py | 32 +-
x2go/gevent_subprocess.py | 2 +-
x2go/guardian.py | 28 +-
x2go/inifiles.py | 40 +-
x2go/log.py | 16 +-
x2go/mimebox.py | 46 +-
x2go/mimeboxactions.py | 66 +--
x2go/printactions.py | 98 ++--
x2go/printqueue.py | 50 +-
x2go/pulseaudio.py | 20 +-
x2go/registry.py | 168 +++----
x2go/rforward.py | 84 ++--
x2go/session.py | 365 ++++++++------
x2go/sftpserver.py | 66 +--
x2go/sshproxy.py | 77 ++-
x2go/tests/test_printing.py | 24 +-
x2go/utils.py | 24 +-
x2go/x2go_exceptions.py | 86 ++--
x2go/xserver.py | 32 +-
60 files changed, 1989 insertions(+), 1409 deletions(-)
The diff of changes is:
diff --git a/Makefile.docupload b/Makefile.docupload
index aa4869d..a82d7b7 100644
--- a/Makefile.docupload
+++ b/Makefile.docupload
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
# Makefile.docupload file - for python-x2go
-# Copyright 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>, GPLv3+ applies to this file
+# Copyright 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>, GPLv3+ applies to this file
VERSION=`head -n1 debian/changelog | sed 's,.*(\(.*\)).*,\1,' | cut -d"-" -f1`
DOC_HOST=code.x2go.org
@@ -16,7 +16,7 @@ docbuild:
rm -Rf .epydoc/html/*
epydoc --debug -n "Python X2Go" -u http://www.x2go.org -v --html --no-private -o .epydoc/html x2go/
#epydoc --debug --pdf --no-private -o .epydoc/pdf.tmp x2go/
- #mv .epydoc/pdf.tmp/api.pdf .epydoc/pdf/Python-X2go_API.pdf
+ #mv .epydoc/pdf.tmp/api.pdf .epydoc/pdf/Python-X2Go_API.pdf
#rm -Rf .epydoc/pdf.tmp
diff --git a/README b/README
index da4bc54..c1535ea 100644
--- a/README
+++ b/README
@@ -1,16 +1,16 @@
-python-x2go - Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+python-x2go - Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Published under the terms of the GNU Affero General Public License.
See http://www.gnu.org/licenses/agpl.html for a recent copy.
-=== What is Python X2go? ===
+=== What is Python X2Go? ===
The Python X2Go module integrates X2Go client support into your python programmes.
Python X2Go is used in the headless X2Go client Âģpyhoca-cliÂĢ and by the tiny systray GUI
application Âģpyhoca-guiÂĢ
-Python X2Go takes advantages of the NX Proxy by NoMachine published under GPL.
+Python X2Go takes advantages of the NX Proxy by NoMachine published under GPL.
On Windows and MacOS X systems you have to make sure that you have installed a current
NX Proxy executable somewhere on your system. It probably will be sufficient to have
the X2Go project's x2goclient package installed on your client machine.
@@ -18,22 +18,22 @@ the X2Go project's x2goclient package installed on your client machine.
On Debian / Ubuntu systems there is a nxproxy package available within the distribution.
Python X2Go defaults to using the distro nxproxy binary.
-Python X2Go was originally inspired by work of JÃļrg Sawatzki <joerg.sawatzki(a)web.de>.
-Unfortunately, JÃļrg had to give up work on his ideas due to licensing issues with his
-contractor. To make his ideas furthermore available to the OSS community this complete
+Python X2Go was originally inspired by work of JÃļrg Sawatzki <joerg.sawatzki(a)web.de>.
+Unfortunately, JÃļrg had to give up work on his ideas due to licensing issues with his
+contractor. To make his ideas furthermore available to the OSS community this complete
rewrite of JÃļrgs ideas has been called into life.
-In case you have the opinion that parts of the presented code are not as much a rewrite
+In case you have the opinion that parts of the presented code are not as much a rewrite
as they should be, may I ask you to contact me directly and in person. I am sure, things can
-be sorted out in a non-complicated and heartful fashion. Thanks in advance for your directness
+be sorted out in a non-complicated and heartful fashion. Thanks in advance for your directness
and wholeheartedness concerning this inner process.
=== Requirements ===
-* X2Go Server
- - you need a working X2Go server to connect to. In order to use shadowing make sure
- you have at least X2Go Baikal (3.1.x) installed
+* X2Go Server
+ - you need a working X2Go server to connect to. In order to use shadowing make sure
+ you have at least X2Go Server (>= 4.1.0.0) installed
* on the client system you will need
- the python-gevent library (for details refer to: http://www.gevent.org/)
- the python-paramiko library (SSH implementation in Python, http://www.lag.net/paramiko/)
@@ -44,7 +44,7 @@ and wholeheartedness concerning this inner process.
- also working: if no Ghostscript/GSView is installed the win32api ,,print'' command will
be executed on incoming PDF print spool files. Win32api will try launch the print function
of the default PDF viewer application (mostly Adobe Acrobat Reader)
- - if you have a choice: install Ghostscript/GSview on the system that uses Python X2Go
+ - if you have a choice: install Ghostscript/GSview on the system that uses Python X2Go
applications... it's highly recommended
@@ -59,7 +59,7 @@ and wholeheartedness concerning this inner process.
* use Pulse Audio sound
* X2Go printing
* reading/writing session profiles from file
-* sharing of local (client-side) folders (SFTP server is integrated in Python X2go)
+* sharing of local (client-side) folders (SFTP server is integrated in Python X2Go)
* connect via proxy SSH server
* X2Go MIME box support
* color depth auto-recognition
@@ -77,7 +77,7 @@ We use Launchpad for Ubuntu packaging:
$ apt-get update
$ apt-get install python-x2go
-From Ubuntu oneiric on python-x2go is also available as a part of the
+From Ubuntu oneiric on python-x2go is also available as a part of the
Ubuntu GNU/Linux distribution.
@@ -107,7 +107,7 @@ Testing and writing a short howto for this section is very welcome.
=== How to use it from the command line? ===
A good example for the usage of Python X2Go is the pyhoca-cli programme, a headless
-X2Go client that aims at 100% compatibility with X2goClient applications released in
+X2Go client that aims at 100% compatibility with X2Go Client applications released in
the X2Go project.
On Debian/Ubuntu you can easily install the X2Go Client by running APT again:
diff --git a/README.Trinity-Desktop b/README.Trinity-Desktop
index 90ffa21..2bab505 100644
--- a/README.Trinity-Desktop
+++ b/README.Trinity-Desktop
@@ -1,4 +1,4 @@
-Trinity Deskop (KDE3.5 fork) and (Python) X2go
+Trinity Deskop (KDE3.5 fork) and (Python) X2Go
==============================================
Python X2Go brings support to start Trinity Desktops on remote
diff --git a/TODO b/TODO
index d6cf347..ee8039c 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-python-x2go - Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+python-x2go - Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Published under the terms of the GNU Affero General Public License.
See http://www.gnu.org/licenses/agpl.html for a recent copy.
diff --git a/debian/changelog b/debian/changelog
index 4e01b79..65b9050 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,43 @@
+python-x2go (0.4.0.0-0~x2go1) unstable; urgency=low
+
+ [ Orion Poplawski ]
+ * New upstream version (0.4.0.0):
+ - Importing all of x2go in setup.py causes rpmbuild problems due to
+ DISPLAY not being set. It is overkill as well, causing extra dependencies
+ to be installed at build time. (Fixes: #91).
+
+ [ Mike Gabriel ]
+ * Bump version to 0.4.0.0.
+ * WARNING: starting with version 0.4.0.0 of PyHoca-GUI, PyHoca-CLI and Python
+ X2Go, all class identifiers are now X2Go..., not X2go... anymore.
+ * New upstream version (0.4.0.0):
+ - Add session profile option ,,display'' to default session profile options.
+ - Catch any kind of exception when writing session profile files and return
+ True or False in cases where I/O errors occur.
+ - Avoid the known_hosts file being flushed with localhost:[<someport>]
+ entries. Store host keys of SSH-proxied hosts under the [<address>]:<port>
+ the system has _behind_ the SSH proxy gateway. (Hopefully fixes: #18,
+ partially fixes: #53).
+ - Add session profile option: uniquehostkeyaliases. Allow the
+ (by-design-unique) X2Go session profile ID to be a representative for
+ <hostname>:<port>. Update session profile IDs on hostname changes.
+ Re-arrange class structure for MissingHostKey policies, also provide an
+ X2goAutoAddPolicy class.
+ - Fix auto-starting and auto-resuming of sessions.
+ - Avoid false-positive notifications of dead control session directly after
+ a disconnect request from the user.
+ - Improve desktop sharing code. Add code to obtain version information of
+ server-side X2Go components.
+ - Add session type filter for list of sharable desktops.
+ - Sort X2Go feature list, add force option for X2GoClient queries of server
+ features and server components. Add alias get_server_components (for
+ get_server_versions).
+ - Add low latency support for link types 'modem' and 'isdn'. Selecting
+ either link quality will double nearly all connection timeout values.
+ (Fixes: #53).
+
+ -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 12 Feb 2013 08:41:52 +0100
+
python-x2go (0.2.1.1-0~x2go1) unstable; urgency=low
* New upstream version (0.2.1.1):
@@ -12,7 +52,7 @@ python-x2go (0.2.1.1-0~x2go1) unstable; urgency=low
under the same user ID, we have to strictly differentiate between
running/suspend sessions associated to the several connected session
profiles.
- - Make connection disruptures more robust.
+ - Make connection disruptures more robust. (Fixes: #23).
-- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 18 Dec 2012 12:36:34 +0100
diff --git a/debian/copyright b/debian/copyright
index 8a3752a..f1d6bb8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,12 +4,12 @@ Upstream-Contact: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Source: http://code.x2go.org/releases/source/python-x2go
Files: *
-Copyright: 2010-2012, Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+Copyright: 2010-2013, Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
License: AGPL-3+
Files: x2go/gevent_subprocess.py
Copyright: 2010, Mark Visser <mjmvisser(a)gmail.com>
- 2010-2012, Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+ 2010-2013, Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
License: AGPL-3+
Comment: The file was placed in the ,,public domain'' by Mark Visser and
in context of the X2Go project it is published as GPL-3. The file was
@@ -17,7 +17,7 @@ Comment: The file was placed in the ,,public domain'' by Mark Visser and
http://groups.google.com/group/gevent/browse_thread/thread/dba1a5d29e0a60ff
Files: Makefile.docupload
-Copyright: 2010-2012, Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+Copyright: 2010-2013, Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
License: GPL-3+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -39,7 +39,7 @@ License: GPL-3+
`/usr/share/common-licenses/GPL-3'.
Files: debian/*
-Copyright: 2010-2012, Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+Copyright: 2010-2013, Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
License: GPL-2+
Python X2Go is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/debian/rules b/debian/rules
index 214d87b..4f67782 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
# debian/rules file - for python-x2go
# Based on sample debian/rules file - for GNU Hello (1.3).
-# Copyright 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
WITH_PYTHON2 = $(shell test -f /usr/bin/dh_python2 && echo "--with python2")
@@ -11,7 +11,7 @@ WITH_PYTHON2 = $(shell test -f /usr/bin/dh_python2 && echo "--with python2")
override_dh_auto_build:
mkdir -p .epydoc/html
rm -Rf .epydoc/html/*
- epydoc --debug -n "Python X2go" -u http://www.x2go.org -v --html --no-private -o .epydoc/html x2go/
+ epydoc --debug -n "Python X2Go" -u http://www.x2go.org -v --html --no-private -o .epydoc/html x2go/
dh_auto_build
# tests from upstream are currently broken...
diff --git a/examples/x2go_resume_session.py b/examples/x2go_resume_session.py
index 2afc739..26c151c 100644
--- a/examples/x2go_resume_session.py
+++ b/examples/x2go_resume_session.py
@@ -1,7 +1,7 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -37,7 +37,7 @@ username = "foo"
password = getpass.getpass()
-cli = x2go.X2goClient(use_cache=False, loglevel=x2go.log.loglevel_DEBUG)
+cli = x2go.X2GoClient(use_cache=False, loglevel=x2go.log.loglevel_DEBUG)
s_uuid = cli.register_session(server, port=port, username=username, geometry="800x600", add_to_known_hosts=True)
cli.connect_session(s_uuid, password=password)
diff --git a/examples/x2go_start_session.py b/examples/x2go_start_session.py
index d260f64..fbea4c4 100644
--- a/examples/x2go_start_session.py
+++ b/examples/x2go_start_session.py
@@ -1,7 +1,7 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -37,7 +37,7 @@ command = "GNOME"
password = getpass.getpass()
-cli = x2go.X2goClient(use_cache=False, loglevel=x2go.log.loglevel_DEBUG)
+cli = x2go.X2GoClient(use_cache=False, loglevel=x2go.log.loglevel_DEBUG)
s_uuid = cli.register_session(server, port=port,
username=username,
cmd=command,
diff --git a/examples/x2go_start_session_with_progress_status.py b/examples/x2go_start_session_with_progress_status.py
index 8e7b0e6..8a4ec5f 100644
--- a/examples/x2go_start_session_with_progress_status.py
+++ b/examples/x2go_start_session_with_progress_status.py
@@ -1,7 +1,7 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -32,7 +32,7 @@ import threading
# modify to your needs...
server = "server.mydomain.tld"
-port = 222
+port = 22
username = "foo"
command = "GNOME"
@@ -45,7 +45,7 @@ def my_progress_bar(ps):
password = getpass.getpass()
-cli = x2go.X2goClient(use_cache=False, loglevel=x2go.log.loglevel_DEBUG)
+cli = x2go.X2GoClient(use_cache=False, loglevel=x2go.log.loglevel_DEBUG)
s_uuid = cli.register_session(server, port=port,
username=username,
cmd=command,
diff --git a/setup.py b/setup.py
index 396dd13..890ebef 100755
--- a/setup.py
+++ b/setup.py
@@ -18,12 +18,17 @@
# Free Software Foundation, Inc.,
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+import os
+
from setuptools import setup, find_packages
-import x2go
+for line in file(os.path.join('x2go', '__init__.py')).readlines():
+ if (line.startswith('__VERSION__')):
+ exec(line.strip())
+MODULE_VERSION = __VERSION__
setup(
name = "x2go",
- version = x2go.__VERSION__,
+ version = MODULE_VERSION,
description = "Python X2Go implements an X2Go client/session library in Python based on the Python Paramiko SSH module.",
license = 'AGPLv3+',
author = 'Mike Gabriel',
diff --git a/x2go/__init__.py b/x2go/__init__.py
index e8470ef..340f24f 100644
--- a/x2go/__init__.py
+++ b/x2go/__init__.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -26,6 +26,11 @@ Introduction
With Python X2Go you can write your own X2Go clients or embed X2Go client
features into already existing application environments.
+ NOTE: Beginning with v0.4.0.0 of Python X2Go all class names start with
+ X2Go***. Earlier versions used X2go***. As X2Go is the official name of the
+ project (i.e. with a capital X and a capital G) we have adapted the class
+ names to this circumstance.
+
API Concept
===========
@@ -38,25 +43,25 @@ API Concept
Python X2Go only offers five public API classes. With the release of
version 0.1.0.0, we will try to keep these five public API classes
- of future releases as compatible as possible with versions of Python X2go
+ of future releases as compatible as possible with versions of Python X2Go
greater/equal than v0.1.0.0.
The five public API classes are:
- - L{X2goClient} --- a whole X2Go client API
- - L{X2goSession} --- management of an individual X2Go
- session--either started standalone or from within an L{X2goClient} instance
- - L{X2goClientSettings} --- provide access to X2Go (global and
+ - L{X2GoClient} --- a whole X2Go client API
+ - L{X2GoSession} --- management of an individual X2Go
+ session--either started standalone or from within an L{X2GoClient} instance
+ - L{X2GoClientSettings} --- provide access to X2Go (global and
user) configuration node ÂģsettingsÂĢ
- - L{X2goClientPrinting} --- provide access to X2Go (global and
+ - L{X2GoClientPrinting} --- provide access to X2Go (global and
user) configuration node ÂģprintingÂĢ
- - L{X2goSessionProfiles} --- provide access to X2Go (global and
+ - L{X2GoSessionProfiles} --- provide access to X2Go (global and
user) configuration node ÂģsessionsÂĢ
Plus two extra classes on MS Windows platforms:
- - L{X2goClientXConfig} and L{X2goXServer} --- these classes will be initialized
- during L{X2goClient} instantiation on MS Windows platforms and start an installed XServer
+ - L{X2GoClientXConfig} and L{X2GoXServer} --- these classes will be initialized
+ during L{X2GoClient} instantiation on MS Windows platforms and start an installed XServer
Any other of the Python X2Go classes may be subject to internal changes
and the way of addressing these classes in code may vary between different
@@ -68,40 +73,40 @@ API Structure
=============
When using Python X2Go in your applications, the basic idea is that you
- create your own class and inherit the X2goClient class in that::
+ create your own class and inherit the X2GoClient class in that::
import x2go
- class MyX2goClient(x2go.X2goClient):
+ class MyX2GoClient(x2go.X2GoClient):
...
Python X2Go is capable of handling multiple running/suspended sessions within the
same client instance, so for your application, there should not be any need of
- instantiating more than one L{X2goClient} object in parallel.
+ instantiating more than one L{X2GoClient} object in parallel.
NOTE: Doing so is--herewith--fully disrecommended.
- The L{X2goClient} class flattens the complex structure of Python X2Go into
- many L{X2goClient} methods that you can use in your own C{MyX2goClient} instance.
+ The L{X2GoClient} class flattens the complex structure of Python X2Go into
+ many L{X2GoClient} methods that you can use in your own C{MyX2GoClient} instance.
However, it might be handy to retrieve a whole X2Go session instance
- from the L{X2goClient} instance. This can be achieved by the
- L{X2goClient.register_session()} method::
+ from the L{X2GoClient} instance. This can be achieved by the
+ L{X2GoClient.register_session()} method::
import x2go
- my_x2gocli = MyX2goClient()
+ my_x2gocli = MyX2GoClient()
reg_session_instance = my_x2gocli.register_session(<options>, return_object=True)
Whereas <options> can be as simple as::
Âģprofile_name=<PROFILE_NAME_IN_SESSIONS_FILE>ÂĢ
- or contain a whole set of L{X2goSession} parameters that can be used to start a
+ or contain a whole set of L{X2GoSession} parameters that can be used to start a
session manually (i.e. a session that is based on a pre-configured session profile
in either of the ÂģsessionsÂĢ config files).
- The L{X2goClient.register_session()} method---in object-retrieval-mode---returns
- an L{X2goSession} instance. With this instance you can then manage
+ The L{X2GoClient.register_session()} method---in object-retrieval-mode---returns
+ an L{X2GoSession} instance. With this instance you can then manage
your X2Go session::
import gevent, getpass
@@ -126,8 +131,8 @@ API Structure
How to access---especially how to modify---the X2Go client configuration
files ÂģsettingsÂĢ, ÂģprintingÂĢ, ÂģsessionsÂĢ and ÂģxconfigÂĢ (Windows only)
is explained in detail with each class declaration in this API documentation.
- Please refer to the class docs of L{X2goClientSettings}, L{X2goClientPrinting},
- L{X2goSessionProfiles} and L{X2goXServer}.
+ Please refer to the class docs of L{X2GoClientSettings}, L{X2GoClientPrinting},
+ L{X2GoSessionProfiles} and L{X2GoXServer}.
Configuration and Session Management
@@ -142,22 +147,22 @@ Configuration and Session Management
section, a section in the Windows registry, etc.
NOTE: Each configuration node will be re-read whenever it is needed
- by an X2Go sesion or the X2goClient class itself.
+ by an X2Go sesion or the X2GoClient class itself.
Conclusively, any change to either of the configuration nodes
will be reflected as a change in your X2Go client behaviour:
- - L{X2goSessionProfiles}: changes to a session profile in
+ - L{X2GoSessionProfiles}: changes to a session profile in
the ÂģsessionsÂĢ node will be available for the next registered
- L{X2goSession} instance
- - L{X2goClientPrinting}: on each incoming X2Go print job the
+ L{X2GoSession} instance
+ - L{X2GoClientPrinting}: on each incoming X2Go print job the
ÂģprintingÂĢ configuration node will be re-read, thus you can
change your X2Go client's print setup during a running session
- - L{X2goClientSettings}: also the configuration node ÂģsettingsÂĢ
+ - L{X2GoClientSettings}: also the configuration node ÂģsettingsÂĢ
is re-read whenever needed in the course of X2Go session management
- - L{X2goClientXConfig} and L{X2goXServer} (Windows only): these classes will only be initialized
+ - L{X2GoClientXConfig} and L{X2GoXServer} (Windows only): these classes will only be initialized
once (starting the XServer on Windows platforms) on construction
- of an L{X2goClient} instance
+ of an L{X2GoClient} instance
Dependencies
============
@@ -178,19 +183,19 @@ Contact
"""
__NAME__ = 'python-x2go'
-__VERSION__ = '0.2.1.1'
+__VERSION__ = '0.4.0.0'
from gevent import monkey
monkey.patch_all()
import utils
-from client import X2goClient
-from backends.profiles import X2goSessionProfiles
-from backends.printing import X2goClientPrinting
-from backends.settings import X2goClientSettings
-from session import X2goSession
-from sshproxy import X2goSSHProxy
+from client import X2GoClient
+from backends.profiles import X2GoSessionProfiles
+from backends.printing import X2GoClientPrinting
+from backends.settings import X2GoClientSettings
+from session import X2GoSession
+from sshproxy import X2GoSSHProxy
from x2go_exceptions import *
from log import *
@@ -204,5 +209,16 @@ from defaults import X2GO_SESSIONS_ROOTDIR
from defaults import X2GO_SSH_ROOTDIR
if X2GOCLIENT_OS == 'Windows':
- from xserver import X2goClientXConfig, X2goXServer
+ from xserver import X2GoClientXConfig, X2GoXServer
+
+# compat section
+X2goClient = X2GoClient
+X2goSessionProfiles = X2GoSessionProfiles
+X2goClientPrinting = X2GoClientPrinting
+X2goClientSettings = X2GoClientSettings
+X2goSession = X2GoSession
+X2goSSHProxy = X2GoSSHProxy
+if X2GOCLIENT_OS == 'Windows':
+ X2goClientXConfig = X2GoClientXconfig
+ X2goXServer = X2GoXServer
diff --git a/x2go/_paramiko.py b/x2go/_paramiko.py
index b1e57c5..3b93d14 100644
--- a/x2go/_paramiko.py
+++ b/x2go/_paramiko.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
diff --git a/x2go/backends/__init__.py b/x2go/backends/__init__.py
index de9a5a7..21601b4 100644
--- a/x2go/backends/__init__.py
+++ b/x2go/backends/__init__.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
diff --git a/x2go/backends/control/__init__.py b/x2go/backends/control/__init__.py
index 81de8bb..890975f 100644
--- a/x2go/backends/control/__init__.py
+++ b/x2go/backends/control/__init__.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -19,6 +19,6 @@
from x2go.defaults import BACKEND_CONTROLSESSION_DEFAULT
-from _stdout import X2goControlSessionSTDOUT
+from _stdout import X2GoControlSessionSTDOUT
-X2goControlSession = eval(BACKEND_CONTROLSESSION_DEFAULT)
+X2GoControlSession = eval(BACKEND_CONTROLSESSION_DEFAULT)
diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py
index fdb80d4..0050147 100644
--- a/x2go/backends/control/_stdout.py
+++ b/x2go/backends/control/_stdout.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -18,7 +18,7 @@
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
"""\
-X2goControlSessionSTDOUT class - core functions for handling your individual X2Go sessions.
+X2GoControlSessionSTDOUT class - core functions for handling your individual X2Go sessions.
This backend handles X2Go server implementations that respond via server-side STDOUT.
@@ -48,10 +48,10 @@ import x2go.x2go_exceptions as x2go_exceptions
import x2go.defaults as defaults
import x2go.checkhosts as checkhosts
-from x2go.backends.terminal import X2goTerminalSession as _X2goTerminalSession
-from x2go.backends.info import X2goServerSessionInfo as _X2goServerSessionInfo
-from x2go.backends.info import X2goServerSessionList as _X2goServerSessionList
-from x2go.backends.proxy import X2goProxy as _X2goProxy
+from x2go.backends.terminal import X2GoTerminalSession as _X2GoTerminalSession
+from x2go.backends.info import X2GoServerSessionInfo as _X2GoServerSessionInfo
+from x2go.backends.info import X2GoServerSessionList as _X2GoServerSessionList
+from x2go.backends.proxy import X2GoProxy as _X2GoProxy
import x2go._paramiko
x2go._paramiko.monkey_patch_paramiko()
@@ -103,7 +103,7 @@ def _rewrite_password(cmd, user=None, password=None):
return cmd
-class X2goControlSessionSTDOUT(paramiko.SSHClient):
+class X2GoControlSessionSTDOUT(paramiko.SSHClient):
"""\
In the Python X2Go concept, X2Go sessions fall into two parts: a control session and one to many terminal sessions.
@@ -118,22 +118,24 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
add_to_known_hosts=False,
known_hosts=None,
forward_sshagent=False,
- terminal_backend=_X2goTerminalSession,
- info_backend=_X2goServerSessionInfo,
- list_backend=_X2goServerSessionList,
- proxy_backend=_X2goProxy,
+ unique_hostkey_aliases=False,
+ terminal_backend=_X2GoTerminalSession,
+ info_backend=_X2GoServerSessionInfo,
+ list_backend=_X2GoServerSessionList,
+ proxy_backend=_X2GoProxy,
client_rootdir=os.path.join(defaults.LOCAL_HOME, defaults.X2GO_CLIENT_ROOTDIR),
sessions_rootdir=os.path.join(defaults.LOCAL_HOME, defaults.X2GO_SESSIONS_ROOTDIR),
ssh_rootdir=os.path.join(defaults.LOCAL_HOME, defaults.X2GO_SSH_ROOTDIR),
logger=None, loglevel=log.loglevel_DEFAULT,
published_applications_no_submenus=0,
+ low_latency=False,
**kwargs):
"""\
Initialize an X2Go control session. For each connected session profile there will be one SSH-based
control session and one to many terminal sessions that all server-client-communicate via this one common control
session.
- A control session normally gets set up by an L{X2goSession} instance. Do not use it directly!!!
+ A control session normally gets set up by an L{X2GoSession} instance. Do not use it directly!!!
@param profile_name: the profile name of the session profile this control session works for
@type profile_name: C{str}
@@ -143,14 +145,17 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
@type known_hosts: C{str}
@param forward_sshagent: forward SSH agent authentication requests to the X2Go client-side
@type forward_sshagent: C{bool}
+ @param unique_hostkey_aliases: instead of storing [<hostname>]:<port> in known_hosts file, use the
+ (unique-by-design) profile ID
+ @type unique_hostkey_aliases: C{bool}
@param terminal_backend: X2Go terminal session backend to use
@type terminal_backend: C{class}
@param info_backend: backend for handling storage of server session information
- @type info_backend: C{X2goServerSessionInfo*} instance
+ @type info_backend: C{X2GoServerSessionInfo*} instance
@param list_backend: backend for handling storage of session list information
- @type list_backend: C{X2goServerSessionList*} instance
+ @type list_backend: C{X2GoServerSessionList*} instance
@param proxy_backend: backend for handling the X-proxy connections
- @type proxy_backend: C{X2goProxy*} instance
+ @type proxy_backend: C{X2GoProxy*} instance
@param client_rootdir: client base dir (default: ~/.x2goclient)
@type client_rootdir: C{str}
@param sessions_rootdir: sessions base dir (default: ~/.x2go)
@@ -160,12 +165,14 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
@param published_applications_no_submenus: published applications menus with less items than C{published_applications_no_submenus}
are rendered without submenus
@type published_applications_no_submenus: C{int}
- @param logger: you can pass an L{X2goLogger} object to the
- L{X2goControlSessionSTDOUT} constructor
- @type logger: L{X2goLogger} instance
- @param loglevel: if no L{X2goLogger} object has been supplied a new one will be
+ @param logger: you can pass an L{X2GoLogger} object to the
+ L{X2GoControlSessionSTDOUT} constructor
+ @type logger: L{X2GoLogger} instance
+ @param loglevel: if no L{X2GoLogger} object has been supplied a new one will be
constructed with the given loglevel
@type loglevel: C{int}
+ @param low_latency: set this boolean switch for weak connections, it will double all timeout values.
+ @type low_latency: C{bool}
@param kwargs: catch any non-defined parameters in C{kwargs}
@type kwargs: C{dict}
@@ -177,6 +184,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
self.add_to_known_hosts = add_to_known_hosts
self.known_hosts = known_hosts
self.forward_sshagent = forward_sshagent
+ self.unique_hostkey_aliases = unique_hostkey_aliases
self.hostname = None
self.port = None
@@ -189,10 +197,11 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
self._remote_username = None
self._remote_peername = None
+ self._server_versions = None
self._server_features = None
if logger is None:
- self.logger = log.X2goLogger(loglevel=loglevel)
+ self.logger = log.X2GoLogger(loglevel=loglevel)
else:
self.logger = copy.deepcopy(logger)
self.logger.tag = __NAME__
@@ -217,6 +226,8 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
self.session_died = False
+ self.low_latency = low_latency
+
self.published_applications_no_submenus = published_applications_no_submenus
self._already_querying_published_applications = threading.Lock()
@@ -271,7 +282,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
@param remote_path: full remote path name of the server-side target location, path names have to be Unix-compliant
@type remote_path: C{str}
- @raise X2goControlSessionException: if the SSH connection dropped out
+ @raise X2GoControlSessionException: if the SSH connection dropped out
"""
ssh_transport = self.get_transport()
@@ -285,7 +296,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
# react to connection dropped error for SSH connections
self.session_died = True
self._transport_lock.release()
- raise x2go_exceptions.X2goControlSessionException('The SSH connection was dropped during an sFTP put action.')
+ raise x2go_exceptions.X2GoControlSessionException('The SSH connection was dropped during an sFTP put action.')
self.sftp_client = None
self._transport_lock.release()
@@ -300,7 +311,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
@param content: a text file, multi-line files use Unix-link EOL style
@type content: C{str}
- @raise X2goControlSessionException: if the SSH connection dropped out
+ @raise X2GoControlSessionException: if the SSH connection dropped out
"""
ssh_transport = self.get_transport()
@@ -317,7 +328,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
self.session_died = True
self._transport_lock.release()
self.logger('sFTP-write: opening remote file %s on host %s failed' % (remote_path, self.remote_peername()), loglevel=log.loglevel_WARN)
- raise x2go_exceptions.X2goControlSessionException('The SSH connection was dropped during an sFTP write action.')
+ raise x2go_exceptions.X2GoControlSessionException('The SSH connection was dropped during an sFTP write action.')
self.sftp_client = None
self._transport_lock.release()
@@ -330,7 +341,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
@param remote_path: full remote path name of the server-side file to be removed, path names have to be Unix-compliant
@type remote_path: C{str}
- @raise X2goControlSessionException: if the SSH connection dropped out
+ @raise X2GoControlSessionException: if the SSH connection dropped out
"""
ssh_transport = self.get_transport()
@@ -344,7 +355,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
self.session_died = True
self._transport_lock.release()
self.logger('sFTP-write: removing remote file %s on host %s failed' % (remote_path, self.remote_peername()), loglevel=log.loglevel_WARN)
- raise x2go_exceptions.X2goControlSessionException('The SSH connection was dropped during an sFTP remove action.')
+ raise x2go_exceptions.X2GoControlSessionException('The SSH connection was dropped during an sFTP remove action.')
self.sftp_client = None
self._transport_lock.release()
@@ -367,7 +378,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
@return: C{True} if the command could be successfully executed on the remote X2Go server
@rtype: C{bool}
- @raise X2goControlSessionException: if the command execution failed (due to a lost connection)
+ @raise X2GoControlSessionException: if the command execution failed (due to a lost connection)
"""
if type(cmd_line) == types.ListType:
@@ -388,6 +399,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
ssh_transport = self.get_transport()
if ssh_transport and ssh_transport.is_authenticated():
+ if self.low_latency: timeout = timeout * 2
timer = gevent.Timeout(timeout)
timer.start()
try:
@@ -398,54 +410,89 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
self._transport_lock.release()
if self.sshproxy_session:
self.sshproxy_session.stop_thread()
- raise x2go_exceptions.X2goControlSessionException('the X2Go control session has died unexpectedly')
+ raise x2go_exceptions.X2GoControlSessionException('the X2Go control session has died unexpectedly')
except EOFError:
self.session_died = True
self._transport_lock.release()
if self.sshproxy_session:
self.sshproxy_session.stop_thread()
- raise x2go_exceptions.X2goControlSessionException('the X2Go control session has died unexpectedly')
+ raise x2go_exceptions.X2GoControlSessionException('the X2Go control session has died unexpectedly')
except x2go_exceptions.SSHException:
self.session_died = True
self._transport_lock.release()
if self.sshproxy_session:
self.sshproxy_session.stop_thread()
- raise x2go_exceptions.X2goControlSessionException('the X2Go control session has died unexpectedly')
+ raise x2go_exceptions.X2GoControlSessionException('the X2Go control session has died unexpectedly')
except gevent.timeout.Timeout:
self.session_died = True
self._transport_lock.release()
if self.sshproxy_session:
self.sshproxy_session.stop_thread()
- raise x2go_exceptions.X2goControlSessionException('the X2Go control session command timed out')
+ raise x2go_exceptions.X2GoControlSessionException('the X2Go control session command timed out')
except socket.error:
self.session_died = True
self._transport_lock.release()
if self.sshproxy_session:
self.sshproxy_session.stop_thread()
- raise x2go_exceptions.X2goControlSessionException('the X2Go control session has died unexpectedly')
+ raise x2go_exceptions.X2GoControlSessionException('the X2Go control session has died unexpectedly')
finally:
timer.cancel()
else:
self._transport_lock.release()
- raise x2go_exceptions.X2goControlSessionException('the X2Go control session is not connected')
+ raise x2go_exceptions.X2GoControlSessionException('the X2Go control session is not connected')
self._transport_lock.release()
return _retval
@property
+ def _x2go_server_versions(self):
+ """\
+ Render a dictionary of server-side X2Go components and their versions. Results get cached
+ once there has been one successful query.
+
+ """
+ if self._server_versions is None:
+ self._server_versions = {}
+ (stdin, stdout, stderr) = self._x2go_exec_command('which x2goversion >/dev/null && x2goversion')
+ _lines = stdout.read().split('\n')
+ for _line in _lines:
+ if ':' not in _line: continue
+ comp = _line.split(':')[0].strip()
+ version = _line.split(':')[1].strip()
+ self._server_versions.update({comp: version})
+ self.logger('server-side X2Go components and their versions are: %s' % self._server_versions, loglevel=log.loglevel_DEBUG)
+ return self._server_versions
+
+ def query_server_versions(self, force=False):
+ """\
+ Do a query for the server-side list of X2Go components and their versions.
+
+ @param force: do not use the cached component list, really ask the server (again)
+ @type force: C{bool}
+
+ @return: dictionary of X2Go components (as keys) and their versions (as values)
+ @rtype: C{list}
+
+ """
+ if force:
+ self._server_versions = None
+ return self._x2go_server_versions
+ get_server_versions = query_server_versions
+
+ @property
def _x2go_server_features(self):
"""\
- Render a list of server-side X2Go features. Results get cached once there has been one successfull query.
+ Render a list of server-side X2Go features. Results get cached once there has been one successful query.
"""
if self._server_features is None:
(stdin, stdout, stderr) = self._x2go_exec_command('which x2gofeaturelist >/dev/null && x2gofeaturelist')
self._server_features = stdout.read().split('\n')
+ self._server_features = [ f for f in self._server_features if f ]
+ self._server_features.sort()
self.logger('server-side X2Go features are: %s' % self._server_features, loglevel=log.loglevel_DEBUG)
- return self._server_features
- else:
- return self._server_features
+ return self._server_features
def query_server_features(self, force=False):
"""\
@@ -538,7 +585,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
@return: SSH transport's user name
@rtype: C{str}
- @raise X2goControlSessionException: on SSH connection loss
+ @raise X2GoControlSessionException: on SSH connection loss
"""
if self._remote_username is None:
@@ -547,7 +594,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
self._remote_username = self.get_transport().get_username()
except:
self.session_died = True
- raise x2go_exceptions.X2goControlSessionException('Lost connection to X2Go server')
+ raise x2go_exceptions.X2GoControlSessionException('Lost connection to X2Go server')
return self._remote_username
def remote_peername(self):
@@ -557,7 +604,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
@return: SSH transport's peer name
@rtype: C{tuple}
- @raise X2goControlSessionException: on SSH connection loss
+ @raise X2GoControlSessionException: on SSH connection loss
"""
if self._remote_peername is None:
@@ -566,7 +613,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
self._remote_peername = self.get_transport().getpeername()
except:
self.session_died = True
- raise x2go_exceptions.X2goControlSessionException('Lost connection to X2Go server')
+ raise x2go_exceptions.X2GoControlSessionException('Lost connection to X2Go server')
return self._remote_peername
@property
@@ -617,6 +664,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
sshproxy_key_filename='', sshproxy_pkey=None, sshproxy_look_for_keys=False, sshproxy_allow_agent=False,
sshproxy_tunnel='',
forward_sshagent=None,
+ unique_hostkey_aliases=None,
session_instance=None,
add_to_known_hosts=False, force_password_auth=False):
"""\
@@ -660,6 +708,8 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
@param forward_sshagent: forward SSH agent authentication requests to the X2Go client-side
(will update the class property of the same name)
@type forward_sshagent: C{bool}
+ @param unique_hostkey_aliases: update the unique_hostkey_aliases class property
+ @type unique_hostkey_aliases: C{bool}
@param timeout: an optional timeout (in seconds) for the TCP connect
@type timeout: float
@param look_for_keys: set to C{True} to enable searching for discoverable
@@ -675,7 +725,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
@param force_password_auth: non-paramiko option, disable pub/priv key authentication
completely, even if the C{pkey} or the C{key_filename} parameter is given
@type force_password_auth: C{bool}
- @param session_instance: an instance L{X2goSession} using this L{X2goControlSessionSTDOUT}
+ @param session_instance: an instance L{X2GoSession} using this L{X2GoControlSessionSTDOUT}
instance.
@type session_instance: C{obj}
@param use_sshproxy: connect through an SSH proxy
@@ -713,14 +763,26 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
@raise SSHException: if there was any other error connecting or
establishing an SSH session
@raise socket.error: if a socket error occurred while connecting
- @raise X2goSSHProxyException: any SSH proxy exception is passed through while establishing the SSH proxy connection and tunneling setup
- @raise X2goSSHAuthenticationException: any SSH proxy authentication exception is passed through while establishing the SSH proxy connection and tunneling setup
- @raise X2goRemoteHomeException: if the remote home directory does not exist or is not accessible
+ @raise X2GoSSHProxyException: any SSH proxy exception is passed through while establishing the SSH proxy connection and tunneling setup
+ @raise X2GoSSHAuthenticationException: any SSH proxy authentication exception is passed through while establishing the SSH proxy connection and tunneling setup
+ @raise X2GoRemoteHomeException: if the remote home directory does not exist or is not accessible
"""
+ _fake_hostname = None
+
+ if unique_hostkey_aliases is not None:
+ self.unique_hostkey_aliases = unique_hostkey_aliases
+ # prep the fake hostname with the real hostname, so we trigger the corresponding code path in
+ # x2go.checkhosts and either of its missing host key policies
+ if self.unique_hostkey_aliases:
+ _fake_hostname = "[%s]:%s" % (hostname, port)
+
if use_sshproxy and sshproxy_host and sshproxy_user:
try:
- self.sshproxy_session = sshproxy.X2goSSHProxy(known_hosts=self.known_hosts,
+
+ if not sshproxy_tunnel:
+ sshproxy_tunnel = "localhost:44444:%s:%s" % (hostname, port)
+ self.sshproxy_session = sshproxy.X2GoSSHProxy(known_hosts=self.known_hosts,
sshproxy_host=sshproxy_host,
sshproxy_port=sshproxy_port,
sshproxy_user=sshproxy_user,
@@ -734,6 +796,11 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
session_instance=session_instance,
logger=self.logger,
)
+ hostname = self.sshproxy_session.get_local_proxy_host()
+ port = self.sshproxy_session.get_local_proxy_port()
+ _fake_hostname = self.sshproxy_session.get_remote_host()
+ _fake_port = self.sshproxy_session.get_remote_port()
+ _fake_hostname = "[%s]:%s" % (_fake_hostname, _fake_port)
except:
if self.sshproxy_session:
@@ -750,10 +817,10 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
port = self.sshproxy_session.get_local_proxy_port()
if not add_to_known_hosts and session_instance:
- self.set_missing_host_key_policy(checkhosts.X2goInteractiveAddPolicy(caller=self, session_instance=session_instance))
+ self.set_missing_host_key_policy(checkhosts.X2GoInteractiveAddPolicy(caller=self, session_instance=session_instance, fake_hostname=_fake_hostname))
if add_to_known_hosts:
- self.set_missing_host_key_policy(paramiko.AutoAddPolicy())
+ self.set_missing_host_key_policy(checkhosts.X2GoAutoAddPolicy(caller=self, session_instance=session_instance, fake_hostname=_fake_hostname))
# disable pub/priv key authentication if forced
if force_password_auth:
@@ -776,6 +843,9 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
if forward_sshagent is not None:
self.forward_sshagent = forward_sshagent
+ if timeout and self.low_latency:
+ timeout = timeout * 2
+
if key_filename or pkey or look_for_keys or allow_agent or (password and force_password_auth):
try:
if password and force_password_auth:
@@ -861,7 +931,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
ssh_transport = self.get_transport()
ssh_transport.reverse_tunnels = {}
- # mark Paramiko/SSH transport as X2goControlSession
+ # mark Paramiko/SSH transport as X2GoControlSession
ssh_transport._x2go_session_marker = True
self._session_password = password
@@ -885,7 +955,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
self.close()
if self.sshproxy_session:
self.sshproxy_session.stop_thread()
- raise x2go_exceptions.X2goRemoteHomeException('remote home directory does not exist')
+ raise x2go_exceptions.X2GoRemoteHomeException('remote home directory does not exist')
return (self.get_transport() is not None)
@@ -894,7 +964,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
Drop an associated terminal session.
@param terminal_session: the terminal session object to remove from the list of associated terminals
- @type terminal_session: C{X2goTerminalSession*}
+ @type terminal_session: C{X2GoTerminalSession*}
"""
for t_name in self.associated_terminals.keys():
@@ -917,9 +987,9 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
try:
if not self.session_died:
t_obj.suspend()
- except x2go_exceptions.X2goTerminalSessionException:
+ except x2go_exceptions.X2GoTerminalSessionException:
pass
- except x2go_exceptions.X2goControlSessionException:
+ except x2go_exceptions.X2GoControlSessionException:
self.session_died
t_obj.__del__()
for t_name in t_names:
@@ -987,7 +1057,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
try:
if self._x2go_exec_command('echo', loglevel=log.loglevel_DEBUG):
return True
- except x2go_exceptions.X2goControlSessionException:
+ except x2go_exceptions.X2GoControlSessionException:
self.session_died = True
self.disconnect()
return False
@@ -1202,8 +1272,8 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
"""\
Start a new X2Go session.
- The L{X2goControlSessionSTDOUT.start()} method accepts any parameter
- that can be passed to any of the C{X2goTerminalSession} backend class
+ The L{X2GoControlSessionSTDOUT.start()} method accepts any parameter
+ that can be passed to any of the C{X2GoTerminalSession} backend class
constructors.
@param kwargs: parameters that get passed through to the control session's
@@ -1224,26 +1294,25 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
"""\
Resume a running/suspended X2Go session.
- The L{X2goControlSessionSTDOUT.resume()} method accepts any parameter
- that can be passed to any of the C{X2goTerminalSession*} backend class constructors.
+ The L{X2GoControlSessionSTDOUT.resume()} method accepts any parameter
+ that can be passed to any of the C{X2GoTerminalSession*} backend class constructors.
@return: True if the session could be successfully resumed
@rtype: C{bool}
- @raise X2goUserException: if the remote user is not allowed to launch/resume X2Go sessions.
+ @raise X2GoUserException: if the remote user is not allowed to launch/resume X2Go sessions.
"""
if not self.is_x2gouser(self.get_transport().get_username()):
- raise x2go_exceptions.X2goUserException('remote user %s is not allowed to run X2Go commands' % self.get_transport().get_username())
+ raise x2go_exceptions.X2GoUserException('remote user %s is not allowed to run X2Go commands' % self.get_transport().get_username())
+ session_info = None
try:
if session_name is not None:
if session_list:
session_info = session_list[session_name]
else:
session_info = self.list_sessions()[session_name]
- else:
- session_info = None
except KeyError:
_success = False
@@ -1264,7 +1333,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
_success = _terminal.resume()
else:
_success = _terminal.start()
- except x2go_exceptions.X2goTerminalSessionException:
+ except x2go_exceptions.X2GoTerminalSessionException:
_success = False
if _success:
@@ -1301,7 +1370,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
@return: True if the session could be successfully shared
@rtype: C{bool}
- @raise X2goDesktopSharingException: if C{username} and C{dislpay} do not relate to a
+ @raise X2GoDesktopSharingException: if C{username} and C{dislpay} do not relate to a
sharable desktop session
"""
@@ -1309,7 +1378,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
user = desktop.split('@')[0]
display = desktop.split('@')[1]
if not (user and display):
- raise x2go_exceptions.X2goDesktopSharingException('Need user name and display number of sharable desktop.')
+ raise x2go_exceptions.X2GoDesktopSharingException('Need user name and display number of shared desktop.')
cmd = '%sXSHAD%sXSHAD%s' % (share_mode, user, display)
@@ -1330,7 +1399,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
@return: a list of X2Go desktops available for sharing
@rtype: C{list}
- @raise X2goTimeOutException: on command execution timeouts, with the server-side C{x2golistdesktops}
+ @raise X2GoTimeOutException: on command execution timeouts, with the server-side C{x2golistdesktops}
command this can sometimes happen. Make sure you ignore these time-outs and to try again
"""
@@ -1343,6 +1412,9 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
# this _success loop will catch errors in case the x2golistsessions output is corrupt
# this should not be needed and is a workaround for the current X2Go server implementation
+ if self.low_latency:
+ maxwait = maxwait * 2
+
timeout = gevent.Timeout(maxwait)
timeout.start()
try:
@@ -1353,7 +1425,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
# if we do not get a reply here after <maxwait> seconds we will raise a time out, we have to
# make sure that we catch this at places where we want to ignore timeouts (e.g. in the
# desktop list cache)
- raise x2go_exceptions.X2goTimeOutException('x2golistdesktop command timed out')
+ raise x2go_exceptions.X2GoTimeOutException('x2golistdesktop command timed out')
finally:
timeout.cancel()
@@ -1374,7 +1446,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
@return: a list of client-side mounts for X2Go session C{<session_name>} on the server
@rtype: C{list}
- @raise X2goTimeOutException: on command execution timeouts, queries with the server-side
+ @raise X2GoTimeOutException: on command execution timeouts, queries with the server-side
C{x2golistmounts} query should normally be processed quickly, a time-out may hint that the
control session has lost its connection to the X2Go server
@@ -1385,6 +1457,9 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
else:
+ if self.low_latency:
+ maxwait = maxwait * 2
+
# this _success loop will catch errors in case the x2golistmounts output is corrupt
timeout = gevent.Timeout(maxwait)
@@ -1396,7 +1471,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
except gevent.timeout.Timeout:
# if we do not get a reply here after <maxwait> seconds we will raise a time out, we have to
# make sure that we catch this at places where we want to ignore timeouts
- raise x2go_exceptions.X2goTimeOutException('x2golistmounts command timed out')
+ raise x2go_exceptions.X2GoTimeOutException('x2golistmounts command timed out')
finally:
timeout.cancel()
@@ -1410,16 +1485,19 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
C{x2golistsessions} is returned.
@type raw: C{bool}
- @return: normally an instance of a C{X2goServerSessionList*} backend is returned. However,
+ @return: normally an instance of a C{X2GoServerSessionList*} backend is returned. However,
if the raw argument is set, the plain text output of the server-side C{x2golistsessions}
command is returned
- @rtype: C{X2goServerSessionList} instance or str
+ @rtype: C{X2GoServerSessionList} instance or str
- @raise X2goControlSessionException: on command execution timeouts, if this happens the control session will
+ @raise X2GoControlSessionException: on command execution timeouts, if this happens the control session will
be interpreted as disconnected due to connection loss
"""
if raw:
- (stdin, stdout, stderr) = self._x2go_exec_command("export HOSTNAME && x2golistsessions")
+ if 'X2GO_LIST_SHADOWSESSIONS' in self._x2go_server_features:
+ (stdin, stdout, stderr) = self._x2go_exec_command("export HOSTNAME && { x2golistsessions; x2golistshadowsessions; }")
+ else:
+ (stdin, stdout, stderr) = self._x2go_exec_command("export HOSTNAME && x2golistsessions")
return stdout.read(), stderr.read()
else:
@@ -1436,7 +1514,10 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
while not _success and _count < _maxwait:
_count += 1
try:
- (stdin, stdout, stderr) = self._x2go_exec_command("export HOSTNAME && x2golistsessions")
+ if 'X2GO_LIST_SHADOWSESSIONS' in self._x2go_server_features:
+ (stdin, stdout, stderr) = self._x2go_exec_command("export HOSTNAME && { x2golistsessions; x2golistshadowsessions; }")
+ else:
+ (stdin, stdout, stderr) = self._x2go_exec_command("export HOSTNAME && x2golistsessions")
_stdout_read = stdout.read()
_listsessions = self._list_backend(_stdout_read, info_backend=self._info_backend).sessions
_success = True
@@ -1450,7 +1531,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
if _count >= _maxwait:
self.session_died = True
self.disconnect()
- raise x2go_exceptions.X2goControlSessionException('x2golistsessions command failed after we have tried 20 times')
+ raise x2go_exceptions.X2GoControlSessionException('x2golistsessions command failed after we have tried 20 times')
# update internal variables when list_sessions() is called
for _session_name, _terminal in self.associated_terminals.items():
diff --git a/x2go/backends/info/__init__.py b/x2go/backends/info/__init__.py
index 4183215..6cf39f7 100644
--- a/x2go/backends/info/__init__.py
+++ b/x2go/backends/info/__init__.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -20,8 +20,8 @@
from x2go.defaults import BACKEND_SERVERSESSIONINFO_DEFAULT
from x2go.defaults import BACKEND_SERVERSESSIONLIST_DEFAULT
-from _stdout import X2goServerSessionInfoSTDOUT
-from _stdout import X2goServerSessionListSTDOUT
+from _stdout import X2GoServerSessionInfoSTDOUT
+from _stdout import X2GoServerSessionListSTDOUT
-X2goServerSessionInfo = eval(BACKEND_SERVERSESSIONINFO_DEFAULT)
-X2goServerSessionList = eval(BACKEND_SERVERSESSIONLIST_DEFAULT)
+X2GoServerSessionInfo = eval(BACKEND_SERVERSESSIONINFO_DEFAULT)
+X2GoServerSessionList = eval(BACKEND_SERVERSESSIONLIST_DEFAULT)
diff --git a/x2go/backends/info/_stdout.py b/x2go/backends/info/_stdout.py
index 7182a95..2273eb3 100644
--- a/x2go/backends/info/_stdout.py
+++ b/x2go/backends/info/_stdout.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -18,7 +18,7 @@
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
"""\
-X2goServerSessionList and X2goServerSessionInfo classes - data handling for
+X2GoServerSessionList and X2GoServerSessionInfo classes - data handling for
X2Go server sessions.
This backend handles X2Go server implementations that respond with session infos
@@ -34,17 +34,17 @@ import re
import x2go.defaults as defaults
-class X2goServerSessionInfoSTDOUT(object):
+class X2GoServerSessionInfoSTDOUT(object):
"""\
- L{X2goServerSessionInfo} is used to store all information
+ L{X2GoServerSessionInfo} is used to store all information
that is retrieved from the connected X2Go server on
- C{X2goTerminalSessionBACKEND.start()} resp. C{X2goTerminalSessionBACKEND.resume()}.
+ C{X2GoTerminalSessionBACKEND.start()} resp. C{X2GoTerminalSessionBACKEND.resume()}.
"""
def __str__(self):
return self.name
def __repr__(self):
- result = 'X2goServerSessionInfoSTDOUT('
+ result = 'X2GoServerSessionInfoSTDOUT('
for p in dir(self):
if '__' in p or not p in self.__dict__ or type(p) is types.InstanceType: continue
result += p + '=' + str(self.__dict__[p]) +','
@@ -52,7 +52,7 @@ class X2goServerSessionInfoSTDOUT(object):
def _parse_x2golistsessions_line(self, x2go_output):
"""\
- Parse a single line of X2go's listsessions output.
+ Parse a single line of X2Go's listsessions output.
@param x2go_output: output from ,,x2golistsessions'' command (as list of strings/lines)
@type x2go_output: C{list}
@@ -90,7 +90,7 @@ class X2goServerSessionInfoSTDOUT(object):
@rtype: C{bool}
"""
- return re.match('.*_stRPUBLISHED_.*', self.name)
+ return bool(re.match('.*_stRPUBLISHED_.*', self.name))
def is_running(self):
"""\
@@ -102,6 +102,34 @@ class X2goServerSessionInfoSTDOUT(object):
"""
return self.status == 'R'
+ def get_session_type(self):
+ """\
+ Get the session type (i.e. 'D', 'R', 'S' or 'P').
+
+ @return: session type
+ @rtype: C{str}
+ """
+ cmd = self.name.split('_')[1]
+ session_type = cmd[2]
+ if session_type == 'R' and self.is_published_applications_provider():
+ session_type = 'P'
+ return session_type
+
+ def get_share_mode(self):
+ """\
+ Get the share mode of a shadow session.
+
+ @return: share mode (0: view-only, 1: full access), C{None} when used for non-desktop-sharing sessions
+ @rtype: C{str}
+
+ """
+ share_mode = None
+ cmd = self.name.split('_')[1]
+ session_type = cmd[2]
+ if session_type == 'S':
+ share_mode = cmd[3]
+ return share_mode
+
def is_suspended(self):
"""\
Is this session suspended?
@@ -120,9 +148,7 @@ class X2goServerSessionInfoSTDOUT(object):
@rtype: C{bool}
"""
- _desktop_sessions = defaults.X2GO_DESKTOPSESSIONS.keys()
- _regexp_desktop_sessions = '(%s)' % "|".join(_desktop_sessions)
- return re.match('.*_stD%s_.*' % _regexp_desktop_sessions, self.name)
+ return self.get_session_type() == 'D'
def _parse_x2gostartagent_output(self, x2go_output):
"""\
@@ -214,7 +240,7 @@ class X2goServerSessionInfoSTDOUT(object):
def clear(self):
"""\
- Clear all properties of a L{X2goServerSessionInfo} object.
+ Clear all properties of a L{X2GoServerSessionInfo} object.
"""
self.name = ''
@@ -235,10 +261,10 @@ class X2goServerSessionInfoSTDOUT(object):
def update(self, session_info):
"""\
- Update all properties of a L{X2goServerSessionInfo} object.
+ Update all properties of a L{X2GoServerSessionInfo} object.
@param session_info: a provided session info data structure
- @type session_info: C{X2goServerSessionInfo*}
+ @type session_info: C{X2GoServerSessionInfo*}
"""
if type(session_info) == type(self):
@@ -253,35 +279,43 @@ class X2goServerSessionInfoSTDOUT(object):
""" Class constructor, identical to L{clear()} method. """
-class X2goServerSessionListSTDOUT(object):
+class X2GoServerSessionListSTDOUT(object):
"""\
- L{X2goServerSessionListSTDOUT} is used to store all information
+ L{X2GoServerSessionListSTDOUT} is used to store all information
that is retrieved from a connected X2Go server on a
- C{X2goControlSessionBACKEND.list_sessions()} call.
+ C{X2GoControlSessionBACKEND.list_sessions()} call.
"""
- def __init__(self, x2go_output, info_backend=X2goServerSessionInfoSTDOUT):
+ def __init__(self, x2go_output=None, info_backend=X2GoServerSessionInfoSTDOUT):
"""\
@param x2go_output: X2Go server's C{x2golistsessions} command output, each
session separated by a newline character. Session values are separated
by Unix Pipe Symbols ('|')
@type x2go_output: str
@param info_backend: the session info backend to use
- @type info_backend: C{X2goServerSessionInfo*}
+ @type info_backend: C{X2GoServerSessionInfo*}
"""
self.sessions = {}
- lines = x2go_output.split("\n")
- for line in lines:
- if not line:
- continue
- s_info = info_backend()
- s_info._parse_x2golistsessions_line(line)
- self.sessions[s_info.name] = s_info
+ if x2go_output is not None:
+ lines = x2go_output.split("\n")
+ for line in lines:
+ if not line:
+ continue
+ s_info = info_backend()
+ s_info._parse_x2golistsessions_line(line)
+ self.sessions[s_info.name] = s_info
def __call__(self):
return self.sessions
+ def set_sessions(self, sessions):
+ """\
+ Set the sessions property directly by parsing a complete data structure.
+
+ """
+ self.sessions = sessions
+
def get_session_info(self, session_name):
"""\
Retrieve the session information for C{<session_name>}.
@@ -290,10 +324,34 @@ class X2goServerSessionListSTDOUT(object):
@type session_name: C{str}
@return: the session info of C{<session_name>}
- @rtype: C{X2goServerSessionInfo*} or C{None}
+ @rtype: C{X2GoServerSessionInfo*} or C{None}
"""
try:
return self.sessions[session_name]
except KeyError:
return None
+
+ def get_session_with(self, property_name, value, hostname=None):
+ """\
+ Find session with a given display number on a given host.
+
+ @param property_name: match a session based on this property name
+ @type property_name: C{str}
+ @param value: the resulting session has to match this value for C{<property_name>}
+ @type value: C{str}
+ @param hostname: the result has to match this hostname
+ @type hostname: C{str}
+
+ """
+ if property_name == 'display':
+ value = value.lstrip(':')
+ if '.' in value: value = value.split('.')[0]
+
+ for session in self.sessions.values():
+ try:
+ if str(getattr(session, property_name)) == str(value):
+ if hostname is None or session.hostname == hostname:
+ return session
+ except AttributeError:
+ pass
diff --git a/x2go/backends/printing/__init__.py b/x2go/backends/printing/__init__.py
index 94cbd97..0fda59e 100644
--- a/x2go/backends/printing/__init__.py
+++ b/x2go/backends/printing/__init__.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -19,9 +19,9 @@
from x2go.defaults import BACKEND_CLIENTPRINTING_DEFAULT
-from _file import X2goClientPrintingFILE
-from _winreg import X2goClientPrintingWINREG
-from _gconf import X2goClientPrintingGCONF
+from _file import X2GoClientPrintingFILE
+from _winreg import X2GoClientPrintingWINREG
+from _gconf import X2GoClientPrintingGCONF
-X2goClientPrinting = eval(BACKEND_CLIENTPRINTING_DEFAULT)
+X2GoClientPrinting = eval(BACKEND_CLIENTPRINTING_DEFAULT)
diff --git a/x2go/backends/printing/_file.py b/x2go/backends/printing/_file.py
index ba136da..3f606f0 100644
--- a/x2go/backends/printing/_file.py
+++ b/x2go/backends/printing/_file.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -18,9 +18,9 @@
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
"""\
-L{X2goClientPrintingFILE} class is one of Python X2go's public API classes.
+L{X2GoClientPrintingFILE} class is one of Python X2Go's public API classes.
-Retrieve an instance of this class from your L{X2goClient} instance.
+Retrieve an instance of this class from your L{X2GoClient} instance.
Use this class in your Python X2Go based applications to access the ÂģprintingÂĢ
configuration of your X2Go client application.
@@ -41,15 +41,15 @@ import x2go.x2go_exceptions as x2go_exceptions
_print_property_map = {
'pdfview_cmd': {
- 'ini_section': 'view',
+ 'ini_section': 'view',
'ini_option': 'command',
},
'save_to_folder': {
- 'ini_section': 'save',
+ 'ini_section': 'save',
'ini_option': 'folder',
},
'printer': {
- 'ini_section': 'CUPS',
+ 'ini_section': 'CUPS',
'ini_option': 'defaultprinter',
},
'print_cmd': {
@@ -58,13 +58,13 @@ _print_property_map = {
},
}
-class X2goClientPrintingFILE(inifiles.X2goIniFile):
+class X2GoClientPrintingFILE(inifiles.X2GoIniFile):
"""\
- L{X2goClientPrintingFILE} provides access to the X2Go ini-like file
+ L{X2GoClientPrintingFILE} provides access to the X2Go ini-like file
ÂģprintingÂĢ as stored in C{~/.x2goclient/printing} resp. globally
C{/etc/x2goclient/printing}.
- An instance of L{X2goClientPrintingFILE} is created on each incoming
+ An instance of L{X2GoClientPrintingFILE} is created on each incoming
print job. This facilitates that on every print job the print action
for this job is derived from the ÂģprintingÂĢ configuration file.
@@ -81,18 +81,18 @@ class X2goClientPrintingFILE(inifiles.X2goIniFile):
directory filename)
@type config_files: C{list}
@param defaults: a cascaded Python dicitionary structure with ini file defaults (to override
- Python X2go's hard coded defaults in L{defaults}
+ Python X2Go's hard coded defaults in L{defaults}
@type defaults: C{dict}
- @param logger: you can pass an L{X2goLogger} object to the
- L{X2goPrintAction} constructor
+ @param logger: you can pass an L{X2GoLogger} object to the
+ L{X2GoPrintAction} constructor
@type logger: C{obj}
- @param loglevel: if no L{X2goLogger} object has been supplied a new one will be
+ @param loglevel: if no L{X2GoLogger} object has been supplied a new one will be
constructed with the given loglevel
@type loglevel: C{int}
"""
self.client_instance = client_instance
- inifiles.X2goIniFile.__init__(self, config_files, defaults=defaults, logger=logger, loglevel=loglevel)
+ inifiles.X2GoIniFile.__init__(self, config_files, defaults=defaults, logger=logger, loglevel=loglevel)
self._detect_print_action()
@@ -108,23 +108,23 @@ class X2goClientPrintingFILE(inifiles.X2goIniFile):
_show_dialog = self.get('General', 'showdialog', key_type=types.BooleanType)
if _show_dialog and self.client_instance is not None:
- self._print_action = printactions.X2goPrintActionDIALOG(client_instance=self.client_instance, logger=self.logger)
+ self._print_action = printactions.X2GoPrintActionDIALOG(client_instance=self.client_instance, logger=self.logger)
elif _general_pdfview and _view_open:
_view_command = self.get('view', 'command')
- self._print_action = printactions.X2goPrintActionPDFVIEW(client_instance=self.client_instance, pdfview_cmd=_view_command, logger=self.logger)
+ self._print_action = printactions.X2GoPrintActionPDFVIEW(client_instance=self.client_instance, pdfview_cmd=_view_command, logger=self.logger)
elif _general_pdfview and not _view_open:
_safe_folder = self.get('save', 'folder')
- self._print_action = printactions.X2goPrintActionPDFSAVE(client_instance=self.client_instance, save_to_folder=_safe_folder, logger=self.logger)
+ self._print_action = printactions.X2GoPrintActionPDFSAVE(client_instance=self.client_instance, save_to_folder=_safe_folder, logger=self.logger)
elif not _general_pdfview and not _print_startcmd:
_cups_defaultprinter = self.get('CUPS', 'defaultprinter')
- self._print_action = printactions.X2goPrintActionPRINT(client_instance=self.client_instance, printer=_cups_defaultprinter, logger=self.logger)
+ self._print_action = printactions.X2GoPrintActionPRINT(client_instance=self.client_instance, printer=_cups_defaultprinter, logger=self.logger)
elif not _general_pdfview and _print_startcmd:
_print_command = self.get('print', 'command')
- self._print_action = printactions.X2goPrintActionPRINTCMD(client_instance=self.client_instance, print_cmd=_print_command, logger=self.logger)
+ self._print_action = printactions.X2GoPrintActionPRINTCMD(client_instance=self.client_instance, print_cmd=_print_command, logger=self.logger)
@property
def print_action(self):
@@ -173,7 +173,7 @@ class X2goClientPrintingFILE(inifiles.X2goIniFile):
@return: the stored value for C{<print_property>}
@rtype: C{str}
- @raise X2goClientPrintingException: if the printing property does not exist
+ @raise X2GoClientPrintingException: if the printing property does not exist
"""
if print_property in _print_property_map.keys():
@@ -181,7 +181,7 @@ class X2goClientPrintingFILE(inifiles.X2goIniFile):
_ini_option = _print_property_map[print_property]['ini_option']
return self.get_value(_ini_section, _ini_option)
else:
- raise x2go_exceptions.X2goClientPrintingException('No such X2Go client printing property ,,%s\'\'' % print_property)
+ raise x2go_exceptions.X2GoClientPrintingException('No such X2Go client printing property ,,%s\'\'' % print_property)
def set_property(self, print_property, value):
"""\
@@ -192,7 +192,7 @@ class X2goClientPrintingFILE(inifiles.X2goIniFile):
@param value: the value to be stored as C{<print_property>}
@rtype: C{str}
- @raise X2goClientPrintingException: if the printing property does not exist or if there is a type mismatch
+ @raise X2GoClientPrintingException: if the printing property does not exist or if there is a type mismatch
"""
if print_property in _print_property_map.keys():
@@ -202,10 +202,10 @@ class X2goClientPrintingFILE(inifiles.X2goIniFile):
if type(value) is types.UnicodeType:
value = value.encode('utf-8')
if _default_type != type(value):
- raise x2go_exceptions.X2goClientPrintingException('Type mismatch error for property ,,%s\'\' - is: %s, should be: %s' % (print_property, str(type(value)), str(_default_type)))
+ raise x2go_exceptions.X2GoClientPrintingException('Type mismatch error for property ,,%s\'\' - is: %s, should be: %s' % (print_property, str(type(value)), str(_default_type)))
self.update_value(_ini_section, _ini_option, value)
else:
- raise x2go_exceptions.X2goClientPrintingException('No such X2Go client printing property ,,%s\'\'' % print_property)
+ raise x2go_exceptions.X2GoClientPrintingException('No such X2Go client printing property ,,%s\'\'' % print_property)
def store_print_action(self, print_action, **print_properties):
"""\
diff --git a/x2go/backends/printing/_gconf.py b/x2go/backends/printing/_gconf.py
index 11bc718..84f3a2b 100644
--- a/x2go/backends/printing/_gconf.py
+++ b/x2go/backends/printing/_gconf.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -18,9 +18,9 @@
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
"""\
-L{X2goClientPrintingGCONF} class is one of Python X2go's public API classes.
+L{X2GoClientPrintingGCONF} class is one of Python X2Go's public API classes.
-Retrieve an instance of this class from your L{X2goClient} instance.
+Retrieve an instance of this class from your L{X2GoClient} instance.
Use this class in your Python X2Go based applications to access the ÂģprintingÂĢ
configuration of your X2Go client application.
@@ -36,14 +36,14 @@ from x2go.defaults import X2GO_CLIENTPRINTING_DEFAULTS as _X2GO_CLIENTPRINTING_D
from x2go.defaults import X2GO_PRINTING_CONFIGFILES as _X2GO_PRINTING_CONFIGFILES
import x2go.inifiles as inifiles
-from x2go.x2go_exceptions import X2goNotImplementedYetException
+from x2go.x2go_exceptions import X2GoNotImplementedYetException
-class X2goClientPrintingGCONF(inifiles.X2goIniFile):
+class X2GoClientPrintingGCONF(inifiles.X2GoIniFile):
"""\
- L{X2goClientPrintingGCONF} provides access to the GCONF based configuration
+ L{X2GoClientPrintingGCONF} provides access to the GCONF based configuration
of the X2Go client printing setup.
- An instance of L{X2goClientPrintingGCONF} is created on each incoming
+ An instance of L{X2GoClientPrintingGCONF} is created on each incoming
print job. This facilitates that on every print job the print action
for this job is derived from the ÂģprintingÂĢ configuration file.
@@ -56,16 +56,16 @@ class X2goClientPrintingGCONF(inifiles.X2goIniFile):
def __init__(self, defaults=None, logger=None, loglevel=log.loglevel_DEFAULT):
"""\
@param defaults: a cascaded Python dicitionary structure with ini file defaults (to override
- Python X2go's hard coded defaults in L{defaults}
+ Python X2Go's hard coded defaults in L{defaults}
@type defaults: C{dict}
- @param logger: you can pass an L{X2goLogger} object to the
- L{X2goPrintAction} constructor
+ @param logger: you can pass an L{X2GoLogger} object to the
+ L{X2GoPrintAction} constructor
@type logger: C{obj}
- @param loglevel: if no L{X2goLogger} object has been supplied a new one will be
+ @param loglevel: if no L{X2GoLogger} object has been supplied a new one will be
constructed with the given loglevel
@type loglevel: C{int}
"""
- raise X2goNotImplementedYetException('GCONF backend support is not implemented yet')
+ raise X2GoNotImplementedYetException('GCONF backend support is not implemented yet')
diff --git a/x2go/backends/printing/_winreg.py b/x2go/backends/printing/_winreg.py
index 839be52..b5e65e7 100644
--- a/x2go/backends/printing/_winreg.py
+++ b/x2go/backends/printing/_winreg.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -18,9 +18,9 @@
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
"""\
-L{X2goClientPrintingWINREG} class is one of Python X2go's public API classes.
+L{X2GoClientPrintingWINREG} class is one of Python X2Go's public API classes.
-Retrieve an instance of this class from your L{X2goClient} instance.
+Retrieve an instance of this class from your L{X2GoClient} instance.
Use this class in your Python X2Go based applications to access the ÂģprintingÂĢ
configuration of your X2Go client application.
@@ -36,14 +36,14 @@ from x2go.defaults import X2GO_CLIENTPRINTING_DEFAULTS as _X2GO_CLIENTPRINTING_D
from x2go.defaults import X2GO_PRINTING_CONFIGFILES as _X2GO_PRINTING_CONFIGFILES
import x2go.inifiles as inifiles
-from x2go.x2go_exceptions import X2goNotImplementedYetException
+from x2go.x2go_exceptions import X2GoNotImplementedYetException
-class X2goClientPrintingWINREG(inifiles.X2goIniFile):
+class X2GoClientPrintingWINREG(inifiles.X2GoIniFile):
"""\
- L{X2goClientPrintingWINREG} provides access to the Windows registry based configuration
+ L{X2GoClientPrintingWINREG} provides access to the Windows registry based configuration
of the X2Go client printing setup.
- An instance of L{X2goClientPrintingWINREG} is created on each incoming
+ An instance of L{X2GoClientPrintingWINREG} is created on each incoming
print job. This facilitates that on every print job the print action
for this job is derived from the ÂģprintingÂĢ configuration file.
@@ -56,14 +56,14 @@ class X2goClientPrintingWINREG(inifiles.X2goIniFile):
def __init__(self, defaults=None, logger=None, loglevel=log.loglevel_DEFAULT):
"""\
@param defaults: a cascaded Python dicitionary structure with ini file defaults (to override
- Python X2go's hard coded defaults in L{defaults}
+ Python X2Go's hard coded defaults in L{defaults}
@type defaults: C{dict}
- @param logger: you can pass an L{X2goLogger} object to the
- L{X2goPrintAction} constructor
+ @param logger: you can pass an L{X2GoLogger} object to the
+ L{X2GoPrintAction} constructor
@type logger: C{obj}
- @param loglevel: if no L{X2goLogger} object has been supplied a new one will be
+ @param loglevel: if no L{X2GoLogger} object has been supplied a new one will be
constructed with the given loglevel
@type loglevel: C{int}
"""
- raise X2goNotImplementedYetException('WINREG backend support is not implemented yet')
+ raise X2GoNotImplementedYetException('WINREG backend support is not implemented yet')
diff --git a/x2go/backends/profiles/__init__.py b/x2go/backends/profiles/__init__.py
index 796245b..9766fc5 100644
--- a/x2go/backends/profiles/__init__.py
+++ b/x2go/backends/profiles/__init__.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -19,10 +19,10 @@
from x2go.defaults import BACKEND_SESSIONPROFILES_DEFAULT
-from _file import X2goSessionProfilesFILE
-from _winreg import X2goSessionProfilesWINREG
-from _httpsbroker import X2goSessionProfilesHTTPSBROKER
-from _gconf import X2goSessionProfilesGCONF
+from _file import X2GoSessionProfilesFILE
+from _winreg import X2GoSessionProfilesWINREG
+from _httpsbroker import X2GoSessionProfilesHTTPSBROKER
+from _gconf import X2GoSessionProfilesGCONF
-X2goSessionProfiles = eval(BACKEND_SESSIONPROFILES_DEFAULT)
+X2GoSessionProfiles = eval(BACKEND_SESSIONPROFILES_DEFAULT)
diff --git a/x2go/backends/profiles/_file.py b/x2go/backends/profiles/_file.py
index eb21f61..64b5f15 100644
--- a/x2go/backends/profiles/_file.py
+++ b/x2go/backends/profiles/_file.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -18,9 +18,9 @@
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
"""\
-L{X2goSessionProfiles} class - managing x2goclient session profiles.
+L{X2GoSessionProfiles} class - managing x2goclient session profiles.
-L{X2goSessionProfiles} is a public API class. Use this class in your Python X2Go based
+L{X2GoSessionProfiles} is a public API class. Use this class in your Python X2Go based
applications.
"""
@@ -37,10 +37,10 @@ from x2go.defaults import X2GO_DESKTOPSESSIONS as _X2GO_DESKTOPSESSIONS
import x2go.inifiles as inifiles
import x2go.log as log
import x2go.utils as utils
-from x2go.x2go_exceptions import X2goProfileException
+from x2go.x2go_exceptions import X2GoProfileException
-class X2goSessionProfilesFILE(inifiles.X2goIniFile):
+class X2GoSessionProfilesFILE(inifiles.X2GoIniFile):
defaultSessionProfile = _X2GO_SESSIONPROFILE_DEFAULTS
_non_profile_sections = ('embedded')
@@ -55,10 +55,10 @@ class X2goSessionProfilesFILE(inifiles.X2goIniFile):
@type defaults: C{dict}
@param session_profile_defaults: a default session profile
@type session_profile_defaults: C{dict}
- @param logger: you can pass an L{X2goLogger} object to the
- L{X2goSessionProfilesFILE} constructor
- @type logger: L{X2goLogger} instance
- @param loglevel: if no L{X2goLogger} object has been supplied a new one will be
+ @param logger: you can pass an L{X2GoLogger} object to the
+ L{X2GoSessionProfilesFILE} constructor
+ @type logger: L{X2GoLogger} instance
+ @param loglevel: if no L{X2GoLogger} object has been supplied a new one will be
constructed with the given loglevel
@type loglevel: C{int}
@@ -67,16 +67,17 @@ class X2goSessionProfilesFILE(inifiles.X2goIniFile):
self._profile_metatypes = {}
self._cached_profile_ids = []
self._cached_profile_names = []
+ self._profiles_need_profile_id_renewal = []
if logger is None:
- self.logger = log.X2goLogger(loglevel=loglevel)
+ self.logger = log.X2GoLogger(loglevel=loglevel)
else:
self.logger = copy.deepcopy(logger)
self.logger.tag = __NAME__
- # providing defaults for an X2goSessionProfiles instance will---in the worst case---override your
+ # providing defaults for an X2GoSessionProfiles instance will---in the worst case---override your
# existing sessions file in your home directory once you write the sessions back to file...
- inifiles.X2goIniFile.__init__(self, config_files, defaults=defaults, logger=logger, loglevel=loglevel)
+ inifiles.X2GoIniFile.__init__(self, config_files, defaults=defaults, logger=logger, loglevel=loglevel)
if utils._checkSessionProfileDefaults(session_profile_defaults):
self.defaultSessionProfile = session_profile_defaults
@@ -115,7 +116,6 @@ class X2goSessionProfilesFILE(inifiles.X2goIniFile):
@rtype: C{str}
"""
-
_profile_id = self.check_profile_id_or_name(profile_id_or_name)
if not self._profile_metatypes.has_key(_profile_id) or force:
_config = self.get_profile_config(_profile_id)
@@ -146,6 +146,22 @@ class X2goSessionProfilesFILE(inifiles.X2goIniFile):
else:
return self._profile_metatypes[_profile_id]
+ def write(self):
+
+ # then update profile IDs for profiles that have a renamed host attribute...
+ for profile_id in self._profiles_need_profile_id_renewal:
+ _config = self.get_profile_config(profile_id=profile_id)
+ self.iniConfig.remove_section(profile_id)
+ try: self._cached_profile_ids.remove(profile_id)
+ except ValueError: pass
+ self.add_profile(profile_id=None, **_config)
+ self._cached_profile_names = []
+ self._profiles_need_profile_id_renewal = []
+
+ # at last write the profile config as is...
+ return inifiles.X2GoIniFile.write(self)
+
+
def get_profile_option_type(self, option):
"""\
Get the data type for a specific session profile option.
@@ -186,7 +202,7 @@ class X2goSessionProfilesFILE(inifiles.X2goIniFile):
@type profile_id_or_name: C{str}
@param parameter: if specified, only the value for the given parameter is returned
@type parameter: C{str}
- @param profile_id: profile ID (fast than specifying C{profile_id_or_name})
+ @param profile_id: profile ID (faster than specifying C{profile_id_or_name})
@type profile_id: C{str}
@return: the session profile configuration for the given profile ID (or name)
@@ -217,7 +233,7 @@ class X2goSessionProfilesFILE(inifiles.X2goIniFile):
return value
else:
- raise X2goProfileException('no such session profile parameter: %s' % parameter)
+ raise X2GoProfileException('no such session profile parameter: %s' % parameter)
return _profile_config
def default_profile_config(self):
@@ -244,7 +260,7 @@ class X2goSessionProfilesFILE(inifiles.X2goIniFile):
try:
self.check_profile_id_or_name(profile_id_or_name)
return True
- except X2goProfileException:
+ except X2GoProfileException:
return False
@property
@@ -310,7 +326,7 @@ class X2goSessionProfilesFILE(inifiles.X2goIniFile):
elif len(_profile_ids) == 0:
return None
else:
- raise X2goProfileException('The sessions config file contains multiple session profiles with name: %s' % profile_name)
+ raise X2GoProfileException('The sessions config file contains multiple session profiles with name: %s' % profile_name)
def to_profile_name(self, profile_id):
"""\
@@ -344,18 +360,13 @@ class X2goSessionProfilesFILE(inifiles.X2goIniFile):
"""
if profile_id is None:
profile_id = utils._genSessionProfileId()
+
for key, value in kwargs.items():
- if key in self.defaultSessionProfile:
- self.update_value(profile_id, key, value)
- else:
- raise X2goProfileException('keyword ,,%s\'\' not supported in X2Go session profile' % key)
+ self.update_value(None, key, value, profile_id=profile_id)
for key, value in self.defaultSessionProfile.items():
if key in kwargs: continue
- self.update_value(profile_id, key, value)
-
- self._cached_profile_ids = []
- self._cached_profile_names = []
+ self.update_value(None, key, value, profile_id=profile_id)
return profile_id
@@ -374,7 +385,7 @@ class X2goSessionProfilesFILE(inifiles.X2goIniFile):
self._cached_profile_ids = []
self._cached_profile_names = []
- def update_value(self, section, key, value):
+ def update_value(self, section, key, value, profile_id=None):
"""\
Update a value in a session profile.
@@ -387,21 +398,23 @@ class X2goSessionProfilesFILE(inifiles.X2goIniFile):
"""
try:
- profile_id = self.check_profile_id_or_name(section)
- except X2goProfileException:
+ profile_id = profile_id or self.check_profile_id_or_name(section)
+ except X2GoProfileException:
profile_id = section
+
+ inifiles.X2GoIniFile.update_value(self, profile_id, key, value)
+
if key == 'name':
profile_name = value
current_profile_name = self.get_value(profile_id, key)
if not profile_name:
- raise X2goProfileException('profile name for profile id %s may not be empty' % profile_id)
+ raise X2GoProfileException('profile name for profile id %s may not be empty' % profile_id)
else:
if profile_name != current_profile_name and profile_name in self.profile_names:
- raise X2goProfileException('a profile of name ,,%s'' already exists' % profile_name)
+ raise X2GoProfileException('a profile of name ,,%s\'\' already exists' % profile_name)
self._cached_profile_names = []
if key == 'export' and type(value) == types.DictType:
-
_strvalue = '"'
for folder in value.keys():
_strvalue += "%s:%s;" % (folder, int(value[folder]))
@@ -409,7 +422,10 @@ class X2goSessionProfilesFILE(inifiles.X2goIniFile):
_strvalue = _strvalue.replace('""', '')
value = _strvalue
- inifiles.X2goIniFile.update_value(self, profile_id, key, value)
+ if key == 'host':
+ _config = self.get_profile_config(profile_id=profile_id)
+ if _config.has_key('host') and _config['host'] != value:
+ self._profiles_need_profile_id_renewal.append(profile_id)
def check_profile_id_or_name(self, profile_id_or_name):
"""\
@@ -421,7 +437,7 @@ class X2goSessionProfilesFILE(inifiles.X2goIniFile):
@return: profile ID
@rtype: C{str}
- @raise X2goProfileException: if no such session profile exists
+ @raise X2GoProfileException: if no such session profile exists
"""
_profile_id = None
@@ -432,19 +448,19 @@ class X2goSessionProfilesFILE(inifiles.X2goIniFile):
# we were given a session profile id...
_profile_id = profile_id_or_name
else:
- raise X2goProfileException('No session profile with id or name ,,%s\'\' exists.' % profile_id_or_name)
+ raise X2GoProfileException('No session profile with id or name ,,%s\'\' exists.' % profile_id_or_name)
return _profile_id
def to_session_params(self, profile_id_or_name=None, profile_id=None):
"""\
- Convert session profile options to L{X2goSession} constructor method parameters.
+ Convert session profile options to L{X2GoSession} constructor method parameters.
@param profile_id_or_name: either profile ID or profile name is accepted
@type profile_id_or_name: C{str}
@param profile_id: profile ID (fast than specifying C{profile_id_or_name})
@type profile_id: C{str}
- @return: a dictionary of L{X2goSession} constructor method parameters
+ @return: a dictionary of L{X2GoSession} constructor method parameters
@rtype: C{dict}
"""
@@ -453,11 +469,11 @@ class X2goSessionProfilesFILE(inifiles.X2goIniFile):
def get_session_param(self, profile_id_or_name, param):
"""\
- Get a single L{X2goSession} parameter from a specific session profile.
+ Get a single L{X2GoSession} parameter from a specific session profile.
@param profile_id_or_name: either profile ID or profile name is accepted
@type profile_id_or_name: C{str}
- @param param: the parameter name in the L{X2goSession} constructor method
+ @param param: the parameter name in the L{X2GoSession} constructor method
@type param: C{str}
@return: the value of the session profile option represented by C{param}
diff --git a/x2go/backends/profiles/_gconf.py b/x2go/backends/profiles/_gconf.py
index 1926e44..645a213 100644
--- a/x2go/backends/profiles/_gconf.py
+++ b/x2go/backends/profiles/_gconf.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -18,9 +18,9 @@
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
"""\
-L{X2goSessionProfiles} class - managing x2goclient session profiles.
+L{X2GoSessionProfiles} class - managing x2goclient session profiles.
-L{X2goSessionProfiles} is a public API class. Use this class in your Python X2Go based
+L{X2GoSessionProfiles} is a public API class. Use this class in your Python X2Go based
applications.
"""
@@ -32,9 +32,9 @@ from x2go.defaults import X2GO_SESSIONPROFILE_DEFAULTS
import x2go.inifiles as inifiles
import x2go.log as log
-from x2go.x2go_exceptions import X2goNotImplementedYetException
+from x2go.x2go_exceptions import X2GoNotImplementedYetException
-class X2goSessionProfilesGCONF(inifiles.X2goIniFile):
+class X2GoSessionProfilesGCONF(inifiles.X2GoIniFile):
defaultSessionProfile = X2GO_SESSIONPROFILE_DEFAULTS
_non_profile_sections = ('embedded')
@@ -45,12 +45,12 @@ class X2goSessionProfilesGCONF(inifiles.X2goIniFile):
@param session_profile_defaults: a default session profile
@type session_profile_defaults: C{dict}
- @param logger: you can pass an L{X2goLogger} object to the
- L{X2goSessionProfilesGCONF} constructor
- @type logger: L{X2goLogger} instance
- @param loglevel: if no L{X2goLogger} object has been supplied a new one will be
+ @param logger: you can pass an L{X2GoLogger} object to the
+ L{X2GoSessionProfilesGCONF} constructor
+ @type logger: L{X2GoLogger} instance
+ @param loglevel: if no L{X2GoLogger} object has been supplied a new one will be
constructed with the given loglevel
@type loglevel: C{int}
"""
- raise X2goNotImplementedYetException('GCONF backend support is not implemented yet')
+ raise X2GoNotImplementedYetException('GCONF backend support is not implemented yet')
diff --git a/x2go/backends/profiles/_httpsbroker.py b/x2go/backends/profiles/_httpsbroker.py
index b56b237..852630d 100644
--- a/x2go/backends/profiles/_httpsbroker.py
+++ b/x2go/backends/profiles/_httpsbroker.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -18,9 +18,9 @@
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
"""\
-L{X2goSessionProfiles} class - managing x2goclient session profiles.
+L{X2GoSessionProfiles} class - managing x2goclient session profiles.
-L{X2goSessionProfiles} is a public API class. Use this class in your Python X2Go based
+L{X2GoSessionProfiles} is a public API class. Use this class in your Python X2Go based
applications.
"""
@@ -32,9 +32,9 @@ from x2go.defaults import X2GO_SESSIONPROFILE_DEFAULTS
import x2go.inifiles as inifiles
import x2go.log as log
-from x2go.x2go_exceptions import X2goNotImplementedYetException
+from x2go.x2go_exceptions import X2GoNotImplementedYetException
-class X2goSessionProfilesHTTPSBROKER(inifiles.X2goIniFile):
+class X2GoSessionProfilesHTTPSBROKER(inifiles.X2GoIniFile):
defaultSessionProfile = X2GO_SESSIONPROFILE_DEFAULTS
_non_profile_sections = ('embedded')
@@ -45,12 +45,12 @@ class X2goSessionProfilesHTTPSBROKER(inifiles.X2goIniFile):
@param session_profile_defaults: a default session profile
@type session_profile_defaults: C{dict}
- @param logger: you can pass an L{X2goLogger} object to the
- L{X2goSessionProfilesHTTPSBROKER} constructor
- @type logger: L{X2goLogger} instance
- @param loglevel: if no L{X2goLogger} object has been supplied a new one will be
+ @param logger: you can pass an L{X2GoLogger} object to the
+ L{X2GoSessionProfilesHTTPSBROKER} constructor
+ @type logger: L{X2GoLogger} instance
+ @param loglevel: if no L{X2GoLogger} object has been supplied a new one will be
constructed with the given loglevel
@type loglevel: C{int}
"""
- raise X2goNotImplementedYetException('HTTPSBROKER backend support is not implemented yet')
+ raise X2GoNotImplementedYetException('HTTPSBROKER backend support is not implemented yet')
diff --git a/x2go/backends/profiles/_winreg.py b/x2go/backends/profiles/_winreg.py
index 7fb1319..07f8e95 100644
--- a/x2go/backends/profiles/_winreg.py
+++ b/x2go/backends/profiles/_winreg.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -18,9 +18,9 @@
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
"""\
-L{X2goSessionProfiles} class - managing x2goclient session profiles.
+L{X2GoSessionProfiles} class - managing x2goclient session profiles.
-L{X2goSessionProfiles} is a public API class. Use this class in your Python X2Go based
+L{X2GoSessionProfiles} is a public API class. Use this class in your Python X2Go based
applications.
"""
@@ -32,9 +32,9 @@ from x2go.defaults import X2GO_SESSIONPROFILE_DEFAULTS
import x2go.inifiles as inifiles
import x2go.log as log
-from x2go.x2go_exceptions import X2goNotImplementedYetException
+from x2go.x2go_exceptions import X2GoNotImplementedYetException
-class X2goSessionProfilesWINREG(inifiles.X2goIniFile):
+class X2GoSessionProfilesWINREG(inifiles.X2GoIniFile):
defaultSessionProfile = X2GO_SESSIONPROFILE_DEFAULTS
_non_profile_sections = ('embedded')
@@ -45,13 +45,13 @@ class X2goSessionProfilesWINREG(inifiles.X2goIniFile):
@param session_profile_defaults: a default session profile
@type session_profile_defaults: C{dict}
- @param logger: you can pass an L{X2goLogger} object to the
- L{X2goSessionProfilesWINREG} constructor
- @type logger: L{X2goLogger} instance
- @param loglevel: if no L{X2goLogger} object has been supplied a new one will be
+ @param logger: you can pass an L{X2GoLogger} object to the
+ L{X2GoSessionProfilesWINREG} constructor
+ @type logger: L{X2GoLogger} instance
+ @param loglevel: if no L{X2GoLogger} object has been supplied a new one will be
constructed with the given loglevel
@type loglevel: C{int}
"""
- raise X2goNotImplementedYetException('WINREG backend support is not implemented yet')
+ raise X2GoNotImplementedYetException('WINREG backend support is not implemented yet')
diff --git a/x2go/backends/proxy/__init__.py b/x2go/backends/proxy/__init__.py
index 4b15847..83d6aff 100644
--- a/x2go/backends/proxy/__init__.py
+++ b/x2go/backends/proxy/__init__.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -19,6 +19,6 @@
from x2go.defaults import BACKEND_PROXY_DEFAULT
-from _nx3 import X2goProxyNX3
+from _nx3 import X2GoProxyNX3
-X2goProxy = eval(BACKEND_PROXY_DEFAULT)
+X2GoProxy = eval(BACKEND_PROXY_DEFAULT)
diff --git a/x2go/backends/proxy/_nx3.py b/x2go/backends/proxy/_nx3.py
index 22ba3ef..3fb1c7c 100644
--- a/x2go/backends/proxy/_nx3.py
+++ b/x2go/backends/proxy/_nx3.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -18,7 +18,7 @@
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
"""\
-X2goProxy classes - proxying your connection through NX3 and others.
+X2GoProxy classes - proxying your connection through NX3 and others.
"""
__NAME__ = 'x2goproxynx3-pylib'
@@ -32,20 +32,20 @@ import base
from x2go.defaults import X2GOCLIENT_OS as _X2GOCLIENT_OS
-class X2goProxyNX3(base.X2goProxyBASE):
+class X2GoProxyNX3(base.X2GoProxyBASE):
"""\
- X2goNX3Proxy is a NX version 3 based X2Go proxy connection class.
+ X2GoNX3Proxy is a NX version 3 based X2Go proxy connection class.
- It basically fills L{X2goProxyBASE} variables with sensible content. Its
+ It basically fills L{X2GoProxyBASE} variables with sensible content. Its
methods mostly wrap around the corresponding methods of the parent class.
"""
def __init__(self, *args, **kwargs):
"""\
- For available parameters refer to L{X2goProxyBASE} class documentation.
+ For available parameters refer to L{X2GoProxyBASE} class documentation.
"""
- base.X2goProxyBASE.__init__(self, *args, **kwargs)
+ base.X2GoProxyBASE.__init__(self, *args, **kwargs)
# setting some default environment variables, nxproxy paths etc.
if _X2GOCLIENT_OS == "Windows":
@@ -76,7 +76,7 @@ class X2goProxyNX3(base.X2goProxyBASE):
"connect=127.0.0.1",
"clipboard=1",
"cookie=%s" % self.session_info.cookie,
- "port=%d" % self.session_info.graphics_port,
+ "port=%s" % self.session_info.graphics_port,
"errors=%s" % os.path.join(".", "..", "S-%s" % self.session_info.name, self.session_log, ),
]
else:
@@ -87,7 +87,7 @@ class X2goProxyNX3(base.X2goProxyBASE):
"connect=127.0.0.1",
"clipboard=1",
"cookie=%s" % self.session_info.cookie,
- "port=%d" % self.session_info.graphics_port,
+ "port=%s" % self.session_info.graphics_port,
"errors=%s" % os.path.join(self.session_info.local_container, self.session_log, ),
]
@@ -136,7 +136,7 @@ class X2goProxyNX3(base.X2goProxyBASE):
self.logger('NX3 Proxy mode is server, cookie=%s, host=127.0.0.1, port=%s.' % (self.session_info.cookie, self.session_info.graphics_port,), loglevel=log.loglevel_DEBUG)
self.logger('NX3 proxy writes session log to %s.' % os.path.join(self.session_info.local_container, 'session.log'), loglevel=log.loglevel_DEBUG)
- p, p_ok = base.X2goProxyBASE.start_proxy(self)
+ p, p_ok = base.X2GoProxyBASE.start_proxy(self)
if self.ok():
self.logger('NX3 proxy is up and running.', loglevel=log.loglevel_INFO)
diff --git a/x2go/backends/proxy/base.py b/x2go/backends/proxy/base.py
index 38e80da..3e9d11e 100644
--- a/x2go/backends/proxy/base.py
+++ b/x2go/backends/proxy/base.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -18,7 +18,7 @@
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
"""\
-X2goProxyBASE class - proxying your connection through NX3 and others.
+X2GoProxyBASE class - proxying your connection through NX3 and others.
"""
__NAME__ = 'x2goproxy-pylib'
@@ -47,12 +47,12 @@ from x2go.defaults import LOCAL_HOME as _LOCAL_HOME
from x2go.defaults import X2GO_SESSIONS_ROOTDIR as _X2GO_SESSIONS_ROOTDIR
-class X2goProxyBASE(threading.Thread):
+class X2GoProxyBASE(threading.Thread):
"""\
- X2goProxy is an abstract class for X2Go proxy connections.
+ X2GoProxy is an abstract class for X2Go proxy connections.
This class needs to be inherited from a concrete proxy class. Only
- currently available proxy class is: L{X2goProxyNX3}.
+ currently available proxy class is: L{X2GoProxyNX3}.
"""
PROXY_CMD = ''
@@ -75,30 +75,30 @@ class X2goProxyBASE(threading.Thread):
session_instance=None,
logger=None, loglevel=log.loglevel_DEFAULT, ):
"""\
- @param session_info: session information provided as an C{X2goServerSessionInfo*} backend
+ @param session_info: session information provided as an C{X2GoServerSessionInfo*} backend
instance
- @type session_info: C{X2goServerSessionInfo*} instance
+ @type session_info: C{X2GoServerSessionInfo*} instance
@param ssh_transport: SSH transport object from C{paramiko.SSHClient}
@type ssh_transport: C{paramiko.Transport} instance
@param session_log: name of the proxy's session logfile
@type session_log: C{str}
@param sessions_rootdir: base dir where X2Go session files are stored (by default: ~/.x2go)
@type sessions_rootdir: C{str}
- @param proxy_options: a set of very C{X2goProxy*} backend specific options; any option that is not known
- to the C{X2goProxy*} backend will simply be ignored
+ @param proxy_options: a set of very C{X2GoProxy*} backend specific options; any option that is not known
+ to the C{X2GoProxy*} backend will simply be ignored
@type proxy_options: C{dict}
- @param logger: you can pass an L{X2goLogger} object to the
- L{X2goProxy} constructor
- @param session_instance: the L{X2goSession} instance this C{X2goProxy*} instance belongs to
- @type session_instance: L{X2goSession} instance
- @type logger: L{X2goLogger} instance
- @param loglevel: if no L{X2goLogger} object has been supplied a new one will be
+ @param logger: you can pass an L{X2GoLogger} object to the
+ L{X2GoProxy} constructor
+ @param session_instance: the L{X2GoSession} instance this C{X2GoProxy*} instance belongs to
+ @type session_instance: L{X2GoSession} instance
+ @type logger: L{X2GoLogger} instance
+ @param loglevel: if no L{X2GoLogger} object has been supplied a new one will be
constructed with the given loglevel
@type loglevel: int
"""
if logger is None:
- self.logger = log.X2goLogger(loglevel=loglevel)
+ self.logger = log.X2GoLogger(loglevel=loglevel)
else:
self.logger = copy.deepcopy(logger)
self.logger.tag = __NAME__
@@ -180,7 +180,7 @@ class X2goProxyBASE(threading.Thread):
if self.ssh_transport.getpeername() in ('::1', '127.0.0.1', 'localhost', 'localhost.localdomain'):
local_graphics_port += 10000
except socket.error:
- raise x2go_exceptions.X2goControlSessionException('The control session has died unexpectedly.')
+ raise x2go_exceptions.X2GoControlSessionException('The control session has died unexpectedly.')
local_graphics_port = utils.detect_unused_port(preferred_port=local_graphics_port)
self.fw_tunnel = forward.start_forward_tunnel(local_port=local_graphics_port,
@@ -244,7 +244,7 @@ class X2goProxyBASE(threading.Thread):
1. remove processed proxy_options from self.proxy_options
2. once you have finished processing the proxy_options call
- the parent class method X2goProxyBASE.process_proxy_options()
+ the parent class method X2GoProxyBASE.process_proxy_options()
"""
# do the logging of remaining options
diff --git a/x2go/backends/settings/__init__.py b/x2go/backends/settings/__init__.py
index a1cb355..a08b32a 100644
--- a/x2go/backends/settings/__init__.py
+++ b/x2go/backends/settings/__init__.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -19,9 +19,9 @@
from x2go.defaults import BACKEND_CLIENTSETTINGS_DEFAULT
-from _file import X2goClientSettingsFILE
-from _gconf import X2goClientSettingsGCONF
-from _winreg import X2goClientSettingsWINREG
+from _file import X2GoClientSettingsFILE
+from _gconf import X2GoClientSettingsGCONF
+from _winreg import X2GoClientSettingsWINREG
-X2goClientSettings = eval(BACKEND_CLIENTSETTINGS_DEFAULT)
+X2GoClientSettings = eval(BACKEND_CLIENTSETTINGS_DEFAULT)
diff --git a/x2go/backends/settings/_file.py b/x2go/backends/settings/_file.py
index 14b5c56..a31cb2a 100644
--- a/x2go/backends/settings/_file.py
+++ b/x2go/backends/settings/_file.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -18,10 +18,10 @@
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
"""\
-X2goClientSettings class - managing x2goclient settings file (incl. LDAP-Support).
+X2GoClientSettings class - managing x2goclient settings file (incl. LDAP-Support).
-The L{X2goClientSettings} class one of Python X2go's a public API classes.
-Use this class (indirectly by retrieving it from an L{X2goClient} instance)
+The L{X2GoClientSettings} class one of Python X2Go's a public API classes.
+Use this class (indirectly by retrieving it from an L{X2GoClient} instance)
in your Python X2Go based applications to access the
ÂģsettingsÂĢ configuration file of your X2Go client application.
@@ -35,20 +35,20 @@ from x2go.defaults import X2GO_CLIENTSETTINGS_DEFAULTS as _X2GO_CLIENTSETTINGS_D
import x2go.inifiles as inifiles
-class X2goClientSettingsFILE(inifiles.X2goIniFile):
+class X2GoClientSettingsFILE(inifiles.X2GoIniFile):
"""\
- Configuration file based settings for L{X2goClient} instances.
+ Configuration file based settings for L{X2GoClient} instances.
"""
defaultValues = _X2GO_CLIENTSETTINGS_DEFAULTS
def __init__(self, config_files=_X2GO_SETTINGS_CONFIGFILES, defaults=None, logger=None, loglevel=log.loglevel_DEFAULT):
"""\
- Constructs an L{X2goClientSettingsFILE} instance. This is normally done from within an L{X2goClient} instance.
- You can retrieve this L{X2goClientSettingsFILE} instance with the L{X2goClient.get_client_settings()}
+ Constructs an L{X2GoClientSettingsFILE} instance. This is normally done from within an L{X2GoClient} instance.
+ You can retrieve this L{X2GoClientSettingsFILE} instance with the L{X2GoClient.get_client_settings()}
method.
- On construction the L{X2goClientSettingsFILE} object is filled with values from the configuration files::
+ On construction the L{X2GoClientSettingsFILE} object is filled with values from the configuration files::
/etc/x2goclient/settings
~/.x2goclient/settings
@@ -58,4 +58,4 @@ class X2goClientSettingsFILE(inifiles.X2goIniFile):
C{/etc/x2goclient/settings}.
"""
- inifiles.X2goIniFile.__init__(self, config_files, defaults=defaults, logger=logger, loglevel=loglevel)
+ inifiles.X2GoIniFile.__init__(self, config_files, defaults=defaults, logger=logger, loglevel=loglevel)
diff --git a/x2go/backends/settings/_gconf.py b/x2go/backends/settings/_gconf.py
index a20bcbb..3d2f349 100644
--- a/x2go/backends/settings/_gconf.py
+++ b/x2go/backends/settings/_gconf.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -18,10 +18,10 @@
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
"""\
-X2goClientSettings class - managing x2goclient settings file (incl. LDAP-Support).
+X2GoClientSettings class - managing x2goclient settings file (incl. LDAP-Support).
-The L{X2goClientSettings} class one of Python X2go's a public API classes.
-Use this class (indirectly by retrieving it from an L{X2goClient} instance)
+The L{X2GoClientSettings} class one of Python X2Go's a public API classes.
+Use this class (indirectly by retrieving it from an L{X2GoClient} instance)
in your Python X2Go based applications to access the
ÂģsettingsÂĢ configuration file of your X2Go client application.
@@ -34,25 +34,25 @@ from x2go.defaults import X2GO_SETTINGS_CONFIGFILES as _X2GO_SETTINGS_CONFIGFILE
from x2go.defaults import X2GO_CLIENTSETTINGS_DEFAULTS as _X2GO_CLIENTSETTINGS_DEFAULTS
import x2go.inifiles as inifiles
-from x2go.x2go_exceptions import X2goNotImplementedYetException
+from x2go.x2go_exceptions import X2GoNotImplementedYetException
-class X2goClientSettingsGCONF(inifiles.X2goIniFile):
+class X2GoClientSettingsGCONF(inifiles.X2GoIniFile):
"""\
- Configure settings for L{X2goClient} instances with the GConf daemon.
+ Configure settings for L{X2GoClient} instances with the GConf daemon.
"""
defaultValues = _X2GO_CLIENTSETTINGS_DEFAULTS
def __init__(self, config_files=_X2GO_SETTINGS_CONFIGFILES, defaults=None, logger=None, loglevel=log.loglevel_DEFAULT):
"""\
- Constructs an L{X2goClientSettingsGCONF} instance. This is normally done from within an L{X2goClient} instance.
- You can retrieve this L{X2goClientSettingsGCONF} instance with the L{X2goClient.get_client_settings()}
+ Constructs an L{X2GoClientSettingsGCONF} instance. This is normally done from within an L{X2GoClient} instance.
+ You can retrieve this L{X2GoClientSettingsGCONF} instance with the L{X2GoClient.get_client_settings()}
method.
- On construction the L{X2goClientSettingsGCONF} object is filled with values as found in GConf::
+ On construction the L{X2GoClientSettingsGCONF} object is filled with values as found in GConf::
<GConf paths, FIXME: give proper locations here>
"""
- raise X2goNotImplementedYetException('GCONF backend support is not implemented yet')
+ raise X2GoNotImplementedYetException('GCONF backend support is not implemented yet')
diff --git a/x2go/backends/settings/_winreg.py b/x2go/backends/settings/_winreg.py
index c5f6f31..50ffc40 100644
--- a/x2go/backends/settings/_winreg.py
+++ b/x2go/backends/settings/_winreg.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -18,10 +18,10 @@
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
"""\
-X2goClientSettings class - managing x2goclient settings file (incl. LDAP-Support).
+X2GoClientSettings class - managing x2goclient settings file (incl. LDAP-Support).
-The L{X2goClientSettings} class one of Python X2go's a public API classes.
-Use this class (indirectly by retrieving it from an L{X2goClient} instance)
+The L{X2GoClientSettings} class one of Python X2Go's a public API classes.
+Use this class (indirectly by retrieving it from an L{X2GoClient} instance)
in your Python X2Go based applications to access the
ÂģsettingsÂĢ configuration file of your X2Go client application.
@@ -34,25 +34,25 @@ from x2go.defaults import X2GO_SETTINGS_CONFIGFILES as _X2GO_SETTINGS_CONFIGFILE
from x2go.defaults import X2GO_CLIENTSETTINGS_DEFAULTS as _X2GO_CLIENTSETTINGS_DEFAULTS
import x2go.inifiles as inifiles
-from x2go.x2go_exceptions import X2goNotImplementedYetException
+from x2go.x2go_exceptions import X2GoNotImplementedYetException
-class X2goClientSettingsWINREG(inifiles.X2goIniFile):
+class X2GoClientSettingsWINREG(inifiles.X2GoIniFile):
"""\
- Windows registry based settings for L{X2goClient} instances.
+ Windows registry based settings for L{X2GoClient} instances.
"""
defaultValues = _X2GO_CLIENTSETTINGS_DEFAULTS
def __init__(self, config_files=_X2GO_SETTINGS_CONFIGFILES, defaults=None, logger=None, loglevel=log.loglevel_DEFAULT):
"""\
- Constructs an L{X2goClientSettingsWINREG} instance. This is normally done from within an L{X2goClient} instance.
- You can retrieve this L{X2goClientSettingsWINREG} instance with the L{X2goClient.get_client_settings()}
+ Constructs an L{X2GoClientSettingsWINREG} instance. This is normally done from within an L{X2GoClient} instance.
+ You can retrieve this L{X2GoClientSettingsWINREG} instance with the L{X2GoClient.get_client_settings()}
method.
- On construction the L{X2goClientSettings} object is filled with values from the Windows registry::
+ On construction the L{X2GoClientSettings} object is filled with values from the Windows registry::
<HKLM path, FIXME: give proper locations here>
<HKCU path, FIXME: give proper locations here>
"""
- raise X2goNotImplementedYetException('WINREG backend support is not implemented yet')
+ raise X2GoNotImplementedYetException('WINREG backend support is not implemented yet')
diff --git a/x2go/backends/terminal/__init__.py b/x2go/backends/terminal/__init__.py
index 315441e..c168066 100644
--- a/x2go/backends/terminal/__init__.py
+++ b/x2go/backends/terminal/__init__.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -19,6 +19,6 @@
from x2go.defaults import BACKEND_TERMINALSESSION_DEFAULT
-from _stdout import X2goTerminalSessionSTDOUT
+from _stdout import X2GoTerminalSessionSTDOUT
-X2goTerminalSession = eval(BACKEND_TERMINALSESSION_DEFAULT)
+X2GoTerminalSession = eval(BACKEND_TERMINALSESSION_DEFAULT)
diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py
index 6f474c0..aeead53 100644
--- a/x2go/backends/terminal/_stdout.py
+++ b/x2go/backends/terminal/_stdout.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -18,7 +18,7 @@
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
"""\
-X2goTerminalSession class - core functions for handling your individual X2Go sessions.
+X2GoTerminalSession class - core functions for handling your individual X2Go sessions.
This backend handles X2Go server implementations that respond with session infos
via server-side STDOUT and use NX3 as graphical proxy.
@@ -54,10 +54,10 @@ from x2go.defaults import X2GO_SESSIONS_ROOTDIR as _X2GO_SESSIONS_ROOTDIR
from x2go.defaults import X2GO_GENERIC_APPLICATIONS as _X2GO_GENERIC_APPLICATIONS
from x2go.defaults import X2GO_DESKTOPSESSIONS as _X2GO_DESKTOPSESSIONS
-from x2go.backends.info import X2goServerSessionInfo as _X2goServerSessionInfo
-from x2go.backends.info import X2goServerSessionList as _X2goServerSessionList
-from x2go.backends.proxy import X2goProxy as _X2goProxy
-from x2go.backends.printing import X2goClientPrinting as _X2goClientPrinting
+from x2go.backends.info import X2GoServerSessionInfo as _X2GoServerSessionInfo
+from x2go.backends.info import X2GoServerSessionList as _X2GoServerSessionList
+from x2go.backends.proxy import X2GoProxy as _X2GoProxy
+from x2go.backends.printing import X2GoClientPrinting as _X2GoClientPrinting
_local_color_depth = utils.local_color_depth()
@@ -69,7 +69,7 @@ def _rewrite_cmd(cmd, params=None):
@param cmd: the current command for execution (as found in the session profile parameter C{cmd})
@type cmd: C{str}
@param params: an session paramter object
- @type params: L{X2goSessionParams}
+ @type params: L{X2GoSessionParams}
@return: the rewritten command for server-side execution
@rtype: C{str}
@@ -82,7 +82,7 @@ def _rewrite_cmd(cmd, params=None):
if cmd in _X2GO_DESKTOPSESSIONS.keys():
cmd = _X2GO_DESKTOPSESSIONS[cmd]
- if (cmd == 'RDP') and (type(params) == X2goSessionParams):
+ if (cmd == 'RDP') and (type(params) == X2GoSessionParams):
_depth = params.depth
if int(_depth) == 17:
_depth = 16
@@ -95,7 +95,7 @@ def _rewrite_cmd(cmd, params=None):
if cmd:
cmd = '"%s"' % cmd
- if ((type(params) == X2goSessionParams) and params.published_applications and cmd == ''):
+ if ((type(params) == X2GoSessionParams) and params.published_applications and cmd == ''):
cmd = 'PUBLISHED'
return cmd
@@ -118,10 +118,10 @@ def _rewrite_blanks(cmd):
return cmd
-class X2goSessionParams(object):
+class X2GoSessionParams(object):
"""\
- The L{X2goSessionParams} class is used to store all parameters that
- C{X2goTerminalSession} backend objects are constructed with.
+ The L{X2GoSessionParams} class is used to store all parameters that
+ C{X2GoTerminalSession} backend objects are constructed with.
"""
def rewrite_session_type(self):
@@ -169,12 +169,12 @@ class X2goSessionParams(object):
def update(self, **properties_to_be_updated):
"""\
- Update all properties in the object L{X2goSessionParams} object from
+ Update all properties in the object L{X2GoSessionParams} object from
the passed on dictionary.
- @param properties_to_be_updated: a dictionary with L{X2goSessionParams}
+ @param properties_to_be_updated: a dictionary with L{X2GoSessionParams}
property names as keys und their values to be update in
- L{X2goSessionParams} object.
+ L{X2GoSessionParams} object.
@type properties_to_be_updated: C{dict}
"""
@@ -183,25 +183,25 @@ class X2goSessionParams(object):
self.rewrite_session_type()
-class X2goTerminalSessionSTDOUT(object):
+class X2GoTerminalSessionSTDOUT(object):
"""\
Class for managing X2Go terminal sessions on a remote X2Go server via Paramiko/SSH.
- With the L{X2goTerminalSessionSTDOUT} class you can start new X2Go sessions, resume suspended
+ With the L{X2GoTerminalSessionSTDOUT} class you can start new X2Go sessions, resume suspended
sessions or suspend resp. terminate currently running sessions on a
connected X2Go server.
- An L{X2goTerminalSessionSTDOUT} object uses two main data structure classes:
+ An L{X2GoTerminalSessionSTDOUT} object uses two main data structure classes:
- - L{X2goSessionParams}: stores all parameters that have been passed to the
+ - L{X2GoSessionParams}: stores all parameters that have been passed to the
constructor method.
- - C{X2goServerSessionInfo*} backend class: when starting or resuming a session, an object of this class
+ - C{X2GoServerSessionInfo*} backend class: when starting or resuming a session, an object of this class
will be used to store all information retrieved from the X2Go server.
The terminal session instance works closely together (i.e. depends on) a connected control
- session instance (e.g. L{X2goControlSessionSTDOUT}). You never should use either of them as a standalone
- instance. Both, control session and terminal session(s) get managed/controlled via L{X2goSession} instances.
+ session instance (e.g. L{X2GoControlSessionSTDOUT}). You never should use either of them as a standalone
+ instance. Both, control session and terminal session(s) get managed/controlled via L{X2GoSession} instances.
"""
def __init__(self, control_session, session_info=None,
@@ -217,16 +217,16 @@ class X2goTerminalSessionSTDOUT(object):
rootdir=None,
profile_name='UNKNOWN', profile_id=utils._genSessionProfileId(),
print_action=None, print_action_args={},
- info_backend=_X2goServerSessionInfo,
- list_backend=_X2goServerSessionList,
- proxy_backend=_X2goProxy, proxy_options={},
- printing_backend=_X2goClientPrinting,
+ info_backend=_X2GoServerSessionInfo,
+ list_backend=_X2GoServerSessionList,
+ proxy_backend=_X2GoProxy, proxy_options={},
+ printing_backend=_X2GoClientPrinting,
client_rootdir=os.path.join(_LOCAL_HOME, _X2GO_CLIENT_ROOTDIR),
sessions_rootdir=os.path.join(_LOCAL_HOME, _X2GO_SESSIONS_ROOTDIR),
session_instance=None,
logger=None, loglevel=log.loglevel_DEFAULT):
"""\
- Initialize an X2Go session. With the L{X2goTerminalSessionSTDOUT} class you can start
+ Initialize an X2Go session. With the L{X2GoTerminalSessionSTDOUT} class you can start
new X2Go sessions, resume suspended sessions or suspend resp. terminate
currently running sessions on a connected X2Go server.
@@ -241,8 +241,8 @@ class X2goTerminalSessionSTDOUT(object):
@type pack: C{str}
@param dpi: dots-per-inch value for the session screen (has an impact on the font size on screen)
@type dpi: C{str}
- @param cache_type: a dummy parameter that is passed to the L{X2goProxyBASE}. In NX Proxy
- (class C{X2goProxyNX3}) this originally is the session name. With X2Go it
+ @param cache_type: a dummy parameter that is passed to the L{X2GoProxyBASE}. In NX Proxy
+ (class C{X2GoProxyNX3}) this originally is the session name. With X2Go it
defines the name of the NX cache directory. Best is to leave it untouched.
@type cache_type: C{str}
@param kbtype: keyboard type, e.g. C{pc105/us} (default), C{pc105/de}, ...
@@ -259,7 +259,7 @@ class X2goTerminalSessionSTDOUT(object):
@param snd_port: local sound port for network capable audio system
@type snd_port: C{int}
@param cmd: command to be run on X2Go server after session start (only used
- when L{X2goTerminalSessionSTDOUT.start()} is called, ignored on resume, suspend etc.
+ when L{X2GoTerminalSessionSTDOUT.start()} is called, ignored on resume, suspend etc.
@type cmd: C{str}
@param published_applications: session is published applications provider
@type published_applications: C{bool}
@@ -288,30 +288,30 @@ class X2goTerminalSessionSTDOUT(object):
@param profile_id: the session profile ID for this terminal session
@type profile_id: C{str}
@param print_action: either a print action short name (PDFVIEW, PDFSAVE, PRINT, PRINTCMD) or the
- resp. C{X2goPrintActionXXX} class (where XXX equals one of the given short names)
+ resp. C{X2GoPrintActionXXX} class (where XXX equals one of the given short names)
@type print_action: C{str} or C{class}
@param print_action_args: optional arguments for a given print_action (for further info refer to
- L{X2goPrintActionPDFVIEW}, L{X2goPrintActionPDFSAVE}, L{X2goPrintActionPRINT} and L{X2goPrintActionPRINTCMD})
+ L{X2GoPrintActionPDFVIEW}, L{X2GoPrintActionPDFSAVE}, L{X2GoPrintActionPRINT} and L{X2GoPrintActionPRINTCMD})
@type print_action_args: dict
@param info_backend: backend for handling storage of server session information
- @type info_backend: C{X2goServerSessionInfo*} instance
+ @type info_backend: C{X2GoServerSessionInfo*} instance
@param list_backend: backend for handling storage of session list information
- @type list_backend: C{X2goServerSessionList*} instance
+ @type list_backend: C{X2GoServerSessionList*} instance
@param proxy_backend: backend for handling the X-proxy connections
- @type proxy_backend: C{X2goProxy*} instance
- @param proxy_options: a set of very C{X2goProxy*} backend specific options; any option that is not known
- to the C{X2goProxy*} backend will simply be ignored
+ @type proxy_backend: C{X2GoProxy*} instance
+ @param proxy_options: a set of very C{X2GoProxy*} backend specific options; any option that is not known
+ to the C{X2GoProxy*} backend will simply be ignored
@type proxy_options: C{dict}
@param client_rootdir: client base dir (default: ~/.x2goclient)
@type client_rootdir: C{str}
@param sessions_rootdir: sessions base dir (default: ~/.x2go)
@type sessions_rootdir: C{str}
- @param session_instance: the L{X2goSession} instance that is parent to this terminal session
+ @param session_instance: the L{X2GoSession} instance that is parent to this terminal session
@type session_instance: C{obj}
- @param logger: you can pass an L{X2goLogger} object to the
- L{X2goTerminalSessionSTDOUT} constructor
- @type logger: L{X2goLogger} instance
- @param loglevel: if no L{X2goLogger} object has been supplied a new one will be
+ @param logger: you can pass an L{X2GoLogger} object to the
+ L{X2GoTerminalSessionSTDOUT} constructor
+ @type logger: L{X2GoLogger} instance
+ @param loglevel: if no L{X2GoLogger} object has been supplied a new one will be
constructed with the given loglevel
@type loglevel: C{int}
@@ -327,7 +327,7 @@ class X2goTerminalSessionSTDOUT(object):
self.mimebox_queue = None
if logger is None:
- self.logger = log.X2goLogger(loglevel=loglevel)
+ self.logger = log.X2GoLogger(loglevel=loglevel)
else:
self.logger = copy.deepcopy(logger)
self.logger.tag = __NAME__
@@ -338,7 +338,7 @@ class X2goTerminalSessionSTDOUT(object):
self.client_rootdir = client_rootdir
self.sessions_rootdir = sessions_rootdir
- self.params = X2goSessionParams()
+ self.params = X2GoSessionParams()
self.params.geometry = str(geometry)
self.params.link = str(link)
@@ -391,7 +391,7 @@ class X2goTerminalSessionSTDOUT(object):
if self.session_info.name:
self.session_info.local_container = os.path.join(self.params.rootdir, 'S-%s' % self.session_info.name)
else:
- raise x2go_exceptions.X2goTerminalSessionException('no valid session info availble')
+ raise x2go_exceptions.X2GoTerminalSessionException('no valid session info availble')
else:
self.session_info = info_backend()
@@ -485,7 +485,7 @@ class X2goTerminalSessionSTDOUT(object):
Retrieve the X2Go session's session info object.
@return: the session info object
- @rtype: C{X2goServerSessionInfo*}
+ @rtype: C{X2GoServerSessionInfo*}
"""
return self.session_info
@@ -519,7 +519,7 @@ class X2goTerminalSessionSTDOUT(object):
- PulseAudio
- Esound (not tested very much)
- @raise X2goControlSessionException: if the control session of this terminal session is not connected
+ @raise X2GoControlSessionException: if the control session of this terminal session is not connected
"""
_tunnel = None
@@ -538,7 +538,7 @@ class X2goTerminalSessionSTDOUT(object):
self.control_session._x2go_sftp_put(local_path='%s/.pulse-cookie' % _LOCAL_HOME, remote_path='%s/.pulse-cookie' % self.session_info.remote_container)
# start reverse SSH tunnel for pulse stream
- _tunnel = rforward.X2goRevFwTunnel(server_port=self.session_info.snd_port,
+ _tunnel = rforward.X2GoRevFwTunnel(server_port=self.session_info.snd_port,
remote_host='127.0.0.1',
remote_port=self.snd_port,
ssh_transport=self.control_session.get_transport(),
@@ -563,7 +563,7 @@ class X2goTerminalSessionSTDOUT(object):
self.control_session._x2go_sftp_put(local_path='%s/.esd_auth' % _LOCAL_HOME, remote_path='%s/.esd_auth' % self.control_session._x2go_remote_home)
# start reverse SSH tunnel for pulse stream
- _tunnel = rforward.X2goRevFwTunnel(server_port=self.session_info.snd_port,
+ _tunnel = rforward.X2GoRevFwTunnel(server_port=self.session_info.snd_port,
remote_host='127.0.0.1',
remote_port=self.snd_port,
ssh_transport=self.control_session.get_transport(),
@@ -587,13 +587,13 @@ class X2goTerminalSessionSTDOUT(object):
"""
if not self.control_session.is_sshfs_available():
- raise x2go_exceptions.X2goUserException('Remote user %s is not allowed to share SSHFS resources with the server.' % self.session_info.username)
+ raise x2go_exceptions.X2GoUserException('Remote user %s is not allowed to share SSHFS resources with the server.' % self.session_info.username)
# start reverse SSH tunnel for sshfs (folder sharing, printing)
ssh_transport = self.control_session.get_transport()
if self.reverse_tunnels[self.session_info.name]['sshfs'][1] is None:
- _tunnel = sftpserver.X2goRevFwTunnelToSFTP(server_port=self.session_info.sshfs_port,
+ _tunnel = sftpserver.X2GoRevFwTunnelToSFTP(server_port=self.session_info.sshfs_port,
ssh_transport=ssh_transport,
auth_key=self.control_session._x2go_session_auth_rsakey,
session_instance=self.session_instance,
@@ -641,17 +641,17 @@ class X2goTerminalSessionSTDOUT(object):
"""\
Initialize X2Go print spooling.
- @raise X2goUserException: if the X2Go printing feature is not available to this user
+ @raise X2GoUserException: if the X2Go printing feature is not available to this user
"""
if not self.control_session.is_sshfs_available():
- raise x2go_exceptions.X2goUserException('Remote user %s is not allowed to use client-side printing.' % self.session_info.username)
+ raise x2go_exceptions.X2GoUserException('Remote user %s is not allowed to use client-side printing.' % self.session_info.username)
spool_dir = os.path.join(self.session_info.local_container, 'spool')
if not os.path.exists(spool_dir):
os.makedirs(spool_dir)
self.share_local_folder(local_path=spool_dir, folder_type='spool')
- self.print_queue = printqueue.X2goPrintQueue(profile_name=self.profile_name,
+ self.print_queue = printqueue.X2GoPrintQueue(profile_name=self.profile_name,
session_name=self.session_info.name,
spool_dir=spool_dir,
print_action=self.print_action,
@@ -667,10 +667,10 @@ class X2goTerminalSessionSTDOUT(object):
"""\
Set a print action for the next incoming print jobs.
- This method is a wrapper for L{X2goPrintQueue}C{.set_print_action()}.
+ This method is a wrapper for L{X2GoPrintQueue}C{.set_print_action()}.
- @param print_action: print action name or object (i.e. an instance of C{X2goPrintAction*} classes)
- @type print_action: C{str} or C{X2goPrintAction*}
+ @param print_action: print action name or object (i.e. an instance of C{X2GoPrintAction*} classes)
+ @type print_action: C{str} or C{X2GoPrintAction*}
@param kwargs: print action specific parameters
@type kwargs: dict
@@ -701,20 +701,20 @@ class X2goTerminalSessionSTDOUT(object):
@param mimebox_extensions: file name extensions that are allowed for local opening/processing
@type mimebox_extensions: C{list}
- @param mimebox_action: MIME box action given as name or object (i.e. an instance of C{X2goMIMEboxAction*} classes).
+ @param mimebox_action: MIME box action given as name or object (i.e. an instance of C{X2GoMIMEboxAction*} classes).
@type mimebox_action: C{str} or C{obj}
- @raise X2goUserException: if the X2Go MIME box feature is not available to this user
+ @raise X2GoUserException: if the X2Go MIME box feature is not available to this user
"""
if not self.control_session.is_sshfs_available():
- raise x2go_exceptions.X2goUserException('Remote user %s is not allowed to use the MIME box.' % self.session_info.username)
+ raise x2go_exceptions.X2GoUserException('Remote user %s is not allowed to use the MIME box.' % self.session_info.username)
mimebox_dir = os.path.join(self.session_info.local_container, 'mimebox')
if not os.path.exists(mimebox_dir):
os.makedirs(mimebox_dir)
self.share_local_folder(local_path=mimebox_dir, folder_type='mimebox')
- self.mimebox_queue = mimebox.X2goMIMEboxQueue(profile_name=self.profile_name,
+ self.mimebox_queue = mimebox.X2GoMIMEboxQueue(profile_name=self.profile_name,
session_name=self.session_info.name,
mimebox_dir=mimebox_dir,
mimebox_extensions=mimebox_extensions,
@@ -729,10 +729,10 @@ class X2goTerminalSessionSTDOUT(object):
"""\
Set a MIME box action for the next incoming MIME jobs.
- This method is a wrapper for L{X2goMIMEboxQueue}C{set_mimebox_action()}.
+ This method is a wrapper for L{X2GoMIMEboxQueue}C{set_mimebox_action()}.
- @param mimebox_action: MIME box action name or object (i.e. an instance of C{X2goMIMEboxAction*} classes)
- @type mimebox_action: C{str} or C{X2goMIMEboxAction*}
+ @param mimebox_action: MIME box action name or object (i.e. an instance of C{X2GoMIMEboxAction*} classes)
+ @type mimebox_action: C{str} or C{X2GoMIMEboxAction*}
@param kwargs: MIME box action specific parameters
@type kwargs: dict
@@ -795,12 +795,12 @@ class X2goTerminalSessionSTDOUT(object):
@return: returns C{True} if the local folder has been successfully mounted within the X2Go server session
@rtype: C{bool}
- @raise X2goUserException: if local folder sharing is not available to this user
+ @raise X2GoUserException: if local folder sharing is not available to this user
@raise Exception: any other exception occuring on the way is passed through by this method
"""
if not self.control_session.is_sshfs_available():
- raise x2go_exceptions.X2goUserException('Remote user %s is not allowed to share local folders with the server.' % self.session_info.username)
+ raise x2go_exceptions.X2GoUserException('Remote user %s is not allowed to share local folders with the server.' % self.session_info.username)
if local_path is None:
self.logger('no folder name given...', log.loglevel_WARN)
@@ -983,6 +983,18 @@ class X2goTerminalSessionSTDOUT(object):
# session title fallback... (like X2Go server does it...)
self.session_title = _generic_title
+ elif self.params.session_type == 'S':
+ if self.set_session_title:
+
+ shared_user = _generic_title.split('XSHAD')[1]
+ shared_display = _generic_title.split('XSHAD')[2].replace('PP', ':').split("_")[0]
+
+ self.session_title = 'Desktop %s@%s shared with %s@%s' % (shared_user, shared_display, self.control_session.remote_username(), self.control_session.get_hostname())
+
+ else:
+ # session title fallback... (like X2Go server does it...)
+ self.session_title = _generic_title
+
else:
# do nothing for rootless sessions
self.session_title = _generic_title
@@ -1148,8 +1160,8 @@ class X2goTerminalSessionSTDOUT(object):
"""\
Run a command in this session.
- After L{X2goTerminalSessionSTDOUT.start()} has been called
- one or more commands can be executed with L{X2goTerminalSessionSTDOUT.run_command()}
+ After L{X2GoTerminalSessionSTDOUT.start()} has been called
+ one or more commands can be executed with L{X2GoTerminalSessionSTDOUT.run_command()}
within the current X2Go session.
@param cmd: Command to be run
@@ -1358,7 +1370,7 @@ class X2goTerminalSessionSTDOUT(object):
@return: C{True} if session startup has been successful and the X2Go proxy is up-and-running
@rtype: C{bool}
- @raise X2goTerminalSessionException: if the session startup failed
+ @raise X2GoTerminalSessionException: if the session startup failed
"""
self.params.rewrite_session_type()
@@ -1413,7 +1425,7 @@ class X2goTerminalSessionSTDOUT(object):
# if the first line of stdout is a "DEN(Y)" string then we will presume that
# we tried to use X2Go desktop sharing and the sharing was rejected
if "ACCESS DENIED" in _stderr and "XSHAD" in _stderr:
- raise x2go_exceptions.X2goDesktopSharingException('X2Go desktop sharing has been denied by the remote user')
+ raise x2go_exceptions.X2GoDesktopSharingException('X2Go desktop sharing has been denied by the remote user')
try:
self.session_info.initialize(_stdout,
@@ -1421,9 +1433,9 @@ class X2goTerminalSessionSTDOUT(object):
hostname=self.control_session.remote_peername(),
)
except ValueError:
- raise x2go_exceptions.X2goTerminalSessionException("failed to start X2Go session")
+ raise x2go_exceptions.X2GoTerminalSessionException("failed to start X2Go session")
except IndexError:
- raise x2go_exceptions.X2goTerminalSessionException("failed to start X2Go session")
+ raise x2go_exceptions.X2GoTerminalSessionException("failed to start X2Go session")
# local path may be a Windows path, so we use the path separator of the local system
self.session_info.local_container = os.path.join(self.params.rootdir, 'S-%s' % self.session_info.name)
@@ -1453,7 +1465,7 @@ class X2goTerminalSessionSTDOUT(object):
self.control_session.get_published_applications()
else:
- raise x2go_exceptions.X2goTerminalSessionException("failed to start X2Go session")
+ raise x2go_exceptions.X2GoTerminalSessionException("failed to start X2Go session")
return proxy_ok
@@ -1464,7 +1476,7 @@ class X2goTerminalSessionSTDOUT(object):
@return: C{True} if the session could successfully be resumed
@rtype: C{bool}
- @raise X2goTerminalSessionException: if the terminal session failed to update server-side reported port changes
+ @raise X2GoTerminalSessionException: if the terminal session failed to update server-side reported port changes
"""
setkbd = "0"
@@ -1502,7 +1514,7 @@ class X2goTerminalSessionSTDOUT(object):
self.logger('re-allocating graphics port for session %s, old server-side port is in use; new graphics port is %s' % (self.session_info, self.session_info.graphics_port), loglevel=log.loglevel_NOTICE)
except TypeError:
# if the re-allocation fails, this is fatal!!!
- raise x2go_exceptions.X2goTerminalSessionException('Failed to retrieve new graphics port from server. X2Go Session cannot be resumed.')
+ raise x2go_exceptions.X2GoTerminalSessionException('Failed to retrieve new graphics port from server. X2Go Session cannot be resumed.')
elif 'sound_port=' in stdout_line and _new_value != str(self.session_info.snd_port):
try:
self.session_info.snd_port = int(_new_value)
@@ -1518,6 +1530,12 @@ class X2goTerminalSessionSTDOUT(object):
except IndexError:
continue
+ # local path may be a Windows path, so we use the path separator of the local system
+ self.session_info.local_container = os.path.join(self.params.rootdir, 'S-%s' % self.session_info.name)
+ # remote path is always a UniX path...
+ self.session_info.remote_container = '%s/.x2go/C-%s' % (self.control_session._x2go_remote_home,
+ self.session_info.name,
+ )
self.proxy = self.proxy_backend(session_info=self.session_info,
ssh_transport=self.control_session.get_transport(),
sessions_rootdir=self.sessions_rootdir,
@@ -1527,12 +1545,6 @@ class X2goTerminalSessionSTDOUT(object):
self.proxy_subprocess, proxy_ok = self.proxy.start_proxy()
if proxy_ok:
- # local path may be a Windows path, so we use the path separator of the local system
- self.session_info.local_container = os.path.join(self.params.rootdir, 'S-%s' % self.session_info.name)
- # remote path is always a UniX path...
- self.session_info.remote_container = '%s/.x2go/C-%s' % (self.control_session._x2go_remote_home,
- self.session_info.name,
- )
self.params.depth = self.session_info.name.split('_')[2][2:]
# on a session resume the user name comes in as a user ID. We have to translate this...
@@ -1550,7 +1562,7 @@ class X2goTerminalSessionSTDOUT(object):
self.control_session.get_published_applications()
self.published_applications = True
else:
- raise x2go_exceptions.X2goTerminalSessionException("failed to start X2Go session")
+ raise x2go_exceptions.X2GoTerminalSessionException("failed to start X2Go session")
return proxy_ok
@@ -1616,3 +1628,48 @@ class X2goTerminalSessionSTDOUT(object):
self._rm_desktop_dirtree()
self._cleaned_up = True
+
+ def is_desktop_session(self):
+ """\
+ Test if this terminal session is a desktop session.
+
+ @return: C{True} if this session is of session type desktop ('D').
+ @rtype: C{bool}
+
+ """
+ self.params.rewrite_session_type()
+ return self.params.session_type == 'D'
+
+ def is_rootless_session(self):
+ """\
+ Test if this terminal session is a rootless session.
+
+ @return: C{True} if this session is of session type rootless ('R').
+ @rtype: C{bool}
+
+ """
+ self.params.rewrite_session_type()
+ return self.params.session_type == 'R'
+
+ def is_shadow_session(self):
+ """\
+ Test if this terminal session is a desktop sharing (aka shadow) session.
+
+ @return: C{True} if this session is of session type shadow ('S').
+ @rtype: C{bool}
+
+ """
+ self.params.rewrite_session_type()
+ return self.params.session_type == 'S'
+
+ def is_pubapp_session(self):
+ """\
+ Test if this terminal session is a published applications session.
+
+ @return: C{True} if this session is of session type published applications ('P').
+ @rtype: C{bool}
+
+ """
+ self.params.rewrite_session_type()
+ return self.params.session_type == 'P'
+
diff --git a/x2go/cache.py b/x2go/cache.py
index 1654e08..389d71a 100644
--- a/x2go/cache.py
+++ b/x2go/cache.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -18,7 +18,7 @@
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
"""\
-X2goListSessionCache class - caching X2Go session information.
+X2GoListSessionCache class - caching X2Go session information.
"""
__NAME__ = 'x2gocache-pylib'
@@ -31,14 +31,14 @@ import gevent
import log
import x2go_exceptions
-class X2goListSessionsCache(object):
+class X2GoListSessionsCache(object):
"""\
For non-blocking operations in client applications using Python X2Go, it is
- recommended to enable the L{X2goListSessionsCache}. This can be done by calling
- the constructor of the L{X2goClient} class.
+ recommended to enable the L{X2GoListSessionsCache}. This can be done by calling
+ the constructor of the L{X2GoClient} class.
The session list and desktop cache gets updated in regular intervals by a threaded
- L{X2goSessionGuardian} instance. For the session list and desktop list update, the
+ L{X2GoSessionGuardian} instance. For the session list and desktop list update, the
X2Go server commands C{x2golistsessions} and C{x2godesktopsessions} are called and
the command's stdout is cached in the session list cache.
@@ -52,11 +52,11 @@ class X2goListSessionsCache(object):
def __init__(self, client_instance, logger=None, loglevel=log.loglevel_DEFAULT):
"""\
- @param client_instance: the L{X2goClient} instance that uses this L{X2goListSessionsCache}
+ @param client_instance: the L{X2GoClient} instance that uses this L{X2GoListSessionsCache}
@type client_instance: C{obj}
- @param logger: you can pass an L{X2goLogger} object to the L{X2goListSessionsCache} constructor
+ @param logger: you can pass an L{X2GoLogger} object to the L{X2GoListSessionsCache} constructor
@type logger: C{obj}
- @param loglevel: if no L{X2goLogger} object has been supplied a new one will be
+ @param loglevel: if no L{X2GoLogger} object has been supplied a new one will be
constructed with the given loglevel
@type loglevel: C{int}
@@ -66,7 +66,7 @@ class X2goListSessionsCache(object):
self.protected = False
if logger is None:
- self.logger = log.X2goLogger(loglevel=loglevel)
+ self.logger = log.X2GoLogger(loglevel=loglevel)
else:
self.logger = copy.deepcopy(logger)
self.logger.tag = __NAME__
@@ -99,7 +99,7 @@ class X2goListSessionsCache(object):
def update_all(self, update_sessions=True, update_desktops=False):
"""\
- Update L{X2goListSessionsCache} for all connected session profiles.
+ Update L{X2GoListSessionsCache} for all connected session profiles.
@param update_sessions: cache recent session lists from all connected servers
@type update_sessions: C{bool}
@@ -114,7 +114,7 @@ class X2goListSessionsCache(object):
def update(self, profile_name, update_sessions=True, update_desktops=False, update_mounts=False):
"""\
- Update L{X2goListSessionsCache} (i.e. session/desktops) for session profile C{profile_name}.
+ Update L{X2GoListSessionsCache} (i.e. session/desktops) for session profile C{profile_name}.
@param profile_name: name of profile to update
@type profile_name: C{str}
@@ -141,12 +141,12 @@ class X2goListSessionsCache(object):
def _update_mounts(self, profile_name, control_session):
"""\
- Update mounts list of L{X2goListSessionsCache} for session profile C{profile_name}.
+ Update mounts list of L{X2GoListSessionsCache} for session profile C{profile_name}.
@param profile_name: name of profile to update
@type profile_name: C{str}
- @raise X2goControlSessionException: if the control session's C{list_mounts} method fails
+ @raise X2GoControlSessionException: if the control session's C{list_mounts} method fails
"""
try:
self.x2go_listsessions_cache[profile_name]['mounts'] = {}
@@ -154,64 +154,64 @@ class X2goListSessionsCache(object):
for session_name in self.x2go_listsessions_cache[profile_name]['sessions']:
if control_session is not None and not control_session.has_session_died():
self.x2go_listsessions_cache[profile_name]['mounts'].update(control_session.list_mounts(session_name))
- except (x2go_exceptions.X2goControlSessionException, AttributeError), e:
+ except (x2go_exceptions.X2GoControlSessionException, AttributeError), e:
if profile_name in self.x2go_listsessions_cache.keys():
del self.x2go_listsessions_cache[profile_name]
self.protected = False
- raise x2go_exceptions.X2goControlSessionException
- except x2go_exceptions.X2goTimeOutException:
+ raise x2go_exceptions.X2GoControlSessionException
+ except x2go_exceptions.X2GoTimeOutException:
pass
def _update_desktops(self, profile_name, control_session):
"""\
- Update session lists of L{X2goListSessionsCache} for session profile C{profile_name}.
+ Update session lists of L{X2GoListSessionsCache} for session profile C{profile_name}.
@param profile_name: name of profile to update
@type profile_name: C{str}
@param control_session: X2Go control session instance
@type control_session: C{obj}
- @raise X2goControlSessionException: if the control session's C{list_desktop} method fails
+ @raise X2GoControlSessionException: if the control session's C{list_desktop} method fails
"""
try:
if control_session is not None and not control_session.has_session_died():
self.x2go_listsessions_cache[profile_name]['desktops'] = control_session.list_desktops()
- except (x2go_exceptions.X2goControlSessionException, AttributeError), e:
+ except (x2go_exceptions.X2GoControlSessionException, AttributeError), e:
if profile_name in self.x2go_listsessions_cache.keys():
del self.x2go_listsessions_cache[profile_name]
self.protected = False
- raise x2go_exceptions.X2goControlSessionException
- except x2go_exceptions.X2goTimeOutException:
+ raise x2go_exceptions.X2GoControlSessionException
+ except x2go_exceptions.X2GoTimeOutException:
pass
def _update_sessions(self, profile_name, control_session):
"""\
- Update desktop list of L{X2goListSessionsCache} for session profile C{profile_name}.
+ Update desktop list of L{X2GoListSessionsCache} for session profile C{profile_name}.
@param profile_name: name of profile to update
@type profile_name: C{str}
- @raise X2goControlSessionException: if the control session's C{list_sessions} method fails
+ @raise X2GoControlSessionException: if the control session's C{list_sessions} method fails
"""
try:
if control_session is not None and not control_session.has_session_died():
self.x2go_listsessions_cache[profile_name]['sessions'] = control_session.list_sessions()
- except (x2go_exceptions.X2goControlSessionException, AttributeError), e:
+ except (x2go_exceptions.X2GoControlSessionException, AttributeError), e:
if profile_name in self.x2go_listsessions_cache.keys():
del self.x2go_listsessions_cache[profile_name]
self.protected = False
- raise x2go_exceptions.X2goControlSessionException
+ raise x2go_exceptions.X2GoControlSessionException
def list_sessions(self, session_uuid):
"""\
- Retrieve a session list from the current cache content of L{X2goListSessionsCache}
- for a given L{X2goSession} instance (specified by its unique session UUID).
+ Retrieve a session list from the current cache content of L{X2GoListSessionsCache}
+ for a given L{X2GoSession} instance (specified by its unique session UUID).
@param session_uuid: unique identifier of session to query cache for
@type session_uuid: C{str}
@return: a data object containing available session information
- @rtype: C{X2goServerSessionList*} instance (or C{None})
+ @rtype: C{X2GoServerSessionList*} instance (or C{None})
"""
profile_name = self.client_instance.get_session_profile_name(session_uuid)
@@ -223,7 +223,7 @@ class X2goListSessionsCache(object):
def list_desktops(self, session_uuid):
"""\
Retrieve a list of available desktop sessions from the current cache content of
- L{X2goListSessionsCache} for a given L{X2goSession} instance (specified by its
+ L{X2GoListSessionsCache} for a given L{X2GoSession} instance (specified by its
unique session UUID).
@param session_uuid: unique identifier of session to query cache for
@@ -242,7 +242,7 @@ class X2goListSessionsCache(object):
def list_mounts(self, session_uuid):
"""\
Retrieve a list of mounted client shares from the current cache content of
- L{X2goListSessionsCache} for a given L{X2goSession} instance (specified by its
+ L{X2GoListSessionsCache} for a given L{X2GoSession} instance (specified by its
unique session UUID).
@param session_uuid: unique identifier of session to query cache for
@@ -274,8 +274,8 @@ class X2goListSessionsCache(object):
if profile_name is None and session_uuid and self.client_instance:
try:
profile_name = self.client_instance.get_session_profile_name(session_uuid)
- except x2go_exceptions.X2goSessionRegistryException:
- raise x2go_exceptions.X2goSessionCacheException("requested session UUID is not valid anymore")
+ except x2go_exceptions.X2GoSessionRegistryException:
+ raise x2go_exceptions.X2GoSessionCacheException("requested session UUID is not valid anymore")
_is_profile_cached = self.x2go_listsessions_cache.has_key(profile_name)
_is_cache_type_cached = _is_profile_cached and self.x2go_listsessions_cache[profile_name].has_key(cache_type)
if cache_type is None:
diff --git a/x2go/checkhosts.py b/x2go/checkhosts.py
index 98badbb..192850a 100644
--- a/x2go/checkhosts.py
+++ b/x2go/checkhosts.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -18,7 +18,7 @@
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
"""\
-Providing mechanisms to C{X2goControlSession*} backends for checking host validity.
+Providing mechanisms to C{X2GoControlSession*} backends for checking host validity.
"""
__NAME__ = 'x2gocheckhosts-pylib'
@@ -34,89 +34,29 @@ import x2go_exceptions
import random
import string
-class X2goInteractiveAddPolicy(paramiko.MissingHostKeyPolicy):
+class X2GoMissingHostKeyPolicy(paramiko.MissingHostKeyPolicy):
"""\
- Policy for making host key information available to Python X2Go after a
- Paramiko/SSH connect has been attempted. This class needs information
- about the associated L{X2goSession} instance.
-
- Once called, the L{missing_host_key} method of this class will try to call
- L{X2goSession.HOOK_check_host_dialog()}. This hook method---if not re-defined
- in your application---will then try to call the L{X2goClient.HOOK_check_host_dialog()},
- which then will return C{True} by default if not customized in your application.
-
- To accept host key checks, make sure to either customize the
- L{X2goClient.HOOK_check_host_dialog()} method or the L{X2goSession.HOOK_check_host_dialog()}
- method and hook some interactive user dialog to either of them.
+ Skeleton class for Python X2Go's missing host key policies.
"""
- def __init__(self, caller=None, session_instance=None):
+ def __init__(self, caller=None, session_instance=None, fake_hostname=None):
"""\
@param caller: calling instance
@type caller: C{class}
@param session_instance: an X2Go session instance
- @type session_instance: L{X2goSession} instance
+ @type session_instance: L{X2GoSession} instance
"""
self.caller = caller
self.session_instance = session_instance
-
- def missing_host_key(self, client, hostname, key):
- """\
- Handle a missing host key situation. This method calls
-
- Once called, the L{missing_host_key} method will try to call
- L{X2goSession.HOOK_check_host_dialog()}. This hook method---if not re-defined
- in your application---will then try to call the L{X2goClient.HOOK_check_host_dialog()},
- which then will return C{True} by default if not customized in your application.
-
- To accept host key checks, make sure to either customize the
- L{X2goClient.HOOK_check_host_dialog()} method or the L{X2goSession.HOOK_check_host_dialog()}
- method and hook some interactive user dialog to either of them.
-
- @param client: SSH client (C{X2goControlSession*}) instance
- @type client: C{X2goControlSession*} instance
- @param hostname: remote hostname
- @type hostname: C{str}
- @param key: host key to validate
- @type key: Paramiko/SSH key instance
-
- @raise X2goHostKeyException: if the X2Go server host key is not in the C{known_hosts} file
- @raise X2goSSHProxyHostKeyException: if the SSH proxy host key is not in the C{known_hosts} file
- @raise SSHException: if this instance does not know its {self.session_instance}
-
- """
- self.client = client
- self.hostname = hostname
- if (self.hostname.find(']') == -1) and (self.hostname.find(':') == -1):
- # if hostname is an IPv4 quadruple with standard SSH port...
- self.hostname = '[%s]:22' % self.hostname
- self.key = key
- client._log(paramiko.common.DEBUG, 'Interactively Checking %s host key for %s: %s' %
- (self.key.get_name(), self.hostname, binascii.hexlify(self.key.get_fingerprint())))
- if self.session_instance:
- self.session_instance.logger('SSH host key verification for host %s with %s fingerprint ,,%s\'\' initiated. We are seeing this X2Go server for the first time.' % (self.get_hostname(), self.get_key_name(), self.get_key_fingerprint_with_colons()), loglevel=log.loglevel_NOTICE)
- _valid = self.session_instance.HOOK_check_host_dialog(self.get_hostname_name(),
- port=self.get_hostname_port(),
- fingerprint=self.get_key_fingerprint_with_colons(),
- fingerprint_type=self.get_key_name(),
- )
- if _valid:
- paramiko.AutoAddPolicy().missing_host_key(client, self.hostname, key)
- else:
- if type(self.caller) in (sshproxy.X2goSSHProxy, ):
- raise x2go_exceptions.X2goSSHProxyHostKeyException('Invalid host %s is not authorized for access. Add the host to Paramiko/SSH\'s known_hosts file.' % hostname)
- else:
- raise x2go_exceptions.X2goHostKeyException('Invalid host %s is not authorized for access. Add the host to Paramiko/SSH\'s known_hosts file.' % hostname)
- else:
- raise x2go_exceptions.SSHException('Policy has collected host key information on %s for further introspection' % hostname)
+ self.fake_hostname = fake_hostname
def get_client(self):
"""\
Retrieve the Paramiko SSH/Client.
@return: the associated X2Go control session instance.
- @rtype: C{X2goControlSession*} instance
+ @rtype: C{X2GoControlSession*} instance
"""
return self.client
@@ -129,7 +69,7 @@ class X2goInteractiveAddPolicy(paramiko.MissingHostKeyPolicy):
@rtype: C{str}
"""
- return self.hostname
+ return self.fake_hostname or self.hostname
def get_hostname_name(self):
"""\
@@ -201,6 +141,110 @@ class X2goInteractiveAddPolicy(paramiko.MissingHostKeyPolicy):
return _colon_fingerprint.rstrip(':')
+class X2GoAutoAddPolicy(X2GoMissingHostKeyPolicy):
+
+ def missing_host_key(self, client, hostname, key):
+ self.client = client
+ self.hostname = hostname
+ self.key = key
+ if self.session_instance and self.session_instance.control_session.unique_hostkey_aliases:
+ self.client._host_keys.add(self.session_instance.get_profile_id(), self.key.get_name(), self.key)
+ else:
+ self.client._host_keys.add(self.get_hostname(), self.key.get_name(), self.key)
+ if self.client._host_keys_filename is not None:
+ self.client.save_host_keys(self.client._host_keys_filename)
+ self.client._log(paramiko.common.DEBUG, 'Adding %s host key for %s: %s' %
+ (self.key.get_name(), self.get_hostname(), binascii.hexlify(self.key.get_fingerprint())))
+
+
+class X2GoInteractiveAddPolicy(X2GoMissingHostKeyPolicy):
+ """\
+ Policy for making host key information available to Python X2Go after a
+ Paramiko/SSH connect has been attempted. This class needs information
+ about the associated L{X2GoSession} instance.
+
+ Once called, the L{missing_host_key} method of this class will try to call
+ L{X2GoSession.HOOK_check_host_dialog()}. This hook method---if not re-defined
+ in your application---will then try to call the L{X2GoClient.HOOK_check_host_dialog()},
+ which then will return C{True} by default if not customized in your application.
+
+ To accept host key checks, make sure to either customize the
+ L{X2GoClient.HOOK_check_host_dialog()} method or the L{X2GoSession.HOOK_check_host_dialog()}
+ method and hook some interactive user dialog to either of them.
+
+ """
+ def missing_host_key(self, client, hostname, key):
+ """\
+ Handle a missing host key situation. This method calls
+
+ Once called, the L{missing_host_key} method will try to call
+ L{X2GoSession.HOOK_check_host_dialog()}. This hook method---if not re-defined
+ in your application---will then try to call the L{X2GoClient.HOOK_check_host_dialog()},
+ which then will return C{True} by default if not customized in your application.
+
+ To accept host key checks, make sure to either customize the
+ L{X2GoClient.HOOK_check_host_dialog()} method or the L{X2GoSession.HOOK_check_host_dialog()}
+ method and hook some interactive user dialog to either of them.
+
+ @param client: SSH client (C{X2GoControlSession*}) instance
+ @type client: C{X2GoControlSession*} instance
+ @param hostname: remote hostname
+ @type hostname: C{str}
+ @param key: host key to validate
+ @type key: Paramiko/SSH key instance
+
+ @raise X2GoHostKeyException: if the X2Go server host key is not in the C{known_hosts} file
+ @raise X2GoSSHProxyHostKeyException: if the SSH proxy host key is not in the C{known_hosts} file
+ @raise SSHException: if this instance does not know its {self.session_instance}
+
+ """
+ self.client = client
+ self.hostname = hostname
+ if (self.hostname.find(']') == -1) and (self.hostname.find(':') == -1):
+ # if hostname is an IPv4 quadruple with standard SSH port...
+ self.hostname = '[%s]:22' % self.hostname
+ self.key = key
+ self.client._log(paramiko.common.DEBUG, 'Interactively Checking %s host key for %s: %s' %
+ (self.key.get_name(), self.get_hostname(), binascii.hexlify(self.key.get_fingerprint())))
+ if self.session_instance:
+
+ if self.fake_hostname is not None:
+ server_key = client.get_transport().get_remote_server_key()
+ keytype = server_key.get_name()
+ our_server_key = client._system_host_keys.get(self.fake_hostname, {}).get(keytype, None)
+ if our_server_key is None:
+ if self.session_instance.control_session.unique_hostkey_aliases:
+ our_server_key = client._host_keys.get(self.session_instance.get_profile_id(), {}).get(keytype, None)
+ if our_server_key is not None:
+ self.session_instance.logger('SSH host key verification for SSH-proxied host %s with %s fingerprint ,,%s\'\' succeeded. This host is known by the X2Go session profile ID of profile Âģ%sÂĢ.' % (self.fake_hostname, self.get_key_name(), self.get_key_fingerprint_with_colons(), self.session_instance.profile_name), loglevel=log.loglevel_NOTICE)
+ return
+ else:
+ our_server_key = client._host_keys.get(self.fake_hostname, {}).get(keytype, None)
+ if our_server_key is not None:
+ self.session_instance.logger('SSH host key verification for SSH-proxied host %s with %s fingerprint ,,%s\'\' succeeded. This host is known by the address it has behind the SSH proxy host.' % (self.fake_hostname, self.get_key_name(), self.get_key_fingerprint_with_colons()), loglevel=log.loglevel_NOTICE)
+ return
+
+ self.session_instance.logger('SSH host key verification for host %s with %s fingerprint ,,%s\'\' initiated. We are seeing this X2Go server for the first time.' % (self.get_hostname(), self.get_key_name(), self.get_key_fingerprint_with_colons()), loglevel=log.loglevel_NOTICE)
+ _valid = self.session_instance.HOOK_check_host_dialog(self.get_hostname_name(),
+ port=self.get_hostname_port(),
+ fingerprint=self.get_key_fingerprint_with_colons(),
+ fingerprint_type=self.get_key_name(),
+ )
+ if _valid:
+ if self.session_instance.control_session.unique_hostkey_aliases and type(self.caller) not in (sshproxy.X2GoSSHProxy, ):
+ paramiko.AutoAddPolicy().missing_host_key(client, self.session_instance.get_profile_id(), key)
+ else:
+ paramiko.AutoAddPolicy().missing_host_key(client, self.get_hostname(), key)
+
+ else:
+ if type(self.caller) in (sshproxy.X2GoSSHProxy, ):
+ raise x2go_exceptions.X2GoSSHProxyHostKeyException('Invalid host %s is not authorized for access. Add the host to Paramiko/SSH\'s known_hosts file.' % self.get_hostname())
+ else:
+ raise x2go_exceptions.X2GoHostKeyException('Invalid host %s is not authorized for access. Add the host to Paramiko/SSH\'s known_hosts file.' % self.get_hostname())
+ else:
+ raise x2go_exceptions.SSHException('Policy has collected host key information on %s for further introspection' % self.get_hostname())
+
+
def check_ssh_host_key(x2go_sshclient_instance, hostname, port=22):
"""\
Perform a Paramiko/SSH host key check by connecting to the host and
@@ -208,7 +252,7 @@ def check_ssh_host_key(x2go_sshclient_instance, hostname, port=22):
connect process).
@param x2go_sshclient_instance: a Paramiko/SSH client instance to be used for testing host key validity.
- @type x2go_sshclient_instance: C{X2goControlSession*} instance
+ @type x2go_sshclient_instance: C{X2GoControlSession*} instance
@param hostname: hostname of server to validate
@type hostname: C{str}
@param port: port of server to validate
@@ -217,7 +261,7 @@ def check_ssh_host_key(x2go_sshclient_instance, hostname, port=22):
@return: returns a tuple with the following components (<host_ok>, <hostname>, <port>, <fingerprint>, <fingerprint_type>)
@rtype: C{tuple}
- @raise SSHException: if an SSH exception occurred, that we did not provocate in L{X2goInteractiveAddPolicy.missing_host_key()}
+ @raise SSHException: if an SSH exception occurred, that we did not provocate in L{X2GoInteractiveAddPolicy.missing_host_key()}
"""
_hostname = hostname
@@ -225,7 +269,7 @@ def check_ssh_host_key(x2go_sshclient_instance, hostname, port=22):
_fingerprint = 'NO-FINGERPRINT'
_fingerprint_type = 'SOME-KEY-TYPE'
- _check_policy = X2goInteractiveAddPolicy()
+ _check_policy = X2GoInteractiveAddPolicy()
x2go_sshclient_instance.set_missing_host_key_policy(_check_policy)
host_ok = False
diff --git a/x2go/cleanup.py b/x2go/cleanup.py
index 399dfa4..1cc040e 100644
--- a/x2go/cleanup.py
+++ b/x2go/cleanup.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -46,7 +46,7 @@ def x2go_cleanup(e=None, threads=None):
import x2go
try:
- my_x2goclient = x2go.X2goClient(...)
+ my_x2goclient = x2go.X2GoClient(...)
[... your code ...]
@@ -70,11 +70,11 @@ def x2go_cleanup(e=None, threads=None):
# stop X2Go reverse forwarding tunnels
for t in threads:
- if type(t) == rforward.X2goRevFwTunnel:
+ if type(t) == rforward.X2GoRevFwTunnel:
t.stop_thread()
del t
- # stop X2Go paramiko transports used by X2goTerminalSession objects
+ # stop X2Go paramiko transports used by X2GoTerminalSession objects
for t in threads:
if type(t) == paramiko.Transport:
if hasattr(t, '_x2go_session_marker'):
@@ -84,19 +84,19 @@ def x2go_cleanup(e=None, threads=None):
# on Windows: stop the XServer that we evoked
if _X2GOCLIENT_OS == 'Windows':
for t in threads:
- if type(t) == xserver.X2goXServer:
+ if type(t) == xserver.X2GoXServer:
t.stop_thread()
del t
# on Windows: stop the PulseAudio daemon that we evoked
if _X2GOCLIENT_OS == 'Windows':
for t in threads:
- if type(t) == pulseaudio.X2goPulseAudio:
+ if type(t) == pulseaudio.X2GoPulseAudio:
t.stop_thread()
del t
for t in threads:
- if type(t) == guardian.X2goSessionGuardian:
+ if type(t) == guardian.X2GoSessionGuardian:
t.stop_thread()
del t
diff --git a/x2go/client.py b/x2go/client.py
index d160e74..c850e40 100644
--- a/x2go/client.py
+++ b/x2go/client.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
# Python X2Go is free software; you can redistribute it and/or modify
@@ -19,8 +19,8 @@
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
"""\
-L{X2goClient} is a public API class. Use this class in your Python X2Go based
-applications. Use it as a parent class for your own object oriented L{X2goClient}'ish
+L{X2GoClient} is a public API class. Use this class in your Python X2Go based
+applications. Use it as a parent class for your own object oriented L{X2GoClient}'ish
class implementation.
Supported Features
@@ -38,19 +38,20 @@ Supported Features
- enabling and mangaging X2Go printing (real printing, viewing as PDF, saving
to a local folder or executing a custom ÂģprintÂĢ command
- transparent tunneling of audio (Pulseaudio, ESD)
+ - sharing of other desktops
- LDAP support for X2Go server clusters (NOT IMPLEMENTED YET)
Non-Profile Sessions
====================
- A new non-profile based X2Go session within an L{X2goClient} instance is setup in the
+ A new non-profile based X2Go session within an L{X2GoClient} instance is setup in the
following way:
- import the Python X2Go module and call the session constructor::
import x2go
- x2go_client = x2go.X2goClient()
+ x2go_client = x2go.X2GoClient()
- - register a new L{X2goClient} session; this creates an L{X2goSession} instance
+ - register a new L{X2GoClient} session; this creates an L{X2GoSession} instance
and calls its constructor method::
x2go_sess_uuid = x2go_client.register_session(<many-options>)
@@ -76,14 +77,14 @@ Non-Profile Sessions
Profiled Sessions
=================
A new profile based X2Go session (i.e. using pre-defined session profiles) within an
- L{X2goClient} instance is setup in a much easier way:
+ L{X2GoClient} instance is setup in a much easier way:
- import the Python X2Go module and call the session constructor::
import x2go
- x2go_client = x2go.X2goClient()
+ x2go_client = x2go.X2GoClient()
- - register an X2goClient session based on a pre-configured session profile::
+ - register an X2GoClient session based on a pre-configured session profile::
x2go_sess_uuid = x2go_client.register_session(profile_name=<session_profile_name>)
@@ -123,9 +124,9 @@ import types
import os
# Python X2Go modules
-from registry import X2goSessionRegistry
-from guardian import X2goSessionGuardian
-from cache import X2goListSessionsCache
+from registry import X2GoSessionRegistry
+from guardian import X2GoSessionGuardian
+from cache import X2GoListSessionsCache
import x2go_exceptions
import log
import utils
@@ -161,33 +162,33 @@ import x2go.backends.settings as settings
import x2go.backends.printing as printing
if _X2GOCLIENT_OS == 'Windows':
- from xserver import X2goClientXConfig, X2goXServer
- from pulseaudio import X2goPulseAudio
+ from xserver import X2GoClientXConfig, X2GoXServer
+ from pulseaudio import X2GoPulseAudio
-class X2goClient(object):
+class X2GoClient(object):
"""\
- The X2goClient implements _THE_ public Python X2Go API. With it you can
+ The X2GoClient implements _THE_ public Python X2Go API. With it you can
construct your own X2Go client application in Python.
Most methods in this class require that you have registered a session
with a remote X2Go server (passing of session options, initialization of the
session object etc.) and connected to it (authentication). For these two steps
- use these methods: L{X2goClient.register_session()} and L{X2goClient.connect_session()}.
+ use these methods: L{X2GoClient.register_session()} and L{X2GoClient.connect_session()}.
"""
lang = 'en'
def __init__(self,
- control_backend=control.X2goControlSession,
- terminal_backend=terminal.X2goTerminalSession,
- info_backend=info.X2goServerSessionInfo,
- list_backend=info.X2goServerSessionList,
- proxy_backend=proxy.X2goProxy,
- profiles_backend=profiles.X2goSessionProfiles,
- settings_backend=settings.X2goClientSettings,
- printing_backend=printing.X2goClientPrinting,
+ control_backend=control.X2GoControlSession,
+ terminal_backend=terminal.X2GoTerminalSession,
+ info_backend=info.X2GoServerSessionInfo,
+ list_backend=info.X2GoServerSessionList,
+ proxy_backend=proxy.X2GoProxy,
+ profiles_backend=profiles.X2GoSessionProfiles,
+ settings_backend=settings.X2GoClientSettings,
+ printing_backend=printing.X2GoClientPrinting,
client_rootdir=None,
sessions_rootdir=None,
ssh_rootdir=None,
@@ -227,19 +228,19 @@ class X2goClient(object):
@type sessions_rootdir: C{str}
@param ssh_rootdir: ssh base dir (default: ~/.ssh)
@type ssh_rootdir: C{str}
- @param start_xserver: start XServer when registering an L{X2goClient} instance
+ @param start_xserver: start XServer when registering an L{X2GoClient} instance
@type start_xserver: C{bool}
- @param start_pulseaudio: start Pulseaudio daemon when registering an L{X2goClient} instance
+ @param start_pulseaudio: start Pulseaudio daemon when registering an L{X2GoClient} instance
@type start_pulseaudio: C{bool}
@param use_cache: alias for C{use_listsessions_cache}
@type use_cache: C{bool}
- @param use_listsessions_cache: activate the X2Go session list cache in (L{X2goListSessionsCache})
+ @param use_listsessions_cache: activate the X2Go session list cache in (L{X2GoListSessionsCache})
@type use_listsessions_cache: C{bool}
- @param auto_update_listsessions_cache: activate automatic updates of the X2Go session list cache (L{X2goListSessionsCache})
+ @param auto_update_listsessions_cache: activate automatic updates of the X2Go session list cache (L{X2GoListSessionsCache})
@type auto_update_listsessions_cache: C{bool}
- @param auto_update_listdesktops_cache: activate automatic updates of desktop lists in (L{X2goListSessionsCache})
+ @param auto_update_listdesktops_cache: activate automatic updates of desktop lists in (L{X2GoListSessionsCache})
@type auto_update_listdesktops_cache: C{bool}
- @param auto_update_listmounts_cache: activate automatic updates of mount lists in (L{X2goListSessionsCache})
+ @param auto_update_listmounts_cache: activate automatic updates of mount lists in (L{X2GoListSessionsCache})
@type auto_update_listmounts_cache: C{bool}
@param auto_update_sessionregistry: activate automatic updates of the X2Go session registry
@type auto_update_sessionregistry: C{bool}
@@ -251,10 +252,10 @@ class X2goClient(object):
@type refresh_interval: C{int}
@param pulseaudio_installdir: install path of Pulseaudio binary
@type pulseaudio_installdir: C{str}
- @param logger: you can pass an L{X2goLogger} object to the
- L{X2goClient} constructor
- @type logger: L{X2goLogger} instance
- @param loglevel: if no X2goLogger object has been supplied a new one will be
+ @param logger: you can pass an L{X2GoLogger} object to the
+ L{X2GoClient} constructor
+ @type logger: L{X2GoLogger} instance
+ @param loglevel: if no X2GoLogger object has been supplied a new one will be
constructed with the given loglevel
@type loglevel: C{int}
@@ -262,7 +263,7 @@ class X2goClient(object):
self.listsessions_cache = None
if logger is None:
- self.logger = log.X2goLogger(loglevel=loglevel)
+ self.logger = log.X2GoLogger(loglevel=loglevel)
else:
self.logger = copy.deepcopy(logger)
self._logger_tag = __NAME__
@@ -307,9 +308,9 @@ class X2goClient(object):
if _X2GOCLIENT_OS == 'Windows' and start_xserver:
if self.client_rootdir:
- self.client_xconfig = X2goClientXConfig(config_files=[_xconfig_config_file], logger=self.logger)
+ self.client_xconfig = X2GoClientXConfig(config_files=[_xconfig_config_file], logger=self.logger)
else:
- self.client_xconfig = X2goClientXConfig(logger=self.logger)
+ self.client_xconfig = X2GoClientXConfig(logger=self.logger)
if not self.client_xconfig.known_xservers:
self.HOOK_no_known_xserver_found()
@@ -329,7 +330,7 @@ class X2goClient(object):
if not self.client_xconfig.running_xservers:
if p_xs is not None:
- self.xserver = X2goXServer(p_xs[0], p_xs[1], logger=self.logger)
+ self.xserver = X2GoXServer(p_xs[0], p_xs[1], logger=self.logger)
else:
@@ -346,12 +347,12 @@ class X2goClient(object):
os.environ.update({'DISPLAY': 'localhost:0'})
if _X2GOCLIENT_OS == 'Windows' and start_pulseaudio:
- self.pulseaudio = X2goPulseAudio(path=self.pulseaudio_installdir, client_instance=self, logger=self.logger)
+ self.pulseaudio = X2GoPulseAudio(path=self.pulseaudio_installdir, client_instance=self, logger=self.logger)
self.auto_register_sessions = auto_register_sessions
self.no_auto_reg_pubapp_sessions = no_auto_reg_pubapp_sessions
- self.session_registry = X2goSessionRegistry(self, logger=self.logger)
- self.session_guardian = X2goSessionGuardian(self, auto_update_listsessions_cache=auto_update_listsessions_cache & (use_listsessions_cache|use_cache),
+ self.session_registry = X2GoSessionRegistry(self, logger=self.logger)
+ self.session_guardian = X2GoSessionGuardian(self, auto_update_listsessions_cache=auto_update_listsessions_cache & (use_listsessions_cache|use_cache),
auto_update_listdesktops_cache=auto_update_listdesktops_cache & use_listsessions_cache,
auto_update_listmounts_cache=auto_update_listmounts_cache & use_listsessions_cache,
auto_update_sessionregistry=auto_update_sessionregistry,
@@ -363,7 +364,7 @@ class X2goClient(object):
self.auto_update_sessionregistry = auto_update_sessionregistry
if use_listsessions_cache:
- self.listsessions_cache = X2goListSessionsCache(self, logger=self.logger)
+ self.listsessions_cache = X2GoListSessionsCache(self, logger=self.logger)
self.use_listsessions_cache = use_listsessions_cache | use_cache
self.auto_update_listsessions_cache = auto_update_listsessions_cache
@@ -384,6 +385,20 @@ class X2goClient(object):
"""
self.logger('HOOK_session_startup_failed: session startup for session profile ,,%s'' failed.' % profile_name, loglevel=log.loglevel_WARN)
+ def HOOK_list_desktops_timeout(self, profile_name='UNKNOWN'):
+ """\
+ HOOK method: called if the x2golistdesktops command generates a timeout due to long execution time.
+
+ """
+ self.logger('HOOK_list_desktops_timeout: the server-side x2golistdesktops command for session profile %s took too long to return results. This can happen from time to time, please try again.' % profile_name, loglevel=log.loglevel_WARN)
+
+ def HOOK_no_such_desktop(self, profile_name='UNKNOWN', desktop='UNKNOWN'):
+ """\
+ HOOK method: called if it is tried to connect to a (seen before) sharable desktop that's not available (anymore).
+
+ """
+ self.logger('HOOK_no_such_desktop: the desktop %s (via session profile %s) is not available for sharing (anymore).' % (desktop, profile_name), loglevel=log.loglevel_WARN)
+
def HOOK_no_known_xserver_found(self):
"""\
HOOK method: called if the Python X2Go module could not find any usable XServer
@@ -394,7 +409,7 @@ class X2goClient(object):
def HOOK_open_print_dialog(self, profile_name='UNKNOWN', session_name='UNKNOWN'):
"""\
- HOOK method: called if an incoming print job has been detected by L{X2goPrintQueue} and a print dialog box is
+ HOOK method: called if an incoming print job has been detected by L{X2GoPrintQueue} and a print dialog box is
requested.
@param profile_name: profile name of session that called this hook method
@@ -403,7 +418,7 @@ class X2goClient(object):
@type session_name: C{str}
"""
- self.logger('HOOK_open_print_dialog: incoming print job detected by X2goClient hook method', loglevel=log.loglevel_WARN)
+ self.logger('HOOK_open_print_dialog: incoming print job detected by X2GoClient hook method', loglevel=log.loglevel_WARN)
def HOOK_no_such_command(self, cmd, profile_name='UNKNOWN', session_name='UNKNOWN'):
"""\
@@ -431,7 +446,7 @@ class X2goClient(object):
@type session_name: C{str}
"""
- self.logger('HOOK_open_mimebox_saveas_dialog: incoming MIME box job ,, %s'' detected by X2goClient hook method' % filename, loglevel=log.loglevel_WARN)
+ self.logger('HOOK_open_mimebox_saveas_dialog: incoming MIME box job ,, %s'' detected by X2GoClient hook method' % filename, loglevel=log.loglevel_WARN)
def HOOK_printaction_error(self, filename, profile_name='UNKNOWN', session_name='UNKNOWN', err_msg='GENERIC_ERROR', printer=None):
"""\
@@ -454,7 +469,7 @@ class X2goClient(object):
else:
self.logger('HOOK_printaction_error: incoming print job ,, %s'' caused error: %s' % (filename, err_msg), loglevel=log.loglevel_ERROR)
- def HOOK_check_host_dialog(self, profile_name='UNKNOWN', host='UNKNOWN', port=22, fingerprint='no fingerprint', fingerprint_type='RSA'):
+ def HOOK_check_host_dialog(self, profile_name='UNKNOWN', host='UNKNOWN', port=22, fingerprint='no fingerprint', fingerprint_type='UNKNOWN'):
"""\
HOOK method: called if a host check is requested. This hook has to either return C{True} (default) or C{False}.
@@ -477,7 +492,6 @@ class X2goClient(object):
# this HOOK has to return either True (accept host connection) or False (deny host conection)
return True
-
def HOOK_on_control_session_death(self, profile_name):
"""\
HOOK method: called if a control session (server connection) has unexpectedly encountered a failure.
@@ -540,11 +554,11 @@ class X2goClient(object):
@type chain_port: C{str}
"""
- self.logger('Forwarding tunnel request to [%s]:%s for session %s (%s) was denied by remote X2go/SSH server. Session startup failed.' % (chain_host, chain_port, session_name, profile_name), loglevel=log.loglevel_ERROR)
+ self.logger('Forwarding tunnel request to [%s]:%s for session %s (%s) was denied by remote X2Go/SSH server. Session startup failed.' % (chain_host, chain_port, session_name, profile_name), loglevel=log.loglevel_ERROR)
def HOOK_on_session_has_started_by_me(self, session_uuid='UNKNOWN', profile_name='UNKNOWN', session_name='UNKNOWN'):
"""\
- HOOK method: called if a session has been started by this instance of L{X2goClient}.
+ HOOK method: called if a session has been started by this instance of L{X2GoClient}.
@param session_uuid: unique session identifier of the calling session
@type session_uuid: C{str}
@@ -572,7 +586,7 @@ class X2goClient(object):
def HOOK_on_session_has_resumed_by_me(self, session_uuid='UNKNOWN', profile_name='UNKNOWN', session_name='UNKNOWN'):
"""\
- HOOK method: called if a session has been resumed by this instance of L{X2goClient}.
+ HOOK method: called if a session has been resumed by this instance of L{X2GoClient}.
@param session_uuid: unique session identifier of the calling session
@type session_uuid: C{str}
@@ -614,7 +628,7 @@ class X2goClient(object):
def HOOK_on_session_has_been_suspended(self, session_uuid='UNKNOWN', profile_name='UNKNOWN', session_name='UNKNOWN'):
"""\
- HOOK method: called if a session has been suspended by this instance of L{X2goClient}.
+ HOOK method: called if a session has been suspended by this instance of L{X2GoClient}.
@param session_uuid: unique session identifier of the calling session
@type session_uuid: C{str}
@@ -692,7 +706,7 @@ class X2goClient(object):
"""\
Detect backend classes from the command line
- @raise X2goBackendException: if a given backend name is unknown."
+ @raise X2GoBackendException: if a given backend name is unknown."
"""
# CONTROL session backend
@@ -703,7 +717,7 @@ class X2goClient(object):
if self.control_backend in _BACKENDS_CONTROLSESSION.values():
_classname = self.control_backend
else:
- raise x2go_exceptions.X2goBackendException('unknown control session backend name %s' % self.control_backend)
+ raise x2go_exceptions.X2GoBackendException('unknown control session backend name %s' % self.control_backend)
self.control_backend = eval('control.%s' % _classname)
# TERMINAL session backend
@@ -714,7 +728,7 @@ class X2goClient(object):
if self.terminal_backend in _BACKENDS_TERMINALSESSION.values():
_classname = self.terminal_backend
else:
- raise x2go_exceptions.X2goBackendException('unknown terminal session backend name %s' % self.terminal_backend)
+ raise x2go_exceptions.X2GoBackendException('unknown terminal session backend name %s' % self.terminal_backend)
self.terminal_backend = eval('terminal.%s' % _classname)
# PROXY session backend
@@ -725,7 +739,7 @@ class X2goClient(object):
if self.proxy_backend in _BACKENDS_PROXY.values():
_classname = self.proxy_backend
else:
- raise x2go_exceptions.X2goBackendException('unknown proxy backend name %s' % self.proxy_backend)
+ raise x2go_exceptions.X2GoBackendException('unknown proxy backend name %s' % self.proxy_backend)
self.proxy_backend = eval('proxy.%s' % _classname)
# server session info backend
@@ -736,7 +750,7 @@ class X2goClient(object):
if self.info_backend in _BACKENDS_SERVERSESSIONINFO.values():
_classname = self.info_backend
else:
- raise x2go_exceptions.X2goBackendException('unknown server session info backend name %s' % self.info_backend)
+ raise x2go_exceptions.X2GoBackendException('unknown server session info backend name %s' % self.info_backend)
self.info_backend = eval('info.%s' % _classname)
# server session list backend
@@ -747,7 +761,7 @@ class X2goClient(object):
if self.list_backend in _BACKENDS_SERVERSESSIONLIST.values():
_classname = self.list_backend
else:
- raise x2go_exceptions.X2goBackendException('unknown server session info backend name %s' % self.list_backend)
+ raise x2go_exceptions.X2GoBackendException('unknown server session info backend name %s' % self.list_backend)
self.list_backend = eval('info.%s' % _classname)
# session profiles backend
@@ -758,7 +772,7 @@ class X2goClient(object):
if self.profiles_backend in _BACKENDS_SESSIONPROFILES.values():
_classname = self.profiles_backend
else:
- raise x2go_exceptions.X2goBackendException('unknown session profiles backend name %s' % self.profiles_backend)
+ raise x2go_exceptions.X2GoBackendException('unknown session profiles backend name %s' % self.profiles_backend)
self.profiles_backend = eval('profiles.%s' % _classname)
# client settings backend
@@ -769,7 +783,7 @@ class X2goClient(object):
if self.settings_backend in _BACKENDS_CLIENTSETTINGS.values():
_classname = self.settings_backend
else:
- raise x2go_exceptions.X2goBackendException('unknown client settings backend name %s' % self.settings_backend)
+ raise x2go_exceptions.X2GoBackendException('unknown client settings backend name %s' % self.settings_backend)
self.settings_backend = eval('settings.%s' % _classname)
# client printing backend
@@ -780,12 +794,12 @@ class X2goClient(object):
if self.printing_backend in _BACKENDS_CLIENTPRINTING.values():
_classname = self.printing_backend
else:
- raise x2go_exceptions.X2goBackendException('unknown client printing backend name %s' % self.printing_backend)
+ raise x2go_exceptions.X2GoBackendException('unknown client printing backend name %s' % self.printing_backend)
self.printing_backend = eval('printing.%s' % _classname)
def get_client_rootdir(self):
"""\
- Retrieve the settings root directory of this L{X2goClient} instance.
+ Retrieve the settings root directory of this L{X2GoClient} instance.
@return: X2Go client root directory
@rtype: C{str}
@@ -796,7 +810,7 @@ class X2goClient(object):
@property
def has_custom_client_rootdir(self):
"""\
- Does this L{X2goClient} instance have a customized root dir path?
+ Does this L{X2GoClient} instance have a customized root dir path?
Equals C{True} in case it has.
"""
@@ -805,7 +819,7 @@ class X2goClient(object):
def get_sessions_rootdir(self):
"""\
- Retrieve the sessions root directory of this L{X2goClient} instance.
+ Retrieve the sessions root directory of this L{X2GoClient} instance.
@return: X2Go sessions root directory
@rtype: C{str}
@@ -815,7 +829,7 @@ class X2goClient(object):
def get_ssh_rootdir(self):
"""\
- Retrieve the SSH client root dir used with this L{X2goClient} instance.
+ Retrieve the SSH client root dir used with this L{X2GoClient} instance.
@return: SSH client root directory
@rtype: C{str}
@@ -827,7 +841,7 @@ class X2goClient(object):
"""\
Query the local user's username (i.e. the user running the X2Go client).
- @return: the local username this L{X2goClient} instance runs as
+ @return: the local username this L{X2GoClient} instance runs as
@rtype: C{str}
"""
@@ -839,20 +853,20 @@ class X2goClient(object):
Register all session profiles found in the C{sessions} configuration node
as potential X2Go sessions.
- @param return_objects: if set to C{True} this methods returns a list of L{X2goSession}
+ @param return_objects: if set to C{True} this methods returns a list of L{X2GoSession}
instances, otherwise a list of session UUIDs representing the corresponding
registered sessions is returned
@type return_objects: C{bool}
@return: a Python dictionary containing one registered session for each available session profile
- configuration, whereas the profile names are used as dictionary keys and L{X2goSession}
+ configuration, whereas the profile names are used as dictionary keys and L{X2GoSession}
instances as their values
@rtype: C{list}
"""
sessions = {}
for profile_name in self.session_profiles.profile_names:
- _obj = self._X2goClient__register_session(profile_name=profile_name, return_object=True)
+ _obj = self._X2GoClient__register_session(profile_name=profile_name, return_object=True)
sessions[_obj.get_profile_name()] = _obj
return sessions
__register_all_session_profiles = register_all_session_profiles
@@ -865,13 +879,13 @@ class X2goClient(object):
proxy_options={},
return_object=False, **kwargs):
"""\
- Register a new L{X2goSession}. Within one L{X2goClient}
- instance you can manage several L{X2goSession} instances on serveral
+ Register a new L{X2GoSession}. Within one L{X2GoClient}
+ instance you can manage several L{X2GoSession} instances on serveral
remote X2Go servers under different user names.
- These sessions can be instantiated by passing direct L{X2goSession}
+ These sessions can be instantiated by passing direct L{X2GoSession}
parameters to this method or by specifying the name of an existing session profile
- (as found in the L{X2goClient}'s C{sessions} configuration node.
+ (as found in the L{X2GoClient}'s C{sessions} configuration node.
A session profile is a pre-defined set of session options stored in a sessions
profile node (e.g. a configuration file). With the FILE backend such session
@@ -881,14 +895,14 @@ class X2goClient(object):
Python X2Go also supports starting multiple X2Go sessions for the same
session profile simultaneously.
- This method (L{X2goClient.register_session()}) accepts a similar set of parameters
- as the L{X2goSession} constructor itself. For a complete set of session options refer
+ This method (L{X2GoClient.register_session()}) accepts a similar set of parameters
+ as the L{X2GoSession} constructor itself. For a complete set of session options refer
there.
Alternatively, you can also pass a profile name or a profile id
to this method. If you do this, Python X2Go tries to find the specified session
in the C{sessions} configuration node and then derives the necessary session parameters
- from the session profile configuration. Additional L{X2goSession} parameters can
+ from the session profile configuration. Additional L{X2GoSession} parameters can
also be passed to this method---they will override the option values retrieved from
the session profile.
@@ -920,18 +934,18 @@ class X2goClient(object):
@type known_hosts: C{str}
@param forward_sshagent: forward SSH agent authentication requests to the X2Go client-side
@type forward_sshagent: C{bool}
- @param proxy_options: a set of very C{X2goProxy*} backend specific options; any option that is not known
- to the C{X2goProxy*} backend will simply be ignored
+ @param proxy_options: a set of very C{X2GoProxy*} backend specific options; any option that is not known
+ to the C{X2GoProxy*} backend will simply be ignored
@type proxy_options: C{dict}
@param return_object: normally this method returns a unique session UUID. If
- C{return_object} is set to C{True} an X2goSession object will be returned
+ C{return_object} is set to C{True} an X2GoSession object will be returned
instead
@type return_object: C{bool}
- @param kwargs: any option that is also valid for the L{X2goSession} constructor
+ @param kwargs: any option that is also valid for the L{X2GoSession} constructor
@type kwargs: C{dict}
@return: a unique identifier (UUID) for the newly registered X2Go session (or an
- X2goSession object if C{return_object} is set to True
+ X2GoSession object if C{return_object} is set to True
@rtype: C{str}
"""
@@ -1014,7 +1028,7 @@ class X2goClient(object):
__register_session = register_session
###
- ### WRAPPER METHODS FOR X2goSessionRegistry objects
+ ### WRAPPER METHODS FOR X2GoSessionRegistry objects
###
def get_session_summary(self, session_uuid):
@@ -1029,12 +1043,12 @@ class X2goClient(object):
__get_session_summary = get_session_summary
###
- ### WRAPPER METHODS FOR X2goSession objects
+ ### WRAPPER METHODS FOR X2GoSession objects
###
def get_session_username(self, session_uuid):
"""\
- After an L{X2goSession} has been set up you can query the
+ After an L{X2GoSession} has been set up you can query the
username that the remote sessions runs as.
@param session_uuid: the X2Go session's UUID registry hash
@@ -1083,13 +1097,13 @@ class X2goClient(object):
def get_session(self, session_uuid):
"""\
- Retrieve the complete L{X2goSession} object that has been
+ Retrieve the complete L{X2GoSession} object that has been
registered under the given session registry hash.
@param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
- @return: the L{X2goSession} instance
+ @return: the L{X2GoSession} instance
@rtype: obj
"""
@@ -1100,23 +1114,23 @@ class X2goClient(object):
def get_session_of_session_name(self, session_name, return_object=False, match_profile_name=None):
"""\
- Retrieve session UUID or L{X2goSession} for session name
+ Retrieve session UUID or L{X2GoSession} for session name
<session_name> from the session registry.
@param session_name: the X2Go session's UUID registry hash
@type session_name: C{str}
- @param return_object: session UUID hash or L{X2goSession} instance wanted?
+ @param return_object: session UUID hash or L{X2GoSession} instance wanted?
@type return_object: C{bool}
@param match_profile_name: only return sessions that match this profile name
@type match_profile_name: C{str}
- @return: the X2Go session's UUID registry hash or L{X2goSession} instance
- @rtype: C{str} or L{X2goSession} instance
+ @return: the X2Go session's UUID registry hash or L{X2GoSession} instance
+ @rtype: C{str} or L{X2GoSession} instance
"""
try:
return self.session_registry.get_session_of_session_name(session_name=session_name, return_object=return_object, match_profile_name=match_profile_name)
- except x2go_exceptions.X2goSessionRegistryException:
+ except x2go_exceptions.X2GoSessionRegistryException:
return None
__get_session_of_session_name = get_session_of_session_name
@@ -1165,13 +1179,13 @@ class X2goClient(object):
"""
if session_uuid is None and profile_name:
- _session_uuids = self._X2goClient__client_pubapp_sessions_of_profile_name(profile_name, return_objects=False)
+ _session_uuids = self._X2GoClient__client_pubapp_sessions_of_profile_name(profile_name, return_objects=False)
if len(_session_uuids): session_uuid = _session_uuids[0]
if session_uuid:
try:
if self.session_registry(session_uuid).is_published_applications_provider():
return self.session_registry(session_uuid).get_published_applications(lang=lang, refresh=refresh, raw=raw, very_raw=False, max_no_submenus=max_no_submenus)
- except x2go_exceptions.X2goSessionRegistryException:
+ except x2go_exceptions.X2GoSessionRegistryException:
pass
else:
self.logger('Cannot find a terminal session for profile ,,%s\'\' that can be used to query a published applications menu tree' % profile_name, loglevel=log.loglevel_INFO)
@@ -1182,7 +1196,7 @@ class X2goClient(object):
def set_session_username(self, session_uuid, username):
"""\
- Set the session username for the L{X2goSession} that has been registered under C{session_uuid}.
+ Set the session username for the L{X2GoSession} that has been registered under C{session_uuid}.
This can be helpful for modifying user credentials during an authentication phase.
@param session_uuid: the X2Go session's UUID registry hash
@@ -1309,7 +1323,7 @@ class X2goClient(object):
@param sshproxy_password: the SSH proxy user's password
@type sshproxy_password: C{str}
@param add_to_known_hosts: non-Paramiko option, if C{True} paramiko.AutoAddPolicy()
- is used as missing-host-key-policy. If set to C{False} checkhosts.X2goInteractiveAddPolicy()
+ is used as missing-host-key-policy. If set to C{False} L{checkhosts.X2GoInteractiveAddPolicy()}
is used
@type add_to_known_hosts: C{bool}
@param force_password_auth: disable SSH pub/priv key authentication mechanisms
@@ -1338,7 +1352,7 @@ class X2goClient(object):
def disconnect_session(self, session_uuid):
"""\
- Disconnect an L{X2goSession} by closing down its Paramiko/SSH Transport thread.
+ Disconnect an L{X2GoSession} by closing down its Paramiko/SSH Transport thread.
@param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
@@ -1356,16 +1370,16 @@ class X2goClient(object):
Currently, there are five different print actions available, each defined as an individual
print action class:
- - B{PDFVIEW} (L{X2goPrintActionPDFVIEW}): view an incoming spool job (a PDF file)
+ - B{PDFVIEW} (L{X2GoPrintActionPDFVIEW}): view an incoming spool job (a PDF file)
locally in a PDF viewer
- - B{PDFSAVE} (L{X2goPrintActionPDFSAVE}): save an incoming spool job (a PDF file)
+ - B{PDFSAVE} (L{X2GoPrintActionPDFSAVE}): save an incoming spool job (a PDF file)
under a nice name in a designated folder
- - B{PRINT} (L{X2goPrintActionPRINT}): really print the incoming spool job on a real printing device
- - B{PRINTCMD} L{X2goPrintActionPRINTCMD}: on each incoming spool job execute an
+ - B{PRINT} (L{X2GoPrintActionPRINT}): really print the incoming spool job on a real printing device
+ - B{PRINTCMD} L{X2GoPrintActionPRINTCMD}: on each incoming spool job execute an
external command that lets the client user handle the further processing of the
print job (PDF) file
- - B{DIALOG} (L{X2goPrintActionDIALOG}): on each incoming spool job this print action
- will call L{X2goClient.HOOK_open_print_dialog()}
+ - B{DIALOG} (L{X2GoPrintActionDIALOG}): on each incoming spool job this print action
+ will call L{X2GoClient.HOOK_open_print_dialog()}
Each of the print action classes accepts different print action arguments. For detail
information on these print action arguments please refer to the constructor methods of
@@ -1444,7 +1458,7 @@ class X2goClient(object):
@param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
- @param sessionopts: pass-through of options directly to the session instance's L{X2goSession.start()} method
+ @param sessionopts: pass-through of options directly to the session instance's L{X2GoSession.start()} method
@type sessionopts: C{dict}
@return: returns True if this method has been successful
@@ -1465,11 +1479,11 @@ class X2goClient(object):
return _retval
__start_session = start_session
- def share_desktop_session(self, session_uuid, desktop=None, user=None, display=None, share_mode=0, **sessionopts):
+ def share_desktop_session(self, session_uuid, desktop=None, user=None, display=None, share_mode=0, check_desktop_list=False, **sessionopts):
"""\
Share another already running desktop session. Desktop sharing can be run
in two different modes: view-only and full-access mode. Like new sessions
- a to-be-shared session has be registered first with the L{X2goClient}
+ a to-be-shared session has be registered first with the L{X2GoClient}
instance.
@param desktop: desktop ID of a sharable desktop in format <user>@<display>
@@ -1482,17 +1496,17 @@ class X2goClient(object):
@type display: C{str}
@param share_mode: desktop sharing mode, 0 is VIEW-ONLY, 1 is FULL-ACCESS.
@type share_mode: C{int}
- @param sessionopts: pass-through of options directly to the session instance's L{X2goSession.share_desktop()} method
+ @param sessionopts: pass-through of options directly to the session instance's L{X2GoSession.share_desktop()} method
@type sessionopts: C{dict}
@return: True if the session could be successfully shared.
@rtype: C{bool}
- @raise X2goDesktopSharingException: if a given desktop ID does not specify an available desktop session
+ @raise X2GoDesktopSharingException: if a given desktop ID does not specify an available desktop session
"""
- # X2goClient.list_desktops() uses caching (if enabled, so we prefer lookups here...
+ # X2GoClient.list_desktops() uses caching (if enabled, so we prefer lookups here...)
if desktop:
_desktop = desktop
user = None
@@ -1500,13 +1514,11 @@ class X2goClient(object):
else:
_desktop = '%s@%s' % (user, display)
- if not _desktop in self._X2goClient__list_desktops(session_uuid):
+ if not _desktop in self._X2GoClient__list_desktops(session_uuid):
_orig_desktop = _desktop
_desktop = '%s.0' % _desktop
- if not _desktop in self._X2goClient__list_desktops(session_uuid):
- raise x2go_exceptions.X2goDesktopSharingException('No such desktop ID: %s' % _orig_desktop)
- return self.session_registry(session_uuid).share_desktop(desktop=_desktop, share_mode=share_mode, check_desktop_list=False, **sessionopts)
+ return self.session_registry(session_uuid).share_desktop(desktop=_desktop, share_mode=share_mode, check_desktop_list=check_desktop_list, **sessionopts)
__share_desktop_session = share_desktop_session
def resume_session(self, session_uuid=None, session_name=None, match_profile_name=None, **sessionopts):
@@ -1521,28 +1533,28 @@ class X2goClient(object):
@type session_name: C{str}
@param match_profile_name: only resume a session if this profile name matches
@type match_profile_name: C{str}
- @param sessionopts: pass-through of options directly to the session instance's L{X2goSession.resume()} method
+ @param sessionopts: pass-through of options directly to the session instance's L{X2GoSession.resume()} method
@type sessionopts: C{dict}
@return: returns True if this method has been successful
@rtype: C{bool}
- @raise X2goClientException: if the method does not know what session to resume
+ @raise X2GoClientException: if the method does not know what session to resume
"""
try:
if session_uuid is None and session_name is None:
- raise x2go_exceptions.X2goClientException('can\'t resume a session without either session_uuid or session_name')
+ raise x2go_exceptions.X2GoClientException('can\'t resume a session without either session_uuid or session_name')
if session_name is None and self.session_registry(session_uuid).session_name is None:
- raise x2go_exceptions.X2goClientException('don\'t know which session to resume')
+ raise x2go_exceptions.X2GoClientException('don\'t know which session to resume')
if session_uuid is None:
session_uuid = self.session_registry.get_session_of_session_name(session_name=session_name, return_object=False, match_profile_name=match_profile_name)
- return self.session_registry(session_uuid).resume(session_list=self._X2goClient__list_sessions(session_uuid=session_uuid), **sessionopts)
+ return self.session_registry(session_uuid).resume(session_list=self._X2GoClient__list_sessions(session_uuid=session_uuid), **sessionopts)
else:
- return self.session_registry(session_uuid).resume(session_name=session_name, session_list=self._X2goClient__list_sessions(session_uuid=session_uuid), **sessionopts)
- except x2go_exceptions.X2goControlSessionException:
+ return self.session_registry(session_uuid).resume(session_name=session_name, session_list=self._X2GoClient__list_sessions(session_uuid=session_uuid), **sessionopts)
+ except x2go_exceptions.X2GoControlSessionException:
profile_name = self.get_session_profile_name(session_uuid)
- self.HOOK_on_control_session_death(profile_name)
+ if self.session_registry(session_uuid).connected: self.HOOK_on_control_session_death(profile_name)
self.disconnect_profile(profile_name)
__resume_session = resume_session
@@ -1552,7 +1564,7 @@ class X2goClient(object):
Normally, you will use this method to suspend a registered session that you
have formerly started/resumed from within your recent
- L{X2goClient} instance. For this you simply call this method
+ L{X2GoClient} instance. For this you simply call this method
using the session's C{session_uuid}, leave the C{session_name}
empty.
@@ -1570,7 +1582,7 @@ class X2goClient(object):
@type session_name: C{str}
@param match_profile_name: only suspend a session if this profile name matches
@type match_profile_name: C{str}
- @param sessionopts: pass-through of options directly to the session instance's L{X2goSession.suspend()} method
+ @param sessionopts: pass-through of options directly to the session instance's L{X2GoSession.suspend()} method
@type sessionopts: C{dict}
@return: returns True if this method has been successful
@@ -1593,9 +1605,9 @@ class X2goClient(object):
if session_name == session.get_session_name():
return session.suspend()
return self.session_registry(session_uuid).control_session.suspend(session_name=session_name, **sessionopts)
- except x2go_exceptions.X2goControlSessionException:
+ except x2go_exceptions.X2GoControlSessionException:
profile_name = self.get_session_profile_name(session_uuid)
- self.HOOK_on_control_session_death(profile_name)
+ if self.session_registry(session_uuid).conntected: self.HOOK_on_control_session_death(profile_name)
self.disconnect_profile(profile_name)
__suspend_session = suspend_session
@@ -1605,7 +1617,7 @@ class X2goClient(object):
Normally you will use this method to terminate a registered session that you
have formerly started/resumed from within your recent
- L{X2goClient} instance. For this you simply call this method
+ L{X2GoClient} instance. For this you simply call this method
using the session's C{session_uuid}, leave the C{session_name}
empty.
@@ -1622,7 +1634,7 @@ class X2goClient(object):
@type session_name: C{str}
@param match_profile_name: only terminate a session if this profile name matches
@type match_profile_name: C{str}
- @param sessionopts: pass-through of options directly to the session instance's L{X2goSession.terminate()} method
+ @param sessionopts: pass-through of options directly to the session instance's L{X2GoSession.terminate()} method
@type sessionopts: C{dict}
@return: returns True if this method has been successful
@@ -1645,9 +1657,9 @@ class X2goClient(object):
if session_name == session.get_session_name():
return session.terminate()
return self.session_registry(session_uuid).control_session.terminate(session_name=session_name, **sessionopts)
- except x2go_exceptions.X2goControlSessionException:
+ except x2go_exceptions.X2GoControlSessionException:
profile_name = self.get_session_profile_name(session_uuid)
- self.HOOK_on_control_session_death(profile_name)
+ if self.session_registry(session_uuid).conntected: self.HOOK_on_control_session_death(profile_name)
self.disconnect_profile(profile_name)
__terminate_session = terminate_session
@@ -1661,7 +1673,7 @@ class X2goClient(object):
For non-profile based session this will either be a C{profile_name} that
was passed to L{register_session} or it will be the application that
- instantiated this L{X2goClient} instance.
+ instantiated this L{X2GoClient} instance.
@param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
@@ -1830,11 +1842,11 @@ class X2goClient(object):
"""
if session_uuid is None and profile_name:
- session_uuid = self._X2goClient__get_master_session(profile_name, return_object=False)
+ session_uuid = self._X2GoClient__get_master_session(profile_name, return_object=False)
if session_uuid:
try:
return self.session_registry(session_uuid).is_folder_sharing_available()
- except x2go_exceptions.X2goSessionRegistryException:
+ except x2go_exceptions.X2GoSessionRegistryException:
return False
else:
self.logger('Cannot find a terminal session for profile ,,%s\'\' that can be used to query folder sharing capabilities' % profile_name, loglevel=log.loglevel_INFO)
@@ -1869,11 +1881,11 @@ class X2goClient(object):
if folder_name: local_path = folder_name
if session_uuid is None and profile_name:
- session_uuid = self._X2goClient__get_master_session(profile_name, return_object=False)
+ session_uuid = self._X2GoClient__get_master_session(profile_name, return_object=False)
if session_uuid:
try:
return self.session_registry(session_uuid).share_local_folder(local_path=local_path)
- except x2go_exceptions.X2goSessionException:
+ except x2go_exceptions.X2GoSessionException:
return False
else:
self.logger('Cannot find a terminal session for profile ,,%s\'\' to share a local folder with' % profile_name, loglevel=log.loglevel_WARN)
@@ -1902,7 +1914,7 @@ class X2goClient(object):
"""
if session_uuid is None and profile_name:
- session_uuid = self._X2goClient__get_master_session(profile_name, return_object=False)
+ session_uuid = self._X2GoClient__get_master_session(profile_name, return_object=False)
if session_uuid:
return self.session_registry(session_uuid).unshare_all_local_folders()
else:
@@ -1927,7 +1939,7 @@ class X2goClient(object):
@param profile_name: alternatively, the profile name can be used to unshare
mounted folders
@type profile_name: C{str}
- @param local_path: the full path of a local folder that is mounted within X2go
+ @param local_path: the full path of a local folder that is mounted within X2Go
session with session ID <session_uuid> (or recognized via profile name) and that
shall be unmounted from that session.
@type local_path: C{str}
@@ -1937,7 +1949,7 @@ class X2goClient(object):
"""
if session_uuid is None and profile_name:
- session_uuid = self._X2goClient__get_master_session(profile_name, return_object=False)
+ session_uuid = self._X2GoClient__get_master_session(profile_name, return_object=False)
if session_uuid:
return self.session_registry(session_uuid).unshare_local_folder(local_path=local_path)
else:
@@ -1965,7 +1977,7 @@ class X2goClient(object):
"""
if session_uuid is None and profile_name:
- session_uuid = self._X2goClient__get_master_session(profile_name, return_object=False)
+ session_uuid = self._X2GoClient__get_master_session(profile_name, return_object=False)
if session_uuid and profile_name is None:
profile_name = self.session_registry(session_uuid).get_profile_name()
@@ -1992,7 +2004,7 @@ class X2goClient(object):
@param profile_name: the profile name that we query the master session of
@type profile_name: C{str}
- @param return_object: return L{X2goSession} instance
+ @param return_object: return L{X2GoSession} instance
@type return_object: C{bool}
@param return_session_name: return X2Go session name
@type return_session_name: C{bool}
@@ -2007,12 +2019,12 @@ class X2goClient(object):
__profile_master_session = profile_master_session
###
- ### Provide access to the X2goClient's session registry
+ ### Provide access to the X2GoClient's session registry
###
def client_connected_sessions(self, return_objects=False, return_profile_names=False, return_profile_ids=False, return_session_names=False):
"""\
- Retrieve a list of X2Go sessions that this L{X2goClient} instance is connected to.
+ Retrieve a list of X2Go sessions that this L{X2GoClient} instance is connected to.
@param return_objects: return as list of X2Go session objects
@type return_objects: C{bool}
@@ -2022,6 +2034,7 @@ class X2goClient(object):
@type return_profile_ids: C{bool}
@param return_session_names: return as list of session names
@type return_session_names: C{bool}
+
@return: list of connected sessions
@rtype: C{list}
@@ -2032,7 +2045,7 @@ class X2goClient(object):
@property
def client_has_connected_sessions(self):
"""\
- Equals C{True} if there are any connected sessions with this L{X2goClient} instance.
+ Equals C{True} if there are any connected sessions with this L{X2GoClient} instance.
"""
return self.session_registry.has_connected_sessions
@@ -2040,7 +2053,7 @@ class X2goClient(object):
def client_associated_sessions(self, return_objects=False, return_profile_names=False, return_profile_ids=False, return_session_names=False):
"""\
- Retrieve a list of X2Go sessions associated to this L{X2goClient} instance.
+ Retrieve a list of X2Go sessions associated to this L{X2GoClient} instance.
@param return_objects: return as list of X2Go session objects
@type return_objects: C{bool}
@@ -2050,6 +2063,7 @@ class X2goClient(object):
@type return_profile_ids: C{bool}
@param return_session_names: return as list of session names
@type return_session_names: C{bool}
+
@return: list of associated sessions
@rtype: C{list}
@@ -2060,7 +2074,7 @@ class X2goClient(object):
@property
def client_has_associated_sessions(self):
"""\
- Equals C{True} if there are any associated sessions with this L{X2goClient} instance.
+ Equals C{True} if there are any associated sessions with this L{X2GoClient} instance.
"""
return self.session_registry.has_associated_sessions
@@ -2078,6 +2092,7 @@ class X2goClient(object):
@type return_profile_ids: C{bool}
@param return_session_names: return as list of session names
@type return_session_names: C{bool}
+
@return: list of running sessions
@rtype: C{list}
@@ -2088,7 +2103,7 @@ class X2goClient(object):
@property
def client_has_running_sessions(self):
"""\
- Equals C{True} if there are any running sessions with this L{X2goClient} instance.
+ Equals C{True} if there are any running sessions with this L{X2GoClient} instance.
"""
return self.session_registry.has_running_sessions
@@ -2106,6 +2121,7 @@ class X2goClient(object):
@type return_profile_ids: C{bool}
@param return_session_names: return as list of session names
@type return_session_names: C{bool}
+
@return: list of suspended sessions
@rtype: C{list}
@@ -2116,7 +2132,7 @@ class X2goClient(object):
@property
def client_has_suspended_sessions(self):
"""\
- Equals C{True} if there are any suspended sessions with this L{X2goClient} instance.
+ Equals C{True} if there are any suspended sessions with this L{X2GoClient} instance.
"""
return self.session_registry.has_suspended_sessions
@@ -2134,6 +2150,7 @@ class X2goClient(object):
@type return_profile_ids: C{bool}
@param return_session_names: return as list of session names
@type return_session_names: C{bool}
+
@return: list of registered sessions
@rtype: C{list}
@@ -2158,12 +2175,78 @@ class X2goClient(object):
@type profile_name: C{str}
@return: control session instance
- @rtype: C{X2goControlSession} instance
+ @rtype: C{X2GoControlSession} instance
"""
return self.session_registry.control_session_of_profile_name(profile_name)
__client_control_session_of_profile_name = client_control_session_of_profile_name
+ def get_server_versions(self, profile_name, component=None, force=False):
+ """\
+ Query the server configured in session profile <profile_name> for the list of install X2Go components
+ and its versions.
+
+ @param profile_name: use the control session of this profile to query the X2Go server for its component list
+ @type profile_name: C{str}
+ @param component: only return the version of a specific component
+ @type component: C{str}
+ @param force: refresh component/version data by a query to the server
+ @type force: C{bool}
+
+ @return: dictionary of server components (as keys) and their versions (as values) or the version of the given <component>
+ @rtype: C{dict} or C{str}
+
+ @raise X2GoClientException: if component is not available on the X2Go Server.
+
+ """
+ control_session = self.client_control_session_of_profile_name(profile_name)
+ if component is None:
+ return control_session.get_server_versions(force=force)
+ else:
+ try:
+ return control_session.get_server_versions(force=force)[component]
+ except KeyError:
+ raise x2go_exceptions.X2GoClientException('No such component on X2Go Server')
+ __get_server_versions = get_server_versions
+ get_server_components = get_server_versions
+ __get_server_components = get_server_components
+
+ def get_server_features(self, profile_name, force=False):
+ """\
+ Query the server configured in session profile <profile_name> for the list of server-side
+ X2Go features.
+
+ @param profile_name: use the control session of this profile to query the X2Go server for its feature list
+ @type profile_name: C{str}
+ @param force: refresh feature list by a query to the server
+ @type force: C{bool}
+
+ @return: list of server feature names (as returned by server-side command ,,x2gofeaturelist''
+ @rtype: C{list}
+
+ """
+ control_session = self.client_control_session_of_profile_name(profile_name)
+ return control_session.get_server_features(force=force)
+ __get_server_features = get_server_features
+
+ def has_server_feature(self, profile_name, feature):
+ """\
+ Query the server configured in session profile <profile_name> for the availability
+ of a certain server feature.
+
+ @param profile_name: use the control session of this profile to query the X2Go server for its feature
+ @type profile_name: C{str}
+ @param feature: test the availability of this feature on the X2Go server
+ @type feature: C{str}
+
+ @return: C{True} if the feature is available on the queried server
+ @rtype: C{bool}
+
+ """
+ control_session = self.client_control_session_of_profile_name(profile_name)
+ return feature in control_session.get_server_features()
+ __has_server_feature = has_server_feature
+
def client_registered_session_of_name(self, session_name, return_object=False):
"""\
Retrieve X2Go session of a given session name.
@@ -2172,7 +2255,7 @@ class X2goClient(object):
@type session_name: C{str}
@return: session instance of the given name
- @rtype: C{X2goSession} or C{str}
+ @rtype: C{X2GoSession} or C{str}
"""
return self.session_registry.get_session_of_session_name(session_name, return_object=return_object)
@@ -2309,22 +2392,22 @@ class X2goClient(object):
"""\
Test if server that corresponds to the terminal session C{session_uuid} is alive.
- If the session is not connected anymore the L{X2goClient.HOOK_on_control_session_death()} gets called.
+ If the session is not connected anymore the L{X2GoClient.HOOK_on_control_session_death()} gets called.
@param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
- @return: C{True} if X2Go server connection for L{X2goSession} instance with <session_uuid> is alive.
+ @return: C{True} if X2Go server connection for L{X2GoSession} instance with <session_uuid> is alive.
@rtype: C{bool}
- @raise X2goControlSessionException: if the session is not connected anymore; in that case the L{HOOK_on_control_session_death} gets called.
+ @raise X2GoControlSessionException: if the session is not connected anymore; in that case the L{HOOK_on_control_session_death} gets called.
"""
try:
return self.session_registry(session_uuid).is_alive()
- except x2go_exceptions.X2goControlSessionException:
+ except x2go_exceptions.X2GoControlSessionException:
profile_name = self.get_session_profile_name(session_uuid)
- self.HOOK_on_control_session_death(profile_name)
+ if self.session_registry(session_uuid).conntected: self.HOOK_on_control_session_death(profile_name)
self.disconnect_profile(profile_name)
return False
__server_is_alive = server_is_alive
@@ -2362,7 +2445,7 @@ class X2goClient(object):
def server_running_sessions(self, session_uuid):
"""\
Retrieve a list of session names of all server-side running sessions (including those not
- instantiated by our L{X2goClient} instance).
+ instantiated by our L{X2GoClient} instance).
@param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
@@ -2370,14 +2453,14 @@ class X2goClient(object):
@return: list of session names
@rtype: C{list}
- @raise X2goClientException: if the session with UUID C{session_uuid} is not connected
+ @raise X2GoClientException: if the session with UUID C{session_uuid} is not connected
"""
- if self._X2goClient__is_session_connected(session_uuid):
- session_list = self._X2goClient__list_sessions(session_uuid)
+ if self._X2GoClient__is_session_connected(session_uuid):
+ session_list = self._X2GoClient__list_sessions(session_uuid)
return [ key for key in session_list.keys() if session_list[key].status == 'R' ]
else:
- raise x2go_exceptions.X2goClientException('X2Go session with UUID %s is not connected' % session_uuid)
+ raise x2go_exceptions.X2GoClientException('X2Go session with UUID %s is not connected' % session_uuid)
__server_running_sessions = server_running_sessions
def server_has_running_sessions(self, session_uuid):
@@ -2390,7 +2473,7 @@ class X2goClient(object):
@rtype: C{bool}
"""
- return len(self._X2goClient__server_running_sessions(session_uuid)) > 0
+ return len(self._X2GoClient__server_running_sessions(session_uuid)) > 0
__server_has_running_sessions = server_has_running_sessions
def server_has_running_session_of_name(self, session_uuid, session_name):
@@ -2403,13 +2486,13 @@ class X2goClient(object):
@type session_name: C{str}
"""
- return session_name in self._X2goClient__server_running_sessions(session_uuid)
+ return session_name in self._X2GoClient__server_running_sessions(session_uuid)
__server_has_running_session_of_name = server_has_running_session_of_name
def server_suspended_sessions(self, session_uuid):
"""\
Retrieve a list of session names of all server-side suspended sessions (including those not
- instantiated by our L{X2goClient} instance).
+ instantiated by our L{X2GoClient} instance).
@param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
@@ -2417,14 +2500,14 @@ class X2goClient(object):
@return: list of session names
@rtype: C{list}
- @raise X2goClientException: if the session with UUID C{session_uuid} is not connected
+ @raise X2GoClientException: if the session with UUID C{session_uuid} is not connected
"""
- if self._X2goClient__is_session_connected(session_uuid):
- session_list = self._X2goClient__list_sessions(session_uuid)
+ if self._X2GoClient__is_session_connected(session_uuid):
+ session_list = self._X2GoClient__list_sessions(session_uuid)
return [ key for key in session_list.keys() if session_list[key].status == 'S' ]
else:
- raise x2go_exceptions.X2goClientException('X2Go session with UUID %s is not connected' % session_uuid)
+ raise x2go_exceptions.X2GoClientException('X2Go session with UUID %s is not connected' % session_uuid)
__server_suspended_sessions = server_suspended_sessions
def server_has_suspended_sessions(self, session_uuid):
@@ -2435,7 +2518,7 @@ class X2goClient(object):
@type session_uuid: C{str}
"""
- return len(self._X2goClient__server_suspended_sessions(session_uuid)) > 0
+ return len(self._X2GoClient__server_suspended_sessions(session_uuid)) > 0
__server_has_suspended_sessions = server_has_suspended_sessions
def server_has_suspended_session_of_name(self, session_uuid, session_name):
@@ -2450,7 +2533,7 @@ class X2goClient(object):
@rtype: C{bool}
"""
- return session_name in self._X2goClient__server_suspended_sessions(session_uuid)
+ return session_name in self._X2GoClient__server_suspended_sessions(session_uuid)
__server_has_suspended_session_of_name = server_has_suspended_session_of_name
###
@@ -2463,9 +2546,9 @@ class X2goClient(object):
connected user on the remote X2Go server and terminate them.
Before calling this method you have to setup a pro forma remote X2Go session
- with L{X2goClient.register_session()} (even if you do not intend to open
+ with L{X2GoClient.register_session()} (even if you do not intend to open
a real X2Go session window on the remote server) and connect to this session (with
- L{X2goClient.connect_session()}.
+ L{X2GoClient.connect_session()}.
@param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
@@ -2491,9 +2574,9 @@ class X2goClient(object):
connected X2Go server (for the authenticated user).
Before calling this method you have to setup a pro forma remote X2Go session
- with L{X2goClient.register_session()} (even if you do not intend to open
+ with L{X2GoClient.register_session()} (even if you do not intend to open
a real X2Go session window on the remote server) and connect to this session (with
- L{X2goClient.connect_session()}.
+ L{X2GoClient.connect_session()}.
@param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
@@ -2510,12 +2593,12 @@ class X2goClient(object):
session registry according to the obtained information
@type update_sessionregistry: C{bool}
@param register_sessions: query the X2Go server directly and register newly found X2Go session
- as L{X2goSession} instances associated to this L{X2goClient} instance
+ as L{X2GoSession} instances associated to this L{X2GoClient} instance
@type register_sessions: C{bool}
- @param raw: output the session list in X2go's raw C{x2golistsessions} format
+ @param raw: output the session list in X2Go's raw C{x2golistsessions} format
@type raw: C{bool}
- @raise X2goClientException: if the session profile specified by C{session_uuid}, C{profile_name} or C{profile_id} is not connected
+ @raise X2GoClientException: if the session profile specified by C{session_uuid}, C{profile_name} or C{profile_id} is not connected
or if none of the named parameters has been specified
"""
@@ -2530,12 +2613,12 @@ class X2goClient(object):
# thus, we simply grab the first that comes in...
session_uuid = _connected_sessions[0].get_uuid()
else:
- raise x2go_exceptions.X2goClientException('profile ,,%s\'\' is not connected' % profile_name)
+ raise x2go_exceptions.X2GoClientException('profile ,,%s\'\' is not connected' % profile_name)
elif session_uuid is not None:
pass
else:
- raise x2go_exceptions.X2goClientException('must either specify session UUID or profile name')
+ raise x2go_exceptions.X2GoClientException('must either specify session UUID or profile name')
if raw:
return self.session_registry(session_uuid).list_sessions(raw=raw)
@@ -2565,6 +2648,7 @@ class X2goClient(object):
def list_desktops(self, session_uuid=None,
profile_name=None, profile_id=None,
no_cache=False, refresh_cache=False,
+ exclude_session_types=[],
raw=False):
"""\
Use the X2Go session registered under C{session_uuid} to
@@ -2572,9 +2656,9 @@ class X2goClient(object):
for desktop sharing.
Before calling this method you have to setup a pro forma remote X2Go session
- with L{X2goClient.register_session()} (even if you do not intend to open
+ with L{X2GoClient.register_session()} (even if you do not intend to open
a real X2Go session window on the remote server) and connect to this session (with
- L{X2goClient.connect_session()}.
+ L{X2GoClient.connect_session()}.
@param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
@@ -2582,15 +2666,22 @@ class X2goClient(object):
@type profile_name: C{str}
@param profile_id: use profile id instead of <profile_name> or <session_uuid>
@type profile_id: C{str}
- @param no_cache: do not get the session list from cache, query the X2Go server directly
+ @param no_cache: do not get the desktop list from cache, query the X2Go server directly
@type no_cache: C{bool}
- @param raw: output the session list in X2go's raw C{x2golistdesktops} format
+ @param refresh_cache: query the X2Go server directly and update the desktop list cache
+ with the new information
+ @type refresh_cache: C{bool}
+ @param excluded_session_types: session types (e.g. "D", "R", "S" or "P") to be excluded from the
+ returned list of sharable desktops (this only works for sharing someone's own sessions, for
+ sharing other users' sessions, the X2Go Desktop Sharing decides on what is sharable and what not).
+ @type excluded_session_types: C{list}
+ @param raw: output the session list in X2Go's raw C{x2golistdesktops} format
@type raw: C{bool}
@return: a list of available desktops to be shared
@rtype: C{list}
- @raise X2goClientException: if the session profile specified by C{session_uuid}, C{profile_name} or C{profile_id} is not connected
+ @raise X2GoClientException: if the session profile specified by C{session_uuid}, C{profile_name} or C{profile_id} is not connected
or if none of the named parameters has been specified
"""
@@ -2605,12 +2696,12 @@ class X2goClient(object):
# thus, we simply grab the first that comes in...
session_uuid = _connected_sessions[0].get_uuid()
else:
- raise x2go_exceptions.X2goClientException('profile ,,%s\'\' is not connected' % profile_name)
+ raise x2go_exceptions.X2GoClientException('profile ,,%s\'\' is not connected' % profile_name)
elif session_uuid is not None:
pass
else:
- raise x2go_exceptions.X2goClientException('must either specify session UUID or profile name')
+ raise x2go_exceptions.X2GoClientException('must either specify session UUID or profile name')
if raw:
return self.session_registry(session_uuid).list_desktops(raw=raw)
@@ -2622,6 +2713,23 @@ class X2goClient(object):
self.__update_cache_by_session_uuid(session_uuid, update_sessions=False, update_desktops=True)
_desktop_list = self.listsessions_cache.list_desktops(session_uuid)
+ # attempt to exclude session types that are requested to be excluded
+ if exclude_session_types:
+
+ # create an X2GoServerSessionList* instance and operate on that
+ session_list = self.list_backend()
+ session_list.set_sessions(self._X2GoClient__list_sessions(session_uuid))
+
+ # search for a match among the listed sessions
+ for desktop in copy.deepcopy(_desktop_list):
+ user = desktop.split('@')[0]
+ if user == self.get_session_username(session_uuid):
+ display = desktop.split('@')[1]
+ session = session_list.get_session_with('display', display, hostname=self.get_session_server_hostname(session_uuid))
+ if session is None: continue
+ if session.get_session_type() in exclude_session_types:
+ _desktop_list.remove(desktop)
+
return _desktop_list
__list_desktops = list_desktops
@@ -2636,7 +2744,7 @@ class X2goClient(object):
@type profile_name: C{str}
@param no_cache: do not get the session list from cache, query the X2Go server directly
@type no_cache: C{bool}
- @param raw: output the session list in X2go's raw C{x2golistmounts} format
+ @param raw: output the session list in X2Go's raw C{x2golistmounts} format
@type raw: C{bool}
@return: list of server-side mounted shares for a given profile name
@@ -2667,7 +2775,7 @@ class X2goClient(object):
@type session_uuid: C{str}
@param no_cache: do not get the session list from cache, query the X2Go server directly
@type no_cache: C{bool}
- @param raw: output the session list in X2go's raw C{x2golistmounts} format
+ @param raw: output the session list in X2Go's raw C{x2golistmounts} format
@type raw: C{bool}
@return: list of server-side mounted shares for a given session UUID
@@ -2693,14 +2801,14 @@ class X2goClient(object):
def get_profiles(self):
"""\
- Returns the L{X2goClient} instance's C{X2goSessionProfiles*} object.
+ Returns the L{X2GoClient} instance's C{X2GoSessionProfiles*} object.
Use this method for object retrieval if you want to modify the ÂģsessionsÂĢ
configuration node (e.g. in ~/.x2goclient with the FILE backend) from within your
Python X2Go based application.
return: returns the client's session profiles instance
- rtype: C{X2goSessionProfiles*} instance
+ rtype: C{X2GoSessionProfiles*} instance
"""
return self.session_profiles
@@ -2711,7 +2819,7 @@ class X2goClient(object):
@property
def profile_names(self):
"""\
- Equals a list of all profile names that are known to this L{X2goClient} instance.
+ Equals a list of all profile names that are known to this L{X2GoClient} instance.
"""
return self.session_profiles.profile_names
@@ -2719,7 +2827,7 @@ class X2goClient(object):
def get_client_settings(self):
"""\
- Returns the L{X2goClient} instance's C{X2goClientSettings*} object.
+ Returns the L{X2GoClient} instance's C{X2GoClientSettings*} object.
Use this method for object retrieval if you want to modify the ÂģsettingsÂĢ
configuration node (e.g. in ~/.x2goclient with the FILE backend) from within your
@@ -2734,7 +2842,7 @@ class X2goClient(object):
def get_client_printing(self):
"""\
- Returns the L{X2goClient} instance's C{X2goClientPrinting*} object.
+ Returns the L{X2GoClient} instance's C{X2GoClientPrinting*} object.
Use this method for object retrieval if you want to modify the printing
configuration node (e.g. in ~/.x2goclient with the FILE backend) from within your
@@ -2854,7 +2962,7 @@ class X2goClient(object):
def disconnect_profile(self, profile_name):
"""\
- Disconnect all L{X2goSession} instances that relate to C{profile_name} by closing down their
+ Disconnect all L{X2GoSession} instances that relate to C{profile_name} by closing down their
Paramiko/SSH Transport thread.
@param profile_name: the X2Go session profile name
@@ -2887,33 +2995,33 @@ class X2goClient(object):
@param profile_name: the X2Go session profile name
@type profile_name: C{str}
@param session_list: a manually passed on list of X2Go sessions
- @type session_list: C{X2goServerList*} instances
+ @type session_list: C{X2GoServerList*} instances
"""
session_uuids = self.client_registered_sessions_of_profile_name(profile_name, return_objects=False)
if session_uuids:
if session_list is None:
- session_list = self._X2goClient__list_sessions(session_uuids[0],
+ session_list = self._X2GoClient__list_sessions(session_uuids[0],
update_sessionregistry=False,
register_sessions=False,
)
try:
self.session_registry.update_status(profile_name=profile_name, session_list=session_list)
- except x2go_exceptions.X2goControlSessionException:
- self.HOOK_on_control_session_death(profile_name)
+ except x2go_exceptions.X2GoControlSessionException:
+ if self.session_registry(session_uuids[0]).connected: self.HOOK_on_control_session_death(profile_name)
self.disconnect_profile(profile_name)
__update_sessionregistry_status_by_profile_name = update_sessionregistry_status_by_profile_name
def update_sessionregistry_status_by_session_uuid(self, session_uuid):
"""\
- Update the session registry status of a specific L{X2goSession} instance with
+ Update the session registry status of a specific L{X2GoSession} instance with
session identifier <session_uuid>.
@param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
"""
- session_list = self._X2goClient__list_sessions(session_uuid, update_sessionregistry=False, register_sessions=False)
+ session_list = self._X2GoClient__list_sessions(session_uuid, update_sessionregistry=False, register_sessions=False)
if session_list:
self.session_registry.update_status(session_uuid=session_uuid, session_list=session_list)
__update_sessionregistry_status_by_session_uuid = update_sessionregistry_status_by_session_uuid
@@ -2953,14 +3061,15 @@ class X2goClient(object):
_update_mounts = ('mounts' in cache_types) or update_mounts
try:
self.listsessions_cache.update(profile_name, update_sessions=_update_sessions, update_desktops=_update_desktops, update_mounts=_update_mounts, )
- except x2go_exceptions.X2goControlSessionException:
- self.HOOK_on_control_session_death(profile_name)
+ except x2go_exceptions.X2GoControlSessionException:
+ c_sessions = self.client_connected_sessions_of_profile_name(profile_name, return_objects=True)
+ if len(c_sessions) and c_sessions[0].connected: self.HOOK_on_control_session_death(profile_name)
self.disconnect_profile(profile_name)
__update_cache_by_profile_name = update_cache_by_profile_name
def update_cache_by_session_uuid(self, session_uuid, cache_types=('sessions'), update_sessions=None, update_desktops=None, update_mounts=None):
"""\
- Update the session list cache of a specific L{X2goSession} instance with
+ Update the session list cache of a specific L{X2GoSession} instance with
session identifier <session_uuid>.
@param session_uuid: the X2Go session's UUID registry hash
@@ -3033,21 +3142,22 @@ class X2goClient(object):
"""
if profile_name not in self.client_connected_profiles(return_profile_names=True):
return
- session_list = self._X2goClient__list_sessions(profile_name=profile_name,
+ session_list = self._X2GoClient__list_sessions(profile_name=profile_name,
update_sessionregistry=False,
register_sessions=False,
)
try:
self.session_registry.register_available_server_sessions(profile_name, session_list=session_list, re_register=re_register, skip_pubapp_sessions=skip_pubapp_sessions)
- except x2go_exceptions.X2goControlSessionException, e:
- self.HOOK_on_control_session_death(profile_name)
+ except x2go_exceptions.X2GoControlSessionException, e:
+ c_sessions = self.client_connected_sessions_of_profile_name(profile_name, return_objects=True)
+ if len(c_sessions) and c_sessions[0].connected: self.HOOK_on_control_session_death(profile_name)
self.disconnect_profile(profile_name)
raise e
__register_available_server_sessions_by_profile_name = register_available_server_sessions_by_profile_name
def register_available_server_sessions_by_session_uuid(self, session_uuid, skip_pubapp_sessions=False):
"""\
- Register available sessions that are found on the X2Go server that the L{X2goSession} instance
+ Register available sessions that are found on the X2Go server that the L{X2GoSession} instance
with session identifier <session_uuid> is connected to.
@param session_uuid: the X2Go session's UUID registry hash
@@ -3071,6 +3181,6 @@ class X2goClient(object):
for profile_name in self.client_connected_profiles(return_profile_names=True):
try:
self.__register_available_server_sessions_by_profile_name(profile_name, skip_pubapp_sessions=skip_pubapp_sessions)
- except x2go_exceptions.X2goSessionRegistryException:
+ except x2go_exceptions.X2GoSessionRegistryException:
pass
__register_available_server_sessions_all_profiles = register_available_server_sessions_all_profiles
diff --git a/x2go/defaults.py b/x2go/defaults.py
index 15ea901..d6d0473 100644
--- a/x2go/defaults.py
+++ b/x2go/defaults.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -96,56 +96,56 @@ else:
##
BACKENDS_CONTROLSESSION = {
- 'STDOUT': 'X2goControlSessionSTDOUT',
+ 'STDOUT': 'X2GoControlSessionSTDOUT',
}
BACKENDS_TERMINALSESSION = {
- 'STDOUT': 'X2goTerminalSessionSTDOUT',
+ 'STDOUT': 'X2GoTerminalSessionSTDOUT',
}
BACKENDS_SERVERSESSIONINFO = {
- 'STDOUT': 'X2goServerSessionInfoSTDOUT',
+ 'STDOUT': 'X2GoServerSessionInfoSTDOUT',
}
BACKENDS_SERVERSESSIONLIST = {
- 'STDOUT': 'X2goServerSessionListSTDOUT',
+ 'STDOUT': 'X2GoServerSessionListSTDOUT',
}
BACKENDS_PROXY = {
- 'NX3': 'X2goProxyNX3',
+ 'NX3': 'X2GoProxyNX3',
}
-BACKEND_CONTROLSESSION_DEFAULT = 'X2goControlSessionSTDOUT'
-BACKEND_TERMINALSESSION_DEFAULT = 'X2goTerminalSessionSTDOUT'
-BACKEND_SERVERSESSIONINFO_DEFAULT = 'X2goServerSessionInfoSTDOUT'
-BACKEND_SERVERSESSIONLIST_DEFAULT = 'X2goServerSessionListSTDOUT'
-BACKEND_PROXY_DEFAULT = 'X2goProxyNX3'
+BACKEND_CONTROLSESSION_DEFAULT = 'X2GoControlSessionSTDOUT'
+BACKEND_TERMINALSESSION_DEFAULT = 'X2GoTerminalSessionSTDOUT'
+BACKEND_SERVERSESSIONINFO_DEFAULT = 'X2GoServerSessionInfoSTDOUT'
+BACKEND_SERVERSESSIONLIST_DEFAULT = 'X2GoServerSessionListSTDOUT'
+BACKEND_PROXY_DEFAULT = 'X2GoProxyNX3'
##
## profile backend defaults
##
BACKENDS_SESSIONPROFILES = {
- 'FILE': 'X2goSessionProfilesFILE',
- 'GCONF': 'X2goSessionProfilesGCONF',
- 'HTTPSBROKER': 'X2goSessionProfilesHTTPSBROKER',
- 'WINREG': 'X2goSessionProfilesWINREG',
+ 'FILE': 'X2GoSessionProfilesFILE',
+ 'GCONF': 'X2GoSessionProfilesGCONF',
+ 'HTTPSBROKER': 'X2GoSessionProfilesHTTPSBROKER',
+ 'WINREG': 'X2GoSessionProfilesWINREG',
}
"""Python X2Go backends for storing session profiles."""
BACKENDS_CLIENTSETTINGS = {
- 'FILE': 'X2goClientSettingsFILE',
- 'GCONF': 'X2goClientSettingsGCONF',
- 'HTTPSBROKER': 'X2goClientSettingsHTTPSBROKER',
- 'WINREG': 'X2goClientSettingsWINREG',
+ 'FILE': 'X2GoClientSettingsFILE',
+ 'GCONF': 'X2GoClientSettingsGCONF',
+ 'HTTPSBROKER': 'X2GoClientSettingsHTTPSBROKER',
+ 'WINREG': 'X2GoClientSettingsWINREG',
}
"""Python X2Go backends for storing client settings."""
BACKENDS_CLIENTPRINTING = {
- 'FILE': 'X2goClientPrintingFILE',
- 'GCONF': 'X2goClientPrintingGCONF',
- 'HTTPSBROKER': 'X2goClientPrintingHTTPSBROKER',
- 'WINREG': 'X2goClientPrintingWINREG',
+ 'FILE': 'X2GoClientPrintingFILE',
+ 'GCONF': 'X2GoClientPrintingGCONF',
+ 'HTTPSBROKER': 'X2GoClientPrintingHTTPSBROKER',
+ 'WINREG': 'X2GoClientPrintingWINREG',
}
"""Python X2Go backends for storing print settings."""
-BACKEND_SESSIONPROFILES_DEFAULT = 'X2goSessionProfilesFILE'
-BACKEND_CLIENTSETTINGS_DEFAULT = 'X2goClientSettingsFILE'
-BACKEND_CLIENTPRINTING_DEFAULT = 'X2goClientPrintingFILE'
+BACKEND_SESSIONPROFILES_DEFAULT = 'X2GoSessionProfilesFILE'
+BACKEND_CLIENTSETTINGS_DEFAULT = 'X2GoClientSettingsFILE'
+BACKEND_CLIENTPRINTING_DEFAULT = 'X2GoClientPrintingFILE'
##
## X2Go Printing
@@ -181,7 +181,7 @@ X2GO_CLIENTSETTINGS_DEFAULTS = {
'port2': 0,
},
'General': {
- # clientport is not needed for Python X2go
+ # clientport is not needed for Python X2Go
'clientport': 22,
'autoresume': True,
},
@@ -211,9 +211,9 @@ X2GO_CLIENTPRINTING_DEFAULTS = {
'startcmd': False,
# print command for non-CUPS printing
'command': 'lpr',
- # ignored in Python X2go
+ # ignored in Python X2Go
'stdin': False,
- # ignored in Python X2go
+ # ignored in Python X2Go
'ps': False,
},
'save': {
@@ -289,18 +289,19 @@ else:
X2GO_CLIENTXCONFIG_DEFAULTS = {}
X2GO_GENERIC_APPLICATIONS = [ 'WWWBROWSER', 'MAILCLIENT', 'OFFICE', 'TERMINAL', ]
-"""X2go's generic applications."""
+"""X2Go's generic applications."""
X2GO_SESSIONPROFILE_DEFAULTS = {
'autologin': True, 'autoconnect': False, 'autostart': False, 'setsessiontitle': False, 'sessiontitle': "",
'speed': 2, 'pack': '16m-jpeg', 'quality': 9,
'iconvto': 'UTF-8', 'iconvfrom': 'UTF-8', 'useiconv': False,
- 'usesshproxy': False, 'sshproxyhost': 'proxyhost.mydomain', 'sshproxyport': 22, 'sshproxyuser': '', 'sshproxytunnel': 'localhost:44444:server.mydomain.private:22', 'sshproxykeyfile': '',
+ 'usesshproxy': False, 'sshproxyhost': 'proxyhost.mydomain', 'sshproxyport': 22, 'sshproxyuser': '', 'sshproxykeyfile': '',
'sshproxytype': 'SSH', 'sshproxysameuser': False, 'sshproxysamepass': False, 'sshproxyautologin': True,
+ 'uniquehostkeyaliases': False,
'useexports': True, 'restoreexports': False, 'fstunnel': True, 'export': '',
'usemimebox': False, 'mimeboxextensions': '', 'mimeboxaction': 'OPEN',
'fullscreen': False,
- 'width': 800,'height': 600, 'maxdim': False, 'dpi': 96, 'setdpi': False, 'xinerama': False, 'multidisp': False,
+ 'width': 800,'height': 600, 'maxdim': False, 'dpi': 96, 'setdpi': False, 'xinerama': False, 'multidisp': False, 'display': 1,
'usekbd': True, 'layout': 'us', 'type': 'pc105/us', 'variant': '',
'sound': False, 'soundsystem': 'pulse', 'startsoundsystem': False, 'soundtunnel':True, 'defsndport':True, 'sndport':4713,
'name': 'NEW_PROFILE', 'icon': ':icons/128x128/x2gosession.png',
@@ -311,7 +312,7 @@ X2GO_SESSIONPROFILE_DEFAULTS = {
'print': False,
'xdmcpserver': 'localhost',
}
-"""L{X2goSessionProfiles} default values to fill a new session profile with."""
+"""L{X2GoSessionProfiles} default values to fill a new session profile with."""
##
## X2Go Proxy defaults
##
@@ -381,7 +382,7 @@ X2GO_DESKTOPSESSIONS={
'TRINITY': 'starttrinity',
'UNITY': 'unity',
}
-"""A dictionary with meta-commands for X2go's window manager sessions."""
+"""A dictionary with meta-commands for X2Go's window manager sessions."""
##
## X2Go SFTP server defaults
@@ -397,11 +398,11 @@ application instance.
"""
X2GO_PRINT_ACTIONS = {
- 'PDFVIEW': 'X2goPrintActionPDFVIEW',
- 'PDFSAVE': 'X2goPrintActionPDFSAVE',
- 'PRINT': 'X2goPrintActionPRINT',
- 'PRINTCMD': 'X2goPrintActionPRINTCMD',
- 'DIALOG': 'X2goPrintActionDIALOG',
+ 'PDFVIEW': 'X2GoPrintActionPDFVIEW',
+ 'PDFSAVE': 'X2GoPrintActionPDFSAVE',
+ 'PRINT': 'X2GoPrintActionPRINT',
+ 'PRINTCMD': 'X2GoPrintActionPRINTCMD',
+ 'DIALOG': 'X2GoPrintActionDIALOG',
}
"""Relating print action names and classes."""
@@ -413,9 +414,9 @@ DEFAULT_PRINTCMD_CMD = 'lpr'
"""Default command for the PRINTCMD print action."""
X2GO_MIMEBOX_ACTIONS = {
- 'OPEN': 'X2goMIMEboxActionOPEN',
- 'OPENWITH': 'X2goMIMEboxActionOPENWITH',
- 'SAVEAS': 'X2goMIMEboxActionSAVEAS',
+ 'OPEN': 'X2GoMIMEboxActionOPEN',
+ 'OPENWITH': 'X2GoMIMEboxActionOPENWITH',
+ 'SAVEAS': 'X2GoMIMEboxActionSAVEAS',
}
"""Relating MIME box action names and classes."""
diff --git a/x2go/forward.py b/x2go/forward.py
index f626efc..e9e776a 100644
--- a/x2go/forward.py
+++ b/x2go/forward.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -36,13 +36,13 @@ from gevent.server import StreamServer
import log
from defaults import X2GOCLIENT_OS as _X2GOCLIENT_OS
-class X2goFwServer(StreamServer):
+class X2GoFwServer(StreamServer):
"""\
- L{X2goFwServer} implements a gevent's StreamServer based Paramiko/SSH port
+ L{X2GoFwServer} implements a gevent's StreamServer based Paramiko/SSH port
forwarding server.
- An L{X2goFwServer} class object is used to tunnel graphical trafic
- through an external proxy command launched by a C{X2goProxy*} backend.
+ An L{X2GoFwServer} class object is used to tunnel graphical trafic
+ through an external proxy command launched by a C{X2GoProxy*} backend.
"""
def __init__ (self, listener, remote_host, remote_port, ssh_transport, session_instance=None, session_name=None, logger=None, loglevel=log.loglevel_DEFAULT,):
@@ -55,21 +55,21 @@ class X2goFwServer(StreamServer):
@type remote_port: C{int}
@param ssh_transport: a valid Paramiko/SSH transport object
@type ssh_transport: C{obj}
- @param session_instance: the complete L{X2goSession} instance of the X2Go session this port forwarding server belongs to.
- Note: for new L{X2goSession} instances the object has the session name not yet set(!!!)
+ @param session_instance: the complete L{X2GoSession} instance of the X2Go session this port forwarding server belongs to.
+ Note: for new L{X2GoSession} instances the object has the session name not yet set(!!!)
@type session_instance: C{obj}
@param session_name: the session name of the X2Go session this port forwarding server belongs to
@type session_name: C{str}
- @param logger: you can pass an L{X2goLogger} object to the
- L{X2goFwServer} constructor
+ @param logger: you can pass an L{X2GoLogger} object to the
+ L{X2GoFwServer} constructor
@type logger: C{obj}
- @param loglevel: if no L{X2goLogger} object has been supplied a new one will be
+ @param loglevel: if no L{X2GoLogger} object has been supplied a new one will be
constructed with the given loglevel
@type loglevel: C{int}
"""
if logger is None:
- self.logger = log.X2goLogger(loglevel=loglevel)
+ self.logger = log.X2GoLogger(loglevel=loglevel)
else:
self.logger = copy.deepcopy(logger)
self.logger.tag = __NAME__
@@ -240,18 +240,18 @@ def start_forward_tunnel(local_host='127.0.0.1', local_port=22022,
@type remote_port: C{int}
@param ssh_transport: the Paramiko/SSH transport (i.e. the X2Go session's Paramiko/SSH transport object)
@type ssh_transport: C{obj}
- @param session_instance: the L{X2goSession} instance that initiates this tunnel
+ @param session_instance: the L{X2GoSession} instance that initiates this tunnel
@type session_instance: C{obj}
@param session_name: the session name of the X2Go session this port forwarding server belongs to
@type session_name: C{str}
- @param logger: an X2goLogger object
+ @param logger: an X2GoLogger object
@type logger: C{obj}
- @return: returns an L{X2goFwServer} instance
+ @return: returns an L{X2GoFwServer} instance
@rtype: C{obj}
"""
- fw_server = X2goFwServer(listener=(local_host, local_port),
+ fw_server = X2GoFwServer(listener=(local_host, local_port),
remote_host=remote_host, remote_port=remote_port,
ssh_transport=ssh_transport,
session_instance=session_instance, session_name=session_name,
@@ -270,7 +270,7 @@ def stop_forward_tunnel(fw_server):
"""\
Tear down a given Paramiko/SSH port forwarding tunnel.
- @param fw_server: an L{X2goFwServer} instance as returned by the L{start_forward_tunnel()} function
+ @param fw_server: an L{X2GoFwServer} instance as returned by the L{start_forward_tunnel()} function
@type fw_server: C{obj}
"""
diff --git a/x2go/gevent_subprocess.py b/x2go/gevent_subprocess.py
index 6bd6294..cdc3879 100644
--- a/x2go/gevent_subprocess.py
+++ b/x2go/gevent_subprocess.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
diff --git a/x2go/guardian.py b/x2go/guardian.py
index 5e035ff..7ccf0a5 100644
--- a/x2go/guardian.py
+++ b/x2go/guardian.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -18,7 +18,7 @@
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
"""\
-X2goSessionGuardian class - a guardian thread that controls X2Go session threads
+X2GoSessionGuardian class - a guardian thread that controls X2Go session threads
and their sub-threads (like reverse forwarding tunnels, Paramiko transport threads,
etc.).
@@ -34,14 +34,14 @@ import copy
from cleanup import x2go_cleanup
import log
-class X2goSessionGuardian(threading.Thread):
+class X2GoSessionGuardian(threading.Thread):
"""\
- L{X2goSessionGuardian} thread controls X2Go session threads and their sub-threads (like
+ L{X2GoSessionGuardian} thread controls X2Go session threads and their sub-threads (like
reverse forwarding tunnels, Paramiko transport threads, etc.). Its main function is
to tidy up once a session gets interrupted (SIGTERM, SIGINT).
- There is one L{X2goSessionGuardian} for each L{X2goClient} instance (thus: for normal
- setups there should be _one_ L{X2goClient} and _one_ L{X2goSessionGuardian} in use).
+ There is one L{X2GoSessionGuardian} for each L{X2GoClient} instance (thus: for normal
+ setups there should be _one_ L{X2GoClient} and _one_ L{X2GoSessionGuardian} in use).
"""
def __init__(self, client_instance,
@@ -54,11 +54,11 @@ class X2goSessionGuardian(threading.Thread):
refresh_interval=5,
logger=None, loglevel=log.loglevel_DEFAULT):
"""\
- @param auto_update_listsessions_cache: let L{X2goSessionGuardian} refresh the session list cache for all L{X2goSession} objects
+ @param auto_update_listsessions_cache: let L{X2GoSessionGuardian} refresh the session list cache for all L{X2GoSession} objects
@type auto_update_listsessions_cache: C{bool}
- @param auto_update_listdesktops_cache: let L{X2goSessionGuardian} refresh desktop lists in the session list cache for all L{X2goSession} objects
+ @param auto_update_listdesktops_cache: let L{X2GoSessionGuardian} refresh desktop lists in the session list cache for all L{X2GoSession} objects
@type auto_update_listdesktops_cache: C{bool}
- @param auto_update_listmounts_cache: let L{X2goSessionGuardian} refresh mount lists in the session list cache for all L{X2goSession} objects
+ @param auto_update_listmounts_cache: let L{X2GoSessionGuardian} refresh mount lists in the session list cache for all L{X2GoSession} objects
@type auto_update_listmounts_cache: C{bool}
@param auto_update_sessionregistry: if set to C{True} the session status will be updated in regular intervals
@type auto_update_sessionregistry: C{bool}
@@ -69,15 +69,15 @@ class X2goSessionGuardian(threading.Thread):
@type no_auto_reg_pubapp_sessions: C{bool}
@param refresh_interval: refresh cache and session registry every <refresh_interval> seconds
@type refresh_interval: C{int}
- @param logger: you can pass an L{X2goLogger} object to the L{X2goSessionGuardian} constructor
+ @param logger: you can pass an L{X2GoLogger} object to the L{X2GoSessionGuardian} constructor
@type logger: C{obj}
- @param loglevel: if no L{X2goLogger} object has been supplied a new one will be
+ @param loglevel: if no L{X2GoLogger} object has been supplied a new one will be
constructed with the given loglevel
@type loglevel: C{int}
"""
if logger is None:
- self.logger = log.X2goLogger(loglevel=loglevel)
+ self.logger = log.X2GoLogger(loglevel=loglevel)
else:
self.logger = copy.deepcopy(logger)
self.logger.tag = __NAME__
@@ -97,7 +97,7 @@ class X2goSessionGuardian(threading.Thread):
def guardian(self):
"""\
- The handler of this L{X2goSessionGuardian} thread.
+ The handler of this L{X2GoSessionGuardian} thread.
"""
seconds = 0
@@ -132,7 +132,7 @@ class X2goSessionGuardian(threading.Thread):
def stop_thread(self):
"""\
- Stop this L{X2goSessionGuardian} thread.
+ Stop this L{X2GoSessionGuardian} thread.
"""
self._keepalive = False
diff --git a/x2go/inifiles.py b/x2go/inifiles.py
index 996cf83..7650d9e 100644
--- a/x2go/inifiles.py
+++ b/x2go/inifiles.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -24,7 +24,7 @@
# none so far
"""\
-X2goProcessIniFile - helper class for parsing .ini files
+X2GoProcessIniFile - helper class for parsing .ini files
"""
__NAME__ = 'x2goinifiles-pylib'
@@ -41,14 +41,14 @@ from defaults import LOCAL_HOME as _current_home
import log
import utils
-class X2goIniFile(object):
+class X2GoIniFile(object):
"""
- Base class for processing the different ini files used by X2go
+ Base class for processing the different ini files used by X2Go
clients. Primarily used to standardize the content of the different
X2Go client ini file (settings, printing, sessions, xconfig).
If entries are omitted in an ini file, they are filled with
- default values (as hard coded in Python X2go), so the resulting objects
+ default values (as hard coded in Python X2Go), so the resulting objects
always contain the same fields.
"""
@@ -66,12 +66,12 @@ class X2goIniFile(object):
directory filename)
@type config_files: C{list}
@param defaults: a cascaded Python dicitionary structure with ini file defaults (to override
- Python X2go's hard coded defaults in L{defaults}
+ Python X2Go's hard coded defaults in L{defaults}
@type defaults: C{dict}
- @param logger: you can pass an L{X2goLogger} object to the
- L{X2goIniFile} constructor
- @type logger: L{X2goLogger} instance
- @param loglevel: if no L{X2goLogger} object has been supplied a new one will be
+ @param logger: you can pass an L{X2GoLogger} object to the
+ L{X2GoIniFile} constructor
+ @type logger: L{X2GoLogger} instance
+ @param loglevel: if no L{X2GoLogger} object has been supplied a new one will be
constructed with the given loglevel
@type loglevel: C{int}
@@ -81,7 +81,7 @@ class X2goIniFile(object):
config_files = []
if logger is None:
- self.logger = log.X2goLogger(loglevel=loglevel)
+ self.logger = log.X2GoLogger(loglevel=loglevel)
else:
self.logger = copy.deepcopy(logger)
self.logger.tag = __NAME__
@@ -131,7 +131,7 @@ class X2goIniFile(object):
self._fill_defaults()
def __repr__(self):
- result = 'X2goIniFile('
+ result = 'X2GoIniFile('
for p in dir(self):
if '__' in p or not p in self.__dict__ or type(p) is types.InstanceType: continue
result += p + '=' + str(self.__dict__[p]) + ','
@@ -204,12 +204,20 @@ class X2goIniFile(object):
For writing the first of the C{config_files} specified on instance construction
that is writable will be used.
+ @return: C{True} if the user config file has been successfully writte, C{False} otherwise.
+ @rtype: C{bool}
+
"""
if self.user_config_file and self.write_user_config:
- fd = open(self.user_config_file, 'wb')
- self.iniConfig.write(fd)
- fd.close()
- self.write_user_config = False
+ try:
+ fd = open(self.user_config_file, 'wb')
+ self.iniConfig.write(fd)
+ fd.close()
+ self.write_user_config = False
+ return True
+ except Exception, e:
+ print e
+ return False
def get_type(self, section, key):
"""\
diff --git a/x2go/log.py b/x2go/log.py
index 7454f8b..c1d538d 100644
--- a/x2go/log.py
+++ b/x2go/log.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -18,7 +18,7 @@
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
"""\
-X2goLogger class - flexible handling of log and debug output.
+X2GoLogger class - flexible handling of log and debug output.
"""
__NAME__ = 'x2gologger-pylib'
@@ -38,13 +38,13 @@ loglevel_DEBUG_SFTPXFER = 1024
loglevel_DEFAULT = loglevel_ERROR | loglevel_WARN | loglevel_NOTICE
"""\
-Default loglevel of X2goLogger objects is: NOTICE & WARN & ERROR
+Default loglevel of X2GoLogger objects is: NOTICE & WARN & ERROR
"""
# Python X2Go modules
import utils
-class X2goLogger(object):
+class X2GoLogger(object):
"""\
A simple logger class, that is used by all Python X2Go classes.
@@ -65,9 +65,9 @@ class X2goLogger(object):
def __init__(self, name=sys.argv[0], loglevel=loglevel_DEFAULT, tag=None):
"""\
- @param name: name of the programme that uses Python X2go
+ @param name: name of the programme that uses Python X2Go
@type name: C{str}
- @param loglevel: log level for Python X2go
+ @param loglevel: log level for Python X2Go
@type loglevel: C{int}
@param tag: additional tag for all log entries
@type tag: C{str}
@@ -184,3 +184,7 @@ class X2goLogger(object):
"""
self.loglevel = self.loglevel ^ loglevel_DEBUG_SFTPXFER
+
+# compat section
+X2goLogger = X2GoLogger
+
diff --git a/x2go/mimebox.py b/x2go/mimebox.py
index c424047..dcf6d32 100644
--- a/x2go/mimebox.py
+++ b/x2go/mimebox.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -19,11 +19,11 @@
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
"""\
-L{X2goMIMEboxQueue} sets up a thread that listens for incoming files that
+L{X2GoMIMEboxQueue} sets up a thread that listens for incoming files that
shall be opened locally on the client.
For each file that gets dropped in the MIME box an individual
-thread is started (L{X2goMIMEboxJob}) that handles the processing
+thread is started (L{X2GoMIMEboxJob}) that handles the processing
of the incoming file.
"""
@@ -43,12 +43,12 @@ import log
import mimeboxactions
-class X2goMIMEboxQueue(threading.Thread):
+class X2GoMIMEboxQueue(threading.Thread):
"""\
- If the X2Go MIME box is supported in a particaluar L{X2goSession} instance
+ If the X2Go MIME box is supported in a particaluar L{X2GoSession} instance
this class provides a sub-thread for handling incoming files in the MIME box
directory. The actual handling of a dropped file is handled by the classes
- L{X2goMIMEboxActionOPEN}, L{X2goMIMEboxActionOPENWITH} and L{X2goMIMEboxActionSAVEAS}.
+ L{X2GoMIMEboxActionOPEN}, L{X2GoMIMEboxActionOPENWITH} and L{X2GoMIMEboxActionSAVEAS}.
"""
mimebox_action = None
@@ -67,18 +67,18 @@ class X2goMIMEboxQueue(threading.Thread):
@type mimebox_dir: C{str}
@param mimebox_action: name or instance of either of the possible X2Go print action classes
@type mimebox_action: C{str} or instance
- @param client_instance: the underlying L{X2goClient} instance
+ @param client_instance: the underlying L{X2GoClient} instance
@type client_instance: C{obj}
- @param logger: you can pass an L{X2goLogger} object to the
- L{X2goPrintQueue} constructor
+ @param logger: you can pass an L{X2GoLogger} object to the
+ L{X2GoPrintQueue} constructor
@type logger: C{obj}
- @param loglevel: if no L{X2goLogger} object has been supplied a new one will be
+ @param loglevel: if no L{X2GoLogger} object has been supplied a new one will be
constructed with the given loglevel
@type loglevel: C{int}
"""
if logger is None:
- self.logger = log.X2goLogger(loglevel=loglevel)
+ self.logger = log.X2GoLogger(loglevel=loglevel)
else:
self.logger = copy.deepcopy(logger)
self.logger.tag = __NAME__
@@ -95,7 +95,7 @@ class X2goMIMEboxQueue(threading.Thread):
self._accept_jobs = False
if mimebox_action is None:
- mimebox_action = mimeboxactions.X2goMIMEboxActionOPEN(client_instance=self.client_instance, logger=self.logger)
+ mimebox_action = mimeboxactions.X2GoMIMEboxActionOPEN(client_instance=self.client_instance, logger=self.logger)
elif type(mimebox_action) in (types.StringType, types.UnicodeType):
mimebox_action = self.set_mimebox_action(mimebox_action, client_instance=self.client_instance, logger=self.logger)
else:
@@ -136,7 +136,7 @@ class X2goMIMEboxQueue(threading.Thread):
def stop_thread(self):
"""\
- Stops this L{X2goMIMEboxQueue} thread completely.
+ Stops this L{X2GoMIMEboxQueue} thread completely.
"""
self.pause()
@@ -158,7 +158,7 @@ class X2goMIMEboxQueue(threading.Thread):
def set_mimebox_action(self, mimebox_action, **kwargs):
"""\
- Modify the MIME box action of this L{X2goMIMEboxQueue} thread during runtime. The
+ Modify the MIME box action of this L{X2GoMIMEboxQueue} thread during runtime. The
change of the MIME box action will be valid for the next incoming file in the MIME box
directory.
@@ -176,7 +176,7 @@ class X2goMIMEboxQueue(threading.Thread):
def run(self):
"""\
- This method gets called once the L{X2goMIMEboxQueue} thread is started by the C{X2goMIMEboxQueue.start()} method.
+ This method gets called once the L{X2GoMIMEboxQueue} thread is started by the C{X2GoMIMEboxQueue.start()} method.
"""
self.logger('starting MIME box queue thread: %s' % repr(self), loglevel=log.loglevel_DEBUG)
@@ -190,7 +190,7 @@ class X2goMIMEboxQueue(threading.Thread):
for _job in self._incoming_mimebox_jobs:
self.logger('processing incoming X2Go MIME box job: %s' % _job, loglevel=log.loglevel_NOTICE)
- _new_mimeboxjob_thread = X2goMIMEboxJob(target=x2go_mimeboxjob_handler,
+ _new_mimeboxjob_thread = X2GoMIMEboxJob(target=x2go_mimeboxjob_handler,
kwargs={
'mimebox_file': _job,
'mimebox_extensions': self.mimebox_extensions,
@@ -213,15 +213,15 @@ def x2go_mimeboxjob_handler(mimebox_file=None,
parent_thread=None, logger=None, ):
"""\
This function is called as a handler function for each incoming X2Go MIME box file
- represented by the class L{X2goMIMEboxJob}.
+ represented by the class L{X2GoMIMEboxJob}.
@param mimebox_file: MIME box file name as placed in to the X2Go MIME box spool directory
@type mimebox_file: C{str}
- @param mimebox_action: an instance of either of the possible C{X2goMIMEboxActionXXX} classes
- @type mimebox_action: C{X2goMIMEboxActionXXX} nstance
- @param parent_thread: the L{X2goMIMEboxQueue} thread that actually created this handler's L{X2goMIMEboxJob} instance
+ @param mimebox_action: an instance of either of the possible C{X2GoMIMEboxActionXXX} classes
+ @type mimebox_action: C{X2GoMIMEboxActionXXX} nstance
+ @param parent_thread: the L{X2GoMIMEboxQueue} thread that actually created this handler's L{X2GoMIMEboxJob} instance
@type parent_thread: C{obj}
- @param logger: the L{X2goMIMEboxQueue}'s logging instance
+ @param logger: the L{X2GoMIMEboxQueue}'s logging instance
@type logger: C{obj}
"""
@@ -242,7 +242,7 @@ def x2go_mimeboxjob_handler(mimebox_file=None,
elif _dotfile:
logger('placing files starting with a dot (.<file>) into the X2Go MIME box is prohibited, ignoring the file ,,%s\'\'' % mimebox_file, loglevel=log.loglevel_WARN)
else:
- logger('file extension of MIME box file %s has been found in Python X2go\' hardcoded MIME box extenstions blacklist' % mimebox_file, loglevel=log.loglevel_WARN)
+ logger('file extension of MIME box file %s has been found in Python X2Go\' hardcoded MIME box extenstions blacklist' % mimebox_file, loglevel=log.loglevel_WARN)
logger('removing MIME box file %s' % mimebox_file, loglevel=log.loglevel_DEBUG)
@@ -257,7 +257,7 @@ def x2go_mimeboxjob_handler(mimebox_file=None,
parent_thread.mimebox_history = parent_thread.mimebox_history[-100:]
-class X2goMIMEboxJob(threading.Thread):
+class X2GoMIMEboxJob(threading.Thread):
"""\
For each X2Go MIME box job we create a sub-thread that let's
the MIME box job be processed in the background.
diff --git a/x2go/mimeboxactions.py b/x2go/mimeboxactions.py
index a2749f4..10ca5e0 100644
--- a/x2go/mimeboxactions.py
+++ b/x2go/mimeboxactions.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -20,7 +20,7 @@
"""\
For MIME box jobs there are currently three handling actions available:
-L{X2goMIMEboxActionOPEN}, L{X2goMIMEboxActionOPENWITH} and L{X2goMIMEboxActionSAVEAS}.
+L{X2GoMIMEboxActionOPEN}, L{X2GoMIMEboxActionOPENWITH} and L{X2GoMIMEboxActionSAVEAS}.
"""
__NAME__ = 'x2gomimeboxactions-pylib'
@@ -46,7 +46,7 @@ import x2go_exceptions
_MIMEBOX_ENV = os.environ.copy()
-class X2goMIMEboxAction(object):
+class X2GoMIMEboxAction(object):
__name__ = 'NAME'
__description__ = 'DESCRIPTION'
@@ -56,23 +56,23 @@ class X2goMIMEboxAction(object):
This is a meta class and has no functionality as such. It is used as parent
class by ÂģrealÂĢ X2Go MIME box actions.
- @param client_instance: the underlying L{X2goClient} instance
+ @param client_instance: the underlying L{X2GoClient} instance
@type client_instance: C{obj}
- @param logger: you can pass an L{X2goLogger} object to the
- L{X2goMIMEboxAction} constructor
+ @param logger: you can pass an L{X2GoLogger} object to the
+ L{X2GoMIMEboxAction} constructor
@type logger: C{obj}
- @param loglevel: if no L{X2goLogger} object has been supplied a new one will be
+ @param loglevel: if no L{X2GoLogger} object has been supplied a new one will be
constructed with the given loglevel
@type loglevel: C{int}
"""
if logger is None:
- self.logger = log.X2goLogger(loglevel=loglevel)
+ self.logger = log.X2GoLogger(loglevel=loglevel)
else:
self.logger = copy.deepcopy(logger)
self.logger.tag = __NAME__
- # these get set from within the X2goMIMEboxQueue class
+ # these get set from within the X2GoMIMEboxQueue class
self.profile_name = 'UNKNOWN'
self.session_name = 'UNKNOWN'
@@ -96,7 +96,7 @@ class X2goMIMEboxAction(object):
def _do_process(self, mimebox_file, mimebox_dir, ):
"""\
- Perform the defined MIME box action (doing nothing in L{X2goMIMEboxAction} parent class).
+ Perform the defined MIME box action (doing nothing in L{X2GoMIMEboxAction} parent class).
@param mimebox_file: file name as placed in to the X2Go MIME box directory
@type mimebox_file: C{str}
@@ -123,7 +123,7 @@ class X2goMIMEboxAction(object):
self._do_process(mimebox_file, mimebox_dir)
-class X2goMIMEboxActionOPEN(X2goMIMEboxAction):
+class X2GoMIMEboxActionOPEN(X2GoMIMEboxAction):
"""\
MIME box action that opens incoming files in the system's default application.
@@ -133,18 +133,18 @@ class X2goMIMEboxActionOPEN(X2goMIMEboxAction):
def __init__(self, client_instance=None, logger=None, loglevel=log.loglevel_DEFAULT):
"""\
- @param client_instance: the underlying L{X2goClient} instance
+ @param client_instance: the underlying L{X2GoClient} instance
@type client_instance: C{obj}
- @param logger: you can pass an L{X2goLogger} object to the
- L{X2goMIMEboxActionOPEN} constructor
+ @param logger: you can pass an L{X2GoLogger} object to the
+ L{X2GoMIMEboxActionOPEN} constructor
@type logger: C{obj}
- @param loglevel: if no L{X2goLogger} object has been supplied a new one will be
+ @param loglevel: if no L{X2GoLogger} object has been supplied a new one will be
constructed with the given loglevel
@type loglevel: C{int}
"""
self.client_instance = client_instance
- X2goMIMEboxAction.__init__(self, logger=logger, loglevel=loglevel)
+ X2GoMIMEboxAction.__init__(self, logger=logger, loglevel=loglevel)
def _do_process(self, mimebox_file, mimebox_dir, ):
"""\
@@ -180,7 +180,7 @@ class X2goMIMEboxActionOPEN(X2goMIMEboxAction):
time.sleep(20)
-class X2goMIMEboxActionOPENWITH(X2goMIMEboxAction):
+class X2GoMIMEboxActionOPENWITH(X2GoMIMEboxAction):
"""\
MIME box action that calls the system's ,,Open with...'' dialog on incoming files. Currently only
properly implementable on Windows platforms.
@@ -191,18 +191,18 @@ class X2goMIMEboxActionOPENWITH(X2goMIMEboxAction):
def __init__(self, client_instance=None, logger=None, loglevel=log.loglevel_DEFAULT):
"""\
- @param client_instance: the underlying L{X2goClient} instance
+ @param client_instance: the underlying L{X2GoClient} instance
@type client_instance: C{obj}
- @param logger: you can pass an L{X2goLogger} object to the
- L{X2goMIMEboxActionOPENWITH} constructor
+ @param logger: you can pass an L{X2GoLogger} object to the
+ L{X2GoMIMEboxActionOPENWITH} constructor
@type logger: C{obj}
- @param loglevel: if no L{X2goLogger} object has been supplied a new one will be
+ @param loglevel: if no L{X2GoLogger} object has been supplied a new one will be
constructed with the given loglevel
@type loglevel: C{int}
"""
self.client_instance = client_instance
- X2goMIMEboxAction.__init__(self, logger=logger, loglevel=loglevel)
+ X2GoMIMEboxAction.__init__(self, logger=logger, loglevel=loglevel)
def _do_process(self, mimebox_file, mimebox_dir, ):
"""\
@@ -236,10 +236,10 @@ class X2goMIMEboxActionOPENWITH(X2goMIMEboxAction):
time.sleep(20)
-class X2goMIMEboxActionSAVEAS(X2goMIMEboxAction):
+class X2GoMIMEboxActionSAVEAS(X2GoMIMEboxAction):
"""\
MIME box action that allows saving incoming MIME box files to a local folder. What this
- MIME box actually does is calling a hook method in the L{X2goClient} instance that
+ MIME box actually does is calling a hook method in the L{X2GoClient} instance that
can be hi-jacked by one of your application's methods which then can handle the ,,Save as...''
request.
@@ -249,27 +249,27 @@ class X2goMIMEboxActionSAVEAS(X2goMIMEboxAction):
def __init__(self, client_instance=None, logger=None, loglevel=log.loglevel_DEFAULT):
"""\
- @param client_instance: an L{X2goClient} instance, within your customized L{X2goClient} make sure
+ @param client_instance: an L{X2GoClient} instance, within your customized L{X2GoClient} make sure
you have a C{HOOK_open_mimebox_saveas_dialog(filename=<str>)} method defined that will actually
handle the incoming mimebox file.
@type client_instance: C{obj}
- @param logger: you can pass an L{X2goLogger} object to the
- L{X2goMIMEboxActionSAVEAS} constructor
+ @param logger: you can pass an L{X2GoLogger} object to the
+ L{X2GoMIMEboxActionSAVEAS} constructor
@type logger: C{obj}
- @param loglevel: if no L{X2goLogger} object has been supplied a new one will be
+ @param loglevel: if no L{X2GoLogger} object has been supplied a new one will be
constructed with the given loglevel
@type loglevel: C{int}
- @raise X2goMIMEboxActionException: if the client_instance has not been passed to the SAVEAS MIME box action
+ @raise X2GoMIMEboxActionException: if the client_instance has not been passed to the SAVEAS MIME box action
"""
if client_instance is None:
- raise x2go_exceptions.X2goMIMEboxActionException('the SAVEAS MIME box action needs to know the X2goClient instance (client=<instance>)')
- X2goMIMEboxAction.__init__(self, client_instance=client_instance, logger=logger, loglevel=loglevel)
+ raise x2go_exceptions.X2GoMIMEboxActionException('the SAVEAS MIME box action needs to know the X2GoClient instance (client=<instance>)')
+ X2GoMIMEboxAction.__init__(self, client_instance=client_instance, logger=logger, loglevel=loglevel)
def _do_process(self, mimebox_file, mimebox_dir):
"""\
- Call an L{X2goClient} hook method (C{HOOK_open_mimebox_saveas_dialog}) that
+ Call an L{X2GoClient} hook method (C{HOOK_open_mimebox_saveas_dialog}) that
can handle the MIME box's SAVEAS action.
@param mimebox_file: file name as placed in to the MIME box directory
@@ -282,7 +282,7 @@ class X2goMIMEboxActionSAVEAS(X2goMIMEboxAction):
mimebox_file = os.path.normpath(mimebox_file)
mimebox_dir = os.path.normpath(mimebox_dir)
- self.logger('Session %s (%s) is calling X2goClient class hook method <client_instance>.HOOK_open_mimebox_saveas_dialog(%s)' % (self.session_name, self.profile_name, mimebox_file), loglevel=log.loglevel_NOTICE)
+ self.logger('Session %s (%s) is calling X2GoClient class hook method <client_instance>.HOOK_open_mimebox_saveas_dialog(%s)' % (self.session_name, self.profile_name, mimebox_file), loglevel=log.loglevel_NOTICE)
self.client_instance.HOOK_open_mimebox_saveas_dialog(os.path.join(mimebox_dir, mimebox_file), profile_name=self.profile_name, session_name=self.session_name)
time.sleep(60)
diff --git a/x2go/printactions.py b/x2go/printactions.py
index 1def760..23a8f83 100644
--- a/x2go/printactions.py
+++ b/x2go/printactions.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -22,8 +22,8 @@
Print jobs can either be sent to any of the local print queues (CUPS, Win32API),
be opened in an external PDF viewer, be saved to a local folder or be handed
over to a custom (print) command. This is defined by four print action classes
-(L{X2goPrintActionDIALOG}, L{X2goPrintActionPDFVIEW}, L{X2goPrintActionPDFSAVE}, L{X2goPrintActionPRINT} and
-L{X2goPrintActionPRINTCMD}).
+(L{X2GoPrintActionDIALOG}, L{X2GoPrintActionPDFVIEW}, L{X2GoPrintActionPDFSAVE}, L{X2GoPrintActionPRINT} and
+L{X2GoPrintActionPRINTCMD}).
"""
__NAME__ = 'x2goprintactions-pylib'
@@ -55,7 +55,7 @@ import x2go_exceptions
_PRINT_ENV = os.environ.copy()
-class X2goPrintAction(object):
+class X2GoPrintAction(object):
__name__ = 'NAME'
__description__ = 'DESCRIPTION'
@@ -65,23 +65,23 @@ class X2goPrintAction(object):
This is a meta class and has no functionality as such. It is used as parent
class by ÂģrealÂĢ X2Go print actions.
- @param client_instance: the underlying L{X2goClient} instance
+ @param client_instance: the underlying L{X2GoClient} instance
@type client_instance: C{obj}
- @param logger: you can pass an L{X2goLogger} object to the
- L{X2goPrintAction} constructor
+ @param logger: you can pass an L{X2GoLogger} object to the
+ L{X2GoPrintAction} constructor
@type logger: C{obj}
- @param loglevel: if no L{X2goLogger} object has been supplied a new one will be
+ @param loglevel: if no L{X2GoLogger} object has been supplied a new one will be
constructed with the given loglevel
@type loglevel: C{int}
"""
if logger is None:
- self.logger = log.X2goLogger(loglevel=loglevel)
+ self.logger = log.X2GoLogger(loglevel=loglevel)
else:
self.logger = copy.deepcopy(logger)
self.logger.tag = __NAME__
- # these get set from within the X2goPrintQueue class
+ # these get set from within the X2GoPrintQueue class
self.profile_name = 'UNKNOWN'
self.session_name = 'UNKNOWN'
@@ -105,7 +105,7 @@ class X2goPrintAction(object):
def _do_print(self, pdf_file, job_title, spool_dir, ):
"""
- Perform the defined print action (doing nothing in L{X2goPrintAction} parent class).
+ Perform the defined print action (doing nothing in L{X2GoPrintAction} parent class).
@param pdf_file: PDF file name as placed in to the X2Go spool directory
@type pdf_file: C{str}
@@ -159,7 +159,7 @@ class X2goPrintAction(object):
return _hr_path
-class X2goPrintActionPDFVIEW(X2goPrintAction):
+class X2GoPrintActionPDFVIEW(X2GoPrintAction):
"""\
Print action that views incoming print job in an external PDF viewer application.
@@ -171,14 +171,14 @@ class X2goPrintActionPDFVIEW(X2goPrintAction):
def __init__(self, client_instance=None, pdfview_cmd=None, logger=None, loglevel=log.loglevel_DEFAULT):
"""\
- @param client_instance: the underlying L{X2goClient} instance
+ @param client_instance: the underlying L{X2GoClient} instance
@type client_instance: C{obj}
@param pdfview_cmd: command that starts the external PDF viewer application
@type pdfview_cmd: C{str}
- @param logger: you can pass an L{X2goLogger} object to the
- L{X2goPrintActionPDFVIEW} constructor
+ @param logger: you can pass an L{X2GoLogger} object to the
+ L{X2GoPrintActionPDFVIEW} constructor
@type logger: C{obj}
- @param loglevel: if no L{X2goLogger} object has been supplied a new one will be
+ @param loglevel: if no L{X2GoLogger} object has been supplied a new one will be
constructed with the given loglevel
@type loglevel: C{int}
@@ -186,7 +186,7 @@ class X2goPrintActionPDFVIEW(X2goPrintAction):
if pdfview_cmd is None:
pdfview_cmd = defaults.DEFAULT_PDFVIEW_CMD
self.pdfview_cmd = pdfview_cmd
- X2goPrintAction.__init__(self, client_instance=client_instance, logger=logger, loglevel=loglevel)
+ X2GoPrintAction.__init__(self, client_instance=client_instance, logger=logger, loglevel=loglevel)
def _do_print(self, pdf_file, job_title, spool_dir, ):
"""\
@@ -237,7 +237,7 @@ class X2goPrintActionPDFVIEW(X2goPrintAction):
os.remove(_hr_filename)
-class X2goPrintActionPDFSAVE(X2goPrintAction):
+class X2GoPrintActionPDFSAVE(X2GoPrintAction):
"""\
Print action that saves incoming print jobs to a local folder.
@@ -249,14 +249,14 @@ class X2goPrintActionPDFSAVE(X2goPrintAction):
def __init__(self, client_instance=None, save_to_folder=None, logger=None, loglevel=log.loglevel_DEFAULT):
"""\
- @param client_instance: the underlying L{X2goClient} instance
+ @param client_instance: the underlying L{X2GoClient} instance
@type client_instance: C{obj}
@param save_to_folder: saving location for incoming print jobs (PDF files)
@type save_to_folder: C{str}
- @param logger: you can pass an L{X2goLogger} object to the
- L{X2goPrintActionPDFSAVE} constructor
+ @param logger: you can pass an L{X2GoLogger} object to the
+ L{X2GoPrintActionPDFSAVE} constructor
@type logger: C{obj}
- @param loglevel: if no L{X2goLogger} object has been supplied a new one will be
+ @param loglevel: if no L{X2GoLogger} object has been supplied a new one will be
constructed with the given loglevel
@type loglevel: C{int}
@@ -269,7 +269,7 @@ class X2goPrintActionPDFSAVE(X2goPrintAction):
save_to_folder = os.path.expanduser(save_to_folder)
self.save_to_folder = save_to_folder
- X2goPrintAction.__init__(self, client_instance=client_instance, logger=None, loglevel=loglevel)
+ X2GoPrintAction.__init__(self, client_instance=client_instance, logger=None, loglevel=loglevel)
self.logger('Save location for incoming PDFs is: %s' % self.save_to_folder, loglevel=log.loglevel_DEBUG)
if not os.path.exists(self.save_to_folder):
@@ -294,7 +294,7 @@ class X2goPrintActionPDFSAVE(X2goPrintAction):
shutil.copy2(pdf_file, dest_file)
-class X2goPrintActionPRINT(X2goPrintAction):
+class X2GoPrintActionPRINT(X2GoPrintAction):
"""\
Print action that actually prints an incoming print job file.
@@ -304,20 +304,20 @@ class X2goPrintActionPRINT(X2goPrintAction):
def __init__(self, client_instance=None, printer=None, logger=None, loglevel=log.loglevel_DEFAULT):
"""\
- @param client_instance: the underlying L{X2goClient} instance
+ @param client_instance: the underlying L{X2GoClient} instance
@type client_instance: C{obj}
@param printer: name of the preferred printer, if C{None} the system's/user's default printer will be used
@type printer: C{str}
- @param logger: you can pass an L{X2goLogger} object to the
- L{X2goPrintActionPRINT} constructor
+ @param logger: you can pass an L{X2GoLogger} object to the
+ L{X2GoPrintActionPRINT} constructor
@type logger: C{obj}
- @param loglevel: if no L{X2goLogger} object has been supplied a new one will be
+ @param loglevel: if no L{X2GoLogger} object has been supplied a new one will be
constructed with the given loglevel
@type loglevel: C{int}
"""
self.printer = printer
- X2goPrintAction.__init__(self, client_instance=client_instance, logger=logger, loglevel=loglevel)
+ X2GoPrintAction.__init__(self, client_instance=client_instance, logger=logger, loglevel=loglevel)
def _do_print(self, pdf_file, job_title, spool_dir, ):
"""\
@@ -420,12 +420,12 @@ class X2goPrintActionPRINT(X2goPrintAction):
except OSError: pass
-class X2goPrintActionPRINTCMD(X2goPrintAction):
+class X2GoPrintActionPRINTCMD(X2GoPrintAction):
"""\
Print action that calls an external command for further processing of incoming print jobs.
The print job's PDF filename will be prepended as last argument to the print command
- used in L{X2goPrintActionPRINTCMD} instances.
+ used in L{X2GoPrintActionPRINTCMD} instances.
"""
__name__ = 'PRINTCMD'
@@ -433,14 +433,14 @@ class X2goPrintActionPRINTCMD(X2goPrintAction):
def __init__(self, client_instance=None, print_cmd=None, logger=None, loglevel=log.loglevel_DEFAULT):
"""\
- @param client_instance: the underlying L{X2goClient} instance
+ @param client_instance: the underlying L{X2GoClient} instance
@type client_instance: C{obj}
@param print_cmd: external command to be called on incoming print jobs
@type print_cmd: C{str}
- @param logger: you can pass an L{X2goLogger} object to the
- L{X2goPrintActionPRINTCMD} constructor
+ @param logger: you can pass an L{X2GoLogger} object to the
+ L{X2GoPrintActionPRINTCMD} constructor
@type logger: C{obj}
- @param loglevel: if no L{X2goLogger} object has been supplied a new one will be
+ @param loglevel: if no L{X2GoLogger} object has been supplied a new one will be
constructed with the given loglevel
@type loglevel: C{int}
@@ -448,12 +448,12 @@ class X2goPrintActionPRINTCMD(X2goPrintAction):
if print_cmd is None:
print_cmd = defaults.DEFAULT_PRINTCMD_CMD
self.print_cmd = print_cmd
- X2goPrintAction.__init__(self, client_instance=client_instance, logger=logger, loglevel=loglevel)
+ X2GoPrintAction.__init__(self, client_instance=client_instance, logger=logger, loglevel=loglevel)
def _do_print(self, pdf_file, job_title, spool_dir):
"""\
Execute an external command that has been defined on construction
- of this L{X2goPrintActionPRINTCMD} instance.
+ of this L{X2GoPrintActionPRINTCMD} instance.
@param pdf_file: PDF file name as placed in to the X2Go spool directory
@type pdf_file: C{str}
@@ -481,11 +481,11 @@ class X2goPrintActionPRINTCMD(X2goPrintAction):
except OSError: pass
-class X2goPrintActionDIALOG(X2goPrintAction):
+class X2GoPrintActionDIALOG(X2GoPrintAction):
"""\
Print action that mediates opening a print dialog window. This class is rather empty,
the actual print dialog box must be implemented in our GUI application (with the application's
- L{X2goClient} instance.
+ L{X2GoClient} instance.
"""
__name__ = 'DIALOG'
@@ -493,28 +493,28 @@ class X2goPrintActionDIALOG(X2goPrintAction):
def __init__(self, client_instance=None, logger=None, loglevel=log.loglevel_DEFAULT):
"""\
- @param client_instance: an L{X2goClient} instance, within your customized L{X2goClient} make sure
+ @param client_instance: an L{X2GoClient} instance, within your customized L{X2GoClient} make sure
you have a C{HOOK_open_print_dialog(filename=<str>)} method defined that will actually
open the print dialog.
@type client_instance: C{obj}
- @param logger: you can pass an L{X2goLogger} object to the
- L{X2goPrintActionDIALOG} constructor
+ @param logger: you can pass an L{X2GoLogger} object to the
+ L{X2GoPrintActionDIALOG} constructor
@type logger: C{obj}
- @param loglevel: if no L{X2goLogger} object has been supplied a new one will be
+ @param loglevel: if no L{X2GoLogger} object has been supplied a new one will be
constructed with the given loglevel
@type loglevel: C{int}
- @raise X2goPrintActionException: if the client_instance has not been passed to the DIALOG print action
+ @raise X2GoPrintActionException: if the client_instance has not been passed to the DIALOG print action
"""
if client_instance is None:
- raise x2go_exceptions.X2goPrintActionException('the DIALOG print action needs to know the X2goClient instance (client=<instance>)')
- X2goPrintAction.__init__(self, client_instance=client_instance, logger=logger, loglevel=loglevel)
+ raise x2go_exceptions.X2GoPrintActionException('the DIALOG print action needs to know the X2GoClient instance (client=<instance>)')
+ X2GoPrintAction.__init__(self, client_instance=client_instance, logger=logger, loglevel=loglevel)
def _do_print(self, pdf_file, job_title, spool_dir):
"""\
Execute an external command that has been defined on construction
- of this L{X2goPrintActionPRINTCMD} instance.
+ of this L{X2GoPrintActionPRINTCMD} instance.
@param pdf_file: PDF file name as placed in to the X2Go spool directory
@type pdf_file: C{str}
@@ -527,8 +527,8 @@ class X2goPrintActionDIALOG(X2goPrintAction):
pdf_file = os.path.normpath(pdf_file)
spool_dir = os.path.normpath(spool_dir)
- self.logger('Session %s (%s) is calling X2goClient class hook method <client_instance>.HOOK_open_print_dialog' % (self.session_name, self.profile_name), loglevel=log.loglevel_NOTICE)
+ self.logger('Session %s (%s) is calling X2GoClient class hook method <client_instance>.HOOK_open_print_dialog' % (self.session_name, self.profile_name), loglevel=log.loglevel_NOTICE)
_new_print_action = self.client_instance.HOOK_open_print_dialog(profile_name=self.profile_name, session_name=self.session_name)
- if type(_new_print_action) != type(self):
+ if _new_print_action and type(_new_print_action) != type(self):
_new_print_action._do_print(pdf_file, job_title, spool_dir)
diff --git a/x2go/printqueue.py b/x2go/printqueue.py
index cbf7403..9e76ca5 100644
--- a/x2go/printqueue.py
+++ b/x2go/printqueue.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -18,10 +18,10 @@
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
"""\
-L{X2goPrintQueue} sets up a thread that listens for incoming print jobs.
+L{X2GoPrintQueue} sets up a thread that listens for incoming print jobs.
For each incoming print job in an X2Go session's spool directory an
-individual thread is started (L{X2goPrintJob}) that handles the processing
+individual thread is started (L{X2GoPrintJob}) that handles the processing
of the incoming print job.
"""
@@ -39,14 +39,14 @@ import utils
import log
# we hide the default values from epydoc (that's why we transform them to _UNDERSCORE variables)
-from backends.printing import X2goClientPrinting as _X2goClientPrinting
+from backends.printing import X2GoClientPrinting as _X2GoClientPrinting
from defaults import X2GO_PRINTING_FILENAME as _X2GO_PRINTING_FILENAME
-class X2goPrintQueue(threading.Thread):
+class X2GoPrintQueue(threading.Thread):
"""\
- If X2Go printing is supported in a particular L{X2goSession} instance
+ If X2Go printing is supported in a particular L{X2GoSession} instance
this class provides a sub-thread for handling incoming X2Go print jobs.
"""
@@ -63,7 +63,7 @@ class X2goPrintQueue(threading.Thread):
print_action=None,
print_action_args={},
client_instance=None,
- printing_backend=_X2goClientPrinting,
+ printing_backend=_X2GoClientPrinting,
logger=None,
loglevel=log.loglevel_DEFAULT):
"""\
@@ -75,21 +75,21 @@ class X2goPrintQueue(threading.Thread):
@type print_action: C{str} or instance
@param print_action_args: depending of the chosen C{print_action} this dictionary may contain different
values; the C{print_action_args} will be passed on to the X2Go print action instance constructor, so
- refer to either of these: L{X2goPrintActionPDFVIEW}, L{X2goPrintActionPRINT} et al.
- @param client_instance: the underlying L{X2goClient} instance
+ refer to either of these: L{X2GoPrintActionPDFVIEW}, L{X2GoPrintActionPRINT} et al.
+ @param client_instance: the underlying L{X2GoClient} instance
@type client_instance: C{obj}
@param printing_backend: the client printing configuration backend class
@type printing_backend: C{obj}
- @param logger: you can pass an L{X2goLogger} object to the
- L{X2goPrintQueue} constructor
+ @param logger: you can pass an L{X2GoLogger} object to the
+ L{X2GoPrintQueue} constructor
@type logger: C{obj}
- @param loglevel: if no L{X2goLogger} object has been supplied a new one will be
+ @param loglevel: if no L{X2GoLogger} object has been supplied a new one will be
constructed with the given loglevel
@type loglevel: C{int}
"""
if logger is None:
- self.logger = log.X2goLogger(loglevel=loglevel)
+ self.logger = log.X2GoLogger(loglevel=loglevel)
else:
self.logger = copy.deepcopy(logger)
self.logger.tag = __NAME__
@@ -136,7 +136,7 @@ class X2goPrintQueue(threading.Thread):
def stop_thread(self):
"""\
- Stops this L{X2goPrintQueue} thread completely.
+ Stops this L{X2GoPrintQueue} thread completely.
"""
self.pause()
@@ -166,12 +166,12 @@ class X2goPrintQueue(threading.Thread):
def set_print_action(self, print_action, **kwargs):
"""\
- Modify the print action of this L{X2goPrintQueue} thread during runtime. The
+ Modify the print action of this L{X2GoPrintQueue} thread during runtime. The
change of print action will be valid for the next incoming print job.
As kwargs you can pass arguments for the print action class to be set. Refer
- to the class descriptions of L{X2goPrintActionDIALOG}, L{X2goPrintActionPDFVIEW},
- L{X2goPrintActionPRINT}, etc.
+ to the class descriptions of L{X2GoPrintActionDIALOG}, L{X2GoPrintActionPDFVIEW},
+ L{X2GoPrintActionPRINT}, etc.
@param print_action: new print action to be valid for incoming print jobs
@type print_action: C{str} or C{class}
@@ -187,7 +187,7 @@ class X2goPrintQueue(threading.Thread):
def run(self):
"""\
- Start this L{X2goPrintQueue} thread...
+ Start this L{X2GoPrintQueue} thread...
"""
self.logger('starting print queue thread: %s' % repr(self), loglevel=log.loglevel_DEBUG)
@@ -201,7 +201,7 @@ class X2goPrintQueue(threading.Thread):
for _job in self._incoming_print_jobs:
self.logger('processing incoming X2Go print job: %s' % _job[1], loglevel=log.loglevel_NOTICE)
- _new_printjob_thread = X2goPrintJob(target=x2go_printjob_handler,
+ _new_printjob_thread = X2GoPrintJob(target=x2go_printjob_handler,
kwargs={
'job_file': _job[0],
'pdf_file': _job[1],
@@ -222,7 +222,7 @@ class X2goPrintQueue(threading.Thread):
def x2go_printjob_handler(job_file=None, pdf_file=None, job_title=None, print_action=None, parent_thread=None, logger=None, ):
"""\
This function is called as a handler function for each incoming X2Go print job
- represented by the class L{X2goPrintJob}.
+ represented by the class L{X2GoPrintJob}.
The handler function will (re-)read the ÂģprintingÂĢ configuration file (if no
explicit C{print_action} is passed to this function...). It then will
@@ -232,11 +232,11 @@ def x2go_printjob_handler(job_file=None, pdf_file=None, job_title=None, print_ac
@type pdf_file: C{str}
@param job_title: human readable print job title
@type job_title: C{str}
- @param print_action: an instance of either of the possible C{X2goPrintActionXXX} classes
- @type print_action: C{X2goPrintActionXXX} nstance
- @param parent_thread: the L{X2goPrintQueue} thread that actually created this handler's L{X2goPrintJob} instance
+ @param print_action: an instance of either of the possible C{X2GoPrintActionXXX} classes
+ @type print_action: C{X2GoPrintActionXXX} nstance
+ @param parent_thread: the L{X2GoPrintQueue} thread that actually created this handler's L{X2GoPrintJob} instance
@type parent_thread: C{obj}
- @param logger: the L{X2goPrintQueue}'s logging instance
+ @param logger: the L{X2GoPrintQueue}'s logging instance
@type logger: C{obj}
"""
@@ -277,7 +277,7 @@ def x2go_printjob_handler(job_file=None, pdf_file=None, job_title=None, print_ac
parent_thread.job_history = parent_thread.job_history[-100:]
-class X2goPrintJob(threading.Thread):
+class X2GoPrintJob(threading.Thread):
"""\
For each X2Go print job we create a sub-thread that let's
the print job be processed in the background.
diff --git a/x2go/pulseaudio.py b/x2go/pulseaudio.py
index 08b599e..ea8f49d 100644
--- a/x2go/pulseaudio.py
+++ b/x2go/pulseaudio.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -21,7 +21,7 @@
# none so far
"""\
-X2goPulseAudio class - a Pulseaudio daemon guardian thread.
+X2GoPulseAudio class - a Pulseaudio daemon guardian thread.
"""
@@ -49,7 +49,7 @@ import exceptions
class OSNotSupportedException(exceptions.StandardError): pass
""" Exception denoting that this operating system is not supported. """
-class X2goPulseAudio(threading.Thread):
+class X2GoPulseAudio(threading.Thread):
"""
This class controls the Pulse Audio daemon.
"""
@@ -60,11 +60,11 @@ class X2goPulseAudio(threading.Thread):
@param path: full path to pulseaudio.exe
@type path: C{str}
- @param client_instance: the calling L{X2goClient} instance
- @type client_instance: L{X2goClient} instance
- @param logger: you can pass an L{X2goLogger} object to the L{X2goClientXConfig} constructor
+ @param client_instance: the calling L{X2GoClient} instance
+ @type client_instance: L{X2GoClient} instance
+ @param logger: you can pass an L{X2GoLogger} object to the L{X2GoClientXConfig} constructor
@type logger: C{obj}
- @param loglevel: if no L{X2goLogger} object has been supplied a new one will be
+ @param loglevel: if no L{X2GoLogger} object has been supplied a new one will be
constructed with the given loglevel
@type loglevel: C{int}
@@ -75,7 +75,7 @@ class X2goPulseAudio(threading.Thread):
raise OSNotSupportedException('classes of x2go.pulseaudio module are for Windows only')
if logger is None:
- self.logger = log.X2goLogger(loglevel=loglevel)
+ self.logger = log.X2GoLogger(loglevel=loglevel)
else:
self.logger = copy.deepcopy(logger)
self.logger.tag = __NAME__
@@ -90,8 +90,8 @@ class X2goPulseAudio(threading.Thread):
def run(self):
"""\
- This method is called once the C{X2goPulseAudio.start()} method has been called. To tear
- down the Pulseaudio daemon call the L{X2goPulseAudio.stop_thread()} method.
+ This method is called once the C{X2GoPulseAudio.start()} method has been called. To tear
+ down the Pulseaudio daemon call the L{X2GoPulseAudio.stop_thread()} method.
"""
self._keepalive = True
diff --git a/x2go/registry.py b/x2go/registry.py
index 4669ea2..86521c0 100644
--- a/x2go/registry.py
+++ b/x2go/registry.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -18,7 +18,7 @@
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
"""\
-X2goSessionRegistry class - the X2goClient's session registry backend
+X2GoSessionRegistry class - the X2GoClient's session registry backend
"""
__NAME__ = 'x2gosessregistry-pylib'
@@ -37,13 +37,13 @@ import session
import x2go_exceptions
# import the default terminal session backend
-from x2go.backends.control import X2goControlSession as _X2goControlSession
-from x2go.backends.terminal import X2goTerminalSession as _X2goTerminalSession
-from x2go.backends.info import X2goServerSessionInfo as _X2goServerSessionInfo
-from x2go.backends.info import X2goServerSessionList as _X2goServerSessionList
-from x2go.backends.proxy import X2goProxy as _X2goProxy
-from x2go.backends.settings import X2goClientSettings as _X2goClientSettings
-from x2go.backends.printing import X2goClientPrinting as _X2goClientPrinting
+from x2go.backends.control import X2GoControlSession as _X2GoControlSession
+from x2go.backends.terminal import X2GoTerminalSession as _X2GoTerminalSession
+from x2go.backends.info import X2GoServerSessionInfo as _X2GoServerSessionInfo
+from x2go.backends.info import X2GoServerSessionList as _X2GoServerSessionList
+from x2go.backends.proxy import X2GoProxy as _X2GoProxy
+from x2go.backends.settings import X2GoClientSettings as _X2GoClientSettings
+from x2go.backends.printing import X2GoClientPrinting as _X2GoClientPrinting
from defaults import LOCAL_HOME as _LOCAL_HOME
from defaults import X2GO_CLIENT_ROOTDIR as _X2GO_CLIENT_ROOTDIR
@@ -51,26 +51,26 @@ from defaults import X2GO_SESSIONS_ROOTDIR as _X2GO_SESSIONS_ROOTDIR
from defaults import X2GO_SESSIONPROFILE_DEFAULTS as _X2GO_SESSIONPROFILE_DEFAULTS
from defaults import X2GO_SSH_ROOTDIR as _X2GO_SSH_ROOTDIR
-class X2goSessionRegistry(object):
+class X2GoSessionRegistry(object):
"""\
- This class is utilized by L{X2goClient} instances to maintain a good overview on
- session status of all associated L{X2goSession} instances.
+ This class is utilized by L{X2GoClient} instances to maintain a good overview on
+ session status of all associated L{X2GoSession} instances.
"""
def __init__(self, client_instance,
logger=None, loglevel=log.loglevel_DEFAULT):
"""\
- @param client_instance: the L{X2goClient} instance that instantiated this L{X2goSessionRegistry} instance.
- @type client_instance: L{X2goClient} instance
- @param logger: you can pass an L{X2goLogger} object to the L{X2goClientXConfig} constructor
+ @param client_instance: the L{X2GoClient} instance that instantiated this L{X2GoSessionRegistry} instance.
+ @type client_instance: L{X2GoClient} instance
+ @param logger: you can pass an L{X2GoLogger} object to the L{X2GoClientXConfig} constructor
@type logger: C{obj}
- @param loglevel: if no L{X2goLogger} object has been supplied a new one will be
+ @param loglevel: if no L{X2GoLogger} object has been supplied a new one will be
constructed with the given loglevel
@type loglevel: C{int}
"""
if logger is None:
- self.logger = log.X2goLogger(loglevel=loglevel)
+ self.logger = log.X2GoLogger(loglevel=loglevel)
else:
self.logger = copy.deepcopy(logger)
self.logger.tag = __NAME__
@@ -96,7 +96,7 @@ class X2goSessionRegistry(object):
return self.registry.keys()
def __repr__(self):
- result = 'X2goSessionRegistry('
+ result = 'X2GoSessionRegistry('
for p in dir(self):
if '__' in p or not p in self.__dict__ or type(p) is types.InstanceType: continue
result += p + '=' + str(self.__dict__[p]) + ','
@@ -105,21 +105,21 @@ class X2goSessionRegistry(object):
def __call__(self, session_uuid):
"""\
- Returns the L{X2goSession} instance for a given session UUID hash.
+ Returns the L{X2GoSession} instance for a given session UUID hash.
@param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
- @return: the corresponding L{X2goSession} instance
- @rtype: L{X2goSession} instance
+ @return: the corresponding L{X2GoSession} instance
+ @rtype: L{X2GoSession} instance
- @raise X2goSessionRegistryException: if the given session UUID could not be found
+ @raise X2GoSessionRegistryException: if the given session UUID could not be found
"""
try:
return self.registry[session_uuid]
except KeyError:
- raise x2go_exceptions.X2goSessionRegistryException('No session found for UUID %s' % session_uuid)
+ raise x2go_exceptions.X2GoSessionRegistryException('No session found for UUID %s' % session_uuid)
def disable_session_auto_registration(self):
"""\
@@ -229,7 +229,7 @@ class X2goSessionRegistry(object):
def update_status(self, session_uuid=None, profile_name=None, profile_id=None, session_list=None, force_update=False, newly_connected=False):
"""\
- Update the session status for L{X2goSession} that is represented by a given session UUID hash,
+ Update the session status for L{X2GoSession} that is represented by a given session UUID hash,
profile name or profile ID.
@param session_uuid: the X2Go session's UUID registry hash
@@ -240,23 +240,23 @@ class X2goSessionRegistry(object):
@param profile_id: alternatively, a profile ID can be given (the stati of all registered sessions for this session
profile will be updated)
@type profile_id: C{str}
- @param session_list: an optional C{X2goServerSessionList*} instance (as returned by the L{X2goClient.list_sessions()} command can
+ @param session_list: an optional C{X2GoServerSessionList*} instance (as returned by the L{X2GoClient.list_sessions()} command can
be passed to this method.
- @type session_list: C{X2goServerSessionList*} instance
+ @type session_list: C{X2GoServerSessionList*} instance
@param force_update: make sure the session status gets really updated
@type force_update: C{bool}
@return: C{True} if this method has been successful
@rtype: C{bool}
- @raise X2goSessionRegistryException: if the combination of C{session_uuid}, C{profile_name} and C{profile_id} does not match the requirement:
+ @raise X2GoSessionRegistryException: if the combination of C{session_uuid}, C{profile_name} and C{profile_id} does not match the requirement:
only one of them
"""
if session_uuid and profile_name or session_uuid and profile_id or profile_name and profile_id:
- raise x2go_exceptions.X2goSessionRegistryException('only one of the possible method parameters is allowed (session_uuid, profile_name or profile_id)')
+ raise x2go_exceptions.X2GoSessionRegistryException('only one of the possible method parameters is allowed (session_uuid, profile_name or profile_id)')
elif session_uuid is None and profile_name is None and profile_id is None:
- raise x2go_exceptions.X2goSessionRegistryException('at least one of the method parameters session_uuid, profile_name or profile_id must be given')
+ raise x2go_exceptions.X2GoSessionRegistryException('at least one of the method parameters session_uuid, profile_name or profile_id must be given')
if session_uuid:
session_uuids = [ session_uuid ]
@@ -267,8 +267,8 @@ class X2goSessionRegistry(object):
for _session_uuid in session_uuids:
- # only operate on instantiated X2goSession objects
- if type(self(_session_uuid)) != session.X2goSession:
+ # only operate on instantiated X2GoSession objects
+ if type(self(_session_uuid)) != session.X2GoSession:
continue
if not self(_session_uuid).update_status(session_list=session_list, force_update=force_update):
@@ -278,7 +278,7 @@ class X2goSessionRegistry(object):
_last_status = copy.deepcopy(self(_session_uuid)._last_status)
_current_status = copy.deepcopy(self(_session_uuid)._current_status)
- # at this point we hook into the X2goClient instance and call notification methods
+ # at this point we hook into the X2GoClient instance and call notification methods
# that can be used to inform an application that something has happened
_profile_name = self(_session_uuid).get_profile_name()
@@ -360,9 +360,9 @@ class X2goSessionRegistry(object):
# session has terminated
self.client_instance.HOOK_on_session_has_terminated(session_uuid=_session_uuid, profile_name=_profile_name, session_name=_session_name)
try: self(_session_uuid).session_cleanup()
- except x2go_exceptions.X2goSessionException: pass
+ except x2go_exceptions.X2GoSessionException: pass
try: self(_session_uuid).__del__()
- except x2go_exceptions.X2goSessionException: pass
+ except x2go_exceptions.X2GoSessionException: pass
if len(self.virgin_sessions_of_profile_name(profile_name)) > 1:
self.forget(_session_uuid)
@@ -388,13 +388,13 @@ class X2goSessionRegistry(object):
def register_available_server_sessions(self, profile_name, session_list=None, newly_connected=False, re_register=False, skip_pubapp_sessions=False):
"""\
- Register server-side available X2Go sessions with this L{X2goSessionRegistry} instance for a given profile name.
+ Register server-side available X2Go sessions with this L{X2GoSessionRegistry} instance for a given profile name.
@param profile_name: session profile name to register available X2Go sessions for
@type profile_name: C{str}
- @param session_list: an optional C{X2goServerSessionList*} instance (as returned by the L{X2goClient.list_sessions()} command can
+ @param session_list: an optional C{X2GoServerSessionList*} instance (as returned by the L{X2GoClient.list_sessions()} command can
be passed to this method.
- @type session_list: C{X2goServerSessionList*} instance
+ @type session_list: C{X2GoServerSessionList*} instance
@param newly_connected: give a hint that the session profile got newly connected
@type newly_connected: C{bool}
@param re_register: re-register available sessions, needs to be done after changes to the session profile
@@ -424,7 +424,7 @@ class X2goSessionRegistry(object):
session_list = _ctrl_session.list_sessions()
# make sure the session registry gets updated before registering new session
- # (if the server name has changed, this will kick out obsolete X2goSessions)
+ # (if the server name has changed, this will kick out obsolete X2GoSessions)
self.update_status(profile_name=profile_name, session_list=session_list, force_update=True)
for session_name in session_list.keys():
if (session_name not in _session_names and not self._skip_auto_registration) or re_register:
@@ -467,13 +467,13 @@ class X2goSessionRegistry(object):
def register(self, server, profile_id, profile_name,
session_name=None,
- control_backend=_X2goControlSession,
- terminal_backend=_X2goTerminalSession,
- info_backend=_X2goServerSessionInfo,
- list_backend=_X2goServerSessionList,
- proxy_backend=_X2goProxy,
- settings_backend=_X2goClientSettings,
- printing_backend=_X2goClientPrinting,
+ control_backend=_X2GoControlSession,
+ terminal_backend=_X2GoTerminalSession,
+ info_backend=_X2GoServerSessionInfo,
+ list_backend=_X2GoServerSessionList,
+ proxy_backend=_X2GoProxy,
+ settings_backend=_X2GoClientSettings,
+ printing_backend=_X2GoClientPrinting,
client_rootdir=os.path.join(_LOCAL_HOME,_X2GO_CLIENT_ROOTDIR),
sessions_rootdir=os.path.join(_LOCAL_HOME,_X2GO_SESSIONS_ROOTDIR),
ssh_rootdir=os.path.join(_LOCAL_HOME,_X2GO_SSH_ROOTDIR),
@@ -482,7 +482,7 @@ class X2goSessionRegistry(object):
known_hosts=None,
**kwargs):
"""\
- Register a new L{X2goSession} instance with this L{X2goSessionRegistry}.
+ Register a new L{X2GoSession} instance with this L{X2GoSessionRegistry}.
@param server: hostname of X2Go server
@type server: C{str}
@@ -512,13 +512,13 @@ class X2goSessionRegistry(object):
@type sessions_rootdir: C{str}
@param ssh_rootdir: ssh base dir (default: ~/.ssh)
@type ssh_rootdir: C{str}
- @param keep_controlsession_alive: On last L{X2goSession.disconnect()} keep the associated C{X2goControlSession*} instance alive?
+ @param keep_controlsession_alive: On last L{X2GoSession.disconnect()} keep the associated C{X2GoControlSession*} instance alive?
@ŧype keep_controlsession_alive: C{bool}
@param add_to_known_hosts: Auto-accept server host validity?
@type add_to_known_hosts: C{bool}
@param known_hosts: the underlying Paramiko/SSH systems C{known_hosts} file
@type known_hosts: C{str}
- @param kwargs: all other options will be passed on to the constructor of the to-be-instantiated L{X2goSession} instance
+ @param kwargs: all other options will be passed on to the constructor of the to-be-instantiated L{X2GoSession} instance
@type C{dict}
@return: the session UUID of the newly registered (or re-registered) session
@@ -537,7 +537,7 @@ class X2goSessionRegistry(object):
try:
_params = self.client_instance.session_profiles.to_session_params(profile_id)
- except x2go_exceptions.X2goProfileException:
+ except x2go_exceptions.X2GoProfileException:
_params = utils._convert_SessionProfileOptions_2_SessionParams(_X2GO_SESSIONPROFILE_DEFAULTS)
for _k in _params.keys():
@@ -571,7 +571,7 @@ class X2goSessionRegistry(object):
try: del _params['profile_id']
except: pass
- s = session.X2goSession(server=server, control_session=control_session,
+ s = session.X2GoSession(server=server, control_session=control_session,
profile_id=profile_id, profile_name=profile_name,
session_name=session_name,
control_backend=control_backend,
@@ -590,7 +590,7 @@ class X2goSessionRegistry(object):
client_instance=self.client_instance,
logger=self.logger, **_params)
- session_uuid = s._X2goSession__get_uuid()
+ session_uuid = s._X2GoSession__get_uuid()
self.logger('registering X2Go session %s...' % profile_name, log.loglevel_NOTICE)
self.logger('registering X2Go session with UUID %s' % session_uuid, log.loglevel_DEBUG)
@@ -608,7 +608,7 @@ class X2goSessionRegistry(object):
def has_session_of_session_name(self, session_name, match_profile_name=None):
"""\
- Detect if we know about an L{X2goSession} of name C{<session_name>}.
+ Detect if we know about an L{X2GoSession} of name C{<session_name>}.
@param session_name: name of session to be searched for
@type session_name: C{str}
@@ -623,20 +623,20 @@ class X2goSessionRegistry(object):
def get_session_of_session_name(self, session_name, return_object=False, match_profile_name=None):
"""\
- Retrieve the L{X2goSession} instance with session name C{<session_name>}.
+ Retrieve the L{X2GoSession} instance with session name C{<session_name>}.
@param session_name: name of session to be retrieved
@type session_name: C{str}
- @param return_object: if C{False} the session UUID hash will be returned, if C{True} the L{X2goSession} instance will be returned
+ @param return_object: if C{False} the session UUID hash will be returned, if C{True} the L{X2GoSession} instance will be returned
@type return_object: C{bool}
@param match_profile_name: returned sessions must match this profile name
@type match_profile_name: C{str}
- @return: L{X2goSession} object or its representing session UUID hash
- @rtype: L{X2goSession} instance or C{str}
+ @return: L{X2GoSession} object or its representing session UUID hash
+ @rtype: L{X2GoSession} instance or C{str}
- @raise X2goSessionRegistryException: if there is more than one L{X2goSession} registered for C{<session_name>} within
- the same L{X2goClient} instance. This should never happen!
+ @raise X2GoSessionRegistryException: if there is more than one L{X2GoSession} registered for C{<session_name>} within
+ the same L{X2GoClient} instance. This should never happen!
"""
if match_profile_name is None:
@@ -651,7 +651,7 @@ class X2goSessionRegistry(object):
else:
return session.get_uuid()
elif len(found_sessions) > 1:
- raise x2go_exceptions.X2goSessionRegistryException('there should only be one registered session of name ,,%s\'\'' % session_name)
+ raise x2go_exceptions.X2GoSessionRegistryException('there should only be one registered session of name ,,%s\'\'' % session_name)
else:
return None
@@ -687,10 +687,10 @@ class X2goSessionRegistry(object):
def connected_sessions(self, return_objects=True, return_profile_names=False, return_profile_ids=False, return_session_names=False):
"""\
- Retrieve a list of sessions that the underlying L{X2goClient} instances is currently connected to.
+ Retrieve a list of sessions that the underlying L{X2GoClient} instances is currently connected to.
If none of the C{return_*} options is specified a list of session UUID hashes will be returned.
- @param return_objects: return as list of L{X2goSession} instances
+ @param return_objects: return as list of L{X2GoSession} instances
@type return_objects: C{bool}
@param return_profile_names: return as list of profile names
@type return_profile_names: C{bool}
@@ -707,10 +707,10 @@ class X2goSessionRegistry(object):
def associated_sessions(self, return_objects=True, return_profile_names=False, return_profile_ids=False, return_session_names=False):
"""\
- Retrieve a list of sessions that are currently associated by an C{X2goTerminalSession*} to the underlying L{X2goClient} instance.
+ Retrieve a list of sessions that are currently associated by an C{X2GoTerminalSession*} to the underlying L{X2GoClient} instance.
If none of the C{return_*} options is specified a list of session UUID hashes will be returned.
- @param return_objects: return as list of L{X2goSession} instances
+ @param return_objects: return as list of L{X2GoSession} instances
@type return_objects: C{bool}
@param return_profile_names: return as list of profile names
@type return_profile_names: C{bool}
@@ -730,7 +730,7 @@ class X2goSessionRegistry(object):
Retrieve a list of sessions that are currently still in virgin state (not yet connected, associated etc.).
If none of the C{return_*} options is specified a list of session UUID hashes will be returned.
- @param return_objects: return as list of L{X2goSession} instances
+ @param return_objects: return as list of L{X2GoSession} instances
@type return_objects: C{bool}
@param return_profile_names: return as list of profile names
@type return_profile_names: C{bool}
@@ -750,7 +750,7 @@ class X2goSessionRegistry(object):
Retrieve a list of sessions that are currently in running state.
If none of the C{return_*} options is specified a list of session UUID hashes will be returned.
- @param return_objects: return as list of L{X2goSession} instances
+ @param return_objects: return as list of L{X2GoSession} instances
@type return_objects: C{bool}
@param return_profile_names: return as list of profile names
@type return_profile_names: C{bool}
@@ -770,7 +770,7 @@ class X2goSessionRegistry(object):
Retrieve a list of sessions that are currently in suspended state.
If none of the C{return_*} options is specified a list of session UUID hashes will be returned.
- @param return_objects: return as list of L{X2goSession} instances
+ @param return_objects: return as list of L{X2GoSession} instances
@type return_objects: C{bool}
@param return_profile_names: return as list of profile names
@type return_profile_names: C{bool}
@@ -790,7 +790,7 @@ class X2goSessionRegistry(object):
Retrieve a list of sessions that have terminated recently.
If none of the C{return_*} options is specified a list of session UUID hashes will be returned.
- @param return_objects: return as list of L{X2goSession} instances
+ @param return_objects: return as list of L{X2GoSession} instances
@type return_objects: C{bool}
@param return_profile_names: return as list of profile names
@type return_profile_names: C{bool}
@@ -808,7 +808,7 @@ class X2goSessionRegistry(object):
@property
def has_running_sessions(self):
"""\
- Equals C{True} if the underlying L{X2goClient} instance has any running sessions at hand.
+ Equals C{True} if the underlying L{X2GoClient} instance has any running sessions at hand.
"""
return self.running_sessions() and len(self.running_sessions()) > 0
@@ -816,7 +816,7 @@ class X2goSessionRegistry(object):
@property
def has_suspended_sessions(self):
"""\
- Equals C{True} if the underlying L{X2goClient} instance has any suspended sessions at hand.
+ Equals C{True} if the underlying L{X2GoClient} instance has any suspended sessions at hand.
"""
return self.suspended_sessions and len(self.suspended_sessions) > 0
@@ -826,7 +826,7 @@ class X2goSessionRegistry(object):
Retrieve a list of all registered sessions.
If none of the C{return_*} options is specified a list of session UUID hashes will be returned.
- @param return_objects: return as list of L{X2goSession} instances
+ @param return_objects: return as list of L{X2GoSession} instances
@type return_objects: C{bool}
@param return_profile_names: return as list of profile names
@type return_profile_names: C{bool}
@@ -846,7 +846,7 @@ class X2goSessionRegistry(object):
Retrieve a list of sessions that are currently _NOT_ in running state.
If none of the C{return_*} options is specified a list of session UUID hashes will be returned.
- @param return_objects: return as list of L{X2goSession} instances
+ @param return_objects: return as list of L{X2GoSession} instances
@type return_objects: C{bool}
@param return_profile_names: return as list of profile names
@type return_profile_names: C{bool}
@@ -868,7 +868,7 @@ class X2goSessionRegistry(object):
@param profile_name: session profile name
@type profile_name: C{str}
- @param return_objects: return as list of L{X2goSession} instances
+ @param return_objects: return as list of L{X2GoSession} instances
@type return_objects: C{bool}
@param return_session_names: return as list of X2Go session names
@type return_session_names: C{bool}
@@ -886,12 +886,12 @@ class X2goSessionRegistry(object):
def associated_sessions_of_profile_name(self, profile_name, return_objects=True, return_session_names=False):
"""\
- For a given session profile name retrieve a list of sessions that are currently associated by an C{X2goTerminalSession*} to this L{X2goClient} instance.
+ For a given session profile name retrieve a list of sessions that are currently associated by an C{X2GoTerminalSession*} to this L{X2GoClient} instance.
If none of the C{return_*} options is specified a list of session UUID hashes will be returned.
@param profile_name: session profile name
@type profile_name: C{str}
- @param return_objects: return as list of L{X2goSession} instances
+ @param return_objects: return as list of L{X2GoSession} instances
@type return_objects: C{bool}
@param return_session_names: return as list of X2Go session names
@type return_session_names: C{bool}
@@ -914,7 +914,7 @@ class X2goSessionRegistry(object):
@param profile_name: session profile name
@type profile_name: C{str}
- @param return_objects: return as list of L{X2goSession} instances
+ @param return_objects: return as list of L{X2GoSession} instances
@type return_objects: C{bool}
@param return_session_names: return as list of X2Go session names
@type return_session_names: C{bool}
@@ -932,12 +932,12 @@ class X2goSessionRegistry(object):
def registered_sessions_of_profile_name(self, profile_name, return_objects=True, return_session_names=False):
"""\
- For a given session profile name retrieve a list of sessions that are currently registered with this L{X2goClient} instance.
+ For a given session profile name retrieve a list of sessions that are currently registered with this L{X2GoClient} instance.
If none of the C{return_*} options is specified a list of session UUID hashes will be returned.
@param profile_name: session profile name
@type profile_name: C{str}
- @param return_objects: return as list of L{X2goSession} instances
+ @param return_objects: return as list of L{X2GoSession} instances
@type return_objects: C{bool}
@param return_session_names: return as list of X2Go session names
@type return_session_names: C{bool}
@@ -955,13 +955,13 @@ class X2goSessionRegistry(object):
def virgin_sessions_of_profile_name(self, profile_name, return_objects=True, return_session_names=False):
"""\
- For a given session profile name retrieve a list of sessions that are registered with this L{X2goClient} instance but have not
+ For a given session profile name retrieve a list of sessions that are registered with this L{X2GoClient} instance but have not
yet been started (i.e. sessions that are in virgin state). If none of the C{return_*} options is specified a list of
session UUID hashes will be returned.
@param profile_name: session profile name
@type profile_name: C{str}
- @param return_objects: return as list of L{X2goSession} instances
+ @param return_objects: return as list of L{X2GoSession} instances
@type return_objects: C{bool}
@param return_session_names: return as list of X2Go session names
@type return_session_names: C{bool}
@@ -984,7 +984,7 @@ class X2goSessionRegistry(object):
@param profile_name: session profile name
@type profile_name: C{str}
- @param return_objects: return as list of L{X2goSession} instances
+ @param return_objects: return as list of L{X2GoSession} instances
@type return_objects: C{bool}
@param return_session_names: return as list of X2Go session names
@type return_session_names: C{bool}
@@ -1007,7 +1007,7 @@ class X2goSessionRegistry(object):
@param profile_name: session profile name
@type profile_name: C{str}
- @param return_objects: return as list of L{X2goSession} instances
+ @param return_objects: return as list of L{X2GoSession} instances
@type return_objects: C{bool}
@param return_session_names: return as list of X2Go session names
@type return_session_names: C{bool}
@@ -1025,13 +1025,13 @@ class X2goSessionRegistry(object):
def control_session_of_profile_name(self, profile_name):
"""\
- For a given session profile name retrieve a the corresponding C{X2goControlSession*} instance.
+ For a given session profile name retrieve a the corresponding C{X2GoControlSession*} instance.
@param profile_name: session profile name
@type profile_name: C{str}
@return: contol session instance
- @rtype: C{X2goControlSession*} instance
+ @rtype: C{X2GoControlSession*} instance
"""
_sessions = self.registered_sessions_of_profile_name(profile_name, return_objects=True)
@@ -1070,7 +1070,7 @@ class X2goSessionRegistry(object):
@param profile_name: the profile name that we query the master session of
@type profile_name: C{str}
- @param return_object: return L{X2goSession} instance
+ @param return_object: return L{X2GoSession} instance
@type return_object: C{bool}
@param return_session_name: return X2Go session name
@type return_session_name: C{bool}
diff --git a/x2go/rforward.py b/x2go/rforward.py
index a138870..7105134 100644
--- a/x2go/rforward.py
+++ b/x2go/rforward.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -47,12 +47,12 @@ def x2go_transport_tcp_handler(chan, (origin_addr, origin_port), (server_addr, s
However, additionally this handler function checks the server port of the incoming channel
and detects if there are Paramiko/SSH reverse forwarding tunnels waiting for the incoming
- channels. The Paramiko/SSH reverse forwarding tunnels are initiated by an L{X2goSession} instance
+ channels. The Paramiko/SSH reverse forwarding tunnels are initiated by an L{X2GoSession} instance
(currently supported: reverse tunneling auf audio data, reverse tunneling of SSH requests).
- If the server port of an incoming Paramiko/SSH channel matches the configured port of an L{X2goRevFwTunnel}
- instance, this instance gets notified of the incoming channel and a new L{X2goRevFwChannelThread} is
- started. This L{X2goRevFwChannelThread} then takes care of the new channel's incoming data stream.
+ If the server port of an incoming Paramiko/SSH channel matches the configured port of an L{X2GoRevFwTunnel}
+ instance, this instance gets notified of the incoming channel and a new L{X2GoRevFwChannelThread} is
+ started. This L{X2GoRevFwChannelThread} then takes care of the new channel's incoming data stream.
"""
transport = chan.get_transport()
@@ -70,9 +70,9 @@ def x2go_transport_tcp_handler(chan, (origin_addr, origin_port), (server_addr, s
rev_tuns[session_name]['sshfs'][1].notify()
-class X2goRevFwTunnel(threading.Thread):
+class X2GoRevFwTunnel(threading.Thread):
"""\
- L{X2goRevFwTunnel} class objects are used to reversely tunnel
+ L{X2GoRevFwTunnel} class objects are used to reversely tunnel
X2Go audio, X2Go printing and X2Go folder sharing / device mounting
through Paramiko/SSH.
@@ -81,10 +81,10 @@ class X2goRevFwTunnel(threading.Thread):
"""\
Setup a reverse tunnel through Paramiko/SSH.
- After the reverse tunnel has been setup up with L{X2goRevFwTunnel.start()} it waits
- for notification from L{X2goRevFwTunnel.notify()} to accept incoming channels. This
- notification (L{X2goRevFwTunnel.notify()} gets called from within the transport's
- TCP handler function L{x2go_transport_tcp_handler} of the L{X2goSession} instance.
+ After the reverse tunnel has been setup up with L{X2GoRevFwTunnel.start()} it waits
+ for notification from L{X2GoRevFwTunnel.notify()} to accept incoming channels. This
+ notification (L{X2GoRevFwTunnel.notify()} gets called from within the transport's
+ TCP handler function L{x2go_transport_tcp_handler} of the L{X2GoSession} instance.
@param server_port: the TCP/IP port on the X2Go server (starting point of the tunnel),
normally some number above 30000
@@ -95,18 +95,18 @@ class X2goRevFwTunnel(threading.Thread):
@param remote_port: the TCP/IP port on the X2Go client (end point of the tunnel),
normally an application's standard port (22 for SSH, 4713 for pulse audio, etc.)
@type remote_port: int
- @param ssh_transport: the L{X2goSession}'s Paramiko/SSH transport instance
+ @param ssh_transport: the L{X2GoSession}'s Paramiko/SSH transport instance
@type ssh_transport: C{paramiko.Transport} instance
- @param logger: you can pass an L{X2goLogger} object to the
- L{X2goRevFwTunnel} constructor
- @type logger: L{X2goLogger} instance
- @param loglevel: if no L{X2goLogger} object has been supplied a new one will be
+ @param logger: you can pass an L{X2GoLogger} object to the
+ L{X2GoRevFwTunnel} constructor
+ @type logger: L{X2GoLogger} instance
+ @param loglevel: if no L{X2GoLogger} object has been supplied a new one will be
constructed with the given loglevel
@type loglevel: int
"""
if logger is None:
- self.logger = log.X2goLogger(loglevel=loglevel)
+ self.logger = log.X2GoLogger(loglevel=loglevel)
else:
self.logger = copy.deepcopy(logger)
self.logger.tag = __NAME__
@@ -155,7 +155,7 @@ class X2goRevFwTunnel(threading.Thread):
def pause(self):
"""\
Prevent acceptance of new incoming connections through the Paramiko/SSH
- reverse forwarding tunnel. Also, any active connection on this L{X2goRevFwTunnel}
+ reverse forwarding tunnel. Also, any active connection on this L{X2GoRevFwTunnel}
instance will be closed immediately, if this method is called.
"""
@@ -177,14 +177,14 @@ class X2goRevFwTunnel(threading.Thread):
def notify(self):
"""\
- Notify an L{X2goRevFwTunnel} instance of an incoming Paramiko/SSH channel.
+ Notify an L{X2GoRevFwTunnel} instance of an incoming Paramiko/SSH channel.
If an incoming reverse tunnel channel appropriate for this instance has
- been detected, this method gets called from the L{X2goSession}'s transport
+ been detected, this method gets called from the L{X2GoSession}'s transport
TCP handler.
The sent notification will trigger a C{thread.Condition()} waiting for notification
- in L{X2goRevFwTunnel.run()}.
+ in L{X2GoRevFwTunnel.run()}.
"""
self.incoming_channel.acquire()
@@ -194,7 +194,7 @@ class X2goRevFwTunnel(threading.Thread):
def stop_thread(self):
"""\
- Stops this L{X2goRevFwTunnel} thread completely.
+ Stops this L{X2GoRevFwTunnel} thread completely.
"""
self.pause()
@@ -220,23 +220,23 @@ class X2goRevFwTunnel(threading.Thread):
def run(self):
"""\
- This method gets run once an L{X2goRevFwTunnel} has been started with its
- L{start()} method. Use L{X2goRevFwTunnel}.stop_thread() to stop the
+ This method gets run once an L{X2GoRevFwTunnel} has been started with its
+ L{start()} method. Use L{X2GoRevFwTunnel}.stop_thread() to stop the
reverse forwarding tunnel again. You can also temporarily lock the tunnel
- down with L{X2goRevFwTunnel.pause()} and L{X2goRevFwTunnel.resume()}).
+ down with L{X2GoRevFwTunnel.pause()} and L{X2GoRevFwTunnel.resume()}).
- L{X2goRevFwTunnel.run()} waits for notifications of an appropriate incoming
- Paramiko/SSH channel (issued by L{X2goRevFwTunnel.notify()}). Appropriate in
+ L{X2GoRevFwTunnel.run()} waits for notifications of an appropriate incoming
+ Paramiko/SSH channel (issued by L{X2GoRevFwTunnel.notify()}). Appropriate in
this context means, that its start point on the X2Go server matches the class's
property C{server_port}.
Once a new incoming channel gets announced by the L{notify()} method, a new
- L{X2goRevFwChannelThread} instance will be initialized. As a data stream handler,
+ L{X2GoRevFwChannelThread} instance will be initialized. As a data stream handler,
the function L{x2go_rev_forward_channel_handler()} will be used.
The channel will last till the connection gets dropped on the X2Go server side or
- until the tunnel gets paused by an L{X2goRevFwTunnel.pause()} call or stopped via the
- L{X2goRevFwTunnel.stop_thread()} method.
+ until the tunnel gets paused by an L{X2GoRevFwTunnel.pause()} call or stopped via the
+ L{X2GoRevFwTunnel.stop_thread()} method.
"""
self._request_port_forwarding()
@@ -257,7 +257,7 @@ class X2goRevFwTunnel(threading.Thread):
self.incoming_channel.release()
if self._accept_channels and self._keepalive:
- _new_chan_thread = X2goRevFwChannelThread(_chan, (self.remote_host, self.remote_port),
+ _new_chan_thread = X2GoRevFwChannelThread(_chan, (self.remote_host, self.remote_port),
target=x2go_rev_forward_channel_handler,
kwargs={
'chan': _chan,
@@ -273,16 +273,16 @@ class X2goRevFwTunnel(threading.Thread):
def x2go_rev_forward_channel_handler(chan=None, addr='', port=0, parent_thread=None, logger=None, ):
"""\
- Handle the data stream of a requested channel that got set up by a L{X2goRevFwTunnel} (Paramiko/SSH
+ Handle the data stream of a requested channel that got set up by a L{X2GoRevFwTunnel} (Paramiko/SSH
reverse forwarding tunnel).
The channel (and the corresponding connections) close either ...
- ... if the connecting application closes the connection and thus, drops
the channel, or
- - ... if the L{X2goRevFwTunnel} parent thread gets paused. The call
- of L{X2goRevFwTunnel.pause()} on the instance can be used to shut down all incoming
- tunneled SSH connections associated to this L{X2goRevFwTunnel} instance
+ - ... if the L{X2GoRevFwTunnel} parent thread gets paused. The call
+ of L{X2GoRevFwTunnel.pause()} on the instance can be used to shut down all incoming
+ tunneled SSH connections associated to this L{X2GoRevFwTunnel} instance
from within a Python X2Go application.
@param chan: channel
@@ -291,11 +291,11 @@ def x2go_rev_forward_channel_handler(chan=None, addr='', port=0, parent_thread=N
@type addr: C{str}
@param port: bind port
@type port: C{int}
- @param parent_thread: the calling L{X2goRevFwTunnel} instance
- @type parent_thread: L{X2goRevFwTunnel} instance
- @param logger: you can pass an L{X2goLogger} object to the
- L{X2goRevFwTunnel} constructor
- @type logger: L{X2goLogger} instance
+ @param parent_thread: the calling L{X2GoRevFwTunnel} instance
+ @type parent_thread: L{X2GoRevFwTunnel} instance
+ @param logger: you can pass an L{X2GoLogger} object to the
+ L{X2GoRevFwTunnel} constructor
+ @type logger: L{X2GoLogger} instance
"""
fw_socket = socket.socket()
@@ -332,7 +332,7 @@ def x2go_rev_forward_channel_handler(chan=None, addr='', port=0, parent_thread=N
logger('Reverse tunnel %s closed from %r' % (chan, chan.origin_addr,), loglevel=log.loglevel_INFO)
-class X2goRevFwChannelThread(threading.Thread):
+class X2GoRevFwChannelThread(threading.Thread):
"""\
Starts a thread for each incoming Paramiko/SSH data channel trough the reverse
forwarding tunnel.
@@ -342,7 +342,7 @@ class X2goRevFwChannelThread(threading.Thread):
"""\
Initializes a reverse forwarding channel thread.
- @param channel: incoming Paramiko/SSH channel from the L{X2goSession}'s transport
+ @param channel: incoming Paramiko/SSH channel from the L{X2GoSession}'s transport
accept queue
@type channel: class
@param remote: tuple (addr, port) that specifies the data endpoint of the channel
diff --git a/x2go/session.py b/x2go/session.py
index bca32ec..1c94138 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -18,11 +18,11 @@
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
"""\
-X2goSession class - a public API of Python X2Go, handling standalone X2Go
+X2GoSession class - a public API of Python X2Go, handling standalone X2Go
sessions.
-This class is normally embedded into the context of an L{X2goClient}
-instance, but it is also possible to address L{X2goSession}s directly via this
+This class is normally embedded into the context of an L{X2GoClient}
+instance, but it is also possible to address L{X2GoSession}s directly via this
class.
To launch a session manually from the Python interactive shell, perform these
@@ -35,7 +35,7 @@ simple steps::
>>> import x2go
>>> import gevent
Xlib.protocol.request.QueryExtension
- >>> s = x2go.session.X2goSession()
+ >>> s = x2go.session.X2GoSession()
>>> s.set_server('<my.x2go.server>')
>>> s.set_port(<ssh-port>)
>>> s.connect('<my-login>', '<my-password>')
@@ -70,13 +70,13 @@ import utils
import session
import x2go_exceptions
-from x2go.backends.control import X2goControlSession as _X2goControlSession
-from x2go.backends.terminal import X2goTerminalSession as _X2goTerminalSession
-from x2go.backends.info import X2goServerSessionInfo as _X2goServerSessionInfo
-from x2go.backends.info import X2goServerSessionList as _X2goServerSessionList
-from x2go.backends.proxy import X2goProxy as _X2goProxy
-from x2go.backends.settings import X2goClientSettings as _X2goClientSettings
-from x2go.backends.printing import X2goClientPrinting as _X2goClientPrinting
+from x2go.backends.control import X2GoControlSession as _X2GoControlSession
+from x2go.backends.terminal import X2GoTerminalSession as _X2GoTerminalSession
+from x2go.backends.info import X2GoServerSessionInfo as _X2GoServerSessionInfo
+from x2go.backends.info import X2GoServerSessionList as _X2GoServerSessionList
+from x2go.backends.proxy import X2GoProxy as _X2GoProxy
+from x2go.backends.settings import X2GoClientSettings as _X2GoClientSettings
+from x2go.backends.printing import X2GoClientPrinting as _X2GoClientPrinting
from defaults import X2GOCLIENT_OS as _X2GOCLIENT_OS
from defaults import LOCAL_HOME as _LOCAL_HOME
@@ -98,7 +98,7 @@ _X2GO_SESSION_PARAMS = ('use_sshproxy', 'sshproxy_reuse_authinfo',
'connected', 'virgin', 'running', 'suspended', 'terminated', 'faulty'
'client_instance',
)
-"""A list of allowed X2Go pure session parameters (i.e. parameters that are passed on neither to an X2goControlSession, X2goSSHProxy nor an X2goControlSession object."""
+"""A list of allowed X2Go pure session parameters (i.e. parameters that are passed on neither to an X2GoControlSession, X2GoSSHProxy nor an X2GoControlSession object."""
# options of the paramiko.SSHClient().connect() method, any option that is allowed for a terminal session instance
_X2GO_TERMINAL_PARAMS = ('geometry', 'depth', 'link', 'pack', 'dpi',
'cache_type', 'kbtype', 'kblayout', 'kbvariant',
@@ -123,14 +123,14 @@ _X2GO_SSHPROXY_PARAMS = ('sshproxy_host', 'sshproxy_port', 'sshproxy_user', 'ssh
"""A list of allowed X2Go SSH proxy parameters."""
-class X2goSession(object):
+class X2GoSession(object):
"""\
Public API class for launching X2Go sessions. Recommended is to manage X2Go sessions from
- within an L{X2goClient} instance. However, Python X2Go is designed in a way that it also
- allows the management of singel L{X2goSession} instance.
+ within an L{X2GoClient} instance. However, Python X2Go is designed in a way that it also
+ allows the management of singel L{X2GoSession} instance.
- Thus, you can use the L{X2goSession} class to manually set up X2Go sessions without
- L{X2goClient} context (session registry, session list cache, auto-registration of new
+ Thus, you can use the L{X2GoSession} class to manually set up X2Go sessions without
+ L{X2GoClient} context (session registry, session list cache, auto-registration of new
sessions etc.).
"""
@@ -148,13 +148,13 @@ class X2goSession(object):
allow_share_local_folders=False,
share_local_folders=[],
restore_shared_local_folders=False,
- control_backend=_X2goControlSession,
- terminal_backend=_X2goTerminalSession,
- info_backend=_X2goServerSessionInfo,
- list_backend=_X2goServerSessionList,
- proxy_backend=_X2goProxy,
- settings_backend=_X2goClientSettings,
- printing_backend=_X2goClientPrinting,
+ control_backend=_X2GoControlSession,
+ terminal_backend=_X2GoTerminalSession,
+ info_backend=_X2GoServerSessionInfo,
+ list_backend=_X2GoServerSessionList,
+ proxy_backend=_X2GoProxy,
+ settings_backend=_X2GoClientSettings,
+ printing_backend=_X2GoClientPrinting,
client_rootdir=os.path.join(_LOCAL_HOME, _X2GO_CLIENT_ROOTDIR),
sessions_rootdir=os.path.join(_LOCAL_HOME, _X2GO_SESSIONS_ROOTDIR),
ssh_rootdir=os.path.join(_LOCAL_HOME, _X2GO_SSH_ROOTDIR),
@@ -169,8 +169,8 @@ class X2goSession(object):
"""\
@param server: hostname of X2Go server
@type server: C{str}
- @param control_session: an already initialized C{X2goControlSession*} instance
- @type control_session: C{X2goControlSession*} instance
+ @param control_session: an already initialized C{X2GoControlSession*} instance
+ @type control_session: C{X2GoControlSession*} instance
@param use_sshproxy: for communication with X2Go server use an SSH proxy host
@type use_sshproxy: C{bool}
@param sshproxy_reuse_authinfo: for proxy authentication re-use the X2Go session's password / key file
@@ -192,7 +192,7 @@ class X2goSession(object):
@param mimebox_extensions: whitelist of allowed X2Go MIME box extensions
@type mimebox_extensions: C{list}
@param mimebox_action: action for incoming X2Go MIME box files
- @type mimebox_action: C{X2goMimeBoxAction*} or C{str}
+ @type mimebox_action: C{X2GoMimeBoxAction*} or C{str}
@param allow_share_local_folders: enable local folder sharing support
@type allow_share_local_folders: C{bool}
@param share_local_folders: list of local folders to share with the remote X2Go session
@@ -219,7 +219,7 @@ class X2goSession(object):
@type sessions_rootdir: C{str}
@param ssh_rootdir: ssh base dir (default: ~/.ssh)
@type ssh_rootdir: C{str}
- @param keep_controlsession_alive: On last L{X2goSession.disconnect()} keep the associated C{X2goControlSession*} instance alive?
+ @param keep_controlsession_alive: On last L{X2GoSession.disconnect()} keep the associated C{X2GoControlSession*} instance alive?
@ŧype keep_controlsession_alive: C{bool}
@param add_to_known_hosts: Auto-accept server host validity?
@type add_to_known_hosts: C{bool}
@@ -241,14 +241,14 @@ class X2goSession(object):
@type terminated: C{bool}
@param faulty: manipulate session state ÂģfaultyÂĢ by giving a pre-set value
@type faulty: C{bool}
- @param client_instance: if available, the underlying L{X2goClient} instance
- @type client_instance: C{X2goClient} instance
+ @param client_instance: if available, the underlying L{X2GoClient} instance
+ @type client_instance: C{X2GoClient} instance
@param params: further control session, terminal session and SSH proxy class options
@type params: C{dict}
"""
if logger is None:
- self.logger = log.X2goLogger(loglevel=loglevel)
+ self.logger = log.X2GoLogger(loglevel=loglevel)
else:
self.logger = copy.deepcopy(logger)
self.logger.tag = __NAME__
@@ -377,7 +377,7 @@ class X2goSession(object):
return self.__get_uuid()
def __repr__(self):
- result = 'X2goSession('
+ result = 'X2GoSession('
for p in dir(self):
if '__' in p or not p in self.__dict__ or type(p) is types.InstanceType: continue
result += p + '=' + str(self.__dict__[p]) + ','
@@ -428,9 +428,9 @@ class X2goSession(object):
def get_client_instance(self):
"""\
- Return parent L{X2goClient} instance if avaiable.
+ Return parent L{X2GoClient} instance if avaiable.
- return: L{X2goClient} instance this session is associated with
+ return: L{X2GoClient} instance this session is associated with
rtype: C{obj}
"""
@@ -467,6 +467,26 @@ class X2goSession(object):
else:
self.logger('HOOK_session_startup_failed: session startup for session profile ,,%s\'\' failed.' % self.profile_name, loglevel=log.loglevel_WARN)
+ def HOOK_list_desktops_timeout(self):
+ """\
+ HOOK method: called if the x2golistdesktops command generates a timeout due to long execution time.
+
+ """
+ if self.client_instance:
+ self.client_instance.HOOK_list_desktops_timeout(profile_name=self.profile_name)
+ else:
+ self.logger('HOOK_list_desktops_timeout: the server-side x2golistdesktops command for session profile %s took too long to return results. This can happen from time to time, please try again.' % self.profile_name, loglevel=log.loglevel_WARN)
+
+ def HOOK_no_such_desktop(self, desktop='UNKNOWN'):
+ """\
+ HOOK method: called if it is tried to connect to a shared desktop that's not available (anymore).
+
+ """
+ if self.client_instance:
+ self.client_instance.HOOK_no_such_desktop(profile_name=self.profile_name, desktop=desktop)
+ else:
+ self.logger('HOOK_no_such_desktop: the desktop %s (via session profile %s) is not available for sharing (anymore).' % (desktop, self.profile_name), loglevel=log.loglevel_WARN)
+
def HOOK_rforward_request_denied(self, server_port=0):
"""\
HOOK method: called if a reverse port forwarding request has been denied.
@@ -496,12 +516,12 @@ class X2goSession(object):
if self.client_instance:
self.client_instance.HOOK_forwarding_tunnel_setup_failed(profile_name=self.profile_name, session_name=self.session_name, chain_host=chain_host, chain_port=chain_port)
else:
- self.logger('HOOK_forwarding_tunnel_setup_failed: Forwarding tunnel request to [%s]:%s for session %s (%s) was denied by remote X2go/SSH server. Session startup failed.' % (chain_host, chain_port, self.session_name, self.profile_name), loglevel=log.loglevel_WARN)
+ self.logger('HOOK_forwarding_tunnel_setup_failed: Forwarding tunnel request to [%s]:%s for session %s (%s) was denied by remote X2Go/SSH server. Session startup failed.' % (chain_host, chain_port, self.session_name, self.profile_name), loglevel=log.loglevel_WARN)
# get rid of the faulty session...
try:
self._terminate()
- except x2go_exceptions.X2goSessionException:
+ except x2go_exceptions.X2GoSessionException:
pass
def HOOK_printing_not_available(self):
@@ -544,7 +564,7 @@ class X2goSession(object):
else:
self.logger('HOOK_sshfs_not_available: the remote X2Go server (%s) denies SSHFS access for session %s. This will result in client-side folder sharing, printing and the MIME box feature being unavailable' % (self.profile_name, self.session_name), loglevel=log.loglevel_WARN)
- def HOOK_check_host_dialog(self, host, port, fingerprint='no fingerprint', fingerprint_type='RSA'):
+ def HOOK_check_host_dialog(self, host, port, fingerprint='no fingerprint', fingerprint_type='UNKNOWN'):
"""\
HOOK method: called if a host check is requested. This hook has to either return C{True} (default) or C{False}.
@@ -568,11 +588,13 @@ class X2goSession(object):
def init_control_session(self):
"""\
- Initialize a new control session (C{X2goControlSession*}).
+ Initialize a new control session (C{X2GoControlSession*}).
"""
+ low_latency = self.terminal_params.has_key('link') and self.terminal_params['link'].lower() in ('modem', 'isdn')
+
if self.control_session is None:
- self.logger('initializing X2goControlSession', loglevel=log.loglevel_DEBUG)
+ self.logger('initializing X2GoControlSession', loglevel=log.loglevel_DEBUG)
self.control_session = self.control_backend(profile_name=self.profile_name,
add_to_known_hosts=self.add_to_known_hosts,
known_hosts=self.known_hosts,
@@ -584,7 +606,10 @@ class X2goSession(object):
client_rootdir=self.client_rootdir,
sessions_rootdir=self.sessions_rootdir,
ssh_rootdir=self.ssh_rootdir,
+ low_latency=low_latency,
logger=self.logger)
+ else:
+ self.control_session.low_latency = low_latency
__init_control_session = init_control_session
def is_master_session(self):
@@ -594,7 +619,7 @@ class X2goSession(object):
The master session is the session has been launched first for a specific connection,
it also is _the_ session that controls the client-side shared folders.
- If this L{X2goSession} instance is a standalone instance (without parent L{X2goClient})
+ If this L{X2GoSession} instance is a standalone instance (without parent L{X2GoClient})
this method will always return C{True}.
@return: returns C{True} if this session is a master session
@@ -610,7 +635,7 @@ class X2goSession(object):
"""\
Declare this as a master session of a connection channel.
- This method gets called by the L{X2goSessionRegistry} while sessions are starting or resuming and it relies on
+ This method gets called by the L{X2GoSessionRegistry} while sessions are starting or resuming and it relies on
an already set-up terminal session.
@param wait: wait for <wait> seconds before sharing local folders via the new master session
@@ -654,7 +679,7 @@ class X2goSession(object):
def set_server(self, server):
"""\
- Modify server name after L{X2goSession} has already been initialized.
+ Modify server name after L{X2GoSession} has already been initialized.
@param server: new server name
@type server: C{str}
@@ -665,7 +690,7 @@ class X2goSession(object):
def set_port(self, port):
"""\
- Modify server port after L{X2goSession} has already been initialized.
+ Modify server port after L{X2GoSession} has already been initialized.
@param port: socket port of server to connect to
@type port: C{int}
@@ -676,7 +701,7 @@ class X2goSession(object):
def set_profile_name(self, profile_name):
"""\
- Modify session profile name after L{X2goSession} has already been initialized.
+ Modify session profile name after L{X2GoSession} has already been initialized.
@param profile_name: new session profile name
@type profile_name: C{str}
@@ -696,21 +721,21 @@ class X2goSession(object):
@return: value for profile option C{<option>}
@rtype: C{bool,str,int}
- @raise X2goProfileException: if the session profile option is unknown
+ @raise X2GoProfileException: if the session profile option is unknown
"""
if option in _X2GO_SESSION_PARAMS + _X2GO_TERMINAL_PARAMS + _X2GO_SSHPROXY_PARAMS and hasattr(self, option):
return eval("self.%s" % option)
else:
- raise x2go_exceptions.X2goProfileException('Unknown session profile option: %s.' % option)
+ raise x2go_exceptions.X2GoProfileException('Unknown session profile option: %s.' % option)
__get_session_profile_option = get_session_profile_option
def update_params(self, params):
"""\
- This method can be used to modify L{X2goSession} parameters after the
- L{X2goSession} instance has already been initialized.
+ This method can be used to modify L{X2GoSession} parameters after the
+ L{X2GoSession} instance has already been initialized.
- @param params: a Python dictionary with L{X2goSession} parameters
+ @param params: a Python dictionary with L{X2GoSession} parameters
@type params: C{dict}
"""
@@ -797,7 +822,7 @@ class X2goSession(object):
def get_uuid(self):
"""\
- Retrieve session UUID hash for this L{X2goSession}.
+ Retrieve session UUID hash for this L{X2GoSession}.
@return: the session's UUID hash
@rtype: C{str}
@@ -980,10 +1005,10 @@ class X2goSession(object):
def get_control_session(self):
"""\
- Retrieve the control session (C{X2goControlSession*} backend) of this L{X2goSession}.
+ Retrieve the control session (C{X2GoControlSession*} backend) of this L{X2GoSession}.
- @return: the L{X2goSession}'s control session
- @rtype: C{X2goControlSession*} instance
+ @return: the L{X2GoSession}'s control session
+ @rtype: C{X2GoControlSession*} instance
"""
return self.control_session
@@ -991,9 +1016,9 @@ class X2goSession(object):
def has_control_session(self):
"""\
- Check if this L{X2goSession} instance has an associated control session.
+ Check if this L{X2GoSession} instance has an associated control session.
- @return: returns C{True} if this L{X2goSession} has a control session associated to itself
+ @return: returns C{True} if this L{X2GoSession} has a control session associated to itself
@rtype: C{bool}
"""
@@ -1002,10 +1027,10 @@ class X2goSession(object):
def get_terminal_session(self):
"""\
- Retrieve the terminal session (C{X2goTerminalSession*} backend) of this L{X2goSession}.
+ Retrieve the terminal session (C{X2GoTerminalSession*} backend) of this L{X2GoSession}.
- @return: the L{X2goSession}'s terminal session
- @rtype: C{X2goControlTerminal*} instance
+ @return: the L{X2GoSession}'s terminal session
+ @rtype: C{X2GoControlTerminal*} instance
"""
if self.terminal_session == 'PENDING':
@@ -1015,9 +1040,9 @@ class X2goSession(object):
def has_terminal_session(self):
"""\
- Check if this L{X2goSession} instance has an associated terminal session.
+ Check if this L{X2GoSession} instance has an associated terminal session.
- @return: returns C{True} if this L{X2goSession} has a terminal session associated to itself
+ @return: returns C{True} if this L{X2GoSession} has a terminal session associated to itself
@rtype: C{bool}
"""
@@ -1029,7 +1054,7 @@ class X2goSession(object):
def check_host(self):
"""\
Provide a host check mechanism. This method basically calls the L{HOOK_check_host_dialog()} method
- which by itself calls the L{X2goClient.HOOK_check_host_dialog()} method. Make sure you
+ which by itself calls the L{X2GoClient.HOOK_check_host_dialog()} method. Make sure you
override any of these to enable user interaction on X2Go server validity checks.
@return: returns C{True} if an X2Go server host is valid for authentication
@@ -1098,7 +1123,7 @@ class X2goSession(object):
def can_auto_connect(self):
"""\
- Check if a session is configured adequately to be able to auto-connect to the X2go
+ Check if a session is configured adequately to be able to auto-connect to the X2Go
server (e.g. public key authentication).
@return: returns C{True} if the session can auto-connect, C{False} otherwise, C{None}
@@ -1153,8 +1178,8 @@ class X2goSession(object):
look_for_keys=None, allow_agent=None,
use_sshproxy=None, sshproxy_reuse_authinfo=False, sshproxy_user='', sshproxy_password='', sshproxy_force_password_auth=False):
"""\
- Connects to the L{X2goSession}'s server host. This method basically wraps around
- the C{X2goControlSession*.connect()} method.
+ Connects to the L{X2GoSession}'s server host. This method basically wraps around
+ the C{X2GoControlSession*.connect()} method.
@param username: the username for the X2Go server that is going to be
connected to (as a last minute way of changing the session username)
@@ -1189,8 +1214,8 @@ class X2goSession(object):
@return: returns C{True} is the connection to the X2Go server has been successful
@rtype C{bool}
- @raise X2goSessionException: on control session exceptions
- @raise X2goRemoteHomeException: if the remote home directory does not exist
+ @raise X2GoSessionException: on control session exceptions
+ @raise X2GoRemoteHomeException: if the remote home directory does not exist
@raise Exception: any other exception during connecting is passed through
"""
@@ -1246,9 +1271,9 @@ class X2goSession(object):
session_instance=self,
forward_sshagent=self.forward_sshagent,
**_params)
- except x2go_exceptions.X2goControlSessionException, e:
- raise x2go_exceptions.X2goSessionException(str(e))
- except x2go_exceptions.X2goRemoteHomeException, e:
+ except x2go_exceptions.X2GoControlSessionException, e:
+ raise x2go_exceptions.X2GoSessionException(str(e))
+ except x2go_exceptions.X2GoRemoteHomeException, e:
self.disconnect()
raise e
except:
@@ -1280,7 +1305,7 @@ class X2goSession(object):
def disconnect(self):
"""\
- Disconnect this L{X2goSession} instance.
+ Disconnect this L{X2GoSession} instance.
@return: returns C{True} if the disconnect operation has been successful
@rtype: C{bool}
@@ -1296,7 +1321,7 @@ class X2goSession(object):
self.unset_master_session()
try:
self.update_status(force_update=True)
- except x2go_exceptions.X2goControlSessionException:
+ except x2go_exceptions.X2GoControlSessionException:
pass
retval = self.control_session.disconnect()
return retval
@@ -1364,7 +1389,7 @@ class X2goSession(object):
If X2Go client-side printing is enable within this X2Go session you can use
this method to alter the way how incoming print spool jobs are handled/processed.
- For further information, please refer to the documentation of the L{X2goClient.set_session_print_action()}
+ For further information, please refer to the documentation of the L{X2GoClient.set_session_print_action()}
method.
@param print_action: one of the named above print actions, either as string or class instance
@@ -1392,7 +1417,7 @@ class X2goSession(object):
if self.control_session.has_session_died():
self.HOOK_on_control_session_death()
if not self.connected:
- self._X2goSession__disconnect()
+ self._X2GoSession__disconnect()
return self.connected
__is_alive = is_alive
@@ -1414,7 +1439,7 @@ class X2goSession(object):
self.control_session.clean_sessions(destroy_terminals=destroy_terminals, published_applications=published_applications)
else:
- self._X2goSession__disconnect()
+ self._X2GoSession__disconnect()
__clean_sessions = clean_sessions
def list_sessions(self, raw=False):
@@ -1426,14 +1451,14 @@ class X2goSession(object):
@type raw: C{bool}
@return: a session list (as data object or list of strings when called with C{raw=True} option)
- @rtype: C{X2goServerSessionList*} instance or C{list}
+ @rtype: C{X2GoServerSessionList*} instance or C{list}
"""
try:
return self.control_session.list_sessions(raw=raw)
- except x2go_exceptions.X2goControlSessionException:
- self.HOOK_on_control_session_death()
- self._X2goSession__disconnect()
+ except x2go_exceptions.X2GoControlSessionException:
+ if self.connected: self.HOOK_on_control_session_death()
+ self._X2GoSession__disconnect()
return None
__list_sessions = list_sessions
@@ -1451,9 +1476,12 @@ class X2goSession(object):
"""
try:
return self.control_session.list_desktops(raw=raw)
- except x2go_exceptions.X2goControlSessionException:
- self.HOOK_on_control_session_death()
- self._X2goSession__disconnect()
+ except x2go_exceptions.X2GoTimeoutException:
+ if self.is_alive(): self.HOOK_list_desktop_timeout()
+ return []
+ except x2go_exceptions.X2GoControlSessionException:
+ if self.connected: self.HOOK_on_control_session_death()
+ self._X2GoSession__disconnect()
return None
__list_desktops = list_desktops
@@ -1462,7 +1490,7 @@ class X2goSession(object):
Use the X2Go session registered under C{session_uuid} to
retrieve its list of mounted client shares for that session.
- @param raw: output the list of mounted client shares in X2go's
+ @param raw: output the list of mounted client shares in X2Go's
raw C{x2golistmounts} format
@type raw: C{bool}
@@ -1472,29 +1500,29 @@ class X2goSession(object):
"""
try:
return self.control_session.list_mounts(self.session_name, raw=raw)
- except x2go_exceptions.X2goControlSessionException:
- self.HOOK_on_control_session_death()
- self._X2goSession__disconnect()
+ except x2go_exceptions.X2GoControlSessionException:
+ if self.connected: self.HOOK_on_control_session_death()
+ self._X2GoSession__disconnect()
return None
__list_mounts = list_mounts
def update_status(self, session_list=None, force_update=False):
"""\
- Update the current session status. The L{X2goSession} instance uses an internal
+ Update the current session status. The L{X2GoSession} instance uses an internal
session status cache that allows to query the session status without the need
of retrieving data from the remote X2Go server for each query.
- The session status (if initialized properly with the L{X2goClient} constructor gets
+ The session status (if initialized properly with the L{X2GoClient} constructor gets
updated in regularly intervals.
- In case you use the L{X2goSession} class in standalone instances (that is: without
- being embedded into an L{X2goSession} context) then run this method in regular
- intervals to make sure the L{X2goSession}'s internal status cache information
+ In case you use the L{X2GoSession} class in standalone instances (that is: without
+ being embedded into an L{X2GoSession} context) then run this method in regular
+ intervals to make sure the L{X2GoSession}'s internal status cache information
is always up-to-date.
- @param session_list: provide an C{X2goServerSessionList*} that refers to X2Go sessions we want to update.
+ @param session_list: provide an C{X2GoServerSessionList*} that refers to X2Go sessions we want to update.
This option is mainly for reducing server/client traffic.
- @type session_list: C{X2goServerSessionList*} instance
+ @type session_list: C{X2GoServerSessionList*} instance
@param force_update: force a session status update, if if the last update is less then 1 second ago
@type force_update: C{bool}
@@ -1516,7 +1544,7 @@ class X2goSession(object):
try:
session_list = self.control_session.list_sessions()
self.connected = True
- except x2go_exceptions.X2goControlSessionException, e:
+ except x2go_exceptions.X2GoControlSessionException, e:
self.connected = False
self.running = None
self.suspended = None
@@ -1570,19 +1598,6 @@ class X2goSession(object):
return False
__is_published_applications_provider = is_published_applications_provider
- def is_desktop_session(self):
- """\
- Returns true if this session is configured as desktop session.
-
- @return: returns C{True} if this session is a desktop session.
- @rtype: C{bool}
-
- """
- if self.has_terminal_session():
- return self.terminal_session.is_desktop_session()
- return False
- __is_desktop_session = is_desktop_session
-
def get_published_applications(self, lang=None, refresh=False, raw=False, very_raw=False, max_no_submenus=defaults.PUBAPP_MAX_NO_SUBMENUS):
"""\
Return a list of published menu items from the X2Go server
@@ -1637,7 +1652,7 @@ class X2goSession(object):
@type all_suspended: C{bool}
@param start: is no session is to be resumed, start a new session
@type start: C{bool}
- @param redirect_to_client: redirect this call to the L{X2goClient} instance (if available) to allow frontend interaction
+ @param redirect_to_client: redirect this call to the L{X2GoClient} instance (if available) to allow frontend interaction
@type redirect_to_client: C{bool}
@return: returns success (or failure) of starting/resuming this sessions
@@ -1658,10 +1673,13 @@ class X2goSession(object):
del session_infos[session_name]
if session_infos:
+ sorted_session_names = utils.session_names_by_timestamp(session_infos)
if newest:
- return self.resume(session_name=utils.session_names_by_timestamp(session_infos)[-1])
+ if sorted_session_names[0].find('RDP') == -1:
+ return self.resume(session_name=sorted_session_names[-1])
elif oldest:
- return self.resume(session_name=utils.session_names_by_timestamp(session_infos)[-1])
+ if sorted_session_names[-1].find('RDP') == -1:
+ return self.resume(session_name=sorted_session_names[0])
elif all_suspended:
for session_name in [ _sn for _sn in session_infos.keys() if session_infos[_sn].is_suspended() ]:
return self.resume(session_name=session_name)
@@ -1785,7 +1803,7 @@ class X2goSession(object):
self._progress_status = 15
progress_event.set()
- except x2go_exceptions.X2goSessionException:
+ except x2go_exceptions.X2GoSessionException:
pass
self._progress_status = 20
@@ -1851,7 +1869,7 @@ class X2goSession(object):
(self._SUPPORTED_MIMEBOX and self.allow_mimebox) or \
(self._SUPPORTED_FOLDERSHARING and self.allow_share_local_folders):
self.has_terminal_session() and not self.faulty and self.terminal_session.start_sshfs()
- except x2go_exceptions.X2goUserException, e:
+ except x2go_exceptions.X2GoUserException, e:
self.logger('%s' % str(e), loglevel=log.loglevel_WARN)
self.HOOK_sshfs_not_available()
self._SUPPORTED_PRINTING = False
@@ -1865,7 +1883,7 @@ class X2goSession(object):
try:
self.has_terminal_session() and not self.faulty and self.terminal_session.start_printing()
self.has_terminal_session() and not self.faulty and self.session_environment.update({'X2GO_SPOOLDIR': self.terminal_session.get_printing_spooldir(), })
- except x2go_exceptions.X2goUserException, e:
+ except x2go_exceptions.X2GoUserException, e:
self.logger('%s' % str(e), loglevel=log.loglevel_WARN)
self.HOOK_printing_not_available()
self._SUPPORTED_PRINTING = False
@@ -1877,7 +1895,7 @@ class X2goSession(object):
try:
self.has_terminal_session() and not self.faulty and self.terminal_session.start_mimebox(mimebox_extensions=self.mimebox_extensions, mimebox_action=self.mimebox_action)
self.has_terminal_session() and self.session_environment.update({'X2GO_MIMEBOX': self.terminal_session.get_mimebox_spooldir(), })
- except x2go_exceptions.X2goUserException, e:
+ except x2go_exceptions.X2GoUserException, e:
self.logger('%s' % str(e), loglevel=log.loglevel_WARN)
self.HOOK_mimebox_not_available()
self._SUPPORTED_MIMEBOX = False
@@ -1923,9 +1941,8 @@ class X2goSession(object):
self._progress_status = -1
progress_event.set()
- self._X2goSession__disconnect()
+ self._X2GoSession__disconnect()
return False
-
__resume = resume
def start(self, cmd=None, progress_event=None):
@@ -1971,8 +1988,8 @@ class X2goSession(object):
@return: returns C{True} if starting the session has been successful, C{False} otherwise
@rtype: C{bool}
- @raise X2goDesktopSharingException: if the given desktop ID is not an available desktop session on the remote server
- @raise X2goSessionException: if the available desktop session appears to be dead, in fact
+ @raise X2GoDesktopSharingException: if the given desktop ID is not an available desktop session on the remote server
+ @raise X2GoSessionException: if the available desktop session appears to be dead, in fact
"""
self._lock.acquire()
@@ -2009,8 +2026,8 @@ class X2goSession(object):
@return: returns C{True} if starting the session has been successful, C{False} otherwise
@rtype: C{bool}
- @raise X2goDesktopSharingException: if the given desktop ID is not an available desktop session on the remote server
- @raise X2goSessionException: if the available desktop session appears to be dead, in fact
+ @raise X2GoDesktopSharingException: if the given desktop ID is not an available desktop session on the remote server
+ @raise X2GoSessionException: if the available desktop session appears to be dead, in fact
"""
self.terminal_session = 'PENDING'
@@ -2026,11 +2043,15 @@ class X2goSession(object):
_desktop = desktop or '%s@%s' % (user, display)
if check_desktop_list:
- if not _desktop in self._X2goSession__list_desktops():
+ desktop_list = self._X2GoSession__list_desktops()
+ if not _desktop in desktop_list:
_orig_desktop = _desktop
_desktop = '%s.0' % _desktop
- if not _desktop in self._X2goSession__list_desktops():
- raise x2go_exceptions.X2goDesktopSharingException('No such desktop ID: %s' % _orig_desktop)
+ if not _desktop in desktop_list:
+ self.HOOK_no_such_desktop(desktop=_orig_desktop)
+ self._progress_status = -1
+ progress_event.set()
+ return False
self._progress_status = 33
progress_event.set()
@@ -2055,12 +2076,12 @@ class X2goSession(object):
except ValueError:
# x2gostartagent output parsing will result in a ValueError. This one we will catch
- # here and change it into an X2goSessionException
+ # here and change it into an X2GoSessionException
self._progress_status = -1
progress_event.set()
- raise x2go_exceptions.X2goSessionException('the session on desktop %s is seemingly dead' % _desktop)
+ raise x2go_exceptions.X2GoSessionException('the session on desktop %s is seemingly dead' % _desktop)
self._progress_status = 90
progress_event.set()
@@ -2093,11 +2114,59 @@ class X2goSession(object):
self._progress_status = -1
progress_event.set()
- self._X2goSession__disconnect()
+ self._X2GoSession__disconnect()
return False
__share_desktop = share_desktop
+ def is_desktop_session(self):
+ """\
+ Test if this X2Go session is a desktop session.
+
+ @return: C{True} if this session is of session type desktop ('D').
+ @rtype: C{bool}
+
+ """
+ if self.has_terminal_session():
+ return self.terminal_session.is_desktop_session()
+ __is_desktop_session = is_desktop_session
+
+ def is_rootless_session(self):
+ """\
+ Test if this X2Go session is a rootless session.
+
+ @return: C{True} if this session is of session type rootless ('R').
+ @rtype: C{bool}
+
+ """
+ if self.has_terminal_session():
+ return self.terminal_session.is_rootless_session()
+ __is_rootless_session = is_rootless_session
+
+ def is_shadow_session(self):
+ """\
+ Test if this X2Go session is a desktop sharing (aka shadow) session.
+
+ @return: C{True} if this session is of session type shadow ('S').
+ @rtype: C{bool}
+
+ """
+ if self.has_terminal_session():
+ return self.terminal_session.is_shadow_session()
+ __is_shadow_session = is_shadow_session
+
+ def is_pubapp_session(self):
+ """\
+ Test if this X2Go session is a published applications session.
+
+ @return: C{True} if this session is of session type published applications ('P').
+ @rtype: C{bool}
+
+ """
+ if self.has_terminal_session():
+ return self.terminal_session.is_pubapp_session()
+ __is_pubapp_session = is_pubapp_session
+
def suspend(self):
"""\
Suspend this X2Go session.
@@ -2105,7 +2174,7 @@ class X2goSession(object):
@return: returns C{True} if suspending the session has been successful, C{False} otherwise
@rtype: C{bool}
- @raise X2goSessionException: if the session could not be suspended
+ @raise X2GoSessionException: if the session could not be suspended
"""
self._lock.acquire()
@@ -2125,7 +2194,7 @@ class X2goSession(object):
@return: returns C{True} if suspending the session has been successful, C{False} otherwise
@rtype: C{bool}
- @raise X2goSessionException: if the session could not be suspended
+ @raise X2GoSessionException: if the session could not be suspended
"""
if self.is_alive():
@@ -2161,10 +2230,10 @@ class X2goSession(object):
return True
else:
- raise x2go_exceptions.X2goSessionException('cannot suspend session')
+ raise x2go_exceptions.X2GoSessionException('cannot suspend session')
else:
- self._X2goSession__disconnect()
+ self._X2GoSession__disconnect()
return False
__suspend = suspend
@@ -2176,7 +2245,7 @@ class X2goSession(object):
@return: returns C{True} if terminating the session has been successful, C{False} otherwise
@rtype: C{bool}
- @raise X2goSessionException: if the session could not be terminated
+ @raise X2GoSessionException: if the session could not be terminated
"""
self._lock.acquire()
@@ -2196,7 +2265,7 @@ class X2goSession(object):
@return: returns C{True} if terminating the session has been successful, C{False} otherwise
@rtype: C{bool}
- @raise X2goSessionException: if the session could not be terminated
+ @raise X2GoSessionException: if the session could not be terminated
"""
if self.is_alive():
@@ -2231,17 +2300,17 @@ class X2goSession(object):
self.session_cleanup()
return True
else:
- raise x2go_exceptions.X2goSessionException('cannot terminate session')
+ raise x2go_exceptions.X2GoSessionException('cannot terminate session')
else:
- self._X2goSession__disconnect()
+ self._X2GoSession__disconnect()
return False
__terminate = terminate
def get_profile_name(self):
"""\
- Retrieve the profile name of this L{X2goSession} instance.
+ Retrieve the profile name of this L{X2GoSession} instance.
@return: X2Go client profile name of the session
@rtype: C{str}
@@ -2252,7 +2321,7 @@ class X2goSession(object):
def get_profile_id(self):
"""\
- Retrieve the profile ID of this L{X2goSession} instance.
+ Retrieve the profile ID of this L{X2GoSession} instance.
@return: the session profile's id
@rtype: C{str}
@@ -2267,7 +2336,7 @@ class X2goSession(object):
def session_ok(self):
"""\
- Test if this C{X2goSession} is
+ Test if this C{X2GoSession} is
in a healthy state.
@return: C{True} if session is ok, C{False} otherwise
@@ -2304,7 +2373,7 @@ class X2goSession(object):
def is_connected(self):
"""\
- Test if the L{X2goSession}'s control session is connected to the
+ Test if the L{X2GoSession}'s control session is connected to the
remote X2Go server.
@return: C{True} if session is connected, C{False} otherwise
@@ -2322,7 +2391,7 @@ class X2goSession(object):
def is_running(self, update_status=False):
"""\
- Test if the L{X2goSession}'s terminal session is up and running.
+ Test if the L{X2GoSession}'s terminal session is up and running.
@return: C{True} if session is running, C{False} otherwise
@rtype: C{bool}
@@ -2344,7 +2413,7 @@ class X2goSession(object):
def is_suspended(self, update_status=False):
"""\
- Test if the L{X2goSession}'s terminal session is in suspended state.
+ Test if the L{X2GoSession}'s terminal session is in suspended state.
@return: C{True} if session is suspended, C{False} otherwise
@rtype: C{bool}
@@ -2366,7 +2435,7 @@ class X2goSession(object):
def has_terminated(self, update_status=False):
"""\
- Test if the L{X2goSession}'s terminal session has terminated.
+ Test if the L{X2GoSession}'s terminal session has terminated.
@return: C{True} if session has terminated, C{False} otherwise
@rtype: C{bool}
@@ -2432,7 +2501,7 @@ class X2goSession(object):
this X2Go session
@rtype: C{bool}
- @raise X2goSessionException: if this L{X2goSession} does not have an associated terminal session
+ @raise X2GoSessionException: if this L{X2GoSession} does not have an associated terminal session
"""
# compat for Python-X2Go (<=0.1.1.6)
@@ -2466,7 +2535,7 @@ class X2goSession(object):
self._restore_exported_folders[local_path] = False
else:
- raise x2go_exceptions.X2goSessionException('this X2goSession object does not have any associated terminal')
+ raise x2go_exceptions.X2GoSessionException('this X2GoSession object does not have any associated terminal')
return retval
__share_local_folder = share_local_folder
@@ -2491,7 +2560,7 @@ class X2goSession(object):
for _folder in self.share_local_folders:
try:
retval = self.share_local_folder(_folder, update_exported_folders=False) and retval
- except x2go_exceptions.X2goUserException, e:
+ except x2go_exceptions.X2GoUserException, e:
retval = False
self.logger('%s' % str(e), loglevel=log.loglevel_WARN)
if update_exported_folders:
@@ -2516,7 +2585,7 @@ class X2goSession(object):
inside this X2Go session
@rtype: C{bool}
- @raise X2goSessionException: if this L{X2goSession} does not have an associated terminal session
+ @raise X2GoSessionException: if this L{X2GoSession} does not have an associated terminal session
"""
retval = False
@@ -2535,7 +2604,7 @@ class X2goSession(object):
self.shared_folders[local_path]['status'] = 'mounted'
else:
- raise x2go_exceptions.X2goSessionException('this X2goSession object does not have any associated terminal')
+ raise x2go_exceptions.X2GoSessionException('this X2GoSession object does not have any associated terminal')
return retval
__unshare_local_folder = unshare_local_folder
@@ -2554,7 +2623,7 @@ class X2goSession(object):
inside this X2Go session
@rtype: C{bool}
- @raise X2goSessionException: if this L{X2goSession} does not have an associated terminal session
+ @raise X2GoSessionException: if this L{X2GoSession} does not have an associated terminal session
"""
if self.has_terminal_session():
@@ -2574,7 +2643,7 @@ class X2goSession(object):
self._update_restore_exported_folders()
return retval
else:
- raise x2go_exceptions.X2goSessionException('this X2goSession object does not have any associated terminal')
+ raise x2go_exceptions.X2GoSessionException('this X2GoSession object does not have any associated terminal')
return False
__unshare_all_local_folders = unshare_all_local_folders
diff --git a/x2go/sftpserver.py b/x2go/sftpserver.py
index 839f664..02f90a2 100644
--- a/x2go/sftpserver.py
+++ b/x2go/sftpserver.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
# The Python X2Go sFTPServer code was originally written by Richard Murri,
# for further information see his website: http://www.richardmurri.com
@@ -22,7 +22,7 @@
"""\
For sharing local folders via sFTP/sshfs Python X2Go implements its own sFTP
-server (as end point of reverse forwarding tunnel requests). Thus, Python X2go
+server (as end point of reverse forwarding tunnel requests). Thus, Python X2Go
does not need a locally installed SSH daemon on the client side machine.
The Python X2Go sFTP server code was originally written by Richard Murri,
@@ -55,17 +55,17 @@ class _SSHServer(paramiko.ServerInterface):
@param auth_key: Server key that the client has to authenticate against
@type auth_key: C{paramiko.RSAKey} instance
- @param session_instance: the calling L{X2goSession} instance
- @type session_instance: L{X2goSession} instance
- @param logger: you can pass an L{X2goLogger} object to the L{X2goClientXConfig} constructor
+ @param session_instance: the calling L{X2GoSession} instance
+ @type session_instance: L{X2GoSession} instance
+ @param logger: you can pass an L{X2GoLogger} object to the L{X2GoClientXConfig} constructor
@type logger: C{obj}
- @param loglevel: if no L{X2goLogger} object has been supplied a new one will be
+ @param loglevel: if no L{X2GoLogger} object has been supplied a new one will be
constructed with the given loglevel
@type loglevel: C{int}
"""
if logger is None:
- self.logger = log.X2goLogger(loglevel=loglevel)
+ self.logger = log.X2GoLogger(loglevel=loglevel)
else:
self.logger = copy.deepcopy(logger)
self.logger.tag = __NAME__
@@ -162,9 +162,9 @@ class _SFTPServerInterface(paramiko.SFTPServerInterface):
@type server: C{paramiko.ServerInterface} instance
@param chroot: chroot environment for this SFTP interface
@type chroot: C{str}
- @param logger: you can pass an L{X2goLogger} object to the L{X2goClientXConfig} constructor
+ @param logger: you can pass an L{X2GoLogger} object to the L{X2GoClientXConfig} constructor
@type logger: C{obj}
- @param loglevel: if no L{X2goLogger} object has been supplied a new one will be
+ @param loglevel: if no L{X2GoLogger} object has been supplied a new one will be
constructed with the given loglevel
@type loglevel: C{int}
@param server_event: a C{threading.Event} instance that can signal SFTP session termination
@@ -172,7 +172,7 @@ class _SFTPServerInterface(paramiko.SFTPServerInterface):
"""
if logger is None:
- self.logger = log.X2goLogger(loglevel=loglevel)
+ self.logger = log.X2GoLogger(loglevel=loglevel)
else:
self.logger = copy.deepcopy(logger)
self.logger.tag = __NAME__
@@ -490,7 +490,7 @@ class _SFTPServerInterface(paramiko.SFTPServerInterface):
self.server_event.set()
-class X2goRevFwTunnelToSFTP(rforward.X2goRevFwTunnel):
+class X2GoRevFwTunnelToSFTP(rforward.X2GoRevFwTunnel):
"""\
A reverse fowarding tunnel with an sFTP server at its endpoint. This blend of a Paramiko/SSH
reverse forwarding tunnel is used to provide access to local X2Go client folders
@@ -505,22 +505,22 @@ class X2goRevFwTunnelToSFTP(rforward.X2goRevFwTunnel):
@param server_port: the TCP/IP port on the X2Go server (starting point of the tunnel),
normally some number above 30000
@type server_port: C{int}
- @param ssh_transport: the L{X2goSession}'s Paramiko/SSH transport instance
+ @param ssh_transport: the L{X2GoSession}'s Paramiko/SSH transport instance
@type ssh_transport: C{paramiko.Transport} instance
@param auth_key: Paramiko/SSH RSAkey object that has to be authenticated against by
the remote sFTP client
@type auth_key: C{paramiko.RSAKey} instance
- @param logger: you can pass an L{X2goLogger} object to the
- L{X2goRevFwTunnelToSFTP} constructor
- @type logger: L{X2goLogger} instance
- @param loglevel: if no L{X2goLogger} object has been supplied a new one will be
+ @param logger: you can pass an L{X2GoLogger} object to the
+ L{X2GoRevFwTunnelToSFTP} constructor
+ @type logger: L{X2GoLogger} instance
+ @param loglevel: if no L{X2GoLogger} object has been supplied a new one will be
constructed with the given loglevel
@type loglevel: C{int}
"""
self.ready = False
if logger is None:
- self.logger = log.X2goLogger(loglevel=loglevel)
+ self.logger = log.X2GoLogger(loglevel=loglevel)
else:
self.logger = copy.deepcopy(logger)
self.logger.tag = __NAME__
@@ -541,22 +541,22 @@ class X2goRevFwTunnelToSFTP(rforward.X2goRevFwTunnel):
def run(self):
"""\
- This method gets run once an L{X2goRevFwTunnelToSFTP} has been started with its
- L{start()} method. Use L{X2goRevFwTunnelToSFTP}.stop_thread() to stop the
+ This method gets run once an L{X2GoRevFwTunnelToSFTP} has been started with its
+ L{start()} method. Use L{X2GoRevFwTunnelToSFTP}.stop_thread() to stop the
reverse forwarding tunnel again (refer also to its pause() and resume() method).
- L{X2goRevFwTunnelToSFTP.run()} waits for notifications of an appropriate incoming
- Paramiko/SSH channel (issued by L{X2goRevFwTunnelToSFTP.notify()}). Appropriate in
+ L{X2GoRevFwTunnelToSFTP.run()} waits for notifications of an appropriate incoming
+ Paramiko/SSH channel (issued by L{X2GoRevFwTunnelToSFTP.notify()}). Appropriate in
this context means, that its starting point on the X2Go server matches the class's
property C{server_port}.
Once a new incoming channel gets announced by the L{notify()} method, a new
- L{X2goRevFwSFTPChannelThread} instance will be initialized. As a data stream handler,
+ L{X2GoRevFwSFTPChannelThread} instance will be initialized. As a data stream handler,
the function L{x2go_rev_forward_sftpchannel_handler()} will be used.
The channel will last till the connection gets dropped on the X2Go server side or
- until the tunnel gets paused by an L{X2goRevFwTunnelToSFTP.pause()} call or
- stopped via the C{X2goRevFwTunnelToSFTP.stop_thread()} method.
+ until the tunnel gets paused by an L{X2GoRevFwTunnelToSFTP.pause()} call or
+ stopped via the C{X2GoRevFwTunnelToSFTP.stop_thread()} method.
"""
self._request_port_forwarding()
@@ -577,7 +577,7 @@ class X2goRevFwTunnelToSFTP(rforward.X2goRevFwTunnel):
self.incoming_channel.release()
if self._accept_channels and self._keepalive:
- _new_chan_thread = X2goRevFwSFTPChannelThread(_chan,
+ _new_chan_thread = X2GoRevFwSFTPChannelThread(_chan,
target=x2go_rev_forward_sftpchannel_handler,
kwargs={
'chan': _chan,
@@ -592,15 +592,15 @@ class X2goRevFwTunnelToSFTP(rforward.X2goRevFwTunnel):
def x2go_rev_forward_sftpchannel_handler(chan=None, auth_key=None, logger=None):
"""\
- Handle incoming sFTP channels that got setup by an L{X2goRevFwTunnelToSFTP} instance.
+ Handle incoming sFTP channels that got setup by an L{X2GoRevFwTunnelToSFTP} instance.
The channel (and the corresponding connections) close either ...
- ... if the connecting application closes the connection and thus, drops
the sFTP channel, or
- - ... if the L{X2goRevFwTunnelToSFTP} parent thread gets paused. The call
- of L{X2goRevFwTunnelToSFTP.pause()} on the instance can be used to shut down all incoming
- tunneled SSH connections associated to this L{X2goRevFwTunnelToSFTP} instance
+ - ... if the L{X2GoRevFwTunnelToSFTP} parent thread gets paused. The call
+ of L{X2GoRevFwTunnelToSFTP.pause()} on the instance can be used to shut down all incoming
+ tunneled SSH connections associated to this L{X2GoRevFwTunnelToSFTP} instance
from within a Python X2Go application.
@param chan: an incoming sFTP channel
@@ -608,8 +608,8 @@ def x2go_rev_forward_sftpchannel_handler(chan=None, auth_key=None, logger=None):
@param auth_key: Paramiko/SSH RSAkey object that has to be authenticated against by
the remote sFTP client
@type auth_key: C{paramiko.RSAKey} instance
- @param logger: you must pass an L{X2goLogger} object to this handler method
- @type logger: C{X2goLogger} instance
+ @param logger: you must pass an L{X2GoLogger} object to this handler method
+ @type logger: C{X2GoLogger} instance
"""
if logger is None:
@@ -643,5 +643,5 @@ def x2go_rev_forward_sftpchannel_handler(chan=None, auth_key=None, logger=None):
logger('sFTP channel %s closed down' % chan, loglevel=log.loglevel_DEBUG)
-class X2goRevFwSFTPChannelThread(rforward.X2goRevFwChannelThread): pass
-"""A clone of L{rforward.X2goRevFwChannelThread}."""
+class X2GoRevFwSFTPChannelThread(rforward.X2GoRevFwChannelThread): pass
+"""A clone of L{rforward.X2GoRevFwChannelThread}."""
diff --git a/x2go/sshproxy.py b/x2go/sshproxy.py
index df50f2b..7bdb5e5 100644
--- a/x2go/sshproxy.py
+++ b/x2go/sshproxy.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -18,7 +18,7 @@
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
"""\
-L{X2goSSHProxy} class - providing a forwarding tunnel for connecting to servers behind firewalls.
+L{X2GoSSHProxy} class - providing a forwarding tunnel for connecting to servers behind firewalls.
"""
__NAME__ = 'x2gosshproxy-pylib'
@@ -47,9 +47,9 @@ from x2go.defaults import X2GO_SSH_ROOTDIR as _X2GO_SSH_ROOTDIR
import x2go._paramiko
x2go._paramiko.monkey_patch_paramiko()
-class X2goSSHProxy(paramiko.SSHClient, threading.Thread):
+class X2GoSSHProxy(paramiko.SSHClient, threading.Thread):
"""\
- X2goSSHProxy can be used to proxy X2Go connections through a firewall via SSH.
+ X2GoSSHProxy can be used to proxy X2Go connections through a firewall via SSH.
"""
fw_tunnel = None
@@ -65,7 +65,7 @@ class X2goSSHProxy(paramiko.SSHClient, threading.Thread):
session_instance=None,
logger=None, loglevel=log.loglevel_DEFAULT, ):
"""\
- Initialize an X2goSSHProxy instance. Use an instance of this class to tunnel X2Go requests through
+ Initialize an X2GoSSHProxy instance. Use an instance of this class to tunnel X2Go requests through
a proxying SSH server (i.e. to subLANs that are separated by firewalls or to private IP subLANs that
are NATted behind routers).
@@ -125,20 +125,20 @@ class X2goSSHProxy(paramiko.SSHClient, threading.Thread):
@param ssh_rootdir: local user's SSH base directory (default: ~/.ssh)
@type ssh_rootdir: C{str}
- @param session_instance: the L{X2goSession} instance that builds up this SSH proxying tunnel
- @type session_instance: L{X2goSession} instance
- @param logger: you can pass an L{X2goLogger} object to the
- L{X2goSSHProxy} constructor
- @type logger: L{X2goLogger} instance
- @param loglevel: if no L{X2goLogger} object has been supplied a new one will be
+ @param session_instance: the L{X2GoSession} instance that builds up this SSH proxying tunnel
+ @type session_instance: L{X2GoSession} instance
+ @param logger: you can pass an L{X2GoLogger} object to the
+ L{X2GoSSHProxy} constructor
+ @type logger: L{X2GoLogger} instance
+ @param loglevel: if no L{X2GoLogger} object has been supplied a new one will be
constructed with the given loglevel
@type loglevel: int
- @raise X2goSSHProxyAuthenticationException: if the SSH proxy caused a C{paramiko.AuthenticationException}
- @raise X2goSSHProxyException: if the SSH proxy caused a C{paramiko.SSHException}
+ @raise X2GoSSHProxyAuthenticationException: if the SSH proxy caused a C{paramiko.AuthenticationException}
+ @raise X2GoSSHProxyException: if the SSH proxy caused a C{paramiko.SSHException}
"""
if logger is None:
- self.logger = log.X2goLogger(loglevel=loglevel)
+ self.logger = log.X2GoLogger(loglevel=loglevel)
else:
self.logger = copy.deepcopy(logger)
self.logger.tag = __NAME__
@@ -147,7 +147,7 @@ class X2goSSHProxy(paramiko.SSHClient, threading.Thread):
if sshproxy_port: self.port = sshproxy_port
- # translate between X2goSession options and paramiko.SSHCLient.connect() options
+ # translate between X2GoSession options and paramiko.SSHCLient.connect() options
# if <hostname>:<port> is used for sshproxy_host, then this <port> is used
if sshproxy_host:
if sshproxy_host.find(':'):
@@ -207,7 +207,7 @@ class X2goSSHProxy(paramiko.SSHClient, threading.Thread):
self.load_host_keys(self.known_hosts)
if not add_to_known_hosts and session_instance:
- self.set_missing_host_key_policy(checkhosts.X2goInteractiveAddPolicy(caller=self, session_instance=session_instance))
+ self.set_missing_host_key_policy(checkhosts.X2GoInteractiveAddPolicy(caller=self, session_instance=session_instance))
if add_to_known_hosts:
self.set_missing_host_key_policy(paramiko.AutoAddPolicy())
@@ -241,10 +241,10 @@ class X2goSSHProxy(paramiko.SSHClient, threading.Thread):
except x2go_exceptions.AuthenticationException, e:
self.close()
- raise x2go_exceptions.X2goSSHProxyAuthenticationException('pubkey auth mechanisms both failed')
+ raise x2go_exceptions.X2GoSSHProxyAuthenticationException('pubkey auth mechanisms both failed')
except x2go_exceptions.SSHException, e:
self.close()
- raise x2go_exceptions.X2goSSHProxyAuthenticationException('interactive authentication required')
+ raise x2go_exceptions.X2GoSSHProxyAuthenticationException('interactive authentication required')
except:
raise
@@ -267,14 +267,14 @@ class X2goSSHProxy(paramiko.SSHClient, threading.Thread):
)
except x2go_exceptions.AuthenticationException:
self.close()
- raise x2go_exceptions.X2goSSHProxyAuthenticationException('interactive auth mechanisms failed')
+ raise x2go_exceptions.X2GoSSHProxyAuthenticationException('interactive auth mechanisms failed')
except:
self.close()
raise
except (x2go_exceptions.SSHException, IOError), e:
self.close()
- raise x2go_exceptions.X2goSSHProxyException(str(e))
+ raise x2go_exceptions.X2GoSSHProxyException(str(e))
except:
self.close()
raise
@@ -288,7 +288,6 @@ class X2goSSHProxy(paramiko.SSHClient, threading.Thread):
Wraps around a Paramiko/SSH host key check.
"""
- # hostname rewrite for localhost, force to IPv4
_hostname = self.hostname
# force into IPv4 for localhost connections
@@ -298,14 +297,14 @@ class X2goSSHProxy(paramiko.SSHClient, threading.Thread):
_valid = False
(_valid, _hostname, _port, _fingerprint, _fingerprint_type) = checkhosts.check_ssh_host_key(self, _hostname, port=self.port)
if not _valid and self.session_instance:
- _valid = self.session_instance.HOOK_check_host_dialog(_hostname, _port, fingerprint=_fingerprint, fingerprint_type=_fingerprint_type)
+ _valid = self.session_instance.HOOK_check_host_dialog(self.remote_host, self.remote_port, fingerprint=_fingerprint, fingerprint_type=_fingerprint_type)
return _valid
def run(self):
"""\
Start the SSH proxying tunnel...
- @raise X2goSSHProxyException: if the SSH proxy could not retrieve an SSH transport for proxying a X2Go server-client connection
+ @raise X2GoSSHProxyException: if the SSH proxy could not retrieve an SSH transport for proxying a X2Go server-client connection
"""
if self.get_transport() is not None and self.get_transport().is_authenticated():
@@ -332,7 +331,17 @@ class X2goSSHProxy(paramiko.SSHClient, threading.Thread):
gevent.sleep(.1)
else:
- raise x2go_exceptions.X2goSSHProxyException('SSH proxy connection could not retrieve an SSH transport')
+ raise x2go_exceptions.X2GoSSHProxyException('SSH proxy connection could not retrieve an SSH transport')
+
+ def get_local_proxy_host(self):
+ """\
+ Retrieve the local IP socket address this SSH proxying tunnel is (about to) bind/bound to.
+
+ @return: local IP socket address
+ @rtype: C{str}
+
+ """
+ return self.local_host
def get_local_proxy_port(self):
"""\
@@ -344,6 +353,26 @@ class X2goSSHProxy(paramiko.SSHClient, threading.Thread):
"""
return self.local_port
+ def get_remote_host(self):
+ """\
+ Retrieve the remote IP socket address at the remote end of the SSH proxying tunnel.
+
+ @return: remote IP socket address
+ @rtype: C{str}
+
+ """
+ return self.remote_host
+
+ def get_remote_port(self):
+ """\
+ Retrieve the remote IP socket port of the target system's SSH daemon.
+
+ @return: remote SSH port
+ @rtype: C{int}
+
+ """
+ return self.remote_port
+
def stop_thread(self):
"""\
Tear down the SSH proxying tunnel.
diff --git a/x2go/tests/test_printing.py b/x2go/tests/test_printing.py
index 77dba3b..8ac6487 100644
--- a/x2go/tests/test_printing.py
+++ b/x2go/tests/test_printing.py
@@ -23,7 +23,7 @@ import tempfile
# Python X2Go modules
import x2go
-class TestX2goClientPrinting(unittest.TestCase):
+class TestX2GoClientPrinting(unittest.TestCase):
def test_client_printing_dialog(self):
_printing = """\
@@ -42,8 +42,8 @@ defaultprinter=PDF
tf = tempfile.NamedTemporaryFile()
print >> tf, _printing
tf.seek(0)
- p_action = x2go.backends.printing.X2goClientPrinting(config_files=tf.name, client_instance='DUMMY')
- self.assertEqual(type(p_action.print_action), x2go.printactions.X2goPrintActionDIALOG)
+ p_action = x2go.backends.printing.X2GoClientPrinting(config_files=tf.name, client_instance='DUMMY')
+ self.assertEqual(type(p_action.print_action), x2go.printactions.X2GoPrintActionDIALOG)
tf.close()
def test_client_printing_pdfview(self):
@@ -62,8 +62,8 @@ defaultprinter=PDF
tf = tempfile.NamedTemporaryFile()
print >> tf, _printing
tf.seek(0)
- p_action = x2go.backends.printing.X2goClientPrinting(config_files=tf.name)
- self.assertEqual(type(p_action.print_action), x2go.printactions.X2goPrintActionPDFVIEW)
+ p_action = x2go.backends.printing.X2GoClientPrinting(config_files=tf.name)
+ self.assertEqual(type(p_action.print_action), x2go.printactions.X2GoPrintActionPDFVIEW)
tf.close()
def test_client_printing_pdfsave(self):
@@ -82,8 +82,8 @@ defaultprinter=PDF
tf = tempfile.NamedTemporaryFile()
print >> tf, _printing
tf.seek(0)
- p_action = x2go.backends.printing.X2goClientPrinting(config_files=tf.name)
- self.assertEqual(type(p_action.print_action), x2go.printactions.X2goPrintActionPDFSAVE)
+ p_action = x2go.backends.printing.X2GoClientPrinting(config_files=tf.name)
+ self.assertEqual(type(p_action.print_action), x2go.printactions.X2GoPrintActionPDFSAVE)
tf.close()
def test_client_printing_print(self):
@@ -102,8 +102,8 @@ defaultprinter=PDF
tf = tempfile.NamedTemporaryFile()
print >> tf, _printing
tf.seek(0)
- p_action = x2go.backends.printing.X2goClientPrinting(config_files=tf.name)
- self.assertEqual(type(p_action.print_action), x2go.printactions.X2goPrintActionPRINT)
+ p_action = x2go.backends.printing.X2GoClientPrinting(config_files=tf.name)
+ self.assertEqual(type(p_action.print_action), x2go.printactions.X2GoPrintActionPRINT)
tf.close()
def test_client_printing_printcmd(self):
@@ -122,12 +122,12 @@ defaultprinter=PDF
tf = tempfile.NamedTemporaryFile()
print >> tf, _printing
tf.seek(0)
- p_action = x2go.backends.printing.X2goClientPrinting(config_files=tf.name)
- self.assertEqual(type(p_action.print_action), x2go.printactions.X2goPrintActionPRINTCMD)
+ p_action = x2go.backends.printing.X2GoClientPrinting(config_files=tf.name)
+ self.assertEqual(type(p_action.print_action), x2go.printactions.X2GoPrintActionPRINTCMD)
tf.close()
def test_suite():
from unittest import TestSuite, makeSuite
suite = TestSuite()
- suite.addTest(makeSuite(TestX2goClientPrinting))
+ suite.addTest(makeSuite(TestX2GoClientPrinting))
return suite
diff --git a/x2go/utils.py b/x2go/utils.py
index ab98120..03fd9a8 100644
--- a/x2go/utils.py
+++ b/x2go/utils.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -163,7 +163,7 @@ def _convert_SessionProfileOptions_2_SessionParams(options):
@param options: a dictionary of options, parameter names as in the X2Go ,,sessions'' file
@type options: C{dict}
- @return: session options as used in C{X2goSession} instances
+ @return: session options as used in C{X2GoSession} instances
@rtype: C{dict}
"""
@@ -205,7 +205,6 @@ def _convert_SessionProfileOptions_2_SessionParams(options):
'sshproxyport': 'sshproxy_port',
'sshproxyuser': 'sshproxy_user',
'sshproxykeyfile': 'sshproxy_key_filename',
- 'sshproxytunnel': 'sshproxy_tunnel',
'sessiontitle': 'session_title',
'setsessiontitle': 'set_session_title',
'published': 'published_applications',
@@ -214,6 +213,7 @@ def _convert_SessionProfileOptions_2_SessionParams(options):
'forwardsshagent': 'forward_sshagent',
'autologin': 'look_for_keys',
'sshproxyautologin': 'sshproxy_look_for_keys',
+ 'uniquehostkeyaliases': 'unique_hostkey_aliases',
}
_speed_dict = {
'0': 'modem',
@@ -328,7 +328,20 @@ def _convert_SessionProfileOptions_2_SessionParams(options):
_params['sshproxy_key_filename'] = _params['key_filename']
del _params['sshproxysamepass']
- # currently known but ignored in Python X2go
+ if _params['use_sshproxy']:
+
+ # compat code for Python X2Go 0.2.1.0 -> 0.2.2.0
+ if options.has_key('sshproxytunnel'):
+ if not options['sshproxytunnel'].startswith('DEPRECATED'):
+ _params['server'] = options['sshproxytunnel'].split(":")[-2]
+ _params['port'] = options['sshproxytunnel'].split(":")[-1]
+ try: del _params['sshproxytunnel']
+ except KeyError: pass
+
+ _params['sshproxy_tunnel'] = 'localhost:44444:%s:%s' % (_params['server'], _params['port'])
+
+
+ # currently known but ignored in Python X2Go
_ignored_options = [
'startsoundsystem',
'soundtunnel',
@@ -336,6 +349,7 @@ def _convert_SessionProfileOptions_2_SessionParams(options):
'icon',
'xinerama',
'multidisp',
+ 'display',
'krblogin',
'directrdp',
'directrdpsettings',
@@ -353,7 +367,7 @@ def session_names_by_timestamp(session_infos):
"""\
Sorts session profile names by their timestamp (as used in the file format's section name).
- @param session_infos: a dictionary of session infos as reported by L{X2goClient.list_sessions()}
+ @param session_infos: a dictionary of session infos as reported by L{X2GoClient.list_sessions()}
@type session_infos: C{dict}
@return: a timestamp-sorted list of session names found in C{session_infos}
diff --git a/x2go/x2go_exceptions.py b/x2go/x2go_exceptions.py
index a8eaa3f..be69208 100644
--- a/x2go/x2go_exceptions.py
+++ b/x2go/x2go_exceptions.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -39,33 +39,61 @@ BadHostKeyException = paramiko.AuthenticationException
SSHException = paramiko.SSHException
"""inherited from Python Paramiko library"""
-class _X2goException(exceptions.BaseException): pass
-class X2goClientException(_X2goException): pass
-class X2goClientPrintingException(_X2goException): pass
-class X2goClientSettingsException(_X2goException): pass
-class X2goSessionException(_X2goException): pass
-class X2goControlSessionException(_X2goException): pass
-class X2goRemoteHomeException(_X2goException): pass
-class X2goHostKeyException(_X2goException): pass
-class X2goSSHProxyHostKeyException(_X2goException): pass
-class X2goTerminalSessionException(_X2goException): pass
-class X2goSessionCacheException(_X2goException): pass
-class X2goUserException(_X2goException): pass
-class X2goProfileException(_X2goException): pass
-class X2goSessionRegistryException(_X2goException): pass
-class X2goFwTunnelException(_X2goException): pass
-class X2goRevFwTunnelException(_X2goException): pass
-class X2goPrintException(_X2goException): pass
-class X2goPrintQueueException(_X2goException): pass
-class X2goPrintActionException(_X2goException): pass
-class X2goProxyException(_X2goException): pass
-class X2goMIMEboxActionException(_X2goException): pass
-class X2goMIMEboxQueueException(_X2goException): pass
-class X2goSSHProxyException(_X2goException): pass
-class X2goSSHProxyAuthenticationException(_X2goException): pass
-class X2goNotImplementedYetException(_X2goException): pass
-class X2goDesktopSharingException(_X2goException): pass
-class X2goTimeOutException(_X2goException): pass
+class _X2GoException(exceptions.BaseException): pass
+class X2GoClientException(_X2GoException): pass
+class X2GoClientPrintingException(_X2GoException): pass
+class X2GoClientSettingsException(_X2GoException): pass
+class X2GoSessionException(_X2GoException): pass
+class X2GoControlSessionException(_X2GoException): pass
+class X2GoRemoteHomeException(_X2GoException): pass
+class X2GoHostKeyException(_X2GoException): pass
+class X2GoSSHProxyHostKeyException(_X2GoException): pass
+class X2GoTerminalSessionException(_X2GoException): pass
+class X2GoSessionCacheException(_X2GoException): pass
+class X2GoUserException(_X2GoException): pass
+class X2GoProfileException(_X2GoException): pass
+class X2GoSessionRegistryException(_X2GoException): pass
+class X2GoFwTunnelException(_X2GoException): pass
+class X2GoRevFwTunnelException(_X2GoException): pass
+class X2GoPrintException(_X2GoException): pass
+class X2GoPrintQueueException(_X2GoException): pass
+class X2GoPrintActionException(_X2GoException): pass
+class X2GoProxyException(_X2GoException): pass
+class X2GoMIMEboxActionException(_X2GoException): pass
+class X2GoMIMEboxQueueException(_X2GoException): pass
+class X2GoSSHProxyException(_X2GoException): pass
+class X2GoSSHProxyAuthenticationException(_X2GoException): pass
+class X2GoNotImplementedYetException(_X2GoException): pass
+class X2GoDesktopSharingException(_X2GoException): pass
+class X2GoTimeOutException(_X2GoException): pass
if _X2GOCLIENT_OS != 'Windows':
# faking Windows errors on non-Windows systems...
- class WindowsError(_X2goException): pass
+ class WindowsError(_X2GoException): pass
+
+# compat section
+class X2goClientException(_X2GoException): pass
+class X2goClientPrintingException(_X2GoException): pass
+class X2goClientSettingsException(_X2GoException): pass
+class X2goSessionException(_X2GoException): pass
+class X2goControlSessionException(_X2GoException): pass
+class X2goRemoteHomeException(_X2GoException): pass
+class X2goHostKeyException(_X2GoException): pass
+class X2goSSHProxyHostKeyException(_X2GoException): pass
+class X2goTerminalSessionException(_X2GoException): pass
+class X2goSessionCacheException(_X2GoException): pass
+class X2goUserException(_X2GoException): pass
+class X2goProfileException(_X2GoException): pass
+class X2goSessionRegistryException(_X2GoException): pass
+class X2goFwTunnelException(_X2GoException): pass
+class X2goRevFwTunnelException(_X2GoException): pass
+class X2goPrintException(_X2GoException): pass
+class X2goPrintQueueException(_X2GoException): pass
+class X2goPrintActionException(_X2GoException): pass
+class X2goProxyException(_X2GoException): pass
+class X2goMIMEboxActionException(_X2GoException): pass
+class X2goMIMEboxQueueException(_X2GoException): pass
+class X2goSSHProxyException(_X2GoException): pass
+class X2goSSHProxyAuthenticationException(_X2GoException): pass
+class X2goNotImplementedYetException(_X2GoException): pass
+class X2goDesktopSharingException(_X2GoException): pass
+class X2goTimeOutException(_X2GoException): pass
diff --git a/x2go/xserver.py b/x2go/xserver.py
index edcb596..ba9e91d 100644
--- a/x2go/xserver.py
+++ b/x2go/xserver.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
#
# Python X2Go is free software; you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
@@ -43,9 +43,9 @@ from defaults import X2GO_CLIENTXCONFIG_DEFAULTS as _X2GO_CLIENTXCONFIG_DEFAULTS
import inifiles
import utils
-class X2goClientXConfig(inifiles.X2goIniFile):
+class X2GoClientXConfig(inifiles.X2GoIniFile):
"""\
- Configuration file based XServer startup settings for X2goClient instances.
+ Configuration file based XServer startup settings for X2GoClient instances.
This class is needed for Windows systems and (maybe soon) for Unix desktops using Wayland.
@@ -54,11 +54,11 @@ class X2goClientXConfig(inifiles.X2goIniFile):
def __init__(self, config_files=_X2GO_XCONFIG_CONFIGFILES, defaults=None, logger=None, loglevel=log.loglevel_DEFAULT):
"""\
- Constructs an L{X2goClientXConfig} instance. This is normally done by an L{X2goClient} instance.
- You can retrieve this L{X2goClientXConfig} instance with the C{X2goClient.get_client_xconfig()}
+ Constructs an L{X2GoClientXConfig} instance. This is normally done by an L{X2GoClient} instance.
+ You can retrieve this L{X2GoClientXConfig} instance with the C{X2GoClient.get_client_xconfig()}
method.
- On construction the L{X2goClientXConfig} instance is filled with values from the configuration files::
+ On construction the L{X2GoClientXConfig} instance is filled with values from the configuration files::
/etc/x2goclient/xconfig
~/.x2goclient/xconfig
@@ -71,9 +71,9 @@ class X2goClientXConfig(inifiles.X2goIniFile):
@type config_files: C{list}
@param defaults: a Python dictionary with configuration file defaults (use on your own risk)
@type defaults: C{dict}
- @param logger: you can pass an L{X2goLogger} object to the L{X2goClientXConfig} constructor
+ @param logger: you can pass an L{X2GoLogger} object to the L{X2GoClientXConfig} constructor
@type logger: C{obj}
- @param loglevel: if no L{X2goLogger} object has been supplied a new one will be
+ @param loglevel: if no L{X2GoLogger} object has been supplied a new one will be
constructed with the given loglevel
@type loglevel: C{int}
@@ -83,7 +83,7 @@ class X2goClientXConfig(inifiles.X2goIniFile):
class OSNotSupportedException(exceptions.StandardError): pass
raise OSNotSupportedException('classes of x2go.xserver module are for Windows only')
- inifiles.X2goIniFile.__init__(self, config_files, defaults=defaults, logger=logger, loglevel=loglevel)
+ inifiles.X2GoIniFile.__init__(self, config_files, defaults=defaults, logger=logger, loglevel=loglevel)
_known_xservers = utils.merge_ordered_lists(self.defaultValues['XServers']['known_xservers'], self.known_xservers)
@@ -155,7 +155,7 @@ class X2goClientXConfig(inifiles.X2goIniFile):
@property
def xserver_launch_possible(self):
"""\
- Detect if there is an XServer (that is known to Python X2go) installed on the system.
+ Detect if there is an XServer (that is known to Python X2Go) installed on the system.
Equals C{True} if we have found an installed XServer that we can launch.
"""
@@ -239,7 +239,7 @@ class X2goClientXConfig(inifiles.X2goIniFile):
pass
-class X2goXServer(threading.Thread):
+class X2GoXServer(threading.Thread):
"""
This class is responsible for starting/stopping an external XServer application.
@@ -253,11 +253,11 @@ class X2goXServer(threading.Thread):
@param xserver_name: name of the XServer to start (refer to the xconfig file for available names)
@type xserver_name: C{str}
- @param xserver_config: XServer configuration node (as derived from L{X2goClientXConfig.get_xserver_config()}
+ @param xserver_config: XServer configuration node (as derived from L{X2GoClientXConfig.get_xserver_config()}
@type xserver_config: C{dict}
- @param logger: you can pass an L{X2goLogger} object to the L{X2goClientXConfig} constructor
+ @param logger: you can pass an L{X2GoLogger} object to the L{X2GoClientXConfig} constructor
@type logger: C{obj}
- @param loglevel: if no L{X2goLogger} object has been supplied a new one will be
+ @param loglevel: if no L{X2GoLogger} object has been supplied a new one will be
constructed with the given loglevel
@type loglevel: C{int}
@@ -268,7 +268,7 @@ class X2goXServer(threading.Thread):
raise OSNotSupportedException('classes of x2go.xserver module are for Windows only')
if logger is None:
- self.logger = log.X2goLogger(loglevel=loglevel)
+ self.logger = log.X2GoLogger(loglevel=loglevel)
else:
self.logger = copy.deepcopy(logger)
self.logger.tag = __NAME__
@@ -296,7 +296,7 @@ class X2goXServer(threading.Thread):
def run(self):
"""\
- Start this L{X2goXServer} thread. This will launch the configured XServer application.
+ Start this L{X2GoXServer} thread. This will launch the configured XServer application.
"""
self._keepalive = True
hooks/post-receive
--
python-x2go.git (Python X2Go Client API)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "python-x2go.git" (Python X2Go Client API).
1
0
12 Feb '13
The branch, master has been updated
via 720f39f4f42896c5633b612e69a01c7add4eaf95 (commit)
via 1ddcf94e49415941d44f8a142d7863a4d2adcdea (commit)
from 810c1e98f0e38a4cc5364aac2f2832264bd56e58 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 720f39f4f42896c5633b612e69a01c7add4eaf95
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Tue Feb 12 08:44:13 2013 +0100
release 0.4.0.0
commit 1ddcf94e49415941d44f8a142d7863a4d2adcdea
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Tue Feb 12 08:44:02 2013 +0100
add a note about the class name changes to the __doc__ string based documentation
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 4 ++--
x2go/__init__.py | 5 +++++
2 files changed, 7 insertions(+), 2 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index b42d0b0..65b9050 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-python-x2go (0.4.0.0-0~x2go1) UNRELEASED; urgency=low
+python-x2go (0.4.0.0-0~x2go1) unstable; urgency=low
[ Orion Poplawski ]
* New upstream version (0.4.0.0):
@@ -36,7 +36,7 @@ python-x2go (0.4.0.0-0~x2go1) UNRELEASED; urgency=low
either link quality will double nearly all connection timeout values.
(Fixes: #53).
- -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 20 Dec 2012 08:58:44 +0100
+ -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 12 Feb 2013 08:41:52 +0100
python-x2go (0.2.1.1-0~x2go1) unstable; urgency=low
diff --git a/x2go/__init__.py b/x2go/__init__.py
index e2c0058..340f24f 100644
--- a/x2go/__init__.py
+++ b/x2go/__init__.py
@@ -26,6 +26,11 @@ Introduction
With Python X2Go you can write your own X2Go clients or embed X2Go client
features into already existing application environments.
+ NOTE: Beginning with v0.4.0.0 of Python X2Go all class names start with
+ X2Go***. Earlier versions used X2go***. As X2Go is the official name of the
+ project (i.e. with a capital X and a capital G) we have adapted the class
+ names to this circumstance.
+
API Concept
===========
hooks/post-receive
--
python-x2go.git (Python X2Go Client API)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "python-x2go.git" (Python X2Go Client API).
1
0