[X2go-Commits] pyhoca-gui.git - build-main (branch) updated: 0.4.0.0
X2Go dev team
git-admin at x2go.org
Tue Feb 12 11:22:32 CET 2013
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 at das-netzwerkteam.de>, GPLv3 applies to this file
+# Copyright 2010-2013 by Mike Gabriel <mike.gabriel at 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 at das-netzwerkteam.de>
- Copyright (C) 2010-2012 by Dick Kniep <dick.kniep at lindix.nl>
+pyhoca-gui - Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+ Copyright (C) 2010-2013 by Dick Kniep <dick.kniep at 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 at lindix.nl>
Mike Gabriel <mike.gabriel at 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 at das-netzwerkteam.de>
- Copyright (C) 2010-2012 by Dick Kniep <dick.kniep at lindix.nl>
+pyhoca-gui - Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+ Copyright (C) 2010-2013 by Dick Kniep <dick.kniep at 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 at das-netzwerkteam.de>
- Copyright (C) 2010-2012 by Dick Kniep <dick.kniep at lindix.nl>
+pyhoca-gui - Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+ Copyright (C) 2010-2013 by Dick Kniep <dick.kniep at 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 at das-netzwerkteam.de>
Dick Kniep <dick.kniep at 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 at 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 at das-netzwerkteam.de>
Source: http://wiki.x2go.org
Files: *
-Copyright: 2010-2012, Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
- 2010-2012, Dick Kniep <dick.kniep at lindix.nl>
+Copyright: 2010-2013, Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+ 2010-2013, Dick Kniep <dick.kniep at lindix.nl>
License: AGPL-3+
Files: Makefile.docupload
-Copyright: 2010-2012, Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+Copyright: 2010-2013, Mike Gabriel <mike.gabriel at 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 at das-netzwerkteam.de>
+Copyright: 2010-2013, Mike Gabriel <mike.gabriel at 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 at das-netzwerkteam.de>
+# Copyright 2010-2013 by Mike Gabriel <mike.gabriel at 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 at das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at 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 at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at 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 at das-netzwerkteam.de>
+# Copyright (C) 2010-2013 Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
# Dick Kniep <dick.kniep at lindix.nl>
# This file is distributed under the same license as the PyHoca-GUI package.
# Mike Gabriel <mike.gabriel at 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 at das-netzwerkteam.de>\n"
"Language-Team: X2Go i18n <x2go-i18n at 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 at fleten.net>\n"
"Language-Team: X2Go i18n <x2go-i18n at 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 at das-netzwerkteam.de>
+# Copyright (C) 2010-2013 Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
# Dick Kniep <dick.kniep at lindix.nl>
# This file is distributed under the same license as the PyHoca-GUI package.
# Mike Gabriel <mike.gabriel at 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 at das-netzwerkteam.de>\n"
"Language-Team: X2Go i18n <x2go-i18n at 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 at das-netzwerkteam.de>
+# Copyright (C) 2010-2013 Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
# Dick Kniep <dick.kniep at lindix.nl>
# This file is distributed under the same license as the PyHoca-GUI package.
# Mike Gabriel <mike.gabriel at 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 at das-netzwerkteam.de>\n"
"Language-Team: X2Go i18n <x2go-i18n at 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 at das-netzwerkteam.de>
+# Copyright (C) 2010-2013 Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
# Dick Kniep <dick.kniep at 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 at 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 at gmail.com>\n"
"Language-Team: X2Go i18n <x2go-i18n at 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 at das-netzwerkteam.de>
+# Copyright (C) 2010-2013 Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
# Dick Kniep <dick.kniep at lindix.nl>
# This file is distributed under the same license as the PyHoca-GUI package.
# Mike Gabriel <mike.gabriel at 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 at das-netzwerkteam.de>\n"
"Language-Team: X2Go i18n <x2go-i18n at 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 at das-netzwerkteam.de>
+# Copyright (C) 2010-2013 Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
# Dick Kniep <dick.kniep at lindix.nl>
# This file is distributed under the same license as the PyHoca-GUI package.
# Mike Gabriel <mike.gabriel at 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 at 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 at gmail.com>\n"
"Language-Team: X2Go i18n <x2go-i18n at 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 at das-netzwerkteam.de>
+# Copyright (C) 2010-2013 Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
# Dick Kniep <dick.kniep at lindix.nl>
# This file is distributed under the same license as the PyHoca-GUI package.
# Mike Gabriel <mike.gabriel at 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 at das-netzwerkteam.de>\n"
"Language-Team: X2Go i18n <x2go-i18n at 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 at das-netzwerkteam.de>
+# Copyright (C) 2010-2013 Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
# Dick Kniep <dick.kniep at lindix.nl>
# This file is distributed under the same license as the PyHoca-GUI package.
#
# Mike Gabriel <mike.gabriel at das-netzwerkteam.de>, 2011.
-# Oleksandr Shneyder <o.shneyder at phoca-gmbh.de>, 2012.
+# Oleksandr Shneyder <o.shneyder at 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 at phoca-gmbh.de>\n"
-"Language-Team: X2Go i18n <x2go-i18n at lists.berlios.de>\n"
+"Language-Team: German <x2go-i18n at 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 at das-netzwerkteam.de>
+# Copyright (C) 2010-2013 Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
# Dick Kniep <dick.kniep at lindix.nl>
# This file is distributed under the same license as the PyHoca-GUI package.
# Mike Gabriel <mike.gabriel at 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 at 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 at gmail.com>\n"
"Language-Team: X2Go i18n <x2go-i18n at 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 at das-netzwerkteam.de>
-# Copyright (C) 2010-2012 by Dick Kniep <dick.kniep at lindix.nl>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Dick Kniep <dick.kniep at 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 at das-netzwerkteam.de>
-sponsored by Dick Kniep <dick.kniep at lindix.nl> (2010-2012)
+sponsored by Dick Kniep <dick.kniep at 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 at das-netzwerkteam.de>
-# Copyright (C) 2010-2012 by Dick Kniep <dick.kniep at lindix.nl>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Dick Kniep <dick.kniep at 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 at das-netzwerkteam.de>
-# Copyright (C) 2010-2012 by Dick Kniep <dick.kniep at lindix.nl>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Dick Kniep <dick.kniep at 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 at das-netzwerkteam.de>
-# Copyright (C) 2010-2012 by Dick Kniep <dick.kniep at lindix.nl>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Dick Kniep <dick.kniep at 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 at das-netzwerkteam.de>
-# Copyright (C) 2010-2012 by Dick Kniep <dick.kniep at lindix.nl>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Dick Kniep <dick.kniep at 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 at das-netzwerkteam.de>
-# Copyright (C) 2010-2012 by Dick Kniep <dick.kniep at lindix.nl>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Dick Kniep <dick.kniep at 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 at das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Dick Kniep <dick.kniep at 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 at das-netzwerkteam.de>
-# Copyright (C) 2010-2012 by Dick Kniep <dick.kniep at lindix.nl>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Dick Kniep <dick.kniep at 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 at das-netzwerkteam.de>
-# Copyright (C) 2010-2012 by Dick Kniep <dick.kniep at lindix.nl>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Dick Kniep <dick.kniep at 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 at 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 at das-netzwerkteam.de>
-# Copyright (C) 2010-2012 by Dick Kniep <dick.kniep at lindix.nl>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Dick Kniep <dick.kniep at 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 at das-netzwerkteam.de>
-# Copyright (C) 2010-2012 by Dick Kniep <dick.kniep at lindix.nl>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Dick Kniep <dick.kniep at 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 at das-netzwerkteam.de>
-# Copyright (C) 2010-2012 by Dick Kniep <dick.kniep at lindix.nl>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Dick Kniep <dick.kniep at 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 at das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Dick Kniep <dick.kniep at 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 at das-netzwerkteam.de>
-# Copyright (C) 2010-2012 by Dick Kniep <dick.kniep at lindix.nl>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Dick Kniep <dick.kniep at 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 at das-netzwerkteam.de>
-# Copyright (C) 2010-2012 by Dick Kniep <dick.kniep at lindix.nl>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Dick Kniep <dick.kniep at 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 at das-netzwerkteam.de>
-# Copyright (C) 2010-2012 by Dick Kniep <dick.kniep at lindix.nl>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Dick Kniep <dick.kniep at 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 at das-netzwerkteam.de>
+# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel at 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)).
More information about the x2go-commits
mailing list