[X2go-Commits] pyhoca-gui.git - master (branch) updated: 0.1.0.10-251-gc9065ca

X2Go dev team git-admin at x2go.org
Mon May 28 14:52:48 CEST 2012


The branch, master has been updated
       via  c9065ca07a3da3cb8a940fad2285a95dd2b3805b (commit)
       via  a28d17d078fc2ab8789e9cbb4163a88ca10c0a6f (commit)
      from  356a9f714a5a7e16502541770776bb2b549175aa (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c9065ca07a3da3cb8a940fad2285a95dd2b3805b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon May 28 14:52:43 2012 +0200

    rebuild i18n files, update en/de translations

commit a28d17d078fc2ab8789e9cbb4163a88ca10c0a6f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon May 28 14:47:42 2012 +0200

    Make new session option keyboard ,,variant'' configurable in profile manager.

-----------------------------------------------------------------------

Summary of changes:
 build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo    |  Bin 541 -> 541 bytes
 build/mo/de/LC_MESSAGES/PyHoca-GUI.mo    |  Bin 23288 -> 23399 bytes
 build/mo/en/LC_MESSAGES/PyHoca-GUI.mo    |  Bin 21781 -> 21886 bytes
 build/mo/es/LC_MESSAGES/PyHoca-GUI.mo    |  Bin 17738 -> 17686 bytes
 build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo |  Bin 18323 -> 18219 bytes
 build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo    |  Bin 21924 -> 21915 bytes
 build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo    |  Bin 20538 -> 20407 bytes
 debian/changelog                         |    2 +
 po/PyHoca-GUI.pot                        |  286 +++++++++++++++--------------
 po/bg.po                                 |  286 +++++++++++++++--------------
 po/de.po                                 |  303 ++++++++++++++++--------------
 po/en.po                                 |  303 ++++++++++++++++--------------
 po/es.po                                 |  291 +++++++++++++++--------------
 po/nb_NO.po                              |  301 ++++++++++++++++--------------
 po/nl.po                                 |  303 ++++++++++++++++--------------
 po/sv.po                                 |  301 ++++++++++++++++--------------
 pyhoca/wxgui/profilemanager.py           |   50 ++++--
 17 files changed, 1279 insertions(+), 1147 deletions(-)

The diff of changes is:
diff --git a/build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo
index b967fb3..1205743 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/de/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/de/LC_MESSAGES/PyHoca-GUI.mo
index 0343de5..aa12bfc 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 af47f36..7d541cc 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 1110bd3..a4fa8e6 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/nb_NO/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo
index c626e0a..d248eaf 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 0ea5f8c..6bec9f1 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/sv/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo
index 19a9b7e..51acffc 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 f2f1b83..908b3f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -136,6 +136,8 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
     - Add option --about-image. Allow changing the application's name by
       renaming the ,,pyhoca-gui'' script.
     - Allow custom commands to be desktop sessions.
+    - Make new session option keyboard ,,variant'' configurable in profile
+      manager.
   * Depend on Python X2Go 0.1.2.0.
   * Install GNOME icons via dh_links.
   * Install X2Go icons with explicit install paths.
diff --git a/po/PyHoca-GUI.pot b/po/PyHoca-GUI.pot
index f7232f2..bb8a467 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-05-22 00:16+0200\n"
+"POT-Creation-Date: 2012-05-28 14:52+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -46,7 +46,7 @@ msgstr ""
 msgid "SSH proxy server login"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:311
+#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:314
 #: ../pyhoca/wxgui/messages.py:109 ../pyhoca/wxgui/printingprefs.py:138
 #: ../pyhoca/wxgui/sessiontitle.py:75
 msgid "Cancel"
@@ -204,7 +204,7 @@ msgid "Windows Terminal Server (RDP-proxy)"
 msgstr ""
 
 #. 'DirectRDP': 'Windows Terminal Server (RDP-direct)',
-#: ../pyhoca/wxgui/profilemanager.py:84 ../pyhoca/wxgui/profilemanager.py:200
+#: ../pyhoca/wxgui/profilemanager.py:84 ../pyhoca/wxgui/profilemanager.py:201
 msgid "Custom command"
 msgstr ""
 
@@ -242,394 +242,402 @@ msgstr ""
 
 #. allow localization of the default keyboard settings
 #: ../pyhoca/wxgui/profilemanager.py:138
-msgid "us"
+msgid "<xkbtype>"
 msgstr ""
 
 #: ../pyhoca/wxgui/profilemanager.py:139
-msgid "pc105/us"
+msgid "<xkblayout>"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:140
+msgid "<xkbvariant>"
 msgstr ""
 
 #. boxes for all tabs
-#: ../pyhoca/wxgui/profilemanager.py:153
+#: ../pyhoca/wxgui/profilemanager.py:154
 msgid "Session Title"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:154
+#: ../pyhoca/wxgui/profilemanager.py:155
 msgid "Session Window"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:155
+#: ../pyhoca/wxgui/profilemanager.py:156
 msgid "Session Startup"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:156
+#: ../pyhoca/wxgui/profilemanager.py:157
 msgid "Server"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:157
+#: ../pyhoca/wxgui/profilemanager.py:158
 msgid "Connection Link Speed"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:158
+#: ../pyhoca/wxgui/profilemanager.py:159
 msgid "Compression"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:159
+#: ../pyhoca/wxgui/profilemanager.py:160
 msgid "Display"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:160
+#: ../pyhoca/wxgui/profilemanager.py:161
 msgid "Keyboard"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:161
+#: ../pyhoca/wxgui/profilemanager.py:162
 msgid "Sound"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:162
+#: ../pyhoca/wxgui/profilemanager.py:163
 msgid "Printing"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:163
+#: ../pyhoca/wxgui/profilemanager.py:164
 msgid "Folder Exports"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:164
+#: ../pyhoca/wxgui/profilemanager.py:165
 msgid "File Import"
 msgstr ""
 
 #. ##
 #. ## widgets for the PROFILE tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:169
+#: ../pyhoca/wxgui/profilemanager.py:170
 msgid "Name"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:176
+#: ../pyhoca/wxgui/profilemanager.py:177
 msgid "Set session window title"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:177
+#: ../pyhoca/wxgui/profilemanager.py:178
 msgid "Use a default session window title"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:178
+#: ../pyhoca/wxgui/profilemanager.py:179
 msgid "Custom session window title"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:188
+#: ../pyhoca/wxgui/profilemanager.py:189
 msgid "Window Icon"
 msgstr ""
 
 #. ##
 #. ## widgets for the SESSION tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:194
+#: ../pyhoca/wxgui/profilemanager.py:195
 msgid "Start session automatically after login"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:195
+#: ../pyhoca/wxgui/profilemanager.py:196
 #, python-format
 msgid "Login automatically after %s has started"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:196
+#: ../pyhoca/wxgui/profilemanager.py:197
 msgid "Type"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:198
+#: ../pyhoca/wxgui/profilemanager.py:199
 msgid "Application"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:202
+#: ../pyhoca/wxgui/profilemanager.py:203
 msgid "XDMCP server"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:204
+#: ../pyhoca/wxgui/profilemanager.py:205
 msgid "RDP server"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:206
+#: ../pyhoca/wxgui/profilemanager.py:207
 msgid "RDP options"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:208
+#: ../pyhoca/wxgui/profilemanager.py:209
 msgid "Integrate remote application(s) into local desktop (rootless mode)"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:209
+#: ../pyhoca/wxgui/profilemanager.py:210
 msgid "Menu of published applications"
 msgstr ""
 
 #. ##
 #. ## widgets for the CONNECTION tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:216 ../pyhoca/wxgui/profilemanager.py:226
+#: ../pyhoca/wxgui/profilemanager.py:217 ../pyhoca/wxgui/profilemanager.py:227
 msgid "User"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:218
+#: ../pyhoca/wxgui/profilemanager.py:219
 msgid "Host"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:220
+#: ../pyhoca/wxgui/profilemanager.py:221
 msgid "Port"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:222
+#: ../pyhoca/wxgui/profilemanager.py:223
 msgid "RSA/DSA private key"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:225
+#: ../pyhoca/wxgui/profilemanager.py:226
 msgid "Server behind SSH proxy"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:228
+#: ../pyhoca/wxgui/profilemanager.py:229
 msgid "Key file"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:231
+#: ../pyhoca/wxgui/profilemanager.py:232
 msgid "Host[:Port]"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:233
+#: ../pyhoca/wxgui/profilemanager.py:234
 msgid "SSH Proxy Tunnel"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:241
+#: ../pyhoca/wxgui/profilemanager.py:242
 msgid "Modem"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:242
+#: ../pyhoca/wxgui/profilemanager.py:243
 msgid "ISDN"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:243
+#: ../pyhoca/wxgui/profilemanager.py:244
 msgid "ADSL"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:244
+#: ../pyhoca/wxgui/profilemanager.py:245
 msgid "WAN"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:245
+#: ../pyhoca/wxgui/profilemanager.py:246
 msgid "LAN"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:247
+#: ../pyhoca/wxgui/profilemanager.py:248
 msgid "Method"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:249
+#: ../pyhoca/wxgui/profilemanager.py:250
 msgid "Image quality"
 msgstr ""
 
 #. ##
 #. ## wigdets for the SETTINGS tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:255
+#: ../pyhoca/wxgui/profilemanager.py:256
 msgid "Fullscreen"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:256
+#: ../pyhoca/wxgui/profilemanager.py:257
 msgid "Custom Size"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:261
+#: ../pyhoca/wxgui/profilemanager.py:262
 msgid "Set display DPI"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:263
+#: ../pyhoca/wxgui/profilemanager.py:264
 msgid "Keep current keyboard settings"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:264
-msgid "Keyboard layout"
+#: ../pyhoca/wxgui/profilemanager.py:265
+msgid "Keyboard model"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:266
-msgid "Keyboard model"
+#: ../pyhoca/wxgui/profilemanager.py:267
+msgid "Layout"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:268
+#: ../pyhoca/wxgui/profilemanager.py:269
+msgid "Layout variant"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:271
 msgid "Enable sound support"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:269
+#: ../pyhoca/wxgui/profilemanager.py:272
 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:273
+#: ../pyhoca/wxgui/profilemanager.py:276
 msgid "Arts (not supported)"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:276
+#: ../pyhoca/wxgui/profilemanager.py:279
 msgid "esd"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:277
+#: ../pyhoca/wxgui/profilemanager.py:280
 msgid "Use default sound port"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:278
+#: ../pyhoca/wxgui/profilemanager.py:281
 msgid "Custom sound port"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:280
+#: ../pyhoca/wxgui/profilemanager.py:283
 msgid "Client Side printing"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:282
+#: ../pyhoca/wxgui/profilemanager.py:285
 msgid "Use local folder sharing"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:283
+#: ../pyhoca/wxgui/profilemanager.py:286
 msgid "Path"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:286 ../pyhoca/wxgui/profilemanager.py:305
+#: ../pyhoca/wxgui/profilemanager.py:289 ../pyhoca/wxgui/profilemanager.py:308
 msgid "Add"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:288
+#: ../pyhoca/wxgui/profilemanager.py:291
 msgid "Local Path"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:289
+#: ../pyhoca/wxgui/profilemanager.py:292
 msgid "Connect Method"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:290
+#: ../pyhoca/wxgui/profilemanager.py:293
 msgid "Delete"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:292
+#: ../pyhoca/wxgui/profilemanager.py:295
 msgid "Convert between client and server encodings"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:293
+#: ../pyhoca/wxgui/profilemanager.py:296
 msgid "Client encoding"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:295
+#: ../pyhoca/wxgui/profilemanager.py:298
 msgid "Server encoding"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:298
+#: ../pyhoca/wxgui/profilemanager.py:301
 msgid "Use file MIME box for local file import"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:299
+#: ../pyhoca/wxgui/profilemanager.py:302
 msgid "Extensions"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:301
+#: ../pyhoca/wxgui/profilemanager.py:304
 msgid "Action"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:306
+#: ../pyhoca/wxgui/profilemanager.py:309
 msgid "Defaults"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:308
+#: ../pyhoca/wxgui/profilemanager.py:311
 msgid "Save"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:309
+#: ../pyhoca/wxgui/profilemanager.py:312
 msgid "Reset"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:352
-#: ../pyhoca/wxgui/profilemanager.py:1029
-#: ../pyhoca/wxgui/profilemanager.py:1582
+#: ../pyhoca/wxgui/profilemanager.py:355
+#: ../pyhoca/wxgui/profilemanager.py:1042
+#: ../pyhoca/wxgui/profilemanager.py:1600
 msgid "automatically"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:354
-#: ../pyhoca/wxgui/profilemanager.py:1031
+#: ../pyhoca/wxgui/profilemanager.py:357
+#: ../pyhoca/wxgui/profilemanager.py:1044
 msgid "manually"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:359
+#: ../pyhoca/wxgui/profilemanager.py:362
 msgid "PyHoca-GUI Profile Manager - new profile"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:361
+#: ../pyhoca/wxgui/profilemanager.py:364
 #, python-format
 msgid "PyHoca-GUI Profile Manager - %s (connected)"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:363
+#: ../pyhoca/wxgui/profilemanager.py:366
 #, python-format
 msgid "PyHoca-GUI Profile Manager - %s"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:724
+#: ../pyhoca/wxgui/profilemanager.py:732
 msgid "Profile"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:725
+#: ../pyhoca/wxgui/profilemanager.py:733
 msgid "Session"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:726
+#: ../pyhoca/wxgui/profilemanager.py:734
 msgid "Connection"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:727
+#: ../pyhoca/wxgui/profilemanager.py:735
 msgid "Settings"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:728
+#: ../pyhoca/wxgui/profilemanager.py:736
 msgid "Sharing"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1216
+#: ../pyhoca/wxgui/profilemanager.py:1230
 msgid "Icon Files (*.png)|*.png|All files (*.*)|*"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1219
+#: ../pyhoca/wxgui/profilemanager.py:1233
 msgid "Choose an icon for this session profile"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1393
+#: ../pyhoca/wxgui/profilemanager.py:1407
 msgid "All files (*.*)|*"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1395
-#: ../pyhoca/wxgui/profilemanager.py:1410
+#: ../pyhoca/wxgui/profilemanager.py:1409
+#: ../pyhoca/wxgui/profilemanager.py:1424
 msgid "Choose a public SSH key"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1562
+#: ../pyhoca/wxgui/profilemanager.py:1580
 msgid "Choose a folder to share within a session"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1626
-#: ../pyhoca/wxgui/profilemanager.py:1629
-#: ../pyhoca/wxgui/profilemanager.py:1632
-#: ../pyhoca/wxgui/profilemanager.py:1637
-#: ../pyhoca/wxgui/profilemanager.py:1647 ../pyhoca/wxgui/menus_taskbar.py:106
+#: ../pyhoca/wxgui/profilemanager.py:1644
+#: ../pyhoca/wxgui/profilemanager.py:1647
+#: ../pyhoca/wxgui/profilemanager.py:1650
+#: ../pyhoca/wxgui/profilemanager.py:1655
+#: ../pyhoca/wxgui/profilemanager.py:1665 ../pyhoca/wxgui/menus_taskbar.py:106
 msgid "Profile Manager"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1626
+#: ../pyhoca/wxgui/profilemanager.py:1644
 msgid "Profile name is missing, profile unusable!!!"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1629
-#: ../pyhoca/wxgui/profilemanager.py:1632
+#: ../pyhoca/wxgui/profilemanager.py:1647
+#: ../pyhoca/wxgui/profilemanager.py:1650
 #, python-format
 msgid "Profile name %s already exists!!!"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1637
+#: ../pyhoca/wxgui/profilemanager.py:1655
 msgid "The SSH proxy configuration is incomplete. Try again."
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1647
+#: ../pyhoca/wxgui/profilemanager.py:1665
 #, python-format
 msgid ""
 "Another session profile (%s) already uses [%s]:%s for binding a local SSH "
@@ -637,21 +645,21 @@ msgid ""
 "Please change the SSH proxy settings accordingly."
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1667
+#: ../pyhoca/wxgui/profilemanager.py:1685
 #, python-format
 msgid "%s - profile added"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1668
+#: ../pyhoca/wxgui/profilemanager.py:1686
 msgid "A new session profile has been added."
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1672
+#: ../pyhoca/wxgui/profilemanager.py:1690
 #, python-format
 msgid "%s - modified"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1673
+#: ../pyhoca/wxgui/profilemanager.py:1691
 msgid "Changes to profile have been saved."
 msgstr ""
 
@@ -1048,95 +1056,95 @@ msgid ""
 "X2go/SSH server. Session startup failed."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:997
+#: ../pyhoca/wxgui/frontend.py:1000
 #, python-format
 msgid "%s - audio warning"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:997
+#: ../pyhoca/wxgui/frontend.py:1000
 msgid ""
 "The X2Go PulseAudio system is not available within Remote Desktop sessions."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1000 ../pyhoca/wxgui/frontend.py:1003
+#: ../pyhoca/wxgui/frontend.py:1003 ../pyhoca/wxgui/frontend.py:1006
 #, python-format
 msgid "%s - audio error"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1000
+#: ../pyhoca/wxgui/frontend.py:1003
 msgid "The X2Go PulseAudio system could not be started."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1003
+#: ../pyhoca/wxgui/frontend.py:1006
 msgid "The X2Go PulseAudio system has died unexpectedly."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1006
+#: ../pyhoca/wxgui/frontend.py:1009
 #, python-format
 msgid "%s - audio problem"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1006
+#: ../pyhoca/wxgui/frontend.py:1009
 #, python-format
 msgid ""
 "The audio connection could not be set up for this session.\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1009
+#: ../pyhoca/wxgui/frontend.py:1012
 #, python-format
 msgid "%s - client-side printing not available"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1009
+#: ../pyhoca/wxgui/frontend.py:1012
 #, python-format
 msgid ""
 "The server denies client-side printing from within this session.\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1012
+#: ../pyhoca/wxgui/frontend.py:1015
 #, python-format
 msgid "%s - MIME box not available"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1012
+#: ../pyhoca/wxgui/frontend.py:1015
 #, python-format
 msgid ""
 "The server does not support the X2Go MIME box.\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1015
+#: ../pyhoca/wxgui/frontend.py:1018
 #, python-format
 msgid "%s - client-side folders not sharable"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1015
+#: ../pyhoca/wxgui/frontend.py:1018
 #, python-format
 msgid ""
 "The server denies client-side folder sharing with this session.\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1018
+#: ../pyhoca/wxgui/frontend.py:1021
 #, python-format
 msgid "%s - client resources not sharable"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1018
+#: ../pyhoca/wxgui/frontend.py:1021
 #, python-format
 msgid ""
 "Client-side folders and printers cannot be shared with this session.\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1032 ../pyhoca/wxgui/frontend.py:1034
+#: ../pyhoca/wxgui/frontend.py:1035 ../pyhoca/wxgui/frontend.py:1037
 #, python-format
 msgid "%s - print error"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1032
+#: ../pyhoca/wxgui/frontend.py:1035
 #, python-format
 msgid ""
 "%s\n"
@@ -1144,7 +1152,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1034
+#: ../pyhoca/wxgui/frontend.py:1037
 #, python-format
 msgid ""
 "%s\n"
@@ -1152,74 +1160,74 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1038 ../pyhoca/wxgui/frontend.py:1042
+#: ../pyhoca/wxgui/frontend.py:1041 ../pyhoca/wxgui/frontend.py:1045
 #, python-format
 msgid "%s - start"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1038
+#: ../pyhoca/wxgui/frontend.py:1041
 #, python-format
 msgid ""
 "New X2Go session starting up...\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1042
+#: ../pyhoca/wxgui/frontend.py:1045
 #, python-format
 msgid ""
 "Another client started X2Go session\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1046 ../pyhoca/wxgui/frontend.py:1050
+#: ../pyhoca/wxgui/frontend.py:1049 ../pyhoca/wxgui/frontend.py:1053
 #, python-format
 msgid "%s - resume"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1046
+#: ../pyhoca/wxgui/frontend.py:1049
 #, python-format
 msgid ""
 "Resuming X2Go session...\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1050
+#: ../pyhoca/wxgui/frontend.py:1053
 #, python-format
 msgid ""
 "Another client resumed X2Go session\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1054
+#: ../pyhoca/wxgui/frontend.py:1057
 #, python-format
 msgid "%s - running"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1054
+#: ../pyhoca/wxgui/frontend.py:1057
 #, python-format
 msgid ""
 "Found already running session\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1062
+#: ../pyhoca/wxgui/frontend.py:1066
 #, python-format
 msgid "%s - suspend"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1062
+#: ../pyhoca/wxgui/frontend.py:1066
 #, python-format
 msgid ""
 "X2Go Session has been suspended\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1078
+#: ../pyhoca/wxgui/frontend.py:1082
 #, python-format
 msgid "%s - terminate"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1078
+#: ../pyhoca/wxgui/frontend.py:1082
 #, python-format
 msgid ""
 "X2Go Session has terminated\n"
diff --git a/po/bg.po b/po/bg.po
index 389958a..e86ae48 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PyHoca-GUI VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-22 00:16+0200\n"
+"POT-Creation-Date: 2012-05-28 14:52+0200\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"
@@ -50,7 +50,7 @@ msgstr ""
 msgid "SSH proxy server login"
 msgstr ""
 
-#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:311
+#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:314
 #: ../pyhoca/wxgui/messages.py:109 ../pyhoca/wxgui/printingprefs.py:138
 #: ../pyhoca/wxgui/sessiontitle.py:75
 msgid "Cancel"
@@ -208,7 +208,7 @@ msgid "Windows Terminal Server (RDP-proxy)"
 msgstr ""
 
 #. 'DirectRDP': 'Windows Terminal Server (RDP-direct)',
-#: ../pyhoca/wxgui/profilemanager.py:84 ../pyhoca/wxgui/profilemanager.py:200
+#: ../pyhoca/wxgui/profilemanager.py:84 ../pyhoca/wxgui/profilemanager.py:201
 msgid "Custom command"
 msgstr ""
 
@@ -246,394 +246,402 @@ msgstr ""
 
 #. allow localization of the default keyboard settings
 #: ../pyhoca/wxgui/profilemanager.py:138
-msgid "us"
+msgid "<xkbtype>"
 msgstr ""
 
 #: ../pyhoca/wxgui/profilemanager.py:139
-msgid "pc105/us"
+msgid "<xkblayout>"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:140
+msgid "<xkbvariant>"
 msgstr ""
 
 #. boxes for all tabs
-#: ../pyhoca/wxgui/profilemanager.py:153
+#: ../pyhoca/wxgui/profilemanager.py:154
 msgid "Session Title"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:154
+#: ../pyhoca/wxgui/profilemanager.py:155
 msgid "Session Window"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:155
+#: ../pyhoca/wxgui/profilemanager.py:156
 msgid "Session Startup"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:156
+#: ../pyhoca/wxgui/profilemanager.py:157
 msgid "Server"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:157
+#: ../pyhoca/wxgui/profilemanager.py:158
 msgid "Connection Link Speed"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:158
+#: ../pyhoca/wxgui/profilemanager.py:159
 msgid "Compression"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:159
+#: ../pyhoca/wxgui/profilemanager.py:160
 msgid "Display"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:160
+#: ../pyhoca/wxgui/profilemanager.py:161
 msgid "Keyboard"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:161
+#: ../pyhoca/wxgui/profilemanager.py:162
 msgid "Sound"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:162
+#: ../pyhoca/wxgui/profilemanager.py:163
 msgid "Printing"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:163
+#: ../pyhoca/wxgui/profilemanager.py:164
 msgid "Folder Exports"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:164
+#: ../pyhoca/wxgui/profilemanager.py:165
 msgid "File Import"
 msgstr ""
 
 #. ##
 #. ## widgets for the PROFILE tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:169
+#: ../pyhoca/wxgui/profilemanager.py:170
 msgid "Name"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:176
+#: ../pyhoca/wxgui/profilemanager.py:177
 msgid "Set session window title"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:177
+#: ../pyhoca/wxgui/profilemanager.py:178
 msgid "Use a default session window title"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:178
+#: ../pyhoca/wxgui/profilemanager.py:179
 msgid "Custom session window title"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:188
+#: ../pyhoca/wxgui/profilemanager.py:189
 msgid "Window Icon"
 msgstr ""
 
 #. ##
 #. ## widgets for the SESSION tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:194
+#: ../pyhoca/wxgui/profilemanager.py:195
 msgid "Start session automatically after login"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:195
+#: ../pyhoca/wxgui/profilemanager.py:196
 #, python-format
 msgid "Login automatically after %s has started"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:196
+#: ../pyhoca/wxgui/profilemanager.py:197
 msgid "Type"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:198
+#: ../pyhoca/wxgui/profilemanager.py:199
 msgid "Application"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:202
+#: ../pyhoca/wxgui/profilemanager.py:203
 msgid "XDMCP server"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:204
+#: ../pyhoca/wxgui/profilemanager.py:205
 msgid "RDP server"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:206
+#: ../pyhoca/wxgui/profilemanager.py:207
 msgid "RDP options"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:208
+#: ../pyhoca/wxgui/profilemanager.py:209
 msgid "Integrate remote application(s) into local desktop (rootless mode)"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:209
+#: ../pyhoca/wxgui/profilemanager.py:210
 msgid "Menu of published applications"
 msgstr ""
 
 #. ##
 #. ## widgets for the CONNECTION tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:216 ../pyhoca/wxgui/profilemanager.py:226
+#: ../pyhoca/wxgui/profilemanager.py:217 ../pyhoca/wxgui/profilemanager.py:227
 msgid "User"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:218
+#: ../pyhoca/wxgui/profilemanager.py:219
 msgid "Host"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:220
+#: ../pyhoca/wxgui/profilemanager.py:221
 msgid "Port"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:222
+#: ../pyhoca/wxgui/profilemanager.py:223
 msgid "RSA/DSA private key"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:225
+#: ../pyhoca/wxgui/profilemanager.py:226
 msgid "Server behind SSH proxy"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:228
+#: ../pyhoca/wxgui/profilemanager.py:229
 msgid "Key file"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:231
+#: ../pyhoca/wxgui/profilemanager.py:232
 msgid "Host[:Port]"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:233
+#: ../pyhoca/wxgui/profilemanager.py:234
 msgid "SSH Proxy Tunnel"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:241
+#: ../pyhoca/wxgui/profilemanager.py:242
 msgid "Modem"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:242
+#: ../pyhoca/wxgui/profilemanager.py:243
 msgid "ISDN"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:243
+#: ../pyhoca/wxgui/profilemanager.py:244
 msgid "ADSL"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:244
+#: ../pyhoca/wxgui/profilemanager.py:245
 msgid "WAN"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:245
+#: ../pyhoca/wxgui/profilemanager.py:246
 msgid "LAN"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:247
+#: ../pyhoca/wxgui/profilemanager.py:248
 msgid "Method"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:249
+#: ../pyhoca/wxgui/profilemanager.py:250
 msgid "Image quality"
 msgstr ""
 
 #. ##
 #. ## wigdets for the SETTINGS tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:255
+#: ../pyhoca/wxgui/profilemanager.py:256
 msgid "Fullscreen"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:256
+#: ../pyhoca/wxgui/profilemanager.py:257
 msgid "Custom Size"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:261
+#: ../pyhoca/wxgui/profilemanager.py:262
 msgid "Set display DPI"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:263
+#: ../pyhoca/wxgui/profilemanager.py:264
 msgid "Keep current keyboard settings"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:264
-msgid "Keyboard layout"
+#: ../pyhoca/wxgui/profilemanager.py:265
+msgid "Keyboard model"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:266
-msgid "Keyboard model"
+#: ../pyhoca/wxgui/profilemanager.py:267
+msgid "Layout"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:268
+#: ../pyhoca/wxgui/profilemanager.py:269
+msgid "Layout variant"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:271
 msgid "Enable sound support"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:269
+#: ../pyhoca/wxgui/profilemanager.py:272
 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:273
+#: ../pyhoca/wxgui/profilemanager.py:276
 msgid "Arts (not supported)"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:276
+#: ../pyhoca/wxgui/profilemanager.py:279
 msgid "esd"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:277
+#: ../pyhoca/wxgui/profilemanager.py:280
 msgid "Use default sound port"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:278
+#: ../pyhoca/wxgui/profilemanager.py:281
 msgid "Custom sound port"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:280
+#: ../pyhoca/wxgui/profilemanager.py:283
 msgid "Client Side printing"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:282
+#: ../pyhoca/wxgui/profilemanager.py:285
 msgid "Use local folder sharing"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:283
+#: ../pyhoca/wxgui/profilemanager.py:286
 msgid "Path"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:286 ../pyhoca/wxgui/profilemanager.py:305
+#: ../pyhoca/wxgui/profilemanager.py:289 ../pyhoca/wxgui/profilemanager.py:308
 msgid "Add"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:288
+#: ../pyhoca/wxgui/profilemanager.py:291
 msgid "Local Path"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:289
+#: ../pyhoca/wxgui/profilemanager.py:292
 msgid "Connect Method"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:290
+#: ../pyhoca/wxgui/profilemanager.py:293
 msgid "Delete"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:292
+#: ../pyhoca/wxgui/profilemanager.py:295
 msgid "Convert between client and server encodings"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:293
+#: ../pyhoca/wxgui/profilemanager.py:296
 msgid "Client encoding"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:295
+#: ../pyhoca/wxgui/profilemanager.py:298
 msgid "Server encoding"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:298
+#: ../pyhoca/wxgui/profilemanager.py:301
 msgid "Use file MIME box for local file import"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:299
+#: ../pyhoca/wxgui/profilemanager.py:302
 msgid "Extensions"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:301
+#: ../pyhoca/wxgui/profilemanager.py:304
 msgid "Action"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:306
+#: ../pyhoca/wxgui/profilemanager.py:309
 msgid "Defaults"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:308
+#: ../pyhoca/wxgui/profilemanager.py:311
 msgid "Save"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:309
+#: ../pyhoca/wxgui/profilemanager.py:312
 msgid "Reset"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:352
-#: ../pyhoca/wxgui/profilemanager.py:1029
-#: ../pyhoca/wxgui/profilemanager.py:1582
+#: ../pyhoca/wxgui/profilemanager.py:355
+#: ../pyhoca/wxgui/profilemanager.py:1042
+#: ../pyhoca/wxgui/profilemanager.py:1600
 msgid "automatically"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:354
-#: ../pyhoca/wxgui/profilemanager.py:1031
+#: ../pyhoca/wxgui/profilemanager.py:357
+#: ../pyhoca/wxgui/profilemanager.py:1044
 msgid "manually"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:359
+#: ../pyhoca/wxgui/profilemanager.py:362
 msgid "PyHoca-GUI Profile Manager - new profile"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:361
+#: ../pyhoca/wxgui/profilemanager.py:364
 #, python-format
 msgid "PyHoca-GUI Profile Manager - %s (connected)"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:363
+#: ../pyhoca/wxgui/profilemanager.py:366
 #, python-format
 msgid "PyHoca-GUI Profile Manager - %s"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:724
+#: ../pyhoca/wxgui/profilemanager.py:732
 msgid "Profile"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:725
+#: ../pyhoca/wxgui/profilemanager.py:733
 msgid "Session"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:726
+#: ../pyhoca/wxgui/profilemanager.py:734
 msgid "Connection"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:727
+#: ../pyhoca/wxgui/profilemanager.py:735
 msgid "Settings"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:728
+#: ../pyhoca/wxgui/profilemanager.py:736
 msgid "Sharing"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1216
+#: ../pyhoca/wxgui/profilemanager.py:1230
 msgid "Icon Files (*.png)|*.png|All files (*.*)|*"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1219
+#: ../pyhoca/wxgui/profilemanager.py:1233
 msgid "Choose an icon for this session profile"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1393
+#: ../pyhoca/wxgui/profilemanager.py:1407
 msgid "All files (*.*)|*"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1395
-#: ../pyhoca/wxgui/profilemanager.py:1410
+#: ../pyhoca/wxgui/profilemanager.py:1409
+#: ../pyhoca/wxgui/profilemanager.py:1424
 msgid "Choose a public SSH key"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1562
+#: ../pyhoca/wxgui/profilemanager.py:1580
 msgid "Choose a folder to share within a session"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1626
-#: ../pyhoca/wxgui/profilemanager.py:1629
-#: ../pyhoca/wxgui/profilemanager.py:1632
-#: ../pyhoca/wxgui/profilemanager.py:1637
-#: ../pyhoca/wxgui/profilemanager.py:1647 ../pyhoca/wxgui/menus_taskbar.py:106
+#: ../pyhoca/wxgui/profilemanager.py:1644
+#: ../pyhoca/wxgui/profilemanager.py:1647
+#: ../pyhoca/wxgui/profilemanager.py:1650
+#: ../pyhoca/wxgui/profilemanager.py:1655
+#: ../pyhoca/wxgui/profilemanager.py:1665 ../pyhoca/wxgui/menus_taskbar.py:106
 msgid "Profile Manager"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1626
+#: ../pyhoca/wxgui/profilemanager.py:1644
 msgid "Profile name is missing, profile unusable!!!"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1629
-#: ../pyhoca/wxgui/profilemanager.py:1632
+#: ../pyhoca/wxgui/profilemanager.py:1647
+#: ../pyhoca/wxgui/profilemanager.py:1650
 #, python-format
 msgid "Profile name %s already exists!!!"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1637
+#: ../pyhoca/wxgui/profilemanager.py:1655
 msgid "The SSH proxy configuration is incomplete. Try again."
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1647
+#: ../pyhoca/wxgui/profilemanager.py:1665
 #, python-format
 msgid ""
 "Another session profile (%s) already uses [%s]:%s for binding a local SSH "
@@ -641,21 +649,21 @@ msgid ""
 "Please change the SSH proxy settings accordingly."
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1667
+#: ../pyhoca/wxgui/profilemanager.py:1685
 #, python-format
 msgid "%s - profile added"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1668
+#: ../pyhoca/wxgui/profilemanager.py:1686
 msgid "A new session profile has been added."
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1672
+#: ../pyhoca/wxgui/profilemanager.py:1690
 #, python-format
 msgid "%s - modified"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:1673
+#: ../pyhoca/wxgui/profilemanager.py:1691
 msgid "Changes to profile have been saved."
 msgstr ""
 
@@ -1052,95 +1060,95 @@ msgid ""
 "X2go/SSH server. Session startup failed."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:997
+#: ../pyhoca/wxgui/frontend.py:1000
 #, python-format
 msgid "%s - audio warning"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:997
+#: ../pyhoca/wxgui/frontend.py:1000
 msgid ""
 "The X2Go PulseAudio system is not available within Remote Desktop sessions."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1000 ../pyhoca/wxgui/frontend.py:1003
+#: ../pyhoca/wxgui/frontend.py:1003 ../pyhoca/wxgui/frontend.py:1006
 #, python-format
 msgid "%s - audio error"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1000
+#: ../pyhoca/wxgui/frontend.py:1003
 msgid "The X2Go PulseAudio system could not be started."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1003
+#: ../pyhoca/wxgui/frontend.py:1006
 msgid "The X2Go PulseAudio system has died unexpectedly."
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1006
+#: ../pyhoca/wxgui/frontend.py:1009
 #, python-format
 msgid "%s - audio problem"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1006
+#: ../pyhoca/wxgui/frontend.py:1009
 #, python-format
 msgid ""
 "The audio connection could not be set up for this session.\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1009
+#: ../pyhoca/wxgui/frontend.py:1012
 #, python-format
 msgid "%s - client-side printing not available"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1009
+#: ../pyhoca/wxgui/frontend.py:1012
 #, python-format
 msgid ""
 "The server denies client-side printing from within this session.\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1012
+#: ../pyhoca/wxgui/frontend.py:1015
 #, python-format
 msgid "%s - MIME box not available"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1012
+#: ../pyhoca/wxgui/frontend.py:1015
 #, python-format
 msgid ""
 "The server does not support the X2Go MIME box.\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1015
+#: ../pyhoca/wxgui/frontend.py:1018
 #, python-format
 msgid "%s - client-side folders not sharable"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1015
+#: ../pyhoca/wxgui/frontend.py:1018
 #, python-format
 msgid ""
 "The server denies client-side folder sharing with this session.\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1018
+#: ../pyhoca/wxgui/frontend.py:1021
 #, python-format
 msgid "%s - client resources not sharable"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1018
+#: ../pyhoca/wxgui/frontend.py:1021
 #, python-format
 msgid ""
 "Client-side folders and printers cannot be shared with this session.\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1032 ../pyhoca/wxgui/frontend.py:1034
+#: ../pyhoca/wxgui/frontend.py:1035 ../pyhoca/wxgui/frontend.py:1037
 #, python-format
 msgid "%s - print error"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1032
+#: ../pyhoca/wxgui/frontend.py:1035
 #, python-format
 msgid ""
 "%s\n"
@@ -1148,7 +1156,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1034
+#: ../pyhoca/wxgui/frontend.py:1037
 #, python-format
 msgid ""
 "%s\n"
@@ -1156,74 +1164,74 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1038 ../pyhoca/wxgui/frontend.py:1042
+#: ../pyhoca/wxgui/frontend.py:1041 ../pyhoca/wxgui/frontend.py:1045
 #, python-format
 msgid "%s - start"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1038
+#: ../pyhoca/wxgui/frontend.py:1041
 #, python-format
 msgid ""
 "New X2Go session starting up...\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1042
+#: ../pyhoca/wxgui/frontend.py:1045
 #, python-format
 msgid ""
 "Another client started X2Go session\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1046 ../pyhoca/wxgui/frontend.py:1050
+#: ../pyhoca/wxgui/frontend.py:1049 ../pyhoca/wxgui/frontend.py:1053
 #, python-format
 msgid "%s - resume"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1046
+#: ../pyhoca/wxgui/frontend.py:1049
 #, python-format
 msgid ""
 "Resuming X2Go session...\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1050
+#: ../pyhoca/wxgui/frontend.py:1053
 #, python-format
 msgid ""
 "Another client resumed X2Go session\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1054
+#: ../pyhoca/wxgui/frontend.py:1057
 #, python-format
 msgid "%s - running"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1054
+#: ../pyhoca/wxgui/frontend.py:1057
 #, python-format
 msgid ""
 "Found already running session\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1062
+#: ../pyhoca/wxgui/frontend.py:1066
 #, python-format
 msgid "%s - suspend"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1062
+#: ../pyhoca/wxgui/frontend.py:1066
 #, python-format
 msgid ""
 "X2Go Session has been suspended\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1078
+#: ../pyhoca/wxgui/frontend.py:1082
 #, python-format
 msgid "%s - terminate"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1078
+#: ../pyhoca/wxgui/frontend.py:1082
 #, python-format
 msgid ""
 "X2Go Session has terminated\n"
diff --git a/po/de.po b/po/de.po
index c33512b..757ec23 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PyHoca-GUI VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-22 00:16+0200\n"
-"PO-Revision-Date: 2012-05-22 00:16+0100\n"
+"POT-Creation-Date: 2012-05-28 14:52+0200\n"
+"PO-Revision-Date: 2012-05-28 14:50+0100\n"
 "Last-Translator: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>\n"
 "Language-Team: de <mike.gabriel at das-netzwerkteam.de>\n"
 "Language: \n"
@@ -49,7 +49,7 @@ msgstr "Sitzungslogin"
 msgid "SSH proxy server login"
 msgstr "Anmeldung an SSH Proxy"
 
-#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:311
+#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:314
 #: ../pyhoca/wxgui/messages.py:109 ../pyhoca/wxgui/printingprefs.py:138
 #: ../pyhoca/wxgui/sessiontitle.py:75
 msgid "Cancel"
@@ -216,7 +216,7 @@ msgid "Windows Terminal Server (RDP-proxy)"
 msgstr "Windows Terminalserver (RDP-proxy)"
 
 #. 'DirectRDP': 'Windows Terminal Server (RDP-direct)',
-#: ../pyhoca/wxgui/profilemanager.py:84 ../pyhoca/wxgui/profilemanager.py:200
+#: ../pyhoca/wxgui/profilemanager.py:84 ../pyhoca/wxgui/profilemanager.py:201
 msgid "Custom command"
 msgstr "Benutzerdef. Kommando"
 
@@ -254,397 +254,405 @@ msgstr "Einstellungen übernommen von"
 
 #. allow localization of the default keyboard settings
 #: ../pyhoca/wxgui/profilemanager.py:138
-msgid "us"
-msgstr "de"
+msgid "<xkbtype>"
+msgstr "pc105/de"
 
 #: ../pyhoca/wxgui/profilemanager.py:139
-msgid "pc105/us"
-msgstr "pc105/de"
+msgid "<xkblayout>"
+msgstr "de"
+
+#: ../pyhoca/wxgui/profilemanager.py:140
+msgid "<xkbvariant>"
+msgstr "nodeadkeys"
 
 #. boxes for all tabs
-#: ../pyhoca/wxgui/profilemanager.py:153
+#: ../pyhoca/wxgui/profilemanager.py:154
 msgid "Session Title"
 msgstr "Sitzungstitel"
 
-#: ../pyhoca/wxgui/profilemanager.py:154
+#: ../pyhoca/wxgui/profilemanager.py:155
 msgid "Session Window"
 msgstr "Sitzungsfenster"
 
-#: ../pyhoca/wxgui/profilemanager.py:155
+#: ../pyhoca/wxgui/profilemanager.py:156
 msgid "Session Startup"
 msgstr "Sitzungsstart"
 
-#: ../pyhoca/wxgui/profilemanager.py:156
+#: ../pyhoca/wxgui/profilemanager.py:157
 msgid "Server"
 msgstr "Server"
 
-#: ../pyhoca/wxgui/profilemanager.py:157
+#: ../pyhoca/wxgui/profilemanager.py:158
 msgid "Connection Link Speed"
 msgstr "Verbindungsgeschwindigkeit"
 
-#: ../pyhoca/wxgui/profilemanager.py:158
+#: ../pyhoca/wxgui/profilemanager.py:159
 msgid "Compression"
 msgstr "Komprimierung"
 
-#: ../pyhoca/wxgui/profilemanager.py:159
+#: ../pyhoca/wxgui/profilemanager.py:160
 msgid "Display"
 msgstr "Anzeige"
 
-#: ../pyhoca/wxgui/profilemanager.py:160
+#: ../pyhoca/wxgui/profilemanager.py:161
 msgid "Keyboard"
 msgstr "Tastatur"
 
-#: ../pyhoca/wxgui/profilemanager.py:161
+#: ../pyhoca/wxgui/profilemanager.py:162
 msgid "Sound"
 msgstr "Audio"
 
-#: ../pyhoca/wxgui/profilemanager.py:162
+#: ../pyhoca/wxgui/profilemanager.py:163
 msgid "Printing"
 msgstr "Drucken"
 
-#: ../pyhoca/wxgui/profilemanager.py:163
+#: ../pyhoca/wxgui/profilemanager.py:164
 msgid "Folder Exports"
 msgstr "Ordnerfreigabe"
 
-#: ../pyhoca/wxgui/profilemanager.py:164
+#: ../pyhoca/wxgui/profilemanager.py:165
 msgid "File Import"
 msgstr "Dateiimport"
 
 #. ##
 #. ## widgets for the PROFILE tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:169
+#: ../pyhoca/wxgui/profilemanager.py:170
 msgid "Name"
 msgstr "Name"
 
-#: ../pyhoca/wxgui/profilemanager.py:176
+#: ../pyhoca/wxgui/profilemanager.py:177
 msgid "Set session window title"
 msgstr "Sitzungsfenstertitel setzen"
 
-#: ../pyhoca/wxgui/profilemanager.py:177
+#: ../pyhoca/wxgui/profilemanager.py:178
 msgid "Use a default session window title"
 msgstr "Standardtitel für Sitzungsfenster"
 
-#: ../pyhoca/wxgui/profilemanager.py:178
+#: ../pyhoca/wxgui/profilemanager.py:179
 msgid "Custom session window title"
 msgstr "Sitzungstitel anpassen"
 
-#: ../pyhoca/wxgui/profilemanager.py:188
+#: ../pyhoca/wxgui/profilemanager.py:189
 msgid "Window Icon"
 msgstr "Fenstersymbol"
 
 #. ##
 #. ## widgets for the SESSION tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:194
+#: ../pyhoca/wxgui/profilemanager.py:195
 msgid "Start session automatically after login"
 msgstr "Sitzung nach Anmeldung automatisch starten"
 
-#: ../pyhoca/wxgui/profilemanager.py:195
+#: ../pyhoca/wxgui/profilemanager.py:196
 #, python-format
 msgid "Login automatically after %s has started"
 msgstr "Automatisch anmelden nach %s Programmstart"
 
-#: ../pyhoca/wxgui/profilemanager.py:196
+#: ../pyhoca/wxgui/profilemanager.py:197
 msgid "Type"
 msgstr "Typ"
 
-#: ../pyhoca/wxgui/profilemanager.py:198
+#: ../pyhoca/wxgui/profilemanager.py:199
 msgid "Application"
 msgstr "Anwendung"
 
-#: ../pyhoca/wxgui/profilemanager.py:202
+#: ../pyhoca/wxgui/profilemanager.py:203
 msgid "XDMCP server"
 msgstr "XDMCP Server"
 
-#: ../pyhoca/wxgui/profilemanager.py:204
+#: ../pyhoca/wxgui/profilemanager.py:205
 msgid "RDP server"
 msgstr "RDP Server"
 
-#: ../pyhoca/wxgui/profilemanager.py:206
+#: ../pyhoca/wxgui/profilemanager.py:207
 msgid "RDP options"
 msgstr "RDP Optionen"
 
-#: ../pyhoca/wxgui/profilemanager.py:208
+#: ../pyhoca/wxgui/profilemanager.py:209
 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:209
+#: ../pyhoca/wxgui/profilemanager.py:210
 msgid "Menu of published applications"
 msgstr "Menü mit Server-publizierten Anwendungen"
 
 #. ##
 #. ## widgets for the CONNECTION tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:216 ../pyhoca/wxgui/profilemanager.py:226
+#: ../pyhoca/wxgui/profilemanager.py:217 ../pyhoca/wxgui/profilemanager.py:227
 msgid "User"
 msgstr "Benutzer"
 
-#: ../pyhoca/wxgui/profilemanager.py:218
+#: ../pyhoca/wxgui/profilemanager.py:219
 msgid "Host"
 msgstr "Hostname"
 
-#: ../pyhoca/wxgui/profilemanager.py:220
+#: ../pyhoca/wxgui/profilemanager.py:221
 msgid "Port"
 msgstr "Port"
 
-#: ../pyhoca/wxgui/profilemanager.py:222
+#: ../pyhoca/wxgui/profilemanager.py:223
 msgid "RSA/DSA private key"
 msgstr "Privater RSA/DSA Schlüssel"
 
-#: ../pyhoca/wxgui/profilemanager.py:225
+#: ../pyhoca/wxgui/profilemanager.py:226
 msgid "Server behind SSH proxy"
 msgstr "Server hinter SSH-Proxy"
 
-#: ../pyhoca/wxgui/profilemanager.py:228
+#: ../pyhoca/wxgui/profilemanager.py:229
 msgid "Key file"
 msgstr "Schlüssel"
 
-#: ../pyhoca/wxgui/profilemanager.py:231
+#: ../pyhoca/wxgui/profilemanager.py:232
 msgid "Host[:Port]"
 msgstr "Hostname[:Port]"
 
-#: ../pyhoca/wxgui/profilemanager.py:233
+#: ../pyhoca/wxgui/profilemanager.py:234
 msgid "SSH Proxy Tunnel"
 msgstr "SSH-Proxytunnel"
 
-#: ../pyhoca/wxgui/profilemanager.py:241
+#: ../pyhoca/wxgui/profilemanager.py:242
 msgid "Modem"
 msgstr "Modem"
 
-#: ../pyhoca/wxgui/profilemanager.py:242
+#: ../pyhoca/wxgui/profilemanager.py:243
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../pyhoca/wxgui/profilemanager.py:243
+#: ../pyhoca/wxgui/profilemanager.py:244
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../pyhoca/wxgui/profilemanager.py:244
+#: ../pyhoca/wxgui/profilemanager.py:245
 msgid "WAN"
 msgstr "WAN"
 
-#: ../pyhoca/wxgui/profilemanager.py:245
+#: ../pyhoca/wxgui/profilemanager.py:246
 msgid "LAN"
 msgstr "LAN"
 
-#: ../pyhoca/wxgui/profilemanager.py:247
+#: ../pyhoca/wxgui/profilemanager.py:248
 msgid "Method"
 msgstr "Methode"
 
-#: ../pyhoca/wxgui/profilemanager.py:249
+#: ../pyhoca/wxgui/profilemanager.py:250
 msgid "Image quality"
 msgstr "Bildqualität"
 
 #. ##
 #. ## wigdets for the SETTINGS tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:255
+#: ../pyhoca/wxgui/profilemanager.py:256
 msgid "Fullscreen"
 msgstr "Vollbild"
 
-#: ../pyhoca/wxgui/profilemanager.py:256
+#: ../pyhoca/wxgui/profilemanager.py:257
 msgid "Custom Size"
 msgstr "Benutzerdefinierte Größe"
 
-#: ../pyhoca/wxgui/profilemanager.py:261
+#: ../pyhoca/wxgui/profilemanager.py:262
 msgid "Set display DPI"
 msgstr "DPI-Wert für Anzeige setzen"
 
-#: ../pyhoca/wxgui/profilemanager.py:263
+#: ../pyhoca/wxgui/profilemanager.py:264
 msgid "Keep current keyboard settings"
 msgstr "Aktuelle Tastatureinstellungen beibehalten"
 
-#: ../pyhoca/wxgui/profilemanager.py:264
-msgid "Keyboard layout"
-msgstr "Tastaturlayout"
-
-#: ../pyhoca/wxgui/profilemanager.py:266
+#: ../pyhoca/wxgui/profilemanager.py:265
 msgid "Keyboard model"
 msgstr "Tastaturmodell"
 
-#: ../pyhoca/wxgui/profilemanager.py:268
+#: ../pyhoca/wxgui/profilemanager.py:267
+msgid "Layout"
+msgstr "Layout"
+
+#: ../pyhoca/wxgui/profilemanager.py:269
+msgid "Layout variant"
+msgstr "Layoutvariante"
+
+#: ../pyhoca/wxgui/profilemanager.py:271
 msgid "Enable sound support"
 msgstr "Audiounterstützung aktivieren"
 
-#: ../pyhoca/wxgui/profilemanager.py:269
+#: ../pyhoca/wxgui/profilemanager.py:272
 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:273
+#: ../pyhoca/wxgui/profilemanager.py:276
 msgid "Arts (not supported)"
 msgstr "Arts (nicht unterstützt)"
 
-#: ../pyhoca/wxgui/profilemanager.py:276
+#: ../pyhoca/wxgui/profilemanager.py:279
 msgid "esd"
 msgstr "esd"
 
-#: ../pyhoca/wxgui/profilemanager.py:277
+#: ../pyhoca/wxgui/profilemanager.py:280
 msgid "Use default sound port"
 msgstr "Standard Audio-Port verwenden"
 
-#: ../pyhoca/wxgui/profilemanager.py:278
+#: ../pyhoca/wxgui/profilemanager.py:281
 msgid "Custom sound port"
 msgstr "Benutzerdefinierter Audio-Port"
 
-#: ../pyhoca/wxgui/profilemanager.py:280
+#: ../pyhoca/wxgui/profilemanager.py:283
 msgid "Client Side printing"
 msgstr "Unterstützung für lokale Druckeranbindung"
 
-#: ../pyhoca/wxgui/profilemanager.py:282
+#: ../pyhoca/wxgui/profilemanager.py:285
 msgid "Use local folder sharing"
 msgstr "Lokale Ordnerfreigabe verwenden"
 
-#: ../pyhoca/wxgui/profilemanager.py:283
+#: ../pyhoca/wxgui/profilemanager.py:286
 msgid "Path"
 msgstr "Pfad"
 
-#: ../pyhoca/wxgui/profilemanager.py:286 ../pyhoca/wxgui/profilemanager.py:305
+#: ../pyhoca/wxgui/profilemanager.py:289 ../pyhoca/wxgui/profilemanager.py:308
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: ../pyhoca/wxgui/profilemanager.py:288
+#: ../pyhoca/wxgui/profilemanager.py:291
 msgid "Local Path"
 msgstr "Lokaler Pfad"
 
-#: ../pyhoca/wxgui/profilemanager.py:289
+#: ../pyhoca/wxgui/profilemanager.py:292
 msgid "Connect Method"
 msgstr "Verbindungsart"
 
-#: ../pyhoca/wxgui/profilemanager.py:290
+#: ../pyhoca/wxgui/profilemanager.py:293
 msgid "Delete"
 msgstr "Entfernen"
 
-#: ../pyhoca/wxgui/profilemanager.py:292
+#: ../pyhoca/wxgui/profilemanager.py:295
 msgid "Convert between client and server encodings"
 msgstr "Zeichenkodierung zwischen Server und Client übersetzen"
 
-#: ../pyhoca/wxgui/profilemanager.py:293
+#: ../pyhoca/wxgui/profilemanager.py:296
 msgid "Client encoding"
 msgstr "Zeichenkodierung Client"
 
-#: ../pyhoca/wxgui/profilemanager.py:295
+#: ../pyhoca/wxgui/profilemanager.py:298
 msgid "Server encoding"
 msgstr "Server"
 
-#: ../pyhoca/wxgui/profilemanager.py:298
+#: ../pyhoca/wxgui/profilemanager.py:301
 msgid "Use file MIME box for local file import"
 msgstr "MIME-Box für lokalen Dateiimport verwenden"
 
-#: ../pyhoca/wxgui/profilemanager.py:299
+#: ../pyhoca/wxgui/profilemanager.py:302
 msgid "Extensions"
 msgstr "Erweiterungen"
 
-#: ../pyhoca/wxgui/profilemanager.py:301
+#: ../pyhoca/wxgui/profilemanager.py:304
 msgid "Action"
 msgstr "Aktion"
 
-#: ../pyhoca/wxgui/profilemanager.py:306
+#: ../pyhoca/wxgui/profilemanager.py:309
 msgid "Defaults"
 msgstr "Standardwerte"
 
-#: ../pyhoca/wxgui/profilemanager.py:308
+#: ../pyhoca/wxgui/profilemanager.py:311
 msgid "Save"
 msgstr "Speichern"
 
-#: ../pyhoca/wxgui/profilemanager.py:309
+#: ../pyhoca/wxgui/profilemanager.py:312
 msgid "Reset"
 msgstr "Zurücksetzen"
 
-#: ../pyhoca/wxgui/profilemanager.py:352
-#: ../pyhoca/wxgui/profilemanager.py:1029
-#: ../pyhoca/wxgui/profilemanager.py:1582
+#: ../pyhoca/wxgui/profilemanager.py:355
+#: ../pyhoca/wxgui/profilemanager.py:1042
+#: ../pyhoca/wxgui/profilemanager.py:1600
 msgid "automatically"
 msgstr "automatisch"
 
-#: ../pyhoca/wxgui/profilemanager.py:354
-#: ../pyhoca/wxgui/profilemanager.py:1031
+#: ../pyhoca/wxgui/profilemanager.py:357
+#: ../pyhoca/wxgui/profilemanager.py:1044
 msgid "manually"
 msgstr "manuell"
 
-#: ../pyhoca/wxgui/profilemanager.py:359
+#: ../pyhoca/wxgui/profilemanager.py:362
 msgid "PyHoca-GUI Profile Manager - new profile"
 msgstr "PyHoca-GUI Profilmanager - neues Sitzungsprofil"
 
-#: ../pyhoca/wxgui/profilemanager.py:361
+#: ../pyhoca/wxgui/profilemanager.py:364
 #, python-format
 msgid "PyHoca-GUI Profile Manager - %s (connected)"
 msgstr "PyHoca-GUI Profilmanager - %s (verbunden)"
 
-#: ../pyhoca/wxgui/profilemanager.py:363
+#: ../pyhoca/wxgui/profilemanager.py:366
 #, python-format
 msgid "PyHoca-GUI Profile Manager - %s"
 msgstr "PyHoca-GUI Profilmanager - %s"
 
-#: ../pyhoca/wxgui/profilemanager.py:724
+#: ../pyhoca/wxgui/profilemanager.py:732
 msgid "Profile"
 msgstr "Profil"
 
-#: ../pyhoca/wxgui/profilemanager.py:725
+#: ../pyhoca/wxgui/profilemanager.py:733
 msgid "Session"
 msgstr "Sitzung"
 
-#: ../pyhoca/wxgui/profilemanager.py:726
+#: ../pyhoca/wxgui/profilemanager.py:734
 msgid "Connection"
 msgstr "Verbindung"
 
-#: ../pyhoca/wxgui/profilemanager.py:727
+#: ../pyhoca/wxgui/profilemanager.py:735
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: ../pyhoca/wxgui/profilemanager.py:728
+#: ../pyhoca/wxgui/profilemanager.py:736
 msgid "Sharing"
 msgstr "Ordnerfreigabe"
 
-#: ../pyhoca/wxgui/profilemanager.py:1216
+#: ../pyhoca/wxgui/profilemanager.py:1230
 msgid "Icon Files (*.png)|*.png|All files (*.*)|*"
 msgstr "Icon Dateien (*.png)|*.png|Alle Dateien (*.*)|*"
 
-#: ../pyhoca/wxgui/profilemanager.py:1219
+#: ../pyhoca/wxgui/profilemanager.py:1233
 msgid "Choose an icon for this session profile"
 msgstr "Sitzungs-Icon für dieses Sitzungsprofil auswählen"
 
-#: ../pyhoca/wxgui/profilemanager.py:1393
+#: ../pyhoca/wxgui/profilemanager.py:1407
 msgid "All files (*.*)|*"
 msgstr "Alle Dateien (*.*)|*"
 
-#: ../pyhoca/wxgui/profilemanager.py:1395
-#: ../pyhoca/wxgui/profilemanager.py:1410
+#: ../pyhoca/wxgui/profilemanager.py:1409
+#: ../pyhoca/wxgui/profilemanager.py:1424
 msgid "Choose a public SSH key"
 msgstr "Öffentlichen SSH-Schlüssel auswählen"
 
-#: ../pyhoca/wxgui/profilemanager.py:1562
+#: ../pyhoca/wxgui/profilemanager.py:1580
 msgid "Choose a folder to share within a session"
 msgstr "Ordner zur Freigabe für Sitzungen auswählen"
 
-#: ../pyhoca/wxgui/profilemanager.py:1626
-#: ../pyhoca/wxgui/profilemanager.py:1629
-#: ../pyhoca/wxgui/profilemanager.py:1632
-#: ../pyhoca/wxgui/profilemanager.py:1637
-#: ../pyhoca/wxgui/profilemanager.py:1647 ../pyhoca/wxgui/menus_taskbar.py:106
+#: ../pyhoca/wxgui/profilemanager.py:1644
+#: ../pyhoca/wxgui/profilemanager.py:1647
+#: ../pyhoca/wxgui/profilemanager.py:1650
+#: ../pyhoca/wxgui/profilemanager.py:1655
+#: ../pyhoca/wxgui/profilemanager.py:1665 ../pyhoca/wxgui/menus_taskbar.py:106
 msgid "Profile Manager"
 msgstr "Profilmanager"
 
-#: ../pyhoca/wxgui/profilemanager.py:1626
+#: ../pyhoca/wxgui/profilemanager.py:1644
 msgid "Profile name is missing, profile unusable!!!"
 msgstr "Der Profilname fehlt, Profil so nicht verwendbar!!!"
 
-#: ../pyhoca/wxgui/profilemanager.py:1629
-#: ../pyhoca/wxgui/profilemanager.py:1632
+#: ../pyhoca/wxgui/profilemanager.py:1647
+#: ../pyhoca/wxgui/profilemanager.py:1650
 #, python-format
 msgid "Profile name %s already exists!!!"
 msgstr "Ein Sitzungsprofil mit dem Namen %s existiert bereits!!!"
 
-#: ../pyhoca/wxgui/profilemanager.py:1637
+#: ../pyhoca/wxgui/profilemanager.py:1655
 msgid "The SSH proxy configuration is incomplete. Try again."
 msgstr ""
 "Die SSH Proxy Konfiguration ist unvollständig. Bitte nochmal versuchen."
 
-#: ../pyhoca/wxgui/profilemanager.py:1647
+#: ../pyhoca/wxgui/profilemanager.py:1665
 #, python-format
 msgid ""
 "Another session profile (%s) already uses [%s]:%s for binding a local SSH "
@@ -655,21 +663,21 @@ msgstr ""
 "einen lokalen SSH Proxy Port daran zu binden. Bitte die SSH Proxy "
 "Einstellungen entsprechend ändern."
 
-#: ../pyhoca/wxgui/profilemanager.py:1667
+#: ../pyhoca/wxgui/profilemanager.py:1685
 #, python-format
 msgid "%s - profile added"
 msgstr "%s - Profil hinzugefügt"
 
-#: ../pyhoca/wxgui/profilemanager.py:1668
+#: ../pyhoca/wxgui/profilemanager.py:1686
 msgid "A new session profile has been added."
 msgstr "Ein neues Sitzungsprofil wurde hinzugefügt."
 
-#: ../pyhoca/wxgui/profilemanager.py:1672
+#: ../pyhoca/wxgui/profilemanager.py:1690
 #, python-format
 msgid "%s - modified"
 msgstr "%s - modifiziert"
 
-#: ../pyhoca/wxgui/profilemanager.py:1673
+#: ../pyhoca/wxgui/profilemanager.py:1691
 msgid "Changes to profile have been saved."
 msgstr "Änderungen am Profil wurden übernommen."
 
@@ -1082,37 +1090,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:997
+#: ../pyhoca/wxgui/frontend.py:1000
 #, python-format
 msgid "%s - audio warning"
 msgstr "%s - Warnung Audiosystem"
 
-#: ../pyhoca/wxgui/frontend.py:997
+#: ../pyhoca/wxgui/frontend.py:1000
 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:1000 ../pyhoca/wxgui/frontend.py:1003
+#: ../pyhoca/wxgui/frontend.py:1003 ../pyhoca/wxgui/frontend.py:1006
 #, python-format
 msgid "%s - audio error"
 msgstr "%s - Audiofehler"
 
-#: ../pyhoca/wxgui/frontend.py:1000
+#: ../pyhoca/wxgui/frontend.py:1003
 msgid "The X2Go PulseAudio system could not be started."
 msgstr "Das X2Go PulseAudio System konnte nicht gestartet werden."
 
-#: ../pyhoca/wxgui/frontend.py:1003
+#: ../pyhoca/wxgui/frontend.py:1006
 msgid "The X2Go PulseAudio system has died unexpectedly."
 msgstr "Das X2Go PulseAudio System ist soeben abgestürzt."
 
-#: ../pyhoca/wxgui/frontend.py:1006
+#: ../pyhoca/wxgui/frontend.py:1009
 #, python-format
 msgid "%s - audio problem"
 msgstr "%s - Audioproblem"
 
-#: ../pyhoca/wxgui/frontend.py:1006
+#: ../pyhoca/wxgui/frontend.py:1009
 #, python-format
 msgid ""
 "The audio connection could not be set up for this session.\n"
@@ -1121,12 +1129,12 @@ msgstr ""
 "Die Audio-Verbindung für diese Sitzung konnte nicht aufgebaut werden.\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1009
+#: ../pyhoca/wxgui/frontend.py:1012
 #, python-format
 msgid "%s - client-side printing not available"
 msgstr "%s - Client-seitiges Drucken nicht verfügbar"
 
-#: ../pyhoca/wxgui/frontend.py:1009
+#: ../pyhoca/wxgui/frontend.py:1012
 #, python-format
 msgid ""
 "The server denies client-side printing from within this session.\n"
@@ -1136,12 +1144,12 @@ msgstr ""
 "Server verweigert die Verbindung.\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1012
+#: ../pyhoca/wxgui/frontend.py:1015
 #, python-format
 msgid "%s - MIME box not available"
 msgstr "%s - MIME box nicht verfügbar"
 
-#: ../pyhoca/wxgui/frontend.py:1012
+#: ../pyhoca/wxgui/frontend.py:1015
 #, python-format
 msgid ""
 "The server does not support the X2Go MIME box.\n"
@@ -1150,12 +1158,12 @@ msgstr ""
 "Der Server unterstützt die X2Go MIME box nicht.\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1015
+#: ../pyhoca/wxgui/frontend.py:1018
 #, python-format
 msgid "%s - client-side folders not sharable"
 msgstr "%s - keine Freigabe Client-seitiger Ordner"
 
-#: ../pyhoca/wxgui/frontend.py:1015
+#: ../pyhoca/wxgui/frontend.py:1018
 #, python-format
 msgid ""
 "The server denies client-side folder sharing with this session.\n"
@@ -1165,12 +1173,12 @@ msgstr ""
 "Server verweigert die Verbindung.\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1018
+#: ../pyhoca/wxgui/frontend.py:1021
 #, python-format
 msgid "%s - client resources not sharable"
 msgstr "%s - keine Client-seitigen Ordner- und Druckerfreigaben möglich"
 
-#: ../pyhoca/wxgui/frontend.py:1018
+#: ../pyhoca/wxgui/frontend.py:1021
 #, python-format
 msgid ""
 "Client-side folders and printers cannot be shared with this session.\n"
@@ -1180,12 +1188,12 @@ msgstr ""
 "werden.\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1032 ../pyhoca/wxgui/frontend.py:1034
+#: ../pyhoca/wxgui/frontend.py:1035 ../pyhoca/wxgui/frontend.py:1037
 #, python-format
 msgid "%s - print error"
 msgstr "%s - Druckfehler"
 
-#: ../pyhoca/wxgui/frontend.py:1032
+#: ../pyhoca/wxgui/frontend.py:1035
 #, python-format
 msgid ""
 "%s\n"
@@ -1196,7 +1204,7 @@ msgstr ""
 "...verursacht an Drucker durch Sitzung\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1034
+#: ../pyhoca/wxgui/frontend.py:1037
 #, python-format
 msgid ""
 "%s\n"
@@ -1207,12 +1215,12 @@ msgstr ""
 "...verursacht von Sitzung\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1038 ../pyhoca/wxgui/frontend.py:1042
+#: ../pyhoca/wxgui/frontend.py:1041 ../pyhoca/wxgui/frontend.py:1045
 #, python-format
 msgid "%s - start"
 msgstr "%s - starten"
 
-#: ../pyhoca/wxgui/frontend.py:1038
+#: ../pyhoca/wxgui/frontend.py:1041
 #, python-format
 msgid ""
 "New X2Go session starting up...\n"
@@ -1221,7 +1229,7 @@ msgstr ""
 "Neue X2Go Sitzung wird gestartet...\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1042
+#: ../pyhoca/wxgui/frontend.py:1045
 #, python-format
 msgid ""
 "Another client started X2Go session\n"
@@ -1230,12 +1238,12 @@ msgstr ""
 "Ein anderes X2Go Programm hat diese Sitzung gestartet\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1046 ../pyhoca/wxgui/frontend.py:1050
+#: ../pyhoca/wxgui/frontend.py:1049 ../pyhoca/wxgui/frontend.py:1053
 #, python-format
 msgid "%s - resume"
 msgstr "%s - fortsetzen"
 
-#: ../pyhoca/wxgui/frontend.py:1046
+#: ../pyhoca/wxgui/frontend.py:1049
 #, python-format
 msgid ""
 "Resuming X2Go session...\n"
@@ -1244,7 +1252,7 @@ msgstr ""
 "X2Go Sitzung wird fortgesetzt...\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1050
+#: ../pyhoca/wxgui/frontend.py:1053
 #, python-format
 msgid ""
 "Another client resumed X2Go session\n"
@@ -1253,12 +1261,12 @@ msgstr ""
 "Eine andere X2Go Anwendung hat die Sitzung fortgesetzt\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1054
+#: ../pyhoca/wxgui/frontend.py:1057
 #, python-format
 msgid "%s - running"
 msgstr "%s - aktiv"
 
-#: ../pyhoca/wxgui/frontend.py:1054
+#: ../pyhoca/wxgui/frontend.py:1057
 #, python-format
 msgid ""
 "Found already running session\n"
@@ -1267,12 +1275,12 @@ msgstr ""
 "Bereits aktive Sitzung gefunden\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1062
+#: ../pyhoca/wxgui/frontend.py:1066
 #, python-format
 msgid "%s - suspend"
 msgstr "%s - anhalten"
 
-#: ../pyhoca/wxgui/frontend.py:1062
+#: ../pyhoca/wxgui/frontend.py:1066
 #, python-format
 msgid ""
 "X2Go Session has been suspended\n"
@@ -1281,12 +1289,12 @@ msgstr ""
 "X2Go Sitzung wurde angehalten\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1078
+#: ../pyhoca/wxgui/frontend.py:1082
 #, python-format
 msgid "%s - terminate"
 msgstr "%s - beenden"
 
-#: ../pyhoca/wxgui/frontend.py:1078
+#: ../pyhoca/wxgui/frontend.py:1082
 #, python-format
 msgid ""
 "X2Go Session has terminated\n"
@@ -1431,6 +1439,15 @@ msgstr "Sitzungsfenster umbenennen in"
 msgid "OK"
 msgstr "Ok"
 
+#~ msgid "us"
+#~ msgstr "de"
+
+#~ msgid "pc105/us"
+#~ msgstr "pc105/de"
+
+#~ msgid "Keyboard layout"
+#~ msgstr "Tastaturlayout"
+
 #~ msgid "%s - DNS error"
 #~ msgstr "%s - DNS-Fehler"
 
diff --git a/po/en.po b/po/en.po
index 663b692..42a6662 100644
--- a/po/en.po
+++ b/po/en.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PyHoca-GUI VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-22 00:16+0200\n"
-"PO-Revision-Date: 2012-05-22 00:15+0100\n"
+"POT-Creation-Date: 2012-05-28 14:52+0200\n"
+"PO-Revision-Date: 2012-05-28 14:50+0100\n"
 "Last-Translator: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>\n"
 "Language-Team: en <mike.gabriel at das-netzwerkteam.de>\n"
 "Language: \n"
@@ -49,7 +49,7 @@ msgstr "Session login"
 msgid "SSH proxy server login"
 msgstr "SSH proxy server login"
 
-#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:311
+#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:314
 #: ../pyhoca/wxgui/messages.py:109 ../pyhoca/wxgui/printingprefs.py:138
 #: ../pyhoca/wxgui/sessiontitle.py:75
 msgid "Cancel"
@@ -216,7 +216,7 @@ msgid "Windows Terminal Server (RDP-proxy)"
 msgstr "Windows Terminal Server (RDP-proxy)"
 
 #. 'DirectRDP': 'Windows Terminal Server (RDP-direct)',
-#: ../pyhoca/wxgui/profilemanager.py:84 ../pyhoca/wxgui/profilemanager.py:200
+#: ../pyhoca/wxgui/profilemanager.py:84 ../pyhoca/wxgui/profilemanager.py:201
 msgid "Custom command"
 msgstr "Custom command"
 
@@ -254,394 +254,402 @@ msgstr "settings derived from "
 
 #. allow localization of the default keyboard settings
 #: ../pyhoca/wxgui/profilemanager.py:138
-msgid "us"
-msgstr "us"
+msgid "<xkbtype>"
+msgstr "pc105/us"
 
 #: ../pyhoca/wxgui/profilemanager.py:139
-msgid "pc105/us"
-msgstr "pc105/us"
+msgid "<xkblayout>"
+msgstr "us"
+
+#: ../pyhoca/wxgui/profilemanager.py:140
+msgid "<xkbvariant>"
+msgstr "basic"
 
 #. boxes for all tabs
-#: ../pyhoca/wxgui/profilemanager.py:153
+#: ../pyhoca/wxgui/profilemanager.py:154
 msgid "Session Title"
 msgstr "Session Title"
 
-#: ../pyhoca/wxgui/profilemanager.py:154
+#: ../pyhoca/wxgui/profilemanager.py:155
 msgid "Session Window"
 msgstr "Session Window"
 
-#: ../pyhoca/wxgui/profilemanager.py:155
+#: ../pyhoca/wxgui/profilemanager.py:156
 msgid "Session Startup"
 msgstr "Session Startup"
 
-#: ../pyhoca/wxgui/profilemanager.py:156
+#: ../pyhoca/wxgui/profilemanager.py:157
 msgid "Server"
 msgstr "Server"
 
-#: ../pyhoca/wxgui/profilemanager.py:157
+#: ../pyhoca/wxgui/profilemanager.py:158
 msgid "Connection Link Speed"
 msgstr "Connection Link Speed"
 
-#: ../pyhoca/wxgui/profilemanager.py:158
+#: ../pyhoca/wxgui/profilemanager.py:159
 msgid "Compression"
 msgstr "Compression"
 
-#: ../pyhoca/wxgui/profilemanager.py:159
+#: ../pyhoca/wxgui/profilemanager.py:160
 msgid "Display"
 msgstr "Display"
 
-#: ../pyhoca/wxgui/profilemanager.py:160
+#: ../pyhoca/wxgui/profilemanager.py:161
 msgid "Keyboard"
 msgstr "Keyboard"
 
-#: ../pyhoca/wxgui/profilemanager.py:161
+#: ../pyhoca/wxgui/profilemanager.py:162
 msgid "Sound"
 msgstr "Sound"
 
-#: ../pyhoca/wxgui/profilemanager.py:162
+#: ../pyhoca/wxgui/profilemanager.py:163
 msgid "Printing"
 msgstr "Printing"
 
-#: ../pyhoca/wxgui/profilemanager.py:163
+#: ../pyhoca/wxgui/profilemanager.py:164
 msgid "Folder Exports"
 msgstr "Folder Exports"
 
-#: ../pyhoca/wxgui/profilemanager.py:164
+#: ../pyhoca/wxgui/profilemanager.py:165
 msgid "File Import"
 msgstr "File Import"
 
 #. ##
 #. ## widgets for the PROFILE tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:169
+#: ../pyhoca/wxgui/profilemanager.py:170
 msgid "Name"
 msgstr "Name"
 
-#: ../pyhoca/wxgui/profilemanager.py:176
+#: ../pyhoca/wxgui/profilemanager.py:177
 msgid "Set session window title"
 msgstr "Set session window title"
 
-#: ../pyhoca/wxgui/profilemanager.py:177
+#: ../pyhoca/wxgui/profilemanager.py:178
 msgid "Use a default session window title"
 msgstr "Use a default session window title"
 
-#: ../pyhoca/wxgui/profilemanager.py:178
+#: ../pyhoca/wxgui/profilemanager.py:179
 msgid "Custom session window title"
 msgstr "Custom session window title"
 
-#: ../pyhoca/wxgui/profilemanager.py:188
+#: ../pyhoca/wxgui/profilemanager.py:189
 msgid "Window Icon"
 msgstr "Window Icon"
 
 #. ##
 #. ## widgets for the SESSION tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:194
+#: ../pyhoca/wxgui/profilemanager.py:195
 msgid "Start session automatically after login"
 msgstr "Start session automatically after login"
 
-#: ../pyhoca/wxgui/profilemanager.py:195
+#: ../pyhoca/wxgui/profilemanager.py:196
 #, python-format
 msgid "Login automatically after %s has started"
 msgstr "Login automatically after %s has started"
 
-#: ../pyhoca/wxgui/profilemanager.py:196
+#: ../pyhoca/wxgui/profilemanager.py:197
 msgid "Type"
 msgstr "Type"
 
-#: ../pyhoca/wxgui/profilemanager.py:198
+#: ../pyhoca/wxgui/profilemanager.py:199
 msgid "Application"
 msgstr "Application"
 
-#: ../pyhoca/wxgui/profilemanager.py:202
+#: ../pyhoca/wxgui/profilemanager.py:203
 msgid "XDMCP server"
 msgstr "XDMCP server"
 
-#: ../pyhoca/wxgui/profilemanager.py:204
+#: ../pyhoca/wxgui/profilemanager.py:205
 msgid "RDP server"
 msgstr "RDP server"
 
-#: ../pyhoca/wxgui/profilemanager.py:206
+#: ../pyhoca/wxgui/profilemanager.py:207
 msgid "RDP options"
 msgstr "RDP options"
 
-#: ../pyhoca/wxgui/profilemanager.py:208
+#: ../pyhoca/wxgui/profilemanager.py:209
 msgid "Integrate remote application(s) into local desktop (rootless mode)"
 msgstr "ntegrate remote application(s) into local desktop (rootless mode)"
 
-#: ../pyhoca/wxgui/profilemanager.py:209
+#: ../pyhoca/wxgui/profilemanager.py:210
 msgid "Menu of published applications"
 msgstr "Menu of published applications"
 
 #. ##
 #. ## widgets for the CONNECTION tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:216 ../pyhoca/wxgui/profilemanager.py:226
+#: ../pyhoca/wxgui/profilemanager.py:217 ../pyhoca/wxgui/profilemanager.py:227
 msgid "User"
 msgstr "User"
 
-#: ../pyhoca/wxgui/profilemanager.py:218
+#: ../pyhoca/wxgui/profilemanager.py:219
 msgid "Host"
 msgstr "Host"
 
-#: ../pyhoca/wxgui/profilemanager.py:220
+#: ../pyhoca/wxgui/profilemanager.py:221
 msgid "Port"
 msgstr "Port"
 
-#: ../pyhoca/wxgui/profilemanager.py:222
+#: ../pyhoca/wxgui/profilemanager.py:223
 msgid "RSA/DSA private key"
 msgstr "RSA/DSA private key"
 
-#: ../pyhoca/wxgui/profilemanager.py:225
+#: ../pyhoca/wxgui/profilemanager.py:226
 msgid "Server behind SSH proxy"
 msgstr "Server behind SSH proxy"
 
-#: ../pyhoca/wxgui/profilemanager.py:228
+#: ../pyhoca/wxgui/profilemanager.py:229
 msgid "Key file"
 msgstr "Key file"
 
-#: ../pyhoca/wxgui/profilemanager.py:231
+#: ../pyhoca/wxgui/profilemanager.py:232
 msgid "Host[:Port]"
 msgstr "Host[:Port]"
 
-#: ../pyhoca/wxgui/profilemanager.py:233
+#: ../pyhoca/wxgui/profilemanager.py:234
 msgid "SSH Proxy Tunnel"
 msgstr "SSH Proxy Tunnel"
 
-#: ../pyhoca/wxgui/profilemanager.py:241
+#: ../pyhoca/wxgui/profilemanager.py:242
 msgid "Modem"
 msgstr "Modem"
 
-#: ../pyhoca/wxgui/profilemanager.py:242
+#: ../pyhoca/wxgui/profilemanager.py:243
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../pyhoca/wxgui/profilemanager.py:243
+#: ../pyhoca/wxgui/profilemanager.py:244
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../pyhoca/wxgui/profilemanager.py:244
+#: ../pyhoca/wxgui/profilemanager.py:245
 msgid "WAN"
 msgstr "WAN"
 
-#: ../pyhoca/wxgui/profilemanager.py:245
+#: ../pyhoca/wxgui/profilemanager.py:246
 msgid "LAN"
 msgstr "LAN"
 
-#: ../pyhoca/wxgui/profilemanager.py:247
+#: ../pyhoca/wxgui/profilemanager.py:248
 msgid "Method"
 msgstr "Method"
 
-#: ../pyhoca/wxgui/profilemanager.py:249
+#: ../pyhoca/wxgui/profilemanager.py:250
 msgid "Image quality"
 msgstr "Image quality"
 
 #. ##
 #. ## wigdets for the SETTINGS tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:255
+#: ../pyhoca/wxgui/profilemanager.py:256
 msgid "Fullscreen"
 msgstr "Fullscreen"
 
-#: ../pyhoca/wxgui/profilemanager.py:256
+#: ../pyhoca/wxgui/profilemanager.py:257
 msgid "Custom Size"
 msgstr "Custom Size"
 
-#: ../pyhoca/wxgui/profilemanager.py:261
+#: ../pyhoca/wxgui/profilemanager.py:262
 msgid "Set display DPI"
 msgstr "Set display DPI"
 
-#: ../pyhoca/wxgui/profilemanager.py:263
+#: ../pyhoca/wxgui/profilemanager.py:264
 msgid "Keep current keyboard settings"
 msgstr "Keep current keyboard settings"
 
-#: ../pyhoca/wxgui/profilemanager.py:264
-msgid "Keyboard layout"
-msgstr "Keyboard layout"
-
-#: ../pyhoca/wxgui/profilemanager.py:266
+#: ../pyhoca/wxgui/profilemanager.py:265
 msgid "Keyboard model"
 msgstr "Keyboard model"
 
-#: ../pyhoca/wxgui/profilemanager.py:268
+#: ../pyhoca/wxgui/profilemanager.py:267
+msgid "Layout"
+msgstr "Layout"
+
+#: ../pyhoca/wxgui/profilemanager.py:269
+msgid "Layout variant"
+msgstr "Layout variant"
+
+#: ../pyhoca/wxgui/profilemanager.py:271
 msgid "Enable sound support"
 msgstr "Enable sound support"
 
-#: ../pyhoca/wxgui/profilemanager.py:269
+#: ../pyhoca/wxgui/profilemanager.py:272
 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:273
+#: ../pyhoca/wxgui/profilemanager.py:276
 msgid "Arts (not supported)"
 msgstr "Arts (not supported)"
 
-#: ../pyhoca/wxgui/profilemanager.py:276
+#: ../pyhoca/wxgui/profilemanager.py:279
 msgid "esd"
 msgstr "esd"
 
-#: ../pyhoca/wxgui/profilemanager.py:277
+#: ../pyhoca/wxgui/profilemanager.py:280
 msgid "Use default sound port"
 msgstr "Use default sound port"
 
-#: ../pyhoca/wxgui/profilemanager.py:278
+#: ../pyhoca/wxgui/profilemanager.py:281
 msgid "Custom sound port"
 msgstr "Custom sound port"
 
-#: ../pyhoca/wxgui/profilemanager.py:280
+#: ../pyhoca/wxgui/profilemanager.py:283
 msgid "Client Side printing"
 msgstr "Client Side printing"
 
-#: ../pyhoca/wxgui/profilemanager.py:282
+#: ../pyhoca/wxgui/profilemanager.py:285
 msgid "Use local folder sharing"
 msgstr "Use local folder sharing"
 
-#: ../pyhoca/wxgui/profilemanager.py:283
+#: ../pyhoca/wxgui/profilemanager.py:286
 msgid "Path"
 msgstr "Path"
 
-#: ../pyhoca/wxgui/profilemanager.py:286 ../pyhoca/wxgui/profilemanager.py:305
+#: ../pyhoca/wxgui/profilemanager.py:289 ../pyhoca/wxgui/profilemanager.py:308
 msgid "Add"
 msgstr "Add"
 
-#: ../pyhoca/wxgui/profilemanager.py:288
+#: ../pyhoca/wxgui/profilemanager.py:291
 msgid "Local Path"
 msgstr "Local Path"
 
-#: ../pyhoca/wxgui/profilemanager.py:289
+#: ../pyhoca/wxgui/profilemanager.py:292
 msgid "Connect Method"
 msgstr "Connect Method"
 
-#: ../pyhoca/wxgui/profilemanager.py:290
+#: ../pyhoca/wxgui/profilemanager.py:293
 msgid "Delete"
 msgstr "Delete"
 
-#: ../pyhoca/wxgui/profilemanager.py:292
+#: ../pyhoca/wxgui/profilemanager.py:295
 msgid "Convert between client and server encodings"
 msgstr "Convert between client and server encodings"
 
-#: ../pyhoca/wxgui/profilemanager.py:293
+#: ../pyhoca/wxgui/profilemanager.py:296
 msgid "Client encoding"
 msgstr "Client encoding"
 
-#: ../pyhoca/wxgui/profilemanager.py:295
+#: ../pyhoca/wxgui/profilemanager.py:298
 msgid "Server encoding"
 msgstr "Server encoding"
 
-#: ../pyhoca/wxgui/profilemanager.py:298
+#: ../pyhoca/wxgui/profilemanager.py:301
 msgid "Use file MIME box for local file import"
 msgstr "Use file MIME box for local file import"
 
-#: ../pyhoca/wxgui/profilemanager.py:299
+#: ../pyhoca/wxgui/profilemanager.py:302
 msgid "Extensions"
 msgstr "Extensions"
 
-#: ../pyhoca/wxgui/profilemanager.py:301
+#: ../pyhoca/wxgui/profilemanager.py:304
 msgid "Action"
 msgstr "Action"
 
-#: ../pyhoca/wxgui/profilemanager.py:306
+#: ../pyhoca/wxgui/profilemanager.py:309
 msgid "Defaults"
 msgstr "Defaults"
 
-#: ../pyhoca/wxgui/profilemanager.py:308
+#: ../pyhoca/wxgui/profilemanager.py:311
 msgid "Save"
 msgstr "Save"
 
-#: ../pyhoca/wxgui/profilemanager.py:309
+#: ../pyhoca/wxgui/profilemanager.py:312
 msgid "Reset"
 msgstr "Reset"
 
-#: ../pyhoca/wxgui/profilemanager.py:352
-#: ../pyhoca/wxgui/profilemanager.py:1029
-#: ../pyhoca/wxgui/profilemanager.py:1582
+#: ../pyhoca/wxgui/profilemanager.py:355
+#: ../pyhoca/wxgui/profilemanager.py:1042
+#: ../pyhoca/wxgui/profilemanager.py:1600
 msgid "automatically"
 msgstr "automatically"
 
-#: ../pyhoca/wxgui/profilemanager.py:354
-#: ../pyhoca/wxgui/profilemanager.py:1031
+#: ../pyhoca/wxgui/profilemanager.py:357
+#: ../pyhoca/wxgui/profilemanager.py:1044
 msgid "manually"
 msgstr "manually"
 
-#: ../pyhoca/wxgui/profilemanager.py:359
+#: ../pyhoca/wxgui/profilemanager.py:362
 msgid "PyHoca-GUI Profile Manager - new profile"
 msgstr "PyHoca-GUI Profile Manager - new profile"
 
-#: ../pyhoca/wxgui/profilemanager.py:361
+#: ../pyhoca/wxgui/profilemanager.py:364
 #, python-format
 msgid "PyHoca-GUI Profile Manager - %s (connected)"
 msgstr "PyHoca-GUI Profile Manager - %s (connected)"
 
-#: ../pyhoca/wxgui/profilemanager.py:363
+#: ../pyhoca/wxgui/profilemanager.py:366
 #, python-format
 msgid "PyHoca-GUI Profile Manager - %s"
 msgstr "PyHoca-GUI Profile Manager - %s"
 
-#: ../pyhoca/wxgui/profilemanager.py:724
+#: ../pyhoca/wxgui/profilemanager.py:732
 msgid "Profile"
 msgstr "Profile"
 
-#: ../pyhoca/wxgui/profilemanager.py:725
+#: ../pyhoca/wxgui/profilemanager.py:733
 msgid "Session"
 msgstr "Session"
 
-#: ../pyhoca/wxgui/profilemanager.py:726
+#: ../pyhoca/wxgui/profilemanager.py:734
 msgid "Connection"
 msgstr "Connection"
 
-#: ../pyhoca/wxgui/profilemanager.py:727
+#: ../pyhoca/wxgui/profilemanager.py:735
 msgid "Settings"
 msgstr "Settings"
 
-#: ../pyhoca/wxgui/profilemanager.py:728
+#: ../pyhoca/wxgui/profilemanager.py:736
 msgid "Sharing"
 msgstr "Sharing"
 
-#: ../pyhoca/wxgui/profilemanager.py:1216
+#: ../pyhoca/wxgui/profilemanager.py:1230
 msgid "Icon Files (*.png)|*.png|All files (*.*)|*"
 msgstr "Icon Files (*.png)|*.png|All files (*.*)|*"
 
-#: ../pyhoca/wxgui/profilemanager.py:1219
+#: ../pyhoca/wxgui/profilemanager.py:1233
 msgid "Choose an icon for this session profile"
 msgstr "Choose an icon for this session profile"
 
-#: ../pyhoca/wxgui/profilemanager.py:1393
+#: ../pyhoca/wxgui/profilemanager.py:1407
 msgid "All files (*.*)|*"
 msgstr "All files (*.*)|*"
 
-#: ../pyhoca/wxgui/profilemanager.py:1395
-#: ../pyhoca/wxgui/profilemanager.py:1410
+#: ../pyhoca/wxgui/profilemanager.py:1409
+#: ../pyhoca/wxgui/profilemanager.py:1424
 msgid "Choose a public SSH key"
 msgstr "Choose a public SSH key"
 
-#: ../pyhoca/wxgui/profilemanager.py:1562
+#: ../pyhoca/wxgui/profilemanager.py:1580
 msgid "Choose a folder to share within a session"
 msgstr "Choose a folder to share within a session"
 
-#: ../pyhoca/wxgui/profilemanager.py:1626
-#: ../pyhoca/wxgui/profilemanager.py:1629
-#: ../pyhoca/wxgui/profilemanager.py:1632
-#: ../pyhoca/wxgui/profilemanager.py:1637
-#: ../pyhoca/wxgui/profilemanager.py:1647 ../pyhoca/wxgui/menus_taskbar.py:106
+#: ../pyhoca/wxgui/profilemanager.py:1644
+#: ../pyhoca/wxgui/profilemanager.py:1647
+#: ../pyhoca/wxgui/profilemanager.py:1650
+#: ../pyhoca/wxgui/profilemanager.py:1655
+#: ../pyhoca/wxgui/profilemanager.py:1665 ../pyhoca/wxgui/menus_taskbar.py:106
 msgid "Profile Manager"
 msgstr "Profile Manager"
 
-#: ../pyhoca/wxgui/profilemanager.py:1626
+#: ../pyhoca/wxgui/profilemanager.py:1644
 msgid "Profile name is missing, profile unusable!!!"
 msgstr "Profile name is missing, profile unusable!!!"
 
-#: ../pyhoca/wxgui/profilemanager.py:1629
-#: ../pyhoca/wxgui/profilemanager.py:1632
+#: ../pyhoca/wxgui/profilemanager.py:1647
+#: ../pyhoca/wxgui/profilemanager.py:1650
 #, python-format
 msgid "Profile name %s already exists!!!"
 msgstr "Profile name %s already exists!!!"
 
-#: ../pyhoca/wxgui/profilemanager.py:1637
+#: ../pyhoca/wxgui/profilemanager.py:1655
 msgid "The SSH proxy configuration is incomplete. Try again."
 msgstr "The SSH proxy configuration is incomplete. Try again."
 
-#: ../pyhoca/wxgui/profilemanager.py:1647
+#: ../pyhoca/wxgui/profilemanager.py:1665
 #, python-format
 msgid ""
 "Another session profile (%s) already uses [%s]:%s for binding a local SSH "
@@ -652,21 +660,21 @@ msgstr ""
 "proxy to.\n"
 "Please change the SSH proxy settings accordingly."
 
-#: ../pyhoca/wxgui/profilemanager.py:1667
+#: ../pyhoca/wxgui/profilemanager.py:1685
 #, python-format
 msgid "%s - profile added"
 msgstr "%s - profile added"
 
-#: ../pyhoca/wxgui/profilemanager.py:1668
+#: ../pyhoca/wxgui/profilemanager.py:1686
 msgid "A new session profile has been added."
 msgstr "A new session profile has been added."
 
-#: ../pyhoca/wxgui/profilemanager.py:1672
+#: ../pyhoca/wxgui/profilemanager.py:1690
 #, python-format
 msgid "%s - modified"
 msgstr "%s - modified"
 
-#: ../pyhoca/wxgui/profilemanager.py:1673
+#: ../pyhoca/wxgui/profilemanager.py:1691
 msgid "Changes to profile have been saved."
 msgstr "Changes to profile have been saved."
 
@@ -1076,36 +1084,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:997
+#: ../pyhoca/wxgui/frontend.py:1000
 #, python-format
 msgid "%s - audio warning"
 msgstr "%s - audio warning"
 
-#: ../pyhoca/wxgui/frontend.py:997
+#: ../pyhoca/wxgui/frontend.py:1000
 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:1000 ../pyhoca/wxgui/frontend.py:1003
+#: ../pyhoca/wxgui/frontend.py:1003 ../pyhoca/wxgui/frontend.py:1006
 #, python-format
 msgid "%s - audio error"
 msgstr "%s - audio error"
 
-#: ../pyhoca/wxgui/frontend.py:1000
+#: ../pyhoca/wxgui/frontend.py:1003
 msgid "The X2Go PulseAudio system could not be started."
 msgstr "The X2Go PulseAudio system could not be started."
 
-#: ../pyhoca/wxgui/frontend.py:1003
+#: ../pyhoca/wxgui/frontend.py:1006
 msgid "The X2Go PulseAudio system has died unexpectedly."
 msgstr "The X2Go PulseAudio system has died unexpectedly."
 
-#: ../pyhoca/wxgui/frontend.py:1006
+#: ../pyhoca/wxgui/frontend.py:1009
 #, python-format
 msgid "%s - audio problem"
 msgstr "%s - audio problem"
 
-#: ../pyhoca/wxgui/frontend.py:1006
+#: ../pyhoca/wxgui/frontend.py:1009
 #, python-format
 msgid ""
 "The audio connection could not be set up for this session.\n"
@@ -1114,12 +1122,12 @@ msgstr ""
 "The audio connection could not be set up for this session.\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1009
+#: ../pyhoca/wxgui/frontend.py:1012
 #, python-format
 msgid "%s - client-side printing not available"
 msgstr "%s - client-side printing not available"
 
-#: ../pyhoca/wxgui/frontend.py:1009
+#: ../pyhoca/wxgui/frontend.py:1012
 #, python-format
 msgid ""
 "The server denies client-side printing from within this session.\n"
@@ -1128,12 +1136,12 @@ msgstr ""
 "The server denies client-side printing from within this session.\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1012
+#: ../pyhoca/wxgui/frontend.py:1015
 #, python-format
 msgid "%s - MIME box not available"
 msgstr "%s - MIME box not available"
 
-#: ../pyhoca/wxgui/frontend.py:1012
+#: ../pyhoca/wxgui/frontend.py:1015
 #, python-format
 msgid ""
 "The server does not support the X2Go MIME box.\n"
@@ -1142,12 +1150,12 @@ msgstr ""
 "The server does not support the X2Go MIME box.\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1015
+#: ../pyhoca/wxgui/frontend.py:1018
 #, python-format
 msgid "%s - client-side folders not sharable"
 msgstr "%s - client-side folders not sharable"
 
-#: ../pyhoca/wxgui/frontend.py:1015
+#: ../pyhoca/wxgui/frontend.py:1018
 #, python-format
 msgid ""
 "The server denies client-side folder sharing with this session.\n"
@@ -1156,12 +1164,12 @@ msgstr ""
 "The server denies client-side folder sharing with this session.\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1018
+#: ../pyhoca/wxgui/frontend.py:1021
 #, python-format
 msgid "%s - client resources not sharable"
 msgstr "%s - client resources not sharable"
 
-#: ../pyhoca/wxgui/frontend.py:1018
+#: ../pyhoca/wxgui/frontend.py:1021
 #, python-format
 msgid ""
 "Client-side folders and printers cannot be shared with this session.\n"
@@ -1170,12 +1178,12 @@ msgstr ""
 "Client-side folders and printers cannot be shared with this session.\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1032 ../pyhoca/wxgui/frontend.py:1034
+#: ../pyhoca/wxgui/frontend.py:1035 ../pyhoca/wxgui/frontend.py:1037
 #, python-format
 msgid "%s - print error"
 msgstr "%s - print error"
 
-#: ../pyhoca/wxgui/frontend.py:1032
+#: ../pyhoca/wxgui/frontend.py:1035
 #, python-format
 msgid ""
 "%s\n"
@@ -1186,7 +1194,7 @@ msgstr ""
 "...caused on printer %s by session\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1034
+#: ../pyhoca/wxgui/frontend.py:1037
 #, python-format
 msgid ""
 "%s\n"
@@ -1197,12 +1205,12 @@ msgstr ""
 "...caused by session\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1038 ../pyhoca/wxgui/frontend.py:1042
+#: ../pyhoca/wxgui/frontend.py:1041 ../pyhoca/wxgui/frontend.py:1045
 #, python-format
 msgid "%s - start"
 msgstr "%s - start"
 
-#: ../pyhoca/wxgui/frontend.py:1038
+#: ../pyhoca/wxgui/frontend.py:1041
 #, python-format
 msgid ""
 "New X2Go session starting up...\n"
@@ -1211,7 +1219,7 @@ msgstr ""
 "New X2Go session starting up...\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1042
+#: ../pyhoca/wxgui/frontend.py:1045
 #, python-format
 msgid ""
 "Another client started X2Go session\n"
@@ -1220,12 +1228,12 @@ msgstr ""
 "Another client started X2Go session\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1046 ../pyhoca/wxgui/frontend.py:1050
+#: ../pyhoca/wxgui/frontend.py:1049 ../pyhoca/wxgui/frontend.py:1053
 #, python-format
 msgid "%s - resume"
 msgstr "%s - resume"
 
-#: ../pyhoca/wxgui/frontend.py:1046
+#: ../pyhoca/wxgui/frontend.py:1049
 #, python-format
 msgid ""
 "Resuming X2Go session...\n"
@@ -1234,7 +1242,7 @@ msgstr ""
 "Resuming X2Go session...\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1050
+#: ../pyhoca/wxgui/frontend.py:1053
 #, python-format
 msgid ""
 "Another client resumed X2Go session\n"
@@ -1243,12 +1251,12 @@ msgstr ""
 "Another client resumed X2Go session\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1054
+#: ../pyhoca/wxgui/frontend.py:1057
 #, python-format
 msgid "%s - running"
 msgstr "%s - running"
 
-#: ../pyhoca/wxgui/frontend.py:1054
+#: ../pyhoca/wxgui/frontend.py:1057
 #, python-format
 msgid ""
 "Found already running session\n"
@@ -1257,12 +1265,12 @@ msgstr ""
 "Found already running session\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1062
+#: ../pyhoca/wxgui/frontend.py:1066
 #, python-format
 msgid "%s - suspend"
 msgstr "%s - suspend"
 
-#: ../pyhoca/wxgui/frontend.py:1062
+#: ../pyhoca/wxgui/frontend.py:1066
 #, python-format
 msgid ""
 "X2Go Session has been suspended\n"
@@ -1271,12 +1279,12 @@ msgstr ""
 "X2Go Session has been suspended\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1078
+#: ../pyhoca/wxgui/frontend.py:1082
 #, python-format
 msgid "%s - terminate"
 msgstr "%s - terminate"
 
-#: ../pyhoca/wxgui/frontend.py:1078
+#: ../pyhoca/wxgui/frontend.py:1082
 #, python-format
 msgid ""
 "X2Go Session has terminated\n"
@@ -1420,6 +1428,15 @@ msgstr "Change session title to"
 msgid "OK"
 msgstr "OK"
 
+#~ msgid "us"
+#~ msgstr "us"
+
+#~ msgid "pc105/us"
+#~ msgstr "pc105/us"
+
+#~ msgid "Keyboard layout"
+#~ msgstr "Keyboard layout"
+
 #~ msgid "%s - DNS error"
 #~ msgstr "%s - DNS error"
 
diff --git a/po/es.po b/po/es.po
index cd97758..f3a6745 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PyHoca-GUI VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-22 00:16+0200\n"
+"POT-Creation-Date: 2012-05-28 14:52+0200\n"
 "PO-Revision-Date: 2011-11-30 15:59+0100\n"
 "Last-Translator: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>\n"
 "Language-Team: Spanish <x2go-dev at lists.berlios.de>\n"
@@ -52,7 +52,7 @@ msgstr "Inicio de sesión"
 msgid "SSH proxy server login"
 msgstr "Inicio de sesión en el servidor proxy SSH"
 
-#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:311
+#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:314
 #: ../pyhoca/wxgui/messages.py:109 ../pyhoca/wxgui/printingprefs.py:138
 #: ../pyhoca/wxgui/sessiontitle.py:75
 msgid "Cancel"
@@ -222,7 +222,7 @@ msgid "Windows Terminal Server (RDP-proxy)"
 msgstr "Windows Terminal Server (RDP-proxy)"
 
 #. 'DirectRDP': 'Windows Terminal Server (RDP-direct)',
-#: ../pyhoca/wxgui/profilemanager.py:84 ../pyhoca/wxgui/profilemanager.py:200
+#: ../pyhoca/wxgui/profilemanager.py:84 ../pyhoca/wxgui/profilemanager.py:201
 msgid "Custom command"
 msgstr "Comando personalizado"
 
@@ -261,88 +261,92 @@ msgstr ""
 
 #. allow localization of the default keyboard settings
 #: ../pyhoca/wxgui/profilemanager.py:138
-msgid "us"
+msgid "<xkbtype>"
 msgstr ""
 
 #: ../pyhoca/wxgui/profilemanager.py:139
-msgid "pc105/us"
+msgid "<xkblayout>"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:140
+msgid "<xkbvariant>"
 msgstr ""
 
 #. boxes for all tabs
-#: ../pyhoca/wxgui/profilemanager.py:153
+#: ../pyhoca/wxgui/profilemanager.py:154
 #, fuzzy
 msgid "Session Title"
 msgstr "Perfil de Sesión"
 
-#: ../pyhoca/wxgui/profilemanager.py:154
+#: ../pyhoca/wxgui/profilemanager.py:155
 #, fuzzy
 msgid "Session Window"
 msgstr "Retomar Sesión"
 
-#: ../pyhoca/wxgui/profilemanager.py:155
+#: ../pyhoca/wxgui/profilemanager.py:156
 #, fuzzy
 msgid "Session Startup"
 msgstr "Sesión"
 
-#: ../pyhoca/wxgui/profilemanager.py:156
+#: ../pyhoca/wxgui/profilemanager.py:157
 msgid "Server"
 msgstr "Servidor"
 
-#: ../pyhoca/wxgui/profilemanager.py:157
+#: ../pyhoca/wxgui/profilemanager.py:158
 msgid "Connection Link Speed"
 msgstr "Velocidad de conexión"
 
-#: ../pyhoca/wxgui/profilemanager.py:158
+#: ../pyhoca/wxgui/profilemanager.py:159
 msgid "Compression"
 msgstr "Compresión"
 
-#: ../pyhoca/wxgui/profilemanager.py:159
+#: ../pyhoca/wxgui/profilemanager.py:160
 msgid "Display"
 msgstr "Pantalla"
 
-#: ../pyhoca/wxgui/profilemanager.py:160
+#: ../pyhoca/wxgui/profilemanager.py:161
 msgid "Keyboard"
 msgstr "Teclado"
 
-#: ../pyhoca/wxgui/profilemanager.py:161
+#: ../pyhoca/wxgui/profilemanager.py:162
 msgid "Sound"
 msgstr "Sonido"
 
-#: ../pyhoca/wxgui/profilemanager.py:162
+#: ../pyhoca/wxgui/profilemanager.py:163
 msgid "Printing"
 msgstr "Impresora"
 
-#: ../pyhoca/wxgui/profilemanager.py:163
+#: ../pyhoca/wxgui/profilemanager.py:164
 msgid "Folder Exports"
 msgstr "Carpeta de Exportaciones"
 
-#: ../pyhoca/wxgui/profilemanager.py:164
+#: ../pyhoca/wxgui/profilemanager.py:165
 msgid "File Import"
 msgstr "Importar Archivo"
 
 #. ##
 #. ## widgets for the PROFILE tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:169
+#: ../pyhoca/wxgui/profilemanager.py:170
 msgid "Name"
 msgstr "Nombre"
 
-#: ../pyhoca/wxgui/profilemanager.py:176
+#: ../pyhoca/wxgui/profilemanager.py:177
 #, fuzzy
 msgid "Set session window title"
 msgstr "Título de Sesión"
 
-#: ../pyhoca/wxgui/profilemanager.py:177
+#: ../pyhoca/wxgui/profilemanager.py:178
 #, fuzzy
 msgid "Use a default session window title"
 msgstr "Título de Sesión"
 
-#: ../pyhoca/wxgui/profilemanager.py:178
+#: ../pyhoca/wxgui/profilemanager.py:179
 #, fuzzy
 msgid "Custom session window title"
 msgstr "Título de Sesión"
 
-#: ../pyhoca/wxgui/profilemanager.py:188
+#: ../pyhoca/wxgui/profilemanager.py:189
 #, fuzzy
 msgid "Window Icon"
 msgstr "Título de Sesión"
@@ -350,315 +354,319 @@ msgstr "Título de Sesión"
 #. ##
 #. ## widgets for the SESSION tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:194
+#: ../pyhoca/wxgui/profilemanager.py:195
 msgid "Start session automatically after login"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:195
+#: ../pyhoca/wxgui/profilemanager.py:196
 #, python-format
 msgid "Login automatically after %s has started"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:196
+#: ../pyhoca/wxgui/profilemanager.py:197
 msgid "Type"
 msgstr "Tipo"
 
-#: ../pyhoca/wxgui/profilemanager.py:198
+#: ../pyhoca/wxgui/profilemanager.py:199
 msgid "Application"
 msgstr "Aplicación"
 
-#: ../pyhoca/wxgui/profilemanager.py:202
+#: ../pyhoca/wxgui/profilemanager.py:203
 msgid "XDMCP server"
 msgstr "Servidor XDMCP"
 
-#: ../pyhoca/wxgui/profilemanager.py:204
+#: ../pyhoca/wxgui/profilemanager.py:205
 msgid "RDP server"
 msgstr "Servidor RDP"
 
-#: ../pyhoca/wxgui/profilemanager.py:206
+#: ../pyhoca/wxgui/profilemanager.py:207
 msgid "RDP options"
 msgstr "Opciones RDP"
 
-#: ../pyhoca/wxgui/profilemanager.py:208
+#: ../pyhoca/wxgui/profilemanager.py:209
 msgid "Integrate remote application(s) into local desktop (rootless mode)"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:209
+#: ../pyhoca/wxgui/profilemanager.py:210
 msgid "Menu of published applications"
 msgstr ""
 
 #. ##
 #. ## widgets for the CONNECTION tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:216 ../pyhoca/wxgui/profilemanager.py:226
+#: ../pyhoca/wxgui/profilemanager.py:217 ../pyhoca/wxgui/profilemanager.py:227
 msgid "User"
 msgstr "Usuario"
 
-#: ../pyhoca/wxgui/profilemanager.py:218
+#: ../pyhoca/wxgui/profilemanager.py:219
 msgid "Host"
 msgstr "Host"
 
-#: ../pyhoca/wxgui/profilemanager.py:220
+#: ../pyhoca/wxgui/profilemanager.py:221
 msgid "Port"
 msgstr "Puerto"
 
-#: ../pyhoca/wxgui/profilemanager.py:222
+#: ../pyhoca/wxgui/profilemanager.py:223
 msgid "RSA/DSA private key"
 msgstr "Clave privada RSA/DSA"
 
-#: ../pyhoca/wxgui/profilemanager.py:225
+#: ../pyhoca/wxgui/profilemanager.py:226
 msgid "Server behind SSH proxy"
 msgstr "Servidor detrás del proxy SSH"
 
-#: ../pyhoca/wxgui/profilemanager.py:228
+#: ../pyhoca/wxgui/profilemanager.py:229
 msgid "Key file"
 msgstr "Clave"
 
-#: ../pyhoca/wxgui/profilemanager.py:231
+#: ../pyhoca/wxgui/profilemanager.py:232
 msgid "Host[:Port]"
 msgstr "Host[:Puerto]"
 
-#: ../pyhoca/wxgui/profilemanager.py:233
+#: ../pyhoca/wxgui/profilemanager.py:234
 msgid "SSH Proxy Tunnel"
 msgstr "Tunel Proxy SSH"
 
-#: ../pyhoca/wxgui/profilemanager.py:241
+#: ../pyhoca/wxgui/profilemanager.py:242
 msgid "Modem"
 msgstr "Módem"
 
-#: ../pyhoca/wxgui/profilemanager.py:242
+#: ../pyhoca/wxgui/profilemanager.py:243
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../pyhoca/wxgui/profilemanager.py:243
+#: ../pyhoca/wxgui/profilemanager.py:244
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../pyhoca/wxgui/profilemanager.py:244
+#: ../pyhoca/wxgui/profilemanager.py:245
 msgid "WAN"
 msgstr "WAN"
 
-#: ../pyhoca/wxgui/profilemanager.py:245
+#: ../pyhoca/wxgui/profilemanager.py:246
 msgid "LAN"
 msgstr "LAN"
 
-#: ../pyhoca/wxgui/profilemanager.py:247
+#: ../pyhoca/wxgui/profilemanager.py:248
 msgid "Method"
 msgstr "Método"
 
-#: ../pyhoca/wxgui/profilemanager.py:249
+#: ../pyhoca/wxgui/profilemanager.py:250
 msgid "Image quality"
 msgstr "Calidad de imagen"
 
 #. ##
 #. ## wigdets for the SETTINGS tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:255
+#: ../pyhoca/wxgui/profilemanager.py:256
 msgid "Fullscreen"
 msgstr "Pantalla Completa"
 
-#: ../pyhoca/wxgui/profilemanager.py:256
+#: ../pyhoca/wxgui/profilemanager.py:257
 msgid "Custom Size"
 msgstr "Tamaño Personalizado"
 
-#: ../pyhoca/wxgui/profilemanager.py:261
+#: ../pyhoca/wxgui/profilemanager.py:262
 msgid "Set display DPI"
 msgstr "Establecer DPI"
 
-#: ../pyhoca/wxgui/profilemanager.py:263
+#: ../pyhoca/wxgui/profilemanager.py:264
 msgid "Keep current keyboard settings"
 msgstr "Mantener configuración actual del teclado"
 
-#: ../pyhoca/wxgui/profilemanager.py:264
-msgid "Keyboard layout"
-msgstr "Máscara de teclado"
-
-#: ../pyhoca/wxgui/profilemanager.py:266
+#: ../pyhoca/wxgui/profilemanager.py:265
 msgid "Keyboard model"
 msgstr "Modelo de teclado"
 
-#: ../pyhoca/wxgui/profilemanager.py:268
+#: ../pyhoca/wxgui/profilemanager.py:267
+msgid "Layout"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:269
+msgid "Layout variant"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:271
 msgid "Enable sound support"
 msgstr "Activar soporte de sonido"
 
-#: ../pyhoca/wxgui/profilemanager.py:269
+#: ../pyhoca/wxgui/profilemanager.py:272
 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:273
+#: ../pyhoca/wxgui/profilemanager.py:276
 msgid "Arts (not supported)"
 msgstr "Arts (sin soporte)"
 
-#: ../pyhoca/wxgui/profilemanager.py:276
+#: ../pyhoca/wxgui/profilemanager.py:279
 msgid "esd"
 msgstr "esd"
 
-#: ../pyhoca/wxgui/profilemanager.py:277
+#: ../pyhoca/wxgui/profilemanager.py:280
 msgid "Use default sound port"
 msgstr "Usar puerto de sonido por defecto"
 
-#: ../pyhoca/wxgui/profilemanager.py:278
+#: ../pyhoca/wxgui/profilemanager.py:281
 msgid "Custom sound port"
 msgstr "Puerto de sonido personalizado"
 
-#: ../pyhoca/wxgui/profilemanager.py:280
+#: ../pyhoca/wxgui/profilemanager.py:283
 msgid "Client Side printing"
 msgstr "Impresión local"
 
-#: ../pyhoca/wxgui/profilemanager.py:282
+#: ../pyhoca/wxgui/profilemanager.py:285
 msgid "Use local folder sharing"
 msgstr "Compartir carpetas locales"
 
-#: ../pyhoca/wxgui/profilemanager.py:283
+#: ../pyhoca/wxgui/profilemanager.py:286
 msgid "Path"
 msgstr "Ruta"
 
-#: ../pyhoca/wxgui/profilemanager.py:286 ../pyhoca/wxgui/profilemanager.py:305
+#: ../pyhoca/wxgui/profilemanager.py:289 ../pyhoca/wxgui/profilemanager.py:308
 msgid "Add"
 msgstr "Añadir"
 
-#: ../pyhoca/wxgui/profilemanager.py:288
+#: ../pyhoca/wxgui/profilemanager.py:291
 msgid "Local Path"
 msgstr "Ruta Local"
 
-#: ../pyhoca/wxgui/profilemanager.py:289
+#: ../pyhoca/wxgui/profilemanager.py:292
 msgid "Connect Method"
 msgstr "Método de Conexión"
 
-#: ../pyhoca/wxgui/profilemanager.py:290
+#: ../pyhoca/wxgui/profilemanager.py:293
 msgid "Delete"
 msgstr "Eliminar"
 
-#: ../pyhoca/wxgui/profilemanager.py:292
+#: ../pyhoca/wxgui/profilemanager.py:295
 msgid "Convert between client and server encodings"
 msgstr "Convertir codificaciones entre cliente y servidor"
 
-#: ../pyhoca/wxgui/profilemanager.py:293
+#: ../pyhoca/wxgui/profilemanager.py:296
 msgid "Client encoding"
 msgstr "Codificación del cliente"
 
-#: ../pyhoca/wxgui/profilemanager.py:295
+#: ../pyhoca/wxgui/profilemanager.py:298
 msgid "Server encoding"
 msgstr "Codificación del Servidor"
 
-#: ../pyhoca/wxgui/profilemanager.py:298
+#: ../pyhoca/wxgui/profilemanager.py:301
 msgid "Use file MIME box for local file import"
 msgstr "Usar tipo de archivo MIME para la importación local"
 
-#: ../pyhoca/wxgui/profilemanager.py:299
+#: ../pyhoca/wxgui/profilemanager.py:302
 msgid "Extensions"
 msgstr "Extensiones"
 
-#: ../pyhoca/wxgui/profilemanager.py:301
+#: ../pyhoca/wxgui/profilemanager.py:304
 msgid "Action"
 msgstr "Acción"
 
-#: ../pyhoca/wxgui/profilemanager.py:306
+#: ../pyhoca/wxgui/profilemanager.py:309
 msgid "Defaults"
 msgstr "Valores por defecto"
 
-#: ../pyhoca/wxgui/profilemanager.py:308
+#: ../pyhoca/wxgui/profilemanager.py:311
 msgid "Save"
 msgstr "Guardar"
 
-#: ../pyhoca/wxgui/profilemanager.py:309
+#: ../pyhoca/wxgui/profilemanager.py:312
 msgid "Reset"
 msgstr "Reiniciar"
 
-#: ../pyhoca/wxgui/profilemanager.py:352
-#: ../pyhoca/wxgui/profilemanager.py:1029
-#: ../pyhoca/wxgui/profilemanager.py:1582
+#: ../pyhoca/wxgui/profilemanager.py:355
+#: ../pyhoca/wxgui/profilemanager.py:1042
+#: ../pyhoca/wxgui/profilemanager.py:1600
 msgid "automatically"
 msgstr "automáticamente"
 
-#: ../pyhoca/wxgui/profilemanager.py:354
-#: ../pyhoca/wxgui/profilemanager.py:1031
+#: ../pyhoca/wxgui/profilemanager.py:357
+#: ../pyhoca/wxgui/profilemanager.py:1044
 msgid "manually"
 msgstr "manualmente"
 
-#: ../pyhoca/wxgui/profilemanager.py:359
+#: ../pyhoca/wxgui/profilemanager.py:362
 msgid "PyHoca-GUI Profile Manager - new profile"
 msgstr "PyHoca-GUI Gestor de Perfiles - nuevo perfil"
 
-#: ../pyhoca/wxgui/profilemanager.py:361
+#: ../pyhoca/wxgui/profilemanager.py:364
 #, python-format
 msgid "PyHoca-GUI Profile Manager - %s (connected)"
 msgstr "PyHoca-GUI Gestor de Perfiles - %s (conectado)"
 
-#: ../pyhoca/wxgui/profilemanager.py:363
+#: ../pyhoca/wxgui/profilemanager.py:366
 #, python-format
 msgid "PyHoca-GUI Profile Manager - %s"
 msgstr "PyHoca-GUI Gestor de Perfiles - %s"
 
-#: ../pyhoca/wxgui/profilemanager.py:724
+#: ../pyhoca/wxgui/profilemanager.py:732
 #, fuzzy
 msgid "Profile"
 msgstr "Perfil "
 
-#: ../pyhoca/wxgui/profilemanager.py:725
+#: ../pyhoca/wxgui/profilemanager.py:733
 msgid "Session"
 msgstr "Sesión"
 
-#: ../pyhoca/wxgui/profilemanager.py:726
+#: ../pyhoca/wxgui/profilemanager.py:734
 msgid "Connection"
 msgstr "Conexión"
 
-#: ../pyhoca/wxgui/profilemanager.py:727
+#: ../pyhoca/wxgui/profilemanager.py:735
 msgid "Settings"
 msgstr "Opciones"
 
-#: ../pyhoca/wxgui/profilemanager.py:728
+#: ../pyhoca/wxgui/profilemanager.py:736
 msgid "Sharing"
 msgstr "Compartir"
 
-#: ../pyhoca/wxgui/profilemanager.py:1216
+#: ../pyhoca/wxgui/profilemanager.py:1230
 msgid "Icon Files (*.png)|*.png|All files (*.*)|*"
 msgstr "Iconos (*.png)|*.png|Todos (*.*)|*"
 
-#: ../pyhoca/wxgui/profilemanager.py:1219
+#: ../pyhoca/wxgui/profilemanager.py:1233
 msgid "Choose an icon for this session profile"
 msgstr "Elige un icono para este perfil de sesión"
 
-#: ../pyhoca/wxgui/profilemanager.py:1393
+#: ../pyhoca/wxgui/profilemanager.py:1407
 msgid "All files (*.*)|*"
 msgstr "Todos (*.*)|*"
 
-#: ../pyhoca/wxgui/profilemanager.py:1395
-#: ../pyhoca/wxgui/profilemanager.py:1410
+#: ../pyhoca/wxgui/profilemanager.py:1409
+#: ../pyhoca/wxgui/profilemanager.py:1424
 msgid "Choose a public SSH key"
 msgstr "Elige una clave pública SSH"
 
-#: ../pyhoca/wxgui/profilemanager.py:1562
+#: ../pyhoca/wxgui/profilemanager.py:1580
 msgid "Choose a folder to share within a session"
 msgstr "Elige la carpeta que quieres compartir en la conexión"
 
-#: ../pyhoca/wxgui/profilemanager.py:1626
-#: ../pyhoca/wxgui/profilemanager.py:1629
-#: ../pyhoca/wxgui/profilemanager.py:1632
-#: ../pyhoca/wxgui/profilemanager.py:1637
-#: ../pyhoca/wxgui/profilemanager.py:1647 ../pyhoca/wxgui/menus_taskbar.py:106
+#: ../pyhoca/wxgui/profilemanager.py:1644
+#: ../pyhoca/wxgui/profilemanager.py:1647
+#: ../pyhoca/wxgui/profilemanager.py:1650
+#: ../pyhoca/wxgui/profilemanager.py:1655
+#: ../pyhoca/wxgui/profilemanager.py:1665 ../pyhoca/wxgui/menus_taskbar.py:106
 msgid "Profile Manager"
 msgstr "Gestor de Perfiles"
 
-#: ../pyhoca/wxgui/profilemanager.py:1626
+#: ../pyhoca/wxgui/profilemanager.py:1644
 msgid "Profile name is missing, profile unusable!!!"
 msgstr "¡¡¡Nombre de pefil no encontrado o no válido!!!"
 
-#: ../pyhoca/wxgui/profilemanager.py:1629
-#: ../pyhoca/wxgui/profilemanager.py:1632
+#: ../pyhoca/wxgui/profilemanager.py:1647
+#: ../pyhoca/wxgui/profilemanager.py:1650
 #, python-format
 msgid "Profile name %s already exists!!!"
 msgstr "El perfil de usuario %s ya existe!!!"
 
-#: ../pyhoca/wxgui/profilemanager.py:1637
+#: ../pyhoca/wxgui/profilemanager.py:1655
 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:1647
+#: ../pyhoca/wxgui/profilemanager.py:1665
 #, python-format
 msgid ""
 "Another session profile (%s) already uses [%s]:%s for binding a local SSH "
@@ -669,21 +677,21 @@ 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:1667
+#: ../pyhoca/wxgui/profilemanager.py:1685
 #, python-format
 msgid "%s - profile added"
 msgstr "%s - perfil añadido"
 
-#: ../pyhoca/wxgui/profilemanager.py:1668
+#: ../pyhoca/wxgui/profilemanager.py:1686
 msgid "A new session profile has been added."
 msgstr "Se ha añadido un nuevo perfil de sesión."
 
-#: ../pyhoca/wxgui/profilemanager.py:1672
+#: ../pyhoca/wxgui/profilemanager.py:1690
 #, python-format
 msgid "%s - modified"
 msgstr "%s - modificado"
 
-#: ../pyhoca/wxgui/profilemanager.py:1673
+#: ../pyhoca/wxgui/profilemanager.py:1691
 msgid "Changes to profile have been saved."
 msgstr "Se han guardado los cambios en el perfil."
 
@@ -1118,37 +1126,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:997
+#: ../pyhoca/wxgui/frontend.py:1000
 #, python-format
 msgid "%s - audio warning"
 msgstr "%s - advertencia en el sistema de audio"
 
-#: ../pyhoca/wxgui/frontend.py:997
+#: ../pyhoca/wxgui/frontend.py:1000
 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:1000 ../pyhoca/wxgui/frontend.py:1003
+#: ../pyhoca/wxgui/frontend.py:1003 ../pyhoca/wxgui/frontend.py:1006
 #, python-format
 msgid "%s - audio error"
 msgstr "%s - error en el audio"
 
-#: ../pyhoca/wxgui/frontend.py:1000
+#: ../pyhoca/wxgui/frontend.py:1003
 msgid "The X2Go PulseAudio system could not be started."
 msgstr "El sistema X2Go PulseAudio no puede iniciarse"
 
-#: ../pyhoca/wxgui/frontend.py:1003
+#: ../pyhoca/wxgui/frontend.py:1006
 msgid "The X2Go PulseAudio system has died unexpectedly."
 msgstr "El sistema X2Go PulseAudio ha finalizado inesperadamente"
 
-#: ../pyhoca/wxgui/frontend.py:1006
+#: ../pyhoca/wxgui/frontend.py:1009
 #, python-format
 msgid "%s - audio problem"
 msgstr "%s - problema en el audio"
 
-#: ../pyhoca/wxgui/frontend.py:1006
+#: ../pyhoca/wxgui/frontend.py:1009
 #, python-format
 msgid ""
 "The audio connection could not be set up for this session.\n"
@@ -1157,60 +1165,60 @@ msgstr ""
 "La conexión de audio puede que no esté configurada para esta sesión.\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1009
+#: ../pyhoca/wxgui/frontend.py:1012
 #, fuzzy, python-format
 msgid "%s - client-side printing not available"
 msgstr "- el sistema de impresión no está disponible -"
 
-#: ../pyhoca/wxgui/frontend.py:1009
+#: ../pyhoca/wxgui/frontend.py:1012
 #, python-format
 msgid ""
 "The server denies client-side printing from within this session.\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1012
+#: ../pyhoca/wxgui/frontend.py:1015
 #, python-format
 msgid "%s - MIME box not available"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1012
+#: ../pyhoca/wxgui/frontend.py:1015
 #, python-format
 msgid ""
 "The server does not support the X2Go MIME box.\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1015
+#: ../pyhoca/wxgui/frontend.py:1018
 #, python-format
 msgid "%s - client-side folders not sharable"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1015
+#: ../pyhoca/wxgui/frontend.py:1018
 #, python-format
 msgid ""
 "The server denies client-side folder sharing with this session.\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1018
+#: ../pyhoca/wxgui/frontend.py:1021
 #, python-format
 msgid "%s - client resources not sharable"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1018
+#: ../pyhoca/wxgui/frontend.py:1021
 #, python-format
 msgid ""
 "Client-side folders and printers cannot be shared with this session.\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1032 ../pyhoca/wxgui/frontend.py:1034
+#: ../pyhoca/wxgui/frontend.py:1035 ../pyhoca/wxgui/frontend.py:1037
 #, python-format
 msgid "%s - print error"
 msgstr "%s - error de impresión"
 
-#: ../pyhoca/wxgui/frontend.py:1032
+#: ../pyhoca/wxgui/frontend.py:1035
 #, python-format
 msgid ""
 "%s\n"
@@ -1221,7 +1229,7 @@ msgstr ""
 "...provocado en la impresora %s  por la sesión\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1034
+#: ../pyhoca/wxgui/frontend.py:1037
 #, python-format
 msgid ""
 "%s\n"
@@ -1232,12 +1240,12 @@ msgstr ""
 "...provocado por la sesión\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1038 ../pyhoca/wxgui/frontend.py:1042
+#: ../pyhoca/wxgui/frontend.py:1041 ../pyhoca/wxgui/frontend.py:1045
 #, python-format
 msgid "%s - start"
 msgstr "%s - inicio"
 
-#: ../pyhoca/wxgui/frontend.py:1038
+#: ../pyhoca/wxgui/frontend.py:1041
 #, python-format
 msgid ""
 "New X2Go session starting up...\n"
@@ -1246,7 +1254,7 @@ msgstr ""
 "Iniciando nueva sesión X2Go...\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1042
+#: ../pyhoca/wxgui/frontend.py:1045
 #, python-format
 msgid ""
 "Another client started X2Go session\n"
@@ -1255,12 +1263,12 @@ msgstr ""
 "Otro cliente ha iniciado sesión X2go\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1046 ../pyhoca/wxgui/frontend.py:1050
+#: ../pyhoca/wxgui/frontend.py:1049 ../pyhoca/wxgui/frontend.py:1053
 #, python-format
 msgid "%s - resume"
 msgstr "%s - retornar a la sesión"
 
-#: ../pyhoca/wxgui/frontend.py:1046
+#: ../pyhoca/wxgui/frontend.py:1049
 #, python-format
 msgid ""
 "Resuming X2Go session...\n"
@@ -1269,7 +1277,7 @@ msgstr ""
 "Retornando sesión X2Go...\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1050
+#: ../pyhoca/wxgui/frontend.py:1053
 #, python-format
 msgid ""
 "Another client resumed X2Go session\n"
@@ -1278,12 +1286,12 @@ msgstr ""
 "Otro cliente retornó a la sesión X2go\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1054
+#: ../pyhoca/wxgui/frontend.py:1057
 #, python-format
 msgid "%s - running"
 msgstr "%s - en ejecución"
 
-#: ../pyhoca/wxgui/frontend.py:1054
+#: ../pyhoca/wxgui/frontend.py:1057
 #, python-format
 msgid ""
 "Found already running session\n"
@@ -1292,12 +1300,12 @@ msgstr ""
 "La sesión ya está en ejecución\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1062
+#: ../pyhoca/wxgui/frontend.py:1066
 #, python-format
 msgid "%s - suspend"
 msgstr "%s - suspender"
 
-#: ../pyhoca/wxgui/frontend.py:1062
+#: ../pyhoca/wxgui/frontend.py:1066
 #, python-format
 msgid ""
 "X2Go Session has been suspended\n"
@@ -1306,12 +1314,12 @@ msgstr ""
 "Se ha suspendido la Sesión X2go\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1078
+#: ../pyhoca/wxgui/frontend.py:1082
 #, python-format
 msgid "%s - terminate"
 msgstr "%s - finalizar"
 
-#: ../pyhoca/wxgui/frontend.py:1078
+#: ../pyhoca/wxgui/frontend.py:1082
 #, python-format
 msgid ""
 "X2Go Session has terminated\n"
@@ -1454,6 +1462,9 @@ msgstr "Nuevo Perfil de Sesión"
 msgid "OK"
 msgstr ""
 
+#~ msgid "Keyboard layout"
+#~ msgstr "Máscara de teclado"
+
 #, fuzzy
 #~ msgid "%s - DNS error"
 #~ msgstr "%s - error en la clave"
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 4acd660..a15943c 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PyHoca-GUI VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-22 00:16+0200\n"
+"POT-Creation-Date: 2012-05-28 14:52+0200\n"
 "PO-Revision-Date: 2012-02-19 23:16+0100\n"
 "Last-Translator: Terje Andersen <teranders at gmail.com>\n"
 "Language-Team: nb_NO <x2go-i18n at lists.berlios.de>\n"
@@ -49,7 +49,7 @@ msgstr "Sesjons innlogging"
 msgid "SSH proxy server login"
 msgstr "logg inn via en SSH mellomtjener"
 
-#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:311
+#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:314
 #: ../pyhoca/wxgui/messages.py:109 ../pyhoca/wxgui/printingprefs.py:138
 #: ../pyhoca/wxgui/sessiontitle.py:75
 msgid "Cancel"
@@ -218,7 +218,7 @@ msgid "Windows Terminal Server (RDP-proxy)"
 msgstr "Windows Terminal Server (RDP-proxy)"
 
 #. 'DirectRDP': 'Windows Terminal Server (RDP-direct)',
-#: ../pyhoca/wxgui/profilemanager.py:84 ../pyhoca/wxgui/profilemanager.py:200
+#: ../pyhoca/wxgui/profilemanager.py:84 ../pyhoca/wxgui/profilemanager.py:201
 msgid "Custom command"
 msgstr "Selvvalgt kommando"
 
@@ -256,394 +256,402 @@ msgstr "innstillinger arvet fra"
 
 #. allow localization of the default keyboard settings
 #: ../pyhoca/wxgui/profilemanager.py:138
-msgid "us"
-msgstr "no"
+msgid "<xkbtype>"
+msgstr ""
 
 #: ../pyhoca/wxgui/profilemanager.py:139
-msgid "pc105/us"
-msgstr "pc105/no"
+msgid "<xkblayout>"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:140
+msgid "<xkbvariant>"
+msgstr ""
 
 #. boxes for all tabs
-#: ../pyhoca/wxgui/profilemanager.py:153
+#: ../pyhoca/wxgui/profilemanager.py:154
 msgid "Session Title"
 msgstr "Sesjonstittel"
 
-#: ../pyhoca/wxgui/profilemanager.py:154
+#: ../pyhoca/wxgui/profilemanager.py:155
 msgid "Session Window"
 msgstr "Sesjonsvindu"
 
-#: ../pyhoca/wxgui/profilemanager.py:155
+#: ../pyhoca/wxgui/profilemanager.py:156
 msgid "Session Startup"
 msgstr "Sesjon oppstart"
 
-#: ../pyhoca/wxgui/profilemanager.py:156
+#: ../pyhoca/wxgui/profilemanager.py:157
 msgid "Server"
 msgstr "Server"
 
-#: ../pyhoca/wxgui/profilemanager.py:157
+#: ../pyhoca/wxgui/profilemanager.py:158
 msgid "Connection Link Speed"
 msgstr "Tilkoblingens forbindelseshastighet"
 
-#: ../pyhoca/wxgui/profilemanager.py:158
+#: ../pyhoca/wxgui/profilemanager.py:159
 msgid "Compression"
 msgstr "Kompresjon"
 
-#: ../pyhoca/wxgui/profilemanager.py:159
+#: ../pyhoca/wxgui/profilemanager.py:160
 msgid "Display"
 msgstr "Skjerm"
 
-#: ../pyhoca/wxgui/profilemanager.py:160
+#: ../pyhoca/wxgui/profilemanager.py:161
 msgid "Keyboard"
 msgstr "Tastatur"
 
-#: ../pyhoca/wxgui/profilemanager.py:161
+#: ../pyhoca/wxgui/profilemanager.py:162
 msgid "Sound"
 msgstr "Lyd"
 
-#: ../pyhoca/wxgui/profilemanager.py:162
+#: ../pyhoca/wxgui/profilemanager.py:163
 msgid "Printing"
 msgstr "Utskrift"
 
-#: ../pyhoca/wxgui/profilemanager.py:163
+#: ../pyhoca/wxgui/profilemanager.py:164
 msgid "Folder Exports"
 msgstr "Mappe eksporter"
 
-#: ../pyhoca/wxgui/profilemanager.py:164
+#: ../pyhoca/wxgui/profilemanager.py:165
 msgid "File Import"
 msgstr "Fil import"
 
 #. ##
 #. ## widgets for the PROFILE tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:169
+#: ../pyhoca/wxgui/profilemanager.py:170
 msgid "Name"
 msgstr "Navn"
 
-#: ../pyhoca/wxgui/profilemanager.py:176
+#: ../pyhoca/wxgui/profilemanager.py:177
 msgid "Set session window title"
 msgstr "Angi sesjons vindustittel"
 
-#: ../pyhoca/wxgui/profilemanager.py:177
+#: ../pyhoca/wxgui/profilemanager.py:178
 msgid "Use a default session window title"
 msgstr "Benytt standard sesjons vindustittel"
 
-#: ../pyhoca/wxgui/profilemanager.py:178
+#: ../pyhoca/wxgui/profilemanager.py:179
 msgid "Custom session window title"
 msgstr "Tilpasset sesjon vindustittel"
 
-#: ../pyhoca/wxgui/profilemanager.py:188
+#: ../pyhoca/wxgui/profilemanager.py:189
 msgid "Window Icon"
 msgstr "Vindusikon"
 
 #. ##
 #. ## widgets for the SESSION tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:194
+#: ../pyhoca/wxgui/profilemanager.py:195
 msgid "Start session automatically after login"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:195
+#: ../pyhoca/wxgui/profilemanager.py:196
 #, python-format
 msgid "Login automatically after %s has started"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:196
+#: ../pyhoca/wxgui/profilemanager.py:197
 msgid "Type"
 msgstr "Type"
 
-#: ../pyhoca/wxgui/profilemanager.py:198
+#: ../pyhoca/wxgui/profilemanager.py:199
 msgid "Application"
 msgstr "Applikasjon"
 
-#: ../pyhoca/wxgui/profilemanager.py:202
+#: ../pyhoca/wxgui/profilemanager.py:203
 msgid "XDMCP server"
 msgstr "XDMCP server"
 
-#: ../pyhoca/wxgui/profilemanager.py:204
+#: ../pyhoca/wxgui/profilemanager.py:205
 msgid "RDP server"
 msgstr "RDP server"
 
-#: ../pyhoca/wxgui/profilemanager.py:206
+#: ../pyhoca/wxgui/profilemanager.py:207
 msgid "RDP options"
 msgstr "RDP alternativer"
 
-#: ../pyhoca/wxgui/profilemanager.py:208
+#: ../pyhoca/wxgui/profilemanager.py:209
 msgid "Integrate remote application(s) into local desktop (rootless mode)"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:209
+#: ../pyhoca/wxgui/profilemanager.py:210
 msgid "Menu of published applications"
 msgstr ""
 
 #. ##
 #. ## widgets for the CONNECTION tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:216 ../pyhoca/wxgui/profilemanager.py:226
+#: ../pyhoca/wxgui/profilemanager.py:217 ../pyhoca/wxgui/profilemanager.py:227
 msgid "User"
 msgstr "Bruker"
 
-#: ../pyhoca/wxgui/profilemanager.py:218
+#: ../pyhoca/wxgui/profilemanager.py:219
 msgid "Host"
 msgstr "Vert"
 
-#: ../pyhoca/wxgui/profilemanager.py:220
+#: ../pyhoca/wxgui/profilemanager.py:221
 msgid "Port"
 msgstr "Port"
 
-#: ../pyhoca/wxgui/profilemanager.py:222
+#: ../pyhoca/wxgui/profilemanager.py:223
 msgid "RSA/DSA private key"
 msgstr "RSA/DSA privat nøkkel"
 
-#: ../pyhoca/wxgui/profilemanager.py:225
+#: ../pyhoca/wxgui/profilemanager.py:226
 msgid "Server behind SSH proxy"
 msgstr "Server bak SSH mellomtjeneren"
 
-#: ../pyhoca/wxgui/profilemanager.py:228
+#: ../pyhoca/wxgui/profilemanager.py:229
 msgid "Key file"
 msgstr "Nøkkelfil"
 
-#: ../pyhoca/wxgui/profilemanager.py:231
+#: ../pyhoca/wxgui/profilemanager.py:232
 msgid "Host[:Port]"
 msgstr "Vert[:Port]"
 
-#: ../pyhoca/wxgui/profilemanager.py:233
+#: ../pyhoca/wxgui/profilemanager.py:234
 msgid "SSH Proxy Tunnel"
 msgstr "SSH mellomtjener tunnel"
 
-#: ../pyhoca/wxgui/profilemanager.py:241
+#: ../pyhoca/wxgui/profilemanager.py:242
 msgid "Modem"
 msgstr "Modem"
 
-#: ../pyhoca/wxgui/profilemanager.py:242
+#: ../pyhoca/wxgui/profilemanager.py:243
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../pyhoca/wxgui/profilemanager.py:243
+#: ../pyhoca/wxgui/profilemanager.py:244
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../pyhoca/wxgui/profilemanager.py:244
+#: ../pyhoca/wxgui/profilemanager.py:245
 msgid "WAN"
 msgstr "WAN"
 
-#: ../pyhoca/wxgui/profilemanager.py:245
+#: ../pyhoca/wxgui/profilemanager.py:246
 msgid "LAN"
 msgstr "LAN"
 
-#: ../pyhoca/wxgui/profilemanager.py:247
+#: ../pyhoca/wxgui/profilemanager.py:248
 msgid "Method"
 msgstr "Metode"
 
-#: ../pyhoca/wxgui/profilemanager.py:249
+#: ../pyhoca/wxgui/profilemanager.py:250
 msgid "Image quality"
 msgstr "Bildekvalitet"
 
 #. ##
 #. ## wigdets for the SETTINGS tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:255
+#: ../pyhoca/wxgui/profilemanager.py:256
 msgid "Fullscreen"
 msgstr "Fullskjerm"
 
-#: ../pyhoca/wxgui/profilemanager.py:256
+#: ../pyhoca/wxgui/profilemanager.py:257
 msgid "Custom Size"
 msgstr "Egentilpasset størrelse"
 
-#: ../pyhoca/wxgui/profilemanager.py:261
+#: ../pyhoca/wxgui/profilemanager.py:262
 msgid "Set display DPI"
 msgstr "Sett skjermens DPI"
 
-#: ../pyhoca/wxgui/profilemanager.py:263
+#: ../pyhoca/wxgui/profilemanager.py:264
 msgid "Keep current keyboard settings"
 msgstr "Behold gjeldende tastaturoppsett"
 
-#: ../pyhoca/wxgui/profilemanager.py:264
-msgid "Keyboard layout"
-msgstr "Tastaturoppsett"
-
-#: ../pyhoca/wxgui/profilemanager.py:266
+#: ../pyhoca/wxgui/profilemanager.py:265
 msgid "Keyboard model"
 msgstr "Tastaturmodell"
 
-#: ../pyhoca/wxgui/profilemanager.py:268
+#: ../pyhoca/wxgui/profilemanager.py:267
+msgid "Layout"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:269
+msgid "Layout variant"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:271
 msgid "Enable sound support"
 msgstr "Aktiver lydstøtte"
 
-#: ../pyhoca/wxgui/profilemanager.py:269
+#: ../pyhoca/wxgui/profilemanager.py:272
 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:273
+#: ../pyhoca/wxgui/profilemanager.py:276
 msgid "Arts (not supported)"
 msgstr "Arts (ikke supportert)"
 
-#: ../pyhoca/wxgui/profilemanager.py:276
+#: ../pyhoca/wxgui/profilemanager.py:279
 msgid "esd"
 msgstr "esd"
 
-#: ../pyhoca/wxgui/profilemanager.py:277
+#: ../pyhoca/wxgui/profilemanager.py:280
 msgid "Use default sound port"
 msgstr "Benytt standard lydport"
 
-#: ../pyhoca/wxgui/profilemanager.py:278
+#: ../pyhoca/wxgui/profilemanager.py:281
 msgid "Custom sound port"
 msgstr "Selvvalgt lydport"
 
-#: ../pyhoca/wxgui/profilemanager.py:280
+#: ../pyhoca/wxgui/profilemanager.py:283
 msgid "Client Side printing"
 msgstr "Klientside utskrift"
 
-#: ../pyhoca/wxgui/profilemanager.py:282
+#: ../pyhoca/wxgui/profilemanager.py:285
 msgid "Use local folder sharing"
 msgstr "Benytt lokal mappedeling"
 
-#: ../pyhoca/wxgui/profilemanager.py:283
+#: ../pyhoca/wxgui/profilemanager.py:286
 msgid "Path"
 msgstr "Sti"
 
-#: ../pyhoca/wxgui/profilemanager.py:286 ../pyhoca/wxgui/profilemanager.py:305
+#: ../pyhoca/wxgui/profilemanager.py:289 ../pyhoca/wxgui/profilemanager.py:308
 msgid "Add"
 msgstr "Legg til"
 
-#: ../pyhoca/wxgui/profilemanager.py:288
+#: ../pyhoca/wxgui/profilemanager.py:291
 msgid "Local Path"
 msgstr "Lokal sti"
 
-#: ../pyhoca/wxgui/profilemanager.py:289
+#: ../pyhoca/wxgui/profilemanager.py:292
 msgid "Connect Method"
 msgstr "Tilkoblingsmetode"
 
-#: ../pyhoca/wxgui/profilemanager.py:290
+#: ../pyhoca/wxgui/profilemanager.py:293
 msgid "Delete"
 msgstr "Slett"
 
-#: ../pyhoca/wxgui/profilemanager.py:292
+#: ../pyhoca/wxgui/profilemanager.py:295
 msgid "Convert between client and server encodings"
 msgstr "Konverter tegnkodingen mellom klient og server"
 
-#: ../pyhoca/wxgui/profilemanager.py:293
+#: ../pyhoca/wxgui/profilemanager.py:296
 msgid "Client encoding"
 msgstr "Klientens tegnkode"
 
-#: ../pyhoca/wxgui/profilemanager.py:295
+#: ../pyhoca/wxgui/profilemanager.py:298
 msgid "Server encoding"
 msgstr "Serverens tegnkode"
 
-#: ../pyhoca/wxgui/profilemanager.py:298
+#: ../pyhoca/wxgui/profilemanager.py:301
 msgid "Use file MIME box for local file import"
 msgstr "Benytt filens MIME boks for lokal fil import"
 
-#: ../pyhoca/wxgui/profilemanager.py:299
+#: ../pyhoca/wxgui/profilemanager.py:302
 msgid "Extensions"
 msgstr "Utvidelser"
 
-#: ../pyhoca/wxgui/profilemanager.py:301
+#: ../pyhoca/wxgui/profilemanager.py:304
 msgid "Action"
 msgstr "Handling"
 
-#: ../pyhoca/wxgui/profilemanager.py:306
+#: ../pyhoca/wxgui/profilemanager.py:309
 msgid "Defaults"
 msgstr "Standard"
 
-#: ../pyhoca/wxgui/profilemanager.py:308
+#: ../pyhoca/wxgui/profilemanager.py:311
 msgid "Save"
 msgstr "Lagre"
 
-#: ../pyhoca/wxgui/profilemanager.py:309
+#: ../pyhoca/wxgui/profilemanager.py:312
 msgid "Reset"
 msgstr "Resett"
 
-#: ../pyhoca/wxgui/profilemanager.py:352
-#: ../pyhoca/wxgui/profilemanager.py:1029
-#: ../pyhoca/wxgui/profilemanager.py:1582
+#: ../pyhoca/wxgui/profilemanager.py:355
+#: ../pyhoca/wxgui/profilemanager.py:1042
+#: ../pyhoca/wxgui/profilemanager.py:1600
 msgid "automatically"
 msgstr "automatisk"
 
-#: ../pyhoca/wxgui/profilemanager.py:354
-#: ../pyhoca/wxgui/profilemanager.py:1031
+#: ../pyhoca/wxgui/profilemanager.py:357
+#: ../pyhoca/wxgui/profilemanager.py:1044
 msgid "manually"
 msgstr "manuelt"
 
-#: ../pyhoca/wxgui/profilemanager.py:359
+#: ../pyhoca/wxgui/profilemanager.py:362
 msgid "PyHoca-GUI Profile Manager - new profile"
 msgstr "PyHoca-GUI Profil håndterer - ny profil"
 
-#: ../pyhoca/wxgui/profilemanager.py:361
+#: ../pyhoca/wxgui/profilemanager.py:364
 #, python-format
 msgid "PyHoca-GUI Profile Manager - %s (connected)"
 msgstr "PyHoca-GUI Profil håndterer  - %s (tilkoblet)"
 
-#: ../pyhoca/wxgui/profilemanager.py:363
+#: ../pyhoca/wxgui/profilemanager.py:366
 #, python-format
 msgid "PyHoca-GUI Profile Manager - %s"
 msgstr "PyHoca-GUI Profil håndterer  - %s"
 
-#: ../pyhoca/wxgui/profilemanager.py:724
+#: ../pyhoca/wxgui/profilemanager.py:732
 msgid "Profile"
 msgstr "Profil"
 
-#: ../pyhoca/wxgui/profilemanager.py:725
+#: ../pyhoca/wxgui/profilemanager.py:733
 msgid "Session"
 msgstr "Sesjon"
 
-#: ../pyhoca/wxgui/profilemanager.py:726
+#: ../pyhoca/wxgui/profilemanager.py:734
 msgid "Connection"
 msgstr "Tilkobling"
 
-#: ../pyhoca/wxgui/profilemanager.py:727
+#: ../pyhoca/wxgui/profilemanager.py:735
 msgid "Settings"
 msgstr "Innstillinger"
 
-#: ../pyhoca/wxgui/profilemanager.py:728
+#: ../pyhoca/wxgui/profilemanager.py:736
 msgid "Sharing"
 msgstr "Deling"
 
-#: ../pyhoca/wxgui/profilemanager.py:1216
+#: ../pyhoca/wxgui/profilemanager.py:1230
 msgid "Icon Files (*.png)|*.png|All files (*.*)|*"
 msgstr "Ikonfiler(*.png)|*.png|Alle filer (*.*)|*"
 
-#: ../pyhoca/wxgui/profilemanager.py:1219
+#: ../pyhoca/wxgui/profilemanager.py:1233
 msgid "Choose an icon for this session profile"
 msgstr "Velg et ikon for denne sesjonsprofilen"
 
-#: ../pyhoca/wxgui/profilemanager.py:1393
+#: ../pyhoca/wxgui/profilemanager.py:1407
 msgid "All files (*.*)|*"
 msgstr "Alle filer (*.*)|*"
 
-#: ../pyhoca/wxgui/profilemanager.py:1395
-#: ../pyhoca/wxgui/profilemanager.py:1410
+#: ../pyhoca/wxgui/profilemanager.py:1409
+#: ../pyhoca/wxgui/profilemanager.py:1424
 msgid "Choose a public SSH key"
 msgstr "Velg en offentlig SSH nøkkel"
 
-#: ../pyhoca/wxgui/profilemanager.py:1562
+#: ../pyhoca/wxgui/profilemanager.py:1580
 msgid "Choose a folder to share within a session"
 msgstr "Velg en mappe som skal deles i en sesjon"
 
-#: ../pyhoca/wxgui/profilemanager.py:1626
-#: ../pyhoca/wxgui/profilemanager.py:1629
-#: ../pyhoca/wxgui/profilemanager.py:1632
-#: ../pyhoca/wxgui/profilemanager.py:1637
-#: ../pyhoca/wxgui/profilemanager.py:1647 ../pyhoca/wxgui/menus_taskbar.py:106
+#: ../pyhoca/wxgui/profilemanager.py:1644
+#: ../pyhoca/wxgui/profilemanager.py:1647
+#: ../pyhoca/wxgui/profilemanager.py:1650
+#: ../pyhoca/wxgui/profilemanager.py:1655
+#: ../pyhoca/wxgui/profilemanager.py:1665 ../pyhoca/wxgui/menus_taskbar.py:106
 msgid "Profile Manager"
 msgstr "Profil håndterer"
 
-#: ../pyhoca/wxgui/profilemanager.py:1626
+#: ../pyhoca/wxgui/profilemanager.py:1644
 msgid "Profile name is missing, profile unusable!!!"
 msgstr "Profilnavnet mangler, profilen er ubrukelig!"
 
-#: ../pyhoca/wxgui/profilemanager.py:1629
-#: ../pyhoca/wxgui/profilemanager.py:1632
+#: ../pyhoca/wxgui/profilemanager.py:1647
+#: ../pyhoca/wxgui/profilemanager.py:1650
 #, python-format
 msgid "Profile name %s already exists!!!"
 msgstr "Profilnavnet %s eksisterer allerede!"
 
-#: ../pyhoca/wxgui/profilemanager.py:1637
+#: ../pyhoca/wxgui/profilemanager.py:1655
 msgid "The SSH proxy configuration is incomplete. Try again."
 msgstr "SSH mellomtjener konfigurasjonen er ufullstendig. Forsøk igjen."
 
-#: ../pyhoca/wxgui/profilemanager.py:1647
+#: ../pyhoca/wxgui/profilemanager.py:1665
 #, python-format
 msgid ""
 "Another session profile (%s) already uses [%s]:%s for binding a local SSH "
@@ -654,21 +662,21 @@ msgstr ""
 "lokal SSH mellomtjener.\n"
 "Vennligst endre SSH mellomtjener innstillingene tilsvarende."
 
-#: ../pyhoca/wxgui/profilemanager.py:1667
+#: ../pyhoca/wxgui/profilemanager.py:1685
 #, python-format
 msgid "%s - profile added"
 msgstr "%s - profil lagt til"
 
-#: ../pyhoca/wxgui/profilemanager.py:1668
+#: ../pyhoca/wxgui/profilemanager.py:1686
 msgid "A new session profile has been added."
 msgstr "En ny sesjonsprofil har blitt lagt til."
 
-#: ../pyhoca/wxgui/profilemanager.py:1672
+#: ../pyhoca/wxgui/profilemanager.py:1690
 #, python-format
 msgid "%s - modified"
 msgstr "%s - endret"
 
-#: ../pyhoca/wxgui/profilemanager.py:1673
+#: ../pyhoca/wxgui/profilemanager.py:1691
 msgid "Changes to profile have been saved."
 msgstr "Endringer til profilen har blitt lagret."
 
@@ -1097,37 +1105,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:997
+#: ../pyhoca/wxgui/frontend.py:1000
 #, python-format
 msgid "%s - audio warning"
 msgstr "%s - advarsel om lyd"
 
-#: ../pyhoca/wxgui/frontend.py:997
+#: ../pyhoca/wxgui/frontend.py:1000
 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:1000 ../pyhoca/wxgui/frontend.py:1003
+#: ../pyhoca/wxgui/frontend.py:1003 ../pyhoca/wxgui/frontend.py:1006
 #, python-format
 msgid "%s - audio error"
 msgstr "%s - feil med lyden"
 
-#: ../pyhoca/wxgui/frontend.py:1000
+#: ../pyhoca/wxgui/frontend.py:1003
 msgid "The X2Go PulseAudio system could not be started."
 msgstr "X2Go PulseAudio systemet kan ikke bli startet."
 
-#: ../pyhoca/wxgui/frontend.py:1003
+#: ../pyhoca/wxgui/frontend.py:1006
 msgid "The X2Go PulseAudio system has died unexpectedly."
 msgstr "X2Go PulseAudio systemet har uventet stoppet."
 
-#: ../pyhoca/wxgui/frontend.py:1006
+#: ../pyhoca/wxgui/frontend.py:1009
 #, python-format
 msgid "%s - audio problem"
 msgstr "%s - problem med lyden"
 
-#: ../pyhoca/wxgui/frontend.py:1006
+#: ../pyhoca/wxgui/frontend.py:1009
 #, python-format
 msgid ""
 "The audio connection could not be set up for this session.\n"
@@ -1136,60 +1144,60 @@ msgstr ""
 "Klarte ikke å sette opp lydforbindelsen for denne sesjonen.\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1009
+#: ../pyhoca/wxgui/frontend.py:1012
 #, fuzzy, python-format
 msgid "%s - client-side printing not available"
 msgstr "- utskriftssystemet er ikke tilgjengelig -"
 
-#: ../pyhoca/wxgui/frontend.py:1009
+#: ../pyhoca/wxgui/frontend.py:1012
 #, python-format
 msgid ""
 "The server denies client-side printing from within this session.\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1012
+#: ../pyhoca/wxgui/frontend.py:1015
 #, python-format
 msgid "%s - MIME box not available"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1012
+#: ../pyhoca/wxgui/frontend.py:1015
 #, python-format
 msgid ""
 "The server does not support the X2Go MIME box.\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1015
+#: ../pyhoca/wxgui/frontend.py:1018
 #, python-format
 msgid "%s - client-side folders not sharable"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1015
+#: ../pyhoca/wxgui/frontend.py:1018
 #, python-format
 msgid ""
 "The server denies client-side folder sharing with this session.\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1018
+#: ../pyhoca/wxgui/frontend.py:1021
 #, python-format
 msgid "%s - client resources not sharable"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1018
+#: ../pyhoca/wxgui/frontend.py:1021
 #, python-format
 msgid ""
 "Client-side folders and printers cannot be shared with this session.\n"
 "%s"
 msgstr ""
 
-#: ../pyhoca/wxgui/frontend.py:1032 ../pyhoca/wxgui/frontend.py:1034
+#: ../pyhoca/wxgui/frontend.py:1035 ../pyhoca/wxgui/frontend.py:1037
 #, python-format
 msgid "%s - print error"
 msgstr "%s - feil ved utskrift"
 
-#: ../pyhoca/wxgui/frontend.py:1032
+#: ../pyhoca/wxgui/frontend.py:1035
 #, python-format
 msgid ""
 "%s\n"
@@ -1200,7 +1208,7 @@ msgstr ""
 "...oppstod på skriver %s fra sesjon\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1034
+#: ../pyhoca/wxgui/frontend.py:1037
 #, python-format
 msgid ""
 "%s\n"
@@ -1211,12 +1219,12 @@ msgstr ""
 "...oppstod fra sesjon\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1038 ../pyhoca/wxgui/frontend.py:1042
+#: ../pyhoca/wxgui/frontend.py:1041 ../pyhoca/wxgui/frontend.py:1045
 #, python-format
 msgid "%s - start"
 msgstr "%s - start"
 
-#: ../pyhoca/wxgui/frontend.py:1038
+#: ../pyhoca/wxgui/frontend.py:1041
 #, python-format
 msgid ""
 "New X2Go session starting up...\n"
@@ -1225,7 +1233,7 @@ msgstr ""
 "Ny X2Go sesjon starter opp...\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1042
+#: ../pyhoca/wxgui/frontend.py:1045
 #, python-format
 msgid ""
 "Another client started X2Go session\n"
@@ -1234,12 +1242,12 @@ msgstr ""
 "En annen klient startet X2Go sesjon\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1046 ../pyhoca/wxgui/frontend.py:1050
+#: ../pyhoca/wxgui/frontend.py:1049 ../pyhoca/wxgui/frontend.py:1053
 #, python-format
 msgid "%s - resume"
 msgstr "%s - gjenoppta"
 
-#: ../pyhoca/wxgui/frontend.py:1046
+#: ../pyhoca/wxgui/frontend.py:1049
 #, python-format
 msgid ""
 "Resuming X2Go session...\n"
@@ -1248,7 +1256,7 @@ msgstr ""
 "Gjenopptar X2Go sesjon...\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1050
+#: ../pyhoca/wxgui/frontend.py:1053
 #, python-format
 msgid ""
 "Another client resumed X2Go session\n"
@@ -1257,12 +1265,12 @@ msgstr ""
 "En annen klient gjenopptok X2Go sesjon\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1054
+#: ../pyhoca/wxgui/frontend.py:1057
 #, python-format
 msgid "%s - running"
 msgstr "%s - aktiv"
 
-#: ../pyhoca/wxgui/frontend.py:1054
+#: ../pyhoca/wxgui/frontend.py:1057
 #, python-format
 msgid ""
 "Found already running session\n"
@@ -1271,12 +1279,12 @@ msgstr ""
 "Fant allerede kjørende sesjon\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1062
+#: ../pyhoca/wxgui/frontend.py:1066
 #, python-format
 msgid "%s - suspend"
 msgstr "%s - koble fra"
 
-#: ../pyhoca/wxgui/frontend.py:1062
+#: ../pyhoca/wxgui/frontend.py:1066
 #, python-format
 msgid ""
 "X2Go Session has been suspended\n"
@@ -1285,12 +1293,12 @@ msgstr ""
 "X2Go sesjonen har blitt frakoblet\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1078
+#: ../pyhoca/wxgui/frontend.py:1082
 #, python-format
 msgid "%s - terminate"
 msgstr "%s - avslutt"
 
-#: ../pyhoca/wxgui/frontend.py:1078
+#: ../pyhoca/wxgui/frontend.py:1082
 #, python-format
 msgid ""
 "X2Go Session has terminated\n"
@@ -1434,6 +1442,15 @@ msgstr "Endre sesjonstittelen til"
 msgid "OK"
 msgstr "OK"
 
+#~ msgid "us"
+#~ msgstr "no"
+
+#~ msgid "pc105/us"
+#~ msgstr "pc105/no"
+
+#~ msgid "Keyboard layout"
+#~ msgstr "Tastaturoppsett"
+
 #, fuzzy
 #~ msgid "%s - DNS error"
 #~ msgstr "%s - nøkkel feil"
diff --git a/po/nl.po b/po/nl.po
index 8379f55..22f73e0 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PyHoca-GUI VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-22 00:16+0200\n"
-"PO-Revision-Date: 2012-04-18 17:30+0100\n"
+"POT-Creation-Date: 2012-05-28 14:52+0200\n"
+"PO-Revision-Date: 2012-05-28 14:51+0100\n"
 "Last-Translator: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>\n"
 "Language-Team: nl <dick.kniep at lindix.nl>\n"
 "Language: \n"
@@ -49,7 +49,7 @@ msgstr "Sessie login"
 msgid "SSH proxy server login"
 msgstr "Login via SSH Proxy"
 
-#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:311
+#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:314
 #: ../pyhoca/wxgui/messages.py:109 ../pyhoca/wxgui/printingprefs.py:138
 #: ../pyhoca/wxgui/sessiontitle.py:75
 msgid "Cancel"
@@ -215,7 +215,7 @@ msgid "Windows Terminal Server (RDP-proxy)"
 msgstr "Windows Terminalserver (RDP-proxy)"
 
 #. 'DirectRDP': 'Windows Terminal Server (RDP-direct)',
-#: ../pyhoca/wxgui/profilemanager.py:84 ../pyhoca/wxgui/profilemanager.py:200
+#: ../pyhoca/wxgui/profilemanager.py:84 ../pyhoca/wxgui/profilemanager.py:201
 msgid "Custom command"
 msgstr "Speciaal Commando"
 
@@ -253,394 +253,402 @@ msgstr "configuratie afgeleid van"
 
 #. allow localization of the default keyboard settings
 #: ../pyhoca/wxgui/profilemanager.py:138
-msgid "us"
-msgstr "us"
+msgid "<xkbtype>"
+msgstr "pc105/us"
 
 #: ../pyhoca/wxgui/profilemanager.py:139
-msgid "pc105/us"
-msgstr "altgr/intl"
+msgid "<xkblayout>"
+msgstr "us"
+
+#: ../pyhoca/wxgui/profilemanager.py:140
+msgid "<xkbvariant>"
+msgstr "intl"
 
 #. boxes for all tabs
-#: ../pyhoca/wxgui/profilemanager.py:153
+#: ../pyhoca/wxgui/profilemanager.py:154
 msgid "Session Title"
 msgstr "Sessie naam"
 
-#: ../pyhoca/wxgui/profilemanager.py:154
+#: ../pyhoca/wxgui/profilemanager.py:155
 msgid "Session Window"
 msgstr "Sessie Window"
 
-#: ../pyhoca/wxgui/profilemanager.py:155
+#: ../pyhoca/wxgui/profilemanager.py:156
 msgid "Session Startup"
 msgstr "Sessie start"
 
-#: ../pyhoca/wxgui/profilemanager.py:156
+#: ../pyhoca/wxgui/profilemanager.py:157
 msgid "Server"
 msgstr "Server"
 
-#: ../pyhoca/wxgui/profilemanager.py:157
+#: ../pyhoca/wxgui/profilemanager.py:158
 msgid "Connection Link Speed"
 msgstr "Verbindings snelheid"
 
-#: ../pyhoca/wxgui/profilemanager.py:158
+#: ../pyhoca/wxgui/profilemanager.py:159
 msgid "Compression"
 msgstr "Compressie"
 
-#: ../pyhoca/wxgui/profilemanager.py:159
+#: ../pyhoca/wxgui/profilemanager.py:160
 msgid "Display"
 msgstr "Display"
 
-#: ../pyhoca/wxgui/profilemanager.py:160
+#: ../pyhoca/wxgui/profilemanager.py:161
 msgid "Keyboard"
 msgstr "Toetsenbord"
 
-#: ../pyhoca/wxgui/profilemanager.py:161
+#: ../pyhoca/wxgui/profilemanager.py:162
 msgid "Sound"
 msgstr "Geluid"
 
-#: ../pyhoca/wxgui/profilemanager.py:162
+#: ../pyhoca/wxgui/profilemanager.py:163
 msgid "Printing"
 msgstr "Afdrukken"
 
-#: ../pyhoca/wxgui/profilemanager.py:163
+#: ../pyhoca/wxgui/profilemanager.py:164
 msgid "Folder Exports"
 msgstr "Map export"
 
-#: ../pyhoca/wxgui/profilemanager.py:164
+#: ../pyhoca/wxgui/profilemanager.py:165
 msgid "File Import"
 msgstr "Bestands import"
 
 #. ##
 #. ## widgets for the PROFILE tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:169
+#: ../pyhoca/wxgui/profilemanager.py:170
 msgid "Name"
 msgstr "Naam"
 
-#: ../pyhoca/wxgui/profilemanager.py:176
+#: ../pyhoca/wxgui/profilemanager.py:177
 msgid "Set session window title"
 msgstr "Stel sessiescherm titel in"
 
-#: ../pyhoca/wxgui/profilemanager.py:177
+#: ../pyhoca/wxgui/profilemanager.py:178
 msgid "Use a default session window title"
 msgstr "Gebruik een standaard sessienaam"
 
-#: ../pyhoca/wxgui/profilemanager.py:178
+#: ../pyhoca/wxgui/profilemanager.py:179
 msgid "Custom session window title"
 msgstr "Aangepaste sessienaam"
 
-#: ../pyhoca/wxgui/profilemanager.py:188
+#: ../pyhoca/wxgui/profilemanager.py:189
 msgid "Window Icon"
 msgstr "Scherm icoon"
 
 #. ##
 #. ## widgets for the SESSION tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:194
+#: ../pyhoca/wxgui/profilemanager.py:195
 msgid "Start session automatically after login"
 msgstr "Start sessie automatisch na login"
 
-#: ../pyhoca/wxgui/profilemanager.py:195
+#: ../pyhoca/wxgui/profilemanager.py:196
 #, python-format
 msgid "Login automatically after %s has started"
 msgstr "Login automatisch nadat %s is gestart"
 
-#: ../pyhoca/wxgui/profilemanager.py:196
+#: ../pyhoca/wxgui/profilemanager.py:197
 msgid "Type"
 msgstr "Type"
 
-#: ../pyhoca/wxgui/profilemanager.py:198
+#: ../pyhoca/wxgui/profilemanager.py:199
 msgid "Application"
 msgstr "Applicatie"
 
-#: ../pyhoca/wxgui/profilemanager.py:202
+#: ../pyhoca/wxgui/profilemanager.py:203
 msgid "XDMCP server"
 msgstr "XDMCP Server"
 
-#: ../pyhoca/wxgui/profilemanager.py:204
+#: ../pyhoca/wxgui/profilemanager.py:205
 msgid "RDP server"
 msgstr "RDP Server"
 
-#: ../pyhoca/wxgui/profilemanager.py:206
+#: ../pyhoca/wxgui/profilemanager.py:207
 msgid "RDP options"
 msgstr "RDP Opties"
 
-#: ../pyhoca/wxgui/profilemanager.py:208
+#: ../pyhoca/wxgui/profilemanager.py:209
 msgid "Integrate remote application(s) into local desktop (rootless mode)"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:209
+#: ../pyhoca/wxgui/profilemanager.py:210
 msgid "Menu of published applications"
 msgstr "Menu met gepubliceerde applicaties"
 
 #. ##
 #. ## widgets for the CONNECTION tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:216 ../pyhoca/wxgui/profilemanager.py:226
+#: ../pyhoca/wxgui/profilemanager.py:217 ../pyhoca/wxgui/profilemanager.py:227
 msgid "User"
 msgstr "Gebruiker"
 
-#: ../pyhoca/wxgui/profilemanager.py:218
+#: ../pyhoca/wxgui/profilemanager.py:219
 msgid "Host"
 msgstr "Host"
 
-#: ../pyhoca/wxgui/profilemanager.py:220
+#: ../pyhoca/wxgui/profilemanager.py:221
 msgid "Port"
 msgstr "Port"
 
-#: ../pyhoca/wxgui/profilemanager.py:222
+#: ../pyhoca/wxgui/profilemanager.py:223
 msgid "RSA/DSA private key"
 msgstr "Private RSA/DSA Key"
 
-#: ../pyhoca/wxgui/profilemanager.py:225
+#: ../pyhoca/wxgui/profilemanager.py:226
 msgid "Server behind SSH proxy"
 msgstr "Server achter SSH-Proxy"
 
-#: ../pyhoca/wxgui/profilemanager.py:228
+#: ../pyhoca/wxgui/profilemanager.py:229
 msgid "Key file"
 msgstr "Sleutel"
 
-#: ../pyhoca/wxgui/profilemanager.py:231
+#: ../pyhoca/wxgui/profilemanager.py:232
 msgid "Host[:Port]"
 msgstr "Host[:Port]"
 
-#: ../pyhoca/wxgui/profilemanager.py:233
+#: ../pyhoca/wxgui/profilemanager.py:234
 msgid "SSH Proxy Tunnel"
 msgstr "SSH Proxy Tunnel"
 
-#: ../pyhoca/wxgui/profilemanager.py:241
+#: ../pyhoca/wxgui/profilemanager.py:242
 msgid "Modem"
 msgstr "Modem"
 
-#: ../pyhoca/wxgui/profilemanager.py:242
+#: ../pyhoca/wxgui/profilemanager.py:243
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../pyhoca/wxgui/profilemanager.py:243
+#: ../pyhoca/wxgui/profilemanager.py:244
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../pyhoca/wxgui/profilemanager.py:244
+#: ../pyhoca/wxgui/profilemanager.py:245
 msgid "WAN"
 msgstr "WAN"
 
-#: ../pyhoca/wxgui/profilemanager.py:245
+#: ../pyhoca/wxgui/profilemanager.py:246
 msgid "LAN"
 msgstr "LAN"
 
-#: ../pyhoca/wxgui/profilemanager.py:247
+#: ../pyhoca/wxgui/profilemanager.py:248
 msgid "Method"
 msgstr "Methode"
 
-#: ../pyhoca/wxgui/profilemanager.py:249
+#: ../pyhoca/wxgui/profilemanager.py:250
 msgid "Image quality"
 msgstr "Beeldkwaliteit"
 
 #. ##
 #. ## wigdets for the SETTINGS tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:255
+#: ../pyhoca/wxgui/profilemanager.py:256
 msgid "Fullscreen"
 msgstr "Fullscreen"
 
-#: ../pyhoca/wxgui/profilemanager.py:256
+#: ../pyhoca/wxgui/profilemanager.py:257
 msgid "Custom Size"
 msgstr "Grootte instellen"
 
-#: ../pyhoca/wxgui/profilemanager.py:261
+#: ../pyhoca/wxgui/profilemanager.py:262
 msgid "Set display DPI"
 msgstr "DPI-waarde instellen"
 
-#: ../pyhoca/wxgui/profilemanager.py:263
+#: ../pyhoca/wxgui/profilemanager.py:264
 msgid "Keep current keyboard settings"
 msgstr "Huidige toetsenbord-instellingen behouden"
 
-#: ../pyhoca/wxgui/profilemanager.py:264
-msgid "Keyboard layout"
-msgstr "Toetsenbord layout"
-
-#: ../pyhoca/wxgui/profilemanager.py:266
+#: ../pyhoca/wxgui/profilemanager.py:265
 msgid "Keyboard model"
 msgstr "Toetsenbord model"
 
-#: ../pyhoca/wxgui/profilemanager.py:268
+#: ../pyhoca/wxgui/profilemanager.py:267
+msgid "Layout"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:269
+msgid "Layout variant"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:271
 msgid "Enable sound support"
 msgstr "Geluid gebruiken"
 
-#: ../pyhoca/wxgui/profilemanager.py:269
+#: ../pyhoca/wxgui/profilemanager.py:272
 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:273
+#: ../pyhoca/wxgui/profilemanager.py:276
 msgid "Arts (not supported)"
 msgstr "Arts (niet ondersteund)"
 
-#: ../pyhoca/wxgui/profilemanager.py:276
+#: ../pyhoca/wxgui/profilemanager.py:279
 msgid "esd"
 msgstr "esd"
 
-#: ../pyhoca/wxgui/profilemanager.py:277
+#: ../pyhoca/wxgui/profilemanager.py:280
 msgid "Use default sound port"
 msgstr "Standaard Audio-Port gebruiken"
 
-#: ../pyhoca/wxgui/profilemanager.py:278
+#: ../pyhoca/wxgui/profilemanager.py:281
 msgid "Custom sound port"
 msgstr "Speciale Audio-Port"
 
-#: ../pyhoca/wxgui/profilemanager.py:280
+#: ../pyhoca/wxgui/profilemanager.py:283
 msgid "Client Side printing"
 msgstr "Afdrukken via deze computer"
 
-#: ../pyhoca/wxgui/profilemanager.py:282
+#: ../pyhoca/wxgui/profilemanager.py:285
 msgid "Use local folder sharing"
 msgstr "Delen van lokale mappen"
 
-#: ../pyhoca/wxgui/profilemanager.py:283
+#: ../pyhoca/wxgui/profilemanager.py:286
 msgid "Path"
 msgstr "Pad"
 
-#: ../pyhoca/wxgui/profilemanager.py:286 ../pyhoca/wxgui/profilemanager.py:305
+#: ../pyhoca/wxgui/profilemanager.py:289 ../pyhoca/wxgui/profilemanager.py:308
 msgid "Add"
 msgstr "Toevoegen"
 
-#: ../pyhoca/wxgui/profilemanager.py:288
+#: ../pyhoca/wxgui/profilemanager.py:291
 msgid "Local Path"
 msgstr "Lokaal Pad"
 
-#: ../pyhoca/wxgui/profilemanager.py:289
+#: ../pyhoca/wxgui/profilemanager.py:292
 msgid "Connect Method"
 msgstr "Verbindingsmethode"
 
-#: ../pyhoca/wxgui/profilemanager.py:290
+#: ../pyhoca/wxgui/profilemanager.py:293
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: ../pyhoca/wxgui/profilemanager.py:292
+#: ../pyhoca/wxgui/profilemanager.py:295
 msgid "Convert between client and server encodings"
 msgstr "Encoding tussen client en server vertalen"
 
-#: ../pyhoca/wxgui/profilemanager.py:293
+#: ../pyhoca/wxgui/profilemanager.py:296
 msgid "Client encoding"
 msgstr "Client encoding"
 
-#: ../pyhoca/wxgui/profilemanager.py:295
+#: ../pyhoca/wxgui/profilemanager.py:298
 msgid "Server encoding"
 msgstr "Server encoding"
 
-#: ../pyhoca/wxgui/profilemanager.py:298
+#: ../pyhoca/wxgui/profilemanager.py:301
 msgid "Use file MIME box for local file import"
 msgstr "Importeren lokale bestanden via MIME box"
 
-#: ../pyhoca/wxgui/profilemanager.py:299
+#: ../pyhoca/wxgui/profilemanager.py:302
 msgid "Extensions"
 msgstr "Uitbreidingen"
 
-#: ../pyhoca/wxgui/profilemanager.py:301
+#: ../pyhoca/wxgui/profilemanager.py:304
 msgid "Action"
 msgstr "Actie"
 
-#: ../pyhoca/wxgui/profilemanager.py:306
+#: ../pyhoca/wxgui/profilemanager.py:309
 msgid "Defaults"
 msgstr "Standaardwaarden"
 
-#: ../pyhoca/wxgui/profilemanager.py:308
+#: ../pyhoca/wxgui/profilemanager.py:311
 msgid "Save"
 msgstr "Opslaan"
 
-#: ../pyhoca/wxgui/profilemanager.py:309
+#: ../pyhoca/wxgui/profilemanager.py:312
 msgid "Reset"
 msgstr "Reset"
 
-#: ../pyhoca/wxgui/profilemanager.py:352
-#: ../pyhoca/wxgui/profilemanager.py:1029
-#: ../pyhoca/wxgui/profilemanager.py:1582
+#: ../pyhoca/wxgui/profilemanager.py:355
+#: ../pyhoca/wxgui/profilemanager.py:1042
+#: ../pyhoca/wxgui/profilemanager.py:1600
 msgid "automatically"
 msgstr "automatisch"
 
-#: ../pyhoca/wxgui/profilemanager.py:354
-#: ../pyhoca/wxgui/profilemanager.py:1031
+#: ../pyhoca/wxgui/profilemanager.py:357
+#: ../pyhoca/wxgui/profilemanager.py:1044
 msgid "manually"
 msgstr "handmatig"
 
-#: ../pyhoca/wxgui/profilemanager.py:359
+#: ../pyhoca/wxgui/profilemanager.py:362
 msgid "PyHoca-GUI Profile Manager - new profile"
 msgstr "PyHoca-GUI Profiel manager - nieuw profiel"
 
-#: ../pyhoca/wxgui/profilemanager.py:361
+#: ../pyhoca/wxgui/profilemanager.py:364
 #, python-format
 msgid "PyHoca-GUI Profile Manager - %s (connected)"
 msgstr "PyHoca-GUI Profiel manager - %s (verbonden)"
 
-#: ../pyhoca/wxgui/profilemanager.py:363
+#: ../pyhoca/wxgui/profilemanager.py:366
 #, python-format
 msgid "PyHoca-GUI Profile Manager - %s"
 msgstr "PyHoca-GUI Profiel manager - %s"
 
-#: ../pyhoca/wxgui/profilemanager.py:724
+#: ../pyhoca/wxgui/profilemanager.py:732
 msgid "Profile"
 msgstr "Profiel"
 
-#: ../pyhoca/wxgui/profilemanager.py:725
+#: ../pyhoca/wxgui/profilemanager.py:733
 msgid "Session"
 msgstr "Sessie"
 
-#: ../pyhoca/wxgui/profilemanager.py:726
+#: ../pyhoca/wxgui/profilemanager.py:734
 msgid "Connection"
 msgstr "Verbinding"
 
-#: ../pyhoca/wxgui/profilemanager.py:727
+#: ../pyhoca/wxgui/profilemanager.py:735
 msgid "Settings"
 msgstr "Instellingen"
 
-#: ../pyhoca/wxgui/profilemanager.py:728
+#: ../pyhoca/wxgui/profilemanager.py:736
 msgid "Sharing"
 msgstr "Delen"
 
-#: ../pyhoca/wxgui/profilemanager.py:1216
+#: ../pyhoca/wxgui/profilemanager.py:1230
 msgid "Icon Files (*.png)|*.png|All files (*.*)|*"
 msgstr "Icon Bestanden (*.png)|*.png|Alle Bestanden (*.*)|*"
 
-#: ../pyhoca/wxgui/profilemanager.py:1219
+#: ../pyhoca/wxgui/profilemanager.py:1233
 msgid "Choose an icon for this session profile"
 msgstr "Icon voor dit Profiel kiezen"
 
-#: ../pyhoca/wxgui/profilemanager.py:1393
+#: ../pyhoca/wxgui/profilemanager.py:1407
 msgid "All files (*.*)|*"
 msgstr "Alle Bestanden (*.*)|*"
 
-#: ../pyhoca/wxgui/profilemanager.py:1395
-#: ../pyhoca/wxgui/profilemanager.py:1410
+#: ../pyhoca/wxgui/profilemanager.py:1409
+#: ../pyhoca/wxgui/profilemanager.py:1424
 msgid "Choose a public SSH key"
 msgstr "Kies een public SSH-key"
 
-#: ../pyhoca/wxgui/profilemanager.py:1562
+#: ../pyhoca/wxgui/profilemanager.py:1580
 msgid "Choose a folder to share within a session"
 msgstr "Kies een map om te delen"
 
-#: ../pyhoca/wxgui/profilemanager.py:1626
-#: ../pyhoca/wxgui/profilemanager.py:1629
-#: ../pyhoca/wxgui/profilemanager.py:1632
-#: ../pyhoca/wxgui/profilemanager.py:1637
-#: ../pyhoca/wxgui/profilemanager.py:1647 ../pyhoca/wxgui/menus_taskbar.py:106
+#: ../pyhoca/wxgui/profilemanager.py:1644
+#: ../pyhoca/wxgui/profilemanager.py:1647
+#: ../pyhoca/wxgui/profilemanager.py:1650
+#: ../pyhoca/wxgui/profilemanager.py:1655
+#: ../pyhoca/wxgui/profilemanager.py:1665 ../pyhoca/wxgui/menus_taskbar.py:106
 msgid "Profile Manager"
 msgstr "Profiel manager"
 
-#: ../pyhoca/wxgui/profilemanager.py:1626
+#: ../pyhoca/wxgui/profilemanager.py:1644
 msgid "Profile name is missing, profile unusable!!!"
 msgstr "Profiel naam ontbreekt, kan niet gebruikt worden!!!"
 
-#: ../pyhoca/wxgui/profilemanager.py:1629
-#: ../pyhoca/wxgui/profilemanager.py:1632
+#: ../pyhoca/wxgui/profilemanager.py:1647
+#: ../pyhoca/wxgui/profilemanager.py:1650
 #, python-format
 msgid "Profile name %s already exists!!!"
 msgstr "Profiel %s bestaat al"
 
-#: ../pyhoca/wxgui/profilemanager.py:1637
+#: ../pyhoca/wxgui/profilemanager.py:1655
 msgid "The SSH proxy configuration is incomplete. Try again."
 msgstr "SSH Proxy Configuratie is niet volledig! Opnieuw proberen..."
 
-#: ../pyhoca/wxgui/profilemanager.py:1647
+#: ../pyhoca/wxgui/profilemanager.py:1665
 #, python-format
 msgid ""
 "Another session profile (%s) already uses [%s]:%s for binding a local SSH "
@@ -651,21 +659,21 @@ msgstr ""
 "SSH proxy.\n"
 "Verander de SSH proxy instelling om dit probleem te verhelpen."
 
-#: ../pyhoca/wxgui/profilemanager.py:1667
+#: ../pyhoca/wxgui/profilemanager.py:1685
 #, python-format
 msgid "%s - profile added"
 msgstr "%s - Profiel toegevoegd"
 
-#: ../pyhoca/wxgui/profilemanager.py:1668
+#: ../pyhoca/wxgui/profilemanager.py:1686
 msgid "A new session profile has been added."
 msgstr "Een nieuw Profiel is toegevoegd"
 
-#: ../pyhoca/wxgui/profilemanager.py:1672
+#: ../pyhoca/wxgui/profilemanager.py:1690
 #, python-format
 msgid "%s - modified"
 msgstr "%s - gewijzigd"
 
-#: ../pyhoca/wxgui/profilemanager.py:1673
+#: ../pyhoca/wxgui/profilemanager.py:1691
 msgid "Changes to profile have been saved."
 msgstr "Wijzigingen in het profiel zijn opgeslagen."
 
@@ -1076,36 +1084,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:997
+#: ../pyhoca/wxgui/frontend.py:1000
 #, python-format
 msgid "%s - audio warning"
 msgstr "%s - audio waarschuwing"
 
-#: ../pyhoca/wxgui/frontend.py:997
+#: ../pyhoca/wxgui/frontend.py:1000
 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:1000 ../pyhoca/wxgui/frontend.py:1003
+#: ../pyhoca/wxgui/frontend.py:1003 ../pyhoca/wxgui/frontend.py:1006
 #, python-format
 msgid "%s - audio error"
 msgstr "%s - audio fout"
 
-#: ../pyhoca/wxgui/frontend.py:1000
+#: ../pyhoca/wxgui/frontend.py:1003
 msgid "The X2Go PulseAudio system could not be started."
 msgstr "Het X2Go PulseAudio systeem kon niet gestart worden"
 
-#: ../pyhoca/wxgui/frontend.py:1003
+#: ../pyhoca/wxgui/frontend.py:1006
 msgid "The X2Go PulseAudio system has died unexpectedly."
 msgstr "Het X2Go PulseAudio systeem is gecrashed"
 
-#: ../pyhoca/wxgui/frontend.py:1006
+#: ../pyhoca/wxgui/frontend.py:1009
 #, python-format
 msgid "%s - audio problem"
 msgstr "%s - audio probleem"
 
-#: ../pyhoca/wxgui/frontend.py:1006
+#: ../pyhoca/wxgui/frontend.py:1009
 #, python-format
 msgid ""
 "The audio connection could not be set up for this session.\n"
@@ -1114,36 +1122,36 @@ msgstr ""
 "De audio verbinding kon niet worden gemaakt voor deze sessie.\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1009
+#: ../pyhoca/wxgui/frontend.py:1012
 #, python-format
 msgid "%s - client-side printing not available"
 msgstr "%s - client-side print systeem niet beschikbaar"
 
-#: ../pyhoca/wxgui/frontend.py:1009
+#: ../pyhoca/wxgui/frontend.py:1012
 #, 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:1012
+#: ../pyhoca/wxgui/frontend.py:1015
 #, python-format
 msgid "%s - MIME box not available"
 msgstr "%s- MIME box is niet beschikbaar"
 
-#: ../pyhoca/wxgui/frontend.py:1012
+#: ../pyhoca/wxgui/frontend.py:1015
 #, 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:1015
+#: ../pyhoca/wxgui/frontend.py:1018
 #, python-format
 msgid "%s - client-side folders not sharable"
 msgstr "%s - client-side mappen worden niet gedeeld"
 
-#: ../pyhoca/wxgui/frontend.py:1015
+#: ../pyhoca/wxgui/frontend.py:1018
 #, python-format
 msgid ""
 "The server denies client-side folder sharing with this session.\n"
@@ -1152,12 +1160,12 @@ msgstr ""
 "De server staat client-side mappen deling in deze sessie niet toe.\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1018
+#: ../pyhoca/wxgui/frontend.py:1021
 #, python-format
 msgid "%s - client resources not sharable"
 msgstr "%s - client bronnen kunnen niet gedeeld worden"
 
-#: ../pyhoca/wxgui/frontend.py:1018
+#: ../pyhoca/wxgui/frontend.py:1021
 #, python-format
 msgid ""
 "Client-side folders and printers cannot be shared with this session.\n"
@@ -1166,12 +1174,12 @@ msgstr ""
 "Client-side mappen en printers kunnen niet gedeeld worden in deze sessie.\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1032 ../pyhoca/wxgui/frontend.py:1034
+#: ../pyhoca/wxgui/frontend.py:1035 ../pyhoca/wxgui/frontend.py:1037
 #, python-format
 msgid "%s - print error"
 msgstr "%s - Printfout"
 
-#: ../pyhoca/wxgui/frontend.py:1032
+#: ../pyhoca/wxgui/frontend.py:1035
 #, python-format
 msgid ""
 "%s\n"
@@ -1182,7 +1190,7 @@ msgstr ""
 "...veroorzaakt door printer %s in  sessie\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1034
+#: ../pyhoca/wxgui/frontend.py:1037
 #, python-format
 msgid ""
 "%s\n"
@@ -1193,12 +1201,12 @@ msgstr ""
 "...veroorzaakt door sessie\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1038 ../pyhoca/wxgui/frontend.py:1042
+#: ../pyhoca/wxgui/frontend.py:1041 ../pyhoca/wxgui/frontend.py:1045
 #, python-format
 msgid "%s - start"
 msgstr "%s - Start"
 
-#: ../pyhoca/wxgui/frontend.py:1038
+#: ../pyhoca/wxgui/frontend.py:1041
 #, python-format
 msgid ""
 "New X2Go session starting up...\n"
@@ -1207,7 +1215,7 @@ msgstr ""
 "Nieuwe X2Go sessie wordt gestart...\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1042
+#: ../pyhoca/wxgui/frontend.py:1045
 #, python-format
 msgid ""
 "Another client started X2Go session\n"
@@ -1216,12 +1224,12 @@ msgstr ""
 "Een andere X2Go-client heeft deze sessie gestart\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1046 ../pyhoca/wxgui/frontend.py:1050
+#: ../pyhoca/wxgui/frontend.py:1049 ../pyhoca/wxgui/frontend.py:1053
 #, python-format
 msgid "%s - resume"
 msgstr "%s - hervatten"
 
-#: ../pyhoca/wxgui/frontend.py:1046
+#: ../pyhoca/wxgui/frontend.py:1049
 #, python-format
 msgid ""
 "Resuming X2Go session...\n"
@@ -1230,7 +1238,7 @@ msgstr ""
 "X2Go Sessie wordt hervat...\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1050
+#: ../pyhoca/wxgui/frontend.py:1053
 #, python-format
 msgid ""
 "Another client resumed X2Go session\n"
@@ -1239,12 +1247,12 @@ msgstr ""
 "Een andere X2Go-client heeft de Sessie hervat\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1054
+#: ../pyhoca/wxgui/frontend.py:1057
 #, python-format
 msgid "%s - running"
 msgstr "%s - actief"
 
-#: ../pyhoca/wxgui/frontend.py:1054
+#: ../pyhoca/wxgui/frontend.py:1057
 #, python-format
 msgid ""
 "Found already running session\n"
@@ -1253,12 +1261,12 @@ msgstr ""
 "Reeds actieve sessie gevonden\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1062
+#: ../pyhoca/wxgui/frontend.py:1066
 #, python-format
 msgid "%s - suspend"
 msgstr "%s - suspend"
 
-#: ../pyhoca/wxgui/frontend.py:1062
+#: ../pyhoca/wxgui/frontend.py:1066
 #, python-format
 msgid ""
 "X2Go Session has been suspended\n"
@@ -1267,12 +1275,12 @@ msgstr ""
 "X2Go Sessie is suspended\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1078
+#: ../pyhoca/wxgui/frontend.py:1082
 #, python-format
 msgid "%s - terminate"
 msgstr "%s - beëindigen"
 
-#: ../pyhoca/wxgui/frontend.py:1078
+#: ../pyhoca/wxgui/frontend.py:1082
 #, python-format
 msgid ""
 "X2Go Session has terminated\n"
@@ -1416,6 +1424,15 @@ msgstr "Wijzig sessie naam naar"
 msgid "OK"
 msgstr "OK"
 
+#~ msgid "us"
+#~ msgstr "us"
+
+#~ msgid "pc105/us"
+#~ msgstr "altgr/intl"
+
+#~ msgid "Keyboard layout"
+#~ msgstr "Toetsenbord layout"
+
 #~ msgid "%s - DNS error"
 #~ msgstr "%s - DNS fout"
 
diff --git a/po/sv.po b/po/sv.po
index 3826af5..e47c9b7 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PyHoca-GUI VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-22 00:16+0200\n"
+"POT-Creation-Date: 2012-05-28 14:52+0200\n"
 "PO-Revision-Date: 2012-04-06 09:56+0100\n"
 "Last-Translator: Daniel Lindgren <bd.dali at gmail.com>\n"
 "Language-Team: Swedish <x2go-i18n at lists.berlios.de>\n"
@@ -50,7 +50,7 @@ msgstr "Sessionsinloggning"
 msgid "SSH proxy server login"
 msgstr "SSH proxyserverinloggning"
 
-#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:311
+#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:314
 #: ../pyhoca/wxgui/messages.py:109 ../pyhoca/wxgui/printingprefs.py:138
 #: ../pyhoca/wxgui/sessiontitle.py:75
 msgid "Cancel"
@@ -216,7 +216,7 @@ msgid "Windows Terminal Server (RDP-proxy)"
 msgstr "Windows Terminal Server (RDP-proxy)"
 
 #. 'DirectRDP': 'Windows Terminal Server (RDP-direct)',
-#: ../pyhoca/wxgui/profilemanager.py:84 ../pyhoca/wxgui/profilemanager.py:200
+#: ../pyhoca/wxgui/profilemanager.py:84 ../pyhoca/wxgui/profilemanager.py:201
 msgid "Custom command"
 msgstr "Anpassat kommando"
 
@@ -254,394 +254,402 @@ msgstr "inställningar hämtade från"
 
 #. allow localization of the default keyboard settings
 #: ../pyhoca/wxgui/profilemanager.py:138
-msgid "us"
-msgstr "se"
+msgid "<xkbtype>"
+msgstr ""
 
 #: ../pyhoca/wxgui/profilemanager.py:139
-msgid "pc105/us"
-msgstr "pc105/se"
+msgid "<xkblayout>"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:140
+msgid "<xkbvariant>"
+msgstr ""
 
 #. boxes for all tabs
-#: ../pyhoca/wxgui/profilemanager.py:153
+#: ../pyhoca/wxgui/profilemanager.py:154
 msgid "Session Title"
 msgstr "Sessionsnamn"
 
-#: ../pyhoca/wxgui/profilemanager.py:154
+#: ../pyhoca/wxgui/profilemanager.py:155
 msgid "Session Window"
 msgstr "Sessionsfönster"
 
-#: ../pyhoca/wxgui/profilemanager.py:155
+#: ../pyhoca/wxgui/profilemanager.py:156
 msgid "Session Startup"
 msgstr "Sessionsstart"
 
-#: ../pyhoca/wxgui/profilemanager.py:156
+#: ../pyhoca/wxgui/profilemanager.py:157
 msgid "Server"
 msgstr "Server"
 
-#: ../pyhoca/wxgui/profilemanager.py:157
+#: ../pyhoca/wxgui/profilemanager.py:158
 msgid "Connection Link Speed"
 msgstr "Anslutningshastighet"
 
-#: ../pyhoca/wxgui/profilemanager.py:158
+#: ../pyhoca/wxgui/profilemanager.py:159
 msgid "Compression"
 msgstr "Komprimering"
 
-#: ../pyhoca/wxgui/profilemanager.py:159
+#: ../pyhoca/wxgui/profilemanager.py:160
 msgid "Display"
 msgstr "Skärm"
 
-#: ../pyhoca/wxgui/profilemanager.py:160
+#: ../pyhoca/wxgui/profilemanager.py:161
 msgid "Keyboard"
 msgstr "Tangentbord"
 
-#: ../pyhoca/wxgui/profilemanager.py:161
+#: ../pyhoca/wxgui/profilemanager.py:162
 msgid "Sound"
 msgstr "Ljud"
 
-#: ../pyhoca/wxgui/profilemanager.py:162
+#: ../pyhoca/wxgui/profilemanager.py:163
 msgid "Printing"
 msgstr "Utskrifter"
 
-#: ../pyhoca/wxgui/profilemanager.py:163
+#: ../pyhoca/wxgui/profilemanager.py:164
 msgid "Folder Exports"
 msgstr "Delade mappar"
 
-#: ../pyhoca/wxgui/profilemanager.py:164
+#: ../pyhoca/wxgui/profilemanager.py:165
 msgid "File Import"
 msgstr "Filimport"
 
 #. ##
 #. ## widgets for the PROFILE tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:169
+#: ../pyhoca/wxgui/profilemanager.py:170
 msgid "Name"
 msgstr "Namn"
 
-#: ../pyhoca/wxgui/profilemanager.py:176
+#: ../pyhoca/wxgui/profilemanager.py:177
 msgid "Set session window title"
 msgstr "Ange fönstertitel för session"
 
-#: ../pyhoca/wxgui/profilemanager.py:177
+#: ../pyhoca/wxgui/profilemanager.py:178
 msgid "Use a default session window title"
 msgstr "Använd standard fönstertitel för session"
 
-#: ../pyhoca/wxgui/profilemanager.py:178
+#: ../pyhoca/wxgui/profilemanager.py:179
 msgid "Custom session window title"
 msgstr "Anpassad fönstertitel för session"
 
-#: ../pyhoca/wxgui/profilemanager.py:188
+#: ../pyhoca/wxgui/profilemanager.py:189
 msgid "Window Icon"
 msgstr "Fönsterikon"
 
 #. ##
 #. ## widgets for the SESSION tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:194
+#: ../pyhoca/wxgui/profilemanager.py:195
 msgid "Start session automatically after login"
 msgstr "Starta session automatiskt efter inloggning"
 
-#: ../pyhoca/wxgui/profilemanager.py:195
+#: ../pyhoca/wxgui/profilemanager.py:196
 #, python-format
 msgid "Login automatically after %s has started"
 msgstr "Logga in automatiskt när %s har startat"
 
-#: ../pyhoca/wxgui/profilemanager.py:196
+#: ../pyhoca/wxgui/profilemanager.py:197
 msgid "Type"
 msgstr "Typ"
 
-#: ../pyhoca/wxgui/profilemanager.py:198
+#: ../pyhoca/wxgui/profilemanager.py:199
 msgid "Application"
 msgstr "Applikation"
 
-#: ../pyhoca/wxgui/profilemanager.py:202
+#: ../pyhoca/wxgui/profilemanager.py:203
 msgid "XDMCP server"
 msgstr "XDMCP-server"
 
-#: ../pyhoca/wxgui/profilemanager.py:204
+#: ../pyhoca/wxgui/profilemanager.py:205
 msgid "RDP server"
 msgstr "RDP-server"
 
-#: ../pyhoca/wxgui/profilemanager.py:206
+#: ../pyhoca/wxgui/profilemanager.py:207
 msgid "RDP options"
 msgstr "RDP-alternativ"
 
-#: ../pyhoca/wxgui/profilemanager.py:208
+#: ../pyhoca/wxgui/profilemanager.py:209
 msgid "Integrate remote application(s) into local desktop (rootless mode)"
 msgstr ""
 
-#: ../pyhoca/wxgui/profilemanager.py:209
+#: ../pyhoca/wxgui/profilemanager.py:210
 msgid "Menu of published applications"
 msgstr "Meny med publicerade applikationer"
 
 #. ##
 #. ## widgets for the CONNECTION tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:216 ../pyhoca/wxgui/profilemanager.py:226
+#: ../pyhoca/wxgui/profilemanager.py:217 ../pyhoca/wxgui/profilemanager.py:227
 msgid "User"
 msgstr "Användare"
 
-#: ../pyhoca/wxgui/profilemanager.py:218
+#: ../pyhoca/wxgui/profilemanager.py:219
 msgid "Host"
 msgstr "Server"
 
-#: ../pyhoca/wxgui/profilemanager.py:220
+#: ../pyhoca/wxgui/profilemanager.py:221
 msgid "Port"
 msgstr "Port"
 
-#: ../pyhoca/wxgui/profilemanager.py:222
+#: ../pyhoca/wxgui/profilemanager.py:223
 msgid "RSA/DSA private key"
 msgstr "RSA/DSA privat nyckel"
 
-#: ../pyhoca/wxgui/profilemanager.py:225
+#: ../pyhoca/wxgui/profilemanager.py:226
 msgid "Server behind SSH proxy"
 msgstr "Server bakom SSH-proxy"
 
-#: ../pyhoca/wxgui/profilemanager.py:228
+#: ../pyhoca/wxgui/profilemanager.py:229
 msgid "Key file"
 msgstr "Nyckelfil"
 
-#: ../pyhoca/wxgui/profilemanager.py:231
+#: ../pyhoca/wxgui/profilemanager.py:232
 msgid "Host[:Port]"
 msgstr "Server[:Port]"
 
-#: ../pyhoca/wxgui/profilemanager.py:233
+#: ../pyhoca/wxgui/profilemanager.py:234
 msgid "SSH Proxy Tunnel"
 msgstr "SSH proxytunnel"
 
-#: ../pyhoca/wxgui/profilemanager.py:241
+#: ../pyhoca/wxgui/profilemanager.py:242
 msgid "Modem"
 msgstr "Modem"
 
-#: ../pyhoca/wxgui/profilemanager.py:242
+#: ../pyhoca/wxgui/profilemanager.py:243
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../pyhoca/wxgui/profilemanager.py:243
+#: ../pyhoca/wxgui/profilemanager.py:244
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../pyhoca/wxgui/profilemanager.py:244
+#: ../pyhoca/wxgui/profilemanager.py:245
 msgid "WAN"
 msgstr "WAN"
 
-#: ../pyhoca/wxgui/profilemanager.py:245
+#: ../pyhoca/wxgui/profilemanager.py:246
 msgid "LAN"
 msgstr "LAN"
 
-#: ../pyhoca/wxgui/profilemanager.py:247
+#: ../pyhoca/wxgui/profilemanager.py:248
 msgid "Method"
 msgstr "Metod"
 
-#: ../pyhoca/wxgui/profilemanager.py:249
+#: ../pyhoca/wxgui/profilemanager.py:250
 msgid "Image quality"
 msgstr "Bildkvalitet"
 
 #. ##
 #. ## wigdets for the SETTINGS tab
 #. ##
-#: ../pyhoca/wxgui/profilemanager.py:255
+#: ../pyhoca/wxgui/profilemanager.py:256
 msgid "Fullscreen"
 msgstr "Fullskärm"
 
-#: ../pyhoca/wxgui/profilemanager.py:256
+#: ../pyhoca/wxgui/profilemanager.py:257
 msgid "Custom Size"
 msgstr "Anpassad storlek"
 
-#: ../pyhoca/wxgui/profilemanager.py:261
+#: ../pyhoca/wxgui/profilemanager.py:262
 msgid "Set display DPI"
 msgstr "Ange skärmupplösning (DPI)"
 
-#: ../pyhoca/wxgui/profilemanager.py:263
+#: ../pyhoca/wxgui/profilemanager.py:264
 msgid "Keep current keyboard settings"
 msgstr "Behåll aktuella tangentbordsinställningar"
 
-#: ../pyhoca/wxgui/profilemanager.py:264
-msgid "Keyboard layout"
-msgstr "Tangentbordslayout"
-
-#: ../pyhoca/wxgui/profilemanager.py:266
+#: ../pyhoca/wxgui/profilemanager.py:265
 msgid "Keyboard model"
 msgstr "Tangentbordsmodell"
 
-#: ../pyhoca/wxgui/profilemanager.py:268
+#: ../pyhoca/wxgui/profilemanager.py:267
+msgid "Layout"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:269
+msgid "Layout variant"
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:271
 msgid "Enable sound support"
 msgstr "Aktivera ljudstöd"
 
-#: ../pyhoca/wxgui/profilemanager.py:269
+#: ../pyhoca/wxgui/profilemanager.py:272
 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:273
+#: ../pyhoca/wxgui/profilemanager.py:276
 msgid "Arts (not supported)"
 msgstr "Arts (ej supportad)"
 
-#: ../pyhoca/wxgui/profilemanager.py:276
+#: ../pyhoca/wxgui/profilemanager.py:279
 msgid "esd"
 msgstr "esd"
 
-#: ../pyhoca/wxgui/profilemanager.py:277
+#: ../pyhoca/wxgui/profilemanager.py:280
 msgid "Use default sound port"
 msgstr "Använd standardport för ljud"
 
-#: ../pyhoca/wxgui/profilemanager.py:278
+#: ../pyhoca/wxgui/profilemanager.py:281
 msgid "Custom sound port"
 msgstr "Anpassad ljudport"
 
-#: ../pyhoca/wxgui/profilemanager.py:280
+#: ../pyhoca/wxgui/profilemanager.py:283
 msgid "Client Side printing"
 msgstr "Stöd för utskrifter via klienten"
 
-#: ../pyhoca/wxgui/profilemanager.py:282
+#: ../pyhoca/wxgui/profilemanager.py:285
 msgid "Use local folder sharing"
 msgstr "Använd lokal mappdelning"
 
-#: ../pyhoca/wxgui/profilemanager.py:283
+#: ../pyhoca/wxgui/profilemanager.py:286
 msgid "Path"
 msgstr "Sökväg"
 
-#: ../pyhoca/wxgui/profilemanager.py:286 ../pyhoca/wxgui/profilemanager.py:305
+#: ../pyhoca/wxgui/profilemanager.py:289 ../pyhoca/wxgui/profilemanager.py:308
 msgid "Add"
 msgstr "Lägg till"
 
-#: ../pyhoca/wxgui/profilemanager.py:288
+#: ../pyhoca/wxgui/profilemanager.py:291
 msgid "Local Path"
 msgstr "Lokal sökväg"
 
-#: ../pyhoca/wxgui/profilemanager.py:289
+#: ../pyhoca/wxgui/profilemanager.py:292
 msgid "Connect Method"
 msgstr "Anslutningsmetod"
 
-#: ../pyhoca/wxgui/profilemanager.py:290
+#: ../pyhoca/wxgui/profilemanager.py:293
 msgid "Delete"
 msgstr "Radera"
 
-#: ../pyhoca/wxgui/profilemanager.py:292
+#: ../pyhoca/wxgui/profilemanager.py:295
 msgid "Convert between client and server encodings"
 msgstr "Konvertera kodtabell mellan klient och server"
 
-#: ../pyhoca/wxgui/profilemanager.py:293
+#: ../pyhoca/wxgui/profilemanager.py:296
 msgid "Client encoding"
 msgstr "Kodtabell klient"
 
-#: ../pyhoca/wxgui/profilemanager.py:295
+#: ../pyhoca/wxgui/profilemanager.py:298
 msgid "Server encoding"
 msgstr "Kodtabell server"
 
-#: ../pyhoca/wxgui/profilemanager.py:298
+#: ../pyhoca/wxgui/profilemanager.py:301
 msgid "Use file MIME box for local file import"
 msgstr "Använd MIME för lokal filimport"
 
-#: ../pyhoca/wxgui/profilemanager.py:299
+#: ../pyhoca/wxgui/profilemanager.py:302
 msgid "Extensions"
 msgstr "Filändelser"
 
-#: ../pyhoca/wxgui/profilemanager.py:301
+#: ../pyhoca/wxgui/profilemanager.py:304
 msgid "Action"
 msgstr "Hantering"
 
-#: ../pyhoca/wxgui/profilemanager.py:306
+#: ../pyhoca/wxgui/profilemanager.py:309
 msgid "Defaults"
 msgstr "Standard"
 
-#: ../pyhoca/wxgui/profilemanager.py:308
+#: ../pyhoca/wxgui/profilemanager.py:311
 msgid "Save"
 msgstr "Spara"
 
-#: ../pyhoca/wxgui/profilemanager.py:309
+#: ../pyhoca/wxgui/profilemanager.py:312
 msgid "Reset"
 msgstr "Återställ"
 
-#: ../pyhoca/wxgui/profilemanager.py:352
-#: ../pyhoca/wxgui/profilemanager.py:1029
-#: ../pyhoca/wxgui/profilemanager.py:1582
+#: ../pyhoca/wxgui/profilemanager.py:355
+#: ../pyhoca/wxgui/profilemanager.py:1042
+#: ../pyhoca/wxgui/profilemanager.py:1600
 msgid "automatically"
 msgstr "automatisk"
 
-#: ../pyhoca/wxgui/profilemanager.py:354
-#: ../pyhoca/wxgui/profilemanager.py:1031
+#: ../pyhoca/wxgui/profilemanager.py:357
+#: ../pyhoca/wxgui/profilemanager.py:1044
 msgid "manually"
 msgstr "manuellt"
 
-#: ../pyhoca/wxgui/profilemanager.py:359
+#: ../pyhoca/wxgui/profilemanager.py:362
 msgid "PyHoca-GUI Profile Manager - new profile"
 msgstr "PyHoca-GUI Profilhanterare - ny profil"
 
-#: ../pyhoca/wxgui/profilemanager.py:361
+#: ../pyhoca/wxgui/profilemanager.py:364
 #, python-format
 msgid "PyHoca-GUI Profile Manager - %s (connected)"
 msgstr " PyHoca-GUI Profilhanterare - %s (ansluten)"
 
-#: ../pyhoca/wxgui/profilemanager.py:363
+#: ../pyhoca/wxgui/profilemanager.py:366
 #, python-format
 msgid "PyHoca-GUI Profile Manager - %s"
 msgstr "PyHoca-GUI Profilhanterare - %s"
 
-#: ../pyhoca/wxgui/profilemanager.py:724
+#: ../pyhoca/wxgui/profilemanager.py:732
 msgid "Profile"
 msgstr "Profil"
 
-#: ../pyhoca/wxgui/profilemanager.py:725
+#: ../pyhoca/wxgui/profilemanager.py:733
 msgid "Session"
 msgstr "Session"
 
-#: ../pyhoca/wxgui/profilemanager.py:726
+#: ../pyhoca/wxgui/profilemanager.py:734
 msgid "Connection"
 msgstr "Anslutning"
 
-#: ../pyhoca/wxgui/profilemanager.py:727
+#: ../pyhoca/wxgui/profilemanager.py:735
 msgid "Settings"
 msgstr "Inställningar"
 
-#: ../pyhoca/wxgui/profilemanager.py:728
+#: ../pyhoca/wxgui/profilemanager.py:736
 msgid "Sharing"
 msgstr "Delning"
 
-#: ../pyhoca/wxgui/profilemanager.py:1216
+#: ../pyhoca/wxgui/profilemanager.py:1230
 msgid "Icon Files (*.png)|*.png|All files (*.*)|*"
 msgstr "Ikonfiler (*.png)|*.png|Alla filer (*.*)|*"
 
-#: ../pyhoca/wxgui/profilemanager.py:1219
+#: ../pyhoca/wxgui/profilemanager.py:1233
 msgid "Choose an icon for this session profile"
 msgstr "Välj en ikon för denna sessionsprofil"
 
-#: ../pyhoca/wxgui/profilemanager.py:1393
+#: ../pyhoca/wxgui/profilemanager.py:1407
 msgid "All files (*.*)|*"
 msgstr "Alla filer (*.*)|*"
 
-#: ../pyhoca/wxgui/profilemanager.py:1395
-#: ../pyhoca/wxgui/profilemanager.py:1410
+#: ../pyhoca/wxgui/profilemanager.py:1409
+#: ../pyhoca/wxgui/profilemanager.py:1424
 msgid "Choose a public SSH key"
 msgstr "Välj en public SSH-nyckel"
 
-#: ../pyhoca/wxgui/profilemanager.py:1562
+#: ../pyhoca/wxgui/profilemanager.py:1580
 msgid "Choose a folder to share within a session"
 msgstr "Välj en mapp att dela i en session"
 
-#: ../pyhoca/wxgui/profilemanager.py:1626
-#: ../pyhoca/wxgui/profilemanager.py:1629
-#: ../pyhoca/wxgui/profilemanager.py:1632
-#: ../pyhoca/wxgui/profilemanager.py:1637
-#: ../pyhoca/wxgui/profilemanager.py:1647 ../pyhoca/wxgui/menus_taskbar.py:106
+#: ../pyhoca/wxgui/profilemanager.py:1644
+#: ../pyhoca/wxgui/profilemanager.py:1647
+#: ../pyhoca/wxgui/profilemanager.py:1650
+#: ../pyhoca/wxgui/profilemanager.py:1655
+#: ../pyhoca/wxgui/profilemanager.py:1665 ../pyhoca/wxgui/menus_taskbar.py:106
 msgid "Profile Manager"
 msgstr "Profilhanterare"
 
-#: ../pyhoca/wxgui/profilemanager.py:1626
+#: ../pyhoca/wxgui/profilemanager.py:1644
 msgid "Profile name is missing, profile unusable!!!"
 msgstr "Profilnamn saknas, profil oanvändbar!"
 
-#: ../pyhoca/wxgui/profilemanager.py:1629
-#: ../pyhoca/wxgui/profilemanager.py:1632
+#: ../pyhoca/wxgui/profilemanager.py:1647
+#: ../pyhoca/wxgui/profilemanager.py:1650
 #, python-format
 msgid "Profile name %s already exists!!!"
 msgstr "Profilen %s finns redan!"
 
-#: ../pyhoca/wxgui/profilemanager.py:1637
+#: ../pyhoca/wxgui/profilemanager.py:1655
 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:1647
+#: ../pyhoca/wxgui/profilemanager.py:1665
 #, python-format
 msgid ""
 "Another session profile (%s) already uses [%s]:%s for binding a local SSH "
@@ -652,21 +660,21 @@ msgstr ""
 "proxy.\n"
 "Ändra konfiguration för SSH-proxy ."
 
-#: ../pyhoca/wxgui/profilemanager.py:1667
+#: ../pyhoca/wxgui/profilemanager.py:1685
 #, python-format
 msgid "%s - profile added"
 msgstr "%s - profil tillagd"
 
-#: ../pyhoca/wxgui/profilemanager.py:1668
+#: ../pyhoca/wxgui/profilemanager.py:1686
 msgid "A new session profile has been added."
 msgstr "En ny sessionsprofil har lagts till."
 
-#: ../pyhoca/wxgui/profilemanager.py:1672
+#: ../pyhoca/wxgui/profilemanager.py:1690
 #, python-format
 msgid "%s - modified"
 msgstr "%s - ändrad"
 
-#: ../pyhoca/wxgui/profilemanager.py:1673
+#: ../pyhoca/wxgui/profilemanager.py:1691
 msgid "Changes to profile have been saved."
 msgstr "Ändringar av profil har sparats."
 
@@ -1080,35 +1088,35 @@ msgstr ""
 "Begäran om tunnel till [%s]:%s för session %s nekades av X2Go/SSH-server. "
 "Sessionsstart misslyckades."
 
-#: ../pyhoca/wxgui/frontend.py:997
+#: ../pyhoca/wxgui/frontend.py:1000
 #, python-format
 msgid "%s - audio warning"
 msgstr "%s - ljudvarning"
 
-#: ../pyhoca/wxgui/frontend.py:997
+#: ../pyhoca/wxgui/frontend.py:1000
 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:1000 ../pyhoca/wxgui/frontend.py:1003
+#: ../pyhoca/wxgui/frontend.py:1003 ../pyhoca/wxgui/frontend.py:1006
 #, python-format
 msgid "%s - audio error"
 msgstr "%s - ljudfel"
 
-#: ../pyhoca/wxgui/frontend.py:1000
+#: ../pyhoca/wxgui/frontend.py:1003
 msgid "The X2Go PulseAudio system could not be started."
 msgstr "X2Go PulseAudio kunde ej startas."
 
-#: ../pyhoca/wxgui/frontend.py:1003
+#: ../pyhoca/wxgui/frontend.py:1006
 msgid "The X2Go PulseAudio system has died unexpectedly."
 msgstr "X2Go PulseAudio avslutades oväntat."
 
-#: ../pyhoca/wxgui/frontend.py:1006
+#: ../pyhoca/wxgui/frontend.py:1009
 #, python-format
 msgid "%s - audio problem"
 msgstr "%s - ljudproblem"
 
-#: ../pyhoca/wxgui/frontend.py:1006
+#: ../pyhoca/wxgui/frontend.py:1009
 #, python-format
 msgid ""
 "The audio connection could not be set up for this session.\n"
@@ -1117,12 +1125,12 @@ msgstr ""
 "Anslutning för ljud kunde ej genomföras för denna session.\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1009
+#: ../pyhoca/wxgui/frontend.py:1012
 #, python-format
 msgid "%s - client-side printing not available"
 msgstr "%s - klientdelade utskrifter ej tillgängliga"
 
-#: ../pyhoca/wxgui/frontend.py:1009
+#: ../pyhoca/wxgui/frontend.py:1012
 #, python-format
 msgid ""
 "The server denies client-side printing from within this session.\n"
@@ -1131,12 +1139,12 @@ msgstr ""
 "Servern tillåter ej utskrifter via klient från denna session.\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1012
+#: ../pyhoca/wxgui/frontend.py:1015
 #, python-format
 msgid "%s - MIME box not available"
 msgstr "%s - MIME ej tillgängligt"
 
-#: ../pyhoca/wxgui/frontend.py:1012
+#: ../pyhoca/wxgui/frontend.py:1015
 #, python-format
 msgid ""
 "The server does not support the X2Go MIME box.\n"
@@ -1145,12 +1153,12 @@ msgstr ""
 "Servern stöder ej X2Go MIME.\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1015
+#: ../pyhoca/wxgui/frontend.py:1018
 #, python-format
 msgid "%s - client-side folders not sharable"
 msgstr "%s - klientmappar ej delningsbara"
 
-#: ../pyhoca/wxgui/frontend.py:1015
+#: ../pyhoca/wxgui/frontend.py:1018
 #, python-format
 msgid ""
 "The server denies client-side folder sharing with this session.\n"
@@ -1159,12 +1167,12 @@ msgstr ""
 "Servern tillåter ej klientdelade mappar i denna session.\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1018
+#: ../pyhoca/wxgui/frontend.py:1021
 #, python-format
 msgid "%s - client resources not sharable"
 msgstr "%s - klientresurser ej delningsbara"
 
-#: ../pyhoca/wxgui/frontend.py:1018
+#: ../pyhoca/wxgui/frontend.py:1021
 #, python-format
 msgid ""
 "Client-side folders and printers cannot be shared with this session.\n"
@@ -1173,12 +1181,12 @@ msgstr ""
 "Klientdelade mappar och utskrifter kan ej delas med denna session.\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1032 ../pyhoca/wxgui/frontend.py:1034
+#: ../pyhoca/wxgui/frontend.py:1035 ../pyhoca/wxgui/frontend.py:1037
 #, python-format
 msgid "%s - print error"
 msgstr "%s - utskriftsfel"
 
-#: ../pyhoca/wxgui/frontend.py:1032
+#: ../pyhoca/wxgui/frontend.py:1035
 #, python-format
 msgid ""
 "%s\n"
@@ -1189,7 +1197,7 @@ msgstr ""
 "... orsakat på skrivare %s av session\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1034
+#: ../pyhoca/wxgui/frontend.py:1037
 #, python-format
 msgid ""
 "%s\n"
@@ -1200,12 +1208,12 @@ msgstr ""
 "...orsakat av session\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1038 ../pyhoca/wxgui/frontend.py:1042
+#: ../pyhoca/wxgui/frontend.py:1041 ../pyhoca/wxgui/frontend.py:1045
 #, python-format
 msgid "%s - start"
 msgstr "%s - startar"
 
-#: ../pyhoca/wxgui/frontend.py:1038
+#: ../pyhoca/wxgui/frontend.py:1041
 #, python-format
 msgid ""
 "New X2Go session starting up...\n"
@@ -1214,7 +1222,7 @@ msgstr ""
 "Ny X2Go-session startar ...\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1042
+#: ../pyhoca/wxgui/frontend.py:1045
 #, python-format
 msgid ""
 "Another client started X2Go session\n"
@@ -1223,12 +1231,12 @@ msgstr ""
 "En annan klient startade X2Go-session\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1046 ../pyhoca/wxgui/frontend.py:1050
+#: ../pyhoca/wxgui/frontend.py:1049 ../pyhoca/wxgui/frontend.py:1053
 #, python-format
 msgid "%s - resume"
 msgstr "%s - återanslut"
 
-#: ../pyhoca/wxgui/frontend.py:1046
+#: ../pyhoca/wxgui/frontend.py:1049
 #, python-format
 msgid ""
 "Resuming X2Go session...\n"
@@ -1237,7 +1245,7 @@ msgstr ""
 "Återansluter X2Go-session...\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1050
+#: ../pyhoca/wxgui/frontend.py:1053
 #, python-format
 msgid ""
 "Another client resumed X2Go session\n"
@@ -1246,12 +1254,12 @@ msgstr ""
 "En annan klient återanslöt X2Go-session\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1054
+#: ../pyhoca/wxgui/frontend.py:1057
 #, python-format
 msgid "%s - running"
 msgstr "%s - aktiv"
 
-#: ../pyhoca/wxgui/frontend.py:1054
+#: ../pyhoca/wxgui/frontend.py:1057
 #, python-format
 msgid ""
 "Found already running session\n"
@@ -1260,12 +1268,12 @@ msgstr ""
 "Hittade aktiv session\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1062
+#: ../pyhoca/wxgui/frontend.py:1066
 #, python-format
 msgid "%s - suspend"
 msgstr "%s - vila"
 
-#: ../pyhoca/wxgui/frontend.py:1062
+#: ../pyhoca/wxgui/frontend.py:1066
 #, python-format
 msgid ""
 "X2Go Session has been suspended\n"
@@ -1274,12 +1282,12 @@ msgstr ""
 "X2Go-session har försatts i vila\n"
 "%s"
 
-#: ../pyhoca/wxgui/frontend.py:1078
+#: ../pyhoca/wxgui/frontend.py:1082
 #, python-format
 msgid "%s - terminate"
 msgstr "%s - avsluta"
 
-#: ../pyhoca/wxgui/frontend.py:1078
+#: ../pyhoca/wxgui/frontend.py:1082
 #, python-format
 msgid ""
 "X2Go Session has terminated\n"
@@ -1422,6 +1430,15 @@ msgstr "Ändra sessionstitel till"
 msgid "OK"
 msgstr "OK"
 
+#~ msgid "us"
+#~ msgstr "se"
+
+#~ msgid "pc105/us"
+#~ msgstr "pc105/se"
+
+#~ msgid "Keyboard layout"
+#~ msgstr "Tangentbordslayout"
+
 #, fuzzy
 #~ msgid "%s - DNS error"
 #~ msgstr "%s - nyckelfel"
diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py
index f1d6c5e..e16837f 100644
--- a/pyhoca/wxgui/profilemanager.py
+++ b/pyhoca/wxgui/profilemanager.py
@@ -135,8 +135,9 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         elif self.action in ("ADD", "ADD_EXPLICITLY"):
             self.profile_config = self.session_profiles.default_profile_config()
             # allow localization of the default keyboard settings
-            self.profile_config['layout'] = _(u'us')
-            self.profile_config['type'] = _(u'pc105/us')
+            self.profile_config['type'] = _(u'<xkbtype>')
+            self.profile_config['layout'] = _(u'<xkblayout>')
+            self.profile_config['variant'] = _(u'<xkbvariant>')
             self.profile_name = self.profile_config['name'] = profile_name
 
         # we create a backup dict of our profile_config immediately (for being able to reset erroneously made changes)
@@ -261,10 +262,12 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         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.CurrentKeyBoard = wx.CheckBox(self.tab_Settings, -1, _(u"Keep current keyboard settings"))
-        self.KeyboardLayoutLabel = wx.StaticText(self.tab_Settings, -1, _(u"Keyboard layout")+':')
-        self.KeyboardLayout = wx.TextCtrl(self.tab_Settings, -1, "")
         self.KeyboardModelLabel = wx.StaticText(self.tab_Settings, -1, _(u"Keyboard model")+':')
         self.KeyboardModel = wx.TextCtrl(self.tab_Settings, -1, "")
+        self.KeyboardLayoutLabel = wx.StaticText(self.tab_Settings, -1, _(u"Layout")+':')
+        self.KeyboardLayout = wx.TextCtrl(self.tab_Settings, -1, "")
+        self.KeyboardVariantLabel = wx.StaticText(self.tab_Settings, -1, _(u"Layout variant")+':')
+        self.KeyboardVariant = wx.TextCtrl(self.tab_Settings, -1, "")
         self.EnableSound = wx.CheckBox(self.tab_Settings, -1, _(u"Enable sound support"))
         self.PulseAudio = wx.RadioButton(self.tab_Settings, -1, _(u"Pulse Audio"), style=wx.RB_GROUP)
 
@@ -427,10 +430,12 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         self.ScreenHeight.SetMinSize((60, self._textfield_height))
         self.SetDisplayDPI.SetMinSize((-1, self._textfield_height))
         self.DisplayDPI.SetMinSize((60, self._textfield_height))
-        self.KeyboardLayoutLabel.SetMinSize((-1, 16))
-        self.KeyboardLayout.SetMinSize((-1, self._textfield_height))
         self.KeyboardModelLabel.SetMinSize((-1, 16))
         self.KeyboardModel.SetMinSize((-1, self._textfield_height))
+        self.KeyboardLayoutLabel.SetMinSize((-1, 16))
+        self.KeyboardLayout.SetMinSize((-1, self._textfield_height))
+        self.KeyboardVariantLabel.SetMinSize((-1, 16))
+        self.KeyboardVariant.SetMinSize((-1, self._textfield_height))
         self.PulseAudio.SetMinSize((-1, self._textfield_height))
         self.Arts.SetMinSize((-1, self._textfield_height))
         self.Esd.SetMinSize((-1, self._textfield_height))
@@ -628,11 +633,14 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         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.KeyboardLayoutLabel, flag=wx.ALIGN_CENTRE_VERTICAL, pos=(0,0), )
-        sizer_4_2_1_2_1.Add(self.KeyboardLayout, flag=wx.EXPAND, pos=(1,0), )
+        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.KeyboardModelLabel, pos=(0,2),)
-        sizer_4_2_1_2_1.Add(self.KeyboardModel, flag=wx.EXPAND, pos=(1,2),)
+        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)
@@ -954,18 +962,23 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
 
         # TODO Fill in the actual DPI
         self.CurrentKeyBoard.SetValue(not self.profile_config['usekbd'])
-        self.KeyboardLayout.SetValue(self.profile_config['layout'])
         self.KeyboardModel.SetValue(self.profile_config['type'])
+        self.KeyboardLayout.SetValue(self.profile_config['layout'])
+        self.KeyboardVariant.SetValue(self.profile_config['variant'])
         if self.CurrentKeyBoard.GetValue():
-            self.KeyboardLayoutLabel.Enable(False)
             self.KeyboardModelLabel.Enable(False)
-            self.KeyboardLayout.Enable(False)
+            self.KeyboardLayoutLabel.Enable(False)
+            self.KeyboardVariantLabel.Enable(False)
             self.KeyboardModel.Enable(False)
+            self.KeyboardLayout.Enable(False)
+            self.KeyboardVariant.Enable(False)
         else:
             self.KeyboardLayoutLabel.Enable(True)
             self.KeyboardModelLabel.Enable(True)
+            self.KeyboardVariantLabel.Enable(True)
             self.KeyboardLayout.Enable(True)
             self.KeyboardModel.Enable(True)
+            self.KeyboardVariant.Enable(True)
 
         self.EnableSound.SetValue(self.profile_config['sound'])
         self.DefaultSoundPort.SetValue(self.profile_config['defsndport'])
@@ -1157,8 +1170,9 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         self.profile_config['dpi'] = self.DisplayDPI.GetValue()
 
         self.profile_config['usekbd'] = not self.CurrentKeyBoard.GetValue()
-        self.profile_config['layout'] = self.KeyboardLayout.GetValue()
         self.profile_config['type'] = self.KeyboardModel.GetValue()
+        self.profile_config['layout'] = self.KeyboardLayout.GetValue()
+        self.profile_config['variant'] = self.KeyboardVariant.GetValue()
 
         self.profile_config['sound'] = self.EnableSound.GetValue()
         self.profile_config['defsndport'] = self.DefaultSoundPort.GetValue()
@@ -1466,15 +1480,19 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
 
     def OnKeepKeyboard(self, event):
         if self.CurrentKeyBoard.GetValue():
-            self.KeyboardLayoutLabel.Enable(False)
             self.KeyboardModelLabel.Enable(False)
+            self.KeyboardLayoutLabel.Enable(False)
+            self.KeyboardVariantLabel.Enable(False)
             self.KeyboardLayout.Enable(False)
             self.KeyboardModel.Enable(False)
+            self.KeyboardVariant.Enable(False)
         else:
-            self.KeyboardLayoutLabel.Enable(True)
             self.KeyboardModelLabel.Enable(True)
+            self.KeyboardLayoutLabel.Enable(True)
+            self.KeyboardVariantLabel.Enable(True)
             self.KeyboardLayout.Enable(True)
             self.KeyboardModel.Enable(True)
+            self.KeyboardVariant.Enable(True)
 
     def OnSoundEnable(self, event): # wxGlade: X2goMaintProfile.<event_handler>
         if self.EnableSound.GetValue():


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