[X2go-Commits] pyhoca-gui.git - build-main (branch) updated: 0.2.1.0

X2Go dev team git-admin at x2go.org
Mon Dec 10 14:50:52 CET 2012


The branch, build-main has been updated
       via  5bb9a4b0aa33329c2b2a79260b54a6b87334332a (commit)
       via  5b764d41679e02eb3dfd97f5dcd4897a116e1098 (commit)
       via  dcac2c5ae996bd7a4dd23cc9aeb4235a7cce9d3b (commit)
       via  c0377039208d2527f0c037b8576dd39b387fb378 (commit)
       via  bc3bb9dab6e47c904b52ea9c9e9dec32c821b944 (commit)
       via  2f6077616d65e694ec167c6751713794f1a20638 (commit)
       via  eaccadf4b52579dbd86c2a1e86b4bf9213fc4f7a (commit)
       via  19d964360f25318e592c33da21327909f28494ab (commit)
       via  6dc18e669540ca454f2b25e6b49b6371213dc4c1 (commit)
       via  ac750e0c0c547caf19bcd36d48d41fb36146b62f (commit)
       via  85f634b07ef3b07d6a1ff6c00afc74f6621cb00d (commit)
       via  f2f6ad0f9ca99335d9072f69bfdd771dab1ef6e7 (commit)
       via  4cfaaa8d8dee0cf896fe6bdfa6e48a21b53c2709 (commit)
       via  1520b78b713ac0e33e72c40ae174f9d01fcad327 (commit)
       via  8df7c7aae88494c4017543320352f55c5297e2e8 (commit)
       via  3390847c9d1458585dffb454e979441b5866285e (commit)
       via  8c1dec2cfea69338c145b981c7b324896b4fcbd6 (commit)
       via  c66dea94ef4c9925be3eed34152c0b177bfbd951 (commit)
       via  053c04ac098c1db8e1ff5060a14b2c19450a63e3 (commit)
       via  fc28981a118db41c298d648ec4693d293c45d207 (commit)
       via  0f5614896481ff3423b911b550e39af9b394e2a9 (commit)
       via  f4e389a0769997fb983504ee5d33336519b3c17a (commit)
       via  a5593b2e7efc3b6e6e9c994e2cc16f4f141ff1a7 (commit)
       via  7eecfc7640ffdf1f30c3734af494dd15f18f4450 (commit)
       via  ea1bcbc809d3dfaaed57a745190f6ac4bdc3aac3 (commit)
       via  95d6628ecfe0ecadec0ead74ca3f24d14286a5a3 (commit)
       via  2a49b0d8f2aa4cf4245143042803c656d80aff50 (commit)
       via  4354726c3a3acf92604a55f0ea1f607881450dc5 (commit)
       via  ec4e5f5ddf1e7a35bdb310d99db2947aa9eb2ae9 (commit)
       via  113a759d6a62ce7da966cb23eba9203dfd7341a9 (commit)
       via  f135580befdc5dd364bca91c8a64e3d29dff4c88 (commit)
       via  337e86379c75a67cbd224d29ce26d50a7d702bc3 (commit)
       via  ae0304eb4c90d488c0f72a5c47dffaabf52fb380 (commit)
       via  4869754ee97d279f284aeddfb5cf6092211cf7b1 (commit)
       via  6d8aba1eaba4423f8c49f5dcb9883b152ef0324c (commit)
       via  728f2948cfa6a1d648c10b6b962dce1901d5a01d (commit)
       via  57ca969df9b1ceae6b35fd18ab786928aaf31ffe (commit)
       via  fe47e16bc886004ec63cb6313e7923abf7aeaaca (commit)
       via  ba2180e42bea8493a28f74eb3a038a5f6a4fb4ee (commit)
       via  a013e6d00c1ed229dd091a5fad0658fc88b43fcb (commit)
       via  cfad2f03113a1b16b580a34f5e54c5123cc24c9c (commit)
       via  a571ebdb3f20dfe82d2d4fc8a6c2bdfec34992f1 (commit)
       via  00d7b0529a015b22e485fd9b71e26a3758d47aff (commit)
       via  ef1aaf313335aa9a7da50ca5d7d0dd4d26754f81 (commit)
       via  80bb31397fd9615a0c891619cd24eccd72611a19 (commit)
       via  b82dd8e3f9073fcadef480a8b2cfb2b0894676e8 (commit)
       via  64519987d9eccbd1cd6d0c6908fa0163e3b0bbfc (commit)
       via  87a48d6179b56a29e0368816394cbfd30c10b405 (commit)
       via  33785581352c15249649db0721142da37274811e (commit)
       via  d2505bc15c1581c0c585c06f1c9fb4135101c7ad (commit)
       via  a6554a3d361ebb8cecadc36844ef8ec220a29928 (commit)
       via  435d2f1d276bb3042f12ee44e0f606ba7d56833c (commit)
       via  69590f962fa1b22238c13abdc099a5702fe27fbc (commit)
       via  62f5f2483a0cc43ba2aa1f1766f9b010dd344288 (commit)
       via  18cad97c9f3fa91d600df1588dc8042a1091ce1d (commit)
       via  cd588e1eb3863f9ec799f8421e0cdf80be5ace9f (commit)
       via  d4d46bd9ba5af5e1b68d93fa99dd99a5f21b1223 (commit)
       via  3f77f7a8cdbb257689188f7f3d6d946f11ed1c85 (commit)
       via  6d89c6e673d7490f13c56411ab63d1bd04b741db (commit)
       via  39de05daa2a2de6de879d56fed8b1e2ec9eb6f62 (commit)
       via  9161ff44df49a953f9130054e6f61b13489edb40 (commit)
       via  9a028353d870e859343839d81b0ec099dafd4ddd (commit)
       via  ab2b0f57b5fb505636cf4c94892c07bab49a8040 (commit)
       via  f93c37e1cbbdf9727a2480e8b037eab9ed5fa038 (commit)
       via  31c69980c908bfd90d247b3325f934b4a766f971 (commit)
       via  e70ffb47d5ee0f150d1a0931bf21bbfa99277df9 (commit)
       via  3487e9fe57040a0662adbf612dc172a23b4c2c05 (commit)
       via  ceb8be9f42018269727039f934c4776715fe33f4 (commit)
       via  b1b9489df66447dfb0c863804228a5ac5ca5092c (commit)
       via  fda28cd78ed721cce9d0bf900ac96682f91b3700 (commit)
       via  a6bbb96a2533efb7a31d77d6fe2693796cd9e87a (commit)
       via  6a54d5625b423a01a52b5e5882203195e51cd794 (commit)
       via  76f5cc8bdb1b7a0dfe63a516df806d557320266a (commit)
       via  64830a5affee7b9b6a001c79c25b8d4b9d868866 (commit)
       via  3f005b653426eb5cf92c8c909a12f245f2fa0899 (commit)
       via  04aeddee31eb27ca15346f585b6b550f757b2e3f (commit)
       via  d92c83a10d806f60fc797a06f6584445e6b16a2f (commit)
       via  251ca3366bb0acb2cd01db1e62331c86b246cb7f (commit)
       via  84758c73bfd5cff19e6c12369e92a2aff008ceb9 (commit)
       via  5bb0021dc90086ae1d4182f463d2e5941fb22a3a (commit)
       via  eba734c45a3b62effec934404e1b8f78804b25a7 (commit)
       via  4e7c22e6c1994cc74348e8c8ee808e5e31886de1 (commit)
       via  ce4e09cc437f0ff15e4ed53b7a96e100576462bc (commit)
       via  306c697d496bf9bf797eeb17ef15a29cf18c191f (commit)
       via  e27f1f2427b04822c4d8576e03cc926820f40343 (commit)
       via  fe384f5b67fb9951bbec9bdceb99498dae6e50bf (commit)
       via  2c5b98f0c3db1dd83e6789e6e4bff172ecab4a50 (commit)
       via  c64bf0c058790384308e91503ee7a8e975ed0489 (commit)
       via  723ccbb41ce920aa9434d613a21ddbb7a4c551d9 (commit)
       via  4233271402327db1eab563126e604697377dcc53 (commit)
       via  51a10345649908d5972d4cffcbd33e7c2d37c9d8 (commit)
       via  30830ba27f3e93883e1a2f3769ddd9607f352b3c (commit)
       via  a46cf11de15196bb3e95a1761f496f7e3f2b7538 (commit)
       via  965079da790f5814e741af789de3b8f8e5c67c08 (commit)
       via  2f797259c147c7d5546f1024bdf39e356236cf29 (commit)
       via  e61da26a3952164d7fced46dbaf9d8b71e3b030c (commit)
       via  684548520c09ff14d81f3be22f32676d5b3e7f29 (commit)
       via  d2ed0cc4ebcfc26835533fa4d9009692b08f2a2d (commit)
       via  77b0b0f9deb978ccabd99a0c4cc346c4f488c0ae (commit)
       via  9d891f82dd2fee56ecb5f8774315340fdd0a19ce (commit)
       via  f7c2451f34638bc25b1f3485e5c360fac3243cd1 (commit)
       via  374f29a15cd867fef6e0122f3a55e863d28a7da1 (commit)
       via  549b097bab2e89387242942c620602a60868a485 (commit)
       via  f5ce305afc462a7be89f74d446813ce9b534e6e1 (commit)
       via  73978e61d7b8f85be2780c03bf2d13ada0bf0a8c (commit)
       via  b8235fc8bdd2710ca896d64c25e063a00eade1c6 (commit)
       via  d2cfd08a175648e8bc5db432e0a6803ba899ea73 (commit)
       via  9a3d8cdb423e1a3ebe6ced33d80c52bc1c04b51a (commit)
       via  46be5e3b5b1f56c6c3084bccc5e36e6eb81b574b (commit)
       via  794df417583d5de50cb34ebedb922fe16aa0d423 (commit)
       via  7b18f2d1e27306b0cea947cfb88eedce4cb56bd2 (commit)
       via  804944e3c211b676a3e08c668cba238d4e3b238a (commit)
       via  fd5baf9e97fba0604121a14be5a08e15bc6f8b02 (commit)
       via  2a31166c4cf11f010130da7bb7fcefb233969b4f (commit)
       via  2dc4c04d36b279dd528814dff415e2b48e7b72d9 (commit)
       via  56cc18453b46f1129f4b710397ee97c5326584b9 (commit)
       via  7a2bffc40742eb2062dba624ddba693cb62832a3 (commit)
      from  d864e3fa9dfce0f10fd9ee0e7f3cacedf215f0ff (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:
 README.ssh-agent                                   |  110 ++
 build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo              |  Bin 541 -> 541 bytes
 build/mo/da/LC_MESSAGES/PyHoca-GUI.mo              |  Bin 0 -> 23577 bytes
 build/mo/de/LC_MESSAGES/PyHoca-GUI.mo              |  Bin 23789 -> 25283 bytes
 build/mo/en/LC_MESSAGES/PyHoca-GUI.mo              |  Bin 22238 -> 23662 bytes
 build/mo/es/LC_MESSAGES/PyHoca-GUI.mo              |  Bin 23773 -> 25344 bytes
 build/mo/{bg => fr}/LC_MESSAGES/PyHoca-GUI.mo      |  Bin 541 -> 541 bytes
 build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo           |  Bin 22740 -> 24244 bytes
 build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo              |  Bin 22596 -> 23844 bytes
 build/mo/ru/LC_MESSAGES/PyHoca-GUI.mo              |  Bin 0 -> 28871 bytes
 build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo              |  Bin 22180 -> 23642 bytes
 debian/changelog                                   |  104 ++
 debian/control                                     |   11 +-
 debian/pyhoca-gui.docs                             |    2 +
 debian/rules                                       |    4 +-
 debian/watch                                       |    2 +
 .../PyHoca/32x32/{auth_failed.png => warning.png}  |  Bin 1651 -> 1651 bytes
 .../PyHoca/64x64/{auth_failed.png => warning.png}  |  Bin 3894 -> 3894 bytes
 .../PyHoca/32x32/{auth_failed.png => warning.png}  |    0
 .../{32x32/auth_failed.png => 64x64/warning.png}   |    0
 nsis_include/es.nsi                                |    4 +-
 nsis_include/ru.nsi                                |   15 +
 nsis_include/sv.nsi                                |   16 +
 nsis_template.py                                   |  160 +-
 paramiko                                           |    1 +
 po/PyHoca-GUI.pot                                  |  645 +++++----
 po/bg.po                                           |  647 +++++----
 po/da.po                                           | 1524 ++++++++++++++++++++
 po/de.po                                           |  687 +++++----
 po/en.po                                           |  681 +++++----
 po/es.po                                           |  687 +++++----
 po/fr.po                                           |  647 +++++----
 po/nb_NO.po                                        |  683 +++++----
 po/nl.po                                           |  684 +++++----
 po/ru.po                                           | 1510 +++++++++++++++++++
 po/sv.po                                           |  683 +++++----
 pyhoca/wxgui/__init__.py                           |    2 +-
 pyhoca/wxgui/frontend.py                           |  131 +-
 pyhoca/wxgui/logon.py                              |   61 +-
 pyhoca/wxgui/menus_taskbar.py                      |   72 +-
 pyhoca/wxgui/messages.py                           |   49 +-
 pyhoca/wxgui/profilemanager.py                     | 1378 ++++++++++++------
 pyhoca/wxgui/taskbar.py                            |    3 -
 43 files changed, 7831 insertions(+), 3372 deletions(-)
 create mode 100644 README.ssh-agent
 create mode 100644 build/mo/da/LC_MESSAGES/PyHoca-GUI.mo
 copy build/mo/{bg => fr}/LC_MESSAGES/PyHoca-GUI.mo (63%)
 create mode 100644 build/mo/ru/LC_MESSAGES/PyHoca-GUI.mo
 create mode 100644 debian/watch
 copy icons/PyHoca/32x32/{auth_failed.png => warning.png} (100%)
 copy icons/PyHoca/64x64/{auth_failed.png => warning.png} (100%)
 copy icons_symlinked/PyHoca/32x32/{auth_failed.png => warning.png} (100%)
 copy icons_symlinked/PyHoca/{32x32/auth_failed.png => 64x64/warning.png} (100%)
 create mode 100644 nsis_include/ru.nsi
 create mode 100644 nsis_include/sv.nsi
 create mode 120000 paramiko
 create mode 100644 po/da.po
 create mode 100644 po/ru.po

The diff of changes is:
diff --git a/README.ssh-agent b/README.ssh-agent
new file mode 100644
index 0000000..da120c7
--- /dev/null
+++ b/README.ssh-agent
@@ -0,0 +1,110 @@
+SSH Agent support in PyHoca-GUI / Python X2Go
+=============================================
+
+Quotation from the ssh-agent man page:
+
+"""
+[...]
+
+The agent will never send a private key over its request channel.
+Instead, operations that require a private key will be performed
+by the agent, and the result will be returned to the requester.
+This way, private keys are not exposed to clients using the agent.
+
+A UNIX-domain socket is created and the name of this socket is stored
+in the SSH_AUTH_SOCK environment variable.  The socket is made
+accessible only to the current user.  This method is easily abused by
+root or another instance of the same user.
+
+[...]
+"""
+
+So the benefit of SSH agent support is: no need to have private SSH keys
+on remote systems anymore. You can keep your private ID files locally
+and use SSH agent to handle authentication requests, even if you have
+a chain of systems that you log in to:
+
+  local-machine -> machine-1 -> machine-2 -> machine-3 ...
+
+The requirement for SSH agent usage: the system administrators of the
+remote hosts must be trustworthy. They cannot obtain your private keys,
+but they can use the SSH agent socket and log into systems in your
+login chain under your identity. So, BEWARE!!!
+
+
+1. AUTHENTICATION AGAINST SSH AGENT
+-----------------------------------
+
+This feature has been added to Python X2Go 0.2.1.0.
+
+PyHoca-GUI / Python X2Go is aware of local SSH agents and can authenticated
+against those. Use this feature with the following session profile options
+set:
+
+  [x] Discover SSH keys or use SSH agent for X2Go authentication
+
+  autologin = true (or 1)
+
+  [x] Discover SSH keys or use SSH agent for proxy authentication
+
+  sshproxyautologin = true (or 1)
+
+Do not forget to run ssh-add (see the man page for more info).
+
+2. AUTHENTICATION REQUEST FORWARDING TO YOUR LOCAL SSH AGENT
+------------------------------------------------------------
+
+This feature has been added to Python X2Go 0.2.1.0 and requires Python Paramiko
+1.8.0.
+
+PyHoca-GUI / Python X2Go supports forwarding of SSH agent authentication request.
+Basically, you could say that the -A command line switch of the OpenSSH client
+is now also available with X2Go. Please read the ssh man page for more
+info on this.
+
+With this little howto, you can test SSH agent authentication request forwarding:
+
+  Place your SSH pubkey on machine-1 and machine-2 (which can be reached via
+  machine-1) into the (for this demo) otherwise empty files:
+
+    user-1 at machine-1:~user-1/.ssh/authorized_keys
+
+  and
+
+    user-2 at machine-2:~user-2/.ssh/authorized_keys
+
+  Return to your local client:
+
+  $ ssh-add [<priv-keyfile>]
+  $ pyhoca-gui
+
+  Enable SSH agent forwarding in connection tab of a session profile for
+  machine-1. Use a simple TERMINAL session command.
+
+  Connect to user-1 at machine-1 and start a session on machine-1
+
+  $ echo $SSH_AUTH_SOCK
+  /tmp/ssh-<hash>/agent.<pid>
+
+  $ ssh <user-2>@<machine-2>
+  (should work without password)
+
+  For the authentication from user-1 at machine-1 to user-2 at machine-2 you use an
+  SSH agent connection that is tunneled back through Python X2Go to your client
+  machine (the machine you run PyHoca-GUI on). So, the SSH agent on your client
+  machine serves a challenge/response request from SSH client programs within
+  X2Go sessions.
+
+  Note: if you try the above with a GNOME desktop (XFCE probably as well) the
+  gnome-keyring will hijack the SSH agent functionality and ignore forwarded
+  SSH agent connections. (This normally happens with the x2goserver-xsession
+  bin:package installed.)
+
+  Use the below command to disable the SSH agent feature in gnome-keyring (within the
+  X2Go Session):
+
+  $ gconftool-2 -s /apps/gnome-keyring/daemon-components/ssh false  --type bool
+
+  After you have applied this gconf change, logout and re-start a new GNOME (or XFCE)
+  session. Now SSH agent stuff is handled properly through ssh-agent and the ssh-agent
+  should also be aware of SSH agent forwarding connections.
diff --git a/build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo
index 3befb69..bf0afb2 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
new file mode 100644
index 0000000..10b1f79
Binary files /dev/null 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 252ae8c..8872247 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 81315ae..a731337 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 27ae858..a93603c 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/bg/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/fr/LC_MESSAGES/PyHoca-GUI.mo
similarity index 63%
copy from build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo
copy to build/mo/fr/LC_MESSAGES/PyHoca-GUI.mo
index 3befb69..2d0340f 100644
Binary files a/build/mo/bg/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 3177d2b..1957d79 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 d1b543e..2337493 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
new file mode 100644
index 0000000..e334ec7
Binary files /dev/null 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 0b69544..2843da1 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 491895a..49aeba3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,107 @@
+pyhoca-gui (0.2.1.0-0~x2go1) unstable; urgency=low
+
+  [ Mike Gabriel ]
+  * New upstream version (0.2.1.0):
+    - Session profile file option ,,export'': stay empty if no exports are
+      definded.
+    - Make sure RDP (X2Go-proxy) sessions stored by PyHoca-GUI get recognized
+      as such by X2goClient.
+    - Make session icon handling more robust, be more compatible with X2Go
+      Client about the session icon name. Rewrite mistakes pyhoca-gui 
+      (<= 0.2.0.4) did on the icon attribute in the session profile config.
+    - Make DirectRDP sessions configurable through PyHoca-GUI profile manager.
+    - Slight change in internal message box API, rename custom_message class
+      option to msg.
+    - Add a warning message box that DirectRDP is not yet supported by
+      PyHoca-GUI.
+    - Widen session type widget to make sure all widget (also when translated)
+      fit in.
+    - Do not offer DirectRDP sessions in profile manager while connected to a
+      real X2Go server via SSH.
+    - Configure SSH proxy port in a separate session profile option
+      (sshproxyport).
+    - Make sure that SSH proxy port migration works flawlessly.
+    - Rework session profile manager around SSH proxy settings. Implement
+      session
+      profile options ,,sshproxysameuser'' and ,,sshproxysamepass''.
+    - Rebuild of i18n files, update of en.po and de.po.
+    - Disable ,,usesshproxy'' for DirectRDP sessions.
+    - Make ,,maxdim'' option configurable through session profile manager.
+    - Fix naming mismatch ,,autologin'' vs. ,,autoconnect''.
+    - Introduce profile manager tab ,,Link Quality''. Move printing into renamed
+      tab ,,Resource Sharing''. Shrink profile manager window, closes upstream
+      issue: #13.
+    - Implement SSH agent, automatic key discovery, and SSH agent authentication
+      request forwarding in session profile manager.
+    - Add SSH agent README.
+    - Rename session type XFCE4 to XFCE (using an unversioned session type name).
+    - Make pub app session startup more robust.
+    - Allow autologin and SSH key file at the same time.
+    - Scale profile manager differently on Windows and Linux (Windows needs
+      a slightly larger window).
+    - Profile manager: apply text field height to keyboard configuration radio
+      buttons.
+    - Disable SSH agent forwarding for Windows. Code in Python Paramiko is no
+      executable on MS Windows, currently.
+    - Use threading.Lock() to prevent from simultaneous calls of the
+      _init_pubapp_sessions() method.
+    - Implement functionality for restoring mounted shares on session
+      resumption / re-start. Sponsored by Dick Kniep, LinDix NL.
+    - Hide the file sharing submenu if the master session's submenu is currently
+      disabled due to some current action and an expected session status change.
+    - If the profile manager is open for a certain session profile, disable
+      all menu items that relate to this session profile. Re-enable the menu
+      items again, once the corresponding profile manager window has been
+      closed.
+  * /debian/control:
+    + Maintainer change in package: X2Go Developers
+      <x2go-dev at lists.berlios.de>.
+    + Add Oleksandr Shneyder to Uploaders.
+    + Depend on python-x2go (>=0.2.0.11-0~).
+    + Reduce python version in Build-Depends to allow build against Ubuntu
+      10.04.
+  * /debian/rules:
+    + Allow package build on systems with missing dh_python2.
+  * /debian/pyhoca-gui.docs:
+    + Install README.i18n into package.
+
+  [ Christoffer Krakou ]
+  * New upstream version (0.2.1.0):
+    - Add Danish translation.
+    - Add Danish translation (restoreexports feature).
+
+  [ Daniel Lindgren ]
+  * New upstream version (0.2.1.0):
+    - Update Swedish translation file.
+    - Add Swedish translation for NSIS installer.
+    - Update Swedish translation file (restoreexports).
+
+  [ Dick Kniep ]
+  * New upstream version (0.2.1.0):
+    - Update Dutch translation file.
+
+  [ Ricardo Díaz Martín ]
+  * New upstream version (0.2.1.0):
+    - Update Spanish translation file.
+    - Update Spanish translation file (restoreexports).
+
+  [ Nable ]
+  * New upstream version (0.2.1.0):
+    - Add Russian translation for NSIS installer.
+    - Fine-tune Russion translation.
+
+  [ Terje Andersen ]
+  * New upstream version (0.2.1.0):
+    - Update Bokmal (Norway) translation file.
+    - Update Bokmal (Norway) translation file (restoreexports).
+
+  [ Oleksandr Shneyder ]
+  * New upstream version (0.2.1.0):
+    - Add Russian translation.
+    - Update Russian translation.
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Mon, 10 Dec 2012 13:06:10 +0100
+
 pyhoca-gui (0.2.0.4-0~x2go1) unstable; urgency=low
 
   * New upstream version (0.2.0.4):
diff --git a/debian/control b/debian/control
index 5656b24..9b8a7f7 100644
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,14 @@
 Source: pyhoca-gui
 Section: python
 Priority: optional
-Maintainer: X2Go Packaging Team <pkg-x2go-devel at lists.alioth.debian.org>
+Maintainer: X2Go Packaging Team <x2go-dev at lists.berlios.de>
 Uploaders:
- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+ Mike Gabriel <mike.gabriel at das-netzwerkteam.de>,
+ Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>,
 Build-Depends: 
  debhelper (>= 7.0.50~),
  man2html-base | man2html,
- python (>=2.6.6-3~),
+ python (>=2.6.5-0~),
  python-setuptools,
  python-support,
  python-distutils-extra,
@@ -29,7 +30,7 @@ Architecture: all
 Depends: 
  ${misc:Depends},
  python,
- python-x2go (>=0.2.0.1-0~),
+ python-x2go (>=0.2.1.0-0~),
  python-argparse,
  python-notify,
  python-setproctitle,
@@ -40,7 +41,7 @@ Depends:
 Description: Graphical X2Go client written in (wx)Python
  X2Go is a server based computing environment with
     - session resuming
-    - low bandwith support
+    - low bandwidth support
     - LDAP support
     - client-side mass storage mounting support
     - client-side printing support
diff --git a/debian/pyhoca-gui.docs b/debian/pyhoca-gui.docs
index 4a27220..bd5d7f2 100644
--- a/debian/pyhoca-gui.docs
+++ b/debian/pyhoca-gui.docs
@@ -1,3 +1,5 @@
 README
 README.Unity
+README.i18n
+README.ssh-agent
 TODO
diff --git a/debian/rules b/debian/rules
index 3dca7bc..4e0c6f5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,8 +3,10 @@
 # Based on sample debian/rules file - for GNU Hello (1.3).
 # Copyright 2010-2012 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 
+WITH_PYTHON2 = $(shell test -f /usr/bin/dh_python2 && echo "--with python2")
+
 %:
-	dh ${@} --with python2
+	dh ${@} ${WITH_PYTHON2}
 
 override_dh_auto_build:
 	cp po/PyHoca-GUI.pot po/PyHoca-GUI.pot.bak
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..685b078
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://code.x2go.org/releases/source/pyhoca-gui/pyhoca-gui-(.+)\.tar\.gz
diff --git a/icons/PyHoca/32x32/auth_failed.png b/icons/PyHoca/32x32/warning.png
similarity index 100%
copy from icons/PyHoca/32x32/auth_failed.png
copy to icons/PyHoca/32x32/warning.png
diff --git a/icons/PyHoca/64x64/auth_failed.png b/icons/PyHoca/64x64/warning.png
similarity index 100%
copy from icons/PyHoca/64x64/auth_failed.png
copy to icons/PyHoca/64x64/warning.png
diff --git a/icons_symlinked/PyHoca/32x32/auth_failed.png b/icons_symlinked/PyHoca/32x32/warning.png
similarity index 100%
copy from icons_symlinked/PyHoca/32x32/auth_failed.png
copy to icons_symlinked/PyHoca/32x32/warning.png
diff --git a/icons_symlinked/PyHoca/32x32/auth_failed.png b/icons_symlinked/PyHoca/64x64/warning.png
similarity index 100%
copy from icons_symlinked/PyHoca/32x32/auth_failed.png
copy to icons_symlinked/PyHoca/64x64/warning.png
diff --git a/nsis_include/es.nsi b/nsis_include/es.nsi
index bb44fef..2b3b028 100644
--- a/nsis_include/es.nsi
+++ b/nsis_include/es.nsi
@@ -8,8 +8,8 @@ StrCpy $REQUIRED "requerido"
 ; from "Desktop Icon"
 StrCpy $DESKTOP_LINKS "Acceso directo en el Escritorio"
 ; from "Start Menu Entries"
-StrCpy $STARTMENU_LINKS "Acceso directo en el menú Inicio"
+StrCpy $STARTMENU_LINKS "Acceso directo en el menú Inicio"
 ; from "no PulseAudio"
 StrCpy $WITHOUT_PULSEAUDIO "sin PulseAudio"
 ; from "Direct Printing Support"
-StrCpy $GSPRINT "Direct Printing Support"
\ No newline at end of file
+StrCpy $GSPRINT "Direct Printing Support"
diff --git a/nsis_include/ru.nsi b/nsis_include/ru.nsi
new file mode 100644
index 0000000..3bf3871
--- /dev/null
+++ b/nsis_include/ru.nsi
@@ -0,0 +1,15 @@
+; ru.nsi
+;
+
+;--------------------------------
+
+; from "required"
+StrCpy $REQUIRED "необходимо"
+; from "Desktop Icon"
+StrCpy $DESKTOP_LINKS "Ярлык на рабочем столе"
+; from "Start Menu Entries"
+StrCpy $STARTMENU_LINKS "Пункты меню Пуск"
+; from "no PulseAudio"
+StrCpy $WITHOUT_PULSEAUDIO "Без поддержки PulseAudio"
+; from "Direct Printing Support"
+StrCpy $GSPRINT "Поддержка прямой печати (Direct Printing)"
diff --git a/nsis_include/sv.nsi b/nsis_include/sv.nsi
new file mode 100644
index 0000000..a25a682
--- /dev/null
+++ b/nsis_include/sv.nsi
@@ -0,0 +1,16 @@
+; sv.nsi
+;
+
+;--------------------------------
+
+; from "required"
+StrCpy $REQUIRED "obligatorisk"
+; from "Desktop Icon"
+StrCpy $DESKTOP_LINKS "Skrivbordsikon"
+; from "Start Menu Entries"
+StrCpy $STARTMENU_LINKS "Länkar i Startmeny"
+; from "no PulseAudio"
+StrCpy $WITHOUT_PULSEAUDIO "Utan PulseAudio"
+; from "Direct Printing Support"
+StrCpy $GSPRINT "Stöd för direktutskrift"
+
diff --git a/nsis_template.py b/nsis_template.py
index f3de719..e9db9eb 100644
--- a/nsis_template.py
+++ b/nsis_template.py
@@ -44,36 +44,78 @@ InstallDir $PROGRAMFILES\\{program_name}
 ; overwrite the old one automatically)
 InstallDirRegKey HKLM "Software\\{program_name}" "Install_Dir"
 
-; Request application privileges for Windows Vista
-RequestExecutionLevel admin
-
-;--------------------------------
-
-; Installer Language Configuration
-
-!include LogicLib.nsh
-
-var LC_MESSAGES
-
-; i18n strings
-var REQUIRED
-var DESKTOP_LINKS
-var STARTMENU_LINKS
-var WITHOUT_PULSEAUDIO
-var GSPRINT
-
-; First is default
-LoadLanguageFile "${{NSISDIR}}\\Contrib\\Language files\\English.nlf"
-LoadLanguageFile "${{NSISDIR}}\\Contrib\\Language files\\Dutch.nlf"
-;LoadLanguageFile "${{NSISDIR}}\\Contrib\\Language files\\French.nlf"
-LoadLanguageFile "${{NSISDIR}}\\Contrib\\Language files\\German.nlf"
-;LoadLanguageFile "${{NSISDIR}}\\Contrib\\Language files\\Korean.nlf"
-;LoadLanguageFile "${{NSISDIR}}\\Contrib\\Language files\\Russian.nlf"
-LoadLanguageFile "${{NSISDIR}}\\Contrib\\Language files\\Spanish.nlf"
-;LoadLanguageFile "${{NSISDIR}}\\Contrib\\Language files\\Swedish.nlf"
-;LoadLanguageFile "${{NSISDIR}}\\Contrib\\Language files\\TradChinese.nlf"
-;LoadLanguageFile "${{NSISDIR}}\\Contrib\\Language files\\SimpChinese.nlf"
-;LoadLanguageFile "${{NSISDIR}}\\Contrib\\Language files\\Slovak.nlf"
+; OBSOLETE WITH MUI2: Request application privileges for Windows Vista
+;RequestExecutionLevel admin
+
+!define MULTIUSER_EXECUTIONLEVEL Highest
+!define MULTIUSER_MUI
+!define MULTIUSER_INSTALLMODE_COMMANDLINE
+!include MultiUser.nsh
+!include MUI2.nsh
+
+!insertmacro MULTIUSER_PAGE_INSTALLMODE
+!insertmacro MUI_PAGE_LICENSE LICENSE.txt
+!insertmacro MUI_PAGE_DIRECTORY
+!insertmacro MUI_PAGE_COMPONENTS
+!insertmacro MUI_PAGE_INSTFILES
+
+!insertmacro MUI_LANGUAGE "English" ;first language is the default language
+;!insertmacro MUI_LANGUAGE "French"
+!insertmacro MUI_LANGUAGE "German"
+!insertmacro MUI_LANGUAGE "Spanish"
+;!insertmacro MUI_LANGUAGE "SpanishInternational"
+;!insertmacro MUI_LANGUAGE "SimpChinese"
+;!insertmacro MUI_LANGUAGE "TradChinese"
+;!insertmacro MUI_LANGUAGE "Japanese"
+;!insertmacro MUI_LANGUAGE "Korean"
+;!insertmacro MUI_LANGUAGE "Italian"
+!insertmacro MUI_LANGUAGE "Dutch"
+;!insertmacro MUI_LANGUAGE "Danish"
+!insertmacro MUI_LANGUAGE "Swedish"
+;!insertmacro MUI_LANGUAGE "Norwegian"
+;!insertmacro MUI_LANGUAGE "NorwegianNynorsk"
+;!insertmacro MUI_LANGUAGE "Finnish"
+;!insertmacro MUI_LANGUAGE "Greek"
+!insertmacro MUI_LANGUAGE "Russian"
+;!insertmacro MUI_LANGUAGE "Portuguese"
+;!insertmacro MUI_LANGUAGE "PortugueseBR"
+;!insertmacro MUI_LANGUAGE "Polish"
+;!insertmacro MUI_LANGUAGE "Ukrainian"
+;!insertmacro MUI_LANGUAGE "Czech"
+;!insertmacro MUI_LANGUAGE "Slovak"
+;!insertmacro MUI_LANGUAGE "Croatian"
+;!insertmacro MUI_LANGUAGE "Bulgarian"
+;!insertmacro MUI_LANGUAGE "Hungarian"
+;!insertmacro MUI_LANGUAGE "Thai"
+;!insertmacro MUI_LANGUAGE "Romanian"
+;!insertmacro MUI_LANGUAGE "Latvian"
+;!insertmacro MUI_LANGUAGE "Macedonian"
+;!insertmacro MUI_LANGUAGE "Estonian"
+;!insertmacro MUI_LANGUAGE "Turkish"
+;!insertmacro MUI_LANGUAGE "Lithuanian"
+;!insertmacro MUI_LANGUAGE "Slovenian"
+;!insertmacro MUI_LANGUAGE "Serbian"
+;!insertmacro MUI_LANGUAGE "SerbianLatin"
+;!insertmacro MUI_LANGUAGE "Arabic"
+;!insertmacro MUI_LANGUAGE "Farsi"
+;!insertmacro MUI_LANGUAGE "Hebrew"
+;!insertmacro MUI_LANGUAGE "Indonesian"
+;!insertmacro MUI_LANGUAGE "Mongolian"
+;!insertmacro MUI_LANGUAGE "Luxembourgish"
+;!insertmacro MUI_LANGUAGE "Albanian"
+;!insertmacro MUI_LANGUAGE "Breton"
+;!insertmacro MUI_LANGUAGE "Belarusian"
+;!insertmacro MUI_LANGUAGE "Icelandic"
+;!insertmacro MUI_LANGUAGE "Malay"
+;!insertmacro MUI_LANGUAGE "Bosnian"
+;!insertmacro MUI_LANGUAGE "Kurdish"
+;!insertmacro MUI_LANGUAGE "Irish"
+;!insertmacro MUI_LANGUAGE "Uzbek"
+;!insertmacro MUI_LANGUAGE "Galician"
+;!insertmacro MUI_LANGUAGE "Afrikaans"
+;!insertmacro MUI_LANGUAGE "Catalan"
+;!insertmacro MUI_LANGUAGE "Esperanto"
+;!insertmacro MUI_LANGUAGE "Asturian"
 
 ; License data
 ; Not exactly translated, but it shows what's needed
@@ -82,9 +124,9 @@ LicenseLangString myLicenseData ${{LANG_DUTCH}} "LICENSE.txt"
 ;LicenseLangString myLicenseData ${{LANG_FRENCH}} "LICENSE.txt"
 LicenseLangString myLicenseData ${{LANG_GERMAN}} "LICENSE.txt"
 ;LicenseLangString myLicenseData ${{LANG_KOREAN}} "LICENSE.txt"
-;LicenseLangString myLicenseData ${{LANG_RUSSIAN}} "LICENSE.txt"
+LicenseLangString myLicenseData ${{LANG_RUSSIAN}} "LICENSE.txt"
 LicenseLangString myLicenseData ${{LANG_SPANISH}} "LICENSE.txt"
-;LicenseLangString myLicenseData ${{LANG_SWEDISH}} "LICENSE.txt"
+LicenseLangString myLicenseData ${{LANG_SWEDISH}} "LICENSE.txt"
 ;LicenseLangString myLicenseData ${{LANG_TRADCHINESE}} "LICENSE.txt"
 ;LicenseLangString myLicenseData ${{LANG_SIMPCHINESE}} "LICENSE.txt"
 ;LicenseLangString myLicenseData ${{LANG_SLOVAK}} "LICENSE.txt"
@@ -97,17 +139,32 @@ LangString Name ${{LANG_DUTCH}} "Dutch"
 ;LangString Name ${{LANG_FRENCH}} "French"
 LangString Name ${{LANG_GERMAN}} "German"
 ;LangString Name ${{LANG_KOREAN}} "Korean"
-;LangString Name ${{LANG_RUSSIAN}} "Russian"
+LangString Name ${{LANG_RUSSIAN}} "Russian"
 LangString Name ${{LANG_SPANISH}} "Spanish"
-;LangString Name ${{LANG_SWEDISH}} "Swedish"
+LangString Name ${{LANG_SWEDISH}} "Swedish"
 ;LangString Name ${{LANG_TRADCHINESE}} "Traditional Chinese"
 ;LangString Name ${{LANG_SIMPCHINESE}} "Simplified Chinese"
 ;LangString Name ${{LANG_SLOVAK}} "Slovak"
 
-Function .onInit
+;--------------------------------
+
+; Installer Language Configuration
 
-        ;Language selection dialog
+;!include LogicLib.nsh
 
+var LC_MESSAGES
+
+; i18n strings
+var REQUIRED
+var DESKTOP_LINKS
+var STARTMENU_LINKS
+var WITHOUT_PULSEAUDIO
+var GSPRINT
+
+Function .onInit
+
+;        ;Language selection dialog
+;
         Push ""
         Push ${{LANG_ENGLISH}}
         Push English
@@ -119,12 +176,12 @@ Function .onInit
         Push German
 ;       Push ${{LANG_KOREAN}}
 ;       Push Korean
-;       Push ${{LANG_RUSSIAN}}
-;       Push Russian
+        Push ${{LANG_RUSSIAN}}
+        Push Russian
         Push ${{LANG_SPANISH}}
         Push Spanish
-;       Push ${{LANG_SWEDISH}}
-;       Push Swedish
+        Push ${{LANG_SWEDISH}}
+        Push Swedish
 ;       Push ${{LANG_TRADCHINESE}}
 ;       Push "Traditional Chinese"
 ;       Push ${{LANG_SIMPCHINESE}}
@@ -154,23 +211,30 @@ Function .onInit
             StrCpy $LC_MESSAGES "es"
             !include "nsis_include\\es.nsi"
             ${{Break}}
+          ${{Case}} 1053
+            StrCpy $LC_MESSAGES "sv"
+            !include "nsis_include\\sv.nsi"
+            ${{Break}}
+          ${{Case}} 1049
+            StrCpy $LC_MESSAGES "ru"
+            !include "nsis_include\\ru.nsi"
+            ${{Break}}
         ${{EndSwitch}}
 
         StrCmp $LANGUAGE "cancel" 0 +2
             Abort
 
+        !insertmacro MULTIUSER_INIT
+
 FunctionEnd
 
-;--------------------------------
+Function un.onInit
+
+        !insertmacro MULTIUSER_UNINIT
 
-; Pages
-Page license
-Page components
-Page directory
-Page instfiles
+FunctionEnd
 
-UninstPage uninstConfirm
-UninstPage instfiles
+;--------------------------------
 
 ;--------------------------------
 
diff --git a/paramiko b/paramiko
new file mode 120000
index 0000000..84dd28b
--- /dev/null
+++ b/paramiko
@@ -0,0 +1 @@
+/home/mike/MyDocuments/4projects/x2go-upstream/python-paramiko/paramiko
\ No newline at end of file
diff --git a/po/PyHoca-GUI.pot b/po/PyHoca-GUI.pot
index 96396f3..c011b74 100644
--- a/po/PyHoca-GUI.pot
+++ b/po/PyHoca-GUI.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-10 21:18+0200\n"
+"POT-Creation-Date: 2012-11-26 14:25+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"
@@ -17,636 +17,671 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../pyhoca/wxgui/logon.py:92
+#: ../pyhoca/wxgui/logon.py:86
 #, python-format
 msgid "%s (via %s)"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:96 ../pyhoca/wxgui/logon.py:108
+#: ../pyhoca/wxgui/logon.py:90 ../pyhoca/wxgui/logon.py:102
 msgid "Username"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:98 ../pyhoca/wxgui/logon.py:110
+#: ../pyhoca/wxgui/logon.py:92 ../pyhoca/wxgui/logon.py:104
 msgid "Password"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:101
+#: ../pyhoca/wxgui/logon.py:95
 msgid "Authenticate"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:113
+#: ../pyhoca/wxgui/logon.py:107
 msgid "  Start SSH tunnel  "
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:121
+#: ../pyhoca/wxgui/logon.py:115
 msgid "Session login"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:122
+#: ../pyhoca/wxgui/logon.py:116
 msgid "SSH proxy server login"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:133 ../pyhoca/wxgui/profilemanager.py:322
-#: ../pyhoca/wxgui/messages.py:132 ../pyhoca/wxgui/printingprefs.py:147
+#: ../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
 msgid "Cancel"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:292 ../pyhoca/wxgui/logon.py:334
-#: ../pyhoca/wxgui/frontend.py:603
+#: ../pyhoca/wxgui/logon.py:297 ../pyhoca/wxgui/logon.py:339
+#: ../pyhoca/wxgui/frontend.py:606
 #, python-format
 msgid "%s - connect failure"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:293 ../pyhoca/wxgui/frontend.py:603
+#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:606
 msgid "User is not allowed to start X2Go sessions!"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:610
+#: ../pyhoca/wxgui/logon.py:303 ../pyhoca/wxgui/frontend.py:613
 #, python-format
 msgid "%s - connect"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:299
+#: ../pyhoca/wxgui/logon.py:304
 msgid "Authentication has been successful."
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:330
+#: ../pyhoca/wxgui/logon.py:335
 msgid "SSH tunnel started"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:335
+#: ../pyhoca/wxgui/logon.py:340
 msgid "Authentication failed!"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:342
+#: ../pyhoca/wxgui/logon.py:348
 #, python-format
 msgid "%s - SSH proxy"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:343
+#: ../pyhoca/wxgui/logon.py:349
 msgid "Authentication to the SSH proxy server failed!"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:658
+#: ../pyhoca/wxgui/logon.py:376 ../pyhoca/wxgui/frontend.py:664
 #, python-format
 msgid "%s - socket error"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:372 ../pyhoca/wxgui/frontend.py:637
-#: ../pyhoca/wxgui/frontend.py:644
+#: ../pyhoca/wxgui/logon.py:383 ../pyhoca/wxgui/frontend.py:643
+#: ../pyhoca/wxgui/frontend.py:650
 #, python-format
 msgid "%s - host key error"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:373 ../pyhoca/wxgui/frontend.py:637
+#: ../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 ""
 
-#: ../pyhoca/wxgui/logon.py:380 ../pyhoca/wxgui/frontend.py:679
+#: ../pyhoca/wxgui/logon.py:391 ../pyhoca/wxgui/frontend.py:685
 #, python-format
 msgid "%s - missing home directory"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:679
+#: ../pyhoca/wxgui/logon.py:392 ../pyhoca/wxgui/frontend.py:685
 msgid "The remote user's home directory does not exist."
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:388
+#: ../pyhoca/wxgui/logon.py:399
 #, python-format
 msgid "%s - key error"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:396 ../pyhoca/wxgui/frontend.py:686
+#: ../pyhoca/wxgui/logon.py:407 ../pyhoca/wxgui/frontend.py:692
 #, python-format
 msgid "%s - auth error"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:404 ../pyhoca/wxgui/frontend.py:630
+#: ../pyhoca/wxgui/logon.py:415 ../pyhoca/wxgui/frontend.py:636
 #, python-format
 msgid "%s - SSH error"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:412
+#: ../pyhoca/wxgui/logon.py:423
 #, python-format
 msgid "%s - unknown error"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:413
+#: ../pyhoca/wxgui/logon.py:424
 msgid "An unknown error occured during authentication!"
 msgstr ""
 
-#: ../pyhoca/wxgui/taskbar.py:92
+#: ../pyhoca/wxgui/taskbar.py:89
 #, python-format
 msgid ""
 "PyHoca-GUI\n"
 "Connecting you to ,,%s''"
 msgstr ""
 
-#: ../pyhoca/wxgui/taskbar.py:96
+#: ../pyhoca/wxgui/taskbar.py:93
 #, python-format
 msgid ""
 "PyHoca-GUI (Python X2goClient)\n"
 "Currently connecting you to remote X2Go server ,,%s''"
 msgstr ""
 
-#: ../pyhoca/wxgui/taskbar.py:106
+#: ../pyhoca/wxgui/taskbar.py:103
 msgid ""
 "PyHoca-GUI\n"
 "Connecting you to X2Go..."
 msgstr ""
 
-#: ../pyhoca/wxgui/taskbar.py:110
+#: ../pyhoca/wxgui/taskbar.py:107
 msgid ""
 "PyHoca-GUI (Python X2goClient)\n"
 "Client for connecting you to a remote X2Go server"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:82
+#: ../pyhoca/wxgui/profilemanager.py:79
 msgid "GNOME Desktop (GNOME)"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:83
+#: ../pyhoca/wxgui/profilemanager.py:80
 msgid "K Desktop Environment (KDE)"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:84
+#: ../pyhoca/wxgui/profilemanager.py:81
 msgid "Lightweight X Desktop (LXDE)"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:85
+#: ../pyhoca/wxgui/profilemanager.py:82
 msgid "Trinity X Desktop (KDE3-like)"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:86
+#: ../pyhoca/wxgui/profilemanager.py:83
 msgid "Unity X Desktop Shell (UNITY)"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:87
-msgid "XFCE4 Desktop (XFCE4)"
+#: ../pyhoca/wxgui/profilemanager.py:84
+msgid "XFCE Desktop (XFCE)"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:88
+#: ../pyhoca/wxgui/profilemanager.py:85
 msgid "Published Applications"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:89
+#: ../pyhoca/wxgui/profilemanager.py:86
 msgid "Single Application"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:90
+#: ../pyhoca/wxgui/profilemanager.py:87
 msgid "XDMCP Query"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:91
-msgid "Windows Terminal Server (RDP-proxy)"
+#: ../pyhoca/wxgui/profilemanager.py:88
+msgid "Windows Terminal Server (X2Go-proxied RDP)"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:89
+msgid "Windows Terminal Server (Direct RDP)"
 msgstr ""
 
-#. 'DirectRDP': 'Windows Terminal Server (RDP-direct)',
-#: ../pyhoca/wxgui/profilemanager.py:93 ../pyhoca/wxgui/profilemanager.py:207
+#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/profilemanager.py:224
 msgid "Custom command"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:398
+#: ../pyhoca/wxgui/profilemanager.py:95 ../pyhoca/wxgui/menus_taskbar.py:393
 msgid "Internet Browser"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:399
+#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:394
 msgid "Email Client"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:400
+#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:395
 msgid "Office"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:99 ../pyhoca/wxgui/menus_taskbar.py:401
+#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:396
 msgid "Terminal"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:113
+#: ../pyhoca/wxgui/profilemanager.py:116
 msgid "Open file with system's default application"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:114
+#: ../pyhoca/wxgui/profilemanager.py:117
 msgid "Open application chooser dialog"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:115
+#: ../pyhoca/wxgui/profilemanager.py:118
 msgid "Save incoming file as ..."
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:143
+#: ../pyhoca/wxgui/profilemanager.py:146
 msgid "settings derived from "
 msgstr ""
 
 #. boxes for all tabs
-#: ../pyhoca/wxgui/profilemanager.py:160
+#: ../pyhoca/wxgui/profilemanager.py:167
 msgid "Session Title"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:161
+#: ../pyhoca/wxgui/profilemanager.py:168
 msgid "Session Window"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:162
+#: ../pyhoca/wxgui/profilemanager.py:169
 msgid "Session Startup"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:163
+#: ../pyhoca/wxgui/profilemanager.py:170
 msgid "Server"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:164
+#: ../pyhoca/wxgui/profilemanager.py:171
+msgid "Proxy"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:172
 msgid "Connection Link Speed"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:165
+#: ../pyhoca/wxgui/profilemanager.py:173
 msgid "Compression"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:166
+#: ../pyhoca/wxgui/profilemanager.py:174
 msgid "Display"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:167
+#: ../pyhoca/wxgui/profilemanager.py:175
 msgid "Keyboard"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:168
+#: ../pyhoca/wxgui/profilemanager.py:176
 msgid "Sound"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:169
+#: ../pyhoca/wxgui/profilemanager.py:177
 msgid "Printing"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:170
+#: ../pyhoca/wxgui/profilemanager.py:178
 msgid "Folder Exports"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:171
+#: ../pyhoca/wxgui/profilemanager.py:179
 msgid "File Import"
 msgstr ""
 
 #. ##
 #. ## widgets for the PROFILE tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:176
+#: ../pyhoca/wxgui/profilemanager.py:184
 msgid "Name"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:183
+#: ../pyhoca/wxgui/profilemanager.py:191
 msgid "Set session window title"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:184
+#: ../pyhoca/wxgui/profilemanager.py:192
 msgid "Use a default session window title"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:185
+#: ../pyhoca/wxgui/profilemanager.py:193
 msgid "Custom session window title"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:195
+#: ../pyhoca/wxgui/profilemanager.py:212
 msgid "Window Icon"
 msgstr ""
 
 #. ##
 #. ## widgets for the SESSION tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:201
+#: ../pyhoca/wxgui/profilemanager.py:218
 msgid "Start session automatically after login"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:202
+#: ../pyhoca/wxgui/profilemanager.py:219
 #, python-format
 msgid "Login automatically after %s has started"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:203
+#: ../pyhoca/wxgui/profilemanager.py:220
 msgid "Type"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:205
+#: ../pyhoca/wxgui/profilemanager.py:222
 msgid "Application"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:209
+#: ../pyhoca/wxgui/profilemanager.py:226
 msgid "XDMCP server"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:211
+#: ../pyhoca/wxgui/profilemanager.py:228
 msgid "RDP server"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:213
+#: ../pyhoca/wxgui/profilemanager.py:230
 msgid "RDP options"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:215
+#: ../pyhoca/wxgui/profilemanager.py:232
 msgid "Integrate remote application(s) into local desktop (rootless mode)"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:216
+#: ../pyhoca/wxgui/profilemanager.py:233
 msgid "Menu of published applications"
 msgstr ""
 
 #. ##
 #. ## widgets for the CONNECTION tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:223 ../pyhoca/wxgui/profilemanager.py:233
+#: ../pyhoca/wxgui/profilemanager.py:240 ../pyhoca/wxgui/profilemanager.py:253
 msgid "User"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:225
+#: ../pyhoca/wxgui/profilemanager.py:242 ../pyhoca/wxgui/profilemanager.py:260
 msgid "Host"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:227
+#: ../pyhoca/wxgui/profilemanager.py:244 ../pyhoca/wxgui/profilemanager.py:262
 msgid "Port"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:229
-msgid "RSA/DSA private key"
+#: ../pyhoca/wxgui/profilemanager.py:246
+msgid "Key"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:232
+#: ../pyhoca/wxgui/profilemanager.py:249
+msgid "Discover SSH keys or use SSH agent for X2Go authentication"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:251
+msgid "Enable forwarding of SSH authentication agent connections"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:252
 msgid "Server behind SSH proxy"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:235
-msgid "Key file"
+#: ../pyhoca/wxgui/profilemanager.py:255
+msgid "Use same username for X2Go and proxy host"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:238
-msgid "Host[:Port]"
+#: ../pyhoca/wxgui/profilemanager.py:256
+msgid "Use same authentication for X2Go and proxy host"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:257
+msgid "Key file"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:240
+#: ../pyhoca/wxgui/profilemanager.py:264
 msgid "SSH Proxy Tunnel"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:248
+#: ../pyhoca/wxgui/profilemanager.py:270
+msgid "Discover SSH keys or use SSH agent for proxy authentication"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:273
 msgid "Modem"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:249
+#: ../pyhoca/wxgui/profilemanager.py:274
 msgid "ISDN"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:250
+#: ../pyhoca/wxgui/profilemanager.py:275
 msgid "ADSL"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:251
+#: ../pyhoca/wxgui/profilemanager.py:276
 msgid "WAN"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:252
+#: ../pyhoca/wxgui/profilemanager.py:277
 msgid "LAN"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:254
+#: ../pyhoca/wxgui/profilemanager.py:279
 msgid "Method"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:256
+#: ../pyhoca/wxgui/profilemanager.py:281
 msgid "Image quality"
 msgstr ""
 
 #. ##
 #. ## wigdets for the SETTINGS tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:262
+#: ../pyhoca/wxgui/profilemanager.py:287
 msgid "Fullscreen"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:263
+#: ../pyhoca/wxgui/profilemanager.py:288
+msgid "Maximized"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:289
 msgid "Custom Size"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:268
+#: ../pyhoca/wxgui/profilemanager.py:294
 msgid "Set display DPI"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:270
+#: ../pyhoca/wxgui/profilemanager.py:296
 msgid "Do not set (use server-side tools to configure the keyboard)"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:271
+#: ../pyhoca/wxgui/profilemanager.py:297
 msgid ""
 "Automatically detect and use client-side keyboard configuration inside the "
 "session"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:272
+#: ../pyhoca/wxgui/profilemanager.py:298
 msgid "Use custom keyboard settings as provided below"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:273
+#: ../pyhoca/wxgui/profilemanager.py:299
 msgid "Keyboard model"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:275
+#: ../pyhoca/wxgui/profilemanager.py:301
 msgid "Layout"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:277
+#: ../pyhoca/wxgui/profilemanager.py:303
 msgid "Layout variant"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:279
+#: ../pyhoca/wxgui/profilemanager.py:305
 msgid "Enable sound support"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:280
+#: ../pyhoca/wxgui/profilemanager.py:306
 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:284
+#: ../pyhoca/wxgui/profilemanager.py:310
 msgid "Arts (not supported)"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:287
+#: ../pyhoca/wxgui/profilemanager.py:313
 msgid "esd"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:288
+#: ../pyhoca/wxgui/profilemanager.py:314
 msgid "Use default sound port"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:289
+#: ../pyhoca/wxgui/profilemanager.py:315
 msgid "Custom sound port"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:291
-msgid "Client Side printing"
+#: ../pyhoca/wxgui/profilemanager.py:318
+msgid "Use local folder sharing"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:293
-msgid "Use local folder sharing"
+#: ../pyhoca/wxgui/profilemanager.py:319
+msgid "Store share list at end of session"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:294
+#: ../pyhoca/wxgui/profilemanager.py:320
 msgid "Path"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:297 ../pyhoca/wxgui/profilemanager.py:316
+#: ../pyhoca/wxgui/profilemanager.py:323 ../pyhoca/wxgui/profilemanager.py:344
 msgid "Add"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:299
+#: ../pyhoca/wxgui/profilemanager.py:325
 msgid "Local Path"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:300
+#: ../pyhoca/wxgui/profilemanager.py:326
 msgid "Connect Method"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:301
+#: ../pyhoca/wxgui/profilemanager.py:327
 msgid "Delete"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:303
+#: ../pyhoca/wxgui/profilemanager.py:329
 msgid "Convert between client and server encodings"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:304
+#: ../pyhoca/wxgui/profilemanager.py:330
 msgid "Client encoding"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:306
+#: ../pyhoca/wxgui/profilemanager.py:332
 msgid "Server encoding"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:309
+#: ../pyhoca/wxgui/profilemanager.py:335
 msgid "Use file MIME box for local file import"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:310
+#: ../pyhoca/wxgui/profilemanager.py:336
 msgid "Extensions"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:312
+#: ../pyhoca/wxgui/profilemanager.py:338
 msgid "Action"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:317
+#: ../pyhoca/wxgui/profilemanager.py:341
+msgid "Client Side printing"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:345
 msgid "Defaults"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:319
+#: ../pyhoca/wxgui/profilemanager.py:347
 msgid "Save"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:320
+#: ../pyhoca/wxgui/profilemanager.py:348
 msgid "Reset"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:365
-#: ../pyhoca/wxgui/profilemanager.py:1078
-#: ../pyhoca/wxgui/profilemanager.py:1832
+#: ../pyhoca/wxgui/profilemanager.py:401
+#: ../pyhoca/wxgui/profilemanager.py:1124
+#: ../pyhoca/wxgui/profilemanager.py:2268
 msgid "automatically"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:367
-#: ../pyhoca/wxgui/profilemanager.py:1080
+#: ../pyhoca/wxgui/profilemanager.py:403
+#: ../pyhoca/wxgui/profilemanager.py:1126
 msgid "manually"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:376
+#: ../pyhoca/wxgui/profilemanager.py:412
 msgid "PyHoca-GUI Profile Manager - new profile"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:378
+#: ../pyhoca/wxgui/profilemanager.py:414
 #, python-format
 msgid "PyHoca-GUI Profile Manager - %s (connected)"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:380
+#: ../pyhoca/wxgui/profilemanager.py:416
 #, python-format
 msgid "PyHoca-GUI Profile Manager - %s"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:751
+#: ../pyhoca/wxgui/profilemanager.py:797
 msgid "Profile"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:752
+#: ../pyhoca/wxgui/profilemanager.py:798
 msgid "Session"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:753
+#: ../pyhoca/wxgui/profilemanager.py:799
 msgid "Connection"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:754
+#: ../pyhoca/wxgui/profilemanager.py:800
+msgid "Link Quality"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:801
 msgid "Settings"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:755
+#: ../pyhoca/wxgui/profilemanager.py:802
 msgid "Sharing"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:996
+#: ../pyhoca/wxgui/profilemanager.py:988
 msgid "<xkbtype>"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:997
+#: ../pyhoca/wxgui/profilemanager.py:989
 msgid "<xkblayout>"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:998
+#: ../pyhoca/wxgui/profilemanager.py:990
 msgid "<xkbvariant>"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1284
+#: ../pyhoca/wxgui/profilemanager.py:1444
 msgid "Icon Files (*.png)|*.png|All files (*.*)|*"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1287
+#: ../pyhoca/wxgui/profilemanager.py:1447
 msgid "Choose an icon for this session profile"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1509
+#: ../pyhoca/wxgui/profilemanager.py:1816
 msgid "All files (*.*)|*"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1511
-#: ../pyhoca/wxgui/profilemanager.py:1533
+#: ../pyhoca/wxgui/profilemanager.py:1818
+#: ../pyhoca/wxgui/profilemanager.py:1842
 msgid "Choose a public SSH key"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1784
+#: ../pyhoca/wxgui/profilemanager.py:2220
 msgid "Choose a folder to share within a session"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1912
-#: ../pyhoca/wxgui/profilemanager.py:1915
-#: ../pyhoca/wxgui/profilemanager.py:1918
-#: ../pyhoca/wxgui/profilemanager.py:1923
-#: ../pyhoca/wxgui/profilemanager.py:1933 ../pyhoca/wxgui/menus_taskbar.py:118
+#: ../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
 msgid "Profile Manager"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1912
+#: ../pyhoca/wxgui/profilemanager.py:2348
 msgid "Profile name is missing, profile unusable!!!"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1915
-#: ../pyhoca/wxgui/profilemanager.py:1918
+#: ../pyhoca/wxgui/profilemanager.py:2351
+#: ../pyhoca/wxgui/profilemanager.py:2354
 #, python-format
 msgid "Profile name %s already exists!!!"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1923
+#: ../pyhoca/wxgui/profilemanager.py:2359
 msgid "The SSH proxy configuration is incomplete. Try again."
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1933
+#: ../pyhoca/wxgui/profilemanager.py:2369
 #, python-format
 msgid ""
 "Another session profile (%s) already uses [%s]:%s for binding a local SSH "
@@ -654,248 +689,252 @@ msgid ""
 "Please change the SSH proxy settings accordingly."
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1960
+#: ../pyhoca/wxgui/profilemanager.py:2396
 #, python-format
 msgid "%s - profile added"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1961
+#: ../pyhoca/wxgui/profilemanager.py:2397
 msgid "A new session profile has been added."
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1965
+#: ../pyhoca/wxgui/profilemanager.py:2401
 #, python-format
 msgid "%s - modified"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1966
+#: ../pyhoca/wxgui/profilemanager.py:2402
 msgid "Changes to profile have been saved."
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:75
+#: ../pyhoca/wxgui/menus_taskbar.py:74
 msgid "Edit Profile"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:78
+#: ../pyhoca/wxgui/menus_taskbar.py:77
 msgid "Use as Template for New Profile"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:79
+#: ../pyhoca/wxgui/menus_taskbar.py:78
 msgid "Delete Profile"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:107
+#: ../pyhoca/wxgui/menus_taskbar.py:106
 #, python-format
 msgid "About %s (%s)..."
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:133
+#: ../pyhoca/wxgui/menus_taskbar.py:132
 msgid "Manage Session Profile"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:142
+#: ../pyhoca/wxgui/menus_taskbar.py:141
 msgid "Printing Preferences"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:148
+#: ../pyhoca/wxgui/menus_taskbar.py:147
 msgid "Client Options"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:156 ../pyhoca/wxgui/menus_taskbar.py:785
-#: ../pyhoca/wxgui/menus_taskbar.py:977
+#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:783
+#: ../pyhoca/wxgui/menus_taskbar.py:975
 msgid "E&xit"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:228
+#: ../pyhoca/wxgui/menus_taskbar.py:227
 msgid "Window title"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:234 ../pyhoca/wxgui/menus_taskbar.py:613
+#: ../pyhoca/wxgui/menus_taskbar.py:233 ../pyhoca/wxgui/menus_taskbar.py:608
 msgid "Resume Session"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:236
+#: ../pyhoca/wxgui/menus_taskbar.py:235
 msgid "Resume Session (not possible)"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:247
+#: ../pyhoca/wxgui/menus_taskbar.py:246
 msgid "Transfer Session"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:249
+#: ../pyhoca/wxgui/menus_taskbar.py:248
 msgid "Transfer Session (not possible)"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:253 ../pyhoca/wxgui/menus_taskbar.py:604
+#: ../pyhoca/wxgui/menus_taskbar.py:252 ../pyhoca/wxgui/menus_taskbar.py:599
 msgid "Suspend Session (and disconnect/exit)"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:255 ../pyhoca/wxgui/menus_taskbar.py:606
+#: ../pyhoca/wxgui/menus_taskbar.py:254 ../pyhoca/wxgui/menus_taskbar.py:601
 msgid "Suspend Session (and disconnect)"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:257 ../pyhoca/wxgui/menus_taskbar.py:608
+#: ../pyhoca/wxgui/menus_taskbar.py:256 ../pyhoca/wxgui/menus_taskbar.py:603
 msgid "Suspend Session"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:263 ../pyhoca/wxgui/menus_taskbar.py:617
+#: ../pyhoca/wxgui/menus_taskbar.py:262 ../pyhoca/wxgui/menus_taskbar.py:612
 msgid "Terminate Session (and disconnect/exit)"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:265 ../pyhoca/wxgui/menus_taskbar.py:619
+#: ../pyhoca/wxgui/menus_taskbar.py:264 ../pyhoca/wxgui/menus_taskbar.py:614
 msgid "Terminate Session (and disconnect)"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:267 ../pyhoca/wxgui/menus_taskbar.py:621
+#: ../pyhoca/wxgui/menus_taskbar.py:266 ../pyhoca/wxgui/menus_taskbar.py:616
 msgid "Terminate Session"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:271 ../pyhoca/wxgui/menus_taskbar.py:601
+#: ../pyhoca/wxgui/menus_taskbar.py:270 ../pyhoca/wxgui/menus_taskbar.py:596
 msgid "Refresh menu tree"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:280
+#: ../pyhoca/wxgui/menus_taskbar.py:279
 msgid "Rename Session Window"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:281
+#: ../pyhoca/wxgui/menus_taskbar.py:280
 msgid "Show Session Window"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:321
+#: ../pyhoca/wxgui/menus_taskbar.py:322
 msgid "&Share custom local folder"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:344
+#: ../pyhoca/wxgui/menus_taskbar.py:337
 msgid "Share:"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:355
+#: ../pyhoca/wxgui/menus_taskbar.py:346
 msgid "Unshare:"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:365
+#: ../pyhoca/wxgui/menus_taskbar.py:354
 msgid "Unshare &all local folders"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:445
+#: ../pyhoca/wxgui/menus_taskbar.py:360
+msgid "Restore shares in next session"
+msgstr ""
+
+#: ../pyhoca/wxgui/menus_taskbar.py:440
 msgid "Multimedia"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:446
+#: ../pyhoca/wxgui/menus_taskbar.py:441
 msgid "Development"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:447
+#: ../pyhoca/wxgui/menus_taskbar.py:442
 msgid "Education"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:448
+#: ../pyhoca/wxgui/menus_taskbar.py:443
 msgid "Games"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:449
+#: ../pyhoca/wxgui/menus_taskbar.py:444
 msgid "Graphics"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:450
+#: ../pyhoca/wxgui/menus_taskbar.py:445
 msgid "Internet"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:451
+#: ../pyhoca/wxgui/menus_taskbar.py:446
 msgid "Office Applications"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:452
+#: ../pyhoca/wxgui/menus_taskbar.py:447
 msgid "System"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:453
+#: ../pyhoca/wxgui/menus_taskbar.py:448
 msgid "Utilities"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:454
+#: ../pyhoca/wxgui/menus_taskbar.py:449
 msgid "Other Applications"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:526 ../pyhoca/wxgui/menus_taskbar.py:538
+#: ../pyhoca/wxgui/menus_taskbar.py:521 ../pyhoca/wxgui/menus_taskbar.py:533
 #, python-format
 msgid "Connect %s"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:532
+#: ../pyhoca/wxgui/menus_taskbar.py:527
 msgid "Currently connecting..."
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:546
+#: ../pyhoca/wxgui/menus_taskbar.py:541
 msgid "Start &new Desktop Session"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:551 ../pyhoca/wxgui/menus_taskbar.py:689
+#: ../pyhoca/wxgui/menus_taskbar.py:546 ../pyhoca/wxgui/menus_taskbar.py:684
 msgid "Retrieving Application Menu..."
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:555 ../pyhoca/wxgui/menus_taskbar.py:692
+#: ../pyhoca/wxgui/menus_taskbar.py:550 ../pyhoca/wxgui/menus_taskbar.py:687
 msgid "Retrieve Application Menu"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:558
+#: ../pyhoca/wxgui/menus_taskbar.py:553
 msgid "Start &new Session"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:638
+#: ../pyhoca/wxgui/menus_taskbar.py:633
 msgid "Launch Single Application"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:676
+#: ../pyhoca/wxgui/menus_taskbar.py:671
 msgid "Manage Application Menu"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:719
+#: ../pyhoca/wxgui/menus_taskbar.py:714
 msgid "Running"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:721
+#: ../pyhoca/wxgui/menus_taskbar.py:716
 msgid "Suspended"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:740
+#: ../pyhoca/wxgui/menus_taskbar.py:735
 msgid "&Clean all sessions"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:746
+#: ../pyhoca/wxgui/menus_taskbar.py:741
 msgid "Customize &profile"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:758
+#: ../pyhoca/wxgui/menus_taskbar.py:756
 msgid "Shared &folders"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:770
+#: ../pyhoca/wxgui/menus_taskbar.py:768
 msgid "&Disconnect from Server"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:777
+#: ../pyhoca/wxgui/menus_taskbar.py:775
 msgid "Suspend Session and E&xit application"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:781
+#: ../pyhoca/wxgui/menus_taskbar.py:779
 msgid "Disconnect and E&xit application"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:835
+#: ../pyhoca/wxgui/menus_taskbar.py:833
 msgid "Add Profile"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:911
+#: ../pyhoca/wxgui/menus_taskbar.py:909
 msgid "No session profiles defined"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:947
+#: ../pyhoca/wxgui/menus_taskbar.py:945
 msgid "Start/Resume Session"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:947
+#: ../pyhoca/wxgui/menus_taskbar.py:945
 msgid "Connect Server"
 msgstr ""
 
@@ -904,106 +943,122 @@ msgstr ""
 msgid "About %s ..."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:462
+#: ../pyhoca/wxgui/frontend.py:459
 msgid "Suspending sessions and exiting application..."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:465
+#: ../pyhoca/wxgui/frontend.py:462
 #, python-format
 msgid "Disconnecting %s and exiting application..."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:467
+#: ../pyhoca/wxgui/frontend.py:464
 msgid "Exiting application..."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:560
+#: ../pyhoca/wxgui/frontend.py:562
 #, python-format
 msgid "%s - server warning"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:560
+#: ../pyhoca/wxgui/frontend.py:562
 msgid "The X2Go Server does not publish an application menu."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:610
-msgid "Public SSH key authentication has been successful."
+#: ../pyhoca/wxgui/frontend.py:613
+msgid "SSH key authentication has been successful."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:644
+#: ../pyhoca/wxgui/frontend.py:650
 msgid ""
 "The SSH proxy's host key is invalid or has not been accepted by the user"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:665
+#: ../pyhoca/wxgui/frontend.py:671
 #, python-format
 msgid "%s - EOF error"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:665
+#: ../pyhoca/wxgui/frontend.py:671
 msgid "Authentication protocol communication incomplete! Try again..."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:672
+#: ../pyhoca/wxgui/frontend.py:678
 #, python-format
 msgid "%s - auth key error"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:693
+#: ../pyhoca/wxgui/frontend.py:699
 msgid "An unknown error occurred during authentication!"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:726
+#: ../pyhoca/wxgui/frontend.py:728
+#, python-format
+msgid "%s: DirectRDP not supported yet"
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:729
+#, python-format
+msgid ""
+"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)."
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:741
 msgid "Unknown session profile, configure before using it..."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:784 ../pyhoca/wxgui/frontend.py:1302
+#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:1332
 #, python-format
 msgid "%s - session warning"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:784
+#: ../pyhoca/wxgui/frontend.py:798
 #, python-format
 msgid "Execution of command ,,%s'' failed."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:926
+#: ../pyhoca/wxgui/frontend.py:939
 msgid "Cleaning X2Go sessions..."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:961
+#: ../pyhoca/wxgui/frontend.py:974
 #, python-format
 msgid "%s - disconnect"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:961
+#: ../pyhoca/wxgui/frontend.py:974
 msgid "X2Go Profile is now disconnected."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:977
+#: ../pyhoca/wxgui/frontend.py:995
 msgid "New Session Profile"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1029
+#: ../pyhoca/wxgui/frontend.py:1047
 #, python-format
 msgid "Really Delete Session Profile ,,%s''?"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1035
+#: ../pyhoca/wxgui/frontend.py:1053
 #, python-format
 msgid "%s - profile deleted"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1035
+#: ../pyhoca/wxgui/frontend.py:1053
 msgid "The session profile has been deleted."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1053
+#: ../pyhoca/wxgui/frontend.py:1071
 #, python-format
 msgid "%s - share local folder with sessions of this profile"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1194
+#: ../pyhoca/wxgui/frontend.py:1224
 #, python-format
 msgid ""
 "The authenticity of host [%s]:%s can't be established.\n"
@@ -1012,148 +1067,148 @@ msgid ""
 "Are you sure you want to continue connecting?"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1202
+#: ../pyhoca/wxgui/frontend.py:1232
 #, python-format
 msgid "%s: Confirm Host Authorization"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1247
+#: ../pyhoca/wxgui/frontend.py:1277
 #, python-format
 msgid "%s - channel error"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1247
+#: ../pyhoca/wxgui/frontend.py:1277
 #, python-format
 msgid ""
 "Lost connection to server %s unexpectedly! Try to re-authenticate to the "
 "server..."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1265 ../pyhoca/wxgui/frontend.py:1283
-#: ../pyhoca/wxgui/frontend.py:1285 ../pyhoca/wxgui/frontend.py:1321
+#: ../pyhoca/wxgui/frontend.py:1295 ../pyhoca/wxgui/frontend.py:1313
+#: ../pyhoca/wxgui/frontend.py:1315 ../pyhoca/wxgui/frontend.py:1351
 #, python-format
 msgid "%s - session failure"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1265
+#: ../pyhoca/wxgui/frontend.py:1295
 msgid "The session startup failed."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1283
+#: ../pyhoca/wxgui/frontend.py:1313
 #, python-format
 msgid "The command ,,%s'' is not available on X2Go server."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1285
+#: ../pyhoca/wxgui/frontend.py:1315
 #, python-format
 msgid ""
 "The command ,,%s'' is not available on X2Go server\n"
 "%s."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1302
+#: ../pyhoca/wxgui/frontend.py:1332
 #, python-format
 msgid ""
 "Reverse TCP port forwarding request for session %s to server port %s has "
 "been denied."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1321
+#: ../pyhoca/wxgui/frontend.py:1351
 #, python-format
 msgid ""
 "Forwarding tunnel request to [%s]:%s for session %s was denied by remote "
 "X2go/SSH server. Session startup failed."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1340
+#: ../pyhoca/wxgui/frontend.py:1370
 #, python-format
 msgid "%s - audio warning"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1340
+#: ../pyhoca/wxgui/frontend.py:1370
 msgid ""
 "The X2Go PulseAudio system is not available within Remote Desktop sessions."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1347 ../pyhoca/wxgui/frontend.py:1354
+#: ../pyhoca/wxgui/frontend.py:1377 ../pyhoca/wxgui/frontend.py:1384
 #, python-format
 msgid "%s - audio error"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1347
+#: ../pyhoca/wxgui/frontend.py:1377
 msgid "The X2Go PulseAudio system could not be started."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1354
+#: ../pyhoca/wxgui/frontend.py:1384
 msgid "The X2Go PulseAudio system has died unexpectedly."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1366
+#: ../pyhoca/wxgui/frontend.py:1396
 #, python-format
 msgid "%s - audio problem"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1366
+#: ../pyhoca/wxgui/frontend.py:1396
 #, python-format
 msgid ""
 "The audio connection could not be set up for this session.\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1378
+#: ../pyhoca/wxgui/frontend.py:1408
 #, python-format
 msgid "%s - client-side printing not available"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1378
+#: ../pyhoca/wxgui/frontend.py:1408
 #, python-format
 msgid ""
 "The server denies client-side printing from within this session.\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1390
+#: ../pyhoca/wxgui/frontend.py:1420
 #, python-format
 msgid "%s - MIME box not available"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1390
+#: ../pyhoca/wxgui/frontend.py:1420
 #, python-format
 msgid ""
 "The server does not support the X2Go MIME box.\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1402
+#: ../pyhoca/wxgui/frontend.py:1432
 #, python-format
 msgid "%s - client-side folders not sharable"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1402
+#: ../pyhoca/wxgui/frontend.py:1432
 #, python-format
 msgid ""
 "The server denies client-side folder sharing with this session.\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1414
+#: ../pyhoca/wxgui/frontend.py:1444
 #, python-format
 msgid "%s - client resources not sharable"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1414
+#: ../pyhoca/wxgui/frontend.py:1444
 #, python-format
 msgid ""
 "Client-side folders and printers cannot be shared with this session.\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1433 ../pyhoca/wxgui/frontend.py:1435
+#: ../pyhoca/wxgui/frontend.py:1463 ../pyhoca/wxgui/frontend.py:1465
 #, python-format
 msgid "%s - print error"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1433
+#: ../pyhoca/wxgui/frontend.py:1463
 #, python-format
 msgid ""
 "%s\n"
@@ -1161,7 +1216,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1435
+#: ../pyhoca/wxgui/frontend.py:1465
 #, python-format
 msgid ""
 "%s\n"
@@ -1169,88 +1224,88 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1450 ../pyhoca/wxgui/frontend.py:1465
+#: ../pyhoca/wxgui/frontend.py:1480 ../pyhoca/wxgui/frontend.py:1495
 #, python-format
 msgid "%s - start"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1450
+#: ../pyhoca/wxgui/frontend.py:1480
 #, python-format
 msgid ""
 "New X2Go session starting up...\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1465
+#: ../pyhoca/wxgui/frontend.py:1495
 #, python-format
 msgid ""
 "Another client started X2Go session\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1480 ../pyhoca/wxgui/frontend.py:1495
+#: ../pyhoca/wxgui/frontend.py:1510 ../pyhoca/wxgui/frontend.py:1525
 #, python-format
 msgid "%s - resume"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1480
+#: ../pyhoca/wxgui/frontend.py:1510
 #, python-format
 msgid ""
 "Resuming X2Go session...\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1495
+#: ../pyhoca/wxgui/frontend.py:1525
 #, python-format
 msgid ""
 "Another client resumed X2Go session\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1510
+#: ../pyhoca/wxgui/frontend.py:1540
 #, python-format
 msgid "%s - running"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1510
+#: ../pyhoca/wxgui/frontend.py:1540
 #, python-format
 msgid ""
 "Found already running session\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1530
+#: ../pyhoca/wxgui/frontend.py:1560
 #, python-format
 msgid "%s - suspend"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1530
+#: ../pyhoca/wxgui/frontend.py:1560
 #, python-format
 msgid ""
 "X2Go Session has been suspended\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1557
+#: ../pyhoca/wxgui/frontend.py:1587
 #, python-format
 msgid "%s - terminate"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1557
+#: ../pyhoca/wxgui/frontend.py:1587
 #, python-format
 msgid ""
 "X2Go Session has terminated\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/messages.py:74
+#: ../pyhoca/wxgui/messages.py:73
 #, python-format
 msgid ""
 "Are you really sure you want to\n"
 "delete the session profile ,,%s''?"
 msgstr ""
 
-#: ../pyhoca/wxgui/messages.py:75
+#: ../pyhoca/wxgui/messages.py:74
 #, python-format
 msgid ""
 "PyHoca-GUI is already running for user ,,%s''!\n"
@@ -1260,15 +1315,15 @@ msgid ""
 "notification area/systray."
 msgstr ""
 
-#: ../pyhoca/wxgui/messages.py:108
+#: ../pyhoca/wxgui/messages.py:107
 msgid "Yes"
 msgstr ""
 
-#: ../pyhoca/wxgui/messages.py:109
+#: ../pyhoca/wxgui/messages.py:108
 msgid "No"
 msgstr ""
 
-#: ../pyhoca/wxgui/messages.py:126 ../pyhoca/wxgui/printingprefs.py:142
+#: ../pyhoca/wxgui/messages.py:125 ../pyhoca/wxgui/printingprefs.py:142
 msgid "Ok"
 msgstr ""
 
diff --git a/po/bg.po b/po/bg.po
index 816902f..194fc9c 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PyHoca-GUI VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-10 21:18+0200\n"
+"POT-Creation-Date: 2012-11-26 14:25+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: Bulgarian <chepati at yahoo.com>\n"
+"Language-Team: X2Go i18n <x2go-i18n at lists.berlios.de>\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,636 +21,671 @@ msgstr ""
 "X-Poedit-Country: Bulgaria\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../pyhoca/wxgui/logon.py:92
+#: ../pyhoca/wxgui/logon.py:86
 #, python-format
 msgid "%s (via %s)"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:96 ../pyhoca/wxgui/logon.py:108
+#: ../pyhoca/wxgui/logon.py:90 ../pyhoca/wxgui/logon.py:102
 msgid "Username"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:98 ../pyhoca/wxgui/logon.py:110
+#: ../pyhoca/wxgui/logon.py:92 ../pyhoca/wxgui/logon.py:104
 msgid "Password"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:101
+#: ../pyhoca/wxgui/logon.py:95
 msgid "Authenticate"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:113
+#: ../pyhoca/wxgui/logon.py:107
 msgid "  Start SSH tunnel  "
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:121
+#: ../pyhoca/wxgui/logon.py:115
 msgid "Session login"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:122
+#: ../pyhoca/wxgui/logon.py:116
 msgid "SSH proxy server login"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:133 ../pyhoca/wxgui/profilemanager.py:322
-#: ../pyhoca/wxgui/messages.py:132 ../pyhoca/wxgui/printingprefs.py:147
+#: ../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
 msgid "Cancel"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:292 ../pyhoca/wxgui/logon.py:334
-#: ../pyhoca/wxgui/frontend.py:603
+#: ../pyhoca/wxgui/logon.py:297 ../pyhoca/wxgui/logon.py:339
+#: ../pyhoca/wxgui/frontend.py:606
 #, python-format
 msgid "%s - connect failure"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:293 ../pyhoca/wxgui/frontend.py:603
+#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:606
 msgid "User is not allowed to start X2Go sessions!"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:610
+#: ../pyhoca/wxgui/logon.py:303 ../pyhoca/wxgui/frontend.py:613
 #, python-format
 msgid "%s - connect"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:299
+#: ../pyhoca/wxgui/logon.py:304
 msgid "Authentication has been successful."
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:330
+#: ../pyhoca/wxgui/logon.py:335
 msgid "SSH tunnel started"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:335
+#: ../pyhoca/wxgui/logon.py:340
 msgid "Authentication failed!"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:342
+#: ../pyhoca/wxgui/logon.py:348
 #, python-format
 msgid "%s - SSH proxy"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:343
+#: ../pyhoca/wxgui/logon.py:349
 msgid "Authentication to the SSH proxy server failed!"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:658
+#: ../pyhoca/wxgui/logon.py:376 ../pyhoca/wxgui/frontend.py:664
 #, python-format
 msgid "%s - socket error"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:372 ../pyhoca/wxgui/frontend.py:637
-#: ../pyhoca/wxgui/frontend.py:644
+#: ../pyhoca/wxgui/logon.py:383 ../pyhoca/wxgui/frontend.py:643
+#: ../pyhoca/wxgui/frontend.py:650
 #, python-format
 msgid "%s - host key error"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:373 ../pyhoca/wxgui/frontend.py:637
+#: ../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 ""
 
-#: ../pyhoca/wxgui/logon.py:380 ../pyhoca/wxgui/frontend.py:679
+#: ../pyhoca/wxgui/logon.py:391 ../pyhoca/wxgui/frontend.py:685
 #, python-format
 msgid "%s - missing home directory"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:679
+#: ../pyhoca/wxgui/logon.py:392 ../pyhoca/wxgui/frontend.py:685
 msgid "The remote user's home directory does not exist."
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:388
+#: ../pyhoca/wxgui/logon.py:399
 #, python-format
 msgid "%s - key error"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:396 ../pyhoca/wxgui/frontend.py:686
+#: ../pyhoca/wxgui/logon.py:407 ../pyhoca/wxgui/frontend.py:692
 #, python-format
 msgid "%s - auth error"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:404 ../pyhoca/wxgui/frontend.py:630
+#: ../pyhoca/wxgui/logon.py:415 ../pyhoca/wxgui/frontend.py:636
 #, python-format
 msgid "%s - SSH error"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:412
+#: ../pyhoca/wxgui/logon.py:423
 #, python-format
 msgid "%s - unknown error"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:413
+#: ../pyhoca/wxgui/logon.py:424
 msgid "An unknown error occured during authentication!"
 msgstr ""
 
-#: ../pyhoca/wxgui/taskbar.py:92
+#: ../pyhoca/wxgui/taskbar.py:89
 #, python-format
 msgid ""
 "PyHoca-GUI\n"
 "Connecting you to ,,%s''"
 msgstr ""
 
-#: ../pyhoca/wxgui/taskbar.py:96
+#: ../pyhoca/wxgui/taskbar.py:93
 #, python-format
 msgid ""
 "PyHoca-GUI (Python X2goClient)\n"
 "Currently connecting you to remote X2Go server ,,%s''"
 msgstr ""
 
-#: ../pyhoca/wxgui/taskbar.py:106
+#: ../pyhoca/wxgui/taskbar.py:103
 msgid ""
 "PyHoca-GUI\n"
 "Connecting you to X2Go..."
 msgstr ""
 
-#: ../pyhoca/wxgui/taskbar.py:110
+#: ../pyhoca/wxgui/taskbar.py:107
 msgid ""
 "PyHoca-GUI (Python X2goClient)\n"
 "Client for connecting you to a remote X2Go server"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:82
+#: ../pyhoca/wxgui/profilemanager.py:79
 msgid "GNOME Desktop (GNOME)"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:83
+#: ../pyhoca/wxgui/profilemanager.py:80
 msgid "K Desktop Environment (KDE)"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:84
+#: ../pyhoca/wxgui/profilemanager.py:81
 msgid "Lightweight X Desktop (LXDE)"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:85
+#: ../pyhoca/wxgui/profilemanager.py:82
 msgid "Trinity X Desktop (KDE3-like)"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:86
+#: ../pyhoca/wxgui/profilemanager.py:83
 msgid "Unity X Desktop Shell (UNITY)"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:87
-msgid "XFCE4 Desktop (XFCE4)"
+#: ../pyhoca/wxgui/profilemanager.py:84
+msgid "XFCE Desktop (XFCE)"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:88
+#: ../pyhoca/wxgui/profilemanager.py:85
 msgid "Published Applications"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:89
+#: ../pyhoca/wxgui/profilemanager.py:86
 msgid "Single Application"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:90
+#: ../pyhoca/wxgui/profilemanager.py:87
 msgid "XDMCP Query"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:91
-msgid "Windows Terminal Server (RDP-proxy)"
+#: ../pyhoca/wxgui/profilemanager.py:88
+msgid "Windows Terminal Server (X2Go-proxied RDP)"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:89
+msgid "Windows Terminal Server (Direct RDP)"
 msgstr ""
 
-#. 'DirectRDP': 'Windows Terminal Server (RDP-direct)',
-#: ../pyhoca/wxgui/profilemanager.py:93 ../pyhoca/wxgui/profilemanager.py:207
+#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/profilemanager.py:224
 msgid "Custom command"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:398
+#: ../pyhoca/wxgui/profilemanager.py:95 ../pyhoca/wxgui/menus_taskbar.py:393
 msgid "Internet Browser"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:399
+#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:394
 msgid "Email Client"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:400
+#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:395
 msgid "Office"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:99 ../pyhoca/wxgui/menus_taskbar.py:401
+#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:396
 msgid "Terminal"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:113
+#: ../pyhoca/wxgui/profilemanager.py:116
 msgid "Open file with system's default application"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:114
+#: ../pyhoca/wxgui/profilemanager.py:117
 msgid "Open application chooser dialog"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:115
+#: ../pyhoca/wxgui/profilemanager.py:118
 msgid "Save incoming file as ..."
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:143
+#: ../pyhoca/wxgui/profilemanager.py:146
 msgid "settings derived from "
 msgstr ""
 
 #. boxes for all tabs
-#: ../pyhoca/wxgui/profilemanager.py:160
+#: ../pyhoca/wxgui/profilemanager.py:167
 msgid "Session Title"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:161
+#: ../pyhoca/wxgui/profilemanager.py:168
 msgid "Session Window"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:162
+#: ../pyhoca/wxgui/profilemanager.py:169
 msgid "Session Startup"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:163
+#: ../pyhoca/wxgui/profilemanager.py:170
 msgid "Server"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:164
+#: ../pyhoca/wxgui/profilemanager.py:171
+msgid "Proxy"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:172
 msgid "Connection Link Speed"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:165
+#: ../pyhoca/wxgui/profilemanager.py:173
 msgid "Compression"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:166
+#: ../pyhoca/wxgui/profilemanager.py:174
 msgid "Display"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:167
+#: ../pyhoca/wxgui/profilemanager.py:175
 msgid "Keyboard"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:168
+#: ../pyhoca/wxgui/profilemanager.py:176
 msgid "Sound"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:169
+#: ../pyhoca/wxgui/profilemanager.py:177
 msgid "Printing"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:170
+#: ../pyhoca/wxgui/profilemanager.py:178
 msgid "Folder Exports"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:171
+#: ../pyhoca/wxgui/profilemanager.py:179
 msgid "File Import"
 msgstr ""
 
 #. ##
 #. ## widgets for the PROFILE tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:176
+#: ../pyhoca/wxgui/profilemanager.py:184
 msgid "Name"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:183
+#: ../pyhoca/wxgui/profilemanager.py:191
 msgid "Set session window title"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:184
+#: ../pyhoca/wxgui/profilemanager.py:192
 msgid "Use a default session window title"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:185
+#: ../pyhoca/wxgui/profilemanager.py:193
 msgid "Custom session window title"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:195
+#: ../pyhoca/wxgui/profilemanager.py:212
 msgid "Window Icon"
 msgstr ""
 
 #. ##
 #. ## widgets for the SESSION tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:201
+#: ../pyhoca/wxgui/profilemanager.py:218
 msgid "Start session automatically after login"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:202
+#: ../pyhoca/wxgui/profilemanager.py:219
 #, python-format
 msgid "Login automatically after %s has started"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:203
+#: ../pyhoca/wxgui/profilemanager.py:220
 msgid "Type"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:205
+#: ../pyhoca/wxgui/profilemanager.py:222
 msgid "Application"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:209
+#: ../pyhoca/wxgui/profilemanager.py:226
 msgid "XDMCP server"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:211
+#: ../pyhoca/wxgui/profilemanager.py:228
 msgid "RDP server"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:213
+#: ../pyhoca/wxgui/profilemanager.py:230
 msgid "RDP options"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:215
+#: ../pyhoca/wxgui/profilemanager.py:232
 msgid "Integrate remote application(s) into local desktop (rootless mode)"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:216
+#: ../pyhoca/wxgui/profilemanager.py:233
 msgid "Menu of published applications"
 msgstr ""
 
 #. ##
 #. ## widgets for the CONNECTION tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:223 ../pyhoca/wxgui/profilemanager.py:233
+#: ../pyhoca/wxgui/profilemanager.py:240 ../pyhoca/wxgui/profilemanager.py:253
 msgid "User"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:225
+#: ../pyhoca/wxgui/profilemanager.py:242 ../pyhoca/wxgui/profilemanager.py:260
 msgid "Host"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:227
+#: ../pyhoca/wxgui/profilemanager.py:244 ../pyhoca/wxgui/profilemanager.py:262
 msgid "Port"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:229
-msgid "RSA/DSA private key"
+#: ../pyhoca/wxgui/profilemanager.py:246
+msgid "Key"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:232
+#: ../pyhoca/wxgui/profilemanager.py:249
+msgid "Discover SSH keys or use SSH agent for X2Go authentication"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:251
+msgid "Enable forwarding of SSH authentication agent connections"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:252
 msgid "Server behind SSH proxy"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:235
-msgid "Key file"
+#: ../pyhoca/wxgui/profilemanager.py:255
+msgid "Use same username for X2Go and proxy host"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:238
-msgid "Host[:Port]"
+#: ../pyhoca/wxgui/profilemanager.py:256
+msgid "Use same authentication for X2Go and proxy host"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:257
+msgid "Key file"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:240
+#: ../pyhoca/wxgui/profilemanager.py:264
 msgid "SSH Proxy Tunnel"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:248
+#: ../pyhoca/wxgui/profilemanager.py:270
+msgid "Discover SSH keys or use SSH agent for proxy authentication"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:273
 msgid "Modem"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:249
+#: ../pyhoca/wxgui/profilemanager.py:274
 msgid "ISDN"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:250
+#: ../pyhoca/wxgui/profilemanager.py:275
 msgid "ADSL"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:251
+#: ../pyhoca/wxgui/profilemanager.py:276
 msgid "WAN"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:252
+#: ../pyhoca/wxgui/profilemanager.py:277
 msgid "LAN"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:254
+#: ../pyhoca/wxgui/profilemanager.py:279
 msgid "Method"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:256
+#: ../pyhoca/wxgui/profilemanager.py:281
 msgid "Image quality"
 msgstr ""
 
 #. ##
 #. ## wigdets for the SETTINGS tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:262
+#: ../pyhoca/wxgui/profilemanager.py:287
 msgid "Fullscreen"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:263
+#: ../pyhoca/wxgui/profilemanager.py:288
+msgid "Maximized"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:289
 msgid "Custom Size"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:268
+#: ../pyhoca/wxgui/profilemanager.py:294
 msgid "Set display DPI"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:270
+#: ../pyhoca/wxgui/profilemanager.py:296
 msgid "Do not set (use server-side tools to configure the keyboard)"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:271
+#: ../pyhoca/wxgui/profilemanager.py:297
 msgid ""
 "Automatically detect and use client-side keyboard configuration inside the "
 "session"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:272
+#: ../pyhoca/wxgui/profilemanager.py:298
 msgid "Use custom keyboard settings as provided below"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:273
+#: ../pyhoca/wxgui/profilemanager.py:299
 msgid "Keyboard model"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:275
+#: ../pyhoca/wxgui/profilemanager.py:301
 msgid "Layout"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:277
+#: ../pyhoca/wxgui/profilemanager.py:303
 msgid "Layout variant"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:279
+#: ../pyhoca/wxgui/profilemanager.py:305
 msgid "Enable sound support"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:280
+#: ../pyhoca/wxgui/profilemanager.py:306
 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:284
+#: ../pyhoca/wxgui/profilemanager.py:310
 msgid "Arts (not supported)"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:287
+#: ../pyhoca/wxgui/profilemanager.py:313
 msgid "esd"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:288
+#: ../pyhoca/wxgui/profilemanager.py:314
 msgid "Use default sound port"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:289
+#: ../pyhoca/wxgui/profilemanager.py:315
 msgid "Custom sound port"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:291
-msgid "Client Side printing"
+#: ../pyhoca/wxgui/profilemanager.py:318
+msgid "Use local folder sharing"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:293
-msgid "Use local folder sharing"
+#: ../pyhoca/wxgui/profilemanager.py:319
+msgid "Store share list at end of session"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:294
+#: ../pyhoca/wxgui/profilemanager.py:320
 msgid "Path"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:297 ../pyhoca/wxgui/profilemanager.py:316
+#: ../pyhoca/wxgui/profilemanager.py:323 ../pyhoca/wxgui/profilemanager.py:344
 msgid "Add"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:299
+#: ../pyhoca/wxgui/profilemanager.py:325
 msgid "Local Path"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:300
+#: ../pyhoca/wxgui/profilemanager.py:326
 msgid "Connect Method"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:301
+#: ../pyhoca/wxgui/profilemanager.py:327
 msgid "Delete"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:303
+#: ../pyhoca/wxgui/profilemanager.py:329
 msgid "Convert between client and server encodings"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:304
+#: ../pyhoca/wxgui/profilemanager.py:330
 msgid "Client encoding"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:306
+#: ../pyhoca/wxgui/profilemanager.py:332
 msgid "Server encoding"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:309
+#: ../pyhoca/wxgui/profilemanager.py:335
 msgid "Use file MIME box for local file import"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:310
+#: ../pyhoca/wxgui/profilemanager.py:336
 msgid "Extensions"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:312
+#: ../pyhoca/wxgui/profilemanager.py:338
 msgid "Action"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:317
+#: ../pyhoca/wxgui/profilemanager.py:341
+msgid "Client Side printing"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:345
 msgid "Defaults"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:319
+#: ../pyhoca/wxgui/profilemanager.py:347
 msgid "Save"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:320
+#: ../pyhoca/wxgui/profilemanager.py:348
 msgid "Reset"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:365
-#: ../pyhoca/wxgui/profilemanager.py:1078
-#: ../pyhoca/wxgui/profilemanager.py:1832
+#: ../pyhoca/wxgui/profilemanager.py:401
+#: ../pyhoca/wxgui/profilemanager.py:1124
+#: ../pyhoca/wxgui/profilemanager.py:2268
 msgid "automatically"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:367
-#: ../pyhoca/wxgui/profilemanager.py:1080
+#: ../pyhoca/wxgui/profilemanager.py:403
+#: ../pyhoca/wxgui/profilemanager.py:1126
 msgid "manually"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:376
+#: ../pyhoca/wxgui/profilemanager.py:412
 msgid "PyHoca-GUI Profile Manager - new profile"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:378
+#: ../pyhoca/wxgui/profilemanager.py:414
 #, python-format
 msgid "PyHoca-GUI Profile Manager - %s (connected)"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:380
+#: ../pyhoca/wxgui/profilemanager.py:416
 #, python-format
 msgid "PyHoca-GUI Profile Manager - %s"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:751
+#: ../pyhoca/wxgui/profilemanager.py:797
 msgid "Profile"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:752
+#: ../pyhoca/wxgui/profilemanager.py:798
 msgid "Session"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:753
+#: ../pyhoca/wxgui/profilemanager.py:799
 msgid "Connection"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:754
+#: ../pyhoca/wxgui/profilemanager.py:800
+msgid "Link Quality"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:801
 msgid "Settings"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:755
+#: ../pyhoca/wxgui/profilemanager.py:802
 msgid "Sharing"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:996
+#: ../pyhoca/wxgui/profilemanager.py:988
 msgid "<xkbtype>"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:997
+#: ../pyhoca/wxgui/profilemanager.py:989
 msgid "<xkblayout>"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:998
+#: ../pyhoca/wxgui/profilemanager.py:990
 msgid "<xkbvariant>"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1284
+#: ../pyhoca/wxgui/profilemanager.py:1444
 msgid "Icon Files (*.png)|*.png|All files (*.*)|*"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1287
+#: ../pyhoca/wxgui/profilemanager.py:1447
 msgid "Choose an icon for this session profile"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1509
+#: ../pyhoca/wxgui/profilemanager.py:1816
 msgid "All files (*.*)|*"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1511
-#: ../pyhoca/wxgui/profilemanager.py:1533
+#: ../pyhoca/wxgui/profilemanager.py:1818
+#: ../pyhoca/wxgui/profilemanager.py:1842
 msgid "Choose a public SSH key"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1784
+#: ../pyhoca/wxgui/profilemanager.py:2220
 msgid "Choose a folder to share within a session"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1912
-#: ../pyhoca/wxgui/profilemanager.py:1915
-#: ../pyhoca/wxgui/profilemanager.py:1918
-#: ../pyhoca/wxgui/profilemanager.py:1923
-#: ../pyhoca/wxgui/profilemanager.py:1933 ../pyhoca/wxgui/menus_taskbar.py:118
+#: ../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
 msgid "Profile Manager"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1912
+#: ../pyhoca/wxgui/profilemanager.py:2348
 msgid "Profile name is missing, profile unusable!!!"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1915
-#: ../pyhoca/wxgui/profilemanager.py:1918
+#: ../pyhoca/wxgui/profilemanager.py:2351
+#: ../pyhoca/wxgui/profilemanager.py:2354
 #, python-format
 msgid "Profile name %s already exists!!!"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1923
+#: ../pyhoca/wxgui/profilemanager.py:2359
 msgid "The SSH proxy configuration is incomplete. Try again."
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1933
+#: ../pyhoca/wxgui/profilemanager.py:2369
 #, python-format
 msgid ""
 "Another session profile (%s) already uses [%s]:%s for binding a local SSH "
@@ -658,248 +693,252 @@ msgid ""
 "Please change the SSH proxy settings accordingly."
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1960
+#: ../pyhoca/wxgui/profilemanager.py:2396
 #, python-format
 msgid "%s - profile added"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1961
+#: ../pyhoca/wxgui/profilemanager.py:2397
 msgid "A new session profile has been added."
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1965
+#: ../pyhoca/wxgui/profilemanager.py:2401
 #, python-format
 msgid "%s - modified"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1966
+#: ../pyhoca/wxgui/profilemanager.py:2402
 msgid "Changes to profile have been saved."
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:75
+#: ../pyhoca/wxgui/menus_taskbar.py:74
 msgid "Edit Profile"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:78
+#: ../pyhoca/wxgui/menus_taskbar.py:77
 msgid "Use as Template for New Profile"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:79
+#: ../pyhoca/wxgui/menus_taskbar.py:78
 msgid "Delete Profile"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:107
+#: ../pyhoca/wxgui/menus_taskbar.py:106
 #, python-format
 msgid "About %s (%s)..."
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:133
+#: ../pyhoca/wxgui/menus_taskbar.py:132
 msgid "Manage Session Profile"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:142
+#: ../pyhoca/wxgui/menus_taskbar.py:141
 msgid "Printing Preferences"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:148
+#: ../pyhoca/wxgui/menus_taskbar.py:147
 msgid "Client Options"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:156 ../pyhoca/wxgui/menus_taskbar.py:785
-#: ../pyhoca/wxgui/menus_taskbar.py:977
+#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:783
+#: ../pyhoca/wxgui/menus_taskbar.py:975
 msgid "E&xit"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:228
+#: ../pyhoca/wxgui/menus_taskbar.py:227
 msgid "Window title"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:234 ../pyhoca/wxgui/menus_taskbar.py:613
+#: ../pyhoca/wxgui/menus_taskbar.py:233 ../pyhoca/wxgui/menus_taskbar.py:608
 msgid "Resume Session"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:236
+#: ../pyhoca/wxgui/menus_taskbar.py:235
 msgid "Resume Session (not possible)"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:247
+#: ../pyhoca/wxgui/menus_taskbar.py:246
 msgid "Transfer Session"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:249
+#: ../pyhoca/wxgui/menus_taskbar.py:248
 msgid "Transfer Session (not possible)"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:253 ../pyhoca/wxgui/menus_taskbar.py:604
+#: ../pyhoca/wxgui/menus_taskbar.py:252 ../pyhoca/wxgui/menus_taskbar.py:599
 msgid "Suspend Session (and disconnect/exit)"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:255 ../pyhoca/wxgui/menus_taskbar.py:606
+#: ../pyhoca/wxgui/menus_taskbar.py:254 ../pyhoca/wxgui/menus_taskbar.py:601
 msgid "Suspend Session (and disconnect)"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:257 ../pyhoca/wxgui/menus_taskbar.py:608
+#: ../pyhoca/wxgui/menus_taskbar.py:256 ../pyhoca/wxgui/menus_taskbar.py:603
 msgid "Suspend Session"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:263 ../pyhoca/wxgui/menus_taskbar.py:617
+#: ../pyhoca/wxgui/menus_taskbar.py:262 ../pyhoca/wxgui/menus_taskbar.py:612
 msgid "Terminate Session (and disconnect/exit)"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:265 ../pyhoca/wxgui/menus_taskbar.py:619
+#: ../pyhoca/wxgui/menus_taskbar.py:264 ../pyhoca/wxgui/menus_taskbar.py:614
 msgid "Terminate Session (and disconnect)"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:267 ../pyhoca/wxgui/menus_taskbar.py:621
+#: ../pyhoca/wxgui/menus_taskbar.py:266 ../pyhoca/wxgui/menus_taskbar.py:616
 msgid "Terminate Session"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:271 ../pyhoca/wxgui/menus_taskbar.py:601
+#: ../pyhoca/wxgui/menus_taskbar.py:270 ../pyhoca/wxgui/menus_taskbar.py:596
 msgid "Refresh menu tree"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:280
+#: ../pyhoca/wxgui/menus_taskbar.py:279
 msgid "Rename Session Window"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:281
+#: ../pyhoca/wxgui/menus_taskbar.py:280
 msgid "Show Session Window"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:321
+#: ../pyhoca/wxgui/menus_taskbar.py:322
 msgid "&Share custom local folder"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:344
+#: ../pyhoca/wxgui/menus_taskbar.py:337
 msgid "Share:"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:355
+#: ../pyhoca/wxgui/menus_taskbar.py:346
 msgid "Unshare:"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:365
+#: ../pyhoca/wxgui/menus_taskbar.py:354
 msgid "Unshare &all local folders"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:445
+#: ../pyhoca/wxgui/menus_taskbar.py:360
+msgid "Restore shares in next session"
+msgstr ""
+
+#: ../pyhoca/wxgui/menus_taskbar.py:440
 msgid "Multimedia"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:446
+#: ../pyhoca/wxgui/menus_taskbar.py:441
 msgid "Development"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:447
+#: ../pyhoca/wxgui/menus_taskbar.py:442
 msgid "Education"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:448
+#: ../pyhoca/wxgui/menus_taskbar.py:443
 msgid "Games"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:449
+#: ../pyhoca/wxgui/menus_taskbar.py:444
 msgid "Graphics"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:450
+#: ../pyhoca/wxgui/menus_taskbar.py:445
 msgid "Internet"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:451
+#: ../pyhoca/wxgui/menus_taskbar.py:446
 msgid "Office Applications"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:452
+#: ../pyhoca/wxgui/menus_taskbar.py:447
 msgid "System"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:453
+#: ../pyhoca/wxgui/menus_taskbar.py:448
 msgid "Utilities"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:454
+#: ../pyhoca/wxgui/menus_taskbar.py:449
 msgid "Other Applications"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:526 ../pyhoca/wxgui/menus_taskbar.py:538
+#: ../pyhoca/wxgui/menus_taskbar.py:521 ../pyhoca/wxgui/menus_taskbar.py:533
 #, python-format
 msgid "Connect %s"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:532
+#: ../pyhoca/wxgui/menus_taskbar.py:527
 msgid "Currently connecting..."
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:546
+#: ../pyhoca/wxgui/menus_taskbar.py:541
 msgid "Start &new Desktop Session"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:551 ../pyhoca/wxgui/menus_taskbar.py:689
+#: ../pyhoca/wxgui/menus_taskbar.py:546 ../pyhoca/wxgui/menus_taskbar.py:684
 msgid "Retrieving Application Menu..."
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:555 ../pyhoca/wxgui/menus_taskbar.py:692
+#: ../pyhoca/wxgui/menus_taskbar.py:550 ../pyhoca/wxgui/menus_taskbar.py:687
 msgid "Retrieve Application Menu"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:558
+#: ../pyhoca/wxgui/menus_taskbar.py:553
 msgid "Start &new Session"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:638
+#: ../pyhoca/wxgui/menus_taskbar.py:633
 msgid "Launch Single Application"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:676
+#: ../pyhoca/wxgui/menus_taskbar.py:671
 msgid "Manage Application Menu"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:719
+#: ../pyhoca/wxgui/menus_taskbar.py:714
 msgid "Running"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:721
+#: ../pyhoca/wxgui/menus_taskbar.py:716
 msgid "Suspended"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:740
+#: ../pyhoca/wxgui/menus_taskbar.py:735
 msgid "&Clean all sessions"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:746
+#: ../pyhoca/wxgui/menus_taskbar.py:741
 msgid "Customize &profile"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:758
+#: ../pyhoca/wxgui/menus_taskbar.py:756
 msgid "Shared &folders"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:770
+#: ../pyhoca/wxgui/menus_taskbar.py:768
 msgid "&Disconnect from Server"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:777
+#: ../pyhoca/wxgui/menus_taskbar.py:775
 msgid "Suspend Session and E&xit application"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:781
+#: ../pyhoca/wxgui/menus_taskbar.py:779
 msgid "Disconnect and E&xit application"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:835
+#: ../pyhoca/wxgui/menus_taskbar.py:833
 msgid "Add Profile"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:911
+#: ../pyhoca/wxgui/menus_taskbar.py:909
 msgid "No session profiles defined"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:947
+#: ../pyhoca/wxgui/menus_taskbar.py:945
 msgid "Start/Resume Session"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:947
+#: ../pyhoca/wxgui/menus_taskbar.py:945
 msgid "Connect Server"
 msgstr ""
 
@@ -908,106 +947,122 @@ msgstr ""
 msgid "About %s ..."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:462
+#: ../pyhoca/wxgui/frontend.py:459
 msgid "Suspending sessions and exiting application..."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:465
+#: ../pyhoca/wxgui/frontend.py:462
 #, python-format
 msgid "Disconnecting %s and exiting application..."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:467
+#: ../pyhoca/wxgui/frontend.py:464
 msgid "Exiting application..."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:560
+#: ../pyhoca/wxgui/frontend.py:562
 #, python-format
 msgid "%s - server warning"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:560
+#: ../pyhoca/wxgui/frontend.py:562
 msgid "The X2Go Server does not publish an application menu."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:610
-msgid "Public SSH key authentication has been successful."
+#: ../pyhoca/wxgui/frontend.py:613
+msgid "SSH key authentication has been successful."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:644
+#: ../pyhoca/wxgui/frontend.py:650
 msgid ""
 "The SSH proxy's host key is invalid or has not been accepted by the user"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:665
+#: ../pyhoca/wxgui/frontend.py:671
 #, python-format
 msgid "%s - EOF error"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:665
+#: ../pyhoca/wxgui/frontend.py:671
 msgid "Authentication protocol communication incomplete! Try again..."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:672
+#: ../pyhoca/wxgui/frontend.py:678
 #, python-format
 msgid "%s - auth key error"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:693
+#: ../pyhoca/wxgui/frontend.py:699
 msgid "An unknown error occurred during authentication!"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:726
+#: ../pyhoca/wxgui/frontend.py:728
+#, python-format
+msgid "%s: DirectRDP not supported yet"
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:729
+#, python-format
+msgid ""
+"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)."
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:741
 msgid "Unknown session profile, configure before using it..."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:784 ../pyhoca/wxgui/frontend.py:1302
+#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:1332
 #, python-format
 msgid "%s - session warning"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:784
+#: ../pyhoca/wxgui/frontend.py:798
 #, python-format
 msgid "Execution of command ,,%s'' failed."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:926
+#: ../pyhoca/wxgui/frontend.py:939
 msgid "Cleaning X2Go sessions..."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:961
+#: ../pyhoca/wxgui/frontend.py:974
 #, python-format
 msgid "%s - disconnect"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:961
+#: ../pyhoca/wxgui/frontend.py:974
 msgid "X2Go Profile is now disconnected."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:977
+#: ../pyhoca/wxgui/frontend.py:995
 msgid "New Session Profile"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1029
+#: ../pyhoca/wxgui/frontend.py:1047
 #, python-format
 msgid "Really Delete Session Profile ,,%s''?"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1035
+#: ../pyhoca/wxgui/frontend.py:1053
 #, python-format
 msgid "%s - profile deleted"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1035
+#: ../pyhoca/wxgui/frontend.py:1053
 msgid "The session profile has been deleted."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1053
+#: ../pyhoca/wxgui/frontend.py:1071
 #, python-format
 msgid "%s - share local folder with sessions of this profile"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1194
+#: ../pyhoca/wxgui/frontend.py:1224
 #, python-format
 msgid ""
 "The authenticity of host [%s]:%s can't be established.\n"
@@ -1016,148 +1071,148 @@ msgid ""
 "Are you sure you want to continue connecting?"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1202
+#: ../pyhoca/wxgui/frontend.py:1232
 #, python-format
 msgid "%s: Confirm Host Authorization"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1247
+#: ../pyhoca/wxgui/frontend.py:1277
 #, python-format
 msgid "%s - channel error"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1247
+#: ../pyhoca/wxgui/frontend.py:1277
 #, python-format
 msgid ""
 "Lost connection to server %s unexpectedly! Try to re-authenticate to the "
 "server..."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1265 ../pyhoca/wxgui/frontend.py:1283
-#: ../pyhoca/wxgui/frontend.py:1285 ../pyhoca/wxgui/frontend.py:1321
+#: ../pyhoca/wxgui/frontend.py:1295 ../pyhoca/wxgui/frontend.py:1313
+#: ../pyhoca/wxgui/frontend.py:1315 ../pyhoca/wxgui/frontend.py:1351
 #, python-format
 msgid "%s - session failure"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1265
+#: ../pyhoca/wxgui/frontend.py:1295
 msgid "The session startup failed."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1283
+#: ../pyhoca/wxgui/frontend.py:1313
 #, python-format
 msgid "The command ,,%s'' is not available on X2Go server."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1285
+#: ../pyhoca/wxgui/frontend.py:1315
 #, python-format
 msgid ""
 "The command ,,%s'' is not available on X2Go server\n"
 "%s."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1302
+#: ../pyhoca/wxgui/frontend.py:1332
 #, python-format
 msgid ""
 "Reverse TCP port forwarding request for session %s to server port %s has "
 "been denied."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1321
+#: ../pyhoca/wxgui/frontend.py:1351
 #, python-format
 msgid ""
 "Forwarding tunnel request to [%s]:%s for session %s was denied by remote "
 "X2go/SSH server. Session startup failed."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1340
+#: ../pyhoca/wxgui/frontend.py:1370
 #, python-format
 msgid "%s - audio warning"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1340
+#: ../pyhoca/wxgui/frontend.py:1370
 msgid ""
 "The X2Go PulseAudio system is not available within Remote Desktop sessions."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1347 ../pyhoca/wxgui/frontend.py:1354
+#: ../pyhoca/wxgui/frontend.py:1377 ../pyhoca/wxgui/frontend.py:1384
 #, python-format
 msgid "%s - audio error"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1347
+#: ../pyhoca/wxgui/frontend.py:1377
 msgid "The X2Go PulseAudio system could not be started."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1354
+#: ../pyhoca/wxgui/frontend.py:1384
 msgid "The X2Go PulseAudio system has died unexpectedly."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1366
+#: ../pyhoca/wxgui/frontend.py:1396
 #, python-format
 msgid "%s - audio problem"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1366
+#: ../pyhoca/wxgui/frontend.py:1396
 #, python-format
 msgid ""
 "The audio connection could not be set up for this session.\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1378
+#: ../pyhoca/wxgui/frontend.py:1408
 #, python-format
 msgid "%s - client-side printing not available"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1378
+#: ../pyhoca/wxgui/frontend.py:1408
 #, python-format
 msgid ""
 "The server denies client-side printing from within this session.\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1390
+#: ../pyhoca/wxgui/frontend.py:1420
 #, python-format
 msgid "%s - MIME box not available"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1390
+#: ../pyhoca/wxgui/frontend.py:1420
 #, python-format
 msgid ""
 "The server does not support the X2Go MIME box.\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1402
+#: ../pyhoca/wxgui/frontend.py:1432
 #, python-format
 msgid "%s - client-side folders not sharable"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1402
+#: ../pyhoca/wxgui/frontend.py:1432
 #, python-format
 msgid ""
 "The server denies client-side folder sharing with this session.\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1414
+#: ../pyhoca/wxgui/frontend.py:1444
 #, python-format
 msgid "%s - client resources not sharable"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1414
+#: ../pyhoca/wxgui/frontend.py:1444
 #, python-format
 msgid ""
 "Client-side folders and printers cannot be shared with this session.\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1433 ../pyhoca/wxgui/frontend.py:1435
+#: ../pyhoca/wxgui/frontend.py:1463 ../pyhoca/wxgui/frontend.py:1465
 #, python-format
 msgid "%s - print error"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1433
+#: ../pyhoca/wxgui/frontend.py:1463
 #, python-format
 msgid ""
 "%s\n"
@@ -1165,7 +1220,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1435
+#: ../pyhoca/wxgui/frontend.py:1465
 #, python-format
 msgid ""
 "%s\n"
@@ -1173,88 +1228,88 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1450 ../pyhoca/wxgui/frontend.py:1465
+#: ../pyhoca/wxgui/frontend.py:1480 ../pyhoca/wxgui/frontend.py:1495
 #, python-format
 msgid "%s - start"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1450
+#: ../pyhoca/wxgui/frontend.py:1480
 #, python-format
 msgid ""
 "New X2Go session starting up...\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1465
+#: ../pyhoca/wxgui/frontend.py:1495
 #, python-format
 msgid ""
 "Another client started X2Go session\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1480 ../pyhoca/wxgui/frontend.py:1495
+#: ../pyhoca/wxgui/frontend.py:1510 ../pyhoca/wxgui/frontend.py:1525
 #, python-format
 msgid "%s - resume"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1480
+#: ../pyhoca/wxgui/frontend.py:1510
 #, python-format
 msgid ""
 "Resuming X2Go session...\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1495
+#: ../pyhoca/wxgui/frontend.py:1525
 #, python-format
 msgid ""
 "Another client resumed X2Go session\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1510
+#: ../pyhoca/wxgui/frontend.py:1540
 #, python-format
 msgid "%s - running"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1510
+#: ../pyhoca/wxgui/frontend.py:1540
 #, python-format
 msgid ""
 "Found already running session\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1530
+#: ../pyhoca/wxgui/frontend.py:1560
 #, python-format
 msgid "%s - suspend"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1530
+#: ../pyhoca/wxgui/frontend.py:1560
 #, python-format
 msgid ""
 "X2Go Session has been suspended\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1557
+#: ../pyhoca/wxgui/frontend.py:1587
 #, python-format
 msgid "%s - terminate"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1557
+#: ../pyhoca/wxgui/frontend.py:1587
 #, python-format
 msgid ""
 "X2Go Session has terminated\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/messages.py:74
+#: ../pyhoca/wxgui/messages.py:73
 #, python-format
 msgid ""
 "Are you really sure you want to\n"
 "delete the session profile ,,%s''?"
 msgstr ""
 
-#: ../pyhoca/wxgui/messages.py:75
+#: ../pyhoca/wxgui/messages.py:74
 #, python-format
 msgid ""
 "PyHoca-GUI is already running for user ,,%s''!\n"
@@ -1264,15 +1319,15 @@ msgid ""
 "notification area/systray."
 msgstr ""
 
-#: ../pyhoca/wxgui/messages.py:108
+#: ../pyhoca/wxgui/messages.py:107
 msgid "Yes"
 msgstr ""
 
-#: ../pyhoca/wxgui/messages.py:109
+#: ../pyhoca/wxgui/messages.py:108
 msgid "No"
 msgstr ""
 
-#: ../pyhoca/wxgui/messages.py:126 ../pyhoca/wxgui/printingprefs.py:142
+#: ../pyhoca/wxgui/messages.py:125 ../pyhoca/wxgui/printingprefs.py:142
 msgid "Ok"
 msgstr ""
 
diff --git a/po/da.po b/po/da.po
new file mode 100644
index 0000000..ab9e1af
--- /dev/null
+++ b/po/da.po
@@ -0,0 +1,1524 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+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"
+"Last-Translator: Christoffer Krakou <christoffer at fleten.net>\n"
+"Language-Team: X2Go i18n <x2go-i18n at lists.berlios.de>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Danish\n"
+"X-Poedit-Country: Denmark\n"
+
+#: ../pyhoca/wxgui/logon.py:86
+#, python-format
+msgid "%s (via %s)"
+msgstr "%s (via %s)"
+
+#: ../pyhoca/wxgui/logon.py:90
+#: ../pyhoca/wxgui/logon.py:102
+msgid "Username"
+msgstr "Brugernavn"
+
+#: ../pyhoca/wxgui/logon.py:92
+#: ../pyhoca/wxgui/logon.py:104
+msgid "Password"
+msgstr "Kodeord"
+
+#: ../pyhoca/wxgui/logon.py:95
+msgid "Authenticate"
+msgstr "Autentificér"
+
+#: ../pyhoca/wxgui/logon.py:107
+msgid "  Start SSH tunnel  "
+msgstr " Start SSH tunnel"
+
+#: ../pyhoca/wxgui/logon.py:115
+msgid "Session login"
+msgstr "Sessionslogin"
+
+#: ../pyhoca/wxgui/logon.py:116
+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
+msgid "Cancel"
+msgstr "Annullér"
+
+#: ../pyhoca/wxgui/logon.py:297
+#: ../pyhoca/wxgui/logon.py:339
+#: ../pyhoca/wxgui/frontend.py:606
+#, python-format
+msgid "%s - connect failure"
+msgstr "%s - forbindelsesfejl"
+
+#: ../pyhoca/wxgui/logon.py:298
+#: ../pyhoca/wxgui/frontend.py:606
+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
+#, python-format
+msgid "%s - connect"
+msgstr "%s - forbind"
+
+#: ../pyhoca/wxgui/logon.py:304
+msgid "Authentication has been successful."
+msgstr "Autentificering lykkedes"
+
+#: ../pyhoca/wxgui/logon.py:335
+msgid "SSH tunnel started"
+msgstr "SSH tunnel startet"
+
+#: ../pyhoca/wxgui/logon.py:340
+msgid "Authentication failed!"
+msgstr "Autentificering mislykkedes!"
+
+#: ../pyhoca/wxgui/logon.py:348
+#, python-format
+msgid "%s - SSH proxy"
+msgstr "%s - SSH proxy"
+
+#: ../pyhoca/wxgui/logon.py:349
+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
+#, 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
+#, 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:391
+#: ../pyhoca/wxgui/frontend.py:685
+#, python-format
+msgid "%s - missing home directory"
+msgstr "%s - manglende hjemmemappe"
+
+#: ../pyhoca/wxgui/logon.py:392
+#: ../pyhoca/wxgui/frontend.py:685
+msgid "The remote user's home directory does not exist."
+msgstr "Fjernbrugerens hjemmemappe eksisterer ikke"
+
+#: ../pyhoca/wxgui/logon.py:399
+#, python-format
+msgid "%s - key error"
+msgstr "%s - nøglefejl"
+
+#: ../pyhoca/wxgui/logon.py:407
+#: ../pyhoca/wxgui/frontend.py:692
+#, python-format
+msgid "%s - auth error"
+msgstr "%s - auth fejl"
+
+#: ../pyhoca/wxgui/logon.py:415
+#: ../pyhoca/wxgui/frontend.py:636
+#, python-format
+msgid "%s - SSH error"
+msgstr "%s - SSH fejl"
+
+#: ../pyhoca/wxgui/logon.py:423
+#, python-format
+msgid "%s - unknown error"
+msgstr "%s - ukendt fejl"
+
+#: ../pyhoca/wxgui/logon.py:424
+msgid "An unknown error occured during authentication!"
+msgstr "En ukendt fejl opstod under autentificering"
+
+#: ../pyhoca/wxgui/taskbar.py:89
+#, python-format
+msgid ""
+"PyHoca-GUI\n"
+"Connecting you to ,,%s''"
+msgstr ""
+"PyHoca-GUI\n"
+"Forbinder dig til  ,,%s''"
+
+#: ../pyhoca/wxgui/taskbar.py:93
+#, python-format
+msgid ""
+"PyHoca-GUI (Python X2goClient)\n"
+"Currently connecting you to remote X2Go server ,,%s''"
+msgstr ""
+"PyHoca-GUI (Python X2goClient)\n"
+"Forbinder dig til X2Go server ,,%s''"
+
+#: ../pyhoca/wxgui/taskbar.py:103
+msgid ""
+"PyHoca-GUI\n"
+"Connecting you to X2Go..."
+msgstr ""
+"PyHoca-GUI\n"
+"Forbinder dig til X2Go..."
+
+#: ../pyhoca/wxgui/taskbar.py:107
+msgid ""
+"PyHoca-GUI (Python X2goClient)\n"
+"Client for connecting you to a remote X2Go server"
+msgstr ""
+"PyHoca-GUI (Python X2goClient)\n"
+"Klient til at forbinde dig til en X2Go server"
+
+#: ../pyhoca/wxgui/profilemanager.py:79
+msgid "GNOME Desktop (GNOME)"
+msgstr "GNOME Skrivebord (GNOME)"
+
+#: ../pyhoca/wxgui/profilemanager.py:80
+msgid "K Desktop Environment (KDE)"
+msgstr "K Desktop Environment (KDE)"
+
+#: ../pyhoca/wxgui/profilemanager.py:81
+msgid "Lightweight X Desktop (LXDE)"
+msgstr "Lightweight X Desktop (LXDE)"
+
+#: ../pyhoca/wxgui/profilemanager.py:82
+msgid "Trinity X Desktop (KDE3-like)"
+msgstr "Trinity X Desktop (KDE3-lignende)"
+
+#: ../pyhoca/wxgui/profilemanager.py:83
+msgid "Unity X Desktop Shell (UNITY)"
+msgstr "Unity X Desktop Shell (UNITY)"
+
+#: ../pyhoca/wxgui/profilemanager.py:84
+msgid "XFCE Desktop (XFCE)"
+msgstr "XFCE Skrivebord (XFCE)"
+
+#: ../pyhoca/wxgui/profilemanager.py:85
+msgid "Published Applications"
+msgstr "Udgivne Applikationer"
+
+#: ../pyhoca/wxgui/profilemanager.py:86
+msgid "Single Application"
+msgstr "Enkelt Applikation"
+
+#: ../pyhoca/wxgui/profilemanager.py:87
+msgid "XDMCP Query"
+msgstr "XDMCP Forespørgsel"
+
+#: ../pyhoca/wxgui/profilemanager.py:88
+msgid "Windows Terminal Server (X2Go-proxied RDP)"
+msgstr "Windows Terminal Server (RDP igennem X2Go-proxy)"
+
+#: ../pyhoca/wxgui/profilemanager.py:89
+msgid "Windows Terminal Server (Direct RDP)"
+msgstr "Windows Terminal Server (Direkte RDP)"
+
+#: ../pyhoca/wxgui/profilemanager.py:90
+#: ../pyhoca/wxgui/profilemanager.py:224
+msgid "Custom command"
+msgstr "Tilpasset kommando"
+
+#: ../pyhoca/wxgui/profilemanager.py:95
+#: ../pyhoca/wxgui/menus_taskbar.py:393
+msgid "Internet Browser"
+msgstr "Internet Browser"
+
+#: ../pyhoca/wxgui/profilemanager.py:96
+#: ../pyhoca/wxgui/menus_taskbar.py:394
+msgid "Email Client"
+msgstr "Email Klient"
+
+#: ../pyhoca/wxgui/profilemanager.py:97
+#: ../pyhoca/wxgui/menus_taskbar.py:395
+msgid "Office"
+msgstr "Kontorsoftware"
+
+#: ../pyhoca/wxgui/profilemanager.py:98
+#: ../pyhoca/wxgui/menus_taskbar.py:396
+msgid "Terminal"
+msgstr "Terminal"
+
+#: ../pyhoca/wxgui/profilemanager.py:116
+msgid "Open file with system's default application"
+msgstr "Ã…ben fil med systemets standard-applikation"
+
+#: ../pyhoca/wxgui/profilemanager.py:117
+msgid "Open application chooser dialog"
+msgstr "Åben applikationsvælger"
+
+#: ../pyhoca/wxgui/profilemanager.py:118
+msgid "Save incoming file as ..."
+msgstr "Gem indkommende fil som ..."
+
+#: ../pyhoca/wxgui/profilemanager.py:146
+msgid "settings derived from "
+msgstr "indstillinger taget fra"
+
+#. boxes for all tabs
+#: ../pyhoca/wxgui/profilemanager.py:167
+msgid "Session Title"
+msgstr "Sesstionstitel"
+
+#: ../pyhoca/wxgui/profilemanager.py:168
+msgid "Session Window"
+msgstr "Sessionsvindue"
+
+#: ../pyhoca/wxgui/profilemanager.py:169
+msgid "Session Startup"
+msgstr "Sessionsstart"
+
+#: ../pyhoca/wxgui/profilemanager.py:170
+msgid "Server"
+msgstr "Server"
+
+#: ../pyhoca/wxgui/profilemanager.py:171
+msgid "Proxy"
+msgstr "Proxy"
+
+#: ../pyhoca/wxgui/profilemanager.py:172
+msgid "Connection Link Speed"
+msgstr "Forbindelseshastighed"
+
+#: ../pyhoca/wxgui/profilemanager.py:173
+msgid "Compression"
+msgstr "Komprimering"
+
+#: ../pyhoca/wxgui/profilemanager.py:174
+msgid "Display"
+msgstr "Display"
+
+#: ../pyhoca/wxgui/profilemanager.py:175
+msgid "Keyboard"
+msgstr "Tastatur"
+
+#: ../pyhoca/wxgui/profilemanager.py:176
+msgid "Sound"
+msgstr "Lyd"
+
+#: ../pyhoca/wxgui/profilemanager.py:177
+msgid "Printing"
+msgstr "Udskrift"
+
+#: ../pyhoca/wxgui/profilemanager.py:178
+msgid "Folder Exports"
+msgstr "Mappeeksporteringer"
+
+#: ../pyhoca/wxgui/profilemanager.py:179
+msgid "File Import"
+msgstr "Filimporteringer"
+
+#. ##
+#. ## widgets for the PROFILE tab
+#. ##
+#: ../pyhoca/wxgui/profilemanager.py:184
+msgid "Name"
+msgstr "Navn"
+
+#: ../pyhoca/wxgui/profilemanager.py:191
+msgid "Set session window title"
+msgstr "Indstil sessionsvinduets titel"
+
+#: ../pyhoca/wxgui/profilemanager.py:192
+msgid "Use a default session window title"
+msgstr "Brug standardtitel til sessionsvindue"
+
+#: ../pyhoca/wxgui/profilemanager.py:193
+msgid "Custom session window title"
+msgstr "Tilpasset titel til sessionsvindue"
+
+#: ../pyhoca/wxgui/profilemanager.py:212
+msgid "Window Icon"
+msgstr "Vinduesikon"
+
+#. ##
+#. ## widgets for the SESSION tab
+#. ##
+#: ../pyhoca/wxgui/profilemanager.py:218
+msgid "Start session automatically after login"
+msgstr "Start session automatisk efter login"
+
+#: ../pyhoca/wxgui/profilemanager.py:219
+#, python-format
+msgid "Login automatically after %s has started"
+msgstr "Log ind automatisk efter at %s er startet"
+
+#: ../pyhoca/wxgui/profilemanager.py:220
+msgid "Type"
+msgstr "Type"
+
+#: ../pyhoca/wxgui/profilemanager.py:222
+msgid "Application"
+msgstr "Applikation"
+
+#: ../pyhoca/wxgui/profilemanager.py:226
+msgid "XDMCP server"
+msgstr "XDMCP server"
+
+#: ../pyhoca/wxgui/profilemanager.py:228
+msgid "RDP server"
+msgstr "RDP server"
+
+#: ../pyhoca/wxgui/profilemanager.py:230
+msgid "RDP options"
+msgstr "RDP indstillinger"
+
+#: ../pyhoca/wxgui/profilemanager.py:232
+msgid "Integrate remote application(s) into local desktop (rootless mode)"
+msgstr "Integrér fjernapplikationer med lokalt skrivebord (rootless mode)"
+
+#: ../pyhoca/wxgui/profilemanager.py:233
+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
+msgid "User"
+msgstr "Bruger"
+
+#: ../pyhoca/wxgui/profilemanager.py:242
+#: ../pyhoca/wxgui/profilemanager.py:260
+msgid "Host"
+msgstr "Host"
+
+#: ../pyhoca/wxgui/profilemanager.py:244
+#: ../pyhoca/wxgui/profilemanager.py:262
+msgid "Port"
+msgstr "Port"
+
+#: ../pyhoca/wxgui/profilemanager.py:246
+msgid "Key"
+msgstr "Nøgle"
+
+#: ../pyhoca/wxgui/profilemanager.py:249
+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
+msgid "Enable forwarding of SSH authentication agent connections"
+msgstr "Aktiver forwarding af SSH autentificeringsagentens forbindelser"
+
+#: ../pyhoca/wxgui/profilemanager.py:252
+msgid "Server behind SSH proxy"
+msgstr "Server bag SSH proxy"
+
+#: ../pyhoca/wxgui/profilemanager.py:255
+msgid "Use same username for X2Go and proxy host"
+msgstr "Brug samme brugernavn til X2Go og proxy host"
+
+#: ../pyhoca/wxgui/profilemanager.py:256
+msgid "Use same authentication for X2Go and proxy host"
+msgstr "Brug samme autentificering til X2Go og proxy host"
+
+#: ../pyhoca/wxgui/profilemanager.py:257
+msgid "Key file"
+msgstr "Nøglefil"
+
+#: ../pyhoca/wxgui/profilemanager.py:264
+msgid "SSH Proxy Tunnel"
+msgstr "SSH Proxy Tunnel"
+
+#: ../pyhoca/wxgui/profilemanager.py:270
+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
+msgid "Modem"
+msgstr "Modem"
+
+#: ../pyhoca/wxgui/profilemanager.py:274
+msgid "ISDN"
+msgstr "ISDN"
+
+#: ../pyhoca/wxgui/profilemanager.py:275
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../pyhoca/wxgui/profilemanager.py:276
+msgid "WAN"
+msgstr "WAN"
+
+#: ../pyhoca/wxgui/profilemanager.py:277
+msgid "LAN"
+msgstr "LAN"
+
+#: ../pyhoca/wxgui/profilemanager.py:279
+msgid "Method"
+msgstr "Metode"
+
+#: ../pyhoca/wxgui/profilemanager.py:281
+msgid "Image quality"
+msgstr "Billedkvalitet"
+
+#. ##
+#. ## wigdets for the SETTINGS tab
+#. ##
+#: ../pyhoca/wxgui/profilemanager.py:287
+msgid "Fullscreen"
+msgstr "Fuldskærm"
+
+#: ../pyhoca/wxgui/profilemanager.py:288
+msgid "Maximized"
+msgstr "Maximeret"
+
+#: ../pyhoca/wxgui/profilemanager.py:289
+msgid "Custom Size"
+msgstr "TIlpasset størrelse"
+
+#: ../pyhoca/wxgui/profilemanager.py:294
+msgid "Set display DPI"
+msgstr "Indstil display-DPI"
+
+#: ../pyhoca/wxgui/profilemanager.py:296
+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)"
+
+#: ../pyhoca/wxgui/profilemanager.py:297
+msgid "Automatically detect and use client-side keyboard configuration inside the session"
+msgstr "Indstil automatisk tastaturet under sessionen"
+
+#: ../pyhoca/wxgui/profilemanager.py:298
+msgid "Use custom keyboard settings as provided below"
+msgstr "Brug tilpasset tastaturindstillinger som vist nedenfor"
+
+#: ../pyhoca/wxgui/profilemanager.py:299
+msgid "Keyboard model"
+msgstr "Tastaturmodel"
+
+#: ../pyhoca/wxgui/profilemanager.py:301
+msgid "Layout"
+msgstr "Layout"
+
+#: ../pyhoca/wxgui/profilemanager.py:303
+msgid "Layout variant"
+msgstr "Layoutvariant"
+
+#: ../pyhoca/wxgui/profilemanager.py:305
+msgid "Enable sound support"
+msgstr "Aktiver lyd"
+
+#: ../pyhoca/wxgui/profilemanager.py:306
+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
+msgid "Arts (not supported)"
+msgstr "Arts (ikke understøttet)"
+
+#: ../pyhoca/wxgui/profilemanager.py:313
+msgid "esd"
+msgstr "esd"
+
+#: ../pyhoca/wxgui/profilemanager.py:314
+msgid "Use default sound port"
+msgstr "Brug standardport til lyd"
+
+#: ../pyhoca/wxgui/profilemanager.py:315
+msgid "Custom sound port"
+msgstr "Tilpasset lydport"
+
+#: ../pyhoca/wxgui/profilemanager.py:318
+msgid "Use local folder sharing"
+msgstr "Brug lokal mappedeling"
+
+#: ../pyhoca/wxgui/profilemanager.py:319
+msgid "Store share list at end of session"
+msgstr "Gem delemappeliste når sessionen slutter"
+
+#: ../pyhoca/wxgui/profilemanager.py:320
+msgid "Path"
+msgstr "Sti"
+
+#: ../pyhoca/wxgui/profilemanager.py:323
+#: ../pyhoca/wxgui/profilemanager.py:344
+msgid "Add"
+msgstr "Tilføj"
+
+#: ../pyhoca/wxgui/profilemanager.py:325
+msgid "Local Path"
+msgstr "Local Sti"
+
+#: ../pyhoca/wxgui/profilemanager.py:326
+msgid "Connect Method"
+msgstr "Forbindelsesmetode"
+
+#: ../pyhoca/wxgui/profilemanager.py:327
+msgid "Delete"
+msgstr "Slet"
+
+#: ../pyhoca/wxgui/profilemanager.py:329
+msgid "Convert between client and server encodings"
+msgstr "Konverter encoding mellem klient og server"
+
+#: ../pyhoca/wxgui/profilemanager.py:330
+msgid "Client encoding"
+msgstr "Klient encoding"
+
+#: ../pyhoca/wxgui/profilemanager.py:332
+msgid "Server encoding"
+msgstr "Server encoding"
+
+#: ../pyhoca/wxgui/profilemanager.py:335
+msgid "Use file MIME box for local file import"
+msgstr "Brug fil MIME box til lokal filimportering"
+
+#: ../pyhoca/wxgui/profilemanager.py:336
+msgid "Extensions"
+msgstr "Udvidelser"
+
+#: ../pyhoca/wxgui/profilemanager.py:338
+msgid "Action"
+msgstr "Handling"
+
+#: ../pyhoca/wxgui/profilemanager.py:341
+msgid "Client Side printing"
+msgstr "Klient udskrift"
+
+#: ../pyhoca/wxgui/profilemanager.py:345
+msgid "Defaults"
+msgstr "Standard"
+
+#: ../pyhoca/wxgui/profilemanager.py:347
+msgid "Save"
+msgstr "Gem"
+
+#: ../pyhoca/wxgui/profilemanager.py:348
+msgid "Reset"
+msgstr "Nulstil"
+
+#: ../pyhoca/wxgui/profilemanager.py:401
+#: ../pyhoca/wxgui/profilemanager.py:1124
+#: ../pyhoca/wxgui/profilemanager.py:2268
+msgid "automatically"
+msgstr "automatisk"
+
+#: ../pyhoca/wxgui/profilemanager.py:403
+#: ../pyhoca/wxgui/profilemanager.py:1126
+msgid "manually"
+msgstr "manuelt"
+
+#: ../pyhoca/wxgui/profilemanager.py:412
+msgid "PyHoca-GUI Profile Manager - new profile"
+msgstr "PyHoca-Gui Profilmanager - ny profil"
+
+#: ../pyhoca/wxgui/profilemanager.py:414
+#, python-format
+msgid "PyHoca-GUI Profile Manager - %s (connected)"
+msgstr "PyHoca-GUI Profilmanager - %s (forbundet)"
+
+#: ../pyhoca/wxgui/profilemanager.py:416
+#, python-format
+msgid "PyHoca-GUI Profile Manager - %s"
+msgstr "PyHoca-GUI Profilmanager - %s"
+
+#: ../pyhoca/wxgui/profilemanager.py:797
+msgid "Profile"
+msgstr "Profil"
+
+#: ../pyhoca/wxgui/profilemanager.py:798
+msgid "Session"
+msgstr "Session"
+
+#: ../pyhoca/wxgui/profilemanager.py:799
+msgid "Connection"
+msgstr "Forbindelse"
+
+#: ../pyhoca/wxgui/profilemanager.py:800
+msgid "Link Quality"
+msgstr "Link Kvalitet"
+
+#: ../pyhoca/wxgui/profilemanager.py:801
+msgid "Settings"
+msgstr "Indstillinger"
+
+#: ../pyhoca/wxgui/profilemanager.py:802
+msgid "Sharing"
+msgstr "Deling"
+
+#: ../pyhoca/wxgui/profilemanager.py:988
+msgid "<xkbtype>"
+msgstr "<xkbtype>"
+
+#: ../pyhoca/wxgui/profilemanager.py:989
+msgid "<xkblayout>"
+msgstr "<xkblayout>"
+
+#: ../pyhoca/wxgui/profilemanager.py:990
+msgid "<xkbvariant>"
+msgstr "<xkbvariant>"
+
+#: ../pyhoca/wxgui/profilemanager.py:1444
+msgid "Icon Files (*.png)|*.png|All files (*.*)|*"
+msgstr "Ikonfiler (*.png)|*.png|Alle filer (*.*)|*"
+
+#: ../pyhoca/wxgui/profilemanager.py:1447
+msgid "Choose an icon for this session profile"
+msgstr "Vælg et ikon til denne sessionsprofil"
+
+#: ../pyhoca/wxgui/profilemanager.py:1816
+msgid "All files (*.*)|*"
+msgstr "Alle Filer (*.*)|*"
+
+#: ../pyhoca/wxgui/profilemanager.py:1818
+#: ../pyhoca/wxgui/profilemanager.py:1842
+msgid "Choose a public SSH key"
+msgstr "Vælg offentlig SSH nøgle"
+
+#: ../pyhoca/wxgui/profilemanager.py:2220
+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
+msgid "Profile Manager"
+msgstr "Profilmanager"
+
+#: ../pyhoca/wxgui/profilemanager.py:2348
+msgid "Profile name is missing, profile unusable!!!"
+msgstr "Profilnavnet mangler, profilen er ubrugelig!"
+
+#: ../pyhoca/wxgui/profilemanager.py:2351
+#: ../pyhoca/wxgui/profilemanager.py:2354
+#, 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
+#, python-format
+msgid "%s - profile added"
+msgstr "%s - profil tilføjet"
+
+#: ../pyhoca/wxgui/profilemanager.py:2397
+msgid "A new session profile has been added."
+msgstr "A ny sessionsprofil er blevet tilføjet"
+
+#: ../pyhoca/wxgui/profilemanager.py:2401
+#, python-format
+msgid "%s - modified"
+msgstr "%s - modificeret"
+
+#: ../pyhoca/wxgui/profilemanager.py:2402
+msgid "Changes to profile have been saved."
+msgstr "Ændringerne i profilen er blevet gemt"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:74
+msgid "Edit Profile"
+msgstr "Rediger Profil"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:77
+msgid "Use as Template for New Profile"
+msgstr "Brug som Skabelon til Ny Profil"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:78
+msgid "Delete Profile"
+msgstr "Slet Profil"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:106
+#, python-format
+msgid "About %s (%s)..."
+msgstr "Om %s (%s)"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:132
+msgid "Manage Session Profile"
+msgstr "HÃ¥ndter Sessionsprofil"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:141
+msgid "Printing Preferences"
+msgstr "Printerindstillinger"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:147
+msgid "Client Options"
+msgstr "Klientparamentre"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:155
+#: ../pyhoca/wxgui/menus_taskbar.py:783
+#: ../pyhoca/wxgui/menus_taskbar.py:975
+msgid "E&xit"
+msgstr "E&xit"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:227
+msgid "Window title"
+msgstr "Vinduestitel"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:233
+#: ../pyhoca/wxgui/menus_taskbar.py:608
+msgid "Resume Session"
+msgstr "Fortsæt Session"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:235
+msgid "Resume Session (not possible)"
+msgstr "Fortsæt Session (ikke muligt)"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:246
+msgid "Transfer Session"
+msgstr "Overfør Session"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:248
+msgid "Transfer Session (not possible)"
+msgstr "Overfør Session (ikke muligt)"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:252
+#: ../pyhoca/wxgui/menus_taskbar.py:599
+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
+msgid "Suspend Session (and disconnect)"
+msgstr "Suspendér Session (og afbryd forbindelse)"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:256
+#: ../pyhoca/wxgui/menus_taskbar.py:603
+msgid "Suspend Session"
+msgstr "Suspendér Session"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:262
+#: ../pyhoca/wxgui/menus_taskbar.py:612
+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
+msgid "Terminate Session (and disconnect)"
+msgstr "Terminér Session (og afbryd forbindelse)"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:266
+#: ../pyhoca/wxgui/menus_taskbar.py:616
+msgid "Terminate Session"
+msgstr "Terminér Session"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:270
+#: ../pyhoca/wxgui/menus_taskbar.py:596
+msgid "Refresh menu tree"
+msgstr "Opfrisk menu"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:279
+msgid "Rename Session Window"
+msgstr "Omdøb Sessionsvindue"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:280
+msgid "Show Session Window"
+msgstr "Vis Sessionsvindue"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:322
+msgid "&Share custom local folder"
+msgstr "&Del tilpasset lokal mappe"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:337
+msgid "Share:"
+msgstr "Del:"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:346
+msgid "Unshare:"
+msgstr "Afbryd Deling:"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:354
+msgid "Unshare &all local folders"
+msgstr "Afbryd deling af &alle lokale mapper"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:360
+msgid "Restore shares in next session"
+msgstr "Genopret delemapper i næste session"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:440
+msgid "Multimedia"
+msgstr "Multimedie"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:441
+msgid "Development"
+msgstr "Udvikling"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:442
+msgid "Education"
+msgstr "Undervisning"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:443
+msgid "Games"
+msgstr "Spil"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:444
+msgid "Graphics"
+msgstr "Grafik"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:445
+msgid "Internet"
+msgstr "Internet"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:446
+msgid "Office Applications"
+msgstr "Kontorprogrammer"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:447
+msgid "System"
+msgstr "System"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:448
+msgid "Utilities"
+msgstr "Værktøjer"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:449
+msgid "Other Applications"
+msgstr "Andre Programmer"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:521
+#: ../pyhoca/wxgui/menus_taskbar.py:533
+#, python-format
+msgid "Connect %s"
+msgstr "Forbind %s"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:527
+msgid "Currently connecting..."
+msgstr "Forbinder..."
+
+#: ../pyhoca/wxgui/menus_taskbar.py:541
+msgid "Start &new Desktop Session"
+msgstr "Start &ny Skrivebordssession"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:546
+#: ../pyhoca/wxgui/menus_taskbar.py:684
+msgid "Retrieving Application Menu..."
+msgstr "Henter Applikationsmenu"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:550
+#: ../pyhoca/wxgui/menus_taskbar.py:687
+msgid "Retrieve Application Menu"
+msgstr "Hent Applikationsmenu"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:553
+msgid "Start &new Session"
+msgstr "Start &ny Session"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:633
+msgid "Launch Single Application"
+msgstr "Start en enkelt Applikation"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:671
+msgid "Manage Application Menu"
+msgstr "HÃ¥ndter Applikationsmenu"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:714
+msgid "Running"
+msgstr "Kører"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:716
+msgid "Suspended"
+msgstr "Suspenderet"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:735
+msgid "&Clean all sessions"
+msgstr "&Rens alle sessioner"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:741
+msgid "Customize &profile"
+msgstr "Tilpas &profil"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:756
+msgid "Shared &folders"
+msgstr "Delte &mapper"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:768
+msgid "&Disconnect from Server"
+msgstr "&Afbryd forbindelse til Server"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:775
+msgid "Suspend Session and E&xit application"
+msgstr "Suspendér Session og L&uk applikation"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:779
+msgid "Disconnect and E&xit application"
+msgstr "Afbryd forbindese og L&uk programmet"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:833
+msgid "Add Profile"
+msgstr "Tilføj Profil"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:909
+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:945
+msgid "Connect Server"
+msgstr "Forbind Server"
+
+#: ../pyhoca/wxgui/about.py:78
+#: ../pyhoca/wxgui/about.py:80
+#, python-format
+msgid "About %s ..."
+msgstr "Om %s"
+
+#: ../pyhoca/wxgui/frontend.py:459
+msgid "Suspending sessions and exiting application..."
+msgstr "Suspenderer sessioner og lukker programmet"
+
+#: ../pyhoca/wxgui/frontend.py:462
+#, python-format
+msgid "Disconnecting %s and exiting application..."
+msgstr "Afbryder forbindelsen %s og lukker programmet"
+
+#: ../pyhoca/wxgui/frontend.py:464
+msgid "Exiting application..."
+msgstr "Lukker programmet..."
+
+#: ../pyhoca/wxgui/frontend.py:562
+#, python-format
+msgid "%s - server warning"
+msgstr "%s - serveradvarsel"
+
+#: ../pyhoca/wxgui/frontend.py:562
+msgid "The X2Go Server does not publish an application menu."
+msgstr "X2Go serveren udgiver ikke en applikationsmenu"
+
+#: ../pyhoca/wxgui/frontend.py:613
+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:671
+#, python-format
+msgid "%s - EOF error"
+msgstr "%s - EOF fejl"
+
+#: ../pyhoca/wxgui/frontend.py:671
+msgid "Authentication protocol communication incomplete! Try again..."
+msgstr "Autentifikationsprotokollens kommunikation er ukomplet! Prøv igen..."
+
+#: ../pyhoca/wxgui/frontend.py:678
+#, python-format
+msgid "%s - auth key error"
+msgstr "%s - auth nøglefejl"
+
+#: ../pyhoca/wxgui/frontend.py:699
+msgid "An unknown error occurred during authentication!"
+msgstr "Der opstod en ukendt fejl under autentificeringen!"
+
+#: ../pyhoca/wxgui/frontend.py:728
+#, python-format
+msgid "%s: DirectRDP not supported yet"
+msgstr "%s: DirektRDP er ikke undersøttet endnu"
+
+#: ../pyhoca/wxgui/frontend.py:729
+#, python-format
+msgid ""
+"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)."
+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)."
+
+#: ../pyhoca/wxgui/frontend.py:741
+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
+#, python-format
+msgid "%s - session warning"
+msgstr "%s - sessionsadvarsel"
+
+#: ../pyhoca/wxgui/frontend.py:798
+#, python-format
+msgid "Execution of command ,,%s'' failed."
+msgstr "Eksekvering af kommandoen ,,%s'' fejlede"
+
+#: ../pyhoca/wxgui/frontend.py:939
+msgid "Cleaning X2Go sessions..."
+msgstr "Renser X2Go sessioner..."
+
+#: ../pyhoca/wxgui/frontend.py:974
+#, python-format
+msgid "%s - disconnect"
+msgstr "%s - afbryd forbindelse"
+
+#: ../pyhoca/wxgui/frontend.py:974
+msgid "X2Go Profile is now disconnected."
+msgstr "X2Go Profil er nu afbrudt"
+
+#: ../pyhoca/wxgui/frontend.py:995
+msgid "New Session Profile"
+msgstr "Ny Sessionsprofil"
+
+#: ../pyhoca/wxgui/frontend.py:1047
+#, python-format
+msgid "Really Delete Session Profile ,,%s''?"
+msgstr "Er du sikker på at du vil slette Sessionsprofilen ,,%s''?"
+
+#: ../pyhoca/wxgui/frontend.py:1053
+#, python-format
+msgid "%s - profile deleted"
+msgstr "%s - profil slettet"
+
+#: ../pyhoca/wxgui/frontend.py:1053
+msgid "The session profile has been deleted."
+msgstr "Sessionsprofilen er blevet slettet"
+
+#: ../pyhoca/wxgui/frontend.py:1071
+#, 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
+#, python-format
+msgid ""
+"The authenticity of host [%s]:%s can't be established.\n"
+"%s key fingerprint is ,,%s''.\n"
+"\n"
+"Are you sure you want to continue connecting?"
+msgstr ""
+"The authenticity of host [%s]:%s can't be established.\n"
+"%s key fingerprint is ,,%s''.\n"
+"\n"
+"Are you sure you want to continue connecting?"
+
+#: ../pyhoca/wxgui/frontend.py:1232
+#, python-format
+msgid "%s: Confirm Host Authorization"
+msgstr "%s: Bekræft Værtsautorisering"
+
+#: ../pyhoca/wxgui/frontend.py:1277
+#, python-format
+msgid "%s - channel error"
+msgstr "%s - kanalfejl"
+
+#: ../pyhoca/wxgui/frontend.py:1277
+#, 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..."
+
+#: ../pyhoca/wxgui/frontend.py:1295
+#: ../pyhoca/wxgui/frontend.py:1313
+#: ../pyhoca/wxgui/frontend.py:1315
+#: ../pyhoca/wxgui/frontend.py:1351
+#, python-format
+msgid "%s - session failure"
+msgstr "%s - sessionen fejlede"
+
+#: ../pyhoca/wxgui/frontend.py:1295
+msgid "The session startup failed."
+msgstr "Sessionsopstarten fejlede"
+
+#: ../pyhoca/wxgui/frontend.py:1313
+#, 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
+#, python-format
+msgid ""
+"The command ,,%s'' is not available on X2Go server\n"
+"%s."
+msgstr ""
+"Kommandoen ,,%s'' er ikke tilgængelig på X2Go server\n"
+"%s."
+
+#: ../pyhoca/wxgui/frontend.py:1332
+#, 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"
+
+#: ../pyhoca/wxgui/frontend.py:1351
+#, 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."
+
+#: ../pyhoca/wxgui/frontend.py:1370
+#, 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:1377
+#: ../pyhoca/wxgui/frontend.py:1384
+#, python-format
+msgid "%s - audio error"
+msgstr "%s - lydfejl"
+
+#: ../pyhoca/wxgui/frontend.py:1377
+msgid "The X2Go PulseAudio system could not be started."
+msgstr "X2Go PulseAudio systemet kunne ikke startes"
+
+#: ../pyhoca/wxgui/frontend.py:1384
+msgid "The X2Go PulseAudio system has died unexpectedly."
+msgstr "X2Go PulseAudio systemet døde uforventet"
+
+#: ../pyhoca/wxgui/frontend.py:1396
+#, python-format
+msgid "%s - audio problem"
+msgstr "%s - lydproblem"
+
+#: ../pyhoca/wxgui/frontend.py:1396
+#, python-format
+msgid ""
+"The audio connection could not be set up for this session.\n"
+"%s"
+msgstr ""
+"Lydforbindelsen kunne ikke opsættes for denne session.\n"
+"%s"
+
+#: ../pyhoca/wxgui/frontend.py:1408
+#, python-format
+msgid "%s - client-side printing not available"
+msgstr "%s - klient-udskrift ikke tilgængeligt"
+
+#: ../pyhoca/wxgui/frontend.py:1408
+#, python-format
+msgid ""
+"The server denies client-side printing from within this session.\n"
+"%s"
+msgstr ""
+"Serveren nægter klient-udskrift fra denne session.\n"
+"%s"
+
+#: ../pyhoca/wxgui/frontend.py:1420
+#, python-format
+msgid "%s - MIME box not available"
+msgstr "%s - MIME box ikke tilgængelig"
+
+#: ../pyhoca/wxgui/frontend.py:1420
+#, python-format
+msgid ""
+"The server does not support the X2Go MIME box.\n"
+"%s"
+msgstr ""
+"Serveren undersøtter ikke X2Go MIME boxen.\n"
+"%s"
+
+#: ../pyhoca/wxgui/frontend.py:1432
+#, python-format
+msgid "%s - client-side folders not sharable"
+msgstr "%s - klientmapper ikke delbare"
+
+#: ../pyhoca/wxgui/frontend.py:1432
+#, python-format
+msgid ""
+"The server denies client-side folder sharing with this session.\n"
+"%s"
+msgstr ""
+"Serveren nægter klientmappe-deling i denne session.\n"
+"%s"
+
+#: ../pyhoca/wxgui/frontend.py:1444
+#, python-format
+msgid "%s - client resources not sharable"
+msgstr "%s - klientressourcer ikke delbare"
+
+#: ../pyhoca/wxgui/frontend.py:1444
+#, python-format
+msgid ""
+"Client-side folders and printers cannot be shared with this session.\n"
+"%s"
+msgstr ""
+"Klientprintere og mapper kan ikke deles i denne session.\n"
+"%s"
+
+#: ../pyhoca/wxgui/frontend.py:1463
+#: ../pyhoca/wxgui/frontend.py:1465
+#, python-format
+msgid "%s - print error"
+msgstr "%s - printerfejl"
+
+#: ../pyhoca/wxgui/frontend.py:1463
+#, python-format
+msgid ""
+"%s\n"
+"...caused on printer %s by session\n"
+"%s"
+msgstr ""
+"%s\n"
+"... fejlede på printer %s pga. session\n"
+"%s"
+
+#: ../pyhoca/wxgui/frontend.py:1465
+#, python-format
+msgid ""
+"%s\n"
+"...caused by session\n"
+"%s"
+msgstr ""
+"%s\n"
+"...skyldes session\n"
+"%s"
+
+#: ../pyhoca/wxgui/frontend.py:1480
+#: ../pyhoca/wxgui/frontend.py:1495
+#, python-format
+msgid "%s - start"
+msgstr "%s - start"
+
+#: ../pyhoca/wxgui/frontend.py:1480
+#, python-format
+msgid ""
+"New X2Go session starting up...\n"
+"%s"
+msgstr ""
+"Ny X2Go session starter...\n"
+"%s"
+
+#: ../pyhoca/wxgui/frontend.py:1495
+#, python-format
+msgid ""
+"Another client started X2Go session\n"
+"%s"
+msgstr ""
+"En anden klient startede X2Go session\n"
+"%s"
+
+#: ../pyhoca/wxgui/frontend.py:1510
+#: ../pyhoca/wxgui/frontend.py:1525
+#, python-format
+msgid "%s - resume"
+msgstr "%s - fortsæt"
+
+#: ../pyhoca/wxgui/frontend.py:1510
+#, python-format
+msgid ""
+"Resuming X2Go session...\n"
+"%s"
+msgstr ""
+"Genoptager X2Go session...\n"
+"%s"
+
+#: ../pyhoca/wxgui/frontend.py:1525
+#, python-format
+msgid ""
+"Another client resumed X2Go session\n"
+"%s"
+msgstr ""
+"En anden klient genoptog X2Go session\n"
+"%s"
+
+#: ../pyhoca/wxgui/frontend.py:1540
+#, python-format
+msgid "%s - running"
+msgstr "%s - kører"
+
+#: ../pyhoca/wxgui/frontend.py:1540
+#, python-format
+msgid ""
+"Found already running session\n"
+"%s"
+msgstr ""
+"Fandt igangværende session\n"
+"%s"
+
+#: ../pyhoca/wxgui/frontend.py:1560
+#, python-format
+msgid "%s - suspend"
+msgstr "%s - suspender"
+
+#: ../pyhoca/wxgui/frontend.py:1560
+#, python-format
+msgid ""
+"X2Go Session has been suspended\n"
+"%s"
+msgstr ""
+"X2Go session er blevet suspenderet\n"
+"%s"
+
+#: ../pyhoca/wxgui/frontend.py:1587
+#, python-format
+msgid "%s - terminate"
+msgstr "%s - terminer"
+
+#: ../pyhoca/wxgui/frontend.py:1587
+#, python-format
+msgid ""
+"X2Go Session has terminated\n"
+"%s"
+msgstr ""
+"X2Go session er blevet termineret\n"
+"%s"
+
+#: ../pyhoca/wxgui/messages.py:73
+#, python-format
+msgid ""
+"Are you really sure you want to\n"
+"delete the session profile ,,%s''?"
+msgstr ""
+"Er du sikke rpå at du vil \n"
+"slette sessionsprofilen ,,%s''?"
+
+#: ../pyhoca/wxgui/messages.py:74
+#, python-format
+msgid ""
+"PyHoca-GUI is already running for user ,,%s''!\n"
+"\n"
+"Only one instance of PyHoca-GUI can be started per\n"
+"user. The PyHoca-GUI icon can be found in your desktops's\n"
+"notification area/systray."
+msgstr ""
+"PyHoca-GUI kører i forvejen for bruger ,,%s''!\n"
+"\n"
+"Der kan kun startes én instans af Pyhoca-GUI per\n"
+"bruger. PyHoca-GUI ikonet kan findes i dit skrivebord's\n"
+"notifikationsområde/systray"
+
+#: ../pyhoca/wxgui/messages.py:107
+msgid "Yes"
+msgstr "Ja"
+
+#: ../pyhoca/wxgui/messages.py:108
+msgid "No"
+msgstr "Nej"
+
+#: ../pyhoca/wxgui/messages.py:125
+#: ../pyhoca/wxgui/printingprefs.py:142
+msgid "Ok"
+msgstr "Ok"
+
+#: ../pyhoca/wxgui/printingprefs.py:66
+#, python-format
+msgid "%s - Printing Preferences"
+msgstr "%s - Udskriver Preferencer"
+
+#: ../pyhoca/wxgui/printingprefs.py:68
+#, python-format
+msgid "%s - Incoming Print Job from  %s (%s)"
+msgstr "%s - Indkommende Udskriftsjob fra %s (%s)"
+
+#: ../pyhoca/wxgui/printingprefs.py:73
+msgid "Open this dialog window"
+msgstr "Ã…ben dette dialogvindue"
+
+#: ../pyhoca/wxgui/printingprefs.py:74
+msgid "Open with PDF viewer"
+msgstr "Ã…ben med PDF fremviser"
+
+#: ../pyhoca/wxgui/printingprefs.py:75
+msgid "Save to a local folder"
+msgstr "Gem til lokal mappe"
+
+#: ../pyhoca/wxgui/printingprefs.py:76
+msgid "Print to a local printer"
+msgstr "Udskriv til lokal printer"
+
+#: ../pyhoca/wxgui/printingprefs.py:77
+msgid "Run custom print command"
+msgstr "Kør tilpasset udskriftskommando"
+
+#: ../pyhoca/wxgui/printingprefs.py:80
+msgid "<Select a print action here>"
+msgstr "<Vælg en udskriftshandling her>"
+
+#: ../pyhoca/wxgui/printingprefs.py:114
+msgid "Print action"
+msgstr "Udskriftshandling"
+
+#: ../pyhoca/wxgui/printingprefs.py:116
+msgid "Default action for incoming print jobs"
+msgstr "Standardhandling for inkommende udskriftsjobs"
+
+#. widgets for print action PDFVIEW
+#: ../pyhoca/wxgui/printingprefs.py:120
+msgid "PDF viewer command"
+msgstr "PDF fremviser kommando"
+
+#. widgets for print action PDFSAVE
+#: ../pyhoca/wxgui/printingprefs.py:127
+msgid "Save PDFs to folder"
+msgstr "Gem PDF-filer til mappe"
+
+#. widgets for print action PRINT
+#: ../pyhoca/wxgui/printingprefs.py:134
+msgid "Use this printer"
+msgstr "Brug denne printer"
+
+#. widgets for print action PRINTCMD
+#: ../pyhoca/wxgui/printingprefs.py:138
+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"
+
+#: ../pyhoca/wxgui/printingprefs.py:249
+msgid "- no printers installed -"
+msgstr "- ingen printere installeret -"
+
+#: ../pyhoca/wxgui/printingprefs.py:254
+msgid "- print system is not available -"
+msgstr "- udskriftssystem er ikke tilgængeligt"
+
+#: ../pyhoca/wxgui/printingprefs.py:407
+msgid "Choose PDF viewer application"
+msgstr "Vælg PDF fremviser"
+
+#: ../pyhoca/wxgui/printingprefs.py:430
+msgid "Choose PDF saving location"
+msgstr "Vælg lokation for gemte PDF-filer"
+
+#: ../pyhoca/wxgui/sessiontitle.py:79
+#, python-format
+msgid "Session Title - %s"
+msgstr "Sessionstiel -%s"
+
+#: ../pyhoca/wxgui/sessiontitle.py:81
+msgid "Change session title to"
+msgstr "Skift sessionsitel til"
+
+#: ../pyhoca/wxgui/sessiontitle.py:83
+msgid "OK"
+msgstr "OK"
+
+#, fuzzy
+#~ msgid "Remember shared folders"
+#~ msgstr "Delte &mapper"
diff --git a/po/de.po b/po/de.po
index 5338d8a..3ee236d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PyHoca-GUI VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-10 21:18+0200\n"
-"PO-Revision-Date: 2012-05-31 22:04+0100\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"
-"Language-Team: de <mike.gabriel at das-netzwerkteam.de>\n"
+"Language-Team: X2Go i18n <x2go-i18n at lists.berlios.de>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,130 +20,130 @@ msgstr ""
 "X-Poedit-Country: GERMANY\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../pyhoca/wxgui/logon.py:92
+#: ../pyhoca/wxgui/logon.py:86
 #, python-format
 msgid "%s (via %s)"
 msgstr "%s (via %s)"
 
-#: ../pyhoca/wxgui/logon.py:96 ../pyhoca/wxgui/logon.py:108
+#: ../pyhoca/wxgui/logon.py:90 ../pyhoca/wxgui/logon.py:102
 msgid "Username"
 msgstr "Benutzername"
 
-#: ../pyhoca/wxgui/logon.py:98 ../pyhoca/wxgui/logon.py:110
+#: ../pyhoca/wxgui/logon.py:92 ../pyhoca/wxgui/logon.py:104
 msgid "Password"
 msgstr "Kennwort"
 
-#: ../pyhoca/wxgui/logon.py:101
+#: ../pyhoca/wxgui/logon.py:95
 msgid "Authenticate"
 msgstr "Anmelden"
 
-#: ../pyhoca/wxgui/logon.py:113
+#: ../pyhoca/wxgui/logon.py:107
 msgid "  Start SSH tunnel  "
 msgstr "SSH Tunnel aufbauen"
 
-#: ../pyhoca/wxgui/logon.py:121
+#: ../pyhoca/wxgui/logon.py:115
 msgid "Session login"
 msgstr "Sitzungslogin"
 
-#: ../pyhoca/wxgui/logon.py:122
+#: ../pyhoca/wxgui/logon.py:116
 msgid "SSH proxy server login"
 msgstr "Anmeldung an SSH Proxy"
 
-#: ../pyhoca/wxgui/logon.py:133 ../pyhoca/wxgui/profilemanager.py:322
-#: ../pyhoca/wxgui/messages.py:132 ../pyhoca/wxgui/printingprefs.py:147
+#: ../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
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ../pyhoca/wxgui/logon.py:292 ../pyhoca/wxgui/logon.py:334
-#: ../pyhoca/wxgui/frontend.py:603
+#: ../pyhoca/wxgui/logon.py:297 ../pyhoca/wxgui/logon.py:339
+#: ../pyhoca/wxgui/frontend.py:606
 #, python-format
 msgid "%s - connect failure"
 msgstr "%s - Verbindung fehlgeschlagen"
 
-#: ../pyhoca/wxgui/logon.py:293 ../pyhoca/wxgui/frontend.py:603
+#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:606
 msgid "User is not allowed to start X2Go sessions!"
 msgstr "Benutzer darf keine X2Go Sitzungen starten!"
 
-#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:610
+#: ../pyhoca/wxgui/logon.py:303 ../pyhoca/wxgui/frontend.py:613
 #, python-format
 msgid "%s - connect"
 msgstr "%s - verbinden"
 
-#: ../pyhoca/wxgui/logon.py:299
+#: ../pyhoca/wxgui/logon.py:304
 msgid "Authentication has been successful."
 msgstr "Anmeldung war erfolgreich."
 
-#: ../pyhoca/wxgui/logon.py:330
+#: ../pyhoca/wxgui/logon.py:335
 msgid "SSH tunnel started"
 msgstr "SSH Tunnel gestartet"
 
-#: ../pyhoca/wxgui/logon.py:335
+#: ../pyhoca/wxgui/logon.py:340
 msgid "Authentication failed!"
 msgstr "Anmeldung fehlgeschlagen!"
 
-#: ../pyhoca/wxgui/logon.py:342
+#: ../pyhoca/wxgui/logon.py:348
 #, python-format
 msgid "%s - SSH proxy"
 msgstr "%s - SSH Proxy"
 
-#: ../pyhoca/wxgui/logon.py:343
+#: ../pyhoca/wxgui/logon.py:349
 msgid "Authentication to the SSH proxy server failed!"
 msgstr "Anmeldung am SSH Proxy Server ist fehlgeschlagen"
 
-#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:658
+#: ../pyhoca/wxgui/logon.py:376 ../pyhoca/wxgui/frontend.py:664
 #, python-format
 msgid "%s - socket error"
 msgstr "%s - Socket-Fehler"
 
-#: ../pyhoca/wxgui/logon.py:372 ../pyhoca/wxgui/frontend.py:637
-#: ../pyhoca/wxgui/frontend.py:644
+#: ../pyhoca/wxgui/logon.py:383 ../pyhoca/wxgui/frontend.py:643
+#: ../pyhoca/wxgui/frontend.py:650
 #, python-format
 msgid "%s - host key error"
 msgstr "%s - ungültiger Server-Schlüssel"
 
-#: ../pyhoca/wxgui/logon.py:373 ../pyhoca/wxgui/frontend.py:637
+#: ../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 ""
 "Der Host-Schlüssel des X2Go Servers ist ungültig oder wurde vom Benutzer "
 "nicht akzeptiert"
 
-#: ../pyhoca/wxgui/logon.py:380 ../pyhoca/wxgui/frontend.py:679
+#: ../pyhoca/wxgui/logon.py:391 ../pyhoca/wxgui/frontend.py:685
 #, python-format
 msgid "%s - missing home directory"
 msgstr "%s - Benutzerverzeichnis nicht vorhanden"
 
-#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:679
+#: ../pyhoca/wxgui/logon.py:392 ../pyhoca/wxgui/frontend.py:685
 msgid "The remote user's home directory does not exist."
 msgstr ""
 "Das serverseitige Benutzerverzeichnis (HOME-Verzeichnis) existiert nicht."
 
-#: ../pyhoca/wxgui/logon.py:388
+#: ../pyhoca/wxgui/logon.py:399
 #, python-format
 msgid "%s - key error"
 msgstr "%s - ungültiger Schlüssel"
 
-#: ../pyhoca/wxgui/logon.py:396 ../pyhoca/wxgui/frontend.py:686
+#: ../pyhoca/wxgui/logon.py:407 ../pyhoca/wxgui/frontend.py:692
 #, python-format
 msgid "%s - auth error"
 msgstr "%s - Anmeldefehler"
 
-#: ../pyhoca/wxgui/logon.py:404 ../pyhoca/wxgui/frontend.py:630
+#: ../pyhoca/wxgui/logon.py:415 ../pyhoca/wxgui/frontend.py:636
 #, python-format
 msgid "%s - SSH error"
 msgstr "%s - SSH-Fehler"
 
-#: ../pyhoca/wxgui/logon.py:412
+#: ../pyhoca/wxgui/logon.py:423
 #, python-format
 msgid "%s - unknown error"
 msgstr "%s - unbekannter Fehler"
 
-#: ../pyhoca/wxgui/logon.py:413
+#: ../pyhoca/wxgui/logon.py:424
 msgid "An unknown error occured during authentication!"
 msgstr "Ein unbekannter Fehler ist während der Serveranmeldung aufgetreten!"
 
-#: ../pyhoca/wxgui/taskbar.py:92
+#: ../pyhoca/wxgui/taskbar.py:89
 #, python-format
 msgid ""
 "PyHoca-GUI\n"
@@ -152,7 +152,7 @@ msgstr ""
 "PyHoca-GUI\n"
 "Verbinde mit ,,%s''"
 
-#: ../pyhoca/wxgui/taskbar.py:96
+#: ../pyhoca/wxgui/taskbar.py:93
 #, python-format
 msgid ""
 "PyHoca-GUI (Python X2goClient)\n"
@@ -161,13 +161,13 @@ msgstr ""
 "PyHoca-GUI (Python X2goClient)\n"
 "Verbindungsaufbau zu X2Go Server ,,%s'' läuft"
 
-#: ../pyhoca/wxgui/taskbar.py:106
+#: ../pyhoca/wxgui/taskbar.py:103
 msgid ""
 "PyHoca-GUI\n"
 "Connecting you to X2Go..."
 msgstr "Verbinden mit X2Go Server..."
 
-#: ../pyhoca/wxgui/taskbar.py:110
+#: ../pyhoca/wxgui/taskbar.py:107
 msgid ""
 "PyHoca-GUI (Python X2goClient)\n"
 "Client for connecting you to a remote X2Go server"
@@ -175,282 +175,309 @@ msgstr ""
 "PyHoca-GUI (Python X2goClient)\n"
 "Verbindungen zu entferntem X2Go Server aufbauen"
 
-#: ../pyhoca/wxgui/profilemanager.py:82
+#: ../pyhoca/wxgui/profilemanager.py:79
 msgid "GNOME Desktop (GNOME)"
 msgstr "GNOME Desktop (GNOME)"
 
-#: ../pyhoca/wxgui/profilemanager.py:83
+#: ../pyhoca/wxgui/profilemanager.py:80
 msgid "K Desktop Environment (KDE)"
 msgstr "K Desktop Environment (KDE)"
 
-#: ../pyhoca/wxgui/profilemanager.py:84
+#: ../pyhoca/wxgui/profilemanager.py:81
 msgid "Lightweight X Desktop (LXDE)"
 msgstr "Lightweight X Desktop (LXDE)"
 
-#: ../pyhoca/wxgui/profilemanager.py:85
+#: ../pyhoca/wxgui/profilemanager.py:82
 msgid "Trinity X Desktop (KDE3-like)"
 msgstr "Trinity X Desktop (ähnlich KDE3)"
 
-#: ../pyhoca/wxgui/profilemanager.py:86
+#: ../pyhoca/wxgui/profilemanager.py:83
 msgid "Unity X Desktop Shell (UNITY)"
 msgstr "Unity X Desktop Umgebung (UNITY)"
 
-#: ../pyhoca/wxgui/profilemanager.py:87
-msgid "XFCE4 Desktop (XFCE4)"
-msgstr "XFCE4 Desktop (XFCE4)"
+#: ../pyhoca/wxgui/profilemanager.py:84
+msgid "XFCE Desktop (XFCE)"
+msgstr "XFCE Desktop (XFCE)"
 
-#: ../pyhoca/wxgui/profilemanager.py:88
+#: ../pyhoca/wxgui/profilemanager.py:85
 msgid "Published Applications"
 msgstr "Server-publizierte Anwendungen"
 
-#: ../pyhoca/wxgui/profilemanager.py:89
+#: ../pyhoca/wxgui/profilemanager.py:86
 msgid "Single Application"
 msgstr "Einzelne Anwendung"
 
-#: ../pyhoca/wxgui/profilemanager.py:90
+#: ../pyhoca/wxgui/profilemanager.py:87
 msgid "XDMCP Query"
 msgstr "XDMCP-Serveranfrage (Query)"
 
-#: ../pyhoca/wxgui/profilemanager.py:91
-msgid "Windows Terminal Server (RDP-proxy)"
-msgstr "Windows Terminalserver (RDP-proxy)"
+#: ../pyhoca/wxgui/profilemanager.py:88
+msgid "Windows Terminal Server (X2Go-proxied RDP)"
+msgstr "Windows Terminalserver (RDP via X2Go-Proxy)"
+
+#: ../pyhoca/wxgui/profilemanager.py:89
+msgid "Windows Terminal Server (Direct RDP)"
+msgstr "Windows Terminal Server (Direktes RDP)"
 
-#. 'DirectRDP': 'Windows Terminal Server (RDP-direct)',
-#: ../pyhoca/wxgui/profilemanager.py:93 ../pyhoca/wxgui/profilemanager.py:207
+#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/profilemanager.py:224
 msgid "Custom command"
 msgstr "Benutzerdef. Kommando"
 
-#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:398
+#: ../pyhoca/wxgui/profilemanager.py:95 ../pyhoca/wxgui/menus_taskbar.py:393
 msgid "Internet Browser"
 msgstr "Internetbrowser"
 
-#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:399
+#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:394
 msgid "Email Client"
 msgstr "E-Mail Programm"
 
-#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:400
+#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:395
 msgid "Office"
 msgstr "Büroprogramm (Office)"
 
-#: ../pyhoca/wxgui/profilemanager.py:99 ../pyhoca/wxgui/menus_taskbar.py:401
+#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:396
 msgid "Terminal"
 msgstr "Terminalkonsole"
 
-#: ../pyhoca/wxgui/profilemanager.py:113
+#: ../pyhoca/wxgui/profilemanager.py:116
 msgid "Open file with system's default application"
 msgstr "Mit Standardanwendung des Systems öffnen"
 
-#: ../pyhoca/wxgui/profilemanager.py:114
+#: ../pyhoca/wxgui/profilemanager.py:117
 msgid "Open application chooser dialog"
 msgstr "Auswahldialog öffnen, um Anwendung auszuwählen"
 
-#: ../pyhoca/wxgui/profilemanager.py:115
+#: ../pyhoca/wxgui/profilemanager.py:118
 msgid "Save incoming file as ..."
 msgstr "Eingehende Datei speichern unter ..."
 
-#: ../pyhoca/wxgui/profilemanager.py:143
+#: ../pyhoca/wxgui/profilemanager.py:146
 msgid "settings derived from "
 msgstr "Einstellungen übernommen von"
 
 #. boxes for all tabs
-#: ../pyhoca/wxgui/profilemanager.py:160
+#: ../pyhoca/wxgui/profilemanager.py:167
 msgid "Session Title"
 msgstr "Sitzungstitel"
 
-#: ../pyhoca/wxgui/profilemanager.py:161
+#: ../pyhoca/wxgui/profilemanager.py:168
 msgid "Session Window"
 msgstr "Sitzungsfenster"
 
-#: ../pyhoca/wxgui/profilemanager.py:162
+#: ../pyhoca/wxgui/profilemanager.py:169
 msgid "Session Startup"
 msgstr "Sitzungsstart"
 
-#: ../pyhoca/wxgui/profilemanager.py:163
+#: ../pyhoca/wxgui/profilemanager.py:170
 msgid "Server"
 msgstr "Server"
 
-#: ../pyhoca/wxgui/profilemanager.py:164
+#: ../pyhoca/wxgui/profilemanager.py:171
+msgid "Proxy"
+msgstr "Proxy"
+
+#: ../pyhoca/wxgui/profilemanager.py:172
 msgid "Connection Link Speed"
 msgstr "Verbindungsgeschwindigkeit"
 
-#: ../pyhoca/wxgui/profilemanager.py:165
+#: ../pyhoca/wxgui/profilemanager.py:173
 msgid "Compression"
 msgstr "Komprimierung"
 
-#: ../pyhoca/wxgui/profilemanager.py:166
+#: ../pyhoca/wxgui/profilemanager.py:174
 msgid "Display"
 msgstr "Anzeige"
 
-#: ../pyhoca/wxgui/profilemanager.py:167
+#: ../pyhoca/wxgui/profilemanager.py:175
 msgid "Keyboard"
 msgstr "Tastatur"
 
-#: ../pyhoca/wxgui/profilemanager.py:168
+#: ../pyhoca/wxgui/profilemanager.py:176
 msgid "Sound"
 msgstr "Audio"
 
-#: ../pyhoca/wxgui/profilemanager.py:169
+#: ../pyhoca/wxgui/profilemanager.py:177
 msgid "Printing"
 msgstr "Drucken"
 
-#: ../pyhoca/wxgui/profilemanager.py:170
+#: ../pyhoca/wxgui/profilemanager.py:178
 msgid "Folder Exports"
 msgstr "Ordnerfreigabe"
 
-#: ../pyhoca/wxgui/profilemanager.py:171
+#: ../pyhoca/wxgui/profilemanager.py:179
 msgid "File Import"
 msgstr "Dateiimport"
 
 #. ##
 #. ## widgets for the PROFILE tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:176
+#: ../pyhoca/wxgui/profilemanager.py:184
 msgid "Name"
 msgstr "Name"
 
-#: ../pyhoca/wxgui/profilemanager.py:183
+#: ../pyhoca/wxgui/profilemanager.py:191
 msgid "Set session window title"
 msgstr "Sitzungsfenstertitel setzen"
 
-#: ../pyhoca/wxgui/profilemanager.py:184
+#: ../pyhoca/wxgui/profilemanager.py:192
 msgid "Use a default session window title"
 msgstr "Standardtitel für Sitzungsfenster"
 
-#: ../pyhoca/wxgui/profilemanager.py:185
+#: ../pyhoca/wxgui/profilemanager.py:193
 msgid "Custom session window title"
 msgstr "Sitzungstitel anpassen"
 
-#: ../pyhoca/wxgui/profilemanager.py:195
+#: ../pyhoca/wxgui/profilemanager.py:212
 msgid "Window Icon"
 msgstr "Fenstersymbol"
 
 #. ##
 #. ## widgets for the SESSION tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:201
+#: ../pyhoca/wxgui/profilemanager.py:218
 msgid "Start session automatically after login"
 msgstr "Sitzung nach Anmeldung automatisch starten"
 
-#: ../pyhoca/wxgui/profilemanager.py:202
+#: ../pyhoca/wxgui/profilemanager.py:219
 #, python-format
 msgid "Login automatically after %s has started"
 msgstr "Automatisch anmelden nach %s Programmstart"
 
-#: ../pyhoca/wxgui/profilemanager.py:203
+#: ../pyhoca/wxgui/profilemanager.py:220
 msgid "Type"
 msgstr "Typ"
 
-#: ../pyhoca/wxgui/profilemanager.py:205
+#: ../pyhoca/wxgui/profilemanager.py:222
 msgid "Application"
 msgstr "Anwendung"
 
-#: ../pyhoca/wxgui/profilemanager.py:209
+#: ../pyhoca/wxgui/profilemanager.py:226
 msgid "XDMCP server"
 msgstr "XDMCP Server"
 
-#: ../pyhoca/wxgui/profilemanager.py:211
+#: ../pyhoca/wxgui/profilemanager.py:228
 msgid "RDP server"
 msgstr "RDP Server"
 
-#: ../pyhoca/wxgui/profilemanager.py:213
+#: ../pyhoca/wxgui/profilemanager.py:230
 msgid "RDP options"
 msgstr "RDP Optionen"
 
-#: ../pyhoca/wxgui/profilemanager.py:215
+#: ../pyhoca/wxgui/profilemanager.py:232
 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:216
+#: ../pyhoca/wxgui/profilemanager.py:233
 msgid "Menu of published applications"
 msgstr "Menü mit Server-publizierten Anwendungen"
 
 #. ##
 #. ## widgets for the CONNECTION tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:223 ../pyhoca/wxgui/profilemanager.py:233
+#: ../pyhoca/wxgui/profilemanager.py:240 ../pyhoca/wxgui/profilemanager.py:253
 msgid "User"
 msgstr "Benutzer"
 
-#: ../pyhoca/wxgui/profilemanager.py:225
+#: ../pyhoca/wxgui/profilemanager.py:242 ../pyhoca/wxgui/profilemanager.py:260
 msgid "Host"
 msgstr "Hostname"
 
-#: ../pyhoca/wxgui/profilemanager.py:227
+#: ../pyhoca/wxgui/profilemanager.py:244 ../pyhoca/wxgui/profilemanager.py:262
 msgid "Port"
 msgstr "Port"
 
-#: ../pyhoca/wxgui/profilemanager.py:229
-msgid "RSA/DSA private key"
-msgstr "Privater RSA/DSA Schlüssel"
+#: ../pyhoca/wxgui/profilemanager.py:246
+msgid "Key"
+msgstr "Schlüssel"
+
+#: ../pyhoca/wxgui/profilemanager.py:249
+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:232
+#: ../pyhoca/wxgui/profilemanager.py:251
+msgid "Enable forwarding of SSH authentication agent connections"
+msgstr "Weiterleitung von SSH Agent Authentifizierungsanfragen"
+
+#: ../pyhoca/wxgui/profilemanager.py:252
 msgid "Server behind SSH proxy"
 msgstr "Server hinter SSH-Proxy"
 
-#: ../pyhoca/wxgui/profilemanager.py:235
+#: ../pyhoca/wxgui/profilemanager.py:255
+msgid "Use same username for X2Go and proxy host"
+msgstr "Verwende gleichen Anmeldenamen für X2Go Server und Proxy"
+
+#: ../pyhoca/wxgui/profilemanager.py:256
+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
 msgid "Key file"
 msgstr "Schlüssel"
 
-#: ../pyhoca/wxgui/profilemanager.py:238
-msgid "Host[:Port]"
-msgstr "Hostname[:Port]"
-
-#: ../pyhoca/wxgui/profilemanager.py:240
+#: ../pyhoca/wxgui/profilemanager.py:264
 msgid "SSH Proxy Tunnel"
 msgstr "SSH-Proxytunnel"
 
-#: ../pyhoca/wxgui/profilemanager.py:248
+#: ../pyhoca/wxgui/profilemanager.py:270
+msgid "Discover SSH keys or use SSH agent for proxy authentication"
+msgstr "Find SSH Schlüssel oder verwende SSH Agent für Proxy-Anmeldung"
+
+#: ../pyhoca/wxgui/profilemanager.py:273
 msgid "Modem"
 msgstr "Modem"
 
-#: ../pyhoca/wxgui/profilemanager.py:249
+#: ../pyhoca/wxgui/profilemanager.py:274
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../pyhoca/wxgui/profilemanager.py:250
+#: ../pyhoca/wxgui/profilemanager.py:275
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../pyhoca/wxgui/profilemanager.py:251
+#: ../pyhoca/wxgui/profilemanager.py:276
 msgid "WAN"
 msgstr "WAN"
 
-#: ../pyhoca/wxgui/profilemanager.py:252
+#: ../pyhoca/wxgui/profilemanager.py:277
 msgid "LAN"
 msgstr "LAN"
 
-#: ../pyhoca/wxgui/profilemanager.py:254
+#: ../pyhoca/wxgui/profilemanager.py:279
 msgid "Method"
 msgstr "Methode"
 
-#: ../pyhoca/wxgui/profilemanager.py:256
+#: ../pyhoca/wxgui/profilemanager.py:281
 msgid "Image quality"
 msgstr "Bildqualität"
 
 #. ##
 #. ## wigdets for the SETTINGS tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:262
+#: ../pyhoca/wxgui/profilemanager.py:287
 msgid "Fullscreen"
 msgstr "Vollbild"
 
-#: ../pyhoca/wxgui/profilemanager.py:263
+#: ../pyhoca/wxgui/profilemanager.py:288
+msgid "Maximized"
+msgstr "Maximiert"
+
+#: ../pyhoca/wxgui/profilemanager.py:289
 msgid "Custom Size"
 msgstr "Benutzerdefinierte Größe"
 
-#: ../pyhoca/wxgui/profilemanager.py:268
+#: ../pyhoca/wxgui/profilemanager.py:294
 msgid "Set display DPI"
 msgstr "DPI-Wert für Anzeige setzen"
 
-#: ../pyhoca/wxgui/profilemanager.py:270
+#: ../pyhoca/wxgui/profilemanager.py:296
 msgid "Do not set (use server-side tools to configure the keyboard)"
 msgstr ""
-"Keine Einstellungen (zum Konfigurieren der Tastatur müssen Server seitige "
+"Keine Einstellungen (zum Konfigurieren der Tastatur müssen Server-seitige "
 "Tools verwendet werden)"
 
-#: ../pyhoca/wxgui/profilemanager.py:271
+#: ../pyhoca/wxgui/profilemanager.py:297
 msgid ""
 "Automatically detect and use client-side keyboard configuration inside the "
 "session"
@@ -458,214 +485,222 @@ msgstr ""
 "Tastaturkonfiguration dieses Computers automatisch erkennen und in der "
 "Sitzung verwenden"
 
-#: ../pyhoca/wxgui/profilemanager.py:272
+#: ../pyhoca/wxgui/profilemanager.py:298
 msgid "Use custom keyboard settings as provided below"
 msgstr "Tastatureinstellungen der Sitzung wie folgt anpassen"
 
-#: ../pyhoca/wxgui/profilemanager.py:273
+#: ../pyhoca/wxgui/profilemanager.py:299
 msgid "Keyboard model"
 msgstr "Tastaturmodell"
 
-#: ../pyhoca/wxgui/profilemanager.py:275
+#: ../pyhoca/wxgui/profilemanager.py:301
 msgid "Layout"
 msgstr "Layout"
 
-#: ../pyhoca/wxgui/profilemanager.py:277
+#: ../pyhoca/wxgui/profilemanager.py:303
 msgid "Layout variant"
 msgstr "Layoutvariante"
 
-#: ../pyhoca/wxgui/profilemanager.py:279
+#: ../pyhoca/wxgui/profilemanager.py:305
 msgid "Enable sound support"
 msgstr "Audiounterstützung aktivieren"
 
-#: ../pyhoca/wxgui/profilemanager.py:280
+#: ../pyhoca/wxgui/profilemanager.py:306
 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:284
+#: ../pyhoca/wxgui/profilemanager.py:310
 msgid "Arts (not supported)"
 msgstr "Arts (nicht unterstützt)"
 
-#: ../pyhoca/wxgui/profilemanager.py:287
+#: ../pyhoca/wxgui/profilemanager.py:313
 msgid "esd"
 msgstr "esd"
 
-#: ../pyhoca/wxgui/profilemanager.py:288
+#: ../pyhoca/wxgui/profilemanager.py:314
 msgid "Use default sound port"
 msgstr "Standard Audio-Port verwenden"
 
-#: ../pyhoca/wxgui/profilemanager.py:289
+#: ../pyhoca/wxgui/profilemanager.py:315
 msgid "Custom sound port"
 msgstr "Benutzerdefinierter Audio-Port"
 
-#: ../pyhoca/wxgui/profilemanager.py:291
-msgid "Client Side printing"
-msgstr "Unterstützung für lokale Druckeranbindung"
-
-#: ../pyhoca/wxgui/profilemanager.py:293
+#: ../pyhoca/wxgui/profilemanager.py:318
 msgid "Use local folder sharing"
 msgstr "Lokale Ordnerfreigabe verwenden"
 
-#: ../pyhoca/wxgui/profilemanager.py:294
+#: ../pyhoca/wxgui/profilemanager.py:319
+msgid "Store share list at end of session"
+msgstr "Freigabenliste nach Sitzungsende speichern"
+
+#: ../pyhoca/wxgui/profilemanager.py:320
 msgid "Path"
 msgstr "Pfad"
 
-#: ../pyhoca/wxgui/profilemanager.py:297 ../pyhoca/wxgui/profilemanager.py:316
+#: ../pyhoca/wxgui/profilemanager.py:323 ../pyhoca/wxgui/profilemanager.py:344
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: ../pyhoca/wxgui/profilemanager.py:299
+#: ../pyhoca/wxgui/profilemanager.py:325
 msgid "Local Path"
 msgstr "Lokaler Pfad"
 
-#: ../pyhoca/wxgui/profilemanager.py:300
+#: ../pyhoca/wxgui/profilemanager.py:326
 msgid "Connect Method"
 msgstr "Verbindungsart"
 
-#: ../pyhoca/wxgui/profilemanager.py:301
+#: ../pyhoca/wxgui/profilemanager.py:327
 msgid "Delete"
 msgstr "Entfernen"
 
-#: ../pyhoca/wxgui/profilemanager.py:303
+#: ../pyhoca/wxgui/profilemanager.py:329
 msgid "Convert between client and server encodings"
 msgstr "Zeichenkodierung zwischen Server und Client übersetzen"
 
-#: ../pyhoca/wxgui/profilemanager.py:304
+#: ../pyhoca/wxgui/profilemanager.py:330
 msgid "Client encoding"
 msgstr "Zeichenkodierung Client"
 
-#: ../pyhoca/wxgui/profilemanager.py:306
+#: ../pyhoca/wxgui/profilemanager.py:332
 msgid "Server encoding"
 msgstr "Server"
 
-#: ../pyhoca/wxgui/profilemanager.py:309
+#: ../pyhoca/wxgui/profilemanager.py:335
 msgid "Use file MIME box for local file import"
 msgstr "MIME-Box für lokalen Dateiimport verwenden"
 
-#: ../pyhoca/wxgui/profilemanager.py:310
+#: ../pyhoca/wxgui/profilemanager.py:336
 msgid "Extensions"
 msgstr "Erweiterungen"
 
-#: ../pyhoca/wxgui/profilemanager.py:312
+#: ../pyhoca/wxgui/profilemanager.py:338
 msgid "Action"
 msgstr "Aktion"
 
-#: ../pyhoca/wxgui/profilemanager.py:317
+#: ../pyhoca/wxgui/profilemanager.py:341
+msgid "Client Side printing"
+msgstr "Unterstützung für lokale Druckeranbindung"
+
+#: ../pyhoca/wxgui/profilemanager.py:345
 msgid "Defaults"
 msgstr "Standardwerte"
 
-#: ../pyhoca/wxgui/profilemanager.py:319
+#: ../pyhoca/wxgui/profilemanager.py:347
 msgid "Save"
 msgstr "Speichern"
 
-#: ../pyhoca/wxgui/profilemanager.py:320
+#: ../pyhoca/wxgui/profilemanager.py:348
 msgid "Reset"
 msgstr "Zurücksetzen"
 
-#: ../pyhoca/wxgui/profilemanager.py:365
-#: ../pyhoca/wxgui/profilemanager.py:1078
-#: ../pyhoca/wxgui/profilemanager.py:1832
+#: ../pyhoca/wxgui/profilemanager.py:401
+#: ../pyhoca/wxgui/profilemanager.py:1124
+#: ../pyhoca/wxgui/profilemanager.py:2268
 msgid "automatically"
 msgstr "automatisch"
 
-#: ../pyhoca/wxgui/profilemanager.py:367
-#: ../pyhoca/wxgui/profilemanager.py:1080
+#: ../pyhoca/wxgui/profilemanager.py:403
+#: ../pyhoca/wxgui/profilemanager.py:1126
 msgid "manually"
 msgstr "manuell"
 
-#: ../pyhoca/wxgui/profilemanager.py:376
+#: ../pyhoca/wxgui/profilemanager.py:412
 msgid "PyHoca-GUI Profile Manager - new profile"
 msgstr "PyHoca-GUI Profilmanager - neues Sitzungsprofil"
 
-#: ../pyhoca/wxgui/profilemanager.py:378
+#: ../pyhoca/wxgui/profilemanager.py:414
 #, python-format
 msgid "PyHoca-GUI Profile Manager - %s (connected)"
 msgstr "PyHoca-GUI Profilmanager - %s (verbunden)"
 
-#: ../pyhoca/wxgui/profilemanager.py:380
+#: ../pyhoca/wxgui/profilemanager.py:416
 #, python-format
 msgid "PyHoca-GUI Profile Manager - %s"
 msgstr "PyHoca-GUI Profilmanager - %s"
 
-#: ../pyhoca/wxgui/profilemanager.py:751
+#: ../pyhoca/wxgui/profilemanager.py:797
 msgid "Profile"
 msgstr "Profil"
 
-#: ../pyhoca/wxgui/profilemanager.py:752
+#: ../pyhoca/wxgui/profilemanager.py:798
 msgid "Session"
 msgstr "Sitzung"
 
-#: ../pyhoca/wxgui/profilemanager.py:753
+#: ../pyhoca/wxgui/profilemanager.py:799
 msgid "Connection"
 msgstr "Verbindung"
 
-#: ../pyhoca/wxgui/profilemanager.py:754
+#: ../pyhoca/wxgui/profilemanager.py:800
+msgid "Link Quality"
+msgstr "Verbindungsqualität"
+
+#: ../pyhoca/wxgui/profilemanager.py:801
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: ../pyhoca/wxgui/profilemanager.py:755
+#: ../pyhoca/wxgui/profilemanager.py:802
 msgid "Sharing"
-msgstr "Ordnerfreigabe"
+msgstr "Freigaben"
 
-#: ../pyhoca/wxgui/profilemanager.py:996
+#: ../pyhoca/wxgui/profilemanager.py:988
 msgid "<xkbtype>"
 msgstr "pc105/de"
 
-#: ../pyhoca/wxgui/profilemanager.py:997
+#: ../pyhoca/wxgui/profilemanager.py:989
 msgid "<xkblayout>"
 msgstr "de"
 
-#: ../pyhoca/wxgui/profilemanager.py:998
+#: ../pyhoca/wxgui/profilemanager.py:990
 msgid "<xkbvariant>"
 msgstr "nodeadkeys"
 
-#: ../pyhoca/wxgui/profilemanager.py:1284
+#: ../pyhoca/wxgui/profilemanager.py:1444
 msgid "Icon Files (*.png)|*.png|All files (*.*)|*"
 msgstr "Icon Dateien (*.png)|*.png|Alle Dateien (*.*)|*"
 
-#: ../pyhoca/wxgui/profilemanager.py:1287
+#: ../pyhoca/wxgui/profilemanager.py:1447
 msgid "Choose an icon for this session profile"
 msgstr "Sitzungs-Icon für dieses Sitzungsprofil auswählen"
 
-#: ../pyhoca/wxgui/profilemanager.py:1509
+#: ../pyhoca/wxgui/profilemanager.py:1816
 msgid "All files (*.*)|*"
 msgstr "Alle Dateien (*.*)|*"
 
-#: ../pyhoca/wxgui/profilemanager.py:1511
-#: ../pyhoca/wxgui/profilemanager.py:1533
+#: ../pyhoca/wxgui/profilemanager.py:1818
+#: ../pyhoca/wxgui/profilemanager.py:1842
 msgid "Choose a public SSH key"
 msgstr "Öffentlichen SSH-Schlüssel auswählen"
 
-#: ../pyhoca/wxgui/profilemanager.py:1784
+#: ../pyhoca/wxgui/profilemanager.py:2220
 msgid "Choose a folder to share within a session"
 msgstr "Ordner zur Freigabe für Sitzungen auswählen"
 
-#: ../pyhoca/wxgui/profilemanager.py:1912
-#: ../pyhoca/wxgui/profilemanager.py:1915
-#: ../pyhoca/wxgui/profilemanager.py:1918
-#: ../pyhoca/wxgui/profilemanager.py:1923
-#: ../pyhoca/wxgui/profilemanager.py:1933 ../pyhoca/wxgui/menus_taskbar.py:118
+#: ../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
 msgid "Profile Manager"
 msgstr "Profilmanager"
 
-#: ../pyhoca/wxgui/profilemanager.py:1912
+#: ../pyhoca/wxgui/profilemanager.py:2348
 msgid "Profile name is missing, profile unusable!!!"
 msgstr "Der Profilname fehlt, Profil so nicht verwendbar!!!"
 
-#: ../pyhoca/wxgui/profilemanager.py:1915
-#: ../pyhoca/wxgui/profilemanager.py:1918
+#: ../pyhoca/wxgui/profilemanager.py:2351
+#: ../pyhoca/wxgui/profilemanager.py:2354
 #, python-format
 msgid "Profile name %s already exists!!!"
 msgstr "Ein Sitzungsprofil mit dem Namen %s existiert bereits!!!"
 
-#: ../pyhoca/wxgui/profilemanager.py:1923
+#: ../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:1933
+#: ../pyhoca/wxgui/profilemanager.py:2369
 #, python-format
 msgid ""
 "Another session profile (%s) already uses [%s]:%s for binding a local SSH "
@@ -676,248 +711,252 @@ msgstr ""
 "einen lokalen SSH Proxy Port daran zu binden. Bitte die SSH Proxy "
 "Einstellungen entsprechend ändern."
 
-#: ../pyhoca/wxgui/profilemanager.py:1960
+#: ../pyhoca/wxgui/profilemanager.py:2396
 #, python-format
 msgid "%s - profile added"
 msgstr "%s - Profil hinzugefügt"
 
-#: ../pyhoca/wxgui/profilemanager.py:1961
+#: ../pyhoca/wxgui/profilemanager.py:2397
 msgid "A new session profile has been added."
 msgstr "Ein neues Sitzungsprofil wurde hinzugefügt."
 
-#: ../pyhoca/wxgui/profilemanager.py:1965
+#: ../pyhoca/wxgui/profilemanager.py:2401
 #, python-format
 msgid "%s - modified"
 msgstr "%s - modifiziert"
 
-#: ../pyhoca/wxgui/profilemanager.py:1966
+#: ../pyhoca/wxgui/profilemanager.py:2402
 msgid "Changes to profile have been saved."
 msgstr "Änderungen am Profil wurden übernommen."
 
-#: ../pyhoca/wxgui/menus_taskbar.py:75
+#: ../pyhoca/wxgui/menus_taskbar.py:74
 msgid "Edit Profile"
 msgstr "Sitzungsprofil bearbeiten"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:78
+#: ../pyhoca/wxgui/menus_taskbar.py:77
 msgid "Use as Template for New Profile"
 msgstr "Als Vorlage für neues Profil verwenden"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:79
+#: ../pyhoca/wxgui/menus_taskbar.py:78
 msgid "Delete Profile"
 msgstr "Sitzungsprofil löschen"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:107
+#: ../pyhoca/wxgui/menus_taskbar.py:106
 #, python-format
 msgid "About %s (%s)..."
 msgstr "Ãœber %s (%s) ..."
 
-#: ../pyhoca/wxgui/menus_taskbar.py:133
+#: ../pyhoca/wxgui/menus_taskbar.py:132
 msgid "Manage Session Profile"
 msgstr "Sitzungsprofil verwalten"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:142
+#: ../pyhoca/wxgui/menus_taskbar.py:141
 msgid "Printing Preferences"
 msgstr "Druckeinstellungen"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:148
+#: ../pyhoca/wxgui/menus_taskbar.py:147
 msgid "Client Options"
 msgstr "Optionen"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:156 ../pyhoca/wxgui/menus_taskbar.py:785
-#: ../pyhoca/wxgui/menus_taskbar.py:977
+#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:783
+#: ../pyhoca/wxgui/menus_taskbar.py:975
 msgid "E&xit"
 msgstr "&Beenden"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:228
+#: ../pyhoca/wxgui/menus_taskbar.py:227
 msgid "Window title"
 msgstr "Fenstertitel"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:234 ../pyhoca/wxgui/menus_taskbar.py:613
+#: ../pyhoca/wxgui/menus_taskbar.py:233 ../pyhoca/wxgui/menus_taskbar.py:608
 msgid "Resume Session"
 msgstr "Sitzung fortsetzen"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:236
+#: ../pyhoca/wxgui/menus_taskbar.py:235
 msgid "Resume Session (not possible)"
 msgstr "Sitzung fortsetzen (nicht möglich)"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:247
+#: ../pyhoca/wxgui/menus_taskbar.py:246
 msgid "Transfer Session"
 msgstr "Sitzung übernehmen"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:249
+#: ../pyhoca/wxgui/menus_taskbar.py:248
 msgid "Transfer Session (not possible)"
 msgstr "Sitzung übernehmen (nicht möglich)"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:253 ../pyhoca/wxgui/menus_taskbar.py:604
+#: ../pyhoca/wxgui/menus_taskbar.py:252 ../pyhoca/wxgui/menus_taskbar.py:599
 msgid "Suspend Session (and disconnect/exit)"
 msgstr "Sitzung anhalten (und Verbindung trenen / Anwendung beenden)"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:255 ../pyhoca/wxgui/menus_taskbar.py:606
+#: ../pyhoca/wxgui/menus_taskbar.py:254 ../pyhoca/wxgui/menus_taskbar.py:601
 msgid "Suspend Session (and disconnect)"
 msgstr "Sitzungen anhalten (und Verbindung trennen)"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:257 ../pyhoca/wxgui/menus_taskbar.py:608
+#: ../pyhoca/wxgui/menus_taskbar.py:256 ../pyhoca/wxgui/menus_taskbar.py:603
 msgid "Suspend Session"
 msgstr "Sitzung anhalten"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:263 ../pyhoca/wxgui/menus_taskbar.py:617
+#: ../pyhoca/wxgui/menus_taskbar.py:262 ../pyhoca/wxgui/menus_taskbar.py:612
 msgid "Terminate Session (and disconnect/exit)"
 msgstr "Sitzung beenden (und Verbindung trennen / Anwendung beenden)"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:265 ../pyhoca/wxgui/menus_taskbar.py:619
+#: ../pyhoca/wxgui/menus_taskbar.py:264 ../pyhoca/wxgui/menus_taskbar.py:614
 msgid "Terminate Session (and disconnect)"
 msgstr "Sitzung beenden (und Verbindung trennen)"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:267 ../pyhoca/wxgui/menus_taskbar.py:621
+#: ../pyhoca/wxgui/menus_taskbar.py:266 ../pyhoca/wxgui/menus_taskbar.py:616
 msgid "Terminate Session"
 msgstr "Sitzung beenden"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:271 ../pyhoca/wxgui/menus_taskbar.py:601
+#: ../pyhoca/wxgui/menus_taskbar.py:270 ../pyhoca/wxgui/menus_taskbar.py:596
 msgid "Refresh menu tree"
 msgstr "Menübaum aktualisieren"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:280
+#: ../pyhoca/wxgui/menus_taskbar.py:279
 msgid "Rename Session Window"
 msgstr "Sitzungsfenster umbenennen"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:281
+#: ../pyhoca/wxgui/menus_taskbar.py:280
 msgid "Show Session Window"
 msgstr "Sitzungsfenster anzeigen"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:321
+#: ../pyhoca/wxgui/menus_taskbar.py:322
 msgid "&Share custom local folder"
 msgstr "Lokalen Ordner für &Freigabe wählen"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:344
+#: ../pyhoca/wxgui/menus_taskbar.py:337
 msgid "Share:"
 msgstr "Freigeben:"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:355
+#: ../pyhoca/wxgui/menus_taskbar.py:346
 msgid "Unshare:"
 msgstr "Aushängen:"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:365
+#: ../pyhoca/wxgui/menus_taskbar.py:354
 msgid "Unshare &all local folders"
 msgstr "Alle aushängen"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:445
+#: ../pyhoca/wxgui/menus_taskbar.py:360
+msgid "Restore shares in next session"
+msgstr "Freigaben in nächster Sitzung wiederherstellen"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:440
 msgid "Multimedia"
 msgstr "Multimedia"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:446
+#: ../pyhoca/wxgui/menus_taskbar.py:441
 msgid "Development"
 msgstr "Entwicklung"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:447
+#: ../pyhoca/wxgui/menus_taskbar.py:442
 msgid "Education"
 msgstr "Bildung"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:448
+#: ../pyhoca/wxgui/menus_taskbar.py:443
 msgid "Games"
 msgstr "Spiele"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:449
+#: ../pyhoca/wxgui/menus_taskbar.py:444
 msgid "Graphics"
 msgstr "Grafik"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:450
+#: ../pyhoca/wxgui/menus_taskbar.py:445
 msgid "Internet"
 msgstr "Internet"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:451
+#: ../pyhoca/wxgui/menus_taskbar.py:446
 msgid "Office Applications"
 msgstr "Büroanwendungen"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:452
+#: ../pyhoca/wxgui/menus_taskbar.py:447
 msgid "System"
 msgstr "System"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:453
+#: ../pyhoca/wxgui/menus_taskbar.py:448
 msgid "Utilities"
-msgstr "Werkzeuge"
+msgstr "Dienstprogramme"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:454
+#: ../pyhoca/wxgui/menus_taskbar.py:449
 msgid "Other Applications"
 msgstr "Weitere Anwendungen"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:526 ../pyhoca/wxgui/menus_taskbar.py:538
+#: ../pyhoca/wxgui/menus_taskbar.py:521 ../pyhoca/wxgui/menus_taskbar.py:533
 #, python-format
 msgid "Connect %s"
 msgstr "Mit %s verbinden"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:532
+#: ../pyhoca/wxgui/menus_taskbar.py:527
 msgid "Currently connecting..."
 msgstr "Verbindung wird aufgebaut..."
 
-#: ../pyhoca/wxgui/menus_taskbar.py:546
+#: ../pyhoca/wxgui/menus_taskbar.py:541
 msgid "Start &new Desktop Session"
 msgstr "&Neue Desktopsitzung starten"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:551 ../pyhoca/wxgui/menus_taskbar.py:689
+#: ../pyhoca/wxgui/menus_taskbar.py:546 ../pyhoca/wxgui/menus_taskbar.py:684
 msgid "Retrieving Application Menu..."
 msgstr "Hole Anwendungsmenü..."
 
-#: ../pyhoca/wxgui/menus_taskbar.py:555 ../pyhoca/wxgui/menus_taskbar.py:692
+#: ../pyhoca/wxgui/menus_taskbar.py:550 ../pyhoca/wxgui/menus_taskbar.py:687
 msgid "Retrieve Application Menu"
 msgstr "Hole Anwendungsmenü"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:558
+#: ../pyhoca/wxgui/menus_taskbar.py:553
 msgid "Start &new Session"
 msgstr "&Neue Sitzung starten"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:638
+#: ../pyhoca/wxgui/menus_taskbar.py:633
 msgid "Launch Single Application"
 msgstr "Einzelne Anwendung starten"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:676
+#: ../pyhoca/wxgui/menus_taskbar.py:671
 msgid "Manage Application Menu"
 msgstr "Anwendungsmenü verwalten"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:719
+#: ../pyhoca/wxgui/menus_taskbar.py:714
 msgid "Running"
 msgstr "aktiv"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:721
+#: ../pyhoca/wxgui/menus_taskbar.py:716
 msgid "Suspended"
 msgstr "angehalten"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:740
+#: ../pyhoca/wxgui/menus_taskbar.py:735
 msgid "&Clean all sessions"
 msgstr "Alle Sitzungen beenden"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:746
+#: ../pyhoca/wxgui/menus_taskbar.py:741
 msgid "Customize &profile"
 msgstr "Sitzungsprofil anpassen"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:758
+#: ../pyhoca/wxgui/menus_taskbar.py:756
 msgid "Shared &folders"
 msgstr "Freigegebene Ordner"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:770
+#: ../pyhoca/wxgui/menus_taskbar.py:768
 msgid "&Disconnect from Server"
 msgstr "Von Server trennen"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:777
+#: ../pyhoca/wxgui/menus_taskbar.py:775
 msgid "Suspend Session and E&xit application"
 msgstr "Sitzung anhalten und Anwendung beenden"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:781
+#: ../pyhoca/wxgui/menus_taskbar.py:779
 msgid "Disconnect and E&xit application"
 msgstr "Verbindung Trennen und Anwendung schließen"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:835
+#: ../pyhoca/wxgui/menus_taskbar.py:833
 msgid "Add Profile"
 msgstr "Sitzungsprofil hinzufügen"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:911
+#: ../pyhoca/wxgui/menus_taskbar.py:909
 msgid "No session profiles defined"
 msgstr "keine Sitzungsprofile definiert"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:947
+#: ../pyhoca/wxgui/menus_taskbar.py:945
 msgid "Start/Resume Session"
 msgstr "Sitzung starten/fortsetzen"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:947
+#: ../pyhoca/wxgui/menus_taskbar.py:945
 msgid "Connect Server"
 msgstr "Serververbindung aufbauen"
 
@@ -926,110 +965,132 @@ msgstr "Serververbindung aufbauen"
 msgid "About %s ..."
 msgstr "Ãœber %s ..."
 
-#: ../pyhoca/wxgui/frontend.py:462
+#: ../pyhoca/wxgui/frontend.py:459
 msgid "Suspending sessions and exiting application..."
 msgstr "Sitzungen werden angehalten und Programm beendet..."
 
-#: ../pyhoca/wxgui/frontend.py:465
+#: ../pyhoca/wxgui/frontend.py:462
 #, python-format
 msgid "Disconnecting %s and exiting application..."
 msgstr "Trenne %s und schließe Anwendung..."
 
-#: ../pyhoca/wxgui/frontend.py:467
+#: ../pyhoca/wxgui/frontend.py:464
 msgid "Exiting application..."
 msgstr "Programm wird beendet..."
 
-#: ../pyhoca/wxgui/frontend.py:560
+#: ../pyhoca/wxgui/frontend.py:562
 #, python-format
 msgid "%s - server warning"
 msgstr "%s - Serverwarnung"
 
-#: ../pyhoca/wxgui/frontend.py:560
+#: ../pyhoca/wxgui/frontend.py:562
 msgid "The X2Go Server does not publish an application menu."
 msgstr "Der X2Go-Server publiziert kein Anwendungsmenü."
 
-#: ../pyhoca/wxgui/frontend.py:610
-msgid "Public SSH key authentication has been successful."
-msgstr "Authentifizierung mit öffentlichem SSH Schlüssel war erfolgreich."
+#: ../pyhoca/wxgui/frontend.py:613
+msgid "SSH key authentication has been successful."
+msgstr "Authentifizierung mit SSH Schlüssel war erfolgreich."
 
-#: ../pyhoca/wxgui/frontend.py:644
+#: ../pyhoca/wxgui/frontend.py:650
 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:665
+#: ../pyhoca/wxgui/frontend.py:671
 #, python-format
 msgid "%s - EOF error"
 msgstr "%s - EOF-Fehler"
 
-#: ../pyhoca/wxgui/frontend.py:665
+#: ../pyhoca/wxgui/frontend.py:671
 msgid "Authentication protocol communication incomplete! Try again..."
 msgstr ""
 "Kommunikation während Authentifizierungsprotokoll unvollständig! Nochmal "
 "versuchen..."
 
-#: ../pyhoca/wxgui/frontend.py:672
+#: ../pyhoca/wxgui/frontend.py:678
 #, python-format
 msgid "%s - auth key error"
 msgstr "%s - ungültiger Benutzerschlüssel"
 
-#: ../pyhoca/wxgui/frontend.py:693
+#: ../pyhoca/wxgui/frontend.py:699
 msgid "An unknown error occurred during authentication!"
 msgstr "Ein unbekannter Fehler ist während der Serveranmeldung aufgetreten!"
 
-#: ../pyhoca/wxgui/frontend.py:726
+#: ../pyhoca/wxgui/frontend.py:728
+#, python-format
+msgid "%s: DirectRDP not supported yet"
+msgstr "%s: DirectRDP noch nicht unterstützt"
+
+#: ../pyhoca/wxgui/frontend.py:729
+#, python-format
+msgid ""
+"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)."
+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."
+
+#: ../pyhoca/wxgui/frontend.py:741
 msgid "Unknown session profile, configure before using it..."
 msgstr "Unbekanntes Sitzungsprofil, vor Benutzung bitte einrichten..."
 
-#: ../pyhoca/wxgui/frontend.py:784 ../pyhoca/wxgui/frontend.py:1302
+#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:1332
 #, python-format
 msgid "%s - session warning"
 msgstr "%s - Sitzungsfunktion eingeschränkt"
 
-#: ../pyhoca/wxgui/frontend.py:784
+#: ../pyhoca/wxgui/frontend.py:798
 #, python-format
 msgid "Execution of command ,,%s'' failed."
 msgstr "Das Ausführen des Befehls ,,%s'' ist fehlgeschlagen."
 
-#: ../pyhoca/wxgui/frontend.py:926
+#: ../pyhoca/wxgui/frontend.py:939
 msgid "Cleaning X2Go sessions..."
 msgstr "Beende X2Go Sitzungen..."
 
-#: ../pyhoca/wxgui/frontend.py:961
+#: ../pyhoca/wxgui/frontend.py:974
 #, python-format
 msgid "%s - disconnect"
 msgstr "%s - trennen"
 
-#: ../pyhoca/wxgui/frontend.py:961
+#: ../pyhoca/wxgui/frontend.py:974
 msgid "X2Go Profile is now disconnected."
 msgstr "X2Go Profil ist nun nicht mehr verbunden."
 
-#: ../pyhoca/wxgui/frontend.py:977
+#: ../pyhoca/wxgui/frontend.py:995
 msgid "New Session Profile"
 msgstr "Neues Sitzungsprofil"
 
-#: ../pyhoca/wxgui/frontend.py:1029
+#: ../pyhoca/wxgui/frontend.py:1047
 #, python-format
 msgid "Really Delete Session Profile ,,%s''?"
 msgstr "Das Sitzungsprofil ,,%s'' wirklich löschen?"
 
-#: ../pyhoca/wxgui/frontend.py:1035
+#: ../pyhoca/wxgui/frontend.py:1053
 #, python-format
 msgid "%s - profile deleted"
 msgstr "%s - Profil gelöscht"
 
-#: ../pyhoca/wxgui/frontend.py:1035
+#: ../pyhoca/wxgui/frontend.py:1053
 msgid "The session profile has been deleted."
 msgstr "Das Sitzungsprofil wurde gelöscht."
 
-#: ../pyhoca/wxgui/frontend.py:1053
+#: ../pyhoca/wxgui/frontend.py:1071
 #, 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:1194
+#: ../pyhoca/wxgui/frontend.py:1224
 #, python-format
 msgid ""
 "The authenticity of host [%s]:%s can't be established.\n"
@@ -1042,17 +1103,17 @@ msgstr ""
 "\n"
 "Sind Sie sicher, dass sie fortfahren möchten? "
 
-#: ../pyhoca/wxgui/frontend.py:1202
+#: ../pyhoca/wxgui/frontend.py:1232
 #, python-format
 msgid "%s: Confirm Host Authorization"
 msgstr "%s: Echtheit des Servers bestätigen"
 
-#: ../pyhoca/wxgui/frontend.py:1247
+#: ../pyhoca/wxgui/frontend.py:1277
 #, python-format
 msgid "%s - channel error"
 msgstr "%s - Verbindungsfehler"
 
-#: ../pyhoca/wxgui/frontend.py:1247
+#: ../pyhoca/wxgui/frontend.py:1277
 #, python-format
 msgid ""
 "Lost connection to server %s unexpectedly! Try to re-authenticate to the "
@@ -1061,22 +1122,22 @@ msgstr ""
 "Die Verbindung zum Server %s wurde unerwartet unterbrochen! Bitte versuchen "
 "Sie, sich neu am Server anzumelden..."
 
-#: ../pyhoca/wxgui/frontend.py:1265 ../pyhoca/wxgui/frontend.py:1283
-#: ../pyhoca/wxgui/frontend.py:1285 ../pyhoca/wxgui/frontend.py:1321
+#: ../pyhoca/wxgui/frontend.py:1295 ../pyhoca/wxgui/frontend.py:1313
+#: ../pyhoca/wxgui/frontend.py:1315 ../pyhoca/wxgui/frontend.py:1351
 #, python-format
 msgid "%s - session failure"
 msgstr "%s - Verbindung fehlgeschlagen"
 
-#: ../pyhoca/wxgui/frontend.py:1265
+#: ../pyhoca/wxgui/frontend.py:1295
 msgid "The session startup failed."
 msgstr "Der Start der Sitzung ist fehlgeschlagen."
 
-#: ../pyhoca/wxgui/frontend.py:1283
+#: ../pyhoca/wxgui/frontend.py:1313
 #, 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:1285
+#: ../pyhoca/wxgui/frontend.py:1315
 #, python-format
 msgid ""
 "The command ,,%s'' is not available on X2Go server\n"
@@ -1085,7 +1146,7 @@ msgstr ""
 "Der Befehl ,,%s'' ist auf dem X2Go Server nicht  verfügbar\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1302
+#: ../pyhoca/wxgui/frontend.py:1332
 #, python-format
 msgid ""
 "Reverse TCP port forwarding request for session %s to server port %s has "
@@ -1094,7 +1155,7 @@ msgstr ""
 "Eine Reverse TCP Port Weiterleitungsanfrage für Sitzung %s an Serverport %s "
 "wurde vom X2Go Server abgelehnt."
 
-#: ../pyhoca/wxgui/frontend.py:1321
+#: ../pyhoca/wxgui/frontend.py:1351
 #, python-format
 msgid ""
 "Forwarding tunnel request to [%s]:%s for session %s was denied by remote "
@@ -1103,37 +1164,37 @@ msgstr ""
 "SSH Forwarding Tunnel zu [%s]:%s wurde für Sitzung %s vom X2go/SSH Server "
 "verweigert. Die Sitzung konnte nicht gestartet werden."
 
-#: ../pyhoca/wxgui/frontend.py:1340
+#: ../pyhoca/wxgui/frontend.py:1370
 #, python-format
 msgid "%s - audio warning"
 msgstr "%s - Warnung Audiosystem"
 
-#: ../pyhoca/wxgui/frontend.py:1340
+#: ../pyhoca/wxgui/frontend.py:1370
 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:1347 ../pyhoca/wxgui/frontend.py:1354
+#: ../pyhoca/wxgui/frontend.py:1377 ../pyhoca/wxgui/frontend.py:1384
 #, python-format
 msgid "%s - audio error"
 msgstr "%s - Audiofehler"
 
-#: ../pyhoca/wxgui/frontend.py:1347
+#: ../pyhoca/wxgui/frontend.py:1377
 msgid "The X2Go PulseAudio system could not be started."
 msgstr "Das X2Go PulseAudio System konnte nicht gestartet werden."
 
-#: ../pyhoca/wxgui/frontend.py:1354
+#: ../pyhoca/wxgui/frontend.py:1384
 msgid "The X2Go PulseAudio system has died unexpectedly."
 msgstr "Das X2Go PulseAudio System ist soeben abgestürzt."
 
-#: ../pyhoca/wxgui/frontend.py:1366
+#: ../pyhoca/wxgui/frontend.py:1396
 #, python-format
 msgid "%s - audio problem"
 msgstr "%s - Audioproblem"
 
-#: ../pyhoca/wxgui/frontend.py:1366
+#: ../pyhoca/wxgui/frontend.py:1396
 #, python-format
 msgid ""
 "The audio connection could not be set up for this session.\n"
@@ -1142,12 +1203,12 @@ msgstr ""
 "Die Audio-Verbindung für diese Sitzung konnte nicht aufgebaut werden.\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1378
+#: ../pyhoca/wxgui/frontend.py:1408
 #, python-format
 msgid "%s - client-side printing not available"
 msgstr "%s - Client-seitiges Drucken nicht verfügbar"
 
-#: ../pyhoca/wxgui/frontend.py:1378
+#: ../pyhoca/wxgui/frontend.py:1408
 #, python-format
 msgid ""
 "The server denies client-side printing from within this session.\n"
@@ -1157,12 +1218,12 @@ msgstr ""
 "Server verweigert die Verbindung.\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1390
+#: ../pyhoca/wxgui/frontend.py:1420
 #, python-format
 msgid "%s - MIME box not available"
 msgstr "%s - MIME box nicht verfügbar"
 
-#: ../pyhoca/wxgui/frontend.py:1390
+#: ../pyhoca/wxgui/frontend.py:1420
 #, python-format
 msgid ""
 "The server does not support the X2Go MIME box.\n"
@@ -1171,12 +1232,12 @@ msgstr ""
 "Der Server unterstützt die X2Go MIME box nicht.\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1402
+#: ../pyhoca/wxgui/frontend.py:1432
 #, python-format
 msgid "%s - client-side folders not sharable"
 msgstr "%s - keine Freigabe Client-seitiger Ordner"
 
-#: ../pyhoca/wxgui/frontend.py:1402
+#: ../pyhoca/wxgui/frontend.py:1432
 #, python-format
 msgid ""
 "The server denies client-side folder sharing with this session.\n"
@@ -1186,12 +1247,12 @@ msgstr ""
 "Server verweigert die Verbindung.\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1414
+#: ../pyhoca/wxgui/frontend.py:1444
 #, python-format
 msgid "%s - client resources not sharable"
 msgstr "%s - keine Client-seitigen Ordner- und Druckerfreigaben möglich"
 
-#: ../pyhoca/wxgui/frontend.py:1414
+#: ../pyhoca/wxgui/frontend.py:1444
 #, python-format
 msgid ""
 "Client-side folders and printers cannot be shared with this session.\n"
@@ -1201,12 +1262,12 @@ msgstr ""
 "werden.\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1433 ../pyhoca/wxgui/frontend.py:1435
+#: ../pyhoca/wxgui/frontend.py:1463 ../pyhoca/wxgui/frontend.py:1465
 #, python-format
 msgid "%s - print error"
 msgstr "%s - Druckfehler"
 
-#: ../pyhoca/wxgui/frontend.py:1433
+#: ../pyhoca/wxgui/frontend.py:1463
 #, python-format
 msgid ""
 "%s\n"
@@ -1217,7 +1278,7 @@ msgstr ""
 "...verursacht an Drucker durch Sitzung\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1435
+#: ../pyhoca/wxgui/frontend.py:1465
 #, python-format
 msgid ""
 "%s\n"
@@ -1228,12 +1289,12 @@ msgstr ""
 "...verursacht von Sitzung\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1450 ../pyhoca/wxgui/frontend.py:1465
+#: ../pyhoca/wxgui/frontend.py:1480 ../pyhoca/wxgui/frontend.py:1495
 #, python-format
 msgid "%s - start"
 msgstr "%s - starten"
 
-#: ../pyhoca/wxgui/frontend.py:1450
+#: ../pyhoca/wxgui/frontend.py:1480
 #, python-format
 msgid ""
 "New X2Go session starting up...\n"
@@ -1242,7 +1303,7 @@ msgstr ""
 "Neue X2Go Sitzung wird gestartet...\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1465
+#: ../pyhoca/wxgui/frontend.py:1495
 #, python-format
 msgid ""
 "Another client started X2Go session\n"
@@ -1251,12 +1312,12 @@ msgstr ""
 "Ein anderes X2Go Programm hat diese Sitzung gestartet\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1480 ../pyhoca/wxgui/frontend.py:1495
+#: ../pyhoca/wxgui/frontend.py:1510 ../pyhoca/wxgui/frontend.py:1525
 #, python-format
 msgid "%s - resume"
 msgstr "%s - fortsetzen"
 
-#: ../pyhoca/wxgui/frontend.py:1480
+#: ../pyhoca/wxgui/frontend.py:1510
 #, python-format
 msgid ""
 "Resuming X2Go session...\n"
@@ -1265,7 +1326,7 @@ msgstr ""
 "X2Go Sitzung wird fortgesetzt...\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1495
+#: ../pyhoca/wxgui/frontend.py:1525
 #, python-format
 msgid ""
 "Another client resumed X2Go session\n"
@@ -1274,12 +1335,12 @@ msgstr ""
 "Eine andere X2Go Anwendung hat die Sitzung fortgesetzt\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1510
+#: ../pyhoca/wxgui/frontend.py:1540
 #, python-format
 msgid "%s - running"
 msgstr "%s - aktiv"
 
-#: ../pyhoca/wxgui/frontend.py:1510
+#: ../pyhoca/wxgui/frontend.py:1540
 #, python-format
 msgid ""
 "Found already running session\n"
@@ -1288,12 +1349,12 @@ msgstr ""
 "Bereits aktive Sitzung gefunden\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1530
+#: ../pyhoca/wxgui/frontend.py:1560
 #, python-format
 msgid "%s - suspend"
 msgstr "%s - anhalten"
 
-#: ../pyhoca/wxgui/frontend.py:1530
+#: ../pyhoca/wxgui/frontend.py:1560
 #, python-format
 msgid ""
 "X2Go Session has been suspended\n"
@@ -1302,12 +1363,12 @@ msgstr ""
 "X2Go Sitzung wurde angehalten\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1557
+#: ../pyhoca/wxgui/frontend.py:1587
 #, python-format
 msgid "%s - terminate"
 msgstr "%s - beenden"
 
-#: ../pyhoca/wxgui/frontend.py:1557
+#: ../pyhoca/wxgui/frontend.py:1587
 #, python-format
 msgid ""
 "X2Go Session has terminated\n"
@@ -1316,7 +1377,7 @@ msgstr ""
 "X2Go Sitzung wurde beendet\n"
 "%s"
 
-#: ../pyhoca/wxgui/messages.py:74
+#: ../pyhoca/wxgui/messages.py:73
 #, python-format
 msgid ""
 "Are you really sure you want to\n"
@@ -1326,7 +1387,7 @@ msgstr ""
 "das Sitzungsprofil ,,%s''\n"
 "wirklich löschen möchten?"
 
-#: ../pyhoca/wxgui/messages.py:75
+#: ../pyhoca/wxgui/messages.py:74
 #, python-format
 msgid ""
 "PyHoca-GUI is already running for user ,,%s''!\n"
@@ -1341,15 +1402,15 @@ msgstr ""
 "gestartet werden. Das PyHoca-GUI Icon befindet sich auf\n"
 "Ihrem Desktop in der Benachrichtigungsleiste."
 
-#: ../pyhoca/wxgui/messages.py:108
+#: ../pyhoca/wxgui/messages.py:107
 msgid "Yes"
 msgstr "Ja"
 
-#: ../pyhoca/wxgui/messages.py:109
+#: ../pyhoca/wxgui/messages.py:108
 msgid "No"
 msgstr "Nein"
 
-#: ../pyhoca/wxgui/messages.py:126 ../pyhoca/wxgui/printingprefs.py:142
+#: ../pyhoca/wxgui/messages.py:125 ../pyhoca/wxgui/printingprefs.py:142
 msgid "Ok"
 msgstr "OK"
 
@@ -1452,6 +1513,20 @@ msgstr "Sitzungsfenster umbenennen in"
 msgid "OK"
 msgstr "Ok"
 
+#, fuzzy
+#~ msgid "Remember shared folders"
+#~ msgstr "Freigegebene Ordner"
+
+#, fuzzy
+#~ msgid "Shared Resources"
+#~ msgstr "Freigegebene Ordner"
+
+#~ msgid "RSA/DSA private key"
+#~ msgstr "Privater RSA/DSA Schlüssel"
+
+#~ msgid "Host[:Port]"
+#~ msgstr "Hostname[:Port]"
+
 #~ msgid "us"
 #~ msgstr "de"
 
diff --git a/po/en.po b/po/en.po
index 581ab45..f706bbb 100644
--- a/po/en.po
+++ b/po/en.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PyHoca-GUI VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-10 21:18+0200\n"
-"PO-Revision-Date: 2012-05-31 21:44+0100\n"
+"POT-Creation-Date: 2012-11-26 14:25+0100\n"
+"PO-Revision-Date: 2012-11-26 14:22+0100\n"
 "Last-Translator: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>\n"
-"Language-Team: en <mike.gabriel at das-netzwerkteam.de>\n"
+"Language-Team: X2Go i18n <x2go-i18n at lists.berlios.de>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,128 +20,128 @@ msgstr ""
 "X-Poedit-Country: UNITED STATES\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../pyhoca/wxgui/logon.py:92
+#: ../pyhoca/wxgui/logon.py:86
 #, python-format
 msgid "%s (via %s)"
 msgstr "%s (via %s)"
 
-#: ../pyhoca/wxgui/logon.py:96 ../pyhoca/wxgui/logon.py:108
+#: ../pyhoca/wxgui/logon.py:90 ../pyhoca/wxgui/logon.py:102
 msgid "Username"
 msgstr "Username"
 
-#: ../pyhoca/wxgui/logon.py:98 ../pyhoca/wxgui/logon.py:110
+#: ../pyhoca/wxgui/logon.py:92 ../pyhoca/wxgui/logon.py:104
 msgid "Password"
 msgstr "Password"
 
-#: ../pyhoca/wxgui/logon.py:101
+#: ../pyhoca/wxgui/logon.py:95
 msgid "Authenticate"
 msgstr "Authenticate"
 
-#: ../pyhoca/wxgui/logon.py:113
+#: ../pyhoca/wxgui/logon.py:107
 msgid "  Start SSH tunnel  "
 msgstr "  Start SSH tunnel  "
 
-#: ../pyhoca/wxgui/logon.py:121
+#: ../pyhoca/wxgui/logon.py:115
 msgid "Session login"
 msgstr "Session login"
 
-#: ../pyhoca/wxgui/logon.py:122
+#: ../pyhoca/wxgui/logon.py:116
 msgid "SSH proxy server login"
 msgstr "SSH proxy server login"
 
-#: ../pyhoca/wxgui/logon.py:133 ../pyhoca/wxgui/profilemanager.py:322
-#: ../pyhoca/wxgui/messages.py:132 ../pyhoca/wxgui/printingprefs.py:147
+#: ../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
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../pyhoca/wxgui/logon.py:292 ../pyhoca/wxgui/logon.py:334
-#: ../pyhoca/wxgui/frontend.py:603
+#: ../pyhoca/wxgui/logon.py:297 ../pyhoca/wxgui/logon.py:339
+#: ../pyhoca/wxgui/frontend.py:606
 #, python-format
 msgid "%s - connect failure"
 msgstr "%s - connect failure"
 
-#: ../pyhoca/wxgui/logon.py:293 ../pyhoca/wxgui/frontend.py:603
+#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:606
 msgid "User is not allowed to start X2Go sessions!"
 msgstr "User is not allowed to start X2Go sessions!"
 
-#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:610
+#: ../pyhoca/wxgui/logon.py:303 ../pyhoca/wxgui/frontend.py:613
 #, python-format
 msgid "%s - connect"
 msgstr "%s - connect"
 
-#: ../pyhoca/wxgui/logon.py:299
+#: ../pyhoca/wxgui/logon.py:304
 msgid "Authentication has been successful."
 msgstr "Authentication has been successful."
 
-#: ../pyhoca/wxgui/logon.py:330
+#: ../pyhoca/wxgui/logon.py:335
 msgid "SSH tunnel started"
 msgstr "SSH tunnel started"
 
-#: ../pyhoca/wxgui/logon.py:335
+#: ../pyhoca/wxgui/logon.py:340
 msgid "Authentication failed!"
 msgstr "Authentication failed!"
 
-#: ../pyhoca/wxgui/logon.py:342
+#: ../pyhoca/wxgui/logon.py:348
 #, python-format
 msgid "%s - SSH proxy"
 msgstr "%s - SSH proxy"
 
-#: ../pyhoca/wxgui/logon.py:343
+#: ../pyhoca/wxgui/logon.py:349
 msgid "Authentication to the SSH proxy server failed!"
 msgstr "Authentication to the SSH proxy server failed!"
 
-#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:658
+#: ../pyhoca/wxgui/logon.py:376 ../pyhoca/wxgui/frontend.py:664
 #, python-format
 msgid "%s - socket error"
 msgstr "%s - socket error"
 
-#: ../pyhoca/wxgui/logon.py:372 ../pyhoca/wxgui/frontend.py:637
-#: ../pyhoca/wxgui/frontend.py:644
+#: ../pyhoca/wxgui/logon.py:383 ../pyhoca/wxgui/frontend.py:643
+#: ../pyhoca/wxgui/frontend.py:650
 #, python-format
 msgid "%s - host key error"
 msgstr "%s - host key error"
 
-#: ../pyhoca/wxgui/logon.py:373 ../pyhoca/wxgui/frontend.py:637
+#: ../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 ""
 "The remote server's host key is invalid or has not been accepted by the user"
 
-#: ../pyhoca/wxgui/logon.py:380 ../pyhoca/wxgui/frontend.py:679
+#: ../pyhoca/wxgui/logon.py:391 ../pyhoca/wxgui/frontend.py:685
 #, python-format
 msgid "%s - missing home directory"
 msgstr "%s - missing home directory"
 
-#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:679
+#: ../pyhoca/wxgui/logon.py:392 ../pyhoca/wxgui/frontend.py:685
 msgid "The remote user's home directory does not exist."
 msgstr "The remote user's home directory does not exist."
 
-#: ../pyhoca/wxgui/logon.py:388
+#: ../pyhoca/wxgui/logon.py:399
 #, python-format
 msgid "%s - key error"
 msgstr "%s - key error"
 
-#: ../pyhoca/wxgui/logon.py:396 ../pyhoca/wxgui/frontend.py:686
+#: ../pyhoca/wxgui/logon.py:407 ../pyhoca/wxgui/frontend.py:692
 #, python-format
 msgid "%s - auth error"
 msgstr "%s - auth error"
 
-#: ../pyhoca/wxgui/logon.py:404 ../pyhoca/wxgui/frontend.py:630
+#: ../pyhoca/wxgui/logon.py:415 ../pyhoca/wxgui/frontend.py:636
 #, python-format
 msgid "%s - SSH error"
 msgstr "%s - SSH error"
 
-#: ../pyhoca/wxgui/logon.py:412
+#: ../pyhoca/wxgui/logon.py:423
 #, python-format
 msgid "%s - unknown error"
 msgstr "%s - unknown error"
 
-#: ../pyhoca/wxgui/logon.py:413
+#: ../pyhoca/wxgui/logon.py:424
 msgid "An unknown error occured during authentication!"
 msgstr "An unknown error occured during authentication!"
 
-#: ../pyhoca/wxgui/taskbar.py:92
+#: ../pyhoca/wxgui/taskbar.py:89
 #, python-format
 msgid ""
 "PyHoca-GUI\n"
@@ -150,7 +150,7 @@ msgstr ""
 "PyHoca-GUI\n"
 "Connecting you to ,,%s''"
 
-#: ../pyhoca/wxgui/taskbar.py:96
+#: ../pyhoca/wxgui/taskbar.py:93
 #, python-format
 msgid ""
 "PyHoca-GUI (Python X2goClient)\n"
@@ -159,7 +159,7 @@ msgstr ""
 "PyHoca-GUI (Python X2goClient)\n"
 "Currently connecting you to remote X2Go server ,,%s''"
 
-#: ../pyhoca/wxgui/taskbar.py:106
+#: ../pyhoca/wxgui/taskbar.py:103
 msgid ""
 "PyHoca-GUI\n"
 "Connecting you to X2Go..."
@@ -167,7 +167,7 @@ msgstr ""
 "PyHoca-GUI\n"
 "Connecting you to X2Go..."
 
-#: ../pyhoca/wxgui/taskbar.py:110
+#: ../pyhoca/wxgui/taskbar.py:107
 msgid ""
 "PyHoca-GUI (Python X2goClient)\n"
 "Client for connecting you to a remote X2Go server"
@@ -175,278 +175,305 @@ msgstr ""
 "PyHoca-GUI (Python X2goClient)\n"
 "Client for connecting you to a remote X2Go server"
 
-#: ../pyhoca/wxgui/profilemanager.py:82
+#: ../pyhoca/wxgui/profilemanager.py:79
 msgid "GNOME Desktop (GNOME)"
 msgstr "GNOME Desktop (GNOME)"
 
-#: ../pyhoca/wxgui/profilemanager.py:83
+#: ../pyhoca/wxgui/profilemanager.py:80
 msgid "K Desktop Environment (KDE)"
 msgstr "K Desktop Environment (KDE)"
 
-#: ../pyhoca/wxgui/profilemanager.py:84
+#: ../pyhoca/wxgui/profilemanager.py:81
 msgid "Lightweight X Desktop (LXDE)"
 msgstr "Lightweight X Desktop (LXDE)"
 
-#: ../pyhoca/wxgui/profilemanager.py:85
+#: ../pyhoca/wxgui/profilemanager.py:82
 msgid "Trinity X Desktop (KDE3-like)"
 msgstr "Trinity X Desktop (KDE3-like)"
 
-#: ../pyhoca/wxgui/profilemanager.py:86
+#: ../pyhoca/wxgui/profilemanager.py:83
 msgid "Unity X Desktop Shell (UNITY)"
 msgstr "Unity X Desktop Shell (UNITY)"
 
-#: ../pyhoca/wxgui/profilemanager.py:87
-msgid "XFCE4 Desktop (XFCE4)"
-msgstr "XFCE4 Desktop (XFCE4)"
+#: ../pyhoca/wxgui/profilemanager.py:84
+msgid "XFCE Desktop (XFCE)"
+msgstr "XFCE Desktop (XFCE)"
 
-#: ../pyhoca/wxgui/profilemanager.py:88
+#: ../pyhoca/wxgui/profilemanager.py:85
 msgid "Published Applications"
 msgstr "Published Applications"
 
-#: ../pyhoca/wxgui/profilemanager.py:89
+#: ../pyhoca/wxgui/profilemanager.py:86
 msgid "Single Application"
 msgstr "Single Application"
 
-#: ../pyhoca/wxgui/profilemanager.py:90
+#: ../pyhoca/wxgui/profilemanager.py:87
 msgid "XDMCP Query"
 msgstr "XDMCP Query"
 
-#: ../pyhoca/wxgui/profilemanager.py:91
-msgid "Windows Terminal Server (RDP-proxy)"
-msgstr "Windows Terminal Server (RDP-proxy)"
+#: ../pyhoca/wxgui/profilemanager.py:88
+msgid "Windows Terminal Server (X2Go-proxied RDP)"
+msgstr "Windows Terminal Server (X2Go-proxied RDP)"
 
-#. 'DirectRDP': 'Windows Terminal Server (RDP-direct)',
-#: ../pyhoca/wxgui/profilemanager.py:93 ../pyhoca/wxgui/profilemanager.py:207
+#: ../pyhoca/wxgui/profilemanager.py:89
+msgid "Windows Terminal Server (Direct RDP)"
+msgstr "Windows Terminal Server (Direct RDP)"
+
+#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/profilemanager.py:224
 msgid "Custom command"
 msgstr "Custom command"
 
-#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:398
+#: ../pyhoca/wxgui/profilemanager.py:95 ../pyhoca/wxgui/menus_taskbar.py:393
 msgid "Internet Browser"
 msgstr "Internet Browser"
 
-#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:399
+#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:394
 msgid "Email Client"
 msgstr "Email Client"
 
-#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:400
+#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:395
 msgid "Office"
 msgstr "Office"
 
-#: ../pyhoca/wxgui/profilemanager.py:99 ../pyhoca/wxgui/menus_taskbar.py:401
+#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:396
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../pyhoca/wxgui/profilemanager.py:113
+#: ../pyhoca/wxgui/profilemanager.py:116
 msgid "Open file with system's default application"
 msgstr "Open file with system's default application"
 
-#: ../pyhoca/wxgui/profilemanager.py:114
+#: ../pyhoca/wxgui/profilemanager.py:117
 msgid "Open application chooser dialog"
 msgstr "Open application chooser dialog"
 
-#: ../pyhoca/wxgui/profilemanager.py:115
+#: ../pyhoca/wxgui/profilemanager.py:118
 msgid "Save incoming file as ..."
 msgstr "Save incoming file as ..."
 
-#: ../pyhoca/wxgui/profilemanager.py:143
+#: ../pyhoca/wxgui/profilemanager.py:146
 msgid "settings derived from "
 msgstr "settings derived from "
 
 #. boxes for all tabs
-#: ../pyhoca/wxgui/profilemanager.py:160
+#: ../pyhoca/wxgui/profilemanager.py:167
 msgid "Session Title"
 msgstr "Session Title"
 
-#: ../pyhoca/wxgui/profilemanager.py:161
+#: ../pyhoca/wxgui/profilemanager.py:168
 msgid "Session Window"
 msgstr "Session Window"
 
-#: ../pyhoca/wxgui/profilemanager.py:162
+#: ../pyhoca/wxgui/profilemanager.py:169
 msgid "Session Startup"
 msgstr "Session Startup"
 
-#: ../pyhoca/wxgui/profilemanager.py:163
+#: ../pyhoca/wxgui/profilemanager.py:170
 msgid "Server"
 msgstr "Server"
 
-#: ../pyhoca/wxgui/profilemanager.py:164
+#: ../pyhoca/wxgui/profilemanager.py:171
+msgid "Proxy"
+msgstr "Proxy"
+
+#: ../pyhoca/wxgui/profilemanager.py:172
 msgid "Connection Link Speed"
 msgstr "Connection Link Speed"
 
-#: ../pyhoca/wxgui/profilemanager.py:165
+#: ../pyhoca/wxgui/profilemanager.py:173
 msgid "Compression"
 msgstr "Compression"
 
-#: ../pyhoca/wxgui/profilemanager.py:166
+#: ../pyhoca/wxgui/profilemanager.py:174
 msgid "Display"
 msgstr "Display"
 
-#: ../pyhoca/wxgui/profilemanager.py:167
+#: ../pyhoca/wxgui/profilemanager.py:175
 msgid "Keyboard"
 msgstr "Keyboard"
 
-#: ../pyhoca/wxgui/profilemanager.py:168
+#: ../pyhoca/wxgui/profilemanager.py:176
 msgid "Sound"
 msgstr "Sound"
 
-#: ../pyhoca/wxgui/profilemanager.py:169
+#: ../pyhoca/wxgui/profilemanager.py:177
 msgid "Printing"
 msgstr "Printing"
 
-#: ../pyhoca/wxgui/profilemanager.py:170
+#: ../pyhoca/wxgui/profilemanager.py:178
 msgid "Folder Exports"
 msgstr "Folder Exports"
 
-#: ../pyhoca/wxgui/profilemanager.py:171
+#: ../pyhoca/wxgui/profilemanager.py:179
 msgid "File Import"
 msgstr "File Import"
 
 #. ##
 #. ## widgets for the PROFILE tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:176
+#: ../pyhoca/wxgui/profilemanager.py:184
 msgid "Name"
 msgstr "Name"
 
-#: ../pyhoca/wxgui/profilemanager.py:183
+#: ../pyhoca/wxgui/profilemanager.py:191
 msgid "Set session window title"
 msgstr "Set session window title"
 
-#: ../pyhoca/wxgui/profilemanager.py:184
+#: ../pyhoca/wxgui/profilemanager.py:192
 msgid "Use a default session window title"
 msgstr "Use a default session window title"
 
-#: ../pyhoca/wxgui/profilemanager.py:185
+#: ../pyhoca/wxgui/profilemanager.py:193
 msgid "Custom session window title"
 msgstr "Custom session window title"
 
-#: ../pyhoca/wxgui/profilemanager.py:195
+#: ../pyhoca/wxgui/profilemanager.py:212
 msgid "Window Icon"
 msgstr "Window Icon"
 
 #. ##
 #. ## widgets for the SESSION tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:201
+#: ../pyhoca/wxgui/profilemanager.py:218
 msgid "Start session automatically after login"
 msgstr "Start session automatically after login"
 
-#: ../pyhoca/wxgui/profilemanager.py:202
+#: ../pyhoca/wxgui/profilemanager.py:219
 #, python-format
 msgid "Login automatically after %s has started"
 msgstr "Login automatically after %s has started"
 
-#: ../pyhoca/wxgui/profilemanager.py:203
+#: ../pyhoca/wxgui/profilemanager.py:220
 msgid "Type"
 msgstr "Type"
 
-#: ../pyhoca/wxgui/profilemanager.py:205
+#: ../pyhoca/wxgui/profilemanager.py:222
 msgid "Application"
 msgstr "Application"
 
-#: ../pyhoca/wxgui/profilemanager.py:209
+#: ../pyhoca/wxgui/profilemanager.py:226
 msgid "XDMCP server"
 msgstr "XDMCP server"
 
-#: ../pyhoca/wxgui/profilemanager.py:211
+#: ../pyhoca/wxgui/profilemanager.py:228
 msgid "RDP server"
 msgstr "RDP server"
 
-#: ../pyhoca/wxgui/profilemanager.py:213
+#: ../pyhoca/wxgui/profilemanager.py:230
 msgid "RDP options"
 msgstr "RDP options"
 
-#: ../pyhoca/wxgui/profilemanager.py:215
+#: ../pyhoca/wxgui/profilemanager.py:232
 msgid "Integrate remote application(s) into local desktop (rootless mode)"
 msgstr "ntegrate remote application(s) into local desktop (rootless mode)"
 
-#: ../pyhoca/wxgui/profilemanager.py:216
+#: ../pyhoca/wxgui/profilemanager.py:233
 msgid "Menu of published applications"
 msgstr "Menu of published applications"
 
 #. ##
 #. ## widgets for the CONNECTION tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:223 ../pyhoca/wxgui/profilemanager.py:233
+#: ../pyhoca/wxgui/profilemanager.py:240 ../pyhoca/wxgui/profilemanager.py:253
 msgid "User"
 msgstr "User"
 
-#: ../pyhoca/wxgui/profilemanager.py:225
+#: ../pyhoca/wxgui/profilemanager.py:242 ../pyhoca/wxgui/profilemanager.py:260
 msgid "Host"
 msgstr "Host"
 
-#: ../pyhoca/wxgui/profilemanager.py:227
+#: ../pyhoca/wxgui/profilemanager.py:244 ../pyhoca/wxgui/profilemanager.py:262
 msgid "Port"
 msgstr "Port"
 
-#: ../pyhoca/wxgui/profilemanager.py:229
-msgid "RSA/DSA private key"
-msgstr "RSA/DSA private key"
+#: ../pyhoca/wxgui/profilemanager.py:246
+msgid "Key"
+msgstr "Key"
 
-#: ../pyhoca/wxgui/profilemanager.py:232
+#: ../pyhoca/wxgui/profilemanager.py:249
+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
+msgid "Enable forwarding of SSH authentication agent connections"
+msgstr "Enable forwarding of SSH authentication agent connections"
+
+#: ../pyhoca/wxgui/profilemanager.py:252
 msgid "Server behind SSH proxy"
 msgstr "Server behind SSH proxy"
 
-#: ../pyhoca/wxgui/profilemanager.py:235
+#: ../pyhoca/wxgui/profilemanager.py:255
+msgid "Use same username for X2Go and proxy host"
+msgstr "Use same username for X2Go and proxy host"
+
+#: ../pyhoca/wxgui/profilemanager.py:256
+msgid "Use same authentication for X2Go and proxy host"
+msgstr "Use same authentication for X2Go and proxy host"
+
+#: ../pyhoca/wxgui/profilemanager.py:257
 msgid "Key file"
 msgstr "Key file"
 
-#: ../pyhoca/wxgui/profilemanager.py:238
-msgid "Host[:Port]"
-msgstr "Host[:Port]"
-
-#: ../pyhoca/wxgui/profilemanager.py:240
+#: ../pyhoca/wxgui/profilemanager.py:264
 msgid "SSH Proxy Tunnel"
 msgstr "SSH Proxy Tunnel"
 
-#: ../pyhoca/wxgui/profilemanager.py:248
+#: ../pyhoca/wxgui/profilemanager.py:270
+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
 msgid "Modem"
 msgstr "Modem"
 
-#: ../pyhoca/wxgui/profilemanager.py:249
+#: ../pyhoca/wxgui/profilemanager.py:274
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../pyhoca/wxgui/profilemanager.py:250
+#: ../pyhoca/wxgui/profilemanager.py:275
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../pyhoca/wxgui/profilemanager.py:251
+#: ../pyhoca/wxgui/profilemanager.py:276
 msgid "WAN"
 msgstr "WAN"
 
-#: ../pyhoca/wxgui/profilemanager.py:252
+#: ../pyhoca/wxgui/profilemanager.py:277
 msgid "LAN"
 msgstr "LAN"
 
-#: ../pyhoca/wxgui/profilemanager.py:254
+#: ../pyhoca/wxgui/profilemanager.py:279
 msgid "Method"
 msgstr "Method"
 
-#: ../pyhoca/wxgui/profilemanager.py:256
+#: ../pyhoca/wxgui/profilemanager.py:281
 msgid "Image quality"
 msgstr "Image quality"
 
 #. ##
 #. ## wigdets for the SETTINGS tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:262
+#: ../pyhoca/wxgui/profilemanager.py:287
 msgid "Fullscreen"
 msgstr "Fullscreen"
 
-#: ../pyhoca/wxgui/profilemanager.py:263
+#: ../pyhoca/wxgui/profilemanager.py:288
+msgid "Maximized"
+msgstr "Maximized"
+
+#: ../pyhoca/wxgui/profilemanager.py:289
 msgid "Custom Size"
 msgstr "Custom Size"
 
-#: ../pyhoca/wxgui/profilemanager.py:268
+#: ../pyhoca/wxgui/profilemanager.py:294
 msgid "Set display DPI"
 msgstr "Set display DPI"
 
-#: ../pyhoca/wxgui/profilemanager.py:270
+#: ../pyhoca/wxgui/profilemanager.py:296
 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:271
+#: ../pyhoca/wxgui/profilemanager.py:297
 msgid ""
 "Automatically detect and use client-side keyboard configuration inside the "
 "session"
@@ -454,213 +481,221 @@ msgstr ""
 "Automatically detect and use client-side keyboard configuration inside the "
 "session"
 
-#: ../pyhoca/wxgui/profilemanager.py:272
+#: ../pyhoca/wxgui/profilemanager.py:298
 msgid "Use custom keyboard settings as provided below"
 msgstr "Use custom keyboard settings as provided below"
 
-#: ../pyhoca/wxgui/profilemanager.py:273
+#: ../pyhoca/wxgui/profilemanager.py:299
 msgid "Keyboard model"
 msgstr "Keyboard model"
 
-#: ../pyhoca/wxgui/profilemanager.py:275
+#: ../pyhoca/wxgui/profilemanager.py:301
 msgid "Layout"
 msgstr "Layout"
 
-#: ../pyhoca/wxgui/profilemanager.py:277
+#: ../pyhoca/wxgui/profilemanager.py:303
 msgid "Layout variant"
 msgstr "Layout variant"
 
-#: ../pyhoca/wxgui/profilemanager.py:279
+#: ../pyhoca/wxgui/profilemanager.py:305
 msgid "Enable sound support"
 msgstr "Enable sound support"
 
-#: ../pyhoca/wxgui/profilemanager.py:280
+#: ../pyhoca/wxgui/profilemanager.py:306
 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:284
+#: ../pyhoca/wxgui/profilemanager.py:310
 msgid "Arts (not supported)"
 msgstr "Arts (not supported)"
 
-#: ../pyhoca/wxgui/profilemanager.py:287
+#: ../pyhoca/wxgui/profilemanager.py:313
 msgid "esd"
 msgstr "esd"
 
-#: ../pyhoca/wxgui/profilemanager.py:288
+#: ../pyhoca/wxgui/profilemanager.py:314
 msgid "Use default sound port"
 msgstr "Use default sound port"
 
-#: ../pyhoca/wxgui/profilemanager.py:289
+#: ../pyhoca/wxgui/profilemanager.py:315
 msgid "Custom sound port"
 msgstr "Custom sound port"
 
-#: ../pyhoca/wxgui/profilemanager.py:291
-msgid "Client Side printing"
-msgstr "Client Side printing"
-
-#: ../pyhoca/wxgui/profilemanager.py:293
+#: ../pyhoca/wxgui/profilemanager.py:318
 msgid "Use local folder sharing"
 msgstr "Use local folder sharing"
 
-#: ../pyhoca/wxgui/profilemanager.py:294
+#: ../pyhoca/wxgui/profilemanager.py:319
+msgid "Store share list at end of session"
+msgstr "Store share list at end of session"
+
+#: ../pyhoca/wxgui/profilemanager.py:320
 msgid "Path"
 msgstr "Path"
 
-#: ../pyhoca/wxgui/profilemanager.py:297 ../pyhoca/wxgui/profilemanager.py:316
+#: ../pyhoca/wxgui/profilemanager.py:323 ../pyhoca/wxgui/profilemanager.py:344
 msgid "Add"
 msgstr "Add"
 
-#: ../pyhoca/wxgui/profilemanager.py:299
+#: ../pyhoca/wxgui/profilemanager.py:325
 msgid "Local Path"
 msgstr "Local Path"
 
-#: ../pyhoca/wxgui/profilemanager.py:300
+#: ../pyhoca/wxgui/profilemanager.py:326
 msgid "Connect Method"
 msgstr "Connect Method"
 
-#: ../pyhoca/wxgui/profilemanager.py:301
+#: ../pyhoca/wxgui/profilemanager.py:327
 msgid "Delete"
 msgstr "Delete"
 
-#: ../pyhoca/wxgui/profilemanager.py:303
+#: ../pyhoca/wxgui/profilemanager.py:329
 msgid "Convert between client and server encodings"
 msgstr "Convert between client and server encodings"
 
-#: ../pyhoca/wxgui/profilemanager.py:304
+#: ../pyhoca/wxgui/profilemanager.py:330
 msgid "Client encoding"
 msgstr "Client encoding"
 
-#: ../pyhoca/wxgui/profilemanager.py:306
+#: ../pyhoca/wxgui/profilemanager.py:332
 msgid "Server encoding"
 msgstr "Server encoding"
 
-#: ../pyhoca/wxgui/profilemanager.py:309
+#: ../pyhoca/wxgui/profilemanager.py:335
 msgid "Use file MIME box for local file import"
 msgstr "Use file MIME box for local file import"
 
-#: ../pyhoca/wxgui/profilemanager.py:310
+#: ../pyhoca/wxgui/profilemanager.py:336
 msgid "Extensions"
 msgstr "Extensions"
 
-#: ../pyhoca/wxgui/profilemanager.py:312
+#: ../pyhoca/wxgui/profilemanager.py:338
 msgid "Action"
 msgstr "Action"
 
-#: ../pyhoca/wxgui/profilemanager.py:317
+#: ../pyhoca/wxgui/profilemanager.py:341
+msgid "Client Side printing"
+msgstr "Client Side printing"
+
+#: ../pyhoca/wxgui/profilemanager.py:345
 msgid "Defaults"
 msgstr "Defaults"
 
-#: ../pyhoca/wxgui/profilemanager.py:319
+#: ../pyhoca/wxgui/profilemanager.py:347
 msgid "Save"
 msgstr "Save"
 
-#: ../pyhoca/wxgui/profilemanager.py:320
+#: ../pyhoca/wxgui/profilemanager.py:348
 msgid "Reset"
 msgstr "Reset"
 
-#: ../pyhoca/wxgui/profilemanager.py:365
-#: ../pyhoca/wxgui/profilemanager.py:1078
-#: ../pyhoca/wxgui/profilemanager.py:1832
+#: ../pyhoca/wxgui/profilemanager.py:401
+#: ../pyhoca/wxgui/profilemanager.py:1124
+#: ../pyhoca/wxgui/profilemanager.py:2268
 msgid "automatically"
 msgstr "automatically"
 
-#: ../pyhoca/wxgui/profilemanager.py:367
-#: ../pyhoca/wxgui/profilemanager.py:1080
+#: ../pyhoca/wxgui/profilemanager.py:403
+#: ../pyhoca/wxgui/profilemanager.py:1126
 msgid "manually"
 msgstr "manually"
 
-#: ../pyhoca/wxgui/profilemanager.py:376
+#: ../pyhoca/wxgui/profilemanager.py:412
 msgid "PyHoca-GUI Profile Manager - new profile"
 msgstr "PyHoca-GUI Profile Manager - new profile"
 
-#: ../pyhoca/wxgui/profilemanager.py:378
+#: ../pyhoca/wxgui/profilemanager.py:414
 #, python-format
 msgid "PyHoca-GUI Profile Manager - %s (connected)"
 msgstr "PyHoca-GUI Profile Manager - %s (connected)"
 
-#: ../pyhoca/wxgui/profilemanager.py:380
+#: ../pyhoca/wxgui/profilemanager.py:416
 #, python-format
 msgid "PyHoca-GUI Profile Manager - %s"
 msgstr "PyHoca-GUI Profile Manager - %s"
 
-#: ../pyhoca/wxgui/profilemanager.py:751
+#: ../pyhoca/wxgui/profilemanager.py:797
 msgid "Profile"
 msgstr "Profile"
 
-#: ../pyhoca/wxgui/profilemanager.py:752
+#: ../pyhoca/wxgui/profilemanager.py:798
 msgid "Session"
 msgstr "Session"
 
-#: ../pyhoca/wxgui/profilemanager.py:753
+#: ../pyhoca/wxgui/profilemanager.py:799
 msgid "Connection"
 msgstr "Connection"
 
-#: ../pyhoca/wxgui/profilemanager.py:754
+#: ../pyhoca/wxgui/profilemanager.py:800
+msgid "Link Quality"
+msgstr "Link Quality"
+
+#: ../pyhoca/wxgui/profilemanager.py:801
 msgid "Settings"
 msgstr "Settings"
 
-#: ../pyhoca/wxgui/profilemanager.py:755
+#: ../pyhoca/wxgui/profilemanager.py:802
 msgid "Sharing"
 msgstr "Sharing"
 
-#: ../pyhoca/wxgui/profilemanager.py:996
+#: ../pyhoca/wxgui/profilemanager.py:988
 msgid "<xkbtype>"
 msgstr "pc105/us"
 
-#: ../pyhoca/wxgui/profilemanager.py:997
+#: ../pyhoca/wxgui/profilemanager.py:989
 msgid "<xkblayout>"
 msgstr "us"
 
-#: ../pyhoca/wxgui/profilemanager.py:998
+#: ../pyhoca/wxgui/profilemanager.py:990
 msgid "<xkbvariant>"
 msgstr "basic"
 
-#: ../pyhoca/wxgui/profilemanager.py:1284
+#: ../pyhoca/wxgui/profilemanager.py:1444
 msgid "Icon Files (*.png)|*.png|All files (*.*)|*"
 msgstr "Icon Files (*.png)|*.png|All files (*.*)|*"
 
-#: ../pyhoca/wxgui/profilemanager.py:1287
+#: ../pyhoca/wxgui/profilemanager.py:1447
 msgid "Choose an icon for this session profile"
 msgstr "Choose an icon for this session profile"
 
-#: ../pyhoca/wxgui/profilemanager.py:1509
+#: ../pyhoca/wxgui/profilemanager.py:1816
 msgid "All files (*.*)|*"
 msgstr "All files (*.*)|*"
 
-#: ../pyhoca/wxgui/profilemanager.py:1511
-#: ../pyhoca/wxgui/profilemanager.py:1533
+#: ../pyhoca/wxgui/profilemanager.py:1818
+#: ../pyhoca/wxgui/profilemanager.py:1842
 msgid "Choose a public SSH key"
 msgstr "Choose a public SSH key"
 
-#: ../pyhoca/wxgui/profilemanager.py:1784
+#: ../pyhoca/wxgui/profilemanager.py:2220
 msgid "Choose a folder to share within a session"
 msgstr "Choose a folder to share within a session"
 
-#: ../pyhoca/wxgui/profilemanager.py:1912
-#: ../pyhoca/wxgui/profilemanager.py:1915
-#: ../pyhoca/wxgui/profilemanager.py:1918
-#: ../pyhoca/wxgui/profilemanager.py:1923
-#: ../pyhoca/wxgui/profilemanager.py:1933 ../pyhoca/wxgui/menus_taskbar.py:118
+#: ../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
 msgid "Profile Manager"
 msgstr "Profile Manager"
 
-#: ../pyhoca/wxgui/profilemanager.py:1912
+#: ../pyhoca/wxgui/profilemanager.py:2348
 msgid "Profile name is missing, profile unusable!!!"
 msgstr "Profile name is missing, profile unusable!!!"
 
-#: ../pyhoca/wxgui/profilemanager.py:1915
-#: ../pyhoca/wxgui/profilemanager.py:1918
+#: ../pyhoca/wxgui/profilemanager.py:2351
+#: ../pyhoca/wxgui/profilemanager.py:2354
 #, python-format
 msgid "Profile name %s already exists!!!"
 msgstr "Profile name %s already exists!!!"
 
-#: ../pyhoca/wxgui/profilemanager.py:1923
+#: ../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:1933
+#: ../pyhoca/wxgui/profilemanager.py:2369
 #, python-format
 msgid ""
 "Another session profile (%s) already uses [%s]:%s for binding a local SSH "
@@ -671,248 +706,252 @@ msgstr ""
 "proxy to.\n"
 "Please change the SSH proxy settings accordingly."
 
-#: ../pyhoca/wxgui/profilemanager.py:1960
+#: ../pyhoca/wxgui/profilemanager.py:2396
 #, python-format
 msgid "%s - profile added"
 msgstr "%s - profile added"
 
-#: ../pyhoca/wxgui/profilemanager.py:1961
+#: ../pyhoca/wxgui/profilemanager.py:2397
 msgid "A new session profile has been added."
 msgstr "A new session profile has been added."
 
-#: ../pyhoca/wxgui/profilemanager.py:1965
+#: ../pyhoca/wxgui/profilemanager.py:2401
 #, python-format
 msgid "%s - modified"
 msgstr "%s - modified"
 
-#: ../pyhoca/wxgui/profilemanager.py:1966
+#: ../pyhoca/wxgui/profilemanager.py:2402
 msgid "Changes to profile have been saved."
 msgstr "Changes to profile have been saved."
 
-#: ../pyhoca/wxgui/menus_taskbar.py:75
+#: ../pyhoca/wxgui/menus_taskbar.py:74
 msgid "Edit Profile"
 msgstr "Edit Profile"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:78
+#: ../pyhoca/wxgui/menus_taskbar.py:77
 msgid "Use as Template for New Profile"
 msgstr "Use as Template for New Profile"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:79
+#: ../pyhoca/wxgui/menus_taskbar.py:78
 msgid "Delete Profile"
 msgstr "Delete Profile"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:107
+#: ../pyhoca/wxgui/menus_taskbar.py:106
 #, python-format
 msgid "About %s (%s)..."
 msgstr "About %s (%s) ..."
 
-#: ../pyhoca/wxgui/menus_taskbar.py:133
+#: ../pyhoca/wxgui/menus_taskbar.py:132
 msgid "Manage Session Profile"
 msgstr "Manage Session Profile"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:142
+#: ../pyhoca/wxgui/menus_taskbar.py:141
 msgid "Printing Preferences"
 msgstr "Printing Preferences"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:148
+#: ../pyhoca/wxgui/menus_taskbar.py:147
 msgid "Client Options"
 msgstr "Client Options"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:156 ../pyhoca/wxgui/menus_taskbar.py:785
-#: ../pyhoca/wxgui/menus_taskbar.py:977
+#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:783
+#: ../pyhoca/wxgui/menus_taskbar.py:975
 msgid "E&xit"
 msgstr "E&xit"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:228
+#: ../pyhoca/wxgui/menus_taskbar.py:227
 msgid "Window title"
 msgstr "Window title"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:234 ../pyhoca/wxgui/menus_taskbar.py:613
+#: ../pyhoca/wxgui/menus_taskbar.py:233 ../pyhoca/wxgui/menus_taskbar.py:608
 msgid "Resume Session"
 msgstr "Resume Session"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:236
+#: ../pyhoca/wxgui/menus_taskbar.py:235
 msgid "Resume Session (not possible)"
 msgstr "Resume Session (not possible)"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:247
+#: ../pyhoca/wxgui/menus_taskbar.py:246
 msgid "Transfer Session"
 msgstr "Transfer Session"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:249
+#: ../pyhoca/wxgui/menus_taskbar.py:248
 msgid "Transfer Session (not possible)"
 msgstr "Transfer Session (not possible)"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:253 ../pyhoca/wxgui/menus_taskbar.py:604
+#: ../pyhoca/wxgui/menus_taskbar.py:252 ../pyhoca/wxgui/menus_taskbar.py:599
 msgid "Suspend Session (and disconnect/exit)"
 msgstr "Suspend Session (and disconnect/exit)"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:255 ../pyhoca/wxgui/menus_taskbar.py:606
+#: ../pyhoca/wxgui/menus_taskbar.py:254 ../pyhoca/wxgui/menus_taskbar.py:601
 msgid "Suspend Session (and disconnect)"
 msgstr "Suspend Session (and disconnect)"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:257 ../pyhoca/wxgui/menus_taskbar.py:608
+#: ../pyhoca/wxgui/menus_taskbar.py:256 ../pyhoca/wxgui/menus_taskbar.py:603
 msgid "Suspend Session"
 msgstr "Suspend Session"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:263 ../pyhoca/wxgui/menus_taskbar.py:617
+#: ../pyhoca/wxgui/menus_taskbar.py:262 ../pyhoca/wxgui/menus_taskbar.py:612
 msgid "Terminate Session (and disconnect/exit)"
 msgstr "Terminate Session (and disconnect/exit)"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:265 ../pyhoca/wxgui/menus_taskbar.py:619
+#: ../pyhoca/wxgui/menus_taskbar.py:264 ../pyhoca/wxgui/menus_taskbar.py:614
 msgid "Terminate Session (and disconnect)"
 msgstr "Terminate Session (and disconnect)"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:267 ../pyhoca/wxgui/menus_taskbar.py:621
+#: ../pyhoca/wxgui/menus_taskbar.py:266 ../pyhoca/wxgui/menus_taskbar.py:616
 msgid "Terminate Session"
 msgstr "Terminate Session"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:271 ../pyhoca/wxgui/menus_taskbar.py:601
+#: ../pyhoca/wxgui/menus_taskbar.py:270 ../pyhoca/wxgui/menus_taskbar.py:596
 msgid "Refresh menu tree"
 msgstr "Refresh menu tree"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:280
+#: ../pyhoca/wxgui/menus_taskbar.py:279
 msgid "Rename Session Window"
 msgstr "Rename Session Window"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:281
+#: ../pyhoca/wxgui/menus_taskbar.py:280
 msgid "Show Session Window"
 msgstr "Show Session Window"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:321
+#: ../pyhoca/wxgui/menus_taskbar.py:322
 msgid "&Share custom local folder"
 msgstr "&Share custom local folder"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:344
+#: ../pyhoca/wxgui/menus_taskbar.py:337
 msgid "Share:"
 msgstr "Share:"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:355
+#: ../pyhoca/wxgui/menus_taskbar.py:346
 msgid "Unshare:"
 msgstr "Unshare:"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:365
+#: ../pyhoca/wxgui/menus_taskbar.py:354
 msgid "Unshare &all local folders"
 msgstr "Unshare &all local folders"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:445
+#: ../pyhoca/wxgui/menus_taskbar.py:360
+msgid "Restore shares in next session"
+msgstr "Restore shares in next session"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:440
 msgid "Multimedia"
 msgstr "Multimedia"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:446
+#: ../pyhoca/wxgui/menus_taskbar.py:441
 msgid "Development"
 msgstr "Development"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:447
+#: ../pyhoca/wxgui/menus_taskbar.py:442
 msgid "Education"
 msgstr "Education"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:448
+#: ../pyhoca/wxgui/menus_taskbar.py:443
 msgid "Games"
 msgstr "Games"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:449
+#: ../pyhoca/wxgui/menus_taskbar.py:444
 msgid "Graphics"
 msgstr "Graphics"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:450
+#: ../pyhoca/wxgui/menus_taskbar.py:445
 msgid "Internet"
 msgstr "Internet"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:451
+#: ../pyhoca/wxgui/menus_taskbar.py:446
 msgid "Office Applications"
 msgstr "Office Applications"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:452
+#: ../pyhoca/wxgui/menus_taskbar.py:447
 msgid "System"
 msgstr "System"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:453
+#: ../pyhoca/wxgui/menus_taskbar.py:448
 msgid "Utilities"
 msgstr "Utilities"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:454
+#: ../pyhoca/wxgui/menus_taskbar.py:449
 msgid "Other Applications"
 msgstr "Other Applications"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:526 ../pyhoca/wxgui/menus_taskbar.py:538
+#: ../pyhoca/wxgui/menus_taskbar.py:521 ../pyhoca/wxgui/menus_taskbar.py:533
 #, python-format
 msgid "Connect %s"
 msgstr "Connect %s"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:532
+#: ../pyhoca/wxgui/menus_taskbar.py:527
 msgid "Currently connecting..."
 msgstr "Currently connecting..."
 
-#: ../pyhoca/wxgui/menus_taskbar.py:546
+#: ../pyhoca/wxgui/menus_taskbar.py:541
 msgid "Start &new Desktop Session"
 msgstr "Start &new Desktop Session"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:551 ../pyhoca/wxgui/menus_taskbar.py:689
+#: ../pyhoca/wxgui/menus_taskbar.py:546 ../pyhoca/wxgui/menus_taskbar.py:684
 msgid "Retrieving Application Menu..."
 msgstr "Retrieving Application Menu..."
 
-#: ../pyhoca/wxgui/menus_taskbar.py:555 ../pyhoca/wxgui/menus_taskbar.py:692
+#: ../pyhoca/wxgui/menus_taskbar.py:550 ../pyhoca/wxgui/menus_taskbar.py:687
 msgid "Retrieve Application Menu"
 msgstr "Retrieve Application Menu"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:558
+#: ../pyhoca/wxgui/menus_taskbar.py:553
 msgid "Start &new Session"
 msgstr "Start &new Session"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:638
+#: ../pyhoca/wxgui/menus_taskbar.py:633
 msgid "Launch Single Application"
 msgstr "Launch Single Application"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:676
+#: ../pyhoca/wxgui/menus_taskbar.py:671
 msgid "Manage Application Menu"
 msgstr "Manage Application Menu"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:719
+#: ../pyhoca/wxgui/menus_taskbar.py:714
 msgid "Running"
 msgstr "Running"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:721
+#: ../pyhoca/wxgui/menus_taskbar.py:716
 msgid "Suspended"
 msgstr "Suspended"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:740
+#: ../pyhoca/wxgui/menus_taskbar.py:735
 msgid "&Clean all sessions"
 msgstr "&Clean all sessions"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:746
+#: ../pyhoca/wxgui/menus_taskbar.py:741
 msgid "Customize &profile"
 msgstr "Customize &profile"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:758
+#: ../pyhoca/wxgui/menus_taskbar.py:756
 msgid "Shared &folders"
 msgstr "Shared &folders"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:770
+#: ../pyhoca/wxgui/menus_taskbar.py:768
 msgid "&Disconnect from Server"
 msgstr "&Disconnect from Server"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:777
+#: ../pyhoca/wxgui/menus_taskbar.py:775
 msgid "Suspend Session and E&xit application"
 msgstr "Suspend Session and E&xit application"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:781
+#: ../pyhoca/wxgui/menus_taskbar.py:779
 msgid "Disconnect and E&xit application"
 msgstr "Disconnect and E&xit application"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:835
+#: ../pyhoca/wxgui/menus_taskbar.py:833
 msgid "Add Profile"
 msgstr "Add Profile"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:911
+#: ../pyhoca/wxgui/menus_taskbar.py:909
 msgid "No session profiles defined"
 msgstr "No session profiles defined"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:947
+#: ../pyhoca/wxgui/menus_taskbar.py:945
 msgid "Start/Resume Session"
 msgstr "Start/Resume Session"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:947
+#: ../pyhoca/wxgui/menus_taskbar.py:945
 msgid "Connect Server"
 msgstr "Connect Server"
 
@@ -921,107 +960,129 @@ msgstr "Connect Server"
 msgid "About %s ..."
 msgstr "About %s ..."
 
-#: ../pyhoca/wxgui/frontend.py:462
+#: ../pyhoca/wxgui/frontend.py:459
 msgid "Suspending sessions and exiting application..."
 msgstr "Suspending sessions and exiting application..."
 
-#: ../pyhoca/wxgui/frontend.py:465
+#: ../pyhoca/wxgui/frontend.py:462
 #, python-format
 msgid "Disconnecting %s and exiting application..."
 msgstr "Disconnecting %s and exiting application..."
 
-#: ../pyhoca/wxgui/frontend.py:467
+#: ../pyhoca/wxgui/frontend.py:464
 msgid "Exiting application..."
 msgstr "Exiting Application..."
 
-#: ../pyhoca/wxgui/frontend.py:560
+#: ../pyhoca/wxgui/frontend.py:562
 #, python-format
 msgid "%s - server warning"
 msgstr "%s - server warning"
 
-#: ../pyhoca/wxgui/frontend.py:560
+#: ../pyhoca/wxgui/frontend.py:562
 msgid "The X2Go Server does not publish an application menu."
 msgstr "The X2Go Server does not publish an application menu."
 
-#: ../pyhoca/wxgui/frontend.py:610
-msgid "Public SSH key authentication has been successful."
-msgstr "Public SSH key authentication has been successful."
+#: ../pyhoca/wxgui/frontend.py:613
+msgid "SSH key authentication has been successful."
+msgstr "SSH key authentication has been successful."
 
-#: ../pyhoca/wxgui/frontend.py:644
+#: ../pyhoca/wxgui/frontend.py:650
 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:665
+#: ../pyhoca/wxgui/frontend.py:671
 #, python-format
 msgid "%s - EOF error"
 msgstr "%s - EOF error"
 
-#: ../pyhoca/wxgui/frontend.py:665
+#: ../pyhoca/wxgui/frontend.py:671
 msgid "Authentication protocol communication incomplete! Try again..."
 msgstr "Authentication protocol communication incomplete! Try again..."
 
-#: ../pyhoca/wxgui/frontend.py:672
+#: ../pyhoca/wxgui/frontend.py:678
 #, python-format
 msgid "%s - auth key error"
 msgstr "%s - auth key error"
 
-#: ../pyhoca/wxgui/frontend.py:693
+#: ../pyhoca/wxgui/frontend.py:699
 msgid "An unknown error occurred during authentication!"
 msgstr "An unknown error occurred during authentication!"
 
-#: ../pyhoca/wxgui/frontend.py:726
+#: ../pyhoca/wxgui/frontend.py:728
+#, python-format
+msgid "%s: DirectRDP not supported yet"
+msgstr "%s: DirectRDP not supported yet"
+
+#: ../pyhoca/wxgui/frontend.py:729
+#, python-format
+msgid ""
+"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)."
+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)."
+
+#: ../pyhoca/wxgui/frontend.py:741
 msgid "Unknown session profile, configure before using it..."
 msgstr "Unknown session profile, configure before using it..."
 
-#: ../pyhoca/wxgui/frontend.py:784 ../pyhoca/wxgui/frontend.py:1302
+#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:1332
 #, python-format
 msgid "%s - session warning"
 msgstr "%s - session warning"
 
-#: ../pyhoca/wxgui/frontend.py:784
+#: ../pyhoca/wxgui/frontend.py:798
 #, python-format
 msgid "Execution of command ,,%s'' failed."
 msgstr "Execution of command ,,%s'' failed."
 
-#: ../pyhoca/wxgui/frontend.py:926
+#: ../pyhoca/wxgui/frontend.py:939
 msgid "Cleaning X2Go sessions..."
 msgstr "Cleaning X2Go sessions..."
 
-#: ../pyhoca/wxgui/frontend.py:961
+#: ../pyhoca/wxgui/frontend.py:974
 #, python-format
 msgid "%s - disconnect"
 msgstr "%s - disconnect"
 
-#: ../pyhoca/wxgui/frontend.py:961
+#: ../pyhoca/wxgui/frontend.py:974
 msgid "X2Go Profile is now disconnected."
 msgstr "X2Go Profile is now disconnected."
 
-#: ../pyhoca/wxgui/frontend.py:977
+#: ../pyhoca/wxgui/frontend.py:995
 msgid "New Session Profile"
 msgstr "New Session Profile"
 
-#: ../pyhoca/wxgui/frontend.py:1029
+#: ../pyhoca/wxgui/frontend.py:1047
 #, python-format
 msgid "Really Delete Session Profile ,,%s''?"
 msgstr "Really Delete Session Profile ,,%s''?"
 
-#: ../pyhoca/wxgui/frontend.py:1035
+#: ../pyhoca/wxgui/frontend.py:1053
 #, python-format
 msgid "%s - profile deleted"
 msgstr "%s - profile deleted"
 
-#: ../pyhoca/wxgui/frontend.py:1035
+#: ../pyhoca/wxgui/frontend.py:1053
 msgid "The session profile has been deleted."
 msgstr "The session profile has been deleted."
 
-#: ../pyhoca/wxgui/frontend.py:1053
+#: ../pyhoca/wxgui/frontend.py:1071
 #, 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:1194
+#: ../pyhoca/wxgui/frontend.py:1224
 #, python-format
 msgid ""
 "The authenticity of host [%s]:%s can't be established.\n"
@@ -1034,17 +1095,17 @@ msgstr ""
 "\n"
 "Are you sure you want to continue connecting?"
 
-#: ../pyhoca/wxgui/frontend.py:1202
+#: ../pyhoca/wxgui/frontend.py:1232
 #, python-format
 msgid "%s: Confirm Host Authorization"
 msgstr "%s: Confirm Host Authorization"
 
-#: ../pyhoca/wxgui/frontend.py:1247
+#: ../pyhoca/wxgui/frontend.py:1277
 #, python-format
 msgid "%s - channel error"
 msgstr "%s - channel error"
 
-#: ../pyhoca/wxgui/frontend.py:1247
+#: ../pyhoca/wxgui/frontend.py:1277
 #, python-format
 msgid ""
 "Lost connection to server %s unexpectedly! Try to re-authenticate to the "
@@ -1053,22 +1114,22 @@ msgstr ""
 "Lost connection to server %s unexpectedly! Try to re-authenticate to the "
 "server..."
 
-#: ../pyhoca/wxgui/frontend.py:1265 ../pyhoca/wxgui/frontend.py:1283
-#: ../pyhoca/wxgui/frontend.py:1285 ../pyhoca/wxgui/frontend.py:1321
+#: ../pyhoca/wxgui/frontend.py:1295 ../pyhoca/wxgui/frontend.py:1313
+#: ../pyhoca/wxgui/frontend.py:1315 ../pyhoca/wxgui/frontend.py:1351
 #, python-format
 msgid "%s - session failure"
 msgstr "%s - session failure"
 
-#: ../pyhoca/wxgui/frontend.py:1265
+#: ../pyhoca/wxgui/frontend.py:1295
 msgid "The session startup failed."
 msgstr "The session startup failed."
 
-#: ../pyhoca/wxgui/frontend.py:1283
+#: ../pyhoca/wxgui/frontend.py:1313
 #, 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:1285
+#: ../pyhoca/wxgui/frontend.py:1315
 #, python-format
 msgid ""
 "The command ,,%s'' is not available on X2Go server\n"
@@ -1077,7 +1138,7 @@ msgstr ""
 "The command ,,%s'' is not available on X2Go server\n"
 "%s."
 
-#: ../pyhoca/wxgui/frontend.py:1302
+#: ../pyhoca/wxgui/frontend.py:1332
 #, python-format
 msgid ""
 "Reverse TCP port forwarding request for session %s to server port %s has "
@@ -1086,7 +1147,7 @@ msgstr ""
 "Reverse TCP port forwarding request for session %s to server port %s has "
 "been denied."
 
-#: ../pyhoca/wxgui/frontend.py:1321
+#: ../pyhoca/wxgui/frontend.py:1351
 #, python-format
 msgid ""
 "Forwarding tunnel request to [%s]:%s for session %s was denied by remote "
@@ -1095,36 +1156,36 @@ msgstr ""
 "Forwarding tunnel request to [%s]:%s for session %s was denied by remote "
 "X2go/SSH server. Session startup failed."
 
-#: ../pyhoca/wxgui/frontend.py:1340
+#: ../pyhoca/wxgui/frontend.py:1370
 #, python-format
 msgid "%s - audio warning"
 msgstr "%s - audio warning"
 
-#: ../pyhoca/wxgui/frontend.py:1340
+#: ../pyhoca/wxgui/frontend.py:1370
 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:1347 ../pyhoca/wxgui/frontend.py:1354
+#: ../pyhoca/wxgui/frontend.py:1377 ../pyhoca/wxgui/frontend.py:1384
 #, python-format
 msgid "%s - audio error"
 msgstr "%s - audio error"
 
-#: ../pyhoca/wxgui/frontend.py:1347
+#: ../pyhoca/wxgui/frontend.py:1377
 msgid "The X2Go PulseAudio system could not be started."
 msgstr "The X2Go PulseAudio system could not be started."
 
-#: ../pyhoca/wxgui/frontend.py:1354
+#: ../pyhoca/wxgui/frontend.py:1384
 msgid "The X2Go PulseAudio system has died unexpectedly."
 msgstr "The X2Go PulseAudio system has died unexpectedly."
 
-#: ../pyhoca/wxgui/frontend.py:1366
+#: ../pyhoca/wxgui/frontend.py:1396
 #, python-format
 msgid "%s - audio problem"
 msgstr "%s - audio problem"
 
-#: ../pyhoca/wxgui/frontend.py:1366
+#: ../pyhoca/wxgui/frontend.py:1396
 #, python-format
 msgid ""
 "The audio connection could not be set up for this session.\n"
@@ -1133,12 +1194,12 @@ msgstr ""
 "The audio connection could not be set up for this session.\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1378
+#: ../pyhoca/wxgui/frontend.py:1408
 #, python-format
 msgid "%s - client-side printing not available"
 msgstr "%s - client-side printing not available"
 
-#: ../pyhoca/wxgui/frontend.py:1378
+#: ../pyhoca/wxgui/frontend.py:1408
 #, python-format
 msgid ""
 "The server denies client-side printing from within this session.\n"
@@ -1147,12 +1208,12 @@ msgstr ""
 "The server denies client-side printing from within this session.\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1390
+#: ../pyhoca/wxgui/frontend.py:1420
 #, python-format
 msgid "%s - MIME box not available"
 msgstr "%s - MIME box not available"
 
-#: ../pyhoca/wxgui/frontend.py:1390
+#: ../pyhoca/wxgui/frontend.py:1420
 #, python-format
 msgid ""
 "The server does not support the X2Go MIME box.\n"
@@ -1161,12 +1222,12 @@ msgstr ""
 "The server does not support the X2Go MIME box.\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1402
+#: ../pyhoca/wxgui/frontend.py:1432
 #, python-format
 msgid "%s - client-side folders not sharable"
 msgstr "%s - client-side folders not sharable"
 
-#: ../pyhoca/wxgui/frontend.py:1402
+#: ../pyhoca/wxgui/frontend.py:1432
 #, python-format
 msgid ""
 "The server denies client-side folder sharing with this session.\n"
@@ -1175,12 +1236,12 @@ msgstr ""
 "The server denies client-side folder sharing with this session.\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1414
+#: ../pyhoca/wxgui/frontend.py:1444
 #, python-format
 msgid "%s - client resources not sharable"
 msgstr "%s - client resources not sharable"
 
-#: ../pyhoca/wxgui/frontend.py:1414
+#: ../pyhoca/wxgui/frontend.py:1444
 #, python-format
 msgid ""
 "Client-side folders and printers cannot be shared with this session.\n"
@@ -1189,12 +1250,12 @@ msgstr ""
 "Client-side folders and printers cannot be shared with this session.\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1433 ../pyhoca/wxgui/frontend.py:1435
+#: ../pyhoca/wxgui/frontend.py:1463 ../pyhoca/wxgui/frontend.py:1465
 #, python-format
 msgid "%s - print error"
 msgstr "%s - print error"
 
-#: ../pyhoca/wxgui/frontend.py:1433
+#: ../pyhoca/wxgui/frontend.py:1463
 #, python-format
 msgid ""
 "%s\n"
@@ -1205,7 +1266,7 @@ msgstr ""
 "...caused on printer %s by session\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1435
+#: ../pyhoca/wxgui/frontend.py:1465
 #, python-format
 msgid ""
 "%s\n"
@@ -1216,12 +1277,12 @@ msgstr ""
 "...caused by session\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1450 ../pyhoca/wxgui/frontend.py:1465
+#: ../pyhoca/wxgui/frontend.py:1480 ../pyhoca/wxgui/frontend.py:1495
 #, python-format
 msgid "%s - start"
 msgstr "%s - start"
 
-#: ../pyhoca/wxgui/frontend.py:1450
+#: ../pyhoca/wxgui/frontend.py:1480
 #, python-format
 msgid ""
 "New X2Go session starting up...\n"
@@ -1230,7 +1291,7 @@ msgstr ""
 "New X2Go session starting up...\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1465
+#: ../pyhoca/wxgui/frontend.py:1495
 #, python-format
 msgid ""
 "Another client started X2Go session\n"
@@ -1239,12 +1300,12 @@ msgstr ""
 "Another client started X2Go session\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1480 ../pyhoca/wxgui/frontend.py:1495
+#: ../pyhoca/wxgui/frontend.py:1510 ../pyhoca/wxgui/frontend.py:1525
 #, python-format
 msgid "%s - resume"
 msgstr "%s - resume"
 
-#: ../pyhoca/wxgui/frontend.py:1480
+#: ../pyhoca/wxgui/frontend.py:1510
 #, python-format
 msgid ""
 "Resuming X2Go session...\n"
@@ -1253,7 +1314,7 @@ msgstr ""
 "Resuming X2Go session...\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1495
+#: ../pyhoca/wxgui/frontend.py:1525
 #, python-format
 msgid ""
 "Another client resumed X2Go session\n"
@@ -1262,12 +1323,12 @@ msgstr ""
 "Another client resumed X2Go session\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1510
+#: ../pyhoca/wxgui/frontend.py:1540
 #, python-format
 msgid "%s - running"
 msgstr "%s - running"
 
-#: ../pyhoca/wxgui/frontend.py:1510
+#: ../pyhoca/wxgui/frontend.py:1540
 #, python-format
 msgid ""
 "Found already running session\n"
@@ -1276,12 +1337,12 @@ msgstr ""
 "Found already running session\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1530
+#: ../pyhoca/wxgui/frontend.py:1560
 #, python-format
 msgid "%s - suspend"
 msgstr "%s - suspend"
 
-#: ../pyhoca/wxgui/frontend.py:1530
+#: ../pyhoca/wxgui/frontend.py:1560
 #, python-format
 msgid ""
 "X2Go Session has been suspended\n"
@@ -1290,12 +1351,12 @@ msgstr ""
 "X2Go Session has been suspended\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1557
+#: ../pyhoca/wxgui/frontend.py:1587
 #, python-format
 msgid "%s - terminate"
 msgstr "%s - terminate"
 
-#: ../pyhoca/wxgui/frontend.py:1557
+#: ../pyhoca/wxgui/frontend.py:1587
 #, python-format
 msgid ""
 "X2Go Session has terminated\n"
@@ -1304,7 +1365,7 @@ msgstr ""
 "X2Go Session has terminated\n"
 "%s"
 
-#: ../pyhoca/wxgui/messages.py:74
+#: ../pyhoca/wxgui/messages.py:73
 #, python-format
 msgid ""
 "Are you really sure you want to\n"
@@ -1313,7 +1374,7 @@ msgstr ""
 "Are you really sure you want to\n"
 "delete the session profile ,,%s''?"
 
-#: ../pyhoca/wxgui/messages.py:75
+#: ../pyhoca/wxgui/messages.py:74
 #, python-format
 msgid ""
 "PyHoca-GUI is already running for user ,,%s''!\n"
@@ -1328,15 +1389,15 @@ msgstr ""
 "user. The PyHoca-GUI icon can be found in your desktops's\n"
 "notification area/systray."
 
-#: ../pyhoca/wxgui/messages.py:108
+#: ../pyhoca/wxgui/messages.py:107
 msgid "Yes"
 msgstr "Yes"
 
-#: ../pyhoca/wxgui/messages.py:109
+#: ../pyhoca/wxgui/messages.py:108
 msgid "No"
 msgstr "No"
 
-#: ../pyhoca/wxgui/messages.py:126 ../pyhoca/wxgui/printingprefs.py:142
+#: ../pyhoca/wxgui/messages.py:125 ../pyhoca/wxgui/printingprefs.py:142
 msgid "Ok"
 msgstr "Ok"
 
@@ -1439,6 +1500,20 @@ msgstr "Change session title to"
 msgid "OK"
 msgstr "OK"
 
+#, fuzzy
+#~ msgid "Remember shared folders"
+#~ msgstr "Shared &folders"
+
+#, fuzzy
+#~ msgid "Shared Resources"
+#~ msgstr "Shared &folders"
+
+#~ msgid "RSA/DSA private key"
+#~ msgstr "RSA/DSA private key"
+
+#~ msgid "Host[:Port]"
+#~ msgstr "Host[:Port]"
+
 #~ msgid "us"
 #~ msgstr "us"
 
diff --git a/po/es.po b/po/es.po
index b7ee7cd..1574d9f 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,144 +11,144 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PyHoca-GUI VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-10 21:18+0200\n"
-"PO-Revision-Date: 2012-06-01 09:28+0200\n"
-"Last-Translator: Ricardo Díaz Martín <oceanosoftlapalma at gmail.com>\n"
-"Language-Team: Español; Castellano <>\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"
+"Language-Team: X2Go i18n <x2go-i18n at lists.berlios.de>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bits\n"
+"Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Spanish\n"
 "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"
 
-#: ../pyhoca/wxgui/logon.py:92
+#: ../pyhoca/wxgui/logon.py:86
 #, python-format
 msgid "%s (via %s)"
 msgstr "%s (vía %s)"
 
-#: ../pyhoca/wxgui/logon.py:96 ../pyhoca/wxgui/logon.py:108
+#: ../pyhoca/wxgui/logon.py:90 ../pyhoca/wxgui/logon.py:102
 msgid "Username"
 msgstr "Nombre de usuario"
 
-#: ../pyhoca/wxgui/logon.py:98 ../pyhoca/wxgui/logon.py:110
+#: ../pyhoca/wxgui/logon.py:92 ../pyhoca/wxgui/logon.py:104
 msgid "Password"
 msgstr "Contraseña"
 
-#: ../pyhoca/wxgui/logon.py:101
+#: ../pyhoca/wxgui/logon.py:95
 msgid "Authenticate"
 msgstr "Autenticar"
 
-#: ../pyhoca/wxgui/logon.py:113
+#: ../pyhoca/wxgui/logon.py:107
 msgid "  Start SSH tunnel  "
 msgstr "  Iniciar tunel SSH   "
 
-#: ../pyhoca/wxgui/logon.py:121
+#: ../pyhoca/wxgui/logon.py:115
 msgid "Session login"
 msgstr "Inicio de sesión"
 
-#: ../pyhoca/wxgui/logon.py:122
+#: ../pyhoca/wxgui/logon.py:116
 msgid "SSH proxy server login"
 msgstr "Inicio de sesión en el servidor proxy SSH"
 
-#: ../pyhoca/wxgui/logon.py:133 ../pyhoca/wxgui/profilemanager.py:322
-#: ../pyhoca/wxgui/messages.py:132 ../pyhoca/wxgui/printingprefs.py:147
+#: ../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
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../pyhoca/wxgui/logon.py:292 ../pyhoca/wxgui/logon.py:334
-#: ../pyhoca/wxgui/frontend.py:603
+#: ../pyhoca/wxgui/logon.py:297 ../pyhoca/wxgui/logon.py:339
+#: ../pyhoca/wxgui/frontend.py:606
 #, python-format
 msgid "%s - connect failure"
 msgstr "%s - fallo en la conexión"
 
-#: ../pyhoca/wxgui/logon.py:293 ../pyhoca/wxgui/frontend.py:603
+#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:606
 msgid "User is not allowed to start X2Go sessions!"
 msgstr "¡El usuario no tiene permisos para iniciar sesiones X2go!"
 
-#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:610
+#: ../pyhoca/wxgui/logon.py:303 ../pyhoca/wxgui/frontend.py:613
 #, python-format
 msgid "%s - connect"
 msgstr "%s - conectado"
 
-#: ../pyhoca/wxgui/logon.py:299
+#: ../pyhoca/wxgui/logon.py:304
 msgid "Authentication has been successful."
 msgstr "Inicio de sesión correcto."
 
-#: ../pyhoca/wxgui/logon.py:330
+#: ../pyhoca/wxgui/logon.py:335
 msgid "SSH tunnel started"
 msgstr "Iniciado tunel SSH"
 
-#: ../pyhoca/wxgui/logon.py:335
+#: ../pyhoca/wxgui/logon.py:340
 msgid "Authentication failed!"
 msgstr "¡Error en el nombre de usuario o contraseña!"
 
-#: ../pyhoca/wxgui/logon.py:342
+#: ../pyhoca/wxgui/logon.py:348
 #, python-format
 msgid "%s - SSH proxy"
 msgstr "%s - proxy SSH"
 
-#: ../pyhoca/wxgui/logon.py:343
+#: ../pyhoca/wxgui/logon.py:349
 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:365 ../pyhoca/wxgui/frontend.py:658
+#: ../pyhoca/wxgui/logon.py:376 ../pyhoca/wxgui/frontend.py:664
 #, python-format
 msgid "%s - socket error"
 msgstr "%s - error de socket"
 
-#: ../pyhoca/wxgui/logon.py:372 ../pyhoca/wxgui/frontend.py:637
-#: ../pyhoca/wxgui/frontend.py:644
+#: ../pyhoca/wxgui/logon.py:383 ../pyhoca/wxgui/frontend.py:643
+#: ../pyhoca/wxgui/frontend.py:650
 #, python-format
 msgid "%s - host key error"
 msgstr "%s - error en la clave del equipo"
 
-#: ../pyhoca/wxgui/logon.py:373 ../pyhoca/wxgui/frontend.py:637
+#: ../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 ""
 "La clave del servidor remoto no es válida o no ha sido aceptada por el "
 "usuario"
 
-#: ../pyhoca/wxgui/logon.py:380 ../pyhoca/wxgui/frontend.py:679
+#: ../pyhoca/wxgui/logon.py:391 ../pyhoca/wxgui/frontend.py:685
 #, python-format
 msgid "%s - missing home directory"
 msgstr "%s - carpeta home desconocida"
 
-#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:679
+#: ../pyhoca/wxgui/logon.py:392 ../pyhoca/wxgui/frontend.py:685
 msgid "The remote user's home directory does not exist."
 msgstr "La carpeta home del usuario no existe en el servidor"
 
-#: ../pyhoca/wxgui/logon.py:388
+#: ../pyhoca/wxgui/logon.py:399
 #, python-format
 msgid "%s - key error"
 msgstr "%s - error en la clave"
 
-#: ../pyhoca/wxgui/logon.py:396 ../pyhoca/wxgui/frontend.py:686
+#: ../pyhoca/wxgui/logon.py:407 ../pyhoca/wxgui/frontend.py:692
 #, python-format
 msgid "%s - auth error"
 msgstr "%s - error en la autenticación"
 
-#: ../pyhoca/wxgui/logon.py:404 ../pyhoca/wxgui/frontend.py:630
+#: ../pyhoca/wxgui/logon.py:415 ../pyhoca/wxgui/frontend.py:636
 #, python-format
 msgid "%s - SSH error"
 msgstr "%s - error de SSH"
 
-#: ../pyhoca/wxgui/logon.py:412
+#: ../pyhoca/wxgui/logon.py:423
 #, python-format
 msgid "%s - unknown error"
 msgstr "%s - error desconocido"
 
-#: ../pyhoca/wxgui/logon.py:413
+#: ../pyhoca/wxgui/logon.py:424
 msgid "An unknown error occured during authentication!"
 msgstr ""
 "¡Error desconocido al tratar de validar el nombre de usuario y la contraseña!"
 
-#: ../pyhoca/wxgui/taskbar.py:92
+#: ../pyhoca/wxgui/taskbar.py:89
 #, python-format
 msgid ""
 "PyHoca-GUI\n"
@@ -157,7 +157,7 @@ msgstr ""
 "PyHoca-GUI\n"
 "Conectando a \"%s\""
 
-#: ../pyhoca/wxgui/taskbar.py:96
+#: ../pyhoca/wxgui/taskbar.py:93
 #, python-format
 msgid ""
 "PyHoca-GUI (Python X2goClient)\n"
@@ -166,7 +166,7 @@ msgstr ""
 "PyHoca-GUI (Python X2goClient)\n"
 "Conectando con tu servidor remoto X2Go \"%s\""
 
-#: ../pyhoca/wxgui/taskbar.py:106
+#: ../pyhoca/wxgui/taskbar.py:103
 msgid ""
 "PyHoca-GUI\n"
 "Connecting you to X2Go..."
@@ -174,7 +174,7 @@ msgstr ""
 "PyHoca-GUI\n"
 "Conectando a X2Go..."
 
-#: ../pyhoca/wxgui/taskbar.py:110
+#: ../pyhoca/wxgui/taskbar.py:107
 msgid ""
 "PyHoca-GUI (Python X2goClient)\n"
 "Client for connecting you to a remote X2Go server"
@@ -182,280 +182,309 @@ msgstr ""
 "PyHoca-GUI (Python X2goClient)\n"
 "Cliente para conexiones remotas a servidores X2go"
 
-#: ../pyhoca/wxgui/profilemanager.py:82
+#: ../pyhoca/wxgui/profilemanager.py:79
 msgid "GNOME Desktop (GNOME)"
 msgstr "GNOME Desktop (GNOME)"
 
-#: ../pyhoca/wxgui/profilemanager.py:83
+#: ../pyhoca/wxgui/profilemanager.py:80
 msgid "K Desktop Environment (KDE)"
 msgstr "K Desktop Environment (KDE)"
 
-#: ../pyhoca/wxgui/profilemanager.py:84
+#: ../pyhoca/wxgui/profilemanager.py:81
 msgid "Lightweight X Desktop (LXDE)"
 msgstr "Lightweight X Desktop (LXDE)"
 
-#: ../pyhoca/wxgui/profilemanager.py:85
+#: ../pyhoca/wxgui/profilemanager.py:82
 msgid "Trinity X Desktop (KDE3-like)"
 msgstr "Trinity X Desktop (similar a KDE3)"
 
-#: ../pyhoca/wxgui/profilemanager.py:86
+#: ../pyhoca/wxgui/profilemanager.py:83
 msgid "Unity X Desktop Shell (UNITY)"
 msgstr "Unity X Desktop Shell (UNITY)"
 
-#: ../pyhoca/wxgui/profilemanager.py:87
-msgid "XFCE4 Desktop (XFCE4)"
-msgstr "XFCE4 Desktop (XFCE4)"
+#: ../pyhoca/wxgui/profilemanager.py:84
+msgid "XFCE Desktop (XFCE)"
+msgstr "XFCE Desktop (XFCE)"
 
-#: ../pyhoca/wxgui/profilemanager.py:88
+#: ../pyhoca/wxgui/profilemanager.py:85
 msgid "Published Applications"
 msgstr "Aplicaciones publicadas"
 
-#: ../pyhoca/wxgui/profilemanager.py:89
+#: ../pyhoca/wxgui/profilemanager.py:86
 msgid "Single Application"
 msgstr "Aplicación"
 
-#: ../pyhoca/wxgui/profilemanager.py:90
+#: ../pyhoca/wxgui/profilemanager.py:87
 msgid "XDMCP Query"
 msgstr "XDMCP Query"
 
-#: ../pyhoca/wxgui/profilemanager.py:91
-msgid "Windows Terminal Server (RDP-proxy)"
-msgstr "Windows Terminal Server (RDP-proxy)"
+#: ../pyhoca/wxgui/profilemanager.py:88
+msgid "Windows Terminal Server (X2Go-proxied RDP)"
+msgstr "Windows Terminal Server (RDP sobre X2Go)"
+
+#: ../pyhoca/wxgui/profilemanager.py:89
+msgid "Windows Terminal Server (Direct RDP)"
+msgstr "Windows Terminal Server (RDP Directo)"
 
-#. 'DirectRDP': 'Windows Terminal Server (RDP-direct)',
-#: ../pyhoca/wxgui/profilemanager.py:93 ../pyhoca/wxgui/profilemanager.py:207
+#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/profilemanager.py:224
 msgid "Custom command"
 msgstr "Comando personalizado"
 
-#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:398
+#: ../pyhoca/wxgui/profilemanager.py:95 ../pyhoca/wxgui/menus_taskbar.py:393
 msgid "Internet Browser"
 msgstr "Navegador web"
 
-#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:399
+#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:394
 msgid "Email Client"
 msgstr "Cliente de Correo"
 
-#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:400
+#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:395
 msgid "Office"
 msgstr "Office"
 
-#: ../pyhoca/wxgui/profilemanager.py:99 ../pyhoca/wxgui/menus_taskbar.py:401
+#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:396
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../pyhoca/wxgui/profilemanager.py:113
+#: ../pyhoca/wxgui/profilemanager.py:116
 msgid "Open file with system's default application"
 msgstr "Abrir archivo con la aplicación por defecto"
 
-#: ../pyhoca/wxgui/profilemanager.py:114
+#: ../pyhoca/wxgui/profilemanager.py:117
 msgid "Open application chooser dialog"
 msgstr "Abrir selector de aplicaciones"
 
-#: ../pyhoca/wxgui/profilemanager.py:115
+#: ../pyhoca/wxgui/profilemanager.py:118
 msgid "Save incoming file as ..."
 msgstr "Guardar archivo recibido como ..."
 
-#: ../pyhoca/wxgui/profilemanager.py:143
+#: ../pyhoca/wxgui/profilemanager.py:146
 msgid "settings derived from "
 msgstr "configuraciones recuperadas de "
 
 #. boxes for all tabs
-#: ../pyhoca/wxgui/profilemanager.py:160
+#: ../pyhoca/wxgui/profilemanager.py:167
 msgid "Session Title"
 msgstr "Título de la Sesión"
 
-#: ../pyhoca/wxgui/profilemanager.py:161
+#: ../pyhoca/wxgui/profilemanager.py:168
 msgid "Session Window"
 msgstr "Ventana de Sesión"
 
-#: ../pyhoca/wxgui/profilemanager.py:162
+#: ../pyhoca/wxgui/profilemanager.py:169
 msgid "Session Startup"
 msgstr "Inicio de Sesión"
 
-#: ../pyhoca/wxgui/profilemanager.py:163
+#: ../pyhoca/wxgui/profilemanager.py:170
 msgid "Server"
 msgstr "Servidor"
 
-#: ../pyhoca/wxgui/profilemanager.py:164
+#: ../pyhoca/wxgui/profilemanager.py:171
+msgid "Proxy"
+msgstr "Proxy"
+
+#: ../pyhoca/wxgui/profilemanager.py:172
 msgid "Connection Link Speed"
 msgstr "Velocidad de conexión"
 
-#: ../pyhoca/wxgui/profilemanager.py:165
+#: ../pyhoca/wxgui/profilemanager.py:173
 msgid "Compression"
 msgstr "Compresión"
 
-#: ../pyhoca/wxgui/profilemanager.py:166
+#: ../pyhoca/wxgui/profilemanager.py:174
 msgid "Display"
 msgstr "Pantalla"
 
-#: ../pyhoca/wxgui/profilemanager.py:167
+#: ../pyhoca/wxgui/profilemanager.py:175
 msgid "Keyboard"
 msgstr "Teclado"
 
-#: ../pyhoca/wxgui/profilemanager.py:168
+#: ../pyhoca/wxgui/profilemanager.py:176
 msgid "Sound"
 msgstr "Sonido"
 
-#: ../pyhoca/wxgui/profilemanager.py:169
+#: ../pyhoca/wxgui/profilemanager.py:177
 msgid "Printing"
 msgstr "Impresora"
 
-#: ../pyhoca/wxgui/profilemanager.py:170
+#: ../pyhoca/wxgui/profilemanager.py:178
 msgid "Folder Exports"
 msgstr "Carpeta de Exportaciones"
 
-#: ../pyhoca/wxgui/profilemanager.py:171
+#: ../pyhoca/wxgui/profilemanager.py:179
 msgid "File Import"
 msgstr "Importar Archivo"
 
 #. ##
 #. ## widgets for the PROFILE tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:176
+#: ../pyhoca/wxgui/profilemanager.py:184
 msgid "Name"
 msgstr "Nombre"
 
-#: ../pyhoca/wxgui/profilemanager.py:183
+#: ../pyhoca/wxgui/profilemanager.py:191
 msgid "Set session window title"
 msgstr "Establecer título de la sesión"
 
-#: ../pyhoca/wxgui/profilemanager.py:184
+#: ../pyhoca/wxgui/profilemanager.py:192
 msgid "Use a default session window title"
 msgstr "Usar título de sesión por defecto"
 
-#: ../pyhoca/wxgui/profilemanager.py:185
+#: ../pyhoca/wxgui/profilemanager.py:193
 msgid "Custom session window title"
 msgstr "Título de sesión personalizado"
 
-#: ../pyhoca/wxgui/profilemanager.py:195
+#: ../pyhoca/wxgui/profilemanager.py:212
 msgid "Window Icon"
 msgstr "Icono de la ventana"
 
 #. ##
 #. ## widgets for the SESSION tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:201
+#: ../pyhoca/wxgui/profilemanager.py:218
 msgid "Start session automatically after login"
 msgstr "Iniciar sesión automáticamente tras el login"
 
-#: ../pyhoca/wxgui/profilemanager.py:202
+#: ../pyhoca/wxgui/profilemanager.py:219
 #, python-format
 msgid "Login automatically after %s has started"
 msgstr "El inicio de sesión automático ha comenzado tras %s"
 
-#: ../pyhoca/wxgui/profilemanager.py:203
+#: ../pyhoca/wxgui/profilemanager.py:220
 msgid "Type"
 msgstr "Tipo"
 
-#: ../pyhoca/wxgui/profilemanager.py:205
+#: ../pyhoca/wxgui/profilemanager.py:222
 msgid "Application"
 msgstr "Aplicación"
 
-#: ../pyhoca/wxgui/profilemanager.py:209
+#: ../pyhoca/wxgui/profilemanager.py:226
 msgid "XDMCP server"
 msgstr "Servidor XDMCP"
 
-#: ../pyhoca/wxgui/profilemanager.py:211
+#: ../pyhoca/wxgui/profilemanager.py:228
 msgid "RDP server"
 msgstr "Servidor RDP"
 
-#: ../pyhoca/wxgui/profilemanager.py:213
+#: ../pyhoca/wxgui/profilemanager.py:230
 msgid "RDP options"
 msgstr "Opciones RDP"
 
-#: ../pyhoca/wxgui/profilemanager.py:215
+#: ../pyhoca/wxgui/profilemanager.py:232
 msgid "Integrate remote application(s) into local desktop (rootless mode)"
 msgstr "Integrar aplicaciones en el escritorio local (modo rootless)"
 
-#: ../pyhoca/wxgui/profilemanager.py:216
+#: ../pyhoca/wxgui/profilemanager.py:233
 msgid "Menu of published applications"
 msgstr "Menú de aplicaciones publicadas"
 
 #. ##
 #. ## widgets for the CONNECTION tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:223 ../pyhoca/wxgui/profilemanager.py:233
+#: ../pyhoca/wxgui/profilemanager.py:240 ../pyhoca/wxgui/profilemanager.py:253
 msgid "User"
 msgstr "Usuario"
 
-#: ../pyhoca/wxgui/profilemanager.py:225
+#: ../pyhoca/wxgui/profilemanager.py:242 ../pyhoca/wxgui/profilemanager.py:260
 msgid "Host"
 msgstr "Host"
 
-#: ../pyhoca/wxgui/profilemanager.py:227
+#: ../pyhoca/wxgui/profilemanager.py:244 ../pyhoca/wxgui/profilemanager.py:262
 msgid "Port"
 msgstr "Puerto"
 
-#: ../pyhoca/wxgui/profilemanager.py:229
-msgid "RSA/DSA private key"
-msgstr "Clave privada RSA/DSA"
+#: ../pyhoca/wxgui/profilemanager.py:246
+msgid "Key"
+msgstr "Clave"
+
+#: ../pyhoca/wxgui/profilemanager.py:249
+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:232
+#: ../pyhoca/wxgui/profilemanager.py:251
+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
 msgid "Server behind SSH proxy"
 msgstr "Servidor detrás del proxy SSH"
 
-#: ../pyhoca/wxgui/profilemanager.py:235
+#: ../pyhoca/wxgui/profilemanager.py:255
+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
+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
 msgid "Key file"
 msgstr "Clave"
 
-#: ../pyhoca/wxgui/profilemanager.py:238
-msgid "Host[:Port]"
-msgstr "Host[:Puerto]"
-
-#: ../pyhoca/wxgui/profilemanager.py:240
+#: ../pyhoca/wxgui/profilemanager.py:264
 msgid "SSH Proxy Tunnel"
 msgstr "Tunel Proxy SSH"
 
-#: ../pyhoca/wxgui/profilemanager.py:248
+#: ../pyhoca/wxgui/profilemanager.py:270
+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
 msgid "Modem"
 msgstr "Módem"
 
-#: ../pyhoca/wxgui/profilemanager.py:249
+#: ../pyhoca/wxgui/profilemanager.py:274
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../pyhoca/wxgui/profilemanager.py:250
+#: ../pyhoca/wxgui/profilemanager.py:275
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../pyhoca/wxgui/profilemanager.py:251
+#: ../pyhoca/wxgui/profilemanager.py:276
 msgid "WAN"
 msgstr "WAN"
 
-#: ../pyhoca/wxgui/profilemanager.py:252
+#: ../pyhoca/wxgui/profilemanager.py:277
 msgid "LAN"
 msgstr "LAN"
 
-#: ../pyhoca/wxgui/profilemanager.py:254
+#: ../pyhoca/wxgui/profilemanager.py:279
 msgid "Method"
 msgstr "Método"
 
-#: ../pyhoca/wxgui/profilemanager.py:256
+#: ../pyhoca/wxgui/profilemanager.py:281
 msgid "Image quality"
 msgstr "Calidad de imagen"
 
 #. ##
 #. ## wigdets for the SETTINGS tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:262
+#: ../pyhoca/wxgui/profilemanager.py:287
 msgid "Fullscreen"
 msgstr "Pantalla Completa"
 
-#: ../pyhoca/wxgui/profilemanager.py:263
+#: ../pyhoca/wxgui/profilemanager.py:288
+msgid "Maximized"
+msgstr "Maximizada"
+
+#: ../pyhoca/wxgui/profilemanager.py:289
 msgid "Custom Size"
 msgstr "Tamaño Personalizado"
 
-#: ../pyhoca/wxgui/profilemanager.py:268
+#: ../pyhoca/wxgui/profilemanager.py:294
 msgid "Set display DPI"
 msgstr "Establecer DPI"
 
-#: ../pyhoca/wxgui/profilemanager.py:270
+#: ../pyhoca/wxgui/profilemanager.py:296
 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:271
+#: ../pyhoca/wxgui/profilemanager.py:297
 msgid ""
 "Automatically detect and use client-side keyboard configuration inside the "
 "session"
@@ -463,215 +492,223 @@ msgstr ""
 "Detectar automáticamente y usar la configuración de teclado del lado del "
 "cliente en la sesión remota"
 
-#: ../pyhoca/wxgui/profilemanager.py:272
+#: ../pyhoca/wxgui/profilemanager.py:298
 msgid "Use custom keyboard settings as provided below"
 msgstr "Ussar configuración de teclado personalizada"
 
-#: ../pyhoca/wxgui/profilemanager.py:273
+#: ../pyhoca/wxgui/profilemanager.py:299
 msgid "Keyboard model"
 msgstr "Modelo de teclado"
 
-#: ../pyhoca/wxgui/profilemanager.py:275
+#: ../pyhoca/wxgui/profilemanager.py:301
 msgid "Layout"
 msgstr "Capa"
 
-#: ../pyhoca/wxgui/profilemanager.py:277
+#: ../pyhoca/wxgui/profilemanager.py:303
 msgid "Layout variant"
 msgstr "Variante de la capa"
 
-#: ../pyhoca/wxgui/profilemanager.py:279
+#: ../pyhoca/wxgui/profilemanager.py:305
 msgid "Enable sound support"
 msgstr "Activar soporte de sonido"
 
-#: ../pyhoca/wxgui/profilemanager.py:280
+#: ../pyhoca/wxgui/profilemanager.py:306
 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:284
+#: ../pyhoca/wxgui/profilemanager.py:310
 msgid "Arts (not supported)"
 msgstr "Arts (sin soporte)"
 
-#: ../pyhoca/wxgui/profilemanager.py:287
+#: ../pyhoca/wxgui/profilemanager.py:313
 msgid "esd"
 msgstr "esd"
 
-#: ../pyhoca/wxgui/profilemanager.py:288
+#: ../pyhoca/wxgui/profilemanager.py:314
 msgid "Use default sound port"
 msgstr "Usar puerto de sonido por defecto"
 
-#: ../pyhoca/wxgui/profilemanager.py:289
+#: ../pyhoca/wxgui/profilemanager.py:315
 msgid "Custom sound port"
 msgstr "Puerto de sonido personalizado"
 
-#: ../pyhoca/wxgui/profilemanager.py:291
-msgid "Client Side printing"
-msgstr "Impresión local"
-
-#: ../pyhoca/wxgui/profilemanager.py:293
+#: ../pyhoca/wxgui/profilemanager.py:318
 msgid "Use local folder sharing"
 msgstr "Compartir carpetas locales"
 
-#: ../pyhoca/wxgui/profilemanager.py:294
+#: ../pyhoca/wxgui/profilemanager.py:319
+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
 msgid "Path"
 msgstr "Ruta"
 
-#: ../pyhoca/wxgui/profilemanager.py:297 ../pyhoca/wxgui/profilemanager.py:316
+#: ../pyhoca/wxgui/profilemanager.py:323 ../pyhoca/wxgui/profilemanager.py:344
 msgid "Add"
 msgstr "Añadir"
 
-#: ../pyhoca/wxgui/profilemanager.py:299
+#: ../pyhoca/wxgui/profilemanager.py:325
 msgid "Local Path"
 msgstr "Ruta Local"
 
-#: ../pyhoca/wxgui/profilemanager.py:300
+#: ../pyhoca/wxgui/profilemanager.py:326
 msgid "Connect Method"
 msgstr "Método de Conexión"
 
-#: ../pyhoca/wxgui/profilemanager.py:301
+#: ../pyhoca/wxgui/profilemanager.py:327
 msgid "Delete"
 msgstr "Eliminar"
 
-#: ../pyhoca/wxgui/profilemanager.py:303
+#: ../pyhoca/wxgui/profilemanager.py:329
 msgid "Convert between client and server encodings"
 msgstr "Convertir codificaciones entre cliente y servidor"
 
-#: ../pyhoca/wxgui/profilemanager.py:304
+#: ../pyhoca/wxgui/profilemanager.py:330
 msgid "Client encoding"
 msgstr "Codificación del cliente"
 
-#: ../pyhoca/wxgui/profilemanager.py:306
+#: ../pyhoca/wxgui/profilemanager.py:332
 msgid "Server encoding"
 msgstr "Codificación del Servidor"
 
-#: ../pyhoca/wxgui/profilemanager.py:309
+#: ../pyhoca/wxgui/profilemanager.py:335
 msgid "Use file MIME box for local file import"
 msgstr "Usar tipo de archivo MIME para la importación local"
 
-#: ../pyhoca/wxgui/profilemanager.py:310
+#: ../pyhoca/wxgui/profilemanager.py:336
 msgid "Extensions"
 msgstr "Extensiones"
 
-#: ../pyhoca/wxgui/profilemanager.py:312
+#: ../pyhoca/wxgui/profilemanager.py:338
 msgid "Action"
 msgstr "Acción"
 
-#: ../pyhoca/wxgui/profilemanager.py:317
+#: ../pyhoca/wxgui/profilemanager.py:341
+msgid "Client Side printing"
+msgstr "Impresión local"
+
+#: ../pyhoca/wxgui/profilemanager.py:345
 msgid "Defaults"
 msgstr "Valores por defecto"
 
-#: ../pyhoca/wxgui/profilemanager.py:319
+#: ../pyhoca/wxgui/profilemanager.py:347
 msgid "Save"
 msgstr "Guardar"
 
-#: ../pyhoca/wxgui/profilemanager.py:320
+#: ../pyhoca/wxgui/profilemanager.py:348
 msgid "Reset"
 msgstr "Reiniciar"
 
-#: ../pyhoca/wxgui/profilemanager.py:365
-#: ../pyhoca/wxgui/profilemanager.py:1078
-#: ../pyhoca/wxgui/profilemanager.py:1832
+#: ../pyhoca/wxgui/profilemanager.py:401
+#: ../pyhoca/wxgui/profilemanager.py:1124
+#: ../pyhoca/wxgui/profilemanager.py:2268
 msgid "automatically"
 msgstr "automáticamente"
 
-#: ../pyhoca/wxgui/profilemanager.py:367
-#: ../pyhoca/wxgui/profilemanager.py:1080
+#: ../pyhoca/wxgui/profilemanager.py:403
+#: ../pyhoca/wxgui/profilemanager.py:1126
 msgid "manually"
 msgstr "manualmente"
 
-#: ../pyhoca/wxgui/profilemanager.py:376
+#: ../pyhoca/wxgui/profilemanager.py:412
 msgid "PyHoca-GUI Profile Manager - new profile"
 msgstr "PyHoca-GUI Gestor de Perfiles - nuevo perfil"
 
-#: ../pyhoca/wxgui/profilemanager.py:378
+#: ../pyhoca/wxgui/profilemanager.py:414
 #, python-format
 msgid "PyHoca-GUI Profile Manager - %s (connected)"
 msgstr "PyHoca-GUI Gestor de Perfiles - %s (conectado)"
 
-#: ../pyhoca/wxgui/profilemanager.py:380
+#: ../pyhoca/wxgui/profilemanager.py:416
 #, python-format
 msgid "PyHoca-GUI Profile Manager - %s"
 msgstr "PyHoca-GUI Gestor de Perfiles - %s"
 
-#: ../pyhoca/wxgui/profilemanager.py:751
+#: ../pyhoca/wxgui/profilemanager.py:797
 msgid "Profile"
 msgstr "Perfil"
 
-#: ../pyhoca/wxgui/profilemanager.py:752
+#: ../pyhoca/wxgui/profilemanager.py:798
 msgid "Session"
 msgstr "Sesión"
 
-#: ../pyhoca/wxgui/profilemanager.py:753
+#: ../pyhoca/wxgui/profilemanager.py:799
 msgid "Connection"
 msgstr "Conexión"
 
-#: ../pyhoca/wxgui/profilemanager.py:754
+#: ../pyhoca/wxgui/profilemanager.py:800
+msgid "Link Quality"
+msgstr "Calidad del enlace"
+
+#: ../pyhoca/wxgui/profilemanager.py:801
 msgid "Settings"
 msgstr "Opciones"
 
-#: ../pyhoca/wxgui/profilemanager.py:755
+#: ../pyhoca/wxgui/profilemanager.py:802
 msgid "Sharing"
 msgstr "Compartir"
 
-#: ../pyhoca/wxgui/profilemanager.py:996
+#: ../pyhoca/wxgui/profilemanager.py:988
 msgid "<xkbtype>"
 msgstr "<xkbtype>"
 
-#: ../pyhoca/wxgui/profilemanager.py:997
+#: ../pyhoca/wxgui/profilemanager.py:989
 msgid "<xkblayout>"
 msgstr "<xkblayout>"
 
-#: ../pyhoca/wxgui/profilemanager.py:998
+#: ../pyhoca/wxgui/profilemanager.py:990
 msgid "<xkbvariant>"
 msgstr "<xkbvariant>"
 
-#: ../pyhoca/wxgui/profilemanager.py:1284
+#: ../pyhoca/wxgui/profilemanager.py:1444
 msgid "Icon Files (*.png)|*.png|All files (*.*)|*"
 msgstr "Iconos (*.png)|*.png|Todos (*.*)|*"
 
-#: ../pyhoca/wxgui/profilemanager.py:1287
+#: ../pyhoca/wxgui/profilemanager.py:1447
 msgid "Choose an icon for this session profile"
 msgstr "Elige un icono para este perfil de sesión"
 
-#: ../pyhoca/wxgui/profilemanager.py:1509
+#: ../pyhoca/wxgui/profilemanager.py:1816
 msgid "All files (*.*)|*"
 msgstr "Todos (*.*)|*"
 
-#: ../pyhoca/wxgui/profilemanager.py:1511
-#: ../pyhoca/wxgui/profilemanager.py:1533
+#: ../pyhoca/wxgui/profilemanager.py:1818
+#: ../pyhoca/wxgui/profilemanager.py:1842
 msgid "Choose a public SSH key"
 msgstr "Elige una clave pública SSH"
 
-#: ../pyhoca/wxgui/profilemanager.py:1784
+#: ../pyhoca/wxgui/profilemanager.py:2220
 msgid "Choose a folder to share within a session"
 msgstr "Elige la carpeta que quieres compartir en la conexión"
 
-#: ../pyhoca/wxgui/profilemanager.py:1912
-#: ../pyhoca/wxgui/profilemanager.py:1915
-#: ../pyhoca/wxgui/profilemanager.py:1918
-#: ../pyhoca/wxgui/profilemanager.py:1923
-#: ../pyhoca/wxgui/profilemanager.py:1933 ../pyhoca/wxgui/menus_taskbar.py:118
+#: ../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
 msgid "Profile Manager"
 msgstr "Gestor de Perfiles"
 
-#: ../pyhoca/wxgui/profilemanager.py:1912
+#: ../pyhoca/wxgui/profilemanager.py:2348
 msgid "Profile name is missing, profile unusable!!!"
 msgstr "¡¡¡Nombre de pefil no encontrado o no válido!!!"
 
-#: ../pyhoca/wxgui/profilemanager.py:1915
-#: ../pyhoca/wxgui/profilemanager.py:1918
+#: ../pyhoca/wxgui/profilemanager.py:2351
+#: ../pyhoca/wxgui/profilemanager.py:2354
 #, python-format
 msgid "Profile name %s already exists!!!"
 msgstr "El perfil de usuario %s ya existe!!!"
 
-#: ../pyhoca/wxgui/profilemanager.py:1923
+#: ../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:1933
+#: ../pyhoca/wxgui/profilemanager.py:2369
 #, python-format
 msgid ""
 "Another session profile (%s) already uses [%s]:%s for binding a local SSH "
@@ -682,248 +719,252 @@ msgstr ""
 "al proxy SSH local.\n"
 "Por favor, cambia los parámetros del proxy SSH en base a esta información."
 
-#: ../pyhoca/wxgui/profilemanager.py:1960
+#: ../pyhoca/wxgui/profilemanager.py:2396
 #, python-format
 msgid "%s - profile added"
 msgstr "%s - perfil añadido"
 
-#: ../pyhoca/wxgui/profilemanager.py:1961
+#: ../pyhoca/wxgui/profilemanager.py:2397
 msgid "A new session profile has been added."
 msgstr "Se ha añadido un nuevo perfil de sesión."
 
-#: ../pyhoca/wxgui/profilemanager.py:1965
+#: ../pyhoca/wxgui/profilemanager.py:2401
 #, python-format
 msgid "%s - modified"
 msgstr "%s - modificado"
 
-#: ../pyhoca/wxgui/profilemanager.py:1966
+#: ../pyhoca/wxgui/profilemanager.py:2402
 msgid "Changes to profile have been saved."
 msgstr "Se han guardado los cambios en el perfil."
 
-#: ../pyhoca/wxgui/menus_taskbar.py:75
+#: ../pyhoca/wxgui/menus_taskbar.py:74
 msgid "Edit Profile"
 msgstr "Editar Perfil"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:78
+#: ../pyhoca/wxgui/menus_taskbar.py:77
 msgid "Use as Template for New Profile"
 msgstr "Usar como Plantilla para Nuevos Perfiles"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:79
+#: ../pyhoca/wxgui/menus_taskbar.py:78
 msgid "Delete Profile"
 msgstr "Borrar Perfil"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:107
+#: ../pyhoca/wxgui/menus_taskbar.py:106
 #, python-format
 msgid "About %s (%s)..."
 msgstr "Acerca de %s (%s) ..."
 
-#: ../pyhoca/wxgui/menus_taskbar.py:133
+#: ../pyhoca/wxgui/menus_taskbar.py:132
 msgid "Manage Session Profile"
 msgstr "Gestionar Perfil de Sesión"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:142
+#: ../pyhoca/wxgui/menus_taskbar.py:141
 msgid "Printing Preferences"
 msgstr "Preferencias de impresión"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:148
+#: ../pyhoca/wxgui/menus_taskbar.py:147
 msgid "Client Options"
 msgstr "Opciones del Cliente"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:156 ../pyhoca/wxgui/menus_taskbar.py:785
-#: ../pyhoca/wxgui/menus_taskbar.py:977
+#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:783
+#: ../pyhoca/wxgui/menus_taskbar.py:975
 msgid "E&xit"
 msgstr "S&alir"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:228
+#: ../pyhoca/wxgui/menus_taskbar.py:227
 msgid "Window title"
 msgstr "Título de la ventana"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:234 ../pyhoca/wxgui/menus_taskbar.py:613
+#: ../pyhoca/wxgui/menus_taskbar.py:233 ../pyhoca/wxgui/menus_taskbar.py:608
 msgid "Resume Session"
 msgstr "Retomar Sesión"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:236
+#: ../pyhoca/wxgui/menus_taskbar.py:235
 msgid "Resume Session (not possible)"
 msgstr "Retomar Sesión (no disponible)"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:247
+#: ../pyhoca/wxgui/menus_taskbar.py:246
 msgid "Transfer Session"
 msgstr "Transferir Sesión"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:249
+#: ../pyhoca/wxgui/menus_taskbar.py:248
 msgid "Transfer Session (not possible)"
 msgstr "Transferir Sesión (no disponible)"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:253 ../pyhoca/wxgui/menus_taskbar.py:604
+#: ../pyhoca/wxgui/menus_taskbar.py:252 ../pyhoca/wxgui/menus_taskbar.py:599
 msgid "Suspend Session (and disconnect/exit)"
 msgstr "Suspender Sesión (y desconectar/salir)"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:255 ../pyhoca/wxgui/menus_taskbar.py:606
+#: ../pyhoca/wxgui/menus_taskbar.py:254 ../pyhoca/wxgui/menus_taskbar.py:601
 msgid "Suspend Session (and disconnect)"
 msgstr "Suspender Sesión (y desconectar)"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:257 ../pyhoca/wxgui/menus_taskbar.py:608
+#: ../pyhoca/wxgui/menus_taskbar.py:256 ../pyhoca/wxgui/menus_taskbar.py:603
 msgid "Suspend Session"
 msgstr "Suspender Sesión"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:263 ../pyhoca/wxgui/menus_taskbar.py:617
+#: ../pyhoca/wxgui/menus_taskbar.py:262 ../pyhoca/wxgui/menus_taskbar.py:612
 msgid "Terminate Session (and disconnect/exit)"
 msgstr "Finalizar Sesión (y desconectar/salir)"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:265 ../pyhoca/wxgui/menus_taskbar.py:619
+#: ../pyhoca/wxgui/menus_taskbar.py:264 ../pyhoca/wxgui/menus_taskbar.py:614
 msgid "Terminate Session (and disconnect)"
 msgstr "Finalizar Sesión (y desconectar)"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:267 ../pyhoca/wxgui/menus_taskbar.py:621
+#: ../pyhoca/wxgui/menus_taskbar.py:266 ../pyhoca/wxgui/menus_taskbar.py:616
 msgid "Terminate Session"
 msgstr "Finalizar Sesión"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:271 ../pyhoca/wxgui/menus_taskbar.py:601
+#: ../pyhoca/wxgui/menus_taskbar.py:270 ../pyhoca/wxgui/menus_taskbar.py:596
 msgid "Refresh menu tree"
 msgstr "Actualizar árbol de menús"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:280
+#: ../pyhoca/wxgui/menus_taskbar.py:279
 msgid "Rename Session Window"
 msgstr "Renombrar la Ventana de la Sesión"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:281
+#: ../pyhoca/wxgui/menus_taskbar.py:280
 msgid "Show Session Window"
 msgstr "Mostrar la Ventana de la Sesión"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:321
+#: ../pyhoca/wxgui/menus_taskbar.py:322
 msgid "&Share custom local folder"
 msgstr "Compartir carpeta per&sonalizada local"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:344
+#: ../pyhoca/wxgui/menus_taskbar.py:337
 msgid "Share:"
 msgstr "Compartir:"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:355
+#: ../pyhoca/wxgui/menus_taskbar.py:346
 msgid "Unshare:"
 msgstr "No compartido:"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:365
+#: ../pyhoca/wxgui/menus_taskbar.py:354
 msgid "Unshare &all local folders"
 msgstr "Dejar de compartir tod&as las carpetas locales"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:445
+#: ../pyhoca/wxgui/menus_taskbar.py:360
+msgid "Restore shares in next session"
+msgstr "Restaurar comparticiones en la próxima sesión"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:440
 msgid "Multimedia"
 msgstr "Multimedia"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:446
+#: ../pyhoca/wxgui/menus_taskbar.py:441
 msgid "Development"
 msgstr "Desarrollo"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:447
+#: ../pyhoca/wxgui/menus_taskbar.py:442
 msgid "Education"
 msgstr "Educación"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:448
+#: ../pyhoca/wxgui/menus_taskbar.py:443
 msgid "Games"
 msgstr "Juegos"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:449
+#: ../pyhoca/wxgui/menus_taskbar.py:444
 msgid "Graphics"
 msgstr "Gráficos"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:450
+#: ../pyhoca/wxgui/menus_taskbar.py:445
 msgid "Internet"
 msgstr "Internet"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:451
+#: ../pyhoca/wxgui/menus_taskbar.py:446
 msgid "Office Applications"
 msgstr "Ofimática"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:452
+#: ../pyhoca/wxgui/menus_taskbar.py:447
 msgid "System"
 msgstr "Sistema"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:453
+#: ../pyhoca/wxgui/menus_taskbar.py:448
 msgid "Utilities"
 msgstr "Utilidades"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:454
+#: ../pyhoca/wxgui/menus_taskbar.py:449
 msgid "Other Applications"
 msgstr "Otras Aplicaciones"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:526 ../pyhoca/wxgui/menus_taskbar.py:538
+#: ../pyhoca/wxgui/menus_taskbar.py:521 ../pyhoca/wxgui/menus_taskbar.py:533
 #, python-format
 msgid "Connect %s"
 msgstr "Conectar %s"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:532
+#: ../pyhoca/wxgui/menus_taskbar.py:527
 msgid "Currently connecting..."
 msgstr "Conectando..."
 
-#: ../pyhoca/wxgui/menus_taskbar.py:546
+#: ../pyhoca/wxgui/menus_taskbar.py:541
 msgid "Start &new Desktop Session"
 msgstr "Iniciar &nueva Sesión de Escritorio"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:551 ../pyhoca/wxgui/menus_taskbar.py:689
+#: ../pyhoca/wxgui/menus_taskbar.py:546 ../pyhoca/wxgui/menus_taskbar.py:684
 msgid "Retrieving Application Menu..."
 msgstr "Recuperando Menú de Aplicación..."
 
-#: ../pyhoca/wxgui/menus_taskbar.py:555 ../pyhoca/wxgui/menus_taskbar.py:692
+#: ../pyhoca/wxgui/menus_taskbar.py:550 ../pyhoca/wxgui/menus_taskbar.py:687
 msgid "Retrieve Application Menu"
 msgstr "Recibido Menú de Aplicación"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:558
+#: ../pyhoca/wxgui/menus_taskbar.py:553
 msgid "Start &new Session"
 msgstr "Iniciar &nueva Sesión"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:638
+#: ../pyhoca/wxgui/menus_taskbar.py:633
 msgid "Launch Single Application"
 msgstr "Ejecutar la aplicación"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:676
+#: ../pyhoca/wxgui/menus_taskbar.py:671
 msgid "Manage Application Menu"
 msgstr "Gestionar el Menú de la Aplicación"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:719
+#: ../pyhoca/wxgui/menus_taskbar.py:714
 msgid "Running"
 msgstr "Activa"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:721
+#: ../pyhoca/wxgui/menus_taskbar.py:716
 msgid "Suspended"
 msgstr "Suspendida"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:740
+#: ../pyhoca/wxgui/menus_taskbar.py:735
 msgid "&Clean all sessions"
 msgstr "&Limpiar el registro de sesiones"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:746
+#: ../pyhoca/wxgui/menus_taskbar.py:741
 msgid "Customize &profile"
 msgstr "Configurar &perfil"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:758
+#: ../pyhoca/wxgui/menus_taskbar.py:756
 msgid "Shared &folders"
 msgstr "Compartir &carpetas"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:770
+#: ../pyhoca/wxgui/menus_taskbar.py:768
 msgid "&Disconnect from Server"
 msgstr "&Desconectar del servidor"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:777
+#: ../pyhoca/wxgui/menus_taskbar.py:775
 msgid "Suspend Session and E&xit application"
 msgstr "Suspender Sesión y Salir (e&xit) de la aplicación"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:781
+#: ../pyhoca/wxgui/menus_taskbar.py:779
 msgid "Disconnect and E&xit application"
 msgstr "Desconectar y Salir (e&xit) de la aplicación"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:835
+#: ../pyhoca/wxgui/menus_taskbar.py:833
 msgid "Add Profile"
 msgstr "Añadir Perfil"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:911
+#: ../pyhoca/wxgui/menus_taskbar.py:909
 msgid "No session profiles defined"
 msgstr "No se han definido perfiles de sesión"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:947
+#: ../pyhoca/wxgui/menus_taskbar.py:945
 msgid "Start/Resume Session"
 msgstr "Iniciar/Retomar Sesión"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:947
+#: ../pyhoca/wxgui/menus_taskbar.py:945
 msgid "Connect Server"
 msgstr "Conectar con el Servidor"
 
@@ -932,110 +973,132 @@ msgstr "Conectar con el Servidor"
 msgid "About %s ..."
 msgstr "Acerca de %s ..."
 
-#: ../pyhoca/wxgui/frontend.py:462
+#: ../pyhoca/wxgui/frontend.py:459
 msgid "Suspending sessions and exiting application..."
 msgstr "Suspendiendo sesiones y saliendo de las aplicaciones..."
 
-#: ../pyhoca/wxgui/frontend.py:465
+#: ../pyhoca/wxgui/frontend.py:462
 #, python-format
 msgid "Disconnecting %s and exiting application..."
 msgstr "Desconectando %s y saliendo de las aplicaciones..."
 
-#: ../pyhoca/wxgui/frontend.py:467
+#: ../pyhoca/wxgui/frontend.py:464
 msgid "Exiting application..."
 msgstr "Saliendo de la aplicación..."
 
-#: ../pyhoca/wxgui/frontend.py:560
+#: ../pyhoca/wxgui/frontend.py:562
 #, python-format
 msgid "%s - server warning"
 msgstr "%s - advertencia del servidor"
 
-#: ../pyhoca/wxgui/frontend.py:560
+#: ../pyhoca/wxgui/frontend.py:562
 msgid "The X2Go Server does not publish an application menu."
 msgstr "El servidor X2GO no publica menú de la aplicación"
 
-#: ../pyhoca/wxgui/frontend.py:610
-msgid "Public SSH key authentication has been successful."
-msgstr "Se ha iniciado sesión con éxito usando la clave pública SSH."
+#: ../pyhoca/wxgui/frontend.py:613
+msgid "SSH key authentication has been successful."
+msgstr "Se ha iniciado sesión con éxito usando la clave SSH."
 
-#: ../pyhoca/wxgui/frontend.py:644
+#: ../pyhoca/wxgui/frontend.py:650
 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:665
+#: ../pyhoca/wxgui/frontend.py:671
 #, python-format
 msgid "%s - EOF error"
 msgstr "%s - error EOF"
 
-#: ../pyhoca/wxgui/frontend.py:665
+#: ../pyhoca/wxgui/frontend.py:671
 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:672
+#: ../pyhoca/wxgui/frontend.py:678
 #, python-format
 msgid "%s - auth key error"
 msgstr "%s - error en la clave de identificación"
 
-#: ../pyhoca/wxgui/frontend.py:693
+#: ../pyhoca/wxgui/frontend.py:699
 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:726
+#: ../pyhoca/wxgui/frontend.py:728
+#, python-format
+msgid "%s: DirectRDP not supported yet"
+msgstr "%s; Sin soporte DirectRDP todavía"
+
+#: ../pyhoca/wxgui/frontend.py:729
+#, python-format
+msgid ""
+"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)."
+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)."
+
+#: ../pyhoca/wxgui/frontend.py:741
 msgid "Unknown session profile, configure before using it..."
 msgstr "Perfil de Sesión Desconocido, configúralo antes de usar..."
 
-#: ../pyhoca/wxgui/frontend.py:784 ../pyhoca/wxgui/frontend.py:1302
+#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:1332
 #, python-format
 msgid "%s - session warning"
 msgstr "%s - advertencia de la sesión"
 
-#: ../pyhoca/wxgui/frontend.py:784
+#: ../pyhoca/wxgui/frontend.py:798
 #, python-format
 msgid "Execution of command ,,%s'' failed."
 msgstr "Fallo al ejecutar el comando \"%s\"."
 
-#: ../pyhoca/wxgui/frontend.py:926
+#: ../pyhoca/wxgui/frontend.py:939
 msgid "Cleaning X2Go sessions..."
 msgstr "Limpiando sesiones X2Go..."
 
-#: ../pyhoca/wxgui/frontend.py:961
+#: ../pyhoca/wxgui/frontend.py:974
 #, python-format
 msgid "%s - disconnect"
 msgstr "%s - desconectado"
 
-#: ../pyhoca/wxgui/frontend.py:961
+#: ../pyhoca/wxgui/frontend.py:974
 msgid "X2Go Profile is now disconnected."
 msgstr "Se ha desconectado el Perfil X2Go."
 
-#: ../pyhoca/wxgui/frontend.py:977
+#: ../pyhoca/wxgui/frontend.py:995
 msgid "New Session Profile"
 msgstr "Nuevo Perfil de Sesión"
 
-#: ../pyhoca/wxgui/frontend.py:1029
+#: ../pyhoca/wxgui/frontend.py:1047
 #, python-format
 msgid "Really Delete Session Profile ,,%s''?"
 msgstr "Eliminar el Perfil de Sesión \"%s''?"
 
-#: ../pyhoca/wxgui/frontend.py:1035
+#: ../pyhoca/wxgui/frontend.py:1053
 #, python-format
 msgid "%s - profile deleted"
 msgstr "%s - perfil eliminado"
 
-#: ../pyhoca/wxgui/frontend.py:1035
+#: ../pyhoca/wxgui/frontend.py:1053
 msgid "The session profile has been deleted."
 msgstr "Se ha eliminado el perfil de sesión."
 
-#: ../pyhoca/wxgui/frontend.py:1053
+#: ../pyhoca/wxgui/frontend.py:1071
 #, 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:1194
+#: ../pyhoca/wxgui/frontend.py:1224
 #, python-format
 msgid ""
 "The authenticity of host [%s]:%s can't be established.\n"
@@ -1048,17 +1111,17 @@ msgstr ""
 "\n"
 "¿Continuar con la conexión?"
 
-#: ../pyhoca/wxgui/frontend.py:1202
+#: ../pyhoca/wxgui/frontend.py:1232
 #, python-format
 msgid "%s: Confirm Host Authorization"
 msgstr "%s: Se confirma la autorización del equipo"
 
-#: ../pyhoca/wxgui/frontend.py:1247
+#: ../pyhoca/wxgui/frontend.py:1277
 #, python-format
 msgid "%s - channel error"
 msgstr "%s - error en el canal"
 
-#: ../pyhoca/wxgui/frontend.py:1247
+#: ../pyhoca/wxgui/frontend.py:1277
 #, python-format
 msgid ""
 "Lost connection to server %s unexpectedly! Try to re-authenticate to the "
@@ -1067,22 +1130,22 @@ msgstr ""
 "¡La conexión con el servidor %s ha finalizado inesperadamente! Intenta "
 "iniciar sesión nuevamente..."
 
-#: ../pyhoca/wxgui/frontend.py:1265 ../pyhoca/wxgui/frontend.py:1283
-#: ../pyhoca/wxgui/frontend.py:1285 ../pyhoca/wxgui/frontend.py:1321
+#: ../pyhoca/wxgui/frontend.py:1295 ../pyhoca/wxgui/frontend.py:1313
+#: ../pyhoca/wxgui/frontend.py:1315 ../pyhoca/wxgui/frontend.py:1351
 #, python-format
 msgid "%s - session failure"
 msgstr "%s - fallo en la sesión"
 
-#: ../pyhoca/wxgui/frontend.py:1265
+#: ../pyhoca/wxgui/frontend.py:1295
 msgid "The session startup failed."
 msgstr "El inicio de sesión ha fallado"
 
-#: ../pyhoca/wxgui/frontend.py:1283
+#: ../pyhoca/wxgui/frontend.py:1313
 #, 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:1285
+#: ../pyhoca/wxgui/frontend.py:1315
 #, python-format
 msgid ""
 "The command ,,%s'' is not available on X2Go server\n"
@@ -1091,7 +1154,7 @@ msgstr ""
 "El comando \"%s\" no está disponible en el servidor X2go\n"
 "%s."
 
-#: ../pyhoca/wxgui/frontend.py:1302
+#: ../pyhoca/wxgui/frontend.py:1332
 #, python-format
 msgid ""
 "Reverse TCP port forwarding request for session %s to server port %s has "
@@ -1100,7 +1163,7 @@ msgstr ""
 "Se ha denegado la redirección del túnel TCP inverso para la sesión %s al "
 "puerto %s del servidor X2Go."
 
-#: ../pyhoca/wxgui/frontend.py:1321
+#: ../pyhoca/wxgui/frontend.py:1351
 #, python-format
 msgid ""
 "Forwarding tunnel request to [%s]:%s for session %s was denied by remote "
@@ -1109,37 +1172,37 @@ msgstr ""
 "La solicitud de túnel a %s:%s para la sesión %s ha sido denegada por el "
 "servidor X2go/SSH . Fallo en el inicio de sesión."
 
-#: ../pyhoca/wxgui/frontend.py:1340
+#: ../pyhoca/wxgui/frontend.py:1370
 #, python-format
 msgid "%s - audio warning"
 msgstr "%s - advertencia en el sistema de audio"
 
-#: ../pyhoca/wxgui/frontend.py:1340
+#: ../pyhoca/wxgui/frontend.py:1370
 msgid ""
 "The X2Go PulseAudio system is not available within Remote Desktop sessions."
 msgstr ""
 "El sistema X2Go PulseAudio no está disponible en las sesiones del tipo "
 "Remote Desktop"
 
-#: ../pyhoca/wxgui/frontend.py:1347 ../pyhoca/wxgui/frontend.py:1354
+#: ../pyhoca/wxgui/frontend.py:1377 ../pyhoca/wxgui/frontend.py:1384
 #, python-format
 msgid "%s - audio error"
 msgstr "%s - error en el audio"
 
-#: ../pyhoca/wxgui/frontend.py:1347
+#: ../pyhoca/wxgui/frontend.py:1377
 msgid "The X2Go PulseAudio system could not be started."
 msgstr "El sistema X2Go PulseAudio no puede iniciarse"
 
-#: ../pyhoca/wxgui/frontend.py:1354
+#: ../pyhoca/wxgui/frontend.py:1384
 msgid "The X2Go PulseAudio system has died unexpectedly."
 msgstr "El sistema X2Go PulseAudio ha finalizado inesperadamente"
 
-#: ../pyhoca/wxgui/frontend.py:1366
+#: ../pyhoca/wxgui/frontend.py:1396
 #, python-format
 msgid "%s - audio problem"
 msgstr "%s - problema en el audio"
 
-#: ../pyhoca/wxgui/frontend.py:1366
+#: ../pyhoca/wxgui/frontend.py:1396
 #, python-format
 msgid ""
 "The audio connection could not be set up for this session.\n"
@@ -1148,13 +1211,13 @@ msgstr ""
 "La conexión de audio puede que no esté configurada para esta sesión.\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1378
+#: ../pyhoca/wxgui/frontend.py:1408
 #, 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:1378
+#: ../pyhoca/wxgui/frontend.py:1408
 #, python-format
 msgid ""
 "The server denies client-side printing from within this session.\n"
@@ -1163,12 +1226,12 @@ msgstr ""
 "El servidor no permite la impresión del lado del cliente para esta sesión.\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1390
+#: ../pyhoca/wxgui/frontend.py:1420
 #, python-format
 msgid "%s - MIME box not available"
 msgstr "%s - No está disponible el contexto MIME"
 
-#: ../pyhoca/wxgui/frontend.py:1390
+#: ../pyhoca/wxgui/frontend.py:1420
 #, python-format
 msgid ""
 "The server does not support the X2Go MIME box.\n"
@@ -1177,12 +1240,12 @@ msgstr ""
 "El servidor no soporta el contexto X2Go MIME.\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1402
+#: ../pyhoca/wxgui/frontend.py:1432
 #, 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:1402
+#: ../pyhoca/wxgui/frontend.py:1432
 #, python-format
 msgid ""
 "The server denies client-side folder sharing with this session.\n"
@@ -1192,12 +1255,12 @@ msgstr ""
 "sesión.\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1414
+#: ../pyhoca/wxgui/frontend.py:1444
 #, python-format
 msgid "%s - client resources not sharable"
 msgstr "%s - el recurso del cliente no está marcado como compartido"
 
-#: ../pyhoca/wxgui/frontend.py:1414
+#: ../pyhoca/wxgui/frontend.py:1444
 #, python-format
 msgid ""
 "Client-side folders and printers cannot be shared with this session.\n"
@@ -1207,12 +1270,12 @@ msgstr ""
 "permitidas en esta sesión.\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1433 ../pyhoca/wxgui/frontend.py:1435
+#: ../pyhoca/wxgui/frontend.py:1463 ../pyhoca/wxgui/frontend.py:1465
 #, python-format
 msgid "%s - print error"
 msgstr "%s - error de impresión"
 
-#: ../pyhoca/wxgui/frontend.py:1433
+#: ../pyhoca/wxgui/frontend.py:1463
 #, python-format
 msgid ""
 "%s\n"
@@ -1223,7 +1286,7 @@ msgstr ""
 "...provocado en la impresora %s  por la sesión\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1435
+#: ../pyhoca/wxgui/frontend.py:1465
 #, python-format
 msgid ""
 "%s\n"
@@ -1234,12 +1297,12 @@ msgstr ""
 "...provocado por la sesión\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1450 ../pyhoca/wxgui/frontend.py:1465
+#: ../pyhoca/wxgui/frontend.py:1480 ../pyhoca/wxgui/frontend.py:1495
 #, python-format
 msgid "%s - start"
 msgstr "%s - inicio"
 
-#: ../pyhoca/wxgui/frontend.py:1450
+#: ../pyhoca/wxgui/frontend.py:1480
 #, python-format
 msgid ""
 "New X2Go session starting up...\n"
@@ -1248,7 +1311,7 @@ msgstr ""
 "Iniciando nueva sesión X2Go...\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1465
+#: ../pyhoca/wxgui/frontend.py:1495
 #, python-format
 msgid ""
 "Another client started X2Go session\n"
@@ -1257,12 +1320,12 @@ msgstr ""
 "Otro cliente ha iniciado sesión X2go\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1480 ../pyhoca/wxgui/frontend.py:1495
+#: ../pyhoca/wxgui/frontend.py:1510 ../pyhoca/wxgui/frontend.py:1525
 #, python-format
 msgid "%s - resume"
 msgstr "%s - retornar a la sesión"
 
-#: ../pyhoca/wxgui/frontend.py:1480
+#: ../pyhoca/wxgui/frontend.py:1510
 #, python-format
 msgid ""
 "Resuming X2Go session...\n"
@@ -1271,7 +1334,7 @@ msgstr ""
 "Retornando sesión X2Go...\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1495
+#: ../pyhoca/wxgui/frontend.py:1525
 #, python-format
 msgid ""
 "Another client resumed X2Go session\n"
@@ -1280,12 +1343,12 @@ msgstr ""
 "Otro cliente retornó a la sesión X2go\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1510
+#: ../pyhoca/wxgui/frontend.py:1540
 #, python-format
 msgid "%s - running"
 msgstr "%s - en ejecución"
 
-#: ../pyhoca/wxgui/frontend.py:1510
+#: ../pyhoca/wxgui/frontend.py:1540
 #, python-format
 msgid ""
 "Found already running session\n"
@@ -1294,12 +1357,12 @@ msgstr ""
 "La sesión ya está en ejecución\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1530
+#: ../pyhoca/wxgui/frontend.py:1560
 #, python-format
 msgid "%s - suspend"
 msgstr "%s - suspender"
 
-#: ../pyhoca/wxgui/frontend.py:1530
+#: ../pyhoca/wxgui/frontend.py:1560
 #, python-format
 msgid ""
 "X2Go Session has been suspended\n"
@@ -1308,12 +1371,12 @@ msgstr ""
 "Se ha suspendido la Sesión X2go\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1557
+#: ../pyhoca/wxgui/frontend.py:1587
 #, python-format
 msgid "%s - terminate"
 msgstr "%s - finalizar"
 
-#: ../pyhoca/wxgui/frontend.py:1557
+#: ../pyhoca/wxgui/frontend.py:1587
 #, python-format
 msgid ""
 "X2Go Session has terminated\n"
@@ -1322,14 +1385,14 @@ msgstr ""
 "Se ha finalizado la sesión X2go\n"
 "%s"
 
-#: ../pyhoca/wxgui/messages.py:74
+#: ../pyhoca/wxgui/messages.py:73
 #, 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:75
+#: ../pyhoca/wxgui/messages.py:74
 #, python-format
 msgid ""
 "PyHoca-GUI is already running for user ,,%s''!\n"
@@ -1343,15 +1406,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:108
+#: ../pyhoca/wxgui/messages.py:107
 msgid "Yes"
 msgstr "Sí"
 
-#: ../pyhoca/wxgui/messages.py:109
+#: ../pyhoca/wxgui/messages.py:108
 msgid "No"
 msgstr "No"
 
-#: ../pyhoca/wxgui/messages.py:126 ../pyhoca/wxgui/printingprefs.py:142
+#: ../pyhoca/wxgui/messages.py:125 ../pyhoca/wxgui/printingprefs.py:142
 msgid "Ok"
 msgstr "Ok"
 
@@ -1454,6 +1517,20 @@ msgstr "Cambiar título de la sesión a"
 msgid "OK"
 msgstr "Ok"
 
+#, fuzzy
+#~ msgid "Remember shared folders"
+#~ msgstr "Compartir &carpetas"
+
+#, fuzzy
+#~ msgid "Shared Resources"
+#~ msgstr "Compartir &carpetas"
+
+#~ msgid "RSA/DSA private key"
+#~ msgstr "Clave privada RSA/DSA"
+
+#~ msgid "Host[:Port]"
+#~ msgstr "Host[:Puerto]"
+
 #~ msgid "Keyboard layout"
 #~ msgstr "Máscara de teclado"
 
diff --git a/po/fr.po b/po/fr.po
index b8bae00..636eff8 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PyHoca-GUI VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-10 21:18+0200\n"
+"POT-Creation-Date: 2012-11-26 14:25+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: Renaud Gaudin <rgaudin at gmail.com>\n"
+"Language-Team: X2Go i18n <x2go-i18n at lists.berlios.de>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,636 +21,671 @@ msgstr ""
 "X-Poedit-Country: French\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../pyhoca/wxgui/logon.py:92
+#: ../pyhoca/wxgui/logon.py:86
 #, python-format
 msgid "%s (via %s)"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:96 ../pyhoca/wxgui/logon.py:108
+#: ../pyhoca/wxgui/logon.py:90 ../pyhoca/wxgui/logon.py:102
 msgid "Username"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:98 ../pyhoca/wxgui/logon.py:110
+#: ../pyhoca/wxgui/logon.py:92 ../pyhoca/wxgui/logon.py:104
 msgid "Password"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:101
+#: ../pyhoca/wxgui/logon.py:95
 msgid "Authenticate"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:113
+#: ../pyhoca/wxgui/logon.py:107
 msgid "  Start SSH tunnel  "
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:121
+#: ../pyhoca/wxgui/logon.py:115
 msgid "Session login"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:122
+#: ../pyhoca/wxgui/logon.py:116
 msgid "SSH proxy server login"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:133 ../pyhoca/wxgui/profilemanager.py:322
-#: ../pyhoca/wxgui/messages.py:132 ../pyhoca/wxgui/printingprefs.py:147
+#: ../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
 msgid "Cancel"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:292 ../pyhoca/wxgui/logon.py:334
-#: ../pyhoca/wxgui/frontend.py:603
+#: ../pyhoca/wxgui/logon.py:297 ../pyhoca/wxgui/logon.py:339
+#: ../pyhoca/wxgui/frontend.py:606
 #, python-format
 msgid "%s - connect failure"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:293 ../pyhoca/wxgui/frontend.py:603
+#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:606
 msgid "User is not allowed to start X2Go sessions!"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:610
+#: ../pyhoca/wxgui/logon.py:303 ../pyhoca/wxgui/frontend.py:613
 #, python-format
 msgid "%s - connect"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:299
+#: ../pyhoca/wxgui/logon.py:304
 msgid "Authentication has been successful."
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:330
+#: ../pyhoca/wxgui/logon.py:335
 msgid "SSH tunnel started"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:335
+#: ../pyhoca/wxgui/logon.py:340
 msgid "Authentication failed!"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:342
+#: ../pyhoca/wxgui/logon.py:348
 #, python-format
 msgid "%s - SSH proxy"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:343
+#: ../pyhoca/wxgui/logon.py:349
 msgid "Authentication to the SSH proxy server failed!"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:658
+#: ../pyhoca/wxgui/logon.py:376 ../pyhoca/wxgui/frontend.py:664
 #, python-format
 msgid "%s - socket error"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:372 ../pyhoca/wxgui/frontend.py:637
-#: ../pyhoca/wxgui/frontend.py:644
+#: ../pyhoca/wxgui/logon.py:383 ../pyhoca/wxgui/frontend.py:643
+#: ../pyhoca/wxgui/frontend.py:650
 #, python-format
 msgid "%s - host key error"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:373 ../pyhoca/wxgui/frontend.py:637
+#: ../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 ""
 
-#: ../pyhoca/wxgui/logon.py:380 ../pyhoca/wxgui/frontend.py:679
+#: ../pyhoca/wxgui/logon.py:391 ../pyhoca/wxgui/frontend.py:685
 #, python-format
 msgid "%s - missing home directory"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:679
+#: ../pyhoca/wxgui/logon.py:392 ../pyhoca/wxgui/frontend.py:685
 msgid "The remote user's home directory does not exist."
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:388
+#: ../pyhoca/wxgui/logon.py:399
 #, python-format
 msgid "%s - key error"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:396 ../pyhoca/wxgui/frontend.py:686
+#: ../pyhoca/wxgui/logon.py:407 ../pyhoca/wxgui/frontend.py:692
 #, python-format
 msgid "%s - auth error"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:404 ../pyhoca/wxgui/frontend.py:630
+#: ../pyhoca/wxgui/logon.py:415 ../pyhoca/wxgui/frontend.py:636
 #, python-format
 msgid "%s - SSH error"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:412
+#: ../pyhoca/wxgui/logon.py:423
 #, python-format
 msgid "%s - unknown error"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:413
+#: ../pyhoca/wxgui/logon.py:424
 msgid "An unknown error occured during authentication!"
 msgstr ""
 
-#: ../pyhoca/wxgui/taskbar.py:92
+#: ../pyhoca/wxgui/taskbar.py:89
 #, python-format
 msgid ""
 "PyHoca-GUI\n"
 "Connecting you to ,,%s''"
 msgstr ""
 
-#: ../pyhoca/wxgui/taskbar.py:96
+#: ../pyhoca/wxgui/taskbar.py:93
 #, python-format
 msgid ""
 "PyHoca-GUI (Python X2goClient)\n"
 "Currently connecting you to remote X2Go server ,,%s''"
 msgstr ""
 
-#: ../pyhoca/wxgui/taskbar.py:106
+#: ../pyhoca/wxgui/taskbar.py:103
 msgid ""
 "PyHoca-GUI\n"
 "Connecting you to X2Go..."
 msgstr ""
 
-#: ../pyhoca/wxgui/taskbar.py:110
+#: ../pyhoca/wxgui/taskbar.py:107
 msgid ""
 "PyHoca-GUI (Python X2goClient)\n"
 "Client for connecting you to a remote X2Go server"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:82
+#: ../pyhoca/wxgui/profilemanager.py:79
 msgid "GNOME Desktop (GNOME)"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:83
+#: ../pyhoca/wxgui/profilemanager.py:80
 msgid "K Desktop Environment (KDE)"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:84
+#: ../pyhoca/wxgui/profilemanager.py:81
 msgid "Lightweight X Desktop (LXDE)"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:85
+#: ../pyhoca/wxgui/profilemanager.py:82
 msgid "Trinity X Desktop (KDE3-like)"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:86
+#: ../pyhoca/wxgui/profilemanager.py:83
 msgid "Unity X Desktop Shell (UNITY)"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:87
-msgid "XFCE4 Desktop (XFCE4)"
+#: ../pyhoca/wxgui/profilemanager.py:84
+msgid "XFCE Desktop (XFCE)"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:88
+#: ../pyhoca/wxgui/profilemanager.py:85
 msgid "Published Applications"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:89
+#: ../pyhoca/wxgui/profilemanager.py:86
 msgid "Single Application"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:90
+#: ../pyhoca/wxgui/profilemanager.py:87
 msgid "XDMCP Query"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:91
-msgid "Windows Terminal Server (RDP-proxy)"
+#: ../pyhoca/wxgui/profilemanager.py:88
+msgid "Windows Terminal Server (X2Go-proxied RDP)"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:89
+msgid "Windows Terminal Server (Direct RDP)"
 msgstr ""
 
-#. 'DirectRDP': 'Windows Terminal Server (RDP-direct)',
-#: ../pyhoca/wxgui/profilemanager.py:93 ../pyhoca/wxgui/profilemanager.py:207
+#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/profilemanager.py:224
 msgid "Custom command"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:398
+#: ../pyhoca/wxgui/profilemanager.py:95 ../pyhoca/wxgui/menus_taskbar.py:393
 msgid "Internet Browser"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:399
+#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:394
 msgid "Email Client"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:400
+#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:395
 msgid "Office"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:99 ../pyhoca/wxgui/menus_taskbar.py:401
+#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:396
 msgid "Terminal"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:113
+#: ../pyhoca/wxgui/profilemanager.py:116
 msgid "Open file with system's default application"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:114
+#: ../pyhoca/wxgui/profilemanager.py:117
 msgid "Open application chooser dialog"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:115
+#: ../pyhoca/wxgui/profilemanager.py:118
 msgid "Save incoming file as ..."
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:143
+#: ../pyhoca/wxgui/profilemanager.py:146
 msgid "settings derived from "
 msgstr ""
 
 #. boxes for all tabs
-#: ../pyhoca/wxgui/profilemanager.py:160
+#: ../pyhoca/wxgui/profilemanager.py:167
 msgid "Session Title"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:161
+#: ../pyhoca/wxgui/profilemanager.py:168
 msgid "Session Window"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:162
+#: ../pyhoca/wxgui/profilemanager.py:169
 msgid "Session Startup"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:163
+#: ../pyhoca/wxgui/profilemanager.py:170
 msgid "Server"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:164
+#: ../pyhoca/wxgui/profilemanager.py:171
+msgid "Proxy"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:172
 msgid "Connection Link Speed"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:165
+#: ../pyhoca/wxgui/profilemanager.py:173
 msgid "Compression"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:166
+#: ../pyhoca/wxgui/profilemanager.py:174
 msgid "Display"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:167
+#: ../pyhoca/wxgui/profilemanager.py:175
 msgid "Keyboard"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:168
+#: ../pyhoca/wxgui/profilemanager.py:176
 msgid "Sound"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:169
+#: ../pyhoca/wxgui/profilemanager.py:177
 msgid "Printing"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:170
+#: ../pyhoca/wxgui/profilemanager.py:178
 msgid "Folder Exports"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:171
+#: ../pyhoca/wxgui/profilemanager.py:179
 msgid "File Import"
 msgstr ""
 
 #. ##
 #. ## widgets for the PROFILE tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:176
+#: ../pyhoca/wxgui/profilemanager.py:184
 msgid "Name"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:183
+#: ../pyhoca/wxgui/profilemanager.py:191
 msgid "Set session window title"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:184
+#: ../pyhoca/wxgui/profilemanager.py:192
 msgid "Use a default session window title"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:185
+#: ../pyhoca/wxgui/profilemanager.py:193
 msgid "Custom session window title"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:195
+#: ../pyhoca/wxgui/profilemanager.py:212
 msgid "Window Icon"
 msgstr ""
 
 #. ##
 #. ## widgets for the SESSION tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:201
+#: ../pyhoca/wxgui/profilemanager.py:218
 msgid "Start session automatically after login"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:202
+#: ../pyhoca/wxgui/profilemanager.py:219
 #, python-format
 msgid "Login automatically after %s has started"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:203
+#: ../pyhoca/wxgui/profilemanager.py:220
 msgid "Type"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:205
+#: ../pyhoca/wxgui/profilemanager.py:222
 msgid "Application"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:209
+#: ../pyhoca/wxgui/profilemanager.py:226
 msgid "XDMCP server"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:211
+#: ../pyhoca/wxgui/profilemanager.py:228
 msgid "RDP server"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:213
+#: ../pyhoca/wxgui/profilemanager.py:230
 msgid "RDP options"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:215
+#: ../pyhoca/wxgui/profilemanager.py:232
 msgid "Integrate remote application(s) into local desktop (rootless mode)"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:216
+#: ../pyhoca/wxgui/profilemanager.py:233
 msgid "Menu of published applications"
 msgstr ""
 
 #. ##
 #. ## widgets for the CONNECTION tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:223 ../pyhoca/wxgui/profilemanager.py:233
+#: ../pyhoca/wxgui/profilemanager.py:240 ../pyhoca/wxgui/profilemanager.py:253
 msgid "User"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:225
+#: ../pyhoca/wxgui/profilemanager.py:242 ../pyhoca/wxgui/profilemanager.py:260
 msgid "Host"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:227
+#: ../pyhoca/wxgui/profilemanager.py:244 ../pyhoca/wxgui/profilemanager.py:262
 msgid "Port"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:229
-msgid "RSA/DSA private key"
+#: ../pyhoca/wxgui/profilemanager.py:246
+msgid "Key"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:232
+#: ../pyhoca/wxgui/profilemanager.py:249
+msgid "Discover SSH keys or use SSH agent for X2Go authentication"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:251
+msgid "Enable forwarding of SSH authentication agent connections"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:252
 msgid "Server behind SSH proxy"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:235
-msgid "Key file"
+#: ../pyhoca/wxgui/profilemanager.py:255
+msgid "Use same username for X2Go and proxy host"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:238
-msgid "Host[:Port]"
+#: ../pyhoca/wxgui/profilemanager.py:256
+msgid "Use same authentication for X2Go and proxy host"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:257
+msgid "Key file"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:240
+#: ../pyhoca/wxgui/profilemanager.py:264
 msgid "SSH Proxy Tunnel"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:248
+#: ../pyhoca/wxgui/profilemanager.py:270
+msgid "Discover SSH keys or use SSH agent for proxy authentication"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:273
 msgid "Modem"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:249
+#: ../pyhoca/wxgui/profilemanager.py:274
 msgid "ISDN"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:250
+#: ../pyhoca/wxgui/profilemanager.py:275
 msgid "ADSL"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:251
+#: ../pyhoca/wxgui/profilemanager.py:276
 msgid "WAN"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:252
+#: ../pyhoca/wxgui/profilemanager.py:277
 msgid "LAN"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:254
+#: ../pyhoca/wxgui/profilemanager.py:279
 msgid "Method"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:256
+#: ../pyhoca/wxgui/profilemanager.py:281
 msgid "Image quality"
 msgstr ""
 
 #. ##
 #. ## wigdets for the SETTINGS tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:262
+#: ../pyhoca/wxgui/profilemanager.py:287
 msgid "Fullscreen"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:263
+#: ../pyhoca/wxgui/profilemanager.py:288
+msgid "Maximized"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:289
 msgid "Custom Size"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:268
+#: ../pyhoca/wxgui/profilemanager.py:294
 msgid "Set display DPI"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:270
+#: ../pyhoca/wxgui/profilemanager.py:296
 msgid "Do not set (use server-side tools to configure the keyboard)"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:271
+#: ../pyhoca/wxgui/profilemanager.py:297
 msgid ""
 "Automatically detect and use client-side keyboard configuration inside the "
 "session"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:272
+#: ../pyhoca/wxgui/profilemanager.py:298
 msgid "Use custom keyboard settings as provided below"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:273
+#: ../pyhoca/wxgui/profilemanager.py:299
 msgid "Keyboard model"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:275
+#: ../pyhoca/wxgui/profilemanager.py:301
 msgid "Layout"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:277
+#: ../pyhoca/wxgui/profilemanager.py:303
 msgid "Layout variant"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:279
+#: ../pyhoca/wxgui/profilemanager.py:305
 msgid "Enable sound support"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:280
+#: ../pyhoca/wxgui/profilemanager.py:306
 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:284
+#: ../pyhoca/wxgui/profilemanager.py:310
 msgid "Arts (not supported)"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:287
+#: ../pyhoca/wxgui/profilemanager.py:313
 msgid "esd"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:288
+#: ../pyhoca/wxgui/profilemanager.py:314
 msgid "Use default sound port"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:289
+#: ../pyhoca/wxgui/profilemanager.py:315
 msgid "Custom sound port"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:291
-msgid "Client Side printing"
+#: ../pyhoca/wxgui/profilemanager.py:318
+msgid "Use local folder sharing"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:293
-msgid "Use local folder sharing"
+#: ../pyhoca/wxgui/profilemanager.py:319
+msgid "Store share list at end of session"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:294
+#: ../pyhoca/wxgui/profilemanager.py:320
 msgid "Path"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:297 ../pyhoca/wxgui/profilemanager.py:316
+#: ../pyhoca/wxgui/profilemanager.py:323 ../pyhoca/wxgui/profilemanager.py:344
 msgid "Add"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:299
+#: ../pyhoca/wxgui/profilemanager.py:325
 msgid "Local Path"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:300
+#: ../pyhoca/wxgui/profilemanager.py:326
 msgid "Connect Method"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:301
+#: ../pyhoca/wxgui/profilemanager.py:327
 msgid "Delete"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:303
+#: ../pyhoca/wxgui/profilemanager.py:329
 msgid "Convert between client and server encodings"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:304
+#: ../pyhoca/wxgui/profilemanager.py:330
 msgid "Client encoding"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:306
+#: ../pyhoca/wxgui/profilemanager.py:332
 msgid "Server encoding"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:309
+#: ../pyhoca/wxgui/profilemanager.py:335
 msgid "Use file MIME box for local file import"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:310
+#: ../pyhoca/wxgui/profilemanager.py:336
 msgid "Extensions"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:312
+#: ../pyhoca/wxgui/profilemanager.py:338
 msgid "Action"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:317
+#: ../pyhoca/wxgui/profilemanager.py:341
+msgid "Client Side printing"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:345
 msgid "Defaults"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:319
+#: ../pyhoca/wxgui/profilemanager.py:347
 msgid "Save"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:320
+#: ../pyhoca/wxgui/profilemanager.py:348
 msgid "Reset"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:365
-#: ../pyhoca/wxgui/profilemanager.py:1078
-#: ../pyhoca/wxgui/profilemanager.py:1832
+#: ../pyhoca/wxgui/profilemanager.py:401
+#: ../pyhoca/wxgui/profilemanager.py:1124
+#: ../pyhoca/wxgui/profilemanager.py:2268
 msgid "automatically"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:367
-#: ../pyhoca/wxgui/profilemanager.py:1080
+#: ../pyhoca/wxgui/profilemanager.py:403
+#: ../pyhoca/wxgui/profilemanager.py:1126
 msgid "manually"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:376
+#: ../pyhoca/wxgui/profilemanager.py:412
 msgid "PyHoca-GUI Profile Manager - new profile"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:378
+#: ../pyhoca/wxgui/profilemanager.py:414
 #, python-format
 msgid "PyHoca-GUI Profile Manager - %s (connected)"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:380
+#: ../pyhoca/wxgui/profilemanager.py:416
 #, python-format
 msgid "PyHoca-GUI Profile Manager - %s"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:751
+#: ../pyhoca/wxgui/profilemanager.py:797
 msgid "Profile"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:752
+#: ../pyhoca/wxgui/profilemanager.py:798
 msgid "Session"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:753
+#: ../pyhoca/wxgui/profilemanager.py:799
 msgid "Connection"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:754
+#: ../pyhoca/wxgui/profilemanager.py:800
+msgid "Link Quality"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:801
 msgid "Settings"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:755
+#: ../pyhoca/wxgui/profilemanager.py:802
 msgid "Sharing"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:996
+#: ../pyhoca/wxgui/profilemanager.py:988
 msgid "<xkbtype>"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:997
+#: ../pyhoca/wxgui/profilemanager.py:989
 msgid "<xkblayout>"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:998
+#: ../pyhoca/wxgui/profilemanager.py:990
 msgid "<xkbvariant>"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1284
+#: ../pyhoca/wxgui/profilemanager.py:1444
 msgid "Icon Files (*.png)|*.png|All files (*.*)|*"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1287
+#: ../pyhoca/wxgui/profilemanager.py:1447
 msgid "Choose an icon for this session profile"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1509
+#: ../pyhoca/wxgui/profilemanager.py:1816
 msgid "All files (*.*)|*"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1511
-#: ../pyhoca/wxgui/profilemanager.py:1533
+#: ../pyhoca/wxgui/profilemanager.py:1818
+#: ../pyhoca/wxgui/profilemanager.py:1842
 msgid "Choose a public SSH key"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1784
+#: ../pyhoca/wxgui/profilemanager.py:2220
 msgid "Choose a folder to share within a session"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1912
-#: ../pyhoca/wxgui/profilemanager.py:1915
-#: ../pyhoca/wxgui/profilemanager.py:1918
-#: ../pyhoca/wxgui/profilemanager.py:1923
-#: ../pyhoca/wxgui/profilemanager.py:1933 ../pyhoca/wxgui/menus_taskbar.py:118
+#: ../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
 msgid "Profile Manager"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1912
+#: ../pyhoca/wxgui/profilemanager.py:2348
 msgid "Profile name is missing, profile unusable!!!"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1915
-#: ../pyhoca/wxgui/profilemanager.py:1918
+#: ../pyhoca/wxgui/profilemanager.py:2351
+#: ../pyhoca/wxgui/profilemanager.py:2354
 #, python-format
 msgid "Profile name %s already exists!!!"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1923
+#: ../pyhoca/wxgui/profilemanager.py:2359
 msgid "The SSH proxy configuration is incomplete. Try again."
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1933
+#: ../pyhoca/wxgui/profilemanager.py:2369
 #, python-format
 msgid ""
 "Another session profile (%s) already uses [%s]:%s for binding a local SSH "
@@ -658,248 +693,252 @@ msgid ""
 "Please change the SSH proxy settings accordingly."
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1960
+#: ../pyhoca/wxgui/profilemanager.py:2396
 #, python-format
 msgid "%s - profile added"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1961
+#: ../pyhoca/wxgui/profilemanager.py:2397
 msgid "A new session profile has been added."
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1965
+#: ../pyhoca/wxgui/profilemanager.py:2401
 #, python-format
 msgid "%s - modified"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1966
+#: ../pyhoca/wxgui/profilemanager.py:2402
 msgid "Changes to profile have been saved."
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:75
+#: ../pyhoca/wxgui/menus_taskbar.py:74
 msgid "Edit Profile"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:78
+#: ../pyhoca/wxgui/menus_taskbar.py:77
 msgid "Use as Template for New Profile"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:79
+#: ../pyhoca/wxgui/menus_taskbar.py:78
 msgid "Delete Profile"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:107
+#: ../pyhoca/wxgui/menus_taskbar.py:106
 #, python-format
 msgid "About %s (%s)..."
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:133
+#: ../pyhoca/wxgui/menus_taskbar.py:132
 msgid "Manage Session Profile"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:142
+#: ../pyhoca/wxgui/menus_taskbar.py:141
 msgid "Printing Preferences"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:148
+#: ../pyhoca/wxgui/menus_taskbar.py:147
 msgid "Client Options"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:156 ../pyhoca/wxgui/menus_taskbar.py:785
-#: ../pyhoca/wxgui/menus_taskbar.py:977
+#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:783
+#: ../pyhoca/wxgui/menus_taskbar.py:975
 msgid "E&xit"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:228
+#: ../pyhoca/wxgui/menus_taskbar.py:227
 msgid "Window title"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:234 ../pyhoca/wxgui/menus_taskbar.py:613
+#: ../pyhoca/wxgui/menus_taskbar.py:233 ../pyhoca/wxgui/menus_taskbar.py:608
 msgid "Resume Session"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:236
+#: ../pyhoca/wxgui/menus_taskbar.py:235
 msgid "Resume Session (not possible)"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:247
+#: ../pyhoca/wxgui/menus_taskbar.py:246
 msgid "Transfer Session"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:249
+#: ../pyhoca/wxgui/menus_taskbar.py:248
 msgid "Transfer Session (not possible)"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:253 ../pyhoca/wxgui/menus_taskbar.py:604
+#: ../pyhoca/wxgui/menus_taskbar.py:252 ../pyhoca/wxgui/menus_taskbar.py:599
 msgid "Suspend Session (and disconnect/exit)"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:255 ../pyhoca/wxgui/menus_taskbar.py:606
+#: ../pyhoca/wxgui/menus_taskbar.py:254 ../pyhoca/wxgui/menus_taskbar.py:601
 msgid "Suspend Session (and disconnect)"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:257 ../pyhoca/wxgui/menus_taskbar.py:608
+#: ../pyhoca/wxgui/menus_taskbar.py:256 ../pyhoca/wxgui/menus_taskbar.py:603
 msgid "Suspend Session"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:263 ../pyhoca/wxgui/menus_taskbar.py:617
+#: ../pyhoca/wxgui/menus_taskbar.py:262 ../pyhoca/wxgui/menus_taskbar.py:612
 msgid "Terminate Session (and disconnect/exit)"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:265 ../pyhoca/wxgui/menus_taskbar.py:619
+#: ../pyhoca/wxgui/menus_taskbar.py:264 ../pyhoca/wxgui/menus_taskbar.py:614
 msgid "Terminate Session (and disconnect)"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:267 ../pyhoca/wxgui/menus_taskbar.py:621
+#: ../pyhoca/wxgui/menus_taskbar.py:266 ../pyhoca/wxgui/menus_taskbar.py:616
 msgid "Terminate Session"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:271 ../pyhoca/wxgui/menus_taskbar.py:601
+#: ../pyhoca/wxgui/menus_taskbar.py:270 ../pyhoca/wxgui/menus_taskbar.py:596
 msgid "Refresh menu tree"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:280
+#: ../pyhoca/wxgui/menus_taskbar.py:279
 msgid "Rename Session Window"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:281
+#: ../pyhoca/wxgui/menus_taskbar.py:280
 msgid "Show Session Window"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:321
+#: ../pyhoca/wxgui/menus_taskbar.py:322
 msgid "&Share custom local folder"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:344
+#: ../pyhoca/wxgui/menus_taskbar.py:337
 msgid "Share:"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:355
+#: ../pyhoca/wxgui/menus_taskbar.py:346
 msgid "Unshare:"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:365
+#: ../pyhoca/wxgui/menus_taskbar.py:354
 msgid "Unshare &all local folders"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:445
+#: ../pyhoca/wxgui/menus_taskbar.py:360
+msgid "Restore shares in next session"
+msgstr ""
+
+#: ../pyhoca/wxgui/menus_taskbar.py:440
 msgid "Multimedia"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:446
+#: ../pyhoca/wxgui/menus_taskbar.py:441
 msgid "Development"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:447
+#: ../pyhoca/wxgui/menus_taskbar.py:442
 msgid "Education"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:448
+#: ../pyhoca/wxgui/menus_taskbar.py:443
 msgid "Games"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:449
+#: ../pyhoca/wxgui/menus_taskbar.py:444
 msgid "Graphics"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:450
+#: ../pyhoca/wxgui/menus_taskbar.py:445
 msgid "Internet"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:451
+#: ../pyhoca/wxgui/menus_taskbar.py:446
 msgid "Office Applications"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:452
+#: ../pyhoca/wxgui/menus_taskbar.py:447
 msgid "System"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:453
+#: ../pyhoca/wxgui/menus_taskbar.py:448
 msgid "Utilities"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:454
+#: ../pyhoca/wxgui/menus_taskbar.py:449
 msgid "Other Applications"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:526 ../pyhoca/wxgui/menus_taskbar.py:538
+#: ../pyhoca/wxgui/menus_taskbar.py:521 ../pyhoca/wxgui/menus_taskbar.py:533
 #, python-format
 msgid "Connect %s"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:532
+#: ../pyhoca/wxgui/menus_taskbar.py:527
 msgid "Currently connecting..."
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:546
+#: ../pyhoca/wxgui/menus_taskbar.py:541
 msgid "Start &new Desktop Session"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:551 ../pyhoca/wxgui/menus_taskbar.py:689
+#: ../pyhoca/wxgui/menus_taskbar.py:546 ../pyhoca/wxgui/menus_taskbar.py:684
 msgid "Retrieving Application Menu..."
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:555 ../pyhoca/wxgui/menus_taskbar.py:692
+#: ../pyhoca/wxgui/menus_taskbar.py:550 ../pyhoca/wxgui/menus_taskbar.py:687
 msgid "Retrieve Application Menu"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:558
+#: ../pyhoca/wxgui/menus_taskbar.py:553
 msgid "Start &new Session"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:638
+#: ../pyhoca/wxgui/menus_taskbar.py:633
 msgid "Launch Single Application"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:676
+#: ../pyhoca/wxgui/menus_taskbar.py:671
 msgid "Manage Application Menu"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:719
+#: ../pyhoca/wxgui/menus_taskbar.py:714
 msgid "Running"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:721
+#: ../pyhoca/wxgui/menus_taskbar.py:716
 msgid "Suspended"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:740
+#: ../pyhoca/wxgui/menus_taskbar.py:735
 msgid "&Clean all sessions"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:746
+#: ../pyhoca/wxgui/menus_taskbar.py:741
 msgid "Customize &profile"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:758
+#: ../pyhoca/wxgui/menus_taskbar.py:756
 msgid "Shared &folders"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:770
+#: ../pyhoca/wxgui/menus_taskbar.py:768
 msgid "&Disconnect from Server"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:777
+#: ../pyhoca/wxgui/menus_taskbar.py:775
 msgid "Suspend Session and E&xit application"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:781
+#: ../pyhoca/wxgui/menus_taskbar.py:779
 msgid "Disconnect and E&xit application"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:835
+#: ../pyhoca/wxgui/menus_taskbar.py:833
 msgid "Add Profile"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:911
+#: ../pyhoca/wxgui/menus_taskbar.py:909
 msgid "No session profiles defined"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:947
+#: ../pyhoca/wxgui/menus_taskbar.py:945
 msgid "Start/Resume Session"
 msgstr ""
 
-#: ../pyhoca/wxgui/menus_taskbar.py:947
+#: ../pyhoca/wxgui/menus_taskbar.py:945
 msgid "Connect Server"
 msgstr ""
 
@@ -908,106 +947,122 @@ msgstr ""
 msgid "About %s ..."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:462
+#: ../pyhoca/wxgui/frontend.py:459
 msgid "Suspending sessions and exiting application..."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:465
+#: ../pyhoca/wxgui/frontend.py:462
 #, python-format
 msgid "Disconnecting %s and exiting application..."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:467
+#: ../pyhoca/wxgui/frontend.py:464
 msgid "Exiting application..."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:560
+#: ../pyhoca/wxgui/frontend.py:562
 #, python-format
 msgid "%s - server warning"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:560
+#: ../pyhoca/wxgui/frontend.py:562
 msgid "The X2Go Server does not publish an application menu."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:610
-msgid "Public SSH key authentication has been successful."
+#: ../pyhoca/wxgui/frontend.py:613
+msgid "SSH key authentication has been successful."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:644
+#: ../pyhoca/wxgui/frontend.py:650
 msgid ""
 "The SSH proxy's host key is invalid or has not been accepted by the user"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:665
+#: ../pyhoca/wxgui/frontend.py:671
 #, python-format
 msgid "%s - EOF error"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:665
+#: ../pyhoca/wxgui/frontend.py:671
 msgid "Authentication protocol communication incomplete! Try again..."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:672
+#: ../pyhoca/wxgui/frontend.py:678
 #, python-format
 msgid "%s - auth key error"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:693
+#: ../pyhoca/wxgui/frontend.py:699
 msgid "An unknown error occurred during authentication!"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:726
+#: ../pyhoca/wxgui/frontend.py:728
+#, python-format
+msgid "%s: DirectRDP not supported yet"
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:729
+#, python-format
+msgid ""
+"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)."
+msgstr ""
+
+#: ../pyhoca/wxgui/frontend.py:741
 msgid "Unknown session profile, configure before using it..."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:784 ../pyhoca/wxgui/frontend.py:1302
+#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:1332
 #, python-format
 msgid "%s - session warning"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:784
+#: ../pyhoca/wxgui/frontend.py:798
 #, python-format
 msgid "Execution of command ,,%s'' failed."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:926
+#: ../pyhoca/wxgui/frontend.py:939
 msgid "Cleaning X2Go sessions..."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:961
+#: ../pyhoca/wxgui/frontend.py:974
 #, python-format
 msgid "%s - disconnect"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:961
+#: ../pyhoca/wxgui/frontend.py:974
 msgid "X2Go Profile is now disconnected."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:977
+#: ../pyhoca/wxgui/frontend.py:995
 msgid "New Session Profile"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1029
+#: ../pyhoca/wxgui/frontend.py:1047
 #, python-format
 msgid "Really Delete Session Profile ,,%s''?"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1035
+#: ../pyhoca/wxgui/frontend.py:1053
 #, python-format
 msgid "%s - profile deleted"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1035
+#: ../pyhoca/wxgui/frontend.py:1053
 msgid "The session profile has been deleted."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1053
+#: ../pyhoca/wxgui/frontend.py:1071
 #, python-format
 msgid "%s - share local folder with sessions of this profile"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1194
+#: ../pyhoca/wxgui/frontend.py:1224
 #, python-format
 msgid ""
 "The authenticity of host [%s]:%s can't be established.\n"
@@ -1016,148 +1071,148 @@ msgid ""
 "Are you sure you want to continue connecting?"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1202
+#: ../pyhoca/wxgui/frontend.py:1232
 #, python-format
 msgid "%s: Confirm Host Authorization"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1247
+#: ../pyhoca/wxgui/frontend.py:1277
 #, python-format
 msgid "%s - channel error"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1247
+#: ../pyhoca/wxgui/frontend.py:1277
 #, python-format
 msgid ""
 "Lost connection to server %s unexpectedly! Try to re-authenticate to the "
 "server..."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1265 ../pyhoca/wxgui/frontend.py:1283
-#: ../pyhoca/wxgui/frontend.py:1285 ../pyhoca/wxgui/frontend.py:1321
+#: ../pyhoca/wxgui/frontend.py:1295 ../pyhoca/wxgui/frontend.py:1313
+#: ../pyhoca/wxgui/frontend.py:1315 ../pyhoca/wxgui/frontend.py:1351
 #, python-format
 msgid "%s - session failure"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1265
+#: ../pyhoca/wxgui/frontend.py:1295
 msgid "The session startup failed."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1283
+#: ../pyhoca/wxgui/frontend.py:1313
 #, python-format
 msgid "The command ,,%s'' is not available on X2Go server."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1285
+#: ../pyhoca/wxgui/frontend.py:1315
 #, python-format
 msgid ""
 "The command ,,%s'' is not available on X2Go server\n"
 "%s."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1302
+#: ../pyhoca/wxgui/frontend.py:1332
 #, python-format
 msgid ""
 "Reverse TCP port forwarding request for session %s to server port %s has "
 "been denied."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1321
+#: ../pyhoca/wxgui/frontend.py:1351
 #, python-format
 msgid ""
 "Forwarding tunnel request to [%s]:%s for session %s was denied by remote "
 "X2go/SSH server. Session startup failed."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1340
+#: ../pyhoca/wxgui/frontend.py:1370
 #, python-format
 msgid "%s - audio warning"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1340
+#: ../pyhoca/wxgui/frontend.py:1370
 msgid ""
 "The X2Go PulseAudio system is not available within Remote Desktop sessions."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1347 ../pyhoca/wxgui/frontend.py:1354
+#: ../pyhoca/wxgui/frontend.py:1377 ../pyhoca/wxgui/frontend.py:1384
 #, python-format
 msgid "%s - audio error"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1347
+#: ../pyhoca/wxgui/frontend.py:1377
 msgid "The X2Go PulseAudio system could not be started."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1354
+#: ../pyhoca/wxgui/frontend.py:1384
 msgid "The X2Go PulseAudio system has died unexpectedly."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1366
+#: ../pyhoca/wxgui/frontend.py:1396
 #, python-format
 msgid "%s - audio problem"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1366
+#: ../pyhoca/wxgui/frontend.py:1396
 #, python-format
 msgid ""
 "The audio connection could not be set up for this session.\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1378
+#: ../pyhoca/wxgui/frontend.py:1408
 #, python-format
 msgid "%s - client-side printing not available"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1378
+#: ../pyhoca/wxgui/frontend.py:1408
 #, python-format
 msgid ""
 "The server denies client-side printing from within this session.\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1390
+#: ../pyhoca/wxgui/frontend.py:1420
 #, python-format
 msgid "%s - MIME box not available"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1390
+#: ../pyhoca/wxgui/frontend.py:1420
 #, python-format
 msgid ""
 "The server does not support the X2Go MIME box.\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1402
+#: ../pyhoca/wxgui/frontend.py:1432
 #, python-format
 msgid "%s - client-side folders not sharable"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1402
+#: ../pyhoca/wxgui/frontend.py:1432
 #, python-format
 msgid ""
 "The server denies client-side folder sharing with this session.\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1414
+#: ../pyhoca/wxgui/frontend.py:1444
 #, python-format
 msgid "%s - client resources not sharable"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1414
+#: ../pyhoca/wxgui/frontend.py:1444
 #, python-format
 msgid ""
 "Client-side folders and printers cannot be shared with this session.\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1433 ../pyhoca/wxgui/frontend.py:1435
+#: ../pyhoca/wxgui/frontend.py:1463 ../pyhoca/wxgui/frontend.py:1465
 #, python-format
 msgid "%s - print error"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1433
+#: ../pyhoca/wxgui/frontend.py:1463
 #, python-format
 msgid ""
 "%s\n"
@@ -1165,7 +1220,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1435
+#: ../pyhoca/wxgui/frontend.py:1465
 #, python-format
 msgid ""
 "%s\n"
@@ -1173,88 +1228,88 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1450 ../pyhoca/wxgui/frontend.py:1465
+#: ../pyhoca/wxgui/frontend.py:1480 ../pyhoca/wxgui/frontend.py:1495
 #, python-format
 msgid "%s - start"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1450
+#: ../pyhoca/wxgui/frontend.py:1480
 #, python-format
 msgid ""
 "New X2Go session starting up...\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1465
+#: ../pyhoca/wxgui/frontend.py:1495
 #, python-format
 msgid ""
 "Another client started X2Go session\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1480 ../pyhoca/wxgui/frontend.py:1495
+#: ../pyhoca/wxgui/frontend.py:1510 ../pyhoca/wxgui/frontend.py:1525
 #, python-format
 msgid "%s - resume"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1480
+#: ../pyhoca/wxgui/frontend.py:1510
 #, python-format
 msgid ""
 "Resuming X2Go session...\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1495
+#: ../pyhoca/wxgui/frontend.py:1525
 #, python-format
 msgid ""
 "Another client resumed X2Go session\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1510
+#: ../pyhoca/wxgui/frontend.py:1540
 #, python-format
 msgid "%s - running"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1510
+#: ../pyhoca/wxgui/frontend.py:1540
 #, python-format
 msgid ""
 "Found already running session\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1530
+#: ../pyhoca/wxgui/frontend.py:1560
 #, python-format
 msgid "%s - suspend"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1530
+#: ../pyhoca/wxgui/frontend.py:1560
 #, python-format
 msgid ""
 "X2Go Session has been suspended\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1557
+#: ../pyhoca/wxgui/frontend.py:1587
 #, python-format
 msgid "%s - terminate"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1557
+#: ../pyhoca/wxgui/frontend.py:1587
 #, python-format
 msgid ""
 "X2Go Session has terminated\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/messages.py:74
+#: ../pyhoca/wxgui/messages.py:73
 #, python-format
 msgid ""
 "Are you really sure you want to\n"
 "delete the session profile ,,%s''?"
 msgstr ""
 
-#: ../pyhoca/wxgui/messages.py:75
+#: ../pyhoca/wxgui/messages.py:74
 #, python-format
 msgid ""
 "PyHoca-GUI is already running for user ,,%s''!\n"
@@ -1264,15 +1319,15 @@ msgid ""
 "notification area/systray."
 msgstr ""
 
-#: ../pyhoca/wxgui/messages.py:108
+#: ../pyhoca/wxgui/messages.py:107
 msgid "Yes"
 msgstr ""
 
-#: ../pyhoca/wxgui/messages.py:109
+#: ../pyhoca/wxgui/messages.py:108
 msgid "No"
 msgstr ""
 
-#: ../pyhoca/wxgui/messages.py:126 ../pyhoca/wxgui/printingprefs.py:142
+#: ../pyhoca/wxgui/messages.py:125 ../pyhoca/wxgui/printingprefs.py:142
 msgid "Ok"
 msgstr ""
 
diff --git a/po/nb_NO.po b/po/nb_NO.po
index cc75284..0a8c4cd 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PyHoca-GUI VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-10 21:18+0200\n"
-"PO-Revision-Date: 2012-06-03 14:30+0100\n"
-"Last-Translator: Terje Andersen <teranders at gmail.com>\n"
-"Language-Team: nb_NO <x2go-i18n at lists.berlios.de>\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"
+"Language-Team: X2Go i18n <x2go-i18n at lists.berlios.de>\n"
 "Language: nb_NO\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,129 +20,129 @@ msgstr ""
 "X-Poedit-Country: Norway\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../pyhoca/wxgui/logon.py:92
+#: ../pyhoca/wxgui/logon.py:86
 #, python-format
 msgid "%s (via %s)"
 msgstr "%s (via %s)"
 
-#: ../pyhoca/wxgui/logon.py:96 ../pyhoca/wxgui/logon.py:108
+#: ../pyhoca/wxgui/logon.py:90 ../pyhoca/wxgui/logon.py:102
 msgid "Username"
 msgstr "Brukernavn"
 
-#: ../pyhoca/wxgui/logon.py:98 ../pyhoca/wxgui/logon.py:110
+#: ../pyhoca/wxgui/logon.py:92 ../pyhoca/wxgui/logon.py:104
 msgid "Password"
 msgstr "Passord"
 
-#: ../pyhoca/wxgui/logon.py:101
+#: ../pyhoca/wxgui/logon.py:95
 msgid "Authenticate"
 msgstr "Autentiser"
 
-#: ../pyhoca/wxgui/logon.py:113
+#: ../pyhoca/wxgui/logon.py:107
 msgid "  Start SSH tunnel  "
 msgstr "  Start SSH tunnel  "
 
-#: ../pyhoca/wxgui/logon.py:121
+#: ../pyhoca/wxgui/logon.py:115
 msgid "Session login"
 msgstr "Sesjons innlogging"
 
-#: ../pyhoca/wxgui/logon.py:122
+#: ../pyhoca/wxgui/logon.py:116
 msgid "SSH proxy server login"
 msgstr "logg inn via en SSH mellomtjener"
 
-#: ../pyhoca/wxgui/logon.py:133 ../pyhoca/wxgui/profilemanager.py:322
-#: ../pyhoca/wxgui/messages.py:132 ../pyhoca/wxgui/printingprefs.py:147
+#: ../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
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../pyhoca/wxgui/logon.py:292 ../pyhoca/wxgui/logon.py:334
-#: ../pyhoca/wxgui/frontend.py:603
+#: ../pyhoca/wxgui/logon.py:297 ../pyhoca/wxgui/logon.py:339
+#: ../pyhoca/wxgui/frontend.py:606
 #, python-format
 msgid "%s - connect failure"
 msgstr "%s - tilkoblingsfeil"
 
-#: ../pyhoca/wxgui/logon.py:293 ../pyhoca/wxgui/frontend.py:603
+#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:606
 msgid "User is not allowed to start X2Go sessions!"
 msgstr "Bruker kontoen har ikke tillatelse til å starte X2Go sesjoner!"
 
-#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:610
+#: ../pyhoca/wxgui/logon.py:303 ../pyhoca/wxgui/frontend.py:613
 #, python-format
 msgid "%s - connect"
 msgstr "%s - koble til"
 
-#: ../pyhoca/wxgui/logon.py:299
+#: ../pyhoca/wxgui/logon.py:304
 msgid "Authentication has been successful."
 msgstr "Autentiseringen var vellykket."
 
-#: ../pyhoca/wxgui/logon.py:330
+#: ../pyhoca/wxgui/logon.py:335
 msgid "SSH tunnel started"
 msgstr "SSH tunnel har startet"
 
-#: ../pyhoca/wxgui/logon.py:335
+#: ../pyhoca/wxgui/logon.py:340
 msgid "Authentication failed!"
 msgstr "Autentiseringen feilet!"
 
-#: ../pyhoca/wxgui/logon.py:342
+#: ../pyhoca/wxgui/logon.py:348
 #, python-format
 msgid "%s - SSH proxy"
 msgstr "%s - ssh mellomtjener"
 
-#: ../pyhoca/wxgui/logon.py:343
+#: ../pyhoca/wxgui/logon.py:349
 msgid "Authentication to the SSH proxy server failed!"
 msgstr "Autentiseringenen til SSH mellomtjeneren feilet!"
 
-#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:658
+#: ../pyhoca/wxgui/logon.py:376 ../pyhoca/wxgui/frontend.py:664
 #, python-format
 msgid "%s - socket error"
 msgstr "%s - sokkel feil"
 
-#: ../pyhoca/wxgui/logon.py:372 ../pyhoca/wxgui/frontend.py:637
-#: ../pyhoca/wxgui/frontend.py:644
+#: ../pyhoca/wxgui/logon.py:383 ../pyhoca/wxgui/frontend.py:643
+#: ../pyhoca/wxgui/frontend.py:650
 #, python-format
 msgid "%s - host key error"
 msgstr "%s - verts nøkkel feil"
 
-#: ../pyhoca/wxgui/logon.py:373 ../pyhoca/wxgui/frontend.py:637
+#: ../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 ""
 "Den eksterne serverens verts nøkkel er ugyldig, eller ikke blitt akseptert "
 "av brukeren"
 
-#: ../pyhoca/wxgui/logon.py:380 ../pyhoca/wxgui/frontend.py:679
+#: ../pyhoca/wxgui/logon.py:391 ../pyhoca/wxgui/frontend.py:685
 #, python-format
 msgid "%s - missing home directory"
 msgstr "%s - mangler hjemmekatalog"
 
-#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:679
+#: ../pyhoca/wxgui/logon.py:392 ../pyhoca/wxgui/frontend.py:685
 msgid "The remote user's home directory does not exist."
 msgstr "Brukerens hjemmekatalog på den eksterne serveren finnes ikke."
 
-#: ../pyhoca/wxgui/logon.py:388
+#: ../pyhoca/wxgui/logon.py:399
 #, python-format
 msgid "%s - key error"
 msgstr "%s - nøkkel feil"
 
-#: ../pyhoca/wxgui/logon.py:396 ../pyhoca/wxgui/frontend.py:686
+#: ../pyhoca/wxgui/logon.py:407 ../pyhoca/wxgui/frontend.py:692
 #, python-format
 msgid "%s - auth error"
 msgstr "%s - autentiseringens feil"
 
-#: ../pyhoca/wxgui/logon.py:404 ../pyhoca/wxgui/frontend.py:630
+#: ../pyhoca/wxgui/logon.py:415 ../pyhoca/wxgui/frontend.py:636
 #, python-format
 msgid "%s - SSH error"
 msgstr "%s - SSH feil"
 
-#: ../pyhoca/wxgui/logon.py:412
+#: ../pyhoca/wxgui/logon.py:423
 #, python-format
 msgid "%s - unknown error"
 msgstr "%s - ukjent feil"
 
-#: ../pyhoca/wxgui/logon.py:413
+#: ../pyhoca/wxgui/logon.py:424
 msgid "An unknown error occured during authentication!"
 msgstr "En ukjent feil oppstod under autentiseringen!"
 
-#: ../pyhoca/wxgui/taskbar.py:92
+#: ../pyhoca/wxgui/taskbar.py:89
 #, python-format
 msgid ""
 "PyHoca-GUI\n"
@@ -151,7 +151,7 @@ msgstr ""
 "PyHoca-GUI\n"
 "Kobler deg til ,,%s''"
 
-#: ../pyhoca/wxgui/taskbar.py:96
+#: ../pyhoca/wxgui/taskbar.py:93
 #, python-format
 msgid ""
 "PyHoca-GUI (Python X2goClient)\n"
@@ -160,7 +160,7 @@ msgstr ""
 "PyHoca-GUI (Python X2goClient)\n"
 "Holder på med å koble deg til X2Go serveren ,,%s''"
 
-#: ../pyhoca/wxgui/taskbar.py:106
+#: ../pyhoca/wxgui/taskbar.py:103
 msgid ""
 "PyHoca-GUI\n"
 "Connecting you to X2Go..."
@@ -168,7 +168,7 @@ msgstr ""
 "PyHoca-GUI\n"
 "Kobler deg til X2Go..."
 
-#: ../pyhoca/wxgui/taskbar.py:110
+#: ../pyhoca/wxgui/taskbar.py:107
 msgid ""
 "PyHoca-GUI (Python X2goClient)\n"
 "Client for connecting you to a remote X2Go server"
@@ -176,280 +176,307 @@ msgstr ""
 "PyHoca-GUI (Python X2goClient)\n"
 "Klient for å koble deg til en ekstern X2Go server"
 
-#: ../pyhoca/wxgui/profilemanager.py:82
+#: ../pyhoca/wxgui/profilemanager.py:79
 msgid "GNOME Desktop (GNOME)"
 msgstr "GNOME skrivebord (GNOME)"
 
-#: ../pyhoca/wxgui/profilemanager.py:83
+#: ../pyhoca/wxgui/profilemanager.py:80
 msgid "K Desktop Environment (KDE)"
 msgstr "K skrivebordsmiljø (KDE)"
 
-#: ../pyhoca/wxgui/profilemanager.py:84
+#: ../pyhoca/wxgui/profilemanager.py:81
 msgid "Lightweight X Desktop (LXDE)"
 msgstr "Lettvekts X skrivebord (LXDE)"
 
-#: ../pyhoca/wxgui/profilemanager.py:85
+#: ../pyhoca/wxgui/profilemanager.py:82
 msgid "Trinity X Desktop (KDE3-like)"
 msgstr "Trinity X Skrivebord (KDE3-liknende)"
 
-#: ../pyhoca/wxgui/profilemanager.py:86
+#: ../pyhoca/wxgui/profilemanager.py:83
 msgid "Unity X Desktop Shell (UNITY)"
 msgstr "Unity X skrivebords skall (UNITY)"
 
-#: ../pyhoca/wxgui/profilemanager.py:87
-msgid "XFCE4 Desktop (XFCE4)"
-msgstr "XFCE4 skrivebord (XFCE4)"
+#: ../pyhoca/wxgui/profilemanager.py:84
+msgid "XFCE Desktop (XFCE)"
+msgstr "XFCE skrivebord (XFCE)"
 
-#: ../pyhoca/wxgui/profilemanager.py:88
+#: ../pyhoca/wxgui/profilemanager.py:85
 msgid "Published Applications"
 msgstr "Publiserte applikasjoner"
 
-#: ../pyhoca/wxgui/profilemanager.py:89
+#: ../pyhoca/wxgui/profilemanager.py:86
 msgid "Single Application"
 msgstr "Enkelt applikasjon"
 
-#: ../pyhoca/wxgui/profilemanager.py:90
+#: ../pyhoca/wxgui/profilemanager.py:87
 msgid "XDMCP Query"
 msgstr "XDMCP spørring"
 
-#: ../pyhoca/wxgui/profilemanager.py:91
-msgid "Windows Terminal Server (RDP-proxy)"
-msgstr "Windows Terminal Server (RDP-proxy)"
+#: ../pyhoca/wxgui/profilemanager.py:88
+msgid "Windows Terminal Server (X2Go-proxied RDP)"
+msgstr "Windows Terminal Server (RDP via X2Go-proxy)"
+
+#: ../pyhoca/wxgui/profilemanager.py:89
+msgid "Windows Terminal Server (Direct RDP)"
+msgstr "Windows Terminal Server (Direkte RDP)"
 
-#. 'DirectRDP': 'Windows Terminal Server (RDP-direct)',
-#: ../pyhoca/wxgui/profilemanager.py:93 ../pyhoca/wxgui/profilemanager.py:207
+#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/profilemanager.py:224
 msgid "Custom command"
 msgstr "Selvvalgt kommando"
 
-#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:398
+#: ../pyhoca/wxgui/profilemanager.py:95 ../pyhoca/wxgui/menus_taskbar.py:393
 msgid "Internet Browser"
 msgstr "Nettleser"
 
-#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:399
+#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:394
 msgid "Email Client"
 msgstr "Epost klient"
 
-#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:400
+#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:395
 msgid "Office"
 msgstr "Kontor"
 
-#: ../pyhoca/wxgui/profilemanager.py:99 ../pyhoca/wxgui/menus_taskbar.py:401
+#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:396
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../pyhoca/wxgui/profilemanager.py:113
+#: ../pyhoca/wxgui/profilemanager.py:116
 msgid "Open file with system's default application"
 msgstr "Ã…pne filen med systems foretrukne applikasjon"
 
-#: ../pyhoca/wxgui/profilemanager.py:114
+#: ../pyhoca/wxgui/profilemanager.py:117
 msgid "Open application chooser dialog"
 msgstr "Ã…pne applikasjonsvelger dialog"
 
-#: ../pyhoca/wxgui/profilemanager.py:115
+#: ../pyhoca/wxgui/profilemanager.py:118
 msgid "Save incoming file as ..."
 msgstr "Lagre innkommende fil som ..."
 
-#: ../pyhoca/wxgui/profilemanager.py:143
+#: ../pyhoca/wxgui/profilemanager.py:146
 msgid "settings derived from "
 msgstr "innstillinger arvet fra"
 
 #. boxes for all tabs
-#: ../pyhoca/wxgui/profilemanager.py:160
+#: ../pyhoca/wxgui/profilemanager.py:167
 msgid "Session Title"
 msgstr "Sesjonstittel"
 
-#: ../pyhoca/wxgui/profilemanager.py:161
+#: ../pyhoca/wxgui/profilemanager.py:168
 msgid "Session Window"
 msgstr "Sesjonsvindu"
 
-#: ../pyhoca/wxgui/profilemanager.py:162
+#: ../pyhoca/wxgui/profilemanager.py:169
 msgid "Session Startup"
 msgstr "Sesjon oppstart"
 
-#: ../pyhoca/wxgui/profilemanager.py:163
+#: ../pyhoca/wxgui/profilemanager.py:170
 msgid "Server"
 msgstr "Server"
 
-#: ../pyhoca/wxgui/profilemanager.py:164
+#: ../pyhoca/wxgui/profilemanager.py:171
+msgid "Proxy"
+msgstr "Proxy"
+
+#: ../pyhoca/wxgui/profilemanager.py:172
 msgid "Connection Link Speed"
 msgstr "Tilkoblingens forbindelseshastighet"
 
-#: ../pyhoca/wxgui/profilemanager.py:165
+#: ../pyhoca/wxgui/profilemanager.py:173
 msgid "Compression"
 msgstr "Kompresjon"
 
-#: ../pyhoca/wxgui/profilemanager.py:166
+#: ../pyhoca/wxgui/profilemanager.py:174
 msgid "Display"
 msgstr "Skjerm"
 
-#: ../pyhoca/wxgui/profilemanager.py:167
+#: ../pyhoca/wxgui/profilemanager.py:175
 msgid "Keyboard"
 msgstr "Tastatur"
 
-#: ../pyhoca/wxgui/profilemanager.py:168
+#: ../pyhoca/wxgui/profilemanager.py:176
 msgid "Sound"
 msgstr "Lyd"
 
-#: ../pyhoca/wxgui/profilemanager.py:169
+#: ../pyhoca/wxgui/profilemanager.py:177
 msgid "Printing"
 msgstr "Utskrift"
 
-#: ../pyhoca/wxgui/profilemanager.py:170
+#: ../pyhoca/wxgui/profilemanager.py:178
 msgid "Folder Exports"
 msgstr "Mappe eksporter"
 
-#: ../pyhoca/wxgui/profilemanager.py:171
+#: ../pyhoca/wxgui/profilemanager.py:179
 msgid "File Import"
 msgstr "Fil import"
 
 #. ##
 #. ## widgets for the PROFILE tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:176
+#: ../pyhoca/wxgui/profilemanager.py:184
 msgid "Name"
 msgstr "Navn"
 
-#: ../pyhoca/wxgui/profilemanager.py:183
+#: ../pyhoca/wxgui/profilemanager.py:191
 msgid "Set session window title"
 msgstr "Angi sesjons vindustittel"
 
-#: ../pyhoca/wxgui/profilemanager.py:184
+#: ../pyhoca/wxgui/profilemanager.py:192
 msgid "Use a default session window title"
 msgstr "Benytt standard sesjons vindustittel"
 
-#: ../pyhoca/wxgui/profilemanager.py:185
+#: ../pyhoca/wxgui/profilemanager.py:193
 msgid "Custom session window title"
 msgstr "Tilpasset sesjon vindustittel"
 
-#: ../pyhoca/wxgui/profilemanager.py:195
+#: ../pyhoca/wxgui/profilemanager.py:212
 msgid "Window Icon"
 msgstr "Vindusikon"
 
 #. ##
 #. ## widgets for the SESSION tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:201
+#: ../pyhoca/wxgui/profilemanager.py:218
 msgid "Start session automatically after login"
 msgstr "Start sesjonen automatisk etter innlogging"
 
-#: ../pyhoca/wxgui/profilemanager.py:202
+#: ../pyhoca/wxgui/profilemanager.py:219
 #, python-format
 msgid "Login automatically after %s has started"
 msgstr "Logg inn automatisk etter at %s har startet"
 
-#: ../pyhoca/wxgui/profilemanager.py:203
+#: ../pyhoca/wxgui/profilemanager.py:220
 msgid "Type"
 msgstr "Type"
 
-#: ../pyhoca/wxgui/profilemanager.py:205
+#: ../pyhoca/wxgui/profilemanager.py:222
 msgid "Application"
 msgstr "Applikasjon"
 
-#: ../pyhoca/wxgui/profilemanager.py:209
+#: ../pyhoca/wxgui/profilemanager.py:226
 msgid "XDMCP server"
 msgstr "XDMCP server"
 
-#: ../pyhoca/wxgui/profilemanager.py:211
+#: ../pyhoca/wxgui/profilemanager.py:228
 msgid "RDP server"
 msgstr "RDP server"
 
-#: ../pyhoca/wxgui/profilemanager.py:213
+#: ../pyhoca/wxgui/profilemanager.py:230
 msgid "RDP options"
 msgstr "RDP alternativer"
 
-#: ../pyhoca/wxgui/profilemanager.py:215
+#: ../pyhoca/wxgui/profilemanager.py:232
 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:216
+#: ../pyhoca/wxgui/profilemanager.py:233
 msgid "Menu of published applications"
 msgstr "Meny med publiserte applikasjoner"
 
 #. ##
 #. ## widgets for the CONNECTION tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:223 ../pyhoca/wxgui/profilemanager.py:233
+#: ../pyhoca/wxgui/profilemanager.py:240 ../pyhoca/wxgui/profilemanager.py:253
 msgid "User"
 msgstr "Bruker"
 
-#: ../pyhoca/wxgui/profilemanager.py:225
+#: ../pyhoca/wxgui/profilemanager.py:242 ../pyhoca/wxgui/profilemanager.py:260
 msgid "Host"
 msgstr "Vert"
 
-#: ../pyhoca/wxgui/profilemanager.py:227
+#: ../pyhoca/wxgui/profilemanager.py:244 ../pyhoca/wxgui/profilemanager.py:262
 msgid "Port"
 msgstr "Port"
 
-#: ../pyhoca/wxgui/profilemanager.py:229
-msgid "RSA/DSA private key"
-msgstr "RSA/DSA privat nøkkel"
+#: ../pyhoca/wxgui/profilemanager.py:246
+msgid "Key"
+msgstr "Nøkkel"
 
-#: ../pyhoca/wxgui/profilemanager.py:232
+#: ../pyhoca/wxgui/profilemanager.py:249
+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
+msgid "Enable forwarding of SSH authentication agent connections"
+msgstr "Aktiver videresending av SSH autentiseringen for agent tilkoblinger"
+
+#: ../pyhoca/wxgui/profilemanager.py:252
 msgid "Server behind SSH proxy"
 msgstr "Server bak SSH mellomtjeneren"
 
-#: ../pyhoca/wxgui/profilemanager.py:235
+#: ../pyhoca/wxgui/profilemanager.py:255
+msgid "Use same username for X2Go and proxy host"
+msgstr "Bruk samme brukernavn for X2Go og proxyserveren"
+
+#: ../pyhoca/wxgui/profilemanager.py:256
+msgid "Use same authentication for X2Go and proxy host"
+msgstr "Bruk samme autentisering for X2Go og proxyserveren"
+
+#: ../pyhoca/wxgui/profilemanager.py:257
 msgid "Key file"
 msgstr "Nøkkelfil"
 
-#: ../pyhoca/wxgui/profilemanager.py:238
-msgid "Host[:Port]"
-msgstr "Vert[:Port]"
-
-#: ../pyhoca/wxgui/profilemanager.py:240
+#: ../pyhoca/wxgui/profilemanager.py:264
 msgid "SSH Proxy Tunnel"
 msgstr "SSH mellomtjener tunnel"
 
-#: ../pyhoca/wxgui/profilemanager.py:248
+#: ../pyhoca/wxgui/profilemanager.py:270
+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
 msgid "Modem"
 msgstr "Modem"
 
-#: ../pyhoca/wxgui/profilemanager.py:249
+#: ../pyhoca/wxgui/profilemanager.py:274
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../pyhoca/wxgui/profilemanager.py:250
+#: ../pyhoca/wxgui/profilemanager.py:275
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../pyhoca/wxgui/profilemanager.py:251
+#: ../pyhoca/wxgui/profilemanager.py:276
 msgid "WAN"
 msgstr "WAN"
 
-#: ../pyhoca/wxgui/profilemanager.py:252
+#: ../pyhoca/wxgui/profilemanager.py:277
 msgid "LAN"
 msgstr "LAN"
 
-#: ../pyhoca/wxgui/profilemanager.py:254
+#: ../pyhoca/wxgui/profilemanager.py:279
 msgid "Method"
 msgstr "Metode"
 
-#: ../pyhoca/wxgui/profilemanager.py:256
+#: ../pyhoca/wxgui/profilemanager.py:281
 msgid "Image quality"
 msgstr "Bildekvalitet"
 
 #. ##
 #. ## wigdets for the SETTINGS tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:262
+#: ../pyhoca/wxgui/profilemanager.py:287
 msgid "Fullscreen"
 msgstr "Fullskjerm"
 
-#: ../pyhoca/wxgui/profilemanager.py:263
+#: ../pyhoca/wxgui/profilemanager.py:288
+msgid "Maximized"
+msgstr "Maksimert"
+
+#: ../pyhoca/wxgui/profilemanager.py:289
 msgid "Custom Size"
 msgstr "Egentilpasset størrelse"
 
-#: ../pyhoca/wxgui/profilemanager.py:268
+#: ../pyhoca/wxgui/profilemanager.py:294
 msgid "Set display DPI"
 msgstr "Sett skjermens DPI"
 
-#: ../pyhoca/wxgui/profilemanager.py:270
+#: ../pyhoca/wxgui/profilemanager.py:296
 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:271
+#: ../pyhoca/wxgui/profilemanager.py:297
 msgid ""
 "Automatically detect and use client-side keyboard configuration inside the "
 "session"
@@ -457,213 +484,221 @@ msgstr ""
 "Automatisk oppdag og benytt klient-side konfigurasjon for tastaturet inne i "
 "sesjonen"
 
-#: ../pyhoca/wxgui/profilemanager.py:272
+#: ../pyhoca/wxgui/profilemanager.py:298
 msgid "Use custom keyboard settings as provided below"
 msgstr "Benytt tilpasset innstillinger for tastaturoppsett som gitt nedenfor"
 
-#: ../pyhoca/wxgui/profilemanager.py:273
+#: ../pyhoca/wxgui/profilemanager.py:299
 msgid "Keyboard model"
 msgstr "Tastaturmodell"
 
-#: ../pyhoca/wxgui/profilemanager.py:275
+#: ../pyhoca/wxgui/profilemanager.py:301
 msgid "Layout"
 msgstr "Utforming"
 
-#: ../pyhoca/wxgui/profilemanager.py:277
+#: ../pyhoca/wxgui/profilemanager.py:303
 msgid "Layout variant"
 msgstr "Utformingsvariant"
 
-#: ../pyhoca/wxgui/profilemanager.py:279
+#: ../pyhoca/wxgui/profilemanager.py:305
 msgid "Enable sound support"
 msgstr "Aktiver lydstøtte"
 
-#: ../pyhoca/wxgui/profilemanager.py:280
+#: ../pyhoca/wxgui/profilemanager.py:306
 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:284
+#: ../pyhoca/wxgui/profilemanager.py:310
 msgid "Arts (not supported)"
 msgstr "Arts (ikke supportert)"
 
-#: ../pyhoca/wxgui/profilemanager.py:287
+#: ../pyhoca/wxgui/profilemanager.py:313
 msgid "esd"
 msgstr "esd"
 
-#: ../pyhoca/wxgui/profilemanager.py:288
+#: ../pyhoca/wxgui/profilemanager.py:314
 msgid "Use default sound port"
 msgstr "Benytt standard lydport"
 
-#: ../pyhoca/wxgui/profilemanager.py:289
+#: ../pyhoca/wxgui/profilemanager.py:315
 msgid "Custom sound port"
 msgstr "Selvvalgt lydport"
 
-#: ../pyhoca/wxgui/profilemanager.py:291
-msgid "Client Side printing"
-msgstr "Klientside utskrift"
-
-#: ../pyhoca/wxgui/profilemanager.py:293
+#: ../pyhoca/wxgui/profilemanager.py:318
 msgid "Use local folder sharing"
 msgstr "Benytt lokal mappedeling"
 
-#: ../pyhoca/wxgui/profilemanager.py:294
+#: ../pyhoca/wxgui/profilemanager.py:319
+msgid "Store share list at end of session"
+msgstr "Lagre listen over delte mapper ved sesjonsavslutning%s"
+
+#: ../pyhoca/wxgui/profilemanager.py:320
 msgid "Path"
 msgstr "Sti"
 
-#: ../pyhoca/wxgui/profilemanager.py:297 ../pyhoca/wxgui/profilemanager.py:316
+#: ../pyhoca/wxgui/profilemanager.py:323 ../pyhoca/wxgui/profilemanager.py:344
 msgid "Add"
 msgstr "Legg til"
 
-#: ../pyhoca/wxgui/profilemanager.py:299
+#: ../pyhoca/wxgui/profilemanager.py:325
 msgid "Local Path"
 msgstr "Lokal sti"
 
-#: ../pyhoca/wxgui/profilemanager.py:300
+#: ../pyhoca/wxgui/profilemanager.py:326
 msgid "Connect Method"
 msgstr "Tilkoblingsmetode"
 
-#: ../pyhoca/wxgui/profilemanager.py:301
+#: ../pyhoca/wxgui/profilemanager.py:327
 msgid "Delete"
 msgstr "Slett"
 
-#: ../pyhoca/wxgui/profilemanager.py:303
+#: ../pyhoca/wxgui/profilemanager.py:329
 msgid "Convert between client and server encodings"
 msgstr "Konverter tegnkodingen mellom klient og server"
 
-#: ../pyhoca/wxgui/profilemanager.py:304
+#: ../pyhoca/wxgui/profilemanager.py:330
 msgid "Client encoding"
 msgstr "Klientens tegnkode"
 
-#: ../pyhoca/wxgui/profilemanager.py:306
+#: ../pyhoca/wxgui/profilemanager.py:332
 msgid "Server encoding"
 msgstr "Serverens tegnkode"
 
-#: ../pyhoca/wxgui/profilemanager.py:309
+#: ../pyhoca/wxgui/profilemanager.py:335
 msgid "Use file MIME box for local file import"
 msgstr "Benytt filens MIME boks for lokal fil import"
 
-#: ../pyhoca/wxgui/profilemanager.py:310
+#: ../pyhoca/wxgui/profilemanager.py:336
 msgid "Extensions"
 msgstr "Utvidelser"
 
-#: ../pyhoca/wxgui/profilemanager.py:312
+#: ../pyhoca/wxgui/profilemanager.py:338
 msgid "Action"
 msgstr "Handling"
 
-#: ../pyhoca/wxgui/profilemanager.py:317
+#: ../pyhoca/wxgui/profilemanager.py:341
+msgid "Client Side printing"
+msgstr "Klientside utskrift"
+
+#: ../pyhoca/wxgui/profilemanager.py:345
 msgid "Defaults"
 msgstr "Standard"
 
-#: ../pyhoca/wxgui/profilemanager.py:319
+#: ../pyhoca/wxgui/profilemanager.py:347
 msgid "Save"
 msgstr "Lagre"
 
-#: ../pyhoca/wxgui/profilemanager.py:320
+#: ../pyhoca/wxgui/profilemanager.py:348
 msgid "Reset"
 msgstr "Resett"
 
-#: ../pyhoca/wxgui/profilemanager.py:365
-#: ../pyhoca/wxgui/profilemanager.py:1078
-#: ../pyhoca/wxgui/profilemanager.py:1832
+#: ../pyhoca/wxgui/profilemanager.py:401
+#: ../pyhoca/wxgui/profilemanager.py:1124
+#: ../pyhoca/wxgui/profilemanager.py:2268
 msgid "automatically"
 msgstr "automatisk"
 
-#: ../pyhoca/wxgui/profilemanager.py:367
-#: ../pyhoca/wxgui/profilemanager.py:1080
+#: ../pyhoca/wxgui/profilemanager.py:403
+#: ../pyhoca/wxgui/profilemanager.py:1126
 msgid "manually"
 msgstr "manuelt"
 
-#: ../pyhoca/wxgui/profilemanager.py:376
+#: ../pyhoca/wxgui/profilemanager.py:412
 msgid "PyHoca-GUI Profile Manager - new profile"
 msgstr "PyHoca-GUI Profil håndterer - ny profil"
 
-#: ../pyhoca/wxgui/profilemanager.py:378
+#: ../pyhoca/wxgui/profilemanager.py:414
 #, python-format
 msgid "PyHoca-GUI Profile Manager - %s (connected)"
 msgstr "PyHoca-GUI Profil håndterer  - %s (tilkoblet)"
 
-#: ../pyhoca/wxgui/profilemanager.py:380
+#: ../pyhoca/wxgui/profilemanager.py:416
 #, python-format
 msgid "PyHoca-GUI Profile Manager - %s"
 msgstr "PyHoca-GUI Profil håndterer  - %s"
 
-#: ../pyhoca/wxgui/profilemanager.py:751
+#: ../pyhoca/wxgui/profilemanager.py:797
 msgid "Profile"
 msgstr "Profil"
 
-#: ../pyhoca/wxgui/profilemanager.py:752
+#: ../pyhoca/wxgui/profilemanager.py:798
 msgid "Session"
 msgstr "Sesjon"
 
-#: ../pyhoca/wxgui/profilemanager.py:753
+#: ../pyhoca/wxgui/profilemanager.py:799
 msgid "Connection"
 msgstr "Tilkobling"
 
-#: ../pyhoca/wxgui/profilemanager.py:754
+#: ../pyhoca/wxgui/profilemanager.py:800
+msgid "Link Quality"
+msgstr "Koblingskvalitet"
+
+#: ../pyhoca/wxgui/profilemanager.py:801
 msgid "Settings"
 msgstr "Innstillinger"
 
-#: ../pyhoca/wxgui/profilemanager.py:755
+#: ../pyhoca/wxgui/profilemanager.py:802
 msgid "Sharing"
 msgstr "Deling"
 
-#: ../pyhoca/wxgui/profilemanager.py:996
+#: ../pyhoca/wxgui/profilemanager.py:988
 msgid "<xkbtype>"
 msgstr "<xkbtype>"
 
-#: ../pyhoca/wxgui/profilemanager.py:997
+#: ../pyhoca/wxgui/profilemanager.py:989
 msgid "<xkblayout>"
 msgstr "<xkblayout>"
 
-#: ../pyhoca/wxgui/profilemanager.py:998
+#: ../pyhoca/wxgui/profilemanager.py:990
 msgid "<xkbvariant>"
 msgstr "<xkbvariant>"
 
-#: ../pyhoca/wxgui/profilemanager.py:1284
+#: ../pyhoca/wxgui/profilemanager.py:1444
 msgid "Icon Files (*.png)|*.png|All files (*.*)|*"
 msgstr "Ikonfiler(*.png)|*.png|Alle filer (*.*)|*"
 
-#: ../pyhoca/wxgui/profilemanager.py:1287
+#: ../pyhoca/wxgui/profilemanager.py:1447
 msgid "Choose an icon for this session profile"
 msgstr "Velg et ikon for denne sesjonsprofilen"
 
-#: ../pyhoca/wxgui/profilemanager.py:1509
+#: ../pyhoca/wxgui/profilemanager.py:1816
 msgid "All files (*.*)|*"
 msgstr "Alle filer (*.*)|*"
 
-#: ../pyhoca/wxgui/profilemanager.py:1511
-#: ../pyhoca/wxgui/profilemanager.py:1533
+#: ../pyhoca/wxgui/profilemanager.py:1818
+#: ../pyhoca/wxgui/profilemanager.py:1842
 msgid "Choose a public SSH key"
 msgstr "Velg en offentlig SSH nøkkel"
 
-#: ../pyhoca/wxgui/profilemanager.py:1784
+#: ../pyhoca/wxgui/profilemanager.py:2220
 msgid "Choose a folder to share within a session"
 msgstr "Velg en mappe som skal deles i en sesjon"
 
-#: ../pyhoca/wxgui/profilemanager.py:1912
-#: ../pyhoca/wxgui/profilemanager.py:1915
-#: ../pyhoca/wxgui/profilemanager.py:1918
-#: ../pyhoca/wxgui/profilemanager.py:1923
-#: ../pyhoca/wxgui/profilemanager.py:1933 ../pyhoca/wxgui/menus_taskbar.py:118
+#: ../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
 msgid "Profile Manager"
 msgstr "Profil håndterer"
 
-#: ../pyhoca/wxgui/profilemanager.py:1912
+#: ../pyhoca/wxgui/profilemanager.py:2348
 msgid "Profile name is missing, profile unusable!!!"
 msgstr "Profilnavnet mangler, profilen er ubrukelig!"
 
-#: ../pyhoca/wxgui/profilemanager.py:1915
-#: ../pyhoca/wxgui/profilemanager.py:1918
+#: ../pyhoca/wxgui/profilemanager.py:2351
+#: ../pyhoca/wxgui/profilemanager.py:2354
 #, python-format
 msgid "Profile name %s already exists!!!"
 msgstr "Profilnavnet %s eksisterer allerede!"
 
-#: ../pyhoca/wxgui/profilemanager.py:1923
+#: ../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:1933
+#: ../pyhoca/wxgui/profilemanager.py:2369
 #, python-format
 msgid ""
 "Another session profile (%s) already uses [%s]:%s for binding a local SSH "
@@ -674,248 +709,252 @@ msgstr ""
 "lokal SSH mellomtjener.\n"
 "Vennligst endre SSH mellomtjener innstillingene tilsvarende."
 
-#: ../pyhoca/wxgui/profilemanager.py:1960
+#: ../pyhoca/wxgui/profilemanager.py:2396
 #, python-format
 msgid "%s - profile added"
 msgstr "%s - profil lagt til"
 
-#: ../pyhoca/wxgui/profilemanager.py:1961
+#: ../pyhoca/wxgui/profilemanager.py:2397
 msgid "A new session profile has been added."
 msgstr "En ny sesjonsprofil har blitt lagt til."
 
-#: ../pyhoca/wxgui/profilemanager.py:1965
+#: ../pyhoca/wxgui/profilemanager.py:2401
 #, python-format
 msgid "%s - modified"
 msgstr "%s - endret"
 
-#: ../pyhoca/wxgui/profilemanager.py:1966
+#: ../pyhoca/wxgui/profilemanager.py:2402
 msgid "Changes to profile have been saved."
 msgstr "Endringer til profilen har blitt lagret."
 
-#: ../pyhoca/wxgui/menus_taskbar.py:75
+#: ../pyhoca/wxgui/menus_taskbar.py:74
 msgid "Edit Profile"
 msgstr "Rediger profil"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:78
+#: ../pyhoca/wxgui/menus_taskbar.py:77
 msgid "Use as Template for New Profile"
 msgstr "Benytt som mal for en ny profil"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:79
+#: ../pyhoca/wxgui/menus_taskbar.py:78
 msgid "Delete Profile"
 msgstr "Slett profil"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:107
+#: ../pyhoca/wxgui/menus_taskbar.py:106
 #, python-format
 msgid "About %s (%s)..."
 msgstr "Om %s (%s) ..."
 
-#: ../pyhoca/wxgui/menus_taskbar.py:133
+#: ../pyhoca/wxgui/menus_taskbar.py:132
 msgid "Manage Session Profile"
 msgstr "HÃ¥ndter sesjonsprofil"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:142
+#: ../pyhoca/wxgui/menus_taskbar.py:141
 msgid "Printing Preferences"
 msgstr "Utksriftsinnstillinger"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:148
+#: ../pyhoca/wxgui/menus_taskbar.py:147
 msgid "Client Options"
 msgstr "Klient alternativer"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:156 ../pyhoca/wxgui/menus_taskbar.py:785
-#: ../pyhoca/wxgui/menus_taskbar.py:977
+#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:783
+#: ../pyhoca/wxgui/menus_taskbar.py:975
 msgid "E&xit"
 msgstr "&Avslutt"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:228
+#: ../pyhoca/wxgui/menus_taskbar.py:227
 msgid "Window title"
 msgstr "Vindustittel"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:234 ../pyhoca/wxgui/menus_taskbar.py:613
+#: ../pyhoca/wxgui/menus_taskbar.py:233 ../pyhoca/wxgui/menus_taskbar.py:608
 msgid "Resume Session"
 msgstr "Gjenoppta sesjon"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:236
+#: ../pyhoca/wxgui/menus_taskbar.py:235
 msgid "Resume Session (not possible)"
 msgstr "Gjenoppta sesjon (ikke mulig)"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:247
+#: ../pyhoca/wxgui/menus_taskbar.py:246
 msgid "Transfer Session"
 msgstr "Overfør sesjon"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:249
+#: ../pyhoca/wxgui/menus_taskbar.py:248
 msgid "Transfer Session (not possible)"
 msgstr "Overfør sesjon (ikke mulig)"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:253 ../pyhoca/wxgui/menus_taskbar.py:604
+#: ../pyhoca/wxgui/menus_taskbar.py:252 ../pyhoca/wxgui/menus_taskbar.py:599
 msgid "Suspend Session (and disconnect/exit)"
 msgstr "Koble fra sesjonen (og avslutte)"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:255 ../pyhoca/wxgui/menus_taskbar.py:606
+#: ../pyhoca/wxgui/menus_taskbar.py:254 ../pyhoca/wxgui/menus_taskbar.py:601
 msgid "Suspend Session (and disconnect)"
 msgstr "Koble fra sesjonen"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:257 ../pyhoca/wxgui/menus_taskbar.py:608
+#: ../pyhoca/wxgui/menus_taskbar.py:256 ../pyhoca/wxgui/menus_taskbar.py:603
 msgid "Suspend Session"
 msgstr "Frakoble sesjon"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:263 ../pyhoca/wxgui/menus_taskbar.py:617
+#: ../pyhoca/wxgui/menus_taskbar.py:262 ../pyhoca/wxgui/menus_taskbar.py:612
 msgid "Terminate Session (and disconnect/exit)"
 msgstr "Avslutte sesjonen (og "
 
-#: ../pyhoca/wxgui/menus_taskbar.py:265 ../pyhoca/wxgui/menus_taskbar.py:619
+#: ../pyhoca/wxgui/menus_taskbar.py:264 ../pyhoca/wxgui/menus_taskbar.py:614
 msgid "Terminate Session (and disconnect)"
 msgstr "Avslutte sesjon (og koble fra)"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:267 ../pyhoca/wxgui/menus_taskbar.py:621
+#: ../pyhoca/wxgui/menus_taskbar.py:266 ../pyhoca/wxgui/menus_taskbar.py:616
 msgid "Terminate Session"
 msgstr "Avslutte sesjon"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:271 ../pyhoca/wxgui/menus_taskbar.py:601
+#: ../pyhoca/wxgui/menus_taskbar.py:270 ../pyhoca/wxgui/menus_taskbar.py:596
 msgid "Refresh menu tree"
 msgstr "Oppfrisk menytreet"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:280
+#: ../pyhoca/wxgui/menus_taskbar.py:279
 msgid "Rename Session Window"
 msgstr "Omdøp sesjonsvinduet"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:281
+#: ../pyhoca/wxgui/menus_taskbar.py:280
 msgid "Show Session Window"
 msgstr "Vis sesjonsvindu"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:321
+#: ../pyhoca/wxgui/menus_taskbar.py:322
 msgid "&Share custom local folder"
 msgstr "&Del selvvalgt lokal mappe"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:344
+#: ../pyhoca/wxgui/menus_taskbar.py:337
 msgid "Share:"
 msgstr "Del:"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:355
+#: ../pyhoca/wxgui/menus_taskbar.py:346
 msgid "Unshare:"
 msgstr "Stopp deling:"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:365
+#: ../pyhoca/wxgui/menus_taskbar.py:354
 msgid "Unshare &all local folders"
 msgstr "Stopp deling på a&lle lokale mapper"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:445
+#: ../pyhoca/wxgui/menus_taskbar.py:360
+msgid "Restore shares in next session"
+msgstr "Gjenopprett delte mapper i neste sesjon"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:440
 msgid "Multimedia"
 msgstr "Multimedia"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:446
+#: ../pyhoca/wxgui/menus_taskbar.py:441
 msgid "Development"
 msgstr "Utvikling"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:447
+#: ../pyhoca/wxgui/menus_taskbar.py:442
 msgid "Education"
 msgstr "Opplæring"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:448
+#: ../pyhoca/wxgui/menus_taskbar.py:443
 msgid "Games"
 msgstr "Spill"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:449
+#: ../pyhoca/wxgui/menus_taskbar.py:444
 msgid "Graphics"
 msgstr "Grafikk"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:450
+#: ../pyhoca/wxgui/menus_taskbar.py:445
 msgid "Internet"
 msgstr "Internett"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:451
+#: ../pyhoca/wxgui/menus_taskbar.py:446
 msgid "Office Applications"
 msgstr "Kontorapplikasjoner"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:452
+#: ../pyhoca/wxgui/menus_taskbar.py:447
 msgid "System"
 msgstr "System"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:453
+#: ../pyhoca/wxgui/menus_taskbar.py:448
 msgid "Utilities"
 msgstr "Verktøy"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:454
+#: ../pyhoca/wxgui/menus_taskbar.py:449
 msgid "Other Applications"
 msgstr "Andre applikasjoner"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:526 ../pyhoca/wxgui/menus_taskbar.py:538
+#: ../pyhoca/wxgui/menus_taskbar.py:521 ../pyhoca/wxgui/menus_taskbar.py:533
 #, python-format
 msgid "Connect %s"
 msgstr "Koble til %s"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:532
+#: ../pyhoca/wxgui/menus_taskbar.py:527
 msgid "Currently connecting..."
 msgstr "Kobler til..."
 
-#: ../pyhoca/wxgui/menus_taskbar.py:546
+#: ../pyhoca/wxgui/menus_taskbar.py:541
 msgid "Start &new Desktop Session"
 msgstr "Start &ny sesjon"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:551 ../pyhoca/wxgui/menus_taskbar.py:689
+#: ../pyhoca/wxgui/menus_taskbar.py:546 ../pyhoca/wxgui/menus_taskbar.py:684
 msgid "Retrieving Application Menu..."
 msgstr "Henter applikasjonsmenyen..."
 
-#: ../pyhoca/wxgui/menus_taskbar.py:555 ../pyhoca/wxgui/menus_taskbar.py:692
+#: ../pyhoca/wxgui/menus_taskbar.py:550 ../pyhoca/wxgui/menus_taskbar.py:687
 msgid "Retrieve Application Menu"
 msgstr "Hent applikasjonsmenyen"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:558
+#: ../pyhoca/wxgui/menus_taskbar.py:553
 msgid "Start &new Session"
 msgstr "Start &ny sesjon"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:638
+#: ../pyhoca/wxgui/menus_taskbar.py:633
 msgid "Launch Single Application"
 msgstr "Start enkelt applikasjon"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:676
+#: ../pyhoca/wxgui/menus_taskbar.py:671
 msgid "Manage Application Menu"
 msgstr "Administrer applkasjonsmenyen"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:719
+#: ../pyhoca/wxgui/menus_taskbar.py:714
 msgid "Running"
 msgstr "Aktiv"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:721
+#: ../pyhoca/wxgui/menus_taskbar.py:716
 msgid "Suspended"
 msgstr "Frakoblet"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:740
+#: ../pyhoca/wxgui/menus_taskbar.py:735
 msgid "&Clean all sessions"
 msgstr "&Rensk opp alle sesjoner"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:746
+#: ../pyhoca/wxgui/menus_taskbar.py:741
 msgid "Customize &profile"
 msgstr "TIlpass &profil"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:758
+#: ../pyhoca/wxgui/menus_taskbar.py:756
 msgid "Shared &folders"
 msgstr "Delte &mapper"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:770
+#: ../pyhoca/wxgui/menus_taskbar.py:768
 msgid "&Disconnect from Server"
 msgstr "&Koble fra serveren"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:777
+#: ../pyhoca/wxgui/menus_taskbar.py:775
 msgid "Suspend Session and E&xit application"
 msgstr "Koble fra sesjonen og &Avslutt applikasjonen"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:781
+#: ../pyhoca/wxgui/menus_taskbar.py:779
 msgid "Disconnect and E&xit application"
 msgstr "Koble fra sesjonen og &Avslutt applikasjonen"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:835
+#: ../pyhoca/wxgui/menus_taskbar.py:833
 msgid "Add Profile"
 msgstr "Legg til profil"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:911
+#: ../pyhoca/wxgui/menus_taskbar.py:909
 msgid "No session profiles defined"
 msgstr "Ingen sesjonsprofiler er definert"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:947
+#: ../pyhoca/wxgui/menus_taskbar.py:945
 msgid "Start/Resume Session"
 msgstr "Start/gjenoppta sesjon"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:947
+#: ../pyhoca/wxgui/menus_taskbar.py:945
 msgid "Connect Server"
 msgstr "Koble til server"
 
@@ -924,109 +963,131 @@ msgstr "Koble til server"
 msgid "About %s ..."
 msgstr "Om %s ..."
 
-#: ../pyhoca/wxgui/frontend.py:462
+#: ../pyhoca/wxgui/frontend.py:459
 msgid "Suspending sessions and exiting application..."
 msgstr "Koble fra sesjonene og avslutt applikasjonen..."
 
-#: ../pyhoca/wxgui/frontend.py:465
+#: ../pyhoca/wxgui/frontend.py:462
 #, python-format
 msgid "Disconnecting %s and exiting application..."
 msgstr "Kobler fra %s og avslutter applikasjonen..."
 
-#: ../pyhoca/wxgui/frontend.py:467
+#: ../pyhoca/wxgui/frontend.py:464
 msgid "Exiting application..."
 msgstr "Avslutter applikasjonen..."
 
-#: ../pyhoca/wxgui/frontend.py:560
+#: ../pyhoca/wxgui/frontend.py:562
 #, python-format
 msgid "%s - server warning"
 msgstr "%s - server advarsel"
 
-#: ../pyhoca/wxgui/frontend.py:560
+#: ../pyhoca/wxgui/frontend.py:562
 msgid "The X2Go Server does not publish an application menu."
 msgstr "X2Go serveren publiserer ikke en applikasjonsmeny"
 
-#: ../pyhoca/wxgui/frontend.py:610
-msgid "Public SSH key authentication has been successful."
-msgstr "Offentlig SSH nøkkel autentisering var vellykket."
+#: ../pyhoca/wxgui/frontend.py:613
+msgid "SSH key authentication has been successful."
+msgstr "SSH nøkkel autentisering var vellykket."
 
-#: ../pyhoca/wxgui/frontend.py:644
+#: ../pyhoca/wxgui/frontend.py:650
 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:665
+#: ../pyhoca/wxgui/frontend.py:671
 #, python-format
 msgid "%s - EOF error"
 msgstr "%s - EOF feil"
 
-#: ../pyhoca/wxgui/frontend.py:665
+#: ../pyhoca/wxgui/frontend.py:671
 msgid "Authentication protocol communication incomplete! Try again..."
 msgstr ""
 "Autentiseringens protokoll kommunikasjon er ufullstendig! Forsøk igjen."
 
-#: ../pyhoca/wxgui/frontend.py:672
+#: ../pyhoca/wxgui/frontend.py:678
 #, python-format
 msgid "%s - auth key error"
 msgstr "%s - Feil med autentiseringsnøkkel"
 
-#: ../pyhoca/wxgui/frontend.py:693
+#: ../pyhoca/wxgui/frontend.py:699
 msgid "An unknown error occurred during authentication!"
 msgstr "En ukjent feil oppstod under autentiseringen! "
 
-#: ../pyhoca/wxgui/frontend.py:726
+#: ../pyhoca/wxgui/frontend.py:728
+#, python-format
+msgid "%s: DirectRDP not supported yet"
+msgstr "%s: Direkte RDP er ikke støttet enda"
+
+#: ../pyhoca/wxgui/frontend.py:729
+#, python-format
+msgid ""
+"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)."
+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)."
+
+#: ../pyhoca/wxgui/frontend.py:741
 msgid "Unknown session profile, configure before using it..."
 msgstr "Ukjent sesjonsprofil, konfigurer den først..."
 
-#: ../pyhoca/wxgui/frontend.py:784 ../pyhoca/wxgui/frontend.py:1302
+#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:1332
 #, python-format
 msgid "%s - session warning"
 msgstr "%s - advarsel om sesjon"
 
-#: ../pyhoca/wxgui/frontend.py:784
+#: ../pyhoca/wxgui/frontend.py:798
 #, python-format
 msgid "Execution of command ,,%s'' failed."
 msgstr "Utførelsen av kommandoen \"%s\" feilet."
 
-#: ../pyhoca/wxgui/frontend.py:926
+#: ../pyhoca/wxgui/frontend.py:939
 msgid "Cleaning X2Go sessions..."
 msgstr "Rensker opp i X2Go sesjoner..."
 
-#: ../pyhoca/wxgui/frontend.py:961
+#: ../pyhoca/wxgui/frontend.py:974
 #, python-format
 msgid "%s - disconnect"
 msgstr "%s - koble fra"
 
-#: ../pyhoca/wxgui/frontend.py:961
+#: ../pyhoca/wxgui/frontend.py:974
 msgid "X2Go Profile is now disconnected."
 msgstr "X2Go profilen er nå frakoblet."
 
-#: ../pyhoca/wxgui/frontend.py:977
+#: ../pyhoca/wxgui/frontend.py:995
 msgid "New Session Profile"
 msgstr "Ny sesjonsprofil"
 
-#: ../pyhoca/wxgui/frontend.py:1029
+#: ../pyhoca/wxgui/frontend.py:1047
 #, python-format
 msgid "Really Delete Session Profile ,,%s''?"
 msgstr "Virkelig slette sesjonsprofilen \"%s\"?"
 
-#: ../pyhoca/wxgui/frontend.py:1035
+#: ../pyhoca/wxgui/frontend.py:1053
 #, python-format
 msgid "%s - profile deleted"
 msgstr "%s - profilen er slettet"
 
-#: ../pyhoca/wxgui/frontend.py:1035
+#: ../pyhoca/wxgui/frontend.py:1053
 msgid "The session profile has been deleted."
 msgstr "Sesjonsprofilen har blitt slettet."
 
-#: ../pyhoca/wxgui/frontend.py:1053
+#: ../pyhoca/wxgui/frontend.py:1071
 #, 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:1194
+#: ../pyhoca/wxgui/frontend.py:1224
 #, python-format
 msgid ""
 "The authenticity of host [%s]:%s can't be established.\n"
@@ -1039,17 +1100,17 @@ msgstr ""
 "\n"
 "Er du sikker på at du vil fortsette tilkoblingen?"
 
-#: ../pyhoca/wxgui/frontend.py:1202
+#: ../pyhoca/wxgui/frontend.py:1232
 #, python-format
 msgid "%s: Confirm Host Authorization"
 msgstr "%s: Verifiser vert autorisasjonen"
 
-#: ../pyhoca/wxgui/frontend.py:1247
+#: ../pyhoca/wxgui/frontend.py:1277
 #, python-format
 msgid "%s - channel error"
 msgstr "%s - feil med kanalen"
 
-#: ../pyhoca/wxgui/frontend.py:1247
+#: ../pyhoca/wxgui/frontend.py:1277
 #, python-format
 msgid ""
 "Lost connection to server %s unexpectedly! Try to re-authenticate to the "
@@ -1058,22 +1119,22 @@ msgstr ""
 "Mistet uventet forbindelsen til server %s ! Forsøk å autentisiere deg på "
 "nytt til serveren..."
 
-#: ../pyhoca/wxgui/frontend.py:1265 ../pyhoca/wxgui/frontend.py:1283
-#: ../pyhoca/wxgui/frontend.py:1285 ../pyhoca/wxgui/frontend.py:1321
+#: ../pyhoca/wxgui/frontend.py:1295 ../pyhoca/wxgui/frontend.py:1313
+#: ../pyhoca/wxgui/frontend.py:1315 ../pyhoca/wxgui/frontend.py:1351
 #, python-format
 msgid "%s - session failure"
 msgstr "%s - sesjonsfeil"
 
-#: ../pyhoca/wxgui/frontend.py:1265
+#: ../pyhoca/wxgui/frontend.py:1295
 msgid "The session startup failed."
 msgstr "Oppstart av sesjonen feilet."
 
-#: ../pyhoca/wxgui/frontend.py:1283
+#: ../pyhoca/wxgui/frontend.py:1313
 #, 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:1285
+#: ../pyhoca/wxgui/frontend.py:1315
 #, python-format
 msgid ""
 "The command ,,%s'' is not available on X2Go server\n"
@@ -1082,7 +1143,7 @@ msgstr ""
 "Kommandoen \"%s\" er ikke tilgjengelig på X2Go server\n"
 "%s."
 
-#: ../pyhoca/wxgui/frontend.py:1302
+#: ../pyhoca/wxgui/frontend.py:1332
 #, python-format
 msgid ""
 "Reverse TCP port forwarding request for session %s to server port %s has "
@@ -1091,7 +1152,7 @@ msgstr ""
 "Revers TCP port videresendingsforespørselen for sesjon %s til server port %s "
 "har blitt avvist."
 
-#: ../pyhoca/wxgui/frontend.py:1321
+#: ../pyhoca/wxgui/frontend.py:1351
 #, python-format
 msgid ""
 "Forwarding tunnel request to [%s]:%s for session %s was denied by remote "
@@ -1100,37 +1161,37 @@ 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:1340
+#: ../pyhoca/wxgui/frontend.py:1370
 #, python-format
 msgid "%s - audio warning"
 msgstr "%s - advarsel om lyd"
 
-#: ../pyhoca/wxgui/frontend.py:1340
+#: ../pyhoca/wxgui/frontend.py:1370
 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:1347 ../pyhoca/wxgui/frontend.py:1354
+#: ../pyhoca/wxgui/frontend.py:1377 ../pyhoca/wxgui/frontend.py:1384
 #, python-format
 msgid "%s - audio error"
 msgstr "%s - feil med lyden"
 
-#: ../pyhoca/wxgui/frontend.py:1347
+#: ../pyhoca/wxgui/frontend.py:1377
 msgid "The X2Go PulseAudio system could not be started."
 msgstr "X2Go PulseAudio systemet kan ikke bli startet."
 
-#: ../pyhoca/wxgui/frontend.py:1354
+#: ../pyhoca/wxgui/frontend.py:1384
 msgid "The X2Go PulseAudio system has died unexpectedly."
 msgstr "X2Go PulseAudio systemet har uventet stoppet."
 
-#: ../pyhoca/wxgui/frontend.py:1366
+#: ../pyhoca/wxgui/frontend.py:1396
 #, python-format
 msgid "%s - audio problem"
 msgstr "%s - problem med lyden"
 
-#: ../pyhoca/wxgui/frontend.py:1366
+#: ../pyhoca/wxgui/frontend.py:1396
 #, python-format
 msgid ""
 "The audio connection could not be set up for this session.\n"
@@ -1139,12 +1200,12 @@ msgstr ""
 "Klarte ikke å sette opp lydforbindelsen for denne sesjonen.\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1378
+#: ../pyhoca/wxgui/frontend.py:1408
 #, python-format
 msgid "%s - client-side printing not available"
 msgstr "%s - klient-side utskrift er ikke tilgjengelig"
 
-#: ../pyhoca/wxgui/frontend.py:1378
+#: ../pyhoca/wxgui/frontend.py:1408
 #, python-format
 msgid ""
 "The server denies client-side printing from within this session.\n"
@@ -1153,12 +1214,12 @@ msgstr ""
 "Serveren nekter klient-side utskrift innenfra denne sesjonen.\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1390
+#: ../pyhoca/wxgui/frontend.py:1420
 #, python-format
 msgid "%s - MIME box not available"
 msgstr "%s - MIME boks ikke tilgjengelig"
 
-#: ../pyhoca/wxgui/frontend.py:1390
+#: ../pyhoca/wxgui/frontend.py:1420
 #, python-format
 msgid ""
 "The server does not support the X2Go MIME box.\n"
@@ -1167,12 +1228,12 @@ msgstr ""
 "Serveren støtter ikke X2Go MIME boks.\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1402
+#: ../pyhoca/wxgui/frontend.py:1432
 #, python-format
 msgid "%s - client-side folders not sharable"
 msgstr "%s - klient-side mapper er ikke mulig å dele"
 
-#: ../pyhoca/wxgui/frontend.py:1402
+#: ../pyhoca/wxgui/frontend.py:1432
 #, python-format
 msgid ""
 "The server denies client-side folder sharing with this session.\n"
@@ -1181,12 +1242,12 @@ msgstr ""
 "Serveren nekter klient-side mapperdeling med denne sesjonen.\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1414
+#: ../pyhoca/wxgui/frontend.py:1444
 #, python-format
 msgid "%s - client resources not sharable"
 msgstr "%s - klient ressurser er ikke mulig å dele"
 
-#: ../pyhoca/wxgui/frontend.py:1414
+#: ../pyhoca/wxgui/frontend.py:1444
 #, python-format
 msgid ""
 "Client-side folders and printers cannot be shared with this session.\n"
@@ -1195,12 +1256,12 @@ msgstr ""
 "Klient-side mapper og skrivere kan ikke bli delt med denne sesjonen.\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1433 ../pyhoca/wxgui/frontend.py:1435
+#: ../pyhoca/wxgui/frontend.py:1463 ../pyhoca/wxgui/frontend.py:1465
 #, python-format
 msgid "%s - print error"
 msgstr "%s - feil ved utskrift"
 
-#: ../pyhoca/wxgui/frontend.py:1433
+#: ../pyhoca/wxgui/frontend.py:1463
 #, python-format
 msgid ""
 "%s\n"
@@ -1211,7 +1272,7 @@ msgstr ""
 "...oppstod på skriver %s fra sesjon\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1435
+#: ../pyhoca/wxgui/frontend.py:1465
 #, python-format
 msgid ""
 "%s\n"
@@ -1222,12 +1283,12 @@ msgstr ""
 "...oppstod fra sesjon\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1450 ../pyhoca/wxgui/frontend.py:1465
+#: ../pyhoca/wxgui/frontend.py:1480 ../pyhoca/wxgui/frontend.py:1495
 #, python-format
 msgid "%s - start"
 msgstr "%s - start"
 
-#: ../pyhoca/wxgui/frontend.py:1450
+#: ../pyhoca/wxgui/frontend.py:1480
 #, python-format
 msgid ""
 "New X2Go session starting up...\n"
@@ -1236,7 +1297,7 @@ msgstr ""
 "Ny X2Go sesjon starter opp...\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1465
+#: ../pyhoca/wxgui/frontend.py:1495
 #, python-format
 msgid ""
 "Another client started X2Go session\n"
@@ -1245,12 +1306,12 @@ msgstr ""
 "En annen klient startet X2Go sesjon\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1480 ../pyhoca/wxgui/frontend.py:1495
+#: ../pyhoca/wxgui/frontend.py:1510 ../pyhoca/wxgui/frontend.py:1525
 #, python-format
 msgid "%s - resume"
 msgstr "%s - gjenoppta"
 
-#: ../pyhoca/wxgui/frontend.py:1480
+#: ../pyhoca/wxgui/frontend.py:1510
 #, python-format
 msgid ""
 "Resuming X2Go session...\n"
@@ -1259,7 +1320,7 @@ msgstr ""
 "Gjenopptar X2Go sesjon...\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1495
+#: ../pyhoca/wxgui/frontend.py:1525
 #, python-format
 msgid ""
 "Another client resumed X2Go session\n"
@@ -1268,12 +1329,12 @@ msgstr ""
 "En annen klient gjenopptok X2Go sesjon\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1510
+#: ../pyhoca/wxgui/frontend.py:1540
 #, python-format
 msgid "%s - running"
 msgstr "%s - aktiv"
 
-#: ../pyhoca/wxgui/frontend.py:1510
+#: ../pyhoca/wxgui/frontend.py:1540
 #, python-format
 msgid ""
 "Found already running session\n"
@@ -1282,12 +1343,12 @@ msgstr ""
 "Fant allerede kjørende sesjon\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1530
+#: ../pyhoca/wxgui/frontend.py:1560
 #, python-format
 msgid "%s - suspend"
 msgstr "%s - koble fra"
 
-#: ../pyhoca/wxgui/frontend.py:1530
+#: ../pyhoca/wxgui/frontend.py:1560
 #, python-format
 msgid ""
 "X2Go Session has been suspended\n"
@@ -1296,12 +1357,12 @@ msgstr ""
 "X2Go sesjonen har blitt frakoblet\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1557
+#: ../pyhoca/wxgui/frontend.py:1587
 #, python-format
 msgid "%s - terminate"
 msgstr "%s - avslutt"
 
-#: ../pyhoca/wxgui/frontend.py:1557
+#: ../pyhoca/wxgui/frontend.py:1587
 #, python-format
 msgid ""
 "X2Go Session has terminated\n"
@@ -1310,7 +1371,7 @@ msgstr ""
 "X2Go sesjonen har blitt avsluttet\n"
 "%s"
 
-#: ../pyhoca/wxgui/messages.py:74
+#: ../pyhoca/wxgui/messages.py:73
 #, python-format
 msgid ""
 "Are you really sure you want to\n"
@@ -1319,7 +1380,7 @@ msgstr ""
 "Er du helt sikker på at du ønser å\n"
 "slette valgt sesjonsprofil \"%s\"?"
 
-#: ../pyhoca/wxgui/messages.py:75
+#: ../pyhoca/wxgui/messages.py:74
 #, python-format
 msgid ""
 "PyHoca-GUI is already running for user ,,%s''!\n"
@@ -1334,15 +1395,15 @@ msgstr ""
 "bruker. PyHoca-GUI ikonet kan bli funnet i ditt\n"
 "skrivebords systemkurv område."
 
-#: ../pyhoca/wxgui/messages.py:108
+#: ../pyhoca/wxgui/messages.py:107
 msgid "Yes"
 msgstr "Ja"
 
-#: ../pyhoca/wxgui/messages.py:109
+#: ../pyhoca/wxgui/messages.py:108
 msgid "No"
 msgstr "Nei"
 
-#: ../pyhoca/wxgui/messages.py:126 ../pyhoca/wxgui/printingprefs.py:142
+#: ../pyhoca/wxgui/messages.py:125 ../pyhoca/wxgui/printingprefs.py:142
 msgid "Ok"
 msgstr "Ok"
 
@@ -1445,6 +1506,20 @@ msgstr "Endre sesjonstittelen til"
 msgid "OK"
 msgstr "OK"
 
+#, fuzzy
+#~ msgid "Remember shared folders"
+#~ msgstr "Delte &mapper"
+
+#, fuzzy
+#~ msgid "Shared Resources"
+#~ msgstr "Delte &mapper"
+
+#~ msgid "RSA/DSA private key"
+#~ msgstr "RSA/DSA privat nøkkel"
+
+#~ msgid "Host[:Port]"
+#~ msgstr "Vert[:Port]"
+
 #~ msgid "us"
 #~ msgstr "no"
 
diff --git a/po/nl.po b/po/nl.po
index 076e429..af1e219 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PyHoca-GUI VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-10 21:18+0200\n"
-"PO-Revision-Date: 2012-06-10 21:16+0100\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"
-"Language-Team: nl <dick.kniep at lindix.nl>\n"
+"Language-Team: X2Go i18n <x2go-i18n at lists.berlios.de>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,129 +20,129 @@ msgstr ""
 "X-Poedit-Country: NETHERLANDS\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../pyhoca/wxgui/logon.py:92
+#: ../pyhoca/wxgui/logon.py:86
 #, python-format
 msgid "%s (via %s)"
 msgstr "%s (via %s)"
 
-#: ../pyhoca/wxgui/logon.py:96 ../pyhoca/wxgui/logon.py:108
+#: ../pyhoca/wxgui/logon.py:90 ../pyhoca/wxgui/logon.py:102
 msgid "Username"
 msgstr "Gebruiker"
 
-#: ../pyhoca/wxgui/logon.py:98 ../pyhoca/wxgui/logon.py:110
+#: ../pyhoca/wxgui/logon.py:92 ../pyhoca/wxgui/logon.py:104
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: ../pyhoca/wxgui/logon.py:101
+#: ../pyhoca/wxgui/logon.py:95
 msgid "Authenticate"
 msgstr "Aanmelden"
 
-#: ../pyhoca/wxgui/logon.py:113
+#: ../pyhoca/wxgui/logon.py:107
 msgid "  Start SSH tunnel  "
 msgstr "  Start SSH Tunnel  "
 
-#: ../pyhoca/wxgui/logon.py:121
+#: ../pyhoca/wxgui/logon.py:115
 msgid "Session login"
 msgstr "Sessie login"
 
-#: ../pyhoca/wxgui/logon.py:122
+#: ../pyhoca/wxgui/logon.py:116
 msgid "SSH proxy server login"
 msgstr "Login via SSH Proxy"
 
-#: ../pyhoca/wxgui/logon.py:133 ../pyhoca/wxgui/profilemanager.py:322
-#: ../pyhoca/wxgui/messages.py:132 ../pyhoca/wxgui/printingprefs.py:147
+#: ../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
 msgid "Cancel"
 msgstr "Afbreken"
 
-#: ../pyhoca/wxgui/logon.py:292 ../pyhoca/wxgui/logon.py:334
-#: ../pyhoca/wxgui/frontend.py:603
+#: ../pyhoca/wxgui/logon.py:297 ../pyhoca/wxgui/logon.py:339
+#: ../pyhoca/wxgui/frontend.py:606
 #, python-format
 msgid "%s - connect failure"
 msgstr "%s - verbinden mislukt"
 
-#: ../pyhoca/wxgui/logon.py:293 ../pyhoca/wxgui/frontend.py:603
+#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:606
 msgid "User is not allowed to start X2Go sessions!"
 msgstr "Gebruiker mag geen X2Go sessie starten!"
 
-#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:610
+#: ../pyhoca/wxgui/logon.py:303 ../pyhoca/wxgui/frontend.py:613
 #, python-format
 msgid "%s - connect"
 msgstr "%s - verbinden"
 
-#: ../pyhoca/wxgui/logon.py:299
+#: ../pyhoca/wxgui/logon.py:304
 msgid "Authentication has been successful."
 msgstr "Authenticatie is gelukt."
 
-#: ../pyhoca/wxgui/logon.py:330
+#: ../pyhoca/wxgui/logon.py:335
 msgid "SSH tunnel started"
 msgstr "SSH Tunnel gestart"
 
-#: ../pyhoca/wxgui/logon.py:335
+#: ../pyhoca/wxgui/logon.py:340
 msgid "Authentication failed!"
 msgstr "Authenticatie mislukt!"
 
-#: ../pyhoca/wxgui/logon.py:342
+#: ../pyhoca/wxgui/logon.py:348
 #, python-format
 msgid "%s - SSH proxy"
 msgstr "%s - SSH Proxy"
 
-#: ../pyhoca/wxgui/logon.py:343
+#: ../pyhoca/wxgui/logon.py:349
 msgid "Authentication to the SSH proxy server failed!"
 msgstr "Authenticatie via SSH Proxy Server mislukt!"
 
-#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:658
+#: ../pyhoca/wxgui/logon.py:376 ../pyhoca/wxgui/frontend.py:664
 #, python-format
 msgid "%s - socket error"
 msgstr "%s - socket fout"
 
-#: ../pyhoca/wxgui/logon.py:372 ../pyhoca/wxgui/frontend.py:637
-#: ../pyhoca/wxgui/frontend.py:644
+#: ../pyhoca/wxgui/logon.py:383 ../pyhoca/wxgui/frontend.py:643
+#: ../pyhoca/wxgui/frontend.py:650
 #, python-format
 msgid "%s - host key error"
 msgstr "%s - server sleutel fout"
 
-#: ../pyhoca/wxgui/logon.py:373 ../pyhoca/wxgui/frontend.py:637
+#: ../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 ""
 "De sleutel van de server is ongeldig of is niet geaccepteerd door de "
 "gebruiker"
 
-#: ../pyhoca/wxgui/logon.py:380 ../pyhoca/wxgui/frontend.py:679
+#: ../pyhoca/wxgui/logon.py:391 ../pyhoca/wxgui/frontend.py:685
 #, python-format
 msgid "%s - missing home directory"
 msgstr "%s - home directory niet aanwezig"
 
-#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:679
+#: ../pyhoca/wxgui/logon.py:392 ../pyhoca/wxgui/frontend.py:685
 msgid "The remote user's home directory does not exist."
 msgstr "De home directory op afstand van de gebruiker bestaat niet"
 
-#: ../pyhoca/wxgui/logon.py:388
+#: ../pyhoca/wxgui/logon.py:399
 #, python-format
 msgid "%s - key error"
 msgstr "%s - sleutel fout"
 
-#: ../pyhoca/wxgui/logon.py:396 ../pyhoca/wxgui/frontend.py:686
+#: ../pyhoca/wxgui/logon.py:407 ../pyhoca/wxgui/frontend.py:692
 #, python-format
 msgid "%s - auth error"
 msgstr "%s - authenticatie fout"
 
-#: ../pyhoca/wxgui/logon.py:404 ../pyhoca/wxgui/frontend.py:630
+#: ../pyhoca/wxgui/logon.py:415 ../pyhoca/wxgui/frontend.py:636
 #, python-format
 msgid "%s - SSH error"
 msgstr "%s - sleutel fout"
 
-#: ../pyhoca/wxgui/logon.py:412
+#: ../pyhoca/wxgui/logon.py:423
 #, python-format
 msgid "%s - unknown error"
 msgstr "%s - onbekende fout"
 
-#: ../pyhoca/wxgui/logon.py:413
+#: ../pyhoca/wxgui/logon.py:424
 msgid "An unknown error occured during authentication!"
 msgstr "Een onbekende fout is bij de authenticatie opgetreden"
 
-#: ../pyhoca/wxgui/taskbar.py:92
+#: ../pyhoca/wxgui/taskbar.py:89
 #, python-format
 msgid ""
 "PyHoca-GUI\n"
@@ -151,7 +151,7 @@ msgstr ""
 "PyHoca-GUI\n"
 "Verbinden met ,,%s''"
 
-#: ../pyhoca/wxgui/taskbar.py:96
+#: ../pyhoca/wxgui/taskbar.py:93
 #, python-format
 msgid ""
 "PyHoca-GUI (Python X2goClient)\n"
@@ -160,13 +160,13 @@ msgstr ""
 "PyHoca-GUI (Python X2goClient)\n"
 "Verbinding met X2Go server ,,%s'' wordt gemaakt"
 
-#: ../pyhoca/wxgui/taskbar.py:106
+#: ../pyhoca/wxgui/taskbar.py:103
 msgid ""
 "PyHoca-GUI\n"
 "Connecting you to X2Go..."
 msgstr "Bezig je te verbinden met X2Go ..."
 
-#: ../pyhoca/wxgui/taskbar.py:110
+#: ../pyhoca/wxgui/taskbar.py:107
 msgid ""
 "PyHoca-GUI (Python X2goClient)\n"
 "Client for connecting you to a remote X2Go server"
@@ -174,490 +174,528 @@ msgstr ""
 "PyHoca-GUI (Python X2goClient)\n"
 "Verbinding met remote X2Go server aan het opbouwen"
 
-#: ../pyhoca/wxgui/profilemanager.py:82
+#: ../pyhoca/wxgui/profilemanager.py:79
 msgid "GNOME Desktop (GNOME)"
 msgstr "GNOME Desktop (GNOME)"
 
-#: ../pyhoca/wxgui/profilemanager.py:83
+#: ../pyhoca/wxgui/profilemanager.py:80
 msgid "K Desktop Environment (KDE)"
 msgstr "K Desktop Environment (KDE)"
 
-#: ../pyhoca/wxgui/profilemanager.py:84
+#: ../pyhoca/wxgui/profilemanager.py:81
 msgid "Lightweight X Desktop (LXDE)"
 msgstr "Lightweight X Desktop (LXDE)"
 
-#: ../pyhoca/wxgui/profilemanager.py:85
+#: ../pyhoca/wxgui/profilemanager.py:82
 msgid "Trinity X Desktop (KDE3-like)"
 msgstr "Trinity X Desktop (KDE3)"
 
-#: ../pyhoca/wxgui/profilemanager.py:86
+#: ../pyhoca/wxgui/profilemanager.py:83
 msgid "Unity X Desktop Shell (UNITY)"
 msgstr "Unity X Desktop Shell (UNITY)"
 
-#: ../pyhoca/wxgui/profilemanager.py:87
-msgid "XFCE4 Desktop (XFCE4)"
-msgstr "XFCE4 Desktop (XFCE4)"
+#: ../pyhoca/wxgui/profilemanager.py:84
+msgid "XFCE Desktop (XFCE)"
+msgstr "XFCE Desktop (XFCE)"
 
-#: ../pyhoca/wxgui/profilemanager.py:88
+#: ../pyhoca/wxgui/profilemanager.py:85
 msgid "Published Applications"
 msgstr "Gepubliceerde applicaties"
 
-#: ../pyhoca/wxgui/profilemanager.py:89
+#: ../pyhoca/wxgui/profilemanager.py:86
 msgid "Single Application"
 msgstr "Enkelvoudige Applicatie"
 
-#: ../pyhoca/wxgui/profilemanager.py:90
+#: ../pyhoca/wxgui/profilemanager.py:87
 msgid "XDMCP Query"
 msgstr "XDMCP Query"
 
-#: ../pyhoca/wxgui/profilemanager.py:91
-msgid "Windows Terminal Server (RDP-proxy)"
-msgstr "Windows Terminalserver (RDP-proxy)"
+#: ../pyhoca/wxgui/profilemanager.py:88
+msgid "Windows Terminal Server (X2Go-proxied RDP)"
+msgstr "Windows Terminalserver (via X2Go-proxy)"
+
+#: ../pyhoca/wxgui/profilemanager.py:89
+msgid "Windows Terminal Server (Direct RDP)"
+msgstr "Windows Terminalserver (via X2Go-proxy)"
 
-#. 'DirectRDP': 'Windows Terminal Server (RDP-direct)',
-#: ../pyhoca/wxgui/profilemanager.py:93 ../pyhoca/wxgui/profilemanager.py:207
+#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/profilemanager.py:224
 msgid "Custom command"
 msgstr "Speciaal Commando"
 
-#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:398
+#: ../pyhoca/wxgui/profilemanager.py:95 ../pyhoca/wxgui/menus_taskbar.py:393
 msgid "Internet Browser"
 msgstr "Internetbrowser"
 
-#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:399
+#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:394
 msgid "Email Client"
 msgstr "E-Mail Programma"
 
-#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:400
+#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:395
 msgid "Office"
 msgstr "Office"
 
-#: ../pyhoca/wxgui/profilemanager.py:99 ../pyhoca/wxgui/menus_taskbar.py:401
+#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:396
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../pyhoca/wxgui/profilemanager.py:113
+#: ../pyhoca/wxgui/profilemanager.py:116
 msgid "Open file with system's default application"
 msgstr "Open bestand met het geassocieerde programma"
 
-#: ../pyhoca/wxgui/profilemanager.py:114
+#: ../pyhoca/wxgui/profilemanager.py:117
 msgid "Open application chooser dialog"
 msgstr "Open dialoog, om Applicatie te kiezen"
 
-#: ../pyhoca/wxgui/profilemanager.py:115
+#: ../pyhoca/wxgui/profilemanager.py:118
 msgid "Save incoming file as ..."
 msgstr "Opslaan bestand als ..."
 
-#: ../pyhoca/wxgui/profilemanager.py:143
+#: ../pyhoca/wxgui/profilemanager.py:146
 msgid "settings derived from "
 msgstr "configuratie afgeleid van"
 
 #. boxes for all tabs
-#: ../pyhoca/wxgui/profilemanager.py:160
+#: ../pyhoca/wxgui/profilemanager.py:167
 msgid "Session Title"
 msgstr "Sessie naam"
 
-#: ../pyhoca/wxgui/profilemanager.py:161
+#: ../pyhoca/wxgui/profilemanager.py:168
 msgid "Session Window"
 msgstr "Sessie Window"
 
-#: ../pyhoca/wxgui/profilemanager.py:162
+#: ../pyhoca/wxgui/profilemanager.py:169
 msgid "Session Startup"
 msgstr "Sessie start"
 
-#: ../pyhoca/wxgui/profilemanager.py:163
+#: ../pyhoca/wxgui/profilemanager.py:170
 msgid "Server"
 msgstr "Server"
 
-#: ../pyhoca/wxgui/profilemanager.py:164
+#: ../pyhoca/wxgui/profilemanager.py:171
+msgid "Proxy"
+msgstr "Proxy"
+
+#: ../pyhoca/wxgui/profilemanager.py:172
 msgid "Connection Link Speed"
 msgstr "Verbindings snelheid"
 
-#: ../pyhoca/wxgui/profilemanager.py:165
+#: ../pyhoca/wxgui/profilemanager.py:173
 msgid "Compression"
 msgstr "Compressie"
 
-#: ../pyhoca/wxgui/profilemanager.py:166
+#: ../pyhoca/wxgui/profilemanager.py:174
 msgid "Display"
 msgstr "Display"
 
-#: ../pyhoca/wxgui/profilemanager.py:167
+#: ../pyhoca/wxgui/profilemanager.py:175
 msgid "Keyboard"
 msgstr "Toetsenbord"
 
-#: ../pyhoca/wxgui/profilemanager.py:168
+#: ../pyhoca/wxgui/profilemanager.py:176
 msgid "Sound"
 msgstr "Geluid"
 
-#: ../pyhoca/wxgui/profilemanager.py:169
+#: ../pyhoca/wxgui/profilemanager.py:177
 msgid "Printing"
 msgstr "Afdrukken"
 
-#: ../pyhoca/wxgui/profilemanager.py:170
+#: ../pyhoca/wxgui/profilemanager.py:178
 msgid "Folder Exports"
 msgstr "Map export"
 
-#: ../pyhoca/wxgui/profilemanager.py:171
+#: ../pyhoca/wxgui/profilemanager.py:179
 msgid "File Import"
 msgstr "Bestands import"
 
 #. ##
 #. ## widgets for the PROFILE tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:176
+#: ../pyhoca/wxgui/profilemanager.py:184
 msgid "Name"
 msgstr "Naam"
 
-#: ../pyhoca/wxgui/profilemanager.py:183
+#: ../pyhoca/wxgui/profilemanager.py:191
 msgid "Set session window title"
 msgstr "Stel sessiescherm titel in"
 
-#: ../pyhoca/wxgui/profilemanager.py:184
+#: ../pyhoca/wxgui/profilemanager.py:192
 msgid "Use a default session window title"
 msgstr "Gebruik een standaard sessienaam"
 
-#: ../pyhoca/wxgui/profilemanager.py:185
+#: ../pyhoca/wxgui/profilemanager.py:193
 msgid "Custom session window title"
 msgstr "Aangepaste sessienaam"
 
-#: ../pyhoca/wxgui/profilemanager.py:195
+#: ../pyhoca/wxgui/profilemanager.py:212
 msgid "Window Icon"
 msgstr "Scherm icoon"
 
 #. ##
 #. ## widgets for the SESSION tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:201
+#: ../pyhoca/wxgui/profilemanager.py:218
 msgid "Start session automatically after login"
 msgstr "Start sessie automatisch na login"
 
-#: ../pyhoca/wxgui/profilemanager.py:202
+#: ../pyhoca/wxgui/profilemanager.py:219
 #, python-format
 msgid "Login automatically after %s has started"
 msgstr "Login automatisch nadat %s is gestart"
 
-#: ../pyhoca/wxgui/profilemanager.py:203
+#: ../pyhoca/wxgui/profilemanager.py:220
 msgid "Type"
 msgstr "Type"
 
-#: ../pyhoca/wxgui/profilemanager.py:205
+#: ../pyhoca/wxgui/profilemanager.py:222
 msgid "Application"
 msgstr "Applicatie"
 
-#: ../pyhoca/wxgui/profilemanager.py:209
+#: ../pyhoca/wxgui/profilemanager.py:226
 msgid "XDMCP server"
 msgstr "XDMCP Server"
 
-#: ../pyhoca/wxgui/profilemanager.py:211
+#: ../pyhoca/wxgui/profilemanager.py:228
 msgid "RDP server"
 msgstr "RDP Server"
 
-#: ../pyhoca/wxgui/profilemanager.py:213
+#: ../pyhoca/wxgui/profilemanager.py:230
 msgid "RDP options"
 msgstr "RDP Opties"
 
-#: ../pyhoca/wxgui/profilemanager.py:215
+#: ../pyhoca/wxgui/profilemanager.py:232
 msgid "Integrate remote application(s) into local desktop (rootless mode)"
 msgstr "Integreer remote toepassing in de lokale desktop (rootless mode)"
 
-#: ../pyhoca/wxgui/profilemanager.py:216
+#: ../pyhoca/wxgui/profilemanager.py:233
 msgid "Menu of published applications"
 msgstr "Menu met gepubliceerde applicaties"
 
 #. ##
 #. ## widgets for the CONNECTION tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:223 ../pyhoca/wxgui/profilemanager.py:233
+#: ../pyhoca/wxgui/profilemanager.py:240 ../pyhoca/wxgui/profilemanager.py:253
 msgid "User"
 msgstr "Gebruiker"
 
-#: ../pyhoca/wxgui/profilemanager.py:225
+#: ../pyhoca/wxgui/profilemanager.py:242 ../pyhoca/wxgui/profilemanager.py:260
 msgid "Host"
 msgstr "Host"
 
-#: ../pyhoca/wxgui/profilemanager.py:227
+#: ../pyhoca/wxgui/profilemanager.py:244 ../pyhoca/wxgui/profilemanager.py:262
 msgid "Port"
 msgstr "Port"
 
-#: ../pyhoca/wxgui/profilemanager.py:229
-msgid "RSA/DSA private key"
-msgstr "Private RSA/DSA Key"
+#: ../pyhoca/wxgui/profilemanager.py:246
+msgid "Key"
+msgstr "Sleutel"
 
-#: ../pyhoca/wxgui/profilemanager.py:232
+#: ../pyhoca/wxgui/profilemanager.py:249
+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
+msgid "Enable forwarding of SSH authentication agent connections"
+msgstr "Gebruik SSH forwarding van SSH authenticatie agent"
+
+#: ../pyhoca/wxgui/profilemanager.py:252
 msgid "Server behind SSH proxy"
 msgstr "Server achter SSH-Proxy"
 
-#: ../pyhoca/wxgui/profilemanager.py:235
+#: ../pyhoca/wxgui/profilemanager.py:255
+msgid "Use same username for X2Go and proxy host"
+msgstr "Gebruik zelfde gebruikersnaam voor X2Go en de SSH Proxy"
+
+#: ../pyhoca/wxgui/profilemanager.py:256
+msgid "Use same authentication for X2Go and proxy host"
+msgstr "Gebruik dezelfde authenticatie voor X2Go en de SSH Proxy"
+
+#: ../pyhoca/wxgui/profilemanager.py:257
 msgid "Key file"
 msgstr "Sleutel"
 
-#: ../pyhoca/wxgui/profilemanager.py:238
-msgid "Host[:Port]"
-msgstr "Host[:Port]"
-
-#: ../pyhoca/wxgui/profilemanager.py:240
+#: ../pyhoca/wxgui/profilemanager.py:264
 msgid "SSH Proxy Tunnel"
 msgstr "SSH Proxy Tunnel"
 
-#: ../pyhoca/wxgui/profilemanager.py:248
+#: ../pyhoca/wxgui/profilemanager.py:270
+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
 msgid "Modem"
 msgstr "Modem"
 
-#: ../pyhoca/wxgui/profilemanager.py:249
+#: ../pyhoca/wxgui/profilemanager.py:274
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../pyhoca/wxgui/profilemanager.py:250
+#: ../pyhoca/wxgui/profilemanager.py:275
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../pyhoca/wxgui/profilemanager.py:251
+#: ../pyhoca/wxgui/profilemanager.py:276
 msgid "WAN"
 msgstr "WAN"
 
-#: ../pyhoca/wxgui/profilemanager.py:252
+#: ../pyhoca/wxgui/profilemanager.py:277
 msgid "LAN"
 msgstr "LAN"
 
-#: ../pyhoca/wxgui/profilemanager.py:254
+#: ../pyhoca/wxgui/profilemanager.py:279
 msgid "Method"
 msgstr "Methode"
 
-#: ../pyhoca/wxgui/profilemanager.py:256
+#: ../pyhoca/wxgui/profilemanager.py:281
 msgid "Image quality"
 msgstr "Beeldkwaliteit"
 
 #. ##
 #. ## wigdets for the SETTINGS tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:262
+#: ../pyhoca/wxgui/profilemanager.py:287
 msgid "Fullscreen"
 msgstr "Fullscreen"
 
-#: ../pyhoca/wxgui/profilemanager.py:263
+#: ../pyhoca/wxgui/profilemanager.py:288
+msgid "Maximized"
+msgstr "Maximaliseered"
+
+#: ../pyhoca/wxgui/profilemanager.py:289
 msgid "Custom Size"
 msgstr "Grootte instellen"
 
-#: ../pyhoca/wxgui/profilemanager.py:268
+#: ../pyhoca/wxgui/profilemanager.py:294
 msgid "Set display DPI"
 msgstr "DPI-waarde instellen"
 
-#: ../pyhoca/wxgui/profilemanager.py:270
+#: ../pyhoca/wxgui/profilemanager.py:296
 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:271
+#: ../pyhoca/wxgui/profilemanager.py:297
 msgid ""
 "Automatically detect and use client-side keyboard configuration inside the "
 "session"
 msgstr "Gebruik automatisch gedetecteerd toetsenbord in de sessie"
 
-#: ../pyhoca/wxgui/profilemanager.py:272
+#: ../pyhoca/wxgui/profilemanager.py:298
 msgid "Use custom keyboard settings as provided below"
 msgstr "Gebruik de onderstaande speciale toetsenbord instellingen"
 
-#: ../pyhoca/wxgui/profilemanager.py:273
+#: ../pyhoca/wxgui/profilemanager.py:299
 msgid "Keyboard model"
 msgstr "Toetsenbord model"
 
-#: ../pyhoca/wxgui/profilemanager.py:275
+#: ../pyhoca/wxgui/profilemanager.py:301
 msgid "Layout"
 msgstr "Layout"
 
-#: ../pyhoca/wxgui/profilemanager.py:277
+#: ../pyhoca/wxgui/profilemanager.py:303
 msgid "Layout variant"
 msgstr "Layout variant"
 
-#: ../pyhoca/wxgui/profilemanager.py:279
+#: ../pyhoca/wxgui/profilemanager.py:305
 msgid "Enable sound support"
 msgstr "Geluid gebruiken"
 
-#: ../pyhoca/wxgui/profilemanager.py:280
+#: ../pyhoca/wxgui/profilemanager.py:306
 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:284
+#: ../pyhoca/wxgui/profilemanager.py:310
 msgid "Arts (not supported)"
 msgstr "Arts (niet ondersteund)"
 
-#: ../pyhoca/wxgui/profilemanager.py:287
+#: ../pyhoca/wxgui/profilemanager.py:313
 msgid "esd"
 msgstr "esd"
 
-#: ../pyhoca/wxgui/profilemanager.py:288
+#: ../pyhoca/wxgui/profilemanager.py:314
 msgid "Use default sound port"
 msgstr "Standaard Audio-Port gebruiken"
 
-#: ../pyhoca/wxgui/profilemanager.py:289
+#: ../pyhoca/wxgui/profilemanager.py:315
 msgid "Custom sound port"
 msgstr "Speciale Audio-Port"
 
-#: ../pyhoca/wxgui/profilemanager.py:291
-msgid "Client Side printing"
-msgstr "Afdrukken via deze computer"
-
-#: ../pyhoca/wxgui/profilemanager.py:293
+#: ../pyhoca/wxgui/profilemanager.py:318
 msgid "Use local folder sharing"
 msgstr "Delen van lokale mappen"
 
-#: ../pyhoca/wxgui/profilemanager.py:294
+#: ../pyhoca/wxgui/profilemanager.py:319
+#, fuzzy
+msgid "Store share list at end of session"
+msgstr ""
+"Een andere X2Go-client heeft deze sessie gestart\n"
+"%s"
+
+#: ../pyhoca/wxgui/profilemanager.py:320
 msgid "Path"
 msgstr "Pad"
 
-#: ../pyhoca/wxgui/profilemanager.py:297 ../pyhoca/wxgui/profilemanager.py:316
+#: ../pyhoca/wxgui/profilemanager.py:323 ../pyhoca/wxgui/profilemanager.py:344
 msgid "Add"
 msgstr "Toevoegen"
 
-#: ../pyhoca/wxgui/profilemanager.py:299
+#: ../pyhoca/wxgui/profilemanager.py:325
 msgid "Local Path"
 msgstr "Lokaal Pad"
 
-#: ../pyhoca/wxgui/profilemanager.py:300
+#: ../pyhoca/wxgui/profilemanager.py:326
 msgid "Connect Method"
 msgstr "Verbindingsmethode"
 
-#: ../pyhoca/wxgui/profilemanager.py:301
+#: ../pyhoca/wxgui/profilemanager.py:327
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: ../pyhoca/wxgui/profilemanager.py:303
+#: ../pyhoca/wxgui/profilemanager.py:329
 msgid "Convert between client and server encodings"
 msgstr "Encoding tussen client en server vertalen"
 
-#: ../pyhoca/wxgui/profilemanager.py:304
+#: ../pyhoca/wxgui/profilemanager.py:330
 msgid "Client encoding"
 msgstr "Client encoding"
 
-#: ../pyhoca/wxgui/profilemanager.py:306
+#: ../pyhoca/wxgui/profilemanager.py:332
 msgid "Server encoding"
 msgstr "Server encoding"
 
-#: ../pyhoca/wxgui/profilemanager.py:309
+#: ../pyhoca/wxgui/profilemanager.py:335
 msgid "Use file MIME box for local file import"
 msgstr "Importeren lokale bestanden via MIME box"
 
-#: ../pyhoca/wxgui/profilemanager.py:310
+#: ../pyhoca/wxgui/profilemanager.py:336
 msgid "Extensions"
 msgstr "Uitbreidingen"
 
-#: ../pyhoca/wxgui/profilemanager.py:312
+#: ../pyhoca/wxgui/profilemanager.py:338
 msgid "Action"
 msgstr "Actie"
 
-#: ../pyhoca/wxgui/profilemanager.py:317
+#: ../pyhoca/wxgui/profilemanager.py:341
+msgid "Client Side printing"
+msgstr "Afdrukken via deze computer"
+
+#: ../pyhoca/wxgui/profilemanager.py:345
 msgid "Defaults"
 msgstr "Standaardwaarden"
 
-#: ../pyhoca/wxgui/profilemanager.py:319
+#: ../pyhoca/wxgui/profilemanager.py:347
 msgid "Save"
 msgstr "Opslaan"
 
-#: ../pyhoca/wxgui/profilemanager.py:320
+#: ../pyhoca/wxgui/profilemanager.py:348
 msgid "Reset"
 msgstr "Reset"
 
-#: ../pyhoca/wxgui/profilemanager.py:365
-#: ../pyhoca/wxgui/profilemanager.py:1078
-#: ../pyhoca/wxgui/profilemanager.py:1832
+#: ../pyhoca/wxgui/profilemanager.py:401
+#: ../pyhoca/wxgui/profilemanager.py:1124
+#: ../pyhoca/wxgui/profilemanager.py:2268
 msgid "automatically"
 msgstr "automatisch"
 
-#: ../pyhoca/wxgui/profilemanager.py:367
-#: ../pyhoca/wxgui/profilemanager.py:1080
+#: ../pyhoca/wxgui/profilemanager.py:403
+#: ../pyhoca/wxgui/profilemanager.py:1126
 msgid "manually"
 msgstr "handmatig"
 
-#: ../pyhoca/wxgui/profilemanager.py:376
+#: ../pyhoca/wxgui/profilemanager.py:412
 msgid "PyHoca-GUI Profile Manager - new profile"
 msgstr "PyHoca-GUI Profiel manager - nieuw profiel"
 
-#: ../pyhoca/wxgui/profilemanager.py:378
+#: ../pyhoca/wxgui/profilemanager.py:414
 #, python-format
 msgid "PyHoca-GUI Profile Manager - %s (connected)"
 msgstr "PyHoca-GUI Profiel manager - %s (verbonden)"
 
-#: ../pyhoca/wxgui/profilemanager.py:380
+#: ../pyhoca/wxgui/profilemanager.py:416
 #, python-format
 msgid "PyHoca-GUI Profile Manager - %s"
 msgstr "PyHoca-GUI Profiel manager - %s"
 
-#: ../pyhoca/wxgui/profilemanager.py:751
+#: ../pyhoca/wxgui/profilemanager.py:797
 msgid "Profile"
 msgstr "Profiel"
 
-#: ../pyhoca/wxgui/profilemanager.py:752
+#: ../pyhoca/wxgui/profilemanager.py:798
 msgid "Session"
 msgstr "Sessie"
 
-#: ../pyhoca/wxgui/profilemanager.py:753
+#: ../pyhoca/wxgui/profilemanager.py:799
 msgid "Connection"
 msgstr "Verbinding"
 
-#: ../pyhoca/wxgui/profilemanager.py:754
+#: ../pyhoca/wxgui/profilemanager.py:800
+msgid "Link Quality"
+msgstr "Verbindingskwaliteit"
+
+#: ../pyhoca/wxgui/profilemanager.py:801
 msgid "Settings"
 msgstr "Instellingen"
 
-#: ../pyhoca/wxgui/profilemanager.py:755
+#: ../pyhoca/wxgui/profilemanager.py:802
 msgid "Sharing"
 msgstr "Delen"
 
-#: ../pyhoca/wxgui/profilemanager.py:996
+#: ../pyhoca/wxgui/profilemanager.py:988
 msgid "<xkbtype>"
 msgstr "pc105/us"
 
-#: ../pyhoca/wxgui/profilemanager.py:997
+#: ../pyhoca/wxgui/profilemanager.py:989
 msgid "<xkblayout>"
 msgstr "us"
 
-#: ../pyhoca/wxgui/profilemanager.py:998
+#: ../pyhoca/wxgui/profilemanager.py:990
 msgid "<xkbvariant>"
 msgstr "intl"
 
-#: ../pyhoca/wxgui/profilemanager.py:1284
+#: ../pyhoca/wxgui/profilemanager.py:1444
 msgid "Icon Files (*.png)|*.png|All files (*.*)|*"
 msgstr "Icon Bestanden (*.png)|*.png|Alle Bestanden (*.*)|*"
 
-#: ../pyhoca/wxgui/profilemanager.py:1287
+#: ../pyhoca/wxgui/profilemanager.py:1447
 msgid "Choose an icon for this session profile"
 msgstr "Icon voor dit Profiel kiezen"
 
-#: ../pyhoca/wxgui/profilemanager.py:1509
+#: ../pyhoca/wxgui/profilemanager.py:1816
 msgid "All files (*.*)|*"
 msgstr "Alle Bestanden (*.*)|*"
 
-#: ../pyhoca/wxgui/profilemanager.py:1511
-#: ../pyhoca/wxgui/profilemanager.py:1533
+#: ../pyhoca/wxgui/profilemanager.py:1818
+#: ../pyhoca/wxgui/profilemanager.py:1842
 msgid "Choose a public SSH key"
 msgstr "Kies een public SSH-key"
 
-#: ../pyhoca/wxgui/profilemanager.py:1784
+#: ../pyhoca/wxgui/profilemanager.py:2220
 msgid "Choose a folder to share within a session"
 msgstr "Kies een map om te delen"
 
-#: ../pyhoca/wxgui/profilemanager.py:1912
-#: ../pyhoca/wxgui/profilemanager.py:1915
-#: ../pyhoca/wxgui/profilemanager.py:1918
-#: ../pyhoca/wxgui/profilemanager.py:1923
-#: ../pyhoca/wxgui/profilemanager.py:1933 ../pyhoca/wxgui/menus_taskbar.py:118
+#: ../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
 msgid "Profile Manager"
 msgstr "Profiel manager"
 
-#: ../pyhoca/wxgui/profilemanager.py:1912
+#: ../pyhoca/wxgui/profilemanager.py:2348
 msgid "Profile name is missing, profile unusable!!!"
 msgstr "Profiel naam ontbreekt, kan niet gebruikt worden!!!"
 
-#: ../pyhoca/wxgui/profilemanager.py:1915
-#: ../pyhoca/wxgui/profilemanager.py:1918
+#: ../pyhoca/wxgui/profilemanager.py:2351
+#: ../pyhoca/wxgui/profilemanager.py:2354
 #, python-format
 msgid "Profile name %s already exists!!!"
 msgstr "Profiel %s bestaat al"
 
-#: ../pyhoca/wxgui/profilemanager.py:1923
+#: ../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:1933
+#: ../pyhoca/wxgui/profilemanager.py:2369
 #, python-format
 msgid ""
 "Another session profile (%s) already uses [%s]:%s for binding a local SSH "
@@ -668,248 +706,252 @@ msgstr ""
 "SSH proxy.\n"
 "Verander de SSH proxy instelling om dit probleem te verhelpen."
 
-#: ../pyhoca/wxgui/profilemanager.py:1960
+#: ../pyhoca/wxgui/profilemanager.py:2396
 #, python-format
 msgid "%s - profile added"
 msgstr "%s - Profiel toegevoegd"
 
-#: ../pyhoca/wxgui/profilemanager.py:1961
+#: ../pyhoca/wxgui/profilemanager.py:2397
 msgid "A new session profile has been added."
 msgstr "Een nieuw Profiel is toegevoegd"
 
-#: ../pyhoca/wxgui/profilemanager.py:1965
+#: ../pyhoca/wxgui/profilemanager.py:2401
 #, python-format
 msgid "%s - modified"
 msgstr "%s - gewijzigd"
 
-#: ../pyhoca/wxgui/profilemanager.py:1966
+#: ../pyhoca/wxgui/profilemanager.py:2402
 msgid "Changes to profile have been saved."
 msgstr "Wijzigingen in het profiel zijn opgeslagen."
 
-#: ../pyhoca/wxgui/menus_taskbar.py:75
+#: ../pyhoca/wxgui/menus_taskbar.py:74
 msgid "Edit Profile"
 msgstr "Profiel bijwerken"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:78
+#: ../pyhoca/wxgui/menus_taskbar.py:77
 msgid "Use as Template for New Profile"
 msgstr "Gebruik als sjabloon voor een nieuw profiel"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:79
+#: ../pyhoca/wxgui/menus_taskbar.py:78
 msgid "Delete Profile"
 msgstr "Profiel verwijderen"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:107
+#: ../pyhoca/wxgui/menus_taskbar.py:106
 #, python-format
 msgid "About %s (%s)..."
 msgstr "About %s (%s) ..."
 
-#: ../pyhoca/wxgui/menus_taskbar.py:133
+#: ../pyhoca/wxgui/menus_taskbar.py:132
 msgid "Manage Session Profile"
 msgstr "Onderhoud sessieprofiel"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:142
+#: ../pyhoca/wxgui/menus_taskbar.py:141
 msgid "Printing Preferences"
 msgstr "Voorkeur voor afdrukken"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:148
+#: ../pyhoca/wxgui/menus_taskbar.py:147
 msgid "Client Options"
 msgstr "Opties"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:156 ../pyhoca/wxgui/menus_taskbar.py:785
-#: ../pyhoca/wxgui/menus_taskbar.py:977
+#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:783
+#: ../pyhoca/wxgui/menus_taskbar.py:975
 msgid "E&xit"
 msgstr "&Beeindigen"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:228
+#: ../pyhoca/wxgui/menus_taskbar.py:227
 msgid "Window title"
 msgstr "Scherm titel"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:234 ../pyhoca/wxgui/menus_taskbar.py:613
+#: ../pyhoca/wxgui/menus_taskbar.py:233 ../pyhoca/wxgui/menus_taskbar.py:608
 msgid "Resume Session"
 msgstr "Sessie hervatten"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:236
+#: ../pyhoca/wxgui/menus_taskbar.py:235
 msgid "Resume Session (not possible)"
 msgstr "Sessie hervatten (niet mogelijk)"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:247
+#: ../pyhoca/wxgui/menus_taskbar.py:246
 msgid "Transfer Session"
 msgstr "Sessie overnemen"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:249
+#: ../pyhoca/wxgui/menus_taskbar.py:248
 msgid "Transfer Session (not possible)"
 msgstr "Sessie overnemen (niet mogelijk)"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:253 ../pyhoca/wxgui/menus_taskbar.py:604
+#: ../pyhoca/wxgui/menus_taskbar.py:252 ../pyhoca/wxgui/menus_taskbar.py:599
 msgid "Suspend Session (and disconnect/exit)"
 msgstr "Suspend Sessie (en Verbinding verbreken / e&xit)"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:255 ../pyhoca/wxgui/menus_taskbar.py:606
+#: ../pyhoca/wxgui/menus_taskbar.py:254 ../pyhoca/wxgui/menus_taskbar.py:601
 msgid "Suspend Session (and disconnect)"
 msgstr "Suspend Sessie  (en Verbinding verbreken)"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:257 ../pyhoca/wxgui/menus_taskbar.py:608
+#: ../pyhoca/wxgui/menus_taskbar.py:256 ../pyhoca/wxgui/menus_taskbar.py:603
 msgid "Suspend Session"
 msgstr "Suspend Sessie"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:263 ../pyhoca/wxgui/menus_taskbar.py:617
+#: ../pyhoca/wxgui/menus_taskbar.py:262 ../pyhoca/wxgui/menus_taskbar.py:612
 msgid "Terminate Session (and disconnect/exit)"
 msgstr "Sessie beëindigen  (en Verbinding verbreken / e&xit)"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:265 ../pyhoca/wxgui/menus_taskbar.py:619
+#: ../pyhoca/wxgui/menus_taskbar.py:264 ../pyhoca/wxgui/menus_taskbar.py:614
 msgid "Terminate Session (and disconnect)"
 msgstr "Sessie beëindigen  (en Verbinding verbreken)"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:267 ../pyhoca/wxgui/menus_taskbar.py:621
+#: ../pyhoca/wxgui/menus_taskbar.py:266 ../pyhoca/wxgui/menus_taskbar.py:616
 msgid "Terminate Session"
 msgstr "Sessie beëindigen"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:271 ../pyhoca/wxgui/menus_taskbar.py:601
+#: ../pyhoca/wxgui/menus_taskbar.py:270 ../pyhoca/wxgui/menus_taskbar.py:596
 msgid "Refresh menu tree"
 msgstr "Ververs menu"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:280
+#: ../pyhoca/wxgui/menus_taskbar.py:279
 msgid "Rename Session Window"
 msgstr "Hernoem sessie"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:281
+#: ../pyhoca/wxgui/menus_taskbar.py:280
 msgid "Show Session Window"
 msgstr "Toon sessiescherm"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:321
+#: ../pyhoca/wxgui/menus_taskbar.py:322
 msgid "&Share custom local folder"
 msgstr "Delen lokale &map"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:344
+#: ../pyhoca/wxgui/menus_taskbar.py:337
 msgid "Share:"
 msgstr "Delen:"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:355
+#: ../pyhoca/wxgui/menus_taskbar.py:346
 msgid "Unshare:"
 msgstr "Niet meer delen"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:365
+#: ../pyhoca/wxgui/menus_taskbar.py:354
 msgid "Unshare &all local folders"
 msgstr "Niet langer delen alle lokale &mappen"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:445
+#: ../pyhoca/wxgui/menus_taskbar.py:360
+msgid "Restore shares in next session"
+msgstr ""
+
+#: ../pyhoca/wxgui/menus_taskbar.py:440
 msgid "Multimedia"
 msgstr "Multimedia"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:446
+#: ../pyhoca/wxgui/menus_taskbar.py:441
 msgid "Development"
 msgstr "Ontwikkeling"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:447
+#: ../pyhoca/wxgui/menus_taskbar.py:442
 msgid "Education"
 msgstr "Opleiding"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:448
+#: ../pyhoca/wxgui/menus_taskbar.py:443
 msgid "Games"
 msgstr "Spelletjes"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:449
+#: ../pyhoca/wxgui/menus_taskbar.py:444
 msgid "Graphics"
 msgstr "Graphics"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:450
+#: ../pyhoca/wxgui/menus_taskbar.py:445
 msgid "Internet"
 msgstr "Internet"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:451
+#: ../pyhoca/wxgui/menus_taskbar.py:446
 msgid "Office Applications"
 msgstr "Kantoor applicaties"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:452
+#: ../pyhoca/wxgui/menus_taskbar.py:447
 msgid "System"
 msgstr "Systeem"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:453
+#: ../pyhoca/wxgui/menus_taskbar.py:448
 msgid "Utilities"
 msgstr "Hulpmiddelen"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:454
+#: ../pyhoca/wxgui/menus_taskbar.py:449
 msgid "Other Applications"
 msgstr "Andere applicaties"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:526 ../pyhoca/wxgui/menus_taskbar.py:538
+#: ../pyhoca/wxgui/menus_taskbar.py:521 ../pyhoca/wxgui/menus_taskbar.py:533
 #, python-format
 msgid "Connect %s"
 msgstr "Verbind %s"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:532
+#: ../pyhoca/wxgui/menus_taskbar.py:527
 msgid "Currently connecting..."
 msgstr "Nu aan het verbinden..."
 
-#: ../pyhoca/wxgui/menus_taskbar.py:546
+#: ../pyhoca/wxgui/menus_taskbar.py:541
 msgid "Start &new Desktop Session"
 msgstr "&Nieuwe Desktop Sessie starten"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:551 ../pyhoca/wxgui/menus_taskbar.py:689
+#: ../pyhoca/wxgui/menus_taskbar.py:546 ../pyhoca/wxgui/menus_taskbar.py:684
 msgid "Retrieving Application Menu..."
 msgstr "Bezig met ophalen applicatiemenu..."
 
-#: ../pyhoca/wxgui/menus_taskbar.py:555 ../pyhoca/wxgui/menus_taskbar.py:692
+#: ../pyhoca/wxgui/menus_taskbar.py:550 ../pyhoca/wxgui/menus_taskbar.py:687
 msgid "Retrieve Application Menu"
 msgstr "Haal applicatiemenu op"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:558
+#: ../pyhoca/wxgui/menus_taskbar.py:553
 msgid "Start &new Session"
 msgstr "&Nieuwe Sessie starten"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:638
+#: ../pyhoca/wxgui/menus_taskbar.py:633
 msgid "Launch Single Application"
 msgstr "Enkelvoudige Applicatie starten"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:676
+#: ../pyhoca/wxgui/menus_taskbar.py:671
 msgid "Manage Application Menu"
 msgstr "Onderhoud applicatie menu"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:719
+#: ../pyhoca/wxgui/menus_taskbar.py:714
 msgid "Running"
 msgstr "Aktief"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:721
+#: ../pyhoca/wxgui/menus_taskbar.py:716
 msgid "Suspended"
 msgstr "Suspended"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:740
+#: ../pyhoca/wxgui/menus_taskbar.py:735
 msgid "&Clean all sessions"
 msgstr "Alle Sessies beëindigen"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:746
+#: ../pyhoca/wxgui/menus_taskbar.py:741
 msgid "Customize &profile"
 msgstr "Sessieprofiel wijzigen"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:758
+#: ../pyhoca/wxgui/menus_taskbar.py:756
 msgid "Shared &folders"
 msgstr "Delen &mappen"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:770
+#: ../pyhoca/wxgui/menus_taskbar.py:768
 msgid "&Disconnect from Server"
 msgstr "&Verbinding verbreken"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:777
+#: ../pyhoca/wxgui/menus_taskbar.py:775
 msgid "Suspend Session and E&xit application"
 msgstr "Suspend Sessie en e&xit"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:781
+#: ../pyhoca/wxgui/menus_taskbar.py:779
 msgid "Disconnect and E&xit application"
 msgstr "verbinding verbreken en e&xit"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:835
+#: ../pyhoca/wxgui/menus_taskbar.py:833
 msgid "Add Profile"
 msgstr "Profiel toevoegen"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:911
+#: ../pyhoca/wxgui/menus_taskbar.py:909
 msgid "No session profiles defined"
 msgstr "Geen Profiel gedefinieerd"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:947
+#: ../pyhoca/wxgui/menus_taskbar.py:945
 msgid "Start/Resume Session"
 msgstr "Sessie starten/hervatten"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:947
+#: ../pyhoca/wxgui/menus_taskbar.py:945
 msgid "Connect Server"
 msgstr "Verbinden met Server"
 
@@ -918,108 +960,130 @@ msgstr "Verbinden met Server"
 msgid "About %s ..."
 msgstr "About %s ..."
 
-#: ../pyhoca/wxgui/frontend.py:462
+#: ../pyhoca/wxgui/frontend.py:459
 msgid "Suspending sessions and exiting application..."
 msgstr "Bezig met suspend van sessie en afsluiten van applicatie"
 
-#: ../pyhoca/wxgui/frontend.py:465
+#: ../pyhoca/wxgui/frontend.py:462
 #, python-format
 msgid "Disconnecting %s and exiting application..."
 msgstr "Bezig met verbreken verbinding %s en afsluiten applicatie..."
 
-#: ../pyhoca/wxgui/frontend.py:467
+#: ../pyhoca/wxgui/frontend.py:464
 msgid "Exiting application..."
 msgstr "Afsluiten van applicatie..."
 
-#: ../pyhoca/wxgui/frontend.py:560
+#: ../pyhoca/wxgui/frontend.py:562
 #, python-format
 msgid "%s - server warning"
 msgstr "%s - server waarschuwing"
 
-#: ../pyhoca/wxgui/frontend.py:560
+#: ../pyhoca/wxgui/frontend.py:562
 msgid "The X2Go Server does not publish an application menu."
 msgstr "De X2go server publiceert geen applicatie menu"
 
-#: ../pyhoca/wxgui/frontend.py:610
-msgid "Public SSH key authentication has been successful."
-msgstr "Public SSH-key authenticatie is gelukt."
+#: ../pyhoca/wxgui/frontend.py:613
+msgid "SSH key authentication has been successful."
+msgstr "SSH-key authenticatie is gelukt."
 
-#: ../pyhoca/wxgui/frontend.py:644
+#: ../pyhoca/wxgui/frontend.py:650
 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:665
+#: ../pyhoca/wxgui/frontend.py:671
 #, python-format
 msgid "%s - EOF error"
 msgstr "%s - EOF fout"
 
-#: ../pyhoca/wxgui/frontend.py:665
+#: ../pyhoca/wxgui/frontend.py:671
 msgid "Authentication protocol communication incomplete! Try again..."
 msgstr "Authenticatie was niet volledig! Opnieuw proberen..."
 
-#: ../pyhoca/wxgui/frontend.py:672
+#: ../pyhoca/wxgui/frontend.py:678
 #, python-format
 msgid "%s - auth key error"
 msgstr "%s - Verbindingsfout met auth. key"
 
-#: ../pyhoca/wxgui/frontend.py:693
+#: ../pyhoca/wxgui/frontend.py:699
 msgid "An unknown error occurred during authentication!"
 msgstr "Een onbekende fout is bij de authenticatie opgetreden"
 
-#: ../pyhoca/wxgui/frontend.py:726
+#: ../pyhoca/wxgui/frontend.py:728
+#, python-format
+msgid "%s: DirectRDP not supported yet"
+msgstr "%s: DirectRDP wordt nog niet ondersteund"
+
+#: ../pyhoca/wxgui/frontend.py:729
+#, python-format
+msgid ""
+"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)."
+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)."
+
+#: ../pyhoca/wxgui/frontend.py:741
 msgid "Unknown session profile, configure before using it..."
 msgstr "Onekend sessie profiel, stel dit in voordat je het gebruikt..."
 
-#: ../pyhoca/wxgui/frontend.py:784 ../pyhoca/wxgui/frontend.py:1302
+#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:1332
 #, python-format
 msgid "%s - session warning"
 msgstr "%s - sessie waarschuwing"
 
-#: ../pyhoca/wxgui/frontend.py:784
+#: ../pyhoca/wxgui/frontend.py:798
 #, python-format
 msgid "Execution of command ,,%s'' failed."
 msgstr "Uitvoering van commando \"%s\" faalde"
 
-#: ../pyhoca/wxgui/frontend.py:926
+#: ../pyhoca/wxgui/frontend.py:939
 msgid "Cleaning X2Go sessions..."
 msgstr "Opschonen X2Go sessies..."
 
-#: ../pyhoca/wxgui/frontend.py:961
+#: ../pyhoca/wxgui/frontend.py:974
 #, python-format
 msgid "%s - disconnect"
 msgstr "%s - verbinding verbreken"
 
-#: ../pyhoca/wxgui/frontend.py:961
+#: ../pyhoca/wxgui/frontend.py:974
 msgid "X2Go Profile is now disconnected."
 msgstr "X2Go Profiel is nu niet meer verbonden."
 
-#: ../pyhoca/wxgui/frontend.py:977
+#: ../pyhoca/wxgui/frontend.py:995
 msgid "New Session Profile"
 msgstr "Nieuw Profiel"
 
-#: ../pyhoca/wxgui/frontend.py:1029
+#: ../pyhoca/wxgui/frontend.py:1047
 #, python-format
 msgid "Really Delete Session Profile ,,%s''?"
 msgstr "Verwijder sessie profiel ,,%s''?"
 
-#: ../pyhoca/wxgui/frontend.py:1035
+#: ../pyhoca/wxgui/frontend.py:1053
 #, python-format
 msgid "%s - profile deleted"
 msgstr "%s - Profiel is verwijderd!"
 
-#: ../pyhoca/wxgui/frontend.py:1035
+#: ../pyhoca/wxgui/frontend.py:1053
 msgid "The session profile has been deleted."
 msgstr "Het sessie profiel is verwijderd."
 
-#: ../pyhoca/wxgui/frontend.py:1053
+#: ../pyhoca/wxgui/frontend.py:1071
 #, python-format
 msgid "%s - share local folder with sessions of this profile"
 msgstr "%s - deel lokale map met dit Profiel"
 
-#: ../pyhoca/wxgui/frontend.py:1194
+#: ../pyhoca/wxgui/frontend.py:1224
 #, python-format
 msgid ""
 "The authenticity of host [%s]:%s can't be established.\n"
@@ -1032,17 +1096,17 @@ msgstr ""
 "\n"
 "Weet u zeker dat u de verbinding wilt maken?"
 
-#: ../pyhoca/wxgui/frontend.py:1202
+#: ../pyhoca/wxgui/frontend.py:1232
 #, python-format
 msgid "%s: Confirm Host Authorization"
 msgstr "%s: Bevestig dat de Host geautoriseerd is"
 
-#: ../pyhoca/wxgui/frontend.py:1247
+#: ../pyhoca/wxgui/frontend.py:1277
 #, python-format
 msgid "%s - channel error"
 msgstr "%s - Verbindingsfout (channel error)"
 
-#: ../pyhoca/wxgui/frontend.py:1247
+#: ../pyhoca/wxgui/frontend.py:1277
 #, python-format
 msgid ""
 "Lost connection to server %s unexpectedly! Try to re-authenticate to the "
@@ -1051,22 +1115,22 @@ msgstr ""
 "De Verbinding met de server %s werd onverwacht verbroken! Probeer om u "
 "opnieuw aan te melden..."
 
-#: ../pyhoca/wxgui/frontend.py:1265 ../pyhoca/wxgui/frontend.py:1283
-#: ../pyhoca/wxgui/frontend.py:1285 ../pyhoca/wxgui/frontend.py:1321
+#: ../pyhoca/wxgui/frontend.py:1295 ../pyhoca/wxgui/frontend.py:1313
+#: ../pyhoca/wxgui/frontend.py:1315 ../pyhoca/wxgui/frontend.py:1351
 #, python-format
 msgid "%s - session failure"
 msgstr "%s - sessie fout"
 
-#: ../pyhoca/wxgui/frontend.py:1265
+#: ../pyhoca/wxgui/frontend.py:1295
 msgid "The session startup failed."
 msgstr "Opstarten van de sessie is mislukt"
 
-#: ../pyhoca/wxgui/frontend.py:1283
+#: ../pyhoca/wxgui/frontend.py:1313
 #, 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:1285
+#: ../pyhoca/wxgui/frontend.py:1315
 #, python-format
 msgid ""
 "The command ,,%s'' is not available on X2Go server\n"
@@ -1075,7 +1139,7 @@ msgstr ""
 "Het commando ,,%s'' is niet beschikbaar op de X2Go server\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1302
+#: ../pyhoca/wxgui/frontend.py:1332
 #, python-format
 msgid ""
 "Reverse TCP port forwarding request for session %s to server port %s has "
@@ -1084,7 +1148,7 @@ msgstr ""
 "Reverse TCP port forwarding request for session %s to server port %s has "
 "been denied."
 
-#: ../pyhoca/wxgui/frontend.py:1321
+#: ../pyhoca/wxgui/frontend.py:1351
 #, python-format
 msgid ""
 "Forwarding tunnel request to [%s]:%s for session %s was denied by remote "
@@ -1093,36 +1157,36 @@ msgstr ""
 "Forwarding tunnel request to [%s]:%s for session %s was denied by remote "
 "X2go/SSH server. Session startup failed."
 
-#: ../pyhoca/wxgui/frontend.py:1340
+#: ../pyhoca/wxgui/frontend.py:1370
 #, python-format
 msgid "%s - audio warning"
 msgstr "%s - audio waarschuwing"
 
-#: ../pyhoca/wxgui/frontend.py:1340
+#: ../pyhoca/wxgui/frontend.py:1370
 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:1347 ../pyhoca/wxgui/frontend.py:1354
+#: ../pyhoca/wxgui/frontend.py:1377 ../pyhoca/wxgui/frontend.py:1384
 #, python-format
 msgid "%s - audio error"
 msgstr "%s - audio fout"
 
-#: ../pyhoca/wxgui/frontend.py:1347
+#: ../pyhoca/wxgui/frontend.py:1377
 msgid "The X2Go PulseAudio system could not be started."
 msgstr "Het X2Go PulseAudio systeem kon niet gestart worden"
 
-#: ../pyhoca/wxgui/frontend.py:1354
+#: ../pyhoca/wxgui/frontend.py:1384
 msgid "The X2Go PulseAudio system has died unexpectedly."
 msgstr "Het X2Go PulseAudio systeem is gecrashed"
 
-#: ../pyhoca/wxgui/frontend.py:1366
+#: ../pyhoca/wxgui/frontend.py:1396
 #, python-format
 msgid "%s - audio problem"
 msgstr "%s - audio probleem"
 
-#: ../pyhoca/wxgui/frontend.py:1366
+#: ../pyhoca/wxgui/frontend.py:1396
 #, python-format
 msgid ""
 "The audio connection could not be set up for this session.\n"
@@ -1131,36 +1195,36 @@ msgstr ""
 "De audio verbinding kon niet worden gemaakt voor deze sessie.\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1378
+#: ../pyhoca/wxgui/frontend.py:1408
 #, python-format
 msgid "%s - client-side printing not available"
 msgstr "%s - client-side print systeem niet beschikbaar"
 
-#: ../pyhoca/wxgui/frontend.py:1378
+#: ../pyhoca/wxgui/frontend.py:1408
 #, 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:1390
+#: ../pyhoca/wxgui/frontend.py:1420
 #, python-format
 msgid "%s - MIME box not available"
 msgstr "%s- MIME box is niet beschikbaar"
 
-#: ../pyhoca/wxgui/frontend.py:1390
+#: ../pyhoca/wxgui/frontend.py:1420
 #, 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:1402
+#: ../pyhoca/wxgui/frontend.py:1432
 #, python-format
 msgid "%s - client-side folders not sharable"
 msgstr "%s - client-side mappen worden niet gedeeld"
 
-#: ../pyhoca/wxgui/frontend.py:1402
+#: ../pyhoca/wxgui/frontend.py:1432
 #, python-format
 msgid ""
 "The server denies client-side folder sharing with this session.\n"
@@ -1169,12 +1233,12 @@ msgstr ""
 "De server staat client-side mappen deling in deze sessie niet toe.\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1414
+#: ../pyhoca/wxgui/frontend.py:1444
 #, python-format
 msgid "%s - client resources not sharable"
 msgstr "%s - client bronnen kunnen niet gedeeld worden"
 
-#: ../pyhoca/wxgui/frontend.py:1414
+#: ../pyhoca/wxgui/frontend.py:1444
 #, python-format
 msgid ""
 "Client-side folders and printers cannot be shared with this session.\n"
@@ -1183,12 +1247,12 @@ msgstr ""
 "Client-side mappen en printers kunnen niet gedeeld worden in deze sessie.\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1433 ../pyhoca/wxgui/frontend.py:1435
+#: ../pyhoca/wxgui/frontend.py:1463 ../pyhoca/wxgui/frontend.py:1465
 #, python-format
 msgid "%s - print error"
 msgstr "%s - Printfout"
 
-#: ../pyhoca/wxgui/frontend.py:1433
+#: ../pyhoca/wxgui/frontend.py:1463
 #, python-format
 msgid ""
 "%s\n"
@@ -1199,7 +1263,7 @@ msgstr ""
 "...veroorzaakt door printer %s in  sessie\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1435
+#: ../pyhoca/wxgui/frontend.py:1465
 #, python-format
 msgid ""
 "%s\n"
@@ -1210,12 +1274,12 @@ msgstr ""
 "...veroorzaakt door sessie\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1450 ../pyhoca/wxgui/frontend.py:1465
+#: ../pyhoca/wxgui/frontend.py:1480 ../pyhoca/wxgui/frontend.py:1495
 #, python-format
 msgid "%s - start"
 msgstr "%s - Start"
 
-#: ../pyhoca/wxgui/frontend.py:1450
+#: ../pyhoca/wxgui/frontend.py:1480
 #, python-format
 msgid ""
 "New X2Go session starting up...\n"
@@ -1224,7 +1288,7 @@ msgstr ""
 "Nieuwe X2Go sessie wordt gestart...\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1465
+#: ../pyhoca/wxgui/frontend.py:1495
 #, python-format
 msgid ""
 "Another client started X2Go session\n"
@@ -1233,12 +1297,12 @@ msgstr ""
 "Een andere X2Go-client heeft deze sessie gestart\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1480 ../pyhoca/wxgui/frontend.py:1495
+#: ../pyhoca/wxgui/frontend.py:1510 ../pyhoca/wxgui/frontend.py:1525
 #, python-format
 msgid "%s - resume"
 msgstr "%s - hervatten"
 
-#: ../pyhoca/wxgui/frontend.py:1480
+#: ../pyhoca/wxgui/frontend.py:1510
 #, python-format
 msgid ""
 "Resuming X2Go session...\n"
@@ -1247,7 +1311,7 @@ msgstr ""
 "X2Go Sessie wordt hervat...\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1495
+#: ../pyhoca/wxgui/frontend.py:1525
 #, python-format
 msgid ""
 "Another client resumed X2Go session\n"
@@ -1256,12 +1320,12 @@ msgstr ""
 "Een andere X2Go-client heeft de Sessie hervat\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1510
+#: ../pyhoca/wxgui/frontend.py:1540
 #, python-format
 msgid "%s - running"
 msgstr "%s - actief"
 
-#: ../pyhoca/wxgui/frontend.py:1510
+#: ../pyhoca/wxgui/frontend.py:1540
 #, python-format
 msgid ""
 "Found already running session\n"
@@ -1270,12 +1334,12 @@ msgstr ""
 "Reeds actieve sessie gevonden\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1530
+#: ../pyhoca/wxgui/frontend.py:1560
 #, python-format
 msgid "%s - suspend"
 msgstr "%s - suspend"
 
-#: ../pyhoca/wxgui/frontend.py:1530
+#: ../pyhoca/wxgui/frontend.py:1560
 #, python-format
 msgid ""
 "X2Go Session has been suspended\n"
@@ -1284,12 +1348,12 @@ msgstr ""
 "X2Go Sessie is suspended\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1557
+#: ../pyhoca/wxgui/frontend.py:1587
 #, python-format
 msgid "%s - terminate"
 msgstr "%s - beëindigen"
 
-#: ../pyhoca/wxgui/frontend.py:1557
+#: ../pyhoca/wxgui/frontend.py:1587
 #, python-format
 msgid ""
 "X2Go Session has terminated\n"
@@ -1298,7 +1362,7 @@ msgstr ""
 "X2Go Sessie wordt beëindigd\n"
 "%s"
 
-#: ../pyhoca/wxgui/messages.py:74
+#: ../pyhoca/wxgui/messages.py:73
 #, python-format
 msgid ""
 "Are you really sure you want to\n"
@@ -1307,7 +1371,7 @@ msgstr ""
 "Weet u zeker dat u het sessie\n"
 "profiel ,,%s'' wilt verwijderen??"
 
-#: ../pyhoca/wxgui/messages.py:75
+#: ../pyhoca/wxgui/messages.py:74
 #, python-format
 msgid ""
 "PyHoca-GUI is already running for user ,,%s''!\n"
@@ -1322,15 +1386,15 @@ msgstr ""
 "Het Pyhoca-GUI icoontje kan gevonden worden in de\n"
 "taakbalk van uw desktop."
 
-#: ../pyhoca/wxgui/messages.py:108
+#: ../pyhoca/wxgui/messages.py:107
 msgid "Yes"
 msgstr "Ja"
 
-#: ../pyhoca/wxgui/messages.py:109
+#: ../pyhoca/wxgui/messages.py:108
 msgid "No"
 msgstr "Nee"
 
-#: ../pyhoca/wxgui/messages.py:126 ../pyhoca/wxgui/printingprefs.py:142
+#: ../pyhoca/wxgui/messages.py:125 ../pyhoca/wxgui/printingprefs.py:142
 msgid "Ok"
 msgstr "Ok"
 
@@ -1433,6 +1497,20 @@ msgstr "Wijzig sessie naam naar"
 msgid "OK"
 msgstr "OK"
 
+#, fuzzy
+#~ msgid "Remember shared folders"
+#~ msgstr "Delen &mappen"
+
+#, fuzzy
+#~ msgid "Shared Resources"
+#~ msgstr "Delen &mappen"
+
+#~ msgid "RSA/DSA private key"
+#~ msgstr "Private RSA/DSA Key"
+
+#~ msgid "Host[:Port]"
+#~ msgstr "Host[:Port]"
+
 #~ msgid "us"
 #~ msgstr "us"
 
diff --git a/po/ru.po b/po/ru.po
new file mode 100644
index 0000000..531b6c0
--- /dev/null
+++ b/po/ru.po
@@ -0,0 +1,1510 @@
+# PyHoca-GUI / i18n.
+# Copyright (C) 2010-2012 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.
+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"
+"Last-Translator: Oleksandr Shneyder <o.shneyder at phoca-gmbh.de>\n"
+"Language-Team: X2Go i18n <x2go-i18n at lists.berlios.de>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Poedit-Language: Russian\n"
+"X-Poedit-Country: Russian\n"
+"X-Poedit-SourceCharset: utf-8\n"
+"X-Language: ru_RU\n"
+"X-Source-Language: C\n"
+"X-Generator: Lokalize 1.4\n"
+
+#: ../pyhoca/wxgui/logon.py:86
+#, python-format
+msgid "%s (via %s)"
+msgstr "%s (через %s)"
+
+#: ../pyhoca/wxgui/logon.py:90 ../pyhoca/wxgui/logon.py:102
+msgid "Username"
+msgstr "Имя пользователя"
+
+#: ../pyhoca/wxgui/logon.py:92 ../pyhoca/wxgui/logon.py:104
+msgid "Password"
+msgstr "Пароль"
+
+#: ../pyhoca/wxgui/logon.py:95
+msgid "Authenticate"
+msgstr "Авторизовать"
+
+#: ../pyhoca/wxgui/logon.py:107
+msgid "  Start SSH tunnel  "
+msgstr "  Создать SSH туннель  "
+
+#: ../pyhoca/wxgui/logon.py:115
+msgid "Session login"
+msgstr "Логин сессии"
+
+#: ../pyhoca/wxgui/logon.py:116
+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
+msgid "Cancel"
+msgstr "Отмена"
+
+#: ../pyhoca/wxgui/logon.py:297 ../pyhoca/wxgui/logon.py:339
+#: ../pyhoca/wxgui/frontend.py:606
+#, python-format
+msgid "%s - connect failure"
+msgstr "%s - ошибка соединения"
+
+#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:606
+msgid "User is not allowed to start X2Go sessions!"
+msgstr "Пользователю не разрешено открывать X2Go сессии!"
+
+#: ../pyhoca/wxgui/logon.py:303 ../pyhoca/wxgui/frontend.py:613
+#, python-format
+msgid "%s - connect"
+msgstr "%s - соединение"
+
+#: ../pyhoca/wxgui/logon.py:304
+msgid "Authentication has been successful."
+msgstr "Авторизация успешна."
+
+#: ../pyhoca/wxgui/logon.py:335
+msgid "SSH tunnel started"
+msgstr "SSH туннель установлен"
+
+#: ../pyhoca/wxgui/logon.py:340
+msgid "Authentication failed!"
+msgstr "Ошибка авторизации!"
+
+#: ../pyhoca/wxgui/logon.py:348
+#, python-format
+msgid "%s - SSH proxy"
+msgstr "%s - SSH прокси"
+
+#: ../pyhoca/wxgui/logon.py:349
+msgid "Authentication to the SSH proxy server failed!"
+msgstr "Ошибка авторизации на прокси сервере SSH!"
+
+#: ../pyhoca/wxgui/logon.py:376 ../pyhoca/wxgui/frontend.py:664
+#, python-format
+msgid "%s - socket error"
+msgstr "%s - ошибка сокета"
+
+#: ../pyhoca/wxgui/logon.py:383 ../pyhoca/wxgui/frontend.py:643
+#: ../pyhoca/wxgui/frontend.py:650
+#, python-format
+msgid "%s - host key error"
+msgstr "%s - ошибка ключа хоста"
+
+#: ../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 "Удаленный серверный ключ недействителен и не был принят пользователем"
+
+#: ../pyhoca/wxgui/logon.py:391 ../pyhoca/wxgui/frontend.py:685
+#, python-format
+msgid "%s - missing home directory"
+msgstr "%s - домашний каталог отсутствует"
+
+#: ../pyhoca/wxgui/logon.py:392 ../pyhoca/wxgui/frontend.py:685
+msgid "The remote user's home directory does not exist."
+msgstr "Домашний каталог удаленного пользователя не существует."
+
+#: ../pyhoca/wxgui/logon.py:399
+#, python-format
+msgid "%s - key error"
+msgstr "%s - ошибка ключа"
+
+#: ../pyhoca/wxgui/logon.py:407 ../pyhoca/wxgui/frontend.py:692
+#, python-format
+msgid "%s - auth error"
+msgstr "%s - ошибка авторизации"
+
+#: ../pyhoca/wxgui/logon.py:415 ../pyhoca/wxgui/frontend.py:636
+#, python-format
+msgid "%s - SSH error"
+msgstr "%s - ошибка SSH"
+
+#: ../pyhoca/wxgui/logon.py:423
+#, python-format
+msgid "%s - unknown error"
+msgstr "%s - неизвестная ошибка"
+
+#: ../pyhoca/wxgui/logon.py:424
+msgid "An unknown error occured during authentication!"
+msgstr "Неизвестная ошибка при авторизации!"
+
+#: ../pyhoca/wxgui/taskbar.py:89
+#, python-format
+msgid ""
+"PyHoca-GUI\n"
+"Connecting you to ,,%s''"
+msgstr ""
+"PyHoca-GUI\n"
+"Соединяет Вас ,,%s''"
+
+#: ../pyhoca/wxgui/taskbar.py:93
+#, python-format
+msgid ""
+"PyHoca-GUI (Python X2goClient)\n"
+"Currently connecting you to remote X2Go server ,,%s''"
+msgstr ""
+"PyHoca-GUI (Python X2goClient)\n"
+"Соединяет Вас с удаленным сервером X2Go ,,%s''"
+
+#: ../pyhoca/wxgui/taskbar.py:103
+msgid ""
+"PyHoca-GUI\n"
+"Connecting you to X2Go..."
+msgstr "Соединяет Вас с X2Go..."
+
+#: ../pyhoca/wxgui/taskbar.py:107
+msgid ""
+"PyHoca-GUI (Python X2goClient)\n"
+"Client for connecting you to a remote X2Go server"
+msgstr ""
+"PyHoca-GUI (Python X2goClient)\n"
+"Для соединения с удаленным сервером X2Go"
+
+#: ../pyhoca/wxgui/profilemanager.py:79
+msgid "GNOME Desktop (GNOME)"
+msgstr "GNOME Desktop (GNOME)"
+
+#: ../pyhoca/wxgui/profilemanager.py:80
+msgid "K Desktop Environment (KDE)"
+msgstr "K Desktop Environment (KDE)"
+
+#: ../pyhoca/wxgui/profilemanager.py:81
+msgid "Lightweight X Desktop (LXDE)"
+msgstr "Lightweight X Desktop (LXDE)"
+
+#: ../pyhoca/wxgui/profilemanager.py:82
+msgid "Trinity X Desktop (KDE3-like)"
+msgstr "Trinity X Desktop (KDE3-like)"
+
+#: ../pyhoca/wxgui/profilemanager.py:83
+msgid "Unity X Desktop Shell (UNITY)"
+msgstr "Unity X Desktop Shell (UNITY)"
+
+#: ../pyhoca/wxgui/profilemanager.py:84
+msgid "XFCE Desktop (XFCE)"
+msgstr "XFCE Desktop (XFCE)"
+
+#: ../pyhoca/wxgui/profilemanager.py:85
+msgid "Published Applications"
+msgstr "Удаленные приложения"
+
+#: ../pyhoca/wxgui/profilemanager.py:86
+msgid "Single Application"
+msgstr "Приложения"
+
+#: ../pyhoca/wxgui/profilemanager.py:87
+msgid "XDMCP Query"
+msgstr "XDMCP Запрос"
+
+#: ../pyhoca/wxgui/profilemanager.py:88
+msgid "Windows Terminal Server (X2Go-proxied RDP)"
+msgstr "Сервер терминалов Windows (RDP через X2Go прокси)"
+
+#: ../pyhoca/wxgui/profilemanager.py:89
+msgid "Windows Terminal Server (Direct RDP)"
+msgstr "Сервер терминалов Windows (прямое RDP соединение)"
+
+#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/profilemanager.py:224
+msgid "Custom command"
+msgstr "Команда пользователя"
+
+#: ../pyhoca/wxgui/profilemanager.py:95 ../pyhoca/wxgui/menus_taskbar.py:393
+msgid "Internet Browser"
+msgstr "Веб-броузер"
+
+#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:394
+msgid "Email Client"
+msgstr "Почтовый клиент"
+
+#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:395
+msgid "Office"
+msgstr "Офис"
+
+#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:396
+msgid "Terminal"
+msgstr "Терминал"
+
+#: ../pyhoca/wxgui/profilemanager.py:116
+msgid "Open file with system's default application"
+msgstr "Открыть файл с приложением по умолчанию"
+
+#: ../pyhoca/wxgui/profilemanager.py:117
+msgid "Open application chooser dialog"
+msgstr "Открыть диалог выбора приложения"
+
+#: ../pyhoca/wxgui/profilemanager.py:118
+msgid "Save incoming file as ..."
+msgstr "Сохранить файл как ..."
+
+#: ../pyhoca/wxgui/profilemanager.py:146
+msgid "settings derived from "
+msgstr "настройки импортированы из "
+
+#. boxes for all tabs
+#: ../pyhoca/wxgui/profilemanager.py:167
+msgid "Session Title"
+msgstr "Заголовок сессии"
+
+#: ../pyhoca/wxgui/profilemanager.py:168
+msgid "Session Window"
+msgstr "Окно сессии"
+
+#: ../pyhoca/wxgui/profilemanager.py:169
+msgid "Session Startup"
+msgstr "Запуск сессии"
+
+#: ../pyhoca/wxgui/profilemanager.py:170
+msgid "Server"
+msgstr "Сервер"
+
+#: ../pyhoca/wxgui/profilemanager.py:171
+msgid "Proxy"
+msgstr "Прокси"
+
+#: ../pyhoca/wxgui/profilemanager.py:172
+msgid "Connection Link Speed"
+msgstr "Скорость соединения"
+
+#: ../pyhoca/wxgui/profilemanager.py:173
+msgid "Compression"
+msgstr "Сжатие"
+
+#: ../pyhoca/wxgui/profilemanager.py:174
+msgid "Display"
+msgstr "Дисплей"
+
+#: ../pyhoca/wxgui/profilemanager.py:175
+msgid "Keyboard"
+msgstr "Клавиатура"
+
+#: ../pyhoca/wxgui/profilemanager.py:176
+msgid "Sound"
+msgstr "Звук"
+
+#: ../pyhoca/wxgui/profilemanager.py:177
+msgid "Printing"
+msgstr "Печать"
+
+#: ../pyhoca/wxgui/profilemanager.py:178
+msgid "Folder Exports"
+msgstr "Экспорт каталогов"
+
+#: ../pyhoca/wxgui/profilemanager.py:179
+msgid "File Import"
+msgstr "Импорт файлов"
+
+#. ##
+#. ## widgets for the PROFILE tab
+#. ##
+#: ../pyhoca/wxgui/profilemanager.py:184
+msgid "Name"
+msgstr "Имя"
+
+#: ../pyhoca/wxgui/profilemanager.py:191
+msgid "Set session window title"
+msgstr "Установить заголовок окна сессии"
+
+#: ../pyhoca/wxgui/profilemanager.py:192
+msgid "Use a default session window title"
+msgstr "Использовать заголовок окна сессии по умолчанию"
+
+#: ../pyhoca/wxgui/profilemanager.py:193
+msgid "Custom session window title"
+msgstr "Произвольный заголовок окна сессии"
+
+#: ../pyhoca/wxgui/profilemanager.py:212
+msgid "Window Icon"
+msgstr "Пиктограмма"
+
+#. ##
+#. ## widgets for the SESSION tab
+#. ##
+#: ../pyhoca/wxgui/profilemanager.py:218
+msgid "Start session automatically after login"
+msgstr "Запускать сессию автоматически после входа"
+
+#: ../pyhoca/wxgui/profilemanager.py:219
+#, python-format
+msgid "Login automatically after %s has started"
+msgstr "Автоматический вход после запуска %s"
+
+#: ../pyhoca/wxgui/profilemanager.py:220
+msgid "Type"
+msgstr "Тип"
+
+#: ../pyhoca/wxgui/profilemanager.py:222
+msgid "Application"
+msgstr "Приложение"
+
+#: ../pyhoca/wxgui/profilemanager.py:226
+msgid "XDMCP server"
+msgstr "XDMCP сервер"
+
+#: ../pyhoca/wxgui/profilemanager.py:228
+msgid "RDP server"
+msgstr "RDP сервер"
+
+#: ../pyhoca/wxgui/profilemanager.py:230
+msgid "RDP options"
+msgstr "Опции RDP"
+
+#: ../pyhoca/wxgui/profilemanager.py:232
+msgid "Integrate remote application(s) into local desktop (rootless mode)"
+msgstr "Интегрировать удаленное приложение в локальный десктоп"
+
+#: ../pyhoca/wxgui/profilemanager.py:233
+msgid "Menu of published applications"
+msgstr "Меню удаленных приложений"
+
+#. ##
+#. ## widgets for the CONNECTION tab
+#. ##
+#: ../pyhoca/wxgui/profilemanager.py:240 ../pyhoca/wxgui/profilemanager.py:253
+msgid "User"
+msgstr "Пользователь"
+
+#: ../pyhoca/wxgui/profilemanager.py:242 ../pyhoca/wxgui/profilemanager.py:260
+msgid "Host"
+msgstr "Хост"
+
+#: ../pyhoca/wxgui/profilemanager.py:244 ../pyhoca/wxgui/profilemanager.py:262
+msgid "Port"
+msgstr "Порт"
+
+#: ../pyhoca/wxgui/profilemanager.py:246
+msgid "Key"
+msgstr "Ключ"
+
+#: ../pyhoca/wxgui/profilemanager.py:249
+msgid "Discover SSH keys or use SSH agent for X2Go authentication"
+msgstr ""
+"Автоматически определять SSH ключи или использовать SSH агент для "
+"аутентификации"
+
+#: ../pyhoca/wxgui/profilemanager.py:251
+msgid "Enable forwarding of SSH authentication agent connections"
+msgstr "Разрешить ретрансляцию соединений агента SSH"
+
+#: ../pyhoca/wxgui/profilemanager.py:252
+msgid "Server behind SSH proxy"
+msgstr "Сервер за SSH прокси"
+
+#: ../pyhoca/wxgui/profilemanager.py:255
+msgid "Use same username for X2Go and proxy host"
+msgstr "Использовать то же имя пользователя, что и на сервере X2Go"
+
+#: ../pyhoca/wxgui/profilemanager.py:256
+msgid "Use same authentication for X2Go and proxy host"
+msgstr "Использовать тот же пароль, что и на сервере X2Go"
+
+#: ../pyhoca/wxgui/profilemanager.py:257
+msgid "Key file"
+msgstr "Файл ключа"
+
+#: ../pyhoca/wxgui/profilemanager.py:264
+msgid "SSH Proxy Tunnel"
+msgstr "SSH прокси туннель"
+
+#: ../pyhoca/wxgui/profilemanager.py:270
+msgid "Discover SSH keys or use SSH agent for proxy authentication"
+msgstr ""
+"Автоматически определять SSH ключи или использовать SSH агент для "
+"аутентификации на прокси сервере"
+
+#: ../pyhoca/wxgui/profilemanager.py:273
+msgid "Modem"
+msgstr "Модем"
+
+#: ../pyhoca/wxgui/profilemanager.py:274
+msgid "ISDN"
+msgstr "ISDN"
+
+#: ../pyhoca/wxgui/profilemanager.py:275
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../pyhoca/wxgui/profilemanager.py:276
+msgid "WAN"
+msgstr "WAN"
+
+#: ../pyhoca/wxgui/profilemanager.py:277
+msgid "LAN"
+msgstr "LAN"
+
+#: ../pyhoca/wxgui/profilemanager.py:279
+msgid "Method"
+msgstr "Метод"
+
+#: ../pyhoca/wxgui/profilemanager.py:281
+msgid "Image quality"
+msgstr "Качество изображения"
+
+#. ##
+#. ## wigdets for the SETTINGS tab
+#. ##
+#: ../pyhoca/wxgui/profilemanager.py:287
+msgid "Fullscreen"
+msgstr "Полноэкранный режим"
+
+#: ../pyhoca/wxgui/profilemanager.py:288
+msgid "Maximized"
+msgstr "Максимальный размер"
+
+#: ../pyhoca/wxgui/profilemanager.py:289
+msgid "Custom Size"
+msgstr "Другой размер"
+
+#: ../pyhoca/wxgui/profilemanager.py:294
+msgid "Set display DPI"
+msgstr "Установить DPI"
+
+#: ../pyhoca/wxgui/profilemanager.py:296
+msgid "Do not set (use server-side tools to configure the keyboard)"
+msgstr "Не устанавливать (конфигурация на стороне сервера)"
+
+#: ../pyhoca/wxgui/profilemanager.py:297
+msgid ""
+"Automatically detect and use client-side keyboard configuration inside the "
+"session"
+msgstr "автоматически определять и использовать установки на стороне сервера"
+
+#: ../pyhoca/wxgui/profilemanager.py:298
+msgid "Use custom keyboard settings as provided below"
+msgstr "Использовать следующие установки"
+
+#: ../pyhoca/wxgui/profilemanager.py:299
+msgid "Keyboard model"
+msgstr "Модель"
+
+#: ../pyhoca/wxgui/profilemanager.py:301
+msgid "Layout"
+msgstr "Раскладка"
+
+#: ../pyhoca/wxgui/profilemanager.py:303
+msgid "Layout variant"
+msgstr "Вариант раскладки"
+
+#: ../pyhoca/wxgui/profilemanager.py:305
+msgid "Enable sound support"
+msgstr "Активировать звук"
+
+#: ../pyhoca/wxgui/profilemanager.py:306
+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
+msgid "Arts (not supported)"
+msgstr "Arts (не поддерживается)"
+
+#: ../pyhoca/wxgui/profilemanager.py:313
+msgid "esd"
+msgstr "esd"
+
+#: ../pyhoca/wxgui/profilemanager.py:314
+msgid "Use default sound port"
+msgstr "Звуковой порт по умолчанию"
+
+#: ../pyhoca/wxgui/profilemanager.py:315
+msgid "Custom sound port"
+msgstr "Другой звуковой порт"
+
+#: ../pyhoca/wxgui/profilemanager.py:318
+msgid "Use local folder sharing"
+msgstr "Доступ к локальным каталогам"
+
+#: ../pyhoca/wxgui/profilemanager.py:319
+#, fuzzy
+msgid "Store share list at end of session"
+msgstr ""
+"Другой клиент запускает сессию X2Go\n"
+"%s"
+
+#: ../pyhoca/wxgui/profilemanager.py:320
+msgid "Path"
+msgstr "Путь"
+
+#: ../pyhoca/wxgui/profilemanager.py:323 ../pyhoca/wxgui/profilemanager.py:344
+msgid "Add"
+msgstr "Добавить"
+
+#: ../pyhoca/wxgui/profilemanager.py:325
+msgid "Local Path"
+msgstr "Локальный путь"
+
+#: ../pyhoca/wxgui/profilemanager.py:326
+msgid "Connect Method"
+msgstr "Метод подключения"
+
+#: ../pyhoca/wxgui/profilemanager.py:327
+msgid "Delete"
+msgstr "Удалить"
+
+#: ../pyhoca/wxgui/profilemanager.py:329
+msgid "Convert between client and server encodings"
+msgstr "Кодировка имен файлов"
+
+#: ../pyhoca/wxgui/profilemanager.py:330
+msgid "Client encoding"
+msgstr "На стороне клиента"
+
+#: ../pyhoca/wxgui/profilemanager.py:332
+msgid "Server encoding"
+msgstr "На стороне сервера"
+
+#: ../pyhoca/wxgui/profilemanager.py:335
+msgid "Use file MIME box for local file import"
+msgstr "Использовать MIME box для импорта локальных файлов"
+
+#: ../pyhoca/wxgui/profilemanager.py:336
+msgid "Extensions"
+msgstr "Расширения"
+
+#: ../pyhoca/wxgui/profilemanager.py:338
+msgid "Action"
+msgstr "Действие"
+
+#: ../pyhoca/wxgui/profilemanager.py:341
+msgid "Client Side printing"
+msgstr "Печать на стороне клиента"
+
+#: ../pyhoca/wxgui/profilemanager.py:345
+msgid "Defaults"
+msgstr "По умолчанию"
+
+#: ../pyhoca/wxgui/profilemanager.py:347
+msgid "Save"
+msgstr "Сохранить"
+
+#: ../pyhoca/wxgui/profilemanager.py:348
+msgid "Reset"
+msgstr "Восстановить"
+
+#: ../pyhoca/wxgui/profilemanager.py:401
+#: ../pyhoca/wxgui/profilemanager.py:1124
+#: ../pyhoca/wxgui/profilemanager.py:2268
+msgid "automatically"
+msgstr "автоматически"
+
+#: ../pyhoca/wxgui/profilemanager.py:403
+#: ../pyhoca/wxgui/profilemanager.py:1126
+msgid "manually"
+msgstr "вручную"
+
+#: ../pyhoca/wxgui/profilemanager.py:412
+msgid "PyHoca-GUI Profile Manager - new profile"
+msgstr "PyHoca-GUI Profile Manager - новый профиль"
+
+#: ../pyhoca/wxgui/profilemanager.py:414
+#, python-format
+msgid "PyHoca-GUI Profile Manager - %s (connected)"
+msgstr "PyHoca-GUI Profile Manager - %s (соединение)"
+
+#: ../pyhoca/wxgui/profilemanager.py:416
+#, python-format
+msgid "PyHoca-GUI Profile Manager - %s"
+msgstr "PyHoca-GUI Profile Manager - %s"
+
+#: ../pyhoca/wxgui/profilemanager.py:797
+msgid "Profile"
+msgstr "Профиль"
+
+#: ../pyhoca/wxgui/profilemanager.py:798
+msgid "Session"
+msgstr "Сессия"
+
+#: ../pyhoca/wxgui/profilemanager.py:799
+msgid "Connection"
+msgstr "Соединение"
+
+#: ../pyhoca/wxgui/profilemanager.py:800
+msgid "Link Quality"
+msgstr "Качество соединения"
+
+#: ../pyhoca/wxgui/profilemanager.py:801
+msgid "Settings"
+msgstr "Установки"
+
+#: ../pyhoca/wxgui/profilemanager.py:802
+msgid "Sharing"
+msgstr "Доступ"
+
+#: ../pyhoca/wxgui/profilemanager.py:988
+msgid "<xkbtype>"
+msgstr "<xkbtype>"
+
+#: ../pyhoca/wxgui/profilemanager.py:989
+msgid "<xkblayout>"
+msgstr "<xkblayout>"
+
+#: ../pyhoca/wxgui/profilemanager.py:990
+msgid "<xkbvariant>"
+msgstr "<xkbvariant>"
+
+#: ../pyhoca/wxgui/profilemanager.py:1444
+msgid "Icon Files (*.png)|*.png|All files (*.*)|*"
+msgstr "Графические файлы (*.png)|*.png|Все файлы (*.*)|*"
+
+#: ../pyhoca/wxgui/profilemanager.py:1447
+msgid "Choose an icon for this session profile"
+msgstr "Выбрать пиктограмму"
+
+#: ../pyhoca/wxgui/profilemanager.py:1816
+msgid "All files (*.*)|*"
+msgstr "Все файлы (*.*)|*"
+
+#: ../pyhoca/wxgui/profilemanager.py:1818
+#: ../pyhoca/wxgui/profilemanager.py:1842
+msgid "Choose a public SSH key"
+msgstr "Выбрать публичный ключ SSH"
+
+#: ../pyhoca/wxgui/profilemanager.py:2220
+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
+msgid "Profile Manager"
+msgstr "Profile Manager"
+
+#: ../pyhoca/wxgui/profilemanager.py:2348
+msgid "Profile name is missing, profile unusable!!!"
+msgstr "Имя профиля не установлено!!!"
+
+#: ../pyhoca/wxgui/profilemanager.py:2351
+#: ../pyhoca/wxgui/profilemanager.py:2354
+#, 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
+#, python-format
+msgid "%s - profile added"
+msgstr "%s - профиль добавлен"
+
+#: ../pyhoca/wxgui/profilemanager.py:2397
+msgid "A new session profile has been added."
+msgstr "Новый профиль сессии добавлен."
+
+#: ../pyhoca/wxgui/profilemanager.py:2401
+#, python-format
+msgid "%s - modified"
+msgstr "%s - модифицирован"
+
+#: ../pyhoca/wxgui/profilemanager.py:2402
+msgid "Changes to profile have been saved."
+msgstr "Изменения в профиле сохранены."
+
+#: ../pyhoca/wxgui/menus_taskbar.py:74
+msgid "Edit Profile"
+msgstr "Редактировать профиль"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:77
+msgid "Use as Template for New Profile"
+msgstr "Использовать в качестве шаблона для нового профиля"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:78
+msgid "Delete Profile"
+msgstr "Удалить профиль"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:106
+#, python-format
+msgid "About %s (%s)..."
+msgstr "О %s (%s)..."
+
+#: ../pyhoca/wxgui/menus_taskbar.py:132
+msgid "Manage Session Profile"
+msgstr "Управление профилем сессии"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:141
+msgid "Printing Preferences"
+msgstr "Установки печати"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:147
+msgid "Client Options"
+msgstr "Опции клиента"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:783
+#: ../pyhoca/wxgui/menus_taskbar.py:975
+msgid "E&xit"
+msgstr "Вы&ход"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:227
+msgid "Window title"
+msgstr "Заголовок окна"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:233 ../pyhoca/wxgui/menus_taskbar.py:608
+msgid "Resume Session"
+msgstr "Восстановить сессию"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:235
+msgid "Resume Session (not possible)"
+msgstr "Восстановить сессию (невозможно)"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:246
+msgid "Transfer Session"
+msgstr "Трансфер сессии"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:248
+msgid "Transfer Session (not possible)"
+msgstr "Трансфер сессии (невозможен)"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:252 ../pyhoca/wxgui/menus_taskbar.py:599
+msgid "Suspend Session (and disconnect/exit)"
+msgstr "Прервать сессию (и разъединить/выйти)"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:254 ../pyhoca/wxgui/menus_taskbar.py:601
+msgid "Suspend Session (and disconnect)"
+msgstr "Прервать сессию (и разъединить)"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:256 ../pyhoca/wxgui/menus_taskbar.py:603
+msgid "Suspend Session"
+msgstr "Прервать сессию"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:262 ../pyhoca/wxgui/menus_taskbar.py:612
+msgid "Terminate Session (and disconnect/exit)"
+msgstr "Завершить сессию (и разъединить/выйти)"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:264 ../pyhoca/wxgui/menus_taskbar.py:614
+msgid "Terminate Session (and disconnect)"
+msgstr "Завершить сессию (и разъединить)"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:266 ../pyhoca/wxgui/menus_taskbar.py:616
+msgid "Terminate Session"
+msgstr "Завершить сессию"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:270 ../pyhoca/wxgui/menus_taskbar.py:596
+msgid "Refresh menu tree"
+msgstr "Обновить меню"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:279
+msgid "Rename Session Window"
+msgstr "Переименовать окно сессии"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:280
+msgid "Show Session Window"
+msgstr "Показать окно сессии"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:322
+msgid "&Share custom local folder"
+msgstr "Э&кспорт произвольного каталога"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:337
+msgid "Share:"
+msgstr "Экспорт:"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:346
+msgid "Unshare:"
+msgstr "Разъединить:"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:354
+msgid "Unshare &all local folders"
+msgstr "Разъединить &все каталоги"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:360
+msgid "Restore shares in next session"
+msgstr ""
+
+#: ../pyhoca/wxgui/menus_taskbar.py:440
+msgid "Multimedia"
+msgstr "Мультимедиа"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:441
+msgid "Development"
+msgstr "Разработка"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:442
+msgid "Education"
+msgstr "Образование"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:443
+msgid "Games"
+msgstr "Игры"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:444
+msgid "Graphics"
+msgstr "Графика"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:445
+msgid "Internet"
+msgstr "Интернет"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:446
+msgid "Office Applications"
+msgstr "Офисные приложения"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:447
+msgid "System"
+msgstr "Системные"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:448
+msgid "Utilities"
+msgstr "Утилиты"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:449
+msgid "Other Applications"
+msgstr "Другие программы"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:521 ../pyhoca/wxgui/menus_taskbar.py:533
+#, python-format
+msgid "Connect %s"
+msgstr "Соединение %s"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:527
+msgid "Currently connecting..."
+msgstr "Соединение ..."
+
+#: ../pyhoca/wxgui/menus_taskbar.py:541
+msgid "Start &new Desktop Session"
+msgstr "Запустить &новую сессию"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:546 ../pyhoca/wxgui/menus_taskbar.py:684
+msgid "Retrieving Application Menu..."
+msgstr "Получаем меню приложений..."
+
+#: ../pyhoca/wxgui/menus_taskbar.py:550 ../pyhoca/wxgui/menus_taskbar.py:687
+msgid "Retrieve Application Menu"
+msgstr "Получить меню приложений"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:553
+msgid "Start &new Session"
+msgstr "Запустить &новую сессию"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:633
+msgid "Launch Single Application"
+msgstr "Запустить приложение"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:671
+msgid "Manage Application Menu"
+msgstr "Управление меню приложений"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:714
+msgid "Running"
+msgstr "Выполняется"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:716
+msgid "Suspended"
+msgstr "Приостановлено"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:735
+msgid "&Clean all sessions"
+msgstr "&Очистить все сессии"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:741
+msgid "Customize &profile"
+msgstr "Изменить &профиль"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:756
+msgid "Shared &folders"
+msgstr "Экспорт &каталогов"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:768
+msgid "&Disconnect from Server"
+msgstr "&Отсоединить от сервера"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:775
+msgid "Suspend Session and E&xit application"
+msgstr "&Прервать сессию и покинуть программу"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:779
+msgid "Disconnect and E&xit application"
+msgstr "&Разъединить и покинуть программу"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:833
+msgid "Add Profile"
+msgstr "Добавить профиль"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:909
+msgid "No session profiles defined"
+msgstr "Профили не определены"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:945
+msgid "Start/Resume Session"
+msgstr "Запуск/восстановление сессии"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:945
+msgid "Connect Server"
+msgstr "Соединить с сервером"
+
+#: ../pyhoca/wxgui/about.py:78 ../pyhoca/wxgui/about.py:80
+#, python-format
+msgid "About %s ..."
+msgstr "О %s ..."
+
+#: ../pyhoca/wxgui/frontend.py:459
+msgid "Suspending sessions and exiting application..."
+msgstr "Прерываем сессию и покидаем программу..."
+
+#: ../pyhoca/wxgui/frontend.py:462
+#, python-format
+msgid "Disconnecting %s and exiting application..."
+msgstr "Разъединяем %s и покидаем программу..."
+
+#: ../pyhoca/wxgui/frontend.py:464
+msgid "Exiting application..."
+msgstr "Покидаем программу..."
+
+#: ../pyhoca/wxgui/frontend.py:562
+#, python-format
+msgid "%s - server warning"
+msgstr "%s - предупреждение сервера"
+
+#: ../pyhoca/wxgui/frontend.py:562
+msgid "The X2Go Server does not publish an application menu."
+msgstr "Сервер X2Go не публикует меню приложений."
+
+#: ../pyhoca/wxgui/frontend.py:613
+#, fuzzy
+msgid "SSH key authentication has been successful."
+msgstr "Авторизация по публичному ключу завершена."
+
+#: ../pyhoca/wxgui/frontend.py:650
+msgid ""
+"The SSH proxy's host key is invalid or has not been accepted by the user"
+msgstr "SSH прокси ключ недействителен и не был принят пользователем"
+
+#: ../pyhoca/wxgui/frontend.py:671
+#, python-format
+msgid "%s - EOF error"
+msgstr "%s - EOF ошибка"
+
+#: ../pyhoca/wxgui/frontend.py:671
+msgid "Authentication protocol communication incomplete! Try again..."
+msgstr "Ошибка авторизации! Попробуйте еще раз..."
+
+#: ../pyhoca/wxgui/frontend.py:678
+#, python-format
+msgid "%s - auth key error"
+msgstr "%s - ошибка ключа"
+
+#: ../pyhoca/wxgui/frontend.py:699
+msgid "An unknown error occurred during authentication!"
+msgstr "Неизвестная ошибка при авторизации!"
+
+#: ../pyhoca/wxgui/frontend.py:728
+#, python-format
+msgid "%s: DirectRDP not supported yet"
+msgstr "%s: DirectRDP пока не поддерживается"
+
+#: ../pyhoca/wxgui/frontend.py:729
+#, python-format
+msgid ""
+"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)."
+msgstr ""
+"Приносим наши извинения за неудобства...\n"
+"\n"
+"Профиль сессии типа ,,DirectRDP'' пока что\n"
+"не поддерживается %s (%s)!!\n"
+"\n"
+"Поддержка DirectRDP будет доступна в %s (>= 0.2.2.0)."
+
+#: ../pyhoca/wxgui/frontend.py:741
+msgid "Unknown session profile, configure before using it..."
+msgstr "Неизвестный профиль сессии..."
+
+#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:1332
+#, python-format
+msgid "%s - session warning"
+msgstr "%s - предупреждение"
+
+#: ../pyhoca/wxgui/frontend.py:798
+#, python-format
+msgid "Execution of command ,,%s'' failed."
+msgstr "Невозможно выполнить команду ,,%s''."
+
+#: ../pyhoca/wxgui/frontend.py:939
+msgid "Cleaning X2Go sessions..."
+msgstr "Очищаем сессии X2Go..."
+
+#: ../pyhoca/wxgui/frontend.py:974
+#, python-format
+msgid "%s - disconnect"
+msgstr "%s - разъединение"
+
+#: ../pyhoca/wxgui/frontend.py:974
+msgid "X2Go Profile is now disconnected."
+msgstr "X2Go Профиль отсоединен."
+
+#: ../pyhoca/wxgui/frontend.py:995
+msgid "New Session Profile"
+msgstr "Новый профиль"
+
+#: ../pyhoca/wxgui/frontend.py:1047
+#, python-format
+msgid "Really Delete Session Profile ,,%s''?"
+msgstr "Удалить профиль ,,%s''?"
+
+#: ../pyhoca/wxgui/frontend.py:1053
+#, python-format
+msgid "%s - profile deleted"
+msgstr "%s - профиль удален"
+
+#: ../pyhoca/wxgui/frontend.py:1053
+msgid "The session profile has been deleted."
+msgstr "Профиль был удален."
+
+#: ../pyhoca/wxgui/frontend.py:1071
+#, python-format
+msgid "%s - share local folder with sessions of this profile"
+msgstr "%s - экспортируемый каталог"
+
+#: ../pyhoca/wxgui/frontend.py:1224
+#, python-format
+msgid ""
+"The authenticity of host [%s]:%s can't be established.\n"
+"%s key fingerprint is ,,%s''.\n"
+"\n"
+"Are you sure you want to continue connecting?"
+msgstr ""
+"Авторизация хоста [%s]:%s не может быть установлена.\n"
+"%s ключ ,,%s''.\n"
+"\n"
+"Продолжить соединение?"
+
+#: ../pyhoca/wxgui/frontend.py:1232
+#, python-format
+msgid "%s: Confirm Host Authorization"
+msgstr "%s: Подтвердите авторизацию хоста"
+
+#: ../pyhoca/wxgui/frontend.py:1277
+#, python-format
+msgid "%s - channel error"
+msgstr "%s - ошибка канала"
+
+#: ../pyhoca/wxgui/frontend.py:1277
+#, 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
+#, python-format
+msgid "%s - session failure"
+msgstr "%s - ошибка сессии"
+
+#: ../pyhoca/wxgui/frontend.py:1295
+msgid "The session startup failed."
+msgstr "Запуск сессии не удался."
+
+#: ../pyhoca/wxgui/frontend.py:1313
+#, python-format
+msgid "The command ,,%s'' is not available on X2Go server."
+msgstr "Команда ,,%s'' недоступна на сервере X2Go."
+
+#: ../pyhoca/wxgui/frontend.py:1315
+#, python-format
+msgid ""
+"The command ,,%s'' is not available on X2Go server\n"
+"%s."
+msgstr ""
+"Команда ,,%s'' недоступна на сервере X2Go\n"
+"%s."
+
+#: ../pyhoca/wxgui/frontend.py:1332
+#, python-format
+msgid ""
+"Reverse TCP port forwarding request for session %s to server port %s has "
+"been denied."
+msgstr ""
+"Запрос ретрансляции порта TCP для сессии %s к порту сервера %S был отклонен."
+
+#: ../pyhoca/wxgui/frontend.py:1351
+#, python-format
+msgid ""
+"Forwarding tunnel request to [%s]:%s for session %s was denied by remote "
+"X2go/SSH server. Session startup failed."
+msgstr ""
+"Запрос туннеля к серверу [%s]:%s для сессии %s был отклонен удаленным "
+"сервером X2go/SSH. Запуск сессии не удался."
+
+#: ../pyhoca/wxgui/frontend.py:1370
+#, python-format
+msgid "%s - audio warning"
+msgstr "%s - предупреждение audio"
+
+#: ../pyhoca/wxgui/frontend.py:1370
+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
+#, python-format
+msgid "%s - audio error"
+msgstr "%s - ошибка audio"
+
+#: ../pyhoca/wxgui/frontend.py:1377
+msgid "The X2Go PulseAudio system could not be started."
+msgstr "Система X2Go PulseAudio не может быть запущена."
+
+#: ../pyhoca/wxgui/frontend.py:1384
+msgid "The X2Go PulseAudio system has died unexpectedly."
+msgstr "Сбой системы X2Go PulseAudio."
+
+#: ../pyhoca/wxgui/frontend.py:1396
+#, python-format
+msgid "%s - audio problem"
+msgstr "%s - ошибка audio"
+
+#: ../pyhoca/wxgui/frontend.py:1396
+#, python-format
+msgid ""
+"The audio connection could not be set up for this session.\n"
+"%s"
+msgstr ""
+"Звуковое соединение не может быть установлено для этой сессии.\n"
+"%s"
+
+# %s - печать недоступна
+#: ../pyhoca/wxgui/frontend.py:1408
+#, python-format
+msgid "%s - client-side printing not available"
+msgstr "%s - печать недоступна"
+
+#: ../pyhoca/wxgui/frontend.py:1408
+#, python-format
+msgid ""
+"The server denies client-side printing from within this session.\n"
+"%s"
+msgstr ""
+"Сервер отклонил печать внутри этой сессии.\n"
+"%s"
+
+#: ../pyhoca/wxgui/frontend.py:1420
+#, python-format
+msgid "%s - MIME box not available"
+msgstr "%s - MIME box недоступен"
+
+#: ../pyhoca/wxgui/frontend.py:1420
+#, python-format
+msgid ""
+"The server does not support the X2Go MIME box.\n"
+"%s"
+msgstr ""
+"Сервер не поддерживает X2Go MIME box.\n"
+"%s"
+
+#: ../pyhoca/wxgui/frontend.py:1432
+#, python-format
+msgid "%s - client-side folders not sharable"
+msgstr "%s - клиентские каталоги не экспотируемы"
+
+#: ../pyhoca/wxgui/frontend.py:1432
+#, python-format
+msgid ""
+"The server denies client-side folder sharing with this session.\n"
+"%s"
+msgstr ""
+"Сервер отклонил экспорт каталогов внутри этой сессии.\n"
+"%s"
+
+#: ../pyhoca/wxgui/frontend.py:1444
+#, python-format
+msgid "%s - client resources not sharable"
+msgstr "%s - клиентские ресурсы не экспортируемы"
+
+#: ../pyhoca/wxgui/frontend.py:1444
+#, python-format
+msgid ""
+"Client-side folders and printers cannot be shared with this session.\n"
+"%s"
+msgstr ""
+"Каталоги и принтеры на стороне клиента не могут быть экспортированы внутри "
+"этой сессии.\n"
+"%s"
+
+#: ../pyhoca/wxgui/frontend.py:1463 ../pyhoca/wxgui/frontend.py:1465
+#, python-format
+msgid "%s - print error"
+msgstr "%s - ошибка печати"
+
+#: ../pyhoca/wxgui/frontend.py:1463
+#, python-format
+msgid ""
+"%s\n"
+"...caused on printer %s by session\n"
+"%s"
+msgstr ""
+"%s\n"
+"...на принтере %s в сессии\n"
+"%s"
+
+#: ../pyhoca/wxgui/frontend.py:1465
+#, python-format
+msgid ""
+"%s\n"
+"...caused by session\n"
+"%s"
+msgstr ""
+"%s\n"
+"...в сессии\n"
+"%s"
+
+#: ../pyhoca/wxgui/frontend.py:1480 ../pyhoca/wxgui/frontend.py:1495
+#, python-format
+msgid "%s - start"
+msgstr "%s - пуск"
+
+#: ../pyhoca/wxgui/frontend.py:1480
+#, python-format
+msgid ""
+"New X2Go session starting up...\n"
+"%s"
+msgstr ""
+"Новая сессия X2Go запускается...\n"
+"%s"
+
+#: ../pyhoca/wxgui/frontend.py:1495
+#, python-format
+msgid ""
+"Another client started X2Go session\n"
+"%s"
+msgstr ""
+"Другой клиент запускает сессию X2Go\n"
+"%s"
+
+#: ../pyhoca/wxgui/frontend.py:1510 ../pyhoca/wxgui/frontend.py:1525
+#, python-format
+msgid "%s - resume"
+msgstr "%s - восстановить"
+
+#: ../pyhoca/wxgui/frontend.py:1510
+#, python-format
+msgid ""
+"Resuming X2Go session...\n"
+"%s"
+msgstr ""
+"Восстанавливаем X2Go сессию...\n"
+"%s"
+
+#: ../pyhoca/wxgui/frontend.py:1525
+#, python-format
+msgid ""
+"Another client resumed X2Go session\n"
+"%s"
+msgstr ""
+"Другой клиент восстанавливает сессию X2Go\n"
+"%s"
+
+#: ../pyhoca/wxgui/frontend.py:1540
+#, python-format
+msgid "%s - running"
+msgstr "%s - выполняется"
+
+#: ../pyhoca/wxgui/frontend.py:1540
+#, python-format
+msgid ""
+"Found already running session\n"
+"%s"
+msgstr ""
+"Найдена уже запущенная сессия\n"
+"%s"
+
+#: ../pyhoca/wxgui/frontend.py:1560
+#, python-format
+msgid "%s - suspend"
+msgstr "%s - прервать"
+
+#: ../pyhoca/wxgui/frontend.py:1560
+#, python-format
+msgid ""
+"X2Go Session has been suspended\n"
+"%s"
+msgstr ""
+"X2Go сессия прервана\n"
+"%s"
+
+#: ../pyhoca/wxgui/frontend.py:1587
+#, python-format
+msgid "%s - terminate"
+msgstr "%s - завершить"
+
+#: ../pyhoca/wxgui/frontend.py:1587
+#, python-format
+msgid ""
+"X2Go Session has terminated\n"
+"%s"
+msgstr ""
+"X2Go сессия завершена\n"
+"%s"
+
+#: ../pyhoca/wxgui/messages.py:73
+#, python-format
+msgid ""
+"Are you really sure you want to\n"
+"delete the session profile ,,%s''?"
+msgstr "Удалить профиль ,,%s''?"
+
+#: ../pyhoca/wxgui/messages.py:74
+#, python-format
+msgid ""
+"PyHoca-GUI is already running for user ,,%s''!\n"
+"\n"
+"Only one instance of PyHoca-GUI can be started per\n"
+"user. The PyHoca-GUI icon can be found in your desktops's\n"
+"notification area/systray."
+msgstr ""
+"PyHoca-GUI уже выполняется пользователем ,,%s''!\n"
+"\n"
+"Лишь одна версия PyHoca-GUI может быть запущена\n"
+" пользователем."
+
+#: ../pyhoca/wxgui/messages.py:107
+msgid "Yes"
+msgstr "Да"
+
+#: ../pyhoca/wxgui/messages.py:108
+msgid "No"
+msgstr "Нет"
+
+#: ../pyhoca/wxgui/messages.py:125 ../pyhoca/wxgui/printingprefs.py:142
+msgid "Ok"
+msgstr "ОК"
+
+#: ../pyhoca/wxgui/printingprefs.py:66
+#, python-format
+msgid "%s - Printing Preferences"
+msgstr "%s - Установки печати"
+
+#: ../pyhoca/wxgui/printingprefs.py:68
+#, python-format
+msgid "%s - Incoming Print Job from  %s (%s)"
+msgstr "%s - Поступило задание печати от  %s (%s)"
+
+#: ../pyhoca/wxgui/printingprefs.py:73
+msgid "Open this dialog window"
+msgstr "Открывать этот диалог"
+
+#: ../pyhoca/wxgui/printingprefs.py:74
+msgid "Open with PDF viewer"
+msgstr "Открыть с программой просмотра PDF"
+
+#: ../pyhoca/wxgui/printingprefs.py:75
+msgid "Save to a local folder"
+msgstr "Сохранить"
+
+#: ../pyhoca/wxgui/printingprefs.py:76
+msgid "Print to a local printer"
+msgstr "Печатать"
+
+#: ../pyhoca/wxgui/printingprefs.py:77
+msgid "Run custom print command"
+msgstr "Команда печати"
+
+#: ../pyhoca/wxgui/printingprefs.py:80
+msgid "<Select a print action here>"
+msgstr "<Выбор действия печати>"
+
+#: ../pyhoca/wxgui/printingprefs.py:114
+msgid "Print action"
+msgstr "Действие печати"
+
+#: ../pyhoca/wxgui/printingprefs.py:116
+msgid "Default action for incoming print jobs"
+msgstr "Действие по умолчанию для поступающих заданий печати"
+
+#. widgets for print action PDFVIEW
+#: ../pyhoca/wxgui/printingprefs.py:120
+msgid "PDF viewer command"
+msgstr "Программа просмотра PDF"
+
+#. widgets for print action PDFSAVE
+#: ../pyhoca/wxgui/printingprefs.py:127
+msgid "Save PDFs to folder"
+msgstr "Сохранять PDF"
+
+#. widgets for print action PRINT
+#: ../pyhoca/wxgui/printingprefs.py:134
+msgid "Use this printer"
+msgstr "Использовать этот принтер"
+
+#. widgets for print action PRINTCMD
+#: ../pyhoca/wxgui/printingprefs.py:138
+msgid "Custom print command"
+msgstr "Команда печати"
+
+#: ../pyhoca/wxgui/printingprefs.py:143
+msgid "Apply"
+msgstr "Применить"
+
+#: ../pyhoca/wxgui/printingprefs.py:145
+msgid "Print"
+msgstr "Печать"
+
+#: ../pyhoca/wxgui/printingprefs.py:249
+msgid "- no printers installed -"
+msgstr "- принтеры не установлены -"
+
+#: ../pyhoca/wxgui/printingprefs.py:254
+msgid "- print system is not available -"
+msgstr "- система печати недоступна -"
+
+#: ../pyhoca/wxgui/printingprefs.py:407
+msgid "Choose PDF viewer application"
+msgstr "Выберите программу просмотра PDF"
+
+#: ../pyhoca/wxgui/printingprefs.py:430
+msgid "Choose PDF saving location"
+msgstr "Выберите путь сохранения PDF"
+
+#: ../pyhoca/wxgui/sessiontitle.py:79
+#, python-format
+msgid "Session Title - %s"
+msgstr "Заголовок сессии - %s"
+
+#: ../pyhoca/wxgui/sessiontitle.py:81
+msgid "Change session title to"
+msgstr "Изменить заголовок сессии на"
+
+#: ../pyhoca/wxgui/sessiontitle.py:83
+msgid "OK"
+msgstr "ОК"
+
+#~ msgid "RSA/DSA private key"
+#~ msgstr "личный ключ RSA/DSA"
+
+#~ msgid "Host[:Port]"
+#~ msgstr "Хост[:порт]"
diff --git a/po/sv.po b/po/sv.po
index 7abe572..c956385 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PyHoca-GUI VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-10 21:18+0200\n"
-"PO-Revision-Date: 2012-06-01 17:59+0100\n"
-"Last-Translator: Daniel Lindgren <dali.spam at gmail.com>\n"
-"Language-Team: Swedish <x2go-i18n at lists.berlios.de>\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"
+"Language-Team: X2Go i18n <x2go-i18n at lists.berlios.de>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,127 +21,127 @@ msgstr ""
 "X-Poedit-Country: Swedish\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../pyhoca/wxgui/logon.py:92
+#: ../pyhoca/wxgui/logon.py:86
 #, python-format
 msgid "%s (via %s)"
 msgstr "%s (via %s)"
 
-#: ../pyhoca/wxgui/logon.py:96 ../pyhoca/wxgui/logon.py:108
+#: ../pyhoca/wxgui/logon.py:90 ../pyhoca/wxgui/logon.py:102
 msgid "Username"
 msgstr "Användarnamn"
 
-#: ../pyhoca/wxgui/logon.py:98 ../pyhoca/wxgui/logon.py:110
+#: ../pyhoca/wxgui/logon.py:92 ../pyhoca/wxgui/logon.py:104
 msgid "Password"
 msgstr "Lösenord"
 
-#: ../pyhoca/wxgui/logon.py:101
+#: ../pyhoca/wxgui/logon.py:95
 msgid "Authenticate"
 msgstr "Autentisera"
 
-#: ../pyhoca/wxgui/logon.py:113
+#: ../pyhoca/wxgui/logon.py:107
 msgid "  Start SSH tunnel  "
 msgstr "  Starta SSH-tunnel  "
 
-#: ../pyhoca/wxgui/logon.py:121
+#: ../pyhoca/wxgui/logon.py:115
 msgid "Session login"
 msgstr "Sessionsinloggning"
 
-#: ../pyhoca/wxgui/logon.py:122
+#: ../pyhoca/wxgui/logon.py:116
 msgid "SSH proxy server login"
 msgstr "SSH proxyserverinloggning"
 
-#: ../pyhoca/wxgui/logon.py:133 ../pyhoca/wxgui/profilemanager.py:322
-#: ../pyhoca/wxgui/messages.py:132 ../pyhoca/wxgui/printingprefs.py:147
+#: ../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
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../pyhoca/wxgui/logon.py:292 ../pyhoca/wxgui/logon.py:334
-#: ../pyhoca/wxgui/frontend.py:603
+#: ../pyhoca/wxgui/logon.py:297 ../pyhoca/wxgui/logon.py:339
+#: ../pyhoca/wxgui/frontend.py:606
 #, python-format
 msgid "%s - connect failure"
 msgstr "%s - anslutning misslyckades"
 
-#: ../pyhoca/wxgui/logon.py:293 ../pyhoca/wxgui/frontend.py:603
+#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:606
 msgid "User is not allowed to start X2Go sessions!"
 msgstr "Användaren har inte rätt att starta X2Go-sessioner!"
 
-#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:610
+#: ../pyhoca/wxgui/logon.py:303 ../pyhoca/wxgui/frontend.py:613
 #, python-format
 msgid "%s - connect"
 msgstr "%s - anslut"
 
-#: ../pyhoca/wxgui/logon.py:299
+#: ../pyhoca/wxgui/logon.py:304
 msgid "Authentication has been successful."
 msgstr "Autentisering lyckades."
 
-#: ../pyhoca/wxgui/logon.py:330
+#: ../pyhoca/wxgui/logon.py:335
 msgid "SSH tunnel started"
 msgstr "SSH-tunnel startad"
 
-#: ../pyhoca/wxgui/logon.py:335
+#: ../pyhoca/wxgui/logon.py:340
 msgid "Authentication failed!"
 msgstr "Autentisering misslyckades!"
 
-#: ../pyhoca/wxgui/logon.py:342
+#: ../pyhoca/wxgui/logon.py:348
 #, python-format
 msgid "%s - SSH proxy"
 msgstr "%s - SSH-proxy"
 
-#: ../pyhoca/wxgui/logon.py:343
+#: ../pyhoca/wxgui/logon.py:349
 msgid "Authentication to the SSH proxy server failed!"
 msgstr "Autentisering till SSH-proxy misslyckades!"
 
-#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:658
+#: ../pyhoca/wxgui/logon.py:376 ../pyhoca/wxgui/frontend.py:664
 #, python-format
 msgid "%s - socket error"
 msgstr "%s - socketfel"
 
-#: ../pyhoca/wxgui/logon.py:372 ../pyhoca/wxgui/frontend.py:637
-#: ../pyhoca/wxgui/frontend.py:644
+#: ../pyhoca/wxgui/logon.py:383 ../pyhoca/wxgui/frontend.py:643
+#: ../pyhoca/wxgui/frontend.py:650
 #, python-format
 msgid "%s - host key error"
 msgstr "%s - fel på serverns nyckel"
 
-#: ../pyhoca/wxgui/logon.py:373 ../pyhoca/wxgui/frontend.py:637
+#: ../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 "Serverns nyckel är felaktig eller har inte accepterats av användaren"
 
-#: ../pyhoca/wxgui/logon.py:380 ../pyhoca/wxgui/frontend.py:679
+#: ../pyhoca/wxgui/logon.py:391 ../pyhoca/wxgui/frontend.py:685
 #, python-format
 msgid "%s - missing home directory"
 msgstr "%s - hemkatalog saknas"
 
-#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:679
+#: ../pyhoca/wxgui/logon.py:392 ../pyhoca/wxgui/frontend.py:685
 msgid "The remote user's home directory does not exist."
 msgstr "Fjärranvändarens hemkatalog saknas."
 
-#: ../pyhoca/wxgui/logon.py:388
+#: ../pyhoca/wxgui/logon.py:399
 #, python-format
 msgid "%s - key error"
 msgstr "%s - nyckelfel"
 
-#: ../pyhoca/wxgui/logon.py:396 ../pyhoca/wxgui/frontend.py:686
+#: ../pyhoca/wxgui/logon.py:407 ../pyhoca/wxgui/frontend.py:692
 #, python-format
 msgid "%s - auth error"
 msgstr "%s - autentiseringsfel"
 
-#: ../pyhoca/wxgui/logon.py:404 ../pyhoca/wxgui/frontend.py:630
+#: ../pyhoca/wxgui/logon.py:415 ../pyhoca/wxgui/frontend.py:636
 #, python-format
 msgid "%s - SSH error"
 msgstr "%s - SSH-fel"
 
-#: ../pyhoca/wxgui/logon.py:412
+#: ../pyhoca/wxgui/logon.py:423
 #, python-format
 msgid "%s - unknown error"
 msgstr "%s - okänt fel"
 
-#: ../pyhoca/wxgui/logon.py:413
+#: ../pyhoca/wxgui/logon.py:424
 msgid "An unknown error occured during authentication!"
 msgstr "Ett okänt fel inträffade vid autentisering!"
 
-#: ../pyhoca/wxgui/taskbar.py:92
+#: ../pyhoca/wxgui/taskbar.py:89
 #, python-format
 msgid ""
 "PyHoca-GUI\n"
@@ -150,7 +150,7 @@ msgstr ""
 "PyHoca-GUI\n"
 "Ansluter till \"%s\""
 
-#: ../pyhoca/wxgui/taskbar.py:96
+#: ../pyhoca/wxgui/taskbar.py:93
 #, python-format
 msgid ""
 "PyHoca-GUI (Python X2goClient)\n"
@@ -159,7 +159,7 @@ msgstr ""
 "PyHoca-GUI (Python X2Go-klient)\n"
 "Anslutning till \"%s\" pågår"
 
-#: ../pyhoca/wxgui/taskbar.py:106
+#: ../pyhoca/wxgui/taskbar.py:103
 msgid ""
 "PyHoca-GUI\n"
 "Connecting you to X2Go..."
@@ -167,7 +167,7 @@ msgstr ""
 "PyHoca-GUI\n"
 "Ansluter dig till X2Go..."
 
-#: ../pyhoca/wxgui/taskbar.py:110
+#: ../pyhoca/wxgui/taskbar.py:107
 msgid ""
 "PyHoca-GUI (Python X2goClient)\n"
 "Client for connecting you to a remote X2Go server"
@@ -175,279 +175,306 @@ msgstr ""
 "PyHoca-GUI (Python X2Go-klient)\n"
 "Klient för att ansluta dig till en X2Go-server"
 
-#: ../pyhoca/wxgui/profilemanager.py:82
+#: ../pyhoca/wxgui/profilemanager.py:79
 msgid "GNOME Desktop (GNOME)"
 msgstr "GNOME Desktop (GNOME)"
 
-#: ../pyhoca/wxgui/profilemanager.py:83
+#: ../pyhoca/wxgui/profilemanager.py:80
 msgid "K Desktop Environment (KDE)"
 msgstr "K Desktop Environment (KDE)"
 
-#: ../pyhoca/wxgui/profilemanager.py:84
+#: ../pyhoca/wxgui/profilemanager.py:81
 msgid "Lightweight X Desktop (LXDE)"
 msgstr "Lightweight X Desktop (LXDE)"
 
-#: ../pyhoca/wxgui/profilemanager.py:85
+#: ../pyhoca/wxgui/profilemanager.py:82
 msgid "Trinity X Desktop (KDE3-like)"
 msgstr "Trinity X Desktop (KDE3-liknande)"
 
-#: ../pyhoca/wxgui/profilemanager.py:86
+#: ../pyhoca/wxgui/profilemanager.py:83
 msgid "Unity X Desktop Shell (UNITY)"
 msgstr "Unity X Desktop Shell (UNITY)"
 
-#: ../pyhoca/wxgui/profilemanager.py:87
-msgid "XFCE4 Desktop (XFCE4)"
-msgstr "XFCE4 Desktop (XFCE4)"
+#: ../pyhoca/wxgui/profilemanager.py:84
+msgid "XFCE Desktop (XFCE)"
+msgstr "XFCE Desktop (XFCE)"
 
-#: ../pyhoca/wxgui/profilemanager.py:88
+#: ../pyhoca/wxgui/profilemanager.py:85
 msgid "Published Applications"
 msgstr "Publicerade applikationer"
 
-#: ../pyhoca/wxgui/profilemanager.py:89
+#: ../pyhoca/wxgui/profilemanager.py:86
 msgid "Single Application"
 msgstr "Applikation"
 
-#: ../pyhoca/wxgui/profilemanager.py:90
+#: ../pyhoca/wxgui/profilemanager.py:87
 msgid "XDMCP Query"
 msgstr "XDMCP"
 
-#: ../pyhoca/wxgui/profilemanager.py:91
-msgid "Windows Terminal Server (RDP-proxy)"
+#: ../pyhoca/wxgui/profilemanager.py:88
+msgid "Windows Terminal Server (X2Go-proxied RDP)"
+msgstr "Windows Terminal Server (RDP-proxy)"
+
+#: ../pyhoca/wxgui/profilemanager.py:89
+msgid "Windows Terminal Server (Direct RDP)"
 msgstr "Windows Terminal Server (RDP-proxy)"
 
-#. 'DirectRDP': 'Windows Terminal Server (RDP-direct)',
-#: ../pyhoca/wxgui/profilemanager.py:93 ../pyhoca/wxgui/profilemanager.py:207
+#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/profilemanager.py:224
 msgid "Custom command"
 msgstr "Anpassat kommando"
 
-#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:398
+#: ../pyhoca/wxgui/profilemanager.py:95 ../pyhoca/wxgui/menus_taskbar.py:393
 msgid "Internet Browser"
 msgstr "Webbbläsare"
 
-#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:399
+#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:394
 msgid "Email Client"
 msgstr "E-postklient"
 
-#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:400
+#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:395
 msgid "Office"
 msgstr "Office"
 
-#: ../pyhoca/wxgui/profilemanager.py:99 ../pyhoca/wxgui/menus_taskbar.py:401
+#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:396
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../pyhoca/wxgui/profilemanager.py:113
+#: ../pyhoca/wxgui/profilemanager.py:116
 msgid "Open file with system's default application"
 msgstr "Öppna med systemets standardapplikation"
 
-#: ../pyhoca/wxgui/profilemanager.py:114
+#: ../pyhoca/wxgui/profilemanager.py:117
 msgid "Open application chooser dialog"
 msgstr "Öppna applikationsväljare"
 
-#: ../pyhoca/wxgui/profilemanager.py:115
+#: ../pyhoca/wxgui/profilemanager.py:118
 msgid "Save incoming file as ..."
 msgstr "Spara inkommande fil som ..."
 
-#: ../pyhoca/wxgui/profilemanager.py:143
+#: ../pyhoca/wxgui/profilemanager.py:146
 msgid "settings derived from "
 msgstr "inställningar hämtade från"
 
 #. boxes for all tabs
-#: ../pyhoca/wxgui/profilemanager.py:160
+#: ../pyhoca/wxgui/profilemanager.py:167
 msgid "Session Title"
 msgstr "Sessionsnamn"
 
-#: ../pyhoca/wxgui/profilemanager.py:161
+#: ../pyhoca/wxgui/profilemanager.py:168
 msgid "Session Window"
 msgstr "Sessionsfönster"
 
-#: ../pyhoca/wxgui/profilemanager.py:162
+#: ../pyhoca/wxgui/profilemanager.py:169
 msgid "Session Startup"
 msgstr "Sessionsstart"
 
-#: ../pyhoca/wxgui/profilemanager.py:163
+#: ../pyhoca/wxgui/profilemanager.py:170
 msgid "Server"
 msgstr "Server"
 
-#: ../pyhoca/wxgui/profilemanager.py:164
+#: ../pyhoca/wxgui/profilemanager.py:171
+msgid "Proxy"
+msgstr "Proxy"
+
+#: ../pyhoca/wxgui/profilemanager.py:172
 msgid "Connection Link Speed"
 msgstr "Anslutningshastighet"
 
-#: ../pyhoca/wxgui/profilemanager.py:165
+#: ../pyhoca/wxgui/profilemanager.py:173
 msgid "Compression"
 msgstr "Komprimering"
 
-#: ../pyhoca/wxgui/profilemanager.py:166
+#: ../pyhoca/wxgui/profilemanager.py:174
 msgid "Display"
 msgstr "Skärm"
 
-#: ../pyhoca/wxgui/profilemanager.py:167
+#: ../pyhoca/wxgui/profilemanager.py:175
 msgid "Keyboard"
 msgstr "Tangentbord"
 
-#: ../pyhoca/wxgui/profilemanager.py:168
+#: ../pyhoca/wxgui/profilemanager.py:176
 msgid "Sound"
 msgstr "Ljud"
 
-#: ../pyhoca/wxgui/profilemanager.py:169
+#: ../pyhoca/wxgui/profilemanager.py:177
 msgid "Printing"
 msgstr "Utskrifter"
 
-#: ../pyhoca/wxgui/profilemanager.py:170
+#: ../pyhoca/wxgui/profilemanager.py:178
 msgid "Folder Exports"
 msgstr "Delade mappar"
 
-#: ../pyhoca/wxgui/profilemanager.py:171
+#: ../pyhoca/wxgui/profilemanager.py:179
 msgid "File Import"
 msgstr "Filimport"
 
 #. ##
 #. ## widgets for the PROFILE tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:176
+#: ../pyhoca/wxgui/profilemanager.py:184
 msgid "Name"
 msgstr "Namn"
 
-#: ../pyhoca/wxgui/profilemanager.py:183
+#: ../pyhoca/wxgui/profilemanager.py:191
 msgid "Set session window title"
 msgstr "Ange fönstertitel för session"
 
-#: ../pyhoca/wxgui/profilemanager.py:184
+#: ../pyhoca/wxgui/profilemanager.py:192
 msgid "Use a default session window title"
 msgstr "Använd standard fönstertitel för session"
 
-#: ../pyhoca/wxgui/profilemanager.py:185
+#: ../pyhoca/wxgui/profilemanager.py:193
 msgid "Custom session window title"
 msgstr "Anpassad fönstertitel för session"
 
-#: ../pyhoca/wxgui/profilemanager.py:195
+#: ../pyhoca/wxgui/profilemanager.py:212
 msgid "Window Icon"
 msgstr "Fönsterikon"
 
 #. ##
 #. ## widgets for the SESSION tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:201
+#: ../pyhoca/wxgui/profilemanager.py:218
 msgid "Start session automatically after login"
 msgstr "Starta session automatiskt efter inloggning"
 
-#: ../pyhoca/wxgui/profilemanager.py:202
+#: ../pyhoca/wxgui/profilemanager.py:219
 #, python-format
 msgid "Login automatically after %s has started"
 msgstr "Logga in automatiskt när %s har startat"
 
-#: ../pyhoca/wxgui/profilemanager.py:203
+#: ../pyhoca/wxgui/profilemanager.py:220
 msgid "Type"
 msgstr "Typ"
 
-#: ../pyhoca/wxgui/profilemanager.py:205
+#: ../pyhoca/wxgui/profilemanager.py:222
 msgid "Application"
 msgstr "Applikation"
 
-#: ../pyhoca/wxgui/profilemanager.py:209
+#: ../pyhoca/wxgui/profilemanager.py:226
 msgid "XDMCP server"
 msgstr "XDMCP-server"
 
-#: ../pyhoca/wxgui/profilemanager.py:211
+#: ../pyhoca/wxgui/profilemanager.py:228
 msgid "RDP server"
 msgstr "RDP-server"
 
-#: ../pyhoca/wxgui/profilemanager.py:213
+#: ../pyhoca/wxgui/profilemanager.py:230
 msgid "RDP options"
 msgstr "RDP-alternativ"
 
-#: ../pyhoca/wxgui/profilemanager.py:215
+#: ../pyhoca/wxgui/profilemanager.py:232
 msgid "Integrate remote application(s) into local desktop (rootless mode)"
 msgstr "Integrera fjärrapplikation i lokalt Skrivbord (rootless)"
 
-#: ../pyhoca/wxgui/profilemanager.py:216
+#: ../pyhoca/wxgui/profilemanager.py:233
 msgid "Menu of published applications"
 msgstr "Meny med publicerade applikationer"
 
 #. ##
 #. ## widgets for the CONNECTION tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:223 ../pyhoca/wxgui/profilemanager.py:233
+#: ../pyhoca/wxgui/profilemanager.py:240 ../pyhoca/wxgui/profilemanager.py:253
 msgid "User"
 msgstr "Användare"
 
-#: ../pyhoca/wxgui/profilemanager.py:225
+#: ../pyhoca/wxgui/profilemanager.py:242 ../pyhoca/wxgui/profilemanager.py:260
 msgid "Host"
 msgstr "Server"
 
-#: ../pyhoca/wxgui/profilemanager.py:227
+#: ../pyhoca/wxgui/profilemanager.py:244 ../pyhoca/wxgui/profilemanager.py:262
 msgid "Port"
 msgstr "Port"
 
-#: ../pyhoca/wxgui/profilemanager.py:229
-msgid "RSA/DSA private key"
-msgstr "RSA/DSA privat nyckel"
+#: ../pyhoca/wxgui/profilemanager.py:246
+msgid "Key"
+msgstr "Nyckel"
 
-#: ../pyhoca/wxgui/profilemanager.py:232
+#: ../pyhoca/wxgui/profilemanager.py:249
+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
+msgid "Enable forwarding of SSH authentication agent connections"
+msgstr "Aktivera vidarebefordran av anslutningar för SSH autentiseringsagent"
+
+#: ../pyhoca/wxgui/profilemanager.py:252
 msgid "Server behind SSH proxy"
 msgstr "Server bakom SSH-proxy"
 
-#: ../pyhoca/wxgui/profilemanager.py:235
+#: ../pyhoca/wxgui/profilemanager.py:255
+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
+msgid "Use same authentication for X2Go and proxy host"
+msgstr "Använd samma autentisering för X2Go och proxyserver"
+
+#: ../pyhoca/wxgui/profilemanager.py:257
 msgid "Key file"
 msgstr "Nyckelfil"
 
-#: ../pyhoca/wxgui/profilemanager.py:238
-msgid "Host[:Port]"
-msgstr "Server[:Port]"
-
-#: ../pyhoca/wxgui/profilemanager.py:240
+#: ../pyhoca/wxgui/profilemanager.py:264
 msgid "SSH Proxy Tunnel"
 msgstr "SSH proxytunnel"
 
-#: ../pyhoca/wxgui/profilemanager.py:248
+#: ../pyhoca/wxgui/profilemanager.py:270
+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
 msgid "Modem"
 msgstr "Modem"
 
-#: ../pyhoca/wxgui/profilemanager.py:249
+#: ../pyhoca/wxgui/profilemanager.py:274
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../pyhoca/wxgui/profilemanager.py:250
+#: ../pyhoca/wxgui/profilemanager.py:275
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../pyhoca/wxgui/profilemanager.py:251
+#: ../pyhoca/wxgui/profilemanager.py:276
 msgid "WAN"
 msgstr "WAN"
 
-#: ../pyhoca/wxgui/profilemanager.py:252
+#: ../pyhoca/wxgui/profilemanager.py:277
 msgid "LAN"
 msgstr "LAN"
 
-#: ../pyhoca/wxgui/profilemanager.py:254
+#: ../pyhoca/wxgui/profilemanager.py:279
 msgid "Method"
 msgstr "Metod"
 
-#: ../pyhoca/wxgui/profilemanager.py:256
+#: ../pyhoca/wxgui/profilemanager.py:281
 msgid "Image quality"
 msgstr "Bildkvalitet"
 
 #. ##
 #. ## wigdets for the SETTINGS tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:262
+#: ../pyhoca/wxgui/profilemanager.py:287
 msgid "Fullscreen"
 msgstr "Fullskärm"
 
-#: ../pyhoca/wxgui/profilemanager.py:263
+#: ../pyhoca/wxgui/profilemanager.py:288
+msgid "Maximized"
+msgstr "Maximerad"
+
+#: ../pyhoca/wxgui/profilemanager.py:289
 msgid "Custom Size"
 msgstr "Anpassad storlek"
 
-#: ../pyhoca/wxgui/profilemanager.py:268
+#: ../pyhoca/wxgui/profilemanager.py:294
 msgid "Set display DPI"
 msgstr "Ange skärmupplösning (DPI)"
 
-#: ../pyhoca/wxgui/profilemanager.py:270
+#: ../pyhoca/wxgui/profilemanager.py:296
 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:271
+#: ../pyhoca/wxgui/profilemanager.py:297
 msgid ""
 "Automatically detect and use client-side keyboard configuration inside the "
 "session"
@@ -455,213 +482,221 @@ msgstr ""
 "Detektera automatiskt och använd klientinställningar för tangentbord i "
 "session"
 
-#: ../pyhoca/wxgui/profilemanager.py:272
+#: ../pyhoca/wxgui/profilemanager.py:298
 msgid "Use custom keyboard settings as provided below"
 msgstr "Använd nedan angivna tangentbordsinställningar"
 
-#: ../pyhoca/wxgui/profilemanager.py:273
+#: ../pyhoca/wxgui/profilemanager.py:299
 msgid "Keyboard model"
 msgstr "Tangentbordsmodell"
 
-#: ../pyhoca/wxgui/profilemanager.py:275
+#: ../pyhoca/wxgui/profilemanager.py:301
 msgid "Layout"
 msgstr "Tangentbordslayout"
 
-#: ../pyhoca/wxgui/profilemanager.py:277
+#: ../pyhoca/wxgui/profilemanager.py:303
 msgid "Layout variant"
 msgstr "Variant"
 
-#: ../pyhoca/wxgui/profilemanager.py:279
+#: ../pyhoca/wxgui/profilemanager.py:305
 msgid "Enable sound support"
 msgstr "Aktivera ljudstöd"
 
-#: ../pyhoca/wxgui/profilemanager.py:280
+#: ../pyhoca/wxgui/profilemanager.py:306
 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:284
+#: ../pyhoca/wxgui/profilemanager.py:310
 msgid "Arts (not supported)"
-msgstr "Arts (ej supportad)"
+msgstr "Arts (stöds ej)"
 
-#: ../pyhoca/wxgui/profilemanager.py:287
+#: ../pyhoca/wxgui/profilemanager.py:313
 msgid "esd"
 msgstr "esd"
 
-#: ../pyhoca/wxgui/profilemanager.py:288
+#: ../pyhoca/wxgui/profilemanager.py:314
 msgid "Use default sound port"
 msgstr "Använd standardport för ljud"
 
-#: ../pyhoca/wxgui/profilemanager.py:289
+#: ../pyhoca/wxgui/profilemanager.py:315
 msgid "Custom sound port"
 msgstr "Anpassad ljudport"
 
-#: ../pyhoca/wxgui/profilemanager.py:291
-msgid "Client Side printing"
-msgstr "Stöd för utskrifter via klienten"
-
-#: ../pyhoca/wxgui/profilemanager.py:293
+#: ../pyhoca/wxgui/profilemanager.py:318
 msgid "Use local folder sharing"
 msgstr "Använd lokal mappdelning"
 
-#: ../pyhoca/wxgui/profilemanager.py:294
+#: ../pyhoca/wxgui/profilemanager.py:319
+msgid "Store share list at end of session"
+msgstr "Spara lista med delade mappar när sessionen avslutas"
+
+#: ../pyhoca/wxgui/profilemanager.py:320
 msgid "Path"
 msgstr "Sökväg"
 
-#: ../pyhoca/wxgui/profilemanager.py:297 ../pyhoca/wxgui/profilemanager.py:316
+#: ../pyhoca/wxgui/profilemanager.py:323 ../pyhoca/wxgui/profilemanager.py:344
 msgid "Add"
 msgstr "Lägg till"
 
-#: ../pyhoca/wxgui/profilemanager.py:299
+#: ../pyhoca/wxgui/profilemanager.py:325
 msgid "Local Path"
 msgstr "Lokal sökväg"
 
-#: ../pyhoca/wxgui/profilemanager.py:300
+#: ../pyhoca/wxgui/profilemanager.py:326
 msgid "Connect Method"
 msgstr "Anslutningsmetod"
 
-#: ../pyhoca/wxgui/profilemanager.py:301
+#: ../pyhoca/wxgui/profilemanager.py:327
 msgid "Delete"
 msgstr "Radera"
 
-#: ../pyhoca/wxgui/profilemanager.py:303
+#: ../pyhoca/wxgui/profilemanager.py:329
 msgid "Convert between client and server encodings"
 msgstr "Konvertera kodtabell mellan klient och server"
 
-#: ../pyhoca/wxgui/profilemanager.py:304
+#: ../pyhoca/wxgui/profilemanager.py:330
 msgid "Client encoding"
 msgstr "Kodtabell klient"
 
-#: ../pyhoca/wxgui/profilemanager.py:306
+#: ../pyhoca/wxgui/profilemanager.py:332
 msgid "Server encoding"
 msgstr "Kodtabell server"
 
-#: ../pyhoca/wxgui/profilemanager.py:309
+#: ../pyhoca/wxgui/profilemanager.py:335
 msgid "Use file MIME box for local file import"
 msgstr "Använd MIME för lokal filimport"
 
-#: ../pyhoca/wxgui/profilemanager.py:310
+#: ../pyhoca/wxgui/profilemanager.py:336
 msgid "Extensions"
 msgstr "Filändelser"
 
-#: ../pyhoca/wxgui/profilemanager.py:312
+#: ../pyhoca/wxgui/profilemanager.py:338
 msgid "Action"
 msgstr "Hantering"
 
-#: ../pyhoca/wxgui/profilemanager.py:317
+#: ../pyhoca/wxgui/profilemanager.py:341
+msgid "Client Side printing"
+msgstr "Stöd för utskrifter via klienten"
+
+#: ../pyhoca/wxgui/profilemanager.py:345
 msgid "Defaults"
 msgstr "Standard"
 
-#: ../pyhoca/wxgui/profilemanager.py:319
+#: ../pyhoca/wxgui/profilemanager.py:347
 msgid "Save"
 msgstr "Spara"
 
-#: ../pyhoca/wxgui/profilemanager.py:320
+#: ../pyhoca/wxgui/profilemanager.py:348
 msgid "Reset"
 msgstr "Återställ"
 
-#: ../pyhoca/wxgui/profilemanager.py:365
-#: ../pyhoca/wxgui/profilemanager.py:1078
-#: ../pyhoca/wxgui/profilemanager.py:1832
+#: ../pyhoca/wxgui/profilemanager.py:401
+#: ../pyhoca/wxgui/profilemanager.py:1124
+#: ../pyhoca/wxgui/profilemanager.py:2268
 msgid "automatically"
 msgstr "automatisk"
 
-#: ../pyhoca/wxgui/profilemanager.py:367
-#: ../pyhoca/wxgui/profilemanager.py:1080
+#: ../pyhoca/wxgui/profilemanager.py:403
+#: ../pyhoca/wxgui/profilemanager.py:1126
 msgid "manually"
 msgstr "manuellt"
 
-#: ../pyhoca/wxgui/profilemanager.py:376
+#: ../pyhoca/wxgui/profilemanager.py:412
 msgid "PyHoca-GUI Profile Manager - new profile"
 msgstr "PyHoca-GUI Profilhanterare - ny profil"
 
-#: ../pyhoca/wxgui/profilemanager.py:378
+#: ../pyhoca/wxgui/profilemanager.py:414
 #, python-format
 msgid "PyHoca-GUI Profile Manager - %s (connected)"
 msgstr " PyHoca-GUI Profilhanterare - %s (ansluten)"
 
-#: ../pyhoca/wxgui/profilemanager.py:380
+#: ../pyhoca/wxgui/profilemanager.py:416
 #, python-format
 msgid "PyHoca-GUI Profile Manager - %s"
 msgstr "PyHoca-GUI Profilhanterare - %s"
 
-#: ../pyhoca/wxgui/profilemanager.py:751
+#: ../pyhoca/wxgui/profilemanager.py:797
 msgid "Profile"
 msgstr "Profil"
 
-#: ../pyhoca/wxgui/profilemanager.py:752
+#: ../pyhoca/wxgui/profilemanager.py:798
 msgid "Session"
 msgstr "Session"
 
-#: ../pyhoca/wxgui/profilemanager.py:753
+#: ../pyhoca/wxgui/profilemanager.py:799
 msgid "Connection"
 msgstr "Anslutning"
 
-#: ../pyhoca/wxgui/profilemanager.py:754
+#: ../pyhoca/wxgui/profilemanager.py:800
+msgid "Link Quality"
+msgstr "Länkkvalitet"
+
+#: ../pyhoca/wxgui/profilemanager.py:801
 msgid "Settings"
 msgstr "Inställningar"
 
-#: ../pyhoca/wxgui/profilemanager.py:755
+#: ../pyhoca/wxgui/profilemanager.py:802
 msgid "Sharing"
 msgstr "Delning"
 
-#: ../pyhoca/wxgui/profilemanager.py:996
+#: ../pyhoca/wxgui/profilemanager.py:988
 msgid "<xkbtype>"
 msgstr "pc105"
 
-#: ../pyhoca/wxgui/profilemanager.py:997
+#: ../pyhoca/wxgui/profilemanager.py:989
 msgid "<xkblayout>"
 msgstr "se"
 
-#: ../pyhoca/wxgui/profilemanager.py:998
+#: ../pyhoca/wxgui/profilemanager.py:990
 msgid "<xkbvariant>"
 msgstr "se"
 
-#: ../pyhoca/wxgui/profilemanager.py:1284
+#: ../pyhoca/wxgui/profilemanager.py:1444
 msgid "Icon Files (*.png)|*.png|All files (*.*)|*"
 msgstr "Ikonfiler (*.png)|*.png|Alla filer (*.*)|*"
 
-#: ../pyhoca/wxgui/profilemanager.py:1287
+#: ../pyhoca/wxgui/profilemanager.py:1447
 msgid "Choose an icon for this session profile"
 msgstr "Välj en ikon för denna sessionsprofil"
 
-#: ../pyhoca/wxgui/profilemanager.py:1509
+#: ../pyhoca/wxgui/profilemanager.py:1816
 msgid "All files (*.*)|*"
 msgstr "Alla filer (*.*)|*"
 
-#: ../pyhoca/wxgui/profilemanager.py:1511
-#: ../pyhoca/wxgui/profilemanager.py:1533
+#: ../pyhoca/wxgui/profilemanager.py:1818
+#: ../pyhoca/wxgui/profilemanager.py:1842
 msgid "Choose a public SSH key"
 msgstr "Välj en public SSH-nyckel"
 
-#: ../pyhoca/wxgui/profilemanager.py:1784
+#: ../pyhoca/wxgui/profilemanager.py:2220
 msgid "Choose a folder to share within a session"
 msgstr "Välj en mapp att dela i en session"
 
-#: ../pyhoca/wxgui/profilemanager.py:1912
-#: ../pyhoca/wxgui/profilemanager.py:1915
-#: ../pyhoca/wxgui/profilemanager.py:1918
-#: ../pyhoca/wxgui/profilemanager.py:1923
-#: ../pyhoca/wxgui/profilemanager.py:1933 ../pyhoca/wxgui/menus_taskbar.py:118
+#: ../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
 msgid "Profile Manager"
 msgstr "Profilhanterare"
 
-#: ../pyhoca/wxgui/profilemanager.py:1912
+#: ../pyhoca/wxgui/profilemanager.py:2348
 msgid "Profile name is missing, profile unusable!!!"
 msgstr "Profilnamn saknas, profil oanvändbar!"
 
-#: ../pyhoca/wxgui/profilemanager.py:1915
-#: ../pyhoca/wxgui/profilemanager.py:1918
+#: ../pyhoca/wxgui/profilemanager.py:2351
+#: ../pyhoca/wxgui/profilemanager.py:2354
 #, python-format
 msgid "Profile name %s already exists!!!"
 msgstr "Profilen %s finns redan!"
 
-#: ../pyhoca/wxgui/profilemanager.py:1923
+#: ../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:1933
+#: ../pyhoca/wxgui/profilemanager.py:2369
 #, python-format
 msgid ""
 "Another session profile (%s) already uses [%s]:%s for binding a local SSH "
@@ -672,248 +707,252 @@ msgstr ""
 "proxy.\n"
 "Ändra konfiguration för SSH-proxy ."
 
-#: ../pyhoca/wxgui/profilemanager.py:1960
+#: ../pyhoca/wxgui/profilemanager.py:2396
 #, python-format
 msgid "%s - profile added"
 msgstr "%s - profil tillagd"
 
-#: ../pyhoca/wxgui/profilemanager.py:1961
+#: ../pyhoca/wxgui/profilemanager.py:2397
 msgid "A new session profile has been added."
 msgstr "En ny sessionsprofil har lagts till."
 
-#: ../pyhoca/wxgui/profilemanager.py:1965
+#: ../pyhoca/wxgui/profilemanager.py:2401
 #, python-format
 msgid "%s - modified"
 msgstr "%s - ändrad"
 
-#: ../pyhoca/wxgui/profilemanager.py:1966
+#: ../pyhoca/wxgui/profilemanager.py:2402
 msgid "Changes to profile have been saved."
 msgstr "Ändringar av profil har sparats."
 
-#: ../pyhoca/wxgui/menus_taskbar.py:75
+#: ../pyhoca/wxgui/menus_taskbar.py:74
 msgid "Edit Profile"
 msgstr "Redigera profil"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:78
+#: ../pyhoca/wxgui/menus_taskbar.py:77
 msgid "Use as Template for New Profile"
 msgstr "Använd som mall för ny profil"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:79
+#: ../pyhoca/wxgui/menus_taskbar.py:78
 msgid "Delete Profile"
 msgstr "Radera profil"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:107
+#: ../pyhoca/wxgui/menus_taskbar.py:106
 #, python-format
 msgid "About %s (%s)..."
 msgstr "Om %s (%s)..."
 
-#: ../pyhoca/wxgui/menus_taskbar.py:133
+#: ../pyhoca/wxgui/menus_taskbar.py:132
 msgid "Manage Session Profile"
 msgstr "Hantera sessionsprofil"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:142
+#: ../pyhoca/wxgui/menus_taskbar.py:141
 msgid "Printing Preferences"
 msgstr "Utskriftspreferenser"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:148
+#: ../pyhoca/wxgui/menus_taskbar.py:147
 msgid "Client Options"
 msgstr "Klientalternativ"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:156 ../pyhoca/wxgui/menus_taskbar.py:785
-#: ../pyhoca/wxgui/menus_taskbar.py:977
+#: ../pyhoca/wxgui/menus_taskbar.py:155 ../pyhoca/wxgui/menus_taskbar.py:783
+#: ../pyhoca/wxgui/menus_taskbar.py:975
 msgid "E&xit"
 msgstr "&Avsluta"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:228
+#: ../pyhoca/wxgui/menus_taskbar.py:227
 msgid "Window title"
 msgstr "Fönstertitel"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:234 ../pyhoca/wxgui/menus_taskbar.py:613
+#: ../pyhoca/wxgui/menus_taskbar.py:233 ../pyhoca/wxgui/menus_taskbar.py:608
 msgid "Resume Session"
 msgstr "Ã…teranslut session"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:236
+#: ../pyhoca/wxgui/menus_taskbar.py:235
 msgid "Resume Session (not possible)"
 msgstr "Återanslut session (ej möjligt)"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:247
+#: ../pyhoca/wxgui/menus_taskbar.py:246
 msgid "Transfer Session"
 msgstr "Flytta session"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:249
+#: ../pyhoca/wxgui/menus_taskbar.py:248
 msgid "Transfer Session (not possible)"
 msgstr "Flytta session (ej möjligt)"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:253 ../pyhoca/wxgui/menus_taskbar.py:604
+#: ../pyhoca/wxgui/menus_taskbar.py:252 ../pyhoca/wxgui/menus_taskbar.py:599
 msgid "Suspend Session (and disconnect/exit)"
 msgstr "Försätt session i vila och avsluta"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:255 ../pyhoca/wxgui/menus_taskbar.py:606
+#: ../pyhoca/wxgui/menus_taskbar.py:254 ../pyhoca/wxgui/menus_taskbar.py:601
 msgid "Suspend Session (and disconnect)"
 msgstr "Försätt session i vila och koppla från"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:257 ../pyhoca/wxgui/menus_taskbar.py:608
+#: ../pyhoca/wxgui/menus_taskbar.py:256 ../pyhoca/wxgui/menus_taskbar.py:603
 msgid "Suspend Session"
 msgstr "Försätt session i vila"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:263 ../pyhoca/wxgui/menus_taskbar.py:617
+#: ../pyhoca/wxgui/menus_taskbar.py:262 ../pyhoca/wxgui/menus_taskbar.py:612
 msgid "Terminate Session (and disconnect/exit)"
 msgstr "Avsluta session"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:265 ../pyhoca/wxgui/menus_taskbar.py:619
+#: ../pyhoca/wxgui/menus_taskbar.py:264 ../pyhoca/wxgui/menus_taskbar.py:614
 msgid "Terminate Session (and disconnect)"
 msgstr "Koppla från session"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:267 ../pyhoca/wxgui/menus_taskbar.py:621
+#: ../pyhoca/wxgui/menus_taskbar.py:266 ../pyhoca/wxgui/menus_taskbar.py:616
 msgid "Terminate Session"
 msgstr "Avsluta session"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:271 ../pyhoca/wxgui/menus_taskbar.py:601
+#: ../pyhoca/wxgui/menus_taskbar.py:270 ../pyhoca/wxgui/menus_taskbar.py:596
 msgid "Refresh menu tree"
 msgstr "Uppdatera menyträd"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:280
+#: ../pyhoca/wxgui/menus_taskbar.py:279
 msgid "Rename Session Window"
 msgstr "Döp om sessionsfönster"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:281
+#: ../pyhoca/wxgui/menus_taskbar.py:280
 msgid "Show Session Window"
 msgstr "Visa sessionsfönster"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:321
+#: ../pyhoca/wxgui/menus_taskbar.py:322
 msgid "&Share custom local folder"
 msgstr "&Dela anpassad lokal mapp"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:344
+#: ../pyhoca/wxgui/menus_taskbar.py:337
 msgid "Share:"
 msgstr "Dela:"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:355
+#: ../pyhoca/wxgui/menus_taskbar.py:346
 msgid "Unshare:"
 msgstr "Avsluta delning:"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:365
+#: ../pyhoca/wxgui/menus_taskbar.py:354
 msgid "Unshare &all local folders"
 msgstr "Avsluta delning av lokala mappar"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:445
+#: ../pyhoca/wxgui/menus_taskbar.py:360
+msgid "Restore shares in next session"
+msgstr "Återställ delade mappar i nästa session"
+
+#: ../pyhoca/wxgui/menus_taskbar.py:440
 msgid "Multimedia"
 msgstr "Ljud och bild"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:446
+#: ../pyhoca/wxgui/menus_taskbar.py:441
 msgid "Development"
 msgstr "Programmering"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:447
+#: ../pyhoca/wxgui/menus_taskbar.py:442
 msgid "Education"
 msgstr "Utbildning"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:448
+#: ../pyhoca/wxgui/menus_taskbar.py:443
 msgid "Games"
 msgstr "Spel"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:449
+#: ../pyhoca/wxgui/menus_taskbar.py:444
 msgid "Graphics"
 msgstr "Grafik"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:450
+#: ../pyhoca/wxgui/menus_taskbar.py:445
 msgid "Internet"
 msgstr "Internet"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:451
+#: ../pyhoca/wxgui/menus_taskbar.py:446
 msgid "Office Applications"
 msgstr "Kontor"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:452
+#: ../pyhoca/wxgui/menus_taskbar.py:447
 msgid "System"
 msgstr "System"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:453
+#: ../pyhoca/wxgui/menus_taskbar.py:448
 msgid "Utilities"
 msgstr "Verktyg"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:454
+#: ../pyhoca/wxgui/menus_taskbar.py:449
 msgid "Other Applications"
 msgstr "Övriga applikationer"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:526 ../pyhoca/wxgui/menus_taskbar.py:538
+#: ../pyhoca/wxgui/menus_taskbar.py:521 ../pyhoca/wxgui/menus_taskbar.py:533
 #, python-format
 msgid "Connect %s"
 msgstr "Anslut %s"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:532
+#: ../pyhoca/wxgui/menus_taskbar.py:527
 msgid "Currently connecting..."
 msgstr "Anslutning pågår..."
 
-#: ../pyhoca/wxgui/menus_taskbar.py:546
+#: ../pyhoca/wxgui/menus_taskbar.py:541
 msgid "Start &new Desktop Session"
 msgstr "Starta &ny Skrivbordssession"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:551 ../pyhoca/wxgui/menus_taskbar.py:689
+#: ../pyhoca/wxgui/menus_taskbar.py:546 ../pyhoca/wxgui/menus_taskbar.py:684
 msgid "Retrieving Application Menu..."
 msgstr "Hämtar applikationsmeny..."
 
-#: ../pyhoca/wxgui/menus_taskbar.py:555 ../pyhoca/wxgui/menus_taskbar.py:692
+#: ../pyhoca/wxgui/menus_taskbar.py:550 ../pyhoca/wxgui/menus_taskbar.py:687
 msgid "Retrieve Application Menu"
 msgstr "Hämta applikationsmeny"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:558
+#: ../pyhoca/wxgui/menus_taskbar.py:553
 msgid "Start &new Session"
 msgstr "Starta &ny session"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:638
+#: ../pyhoca/wxgui/menus_taskbar.py:633
 msgid "Launch Single Application"
 msgstr "Starta applikation"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:676
+#: ../pyhoca/wxgui/menus_taskbar.py:671
 msgid "Manage Application Menu"
 msgstr "Hantera applikationsmeny"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:719
+#: ../pyhoca/wxgui/menus_taskbar.py:714
 msgid "Running"
 msgstr "Aktiv"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:721
+#: ../pyhoca/wxgui/menus_taskbar.py:716
 msgid "Suspended"
 msgstr "Vilande"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:740
+#: ../pyhoca/wxgui/menus_taskbar.py:735
 msgid "&Clean all sessions"
 msgstr "&Rensa alla sessioner"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:746
+#: ../pyhoca/wxgui/menus_taskbar.py:741
 msgid "Customize &profile"
 msgstr "Anpassa &profil"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:758
+#: ../pyhoca/wxgui/menus_taskbar.py:756
 msgid "Shared &folders"
 msgstr "Delade &mappar"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:770
+#: ../pyhoca/wxgui/menus_taskbar.py:768
 msgid "&Disconnect from Server"
 msgstr "&Koppla från server"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:777
+#: ../pyhoca/wxgui/menus_taskbar.py:775
 msgid "Suspend Session and E&xit application"
 msgstr "Försätt session i vila och avsluta"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:781
+#: ../pyhoca/wxgui/menus_taskbar.py:779
 msgid "Disconnect and E&xit application"
 msgstr "Kopplar från och &avsluta"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:835
+#: ../pyhoca/wxgui/menus_taskbar.py:833
 msgid "Add Profile"
 msgstr "Lägg till profil"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:911
+#: ../pyhoca/wxgui/menus_taskbar.py:909
 msgid "No session profiles defined"
 msgstr "Inga sessionsprofiler har definierats"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:947
+#: ../pyhoca/wxgui/menus_taskbar.py:945
 msgid "Start/Resume Session"
 msgstr "Starta/Ã¥teranslut session"
 
-#: ../pyhoca/wxgui/menus_taskbar.py:947
+#: ../pyhoca/wxgui/menus_taskbar.py:945
 msgid "Connect Server"
 msgstr "Anslut till server"
 
@@ -922,107 +961,129 @@ msgstr "Anslut till server"
 msgid "About %s ..."
 msgstr "Om %s ..."
 
-#: ../pyhoca/wxgui/frontend.py:462
+#: ../pyhoca/wxgui/frontend.py:459
 msgid "Suspending sessions and exiting application..."
 msgstr "Försätter session i vila och avslutar..."
 
-#: ../pyhoca/wxgui/frontend.py:465
+#: ../pyhoca/wxgui/frontend.py:462
 #, python-format
 msgid "Disconnecting %s and exiting application..."
 msgstr "Kopplar från %s och avslutar applikation..."
 
-#: ../pyhoca/wxgui/frontend.py:467
+#: ../pyhoca/wxgui/frontend.py:464
 msgid "Exiting application..."
 msgstr "Avslutar applikation..."
 
-#: ../pyhoca/wxgui/frontend.py:560
+#: ../pyhoca/wxgui/frontend.py:562
 #, python-format
 msgid "%s - server warning"
 msgstr "%s - servervarning"
 
-#: ../pyhoca/wxgui/frontend.py:560
+#: ../pyhoca/wxgui/frontend.py:562
 msgid "The X2Go Server does not publish an application menu."
 msgstr "X2Go-servern publicerar inte en applikationsmeny."
 
-#: ../pyhoca/wxgui/frontend.py:610
-msgid "Public SSH key authentication has been successful."
-msgstr "Autentisering med publik SSH-nyckel lyckades."
+#: ../pyhoca/wxgui/frontend.py:613
+msgid "SSH key authentication has been successful."
+msgstr "Autentisering med SSH-nyckel lyckades."
 
-#: ../pyhoca/wxgui/frontend.py:644
+#: ../pyhoca/wxgui/frontend.py:650
 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:665
+#: ../pyhoca/wxgui/frontend.py:671
 #, python-format
 msgid "%s - EOF error"
 msgstr "%s - EOF fel"
 
-#: ../pyhoca/wxgui/frontend.py:665
+#: ../pyhoca/wxgui/frontend.py:671
 msgid "Authentication protocol communication incomplete! Try again..."
 msgstr "Autentisering slutfördes ej! Prova igen..."
 
-#: ../pyhoca/wxgui/frontend.py:672
+#: ../pyhoca/wxgui/frontend.py:678
 #, python-format
 msgid "%s - auth key error"
 msgstr "%s - autentiseringsnyckel fel"
 
-#: ../pyhoca/wxgui/frontend.py:693
+#: ../pyhoca/wxgui/frontend.py:699
 msgid "An unknown error occurred during authentication!"
 msgstr "Ett okänt fel inträffade vid autentisering!"
 
-#: ../pyhoca/wxgui/frontend.py:726
+#: ../pyhoca/wxgui/frontend.py:728
+#, python-format
+msgid "%s: DirectRDP not supported yet"
+msgstr "%s: DirectRDP stöds inte ännu"
+
+#: ../pyhoca/wxgui/frontend.py:729
+#, python-format
+msgid ""
+"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)."
+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)"
+
+#: ../pyhoca/wxgui/frontend.py:741
 msgid "Unknown session profile, configure before using it..."
 msgstr "Okänd sessionsprofil, konfigurera före användning..."
 
-#: ../pyhoca/wxgui/frontend.py:784 ../pyhoca/wxgui/frontend.py:1302
+#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:1332
 #, python-format
 msgid "%s - session warning"
 msgstr "%s - sessionsvarning"
 
-#: ../pyhoca/wxgui/frontend.py:784
+#: ../pyhoca/wxgui/frontend.py:798
 #, python-format
 msgid "Execution of command ,,%s'' failed."
 msgstr "Exekvering av kommando \"%s\" misslyckades."
 
-#: ../pyhoca/wxgui/frontend.py:926
+#: ../pyhoca/wxgui/frontend.py:939
 msgid "Cleaning X2Go sessions..."
 msgstr "Rensar X2Go-sessioner..."
 
-#: ../pyhoca/wxgui/frontend.py:961
+#: ../pyhoca/wxgui/frontend.py:974
 #, python-format
 msgid "%s - disconnect"
 msgstr "%s - koppla från"
 
-#: ../pyhoca/wxgui/frontend.py:961
+#: ../pyhoca/wxgui/frontend.py:974
 msgid "X2Go Profile is now disconnected."
 msgstr "X2Go-profil är nu frånkopplad"
 
-#: ../pyhoca/wxgui/frontend.py:977
+#: ../pyhoca/wxgui/frontend.py:995
 msgid "New Session Profile"
 msgstr "Ny sessionsprofil"
 
-#: ../pyhoca/wxgui/frontend.py:1029
+#: ../pyhoca/wxgui/frontend.py:1047
 #, python-format
 msgid "Really Delete Session Profile ,,%s''?"
 msgstr "Är du säker på att du vill radera profil ,,%s''?"
 
-#: ../pyhoca/wxgui/frontend.py:1035
+#: ../pyhoca/wxgui/frontend.py:1053
 #, python-format
 msgid "%s - profile deleted"
 msgstr "%s - profil raderad"
 
-#: ../pyhoca/wxgui/frontend.py:1035
+#: ../pyhoca/wxgui/frontend.py:1053
 msgid "The session profile has been deleted."
 msgstr "Profilen har raderats."
 
-#: ../pyhoca/wxgui/frontend.py:1053
+#: ../pyhoca/wxgui/frontend.py:1071
 #, 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:1194
+#: ../pyhoca/wxgui/frontend.py:1224
 #, python-format
 msgid ""
 "The authenticity of host [%s]:%s can't be established.\n"
@@ -1035,17 +1096,17 @@ msgstr ""
 "\n"
 "Litar du på denna nyckel?"
 
-#: ../pyhoca/wxgui/frontend.py:1202
+#: ../pyhoca/wxgui/frontend.py:1232
 #, python-format
 msgid "%s: Confirm Host Authorization"
 msgstr "%s: Bekräfta tillägg av server"
 
-#: ../pyhoca/wxgui/frontend.py:1247
+#: ../pyhoca/wxgui/frontend.py:1277
 #, python-format
 msgid "%s - channel error"
 msgstr "%s - kanalfel"
 
-#: ../pyhoca/wxgui/frontend.py:1247
+#: ../pyhoca/wxgui/frontend.py:1277
 #, python-format
 msgid ""
 "Lost connection to server %s unexpectedly! Try to re-authenticate to the "
@@ -1053,22 +1114,22 @@ msgid ""
 msgstr ""
 "Anslutning till %s avslutades oväntat! Försök återansluta till server..."
 
-#: ../pyhoca/wxgui/frontend.py:1265 ../pyhoca/wxgui/frontend.py:1283
-#: ../pyhoca/wxgui/frontend.py:1285 ../pyhoca/wxgui/frontend.py:1321
+#: ../pyhoca/wxgui/frontend.py:1295 ../pyhoca/wxgui/frontend.py:1313
+#: ../pyhoca/wxgui/frontend.py:1315 ../pyhoca/wxgui/frontend.py:1351
 #, python-format
 msgid "%s - session failure"
 msgstr "%s - session misslyckades"
 
-#: ../pyhoca/wxgui/frontend.py:1265
+#: ../pyhoca/wxgui/frontend.py:1295
 msgid "The session startup failed."
 msgstr "Sessionsstart misslyckades."
 
-#: ../pyhoca/wxgui/frontend.py:1283
+#: ../pyhoca/wxgui/frontend.py:1313
 #, python-format
 msgid "The command ,,%s'' is not available on X2Go server."
 msgstr "Kommandot ,,%s'' finns inte på X2Go-server."
 
-#: ../pyhoca/wxgui/frontend.py:1285
+#: ../pyhoca/wxgui/frontend.py:1315
 #, python-format
 msgid ""
 "The command ,,%s'' is not available on X2Go server\n"
@@ -1077,7 +1138,7 @@ msgstr ""
 "Kommandot ,,%s'' finns inte på X2Go-server\n"
 "%s."
 
-#: ../pyhoca/wxgui/frontend.py:1302
+#: ../pyhoca/wxgui/frontend.py:1332
 #, python-format
 msgid ""
 "Reverse TCP port forwarding request for session %s to server port %s has "
@@ -1085,7 +1146,7 @@ msgid ""
 msgstr ""
 "Omvänd TCP port forwarding för session %s till serverport %s har nekats."
 
-#: ../pyhoca/wxgui/frontend.py:1321
+#: ../pyhoca/wxgui/frontend.py:1351
 #, python-format
 msgid ""
 "Forwarding tunnel request to [%s]:%s for session %s was denied by remote "
@@ -1094,35 +1155,35 @@ msgstr ""
 "Begäran om tunnel till [%s]:%s för session %s nekades av X2Go/SSH-server. "
 "Sessionsstart misslyckades."
 
-#: ../pyhoca/wxgui/frontend.py:1340
+#: ../pyhoca/wxgui/frontend.py:1370
 #, python-format
 msgid "%s - audio warning"
 msgstr "%s - ljudvarning"
 
-#: ../pyhoca/wxgui/frontend.py:1340
+#: ../pyhoca/wxgui/frontend.py:1370
 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:1347 ../pyhoca/wxgui/frontend.py:1354
+#: ../pyhoca/wxgui/frontend.py:1377 ../pyhoca/wxgui/frontend.py:1384
 #, python-format
 msgid "%s - audio error"
 msgstr "%s - ljudfel"
 
-#: ../pyhoca/wxgui/frontend.py:1347
+#: ../pyhoca/wxgui/frontend.py:1377
 msgid "The X2Go PulseAudio system could not be started."
 msgstr "X2Go PulseAudio kunde ej startas."
 
-#: ../pyhoca/wxgui/frontend.py:1354
+#: ../pyhoca/wxgui/frontend.py:1384
 msgid "The X2Go PulseAudio system has died unexpectedly."
 msgstr "X2Go PulseAudio avslutades oväntat."
 
-#: ../pyhoca/wxgui/frontend.py:1366
+#: ../pyhoca/wxgui/frontend.py:1396
 #, python-format
 msgid "%s - audio problem"
 msgstr "%s - ljudproblem"
 
-#: ../pyhoca/wxgui/frontend.py:1366
+#: ../pyhoca/wxgui/frontend.py:1396
 #, python-format
 msgid ""
 "The audio connection could not be set up for this session.\n"
@@ -1131,12 +1192,12 @@ msgstr ""
 "Anslutning för ljud kunde ej genomföras för denna session.\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1378
+#: ../pyhoca/wxgui/frontend.py:1408
 #, python-format
 msgid "%s - client-side printing not available"
 msgstr "%s - klientdelade utskrifter ej tillgängliga"
 
-#: ../pyhoca/wxgui/frontend.py:1378
+#: ../pyhoca/wxgui/frontend.py:1408
 #, python-format
 msgid ""
 "The server denies client-side printing from within this session.\n"
@@ -1145,12 +1206,12 @@ msgstr ""
 "Servern tillåter ej utskrifter via klient från denna session.\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1390
+#: ../pyhoca/wxgui/frontend.py:1420
 #, python-format
 msgid "%s - MIME box not available"
 msgstr "%s - MIME ej tillgängligt"
 
-#: ../pyhoca/wxgui/frontend.py:1390
+#: ../pyhoca/wxgui/frontend.py:1420
 #, python-format
 msgid ""
 "The server does not support the X2Go MIME box.\n"
@@ -1159,12 +1220,12 @@ msgstr ""
 "Servern stöder ej X2Go MIME.\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1402
+#: ../pyhoca/wxgui/frontend.py:1432
 #, python-format
 msgid "%s - client-side folders not sharable"
 msgstr "%s - klientmappar ej delningsbara"
 
-#: ../pyhoca/wxgui/frontend.py:1402
+#: ../pyhoca/wxgui/frontend.py:1432
 #, python-format
 msgid ""
 "The server denies client-side folder sharing with this session.\n"
@@ -1173,12 +1234,12 @@ msgstr ""
 "Servern tillåter ej klientdelade mappar i denna session.\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1414
+#: ../pyhoca/wxgui/frontend.py:1444
 #, python-format
 msgid "%s - client resources not sharable"
 msgstr "%s - klientresurser ej delningsbara"
 
-#: ../pyhoca/wxgui/frontend.py:1414
+#: ../pyhoca/wxgui/frontend.py:1444
 #, python-format
 msgid ""
 "Client-side folders and printers cannot be shared with this session.\n"
@@ -1187,12 +1248,12 @@ msgstr ""
 "Klientdelade mappar och utskrifter kan ej delas med denna session.\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1433 ../pyhoca/wxgui/frontend.py:1435
+#: ../pyhoca/wxgui/frontend.py:1463 ../pyhoca/wxgui/frontend.py:1465
 #, python-format
 msgid "%s - print error"
 msgstr "%s - utskriftsfel"
 
-#: ../pyhoca/wxgui/frontend.py:1433
+#: ../pyhoca/wxgui/frontend.py:1463
 #, python-format
 msgid ""
 "%s\n"
@@ -1203,7 +1264,7 @@ msgstr ""
 "... orsakat på skrivare %s av session\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1435
+#: ../pyhoca/wxgui/frontend.py:1465
 #, python-format
 msgid ""
 "%s\n"
@@ -1214,12 +1275,12 @@ msgstr ""
 "...orsakat av session\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1450 ../pyhoca/wxgui/frontend.py:1465
+#: ../pyhoca/wxgui/frontend.py:1480 ../pyhoca/wxgui/frontend.py:1495
 #, python-format
 msgid "%s - start"
 msgstr "%s - startar"
 
-#: ../pyhoca/wxgui/frontend.py:1450
+#: ../pyhoca/wxgui/frontend.py:1480
 #, python-format
 msgid ""
 "New X2Go session starting up...\n"
@@ -1228,7 +1289,7 @@ msgstr ""
 "Ny X2Go-session startar ...\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1465
+#: ../pyhoca/wxgui/frontend.py:1495
 #, python-format
 msgid ""
 "Another client started X2Go session\n"
@@ -1237,12 +1298,12 @@ msgstr ""
 "En annan klient startade X2Go-session\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1480 ../pyhoca/wxgui/frontend.py:1495
+#: ../pyhoca/wxgui/frontend.py:1510 ../pyhoca/wxgui/frontend.py:1525
 #, python-format
 msgid "%s - resume"
 msgstr "%s - återanslut"
 
-#: ../pyhoca/wxgui/frontend.py:1480
+#: ../pyhoca/wxgui/frontend.py:1510
 #, python-format
 msgid ""
 "Resuming X2Go session...\n"
@@ -1251,7 +1312,7 @@ msgstr ""
 "Ã…teransluter X2Go-session...\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1495
+#: ../pyhoca/wxgui/frontend.py:1525
 #, python-format
 msgid ""
 "Another client resumed X2Go session\n"
@@ -1260,12 +1321,12 @@ msgstr ""
 "En annan klient återanslöt X2Go-session\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1510
+#: ../pyhoca/wxgui/frontend.py:1540
 #, python-format
 msgid "%s - running"
 msgstr "%s - aktiv"
 
-#: ../pyhoca/wxgui/frontend.py:1510
+#: ../pyhoca/wxgui/frontend.py:1540
 #, python-format
 msgid ""
 "Found already running session\n"
@@ -1274,12 +1335,12 @@ msgstr ""
 "Hittade aktiv session\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1530
+#: ../pyhoca/wxgui/frontend.py:1560
 #, python-format
 msgid "%s - suspend"
 msgstr "%s - vila"
 
-#: ../pyhoca/wxgui/frontend.py:1530
+#: ../pyhoca/wxgui/frontend.py:1560
 #, python-format
 msgid ""
 "X2Go Session has been suspended\n"
@@ -1288,12 +1349,12 @@ msgstr ""
 "X2Go-session har försatts i vila\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1557
+#: ../pyhoca/wxgui/frontend.py:1587
 #, python-format
 msgid "%s - terminate"
 msgstr "%s - avsluta"
 
-#: ../pyhoca/wxgui/frontend.py:1557
+#: ../pyhoca/wxgui/frontend.py:1587
 #, python-format
 msgid ""
 "X2Go Session has terminated\n"
@@ -1302,7 +1363,7 @@ msgstr ""
 "X2Go-session har avslutats\n"
 "%s"
 
-#: ../pyhoca/wxgui/messages.py:74
+#: ../pyhoca/wxgui/messages.py:73
 #, python-format
 msgid ""
 "Are you really sure you want to\n"
@@ -1311,7 +1372,7 @@ msgstr ""
 "Är du säker på att du vill\n"
 "radera sessionsprofilen ,,%s''?"
 
-#: ../pyhoca/wxgui/messages.py:75
+#: ../pyhoca/wxgui/messages.py:74
 #, python-format
 msgid ""
 "PyHoca-GUI is already running for user ,,%s''!\n"
@@ -1325,15 +1386,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:108
+#: ../pyhoca/wxgui/messages.py:107
 msgid "Yes"
 msgstr "Ja"
 
-#: ../pyhoca/wxgui/messages.py:109
+#: ../pyhoca/wxgui/messages.py:108
 msgid "No"
 msgstr "Nej"
 
-#: ../pyhoca/wxgui/messages.py:126 ../pyhoca/wxgui/printingprefs.py:142
+#: ../pyhoca/wxgui/messages.py:125 ../pyhoca/wxgui/printingprefs.py:142
 msgid "Ok"
 msgstr "OK"
 
@@ -1436,6 +1497,20 @@ msgstr "Ändra sessionstitel till"
 msgid "OK"
 msgstr "OK"
 
+#, fuzzy
+#~ msgid "Remember shared folders"
+#~ msgstr "Delade &mappar"
+
+#, fuzzy
+#~ msgid "Shared Resources"
+#~ msgstr "Delade &mappar"
+
+#~ msgid "RSA/DSA private key"
+#~ msgstr "RSA/DSA privat nyckel"
+
+#~ msgid "Host[:Port]"
+#~ msgstr "Server[:Port]"
+
 #~ msgid "us"
 #~ msgstr "se"
 
diff --git a/pyhoca/wxgui/__init__.py b/pyhoca/wxgui/__init__.py
index 910c752..0fe95eb 100644
--- a/pyhoca/wxgui/__init__.py
+++ b/pyhoca/wxgui/__init__.py
@@ -18,6 +18,6 @@
 # Free Software Foundation, Inc.,
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-__VERSION__ = '0.2.0.4'
+__VERSION__ = '0.2.1.0'
 
 from frontend import *
diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py
index 77e9d75..b52659e 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
@@ -35,7 +35,6 @@ try:
 except: pass
 
 import os
-import re
 
 # Python X2go
 import x2go
@@ -45,10 +44,6 @@ gevent.monkey.patch_all()
 
 import wx
 
-import time
-import sys
-import platform
-import types
 import copy
 import threading
 import locale
@@ -57,7 +52,6 @@ import locale
 import about
 import logon
 import taskbar
-import menus_taskbar
 import profilemanager
 import printingprefs
 import notify
@@ -69,31 +63,31 @@ import sessiontitle
 wx.SetDefaultPyEncoding("utf-8")
 wx.InitAllImageHandlers()
 
-def SetExitHandler(func):
-    """\
-    An exit handler function for MS Windows / Unix. Currently unused.
-
-    @param func: function that shall get registered with win32api as exit handler.
-    @type func: C{func}
-
-    """
-    if os.name == 'nt' :
-        try :
-            import win32api
-            result = win32api.SetConsoleCtrlHandler( func, True )
-            if result == 0:
-                print '\nCould not SetConsoleCtrlHandler (error %r)\n' % win32api
-            else :
-                print '\nSetConsoleCtrlHandler SUCCESS\n'
-
-        except ImportError :
-            version = '.'.join( map( str, sys.version_info[ :2] ) )
-            raise Exception( 'PyWin32 (win32api) is not installed.' )
-
-    else :
-        import signal
-        signal.signal( signal.SIGTERM, func )
-        signal.signal( signal.SIGINT, func )
+#def SetExitHandler(func):
+#    """\
+#    An exit handler function for MS Windows / Unix. Currently unused.
+#
+#    @param func: function that shall get registered with win32api as exit handler.
+#    @type func: C{func}
+#
+#    """
+#    if os.name == 'nt' :
+#        try :
+#            import win32api
+#            result = win32api.SetConsoleCtrlHandler( func, True )
+#            if result == 0:
+#                print '\nCould not SetConsoleCtrlHandler (error %r)\n' % win32api
+#            else :
+#                print '\nSetConsoleCtrlHandler SUCCESS\n'
+#
+#        except ImportError :
+#            #version = '.'.join( map( str, sys.version_info[ :2] ) )
+#            raise Exception( 'PyWin32 (win32api) is not installed.' )
+#
+#    else :
+#        import signal
+#        signal.signal( signal.SIGTERM, func )
+#        signal.signal( signal.SIGINT, func )
 
 
 class PyHocaGUI(wx.App, x2go.X2goClient):
@@ -180,6 +174,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
             'auto_update_listmounts_cache': True,
             'auto_update_sessionregistry': True,
             'auto_register_sessions': True,
+            'no_auto_reg_pubapp_sessions': True,
             'logger': self._pyhoca_liblogger,
         }
         if self.args.backend_controlsession is not None:
@@ -323,8 +318,10 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
         self._eventid_unshared_folders_map = {}
         self._eventid_pubapp_execmap = {}
         self._temp_launching_pubapp_profiles = []
+        self._temp_launching_pubapp_locks = {}
         self._temp_disabled_profile_names = []
         self._temp_disabled_session_names = {}
+        self._remember_shared_folders = {}
 
         self.profilemanager_disabled = self.args.disable_profilemanager
         self.printingprefs_disabled = self.args.disable_printingprefs
@@ -484,6 +481,9 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
         if profile_name is None and session_uuid:
             profile_name = self._X2goClient__get_session_profile_name(session_uuid)
 
+        if not self._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):
             return None
 
@@ -496,6 +496,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
             if len(self.client_pubapp_sessions_of_profile_name(profile_name=profile_name)):
                 return False
 
+            self._temp_launching_pubapp_locks[profile_name].acquire()
             if profile_name not in self._temp_launching_pubapp_profiles:
                 self._temp_launching_pubapp_profiles.append(profile_name)
 
@@ -516,7 +517,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() ]
@@ -553,6 +554,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
 
             if profile_name in self._temp_launching_pubapp_profiles:
                 self._temp_launching_pubapp_profiles.remove(profile_name)
+            self._temp_launching_pubapp_locks[profile_name].release()
 
             return pubapp_session_started | pubapp_session_resumed
 
@@ -597,6 +599,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
             _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):
@@ -607,24 +610,27 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
                     except ValueError:
                         pass
                 else:
-                    self.notifier.send(_(u'%s - connect') % profile_name, _(u'Public SSH key authentication has been successful.'), icon='auth_success', timeout=4000)
-                    _dummy = self._X2goClient__list_sessions(session_uuid, refresh_cache=True, update_sessionregistry=True)
+                    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._post_authenticate(evt, session_uuid)
                     try:
                         self._temp_disabled_profile_names.remove(profile_name)
                     except ValueError:
                         pass
             else:
-                _logon_window = logon.PyHocaGUI_DialogBoxPassword(self, profile_name, caller=self, sshproxy_auth=(not _can_sshproxy_auto_connect) and _session_uses_sshproxy)
+                _logon_window = logon.PyHocaGUI_DialogBoxPassword(self, profile_name, caller=self, sshproxy_auth=((not _can_sshproxy_auto_connect) and _session_uses_sshproxy and (not _session_reuses_sshproxy_authinfo)))
                 self._logon_windows[profile_name] = _logon_window
 
         except x2go.AuthenticationException:
-            self._pyhoca_logger('public SSH key authentication to server failed, trying next auth-mechanism', loglevel=x2go.log.loglevel_INFO, )
+            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:
-            self._pyhoca_logger('public SSH key authentication for SSH proxy failed, trying next auth-mechanism', loglevel=x2go.log.loglevel_INFO, )
-            _logon_window = logon.PyHocaGUI_DialogBoxPassword(self, profile_name, caller=self, sshproxy_auth=True )
+            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, )
+            else:
+                _logon_window = logon.PyHocaGUI_DialogBoxPassword(self, profile_name, caller=self, sshproxy_auth=True, )
             self._logon_windows[profile_name] = _logon_window
         except x2go.SSHException, e:
             self.notifier.send(_(u'%s - SSH error') % profile_name, u'%s!' % str(e), icon='auth_error', timeout=4000)
@@ -676,7 +682,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
                 pass
             connect_failed = True
         except x2go.X2goRemoteHomeException, e:
-            self._PyHocaGUI.notifier.send(_(u'%s - missing home directory') % profile_name, _("The remote user's home directory does not exist."), icon='auth_error', timeout=4000)
+            self.notifier.send(_(u'%s - missing home directory') % profile_name, _("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:
@@ -703,6 +709,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
             self.WakeUpIdle()
             self.ExitMainLoop()
 
+        self._remember_shared_folders[profile_name] = self.get_profile_config(profile_name)['restoreexports']
         self.taskbar.SetIconIdle()
 
     def OnSessionAuthenticate(self, evt, session_uuid=None):
@@ -716,6 +723,14 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
 
         """
         profile_name = self._eventid_profilenames_map[evt.GetId()]
+        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),
+                                                 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)
@@ -736,11 +751,10 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
 
         """
         profile_name = self._eventid_profilenames_map[evt.GetId()]
-        _query_session = self._X2goClient__client_registered_sessions_of_profile_name(profile_name)[0]
         session_uuid = self._X2goClient__register_session(profile_name=profile_name, published_applications=False)
         if self._X2goClient__server_is_alive(session_uuid):
             gevent.spawn(self._X2goClient__start_session, session_uuid)
-            _dummy = self._X2goClient__list_sessions(session_uuid, refresh_cache=True)
+            self._X2goClient__list_sessions(session_uuid, refresh_cache=True)
 
     def OnPubAppSessionStart(self, evt):
         """\
@@ -780,7 +794,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
             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, e:
+                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
@@ -795,11 +809,10 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
         """
         profile_name = self._eventid_profilenames_map[evt.GetId()]
         _application = self._eventid_applications_map[evt.GetId()]
-        _query_session = self._X2goClient__client_registered_sessions_of_profile_name(profile_name)[0]
         session_uuid = self._X2goClient__register_session(profile_name=profile_name, cmd=_application, session_type="application")
         if self._X2goClient__server_is_alive(session_uuid):
             gevent.spawn(self._X2goClient__start_session, session_uuid)
-            _dummy = self._X2goClient__list_sessions(session_uuid, refresh_cache=True)
+            self._X2goClient__list_sessions(session_uuid, refresh_cache=True)
 
     def _disable_session_name(self, profile_name, session_name):
         """\
@@ -873,7 +886,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
         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)
-            _dummy = self._X2goClient__list_sessions(session_uuid, refresh_cache=True)
+            self._X2goClient__list_sessions(session_uuid, refresh_cache=True)
         self._eventid_sessionnames_map = {}
 
     def OnSessionSuspend(self, evt):
@@ -965,6 +978,11 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
         except KeyError:
             pass
 
+        try:
+            del self._remember_shared_folders[profile_name]
+        except KeyError:
+            pass
+
     def OnProfileAdd(self, evt):
         """\
         Gets called if the user chooses to add a new session profile.
@@ -985,6 +1003,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
 
         """
         profile_name = self._eventid_profilenames_map[evt.GetId()]
+        self._temp_disabled_profile_names.append(profile_name)
         self._pyhoca_logger('editing session profile %s' % profile_name, loglevel=x2go.log.loglevel_INFO, )
         if self.args.single_session_profile:
             _edit_action = "EDIT_EXPLICITLY"
@@ -1001,6 +1020,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
 
         """
         profile_name = self._eventid_profilenames_map[evt.GetId()]
+        self._temp_disabled_profile_names.append(profile_name)
         self._pyhoca_logger('using session profile %s as template for new profile' % profile_name, loglevel=x2go.log.loglevel_INFO, )
         profilemanager.PyHocaGUI_ProfileManager(self, 'COPY', profile_name=profile_name)
 
@@ -1013,6 +1033,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
 
         """
         profile_name = self._eventid_profilenames_map[evt.GetId()]
+        self._temp_disabled_profile_names.append(profile_name)
         self._pyhoca_logger('editing session profile %s' % profile_name, loglevel=x2go.log.loglevel_INFO, )
         profilemanager.PyHocaGUI_ProfileManager(self, 'EDIT_CONNECTED', profile_name=profile_name)
 
@@ -1025,6 +1046,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
 
         """
         profile_name = self._eventid_profilenames_map[evt.GetId()]
+        self._temp_disabled_profile_names.append(profile_name)
 
         m = messages.PyHoca_MessageWindow_NoYes(self, shortmsg='REALLY_DELETE_PROFILE', title=_(u'Really Delete Session Profile ,,%s\'\'?') % profile_name, icon='question', profile_name=profile_name)
         m.ShowModal()
@@ -1035,6 +1057,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
                 self.notifier.send(title=_(u'%s - profile deleted') % profile_name, text=_(u'The session profile has been deleted.'), icon='profile_delete')
             except:
                 pass
+        self._temp_disabled_profile_names.remove(profile_name)
 
     def OnShareCustomLocalFolder(self, evt):
         """\
@@ -1057,6 +1080,19 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
             # 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()))
 
+    def OnRememberSharedFolders(self, evt):
+        """\
+        Gets called if the user toggles the checkbox of the ,,Remember shared folders'' menu item.
+
+        @param evt: event
+        @type evt: C{obj}
+
+        """
+        profile_name = self._eventid_profilenames_map[evt.GetId()]
+        self._remember_shared_folders[profile_name] = not self._remember_shared_folders[profile_name]
+
+        self.set_profile_config(profile_name, 'restoreexports', self._remember_shared_folders[profile_name])
+
     def OnUnshareAllLocalFolders(self, evt):
         """\
         Gets called if the user chooses to unshare all shared local folders from the running X2Go session.
@@ -1122,7 +1158,6 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
         @type evt: C{obj}
 
         """
-        profile_name = self._eventid_profilenames_map[evt.GetId()]
         session_name = self._eventid_sessionnames_map[evt.GetId()]
         _s = self._X2goClient__get_session_of_session_name(session_name, return_object=True)
         _s.raise_session_window()
@@ -1157,7 +1192,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
 
         """
         self._pyhoca_logger('opening the printing preferences window', loglevel=x2go.log.loglevel_INFO, )
-        _pp_dialog = printingprefs.PyHocaGUI_PrintingPreferences(self)
+        printingprefs.PyHocaGUI_PrintingPreferences(self)
 
     def OnClose(self, evt):
         """\
@@ -1199,7 +1234,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
             # use a dummy parent...
             _parent = None
 
-        m = messages.PyHoca_MessageWindow_NoYes(self, parent=_parent, custom_message=_message, title=_(u'%s: Confirm Host Authorization') % profile_name, icon='profile_warning')
+        m = messages.PyHoca_MessageWindow_NoYes(self, parent=_parent, msg=_message, title=_(u'%s: Confirm Host Authorization') % profile_name, icon='profile_warning')
 
         if _parent:
             m.ShowModal()
diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py
index e5ba605..fca8600 100644
--- a/pyhoca/wxgui/logon.py
+++ b/pyhoca/wxgui/logon.py
@@ -39,13 +39,7 @@ import gevent.monkey
 gevent.monkey.patch_all()
 
 import wx
-import time
 import os
-import sys
-import platform
-import types
-import copy
-import threading
 
 # PyHoca-GUI modules
 # ... NONE ...
@@ -195,7 +189,11 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog):
         if self.sshproxy_auth:
 
             if self.current_profile_config.has_key('sshproxyuser'):
-                self.sshProxyUserTxt.SetValue(self.current_profile_config['sshproxyuser'])
+                if self.current_profile_config.has_key('sshproxysameuser') and not self.current_profile_config['sshproxysameuser']:
+                    self.sshProxyUserTxt.SetValue(self.current_profile_config['sshproxyuser'])
+            if self.current_profile_config.has_key('user'):
+                if self.current_profile_config.has_key('sshproxysameuser') and self.current_profile_config['sshproxysameuser']:
+                    self.sshProxyUserTxt.SetValue(self.current_profile_config['user'])
 
         # Logged in variable 
         self.loggedIn = False
@@ -262,6 +260,10 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog):
             self.sshProxyLoginBtn.Enable(False)
             self.cancelBtn.Enable(False)
 
+        elif self.current_profile_config['sshproxysamepass']:
+            sshproxy_user = None
+            sshproxy_password = self.passwordTxt.GetValue()
+
         else:
             sshproxy_user = sshproxy_password = None
 
@@ -273,8 +275,10 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog):
 
         if self.sshproxy_auth and (not self.sshproxy_started):
             force_password_auth=False
+            sshproxy_force_password_auth = True
         else:
             force_password_auth=True
+            sshproxy_force_password_auth = True
 
         wx.BeginBusyCursor()
         session_uuid = self._PyHocaGUI._X2goClient__client_registered_sessions_of_profile_name(self.current_profile_name)[0]
@@ -282,14 +286,15 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog):
             self._PyHocaGUI._X2goClient__connect_session(session_uuid, 
                                                          username=username, 
                                                          password=password, 
-                                                         force_password_auth=force_password_auth, 
+                                                         force_password_auth=force_password_auth,
                                                          add_to_known_hosts=False,
-                                                         sshproxy_user=sshproxy_user, 
-                                                         sshproxy_password=sshproxy_password
+                                                         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):
-                self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name, 
-                                                 title=_(u'%s - connect failure') % self.current_profile_name, 
+                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!'),
                                                  icon='auth_error')
                 self._PyHocaGUI.OnServerDisconnect(evt)
@@ -339,19 +344,25 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog):
         except x2go.X2goSSHProxyAuthenticationException:
             try: wx.EndBusyCursor()
             except: pass
-            self._PyHocaGUI.notifier.send(title=_(u'%s - SSH proxy') % self.current_profile_name, 
-                                          text=_(u'Authentication to the SSH proxy server failed!'),
-                                          icon='auth_failed')
-            if self.sshproxy_auth:
-                self.sshProxyPasswordTxt.SetValue('')
-                self.sshProxyHeaderLbl.Enable(True)
-                self.sshProxyUserLbl.Enable(True)
-                self.sshProxyUserTxt.Enable(True)
-                self.sshProxyPasswordLbl.Enable(True)
-                self.sshProxyPasswordTxt.Enable(True)
-                self.sshProxyLoginBtn.Enable(True)
-            self.cancelBtn.Enable(True)
-            return
+            self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name,
+                                             title=_(u'%s - SSH proxy') % self.current_profile_name, 
+                                             text=_(u'Authentication to the SSH proxy server failed!'),
+                                             icon='auth_failed')
+
+            if not self.current_profile_config['sshproxysamepass']:
+                self._PyHocaGUI.notifier.send(self.current_profile_name, context='AUTH_%s' % self.current_profile_name, timeout=4000)
+                if self.sshproxy_auth:
+                    self.sshProxyPasswordTxt.SetValue('')
+                    self.sshProxyHeaderLbl.Enable(True)
+                    self.sshProxyUserLbl.Enable(True)
+                    self.sshProxyUserTxt.Enable(True)
+                    self.sshProxyPasswordLbl.Enable(True)
+                    self.sshProxyPasswordTxt.Enable(True)
+                    self.sshProxyLoginBtn.Enable(True)
+                self.cancelBtn.Enable(True)
+                return
+            else:
+                connect_failed = True
 
         #except gevent.dns.DNSError, e:
         #    self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name, 
diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py
index 304e807..8fb35ab 100644
--- a/pyhoca/wxgui/menus_taskbar.py
+++ b/pyhoca/wxgui/menus_taskbar.py
@@ -31,7 +31,6 @@ except: pass
 import os.path
 import wx
 import re
-import copy
 import StringIO
 import base64
 
@@ -119,7 +118,7 @@ class PyHocaGUI_Menu_TaskbarOptionsManager(wx.Menu):
                                                           submenu=PyHocaGUI_Menu_TaskbarProfileNames(self._PyHocaGUI,
                                                                                                      caller=self,
                                                                                                      filter_profiles=[],
-                                                                                                     disabled_profiles=self._PyHocaGUI.client_connected_profiles(return_profile_names=True),
+                                                                                                     disabled_profiles=self._PyHocaGUI.client_connected_profiles(return_profile_names=True) + self._PyHocaGUI._temp_disabled_profile_names,
                                                                                                      submenu=PyHocaGUI_Menu_TaskbarManageProfile,
                                                                                                      group_menus=True,
                                                                                                     )
@@ -225,7 +224,7 @@ class PyHocaGUI_Menu_TaskbarSessionActions(wx.Menu):
            _session_status == 'R' and \
            not _s.is_published_applications_provider():
 
-            _title = self.Append(text=_("Window title") + ": " + _s.get_session_title(), id=wx.NewId())
+            self.Append(text=_("Window title") + ": " + _s.get_session_title(), id=wx.NewId())
             self.AppendSeparator()
 
         if _session_status == 'S':
@@ -268,7 +267,7 @@ class PyHocaGUI_Menu_TaskbarSessionActions(wx.Menu):
 
         if _s is not None and _s.is_published_applications_provider() and self._PyHocaGUI.get_profile_config(profile_name)['published']:
             self.AppendSeparator()
-            _rmi = self.Append(text=_(u"Refresh menu tree"), id=ID_REFRESHMENU)
+            self.Append(text=_(u"Refresh menu tree"), id=ID_REFRESHMENU)
 
         if _s is not None and \
            _s.get_session_type() in ('D', 'S') and \
@@ -313,28 +312,22 @@ class PyHocaGUI_Menu_TaskbarProfileSharedFolders(wx.Menu):
 
         ID_SHARECUSTOMLOCALFOLDER = wx.NewId()
         ID_UNSHAREALLLOCALFOLDERS = wx.NewId()
+        ID_REMEMBERSHAREDFOLDERS = wx.NewId()
 
         # preparing profile_name information for the main PyHocaGUI instance
         self._PyHocaGUI._eventid_profilenames_map[ID_SHARECUSTOMLOCALFOLDER] = \
-            self._PyHocaGUI._eventid_profilenames_map[ID_UNSHAREALLLOCALFOLDERS] = profile_name
+            self._PyHocaGUI._eventid_profilenames_map[ID_UNSHAREALLLOCALFOLDERS] = \
+            self._PyHocaGUI._eventid_profilenames_map[ID_REMEMBERSHAREDFOLDERS] = profile_name
 
-        _share_folder = self.Append(id=ID_SHARECUSTOMLOCALFOLDER, text=_(u"&Share custom local folder"))
+        self.Append(id=ID_SHARECUSTOMLOCALFOLDER, text=_(u"&Share custom local folder"))
 
         self.AppendSeparator()
 
-        # FIXME: move this into python-x2go
-
-        _profile_config = self._PyHocaGUI.get_profile_config(profile_name)
-        _exported_folders = _profile_config['export'].replace(',', ';')
-        _exported_folders = _exported_folders.strip().strip('"').strip().strip(';').strip()
-        _exported_folders_list = _exported_folders.split(';')
-
-        _sharable_folders = []
+        _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 []
 
-        for _folder in _exported_folders_list:
-            if ':' not in _folder: _folder = '%s:1' % _folder
-            _folder_path = ':'.join(_folder.split(':')[:-1])
+        _sharable_folders = []
+        for _folder_path in _exported_folders.keys():
             _sharable_folders.append(_folder_path)
 
         self._PyHocaGUI._eventid_unshared_folders_map={}
@@ -344,29 +337,31 @@ class PyHocaGUI_Menu_TaskbarProfileSharedFolders(wx.Menu):
             self.Append(id=wx.NewId(), text=_(u'Share:'))
             for _unshared_folder in _unshared_folders:
                 ID_THISFOLDER = wx.NewId()
-                _unshared_folder_item = self.Append(id=ID_THISFOLDER, text="      %s" % _unshared_folder)
+                self.Append(id=ID_THISFOLDER, text="      %s" % _unshared_folder)
                 self._PyHocaGUI._eventid_profilenames_map[ID_THISFOLDER] = profile_name
                 self._PyHocaGUI._eventid_unshared_folders_map[ID_THISFOLDER] = _unshared_folder
                 self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnShareLocalFolder, id=ID_THISFOLDER)
 
-            self.AppendSeparator()
-
         if _shared_folders:
             self.Append(id=wx.NewId(), text=_(u'Unshare:'))
             for _shared_folder in _shared_folders:
                 ID_THISFOLDER = wx.NewId()
-                _shared_folder_item = self.Append(id=ID_THISFOLDER, text="      %s" % _shared_folder)
+                self.Append(id=ID_THISFOLDER, text="      %s" % _shared_folder)
                 self._PyHocaGUI._eventid_profilenames_map[ID_THISFOLDER] = profile_name
                 self._PyHocaGUI._eventid_shared_folders_map[ID_THISFOLDER] = _shared_folder
                 self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnUnshareLocalFolder, id=ID_THISFOLDER)
 
-            self.AppendSeparator()
-
         _unshare_folders = self.Append(id=ID_UNSHAREALLLOCALFOLDERS, text=_(u"Unshare &all local folders"))
         if not _shared_folders:
             _unshare_folders.Enable(False)
 
+        self.AppendSeparator()
+
+        _remember_shared_folders_item = self.AppendCheckItem(id=ID_REMEMBERSHAREDFOLDERS, text=_(u"Restore shares in next session"))
+        _remember_shared_folders_item.Check(self._PyHocaGUI._remember_shared_folders[profile_name])
+
         self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnShareCustomLocalFolder, id=ID_SHARECUSTOMLOCALFOLDER)
+        self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnRememberSharedFolders, id=ID_REMEMBERSHAREDFOLDERS)
         self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnUnshareAllLocalFolders, id=ID_UNSHAREALLLOCALFOLDERS)
 
 
@@ -750,7 +745,10 @@ class PyHocaGUI_Menu_TaskbarSessionProfile(wx.Menu):
                     self._PyHocaGUI._eventid_profilenames_map[ID_SHARELOCALFOLDER] = \
                     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):
+                if current_profile_config['useexports'] 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()):
 
                     if self._PyHocaGUI.restricted_trayicon:
                         self.AppendSeparator()
@@ -865,18 +863,18 @@ class PyHocaGUI_Menu_TaskbarProfileNames(wx.Menu):
                     filter_profiles.append(profile_name)
 
                 _this_id = wx.NewId()
-                _group = self.AppendMenu(text=profile_group, id=_this_id,
-                                         submenu=PyHocaGUI_Menu_TaskbarProfileNames(self._PyHocaGUI, 
-                                                                                    caller=self,
-                                                                                    sub_profile_items=_sub_profile_items,
-                                                                                    filter_profiles=[],
-                                                                                    disabled_profiles=disabled_profiles,
-                                                                                    submenu=submenu,
-                                                                                    bind_method=bind_method,
-                                                                                    group_name=profile_group,
-                                                                                    parent_group=_parent_group,
-                                                                                    group_menus=True)
-                                        )
+                self.AppendMenu(text=profile_group, id=_this_id,
+                                     submenu=PyHocaGUI_Menu_TaskbarProfileNames(self._PyHocaGUI, 
+                                                                                caller=self,
+                                                                                sub_profile_items=_sub_profile_items,
+                                                                                filter_profiles=[],
+                                                                                disabled_profiles=disabled_profiles,
+                                                                                submenu=submenu,
+                                                                                bind_method=bind_method,
+                                                                                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 ]
@@ -950,7 +948,7 @@ class PyHocaGUI_Menu_TaskbarSessionManager(wx.Menu):
                         submenu=PyHocaGUI_Menu_TaskbarProfileNames(self._PyHocaGUI, 
                                                                    caller=self,
                                                                    filter_profiles=[],
-                                                                   disabled_profiles=self._PyHocaGUI.client_connected_sessions(return_profile_names=True),
+                                                                   disabled_profiles=self._PyHocaGUI.client_connected_profiles(return_profile_names=True) + self._PyHocaGUI._temp_disabled_profile_names,
                                                                    bind_method=self._PyHocaGUI.OnSessionAuthenticate))
         self.AppendSeparator()
 
diff --git a/pyhoca/wxgui/messages.py b/pyhoca/wxgui/messages.py
index ffb9577..2fe0a10 100644
--- a/pyhoca/wxgui/messages.py
+++ b/pyhoca/wxgui/messages.py
@@ -24,7 +24,6 @@
 
 import wx
 import os
-import gevent
 
 # PyHoca-GUI modules
 import basepath
@@ -39,7 +38,7 @@ class PyHoca_MessageWindow(wx.Dialog):
     A simple message window for L{PyHocaGUI}.
 
     """
-    def __init__(self, _PyHocaGUI, parent=None, title=None, shortmsg=None, custom_message=None, icon=None, buttontype='ok', 
+    def __init__(self, _PyHocaGUI, parent=None, title=None, shortmsg=None, msg=None, icon=None, buttontype='ok', 
                  profile_name=None,
                  session_name=None):
         """\
@@ -53,8 +52,8 @@ class PyHoca_MessageWindow(wx.Dialog):
         @type title: C{str}
         @param shortmsg: a short string that refers to a pre-defined message (hard-coded in this class)
         @type shortmsg: C{str}
-        @param custom_message: the message to be shown in this message box (alternative to C{shortmsg})
-        @type custom_message: C{str}
+        @param msg: the message to be shown in this message box (alternative to C{shortmsg})
+        @type msg: C{str}
         @param icon: icon name for an icon to be shown left of the text in this message box
         @type icon: C{str}
         @param buttontype: button types can be: C{ok}, C{okcancel}, C{cancelok}, C{yesno}, and C{noyes}
@@ -77,7 +76,7 @@ class PyHoca_MessageWindow(wx.Dialog):
 
 
         if shortmsg is None:
-            show_message = custom_message
+            show_message = msg
         elif shortmsg in self._pyhoca_messages.keys():
             show_message = self._pyhoca_messages[shortmsg]
         else:
@@ -237,7 +236,7 @@ class PyHoca_MessageWindow_Ok(PyHoca_MessageWindow):
     A simple ,,Ok'' message window for L{PyHocaGUI}.
 
     """
-    def __init__(self, _PyHocaGUI, parent=None, title=None, shortmsg=None, custom_message=None, icon='session_warning', **kwargs):
+    def __init__(self, _PyHocaGUI, parent=None, title=None, shortmsg=None, msg=None, icon='session_warning', **kwargs):
         """\
         @param _PyHocaGUI: main application instance
         @type _PyHocaGUI: C{obj}
@@ -247,15 +246,15 @@ class PyHoca_MessageWindow_Ok(PyHoca_MessageWindow):
         @type title: C{str}
         @param shortmsg: a short string that refers to a pre-defined message (hard-coded in this class)
         @type shortmsg: C{str}
-        @param custom_message: the message to be shown in this message box (alternative to C{shortmsg})
-        @type custom_message: C{str}
+        @param msg: the message to be shown in this message box (alternative to C{shortmsg})
+        @type msg: C{str}
         @param icon: icon name for an icon to be shown left of the text in this message box
         @type icon: C{str}
         @param kwargs: any other optional argument (will be ignored)
         @type kwargs: C{dict}
 
         """
-        PyHoca_MessageWindow.__init__(self, _PyHocaGUI, parent=parent, title=title, shortmsg=shortmsg, custom_message=custom_message, icon=icon, buttontype='ok', **kwargs)
+        PyHoca_MessageWindow.__init__(self, _PyHocaGUI, parent=parent, title=title, shortmsg=shortmsg, msg=msg, icon=icon, buttontype='ok', **kwargs)
 
 
 class PyHoca_MessageWindow_OkCancel(PyHoca_MessageWindow):
@@ -263,7 +262,7 @@ class PyHoca_MessageWindow_OkCancel(PyHoca_MessageWindow):
     A simple ,,Ok+Cancel'' (default: Ok) message window for L{PyHocaGUI}.
 
     """
-    def __init__(self, _PyHocaGUI, parent=None, title=None, shortmsg=None, custom_message=None, icon='session_warning', **kwargs):
+    def __init__(self, _PyHocaGUI, parent=None, title=None, shortmsg=None, msg=None, icon='session_warning', **kwargs):
         """\
         @param _PyHocaGUI: main application instance
         @type _PyHocaGUI: C{obj}
@@ -273,15 +272,15 @@ class PyHoca_MessageWindow_OkCancel(PyHoca_MessageWindow):
         @type title: C{str}
         @param shortmsg: a short string that refers to a pre-defined message (hard-coded in this class)
         @type shortmsg: C{str}
-        @param custom_message: the message to be shown in this message box (alternative to C{shortmsg})
-        @type custom_message: C{str}
+        @param msg: the message to be shown in this message box (alternative to C{shortmsg})
+        @type msg: C{str}
         @param icon: icon name for an icon to be shown left of the text in this message box
         @type icon: C{str}
         @param kwargs: any other optional argument (will be ignored)
         @type kwargs: C{dict}
 
         """
-        PyHoca_MessageWindow.__init__(self, _PyHocaGUI, parent=parent, title=title, shortmsg=shortmsg, custom_message=custom_message,  icon=icon, buttontype='okcancel', **kwargs)
+        PyHoca_MessageWindow.__init__(self, _PyHocaGUI, parent=parent, title=title, shortmsg=shortmsg, msg=msg,  icon=icon, buttontype='okcancel', **kwargs)
 
 
 class PyHoca_MessageWindow_CancelOk(PyHoca_MessageWindow):
@@ -289,7 +288,7 @@ class PyHoca_MessageWindow_CancelOk(PyHoca_MessageWindow):
     A simple ,,Ok+Cancel'' (default: Cancel) message window for L{PyHocaGUI}.
 
     """
-    def __init__(self, _PyHocaGUI, parent=None, title=None, shortmsg=None, custom_message=None, icon='session_warning', **kwargs):
+    def __init__(self, _PyHocaGUI, parent=None, title=None, shortmsg=None, msg=None, icon='session_warning', **kwargs):
         """\
         @param _PyHocaGUI: main application instance
         @type _PyHocaGUI: C{obj}
@@ -299,15 +298,15 @@ class PyHoca_MessageWindow_CancelOk(PyHoca_MessageWindow):
         @type title: C{str}
         @param shortmsg: a short string that refers to a pre-defined message (hard-coded in this class)
         @type shortmsg: C{str}
-        @param custom_message: the message to be shown in this message box (alternative to C{shortmsg})
-        @type custom_message: C{str}
+        @param msg: the message to be shown in this message box (alternative to C{shortmsg})
+        @type msg: C{str}
         @param icon: icon name for an icon to be shown left of the text in this message box
         @type icon: C{str}
         @param kwargs: any other optional argument (will be ignored)
         @type kwargs: C{dict}
 
         """
-        PyHoca_MessageWindow.__init__(self, _PyHocaGUI, parent=parent, title=title, shortmsg=shortmsg, custom_message=custom_message, icon=icon, buttontype='cancelok', **kwargs)
+        PyHoca_MessageWindow.__init__(self, _PyHocaGUI, parent=parent, title=title, shortmsg=shortmsg, msg=msg, icon=icon, buttontype='cancelok', **kwargs)
 
 
 class PyHoca_MessageWindow_YesNo(PyHoca_MessageWindow):
@@ -315,7 +314,7 @@ class PyHoca_MessageWindow_YesNo(PyHoca_MessageWindow):
     A simple ,,Yes+No'' (default: Yes) message window for L{PyHocaGUI}.
 
     """
-    def __init__(self, _PyHocaGUI, parent=None, title=None, shortmsg=None, custom_message=None, icon='session_warning', **kwargs):
+    def __init__(self, _PyHocaGUI, parent=None, title=None, shortmsg=None, msg=None, icon='session_warning', **kwargs):
         """\
         @param _PyHocaGUI: main application instance
         @type _PyHocaGUI: C{obj}
@@ -325,22 +324,22 @@ class PyHoca_MessageWindow_YesNo(PyHoca_MessageWindow):
         @type title: C{str}
         @param shortmsg: a short string that refers to a pre-defined message (hard-coded in this class)
         @type shortmsg: C{str}
-        @param custom_message: the message to be shown in this message box (alternative to C{shortmsg})
-        @type custom_message: C{str}
+        @param msg: the message to be shown in this message box (alternative to C{shortmsg})
+        @type msg: C{str}
         @param icon: icon name for an icon to be shown left of the text in this message box
         @type icon: C{str}
         @param kwargs: any other optional argument (will be ignored)
         @type kwargs: C{dict}
 
         """
-        PyHoca_MessageWindow.__init__(self, _PyHocaGUI, parent=parent, title=title, shortmsg=shortmsg, custom_message=custom_message, icon=icon, buttontype='yesno', **kwargs)
+        PyHoca_MessageWindow.__init__(self, _PyHocaGUI, parent=parent, title=title, shortmsg=shortmsg, msg=msg, icon=icon, buttontype='yesno', **kwargs)
 
 class PyHoca_MessageWindow_NoYes(PyHoca_MessageWindow):
     """\
     A simple ,,Yes+No'' (default: No) message window for L{PyHocaGUI}.
 
     """
-    def __init__(self, _PyHocaGUI, parent=None, title=None, shortmsg=None, custom_message=None, icon='session_warning', **kwargs):
+    def __init__(self, _PyHocaGUI, parent=None, title=None, shortmsg=None, msg=None, icon='session_warning', **kwargs):
         """\
         @param _PyHocaGUI: main application instance
         @type _PyHocaGUI: C{obj}
@@ -350,13 +349,13 @@ class PyHoca_MessageWindow_NoYes(PyHoca_MessageWindow):
         @type title: C{str}
         @param shortmsg: a short string that refers to a pre-defined message (hard-coded in this class)
         @type shortmsg: C{str}
-        @param custom_message: the message to be shown in this message box (alternative to C{shortmsg})
-        @type custom_message: C{str}
+        @param msg: the message to be shown in this message box (alternative to C{shortmsg})
+        @type msg: C{str}
         @param icon: icon name for an icon to be shown left of the text in this message box
         @type icon: C{str}
         @param kwargs: any other optional argument (will be ignored)
         @type kwargs: C{dict}
 
         """
-        PyHoca_MessageWindow.__init__(self, _PyHocaGUI, parent=parent, title=title, shortmsg=shortmsg, custom_message=custom_message, icon=icon, buttontype='noyes', **kwargs)
+        PyHoca_MessageWindow.__init__(self, _PyHocaGUI, parent=parent, title=title, shortmsg=shortmsg, msg=msg, icon=icon, buttontype='noyes', **kwargs)
 
diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py
index 2ff1987..0d3dde5 100644
--- a/pyhoca/wxgui/profilemanager.py
+++ b/pyhoca/wxgui/profilemanager.py
@@ -22,8 +22,6 @@ import wx
 import os 
 import copy
 
-import sys
-import locale
 import re
 
 import x2go.log as log
@@ -31,9 +29,7 @@ import x2go.utils as utils
 import x2go.defaults as defaults
 from x2go import X2GOCLIENT_OS
 
-from x2go import defaults
-
-import notify
+from x2go._paramiko import PARAMIKO_FEATURE
 import basepath
 
 _icons_location = basepath.icons_basepath
@@ -78,26 +74,33 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         self.profileManagerDefaults = defaults.X2GO_SESSIONPROFILE_DEFAULTS
         self.success = False
 
+        self.action = action
         self.sessionChoices = {
             'GNOME': _(u'GNOME Desktop (GNOME)'),
             'KDE': _(u'K Desktop Environment (KDE)'),
             'LXDE': _(u'Lightweight X Desktop (LXDE)'),
             'TRINITY': _(u'Trinity X Desktop (KDE3-like)'),
             'UNITY': _(u'Unity X Desktop Shell (UNITY)'),
-            'XFCE4': _(u'XFCE4 Desktop (XFCE4)'),
+            'XFCE': _(u'XFCE Desktop (XFCE)'),
             'PUBLISHEDAPPLICATIONS': _(u'Published Applications'),
             'APPLICATION': _(u'Single Application'),
             'XDMCP': _(u'XDMCP Query'),
-            'RDP': _(u'Windows Terminal Server (RDP-proxy)'),
-            #'DirectRDP': 'Windows Terminal Server (RDP-direct)',
+            'RDP': _(u'Windows Terminal Server (X2Go-proxied RDP)'),
+            'DirectRDP': _(u'Windows Terminal Server (Direct RDP)'),
             'CUSTOM': _(u'Custom command'),
             }
+        if self.action == 'EDIT_CONNECTED':
+            del self.sessionChoices['DirectRDP']
         self.applicationChoices = {
             'WWWBROWSER': _(u'Internet Browser'),
             'MAILCLIENT': _(u'Email Client'),
             'OFFICE': _(u'Office'), 
             'TERMINAL': _(u'Terminal'), 
             }
+        self.rdpclientChoices = {
+            'rdesktop': u'rdesktop',
+            'xfreerdp': u'xfreerdp',
+            }
         self.linkChoices = {
             0: 'MODEM',
             1: 'ISDN',
@@ -114,13 +117,13 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
             'OPENWITH': _(u'Open application chooser dialog'),
             'SAVEAS': _(u'Save incoming file as ...'),
         }
+
         self._compressions = defaults.pack_methods_nx3_noqual
         self.compressionChoices = {}
         for _comp in self._compressions:
             self.compressionChoices[_comp] = _comp
 
         self.session_profiles = self._PyHocaGUI.session_profiles
-        self.action = action
 
         if X2GOCLIENT_OS == 'Windows':
             self._textfield_height = 24
@@ -149,31 +152,36 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         # we create a backup dict of our profile_config immediately (for being able to reset erroneously made changes)
         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_SharedFilesAndFolders = 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'))
         self.staticbox_Window = wx.StaticBox(self.tab_Profile, -1, ' %s ' % _(u'Session Window'))
         self.staticbox_SessionType = wx.StaticBox(self.tab_Session, -1, ' %s ' % _(u'Session Startup'))
         self.staticbox_Server = wx.StaticBox(self.tab_Connection, -1, ' %s ' % _(u"Server"))
-        self.staticbox_LinkSpeed = wx.StaticBox(self.tab_Connection, -1, ' %s ' % _(u"Connection Link Speed"))
-        self.staticbox_Compression = wx.StaticBox(self.tab_Connection, -1, ' %s ' % _(u"Compression"))
+        self.staticbox_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_Settings, -1, ' %s ' % _(u"Printing"))
-        self.staticbox_FolderSharing = wx.StaticBox(self.tab_SharedFilesAndFolders, -1, ' %s ' % _(u"Folder Exports"))
-        self.staticbox_FileMIMEbox = wx.StaticBox(self.tab_SharedFilesAndFolders, -1, ' %s ' % _(u"File Import"))
+        self.staticbox_Printing = wx.StaticBox(self.tab_SharedResources, -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"))
 
         ###
         ### widgets for the PROFILE tab
         ###
-        self.ProfileNameLabel = wx.StaticText(self.tab_Profile, -1, _(u"Name")+":")
+        self.ProfileNameLabel = wx.StaticText(self.tab_Profile, -1, _(u"Name")+": ")
         self.ProfileName = wx.TextCtrl(self.tab_Profile, -1, "")
 
         if self.action in ("ADD_EXPLICITLY", "EDIT_EXPLICITLY"):
@@ -182,35 +190,44 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
 
         self.SetSessionWindowTitle = wx.CheckBox(self.tab_Profile, -1, _(u"Set session window title"))
         self.UseDefaultSessionWindowTitle = wx.CheckBox(self.tab_Profile, -1, _(u"Use a default session window title"))
-        self.CustomSessionWindowTitleLabel = wx.StaticText(self.tab_Profile, -1, _(u"Custom session window title") + ":")
+        self.CustomSessionWindowTitleLabel = wx.StaticText(self.tab_Profile, -1, _(u"Custom session window title") + ": ")
         self.CustomSessionWindowTitle = wx.TextCtrl(self.tab_Profile, -1, "")
-        _share_location = os.path.split(_icons_location)[0]
-        if 'icon' in self.profile_config:
-            path_to_icon = self.profile_config['icon']
-            path_to_icon = path_to_icon.lstrip(':')
-            path_to_icon = os.path.join(os.path.normpath(_share_location), os.path.normpath(path_to_icon))
-        if not os.path.exists(path_to_icon) or not 'icon' in self.profile_config:
-            path_to_icon = os.path.normpath('%s/icons/PyHoca/128x128/pyhoca-session.png' % _share_location)
+        path_to_icon = os.path.normpath('%s/PyHoca/128x128/pyhoca-session.png' % _icons_location)
+        self.default_icon = True
+        if 'icon' in self.profile_config and self.profile_config['icon'] == ':icons/128x128/x2gosession.png':
+            # interpret the default x2gosession.png icon entry in session profile config as the PyHoca icon...
+            pass
+        elif 'icon' in self.profile_config and self.profile_config['icon'] == path_to_icon:
+            # rewrite absolute path to PyHoca icon in session profile config back to the default icon path used
+            # by X2Go Client, fixes behaviour of PyHoca-GUI <= 0.2.0.4.
+            pass
+        elif 'icon' in self.profile_config:
+            path_to_icon = self.profile_config['icon'].strip()
+            path_to_icon = os.path.normpath(path_to_icon)
+            self.default_icon = False
+        if not os.path.exists(path_to_icon):
+            path_to_icon = os.path.normpath('%s/PyHoca/128x128/pyhoca-session.png' % _icons_location)
+            self.default_icon = True
         self.IconPath = path_to_icon
-        self.IconButtonLabel = wx.StaticText(self.tab_Profile, -1, _(u"Window Icon")+':')
+        self.IconButtonLabel = wx.StaticText(self.tab_Profile, -1, _(u"Window Icon")+": ")
         self.IconButton = wx.BitmapButton(self.tab_Profile, -1, wx.Bitmap(path_to_icon, wx.BITMAP_TYPE_ANY), size=wx.Size(136,136), )
 
         ###
         ### widgets for the SESSION tab
         ###
         self.AutoStartSession = wx.CheckBox(self.tab_Session, -1, _(u"Start session automatically after login"))
-        self.AutoLoginSessionProfile = wx.CheckBox(self.tab_Session, -1, _(u"Login automatically after %s has started") % self._PyHocaGUI.appname)
-        self.SessionTypeLabel = wx.StaticText(self.tab_Session, -1, _(u"Type")+':')
+        self.AutoConnectSessionProfile = wx.CheckBox(self.tab_Session, -1, _(u"Login automatically after %s has started") % 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")+':')
+        self.ApplicationLabel = wx.StaticText(self.tab_Session, -1, _(u"Application")+": ")
         self.Application = wx.ComboBox(self.tab_Session, -1, choices=self.applicationChoices.values(), style=wx.CB_DROPDOWN|wx.CB_READONLY)
-        self.CommandLabel = wx.StaticText(self.tab_Session, -1, _(u"Custom command")+':')
+        self.CommandLabel = wx.StaticText(self.tab_Session, -1, _(u"Custom command")+": ")
         self.Command = wx.TextCtrl(self.tab_Session, -1, "", )
-        self.XDMCPServerLabel = wx.StaticText(self.tab_Session, -1, _(u"XDMCP server")+':')
+        self.XDMCPServerLabel = wx.StaticText(self.tab_Session, -1, _(u"XDMCP server")+": ")
         self.XDMCPServer = wx.TextCtrl(self.tab_Session, -1, "", )
-        self.RDPServerLabel = wx.StaticText(self.tab_Session, -1, _(u"RDP server")+':')
+        self.RDPServerLabel = wx.StaticText(self.tab_Session, -1, _(u"RDP server")+": ")
         self.RDPServer = wx.TextCtrl(self.tab_Session, -1, "", )
-        self.RDPOptionsLabel = wx.StaticText(self.tab_Session, -1, _(u"RDP options")+':')
+        self.RDPOptionsLabel = wx.StaticText(self.tab_Session, -1, _(u"RDP options")+": ")
         self.RDPOptions = wx.TextCtrl(self.tab_Session, -1, "", )
         self.RootlessSession = wx.CheckBox(self.tab_Session, -1, _(u"Integrate remote application(s) into local desktop (rootless mode)"))
         self.UsePublishedApplications = wx.CheckBox(self.tab_Session, -1, _(u"Menu of published applications"))
@@ -220,61 +237,70 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         ###
         ### widgets for the CONNECTION tab
         ###
-        self.UserNameLabel = wx.StaticText(self.tab_Connection, -1, _(u"User")+':')
+        self.UserNameLabel = wx.StaticText(self.tab_Connection, -1, _(u"User")+": ")
         self.UserName = wx.TextCtrl(self.tab_Connection, -1, "", size=wx.Size(200,20))
-        self.HostLabel = wx.StaticText(self.tab_Connection, -1, _(u"Host")+':')
+        self.HostLabel = wx.StaticText(self.tab_Connection, -1, _(u"Host")+": ")
         self.Host = wx.TextCtrl(self.tab_Connection, -1, "", size=wx.Size(200,20))
-        self.SSHPortLabel = wx.StaticText(self.tab_Connection, -1, _(u"Port")+':')
-        self.SSHPort = wx.SpinCtrl(self.tab_Connection, -1, "0", min=1, max=65534)
-        self.SSHKeyFileLabel = wx.StaticText(self.tab_Connection, -1, _(u"RSA/DSA private key")+':')
+        self.SSHPortLabel = wx.StaticText(self.tab_Connection, -1, _(u"Port")+": ")
+        self.SSHPort = wx.SpinCtrl(self.tab_Connection, -1, "22", min=1, max=65534)
+        self.SSHKeyFileLabel = wx.StaticText(self.tab_Connection, -1, _(u"Key")+": ")
         self.SSHKeyFile = wx.TextCtrl(self.tab_Connection, -1, style=wx.TE_PROCESS_ENTER)
         self.SSHKeyFileBrowseButton = wx.BitmapButton(self.tab_Connection, -1, wx.Bitmap('%s/PyHoca/16x16/system-search.png' % _icons_location, wx.BITMAP_TYPE_ANY), size=wx.Size(self._textfield_height,self._textfield_height), )
+        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.UseSSHProxy = wx.CheckBox(self.tab_Connection, -1, _(u"Server behind SSH proxy"))
-        self.SSHProxyUserLabel = wx.StaticText(self.tab_Connection, -1, _(u"User")+':')
+        self.SSHProxyUserLabel = wx.StaticText(self.tab_Connection, -1, _(u"User")+": ")
         self.SSHProxyUser = wx.TextCtrl(self.tab_Connection, -1, "", size=wx.Size(80,20))
-        self.SSHProxyKeyFileLabel = wx.StaticText(self.tab_Connection, -1, _(u"Key file")+':')
+        self.SSHProxySameUser = wx.CheckBox(self.tab_Connection, -1, _(u"Use same username for X2Go and proxy host"))
+        self.SSHProxySamePassword = wx.CheckBox(self.tab_Connection, -1, _(u"Use same authentication for X2Go and proxy host"))
+        self.SSHProxyKeyFileLabel = wx.StaticText(self.tab_Connection, -1, _(u"Key file")+": ")
         self.SSHProxyKeyFile = wx.TextCtrl(self.tab_Connection, -1, style=wx.TE_PROCESS_ENTER)
         self.SSHProxyKeyFileBrowseButton = wx.BitmapButton(self.tab_Connection, -1, wx.Bitmap('%s/PyHoca/16x16/system-search.png' % _icons_location, wx.BITMAP_TYPE_ANY), size=wx.Size(self._textfield_height,self._textfield_height), )
-        self.SSHProxyHostLabel = wx.StaticText(self.tab_Connection, -1, _(u"Host[:Port]")+':')
+        self.SSHProxyHostLabel = wx.StaticText(self.tab_Connection, -1, _(u"Host")+": ")
         self.SSHProxyHost = wx.TextCtrl(self.tab_Connection, -1, "", size=wx.Size(80,20))
-        self.SSHProxyTunnelLabel = wx.StaticText(self.tab_Connection, -1, _(u"SSH Proxy Tunnel")+':')
+        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, "0", min=1, max=65534)
+        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, "0", min=1, max=65534)
+        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_Connection, -1, 0, 0, 4)
-        self.ModemLabel = wx.StaticText(self.tab_Connection, -1, "|\n "+_(u"Modem"), style=wx.ALIGN_CENTRE)
-        self.ISDNLabel = wx.StaticText(self.tab_Connection, -1, "|\n "+_(u"ISDN"), style=wx.ALIGN_CENTRE)
-        self.ADSLLabel = wx.StaticText(self.tab_Connection, -1, "|\n"+_(u"ADSL"), style=wx.ALIGN_CENTRE)
-        self.WANLabel = wx.StaticText(self.tab_Connection, -1, "|\n"+_(u"WAN"), style=wx.ALIGN_CENTRE)
-        self.LANLabel = wx.StaticText(self.tab_Connection, -1, "|\n"+_(u"LAN"), style=wx.ALIGN_CENTRE)
+        self.LinkSpeed = wx.Slider(self.tab_LinkQuality, -1, 0, 0, 4)
+        self.ModemLabel = wx.StaticText(self.tab_LinkQuality, -1, "|\n "+_(u"Modem"), style=wx.ALIGN_CENTRE)
+        self.ISDNLabel = wx.StaticText(self.tab_LinkQuality, -1, "|\n "+_(u"ISDN"), style=wx.ALIGN_CENTRE)
+        self.ADSLLabel = wx.StaticText(self.tab_LinkQuality, -1, "|\n"+_(u"ADSL"), style=wx.ALIGN_CENTRE)
+        self.WANLabel = wx.StaticText(self.tab_LinkQuality, -1, "|\n"+_(u"WAN"), style=wx.ALIGN_CENTRE)
+        self.LANLabel = wx.StaticText(self.tab_LinkQuality, -1, "|\n"+_(u"LAN"), style=wx.ALIGN_CENTRE)
 
-        self.CompressionLabel = wx.StaticText(self.tab_Connection, -1, _(u"Method")+':')
-        self.Compression = wx.ComboBox(self.tab_Connection, -1, choices=self.compressionChoices.values(), style=wx.CB_DROPDOWN)
-        self.ImageQualityLabel = wx.StaticText(self.tab_Connection, -1, _(u"Image quality")+':')
-        self.ImageQuality = wx.SpinCtrl(self.tab_Connection, -1, "9", min=0, max=9)
+        self.CompressionLabel = wx.StaticText(self.tab_LinkQuality, -1, _(u"Method")+": ")
+        self.Compression = wx.ComboBox(self.tab_LinkQuality, -1, choices=self.compressionChoices.values(), style=wx.CB_DROPDOWN)
+        self.ImageQualityLabel = wx.StaticText(self.tab_LinkQuality, -1, _(u"Image quality")+": ")
+        self.ImageQuality = wx.SpinCtrl(self.tab_LinkQuality, -1, "9", min=0, max=9)
 
         ###
         ### wigdets for the SETTINGS tab
         ###
         self.DisplayTypeFullscreen = wx.RadioButton(self.tab_Settings, -1, _(u"Fullscreen"), style=wx.RB_GROUP)
-        self.DisplayTypeCustom = wx.RadioButton(self.tab_Settings, -1, _(u"Custom Size")+':')
+        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.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.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.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.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)
@@ -286,31 +312,33 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
 
         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.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.ClientSidePrinting = wx.CheckBox(self.tab_Settings, -1, _(u"Client Side printing"))
-
-        self.UseLocalFolderSharing = wx.CheckBox(self.tab_SharedFilesAndFolders, -1, _(u"Use local folder sharing"))
-        self.SharedFolderPathLabel = wx.StaticText(self.tab_SharedFilesAndFolders, -1, _(u"Path")+':')
-        self.SharedFolderPath = wx.TextCtrl(self.tab_SharedFilesAndFolders, -1, "", style=wx.TE_PROCESS_ENTER)
-        self.SharedFolderPathBrowseButton = wx.BitmapButton(self.tab_SharedFilesAndFolders, -1, wx.Bitmap('%s/PyHoca/16x16/system-search.png' % _icons_location, wx.BITMAP_TYPE_ANY), size=wx.Size(self._textfield_height,self._textfield_height), )
-        self.AddSharedFolderPathButton = wx.Button(self.tab_SharedFilesAndFolders, -1, _(u"Add"))
-        self.SharedFoldersList = CheckListCtrl(self.tab_SharedFilesAndFolders)
+
+        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"))
+        self.SharedFolderPathLabel = wx.StaticText(self.tab_SharedResources, -1, _(u"Path")+": ")
+        self.SharedFolderPath = wx.TextCtrl(self.tab_SharedResources, -1, "", style=wx.TE_PROCESS_ENTER)
+        self.SharedFolderPathBrowseButton = wx.BitmapButton(self.tab_SharedResources, -1, wx.Bitmap('%s/PyHoca/16x16/system-search.png' % _icons_location, wx.BITMAP_TYPE_ANY), size=wx.Size(self._textfield_height,self._textfield_height), )
+        self.AddSharedFolderPathButton = wx.Button(self.tab_SharedResources, -1, _(u"Add"))
+        self.SharedFoldersList = CheckListCtrl(self.tab_SharedResources)
         self.SharedFoldersList.InsertColumn(0, _("Local Path"), wx.LIST_FORMAT_LEFT)
         self.SharedFoldersList.InsertColumn(1, _("Connect Method"), wx.LIST_FORMAT_CENTER)
-        self.DeleteSharedFolderPathButton = wx.Button(self.tab_SharedFilesAndFolders, -1, _(u"Delete"))
+        self.DeleteSharedFolderPathButton = wx.Button(self.tab_SharedResources, -1, _(u"Delete"))
+
+        self.UseEncodingConverter = wx.CheckBox(self.tab_SharedResources, -1, _(u"Convert between client and server encodings"))
+        self.ClientEncodingLabel = wx.StaticText(self.tab_SharedResources, -1, _(u"Client encoding")+": ")
+        self.ClientEncoding = wx.ComboBox(self.tab_SharedResources, -1, choices=_known_encodings, style=wx.CB_DROPDOWN|wx.CB_READONLY)
+        self.ServerEncodingLabel = wx.StaticText(self.tab_SharedResources, -1, _(u"Server encoding")+": ")
+        self.ServerEncoding = wx.ComboBox(self.tab_SharedResources, -1, choices=_known_encodings, style=wx.CB_DROPDOWN|wx.CB_READONLY)
 
-        self.UseEncodingConverter = wx.CheckBox(self.tab_SharedFilesAndFolders, -1, _(u"Convert between client and server encodings"))
-        self.ClientEncodingLabel = wx.StaticText(self.tab_SharedFilesAndFolders, -1, _(u"Client encoding")+':')
-        self.ClientEncoding = wx.ComboBox(self.tab_SharedFilesAndFolders, -1, choices=_known_encodings, style=wx.CB_DROPDOWN|wx.CB_READONLY)
-        self.ServerEncodingLabel = wx.StaticText(self.tab_SharedFilesAndFolders, -1, _(u"Server encoding")+':')
-        self.ServerEncoding = wx.ComboBox(self.tab_SharedFilesAndFolders, -1, choices=_known_encodings, style=wx.CB_DROPDOWN|wx.CB_READONLY)
+        self.UseFileMIMEbox = wx.CheckBox(self.tab_SharedResources, -1, _(u"Use file MIME box for local file import"))
+        self.FileMIMEboxExtensionsLabel = wx.StaticText(self.tab_SharedResources, -1, _(u"Extensions")+": ")
+        self.FileMIMEboxExtensions = wx.TextCtrl(self.tab_SharedResources, -1, "", style=wx.TE_PROCESS_ENTER)
+        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.UseFileMIMEbox = wx.CheckBox(self.tab_SharedFilesAndFolders, -1, _(u"Use file MIME box for local file import"))
-        self.FileMIMEboxExtensionsLabel = wx.StaticText(self.tab_SharedFilesAndFolders, -1, _(u"Extensions")+':')
-        self.FileMIMEboxExtensions = wx.TextCtrl(self.tab_SharedFilesAndFolders, -1, "", style=wx.TE_PROCESS_ENTER)
-        self.FileMIMEboxActionLabel = wx.StaticText(self.tab_SharedFilesAndFolders, -1, _(u"Action")+':')
-        self.FileMIMEboxAction = wx.ComboBox(self.tab_SharedFilesAndFolders, -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"))
@@ -329,13 +357,21 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         self.Bind(wx.EVT_COMBOBOX, self.OnSessionTypeSelected, self.SessionType)
         self.Bind(wx.EVT_CHECKBOX, self.OnUseDefaultSessionWindowTitle, self.UseDefaultSessionWindowTitle)
         self.Bind(wx.EVT_CHECKBOX, self.OnSetSessionWindowTitle, self.SetSessionWindowTitle)
+        self.Bind(wx.EVT_TEXT, self.OnUserNameKeyPressed, self.UserName)
+        self.Bind(wx.EVT_TEXT, self.OnHostKeyPressed, self.Host)
+        self.Bind(wx.EVT_TEXT, self.OnSSHKeyFileKeyPressed, self.SSHKeyFile)
         self.Bind(wx.EVT_BUTTON, self.OnSSHKeyFileBrowse, self.SSHKeyFileBrowseButton)
         self.Bind(wx.EVT_BUTTON, self.OnSSHProxyKeyFileBrowse, self.SSHProxyKeyFileBrowseButton)
+        self.Bind(wx.EVT_CHECKBOX, self.OnSSHAutoLogin, self.SSHAutoLogin)
         self.Bind(wx.EVT_CHECKBOX, self.OnUseSSHProxy, self.UseSSHProxy)
+        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)
         self.Bind(wx.EVT_RADIOBUTTON, self.OnSetDisplayCustom, self.DisplayTypeCustom)
         self.Bind(wx.EVT_CHECKBOX, self.OnSetDisplayDPI, self.SetDisplayDPI)
         self.Bind(wx.EVT_RADIOBUTTON, self.OnSetKeyboard, self.DontSetKeyboard)
@@ -379,7 +415,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         else:
             self.SetTitle(_(u"PyHoca-GUI Profile Manager - %s") % self.profile_config['name'])
         self.SetFont(wx.Font(9, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, ""))
-        _textfield_height = 30
+        self._textfield_height = 30
 
         self.ProfileNameLabel.SetMinSize((160, 16))
         self.ProfileName.SetMinSize((320, self._textfield_height))
@@ -390,9 +426,9 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         self.IconButtonLabel.SetMinSize((168, 16))
 
         self.AutoStartSession.SetMinSize((-1, self._textfield_height))
-        self.AutoLoginSessionProfile.SetMinSize((-1, self._textfield_height))
+        self.AutoConnectSessionProfile.SetMinSize((-1, self._textfield_height))
         self.SessionTypeLabel.SetMinSize((120, 16))
-        self.SessionType.SetMinSize((320, self._textfield_height))
+        self.SessionType.SetMinSize((420, self._textfield_height))
         self.SessionType.SetSelection(5)
         self.ApplicationLabel.SetMinSize((120, 16))
         self.Application.SetMinSize((-1, self._textfield_height))
@@ -407,24 +443,26 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         self.RootlessSession.SetMinSize((-1, self._textfield_height))
         self.UsePublishedApplications.SetMinSize((-1, self._textfield_height))
 
-        self.UserNameLabel.SetMinSize((110, 16))
+        self.UserNameLabel.SetMinSize((-1, 16))
         self.UserName.SetMinSize((220, self._textfield_height))
-        self.HostLabel.SetMinSize((110, 16))
+        self.HostLabel.SetMinSize((-1, 16))
         self.Host.SetMinSize((220, self._textfield_height))
-        self.SSHPortLabel.SetMinSize((110, 16))
+        self.SSHPortLabel.SetMinSize((-1, 16))
         self.SSHPort.SetMinSize((65, self._textfield_height))
         self.SSHKeyFileLabel.SetMinSize((-1, 16))
-        self.SSHKeyFile.SetMinSize((152, self._textfield_height))
-        self.SSHProxyUserLabel.SetMinSize((140, 16))
-        self.SSHProxyUser.SetMinSize((180, self._textfield_height))
-        self.SSHProxyHostLabel.SetMinSize((140, 16))
-        self.SSHProxyHost.SetMinSize((180, self._textfield_height))
-        self.SSHProxyKeyFile.SetMinSize((120, self._textfield_height))
-        self.SSHProxyTunnelLabel.SetMinSize((140, 16))
-        self.SSHProxyTunnelFromPort.SetMinSize((60, self._textfield_height))
-        self.SSHProxyTunnelToPort.SetMinSize((60, self._textfield_height))
-        self.SSHProxyTunnelFromHost.SetMinSize((120, self._textfield_height))
-        self.SSHProxyTunnelToHost.SetMinSize((120, self._textfield_height))
+        self.SSHKeyFile.SetMinSize((220, self._textfield_height))
+        self.SSHProxyUserLabel.SetMinSize((-1, 16))
+        self.SSHProxyUser.SetMinSize((220, self._textfield_height))
+        self.SSHProxyHostLabel.SetMinSize((-1, 16))
+        self.SSHProxyHost.SetMinSize((220, self._textfield_height))
+        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:
@@ -440,10 +478,14 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         self.ImageQualityLabel.SetMinSize((120, 16))
         self.ImageQuality.SetMinSize((180, self._textfield_height))
         self.DisplayTypeFullscreen.SetMinSize((-1, self._textfield_height))
+        self.DisplayTypeMaximize.SetMinSize((-1, self._textfield_height))
         self.ScreenWidth.SetMinSize((60, self._textfield_height))
         self.ScreenHeight.SetMinSize((60, self._textfield_height))
         self.SetDisplayDPI.SetMinSize((-1, self._textfield_height))
         self.DisplayDPI.SetMinSize((60, self._textfield_height))
+        self.DontSetKeyboard.SetMinSize((-1, self._textfield_height))
+        self.AutoSetKeyboard.SetMinSize((-1, self._textfield_height))
+        self.CustomSetKeyboard.SetMinSize((-1, self._textfield_height))
         self.KeyboardModelLabel.SetMinSize((-1, 16))
         self.KeyboardModel.SetMinSize((-1, self._textfield_height))
         self.KeyboardLayoutLabel.SetMinSize((-1, 16))
@@ -457,7 +499,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         self.SoundPort.SetMinSize((-1, self._textfield_height))
         self.ClientSidePrinting.SetMinSize((-1, self._textfield_height))
         self.SharedFolderPath.SetMinSize((220, self._textfield_height))
-        self.SharedFoldersList.SetMinSize((-1, 180))
+        self.SharedFoldersList.SetMinSize((-1, 90))
 
         self.ClientEncoding.SetMinSize((140, self._textfield_height))
         self.ServerEncoding.SetMinSize((140, self._textfield_height))
@@ -503,7 +545,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         sizer_2 = wx.BoxSizer(wx.VERTICAL)
         sizer_2_1 = wx.StaticBoxSizer(self.staticbox_SessionType, wx.VERTICAL)
         sizer_2_1_1 = wx.GridBagSizer(hgap=2,vgap=6)
-        sizer_2_1_1.Add(self.AutoLoginSessionProfile, pos=(0,0), span=(1,2), flag=wx.EXPAND, )
+        sizer_2_1_1.Add(self.AutoConnectSessionProfile, pos=(0,0), span=(1,2), flag=wx.EXPAND, )
         sizer_2_1_1.Add(self.AutoStartSession, pos=(1,0), span=(1,2), flag=wx.EXPAND, )
         sizer_2_1_1.Add(self.SessionTypeLabel, pos=(2,0), flag=wx.ALIGN_CENTRE_VERTICAL, )
         sizer_2_1_1.Add(self.SessionType, pos=(2,1), flag=wx.EXPAND, )
@@ -527,232 +569,237 @@ 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.BoxSizer(wx.VERTICAL)
-        sizer_3_1_1_1 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_3_1_1_1.Add(self.UserNameLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_3_1_1_1.Add(self.UserName)
-        sizer_3_1_1_1.Add((0,32))
-        sizer_3_1_1_2 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_3_1_1_2.Add(self.HostLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_3_1_1_2.Add(self.Host)
-        sizer_3_1_1_2.Add((0,32))
-        sizer_3_1_1_3 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_3_1_1_3.Add(self.SSHPortLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_3_1_1_3.Add(self.SSHPort)
-        sizer_3_1_1_3.Add((16,0))
-        sizer_3_1_1_3.Add(self.SSHKeyFileLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_3_1_1_3.Add((8,0))
-        sizer_3_1_1_3.Add(self.SSHKeyFile, flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_3_1_1_3.Add(self.SSHKeyFileBrowseButton, flag=wx.ALIGN_CENTRE_VERTICAL|wx.LEFT, border=2)
-        sizer_3_1_1_3.Add((0,32))
-        sizer_3_1_1.Add(sizer_3_1_1_1, flag=wx.EXPAND)
-        sizer_3_1_1.Add(sizer_3_1_1_2, flag=wx.EXPAND)
-        sizer_3_1_1.Add(sizer_3_1_1_3, flag=wx.EXPAND)
-
-        sizer_3_1_2 = wx.BoxSizer(wx.VERTICAL)
-        sizer_3_1_2_1 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_3_1_2_1.Add(self.UseSSHProxy, flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_3_1_2_2 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_3_1_2_2.Add(self.SSHProxyUserLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_3_1_2_2.Add(self.SSHProxyUser, flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_3_1_2_2.Add((16,0))
-        sizer_3_1_2_2.Add(self.SSHProxyKeyFileLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_3_1_2_2.Add((8,0))
-        sizer_3_1_2_2.Add(self.SSHProxyKeyFile, flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_3_1_2_2.Add(self.SSHProxyKeyFileBrowseButton, flag=wx.ALIGN_CENTRE_VERTICAL|wx.LEFT, border=2)
-        sizer_3_1_2_2.Add((0,32))
-        sizer_3_1_2_3 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_3_1_2_3.Add(self.SSHProxyHostLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_3_1_2_3.Add(self.SSHProxyHost, flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_3_1_2_3.Add((0,32))
-        sizer_3_1_2_4 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_3_1_2_4.Add(self.SSHProxyTunnelLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_3_1_2_4.Add(self.SSHProxyTunnelFromHost, flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_3_1_2_4.Add((4, 0))
-        sizer_3_1_2_4.Add(self.SSHProxyTunnelFromPort, flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_3_1_2_4.Add((8, 0))
-        sizer_3_1_2_4.Add(self.SSHProxyTunnelBetweenLabel, flag=wx.ALIGN_CENTRE_VERTICAL|wx.ALIGN_CENTRE_HORIZONTAL)
-        sizer_3_1_2_4.Add((8, 0))
-        sizer_3_1_2_4.Add(self.SSHProxyTunnelToHost, flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_3_1_2_4.Add((4, 0))
-        sizer_3_1_2_4.Add(self.SSHProxyTunnelToPort, flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_3_1_2_4.Add((0,32))
-        sizer_3_1_2.Add(sizer_3_1_2_1, flag=wx.EXPAND)
-        sizer_3_1_2.Add(sizer_3_1_2_2, flag=wx.EXPAND)
-        sizer_3_1_2.Add(sizer_3_1_2_3, flag=wx.EXPAND)
-        sizer_3_1_2.Add(sizer_3_1_2_4, flag=wx.EXPAND)
+        sizer_3_1_1 = wx.GridBagSizer(hgap=5,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))
+        sizer_3_1_1.Add(self.SSHKeyFileLabel, pos=(0,3), flag=wx.ALIGN_CENTRE_VERTICAL)
+        sizer_3_1_1.Add(self.SSHKeyFile, pos=(0,4), flag=wx.ALIGN_CENTRE_VERTICAL)
+        sizer_3_1_1.Add(self.SSHKeyFileBrowseButton, pos=(0,5), flag=wx.ALIGN_CENTRE_VERTICAL|wx.LEFT, border=2)
+        sizer_3_1_1.Add(self.HostLabel, pos=(1,0), flag=wx.ALIGN_CENTRE_VERTICAL)
+        sizer_3_1_1.Add(self.Host, pos=(1,1))
+        sizer_3_1_1.Add(self.SSHPortLabel, pos=(1,3), flag=wx.ALIGN_CENTRE_VERTICAL)
+        sizer_3_1_1.Add(self.SSHPort, pos=(1,4), span=(1,2))
+        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.Add(sizer_3_1_1, flag=wx.EXPAND|wx.ALL, border=7)
-        sizer_3_1.Add(sizer_3_1_2, flag=wx.EXPAND|wx.ALL, border=7)
-
-        sizer_3_2 = wx.StaticBoxSizer(self.staticbox_LinkSpeed, wx.VERTICAL)
-        sizer_3_2_1 = wx.BoxSizer(wx.VERTICAL)
-        sizer_3_2_1_1 = wx.BoxSizer(wx.VERTICAL)
-        sizer_3_2_1_1.Add(self.LinkSpeed)
-        sizer_3_2_1_2 = wx.GridSizer(1,5,0,0)
-        sizer_3_2_1_2.SetMinSize((454/5*6 - 30, 36))
-        sizer_3_2_1_2.Add(self.ModemLabel, flag=wx.ALIGN_CENTRE_HORIZONTAL)
-        sizer_3_2_1_2.Add(self.ISDNLabel, flag=wx.ALIGN_CENTRE_HORIZONTAL)
-        sizer_3_2_1_2.Add(self.ADSLLabel, flag=wx.ALIGN_CENTRE_HORIZONTAL)
-        sizer_3_2_1_2.Add(self.WANLabel, flag=wx.ALIGN_CENTRE_HORIZONTAL)
-        sizer_3_2_1_2.Add(self.LANLabel, flag=wx.ALIGN_CENTRE_HORIZONTAL)
-        sizer_3_2_1.Add(sizer_3_2_1_1, flag=wx.ALIGN_CENTRE_HORIZONTAL)
-        sizer_3_2_1.Add(sizer_3_2_1_2, flag=wx.ALIGN_CENTRE_HORIZONTAL)
-        sizer_3_2.Add(sizer_3_2_1, flag=wx.EXPAND|wx.ALL, border=7)
 
-        sizer_3_3 = wx.StaticBoxSizer(self.staticbox_Compression, wx.VERTICAL)
-        sizer_3_3_1 = wx.BoxSizer(wx.VERTICAL)
-        sizer_3_3_1_1 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_3_3_1_1.Add(self.CompressionLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_3_3_1_1.Add(self.Compression)
-        sizer_3_3_1_1.Add((0,32))
-        sizer_3_3_1_2 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_3_3_1_2.Add(self.ImageQualityLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_3_3_1_2.Add(self.ImageQuality)
-        sizer_3_3_1.Add(sizer_3_3_1_1, flag=wx.EXPAND)
-        sizer_3_3_1.Add(sizer_3_3_1_2, flag=wx.EXPAND)
-        sizer_3_3.Add(sizer_3_3_1, proportion=1, flag=wx.EXPAND|wx.ALL, border=7)
+        sizer_3_2 = wx.StaticBoxSizer(self.staticbox_Proxy, wx.VERTICAL)
+        sizer_3_2_1 = wx.GridBagSizer(hgap=6,vgap=6)
+        sizer_3_2_1.Add(self.SSHProxySameUser, pos=(0,0), span=(1,6))
+        sizer_3_2_1.Add(self.SSHProxySamePassword, pos=(1,0), span=(1,6), flag=wx.ALIGN_CENTRE_VERTICAL)
+        sizer_3_2_1.Add(self.SSHProxyUserLabel, pos=(2,0), flag=wx.ALIGN_CENTRE_VERTICAL)
+        sizer_3_2_1.Add(self.SSHProxyUser, pos=(2,1), flag=wx.ALIGN_CENTRE_VERTICAL)
+        sizer_3_2_1.Add((16,0), pos=(2,2))
+        sizer_3_2_1.Add(self.SSHProxyKeyFileLabel, pos=(2,3),  flag=wx.ALIGN_CENTRE_VERTICAL)
+        sizer_3_2_1.Add(self.SSHProxyKeyFile, pos=(2,4), flag=wx.ALIGN_CENTRE_VERTICAL)
+        sizer_3_2_1.Add(self.SSHProxyKeyFileBrowseButton, pos=(2,5), flag=wx.ALIGN_CENTRE_VERTICAL|wx.LEFT, border=2)
+        sizer_3_2_1.Add(self.SSHProxyHostLabel, pos=(3,0), flag=wx.ALIGN_CENTRE_VERTICAL)
+        sizer_3_2_1.Add(self.SSHProxyHost, pos=(3,1), flag=wx.ALIGN_CENTRE_VERTICAL)
+        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, proportion=1, flag=wx.EXPAND|wx.ALL, border=5)
-        sizer_3.Add(sizer_3_3, flag=wx.EXPAND|wx.ALL, border=5)
+        sizer_3.Add(sizer_3_2, flag=wx.EXPAND|wx.ALL, border=5)
         self.tab_Connection.SetSizerAndFit(sizer_3)
         self.tab_Connection.Layout()
 
-        ## SETTINGS TAB
+        ## LINK QUALITY TAB
         sizer_4 = wx.BoxSizer(wx.VERTICAL)
-        sizer_4_1 = wx.StaticBoxSizer(self.staticbox_Display, wx.VERTICAL)
+        sizer_4_1 = wx.StaticBoxSizer(self.staticbox_LinkSpeed, wx.VERTICAL)
         sizer_4_1_1 = wx.BoxSizer(wx.VERTICAL)
-        sizer_4_1_1_1 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_4_1_1_1.Add(self.DisplayTypeFullscreen, flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_4_1_1_1.Add((16, 0))
-        sizer_4_1_1_1.Add(self.DisplayTypeCustom, flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_4_1_1_1.Add(self.ScreenWidthLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_4_1_1_1.Add((8,0))
-        sizer_4_1_1_1.Add(self.ScreenWidth)
-        sizer_4_1_1_1.Add((8,0))
-        sizer_4_1_1_1.Add(self.ScreenHeightLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_4_1_1_1.Add((8,0))
-        sizer_4_1_1_1.Add(self.ScreenHeight)
-        sizer_4_1_1_2 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_4_1_1_2.Add((-1,48))
-        sizer_4_1_1_2.Add(self.SetDisplayDPI, flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_4_1_1_2.Add((8,0))
-        sizer_4_1_1_2.Add(self.DisplayDPI, flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_4_1_1.Add(sizer_4_1_1_1)
-        sizer_4_1_1.Add(sizer_4_1_1_2)
+        sizer_4_1_1_1 = wx.BoxSizer(wx.VERTICAL)
+        sizer_4_1_1_1.Add(self.LinkSpeed)
+        sizer_4_1_1_2 = wx.GridSizer(1,5,0,0)
+        sizer_4_1_1_2.SetMinSize((454/5*6 - 30, 36))
+        sizer_4_1_1_2.Add(self.ModemLabel, flag=wx.ALIGN_CENTRE_HORIZONTAL)
+        sizer_4_1_1_2.Add(self.ISDNLabel, flag=wx.ALIGN_CENTRE_HORIZONTAL)
+        sizer_4_1_1_2.Add(self.ADSLLabel, flag=wx.ALIGN_CENTRE_HORIZONTAL)
+        sizer_4_1_1_2.Add(self.WANLabel, flag=wx.ALIGN_CENTRE_HORIZONTAL)
+        sizer_4_1_1_2.Add(self.LANLabel, flag=wx.ALIGN_CENTRE_HORIZONTAL)
+        sizer_4_1_1.Add(sizer_4_1_1_1, flag=wx.ALIGN_CENTRE_HORIZONTAL)
+        sizer_4_1_1.Add(sizer_4_1_1_2, flag=wx.ALIGN_CENTRE_HORIZONTAL)
         sizer_4_1.Add(sizer_4_1_1, flag=wx.EXPAND|wx.ALL, border=7)
 
-        sizer_4_2 = wx.StaticBoxSizer(self.staticbox_Keyboard, wx.VERTICAL)
+        sizer_4_2 = wx.StaticBoxSizer(self.staticbox_Compression, wx.VERTICAL)
         sizer_4_2_1 = wx.BoxSizer(wx.VERTICAL)
-        sizer_4_2_1_1 = wx.BoxSizer(wx.VERTICAL)
-        sizer_4_2_1_1.Add(self.DontSetKeyboard, )
-        sizer_4_2_1_1.Add(self.AutoSetKeyboard, )
-        sizer_4_2_1_1.Add(self.CustomSetKeyboard, )
-        sizer_4_2_1_1.Add((0,8))
+        sizer_4_2_1_1 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_4_2_1_1.Add(self.CompressionLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
+        sizer_4_2_1_1.Add(self.Compression)
+        sizer_4_2_1_1.Add((0,32))
         sizer_4_2_1_2 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_4_2_1_2.Add((32,0))
-        sizer_4_2_1_2_1 = wx.GridBagSizer(hgap=2, vgap=2)
-        sizer_4_2_1_2_1.Add(self.KeyboardModelLabel, pos=(0,0),)
-        sizer_4_2_1_2_1.Add(self.KeyboardModel, flag=wx.EXPAND, pos=(1,0),)
-        sizer_4_2_1_2_1.Add((32,0), pos=(0,1), span=(2,1))
-        sizer_4_2_1_2_1.Add(self.KeyboardLayoutLabel, flag=wx.ALIGN_CENTRE_VERTICAL, pos=(0,2), )
-        sizer_4_2_1_2_1.Add(self.KeyboardLayout, flag=wx.EXPAND, pos=(1,2), )
-        sizer_4_2_1_2_1.Add((32,0), pos=(0,3), span=(2,1))
-        sizer_4_2_1_2_1.Add(self.KeyboardVariantLabel, pos=(0,4),)
-        sizer_4_2_1_2_1.Add(self.KeyboardVariant, flag=wx.EXPAND, pos=(1,4),)
-        sizer_4_2_1_2.Add(sizer_4_2_1_2_1)
-        sizer_4_2_1.Add(sizer_4_2_1_1)
-        sizer_4_2_1.Add(sizer_4_2_1_2)
-        sizer_4_2.Add(sizer_4_2_1, flag=wx.EXPAND|wx.ALL, border=7)
-
-        sizer_4_3 = wx.StaticBoxSizer(self.staticbox_Sound, wx.VERTICAL)
-        sizer_4_3_1 = wx.GridBagSizer(vgap=4, hgap=2)
-        sizer_4_3_1.Add(self.EnableSound, pos=(0,0), span=(1,2), border=16, )
-        sizer_4_3_1.Add(self.PulseAudio, pos=(1,0), flag=wx.RIGHT, border=16, )
-        sizer_4_3_1.Add(self.Arts, pos=(2,0), flag=wx.RIGHT, border=16, )
-        sizer_4_3_1.Add(self.Esd, pos=(3,0), flag=wx.RIGHT, border=16, )
-        sizer_4_3_1.Add(self.DefaultSoundPort, pos=(1,1), )
-        sizer_4_3_1_1 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_4_3_1_1.Add(self.SoundPortLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_4_3_1_1.Add((8, -1))
-        sizer_4_3_1_1.Add(self.SoundPort, flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_4_3_1.Add(sizer_4_3_1_1, pos=(2,1), )
-        sizer_4_3.Add(sizer_4_3_1, flag=wx.EXPAND|wx.ALL, border=7)
-
-        sizer_4_4 = wx.StaticBoxSizer(self.staticbox_Printing, wx.VERTICAL)
-        sizer_4_4.Add(self.ClientSidePrinting, flag=wx.EXPAND|wx.ALL, border=7)
+        sizer_4_2_1_2.Add(self.ImageQualityLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
+        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.Add(sizer_4_1, flag=wx.EXPAND|wx.ALL, border=5)
-        sizer_4.Add(sizer_4_2, proportion=1, flag=wx.EXPAND|wx.ALL, border=5)
-        sizer_4.Add(sizer_4_3, proportion=1, flag=wx.EXPAND|wx.ALL, border=5)
-        sizer_4.Add(sizer_4_4, flag=wx.EXPAND|wx.ALL, border=5)
-        self.tab_Settings.SetSizerAndFit(sizer_4)
-        self.tab_Settings.Layout()
+        sizer_4.Add(sizer_4_2, flag=wx.EXPAND|wx.ALL, border=5)
+        self.tab_LinkQuality.SetSizerAndFit(sizer_4)
+        self.tab_LinkQuality.Layout()
 
-        # FOLDERSHARING TAB
+        ## SETTINGS TAB
         sizer_5 = wx.BoxSizer(wx.VERTICAL)
-        sizer_5_1 = wx.StaticBoxSizer(self.staticbox_FolderSharing, wx.VERTICAL)
+        sizer_5_1 = wx.StaticBoxSizer(self.staticbox_Display, wx.VERTICAL)
         sizer_5_1_1 = wx.BoxSizer(wx.VERTICAL)
         sizer_5_1_1_1 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_5_1_1_1.Add(self.UseLocalFolderSharing)
+        sizer_5_1_1_1.Add(self.DisplayTypeFullscreen, flag=wx.ALIGN_CENTRE_VERTICAL)
+        sizer_5_1_1_1.Add((16, 0))
+        sizer_5_1_1_1.Add(self.DisplayTypeMaximize, flag=wx.ALIGN_CENTRE_VERTICAL)
+        sizer_5_1_1_1.Add((16, 0))
+        sizer_5_1_1_1.Add(self.DisplayTypeCustom, flag=wx.ALIGN_CENTRE_VERTICAL)
+        sizer_5_1_1_1.Add(self.ScreenWidthLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
+        sizer_5_1_1_1.Add((8,0))
+        sizer_5_1_1_1.Add(self.ScreenWidth)
+        sizer_5_1_1_1.Add((8,0))
+        sizer_5_1_1_1.Add(self.ScreenHeightLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
+        sizer_5_1_1_1.Add((8,0))
+        sizer_5_1_1_1.Add(self.ScreenHeight)
         sizer_5_1_1_2 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_5_1_1_2_1 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_5_1_1_2_1.Add(self.SharedFolderPathLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_5_1_1_2_1.Add(self.SharedFolderPath, flag=wx.ALIGN_CENTRE_VERTICAL|wx.LEFT, border=5)
-        sizer_5_1_1_2_1.Add(self.SharedFolderPathBrowseButton, flag=wx.ALIGN_CENTRE_VERTICAL|wx.LEFT, border=2)
-        sizer_5_1_1_2_2 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_5_1_1_2_3 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_5_1_1_2_3.Add(self.AddSharedFolderPathButton, flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_5_1_1_2_3.Add(self.DeleteSharedFolderPathButton, flag=wx.ALIGN_CENTRE_VERTICAL|wx.LEFT, border=2)
-        sizer_5_1_1_2.Add(sizer_5_1_1_2_1, flag=wx.EXPAND|wx.ALIGN_LEFT)
-        sizer_5_1_1_2.Add(sizer_5_1_1_2_2, proportion=1, flag=wx.EXPAND|wx.ALIGN_LEFT)
-        sizer_5_1_1_2.Add(sizer_5_1_1_2_3, flag=wx.EXPAND|wx.ALIGN_RIGHT)
-        sizer_5_1_1_3 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_5_1_1_3.Add(self.SharedFoldersList, proportion=1, flag=wx.EXPAND)
-        sizer_5_1_1.Add(sizer_5_1_1_1, flag=wx.EXPAND|wx.BOTTOM, border=12)
-        sizer_5_1_1.Add(sizer_5_1_1_2, flag=wx.EXPAND)
-        sizer_5_1_1.Add(sizer_5_1_1_3, flag=wx.EXPAND|wx.TOP|wx.BOTTOM, border=5)
-        sizer_5_1_2 = wx.BoxSizer(wx.VERTICAL)
-        sizer_5_1_2_1 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_5_1_2_1.Add(self.UseEncodingConverter, flag=wx.BOTTOM, border=5)
-        sizer_5_1_2_2 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_5_1_2_2.Add(self.ClientEncodingLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_5_1_2_2.Add((8,0))
-        sizer_5_1_2_2.Add(self.ClientEncoding)
-        sizer_5_1_2_2.Add((16,0))
-        sizer_5_1_2_2.Add(self.ServerEncodingLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_5_1_2_2.Add((8,0))
-        sizer_5_1_2_2.Add(self.ServerEncoding)
-        sizer_5_1_2.Add(sizer_5_1_2_1, flag=wx.EXPAND)
-        sizer_5_1_2.Add(sizer_5_1_2_2, flag=wx.EXPAND)
+        sizer_5_1_1_2.Add((-1,48))
+        sizer_5_1_1_2.Add(self.SetDisplayDPI, flag=wx.ALIGN_CENTRE_VERTICAL)
+        sizer_5_1_1_2.Add((8,0))
+        sizer_5_1_1_2.Add(self.DisplayDPI, flag=wx.ALIGN_CENTRE_VERTICAL)
+        sizer_5_1_1.Add(sizer_5_1_1_1)
+        sizer_5_1_1.Add(sizer_5_1_1_2)
         sizer_5_1.Add(sizer_5_1_1, flag=wx.EXPAND|wx.ALL, border=7)
-        sizer_5_1.Add(sizer_5_1_2, flag=wx.EXPAND|wx.ALL, border=7)
 
-        sizer_5_2 = wx.StaticBoxSizer(self.staticbox_FileMIMEbox, wx.VERTICAL)
+        sizer_5_2 = wx.StaticBoxSizer(self.staticbox_Keyboard, wx.VERTICAL)
         sizer_5_2_1 = wx.BoxSizer(wx.VERTICAL)
-        sizer_5_2_1_1 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_5_2_1_1.Add(self.UseFileMIMEbox, flag=wx.BOTTOM, border=5)
-        sizer_5_2_1_2 = wx.GridBagSizer(vgap=2, hgap=3)
-        sizer_5_2_1_2.Add(self.FileMIMEboxActionLabel, pos=(0,0), flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_5_2_1_2.Add(self.FileMIMEboxAction, pos=(0,2))
-        sizer_5_2_1_2.Add((8,0), pos=(0,1))
-        sizer_5_2_1_2.Add((8,0), pos=(1,1))
-        sizer_5_2_1_2.Add(self.FileMIMEboxExtensionsLabel, pos=(1,0), flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_5_2_1_2.Add(self.FileMIMEboxExtensions, pos=(1,2))
-        sizer_5_2_1.Add(sizer_5_2_1_1, flag=wx.EXPAND)
-        sizer_5_2_1.Add(sizer_5_2_1_2, flag=wx.EXPAND)
+        sizer_5_2_1_1 = wx.BoxSizer(wx.VERTICAL)
+        sizer_5_2_1_1.Add(self.DontSetKeyboard, )
+        sizer_5_2_1_1.Add(self.AutoSetKeyboard, )
+        sizer_5_2_1_1.Add(self.CustomSetKeyboard, )
+        sizer_5_2_1_1.Add((0,8))
+        sizer_5_2_1_2 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_5_2_1_2.Add((32,0))
+        sizer_5_2_1_2_1 = wx.GridBagSizer(hgap=2, vgap=2)
+        sizer_5_2_1_2_1.Add(self.KeyboardModelLabel, pos=(0,0),)
+        sizer_5_2_1_2_1.Add(self.KeyboardModel, flag=wx.EXPAND, pos=(1,0),)
+        sizer_5_2_1_2_1.Add((32,0), pos=(0,1), span=(2,1))
+        sizer_5_2_1_2_1.Add(self.KeyboardLayoutLabel, flag=wx.ALIGN_CENTRE_VERTICAL, pos=(0,2), )
+        sizer_5_2_1_2_1.Add(self.KeyboardLayout, flag=wx.EXPAND, pos=(1,2), )
+        sizer_5_2_1_2_1.Add((32,0), pos=(0,3), span=(2,1))
+        sizer_5_2_1_2_1.Add(self.KeyboardVariantLabel, pos=(0,4),)
+        sizer_5_2_1_2_1.Add(self.KeyboardVariant, flag=wx.EXPAND, pos=(1,4),)
+        sizer_5_2_1_2.Add(sizer_5_2_1_2_1)
+        sizer_5_2_1.Add(sizer_5_2_1_1)
+        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, proportion=1, flag=wx.EXPAND|wx.ALL, border=5)
-        self.tab_SharedFilesAndFolders.SetSizerAndFit(sizer_5)
-        self.tab_SharedFilesAndFolders.Layout()
+        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()
+
+        # RESOURCE SHARING 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.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.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)
+        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_SharedFilesAndFolders, _(u"Sharing"))
+        self.X2goTabs.AddPage(self.tab_SharedResources, _(u"Sharing"))
 
         # the bottom area with OK, Defaults and Cancel buttons
         sizer_B = wx.BoxSizer(wx.HORIZONTAL)
@@ -771,19 +818,23 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         max1_x, max1_y = self.tab_Profile.GetBestSize()
         max2_x, max2_y = self.tab_Session.GetBestSize()
         max3_x, max3_y = self.tab_Connection.GetBestSize()
-        max4_x, max4_y = self.tab_Settings.GetBestSize()
-        max5_x, max5_y = self.tab_SharedFilesAndFolders.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()
 
         #self.SetSize(self.GetBestSize() + self.X2goTabs.GetBestSize())
 
-        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) + 80))
+        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_5_1_1_3.GetSize().GetWidth()
+        _sizer_width = sizer_6_1_1_3.GetSize().GetWidth()
         self.SharedFoldersList.SetColumnWidth(0, abs(_sizer_width*.7))
         self.SharedFoldersList.SetColumnWidth(1, abs(_sizer_width*.3))
 
@@ -795,27 +846,39 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         self.ProfileName.SetValue(self.profile_config['name'])
         self.SetSessionWindowTitle.SetValue(self.profile_config['setsessiontitle'])
         self.CustomSessionWindowTitle.SetValue(self.profile_config['sessiontitle'])
-        if not self.profile_config['setsessiontitle']:
-            self.CustomSessionWindowTitleLabel.Enable(False)
-            self.CustomSessionWindowTitle.Enable(False)
-            self.UseDefaultSessionWindowTitle.Enable(False)
-        else:
-            if self.profile_config['sessiontitle']:
-                self.UseDefaultSessionWindowTitle.SetValue(False)
-            else:
-                self.UseDefaultSessionWindowTitle.SetValue(True)
-                self.CustomSessionWindowTitleLabel.Enable(False)
-                self.CustomSessionWindowTitle.Enable(False)
-
         self.Host.SetValue(self.profile_config['host'])
         self.UserName.SetValue(self.profile_config['user'])
         self.SSHPort.SetValue(self.profile_config['sshport'])
+        self.SSHAutoLogin.SetValue(self.profile_config['autologin'])
+        if PARAMIKO_FEATURE['forward-ssh-agent']:
+            self.SSHForwardAuthAgent.SetValue(self.profile_config['forwardsshagent'])
         self.SSHKeyFile.SetValue(self.profile_config['key'])
+        if self.profile_config['autologin']:
+            self.SSHKeyFileLabel.Enable(False)
+            self.SSHKeyFile.Enable(False)
+            self.SSHKeyFileBrowseButton.Enable(False)
         self.UseSSHProxy.SetValue(self.profile_config['usesshproxy'])
+        self.SSHProxyAutoLogin.SetValue(self.profile_config['sshproxyautologin'])
 
         _ssh_proxy = self.profile_config['usesshproxy']
-        self.SSHProxyHost.SetValue(self.profile_config['sshproxyhost'])
-        self.SSHProxyUser.SetValue(self.profile_config['sshproxyuser'])
+        _ssh_proxy_host = self.profile_config['sshproxyhost']
+        _ssh_proxy_port = 22
+        try:
+            _ssh_proxy_port = int(self.profile_config['sshproxyport'])
+        except TypeError:
+            pass
+        if ":" in _ssh_proxy_host:
+            try:
+                _ssh_proxy_port = int(_ssh_proxy_host.split(":")[1])
+            except TypeError:
+                pass
+            _ssh_proxy_host = _ssh_proxy_host.split(":")[0]
+        self.SSHProxyHost.SetValue(_ssh_proxy_host)
+        self.SSHProxyPort.SetValue(_ssh_proxy_port)
+        if self.profile_config['sshproxysameuser']:
+            self.SSHProxyUser.SetValue(self.profile_config['user'])
+        else:
+            self.SSHProxyUser.SetValue(self.profile_config['sshproxyuser'])
         self.SSHProxyKeyFile.SetValue(self.profile_config['sshproxykeyfile'])
 
         _from_host = _from_port = _to_host = _to_port = None
@@ -829,49 +892,14 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         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))
-        if _ssh_proxy:
-            self.SSHProxyHostLabel.Enable(True)
-            self.SSHProxyHost.Enable(True)
-            self.SSHProxyUserLabel.Enable(True)
-            self.SSHProxyUser.Enable(True)
-            self.SSHProxyKeyFileLabel.Enable(True)
-            self.SSHProxyKeyFile.Enable(True)
-            self.SSHProxyKeyFileBrowseButton.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.SSHProxyHostLabel.Enable(False)
-            self.SSHProxyHost.Enable(False)
-            self.SSHProxyUserLabel.Enable(False)
-            self.SSHProxyUser.Enable(False)
-            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.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'])
+
+        self.UseSSHProxy.SetValue(_ssh_proxy)
+        self.SSHProxySameUser.SetValue(self.profile_config['sshproxysameuser'])
+        self.SSHProxySamePassword.SetValue(self.profile_config['sshproxysamepass'])
+        self._toggle_SSHProxy()
 
         self.AutoStartSession.SetValue(self.profile_config['autostart'])
-        self.AutoLoginSessionProfile.SetValue(self.profile_config['autologin'])
+        self.AutoConnectSessionProfile.SetValue(self.profile_config['autoconnect'])
 
         _command = self.profile_config['command']
         _published = self.profile_config['published']
@@ -887,7 +915,13 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         self.RootlessSession.Enable(False)
 
         self.UsePublishedApplications.SetValue(_published)
-        if _command in self.sessionChoices.keys():
+        self.Application.SetItems(self.applicationChoices.values())
+        # XFCE4 has been renamed to XFCE for 0.2.1.0
+        if _command == "XFCE4": _command = "XFCE"
+        if _command == 'RDP' and self.profile_config['directrdp']:
+            self.SessionType.SetValue(self.sessionChoices['DirectRDP'])
+            self.Command.SetValue('')
+        elif _command in self.sessionChoices.keys():
             self.SessionType.SetValue(self.sessionChoices[_command])
             self.Application.SetValue('')
             self.Command.SetValue('')
@@ -898,6 +932,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
             self.ApplicationLabel.Enable(True)
             self.Application.Enable(True)
             self.Application.SetValue(self.applicationChoices[_command])
+            self._last_application = self.applicationChoices[_command]
             self.Command.SetValue('')
             self.UsePublishedApplications.SetValue(False)
             self.UsePublishedApplications.Enable(False)
@@ -925,31 +960,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
             self.UsePublishedApplications.Enable(False)
             self.RootlessSession.Enable(False)
 
-        if _command in ('RDP', 'DirectRDP'):
-            self.RDPServerLabel.Enable(True)
-            self.RDPServer.Enable(True)
-            self.RDPOptionsLabel.Enable(True)
-            self.RDPOptions.Enable(True)
-            self.UsePublishedApplications.SetValue(False)
-            self.UsePublishedApplications.Enable(False)
-            self.RootlessSession.SetValue(True)
-            self.RootlessSession.Enable(False)
-        else:
-            self.RDPServerLabel.Enable(False)
-            self.RDPServer.Enable(False)
-            self.RDPOptionsLabel.Enable(False)
-            self.RDPOptions.Enable(False)
-
-        if _command == 'DirectRDP':
-            self.enable_DirectRDP()
-        else:
-            self.disable_DirectRDP()
-
-        self.RDPServer.SetValue(self.profile_config['rdpserver'])
-        self.RDPOptions.SetValue(self.profile_config['rdpoptions'])
-
-        self.XDMCPServer.SetValue(self.profile_config['xdmcpserver'])
-
         if 0 < self.profile_config['speed'] <= 5:
             _link_speed = self.profile_config['speed']
         else:
@@ -964,24 +974,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
             self.ImageQuality.SetValue(9)
             self.ImageQuality.Enable(False)
 
-        self.DisplayTypeFullscreen.SetValue(self.profile_config['fullscreen'])
-        self.DisplayTypeCustom.SetValue(not self.profile_config['fullscreen'])
-        self.ScreenWidth.SetValue(self.profile_config['width'])
-        self.ScreenHeight.SetValue(self.profile_config['height'])
-        if self.profile_config['fullscreen']:
-            self.ScreenWidth.Enable(False)
-            self.ScreenHeight.Enable(False)
-        else:
-            self.ScreenWidth.Enable(True)
-            self.ScreenHeight.Enable(True)
-
-        self.SetDisplayDPI.SetValue(self.profile_config['setdpi'])
-        self.DisplayDPI.SetValue(self.profile_config['dpi'])
-        if not self.profile_config['setdpi']:
-            self.DisplayDPI.Enable(False)
-        else:
-            self.DisplayDPI.Enable(True)
-
         if self.profile_config['usekbd']:
             self.DontSetKeyboard.SetValue(False)
             if self.profile_config['type'] == 'auto':
@@ -1019,12 +1011,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         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['soundsystem'] == 'pulse':
-            self.PulseAudio.SetValue(True)
-        elif self.profile_config['soundsystem'] == 'arts':
-            self.Arts.SetValue(True)
-        elif self.profile_config['soundsystem'] == 'esd':
-            self.Esd.SetValue(True)
         if self.profile_config['sound']:
             self.PulseAudio.Enable(True)
             self.Esd.Enable(True)
@@ -1044,7 +1030,67 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
 
         self.ClientSidePrinting.SetValue(self.profile_config['print'])
 
+        if _command == 'RDP':
+            if self.profile_config['directrdp']:
+                self.UseSSHProxy.SetValue(False)
+                self._toggle_SSHProxy()
+                self.enable_DirectRDP()
+                self._toggle_SetKeyboard()
+                self.PulseAudio.SetValue(True)
+                self._toggle_DefaultSoundPort()
+                self.SSHPort.SetValue(self.profile_config['rdpport'])
+                self.SSHAutoLogin.SetValue(False)
+                if PARAMIKO_FEATURE['forward-ssh-agent']:
+                    self.SSHForwardAuthAgent.SetValue(False)
+                self.RDPOptions.SetValue(self.profile_config['directrdpsettings'])
+                self.RDPServerLabel.Enable(True)
+                self.RDPServer.Enable(False)
+                self.RDPOptionsLabel.Enable(True)
+                self.RDPOptions.Enable(True)
+                self.UsePublishedApplications.SetValue(False)
+                self.UsePublishedApplications.Enable(False)
+                self.RootlessSession.SetValue(False)
+                self.RootlessSession.Enable(False)
+            else:
+                self.disable_DirectRDP()
+                self._toggle_SetKeyboard()
+                self._toggle_SSHProxy()
+                self.RDPServerLabel.Enable(True)
+                self.RDPServer.Enable(True)
+                self.RDPOptionsLabel.Enable(True)
+                self.RDPOptions.Enable(True)
+                self.UsePublishedApplications.SetValue(False)
+                self.UsePublishedApplications.Enable(False)
+                self.RootlessSession.SetValue(False)
+                self.RootlessSession.Enable(False)
+        else:
+            self.disable_DirectRDP()
+            self._toggle_SetKeyboard()
+            self._toggle_SSHProxy()
+            self.RDPServerLabel.Enable(False)
+            self.RDPServer.Enable(False)
+            self.RDPOptionsLabel.Enable(False)
+            self.RDPOptions.Enable(False)
+
+        self.XDMCPServer.SetValue(self.profile_config['xdmcpserver'])
+
+        self.DisplayTypeFullscreen.SetValue(self.profile_config['fullscreen'] and not self.profile_config['maxdim'])
+        self.DisplayTypeMaximize.SetValue(self.profile_config['maxdim'])
+        self.DisplayTypeCustom.SetValue(not (self.profile_config['fullscreen'] or self.profile_config['maxdim']))
+        self.ScreenWidth.SetValue(self.profile_config['width'])
+        self.ScreenHeight.SetValue(self.profile_config['height'])
+
+        self._toggle_DisplayProperties()
+
+        self.SetDisplayDPI.SetValue(self.profile_config['setdpi'])
+        self.DisplayDPI.SetValue(self.profile_config['dpi'])
+        if not self.profile_config['setdpi']:
+            self.DisplayDPI.Enable(False)
+        else:
+            self.DisplayDPI.Enable(True)
+
         self.UseLocalFolderSharing.SetValue(self.profile_config['useexports'])
+        self.RestoreSharedLocalFolders.SetValue(self.profile_config['restoreexports'])
         self._toggle_localFolderSharing()
         self.SharedFoldersList.DeleteAllItems()
 
@@ -1104,6 +1150,65 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
 
         self.disable_EditConnected_options()
 
+    def _toggle_DisplayProperties(self):
+        """\
+        Toggle display properties, depend on activation/deactivation of rootless session mode.
+
+        @param event: event
+        @type event: C{obj}
+
+        """
+        if not self.RootlessSession.GetValue():
+            self.DisplayTypeFullscreen.Enable(True)
+            self.DisplayTypeMaximize.Enable(True)
+            self.DisplayTypeCustom.Enable(True)
+            if self.DisplayTypeFullscreen.GetValue() or self.DisplayTypeMaximize.GetValue():
+                self.ScreenWidth.Enable(False)
+                self.ScreenHeightLabel.Enable(False)
+                self.ScreenHeight.Enable(False)
+            else:
+                self.ScreenWidth.Enable(True)
+                self.ScreenHeightLabel.Enable(True)
+                self.ScreenHeight.Enable(True)
+
+            self.SetSessionWindowTitle.Enable(True)
+            self.SetSessionWindowTitle.SetValue(self.profile_config_bak['setsessiontitle'])
+            self.CustomSessionWindowTitle.SetValue(self.profile_config_bak['sessiontitle'])
+
+            if not self.profile_config['setsessiontitle']:
+                self.CustomSessionWindowTitleLabel.Enable(False)
+                self.CustomSessionWindowTitle.Enable(False)
+                self.UseDefaultSessionWindowTitle.Enable(False)
+            else:
+                if self.profile_config['sessiontitle']:
+                    self.UseDefaultSessionWindowTitle.SetValue(False)
+                else:
+                    self.UseDefaultSessionWindowTitle.SetValue(True)
+                    self.CustomSessionWindowTitleLabel.Enable(False)
+                    self.CustomSessionWindowTitle.Enable(False)
+
+        else:
+            self.DisplayTypeFullscreen.Enable(False)
+            self.DisplayTypeMaximize.Enable(False)
+            self.DisplayTypeCustom.Enable(False)
+            self.ScreenWidth.Enable(False)
+            self.ScreenHeightLabel.Enable(False)
+            self.ScreenHeight.Enable(False)
+
+            self.SetSessionWindowTitle.Enable(False)
+            self.SetSessionWindowTitle.SetValue(False)
+            self.CustomSessionWindowTitleLabel.Enable(False)
+            self.CustomSessionWindowTitle.Enable(False)
+            self.UseDefaultSessionWindowTitle.Enable(False)
+            self.profile_config_bak['setsessiontitle'] = self.SetSessionWindowTitle.GetValue()
+            if self.UseDefaultSessionWindowTitle.GetValue():
+                self.profile_config_bak['sessiontitle'] = ''
+            else:
+                self.profile_config_bak['sessiontitle'] = self.CustomSessionWindowTitle.GetValue()
+            self.SetSessionWindowTitle.SetValue(False)
+            self.UseDefaultSessionWindowTitle.SetValue(False)
+            self.CustomSessionWindowTitle.SetValue("")
+
     def disable_EditConnected_options(self):
         """\
         If C{action} in the constructor has been set to C{EDIT_CONNECTED} this
@@ -1125,20 +1230,30 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
             self.SSHPort.Enable(False)
             self.SSHKeyFileLabel.Enable(False)
             self.SSHKeyFile.Enable(False)
+            self.SSHAutoLogin.Enable(False)
+            if PARAMIKO_FEATURE['forward-ssh-agent']:
+                self.SSHForwardAuthAgent.Enable(False)
             self.UseSSHProxy.Enable(False)
-            self.SSHProxyHostLabel.Enable(False)
-            self.SSHProxyHost.Enable(False)
+            self.staticbox_Proxy.Enable(False)
             self.SSHProxyUserLabel.Enable(False)
             self.SSHProxyUser.Enable(False)
+            self.SSHProxySameUser.Enable(False)
+            self.SSHProxySamePassword.Enable(False)
             self.SSHProxyKeyFileLabel.Enable(False)
             self.SSHProxyKeyFile.Enable(False)
             self.SSHProxyKeyFileBrowseButton.Enable(False)
+            self.SSHProxyHostLabel.Enable(False)
+            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)
+
 
     def __update_from_screen(self):
         """\
@@ -1147,14 +1262,23 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         """
         self.profile_config['name'] = self.ProfileName.GetValue()
         self.profile_config['setsessiontitle'] = self.SetSessionWindowTitle.GetValue()
+        _session_type = [ s for s in self.sessionChoices.keys() if self.sessionChoices[s] == self.SessionType.GetValue() ][0]
         if self.UseDefaultSessionWindowTitle.GetValue():
             self.profile_config['sessiontitle'] = ''
         else:
             self.profile_config['sessiontitle'] = self.CustomSessionWindowTitle.GetValue()
         self.profile_config['autostart'] = self.AutoStartSession.GetValue()
-        self.profile_config['autologin'] = self.AutoLoginSessionProfile.GetValue()
+        self.profile_config['autoconnect'] = self.AutoConnectSessionProfile.GetValue()
+        self.profile_config['autologin'] = self.SSHAutoLogin.GetValue()
+        if PARAMIKO_FEATURE['forward-ssh-agent']:
+            self.profile_config['forwardsshagent'] = self.SSHForwardAuthAgent.GetValue()
+        else:
+            self.profile_config['forwardsshagent'] = False
         self.profile_config['published'] = self.UsePublishedApplications.GetValue()
-        self.profile_config['icon'] = self.IconPath
+        if not self.default_icon:
+            self.profile_config['icon'] = self.IconPath
+        else:
+            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():
@@ -1164,18 +1288,30 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         else:
             self.profile_config['usesshproxy'] = False
             self.profile_config['host'] = self.Host.GetValue()
-            self.profile_config['sshport'] = self.SSHPort.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['sshproxyuser'] = self.SSHProxyUser.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['sshproxykeyfile'] = self.SSHProxyKeyFile.GetValue()
+        self.profile_config['sshproxyautologin'] = self.SSHProxyAutoLogin.GetValue()
+        if self.profile_config['sshproxysameuser']:
+            self.profile_config['sshproxyuser'] = ''
+        else:
+            self.profile_config['sshproxyuser'] = self.SSHProxyUser.GetValue()
+        if self.profile_config['sshproxysamepass']:
+            self.profile_config['sshproxykeyfile'] = ''
+        else:
+            self.profile_config['sshproxykeyfile'] = self.SSHProxyKeyFile.GetValue()
 
         self.profile_config['applications'] = self.applicationChoices.keys()
-        _session_type = [ s for s in self.sessionChoices.keys() if self.sessionChoices[s] == self.SessionType.GetValue() ][0]
+        self.profile_config['directrdp'] = False
         if _session_type == 'APPLICATION':
             _command = [ a for a in self.applicationChoices.keys() if self.applicationChoices[a] == self.Application.GetValue() ][0]
             self.profile_config['rootless'] = True
@@ -1184,7 +1320,18 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
             self.profile_config['rootless'] = self.RootlessSession.GetValue()
         elif _session_type == 'RDP':
             _command = _session_type
-            self.profile_config['rootless'] = True
+            self.profile_config['rootless'] = False
+            self.profile_config['rdpserver'] = self.RDPServer.GetValue()
+            self.profile_config['rdpoptions'] = self.RDPOptions.GetValue()
+        elif _session_type == 'DirectRDP':
+            _command = 'RDP'
+            self.profile_config['usesshproxy'] = False
+            self.profile_config['autologin'] = False
+            self.profile_config['rootless'] = False
+            self.profile_config['directrdp'] = True
+            self.profile_config['directrdpsettings'] = self.RDPOptions.GetValue()
+            self.profile_config['rdpport'] = self.SSHPort.GetValue()
+            self.profile_config['rdpclient'] = [ rc for rc in self.rdpclientChoices.keys() if self.rdpclientChoices[rc] == self.Application.GetValue() ][0]
         elif _session_type == 'PUBLISHEDAPPLICATIONS':
             _command = ""
             self.profile_config['rootless'] = True
@@ -1192,8 +1339,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
             _command = _session_type
             self.profile_config['rootless'] = False
         self.profile_config['command'] = _command
-        self.profile_config['rdpserver'] = self.RDPServer.GetValue()
-        self.profile_config['rdpoptions'] = self.RDPOptions.GetValue()
         self.profile_config['xdmcpserver'] = self.XDMCPServer.GetValue()
 
         _link_idx = self.LinkSpeed.GetValue()
@@ -1205,6 +1350,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         else:
             self.profile_config['quality'] = 0
         self.profile_config['fullscreen'] = self.DisplayTypeFullscreen.GetValue()
+        self.profile_config['maxdim'] = self.DisplayTypeMaximize.GetValue()
         self.profile_config['width'] = self.ScreenWidth.GetValue()
         self.profile_config['height'] = self.ScreenHeight.GetValue()
 
@@ -1221,17 +1367,14 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         self.profile_config['sound'] = self.EnableSound.GetValue()
         self.profile_config['defsndport'] = self.DefaultSoundPort.GetValue()
         self.profile_config['sndport'] = self.SoundPort.GetValue()
-        if self.PulseAudio.GetValue():
-            self.profile_config['soundsystem'] = 'pulse'
-        elif self.Arts.GetValue():
-            self.profile_config['soundsystem'] = 'arts'
-        elif self.Esd.GetValue():
-            self.profile_config['soundsystem'] = 'esd'
+
+        self.profile_config['soundsystem'] = self._get_SoundSystem()
 
         self.profile_config['print'] = self.ClientSidePrinting.GetValue()
 
         self.profile_config['useexports'] = self.UseLocalFolderSharing.GetValue()
-        _shared_folders = []
+        self.profile_config['restoreexports'] = self.RestoreSharedLocalFolders.GetValue()
+        _shared_folders = {}
         _item_id = self.SharedFoldersList.GetTopItem()
         while _item_id != -1 and self.SharedFoldersList.ItemCount > 0:
             _item = self.SharedFoldersList.GetItem(_item_id)
@@ -1241,11 +1384,13 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
             else:
                 _auto_connect = 0
 
-            _shared_folders.append('%s:%s' % (_item.GetText().strip(), _auto_connect))
-
+            _shared_folders.update({ _item.GetText().strip(): bool(_auto_connect) })
             _item_id = self.SharedFoldersList.GetNextItem(_item_id)
 
-        self.profile_config['export'] = '"%s;"' % ';'.join([ f for f in _shared_folders if f ])
+        if _shared_folders:
+            self.profile_config['export'] = '"' + ';'.join([ '%s:%s' % (_sf,int(_shared_folders[_sf])) for _sf in _shared_folders.keys() ]) + ';"'
+        else:
+            self.profile_config['export'] = ''
         self.profile_config['useiconv'] = self.UseEncodingConverter.GetValue()
         self.profile_config['iconvfrom'] = self.ClientEncoding.GetValue()
         self.profile_config['iconvto'] = self.ServerEncoding.GetValue()
@@ -1266,6 +1411,25 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
             _mimebox_action = 'OPEN'
         self.profile_config['mimeboxaction'] = _mimebox_action
 
+    def _get_SoundSystem(self):
+        if self.PulseAudio.GetValue():
+            return 'pulse'
+        elif self.Arts.GetValue():
+            return 'arts'
+        elif self.Esd.GetValue():
+            return 'esd'
+
+    def _set_SoundSystem(self, sound_system='pulse'):
+        self.PulseAudio.SetValue(False)
+        self.Arts.SetValue(False)
+        self.Esd.SetValue(False)
+        if self.profile_config['soundsystem'] == 'pulse':
+            self.PulseAudio.SetValue(True)
+        elif self.profile_config['soundsystem'] == 'arts':
+            self.Arts.SetValue(True)
+        elif self.profile_config['soundsystem'] == 'esd':
+            self.Esd.SetValue(True)
+
     def OnIconChange(self, event):
         """\
         Gets called on profile icon change requests.
@@ -1274,7 +1438,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         @type event: C{obj}
 
         """
-        _share_location = os.path.split(_icons_location)[0]
         iconsdir = _icons_location
         if not os.path.exists(iconsdir):
             iconsdir = os.getcwd()
@@ -1289,9 +1452,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
             # This returns a Python list of files that were selected.
             path_to_icon = dlg.GetPath()
             self.IconButton.SetBitmapLabel(wx.Bitmap(path_to_icon, wx.BITMAP_TYPE_ANY))
-            rel_path = path_to_icon.replace('%s/' % _share_location, ':')
-            rel_path = rel_path.replace( 'icons/PyHoca/128x128/pyhoca-session.png', 'icons/128x128/x2gosession.png')
-            self.IconPath = rel_path
+            self.IconPath = path_to_icon
+            self.default_icon = False
 
     def OnSetSessionWindowTitle(self, event):
         """\
@@ -1334,13 +1496,38 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         @type event: C{obj}
 
         """
-        self.HostLabel.Enable(False)
-        self.Host.Enable(False)
-        self.SSHPortLabel.Enable(False)
-        self.SSHPort.Enable(False)
+        self.HostLabel.Enable(True)
+        self.Host.Enable(True)
+        self.SSHPortLabel.Enable(True)
+        self.SSHPort.Enable(True)
+        self.SSHPort.SetValue(self.profile_config_bak['rdpport'])
         self.SSHKeyFileLabel.Enable(False)
         self.SSHKeyFile.Enable(False)
+        self.SSHKeyFileBrowseButton.Enable(False)
+        self.SSHAutoLogin.Enable(False)
+        if PARAMIKO_FEATURE['forward-ssh-agent']:
+            self.SSHForwardAuthAgent.Enable(False)
+        self.UseSSHProxy.Enable(False)
         self.staticbox_LinkSpeed.Enable(False)
+        self.staticbox_Proxy.Enable(False)
+        self.SSHProxyUserLabel.Enable(False)
+        self.SSHProxyUser.Enable(False)
+        self.SSHProxySameUser.Enable(False)
+        self.SSHProxySamePassword.Enable(False)
+        self.SSHProxyKeyFileLabel.Enable(False)
+        self.SSHProxyKeyFile.Enable(False)
+        self.SSHProxyKeyFileBrowseButton.Enable(False)
+        self.SSHProxyHostLabel.Enable(False)
+        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)
         self.ISDNLabel.Enable(False)
@@ -1352,8 +1539,24 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         self.Compression.Enable(False)
         self.ImageQualityLabel.Enable(False)
         self.ImageQuality.Enable(False)
-        self.tab_Settings.Enable(False)
-        self.tab_SharedFilesAndFolders.Enable(False)
+        self.staticbox_Keyboard.Enable(False)
+        self.DontSetKeyboard.Enable(False)
+        self.AutoSetKeyboard.Enable(False)
+        self.CustomSetKeyboard.Enable(False)
+        self.CustomSetKeyboard.SetValue(True)
+        self.DefaultSoundPort.Enable(False)
+        self.SoundPortLabel.Enable(False)
+        self.SoundPort.Enable(False)
+        self.Esd.Enable(False)
+        self.tab_SharedResources.Enable(True)
+        self.RDPServer.Enable(False)
+        self.RDPServer.SetValue(self.Host.GetValue())
+        self.RDPOptions.SetValue(self.profile_config_bak['directrdpsettings'])
+        if self.Application.GetValue() in self.applicationChoices.keys():
+            self._last_application = self.Application.GetValue()
+        self.Application.SetItems(self.rdpclientChoices.values())
+        self.Application.SetValue(self._last_rdpclient)
+        self.Application.Enable(True)
 
     def disable_DirectRDP(self):
         """\
@@ -1368,8 +1571,20 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
             self.Host.Enable(True)
             self.SSHPortLabel.Enable(True)
             self.SSHPort.Enable(True)
-        self.SSHKeyFileLabel.Enable(True)
-        self.SSHKeyFile.Enable(True)
+            self.SSHPort.SetValue(self.profile_config_bak['sshport'])
+        else:
+            self.SSHPort.SetValue(self.SSHProxyTunnelFromPort.GetValue())
+        self.SSHAutoLogin.Enable(True)
+        if PARAMIKO_FEATURE['forward-ssh-agent']:
+            self.SSHForwardAuthAgent.Enable(True)
+            self.SSHForwardAuthAgent.SetValue(self.profile_config_bak['forwardsshagent'])
+        self.SSHAutoLogin.SetValue(self.profile_config_bak['autologin'])
+        if not self.SSHAutoLogin.GetValue():
+            self.SSHKeyFileLabel.Enable(True)
+            self.SSHKeyFile.Enable(True)
+            self.SSHKeyFileBrowseButton.Enable(True)
+        self.UseSSHProxy.Enable(True)
+        self.staticbox_Proxy.Enable(True)
         self.staticbox_LinkSpeed.Enable(True)
         self.LinkSpeed.Enable(True)
         self.ModemLabel.Enable(True)
@@ -1382,8 +1597,22 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         self.Compression.Enable(True)
         self.ImageQualityLabel.Enable(True)
         self.ImageQuality.Enable(True)
-        self.tab_Settings.Enable(True)
-        self.tab_SharedFilesAndFolders.Enable(True)
+        self.staticbox_Keyboard.Enable(True)
+        self.DontSetKeyboard.Enable(True)
+        self.AutoSetKeyboard.Enable(True)
+        self.CustomSetKeyboard.Enable(True)
+        self.EnableSound.Enable(True)
+        if self.EnableSound.GetValue():
+            self.DefaultSoundPort.Enable(True)
+            self.DefaultSoundPort.SetValue(True)
+            self.Esd.Enable(True)
+        self.tab_SharedResources.Enable(True)
+        self.RDPServer.SetValue(self.profile_config_bak['rdpserver'])
+        self.RDPOptions.SetValue(self.profile_config_bak['rdpoptions'])
+        if self.Application.GetValue() in self.rdpclientChoices.keys():
+            self._last_rdpclient = self.Application.GetValue()
+        self.Application.SetItems(self.applicationChoices.values())
+        self.Application.SetValue(self._last_application)
 
     def OnSessionTypeSelected(self, event):
         """\
@@ -1438,26 +1667,73 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
             self.XDMCPServerLabel.Enable(False)
             self.XDMCPServer.Enable(False)
 
-        if _session_type in ('RDP', 'DirectRDP', ):
+        if _session_type == 'DirectRDP':
+            self.profile_config_bak['sshport'] = self.SSHPort.GetValue()
+            self.profile_config_bak['rdpserver'] = self.RDPServer.GetValue()
+            self.profile_config_bak['rdpoptions'] = self.RDPOptions.GetValue()
+            self.profile_config_bak['soundsystem'] = self._get_SoundSystem()
+            self.profile_config_bak['usesshproxy'] = self.UseSSHProxy.GetValue()
+            self.profile_config_bak['autologin'] = self.SSHAutoLogin.GetValue()
+            if PARAMIKO_FEATURE['forward-ssh-agent']:
+                self.profile_config_bak['forwardsshagent'] = self.SSHForwardAuthAgent.GetValue()
+                self.SSHForwardAuthAgent.SetValue(False)
+            self.UseSSHProxy.SetValue(False)
+            self.SSHAutoLogin.SetValue(False)
+            self.PulseAudio.SetValue(True)
+            self.Arts.SetValue(False)
+            self.Esd.SetValue(False)
+            self.DefaultSoundPort.SetValue(True)
+            self._toggle_DefaultSoundPort()
+            self.enable_DirectRDP()
+            self._toggle_SetKeyboard()
+            self.RDPServerLabel.Enable(True)
+            self.RDPServer.Enable(False)
+            self.RDPOptionsLabel.Enable(True)
+            self.RDPOptions.Enable(True)
+            self.UsePublishedApplications.SetValue(False)
+            self.UsePublishedApplications.Enable(False)
+            self.RootlessSession.SetValue(False)
+            self.RootlessSession.Enable(False)
+        elif _session_type == 'RDP':
+            self.profile_config_bak['rdpport'] = self.SSHPort.GetValue()
+            self.profile_config_bak['directrdpsettings'] = self.RDPOptions.GetValue()
+            self.disable_DirectRDP()
+            self._toggle_SetKeyboard()
+            self.UseSSHProxy.SetValue(self.profile_config_bak['usesshproxy'])
+            self._toggle_SSHProxy()
+            self._set_SoundSystem(self.profile_config_bak['soundsystem'])
+            self._toggle_DefaultSoundPort()
+            self.SSHAutoLogin.SetValue(self.profile_config_bak['autologin'])
+            if PARAMIKO_FEATURE['forward-ssh-agent']:
+                self.SSHForwardAuthAgent.SetValue(self.profile_config_bak['forwardsshagent'])
             self.RDPServerLabel.Enable(True)
             self.RDPServer.Enable(True)
             self.RDPOptionsLabel.Enable(True)
             self.RDPOptions.Enable(True)
             self.UsePublishedApplications.SetValue(False)
             self.UsePublishedApplications.Enable(False)
-            self.RootlessSession.SetValue(True)
+            self.RootlessSession.SetValue(False)
             self.RootlessSession.Enable(False)
         else:
+            self.profile_config_bak['rdpport'] = self.SSHPort.GetValue()
+            self.profile_config_bak['directrdpsettings'] = self.RDPOptions.GetValue()
+            if self.RDPServer.GetValue() != self.Host.GetValue():
+                self.profile_config_bak['rdpserver'] = self.RDPServer.GetValue()
+                self.profile_config_bak['rdpoptions'] = self.RDPOptions.GetValue()
+            self.disable_DirectRDP()
+            self._toggle_SetKeyboard()
+            self.SSHAutoLogin.SetValue(self.profile_config_bak['autologin'])
+            if PARAMIKO_FEATURE['forward-ssh-agent']:
+                self.SSHForwardAuthAgent.SetValue(self.profile_config_bak['forwardsshagent'])
+            self.UseSSHProxy.SetValue(self.profile_config_bak['usesshproxy'])
+            self._toggle_SSHProxy()
+            self._set_SoundSystem(self.profile_config_bak['soundsystem'])
+            self._toggle_DefaultSoundPort()
             self.RDPServerLabel.Enable(False)
             self.RDPServer.Enable(False)
             self.RDPOptionsLabel.Enable(False)
             self.RDPOptions.Enable(False)
 
-        if _session_type == 'DirectRDP':
-            self.enable_DirectRDP()
-        else:
-            self.disable_DirectRDP()
-
         if _session_type == 'PUBLISHEDAPPLICATIONS':
             self._last_pubapp_value = self.UsePublishedApplications.GetValue()
             self._last_auto_start_value = self.AutoStartSession.GetValue()
@@ -1476,6 +1752,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
                 self.AutoStartSession.SetValue(self._last_auto_start_value)
                 self._last_auto_start_value = None
 
+        self._toggle_DisplayProperties()
         self.disable_EditConnected_options()
 
     def OnCompressionSelected(self, event):
@@ -1492,6 +1769,39 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         else:
             self.ImageQuality.Enable(False)
 
+    def OnUserNameKeyPressed(self, event):
+        """\
+        Gets called whenever something gets typed in the user name field.
+
+        @param event: event
+        @type event: C{obj}
+
+        """
+        if self.UseSSHProxy.GetValue() and self.SSHProxySameUser.GetValue():
+            self.SSHProxyUser.SetValue(self.UserName.GetValue())
+
+    def OnSSHKeyFileKeyPressed(self, event):
+        """\
+        Gets called whenever something gets typed in the SSH key file field.
+
+        @param event: event
+        @type event: C{obj}
+
+        """
+        if self.UseSSHProxy.GetValue() and self.SSHProxySamePassword.GetValue():
+            self.SSHProxyKeyFile.SetValue(self.SSHKeyFile.GetValue())
+
+    def OnHostKeyPressed(self, event):
+        """\
+        Gets called whenever something gets typed in the host name field.
+
+        @param event: event
+        @type event: C{obj}
+
+        """
+        if [ k for k in self.sessionChoices.keys() if self.sessionChoices[k] == self.SessionType.GetValue() ][0] == 'DirectRDP':
+            self.RDPServer.SetValue(self.Host.GetValue())
+
     def OnSSHKeyFileBrowse(self, event):
         """\
         Gets called if the user requests to browse for an SSH key file (for X2Go client/server connection).
@@ -1513,6 +1823,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
             # This returns a Python list of files that were selected.
             path = dlg.GetPath()
             self.SSHKeyFile.SetValue(path)
+            if self.SSHProxySamePassword.GetValue():
+                self.SSHProxyKeyFile.SetValue(path)
 
     def OnSSHProxyKeyFileBrowse(self, event):
         """\
@@ -1536,6 +1848,40 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
             path = dlg.GetPath()
             self.SSHProxyKeyFile.SetValue(path)
 
+    def OnSSHAutoLogin(self, event):
+        """\
+        Gets called if the ssh-proxy-auto-login checkbox gets marked.
+
+        @param event: event
+        @type event: C{obj}
+
+        """
+        if self.SSHAutoLogin.GetValue():
+            self.SSHKeyFileLabel.Enable(False)
+            self.SSHKeyFile.Enable(False)
+            self.SSHKeyFileBrowseButton.Enable(False)
+        else:
+            self.SSHKeyFileLabel.Enable(True)
+            self.SSHKeyFile.Enable(True)
+            self.SSHKeyFileBrowseButton.Enable(True)
+
+    def OnSSHProxyAutoLogin(self, event):
+        """\
+        Gets called if the ssh-proxy-auto-login checkbox gets marked.
+
+        @param event: event
+        @type event: C{obj}
+
+        """
+        if self.SSHProxyAutoLogin.GetValue():
+            self.SSHProxyKeyFileLabel.Enable(False)
+            self.SSHProxyKeyFile.Enable(False)
+            self.SSHProxyKeyFileBrowseButton.Enable(False)
+        else:
+            self.SSHProxyKeyFileLabel.Enable(True)
+            self.SSHProxyKeyFile.Enable(True)
+            self.SSHProxyKeyFileBrowseButton.Enable(True)
+
     def OnUseSSHProxy(self, event):
         """\
         Gets called if the use-ssh-proxy checkbox gets marked.
@@ -1545,17 +1891,75 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
 
         """
         if self.UseSSHProxy.GetValue():
+            self.profile_config_bak['host'] = self.Host.GetValue()
+            self.profile_config_bak['sshport'] = self.SSHPort.GetValue()
+        self._toggle_SSHProxy()
+
+    def OnSSHProxySameUser(self, event):
+        """\
+        Gets called if the use-same-user-for-proxy checkbox gets marked.
+
+        @param event: event
+        @type event: C{obj}
+
+        """
+        if self.SSHProxySameUser.GetValue():
+            self.profile_config_bak['sshproxyuser'] = self.SSHProxyUser.GetValue()
+        self._toggle_SSHProxy()
+
+    def OnSSHProxySamePassword(self, event):
+        """\
+        Gets called if the use-same-user-authinfo checkbox gets marked.
+
+        @param event: event
+        @type event: C{obj}
+
+        """
+        if self.SSHProxySamePassword.GetValue():
+            self.profile_config_bak['sshproxykeyfile'] = self.SSHProxyKeyFile.GetValue()
+        self._toggle_SSHProxy()
+
+    def _toggle_SSHProxy(self):
+        """\
+        Gets called if the use-ssh-proxy checkbox gets marked.
+
+        @param event: event
+        @type event: C{obj}
+
+        """
+        if self.UseSSHProxy.GetValue():
+            self.staticbox_Proxy.Enable(True)
+            self.SSHProxySameUser.Enable(True)
+            self.SSHProxySamePassword.Enable(True)
             self.SSHProxyHostLabel.Enable(True)
             self.SSHProxyHost.Enable(True)
-            self.SSHProxyUserLabel.Enable(True)
-            self.SSHProxyUser.Enable(True)
-            self.SSHProxyKeyFileLabel.Enable(True)
-            self.SSHProxyKeyFile.Enable(True)
-            self.SSHProxyKeyFileBrowseButton.Enable(True)
+            self.SSHProxyPortLabel.Enable(True)
+            self.SSHProxyPort.Enable(True)
+            if self.SSHProxySameUser.GetValue():
+                self.SSHProxyUser.SetValue(self.UserName.GetValue())
+                self.SSHProxyUser.Enable(False)
+            else:
+                self.SSHProxyUser.SetValue(self.profile_config_bak['sshproxyuser'])
+                self.SSHProxyUserLabel.Enable(True)
+                self.SSHProxyUser.Enable(True)
+            if self.SSHProxySamePassword.GetValue():
+                self.SSHProxyKeyFile.SetValue(self.SSHKeyFile.GetValue())
+            else:
+                self.SSHProxyKeyFile.SetValue(self.profile_config_bak['sshproxykeyfile'])
+            if self.SSHProxySamePassword.GetValue() or self.SSHProxyAutoLogin.GetValue():
+                self.SSHProxyKeyFile.Enable(False)
+                self.SSHProxyKeyFileBrowseButton.Enable(False)
+            else:
+                self.SSHProxyKeyFileLabel.Enable(True)
+                self.SSHProxyKeyFile.Enable(True)
+                self.SSHProxyKeyFileBrowseButton.Enable(True)
+            if self.SSHProxyAutoLogin.GetValue():
+                self.SSHProxyKeyFileLabel.Enable(False)
+            self.SSHProxyAutoLogin.Enable(True)
             self.SSHProxyTunnelLabel.Enable(True)
             self.SSHProxyTunnelFromHost.Enable(True)
-            self.SSHProxyTunnelBetweenLabel.Enable(True)
             self.SSHProxyTunnelFromPort.Enable(True)
+            self.SSHProxyTunnelBetweenLabel.Enable(True)
             self.SSHProxyTunnelToHost.Enable(True)
             self.SSHProxyTunnelToPort.Enable(True)
             self.Host.Enable(False)
@@ -1565,8 +1969,13 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
             self.SSHPortLabel.Enable(False)
             self.SSHPort.SetValue(self.SSHProxyTunnelFromPort.GetValue())
         else:
+            self.staticbox_Proxy.Enable(False)
+            self.SSHProxySameUser.Enable(False)
+            self.SSHProxySamePassword.Enable(False)
             self.SSHProxyHostLabel.Enable(False)
             self.SSHProxyHost.Enable(False)
+            self.SSHProxyPortLabel.Enable(False)
+            self.SSHProxyPort.Enable(False)
             self.SSHProxyUserLabel.Enable(False)
             self.SSHProxyUser.Enable(False)
             self.SSHProxyKeyFileLabel.Enable(False)
@@ -1578,6 +1987,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
             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'])
@@ -1613,6 +2023,16 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         @type event: C{obj}
 
         """
+        self._toggle_SetKeyboard()
+
+    def _toggle_SetKeyboard(self):
+        """\
+        Toggle keyboard settings, depends on activation/deactivation of custom keyboard settings.
+
+        @param event: event
+        @type event: C{obj}
+
+        """
         if self.CustomSetKeyboard.GetValue():
             self.KeyboardModelLabel.Enable(True)
             self.KeyboardLayoutLabel.Enable(True)
@@ -1636,13 +2056,15 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         @type event: C{obj}
 
         """
+        _session_type = [ i for i in self.sessionChoices.keys() if self.sessionChoices[i] == self.SessionType.GetValue() ][0]
         if self.EnableSound.GetValue():
             self.PulseAudio.Enable(True)
-            self.Esd.Enable(True)
-            self.DefaultSoundPort.Enable(True)
-            if self.DefaultSoundPort.GetValue() is False:
-                self.SoundPortLabel.Enable(True)
-                self.SoundPort.Enable(True)
+            if _session_type != 'DirectRDP':
+                self.Esd.Enable(True)
+                self.DefaultSoundPort.Enable(True)
+                if self.DefaultSoundPort.GetValue() is False:
+                    self.SoundPortLabel.Enable(True)
+                    self.SoundPort.Enable(True)
         else:
             self.PulseAudio.Enable(False)
             self.Esd.Enable(False)
@@ -1650,7 +2072,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
             self.SoundPortLabel.Enable(False)
             self.SoundPort.Enable(False)
 
-
     def OnSetDisplayFullscreen(self, event):
         """\
         Gets called whenever the fullscreen-display radion button gets checked.
@@ -1664,6 +2085,19 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         self.ScreenHeightLabel.Enable(False)
         self.ScreenHeight.Enable(False)
 
+    def OnSetDisplayMaximize(self, event):
+        """\
+        Gets called whenever the maximize-display radion button gets checked.
+
+        @param event: event
+        @type event: C{obj}
+
+        """
+        self.ScreenWidthLabel.Enable(False)
+        self.ScreenWidth.Enable(False)
+        self.ScreenHeightLabel.Enable(False)
+        self.ScreenHeight.Enable(False)
+
     def OnSetDisplayCustom(self, event):
         """\
         Gets called whenever the custom-size-display radion button gets checked.
@@ -1720,6 +2154,16 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         @type event: C{obj}
 
         """
+        self._toggle_DefaultSoundPort()
+
+    def _toggle_DefaultSoundPort(self):
+        """\
+        Gets called indirectly on activation/deactivation of the default-sound-port checkbox.
+
+        @param event: event
+        @type event: C{obj}
+
+        """
         if not self.DefaultSoundPort.GetValue():
             self.SoundPortLabel.Enable(True)
             self.SoundPort.Enable(True)
@@ -1737,6 +2181,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
 
         """
         if self.UseLocalFolderSharing.GetValue():
+            self.RestoreSharedLocalFolders.Enable(True)
             self.SharedFolderPathLabel.Enable(True)
             self.SharedFolderPath.Enable(True)
             self.SharedFolderPathBrowseButton.Enable(True)
@@ -1744,6 +2189,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
             self.UseEncodingConverter.Enable(True)
             self._toggle_useEncodingConverter()
         else:
+            self.RestoreSharedLocalFolders.Enable(False)
             self.AddSharedFolderPathButton.Enable(False)
             self.DeleteSharedFolderPathButton.Enable(False)
             self.SharedFolderPathLabel.Enable(False)
@@ -1757,13 +2203,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
             self.ServerEncoding.Enable(False)
 
     def OnToggleLocalFolderSharing(self, event):
-        """\
-        Gets called on activation/deactivation of client-side local folder sharing.
-
-        @param event: event
-        @type event: C{obj}
-
-        """
         self._toggle_localFolderSharing()
 
     def OnSelectSharedFolderPath(self, event):
@@ -1968,7 +2407,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
             try: wx.EndBusyCursor()
             except: pass
             self.Close()
-            self.Destroy()
         else:
             try: wx.EndBusyCursor()
             except: pass
@@ -1982,7 +2420,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
 
         """
         self.Close()
-        self.Destroy()
 
     def OnDefault(self, event):
         """\
@@ -1995,6 +2432,17 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         self.profile_config = copy.deepcopy(self.profile_config_bak)
         self.__update_fields()
 
+    def Close(self):
+        """\
+        Clean-up disabled profile_names when closing the profile manager dialog.
+
+        """
+        try:
+            self._PyHocaGUI._temp_disabled_profile_names.remove(self.profile_name)
+        except ValueError:
+            pass
+        wx.Dialog.Close(self)
+
     def Destroy(self):
         """\
         Tidy up some stuff in the main application instance before allowing desctruction of the
diff --git a/pyhoca/wxgui/taskbar.py b/pyhoca/wxgui/taskbar.py
index 7fbdd3b..f79feca 100644
--- a/pyhoca/wxgui/taskbar.py
+++ b/pyhoca/wxgui/taskbar.py
@@ -43,12 +43,9 @@ if x2go.X2GOCLIENT_OS == 'Windows':
     import win32gui
 
 import os
-import sys
-import copy
 
 # PyHoca-GUI modules
 import menus_taskbar
-import profilemanager
 import basepath
 
 _icons_location = basepath.icons_basepath


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