x2go-commits

x2go-commits@lists.x2go.org

1 participants
37910 discussions

python-x2go.git - master (branch) updated: 0.2.0.10-9-gf7d6e95
by git-admin＠x2go.org 28 Sep '12

28 Sep '12

The branch, master has been updated via f7d6e9545fd25b055a80d5442f94916d676f2e3f (commit) from feac4d0816d71ffe3fb3bf46c5dd0b9b919917ea (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 f7d6e9545fd25b055a80d5442f94916d676f2e3f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Sep 28 10:03:10 2012 +0200 Implementation of session profile parameters ,,sshproxysameuser'' and ,,sshproxysameauth''. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2go/client.py | 11 ++++++++++ x2go/defaults.py | 4 ++-- x2go/session.py | 59 +++++++++++++++++++++++++++++++++++++++++++++++++----- x2go/utils.py | 10 +++++++-- 5 files changed, 77 insertions(+), 9 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index dd87a28..c942d7b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ python-x2go (0.2.0.11-0~x2go1) UNRELEASED; urgency=low - Prepare for staying compatible with new SSH proxy feature in X2Go Client. - Add sshproxy_port option to session (SSH proxy) options. + - Implementation of session profile parameters ,,sshproxysameuser'' + and ,,sshproxysameauth''. * /debian/rules: + Allow package build on systems with missing dh_python2. diff --git a/x2go/client.py b/x2go/client.py index e52b535..8098270 100644 --- a/x2go/client.py +++ b/x2go/client.py @@ -1197,6 +1197,17 @@ class X2goClient(object): return self.session_registry(session_uuid).check_host() __check_session_host = check_session_host + def session_reuses_sshproxy_authinfo(self, session_uuid): + """\ + Check if session with unique identifier <session_uuid> is configured to re-use the X2Go session's + password / key for proxy authentication, as well. + + @return: returns C{True} if the session is configured to re-use session password / key for proxy authentication + @rtype: C{bool} + """ + return self.session_registry(session_uuid).reuses_sshproxy_authinfo() + __session_reuses_sshproxy_authinfo = session_reuses_sshproxy_authinfo + def session_uses_sshproxy(self, session_uuid): """\ Check if session with unique identifier <session_uuid> is configured to use an diff --git a/x2go/defaults.py b/x2go/defaults.py index 61022c3..d08f146 100644 --- a/x2go/defaults.py +++ b/x2go/defaults.py @@ -295,7 +295,7 @@ X2GO_SESSIONPROFILE_DEFAULTS = { 'autologin': False, 'autostart': False, 'setsessiontitle': False, 'sessiontitle': "", 'speed': 2, 'pack': '16m-jpeg', 'quality': 9, 'iconvto': 'UTF-8', 'iconvfrom': 'UTF-8', 'useiconv': False, - 'usesshproxy': False, 'sshproxyhost': '', 'sshproxyport': 22, 'sshproxyuser': '', 'sshproxytunnel': '', 'sshproxykeyfile': '', + 'usesshproxy': False, 'sshproxyhost': 'proxyhost.mydomain', 'sshproxyport': 22, 'sshproxyuser': '', 'sshproxytunnel': 'localhost:44444:server.mydomain.private:22', 'sshproxykeyfile': '', 'sshproxytype': 'SSH', 'sshproxysameuser': False, 'sshproxysamepass': False, 'sshproxyautologin': False, 'useexports': True, 'fstunnel': True, 'export': '', 'usemimebox': False, 'mimeboxextensions': '', 'mimeboxaction': 'OPEN', @@ -304,7 +304,7 @@ X2GO_SESSIONPROFILE_DEFAULTS = { 'usekbd': True, 'layout': 'us', 'type': 'pc105/us', 'variant': '', 'sound': False, 'soundsystem': 'pulse', 'startsoundsystem': False, 'soundtunnel':True, 'defsndport':True, 'sndport':4713, 'name': 'NEW_PROFILE', 'icon': ':icons/128x128/x2gosession.png', - 'host': '', 'user': CURRENT_LOCAL_USER, 'key': '', 'sshport': 22, 'krblogin': False, + 'host': 'server.mydomain', 'user': CURRENT_LOCAL_USER, 'key': '', 'sshport': 22, 'krblogin': False, 'rootless': True, 'applications': X2GO_GENERIC_APPLICATIONS, 'command':'TERMINAL', 'published': False, 'directrdp': False, 'directrdpsettings': '', 'rdpclient': 'rdesktop', 'rdpport': 3389, 'rdpoptions': '-u X2GO_USER -p X2GO_PASSWORD', 'rdpserver': '', diff --git a/x2go/session.py b/x2go/session.py index 8609cbe..228c4bc 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -83,7 +83,8 @@ from defaults import X2GO_SSH_ROOTDIR as _X2GO_SSH_ROOTDIR from defaults import SUPPORTED_SOUND, SUPPORTED_PRINTING, SUPPORTED_FOLDERSHARING, SUPPORTED_MIMEBOX -_X2GO_SESSION_PARAMS = ('use_sshproxy', 'profile_id', 'session_name', +_X2GO_SESSION_PARAMS = ('use_sshproxy', 'sshproxy_reuse_authinfo', + 'profile_id', 'session_name', 'auto_start_or_resume', 'auto_connect', 'printing', 'allow_mimebox', 'mimebox_extensions', 'mimebox_action', @@ -130,6 +131,7 @@ class X2goSession(object): """ def __init__(self, server=None, port=22, control_session=None, use_sshproxy=False, + sshproxy_reuse_authinfo=False, profile_id=None, profile_name='UNKNOWN', session_name=None, auto_start_or_resume=False, @@ -164,6 +166,8 @@ class X2goSession(object): @type control_session: C{X2goControlSession*} instance @param use_sshproxy: for communication with X2Go server use an SSH proxy host @type use_sshproxy: C{bool} + @param sshproxy_reuse_authinfo: for proxy authentication re-use the X2Go sessions password / key file + @type sshproxy_reuse_authinfo: C{bool} @param profile_id: profile ID @type profile_id: C{str} @param profile_name: profile name @@ -296,6 +300,9 @@ class X2goSession(object): if not re.match('.*_stRPUBLISHED_.*',self.session_name): self.published_applications = params['published_applications'] = False + self.use_sshproxy = use_sshproxy + self.sshproxy_reuse_authinfo = sshproxy_reuse_authinfo + self.control_params = {} self.terminal_params = {} self.sshproxy_params = {} @@ -323,7 +330,6 @@ class X2goSession(object): self.add_to_known_hosts = add_to_known_hosts self.known_hosts = known_hosts - self.use_sshproxy = use_sshproxy self._current_status = { 'timestamp': time.time(), @@ -717,6 +723,10 @@ class X2goSession(object): del params['use_sshproxy'] except KeyError: pass try: + self.sshproxy_reuse_authinfo = params['sshproxy_reuse_authinfo'] + del params['sshproxy_reuse_authinfo'] + except KeyError: pass + try: self.auto_connect = params['auto_connect'] del params['auto_connect'] except KeyError: pass @@ -725,6 +735,14 @@ class X2goSession(object): del params['auto_start_or_resume'] except KeyError: pass + if self.sshproxy_reuse_authinfo: + if params.has_key('key_filename'): + params['sshproxy_key_filename'] = params['key_filename'] + if params.has_key('pkey'): + params['sshproxy_pkey'] = params['pkey'] + if params.has_key('password'): + params['sshproxy_password'] = params['password'] + _terminal_params = copy.deepcopy(params) _control_params = copy.deepcopy(params) _sshproxy_params = copy.deepcopy(params) @@ -992,6 +1010,18 @@ class X2goSession(object): return self.use_sshproxy __uses_sshproxy = uses_sshproxy + def reuses_sshproxy_authinfo(self): + """\ + Check if a session is configured to re-use the X2Go session's password / key for + proxy authentication, as well. + + @return: returns C{True} if the session is configured to re-use session password / key for proxy authentication + @rtype: C{bool} + + """ + return self.sshproxy_reuse_authinfo + __reuses_sshproxy_authinfo = reuses_sshproxy_authinfo + def can_sshproxy_auto_connect(self): """\ Check if a session's SSH proxy (if used) is configured adequately to be able to auto-connect @@ -1065,7 +1095,7 @@ class X2goSession(object): __do_auto_connect = do_auto_connect def connect(self, username='', password='', add_to_known_hosts=False, force_password_auth=False, - use_sshproxy=False, sshproxy_user='', sshproxy_password=''): + use_sshproxy=None, sshproxy_reuse_authinfo=False, sshproxy_user='', sshproxy_password=''): """\ Connects to the L{X2goSession}'s server host. This method basically wraps around the C{X2goControlSession*.connect()} method. @@ -1085,6 +1115,8 @@ class X2goSession(object): @type force_password_auth: C{bool} @param use_sshproxy: use an SSH proxy host for connecting the target X2Go server @type use_sshproxy: C{bool} + @param sshproxy_reuse_authinfo: for proxy authentication re-use the X2Go sessions password / key file + @type sshproxy_reuse_authinfo: C{bool} @param sshproxy_user: username for authentication against the SSH proxy host @type sshproxy_user: C{str} @param sshproxy_password: password for authentication against the SSH proxy host @@ -1102,6 +1134,13 @@ class X2goSession(object): self.logger('control session is already connected, skipping authentication', loglevel=log.loglevel_DEBUG) self.connected = True else: + + if use_sshproxy is not None: + self.use_sshproxy = use_sshproxy + + if sshproxy_reuse_authinfo is not None: + self.sshproxy_reuse_authinfo = sshproxy_reuse_authinfo + if username: self.control_params['username'] = username if add_to_known_hosts is not None: @@ -1110,10 +1149,20 @@ class X2goSession(object): self.control_params['force_password_auth'] = force_password_auth if sshproxy_user: self.sshproxy_params['sshproxy_user'] = sshproxy_user + if sshproxy_password: self.sshproxy_params['sshproxy_password'] = sshproxy_password + self.control_params['password'] = password + if self.sshproxy_reuse_authinfo: + if self.control_params.has_key('key_filename'): + self.sshproxy_params['sshproxy_key_filename'] = self.control_params['key_filename'] + if _params.has_key('pkey'): + self.sshproxy_params['sshproxy_pkey'] = self.control_params['pkey'] + if params.has_key('password'): + self.sshproxy_params['sshproxy_password'] = self.control_params['password'] + _params = {} _params.update(self.control_params) _params.update(self.sshproxy_params) @@ -1123,8 +1172,8 @@ class X2goSession(object): try: self.connected = self.control_session.connect(self.server, - use_sshproxy=self.use_sshproxy, - session_instance=self, + use_sshproxy=self.use_sshproxy, + session_instance=self, **_params) except x2go_exceptions.X2goControlSessionException, e: raise x2go_exceptions.X2goSessionException(str(e)) diff --git a/x2go/utils.py b/x2go/utils.py index 4e8d468..6e2fd05 100644 --- a/x2go/utils.py +++ b/x2go/utils.py @@ -307,6 +307,14 @@ def _convert_SessionProfileOptions_2_SessionParams(options): del _params['dpi'] del _params['setdpi'] + if options['sshproxysameuser']: + _params['sshproxy_user'] = _params['username'] + del _params['sshproxysameuser'] + if options['sshproxysamepass']: + _params['sshproxy_reuse_authinfo'] = True + _params['sshproxy_key_filename'] = _params['key_filename'] + del _params['sshproxysamepass'] + # currently known but ignored in Python X2go _ignored_options = [ 'startsoundsystem', @@ -321,8 +329,6 @@ def _convert_SessionProfileOptions_2_SessionParams(options): 'rdpclient', 'rdpport', 'sshproxytype', - 'sshproxysameuser', - 'sshproxysamepass', 'sshproxyautologin', ] for i in _ignored_options: hooks/post-receive -- python-x2go.git (Python X2Go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2Go Client API).

1 0

pyhoca-gui.git - master (branch) updated: 0.2.0.4-25-ga46cf11
by git-admin＠x2go.org 28 Sep '12

28 Sep '12

The branch, master has been updated via a46cf11de15196bb3e95a1761f496f7e3f2b7538 (commit) from 965079da790f5814e741af789de3b8f8e5c67c08 (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 a46cf11de15196bb3e95a1761f496f7e3f2b7538 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Sep 28 10:02:18 2012 +0200 Rebuild of i18n files, update of en.po and de.po. ----------------------------------------------------------------------- Summary of changes: build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo | Bin 541 -> 541 bytes build/mo/de/LC_MESSAGES/PyHoca-GUI.mo | Bin 23789 -> 24456 bytes build/mo/en/LC_MESSAGES/PyHoca-GUI.mo | Bin 22238 -> 22874 bytes build/mo/es/LC_MESSAGES/PyHoca-GUI.mo | Bin 23773 -> 23585 bytes build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo | Bin 22740 -> 22553 bytes build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo | Bin 22596 -> 22413 bytes build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo | Bin 22180 -> 21992 bytes debian/changelog | 1 + po/PyHoca-GUI.pot | 445 ++++++++++++++-------------- po/bg.po | 445 ++++++++++++++-------------- po/de.po | 465 ++++++++++++++++-------------- po/en.po | 465 ++++++++++++++++-------------- po/es.po | 456 +++++++++++++++-------------- po/fr.po | 445 ++++++++++++++-------------- po/nb_NO.po | 456 +++++++++++++++-------------- po/nl.po | 456 +++++++++++++++-------------- po/ru.po | 454 +++++++++++++++-------------- po/sv.po | 456 +++++++++++++++-------------- pyhoca/wxgui/frontend.py | 2 +- 19 files changed, 2419 insertions(+), 2127 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 3befb69..ab71d33 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 252ae8c..84e7432 100644 Binary files a/build/mo/de/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/de/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/en/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/en/LC_MESSAGES/PyHoca-GUI.mo index 81315ae..24083f9 100644 Binary files a/build/mo/en/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/en/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/es/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/es/LC_MESSAGES/PyHoca-GUI.mo index 27ae858..c3841fa 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 3177d2b..a9ac70d 100644 Binary files a/build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo index d1b543e..fb234be 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 0b69544..e49c34a 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 ceabfbe..4963d2f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,7 @@ pyhoca-gui (0.2.0.5-0~x2go1) UNRELEASED; urgency=low - Make sure that SSH proxy port migration works flawlessly. - Rework session profile manager around SSH proxy settings. Implement session profile options ,,sshproxysameuser'' and ,,sshproxysamepass''. + - Rebuild of i18n files, update of en.po and de.po. * /debian/control: + Maintainer change in package: X2Go Developers <x2go-dev(a)lists.berlios.de>. + Add Oleksandr Shneyder to Uploaders. diff --git a/po/PyHoca-GUI.pot b/po/PyHoca-GUI.pot index 1bf667b..7e10f4e 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-09-05 12:22+0200\n" +"POT-Creation-Date: 2012-09-28 10:00+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -46,94 +46,94 @@ msgstr "" msgid "SSH proxy server login" msgstr "" -#: ../pyhoca/wxgui/logon.py:133 ../pyhoca/wxgui/profilemanager.py:322 +#: ../pyhoca/wxgui/logon.py:133 ../pyhoca/wxgui/profilemanager.py:346 #: ../pyhoca/wxgui/messages.py:132 ../pyhoca/wxgui/printingprefs.py:147 #: ../pyhoca/wxgui/sessiontitle.py:85 msgid "Cancel" msgstr "" -#: ../pyhoca/wxgui/logon.py:292 ../pyhoca/wxgui/logon.py:334 -#: ../pyhoca/wxgui/frontend.py:603 +#: ../pyhoca/wxgui/logon.py:301 ../pyhoca/wxgui/logon.py:343 +#: ../pyhoca/wxgui/frontend.py:604 #, python-format msgid "%s - connect failure" msgstr "" -#: ../pyhoca/wxgui/logon.py:293 ../pyhoca/wxgui/frontend.py:603 +#: ../pyhoca/wxgui/logon.py:302 ../pyhoca/wxgui/frontend.py:604 msgid "User is not allowed to start X2Go sessions!" msgstr "" -#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:610 +#: ../pyhoca/wxgui/logon.py:307 ../pyhoca/wxgui/frontend.py:611 #, python-format msgid "%s - connect" msgstr "" -#: ../pyhoca/wxgui/logon.py:299 +#: ../pyhoca/wxgui/logon.py:308 msgid "Authentication has been successful." msgstr "" -#: ../pyhoca/wxgui/logon.py:330 +#: ../pyhoca/wxgui/logon.py:339 msgid "SSH tunnel started" msgstr "" -#: ../pyhoca/wxgui/logon.py:335 +#: ../pyhoca/wxgui/logon.py:344 msgid "Authentication failed!" msgstr "" -#: ../pyhoca/wxgui/logon.py:342 +#: ../pyhoca/wxgui/logon.py:351 #, python-format msgid "%s - SSH proxy" msgstr "" -#: ../pyhoca/wxgui/logon.py:343 +#: ../pyhoca/wxgui/logon.py:352 msgid "Authentication to the SSH proxy server failed!" msgstr "" -#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:658 +#: ../pyhoca/wxgui/logon.py:374 ../pyhoca/wxgui/frontend.py:662 #, python-format msgid "%s - socket error" msgstr "" -#: ../pyhoca/wxgui/logon.py:372 ../pyhoca/wxgui/frontend.py:637 -#: ../pyhoca/wxgui/frontend.py:644 +#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:641 +#: ../pyhoca/wxgui/frontend.py:648 #, python-format msgid "%s - host key error" msgstr "" -#: ../pyhoca/wxgui/logon.py:373 ../pyhoca/wxgui/frontend.py:637 +#: ../pyhoca/wxgui/logon.py:382 ../pyhoca/wxgui/frontend.py:641 msgid "" "The remote server's host key is invalid or has not been accepted by the user" msgstr "" -#: ../pyhoca/wxgui/logon.py:380 ../pyhoca/wxgui/frontend.py:679 +#: ../pyhoca/wxgui/logon.py:389 ../pyhoca/wxgui/frontend.py:683 #, python-format msgid "%s - missing home directory" msgstr "" -#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:679 +#: ../pyhoca/wxgui/logon.py:390 ../pyhoca/wxgui/frontend.py:683 msgid "The remote user's home directory does not exist." msgstr "" -#: ../pyhoca/wxgui/logon.py:388 +#: ../pyhoca/wxgui/logon.py:397 #, python-format msgid "%s - key error" msgstr "" -#: ../pyhoca/wxgui/logon.py:396 ../pyhoca/wxgui/frontend.py:686 +#: ../pyhoca/wxgui/logon.py:405 ../pyhoca/wxgui/frontend.py:690 #, python-format msgid "%s - auth error" msgstr "" -#: ../pyhoca/wxgui/logon.py:404 ../pyhoca/wxgui/frontend.py:630 +#: ../pyhoca/wxgui/logon.py:413 ../pyhoca/wxgui/frontend.py:634 #, python-format msgid "%s - SSH error" msgstr "" -#: ../pyhoca/wxgui/logon.py:412 +#: ../pyhoca/wxgui/logon.py:421 #, python-format msgid "%s - unknown error" msgstr "" -#: ../pyhoca/wxgui/logon.py:413 +#: ../pyhoca/wxgui/logon.py:422 msgid "An unknown error occured during authentication!" msgstr "" @@ -163,490 +163,497 @@ msgid "" "Client for connecting you to a remote X2Go server" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:82 +#: ../pyhoca/wxgui/profilemanager.py:83 msgid "GNOME Desktop (GNOME)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:83 +#: ../pyhoca/wxgui/profilemanager.py:84 msgid "K Desktop Environment (KDE)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:84 +#: ../pyhoca/wxgui/profilemanager.py:85 msgid "Lightweight X Desktop (LXDE)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:85 +#: ../pyhoca/wxgui/profilemanager.py:86 msgid "Trinity X Desktop (KDE3-like)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:86 +#: ../pyhoca/wxgui/profilemanager.py:87 msgid "Unity X Desktop Shell (UNITY)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:87 +#: ../pyhoca/wxgui/profilemanager.py:88 msgid "XFCE4 Desktop (XFCE4)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:88 +#: ../pyhoca/wxgui/profilemanager.py:89 msgid "Published Applications" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:89 +#: ../pyhoca/wxgui/profilemanager.py:90 msgid "Single Application" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:90 +#: ../pyhoca/wxgui/profilemanager.py:91 msgid "XDMCP Query" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:91 -msgid "Windows Terminal Server (RDP-proxy)" +#: ../pyhoca/wxgui/profilemanager.py:92 +msgid "Windows Terminal Server (X2Go-proxied RDP)" msgstr "" -#. 'DirectRDP': 'Windows Terminal Server (RDP-direct)', -#: ../pyhoca/wxgui/profilemanager.py:93 ../pyhoca/wxgui/profilemanager.py:207 +#: ../pyhoca/wxgui/profilemanager.py:94 ../pyhoca/wxgui/profilemanager.py:227 msgid "Custom command" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:398 +#: ../pyhoca/wxgui/profilemanager.py:99 ../pyhoca/wxgui/menus_taskbar.py:398 msgid "Internet Browser" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:399 +#: ../pyhoca/wxgui/profilemanager.py:100 ../pyhoca/wxgui/menus_taskbar.py:399 msgid "Email Client" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:400 +#: ../pyhoca/wxgui/profilemanager.py:101 ../pyhoca/wxgui/menus_taskbar.py:400 msgid "Office" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:99 ../pyhoca/wxgui/menus_taskbar.py:401 +#: ../pyhoca/wxgui/profilemanager.py:102 ../pyhoca/wxgui/menus_taskbar.py:401 msgid "Terminal" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:113 +#: ../pyhoca/wxgui/profilemanager.py:120 msgid "Open file with system's default application" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:114 +#: ../pyhoca/wxgui/profilemanager.py:121 msgid "Open application chooser dialog" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:115 +#: ../pyhoca/wxgui/profilemanager.py:122 msgid "Save incoming file as ..." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:143 +#: ../pyhoca/wxgui/profilemanager.py:150 msgid "settings derived from " msgstr "" #. boxes for all tabs -#: ../pyhoca/wxgui/profilemanager.py:160 +#: ../pyhoca/wxgui/profilemanager.py:170 msgid "Session Title" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:161 +#: ../pyhoca/wxgui/profilemanager.py:171 msgid "Session Window" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:162 +#: ../pyhoca/wxgui/profilemanager.py:172 msgid "Session Startup" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:163 +#: ../pyhoca/wxgui/profilemanager.py:173 msgid "Server" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:164 +#: ../pyhoca/wxgui/profilemanager.py:174 +msgid "Proxy" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:175 msgid "Connection Link Speed" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:165 +#: ../pyhoca/wxgui/profilemanager.py:176 msgid "Compression" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:166 +#: ../pyhoca/wxgui/profilemanager.py:177 msgid "Display" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:167 +#: ../pyhoca/wxgui/profilemanager.py:178 msgid "Keyboard" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:168 +#: ../pyhoca/wxgui/profilemanager.py:179 msgid "Sound" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:169 +#: ../pyhoca/wxgui/profilemanager.py:180 msgid "Printing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:170 +#: ../pyhoca/wxgui/profilemanager.py:181 msgid "Folder Exports" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:171 +#: ../pyhoca/wxgui/profilemanager.py:182 msgid "File Import" msgstr "" #. ## #. ## widgets for the PROFILE tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:176 +#: ../pyhoca/wxgui/profilemanager.py:187 msgid "Name" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:183 +#: ../pyhoca/wxgui/profilemanager.py:194 msgid "Set session window title" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:184 +#: ../pyhoca/wxgui/profilemanager.py:195 msgid "Use a default session window title" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:185 +#: ../pyhoca/wxgui/profilemanager.py:196 msgid "Custom session window title" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:195 +#: ../pyhoca/wxgui/profilemanager.py:215 msgid "Window Icon" msgstr "" #. ## #. ## widgets for the SESSION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:201 +#: ../pyhoca/wxgui/profilemanager.py:221 msgid "Start session automatically after login" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:202 +#: ../pyhoca/wxgui/profilemanager.py:222 #, python-format msgid "Login automatically after %s has started" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:203 +#: ../pyhoca/wxgui/profilemanager.py:223 msgid "Type" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:205 +#: ../pyhoca/wxgui/profilemanager.py:225 msgid "Application" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:209 +#: ../pyhoca/wxgui/profilemanager.py:229 msgid "XDMCP server" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:211 +#: ../pyhoca/wxgui/profilemanager.py:231 msgid "RDP server" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:213 +#: ../pyhoca/wxgui/profilemanager.py:233 msgid "RDP options" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:215 +#: ../pyhoca/wxgui/profilemanager.py:235 msgid "Integrate remote application(s) into local desktop (rootless mode)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:216 +#: ../pyhoca/wxgui/profilemanager.py:236 msgid "Menu of published applications" msgstr "" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:223 ../pyhoca/wxgui/profilemanager.py:233 +#: ../pyhoca/wxgui/profilemanager.py:243 ../pyhoca/wxgui/profilemanager.py:253 msgid "User" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:225 +#: ../pyhoca/wxgui/profilemanager.py:245 ../pyhoca/wxgui/profilemanager.py:260 msgid "Host" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:227 +#: ../pyhoca/wxgui/profilemanager.py:247 ../pyhoca/wxgui/profilemanager.py:262 msgid "Port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:229 -msgid "RSA/DSA private key" +#: ../pyhoca/wxgui/profilemanager.py:249 +msgid "Key" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:232 +#: ../pyhoca/wxgui/profilemanager.py:252 msgid "Server behind SSH proxy" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:235 -msgid "Key file" +#: ../pyhoca/wxgui/profilemanager.py:255 +msgid "Use same username for X2Go and proxy host" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:256 +msgid "Use same authentication for X2Go and proxy host" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:238 -msgid "Host[:Port]" +#: ../pyhoca/wxgui/profilemanager.py:257 +msgid "Key file" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:240 +#: ../pyhoca/wxgui/profilemanager.py:264 msgid "SSH Proxy Tunnel" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:248 +#: ../pyhoca/wxgui/profilemanager.py:272 msgid "Modem" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:249 +#: ../pyhoca/wxgui/profilemanager.py:273 msgid "ISDN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:250 +#: ../pyhoca/wxgui/profilemanager.py:274 msgid "ADSL" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:251 +#: ../pyhoca/wxgui/profilemanager.py:275 msgid "WAN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:252 +#: ../pyhoca/wxgui/profilemanager.py:276 msgid "LAN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:254 +#: ../pyhoca/wxgui/profilemanager.py:278 msgid "Method" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:256 +#: ../pyhoca/wxgui/profilemanager.py:280 msgid "Image quality" msgstr "" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:262 +#: ../pyhoca/wxgui/profilemanager.py:286 msgid "Fullscreen" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:263 +#: ../pyhoca/wxgui/profilemanager.py:287 msgid "Custom Size" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:268 +#: ../pyhoca/wxgui/profilemanager.py:292 msgid "Set display DPI" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:270 +#: ../pyhoca/wxgui/profilemanager.py:294 msgid "Do not set (use server-side tools to configure the keyboard)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:271 +#: ../pyhoca/wxgui/profilemanager.py:295 msgid "" "Automatically detect and use client-side keyboard configuration inside the " "session" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:272 +#: ../pyhoca/wxgui/profilemanager.py:296 msgid "Use custom keyboard settings as provided below" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:273 +#: ../pyhoca/wxgui/profilemanager.py:297 msgid "Keyboard model" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:275 +#: ../pyhoca/wxgui/profilemanager.py:299 msgid "Layout" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:277 +#: ../pyhoca/wxgui/profilemanager.py:301 msgid "Layout variant" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:279 +#: ../pyhoca/wxgui/profilemanager.py:303 msgid "Enable sound support" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:280 +#: ../pyhoca/wxgui/profilemanager.py:304 msgid "Pulse Audio" msgstr "" #. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated. #. However, config files can contain an Arts configuration, so we will honour this -#: ../pyhoca/wxgui/profilemanager.py:284 +#: ../pyhoca/wxgui/profilemanager.py:308 msgid "Arts (not supported)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:287 +#: ../pyhoca/wxgui/profilemanager.py:311 msgid "esd" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:288 +#: ../pyhoca/wxgui/profilemanager.py:312 msgid "Use default sound port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:289 +#: ../pyhoca/wxgui/profilemanager.py:313 msgid "Custom sound port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:291 +#: ../pyhoca/wxgui/profilemanager.py:315 msgid "Client Side printing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:293 +#: ../pyhoca/wxgui/profilemanager.py:317 msgid "Use local folder sharing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:294 +#: ../pyhoca/wxgui/profilemanager.py:318 msgid "Path" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:297 ../pyhoca/wxgui/profilemanager.py:316 +#: ../pyhoca/wxgui/profilemanager.py:321 ../pyhoca/wxgui/profilemanager.py:340 msgid "Add" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:299 +#: ../pyhoca/wxgui/profilemanager.py:323 msgid "Local Path" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:300 +#: ../pyhoca/wxgui/profilemanager.py:324 msgid "Connect Method" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:301 +#: ../pyhoca/wxgui/profilemanager.py:325 msgid "Delete" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:303 +#: ../pyhoca/wxgui/profilemanager.py:327 msgid "Convert between client and server encodings" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:304 +#: ../pyhoca/wxgui/profilemanager.py:328 msgid "Client encoding" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:306 +#: ../pyhoca/wxgui/profilemanager.py:330 msgid "Server encoding" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:309 +#: ../pyhoca/wxgui/profilemanager.py:333 msgid "Use file MIME box for local file import" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:310 +#: ../pyhoca/wxgui/profilemanager.py:334 msgid "Extensions" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:312 +#: ../pyhoca/wxgui/profilemanager.py:336 msgid "Action" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:317 +#: ../pyhoca/wxgui/profilemanager.py:341 msgid "Defaults" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:319 +#: ../pyhoca/wxgui/profilemanager.py:343 msgid "Save" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:320 +#: ../pyhoca/wxgui/profilemanager.py:344 msgid "Reset" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:365 -#: ../pyhoca/wxgui/profilemanager.py:1078 -#: ../pyhoca/wxgui/profilemanager.py:1829 +#: ../pyhoca/wxgui/profilemanager.py:394 +#: ../pyhoca/wxgui/profilemanager.py:1089 +#: ../pyhoca/wxgui/profilemanager.py:1983 msgid "automatically" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:367 -#: ../pyhoca/wxgui/profilemanager.py:1080 +#: ../pyhoca/wxgui/profilemanager.py:396 +#: ../pyhoca/wxgui/profilemanager.py:1091 msgid "manually" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:376 +#: ../pyhoca/wxgui/profilemanager.py:405 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:378 +#: ../pyhoca/wxgui/profilemanager.py:407 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:380 +#: ../pyhoca/wxgui/profilemanager.py:409 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:751 +#: ../pyhoca/wxgui/profilemanager.py:769 msgid "Profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:752 +#: ../pyhoca/wxgui/profilemanager.py:770 msgid "Session" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:753 +#: ../pyhoca/wxgui/profilemanager.py:771 msgid "Connection" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:754 +#: ../pyhoca/wxgui/profilemanager.py:772 msgid "Settings" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:755 +#: ../pyhoca/wxgui/profilemanager.py:773 msgid "Sharing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:996 +#: ../pyhoca/wxgui/profilemanager.py:1007 msgid "<xkbtype>" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:997 +#: ../pyhoca/wxgui/profilemanager.py:1008 msgid "<xkblayout>" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:998 +#: ../pyhoca/wxgui/profilemanager.py:1009 msgid "<xkbvariant>" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1281 +#: ../pyhoca/wxgui/profilemanager.py:1306 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1284 +#: ../pyhoca/wxgui/profilemanager.py:1309 msgid "Choose an icon for this session profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1506 +#: ../pyhoca/wxgui/profilemanager.py:1600 msgid "All files (*.*)|*" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1508 -#: ../pyhoca/wxgui/profilemanager.py:1530 +#: ../pyhoca/wxgui/profilemanager.py:1602 +#: ../pyhoca/wxgui/profilemanager.py:1626 msgid "Choose a public SSH key" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1781 +#: ../pyhoca/wxgui/profilemanager.py:1935 msgid "Choose a folder to share within a session" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1909 -#: ../pyhoca/wxgui/profilemanager.py:1912 -#: ../pyhoca/wxgui/profilemanager.py:1915 -#: ../pyhoca/wxgui/profilemanager.py:1920 -#: ../pyhoca/wxgui/profilemanager.py:1930 ../pyhoca/wxgui/menus_taskbar.py:118 +#: ../pyhoca/wxgui/profilemanager.py:2063 +#: ../pyhoca/wxgui/profilemanager.py:2066 +#: ../pyhoca/wxgui/profilemanager.py:2069 +#: ../pyhoca/wxgui/profilemanager.py:2074 +#: ../pyhoca/wxgui/profilemanager.py:2084 ../pyhoca/wxgui/menus_taskbar.py:118 msgid "Profile Manager" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1909 +#: ../pyhoca/wxgui/profilemanager.py:2063 msgid "Profile name is missing, profile unusable!!!" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1912 -#: ../pyhoca/wxgui/profilemanager.py:1915 +#: ../pyhoca/wxgui/profilemanager.py:2066 +#: ../pyhoca/wxgui/profilemanager.py:2069 #, python-format msgid "Profile name %s already exists!!!" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1920 +#: ../pyhoca/wxgui/profilemanager.py:2074 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1930 +#: ../pyhoca/wxgui/profilemanager.py:2084 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -654,21 +661,21 @@ msgid "" "Please change the SSH proxy settings accordingly." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1957 +#: ../pyhoca/wxgui/profilemanager.py:2111 #, python-format msgid "%s - profile added" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1958 +#: ../pyhoca/wxgui/profilemanager.py:2112 msgid "A new session profile has been added." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1962 +#: ../pyhoca/wxgui/profilemanager.py:2116 #, python-format msgid "%s - modified" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1963 +#: ../pyhoca/wxgui/profilemanager.py:2117 msgid "Changes to profile have been saved." msgstr "" @@ -926,84 +933,100 @@ msgstr "" msgid "The X2Go Server does not publish an application menu." msgstr "" -#: ../pyhoca/wxgui/frontend.py:610 +#: ../pyhoca/wxgui/frontend.py:611 msgid "Public SSH key authentication has been successful." msgstr "" -#: ../pyhoca/wxgui/frontend.py:644 +#: ../pyhoca/wxgui/frontend.py:648 msgid "" "The SSH proxy's host key is invalid or has not been accepted by the user" msgstr "" -#: ../pyhoca/wxgui/frontend.py:665 +#: ../pyhoca/wxgui/frontend.py:669 #, python-format msgid "%s - EOF error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:665 +#: ../pyhoca/wxgui/frontend.py:669 msgid "Authentication protocol communication incomplete! Try again..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:672 +#: ../pyhoca/wxgui/frontend.py:676 #, python-format msgid "%s - auth key error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:693 +#: ../pyhoca/wxgui/frontend.py:697 msgid "An unknown error occurred during authentication!" msgstr "" +#: ../pyhoca/wxgui/frontend.py:725 +#, python-format +msgid "%s: DirectRDP not supported yet" +msgstr "" + #: ../pyhoca/wxgui/frontend.py:726 +#, python-format +msgid "" +"We apologize for the inconvenience...\n" +"\n" +"Session profiles of type ,,DirectRDP'' are not\n" +"supported by %s (%s), yet!!\n" +"\n" +"DirectRDP support will be available in %s (>= 0.2.2.0)." +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:738 msgid "Unknown session profile, configure before using it..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:784 ../pyhoca/wxgui/frontend.py:1302 +#: ../pyhoca/wxgui/frontend.py:796 ../pyhoca/wxgui/frontend.py:1314 #, python-format msgid "%s - session warning" msgstr "" -#: ../pyhoca/wxgui/frontend.py:784 +#: ../pyhoca/wxgui/frontend.py:796 #, python-format msgid "Execution of command ,,%s'' failed." msgstr "" -#: ../pyhoca/wxgui/frontend.py:926 +#: ../pyhoca/wxgui/frontend.py:938 msgid "Cleaning X2Go sessions..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:961 +#: ../pyhoca/wxgui/frontend.py:973 #, python-format msgid "%s - disconnect" msgstr "" -#: ../pyhoca/wxgui/frontend.py:961 +#: ../pyhoca/wxgui/frontend.py:973 msgid "X2Go Profile is now disconnected." msgstr "" -#: ../pyhoca/wxgui/frontend.py:977 +#: ../pyhoca/wxgui/frontend.py:989 msgid "New Session Profile" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1029 +#: ../pyhoca/wxgui/frontend.py:1041 #, python-format msgid "Really Delete Session Profile ,,%s''?" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1035 +#: ../pyhoca/wxgui/frontend.py:1047 #, python-format msgid "%s - profile deleted" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1035 +#: ../pyhoca/wxgui/frontend.py:1047 msgid "The session profile has been deleted." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1053 +#: ../pyhoca/wxgui/frontend.py:1065 #, python-format msgid "%s - share local folder with sessions of this profile" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1194 +#: ../pyhoca/wxgui/frontend.py:1206 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -1012,148 +1035,148 @@ msgid "" "Are you sure you want to continue connecting?" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1202 +#: ../pyhoca/wxgui/frontend.py:1214 #, python-format msgid "%s: Confirm Host Authorization" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1247 +#: ../pyhoca/wxgui/frontend.py:1259 #, python-format msgid "%s - channel error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1247 +#: ../pyhoca/wxgui/frontend.py:1259 #, python-format msgid "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " "server..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1265 ../pyhoca/wxgui/frontend.py:1283 -#: ../pyhoca/wxgui/frontend.py:1285 ../pyhoca/wxgui/frontend.py:1321 +#: ../pyhoca/wxgui/frontend.py:1277 ../pyhoca/wxgui/frontend.py:1295 +#: ../pyhoca/wxgui/frontend.py:1297 ../pyhoca/wxgui/frontend.py:1333 #, python-format msgid "%s - session failure" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1265 +#: ../pyhoca/wxgui/frontend.py:1277 msgid "The session startup failed." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1283 +#: ../pyhoca/wxgui/frontend.py:1295 #, python-format msgid "The command ,,%s'' is not available on X2Go server." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1285 +#: ../pyhoca/wxgui/frontend.py:1297 #, python-format msgid "" "The command ,,%s'' is not available on X2Go server\n" "%s." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1302 +#: ../pyhoca/wxgui/frontend.py:1314 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " "been denied." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1321 +#: ../pyhoca/wxgui/frontend.py:1333 #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " "X2go/SSH server. Session startup failed." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1340 +#: ../pyhoca/wxgui/frontend.py:1352 #, python-format msgid "%s - audio warning" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1340 +#: ../pyhoca/wxgui/frontend.py:1352 msgid "" "The X2Go PulseAudio system is not available within Remote Desktop sessions." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1347 ../pyhoca/wxgui/frontend.py:1354 +#: ../pyhoca/wxgui/frontend.py:1359 ../pyhoca/wxgui/frontend.py:1366 #, python-format msgid "%s - audio error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1347 +#: ../pyhoca/wxgui/frontend.py:1359 msgid "The X2Go PulseAudio system could not be started." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1354 +#: ../pyhoca/wxgui/frontend.py:1366 msgid "The X2Go PulseAudio system has died unexpectedly." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1366 +#: ../pyhoca/wxgui/frontend.py:1378 #, python-format msgid "%s - audio problem" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1366 +#: ../pyhoca/wxgui/frontend.py:1378 #, python-format msgid "" "The audio connection could not be set up for this session.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1378 +#: ../pyhoca/wxgui/frontend.py:1390 #, python-format msgid "%s - client-side printing not available" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1378 +#: ../pyhoca/wxgui/frontend.py:1390 #, python-format msgid "" "The server denies client-side printing from within this session.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1390 +#: ../pyhoca/wxgui/frontend.py:1402 #, python-format msgid "%s - MIME box not available" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1390 +#: ../pyhoca/wxgui/frontend.py:1402 #, python-format msgid "" "The server does not support the X2Go MIME box.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1402 +#: ../pyhoca/wxgui/frontend.py:1414 #, python-format msgid "%s - client-side folders not sharable" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1402 +#: ../pyhoca/wxgui/frontend.py:1414 #, python-format msgid "" "The server denies client-side folder sharing with this session.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1414 +#: ../pyhoca/wxgui/frontend.py:1426 #, python-format msgid "%s - client resources not sharable" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1414 +#: ../pyhoca/wxgui/frontend.py:1426 #, python-format msgid "" "Client-side folders and printers cannot be shared with this session.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1433 ../pyhoca/wxgui/frontend.py:1435 +#: ../pyhoca/wxgui/frontend.py:1445 ../pyhoca/wxgui/frontend.py:1447 #, python-format msgid "%s - print error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1433 +#: ../pyhoca/wxgui/frontend.py:1445 #, python-format msgid "" "%s\n" @@ -1161,7 +1184,7 @@ msgid "" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1435 +#: ../pyhoca/wxgui/frontend.py:1447 #, python-format msgid "" "%s\n" @@ -1169,74 +1192,74 @@ msgid "" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1450 ../pyhoca/wxgui/frontend.py:1465 +#: ../pyhoca/wxgui/frontend.py:1462 ../pyhoca/wxgui/frontend.py:1477 #, python-format msgid "%s - start" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1450 +#: ../pyhoca/wxgui/frontend.py:1462 #, python-format msgid "" "New X2Go session starting up...\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1465 +#: ../pyhoca/wxgui/frontend.py:1477 #, python-format msgid "" "Another client started X2Go session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1480 ../pyhoca/wxgui/frontend.py:1495 +#: ../pyhoca/wxgui/frontend.py:1492 ../pyhoca/wxgui/frontend.py:1507 #, python-format msgid "%s - resume" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1480 +#: ../pyhoca/wxgui/frontend.py:1492 #, python-format msgid "" "Resuming X2Go session...\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1495 +#: ../pyhoca/wxgui/frontend.py:1507 #, python-format msgid "" "Another client resumed X2Go session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1510 +#: ../pyhoca/wxgui/frontend.py:1522 #, python-format msgid "%s - running" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1510 +#: ../pyhoca/wxgui/frontend.py:1522 #, python-format msgid "" "Found already running session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1530 +#: ../pyhoca/wxgui/frontend.py:1542 #, python-format msgid "%s - suspend" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1530 +#: ../pyhoca/wxgui/frontend.py:1542 #, python-format msgid "" "X2Go Session has been suspended\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1557 +#: ../pyhoca/wxgui/frontend.py:1569 #, python-format msgid "%s - terminate" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1557 +#: ../pyhoca/wxgui/frontend.py:1569 #, python-format msgid "" "X2Go Session has terminated\n" diff --git a/po/bg.po b/po/bg.po index 816902f..567be87 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-06-10 21:18+0200\n" +"POT-Creation-Date: 2012-09-28 10:00+0200\n" "PO-Revision-Date: 2011-09-17 02:17+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: Bulgarian <chepati(a)yahoo.com>\n" @@ -50,94 +50,94 @@ msgstr "" msgid "SSH proxy server login" msgstr "" -#: ../pyhoca/wxgui/logon.py:133 ../pyhoca/wxgui/profilemanager.py:322 +#: ../pyhoca/wxgui/logon.py:133 ../pyhoca/wxgui/profilemanager.py:346 #: ../pyhoca/wxgui/messages.py:132 ../pyhoca/wxgui/printingprefs.py:147 #: ../pyhoca/wxgui/sessiontitle.py:85 msgid "Cancel" msgstr "" -#: ../pyhoca/wxgui/logon.py:292 ../pyhoca/wxgui/logon.py:334 -#: ../pyhoca/wxgui/frontend.py:603 +#: ../pyhoca/wxgui/logon.py:301 ../pyhoca/wxgui/logon.py:343 +#: ../pyhoca/wxgui/frontend.py:604 #, python-format msgid "%s - connect failure" msgstr "" -#: ../pyhoca/wxgui/logon.py:293 ../pyhoca/wxgui/frontend.py:603 +#: ../pyhoca/wxgui/logon.py:302 ../pyhoca/wxgui/frontend.py:604 msgid "User is not allowed to start X2Go sessions!" msgstr "" -#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:610 +#: ../pyhoca/wxgui/logon.py:307 ../pyhoca/wxgui/frontend.py:611 #, python-format msgid "%s - connect" msgstr "" -#: ../pyhoca/wxgui/logon.py:299 +#: ../pyhoca/wxgui/logon.py:308 msgid "Authentication has been successful." msgstr "" -#: ../pyhoca/wxgui/logon.py:330 +#: ../pyhoca/wxgui/logon.py:339 msgid "SSH tunnel started" msgstr "" -#: ../pyhoca/wxgui/logon.py:335 +#: ../pyhoca/wxgui/logon.py:344 msgid "Authentication failed!" msgstr "" -#: ../pyhoca/wxgui/logon.py:342 +#: ../pyhoca/wxgui/logon.py:351 #, python-format msgid "%s - SSH proxy" msgstr "" -#: ../pyhoca/wxgui/logon.py:343 +#: ../pyhoca/wxgui/logon.py:352 msgid "Authentication to the SSH proxy server failed!" msgstr "" -#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:658 +#: ../pyhoca/wxgui/logon.py:374 ../pyhoca/wxgui/frontend.py:662 #, python-format msgid "%s - socket error" msgstr "" -#: ../pyhoca/wxgui/logon.py:372 ../pyhoca/wxgui/frontend.py:637 -#: ../pyhoca/wxgui/frontend.py:644 +#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:641 +#: ../pyhoca/wxgui/frontend.py:648 #, python-format msgid "%s - host key error" msgstr "" -#: ../pyhoca/wxgui/logon.py:373 ../pyhoca/wxgui/frontend.py:637 +#: ../pyhoca/wxgui/logon.py:382 ../pyhoca/wxgui/frontend.py:641 msgid "" "The remote server's host key is invalid or has not been accepted by the user" msgstr "" -#: ../pyhoca/wxgui/logon.py:380 ../pyhoca/wxgui/frontend.py:679 +#: ../pyhoca/wxgui/logon.py:389 ../pyhoca/wxgui/frontend.py:683 #, python-format msgid "%s - missing home directory" msgstr "" -#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:679 +#: ../pyhoca/wxgui/logon.py:390 ../pyhoca/wxgui/frontend.py:683 msgid "The remote user's home directory does not exist." msgstr "" -#: ../pyhoca/wxgui/logon.py:388 +#: ../pyhoca/wxgui/logon.py:397 #, python-format msgid "%s - key error" msgstr "" -#: ../pyhoca/wxgui/logon.py:396 ../pyhoca/wxgui/frontend.py:686 +#: ../pyhoca/wxgui/logon.py:405 ../pyhoca/wxgui/frontend.py:690 #, python-format msgid "%s - auth error" msgstr "" -#: ../pyhoca/wxgui/logon.py:404 ../pyhoca/wxgui/frontend.py:630 +#: ../pyhoca/wxgui/logon.py:413 ../pyhoca/wxgui/frontend.py:634 #, python-format msgid "%s - SSH error" msgstr "" -#: ../pyhoca/wxgui/logon.py:412 +#: ../pyhoca/wxgui/logon.py:421 #, python-format msgid "%s - unknown error" msgstr "" -#: ../pyhoca/wxgui/logon.py:413 +#: ../pyhoca/wxgui/logon.py:422 msgid "An unknown error occured during authentication!" msgstr "" @@ -167,490 +167,497 @@ msgid "" "Client for connecting you to a remote X2Go server" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:82 +#: ../pyhoca/wxgui/profilemanager.py:83 msgid "GNOME Desktop (GNOME)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:83 +#: ../pyhoca/wxgui/profilemanager.py:84 msgid "K Desktop Environment (KDE)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:84 +#: ../pyhoca/wxgui/profilemanager.py:85 msgid "Lightweight X Desktop (LXDE)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:85 +#: ../pyhoca/wxgui/profilemanager.py:86 msgid "Trinity X Desktop (KDE3-like)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:86 +#: ../pyhoca/wxgui/profilemanager.py:87 msgid "Unity X Desktop Shell (UNITY)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:87 +#: ../pyhoca/wxgui/profilemanager.py:88 msgid "XFCE4 Desktop (XFCE4)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:88 +#: ../pyhoca/wxgui/profilemanager.py:89 msgid "Published Applications" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:89 +#: ../pyhoca/wxgui/profilemanager.py:90 msgid "Single Application" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:90 +#: ../pyhoca/wxgui/profilemanager.py:91 msgid "XDMCP Query" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:91 -msgid "Windows Terminal Server (RDP-proxy)" +#: ../pyhoca/wxgui/profilemanager.py:92 +msgid "Windows Terminal Server (X2Go-proxied RDP)" msgstr "" -#. 'DirectRDP': 'Windows Terminal Server (RDP-direct)', -#: ../pyhoca/wxgui/profilemanager.py:93 ../pyhoca/wxgui/profilemanager.py:207 +#: ../pyhoca/wxgui/profilemanager.py:94 ../pyhoca/wxgui/profilemanager.py:227 msgid "Custom command" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:398 +#: ../pyhoca/wxgui/profilemanager.py:99 ../pyhoca/wxgui/menus_taskbar.py:398 msgid "Internet Browser" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:399 +#: ../pyhoca/wxgui/profilemanager.py:100 ../pyhoca/wxgui/menus_taskbar.py:399 msgid "Email Client" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:400 +#: ../pyhoca/wxgui/profilemanager.py:101 ../pyhoca/wxgui/menus_taskbar.py:400 msgid "Office" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:99 ../pyhoca/wxgui/menus_taskbar.py:401 +#: ../pyhoca/wxgui/profilemanager.py:102 ../pyhoca/wxgui/menus_taskbar.py:401 msgid "Terminal" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:113 +#: ../pyhoca/wxgui/profilemanager.py:120 msgid "Open file with system's default application" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:114 +#: ../pyhoca/wxgui/profilemanager.py:121 msgid "Open application chooser dialog" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:115 +#: ../pyhoca/wxgui/profilemanager.py:122 msgid "Save incoming file as ..." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:143 +#: ../pyhoca/wxgui/profilemanager.py:150 msgid "settings derived from " msgstr "" #. boxes for all tabs -#: ../pyhoca/wxgui/profilemanager.py:160 +#: ../pyhoca/wxgui/profilemanager.py:170 msgid "Session Title" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:161 +#: ../pyhoca/wxgui/profilemanager.py:171 msgid "Session Window" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:162 +#: ../pyhoca/wxgui/profilemanager.py:172 msgid "Session Startup" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:163 +#: ../pyhoca/wxgui/profilemanager.py:173 msgid "Server" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:164 +#: ../pyhoca/wxgui/profilemanager.py:174 +msgid "Proxy" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:175 msgid "Connection Link Speed" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:165 +#: ../pyhoca/wxgui/profilemanager.py:176 msgid "Compression" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:166 +#: ../pyhoca/wxgui/profilemanager.py:177 msgid "Display" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:167 +#: ../pyhoca/wxgui/profilemanager.py:178 msgid "Keyboard" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:168 +#: ../pyhoca/wxgui/profilemanager.py:179 msgid "Sound" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:169 +#: ../pyhoca/wxgui/profilemanager.py:180 msgid "Printing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:170 +#: ../pyhoca/wxgui/profilemanager.py:181 msgid "Folder Exports" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:171 +#: ../pyhoca/wxgui/profilemanager.py:182 msgid "File Import" msgstr "" #. ## #. ## widgets for the PROFILE tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:176 +#: ../pyhoca/wxgui/profilemanager.py:187 msgid "Name" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:183 +#: ../pyhoca/wxgui/profilemanager.py:194 msgid "Set session window title" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:184 +#: ../pyhoca/wxgui/profilemanager.py:195 msgid "Use a default session window title" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:185 +#: ../pyhoca/wxgui/profilemanager.py:196 msgid "Custom session window title" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:195 +#: ../pyhoca/wxgui/profilemanager.py:215 msgid "Window Icon" msgstr "" #. ## #. ## widgets for the SESSION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:201 +#: ../pyhoca/wxgui/profilemanager.py:221 msgid "Start session automatically after login" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:202 +#: ../pyhoca/wxgui/profilemanager.py:222 #, python-format msgid "Login automatically after %s has started" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:203 +#: ../pyhoca/wxgui/profilemanager.py:223 msgid "Type" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:205 +#: ../pyhoca/wxgui/profilemanager.py:225 msgid "Application" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:209 +#: ../pyhoca/wxgui/profilemanager.py:229 msgid "XDMCP server" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:211 +#: ../pyhoca/wxgui/profilemanager.py:231 msgid "RDP server" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:213 +#: ../pyhoca/wxgui/profilemanager.py:233 msgid "RDP options" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:215 +#: ../pyhoca/wxgui/profilemanager.py:235 msgid "Integrate remote application(s) into local desktop (rootless mode)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:216 +#: ../pyhoca/wxgui/profilemanager.py:236 msgid "Menu of published applications" msgstr "" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:223 ../pyhoca/wxgui/profilemanager.py:233 +#: ../pyhoca/wxgui/profilemanager.py:243 ../pyhoca/wxgui/profilemanager.py:253 msgid "User" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:225 +#: ../pyhoca/wxgui/profilemanager.py:245 ../pyhoca/wxgui/profilemanager.py:260 msgid "Host" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:227 +#: ../pyhoca/wxgui/profilemanager.py:247 ../pyhoca/wxgui/profilemanager.py:262 msgid "Port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:229 -msgid "RSA/DSA private key" +#: ../pyhoca/wxgui/profilemanager.py:249 +msgid "Key" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:232 +#: ../pyhoca/wxgui/profilemanager.py:252 msgid "Server behind SSH proxy" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:235 -msgid "Key file" +#: ../pyhoca/wxgui/profilemanager.py:255 +msgid "Use same username for X2Go and proxy host" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:256 +msgid "Use same authentication for X2Go and proxy host" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:238 -msgid "Host[:Port]" +#: ../pyhoca/wxgui/profilemanager.py:257 +msgid "Key file" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:240 +#: ../pyhoca/wxgui/profilemanager.py:264 msgid "SSH Proxy Tunnel" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:248 +#: ../pyhoca/wxgui/profilemanager.py:272 msgid "Modem" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:249 +#: ../pyhoca/wxgui/profilemanager.py:273 msgid "ISDN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:250 +#: ../pyhoca/wxgui/profilemanager.py:274 msgid "ADSL" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:251 +#: ../pyhoca/wxgui/profilemanager.py:275 msgid "WAN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:252 +#: ../pyhoca/wxgui/profilemanager.py:276 msgid "LAN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:254 +#: ../pyhoca/wxgui/profilemanager.py:278 msgid "Method" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:256 +#: ../pyhoca/wxgui/profilemanager.py:280 msgid "Image quality" msgstr "" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:262 +#: ../pyhoca/wxgui/profilemanager.py:286 msgid "Fullscreen" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:263 +#: ../pyhoca/wxgui/profilemanager.py:287 msgid "Custom Size" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:268 +#: ../pyhoca/wxgui/profilemanager.py:292 msgid "Set display DPI" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:270 +#: ../pyhoca/wxgui/profilemanager.py:294 msgid "Do not set (use server-side tools to configure the keyboard)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:271 +#: ../pyhoca/wxgui/profilemanager.py:295 msgid "" "Automatically detect and use client-side keyboard configuration inside the " "session" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:272 +#: ../pyhoca/wxgui/profilemanager.py:296 msgid "Use custom keyboard settings as provided below" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:273 +#: ../pyhoca/wxgui/profilemanager.py:297 msgid "Keyboard model" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:275 +#: ../pyhoca/wxgui/profilemanager.py:299 msgid "Layout" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:277 +#: ../pyhoca/wxgui/profilemanager.py:301 msgid "Layout variant" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:279 +#: ../pyhoca/wxgui/profilemanager.py:303 msgid "Enable sound support" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:280 +#: ../pyhoca/wxgui/profilemanager.py:304 msgid "Pulse Audio" msgstr "" #. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated. #. However, config files can contain an Arts configuration, so we will honour this -#: ../pyhoca/wxgui/profilemanager.py:284 +#: ../pyhoca/wxgui/profilemanager.py:308 msgid "Arts (not supported)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:287 +#: ../pyhoca/wxgui/profilemanager.py:311 msgid "esd" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:288 +#: ../pyhoca/wxgui/profilemanager.py:312 msgid "Use default sound port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:289 +#: ../pyhoca/wxgui/profilemanager.py:313 msgid "Custom sound port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:291 +#: ../pyhoca/wxgui/profilemanager.py:315 msgid "Client Side printing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:293 +#: ../pyhoca/wxgui/profilemanager.py:317 msgid "Use local folder sharing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:294 +#: ../pyhoca/wxgui/profilemanager.py:318 msgid "Path" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:297 ../pyhoca/wxgui/profilemanager.py:316 +#: ../pyhoca/wxgui/profilemanager.py:321 ../pyhoca/wxgui/profilemanager.py:340 msgid "Add" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:299 +#: ../pyhoca/wxgui/profilemanager.py:323 msgid "Local Path" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:300 +#: ../pyhoca/wxgui/profilemanager.py:324 msgid "Connect Method" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:301 +#: ../pyhoca/wxgui/profilemanager.py:325 msgid "Delete" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:303 +#: ../pyhoca/wxgui/profilemanager.py:327 msgid "Convert between client and server encodings" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:304 +#: ../pyhoca/wxgui/profilemanager.py:328 msgid "Client encoding" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:306 +#: ../pyhoca/wxgui/profilemanager.py:330 msgid "Server encoding" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:309 +#: ../pyhoca/wxgui/profilemanager.py:333 msgid "Use file MIME box for local file import" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:310 +#: ../pyhoca/wxgui/profilemanager.py:334 msgid "Extensions" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:312 +#: ../pyhoca/wxgui/profilemanager.py:336 msgid "Action" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:317 +#: ../pyhoca/wxgui/profilemanager.py:341 msgid "Defaults" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:319 +#: ../pyhoca/wxgui/profilemanager.py:343 msgid "Save" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:320 +#: ../pyhoca/wxgui/profilemanager.py:344 msgid "Reset" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:365 -#: ../pyhoca/wxgui/profilemanager.py:1078 -#: ../pyhoca/wxgui/profilemanager.py:1832 +#: ../pyhoca/wxgui/profilemanager.py:394 +#: ../pyhoca/wxgui/profilemanager.py:1089 +#: ../pyhoca/wxgui/profilemanager.py:1983 msgid "automatically" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:367 -#: ../pyhoca/wxgui/profilemanager.py:1080 +#: ../pyhoca/wxgui/profilemanager.py:396 +#: ../pyhoca/wxgui/profilemanager.py:1091 msgid "manually" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:376 +#: ../pyhoca/wxgui/profilemanager.py:405 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:378 +#: ../pyhoca/wxgui/profilemanager.py:407 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:380 +#: ../pyhoca/wxgui/profilemanager.py:409 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:751 +#: ../pyhoca/wxgui/profilemanager.py:769 msgid "Profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:752 +#: ../pyhoca/wxgui/profilemanager.py:770 msgid "Session" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:753 +#: ../pyhoca/wxgui/profilemanager.py:771 msgid "Connection" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:754 +#: ../pyhoca/wxgui/profilemanager.py:772 msgid "Settings" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:755 +#: ../pyhoca/wxgui/profilemanager.py:773 msgid "Sharing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:996 +#: ../pyhoca/wxgui/profilemanager.py:1007 msgid "<xkbtype>" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:997 +#: ../pyhoca/wxgui/profilemanager.py:1008 msgid "<xkblayout>" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:998 +#: ../pyhoca/wxgui/profilemanager.py:1009 msgid "<xkbvariant>" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1284 +#: ../pyhoca/wxgui/profilemanager.py:1306 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1287 +#: ../pyhoca/wxgui/profilemanager.py:1309 msgid "Choose an icon for this session profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1509 +#: ../pyhoca/wxgui/profilemanager.py:1600 msgid "All files (*.*)|*" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1511 -#: ../pyhoca/wxgui/profilemanager.py:1533 +#: ../pyhoca/wxgui/profilemanager.py:1602 +#: ../pyhoca/wxgui/profilemanager.py:1626 msgid "Choose a public SSH key" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1784 +#: ../pyhoca/wxgui/profilemanager.py:1935 msgid "Choose a folder to share within a session" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1912 -#: ../pyhoca/wxgui/profilemanager.py:1915 -#: ../pyhoca/wxgui/profilemanager.py:1918 -#: ../pyhoca/wxgui/profilemanager.py:1923 -#: ../pyhoca/wxgui/profilemanager.py:1933 ../pyhoca/wxgui/menus_taskbar.py:118 +#: ../pyhoca/wxgui/profilemanager.py:2063 +#: ../pyhoca/wxgui/profilemanager.py:2066 +#: ../pyhoca/wxgui/profilemanager.py:2069 +#: ../pyhoca/wxgui/profilemanager.py:2074 +#: ../pyhoca/wxgui/profilemanager.py:2084 ../pyhoca/wxgui/menus_taskbar.py:118 msgid "Profile Manager" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1912 +#: ../pyhoca/wxgui/profilemanager.py:2063 msgid "Profile name is missing, profile unusable!!!" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1915 -#: ../pyhoca/wxgui/profilemanager.py:1918 +#: ../pyhoca/wxgui/profilemanager.py:2066 +#: ../pyhoca/wxgui/profilemanager.py:2069 #, python-format msgid "Profile name %s already exists!!!" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1923 +#: ../pyhoca/wxgui/profilemanager.py:2074 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1933 +#: ../pyhoca/wxgui/profilemanager.py:2084 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -658,21 +665,21 @@ msgid "" "Please change the SSH proxy settings accordingly." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1960 +#: ../pyhoca/wxgui/profilemanager.py:2111 #, python-format msgid "%s - profile added" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1961 +#: ../pyhoca/wxgui/profilemanager.py:2112 msgid "A new session profile has been added." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1965 +#: ../pyhoca/wxgui/profilemanager.py:2116 #, python-format msgid "%s - modified" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1966 +#: ../pyhoca/wxgui/profilemanager.py:2117 msgid "Changes to profile have been saved." msgstr "" @@ -930,84 +937,100 @@ msgstr "" msgid "The X2Go Server does not publish an application menu." msgstr "" -#: ../pyhoca/wxgui/frontend.py:610 +#: ../pyhoca/wxgui/frontend.py:611 msgid "Public SSH key authentication has been successful." msgstr "" -#: ../pyhoca/wxgui/frontend.py:644 +#: ../pyhoca/wxgui/frontend.py:648 msgid "" "The SSH proxy's host key is invalid or has not been accepted by the user" msgstr "" -#: ../pyhoca/wxgui/frontend.py:665 +#: ../pyhoca/wxgui/frontend.py:669 #, python-format msgid "%s - EOF error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:665 +#: ../pyhoca/wxgui/frontend.py:669 msgid "Authentication protocol communication incomplete! Try again..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:672 +#: ../pyhoca/wxgui/frontend.py:676 #, python-format msgid "%s - auth key error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:693 +#: ../pyhoca/wxgui/frontend.py:697 msgid "An unknown error occurred during authentication!" msgstr "" +#: ../pyhoca/wxgui/frontend.py:725 +#, python-format +msgid "%s: DirectRDP not supported yet" +msgstr "" + #: ../pyhoca/wxgui/frontend.py:726 +#, python-format +msgid "" +"We apologize for the inconvenience...\n" +"\n" +"Session profiles of type ,,DirectRDP'' are not\n" +"supported by %s (%s), yet!!\n" +"\n" +"DirectRDP support will be available in %s (>= 0.2.2.0)." +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:738 msgid "Unknown session profile, configure before using it..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:784 ../pyhoca/wxgui/frontend.py:1302 +#: ../pyhoca/wxgui/frontend.py:796 ../pyhoca/wxgui/frontend.py:1314 #, python-format msgid "%s - session warning" msgstr "" -#: ../pyhoca/wxgui/frontend.py:784 +#: ../pyhoca/wxgui/frontend.py:796 #, python-format msgid "Execution of command ,,%s'' failed." msgstr "" -#: ../pyhoca/wxgui/frontend.py:926 +#: ../pyhoca/wxgui/frontend.py:938 msgid "Cleaning X2Go sessions..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:961 +#: ../pyhoca/wxgui/frontend.py:973 #, python-format msgid "%s - disconnect" msgstr "" -#: ../pyhoca/wxgui/frontend.py:961 +#: ../pyhoca/wxgui/frontend.py:973 msgid "X2Go Profile is now disconnected." msgstr "" -#: ../pyhoca/wxgui/frontend.py:977 +#: ../pyhoca/wxgui/frontend.py:989 msgid "New Session Profile" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1029 +#: ../pyhoca/wxgui/frontend.py:1041 #, python-format msgid "Really Delete Session Profile ,,%s''?" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1035 +#: ../pyhoca/wxgui/frontend.py:1047 #, python-format msgid "%s - profile deleted" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1035 +#: ../pyhoca/wxgui/frontend.py:1047 msgid "The session profile has been deleted." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1053 +#: ../pyhoca/wxgui/frontend.py:1065 #, python-format msgid "%s - share local folder with sessions of this profile" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1194 +#: ../pyhoca/wxgui/frontend.py:1206 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -1016,148 +1039,148 @@ msgid "" "Are you sure you want to continue connecting?" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1202 +#: ../pyhoca/wxgui/frontend.py:1214 #, python-format msgid "%s: Confirm Host Authorization" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1247 +#: ../pyhoca/wxgui/frontend.py:1259 #, python-format msgid "%s - channel error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1247 +#: ../pyhoca/wxgui/frontend.py:1259 #, python-format msgid "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " "server..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1265 ../pyhoca/wxgui/frontend.py:1283 -#: ../pyhoca/wxgui/frontend.py:1285 ../pyhoca/wxgui/frontend.py:1321 +#: ../pyhoca/wxgui/frontend.py:1277 ../pyhoca/wxgui/frontend.py:1295 +#: ../pyhoca/wxgui/frontend.py:1297 ../pyhoca/wxgui/frontend.py:1333 #, python-format msgid "%s - session failure" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1265 +#: ../pyhoca/wxgui/frontend.py:1277 msgid "The session startup failed." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1283 +#: ../pyhoca/wxgui/frontend.py:1295 #, python-format msgid "The command ,,%s'' is not available on X2Go server." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1285 +#: ../pyhoca/wxgui/frontend.py:1297 #, python-format msgid "" "The command ,,%s'' is not available on X2Go server\n" "%s." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1302 +#: ../pyhoca/wxgui/frontend.py:1314 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " "been denied." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1321 +#: ../pyhoca/wxgui/frontend.py:1333 #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " "X2go/SSH server. Session startup failed." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1340 +#: ../pyhoca/wxgui/frontend.py:1352 #, python-format msgid "%s - audio warning" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1340 +#: ../pyhoca/wxgui/frontend.py:1352 msgid "" "The X2Go PulseAudio system is not available within Remote Desktop sessions." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1347 ../pyhoca/wxgui/frontend.py:1354 +#: ../pyhoca/wxgui/frontend.py:1359 ../pyhoca/wxgui/frontend.py:1366 #, python-format msgid "%s - audio error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1347 +#: ../pyhoca/wxgui/frontend.py:1359 msgid "The X2Go PulseAudio system could not be started." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1354 +#: ../pyhoca/wxgui/frontend.py:1366 msgid "The X2Go PulseAudio system has died unexpectedly." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1366 +#: ../pyhoca/wxgui/frontend.py:1378 #, python-format msgid "%s - audio problem" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1366 +#: ../pyhoca/wxgui/frontend.py:1378 #, python-format msgid "" "The audio connection could not be set up for this session.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1378 +#: ../pyhoca/wxgui/frontend.py:1390 #, python-format msgid "%s - client-side printing not available" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1378 +#: ../pyhoca/wxgui/frontend.py:1390 #, python-format msgid "" "The server denies client-side printing from within this session.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1390 +#: ../pyhoca/wxgui/frontend.py:1402 #, python-format msgid "%s - MIME box not available" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1390 +#: ../pyhoca/wxgui/frontend.py:1402 #, python-format msgid "" "The server does not support the X2Go MIME box.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1402 +#: ../pyhoca/wxgui/frontend.py:1414 #, python-format msgid "%s - client-side folders not sharable" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1402 +#: ../pyhoca/wxgui/frontend.py:1414 #, python-format msgid "" "The server denies client-side folder sharing with this session.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1414 +#: ../pyhoca/wxgui/frontend.py:1426 #, python-format msgid "%s - client resources not sharable" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1414 +#: ../pyhoca/wxgui/frontend.py:1426 #, python-format msgid "" "Client-side folders and printers cannot be shared with this session.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1433 ../pyhoca/wxgui/frontend.py:1435 +#: ../pyhoca/wxgui/frontend.py:1445 ../pyhoca/wxgui/frontend.py:1447 #, python-format msgid "%s - print error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1433 +#: ../pyhoca/wxgui/frontend.py:1445 #, python-format msgid "" "%s\n" @@ -1165,7 +1188,7 @@ msgid "" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1435 +#: ../pyhoca/wxgui/frontend.py:1447 #, python-format msgid "" "%s\n" @@ -1173,74 +1196,74 @@ msgid "" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1450 ../pyhoca/wxgui/frontend.py:1465 +#: ../pyhoca/wxgui/frontend.py:1462 ../pyhoca/wxgui/frontend.py:1477 #, python-format msgid "%s - start" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1450 +#: ../pyhoca/wxgui/frontend.py:1462 #, python-format msgid "" "New X2Go session starting up...\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1465 +#: ../pyhoca/wxgui/frontend.py:1477 #, python-format msgid "" "Another client started X2Go session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1480 ../pyhoca/wxgui/frontend.py:1495 +#: ../pyhoca/wxgui/frontend.py:1492 ../pyhoca/wxgui/frontend.py:1507 #, python-format msgid "%s - resume" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1480 +#: ../pyhoca/wxgui/frontend.py:1492 #, python-format msgid "" "Resuming X2Go session...\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1495 +#: ../pyhoca/wxgui/frontend.py:1507 #, python-format msgid "" "Another client resumed X2Go session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1510 +#: ../pyhoca/wxgui/frontend.py:1522 #, python-format msgid "%s - running" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1510 +#: ../pyhoca/wxgui/frontend.py:1522 #, python-format msgid "" "Found already running session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1530 +#: ../pyhoca/wxgui/frontend.py:1542 #, python-format msgid "%s - suspend" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1530 +#: ../pyhoca/wxgui/frontend.py:1542 #, python-format msgid "" "X2Go Session has been suspended\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1557 +#: ../pyhoca/wxgui/frontend.py:1569 #, python-format msgid "%s - terminate" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1557 +#: ../pyhoca/wxgui/frontend.py:1569 #, python-format msgid "" "X2Go Session has terminated\n" diff --git a/po/de.po b/po/de.po index 5338d8a..88d821e 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-06-10 21:18+0200\n" -"PO-Revision-Date: 2012-05-31 22:04+0100\n" +"POT-Creation-Date: 2012-09-28 10:00+0200\n" +"PO-Revision-Date: 2012-09-28 09:53+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: de <mike.gabriel(a)das-netzwerkteam.de>\n" "Language: \n" @@ -49,97 +49,97 @@ msgstr "Sitzungslogin" msgid "SSH proxy server login" msgstr "Anmeldung an SSH Proxy" -#: ../pyhoca/wxgui/logon.py:133 ../pyhoca/wxgui/profilemanager.py:322 +#: ../pyhoca/wxgui/logon.py:133 ../pyhoca/wxgui/profilemanager.py:346 #: ../pyhoca/wxgui/messages.py:132 ../pyhoca/wxgui/printingprefs.py:147 #: ../pyhoca/wxgui/sessiontitle.py:85 msgid "Cancel" msgstr "Abbrechen" -#: ../pyhoca/wxgui/logon.py:292 ../pyhoca/wxgui/logon.py:334 -#: ../pyhoca/wxgui/frontend.py:603 +#: ../pyhoca/wxgui/logon.py:301 ../pyhoca/wxgui/logon.py:343 +#: ../pyhoca/wxgui/frontend.py:604 #, python-format msgid "%s - connect failure" msgstr "%s - Verbindung fehlgeschlagen" -#: ../pyhoca/wxgui/logon.py:293 ../pyhoca/wxgui/frontend.py:603 +#: ../pyhoca/wxgui/logon.py:302 ../pyhoca/wxgui/frontend.py:604 msgid "User is not allowed to start X2Go sessions!" msgstr "Benutzer darf keine X2Go Sitzungen starten!" -#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:610 +#: ../pyhoca/wxgui/logon.py:307 ../pyhoca/wxgui/frontend.py:611 #, python-format msgid "%s - connect" msgstr "%s - verbinden" -#: ../pyhoca/wxgui/logon.py:299 +#: ../pyhoca/wxgui/logon.py:308 msgid "Authentication has been successful." msgstr "Anmeldung war erfolgreich." -#: ../pyhoca/wxgui/logon.py:330 +#: ../pyhoca/wxgui/logon.py:339 msgid "SSH tunnel started" msgstr "SSH Tunnel gestartet" -#: ../pyhoca/wxgui/logon.py:335 +#: ../pyhoca/wxgui/logon.py:344 msgid "Authentication failed!" msgstr "Anmeldung fehlgeschlagen!" -#: ../pyhoca/wxgui/logon.py:342 +#: ../pyhoca/wxgui/logon.py:351 #, python-format msgid "%s - SSH proxy" msgstr "%s - SSH Proxy" -#: ../pyhoca/wxgui/logon.py:343 +#: ../pyhoca/wxgui/logon.py:352 msgid "Authentication to the SSH proxy server failed!" msgstr "Anmeldung am SSH Proxy Server ist fehlgeschlagen" -#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:658 +#: ../pyhoca/wxgui/logon.py:374 ../pyhoca/wxgui/frontend.py:662 #, python-format msgid "%s - socket error" msgstr "%s - Socket-Fehler" -#: ../pyhoca/wxgui/logon.py:372 ../pyhoca/wxgui/frontend.py:637 -#: ../pyhoca/wxgui/frontend.py:644 +#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:641 +#: ../pyhoca/wxgui/frontend.py:648 #, python-format msgid "%s - host key error" msgstr "%s - ungültiger Server-Schlüssel" -#: ../pyhoca/wxgui/logon.py:373 ../pyhoca/wxgui/frontend.py:637 +#: ../pyhoca/wxgui/logon.py:382 ../pyhoca/wxgui/frontend.py:641 msgid "" "The remote server's host key is invalid or has not been accepted by the user" msgstr "" "Der Host-Schlüssel des X2Go Servers ist ungültig oder wurde vom Benutzer " "nicht akzeptiert" -#: ../pyhoca/wxgui/logon.py:380 ../pyhoca/wxgui/frontend.py:679 +#: ../pyhoca/wxgui/logon.py:389 ../pyhoca/wxgui/frontend.py:683 #, python-format msgid "%s - missing home directory" msgstr "%s - Benutzerverzeichnis nicht vorhanden" -#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:679 +#: ../pyhoca/wxgui/logon.py:390 ../pyhoca/wxgui/frontend.py:683 msgid "The remote user's home directory does not exist." msgstr "" "Das serverseitige Benutzerverzeichnis (HOME-Verzeichnis) existiert nicht." -#: ../pyhoca/wxgui/logon.py:388 +#: ../pyhoca/wxgui/logon.py:397 #, python-format msgid "%s - key error" msgstr "%s - ungültiger Schlüssel" -#: ../pyhoca/wxgui/logon.py:396 ../pyhoca/wxgui/frontend.py:686 +#: ../pyhoca/wxgui/logon.py:405 ../pyhoca/wxgui/frontend.py:690 #, python-format msgid "%s - auth error" msgstr "%s - Anmeldefehler" -#: ../pyhoca/wxgui/logon.py:404 ../pyhoca/wxgui/frontend.py:630 +#: ../pyhoca/wxgui/logon.py:413 ../pyhoca/wxgui/frontend.py:634 #, python-format msgid "%s - SSH error" msgstr "%s - SSH-Fehler" -#: ../pyhoca/wxgui/logon.py:412 +#: ../pyhoca/wxgui/logon.py:421 #, python-format msgid "%s - unknown error" msgstr "%s - unbekannter Fehler" -#: ../pyhoca/wxgui/logon.py:413 +#: ../pyhoca/wxgui/logon.py:422 msgid "An unknown error occured during authentication!" msgstr "Ein unbekannter Fehler ist während der Serveranmeldung aufgetreten!" @@ -175,282 +175,289 @@ msgstr "" "PyHoca-GUI (Python X2goClient)\n" "Verbindungen zu entferntem X2Go Server aufbauen" -#: ../pyhoca/wxgui/profilemanager.py:82 +#: ../pyhoca/wxgui/profilemanager.py:83 msgid "GNOME Desktop (GNOME)" msgstr "GNOME Desktop (GNOME)" -#: ../pyhoca/wxgui/profilemanager.py:83 +#: ../pyhoca/wxgui/profilemanager.py:84 msgid "K Desktop Environment (KDE)" msgstr "K Desktop Environment (KDE)" -#: ../pyhoca/wxgui/profilemanager.py:84 +#: ../pyhoca/wxgui/profilemanager.py:85 msgid "Lightweight X Desktop (LXDE)" msgstr "Lightweight X Desktop (LXDE)" -#: ../pyhoca/wxgui/profilemanager.py:85 +#: ../pyhoca/wxgui/profilemanager.py:86 msgid "Trinity X Desktop (KDE3-like)" msgstr "Trinity X Desktop (ähnlich KDE3)" -#: ../pyhoca/wxgui/profilemanager.py:86 +#: ../pyhoca/wxgui/profilemanager.py:87 msgid "Unity X Desktop Shell (UNITY)" msgstr "Unity X Desktop Umgebung (UNITY)" -#: ../pyhoca/wxgui/profilemanager.py:87 +#: ../pyhoca/wxgui/profilemanager.py:88 msgid "XFCE4 Desktop (XFCE4)" msgstr "XFCE4 Desktop (XFCE4)" -#: ../pyhoca/wxgui/profilemanager.py:88 +#: ../pyhoca/wxgui/profilemanager.py:89 msgid "Published Applications" msgstr "Server-publizierte Anwendungen" -#: ../pyhoca/wxgui/profilemanager.py:89 +#: ../pyhoca/wxgui/profilemanager.py:90 msgid "Single Application" msgstr "Einzelne Anwendung" -#: ../pyhoca/wxgui/profilemanager.py:90 +#: ../pyhoca/wxgui/profilemanager.py:91 msgid "XDMCP Query" msgstr "XDMCP-Serveranfrage (Query)" -#: ../pyhoca/wxgui/profilemanager.py:91 -msgid "Windows Terminal Server (RDP-proxy)" -msgstr "Windows Terminalserver (RDP-proxy)" +#: ../pyhoca/wxgui/profilemanager.py:92 +msgid "Windows Terminal Server (X2Go-proxied RDP)" +msgstr "Windows Terminalserver (RDP via X2Go-Proxy)" -#. 'DirectRDP': 'Windows Terminal Server (RDP-direct)', -#: ../pyhoca/wxgui/profilemanager.py:93 ../pyhoca/wxgui/profilemanager.py:207 +#: ../pyhoca/wxgui/profilemanager.py:94 ../pyhoca/wxgui/profilemanager.py:227 msgid "Custom command" msgstr "Benutzerdef. Kommando" -#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:398 +#: ../pyhoca/wxgui/profilemanager.py:99 ../pyhoca/wxgui/menus_taskbar.py:398 msgid "Internet Browser" msgstr "Internetbrowser" -#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:399 +#: ../pyhoca/wxgui/profilemanager.py:100 ../pyhoca/wxgui/menus_taskbar.py:399 msgid "Email Client" msgstr "E-Mail Programm" -#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:400 +#: ../pyhoca/wxgui/profilemanager.py:101 ../pyhoca/wxgui/menus_taskbar.py:400 msgid "Office" msgstr "Büroprogramm (Office)" -#: ../pyhoca/wxgui/profilemanager.py:99 ../pyhoca/wxgui/menus_taskbar.py:401 +#: ../pyhoca/wxgui/profilemanager.py:102 ../pyhoca/wxgui/menus_taskbar.py:401 msgid "Terminal" msgstr "Terminalkonsole" -#: ../pyhoca/wxgui/profilemanager.py:113 +#: ../pyhoca/wxgui/profilemanager.py:120 msgid "Open file with system's default application" msgstr "Mit Standardanwendung des Systems öffnen" -#: ../pyhoca/wxgui/profilemanager.py:114 +#: ../pyhoca/wxgui/profilemanager.py:121 msgid "Open application chooser dialog" msgstr "Auswahldialog öffnen, um Anwendung auszuwählen" -#: ../pyhoca/wxgui/profilemanager.py:115 +#: ../pyhoca/wxgui/profilemanager.py:122 msgid "Save incoming file as ..." msgstr "Eingehende Datei speichern unter ..." -#: ../pyhoca/wxgui/profilemanager.py:143 +#: ../pyhoca/wxgui/profilemanager.py:150 msgid "settings derived from " msgstr "Einstellungen übernommen von" #. boxes for all tabs -#: ../pyhoca/wxgui/profilemanager.py:160 +#: ../pyhoca/wxgui/profilemanager.py:170 msgid "Session Title" msgstr "Sitzungstitel" -#: ../pyhoca/wxgui/profilemanager.py:161 +#: ../pyhoca/wxgui/profilemanager.py:171 msgid "Session Window" msgstr "Sitzungsfenster" -#: ../pyhoca/wxgui/profilemanager.py:162 +#: ../pyhoca/wxgui/profilemanager.py:172 msgid "Session Startup" msgstr "Sitzungsstart" -#: ../pyhoca/wxgui/profilemanager.py:163 +#: ../pyhoca/wxgui/profilemanager.py:173 msgid "Server" msgstr "Server" -#: ../pyhoca/wxgui/profilemanager.py:164 +#: ../pyhoca/wxgui/profilemanager.py:174 +msgid "Proxy" +msgstr "Proxy" + +#: ../pyhoca/wxgui/profilemanager.py:175 msgid "Connection Link Speed" msgstr "Verbindungsgeschwindigkeit" -#: ../pyhoca/wxgui/profilemanager.py:165 +#: ../pyhoca/wxgui/profilemanager.py:176 msgid "Compression" msgstr "Komprimierung" -#: ../pyhoca/wxgui/profilemanager.py:166 +#: ../pyhoca/wxgui/profilemanager.py:177 msgid "Display" msgstr "Anzeige" -#: ../pyhoca/wxgui/profilemanager.py:167 +#: ../pyhoca/wxgui/profilemanager.py:178 msgid "Keyboard" msgstr "Tastatur" -#: ../pyhoca/wxgui/profilemanager.py:168 +#: ../pyhoca/wxgui/profilemanager.py:179 msgid "Sound" msgstr "Audio" -#: ../pyhoca/wxgui/profilemanager.py:169 +#: ../pyhoca/wxgui/profilemanager.py:180 msgid "Printing" msgstr "Drucken" -#: ../pyhoca/wxgui/profilemanager.py:170 +#: ../pyhoca/wxgui/profilemanager.py:181 msgid "Folder Exports" msgstr "Ordnerfreigabe" -#: ../pyhoca/wxgui/profilemanager.py:171 +#: ../pyhoca/wxgui/profilemanager.py:182 msgid "File Import" msgstr "Dateiimport" #. ## #. ## widgets for the PROFILE tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:176 +#: ../pyhoca/wxgui/profilemanager.py:187 msgid "Name" msgstr "Name" -#: ../pyhoca/wxgui/profilemanager.py:183 +#: ../pyhoca/wxgui/profilemanager.py:194 msgid "Set session window title" msgstr "Sitzungsfenstertitel setzen" -#: ../pyhoca/wxgui/profilemanager.py:184 +#: ../pyhoca/wxgui/profilemanager.py:195 msgid "Use a default session window title" msgstr "Standardtitel für Sitzungsfenster" -#: ../pyhoca/wxgui/profilemanager.py:185 +#: ../pyhoca/wxgui/profilemanager.py:196 msgid "Custom session window title" msgstr "Sitzungstitel anpassen" -#: ../pyhoca/wxgui/profilemanager.py:195 +#: ../pyhoca/wxgui/profilemanager.py:215 msgid "Window Icon" msgstr "Fenstersymbol" #. ## #. ## widgets for the SESSION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:201 +#: ../pyhoca/wxgui/profilemanager.py:221 msgid "Start session automatically after login" msgstr "Sitzung nach Anmeldung automatisch starten" -#: ../pyhoca/wxgui/profilemanager.py:202 +#: ../pyhoca/wxgui/profilemanager.py:222 #, python-format msgid "Login automatically after %s has started" msgstr "Automatisch anmelden nach %s Programmstart" -#: ../pyhoca/wxgui/profilemanager.py:203 +#: ../pyhoca/wxgui/profilemanager.py:223 msgid "Type" msgstr "Typ" -#: ../pyhoca/wxgui/profilemanager.py:205 +#: ../pyhoca/wxgui/profilemanager.py:225 msgid "Application" msgstr "Anwendung" -#: ../pyhoca/wxgui/profilemanager.py:209 +#: ../pyhoca/wxgui/profilemanager.py:229 msgid "XDMCP server" msgstr "XDMCP Server" -#: ../pyhoca/wxgui/profilemanager.py:211 +#: ../pyhoca/wxgui/profilemanager.py:231 msgid "RDP server" msgstr "RDP Server" -#: ../pyhoca/wxgui/profilemanager.py:213 +#: ../pyhoca/wxgui/profilemanager.py:233 msgid "RDP options" msgstr "RDP Optionen" -#: ../pyhoca/wxgui/profilemanager.py:215 +#: ../pyhoca/wxgui/profilemanager.py:235 msgid "Integrate remote application(s) into local desktop (rootless mode)" msgstr "" "Serverseitige Anwendung(en) in lokalen Desktop integrieren (sog. rootless " "Modus)" -#: ../pyhoca/wxgui/profilemanager.py:216 +#: ../pyhoca/wxgui/profilemanager.py:236 msgid "Menu of published applications" msgstr "Menü mit Server-publizierten Anwendungen" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:223 ../pyhoca/wxgui/profilemanager.py:233 +#: ../pyhoca/wxgui/profilemanager.py:243 ../pyhoca/wxgui/profilemanager.py:253 msgid "User" msgstr "Benutzer" -#: ../pyhoca/wxgui/profilemanager.py:225 +#: ../pyhoca/wxgui/profilemanager.py:245 ../pyhoca/wxgui/profilemanager.py:260 msgid "Host" msgstr "Hostname" -#: ../pyhoca/wxgui/profilemanager.py:227 +#: ../pyhoca/wxgui/profilemanager.py:247 ../pyhoca/wxgui/profilemanager.py:262 msgid "Port" msgstr "Port" -#: ../pyhoca/wxgui/profilemanager.py:229 -msgid "RSA/DSA private key" -msgstr "Privater RSA/DSA Schlüssel" +#: ../pyhoca/wxgui/profilemanager.py:249 +msgid "Key" +msgstr "Schlüssel" -#: ../pyhoca/wxgui/profilemanager.py:232 +#: ../pyhoca/wxgui/profilemanager.py:252 msgid "Server behind SSH proxy" msgstr "Server hinter SSH-Proxy" -#: ../pyhoca/wxgui/profilemanager.py:235 +#: ../pyhoca/wxgui/profilemanager.py:255 +msgid "Use same username for X2Go and proxy host" +msgstr "Verwende gleichen Anmeldenamen für X2Go Server und Proxy" + +#: ../pyhoca/wxgui/profilemanager.py:256 +msgid "Use same authentication for X2Go and proxy host" +msgstr "Verwende die gleichen Anmeldeinformation für X2Go Server und Proxy" + +#: ../pyhoca/wxgui/profilemanager.py:257 msgid "Key file" msgstr "Schlüssel" -#: ../pyhoca/wxgui/profilemanager.py:238 -msgid "Host[:Port]" -msgstr "Hostname[:Port]" - -#: ../pyhoca/wxgui/profilemanager.py:240 +#: ../pyhoca/wxgui/profilemanager.py:264 msgid "SSH Proxy Tunnel" msgstr "SSH-Proxytunnel" -#: ../pyhoca/wxgui/profilemanager.py:248 +#: ../pyhoca/wxgui/profilemanager.py:272 msgid "Modem" msgstr "Modem" -#: ../pyhoca/wxgui/profilemanager.py:249 +#: ../pyhoca/wxgui/profilemanager.py:273 msgid "ISDN" msgstr "ISDN" -#: ../pyhoca/wxgui/profilemanager.py:250 +#: ../pyhoca/wxgui/profilemanager.py:274 msgid "ADSL" msgstr "ADSL" -#: ../pyhoca/wxgui/profilemanager.py:251 +#: ../pyhoca/wxgui/profilemanager.py:275 msgid "WAN" msgstr "WAN" -#: ../pyhoca/wxgui/profilemanager.py:252 +#: ../pyhoca/wxgui/profilemanager.py:276 msgid "LAN" msgstr "LAN" -#: ../pyhoca/wxgui/profilemanager.py:254 +#: ../pyhoca/wxgui/profilemanager.py:278 msgid "Method" msgstr "Methode" -#: ../pyhoca/wxgui/profilemanager.py:256 +#: ../pyhoca/wxgui/profilemanager.py:280 msgid "Image quality" msgstr "Bildqualität" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:262 +#: ../pyhoca/wxgui/profilemanager.py:286 msgid "Fullscreen" msgstr "Vollbild" -#: ../pyhoca/wxgui/profilemanager.py:263 +#: ../pyhoca/wxgui/profilemanager.py:287 msgid "Custom Size" msgstr "Benutzerdefinierte Größe" -#: ../pyhoca/wxgui/profilemanager.py:268 +#: ../pyhoca/wxgui/profilemanager.py:292 msgid "Set display DPI" msgstr "DPI-Wert für Anzeige setzen" -#: ../pyhoca/wxgui/profilemanager.py:270 +#: ../pyhoca/wxgui/profilemanager.py:294 msgid "Do not set (use server-side tools to configure the keyboard)" msgstr "" "Keine Einstellungen (zum Konfigurieren der Tastatur müssen Server seitige " "Tools verwendet werden)" -#: ../pyhoca/wxgui/profilemanager.py:271 +#: ../pyhoca/wxgui/profilemanager.py:295 msgid "" "Automatically detect and use client-side keyboard configuration inside the " "session" @@ -458,214 +465,214 @@ msgstr "" "Tastaturkonfiguration dieses Computers automatisch erkennen und in der " "Sitzung verwenden" -#: ../pyhoca/wxgui/profilemanager.py:272 +#: ../pyhoca/wxgui/profilemanager.py:296 msgid "Use custom keyboard settings as provided below" msgstr "Tastatureinstellungen der Sitzung wie folgt anpassen" -#: ../pyhoca/wxgui/profilemanager.py:273 +#: ../pyhoca/wxgui/profilemanager.py:297 msgid "Keyboard model" msgstr "Tastaturmodell" -#: ../pyhoca/wxgui/profilemanager.py:275 +#: ../pyhoca/wxgui/profilemanager.py:299 msgid "Layout" msgstr "Layout" -#: ../pyhoca/wxgui/profilemanager.py:277 +#: ../pyhoca/wxgui/profilemanager.py:301 msgid "Layout variant" msgstr "Layoutvariante" -#: ../pyhoca/wxgui/profilemanager.py:279 +#: ../pyhoca/wxgui/profilemanager.py:303 msgid "Enable sound support" msgstr "Audiounterstützung aktivieren" -#: ../pyhoca/wxgui/profilemanager.py:280 +#: ../pyhoca/wxgui/profilemanager.py:304 msgid "Pulse Audio" msgstr "Pulse Audio" #. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated. #. However, config files can contain an Arts configuration, so we will honour this -#: ../pyhoca/wxgui/profilemanager.py:284 +#: ../pyhoca/wxgui/profilemanager.py:308 msgid "Arts (not supported)" msgstr "Arts (nicht unterstützt)" -#: ../pyhoca/wxgui/profilemanager.py:287 +#: ../pyhoca/wxgui/profilemanager.py:311 msgid "esd" msgstr "esd" -#: ../pyhoca/wxgui/profilemanager.py:288 +#: ../pyhoca/wxgui/profilemanager.py:312 msgid "Use default sound port" msgstr "Standard Audio-Port verwenden" -#: ../pyhoca/wxgui/profilemanager.py:289 +#: ../pyhoca/wxgui/profilemanager.py:313 msgid "Custom sound port" msgstr "Benutzerdefinierter Audio-Port" -#: ../pyhoca/wxgui/profilemanager.py:291 +#: ../pyhoca/wxgui/profilemanager.py:315 msgid "Client Side printing" msgstr "Unterstützung für lokale Druckeranbindung" -#: ../pyhoca/wxgui/profilemanager.py:293 +#: ../pyhoca/wxgui/profilemanager.py:317 msgid "Use local folder sharing" msgstr "Lokale Ordnerfreigabe verwenden" -#: ../pyhoca/wxgui/profilemanager.py:294 +#: ../pyhoca/wxgui/profilemanager.py:318 msgid "Path" msgstr "Pfad" -#: ../pyhoca/wxgui/profilemanager.py:297 ../pyhoca/wxgui/profilemanager.py:316 +#: ../pyhoca/wxgui/profilemanager.py:321 ../pyhoca/wxgui/profilemanager.py:340 msgid "Add" msgstr "Hinzufügen" -#: ../pyhoca/wxgui/profilemanager.py:299 +#: ../pyhoca/wxgui/profilemanager.py:323 msgid "Local Path" msgstr "Lokaler Pfad" -#: ../pyhoca/wxgui/profilemanager.py:300 +#: ../pyhoca/wxgui/profilemanager.py:324 msgid "Connect Method" msgstr "Verbindungsart" -#: ../pyhoca/wxgui/profilemanager.py:301 +#: ../pyhoca/wxgui/profilemanager.py:325 msgid "Delete" msgstr "Entfernen" -#: ../pyhoca/wxgui/profilemanager.py:303 +#: ../pyhoca/wxgui/profilemanager.py:327 msgid "Convert between client and server encodings" msgstr "Zeichenkodierung zwischen Server und Client übersetzen" -#: ../pyhoca/wxgui/profilemanager.py:304 +#: ../pyhoca/wxgui/profilemanager.py:328 msgid "Client encoding" msgstr "Zeichenkodierung Client" -#: ../pyhoca/wxgui/profilemanager.py:306 +#: ../pyhoca/wxgui/profilemanager.py:330 msgid "Server encoding" msgstr "Server" -#: ../pyhoca/wxgui/profilemanager.py:309 +#: ../pyhoca/wxgui/profilemanager.py:333 msgid "Use file MIME box for local file import" msgstr "MIME-Box für lokalen Dateiimport verwenden" -#: ../pyhoca/wxgui/profilemanager.py:310 +#: ../pyhoca/wxgui/profilemanager.py:334 msgid "Extensions" msgstr "Erweiterungen" -#: ../pyhoca/wxgui/profilemanager.py:312 +#: ../pyhoca/wxgui/profilemanager.py:336 msgid "Action" msgstr "Aktion" -#: ../pyhoca/wxgui/profilemanager.py:317 +#: ../pyhoca/wxgui/profilemanager.py:341 msgid "Defaults" msgstr "Standardwerte" -#: ../pyhoca/wxgui/profilemanager.py:319 +#: ../pyhoca/wxgui/profilemanager.py:343 msgid "Save" msgstr "Speichern" -#: ../pyhoca/wxgui/profilemanager.py:320 +#: ../pyhoca/wxgui/profilemanager.py:344 msgid "Reset" msgstr "Zurücksetzen" -#: ../pyhoca/wxgui/profilemanager.py:365 -#: ../pyhoca/wxgui/profilemanager.py:1078 -#: ../pyhoca/wxgui/profilemanager.py:1832 +#: ../pyhoca/wxgui/profilemanager.py:394 +#: ../pyhoca/wxgui/profilemanager.py:1089 +#: ../pyhoca/wxgui/profilemanager.py:1983 msgid "automatically" msgstr "automatisch" -#: ../pyhoca/wxgui/profilemanager.py:367 -#: ../pyhoca/wxgui/profilemanager.py:1080 +#: ../pyhoca/wxgui/profilemanager.py:396 +#: ../pyhoca/wxgui/profilemanager.py:1091 msgid "manually" msgstr "manuell" -#: ../pyhoca/wxgui/profilemanager.py:376 +#: ../pyhoca/wxgui/profilemanager.py:405 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "PyHoca-GUI Profilmanager - neues Sitzungsprofil" -#: ../pyhoca/wxgui/profilemanager.py:378 +#: ../pyhoca/wxgui/profilemanager.py:407 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "PyHoca-GUI Profilmanager - %s (verbunden)" -#: ../pyhoca/wxgui/profilemanager.py:380 +#: ../pyhoca/wxgui/profilemanager.py:409 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "PyHoca-GUI Profilmanager - %s" -#: ../pyhoca/wxgui/profilemanager.py:751 +#: ../pyhoca/wxgui/profilemanager.py:769 msgid "Profile" msgstr "Profil" -#: ../pyhoca/wxgui/profilemanager.py:752 +#: ../pyhoca/wxgui/profilemanager.py:770 msgid "Session" msgstr "Sitzung" -#: ../pyhoca/wxgui/profilemanager.py:753 +#: ../pyhoca/wxgui/profilemanager.py:771 msgid "Connection" msgstr "Verbindung" -#: ../pyhoca/wxgui/profilemanager.py:754 +#: ../pyhoca/wxgui/profilemanager.py:772 msgid "Settings" msgstr "Einstellungen" -#: ../pyhoca/wxgui/profilemanager.py:755 +#: ../pyhoca/wxgui/profilemanager.py:773 msgid "Sharing" msgstr "Ordnerfreigabe" -#: ../pyhoca/wxgui/profilemanager.py:996 +#: ../pyhoca/wxgui/profilemanager.py:1007 msgid "<xkbtype>" msgstr "pc105/de" -#: ../pyhoca/wxgui/profilemanager.py:997 +#: ../pyhoca/wxgui/profilemanager.py:1008 msgid "<xkblayout>" msgstr "de" -#: ../pyhoca/wxgui/profilemanager.py:998 +#: ../pyhoca/wxgui/profilemanager.py:1009 msgid "<xkbvariant>" msgstr "nodeadkeys" -#: ../pyhoca/wxgui/profilemanager.py:1284 +#: ../pyhoca/wxgui/profilemanager.py:1306 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "Icon Dateien (*.png)|*.png|Alle Dateien (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1287 +#: ../pyhoca/wxgui/profilemanager.py:1309 msgid "Choose an icon for this session profile" msgstr "Sitzungs-Icon für dieses Sitzungsprofil auswählen" -#: ../pyhoca/wxgui/profilemanager.py:1509 +#: ../pyhoca/wxgui/profilemanager.py:1600 msgid "All files (*.*)|*" msgstr "Alle Dateien (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1511 -#: ../pyhoca/wxgui/profilemanager.py:1533 +#: ../pyhoca/wxgui/profilemanager.py:1602 +#: ../pyhoca/wxgui/profilemanager.py:1626 msgid "Choose a public SSH key" msgstr "Öffentlichen SSH-Schlüssel auswählen" -#: ../pyhoca/wxgui/profilemanager.py:1784 +#: ../pyhoca/wxgui/profilemanager.py:1935 msgid "Choose a folder to share within a session" msgstr "Ordner zur Freigabe für Sitzungen auswählen" -#: ../pyhoca/wxgui/profilemanager.py:1912 -#: ../pyhoca/wxgui/profilemanager.py:1915 -#: ../pyhoca/wxgui/profilemanager.py:1918 -#: ../pyhoca/wxgui/profilemanager.py:1923 -#: ../pyhoca/wxgui/profilemanager.py:1933 ../pyhoca/wxgui/menus_taskbar.py:118 +#: ../pyhoca/wxgui/profilemanager.py:2063 +#: ../pyhoca/wxgui/profilemanager.py:2066 +#: ../pyhoca/wxgui/profilemanager.py:2069 +#: ../pyhoca/wxgui/profilemanager.py:2074 +#: ../pyhoca/wxgui/profilemanager.py:2084 ../pyhoca/wxgui/menus_taskbar.py:118 msgid "Profile Manager" msgstr "Profilmanager" -#: ../pyhoca/wxgui/profilemanager.py:1912 +#: ../pyhoca/wxgui/profilemanager.py:2063 msgid "Profile name is missing, profile unusable!!!" msgstr "Der Profilname fehlt, Profil so nicht verwendbar!!!" -#: ../pyhoca/wxgui/profilemanager.py:1915 -#: ../pyhoca/wxgui/profilemanager.py:1918 +#: ../pyhoca/wxgui/profilemanager.py:2066 +#: ../pyhoca/wxgui/profilemanager.py:2069 #, python-format msgid "Profile name %s already exists!!!" msgstr "Ein Sitzungsprofil mit dem Namen %s existiert bereits!!!" -#: ../pyhoca/wxgui/profilemanager.py:1923 +#: ../pyhoca/wxgui/profilemanager.py:2074 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "" "Die SSH Proxy Konfiguration ist unvollständig. Bitte nochmal versuchen." -#: ../pyhoca/wxgui/profilemanager.py:1933 +#: ../pyhoca/wxgui/profilemanager.py:2084 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -676,21 +683,21 @@ msgstr "" "einen lokalen SSH Proxy Port daran zu binden. Bitte die SSH Proxy " "Einstellungen entsprechend ändern." -#: ../pyhoca/wxgui/profilemanager.py:1960 +#: ../pyhoca/wxgui/profilemanager.py:2111 #, python-format msgid "%s - profile added" msgstr "%s - Profil hinzugefügt" -#: ../pyhoca/wxgui/profilemanager.py:1961 +#: ../pyhoca/wxgui/profilemanager.py:2112 msgid "A new session profile has been added." msgstr "Ein neues Sitzungsprofil wurde hinzugefügt." -#: ../pyhoca/wxgui/profilemanager.py:1965 +#: ../pyhoca/wxgui/profilemanager.py:2116 #, python-format msgid "%s - modified" msgstr "%s - modifiziert" -#: ../pyhoca/wxgui/profilemanager.py:1966 +#: ../pyhoca/wxgui/profilemanager.py:2117 msgid "Changes to profile have been saved." msgstr "Änderungen am Profil wurden übernommen." @@ -948,88 +955,110 @@ msgstr "%s - Serverwarnung" msgid "The X2Go Server does not publish an application menu." msgstr "Der X2Go-Server publiziert kein Anwendungsmenü." -#: ../pyhoca/wxgui/frontend.py:610 +#: ../pyhoca/wxgui/frontend.py:611 msgid "Public SSH key authentication has been successful." msgstr "Authentifizierung mit öffentlichem SSH Schlüssel war erfolgreich." -#: ../pyhoca/wxgui/frontend.py:644 +#: ../pyhoca/wxgui/frontend.py:648 msgid "" "The SSH proxy's host key is invalid or has not been accepted by the user" msgstr "" "Der Host-Schlüssel des SSH Proxy-Servers ist ungültig oder wurde vom " "Benutzer nicht akzeptiert" -#: ../pyhoca/wxgui/frontend.py:665 +#: ../pyhoca/wxgui/frontend.py:669 #, python-format msgid "%s - EOF error" msgstr "%s - EOF-Fehler" -#: ../pyhoca/wxgui/frontend.py:665 +#: ../pyhoca/wxgui/frontend.py:669 msgid "Authentication protocol communication incomplete! Try again..." msgstr "" "Kommunikation während Authentifizierungsprotokoll unvollständig! Nochmal " "versuchen..." -#: ../pyhoca/wxgui/frontend.py:672 +#: ../pyhoca/wxgui/frontend.py:676 #, python-format msgid "%s - auth key error" msgstr "%s - ungültiger Benutzerschlüssel" -#: ../pyhoca/wxgui/frontend.py:693 +#: ../pyhoca/wxgui/frontend.py:697 msgid "An unknown error occurred during authentication!" msgstr "Ein unbekannter Fehler ist während der Serveranmeldung aufgetreten!" +#: ../pyhoca/wxgui/frontend.py:725 +#, python-format +msgid "%s: DirectRDP not supported yet" +msgstr "%s: DirectRDP noch nicht unterstützt" + #: ../pyhoca/wxgui/frontend.py:726 +#, python-format +msgid "" +"We apologize for the inconvenience...\n" +"\n" +"Session profiles of type ,,DirectRDP'' are not\n" +"supported by %s (%s), yet!!\n" +"\n" +"DirectRDP support will be available in %s (>= 0.2.2.0)." +msgstr "" +"Entschuldigung...\n" +"\n" +"Sitzungsprofile vom Typ ,,DirectRDP'' werden momentan von\n" +"%s (%s) noch nicht unterstützt!!\n" +"\n" +"DirectRDP wird in %s (>= 0.2.2.0) verfügbar sein." + +#: ../pyhoca/wxgui/frontend.py:738 msgid "Unknown session profile, configure before using it..." msgstr "Unbekanntes Sitzungsprofil, vor Benutzung bitte einrichten..." -#: ../pyhoca/wxgui/frontend.py:784 ../pyhoca/wxgui/frontend.py:1302 +#: ../pyhoca/wxgui/frontend.py:796 ../pyhoca/wxgui/frontend.py:1314 #, python-format msgid "%s - session warning" msgstr "%s - Sitzungsfunktion eingeschränkt" -#: ../pyhoca/wxgui/frontend.py:784 +#: ../pyhoca/wxgui/frontend.py:796 #, python-format msgid "Execution of command ,,%s'' failed." msgstr "Das Ausführen des Befehls ,,%s'' ist fehlgeschlagen." -#: ../pyhoca/wxgui/frontend.py:926 +#: ../pyhoca/wxgui/frontend.py:938 msgid "Cleaning X2Go sessions..." msgstr "Beende X2Go Sitzungen..." -#: ../pyhoca/wxgui/frontend.py:961 +#: ../pyhoca/wxgui/frontend.py:973 #, python-format msgid "%s - disconnect" msgstr "%s - trennen" -#: ../pyhoca/wxgui/frontend.py:961 +#: ../pyhoca/wxgui/frontend.py:973 msgid "X2Go Profile is now disconnected." msgstr "X2Go Profil ist nun nicht mehr verbunden." -#: ../pyhoca/wxgui/frontend.py:977 +#: ../pyhoca/wxgui/frontend.py:989 msgid "New Session Profile" msgstr "Neues Sitzungsprofil" -#: ../pyhoca/wxgui/frontend.py:1029 +#: ../pyhoca/wxgui/frontend.py:1041 #, python-format msgid "Really Delete Session Profile ,,%s''?" msgstr "Das Sitzungsprofil ,,%s'' wirklich löschen?" -#: ../pyhoca/wxgui/frontend.py:1035 +#: ../pyhoca/wxgui/frontend.py:1047 #, python-format msgid "%s - profile deleted" msgstr "%s - Profil gelöscht" -#: ../pyhoca/wxgui/frontend.py:1035 +#: ../pyhoca/wxgui/frontend.py:1047 msgid "The session profile has been deleted." msgstr "Das Sitzungsprofil wurde gelöscht." -#: ../pyhoca/wxgui/frontend.py:1053 +#: ../pyhoca/wxgui/frontend.py:1065 #, python-format msgid "%s - share local folder with sessions of this profile" msgstr "%s - lokalen Ordner für dieses Sitzungsprofile freigeben" -#: ../pyhoca/wxgui/frontend.py:1194 +#: ../pyhoca/wxgui/frontend.py:1206 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -1042,17 +1071,17 @@ msgstr "" "\n" "Sind Sie sicher, dass sie fortfahren möchten? " -#: ../pyhoca/wxgui/frontend.py:1202 +#: ../pyhoca/wxgui/frontend.py:1214 #, python-format msgid "%s: Confirm Host Authorization" msgstr "%s: Echtheit des Servers bestätigen" -#: ../pyhoca/wxgui/frontend.py:1247 +#: ../pyhoca/wxgui/frontend.py:1259 #, python-format msgid "%s - channel error" msgstr "%s - Verbindungsfehler" -#: ../pyhoca/wxgui/frontend.py:1247 +#: ../pyhoca/wxgui/frontend.py:1259 #, python-format msgid "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " @@ -1061,22 +1090,22 @@ msgstr "" "Die Verbindung zum Server %s wurde unerwartet unterbrochen! Bitte versuchen " "Sie, sich neu am Server anzumelden..." -#: ../pyhoca/wxgui/frontend.py:1265 ../pyhoca/wxgui/frontend.py:1283 -#: ../pyhoca/wxgui/frontend.py:1285 ../pyhoca/wxgui/frontend.py:1321 +#: ../pyhoca/wxgui/frontend.py:1277 ../pyhoca/wxgui/frontend.py:1295 +#: ../pyhoca/wxgui/frontend.py:1297 ../pyhoca/wxgui/frontend.py:1333 #, python-format msgid "%s - session failure" msgstr "%s - Verbindung fehlgeschlagen" -#: ../pyhoca/wxgui/frontend.py:1265 +#: ../pyhoca/wxgui/frontend.py:1277 msgid "The session startup failed." msgstr "Der Start der Sitzung ist fehlgeschlagen." -#: ../pyhoca/wxgui/frontend.py:1283 +#: ../pyhoca/wxgui/frontend.py:1295 #, python-format msgid "The command ,,%s'' is not available on X2Go server." msgstr "Der Befehl ,,%s'' ist auf dem X2Go Server nicht verfügbar." -#: ../pyhoca/wxgui/frontend.py:1285 +#: ../pyhoca/wxgui/frontend.py:1297 #, python-format msgid "" "The command ,,%s'' is not available on X2Go server\n" @@ -1085,7 +1114,7 @@ msgstr "" "Der Befehl ,,%s'' ist auf dem X2Go Server nicht verfügbar\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1302 +#: ../pyhoca/wxgui/frontend.py:1314 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " @@ -1094,7 +1123,7 @@ msgstr "" "Eine Reverse TCP Port Weiterleitungsanfrage für Sitzung %s an Serverport %s " "wurde vom X2Go Server abgelehnt." -#: ../pyhoca/wxgui/frontend.py:1321 +#: ../pyhoca/wxgui/frontend.py:1333 #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " @@ -1103,37 +1132,37 @@ msgstr "" "SSH Forwarding Tunnel zu [%s]:%s wurde für Sitzung %s vom X2go/SSH Server " "verweigert. Die Sitzung konnte nicht gestartet werden." -#: ../pyhoca/wxgui/frontend.py:1340 +#: ../pyhoca/wxgui/frontend.py:1352 #, python-format msgid "%s - audio warning" msgstr "%s - Warnung Audiosystem" -#: ../pyhoca/wxgui/frontend.py:1340 +#: ../pyhoca/wxgui/frontend.py:1352 msgid "" "The X2Go PulseAudio system is not available within Remote Desktop sessions." msgstr "" "Das X2Go PulseAudio System ist innerhalb von Remote Desktop Sitzungen nicht " "verfügbar." -#: ../pyhoca/wxgui/frontend.py:1347 ../pyhoca/wxgui/frontend.py:1354 +#: ../pyhoca/wxgui/frontend.py:1359 ../pyhoca/wxgui/frontend.py:1366 #, python-format msgid "%s - audio error" msgstr "%s - Audiofehler" -#: ../pyhoca/wxgui/frontend.py:1347 +#: ../pyhoca/wxgui/frontend.py:1359 msgid "The X2Go PulseAudio system could not be started." msgstr "Das X2Go PulseAudio System konnte nicht gestartet werden." -#: ../pyhoca/wxgui/frontend.py:1354 +#: ../pyhoca/wxgui/frontend.py:1366 msgid "The X2Go PulseAudio system has died unexpectedly." msgstr "Das X2Go PulseAudio System ist soeben abgestürzt." -#: ../pyhoca/wxgui/frontend.py:1366 +#: ../pyhoca/wxgui/frontend.py:1378 #, python-format msgid "%s - audio problem" msgstr "%s - Audioproblem" -#: ../pyhoca/wxgui/frontend.py:1366 +#: ../pyhoca/wxgui/frontend.py:1378 #, python-format msgid "" "The audio connection could not be set up for this session.\n" @@ -1142,12 +1171,12 @@ msgstr "" "Die Audio-Verbindung für diese Sitzung konnte nicht aufgebaut werden.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1378 +#: ../pyhoca/wxgui/frontend.py:1390 #, python-format msgid "%s - client-side printing not available" msgstr "%s - Client-seitiges Drucken nicht verfügbar" -#: ../pyhoca/wxgui/frontend.py:1378 +#: ../pyhoca/wxgui/frontend.py:1390 #, python-format msgid "" "The server denies client-side printing from within this session.\n" @@ -1157,12 +1186,12 @@ msgstr "" "Server verweigert die Verbindung.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1390 +#: ../pyhoca/wxgui/frontend.py:1402 #, python-format msgid "%s - MIME box not available" msgstr "%s - MIME box nicht verfügbar" -#: ../pyhoca/wxgui/frontend.py:1390 +#: ../pyhoca/wxgui/frontend.py:1402 #, python-format msgid "" "The server does not support the X2Go MIME box.\n" @@ -1171,12 +1200,12 @@ msgstr "" "Der Server unterstützt die X2Go MIME box nicht.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1402 +#: ../pyhoca/wxgui/frontend.py:1414 #, python-format msgid "%s - client-side folders not sharable" msgstr "%s - keine Freigabe Client-seitiger Ordner" -#: ../pyhoca/wxgui/frontend.py:1402 +#: ../pyhoca/wxgui/frontend.py:1414 #, python-format msgid "" "The server denies client-side folder sharing with this session.\n" @@ -1186,12 +1215,12 @@ msgstr "" "Server verweigert die Verbindung.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1414 +#: ../pyhoca/wxgui/frontend.py:1426 #, python-format msgid "%s - client resources not sharable" msgstr "%s - keine Client-seitigen Ordner- und Druckerfreigaben möglich" -#: ../pyhoca/wxgui/frontend.py:1414 +#: ../pyhoca/wxgui/frontend.py:1426 #, python-format msgid "" "Client-side folders and printers cannot be shared with this session.\n" @@ -1201,12 +1230,12 @@ msgstr "" "werden.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1433 ../pyhoca/wxgui/frontend.py:1435 +#: ../pyhoca/wxgui/frontend.py:1445 ../pyhoca/wxgui/frontend.py:1447 #, python-format msgid "%s - print error" msgstr "%s - Druckfehler" -#: ../pyhoca/wxgui/frontend.py:1433 +#: ../pyhoca/wxgui/frontend.py:1445 #, python-format msgid "" "%s\n" @@ -1217,7 +1246,7 @@ msgstr "" "...verursacht an Drucker durch Sitzung\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1435 +#: ../pyhoca/wxgui/frontend.py:1447 #, python-format msgid "" "%s\n" @@ -1228,12 +1257,12 @@ msgstr "" "...verursacht von Sitzung\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1450 ../pyhoca/wxgui/frontend.py:1465 +#: ../pyhoca/wxgui/frontend.py:1462 ../pyhoca/wxgui/frontend.py:1477 #, python-format msgid "%s - start" msgstr "%s - starten" -#: ../pyhoca/wxgui/frontend.py:1450 +#: ../pyhoca/wxgui/frontend.py:1462 #, python-format msgid "" "New X2Go session starting up...\n" @@ -1242,7 +1271,7 @@ msgstr "" "Neue X2Go Sitzung wird gestartet...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1465 +#: ../pyhoca/wxgui/frontend.py:1477 #, python-format msgid "" "Another client started X2Go session\n" @@ -1251,12 +1280,12 @@ msgstr "" "Ein anderes X2Go Programm hat diese Sitzung gestartet\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1480 ../pyhoca/wxgui/frontend.py:1495 +#: ../pyhoca/wxgui/frontend.py:1492 ../pyhoca/wxgui/frontend.py:1507 #, python-format msgid "%s - resume" msgstr "%s - fortsetzen" -#: ../pyhoca/wxgui/frontend.py:1480 +#: ../pyhoca/wxgui/frontend.py:1492 #, python-format msgid "" "Resuming X2Go session...\n" @@ -1265,7 +1294,7 @@ msgstr "" "X2Go Sitzung wird fortgesetzt...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1495 +#: ../pyhoca/wxgui/frontend.py:1507 #, python-format msgid "" "Another client resumed X2Go session\n" @@ -1274,12 +1303,12 @@ msgstr "" "Eine andere X2Go Anwendung hat die Sitzung fortgesetzt\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1510 +#: ../pyhoca/wxgui/frontend.py:1522 #, python-format msgid "%s - running" msgstr "%s - aktiv" -#: ../pyhoca/wxgui/frontend.py:1510 +#: ../pyhoca/wxgui/frontend.py:1522 #, python-format msgid "" "Found already running session\n" @@ -1288,12 +1317,12 @@ msgstr "" "Bereits aktive Sitzung gefunden\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1530 +#: ../pyhoca/wxgui/frontend.py:1542 #, python-format msgid "%s - suspend" msgstr "%s - anhalten" -#: ../pyhoca/wxgui/frontend.py:1530 +#: ../pyhoca/wxgui/frontend.py:1542 #, python-format msgid "" "X2Go Session has been suspended\n" @@ -1302,12 +1331,12 @@ msgstr "" "X2Go Sitzung wurde angehalten\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1557 +#: ../pyhoca/wxgui/frontend.py:1569 #, python-format msgid "%s - terminate" msgstr "%s - beenden" -#: ../pyhoca/wxgui/frontend.py:1557 +#: ../pyhoca/wxgui/frontend.py:1569 #, python-format msgid "" "X2Go Session has terminated\n" @@ -1452,6 +1481,12 @@ msgstr "Sitzungsfenster umbenennen in" msgid "OK" msgstr "Ok" +#~ msgid "RSA/DSA private key" +#~ msgstr "Privater RSA/DSA Schlüssel" + +#~ msgid "Host[:Port]" +#~ msgstr "Hostname[:Port]" + #~ msgid "us" #~ msgstr "de" diff --git a/po/en.po b/po/en.po index 581ab45..6b7270b 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-06-10 21:18+0200\n" -"PO-Revision-Date: 2012-05-31 21:44+0100\n" +"POT-Creation-Date: 2012-09-28 10:00+0200\n" +"PO-Revision-Date: 2012-09-28 09:53+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: en <mike.gabriel(a)das-netzwerkteam.de>\n" "Language: \n" @@ -49,95 +49,95 @@ msgstr "Session login" msgid "SSH proxy server login" msgstr "SSH proxy server login" -#: ../pyhoca/wxgui/logon.py:133 ../pyhoca/wxgui/profilemanager.py:322 +#: ../pyhoca/wxgui/logon.py:133 ../pyhoca/wxgui/profilemanager.py:346 #: ../pyhoca/wxgui/messages.py:132 ../pyhoca/wxgui/printingprefs.py:147 #: ../pyhoca/wxgui/sessiontitle.py:85 msgid "Cancel" msgstr "Cancel" -#: ../pyhoca/wxgui/logon.py:292 ../pyhoca/wxgui/logon.py:334 -#: ../pyhoca/wxgui/frontend.py:603 +#: ../pyhoca/wxgui/logon.py:301 ../pyhoca/wxgui/logon.py:343 +#: ../pyhoca/wxgui/frontend.py:604 #, python-format msgid "%s - connect failure" msgstr "%s - connect failure" -#: ../pyhoca/wxgui/logon.py:293 ../pyhoca/wxgui/frontend.py:603 +#: ../pyhoca/wxgui/logon.py:302 ../pyhoca/wxgui/frontend.py:604 msgid "User is not allowed to start X2Go sessions!" msgstr "User is not allowed to start X2Go sessions!" -#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:610 +#: ../pyhoca/wxgui/logon.py:307 ../pyhoca/wxgui/frontend.py:611 #, python-format msgid "%s - connect" msgstr "%s - connect" -#: ../pyhoca/wxgui/logon.py:299 +#: ../pyhoca/wxgui/logon.py:308 msgid "Authentication has been successful." msgstr "Authentication has been successful." -#: ../pyhoca/wxgui/logon.py:330 +#: ../pyhoca/wxgui/logon.py:339 msgid "SSH tunnel started" msgstr "SSH tunnel started" -#: ../pyhoca/wxgui/logon.py:335 +#: ../pyhoca/wxgui/logon.py:344 msgid "Authentication failed!" msgstr "Authentication failed!" -#: ../pyhoca/wxgui/logon.py:342 +#: ../pyhoca/wxgui/logon.py:351 #, python-format msgid "%s - SSH proxy" msgstr "%s - SSH proxy" -#: ../pyhoca/wxgui/logon.py:343 +#: ../pyhoca/wxgui/logon.py:352 msgid "Authentication to the SSH proxy server failed!" msgstr "Authentication to the SSH proxy server failed!" -#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:658 +#: ../pyhoca/wxgui/logon.py:374 ../pyhoca/wxgui/frontend.py:662 #, python-format msgid "%s - socket error" msgstr "%s - socket error" -#: ../pyhoca/wxgui/logon.py:372 ../pyhoca/wxgui/frontend.py:637 -#: ../pyhoca/wxgui/frontend.py:644 +#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:641 +#: ../pyhoca/wxgui/frontend.py:648 #, python-format msgid "%s - host key error" msgstr "%s - host key error" -#: ../pyhoca/wxgui/logon.py:373 ../pyhoca/wxgui/frontend.py:637 +#: ../pyhoca/wxgui/logon.py:382 ../pyhoca/wxgui/frontend.py:641 msgid "" "The remote server's host key is invalid or has not been accepted by the user" msgstr "" "The remote server's host key is invalid or has not been accepted by the user" -#: ../pyhoca/wxgui/logon.py:380 ../pyhoca/wxgui/frontend.py:679 +#: ../pyhoca/wxgui/logon.py:389 ../pyhoca/wxgui/frontend.py:683 #, python-format msgid "%s - missing home directory" msgstr "%s - missing home directory" -#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:679 +#: ../pyhoca/wxgui/logon.py:390 ../pyhoca/wxgui/frontend.py:683 msgid "The remote user's home directory does not exist." msgstr "The remote user's home directory does not exist." -#: ../pyhoca/wxgui/logon.py:388 +#: ../pyhoca/wxgui/logon.py:397 #, python-format msgid "%s - key error" msgstr "%s - key error" -#: ../pyhoca/wxgui/logon.py:396 ../pyhoca/wxgui/frontend.py:686 +#: ../pyhoca/wxgui/logon.py:405 ../pyhoca/wxgui/frontend.py:690 #, python-format msgid "%s - auth error" msgstr "%s - auth error" -#: ../pyhoca/wxgui/logon.py:404 ../pyhoca/wxgui/frontend.py:630 +#: ../pyhoca/wxgui/logon.py:413 ../pyhoca/wxgui/frontend.py:634 #, python-format msgid "%s - SSH error" msgstr "%s - SSH error" -#: ../pyhoca/wxgui/logon.py:412 +#: ../pyhoca/wxgui/logon.py:421 #, python-format msgid "%s - unknown error" msgstr "%s - unknown error" -#: ../pyhoca/wxgui/logon.py:413 +#: ../pyhoca/wxgui/logon.py:422 msgid "An unknown error occured during authentication!" msgstr "An unknown error occured during authentication!" @@ -175,278 +175,285 @@ msgstr "" "PyHoca-GUI (Python X2goClient)\n" "Client for connecting you to a remote X2Go server" -#: ../pyhoca/wxgui/profilemanager.py:82 +#: ../pyhoca/wxgui/profilemanager.py:83 msgid "GNOME Desktop (GNOME)" msgstr "GNOME Desktop (GNOME)" -#: ../pyhoca/wxgui/profilemanager.py:83 +#: ../pyhoca/wxgui/profilemanager.py:84 msgid "K Desktop Environment (KDE)" msgstr "K Desktop Environment (KDE)" -#: ../pyhoca/wxgui/profilemanager.py:84 +#: ../pyhoca/wxgui/profilemanager.py:85 msgid "Lightweight X Desktop (LXDE)" msgstr "Lightweight X Desktop (LXDE)" -#: ../pyhoca/wxgui/profilemanager.py:85 +#: ../pyhoca/wxgui/profilemanager.py:86 msgid "Trinity X Desktop (KDE3-like)" msgstr "Trinity X Desktop (KDE3-like)" -#: ../pyhoca/wxgui/profilemanager.py:86 +#: ../pyhoca/wxgui/profilemanager.py:87 msgid "Unity X Desktop Shell (UNITY)" msgstr "Unity X Desktop Shell (UNITY)" -#: ../pyhoca/wxgui/profilemanager.py:87 +#: ../pyhoca/wxgui/profilemanager.py:88 msgid "XFCE4 Desktop (XFCE4)" msgstr "XFCE4 Desktop (XFCE4)" -#: ../pyhoca/wxgui/profilemanager.py:88 +#: ../pyhoca/wxgui/profilemanager.py:89 msgid "Published Applications" msgstr "Published Applications" -#: ../pyhoca/wxgui/profilemanager.py:89 +#: ../pyhoca/wxgui/profilemanager.py:90 msgid "Single Application" msgstr "Single Application" -#: ../pyhoca/wxgui/profilemanager.py:90 +#: ../pyhoca/wxgui/profilemanager.py:91 msgid "XDMCP Query" msgstr "XDMCP Query" -#: ../pyhoca/wxgui/profilemanager.py:91 -msgid "Windows Terminal Server (RDP-proxy)" -msgstr "Windows Terminal Server (RDP-proxy)" +#: ../pyhoca/wxgui/profilemanager.py:92 +msgid "Windows Terminal Server (X2Go-proxied RDP)" +msgstr "Windows Terminal Server (X2Go-proxied RDP)" -#. 'DirectRDP': 'Windows Terminal Server (RDP-direct)', -#: ../pyhoca/wxgui/profilemanager.py:93 ../pyhoca/wxgui/profilemanager.py:207 +#: ../pyhoca/wxgui/profilemanager.py:94 ../pyhoca/wxgui/profilemanager.py:227 msgid "Custom command" msgstr "Custom command" -#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:398 +#: ../pyhoca/wxgui/profilemanager.py:99 ../pyhoca/wxgui/menus_taskbar.py:398 msgid "Internet Browser" msgstr "Internet Browser" -#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:399 +#: ../pyhoca/wxgui/profilemanager.py:100 ../pyhoca/wxgui/menus_taskbar.py:399 msgid "Email Client" msgstr "Email Client" -#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:400 +#: ../pyhoca/wxgui/profilemanager.py:101 ../pyhoca/wxgui/menus_taskbar.py:400 msgid "Office" msgstr "Office" -#: ../pyhoca/wxgui/profilemanager.py:99 ../pyhoca/wxgui/menus_taskbar.py:401 +#: ../pyhoca/wxgui/profilemanager.py:102 ../pyhoca/wxgui/menus_taskbar.py:401 msgid "Terminal" msgstr "Terminal" -#: ../pyhoca/wxgui/profilemanager.py:113 +#: ../pyhoca/wxgui/profilemanager.py:120 msgid "Open file with system's default application" msgstr "Open file with system's default application" -#: ../pyhoca/wxgui/profilemanager.py:114 +#: ../pyhoca/wxgui/profilemanager.py:121 msgid "Open application chooser dialog" msgstr "Open application chooser dialog" -#: ../pyhoca/wxgui/profilemanager.py:115 +#: ../pyhoca/wxgui/profilemanager.py:122 msgid "Save incoming file as ..." msgstr "Save incoming file as ..." -#: ../pyhoca/wxgui/profilemanager.py:143 +#: ../pyhoca/wxgui/profilemanager.py:150 msgid "settings derived from " msgstr "settings derived from " #. boxes for all tabs -#: ../pyhoca/wxgui/profilemanager.py:160 +#: ../pyhoca/wxgui/profilemanager.py:170 msgid "Session Title" msgstr "Session Title" -#: ../pyhoca/wxgui/profilemanager.py:161 +#: ../pyhoca/wxgui/profilemanager.py:171 msgid "Session Window" msgstr "Session Window" -#: ../pyhoca/wxgui/profilemanager.py:162 +#: ../pyhoca/wxgui/profilemanager.py:172 msgid "Session Startup" msgstr "Session Startup" -#: ../pyhoca/wxgui/profilemanager.py:163 +#: ../pyhoca/wxgui/profilemanager.py:173 msgid "Server" msgstr "Server" -#: ../pyhoca/wxgui/profilemanager.py:164 +#: ../pyhoca/wxgui/profilemanager.py:174 +msgid "Proxy" +msgstr "Proxy" + +#: ../pyhoca/wxgui/profilemanager.py:175 msgid "Connection Link Speed" msgstr "Connection Link Speed" -#: ../pyhoca/wxgui/profilemanager.py:165 +#: ../pyhoca/wxgui/profilemanager.py:176 msgid "Compression" msgstr "Compression" -#: ../pyhoca/wxgui/profilemanager.py:166 +#: ../pyhoca/wxgui/profilemanager.py:177 msgid "Display" msgstr "Display" -#: ../pyhoca/wxgui/profilemanager.py:167 +#: ../pyhoca/wxgui/profilemanager.py:178 msgid "Keyboard" msgstr "Keyboard" -#: ../pyhoca/wxgui/profilemanager.py:168 +#: ../pyhoca/wxgui/profilemanager.py:179 msgid "Sound" msgstr "Sound" -#: ../pyhoca/wxgui/profilemanager.py:169 +#: ../pyhoca/wxgui/profilemanager.py:180 msgid "Printing" msgstr "Printing" -#: ../pyhoca/wxgui/profilemanager.py:170 +#: ../pyhoca/wxgui/profilemanager.py:181 msgid "Folder Exports" msgstr "Folder Exports" -#: ../pyhoca/wxgui/profilemanager.py:171 +#: ../pyhoca/wxgui/profilemanager.py:182 msgid "File Import" msgstr "File Import" #. ## #. ## widgets for the PROFILE tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:176 +#: ../pyhoca/wxgui/profilemanager.py:187 msgid "Name" msgstr "Name" -#: ../pyhoca/wxgui/profilemanager.py:183 +#: ../pyhoca/wxgui/profilemanager.py:194 msgid "Set session window title" msgstr "Set session window title" -#: ../pyhoca/wxgui/profilemanager.py:184 +#: ../pyhoca/wxgui/profilemanager.py:195 msgid "Use a default session window title" msgstr "Use a default session window title" -#: ../pyhoca/wxgui/profilemanager.py:185 +#: ../pyhoca/wxgui/profilemanager.py:196 msgid "Custom session window title" msgstr "Custom session window title" -#: ../pyhoca/wxgui/profilemanager.py:195 +#: ../pyhoca/wxgui/profilemanager.py:215 msgid "Window Icon" msgstr "Window Icon" #. ## #. ## widgets for the SESSION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:201 +#: ../pyhoca/wxgui/profilemanager.py:221 msgid "Start session automatically after login" msgstr "Start session automatically after login" -#: ../pyhoca/wxgui/profilemanager.py:202 +#: ../pyhoca/wxgui/profilemanager.py:222 #, python-format msgid "Login automatically after %s has started" msgstr "Login automatically after %s has started" -#: ../pyhoca/wxgui/profilemanager.py:203 +#: ../pyhoca/wxgui/profilemanager.py:223 msgid "Type" msgstr "Type" -#: ../pyhoca/wxgui/profilemanager.py:205 +#: ../pyhoca/wxgui/profilemanager.py:225 msgid "Application" msgstr "Application" -#: ../pyhoca/wxgui/profilemanager.py:209 +#: ../pyhoca/wxgui/profilemanager.py:229 msgid "XDMCP server" msgstr "XDMCP server" -#: ../pyhoca/wxgui/profilemanager.py:211 +#: ../pyhoca/wxgui/profilemanager.py:231 msgid "RDP server" msgstr "RDP server" -#: ../pyhoca/wxgui/profilemanager.py:213 +#: ../pyhoca/wxgui/profilemanager.py:233 msgid "RDP options" msgstr "RDP options" -#: ../pyhoca/wxgui/profilemanager.py:215 +#: ../pyhoca/wxgui/profilemanager.py:235 msgid "Integrate remote application(s) into local desktop (rootless mode)" msgstr "ntegrate remote application(s) into local desktop (rootless mode)" -#: ../pyhoca/wxgui/profilemanager.py:216 +#: ../pyhoca/wxgui/profilemanager.py:236 msgid "Menu of published applications" msgstr "Menu of published applications" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:223 ../pyhoca/wxgui/profilemanager.py:233 +#: ../pyhoca/wxgui/profilemanager.py:243 ../pyhoca/wxgui/profilemanager.py:253 msgid "User" msgstr "User" -#: ../pyhoca/wxgui/profilemanager.py:225 +#: ../pyhoca/wxgui/profilemanager.py:245 ../pyhoca/wxgui/profilemanager.py:260 msgid "Host" msgstr "Host" -#: ../pyhoca/wxgui/profilemanager.py:227 +#: ../pyhoca/wxgui/profilemanager.py:247 ../pyhoca/wxgui/profilemanager.py:262 msgid "Port" msgstr "Port" -#: ../pyhoca/wxgui/profilemanager.py:229 -msgid "RSA/DSA private key" -msgstr "RSA/DSA private key" +#: ../pyhoca/wxgui/profilemanager.py:249 +msgid "Key" +msgstr "Key" -#: ../pyhoca/wxgui/profilemanager.py:232 +#: ../pyhoca/wxgui/profilemanager.py:252 msgid "Server behind SSH proxy" msgstr "Server behind SSH proxy" -#: ../pyhoca/wxgui/profilemanager.py:235 +#: ../pyhoca/wxgui/profilemanager.py:255 +msgid "Use same username for X2Go and proxy host" +msgstr "Use same username for X2Go and proxy host" + +#: ../pyhoca/wxgui/profilemanager.py:256 +msgid "Use same authentication for X2Go and proxy host" +msgstr "Use same authentication for X2Go and proxy host" + +#: ../pyhoca/wxgui/profilemanager.py:257 msgid "Key file" msgstr "Key file" -#: ../pyhoca/wxgui/profilemanager.py:238 -msgid "Host[:Port]" -msgstr "Host[:Port]" - -#: ../pyhoca/wxgui/profilemanager.py:240 +#: ../pyhoca/wxgui/profilemanager.py:264 msgid "SSH Proxy Tunnel" msgstr "SSH Proxy Tunnel" -#: ../pyhoca/wxgui/profilemanager.py:248 +#: ../pyhoca/wxgui/profilemanager.py:272 msgid "Modem" msgstr "Modem" -#: ../pyhoca/wxgui/profilemanager.py:249 +#: ../pyhoca/wxgui/profilemanager.py:273 msgid "ISDN" msgstr "ISDN" -#: ../pyhoca/wxgui/profilemanager.py:250 +#: ../pyhoca/wxgui/profilemanager.py:274 msgid "ADSL" msgstr "ADSL" -#: ../pyhoca/wxgui/profilemanager.py:251 +#: ../pyhoca/wxgui/profilemanager.py:275 msgid "WAN" msgstr "WAN" -#: ../pyhoca/wxgui/profilemanager.py:252 +#: ../pyhoca/wxgui/profilemanager.py:276 msgid "LAN" msgstr "LAN" -#: ../pyhoca/wxgui/profilemanager.py:254 +#: ../pyhoca/wxgui/profilemanager.py:278 msgid "Method" msgstr "Method" -#: ../pyhoca/wxgui/profilemanager.py:256 +#: ../pyhoca/wxgui/profilemanager.py:280 msgid "Image quality" msgstr "Image quality" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:262 +#: ../pyhoca/wxgui/profilemanager.py:286 msgid "Fullscreen" msgstr "Fullscreen" -#: ../pyhoca/wxgui/profilemanager.py:263 +#: ../pyhoca/wxgui/profilemanager.py:287 msgid "Custom Size" msgstr "Custom Size" -#: ../pyhoca/wxgui/profilemanager.py:268 +#: ../pyhoca/wxgui/profilemanager.py:292 msgid "Set display DPI" msgstr "Set display DPI" -#: ../pyhoca/wxgui/profilemanager.py:270 +#: ../pyhoca/wxgui/profilemanager.py:294 msgid "Do not set (use server-side tools to configure the keyboard)" msgstr "Do not set (use server-side tools to configure the keyboard)" -#: ../pyhoca/wxgui/profilemanager.py:271 +#: ../pyhoca/wxgui/profilemanager.py:295 msgid "" "Automatically detect and use client-side keyboard configuration inside the " "session" @@ -454,213 +461,213 @@ msgstr "" "Automatically detect and use client-side keyboard configuration inside the " "session" -#: ../pyhoca/wxgui/profilemanager.py:272 +#: ../pyhoca/wxgui/profilemanager.py:296 msgid "Use custom keyboard settings as provided below" msgstr "Use custom keyboard settings as provided below" -#: ../pyhoca/wxgui/profilemanager.py:273 +#: ../pyhoca/wxgui/profilemanager.py:297 msgid "Keyboard model" msgstr "Keyboard model" -#: ../pyhoca/wxgui/profilemanager.py:275 +#: ../pyhoca/wxgui/profilemanager.py:299 msgid "Layout" msgstr "Layout" -#: ../pyhoca/wxgui/profilemanager.py:277 +#: ../pyhoca/wxgui/profilemanager.py:301 msgid "Layout variant" msgstr "Layout variant" -#: ../pyhoca/wxgui/profilemanager.py:279 +#: ../pyhoca/wxgui/profilemanager.py:303 msgid "Enable sound support" msgstr "Enable sound support" -#: ../pyhoca/wxgui/profilemanager.py:280 +#: ../pyhoca/wxgui/profilemanager.py:304 msgid "Pulse Audio" msgstr "Pulse Audio" #. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated. #. However, config files can contain an Arts configuration, so we will honour this -#: ../pyhoca/wxgui/profilemanager.py:284 +#: ../pyhoca/wxgui/profilemanager.py:308 msgid "Arts (not supported)" msgstr "Arts (not supported)" -#: ../pyhoca/wxgui/profilemanager.py:287 +#: ../pyhoca/wxgui/profilemanager.py:311 msgid "esd" msgstr "esd" -#: ../pyhoca/wxgui/profilemanager.py:288 +#: ../pyhoca/wxgui/profilemanager.py:312 msgid "Use default sound port" msgstr "Use default sound port" -#: ../pyhoca/wxgui/profilemanager.py:289 +#: ../pyhoca/wxgui/profilemanager.py:313 msgid "Custom sound port" msgstr "Custom sound port" -#: ../pyhoca/wxgui/profilemanager.py:291 +#: ../pyhoca/wxgui/profilemanager.py:315 msgid "Client Side printing" msgstr "Client Side printing" -#: ../pyhoca/wxgui/profilemanager.py:293 +#: ../pyhoca/wxgui/profilemanager.py:317 msgid "Use local folder sharing" msgstr "Use local folder sharing" -#: ../pyhoca/wxgui/profilemanager.py:294 +#: ../pyhoca/wxgui/profilemanager.py:318 msgid "Path" msgstr "Path" -#: ../pyhoca/wxgui/profilemanager.py:297 ../pyhoca/wxgui/profilemanager.py:316 +#: ../pyhoca/wxgui/profilemanager.py:321 ../pyhoca/wxgui/profilemanager.py:340 msgid "Add" msgstr "Add" -#: ../pyhoca/wxgui/profilemanager.py:299 +#: ../pyhoca/wxgui/profilemanager.py:323 msgid "Local Path" msgstr "Local Path" -#: ../pyhoca/wxgui/profilemanager.py:300 +#: ../pyhoca/wxgui/profilemanager.py:324 msgid "Connect Method" msgstr "Connect Method" -#: ../pyhoca/wxgui/profilemanager.py:301 +#: ../pyhoca/wxgui/profilemanager.py:325 msgid "Delete" msgstr "Delete" -#: ../pyhoca/wxgui/profilemanager.py:303 +#: ../pyhoca/wxgui/profilemanager.py:327 msgid "Convert between client and server encodings" msgstr "Convert between client and server encodings" -#: ../pyhoca/wxgui/profilemanager.py:304 +#: ../pyhoca/wxgui/profilemanager.py:328 msgid "Client encoding" msgstr "Client encoding" -#: ../pyhoca/wxgui/profilemanager.py:306 +#: ../pyhoca/wxgui/profilemanager.py:330 msgid "Server encoding" msgstr "Server encoding" -#: ../pyhoca/wxgui/profilemanager.py:309 +#: ../pyhoca/wxgui/profilemanager.py:333 msgid "Use file MIME box for local file import" msgstr "Use file MIME box for local file import" -#: ../pyhoca/wxgui/profilemanager.py:310 +#: ../pyhoca/wxgui/profilemanager.py:334 msgid "Extensions" msgstr "Extensions" -#: ../pyhoca/wxgui/profilemanager.py:312 +#: ../pyhoca/wxgui/profilemanager.py:336 msgid "Action" msgstr "Action" -#: ../pyhoca/wxgui/profilemanager.py:317 +#: ../pyhoca/wxgui/profilemanager.py:341 msgid "Defaults" msgstr "Defaults" -#: ../pyhoca/wxgui/profilemanager.py:319 +#: ../pyhoca/wxgui/profilemanager.py:343 msgid "Save" msgstr "Save" -#: ../pyhoca/wxgui/profilemanager.py:320 +#: ../pyhoca/wxgui/profilemanager.py:344 msgid "Reset" msgstr "Reset" -#: ../pyhoca/wxgui/profilemanager.py:365 -#: ../pyhoca/wxgui/profilemanager.py:1078 -#: ../pyhoca/wxgui/profilemanager.py:1832 +#: ../pyhoca/wxgui/profilemanager.py:394 +#: ../pyhoca/wxgui/profilemanager.py:1089 +#: ../pyhoca/wxgui/profilemanager.py:1983 msgid "automatically" msgstr "automatically" -#: ../pyhoca/wxgui/profilemanager.py:367 -#: ../pyhoca/wxgui/profilemanager.py:1080 +#: ../pyhoca/wxgui/profilemanager.py:396 +#: ../pyhoca/wxgui/profilemanager.py:1091 msgid "manually" msgstr "manually" -#: ../pyhoca/wxgui/profilemanager.py:376 +#: ../pyhoca/wxgui/profilemanager.py:405 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "PyHoca-GUI Profile Manager - new profile" -#: ../pyhoca/wxgui/profilemanager.py:378 +#: ../pyhoca/wxgui/profilemanager.py:407 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "PyHoca-GUI Profile Manager - %s (connected)" -#: ../pyhoca/wxgui/profilemanager.py:380 +#: ../pyhoca/wxgui/profilemanager.py:409 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "PyHoca-GUI Profile Manager - %s" -#: ../pyhoca/wxgui/profilemanager.py:751 +#: ../pyhoca/wxgui/profilemanager.py:769 msgid "Profile" msgstr "Profile" -#: ../pyhoca/wxgui/profilemanager.py:752 +#: ../pyhoca/wxgui/profilemanager.py:770 msgid "Session" msgstr "Session" -#: ../pyhoca/wxgui/profilemanager.py:753 +#: ../pyhoca/wxgui/profilemanager.py:771 msgid "Connection" msgstr "Connection" -#: ../pyhoca/wxgui/profilemanager.py:754 +#: ../pyhoca/wxgui/profilemanager.py:772 msgid "Settings" msgstr "Settings" -#: ../pyhoca/wxgui/profilemanager.py:755 +#: ../pyhoca/wxgui/profilemanager.py:773 msgid "Sharing" msgstr "Sharing" -#: ../pyhoca/wxgui/profilemanager.py:996 +#: ../pyhoca/wxgui/profilemanager.py:1007 msgid "<xkbtype>" msgstr "pc105/us" -#: ../pyhoca/wxgui/profilemanager.py:997 +#: ../pyhoca/wxgui/profilemanager.py:1008 msgid "<xkblayout>" msgstr "us" -#: ../pyhoca/wxgui/profilemanager.py:998 +#: ../pyhoca/wxgui/profilemanager.py:1009 msgid "<xkbvariant>" msgstr "basic" -#: ../pyhoca/wxgui/profilemanager.py:1284 +#: ../pyhoca/wxgui/profilemanager.py:1306 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "Icon Files (*.png)|*.png|All files (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1287 +#: ../pyhoca/wxgui/profilemanager.py:1309 msgid "Choose an icon for this session profile" msgstr "Choose an icon for this session profile" -#: ../pyhoca/wxgui/profilemanager.py:1509 +#: ../pyhoca/wxgui/profilemanager.py:1600 msgid "All files (*.*)|*" msgstr "All files (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1511 -#: ../pyhoca/wxgui/profilemanager.py:1533 +#: ../pyhoca/wxgui/profilemanager.py:1602 +#: ../pyhoca/wxgui/profilemanager.py:1626 msgid "Choose a public SSH key" msgstr "Choose a public SSH key" -#: ../pyhoca/wxgui/profilemanager.py:1784 +#: ../pyhoca/wxgui/profilemanager.py:1935 msgid "Choose a folder to share within a session" msgstr "Choose a folder to share within a session" -#: ../pyhoca/wxgui/profilemanager.py:1912 -#: ../pyhoca/wxgui/profilemanager.py:1915 -#: ../pyhoca/wxgui/profilemanager.py:1918 -#: ../pyhoca/wxgui/profilemanager.py:1923 -#: ../pyhoca/wxgui/profilemanager.py:1933 ../pyhoca/wxgui/menus_taskbar.py:118 +#: ../pyhoca/wxgui/profilemanager.py:2063 +#: ../pyhoca/wxgui/profilemanager.py:2066 +#: ../pyhoca/wxgui/profilemanager.py:2069 +#: ../pyhoca/wxgui/profilemanager.py:2074 +#: ../pyhoca/wxgui/profilemanager.py:2084 ../pyhoca/wxgui/menus_taskbar.py:118 msgid "Profile Manager" msgstr "Profile Manager" -#: ../pyhoca/wxgui/profilemanager.py:1912 +#: ../pyhoca/wxgui/profilemanager.py:2063 msgid "Profile name is missing, profile unusable!!!" msgstr "Profile name is missing, profile unusable!!!" -#: ../pyhoca/wxgui/profilemanager.py:1915 -#: ../pyhoca/wxgui/profilemanager.py:1918 +#: ../pyhoca/wxgui/profilemanager.py:2066 +#: ../pyhoca/wxgui/profilemanager.py:2069 #, python-format msgid "Profile name %s already exists!!!" msgstr "Profile name %s already exists!!!" -#: ../pyhoca/wxgui/profilemanager.py:1923 +#: ../pyhoca/wxgui/profilemanager.py:2074 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "The SSH proxy configuration is incomplete. Try again." -#: ../pyhoca/wxgui/profilemanager.py:1933 +#: ../pyhoca/wxgui/profilemanager.py:2084 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -671,21 +678,21 @@ msgstr "" "proxy to.\n" "Please change the SSH proxy settings accordingly." -#: ../pyhoca/wxgui/profilemanager.py:1960 +#: ../pyhoca/wxgui/profilemanager.py:2111 #, python-format msgid "%s - profile added" msgstr "%s - profile added" -#: ../pyhoca/wxgui/profilemanager.py:1961 +#: ../pyhoca/wxgui/profilemanager.py:2112 msgid "A new session profile has been added." msgstr "A new session profile has been added." -#: ../pyhoca/wxgui/profilemanager.py:1965 +#: ../pyhoca/wxgui/profilemanager.py:2116 #, python-format msgid "%s - modified" msgstr "%s - modified" -#: ../pyhoca/wxgui/profilemanager.py:1966 +#: ../pyhoca/wxgui/profilemanager.py:2117 msgid "Changes to profile have been saved." msgstr "Changes to profile have been saved." @@ -943,85 +950,107 @@ msgstr "%s - server warning" msgid "The X2Go Server does not publish an application menu." msgstr "The X2Go Server does not publish an application menu." -#: ../pyhoca/wxgui/frontend.py:610 +#: ../pyhoca/wxgui/frontend.py:611 msgid "Public SSH key authentication has been successful." msgstr "Public SSH key authentication has been successful." -#: ../pyhoca/wxgui/frontend.py:644 +#: ../pyhoca/wxgui/frontend.py:648 msgid "" "The SSH proxy's host key is invalid or has not been accepted by the user" msgstr "" "The SSH proxy's host key is invalid or has not been accepted by the user" -#: ../pyhoca/wxgui/frontend.py:665 +#: ../pyhoca/wxgui/frontend.py:669 #, python-format msgid "%s - EOF error" msgstr "%s - EOF error" -#: ../pyhoca/wxgui/frontend.py:665 +#: ../pyhoca/wxgui/frontend.py:669 msgid "Authentication protocol communication incomplete! Try again..." msgstr "Authentication protocol communication incomplete! Try again..." -#: ../pyhoca/wxgui/frontend.py:672 +#: ../pyhoca/wxgui/frontend.py:676 #, python-format msgid "%s - auth key error" msgstr "%s - auth key error" -#: ../pyhoca/wxgui/frontend.py:693 +#: ../pyhoca/wxgui/frontend.py:697 msgid "An unknown error occurred during authentication!" msgstr "An unknown error occurred during authentication!" +#: ../pyhoca/wxgui/frontend.py:725 +#, python-format +msgid "%s: DirectRDP not supported yet" +msgstr "%s: DirectRDP not supported yet" + #: ../pyhoca/wxgui/frontend.py:726 +#, python-format +msgid "" +"We apologize for the inconvenience...\n" +"\n" +"Session profiles of type ,,DirectRDP'' are not\n" +"supported by %s (%s), yet!!\n" +"\n" +"DirectRDP support will be available in %s (>= 0.2.2.0)." +msgstr "" +"We apologize for the inconvenience...\n" +"\n" +"Session profiles of type ,,DirectRDP'' are not\n" +"supported by %s (%s), yet!!\n" +"\n" +"DirectRDP support will be available in %s (>= 0.2.2.0)." + +#: ../pyhoca/wxgui/frontend.py:738 msgid "Unknown session profile, configure before using it..." msgstr "Unknown session profile, configure before using it..." -#: ../pyhoca/wxgui/frontend.py:784 ../pyhoca/wxgui/frontend.py:1302 +#: ../pyhoca/wxgui/frontend.py:796 ../pyhoca/wxgui/frontend.py:1314 #, python-format msgid "%s - session warning" msgstr "%s - session warning" -#: ../pyhoca/wxgui/frontend.py:784 +#: ../pyhoca/wxgui/frontend.py:796 #, python-format msgid "Execution of command ,,%s'' failed." msgstr "Execution of command ,,%s'' failed." -#: ../pyhoca/wxgui/frontend.py:926 +#: ../pyhoca/wxgui/frontend.py:938 msgid "Cleaning X2Go sessions..." msgstr "Cleaning X2Go sessions..." -#: ../pyhoca/wxgui/frontend.py:961 +#: ../pyhoca/wxgui/frontend.py:973 #, python-format msgid "%s - disconnect" msgstr "%s - disconnect" -#: ../pyhoca/wxgui/frontend.py:961 +#: ../pyhoca/wxgui/frontend.py:973 msgid "X2Go Profile is now disconnected." msgstr "X2Go Profile is now disconnected." -#: ../pyhoca/wxgui/frontend.py:977 +#: ../pyhoca/wxgui/frontend.py:989 msgid "New Session Profile" msgstr "New Session Profile" -#: ../pyhoca/wxgui/frontend.py:1029 +#: ../pyhoca/wxgui/frontend.py:1041 #, python-format msgid "Really Delete Session Profile ,,%s''?" msgstr "Really Delete Session Profile ,,%s''?" -#: ../pyhoca/wxgui/frontend.py:1035 +#: ../pyhoca/wxgui/frontend.py:1047 #, python-format msgid "%s - profile deleted" msgstr "%s - profile deleted" -#: ../pyhoca/wxgui/frontend.py:1035 +#: ../pyhoca/wxgui/frontend.py:1047 msgid "The session profile has been deleted." msgstr "The session profile has been deleted." -#: ../pyhoca/wxgui/frontend.py:1053 +#: ../pyhoca/wxgui/frontend.py:1065 #, python-format msgid "%s - share local folder with sessions of this profile" msgstr "%s - share local folder with sessions of this profile" -#: ../pyhoca/wxgui/frontend.py:1194 +#: ../pyhoca/wxgui/frontend.py:1206 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -1034,17 +1063,17 @@ msgstr "" "\n" "Are you sure you want to continue connecting?" -#: ../pyhoca/wxgui/frontend.py:1202 +#: ../pyhoca/wxgui/frontend.py:1214 #, python-format msgid "%s: Confirm Host Authorization" msgstr "%s: Confirm Host Authorization" -#: ../pyhoca/wxgui/frontend.py:1247 +#: ../pyhoca/wxgui/frontend.py:1259 #, python-format msgid "%s - channel error" msgstr "%s - channel error" -#: ../pyhoca/wxgui/frontend.py:1247 +#: ../pyhoca/wxgui/frontend.py:1259 #, python-format msgid "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " @@ -1053,22 +1082,22 @@ msgstr "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " "server..." -#: ../pyhoca/wxgui/frontend.py:1265 ../pyhoca/wxgui/frontend.py:1283 -#: ../pyhoca/wxgui/frontend.py:1285 ../pyhoca/wxgui/frontend.py:1321 +#: ../pyhoca/wxgui/frontend.py:1277 ../pyhoca/wxgui/frontend.py:1295 +#: ../pyhoca/wxgui/frontend.py:1297 ../pyhoca/wxgui/frontend.py:1333 #, python-format msgid "%s - session failure" msgstr "%s - session failure" -#: ../pyhoca/wxgui/frontend.py:1265 +#: ../pyhoca/wxgui/frontend.py:1277 msgid "The session startup failed." msgstr "The session startup failed." -#: ../pyhoca/wxgui/frontend.py:1283 +#: ../pyhoca/wxgui/frontend.py:1295 #, python-format msgid "The command ,,%s'' is not available on X2Go server." msgstr "The command ,,%s'' is not available on X2Go server." -#: ../pyhoca/wxgui/frontend.py:1285 +#: ../pyhoca/wxgui/frontend.py:1297 #, python-format msgid "" "The command ,,%s'' is not available on X2Go server\n" @@ -1077,7 +1106,7 @@ msgstr "" "The command ,,%s'' is not available on X2Go server\n" "%s." -#: ../pyhoca/wxgui/frontend.py:1302 +#: ../pyhoca/wxgui/frontend.py:1314 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " @@ -1086,7 +1115,7 @@ msgstr "" "Reverse TCP port forwarding request for session %s to server port %s has " "been denied." -#: ../pyhoca/wxgui/frontend.py:1321 +#: ../pyhoca/wxgui/frontend.py:1333 #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " @@ -1095,36 +1124,36 @@ msgstr "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " "X2go/SSH server. Session startup failed." -#: ../pyhoca/wxgui/frontend.py:1340 +#: ../pyhoca/wxgui/frontend.py:1352 #, python-format msgid "%s - audio warning" msgstr "%s - audio warning" -#: ../pyhoca/wxgui/frontend.py:1340 +#: ../pyhoca/wxgui/frontend.py:1352 msgid "" "The X2Go PulseAudio system is not available within Remote Desktop sessions." msgstr "" "The X2Go PulseAudio system is not available within Remote Desktop sessions." -#: ../pyhoca/wxgui/frontend.py:1347 ../pyhoca/wxgui/frontend.py:1354 +#: ../pyhoca/wxgui/frontend.py:1359 ../pyhoca/wxgui/frontend.py:1366 #, python-format msgid "%s - audio error" msgstr "%s - audio error" -#: ../pyhoca/wxgui/frontend.py:1347 +#: ../pyhoca/wxgui/frontend.py:1359 msgid "The X2Go PulseAudio system could not be started." msgstr "The X2Go PulseAudio system could not be started." -#: ../pyhoca/wxgui/frontend.py:1354 +#: ../pyhoca/wxgui/frontend.py:1366 msgid "The X2Go PulseAudio system has died unexpectedly." msgstr "The X2Go PulseAudio system has died unexpectedly." -#: ../pyhoca/wxgui/frontend.py:1366 +#: ../pyhoca/wxgui/frontend.py:1378 #, python-format msgid "%s - audio problem" msgstr "%s - audio problem" -#: ../pyhoca/wxgui/frontend.py:1366 +#: ../pyhoca/wxgui/frontend.py:1378 #, python-format msgid "" "The audio connection could not be set up for this session.\n" @@ -1133,12 +1162,12 @@ msgstr "" "The audio connection could not be set up for this session.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1378 +#: ../pyhoca/wxgui/frontend.py:1390 #, python-format msgid "%s - client-side printing not available" msgstr "%s - client-side printing not available" -#: ../pyhoca/wxgui/frontend.py:1378 +#: ../pyhoca/wxgui/frontend.py:1390 #, python-format msgid "" "The server denies client-side printing from within this session.\n" @@ -1147,12 +1176,12 @@ msgstr "" "The server denies client-side printing from within this session.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1390 +#: ../pyhoca/wxgui/frontend.py:1402 #, python-format msgid "%s - MIME box not available" msgstr "%s - MIME box not available" -#: ../pyhoca/wxgui/frontend.py:1390 +#: ../pyhoca/wxgui/frontend.py:1402 #, python-format msgid "" "The server does not support the X2Go MIME box.\n" @@ -1161,12 +1190,12 @@ msgstr "" "The server does not support the X2Go MIME box.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1402 +#: ../pyhoca/wxgui/frontend.py:1414 #, python-format msgid "%s - client-side folders not sharable" msgstr "%s - client-side folders not sharable" -#: ../pyhoca/wxgui/frontend.py:1402 +#: ../pyhoca/wxgui/frontend.py:1414 #, python-format msgid "" "The server denies client-side folder sharing with this session.\n" @@ -1175,12 +1204,12 @@ msgstr "" "The server denies client-side folder sharing with this session.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1414 +#: ../pyhoca/wxgui/frontend.py:1426 #, python-format msgid "%s - client resources not sharable" msgstr "%s - client resources not sharable" -#: ../pyhoca/wxgui/frontend.py:1414 +#: ../pyhoca/wxgui/frontend.py:1426 #, python-format msgid "" "Client-side folders and printers cannot be shared with this session.\n" @@ -1189,12 +1218,12 @@ msgstr "" "Client-side folders and printers cannot be shared with this session.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1433 ../pyhoca/wxgui/frontend.py:1435 +#: ../pyhoca/wxgui/frontend.py:1445 ../pyhoca/wxgui/frontend.py:1447 #, python-format msgid "%s - print error" msgstr "%s - print error" -#: ../pyhoca/wxgui/frontend.py:1433 +#: ../pyhoca/wxgui/frontend.py:1445 #, python-format msgid "" "%s\n" @@ -1205,7 +1234,7 @@ msgstr "" "...caused on printer %s by session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1435 +#: ../pyhoca/wxgui/frontend.py:1447 #, python-format msgid "" "%s\n" @@ -1216,12 +1245,12 @@ msgstr "" "...caused by session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1450 ../pyhoca/wxgui/frontend.py:1465 +#: ../pyhoca/wxgui/frontend.py:1462 ../pyhoca/wxgui/frontend.py:1477 #, python-format msgid "%s - start" msgstr "%s - start" -#: ../pyhoca/wxgui/frontend.py:1450 +#: ../pyhoca/wxgui/frontend.py:1462 #, python-format msgid "" "New X2Go session starting up...\n" @@ -1230,7 +1259,7 @@ msgstr "" "New X2Go session starting up...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1465 +#: ../pyhoca/wxgui/frontend.py:1477 #, python-format msgid "" "Another client started X2Go session\n" @@ -1239,12 +1268,12 @@ msgstr "" "Another client started X2Go session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1480 ../pyhoca/wxgui/frontend.py:1495 +#: ../pyhoca/wxgui/frontend.py:1492 ../pyhoca/wxgui/frontend.py:1507 #, python-format msgid "%s - resume" msgstr "%s - resume" -#: ../pyhoca/wxgui/frontend.py:1480 +#: ../pyhoca/wxgui/frontend.py:1492 #, python-format msgid "" "Resuming X2Go session...\n" @@ -1253,7 +1282,7 @@ msgstr "" "Resuming X2Go session...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1495 +#: ../pyhoca/wxgui/frontend.py:1507 #, python-format msgid "" "Another client resumed X2Go session\n" @@ -1262,12 +1291,12 @@ msgstr "" "Another client resumed X2Go session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1510 +#: ../pyhoca/wxgui/frontend.py:1522 #, python-format msgid "%s - running" msgstr "%s - running" -#: ../pyhoca/wxgui/frontend.py:1510 +#: ../pyhoca/wxgui/frontend.py:1522 #, python-format msgid "" "Found already running session\n" @@ -1276,12 +1305,12 @@ msgstr "" "Found already running session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1530 +#: ../pyhoca/wxgui/frontend.py:1542 #, python-format msgid "%s - suspend" msgstr "%s - suspend" -#: ../pyhoca/wxgui/frontend.py:1530 +#: ../pyhoca/wxgui/frontend.py:1542 #, python-format msgid "" "X2Go Session has been suspended\n" @@ -1290,12 +1319,12 @@ msgstr "" "X2Go Session has been suspended\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1557 +#: ../pyhoca/wxgui/frontend.py:1569 #, python-format msgid "%s - terminate" msgstr "%s - terminate" -#: ../pyhoca/wxgui/frontend.py:1557 +#: ../pyhoca/wxgui/frontend.py:1569 #, python-format msgid "" "X2Go Session has terminated\n" @@ -1439,6 +1468,12 @@ msgstr "Change session title to" msgid "OK" msgstr "OK" +#~ msgid "RSA/DSA private key" +#~ msgstr "RSA/DSA private key" + +#~ msgid "Host[:Port]" +#~ msgstr "Host[:Port]" + #~ msgid "us" #~ msgstr "us" diff --git a/po/es.po b/po/es.po index b7ee7cd..d559d05 100644 --- a/po/es.po +++ b/po/es.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-10 21:18+0200\n" +"POT-Creation-Date: 2012-09-28 10:00+0200\n" "PO-Revision-Date: 2012-06-01 09:28+0200\n" "Last-Translator: Ricardo Díaz Martín <oceanosoftlapalma(a)gmail.com>\n" "Language-Team: Español; Castellano <>\n" @@ -54,96 +54,96 @@ msgstr "Inicio de sesión" msgid "SSH proxy server login" msgstr "Inicio de sesión en el servidor proxy SSH" -#: ../pyhoca/wxgui/logon.py:133 ../pyhoca/wxgui/profilemanager.py:322 +#: ../pyhoca/wxgui/logon.py:133 ../pyhoca/wxgui/profilemanager.py:346 #: ../pyhoca/wxgui/messages.py:132 ../pyhoca/wxgui/printingprefs.py:147 #: ../pyhoca/wxgui/sessiontitle.py:85 msgid "Cancel" msgstr "Cancelar" -#: ../pyhoca/wxgui/logon.py:292 ../pyhoca/wxgui/logon.py:334 -#: ../pyhoca/wxgui/frontend.py:603 +#: ../pyhoca/wxgui/logon.py:301 ../pyhoca/wxgui/logon.py:343 +#: ../pyhoca/wxgui/frontend.py:604 #, python-format msgid "%s - connect failure" msgstr "%s - fallo en la conexión" -#: ../pyhoca/wxgui/logon.py:293 ../pyhoca/wxgui/frontend.py:603 +#: ../pyhoca/wxgui/logon.py:302 ../pyhoca/wxgui/frontend.py:604 msgid "User is not allowed to start X2Go sessions!" msgstr "¡El usuario no tiene permisos para iniciar sesiones X2go!" -#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:610 +#: ../pyhoca/wxgui/logon.py:307 ../pyhoca/wxgui/frontend.py:611 #, python-format msgid "%s - connect" msgstr "%s - conectado" -#: ../pyhoca/wxgui/logon.py:299 +#: ../pyhoca/wxgui/logon.py:308 msgid "Authentication has been successful." msgstr "Inicio de sesión correcto." -#: ../pyhoca/wxgui/logon.py:330 +#: ../pyhoca/wxgui/logon.py:339 msgid "SSH tunnel started" msgstr "Iniciado tunel SSH" -#: ../pyhoca/wxgui/logon.py:335 +#: ../pyhoca/wxgui/logon.py:344 msgid "Authentication failed!" msgstr "¡Error en el nombre de usuario o contraseña!" -#: ../pyhoca/wxgui/logon.py:342 +#: ../pyhoca/wxgui/logon.py:351 #, python-format msgid "%s - SSH proxy" msgstr "%s - proxy SSH" -#: ../pyhoca/wxgui/logon.py:343 +#: ../pyhoca/wxgui/logon.py:352 msgid "Authentication to the SSH proxy server failed!" msgstr "¡Nombre de usuario o contraseña erróneo en el servidor proxy SSH!" -#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:658 +#: ../pyhoca/wxgui/logon.py:374 ../pyhoca/wxgui/frontend.py:662 #, python-format msgid "%s - socket error" msgstr "%s - error de socket" -#: ../pyhoca/wxgui/logon.py:372 ../pyhoca/wxgui/frontend.py:637 -#: ../pyhoca/wxgui/frontend.py:644 +#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:641 +#: ../pyhoca/wxgui/frontend.py:648 #, python-format msgid "%s - host key error" msgstr "%s - error en la clave del equipo" -#: ../pyhoca/wxgui/logon.py:373 ../pyhoca/wxgui/frontend.py:637 +#: ../pyhoca/wxgui/logon.py:382 ../pyhoca/wxgui/frontend.py:641 msgid "" "The remote server's host key is invalid or has not been accepted by the user" msgstr "" "La clave del servidor remoto no es válida o no ha sido aceptada por el " "usuario" -#: ../pyhoca/wxgui/logon.py:380 ../pyhoca/wxgui/frontend.py:679 +#: ../pyhoca/wxgui/logon.py:389 ../pyhoca/wxgui/frontend.py:683 #, python-format msgid "%s - missing home directory" msgstr "%s - carpeta home desconocida" -#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:679 +#: ../pyhoca/wxgui/logon.py:390 ../pyhoca/wxgui/frontend.py:683 msgid "The remote user's home directory does not exist." msgstr "La carpeta home del usuario no existe en el servidor" -#: ../pyhoca/wxgui/logon.py:388 +#: ../pyhoca/wxgui/logon.py:397 #, python-format msgid "%s - key error" msgstr "%s - error en la clave" -#: ../pyhoca/wxgui/logon.py:396 ../pyhoca/wxgui/frontend.py:686 +#: ../pyhoca/wxgui/logon.py:405 ../pyhoca/wxgui/frontend.py:690 #, python-format msgid "%s - auth error" msgstr "%s - error en la autenticación" -#: ../pyhoca/wxgui/logon.py:404 ../pyhoca/wxgui/frontend.py:630 +#: ../pyhoca/wxgui/logon.py:413 ../pyhoca/wxgui/frontend.py:634 #, python-format msgid "%s - SSH error" msgstr "%s - error de SSH" -#: ../pyhoca/wxgui/logon.py:412 +#: ../pyhoca/wxgui/logon.py:421 #, python-format msgid "%s - unknown error" msgstr "%s - error desconocido" -#: ../pyhoca/wxgui/logon.py:413 +#: ../pyhoca/wxgui/logon.py:422 msgid "An unknown error occured during authentication!" msgstr "" "¡Error desconocido al tratar de validar el nombre de usuario y la contraseña!" @@ -182,280 +182,288 @@ msgstr "" "PyHoca-GUI (Python X2goClient)\n" "Cliente para conexiones remotas a servidores X2go" -#: ../pyhoca/wxgui/profilemanager.py:82 +#: ../pyhoca/wxgui/profilemanager.py:83 msgid "GNOME Desktop (GNOME)" msgstr "GNOME Desktop (GNOME)" -#: ../pyhoca/wxgui/profilemanager.py:83 +#: ../pyhoca/wxgui/profilemanager.py:84 msgid "K Desktop Environment (KDE)" msgstr "K Desktop Environment (KDE)" -#: ../pyhoca/wxgui/profilemanager.py:84 +#: ../pyhoca/wxgui/profilemanager.py:85 msgid "Lightweight X Desktop (LXDE)" msgstr "Lightweight X Desktop (LXDE)" -#: ../pyhoca/wxgui/profilemanager.py:85 +#: ../pyhoca/wxgui/profilemanager.py:86 msgid "Trinity X Desktop (KDE3-like)" msgstr "Trinity X Desktop (similar a KDE3)" -#: ../pyhoca/wxgui/profilemanager.py:86 +#: ../pyhoca/wxgui/profilemanager.py:87 msgid "Unity X Desktop Shell (UNITY)" msgstr "Unity X Desktop Shell (UNITY)" -#: ../pyhoca/wxgui/profilemanager.py:87 +#: ../pyhoca/wxgui/profilemanager.py:88 msgid "XFCE4 Desktop (XFCE4)" msgstr "XFCE4 Desktop (XFCE4)" -#: ../pyhoca/wxgui/profilemanager.py:88 +#: ../pyhoca/wxgui/profilemanager.py:89 msgid "Published Applications" msgstr "Aplicaciones publicadas" -#: ../pyhoca/wxgui/profilemanager.py:89 +#: ../pyhoca/wxgui/profilemanager.py:90 msgid "Single Application" msgstr "Aplicación" -#: ../pyhoca/wxgui/profilemanager.py:90 +#: ../pyhoca/wxgui/profilemanager.py:91 msgid "XDMCP Query" msgstr "XDMCP Query" -#: ../pyhoca/wxgui/profilemanager.py:91 -msgid "Windows Terminal Server (RDP-proxy)" +#: ../pyhoca/wxgui/profilemanager.py:92 +#, fuzzy +msgid "Windows Terminal Server (X2Go-proxied RDP)" msgstr "Windows Terminal Server (RDP-proxy)" -#. 'DirectRDP': 'Windows Terminal Server (RDP-direct)', -#: ../pyhoca/wxgui/profilemanager.py:93 ../pyhoca/wxgui/profilemanager.py:207 +#: ../pyhoca/wxgui/profilemanager.py:94 ../pyhoca/wxgui/profilemanager.py:227 msgid "Custom command" msgstr "Comando personalizado" -#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:398 +#: ../pyhoca/wxgui/profilemanager.py:99 ../pyhoca/wxgui/menus_taskbar.py:398 msgid "Internet Browser" msgstr "Navegador web" -#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:399 +#: ../pyhoca/wxgui/profilemanager.py:100 ../pyhoca/wxgui/menus_taskbar.py:399 msgid "Email Client" msgstr "Cliente de Correo" -#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:400 +#: ../pyhoca/wxgui/profilemanager.py:101 ../pyhoca/wxgui/menus_taskbar.py:400 msgid "Office" msgstr "Office" -#: ../pyhoca/wxgui/profilemanager.py:99 ../pyhoca/wxgui/menus_taskbar.py:401 +#: ../pyhoca/wxgui/profilemanager.py:102 ../pyhoca/wxgui/menus_taskbar.py:401 msgid "Terminal" msgstr "Terminal" -#: ../pyhoca/wxgui/profilemanager.py:113 +#: ../pyhoca/wxgui/profilemanager.py:120 msgid "Open file with system's default application" msgstr "Abrir archivo con la aplicación por defecto" -#: ../pyhoca/wxgui/profilemanager.py:114 +#: ../pyhoca/wxgui/profilemanager.py:121 msgid "Open application chooser dialog" msgstr "Abrir selector de aplicaciones" -#: ../pyhoca/wxgui/profilemanager.py:115 +#: ../pyhoca/wxgui/profilemanager.py:122 msgid "Save incoming file as ..." msgstr "Guardar archivo recibido como ..." -#: ../pyhoca/wxgui/profilemanager.py:143 +#: ../pyhoca/wxgui/profilemanager.py:150 msgid "settings derived from " msgstr "configuraciones recuperadas de " #. boxes for all tabs -#: ../pyhoca/wxgui/profilemanager.py:160 +#: ../pyhoca/wxgui/profilemanager.py:170 msgid "Session Title" msgstr "Título de la Sesión" -#: ../pyhoca/wxgui/profilemanager.py:161 +#: ../pyhoca/wxgui/profilemanager.py:171 msgid "Session Window" msgstr "Ventana de Sesión" -#: ../pyhoca/wxgui/profilemanager.py:162 +#: ../pyhoca/wxgui/profilemanager.py:172 msgid "Session Startup" msgstr "Inicio de Sesión" -#: ../pyhoca/wxgui/profilemanager.py:163 +#: ../pyhoca/wxgui/profilemanager.py:173 msgid "Server" msgstr "Servidor" -#: ../pyhoca/wxgui/profilemanager.py:164 +#: ../pyhoca/wxgui/profilemanager.py:174 +msgid "Proxy" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:175 msgid "Connection Link Speed" msgstr "Velocidad de conexión" -#: ../pyhoca/wxgui/profilemanager.py:165 +#: ../pyhoca/wxgui/profilemanager.py:176 msgid "Compression" msgstr "Compresión" -#: ../pyhoca/wxgui/profilemanager.py:166 +#: ../pyhoca/wxgui/profilemanager.py:177 msgid "Display" msgstr "Pantalla" -#: ../pyhoca/wxgui/profilemanager.py:167 +#: ../pyhoca/wxgui/profilemanager.py:178 msgid "Keyboard" msgstr "Teclado" -#: ../pyhoca/wxgui/profilemanager.py:168 +#: ../pyhoca/wxgui/profilemanager.py:179 msgid "Sound" msgstr "Sonido" -#: ../pyhoca/wxgui/profilemanager.py:169 +#: ../pyhoca/wxgui/profilemanager.py:180 msgid "Printing" msgstr "Impresora" -#: ../pyhoca/wxgui/profilemanager.py:170 +#: ../pyhoca/wxgui/profilemanager.py:181 msgid "Folder Exports" msgstr "Carpeta de Exportaciones" -#: ../pyhoca/wxgui/profilemanager.py:171 +#: ../pyhoca/wxgui/profilemanager.py:182 msgid "File Import" msgstr "Importar Archivo" #. ## #. ## widgets for the PROFILE tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:176 +#: ../pyhoca/wxgui/profilemanager.py:187 msgid "Name" msgstr "Nombre" -#: ../pyhoca/wxgui/profilemanager.py:183 +#: ../pyhoca/wxgui/profilemanager.py:194 msgid "Set session window title" msgstr "Establecer título de la sesión" -#: ../pyhoca/wxgui/profilemanager.py:184 +#: ../pyhoca/wxgui/profilemanager.py:195 msgid "Use a default session window title" msgstr "Usar título de sesión por defecto" -#: ../pyhoca/wxgui/profilemanager.py:185 +#: ../pyhoca/wxgui/profilemanager.py:196 msgid "Custom session window title" msgstr "Título de sesión personalizado" -#: ../pyhoca/wxgui/profilemanager.py:195 +#: ../pyhoca/wxgui/profilemanager.py:215 msgid "Window Icon" msgstr "Icono de la ventana" #. ## #. ## widgets for the SESSION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:201 +#: ../pyhoca/wxgui/profilemanager.py:221 msgid "Start session automatically after login" msgstr "Iniciar sesión automáticamente tras el login" -#: ../pyhoca/wxgui/profilemanager.py:202 +#: ../pyhoca/wxgui/profilemanager.py:222 #, python-format msgid "Login automatically after %s has started" msgstr "El inicio de sesión automático ha comenzado tras %s" -#: ../pyhoca/wxgui/profilemanager.py:203 +#: ../pyhoca/wxgui/profilemanager.py:223 msgid "Type" msgstr "Tipo" -#: ../pyhoca/wxgui/profilemanager.py:205 +#: ../pyhoca/wxgui/profilemanager.py:225 msgid "Application" msgstr "Aplicación" -#: ../pyhoca/wxgui/profilemanager.py:209 +#: ../pyhoca/wxgui/profilemanager.py:229 msgid "XDMCP server" msgstr "Servidor XDMCP" -#: ../pyhoca/wxgui/profilemanager.py:211 +#: ../pyhoca/wxgui/profilemanager.py:231 msgid "RDP server" msgstr "Servidor RDP" -#: ../pyhoca/wxgui/profilemanager.py:213 +#: ../pyhoca/wxgui/profilemanager.py:233 msgid "RDP options" msgstr "Opciones RDP" -#: ../pyhoca/wxgui/profilemanager.py:215 +#: ../pyhoca/wxgui/profilemanager.py:235 msgid "Integrate remote application(s) into local desktop (rootless mode)" msgstr "Integrar aplicaciones en el escritorio local (modo rootless)" -#: ../pyhoca/wxgui/profilemanager.py:216 +#: ../pyhoca/wxgui/profilemanager.py:236 msgid "Menu of published applications" msgstr "Menú de aplicaciones publicadas" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:223 ../pyhoca/wxgui/profilemanager.py:233 +#: ../pyhoca/wxgui/profilemanager.py:243 ../pyhoca/wxgui/profilemanager.py:253 msgid "User" msgstr "Usuario" -#: ../pyhoca/wxgui/profilemanager.py:225 +#: ../pyhoca/wxgui/profilemanager.py:245 ../pyhoca/wxgui/profilemanager.py:260 msgid "Host" msgstr "Host" -#: ../pyhoca/wxgui/profilemanager.py:227 +#: ../pyhoca/wxgui/profilemanager.py:247 ../pyhoca/wxgui/profilemanager.py:262 msgid "Port" msgstr "Puerto" -#: ../pyhoca/wxgui/profilemanager.py:229 -msgid "RSA/DSA private key" -msgstr "Clave privada RSA/DSA" +#: ../pyhoca/wxgui/profilemanager.py:249 +msgid "Key" +msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:232 +#: ../pyhoca/wxgui/profilemanager.py:252 msgid "Server behind SSH proxy" msgstr "Servidor detrás del proxy SSH" -#: ../pyhoca/wxgui/profilemanager.py:235 +#: ../pyhoca/wxgui/profilemanager.py:255 +msgid "Use same username for X2Go and proxy host" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:256 +msgid "Use same authentication for X2Go and proxy host" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:257 msgid "Key file" msgstr "Clave" -#: ../pyhoca/wxgui/profilemanager.py:238 -msgid "Host[:Port]" -msgstr "Host[:Puerto]" - -#: ../pyhoca/wxgui/profilemanager.py:240 +#: ../pyhoca/wxgui/profilemanager.py:264 msgid "SSH Proxy Tunnel" msgstr "Tunel Proxy SSH" -#: ../pyhoca/wxgui/profilemanager.py:248 +#: ../pyhoca/wxgui/profilemanager.py:272 msgid "Modem" msgstr "Módem" -#: ../pyhoca/wxgui/profilemanager.py:249 +#: ../pyhoca/wxgui/profilemanager.py:273 msgid "ISDN" msgstr "ISDN" -#: ../pyhoca/wxgui/profilemanager.py:250 +#: ../pyhoca/wxgui/profilemanager.py:274 msgid "ADSL" msgstr "ADSL" -#: ../pyhoca/wxgui/profilemanager.py:251 +#: ../pyhoca/wxgui/profilemanager.py:275 msgid "WAN" msgstr "WAN" -#: ../pyhoca/wxgui/profilemanager.py:252 +#: ../pyhoca/wxgui/profilemanager.py:276 msgid "LAN" msgstr "LAN" -#: ../pyhoca/wxgui/profilemanager.py:254 +#: ../pyhoca/wxgui/profilemanager.py:278 msgid "Method" msgstr "Método" -#: ../pyhoca/wxgui/profilemanager.py:256 +#: ../pyhoca/wxgui/profilemanager.py:280 msgid "Image quality" msgstr "Calidad de imagen" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:262 +#: ../pyhoca/wxgui/profilemanager.py:286 msgid "Fullscreen" msgstr "Pantalla Completa" -#: ../pyhoca/wxgui/profilemanager.py:263 +#: ../pyhoca/wxgui/profilemanager.py:287 msgid "Custom Size" msgstr "Tamaño Personalizado" -#: ../pyhoca/wxgui/profilemanager.py:268 +#: ../pyhoca/wxgui/profilemanager.py:292 msgid "Set display DPI" msgstr "Establecer DPI" -#: ../pyhoca/wxgui/profilemanager.py:270 +#: ../pyhoca/wxgui/profilemanager.py:294 msgid "Do not set (use server-side tools to configure the keyboard)" msgstr "" "No establecido (usar las herramientas del lado del servidor para configurar " "el teclado)" -#: ../pyhoca/wxgui/profilemanager.py:271 +#: ../pyhoca/wxgui/profilemanager.py:295 msgid "" "Automatically detect and use client-side keyboard configuration inside the " "session" @@ -463,215 +471,215 @@ msgstr "" "Detectar automáticamente y usar la configuración de teclado del lado del " "cliente en la sesión remota" -#: ../pyhoca/wxgui/profilemanager.py:272 +#: ../pyhoca/wxgui/profilemanager.py:296 msgid "Use custom keyboard settings as provided below" msgstr "Ussar configuración de teclado personalizada" -#: ../pyhoca/wxgui/profilemanager.py:273 +#: ../pyhoca/wxgui/profilemanager.py:297 msgid "Keyboard model" msgstr "Modelo de teclado" -#: ../pyhoca/wxgui/profilemanager.py:275 +#: ../pyhoca/wxgui/profilemanager.py:299 msgid "Layout" msgstr "Capa" -#: ../pyhoca/wxgui/profilemanager.py:277 +#: ../pyhoca/wxgui/profilemanager.py:301 msgid "Layout variant" msgstr "Variante de la capa" -#: ../pyhoca/wxgui/profilemanager.py:279 +#: ../pyhoca/wxgui/profilemanager.py:303 msgid "Enable sound support" msgstr "Activar soporte de sonido" -#: ../pyhoca/wxgui/profilemanager.py:280 +#: ../pyhoca/wxgui/profilemanager.py:304 msgid "Pulse Audio" msgstr "Pulse Audio" #. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated. #. However, config files can contain an Arts configuration, so we will honour this -#: ../pyhoca/wxgui/profilemanager.py:284 +#: ../pyhoca/wxgui/profilemanager.py:308 msgid "Arts (not supported)" msgstr "Arts (sin soporte)" -#: ../pyhoca/wxgui/profilemanager.py:287 +#: ../pyhoca/wxgui/profilemanager.py:311 msgid "esd" msgstr "esd" -#: ../pyhoca/wxgui/profilemanager.py:288 +#: ../pyhoca/wxgui/profilemanager.py:312 msgid "Use default sound port" msgstr "Usar puerto de sonido por defecto" -#: ../pyhoca/wxgui/profilemanager.py:289 +#: ../pyhoca/wxgui/profilemanager.py:313 msgid "Custom sound port" msgstr "Puerto de sonido personalizado" -#: ../pyhoca/wxgui/profilemanager.py:291 +#: ../pyhoca/wxgui/profilemanager.py:315 msgid "Client Side printing" msgstr "Impresión local" -#: ../pyhoca/wxgui/profilemanager.py:293 +#: ../pyhoca/wxgui/profilemanager.py:317 msgid "Use local folder sharing" msgstr "Compartir carpetas locales" -#: ../pyhoca/wxgui/profilemanager.py:294 +#: ../pyhoca/wxgui/profilemanager.py:318 msgid "Path" msgstr "Ruta" -#: ../pyhoca/wxgui/profilemanager.py:297 ../pyhoca/wxgui/profilemanager.py:316 +#: ../pyhoca/wxgui/profilemanager.py:321 ../pyhoca/wxgui/profilemanager.py:340 msgid "Add" msgstr "Añadir" -#: ../pyhoca/wxgui/profilemanager.py:299 +#: ../pyhoca/wxgui/profilemanager.py:323 msgid "Local Path" msgstr "Ruta Local" -#: ../pyhoca/wxgui/profilemanager.py:300 +#: ../pyhoca/wxgui/profilemanager.py:324 msgid "Connect Method" msgstr "Método de Conexión" -#: ../pyhoca/wxgui/profilemanager.py:301 +#: ../pyhoca/wxgui/profilemanager.py:325 msgid "Delete" msgstr "Eliminar" -#: ../pyhoca/wxgui/profilemanager.py:303 +#: ../pyhoca/wxgui/profilemanager.py:327 msgid "Convert between client and server encodings" msgstr "Convertir codificaciones entre cliente y servidor" -#: ../pyhoca/wxgui/profilemanager.py:304 +#: ../pyhoca/wxgui/profilemanager.py:328 msgid "Client encoding" msgstr "Codificación del cliente" -#: ../pyhoca/wxgui/profilemanager.py:306 +#: ../pyhoca/wxgui/profilemanager.py:330 msgid "Server encoding" msgstr "Codificación del Servidor" -#: ../pyhoca/wxgui/profilemanager.py:309 +#: ../pyhoca/wxgui/profilemanager.py:333 msgid "Use file MIME box for local file import" msgstr "Usar tipo de archivo MIME para la importación local" -#: ../pyhoca/wxgui/profilemanager.py:310 +#: ../pyhoca/wxgui/profilemanager.py:334 msgid "Extensions" msgstr "Extensiones" -#: ../pyhoca/wxgui/profilemanager.py:312 +#: ../pyhoca/wxgui/profilemanager.py:336 msgid "Action" msgstr "Acción" -#: ../pyhoca/wxgui/profilemanager.py:317 +#: ../pyhoca/wxgui/profilemanager.py:341 msgid "Defaults" msgstr "Valores por defecto" -#: ../pyhoca/wxgui/profilemanager.py:319 +#: ../pyhoca/wxgui/profilemanager.py:343 msgid "Save" msgstr "Guardar" -#: ../pyhoca/wxgui/profilemanager.py:320 +#: ../pyhoca/wxgui/profilemanager.py:344 msgid "Reset" msgstr "Reiniciar" -#: ../pyhoca/wxgui/profilemanager.py:365 -#: ../pyhoca/wxgui/profilemanager.py:1078 -#: ../pyhoca/wxgui/profilemanager.py:1832 +#: ../pyhoca/wxgui/profilemanager.py:394 +#: ../pyhoca/wxgui/profilemanager.py:1089 +#: ../pyhoca/wxgui/profilemanager.py:1983 msgid "automatically" msgstr "automáticamente" -#: ../pyhoca/wxgui/profilemanager.py:367 -#: ../pyhoca/wxgui/profilemanager.py:1080 +#: ../pyhoca/wxgui/profilemanager.py:396 +#: ../pyhoca/wxgui/profilemanager.py:1091 msgid "manually" msgstr "manualmente" -#: ../pyhoca/wxgui/profilemanager.py:376 +#: ../pyhoca/wxgui/profilemanager.py:405 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "PyHoca-GUI Gestor de Perfiles - nuevo perfil" -#: ../pyhoca/wxgui/profilemanager.py:378 +#: ../pyhoca/wxgui/profilemanager.py:407 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "PyHoca-GUI Gestor de Perfiles - %s (conectado)" -#: ../pyhoca/wxgui/profilemanager.py:380 +#: ../pyhoca/wxgui/profilemanager.py:409 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "PyHoca-GUI Gestor de Perfiles - %s" -#: ../pyhoca/wxgui/profilemanager.py:751 +#: ../pyhoca/wxgui/profilemanager.py:769 msgid "Profile" msgstr "Perfil" -#: ../pyhoca/wxgui/profilemanager.py:752 +#: ../pyhoca/wxgui/profilemanager.py:770 msgid "Session" msgstr "Sesión" -#: ../pyhoca/wxgui/profilemanager.py:753 +#: ../pyhoca/wxgui/profilemanager.py:771 msgid "Connection" msgstr "Conexión" -#: ../pyhoca/wxgui/profilemanager.py:754 +#: ../pyhoca/wxgui/profilemanager.py:772 msgid "Settings" msgstr "Opciones" -#: ../pyhoca/wxgui/profilemanager.py:755 +#: ../pyhoca/wxgui/profilemanager.py:773 msgid "Sharing" msgstr "Compartir" -#: ../pyhoca/wxgui/profilemanager.py:996 +#: ../pyhoca/wxgui/profilemanager.py:1007 msgid "<xkbtype>" msgstr "<xkbtype>" -#: ../pyhoca/wxgui/profilemanager.py:997 +#: ../pyhoca/wxgui/profilemanager.py:1008 msgid "<xkblayout>" msgstr "<xkblayout>" -#: ../pyhoca/wxgui/profilemanager.py:998 +#: ../pyhoca/wxgui/profilemanager.py:1009 msgid "<xkbvariant>" msgstr "<xkbvariant>" -#: ../pyhoca/wxgui/profilemanager.py:1284 +#: ../pyhoca/wxgui/profilemanager.py:1306 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "Iconos (*.png)|*.png|Todos (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1287 +#: ../pyhoca/wxgui/profilemanager.py:1309 msgid "Choose an icon for this session profile" msgstr "Elige un icono para este perfil de sesión" -#: ../pyhoca/wxgui/profilemanager.py:1509 +#: ../pyhoca/wxgui/profilemanager.py:1600 msgid "All files (*.*)|*" msgstr "Todos (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1511 -#: ../pyhoca/wxgui/profilemanager.py:1533 +#: ../pyhoca/wxgui/profilemanager.py:1602 +#: ../pyhoca/wxgui/profilemanager.py:1626 msgid "Choose a public SSH key" msgstr "Elige una clave pública SSH" -#: ../pyhoca/wxgui/profilemanager.py:1784 +#: ../pyhoca/wxgui/profilemanager.py:1935 msgid "Choose a folder to share within a session" msgstr "Elige la carpeta que quieres compartir en la conexión" -#: ../pyhoca/wxgui/profilemanager.py:1912 -#: ../pyhoca/wxgui/profilemanager.py:1915 -#: ../pyhoca/wxgui/profilemanager.py:1918 -#: ../pyhoca/wxgui/profilemanager.py:1923 -#: ../pyhoca/wxgui/profilemanager.py:1933 ../pyhoca/wxgui/menus_taskbar.py:118 +#: ../pyhoca/wxgui/profilemanager.py:2063 +#: ../pyhoca/wxgui/profilemanager.py:2066 +#: ../pyhoca/wxgui/profilemanager.py:2069 +#: ../pyhoca/wxgui/profilemanager.py:2074 +#: ../pyhoca/wxgui/profilemanager.py:2084 ../pyhoca/wxgui/menus_taskbar.py:118 msgid "Profile Manager" msgstr "Gestor de Perfiles" -#: ../pyhoca/wxgui/profilemanager.py:1912 +#: ../pyhoca/wxgui/profilemanager.py:2063 msgid "Profile name is missing, profile unusable!!!" msgstr "¡¡¡Nombre de pefil no encontrado o no válido!!!" -#: ../pyhoca/wxgui/profilemanager.py:1915 -#: ../pyhoca/wxgui/profilemanager.py:1918 +#: ../pyhoca/wxgui/profilemanager.py:2066 +#: ../pyhoca/wxgui/profilemanager.py:2069 #, python-format msgid "Profile name %s already exists!!!" msgstr "El perfil de usuario %s ya existe!!!" -#: ../pyhoca/wxgui/profilemanager.py:1923 +#: ../pyhoca/wxgui/profilemanager.py:2074 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "" "El protocolo de autenticación de comunicaciones está incompleto. Inténtalo " "otra vez." -#: ../pyhoca/wxgui/profilemanager.py:1933 +#: ../pyhoca/wxgui/profilemanager.py:2084 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -682,21 +690,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:1960 +#: ../pyhoca/wxgui/profilemanager.py:2111 #, python-format msgid "%s - profile added" msgstr "%s - perfil añadido" -#: ../pyhoca/wxgui/profilemanager.py:1961 +#: ../pyhoca/wxgui/profilemanager.py:2112 msgid "A new session profile has been added." msgstr "Se ha añadido un nuevo perfil de sesión." -#: ../pyhoca/wxgui/profilemanager.py:1965 +#: ../pyhoca/wxgui/profilemanager.py:2116 #, python-format msgid "%s - modified" msgstr "%s - modificado" -#: ../pyhoca/wxgui/profilemanager.py:1966 +#: ../pyhoca/wxgui/profilemanager.py:2117 msgid "Changes to profile have been saved." msgstr "Se han guardado los cambios en el perfil." @@ -954,88 +962,104 @@ msgstr "%s - advertencia del servidor" msgid "The X2Go Server does not publish an application menu." msgstr "El servidor X2GO no publica menú de la aplicación" -#: ../pyhoca/wxgui/frontend.py:610 +#: ../pyhoca/wxgui/frontend.py:611 msgid "Public SSH key authentication has been successful." msgstr "Se ha iniciado sesión con éxito usando la clave pública SSH." -#: ../pyhoca/wxgui/frontend.py:644 +#: ../pyhoca/wxgui/frontend.py:648 msgid "" "The SSH proxy's host key is invalid or has not been accepted by the user" msgstr "" "La clave SSH del proxy no es válida o no ha sido aceptada por el usuario" -#: ../pyhoca/wxgui/frontend.py:665 +#: ../pyhoca/wxgui/frontend.py:669 #, python-format msgid "%s - EOF error" msgstr "%s - error EOF" -#: ../pyhoca/wxgui/frontend.py:665 +#: ../pyhoca/wxgui/frontend.py:669 msgid "Authentication protocol communication incomplete! Try again..." msgstr "" "¡El protocolo de autenticación de comunicaciones está incompleto! Inténtalo " "otra vez..." -#: ../pyhoca/wxgui/frontend.py:672 +#: ../pyhoca/wxgui/frontend.py:676 #, python-format msgid "%s - auth key error" msgstr "%s - error en la clave de identificación" -#: ../pyhoca/wxgui/frontend.py:693 +#: ../pyhoca/wxgui/frontend.py:697 msgid "An unknown error occurred during authentication!" msgstr "" "¡Error desconocido al tratar de validar el nombre de usuario y la contraseña!" +#: ../pyhoca/wxgui/frontend.py:725 +#, fuzzy, python-format +msgid "%s: DirectRDP not supported yet" +msgstr "Arts (sin soporte)" + #: ../pyhoca/wxgui/frontend.py:726 +#, python-format +msgid "" +"We apologize for the inconvenience...\n" +"\n" +"Session profiles of type ,,DirectRDP'' are not\n" +"supported by %s (%s), yet!!\n" +"\n" +"DirectRDP support will be available in %s (>= 0.2.2.0)." +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:738 msgid "Unknown session profile, configure before using it..." msgstr "Perfil de Sesión Desconocido, configúralo antes de usar..." -#: ../pyhoca/wxgui/frontend.py:784 ../pyhoca/wxgui/frontend.py:1302 +#: ../pyhoca/wxgui/frontend.py:796 ../pyhoca/wxgui/frontend.py:1314 #, python-format msgid "%s - session warning" msgstr "%s - advertencia de la sesión" -#: ../pyhoca/wxgui/frontend.py:784 +#: ../pyhoca/wxgui/frontend.py:796 #, python-format msgid "Execution of command ,,%s'' failed." msgstr "Fallo al ejecutar el comando \"%s\"." -#: ../pyhoca/wxgui/frontend.py:926 +#: ../pyhoca/wxgui/frontend.py:938 msgid "Cleaning X2Go sessions..." msgstr "Limpiando sesiones X2Go..." -#: ../pyhoca/wxgui/frontend.py:961 +#: ../pyhoca/wxgui/frontend.py:973 #, python-format msgid "%s - disconnect" msgstr "%s - desconectado" -#: ../pyhoca/wxgui/frontend.py:961 +#: ../pyhoca/wxgui/frontend.py:973 msgid "X2Go Profile is now disconnected." msgstr "Se ha desconectado el Perfil X2Go." -#: ../pyhoca/wxgui/frontend.py:977 +#: ../pyhoca/wxgui/frontend.py:989 msgid "New Session Profile" msgstr "Nuevo Perfil de Sesión" -#: ../pyhoca/wxgui/frontend.py:1029 +#: ../pyhoca/wxgui/frontend.py:1041 #, python-format msgid "Really Delete Session Profile ,,%s''?" msgstr "Eliminar el Perfil de Sesión \"%s''?" -#: ../pyhoca/wxgui/frontend.py:1035 +#: ../pyhoca/wxgui/frontend.py:1047 #, python-format msgid "%s - profile deleted" msgstr "%s - perfil eliminado" -#: ../pyhoca/wxgui/frontend.py:1035 +#: ../pyhoca/wxgui/frontend.py:1047 msgid "The session profile has been deleted." msgstr "Se ha eliminado el perfil de sesión." -#: ../pyhoca/wxgui/frontend.py:1053 +#: ../pyhoca/wxgui/frontend.py:1065 #, python-format msgid "%s - share local folder with sessions of this profile" msgstr "%s - compartir carpetas locales con las sesiones de este perfil" -#: ../pyhoca/wxgui/frontend.py:1194 +#: ../pyhoca/wxgui/frontend.py:1206 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -1048,17 +1072,17 @@ msgstr "" "\n" "¿Continuar con la conexión?" -#: ../pyhoca/wxgui/frontend.py:1202 +#: ../pyhoca/wxgui/frontend.py:1214 #, python-format msgid "%s: Confirm Host Authorization" msgstr "%s: Se confirma la autorización del equipo" -#: ../pyhoca/wxgui/frontend.py:1247 +#: ../pyhoca/wxgui/frontend.py:1259 #, python-format msgid "%s - channel error" msgstr "%s - error en el canal" -#: ../pyhoca/wxgui/frontend.py:1247 +#: ../pyhoca/wxgui/frontend.py:1259 #, python-format msgid "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " @@ -1067,22 +1091,22 @@ msgstr "" "¡La conexión con el servidor %s ha finalizado inesperadamente! Intenta " "iniciar sesión nuevamente..." -#: ../pyhoca/wxgui/frontend.py:1265 ../pyhoca/wxgui/frontend.py:1283 -#: ../pyhoca/wxgui/frontend.py:1285 ../pyhoca/wxgui/frontend.py:1321 +#: ../pyhoca/wxgui/frontend.py:1277 ../pyhoca/wxgui/frontend.py:1295 +#: ../pyhoca/wxgui/frontend.py:1297 ../pyhoca/wxgui/frontend.py:1333 #, python-format msgid "%s - session failure" msgstr "%s - fallo en la sesión" -#: ../pyhoca/wxgui/frontend.py:1265 +#: ../pyhoca/wxgui/frontend.py:1277 msgid "The session startup failed." msgstr "El inicio de sesión ha fallado" -#: ../pyhoca/wxgui/frontend.py:1283 +#: ../pyhoca/wxgui/frontend.py:1295 #, python-format msgid "The command ,,%s'' is not available on X2Go server." msgstr "El comando \"%s'' no está presente en el servidor X2Go." -#: ../pyhoca/wxgui/frontend.py:1285 +#: ../pyhoca/wxgui/frontend.py:1297 #, python-format msgid "" "The command ,,%s'' is not available on X2Go server\n" @@ -1091,7 +1115,7 @@ msgstr "" "El comando \"%s\" no está disponible en el servidor X2go\n" "%s." -#: ../pyhoca/wxgui/frontend.py:1302 +#: ../pyhoca/wxgui/frontend.py:1314 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " @@ -1100,7 +1124,7 @@ msgstr "" "Se ha denegado la redirección del túnel TCP inverso para la sesión %s al " "puerto %s del servidor X2Go." -#: ../pyhoca/wxgui/frontend.py:1321 +#: ../pyhoca/wxgui/frontend.py:1333 #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " @@ -1109,37 +1133,37 @@ msgstr "" "La solicitud de túnel a %s:%s para la sesión %s ha sido denegada por el " "servidor X2go/SSH . Fallo en el inicio de sesión." -#: ../pyhoca/wxgui/frontend.py:1340 +#: ../pyhoca/wxgui/frontend.py:1352 #, python-format msgid "%s - audio warning" msgstr "%s - advertencia en el sistema de audio" -#: ../pyhoca/wxgui/frontend.py:1340 +#: ../pyhoca/wxgui/frontend.py:1352 msgid "" "The X2Go PulseAudio system is not available within Remote Desktop sessions." msgstr "" "El sistema X2Go PulseAudio no está disponible en las sesiones del tipo " "Remote Desktop" -#: ../pyhoca/wxgui/frontend.py:1347 ../pyhoca/wxgui/frontend.py:1354 +#: ../pyhoca/wxgui/frontend.py:1359 ../pyhoca/wxgui/frontend.py:1366 #, python-format msgid "%s - audio error" msgstr "%s - error en el audio" -#: ../pyhoca/wxgui/frontend.py:1347 +#: ../pyhoca/wxgui/frontend.py:1359 msgid "The X2Go PulseAudio system could not be started." msgstr "El sistema X2Go PulseAudio no puede iniciarse" -#: ../pyhoca/wxgui/frontend.py:1354 +#: ../pyhoca/wxgui/frontend.py:1366 msgid "The X2Go PulseAudio system has died unexpectedly." msgstr "El sistema X2Go PulseAudio ha finalizado inesperadamente" -#: ../pyhoca/wxgui/frontend.py:1366 +#: ../pyhoca/wxgui/frontend.py:1378 #, python-format msgid "%s - audio problem" msgstr "%s - problema en el audio" -#: ../pyhoca/wxgui/frontend.py:1366 +#: ../pyhoca/wxgui/frontend.py:1378 #, python-format msgid "" "The audio connection could not be set up for this session.\n" @@ -1148,13 +1172,13 @@ msgstr "" "La conexión de audio puede que no esté configurada para esta sesión.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1378 +#: ../pyhoca/wxgui/frontend.py:1390 #, python-format msgid "%s - client-side printing not available" msgstr "" "%s - el sistema de impresión en el lado del cliente no está disponible -" -#: ../pyhoca/wxgui/frontend.py:1378 +#: ../pyhoca/wxgui/frontend.py:1390 #, python-format msgid "" "The server denies client-side printing from within this session.\n" @@ -1163,12 +1187,12 @@ msgstr "" "El servidor no permite la impresión del lado del cliente para esta sesión.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1390 +#: ../pyhoca/wxgui/frontend.py:1402 #, python-format msgid "%s - MIME box not available" msgstr "%s - No está disponible el contexto MIME" -#: ../pyhoca/wxgui/frontend.py:1390 +#: ../pyhoca/wxgui/frontend.py:1402 #, python-format msgid "" "The server does not support the X2Go MIME box.\n" @@ -1177,12 +1201,12 @@ msgstr "" "El servidor no soporta el contexto X2Go MIME.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1402 +#: ../pyhoca/wxgui/frontend.py:1414 #, python-format msgid "%s - client-side folders not sharable" msgstr "%s - las carpetas del lado del cliente no están compartidas" -#: ../pyhoca/wxgui/frontend.py:1402 +#: ../pyhoca/wxgui/frontend.py:1414 #, python-format msgid "" "The server denies client-side folder sharing with this session.\n" @@ -1192,12 +1216,12 @@ msgstr "" "sesión.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1414 +#: ../pyhoca/wxgui/frontend.py:1426 #, python-format msgid "%s - client resources not sharable" msgstr "%s - el recurso del cliente no está marcado como compartido" -#: ../pyhoca/wxgui/frontend.py:1414 +#: ../pyhoca/wxgui/frontend.py:1426 #, python-format msgid "" "Client-side folders and printers cannot be shared with this session.\n" @@ -1207,12 +1231,12 @@ msgstr "" "permitidas en esta sesión.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1433 ../pyhoca/wxgui/frontend.py:1435 +#: ../pyhoca/wxgui/frontend.py:1445 ../pyhoca/wxgui/frontend.py:1447 #, python-format msgid "%s - print error" msgstr "%s - error de impresión" -#: ../pyhoca/wxgui/frontend.py:1433 +#: ../pyhoca/wxgui/frontend.py:1445 #, python-format msgid "" "%s\n" @@ -1223,7 +1247,7 @@ msgstr "" "...provocado en la impresora %s por la sesión\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1435 +#: ../pyhoca/wxgui/frontend.py:1447 #, python-format msgid "" "%s\n" @@ -1234,12 +1258,12 @@ msgstr "" "...provocado por la sesión\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1450 ../pyhoca/wxgui/frontend.py:1465 +#: ../pyhoca/wxgui/frontend.py:1462 ../pyhoca/wxgui/frontend.py:1477 #, python-format msgid "%s - start" msgstr "%s - inicio" -#: ../pyhoca/wxgui/frontend.py:1450 +#: ../pyhoca/wxgui/frontend.py:1462 #, python-format msgid "" "New X2Go session starting up...\n" @@ -1248,7 +1272,7 @@ msgstr "" "Iniciando nueva sesión X2Go...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1465 +#: ../pyhoca/wxgui/frontend.py:1477 #, python-format msgid "" "Another client started X2Go session\n" @@ -1257,12 +1281,12 @@ msgstr "" "Otro cliente ha iniciado sesión X2go\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1480 ../pyhoca/wxgui/frontend.py:1495 +#: ../pyhoca/wxgui/frontend.py:1492 ../pyhoca/wxgui/frontend.py:1507 #, python-format msgid "%s - resume" msgstr "%s - retornar a la sesión" -#: ../pyhoca/wxgui/frontend.py:1480 +#: ../pyhoca/wxgui/frontend.py:1492 #, python-format msgid "" "Resuming X2Go session...\n" @@ -1271,7 +1295,7 @@ msgstr "" "Retornando sesión X2Go...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1495 +#: ../pyhoca/wxgui/frontend.py:1507 #, python-format msgid "" "Another client resumed X2Go session\n" @@ -1280,12 +1304,12 @@ msgstr "" "Otro cliente retornó a la sesión X2go\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1510 +#: ../pyhoca/wxgui/frontend.py:1522 #, python-format msgid "%s - running" msgstr "%s - en ejecución" -#: ../pyhoca/wxgui/frontend.py:1510 +#: ../pyhoca/wxgui/frontend.py:1522 #, python-format msgid "" "Found already running session\n" @@ -1294,12 +1318,12 @@ msgstr "" "La sesión ya está en ejecución\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1530 +#: ../pyhoca/wxgui/frontend.py:1542 #, python-format msgid "%s - suspend" msgstr "%s - suspender" -#: ../pyhoca/wxgui/frontend.py:1530 +#: ../pyhoca/wxgui/frontend.py:1542 #, python-format msgid "" "X2Go Session has been suspended\n" @@ -1308,12 +1332,12 @@ msgstr "" "Se ha suspendido la Sesión X2go\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1557 +#: ../pyhoca/wxgui/frontend.py:1569 #, python-format msgid "%s - terminate" msgstr "%s - finalizar" -#: ../pyhoca/wxgui/frontend.py:1557 +#: ../pyhoca/wxgui/frontend.py:1569 #, python-format msgid "" "X2Go Session has terminated\n" @@ -1454,6 +1478,12 @@ msgstr "Cambiar título de la sesión a" msgid "OK" msgstr "Ok" +#~ msgid "RSA/DSA private key" +#~ msgstr "Clave privada RSA/DSA" + +#~ msgid "Host[:Port]" +#~ msgstr "Host[:Puerto]" + #~ msgid "Keyboard layout" #~ msgstr "Máscara de teclado" diff --git a/po/fr.po b/po/fr.po index b8bae00..fe476e1 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-10 21:18+0200\n" +"POT-Creation-Date: 2012-09-28 10:00+0200\n" "PO-Revision-Date: 2011-09-17 02:17+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: Renaud Gaudin <rgaudin(a)gmail.com>\n" @@ -50,94 +50,94 @@ msgstr "" msgid "SSH proxy server login" msgstr "" -#: ../pyhoca/wxgui/logon.py:133 ../pyhoca/wxgui/profilemanager.py:322 +#: ../pyhoca/wxgui/logon.py:133 ../pyhoca/wxgui/profilemanager.py:346 #: ../pyhoca/wxgui/messages.py:132 ../pyhoca/wxgui/printingprefs.py:147 #: ../pyhoca/wxgui/sessiontitle.py:85 msgid "Cancel" msgstr "" -#: ../pyhoca/wxgui/logon.py:292 ../pyhoca/wxgui/logon.py:334 -#: ../pyhoca/wxgui/frontend.py:603 +#: ../pyhoca/wxgui/logon.py:301 ../pyhoca/wxgui/logon.py:343 +#: ../pyhoca/wxgui/frontend.py:604 #, python-format msgid "%s - connect failure" msgstr "" -#: ../pyhoca/wxgui/logon.py:293 ../pyhoca/wxgui/frontend.py:603 +#: ../pyhoca/wxgui/logon.py:302 ../pyhoca/wxgui/frontend.py:604 msgid "User is not allowed to start X2Go sessions!" msgstr "" -#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:610 +#: ../pyhoca/wxgui/logon.py:307 ../pyhoca/wxgui/frontend.py:611 #, python-format msgid "%s - connect" msgstr "" -#: ../pyhoca/wxgui/logon.py:299 +#: ../pyhoca/wxgui/logon.py:308 msgid "Authentication has been successful." msgstr "" -#: ../pyhoca/wxgui/logon.py:330 +#: ../pyhoca/wxgui/logon.py:339 msgid "SSH tunnel started" msgstr "" -#: ../pyhoca/wxgui/logon.py:335 +#: ../pyhoca/wxgui/logon.py:344 msgid "Authentication failed!" msgstr "" -#: ../pyhoca/wxgui/logon.py:342 +#: ../pyhoca/wxgui/logon.py:351 #, python-format msgid "%s - SSH proxy" msgstr "" -#: ../pyhoca/wxgui/logon.py:343 +#: ../pyhoca/wxgui/logon.py:352 msgid "Authentication to the SSH proxy server failed!" msgstr "" -#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:658 +#: ../pyhoca/wxgui/logon.py:374 ../pyhoca/wxgui/frontend.py:662 #, python-format msgid "%s - socket error" msgstr "" -#: ../pyhoca/wxgui/logon.py:372 ../pyhoca/wxgui/frontend.py:637 -#: ../pyhoca/wxgui/frontend.py:644 +#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:641 +#: ../pyhoca/wxgui/frontend.py:648 #, python-format msgid "%s - host key error" msgstr "" -#: ../pyhoca/wxgui/logon.py:373 ../pyhoca/wxgui/frontend.py:637 +#: ../pyhoca/wxgui/logon.py:382 ../pyhoca/wxgui/frontend.py:641 msgid "" "The remote server's host key is invalid or has not been accepted by the user" msgstr "" -#: ../pyhoca/wxgui/logon.py:380 ../pyhoca/wxgui/frontend.py:679 +#: ../pyhoca/wxgui/logon.py:389 ../pyhoca/wxgui/frontend.py:683 #, python-format msgid "%s - missing home directory" msgstr "" -#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:679 +#: ../pyhoca/wxgui/logon.py:390 ../pyhoca/wxgui/frontend.py:683 msgid "The remote user's home directory does not exist." msgstr "" -#: ../pyhoca/wxgui/logon.py:388 +#: ../pyhoca/wxgui/logon.py:397 #, python-format msgid "%s - key error" msgstr "" -#: ../pyhoca/wxgui/logon.py:396 ../pyhoca/wxgui/frontend.py:686 +#: ../pyhoca/wxgui/logon.py:405 ../pyhoca/wxgui/frontend.py:690 #, python-format msgid "%s - auth error" msgstr "" -#: ../pyhoca/wxgui/logon.py:404 ../pyhoca/wxgui/frontend.py:630 +#: ../pyhoca/wxgui/logon.py:413 ../pyhoca/wxgui/frontend.py:634 #, python-format msgid "%s - SSH error" msgstr "" -#: ../pyhoca/wxgui/logon.py:412 +#: ../pyhoca/wxgui/logon.py:421 #, python-format msgid "%s - unknown error" msgstr "" -#: ../pyhoca/wxgui/logon.py:413 +#: ../pyhoca/wxgui/logon.py:422 msgid "An unknown error occured during authentication!" msgstr "" @@ -167,490 +167,497 @@ msgid "" "Client for connecting you to a remote X2Go server" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:82 +#: ../pyhoca/wxgui/profilemanager.py:83 msgid "GNOME Desktop (GNOME)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:83 +#: ../pyhoca/wxgui/profilemanager.py:84 msgid "K Desktop Environment (KDE)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:84 +#: ../pyhoca/wxgui/profilemanager.py:85 msgid "Lightweight X Desktop (LXDE)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:85 +#: ../pyhoca/wxgui/profilemanager.py:86 msgid "Trinity X Desktop (KDE3-like)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:86 +#: ../pyhoca/wxgui/profilemanager.py:87 msgid "Unity X Desktop Shell (UNITY)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:87 +#: ../pyhoca/wxgui/profilemanager.py:88 msgid "XFCE4 Desktop (XFCE4)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:88 +#: ../pyhoca/wxgui/profilemanager.py:89 msgid "Published Applications" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:89 +#: ../pyhoca/wxgui/profilemanager.py:90 msgid "Single Application" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:90 +#: ../pyhoca/wxgui/profilemanager.py:91 msgid "XDMCP Query" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:91 -msgid "Windows Terminal Server (RDP-proxy)" +#: ../pyhoca/wxgui/profilemanager.py:92 +msgid "Windows Terminal Server (X2Go-proxied RDP)" msgstr "" -#. 'DirectRDP': 'Windows Terminal Server (RDP-direct)', -#: ../pyhoca/wxgui/profilemanager.py:93 ../pyhoca/wxgui/profilemanager.py:207 +#: ../pyhoca/wxgui/profilemanager.py:94 ../pyhoca/wxgui/profilemanager.py:227 msgid "Custom command" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:398 +#: ../pyhoca/wxgui/profilemanager.py:99 ../pyhoca/wxgui/menus_taskbar.py:398 msgid "Internet Browser" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:399 +#: ../pyhoca/wxgui/profilemanager.py:100 ../pyhoca/wxgui/menus_taskbar.py:399 msgid "Email Client" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:400 +#: ../pyhoca/wxgui/profilemanager.py:101 ../pyhoca/wxgui/menus_taskbar.py:400 msgid "Office" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:99 ../pyhoca/wxgui/menus_taskbar.py:401 +#: ../pyhoca/wxgui/profilemanager.py:102 ../pyhoca/wxgui/menus_taskbar.py:401 msgid "Terminal" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:113 +#: ../pyhoca/wxgui/profilemanager.py:120 msgid "Open file with system's default application" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:114 +#: ../pyhoca/wxgui/profilemanager.py:121 msgid "Open application chooser dialog" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:115 +#: ../pyhoca/wxgui/profilemanager.py:122 msgid "Save incoming file as ..." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:143 +#: ../pyhoca/wxgui/profilemanager.py:150 msgid "settings derived from " msgstr "" #. boxes for all tabs -#: ../pyhoca/wxgui/profilemanager.py:160 +#: ../pyhoca/wxgui/profilemanager.py:170 msgid "Session Title" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:161 +#: ../pyhoca/wxgui/profilemanager.py:171 msgid "Session Window" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:162 +#: ../pyhoca/wxgui/profilemanager.py:172 msgid "Session Startup" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:163 +#: ../pyhoca/wxgui/profilemanager.py:173 msgid "Server" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:164 +#: ../pyhoca/wxgui/profilemanager.py:174 +msgid "Proxy" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:175 msgid "Connection Link Speed" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:165 +#: ../pyhoca/wxgui/profilemanager.py:176 msgid "Compression" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:166 +#: ../pyhoca/wxgui/profilemanager.py:177 msgid "Display" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:167 +#: ../pyhoca/wxgui/profilemanager.py:178 msgid "Keyboard" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:168 +#: ../pyhoca/wxgui/profilemanager.py:179 msgid "Sound" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:169 +#: ../pyhoca/wxgui/profilemanager.py:180 msgid "Printing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:170 +#: ../pyhoca/wxgui/profilemanager.py:181 msgid "Folder Exports" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:171 +#: ../pyhoca/wxgui/profilemanager.py:182 msgid "File Import" msgstr "" #. ## #. ## widgets for the PROFILE tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:176 +#: ../pyhoca/wxgui/profilemanager.py:187 msgid "Name" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:183 +#: ../pyhoca/wxgui/profilemanager.py:194 msgid "Set session window title" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:184 +#: ../pyhoca/wxgui/profilemanager.py:195 msgid "Use a default session window title" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:185 +#: ../pyhoca/wxgui/profilemanager.py:196 msgid "Custom session window title" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:195 +#: ../pyhoca/wxgui/profilemanager.py:215 msgid "Window Icon" msgstr "" #. ## #. ## widgets for the SESSION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:201 +#: ../pyhoca/wxgui/profilemanager.py:221 msgid "Start session automatically after login" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:202 +#: ../pyhoca/wxgui/profilemanager.py:222 #, python-format msgid "Login automatically after %s has started" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:203 +#: ../pyhoca/wxgui/profilemanager.py:223 msgid "Type" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:205 +#: ../pyhoca/wxgui/profilemanager.py:225 msgid "Application" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:209 +#: ../pyhoca/wxgui/profilemanager.py:229 msgid "XDMCP server" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:211 +#: ../pyhoca/wxgui/profilemanager.py:231 msgid "RDP server" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:213 +#: ../pyhoca/wxgui/profilemanager.py:233 msgid "RDP options" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:215 +#: ../pyhoca/wxgui/profilemanager.py:235 msgid "Integrate remote application(s) into local desktop (rootless mode)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:216 +#: ../pyhoca/wxgui/profilemanager.py:236 msgid "Menu of published applications" msgstr "" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:223 ../pyhoca/wxgui/profilemanager.py:233 +#: ../pyhoca/wxgui/profilemanager.py:243 ../pyhoca/wxgui/profilemanager.py:253 msgid "User" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:225 +#: ../pyhoca/wxgui/profilemanager.py:245 ../pyhoca/wxgui/profilemanager.py:260 msgid "Host" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:227 +#: ../pyhoca/wxgui/profilemanager.py:247 ../pyhoca/wxgui/profilemanager.py:262 msgid "Port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:229 -msgid "RSA/DSA private key" +#: ../pyhoca/wxgui/profilemanager.py:249 +msgid "Key" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:232 +#: ../pyhoca/wxgui/profilemanager.py:252 msgid "Server behind SSH proxy" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:235 -msgid "Key file" +#: ../pyhoca/wxgui/profilemanager.py:255 +msgid "Use same username for X2Go and proxy host" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:256 +msgid "Use same authentication for X2Go and proxy host" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:238 -msgid "Host[:Port]" +#: ../pyhoca/wxgui/profilemanager.py:257 +msgid "Key file" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:240 +#: ../pyhoca/wxgui/profilemanager.py:264 msgid "SSH Proxy Tunnel" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:248 +#: ../pyhoca/wxgui/profilemanager.py:272 msgid "Modem" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:249 +#: ../pyhoca/wxgui/profilemanager.py:273 msgid "ISDN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:250 +#: ../pyhoca/wxgui/profilemanager.py:274 msgid "ADSL" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:251 +#: ../pyhoca/wxgui/profilemanager.py:275 msgid "WAN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:252 +#: ../pyhoca/wxgui/profilemanager.py:276 msgid "LAN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:254 +#: ../pyhoca/wxgui/profilemanager.py:278 msgid "Method" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:256 +#: ../pyhoca/wxgui/profilemanager.py:280 msgid "Image quality" msgstr "" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:262 +#: ../pyhoca/wxgui/profilemanager.py:286 msgid "Fullscreen" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:263 +#: ../pyhoca/wxgui/profilemanager.py:287 msgid "Custom Size" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:268 +#: ../pyhoca/wxgui/profilemanager.py:292 msgid "Set display DPI" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:270 +#: ../pyhoca/wxgui/profilemanager.py:294 msgid "Do not set (use server-side tools to configure the keyboard)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:271 +#: ../pyhoca/wxgui/profilemanager.py:295 msgid "" "Automatically detect and use client-side keyboard configuration inside the " "session" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:272 +#: ../pyhoca/wxgui/profilemanager.py:296 msgid "Use custom keyboard settings as provided below" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:273 +#: ../pyhoca/wxgui/profilemanager.py:297 msgid "Keyboard model" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:275 +#: ../pyhoca/wxgui/profilemanager.py:299 msgid "Layout" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:277 +#: ../pyhoca/wxgui/profilemanager.py:301 msgid "Layout variant" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:279 +#: ../pyhoca/wxgui/profilemanager.py:303 msgid "Enable sound support" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:280 +#: ../pyhoca/wxgui/profilemanager.py:304 msgid "Pulse Audio" msgstr "" #. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated. #. However, config files can contain an Arts configuration, so we will honour this -#: ../pyhoca/wxgui/profilemanager.py:284 +#: ../pyhoca/wxgui/profilemanager.py:308 msgid "Arts (not supported)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:287 +#: ../pyhoca/wxgui/profilemanager.py:311 msgid "esd" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:288 +#: ../pyhoca/wxgui/profilemanager.py:312 msgid "Use default sound port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:289 +#: ../pyhoca/wxgui/profilemanager.py:313 msgid "Custom sound port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:291 +#: ../pyhoca/wxgui/profilemanager.py:315 msgid "Client Side printing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:293 +#: ../pyhoca/wxgui/profilemanager.py:317 msgid "Use local folder sharing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:294 +#: ../pyhoca/wxgui/profilemanager.py:318 msgid "Path" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:297 ../pyhoca/wxgui/profilemanager.py:316 +#: ../pyhoca/wxgui/profilemanager.py:321 ../pyhoca/wxgui/profilemanager.py:340 msgid "Add" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:299 +#: ../pyhoca/wxgui/profilemanager.py:323 msgid "Local Path" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:300 +#: ../pyhoca/wxgui/profilemanager.py:324 msgid "Connect Method" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:301 +#: ../pyhoca/wxgui/profilemanager.py:325 msgid "Delete" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:303 +#: ../pyhoca/wxgui/profilemanager.py:327 msgid "Convert between client and server encodings" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:304 +#: ../pyhoca/wxgui/profilemanager.py:328 msgid "Client encoding" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:306 +#: ../pyhoca/wxgui/profilemanager.py:330 msgid "Server encoding" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:309 +#: ../pyhoca/wxgui/profilemanager.py:333 msgid "Use file MIME box for local file import" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:310 +#: ../pyhoca/wxgui/profilemanager.py:334 msgid "Extensions" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:312 +#: ../pyhoca/wxgui/profilemanager.py:336 msgid "Action" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:317 +#: ../pyhoca/wxgui/profilemanager.py:341 msgid "Defaults" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:319 +#: ../pyhoca/wxgui/profilemanager.py:343 msgid "Save" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:320 +#: ../pyhoca/wxgui/profilemanager.py:344 msgid "Reset" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:365 -#: ../pyhoca/wxgui/profilemanager.py:1078 -#: ../pyhoca/wxgui/profilemanager.py:1832 +#: ../pyhoca/wxgui/profilemanager.py:394 +#: ../pyhoca/wxgui/profilemanager.py:1089 +#: ../pyhoca/wxgui/profilemanager.py:1983 msgid "automatically" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:367 -#: ../pyhoca/wxgui/profilemanager.py:1080 +#: ../pyhoca/wxgui/profilemanager.py:396 +#: ../pyhoca/wxgui/profilemanager.py:1091 msgid "manually" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:376 +#: ../pyhoca/wxgui/profilemanager.py:405 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:378 +#: ../pyhoca/wxgui/profilemanager.py:407 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:380 +#: ../pyhoca/wxgui/profilemanager.py:409 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:751 +#: ../pyhoca/wxgui/profilemanager.py:769 msgid "Profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:752 +#: ../pyhoca/wxgui/profilemanager.py:770 msgid "Session" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:753 +#: ../pyhoca/wxgui/profilemanager.py:771 msgid "Connection" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:754 +#: ../pyhoca/wxgui/profilemanager.py:772 msgid "Settings" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:755 +#: ../pyhoca/wxgui/profilemanager.py:773 msgid "Sharing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:996 +#: ../pyhoca/wxgui/profilemanager.py:1007 msgid "<xkbtype>" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:997 +#: ../pyhoca/wxgui/profilemanager.py:1008 msgid "<xkblayout>" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:998 +#: ../pyhoca/wxgui/profilemanager.py:1009 msgid "<xkbvariant>" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1284 +#: ../pyhoca/wxgui/profilemanager.py:1306 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1287 +#: ../pyhoca/wxgui/profilemanager.py:1309 msgid "Choose an icon for this session profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1509 +#: ../pyhoca/wxgui/profilemanager.py:1600 msgid "All files (*.*)|*" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1511 -#: ../pyhoca/wxgui/profilemanager.py:1533 +#: ../pyhoca/wxgui/profilemanager.py:1602 +#: ../pyhoca/wxgui/profilemanager.py:1626 msgid "Choose a public SSH key" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1784 +#: ../pyhoca/wxgui/profilemanager.py:1935 msgid "Choose a folder to share within a session" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1912 -#: ../pyhoca/wxgui/profilemanager.py:1915 -#: ../pyhoca/wxgui/profilemanager.py:1918 -#: ../pyhoca/wxgui/profilemanager.py:1923 -#: ../pyhoca/wxgui/profilemanager.py:1933 ../pyhoca/wxgui/menus_taskbar.py:118 +#: ../pyhoca/wxgui/profilemanager.py:2063 +#: ../pyhoca/wxgui/profilemanager.py:2066 +#: ../pyhoca/wxgui/profilemanager.py:2069 +#: ../pyhoca/wxgui/profilemanager.py:2074 +#: ../pyhoca/wxgui/profilemanager.py:2084 ../pyhoca/wxgui/menus_taskbar.py:118 msgid "Profile Manager" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1912 +#: ../pyhoca/wxgui/profilemanager.py:2063 msgid "Profile name is missing, profile unusable!!!" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1915 -#: ../pyhoca/wxgui/profilemanager.py:1918 +#: ../pyhoca/wxgui/profilemanager.py:2066 +#: ../pyhoca/wxgui/profilemanager.py:2069 #, python-format msgid "Profile name %s already exists!!!" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1923 +#: ../pyhoca/wxgui/profilemanager.py:2074 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1933 +#: ../pyhoca/wxgui/profilemanager.py:2084 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -658,21 +665,21 @@ msgid "" "Please change the SSH proxy settings accordingly." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1960 +#: ../pyhoca/wxgui/profilemanager.py:2111 #, python-format msgid "%s - profile added" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1961 +#: ../pyhoca/wxgui/profilemanager.py:2112 msgid "A new session profile has been added." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1965 +#: ../pyhoca/wxgui/profilemanager.py:2116 #, python-format msgid "%s - modified" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1966 +#: ../pyhoca/wxgui/profilemanager.py:2117 msgid "Changes to profile have been saved." msgstr "" @@ -930,84 +937,100 @@ msgstr "" msgid "The X2Go Server does not publish an application menu." msgstr "" -#: ../pyhoca/wxgui/frontend.py:610 +#: ../pyhoca/wxgui/frontend.py:611 msgid "Public SSH key authentication has been successful." msgstr "" -#: ../pyhoca/wxgui/frontend.py:644 +#: ../pyhoca/wxgui/frontend.py:648 msgid "" "The SSH proxy's host key is invalid or has not been accepted by the user" msgstr "" -#: ../pyhoca/wxgui/frontend.py:665 +#: ../pyhoca/wxgui/frontend.py:669 #, python-format msgid "%s - EOF error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:665 +#: ../pyhoca/wxgui/frontend.py:669 msgid "Authentication protocol communication incomplete! Try again..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:672 +#: ../pyhoca/wxgui/frontend.py:676 #, python-format msgid "%s - auth key error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:693 +#: ../pyhoca/wxgui/frontend.py:697 msgid "An unknown error occurred during authentication!" msgstr "" +#: ../pyhoca/wxgui/frontend.py:725 +#, python-format +msgid "%s: DirectRDP not supported yet" +msgstr "" + #: ../pyhoca/wxgui/frontend.py:726 +#, python-format +msgid "" +"We apologize for the inconvenience...\n" +"\n" +"Session profiles of type ,,DirectRDP'' are not\n" +"supported by %s (%s), yet!!\n" +"\n" +"DirectRDP support will be available in %s (>= 0.2.2.0)." +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:738 msgid "Unknown session profile, configure before using it..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:784 ../pyhoca/wxgui/frontend.py:1302 +#: ../pyhoca/wxgui/frontend.py:796 ../pyhoca/wxgui/frontend.py:1314 #, python-format msgid "%s - session warning" msgstr "" -#: ../pyhoca/wxgui/frontend.py:784 +#: ../pyhoca/wxgui/frontend.py:796 #, python-format msgid "Execution of command ,,%s'' failed." msgstr "" -#: ../pyhoca/wxgui/frontend.py:926 +#: ../pyhoca/wxgui/frontend.py:938 msgid "Cleaning X2Go sessions..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:961 +#: ../pyhoca/wxgui/frontend.py:973 #, python-format msgid "%s - disconnect" msgstr "" -#: ../pyhoca/wxgui/frontend.py:961 +#: ../pyhoca/wxgui/frontend.py:973 msgid "X2Go Profile is now disconnected." msgstr "" -#: ../pyhoca/wxgui/frontend.py:977 +#: ../pyhoca/wxgui/frontend.py:989 msgid "New Session Profile" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1029 +#: ../pyhoca/wxgui/frontend.py:1041 #, python-format msgid "Really Delete Session Profile ,,%s''?" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1035 +#: ../pyhoca/wxgui/frontend.py:1047 #, python-format msgid "%s - profile deleted" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1035 +#: ../pyhoca/wxgui/frontend.py:1047 msgid "The session profile has been deleted." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1053 +#: ../pyhoca/wxgui/frontend.py:1065 #, python-format msgid "%s - share local folder with sessions of this profile" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1194 +#: ../pyhoca/wxgui/frontend.py:1206 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -1016,148 +1039,148 @@ msgid "" "Are you sure you want to continue connecting?" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1202 +#: ../pyhoca/wxgui/frontend.py:1214 #, python-format msgid "%s: Confirm Host Authorization" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1247 +#: ../pyhoca/wxgui/frontend.py:1259 #, python-format msgid "%s - channel error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1247 +#: ../pyhoca/wxgui/frontend.py:1259 #, python-format msgid "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " "server..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1265 ../pyhoca/wxgui/frontend.py:1283 -#: ../pyhoca/wxgui/frontend.py:1285 ../pyhoca/wxgui/frontend.py:1321 +#: ../pyhoca/wxgui/frontend.py:1277 ../pyhoca/wxgui/frontend.py:1295 +#: ../pyhoca/wxgui/frontend.py:1297 ../pyhoca/wxgui/frontend.py:1333 #, python-format msgid "%s - session failure" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1265 +#: ../pyhoca/wxgui/frontend.py:1277 msgid "The session startup failed." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1283 +#: ../pyhoca/wxgui/frontend.py:1295 #, python-format msgid "The command ,,%s'' is not available on X2Go server." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1285 +#: ../pyhoca/wxgui/frontend.py:1297 #, python-format msgid "" "The command ,,%s'' is not available on X2Go server\n" "%s." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1302 +#: ../pyhoca/wxgui/frontend.py:1314 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " "been denied." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1321 +#: ../pyhoca/wxgui/frontend.py:1333 #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " "X2go/SSH server. Session startup failed." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1340 +#: ../pyhoca/wxgui/frontend.py:1352 #, python-format msgid "%s - audio warning" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1340 +#: ../pyhoca/wxgui/frontend.py:1352 msgid "" "The X2Go PulseAudio system is not available within Remote Desktop sessions." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1347 ../pyhoca/wxgui/frontend.py:1354 +#: ../pyhoca/wxgui/frontend.py:1359 ../pyhoca/wxgui/frontend.py:1366 #, python-format msgid "%s - audio error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1347 +#: ../pyhoca/wxgui/frontend.py:1359 msgid "The X2Go PulseAudio system could not be started." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1354 +#: ../pyhoca/wxgui/frontend.py:1366 msgid "The X2Go PulseAudio system has died unexpectedly." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1366 +#: ../pyhoca/wxgui/frontend.py:1378 #, python-format msgid "%s - audio problem" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1366 +#: ../pyhoca/wxgui/frontend.py:1378 #, python-format msgid "" "The audio connection could not be set up for this session.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1378 +#: ../pyhoca/wxgui/frontend.py:1390 #, python-format msgid "%s - client-side printing not available" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1378 +#: ../pyhoca/wxgui/frontend.py:1390 #, python-format msgid "" "The server denies client-side printing from within this session.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1390 +#: ../pyhoca/wxgui/frontend.py:1402 #, python-format msgid "%s - MIME box not available" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1390 +#: ../pyhoca/wxgui/frontend.py:1402 #, python-format msgid "" "The server does not support the X2Go MIME box.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1402 +#: ../pyhoca/wxgui/frontend.py:1414 #, python-format msgid "%s - client-side folders not sharable" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1402 +#: ../pyhoca/wxgui/frontend.py:1414 #, python-format msgid "" "The server denies client-side folder sharing with this session.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1414 +#: ../pyhoca/wxgui/frontend.py:1426 #, python-format msgid "%s - client resources not sharable" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1414 +#: ../pyhoca/wxgui/frontend.py:1426 #, python-format msgid "" "Client-side folders and printers cannot be shared with this session.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1433 ../pyhoca/wxgui/frontend.py:1435 +#: ../pyhoca/wxgui/frontend.py:1445 ../pyhoca/wxgui/frontend.py:1447 #, python-format msgid "%s - print error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1433 +#: ../pyhoca/wxgui/frontend.py:1445 #, python-format msgid "" "%s\n" @@ -1165,7 +1188,7 @@ msgid "" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1435 +#: ../pyhoca/wxgui/frontend.py:1447 #, python-format msgid "" "%s\n" @@ -1173,74 +1196,74 @@ msgid "" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1450 ../pyhoca/wxgui/frontend.py:1465 +#: ../pyhoca/wxgui/frontend.py:1462 ../pyhoca/wxgui/frontend.py:1477 #, python-format msgid "%s - start" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1450 +#: ../pyhoca/wxgui/frontend.py:1462 #, python-format msgid "" "New X2Go session starting up...\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1465 +#: ../pyhoca/wxgui/frontend.py:1477 #, python-format msgid "" "Another client started X2Go session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1480 ../pyhoca/wxgui/frontend.py:1495 +#: ../pyhoca/wxgui/frontend.py:1492 ../pyhoca/wxgui/frontend.py:1507 #, python-format msgid "%s - resume" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1480 +#: ../pyhoca/wxgui/frontend.py:1492 #, python-format msgid "" "Resuming X2Go session...\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1495 +#: ../pyhoca/wxgui/frontend.py:1507 #, python-format msgid "" "Another client resumed X2Go session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1510 +#: ../pyhoca/wxgui/frontend.py:1522 #, python-format msgid "%s - running" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1510 +#: ../pyhoca/wxgui/frontend.py:1522 #, python-format msgid "" "Found already running session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1530 +#: ../pyhoca/wxgui/frontend.py:1542 #, python-format msgid "%s - suspend" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1530 +#: ../pyhoca/wxgui/frontend.py:1542 #, python-format msgid "" "X2Go Session has been suspended\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1557 +#: ../pyhoca/wxgui/frontend.py:1569 #, python-format msgid "%s - terminate" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1557 +#: ../pyhoca/wxgui/frontend.py:1569 #, python-format msgid "" "X2Go Session has terminated\n" diff --git a/po/nb_NO.po b/po/nb_NO.po index cc75284..5a76931 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-06-10 21:18+0200\n" +"POT-Creation-Date: 2012-09-28 10:00+0200\n" "PO-Revision-Date: 2012-06-03 14:30+0100\n" "Last-Translator: Terje Andersen <teranders(a)gmail.com>\n" "Language-Team: nb_NO <x2go-i18n(a)lists.berlios.de>\n" @@ -49,96 +49,96 @@ msgstr "Sesjons innlogging" msgid "SSH proxy server login" msgstr "logg inn via en SSH mellomtjener" -#: ../pyhoca/wxgui/logon.py:133 ../pyhoca/wxgui/profilemanager.py:322 +#: ../pyhoca/wxgui/logon.py:133 ../pyhoca/wxgui/profilemanager.py:346 #: ../pyhoca/wxgui/messages.py:132 ../pyhoca/wxgui/printingprefs.py:147 #: ../pyhoca/wxgui/sessiontitle.py:85 msgid "Cancel" msgstr "Avbryt" -#: ../pyhoca/wxgui/logon.py:292 ../pyhoca/wxgui/logon.py:334 -#: ../pyhoca/wxgui/frontend.py:603 +#: ../pyhoca/wxgui/logon.py:301 ../pyhoca/wxgui/logon.py:343 +#: ../pyhoca/wxgui/frontend.py:604 #, python-format msgid "%s - connect failure" msgstr "%s - tilkoblingsfeil" -#: ../pyhoca/wxgui/logon.py:293 ../pyhoca/wxgui/frontend.py:603 +#: ../pyhoca/wxgui/logon.py:302 ../pyhoca/wxgui/frontend.py:604 msgid "User is not allowed to start X2Go sessions!" msgstr "Bruker kontoen har ikke tillatelse til å starte X2Go sesjoner!" -#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:610 +#: ../pyhoca/wxgui/logon.py:307 ../pyhoca/wxgui/frontend.py:611 #, python-format msgid "%s - connect" msgstr "%s - koble til" -#: ../pyhoca/wxgui/logon.py:299 +#: ../pyhoca/wxgui/logon.py:308 msgid "Authentication has been successful." msgstr "Autentiseringen var vellykket." -#: ../pyhoca/wxgui/logon.py:330 +#: ../pyhoca/wxgui/logon.py:339 msgid "SSH tunnel started" msgstr "SSH tunnel har startet" -#: ../pyhoca/wxgui/logon.py:335 +#: ../pyhoca/wxgui/logon.py:344 msgid "Authentication failed!" msgstr "Autentiseringen feilet!" -#: ../pyhoca/wxgui/logon.py:342 +#: ../pyhoca/wxgui/logon.py:351 #, python-format msgid "%s - SSH proxy" msgstr "%s - ssh mellomtjener" -#: ../pyhoca/wxgui/logon.py:343 +#: ../pyhoca/wxgui/logon.py:352 msgid "Authentication to the SSH proxy server failed!" msgstr "Autentiseringenen til SSH mellomtjeneren feilet!" -#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:658 +#: ../pyhoca/wxgui/logon.py:374 ../pyhoca/wxgui/frontend.py:662 #, python-format msgid "%s - socket error" msgstr "%s - sokkel feil" -#: ../pyhoca/wxgui/logon.py:372 ../pyhoca/wxgui/frontend.py:637 -#: ../pyhoca/wxgui/frontend.py:644 +#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:641 +#: ../pyhoca/wxgui/frontend.py:648 #, python-format msgid "%s - host key error" msgstr "%s - verts nøkkel feil" -#: ../pyhoca/wxgui/logon.py:373 ../pyhoca/wxgui/frontend.py:637 +#: ../pyhoca/wxgui/logon.py:382 ../pyhoca/wxgui/frontend.py:641 msgid "" "The remote server's host key is invalid or has not been accepted by the user" msgstr "" "Den eksterne serverens verts nøkkel er ugyldig, eller ikke blitt akseptert " "av brukeren" -#: ../pyhoca/wxgui/logon.py:380 ../pyhoca/wxgui/frontend.py:679 +#: ../pyhoca/wxgui/logon.py:389 ../pyhoca/wxgui/frontend.py:683 #, python-format msgid "%s - missing home directory" msgstr "%s - mangler hjemmekatalog" -#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:679 +#: ../pyhoca/wxgui/logon.py:390 ../pyhoca/wxgui/frontend.py:683 msgid "The remote user's home directory does not exist." msgstr "Brukerens hjemmekatalog på den eksterne serveren finnes ikke." -#: ../pyhoca/wxgui/logon.py:388 +#: ../pyhoca/wxgui/logon.py:397 #, python-format msgid "%s - key error" msgstr "%s - nøkkel feil" -#: ../pyhoca/wxgui/logon.py:396 ../pyhoca/wxgui/frontend.py:686 +#: ../pyhoca/wxgui/logon.py:405 ../pyhoca/wxgui/frontend.py:690 #, python-format msgid "%s - auth error" msgstr "%s - autentiseringens feil" -#: ../pyhoca/wxgui/logon.py:404 ../pyhoca/wxgui/frontend.py:630 +#: ../pyhoca/wxgui/logon.py:413 ../pyhoca/wxgui/frontend.py:634 #, python-format msgid "%s - SSH error" msgstr "%s - SSH feil" -#: ../pyhoca/wxgui/logon.py:412 +#: ../pyhoca/wxgui/logon.py:421 #, python-format msgid "%s - unknown error" msgstr "%s - ukjent feil" -#: ../pyhoca/wxgui/logon.py:413 +#: ../pyhoca/wxgui/logon.py:422 msgid "An unknown error occured during authentication!" msgstr "En ukjent feil oppstod under autentiseringen!" @@ -176,280 +176,288 @@ msgstr "" "PyHoca-GUI (Python X2goClient)\n" "Klient for å koble deg til en ekstern X2Go server" -#: ../pyhoca/wxgui/profilemanager.py:82 +#: ../pyhoca/wxgui/profilemanager.py:83 msgid "GNOME Desktop (GNOME)" msgstr "GNOME skrivebord (GNOME)" -#: ../pyhoca/wxgui/profilemanager.py:83 +#: ../pyhoca/wxgui/profilemanager.py:84 msgid "K Desktop Environment (KDE)" msgstr "K skrivebordsmiljø (KDE)" -#: ../pyhoca/wxgui/profilemanager.py:84 +#: ../pyhoca/wxgui/profilemanager.py:85 msgid "Lightweight X Desktop (LXDE)" msgstr "Lettvekts X skrivebord (LXDE)" -#: ../pyhoca/wxgui/profilemanager.py:85 +#: ../pyhoca/wxgui/profilemanager.py:86 msgid "Trinity X Desktop (KDE3-like)" msgstr "Trinity X Skrivebord (KDE3-liknende)" -#: ../pyhoca/wxgui/profilemanager.py:86 +#: ../pyhoca/wxgui/profilemanager.py:87 msgid "Unity X Desktop Shell (UNITY)" msgstr "Unity X skrivebords skall (UNITY)" -#: ../pyhoca/wxgui/profilemanager.py:87 +#: ../pyhoca/wxgui/profilemanager.py:88 msgid "XFCE4 Desktop (XFCE4)" msgstr "XFCE4 skrivebord (XFCE4)" -#: ../pyhoca/wxgui/profilemanager.py:88 +#: ../pyhoca/wxgui/profilemanager.py:89 msgid "Published Applications" msgstr "Publiserte applikasjoner" -#: ../pyhoca/wxgui/profilemanager.py:89 +#: ../pyhoca/wxgui/profilemanager.py:90 msgid "Single Application" msgstr "Enkelt applikasjon" -#: ../pyhoca/wxgui/profilemanager.py:90 +#: ../pyhoca/wxgui/profilemanager.py:91 msgid "XDMCP Query" msgstr "XDMCP spørring" -#: ../pyhoca/wxgui/profilemanager.py:91 -msgid "Windows Terminal Server (RDP-proxy)" +#: ../pyhoca/wxgui/profilemanager.py:92 +#, fuzzy +msgid "Windows Terminal Server (X2Go-proxied RDP)" msgstr "Windows Terminal Server (RDP-proxy)" -#. 'DirectRDP': 'Windows Terminal Server (RDP-direct)', -#: ../pyhoca/wxgui/profilemanager.py:93 ../pyhoca/wxgui/profilemanager.py:207 +#: ../pyhoca/wxgui/profilemanager.py:94 ../pyhoca/wxgui/profilemanager.py:227 msgid "Custom command" msgstr "Selvvalgt kommando" -#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:398 +#: ../pyhoca/wxgui/profilemanager.py:99 ../pyhoca/wxgui/menus_taskbar.py:398 msgid "Internet Browser" msgstr "Nettleser" -#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:399 +#: ../pyhoca/wxgui/profilemanager.py:100 ../pyhoca/wxgui/menus_taskbar.py:399 msgid "Email Client" msgstr "Epost klient" -#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:400 +#: ../pyhoca/wxgui/profilemanager.py:101 ../pyhoca/wxgui/menus_taskbar.py:400 msgid "Office" msgstr "Kontor" -#: ../pyhoca/wxgui/profilemanager.py:99 ../pyhoca/wxgui/menus_taskbar.py:401 +#: ../pyhoca/wxgui/profilemanager.py:102 ../pyhoca/wxgui/menus_taskbar.py:401 msgid "Terminal" msgstr "Terminal" -#: ../pyhoca/wxgui/profilemanager.py:113 +#: ../pyhoca/wxgui/profilemanager.py:120 msgid "Open file with system's default application" msgstr "Åpne filen med systems foretrukne applikasjon" -#: ../pyhoca/wxgui/profilemanager.py:114 +#: ../pyhoca/wxgui/profilemanager.py:121 msgid "Open application chooser dialog" msgstr "Åpne applikasjonsvelger dialog" -#: ../pyhoca/wxgui/profilemanager.py:115 +#: ../pyhoca/wxgui/profilemanager.py:122 msgid "Save incoming file as ..." msgstr "Lagre innkommende fil som ..." -#: ../pyhoca/wxgui/profilemanager.py:143 +#: ../pyhoca/wxgui/profilemanager.py:150 msgid "settings derived from " msgstr "innstillinger arvet fra" #. boxes for all tabs -#: ../pyhoca/wxgui/profilemanager.py:160 +#: ../pyhoca/wxgui/profilemanager.py:170 msgid "Session Title" msgstr "Sesjonstittel" -#: ../pyhoca/wxgui/profilemanager.py:161 +#: ../pyhoca/wxgui/profilemanager.py:171 msgid "Session Window" msgstr "Sesjonsvindu" -#: ../pyhoca/wxgui/profilemanager.py:162 +#: ../pyhoca/wxgui/profilemanager.py:172 msgid "Session Startup" msgstr "Sesjon oppstart" -#: ../pyhoca/wxgui/profilemanager.py:163 +#: ../pyhoca/wxgui/profilemanager.py:173 msgid "Server" msgstr "Server" -#: ../pyhoca/wxgui/profilemanager.py:164 +#: ../pyhoca/wxgui/profilemanager.py:174 +msgid "Proxy" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:175 msgid "Connection Link Speed" msgstr "Tilkoblingens forbindelseshastighet" -#: ../pyhoca/wxgui/profilemanager.py:165 +#: ../pyhoca/wxgui/profilemanager.py:176 msgid "Compression" msgstr "Kompresjon" -#: ../pyhoca/wxgui/profilemanager.py:166 +#: ../pyhoca/wxgui/profilemanager.py:177 msgid "Display" msgstr "Skjerm" -#: ../pyhoca/wxgui/profilemanager.py:167 +#: ../pyhoca/wxgui/profilemanager.py:178 msgid "Keyboard" msgstr "Tastatur" -#: ../pyhoca/wxgui/profilemanager.py:168 +#: ../pyhoca/wxgui/profilemanager.py:179 msgid "Sound" msgstr "Lyd" -#: ../pyhoca/wxgui/profilemanager.py:169 +#: ../pyhoca/wxgui/profilemanager.py:180 msgid "Printing" msgstr "Utskrift" -#: ../pyhoca/wxgui/profilemanager.py:170 +#: ../pyhoca/wxgui/profilemanager.py:181 msgid "Folder Exports" msgstr "Mappe eksporter" -#: ../pyhoca/wxgui/profilemanager.py:171 +#: ../pyhoca/wxgui/profilemanager.py:182 msgid "File Import" msgstr "Fil import" #. ## #. ## widgets for the PROFILE tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:176 +#: ../pyhoca/wxgui/profilemanager.py:187 msgid "Name" msgstr "Navn" -#: ../pyhoca/wxgui/profilemanager.py:183 +#: ../pyhoca/wxgui/profilemanager.py:194 msgid "Set session window title" msgstr "Angi sesjons vindustittel" -#: ../pyhoca/wxgui/profilemanager.py:184 +#: ../pyhoca/wxgui/profilemanager.py:195 msgid "Use a default session window title" msgstr "Benytt standard sesjons vindustittel" -#: ../pyhoca/wxgui/profilemanager.py:185 +#: ../pyhoca/wxgui/profilemanager.py:196 msgid "Custom session window title" msgstr "Tilpasset sesjon vindustittel" -#: ../pyhoca/wxgui/profilemanager.py:195 +#: ../pyhoca/wxgui/profilemanager.py:215 msgid "Window Icon" msgstr "Vindusikon" #. ## #. ## widgets for the SESSION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:201 +#: ../pyhoca/wxgui/profilemanager.py:221 msgid "Start session automatically after login" msgstr "Start sesjonen automatisk etter innlogging" -#: ../pyhoca/wxgui/profilemanager.py:202 +#: ../pyhoca/wxgui/profilemanager.py:222 #, python-format msgid "Login automatically after %s has started" msgstr "Logg inn automatisk etter at %s har startet" -#: ../pyhoca/wxgui/profilemanager.py:203 +#: ../pyhoca/wxgui/profilemanager.py:223 msgid "Type" msgstr "Type" -#: ../pyhoca/wxgui/profilemanager.py:205 +#: ../pyhoca/wxgui/profilemanager.py:225 msgid "Application" msgstr "Applikasjon" -#: ../pyhoca/wxgui/profilemanager.py:209 +#: ../pyhoca/wxgui/profilemanager.py:229 msgid "XDMCP server" msgstr "XDMCP server" -#: ../pyhoca/wxgui/profilemanager.py:211 +#: ../pyhoca/wxgui/profilemanager.py:231 msgid "RDP server" msgstr "RDP server" -#: ../pyhoca/wxgui/profilemanager.py:213 +#: ../pyhoca/wxgui/profilemanager.py:233 msgid "RDP options" msgstr "RDP alternativer" -#: ../pyhoca/wxgui/profilemanager.py:215 +#: ../pyhoca/wxgui/profilemanager.py:235 msgid "Integrate remote application(s) into local desktop (rootless mode)" msgstr "" "Integrer eksterne applikasjon(er) inn i det lokale skrivebordet (rotløs " "modus)" -#: ../pyhoca/wxgui/profilemanager.py:216 +#: ../pyhoca/wxgui/profilemanager.py:236 msgid "Menu of published applications" msgstr "Meny med publiserte applikasjoner" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:223 ../pyhoca/wxgui/profilemanager.py:233 +#: ../pyhoca/wxgui/profilemanager.py:243 ../pyhoca/wxgui/profilemanager.py:253 msgid "User" msgstr "Bruker" -#: ../pyhoca/wxgui/profilemanager.py:225 +#: ../pyhoca/wxgui/profilemanager.py:245 ../pyhoca/wxgui/profilemanager.py:260 msgid "Host" msgstr "Vert" -#: ../pyhoca/wxgui/profilemanager.py:227 +#: ../pyhoca/wxgui/profilemanager.py:247 ../pyhoca/wxgui/profilemanager.py:262 msgid "Port" msgstr "Port" -#: ../pyhoca/wxgui/profilemanager.py:229 -msgid "RSA/DSA private key" -msgstr "RSA/DSA privat nøkkel" +#: ../pyhoca/wxgui/profilemanager.py:249 +msgid "Key" +msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:232 +#: ../pyhoca/wxgui/profilemanager.py:252 msgid "Server behind SSH proxy" msgstr "Server bak SSH mellomtjeneren" -#: ../pyhoca/wxgui/profilemanager.py:235 +#: ../pyhoca/wxgui/profilemanager.py:255 +msgid "Use same username for X2Go and proxy host" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:256 +msgid "Use same authentication for X2Go and proxy host" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:257 msgid "Key file" msgstr "Nøkkelfil" -#: ../pyhoca/wxgui/profilemanager.py:238 -msgid "Host[:Port]" -msgstr "Vert[:Port]" - -#: ../pyhoca/wxgui/profilemanager.py:240 +#: ../pyhoca/wxgui/profilemanager.py:264 msgid "SSH Proxy Tunnel" msgstr "SSH mellomtjener tunnel" -#: ../pyhoca/wxgui/profilemanager.py:248 +#: ../pyhoca/wxgui/profilemanager.py:272 msgid "Modem" msgstr "Modem" -#: ../pyhoca/wxgui/profilemanager.py:249 +#: ../pyhoca/wxgui/profilemanager.py:273 msgid "ISDN" msgstr "ISDN" -#: ../pyhoca/wxgui/profilemanager.py:250 +#: ../pyhoca/wxgui/profilemanager.py:274 msgid "ADSL" msgstr "ADSL" -#: ../pyhoca/wxgui/profilemanager.py:251 +#: ../pyhoca/wxgui/profilemanager.py:275 msgid "WAN" msgstr "WAN" -#: ../pyhoca/wxgui/profilemanager.py:252 +#: ../pyhoca/wxgui/profilemanager.py:276 msgid "LAN" msgstr "LAN" -#: ../pyhoca/wxgui/profilemanager.py:254 +#: ../pyhoca/wxgui/profilemanager.py:278 msgid "Method" msgstr "Metode" -#: ../pyhoca/wxgui/profilemanager.py:256 +#: ../pyhoca/wxgui/profilemanager.py:280 msgid "Image quality" msgstr "Bildekvalitet" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:262 +#: ../pyhoca/wxgui/profilemanager.py:286 msgid "Fullscreen" msgstr "Fullskjerm" -#: ../pyhoca/wxgui/profilemanager.py:263 +#: ../pyhoca/wxgui/profilemanager.py:287 msgid "Custom Size" msgstr "Egentilpasset størrelse" -#: ../pyhoca/wxgui/profilemanager.py:268 +#: ../pyhoca/wxgui/profilemanager.py:292 msgid "Set display DPI" msgstr "Sett skjermens DPI" -#: ../pyhoca/wxgui/profilemanager.py:270 +#: ../pyhoca/wxgui/profilemanager.py:294 msgid "Do not set (use server-side tools to configure the keyboard)" msgstr "Ikke angi (benytt server-side verktøy for å konfigurere tastaturet)" -#: ../pyhoca/wxgui/profilemanager.py:271 +#: ../pyhoca/wxgui/profilemanager.py:295 msgid "" "Automatically detect and use client-side keyboard configuration inside the " "session" @@ -457,213 +465,213 @@ msgstr "" "Automatisk oppdag og benytt klient-side konfigurasjon for tastaturet inne i " "sesjonen" -#: ../pyhoca/wxgui/profilemanager.py:272 +#: ../pyhoca/wxgui/profilemanager.py:296 msgid "Use custom keyboard settings as provided below" msgstr "Benytt tilpasset innstillinger for tastaturoppsett som gitt nedenfor" -#: ../pyhoca/wxgui/profilemanager.py:273 +#: ../pyhoca/wxgui/profilemanager.py:297 msgid "Keyboard model" msgstr "Tastaturmodell" -#: ../pyhoca/wxgui/profilemanager.py:275 +#: ../pyhoca/wxgui/profilemanager.py:299 msgid "Layout" msgstr "Utforming" -#: ../pyhoca/wxgui/profilemanager.py:277 +#: ../pyhoca/wxgui/profilemanager.py:301 msgid "Layout variant" msgstr "Utformingsvariant" -#: ../pyhoca/wxgui/profilemanager.py:279 +#: ../pyhoca/wxgui/profilemanager.py:303 msgid "Enable sound support" msgstr "Aktiver lydstøtte" -#: ../pyhoca/wxgui/profilemanager.py:280 +#: ../pyhoca/wxgui/profilemanager.py:304 msgid "Pulse Audio" msgstr "Pulse Audio" #. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated. #. However, config files can contain an Arts configuration, so we will honour this -#: ../pyhoca/wxgui/profilemanager.py:284 +#: ../pyhoca/wxgui/profilemanager.py:308 msgid "Arts (not supported)" msgstr "Arts (ikke supportert)" -#: ../pyhoca/wxgui/profilemanager.py:287 +#: ../pyhoca/wxgui/profilemanager.py:311 msgid "esd" msgstr "esd" -#: ../pyhoca/wxgui/profilemanager.py:288 +#: ../pyhoca/wxgui/profilemanager.py:312 msgid "Use default sound port" msgstr "Benytt standard lydport" -#: ../pyhoca/wxgui/profilemanager.py:289 +#: ../pyhoca/wxgui/profilemanager.py:313 msgid "Custom sound port" msgstr "Selvvalgt lydport" -#: ../pyhoca/wxgui/profilemanager.py:291 +#: ../pyhoca/wxgui/profilemanager.py:315 msgid "Client Side printing" msgstr "Klientside utskrift" -#: ../pyhoca/wxgui/profilemanager.py:293 +#: ../pyhoca/wxgui/profilemanager.py:317 msgid "Use local folder sharing" msgstr "Benytt lokal mappedeling" -#: ../pyhoca/wxgui/profilemanager.py:294 +#: ../pyhoca/wxgui/profilemanager.py:318 msgid "Path" msgstr "Sti" -#: ../pyhoca/wxgui/profilemanager.py:297 ../pyhoca/wxgui/profilemanager.py:316 +#: ../pyhoca/wxgui/profilemanager.py:321 ../pyhoca/wxgui/profilemanager.py:340 msgid "Add" msgstr "Legg til" -#: ../pyhoca/wxgui/profilemanager.py:299 +#: ../pyhoca/wxgui/profilemanager.py:323 msgid "Local Path" msgstr "Lokal sti" -#: ../pyhoca/wxgui/profilemanager.py:300 +#: ../pyhoca/wxgui/profilemanager.py:324 msgid "Connect Method" msgstr "Tilkoblingsmetode" -#: ../pyhoca/wxgui/profilemanager.py:301 +#: ../pyhoca/wxgui/profilemanager.py:325 msgid "Delete" msgstr "Slett" -#: ../pyhoca/wxgui/profilemanager.py:303 +#: ../pyhoca/wxgui/profilemanager.py:327 msgid "Convert between client and server encodings" msgstr "Konverter tegnkodingen mellom klient og server" -#: ../pyhoca/wxgui/profilemanager.py:304 +#: ../pyhoca/wxgui/profilemanager.py:328 msgid "Client encoding" msgstr "Klientens tegnkode" -#: ../pyhoca/wxgui/profilemanager.py:306 +#: ../pyhoca/wxgui/profilemanager.py:330 msgid "Server encoding" msgstr "Serverens tegnkode" -#: ../pyhoca/wxgui/profilemanager.py:309 +#: ../pyhoca/wxgui/profilemanager.py:333 msgid "Use file MIME box for local file import" msgstr "Benytt filens MIME boks for lokal fil import" -#: ../pyhoca/wxgui/profilemanager.py:310 +#: ../pyhoca/wxgui/profilemanager.py:334 msgid "Extensions" msgstr "Utvidelser" -#: ../pyhoca/wxgui/profilemanager.py:312 +#: ../pyhoca/wxgui/profilemanager.py:336 msgid "Action" msgstr "Handling" -#: ../pyhoca/wxgui/profilemanager.py:317 +#: ../pyhoca/wxgui/profilemanager.py:341 msgid "Defaults" msgstr "Standard" -#: ../pyhoca/wxgui/profilemanager.py:319 +#: ../pyhoca/wxgui/profilemanager.py:343 msgid "Save" msgstr "Lagre" -#: ../pyhoca/wxgui/profilemanager.py:320 +#: ../pyhoca/wxgui/profilemanager.py:344 msgid "Reset" msgstr "Resett" -#: ../pyhoca/wxgui/profilemanager.py:365 -#: ../pyhoca/wxgui/profilemanager.py:1078 -#: ../pyhoca/wxgui/profilemanager.py:1832 +#: ../pyhoca/wxgui/profilemanager.py:394 +#: ../pyhoca/wxgui/profilemanager.py:1089 +#: ../pyhoca/wxgui/profilemanager.py:1983 msgid "automatically" msgstr "automatisk" -#: ../pyhoca/wxgui/profilemanager.py:367 -#: ../pyhoca/wxgui/profilemanager.py:1080 +#: ../pyhoca/wxgui/profilemanager.py:396 +#: ../pyhoca/wxgui/profilemanager.py:1091 msgid "manually" msgstr "manuelt" -#: ../pyhoca/wxgui/profilemanager.py:376 +#: ../pyhoca/wxgui/profilemanager.py:405 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "PyHoca-GUI Profil håndterer - ny profil" -#: ../pyhoca/wxgui/profilemanager.py:378 +#: ../pyhoca/wxgui/profilemanager.py:407 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "PyHoca-GUI Profil håndterer - %s (tilkoblet)" -#: ../pyhoca/wxgui/profilemanager.py:380 +#: ../pyhoca/wxgui/profilemanager.py:409 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "PyHoca-GUI Profil håndterer - %s" -#: ../pyhoca/wxgui/profilemanager.py:751 +#: ../pyhoca/wxgui/profilemanager.py:769 msgid "Profile" msgstr "Profil" -#: ../pyhoca/wxgui/profilemanager.py:752 +#: ../pyhoca/wxgui/profilemanager.py:770 msgid "Session" msgstr "Sesjon" -#: ../pyhoca/wxgui/profilemanager.py:753 +#: ../pyhoca/wxgui/profilemanager.py:771 msgid "Connection" msgstr "Tilkobling" -#: ../pyhoca/wxgui/profilemanager.py:754 +#: ../pyhoca/wxgui/profilemanager.py:772 msgid "Settings" msgstr "Innstillinger" -#: ../pyhoca/wxgui/profilemanager.py:755 +#: ../pyhoca/wxgui/profilemanager.py:773 msgid "Sharing" msgstr "Deling" -#: ../pyhoca/wxgui/profilemanager.py:996 +#: ../pyhoca/wxgui/profilemanager.py:1007 msgid "<xkbtype>" msgstr "<xkbtype>" -#: ../pyhoca/wxgui/profilemanager.py:997 +#: ../pyhoca/wxgui/profilemanager.py:1008 msgid "<xkblayout>" msgstr "<xkblayout>" -#: ../pyhoca/wxgui/profilemanager.py:998 +#: ../pyhoca/wxgui/profilemanager.py:1009 msgid "<xkbvariant>" msgstr "<xkbvariant>" -#: ../pyhoca/wxgui/profilemanager.py:1284 +#: ../pyhoca/wxgui/profilemanager.py:1306 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "Ikonfiler(*.png)|*.png|Alle filer (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1287 +#: ../pyhoca/wxgui/profilemanager.py:1309 msgid "Choose an icon for this session profile" msgstr "Velg et ikon for denne sesjonsprofilen" -#: ../pyhoca/wxgui/profilemanager.py:1509 +#: ../pyhoca/wxgui/profilemanager.py:1600 msgid "All files (*.*)|*" msgstr "Alle filer (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1511 -#: ../pyhoca/wxgui/profilemanager.py:1533 +#: ../pyhoca/wxgui/profilemanager.py:1602 +#: ../pyhoca/wxgui/profilemanager.py:1626 msgid "Choose a public SSH key" msgstr "Velg en offentlig SSH nøkkel" -#: ../pyhoca/wxgui/profilemanager.py:1784 +#: ../pyhoca/wxgui/profilemanager.py:1935 msgid "Choose a folder to share within a session" msgstr "Velg en mappe som skal deles i en sesjon" -#: ../pyhoca/wxgui/profilemanager.py:1912 -#: ../pyhoca/wxgui/profilemanager.py:1915 -#: ../pyhoca/wxgui/profilemanager.py:1918 -#: ../pyhoca/wxgui/profilemanager.py:1923 -#: ../pyhoca/wxgui/profilemanager.py:1933 ../pyhoca/wxgui/menus_taskbar.py:118 +#: ../pyhoca/wxgui/profilemanager.py:2063 +#: ../pyhoca/wxgui/profilemanager.py:2066 +#: ../pyhoca/wxgui/profilemanager.py:2069 +#: ../pyhoca/wxgui/profilemanager.py:2074 +#: ../pyhoca/wxgui/profilemanager.py:2084 ../pyhoca/wxgui/menus_taskbar.py:118 msgid "Profile Manager" msgstr "Profil håndterer" -#: ../pyhoca/wxgui/profilemanager.py:1912 +#: ../pyhoca/wxgui/profilemanager.py:2063 msgid "Profile name is missing, profile unusable!!!" msgstr "Profilnavnet mangler, profilen er ubrukelig!" -#: ../pyhoca/wxgui/profilemanager.py:1915 -#: ../pyhoca/wxgui/profilemanager.py:1918 +#: ../pyhoca/wxgui/profilemanager.py:2066 +#: ../pyhoca/wxgui/profilemanager.py:2069 #, python-format msgid "Profile name %s already exists!!!" msgstr "Profilnavnet %s eksisterer allerede!" -#: ../pyhoca/wxgui/profilemanager.py:1923 +#: ../pyhoca/wxgui/profilemanager.py:2074 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "SSH mellomtjener konfigurasjonen er ufullstendig. Forsøk igjen." -#: ../pyhoca/wxgui/profilemanager.py:1933 +#: ../pyhoca/wxgui/profilemanager.py:2084 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -674,21 +682,21 @@ msgstr "" "lokal SSH mellomtjener.\n" "Vennligst endre SSH mellomtjener innstillingene tilsvarende." -#: ../pyhoca/wxgui/profilemanager.py:1960 +#: ../pyhoca/wxgui/profilemanager.py:2111 #, python-format msgid "%s - profile added" msgstr "%s - profil lagt til" -#: ../pyhoca/wxgui/profilemanager.py:1961 +#: ../pyhoca/wxgui/profilemanager.py:2112 msgid "A new session profile has been added." msgstr "En ny sesjonsprofil har blitt lagt til." -#: ../pyhoca/wxgui/profilemanager.py:1965 +#: ../pyhoca/wxgui/profilemanager.py:2116 #, python-format msgid "%s - modified" msgstr "%s - endret" -#: ../pyhoca/wxgui/profilemanager.py:1966 +#: ../pyhoca/wxgui/profilemanager.py:2117 msgid "Changes to profile have been saved." msgstr "Endringer til profilen har blitt lagret." @@ -946,87 +954,103 @@ msgstr "%s - server advarsel" msgid "The X2Go Server does not publish an application menu." msgstr "X2Go serveren publiserer ikke en applikasjonsmeny" -#: ../pyhoca/wxgui/frontend.py:610 +#: ../pyhoca/wxgui/frontend.py:611 msgid "Public SSH key authentication has been successful." msgstr "Offentlig SSH nøkkel autentisering var vellykket." -#: ../pyhoca/wxgui/frontend.py:644 +#: ../pyhoca/wxgui/frontend.py:648 msgid "" "The SSH proxy's host key is invalid or has not been accepted by the user" msgstr "" "SSH mellomtjenerens vertsnøkkel er ugyldig, eller har ikke blitt akseptert " "av brukeren" -#: ../pyhoca/wxgui/frontend.py:665 +#: ../pyhoca/wxgui/frontend.py:669 #, python-format msgid "%s - EOF error" msgstr "%s - EOF feil" -#: ../pyhoca/wxgui/frontend.py:665 +#: ../pyhoca/wxgui/frontend.py:669 msgid "Authentication protocol communication incomplete! Try again..." msgstr "" "Autentiseringens protokoll kommunikasjon er ufullstendig! Forsøk igjen." -#: ../pyhoca/wxgui/frontend.py:672 +#: ../pyhoca/wxgui/frontend.py:676 #, python-format msgid "%s - auth key error" msgstr "%s - Feil med autentiseringsnøkkel" -#: ../pyhoca/wxgui/frontend.py:693 +#: ../pyhoca/wxgui/frontend.py:697 msgid "An unknown error occurred during authentication!" msgstr "En ukjent feil oppstod under autentiseringen! " +#: ../pyhoca/wxgui/frontend.py:725 +#, fuzzy, python-format +msgid "%s: DirectRDP not supported yet" +msgstr "Arts (ikke supportert)" + #: ../pyhoca/wxgui/frontend.py:726 +#, python-format +msgid "" +"We apologize for the inconvenience...\n" +"\n" +"Session profiles of type ,,DirectRDP'' are not\n" +"supported by %s (%s), yet!!\n" +"\n" +"DirectRDP support will be available in %s (>= 0.2.2.0)." +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:738 msgid "Unknown session profile, configure before using it..." msgstr "Ukjent sesjonsprofil, konfigurer den først..." -#: ../pyhoca/wxgui/frontend.py:784 ../pyhoca/wxgui/frontend.py:1302 +#: ../pyhoca/wxgui/frontend.py:796 ../pyhoca/wxgui/frontend.py:1314 #, python-format msgid "%s - session warning" msgstr "%s - advarsel om sesjon" -#: ../pyhoca/wxgui/frontend.py:784 +#: ../pyhoca/wxgui/frontend.py:796 #, python-format msgid "Execution of command ,,%s'' failed." msgstr "Utførelsen av kommandoen \"%s\" feilet." -#: ../pyhoca/wxgui/frontend.py:926 +#: ../pyhoca/wxgui/frontend.py:938 msgid "Cleaning X2Go sessions..." msgstr "Rensker opp i X2Go sesjoner..." -#: ../pyhoca/wxgui/frontend.py:961 +#: ../pyhoca/wxgui/frontend.py:973 #, python-format msgid "%s - disconnect" msgstr "%s - koble fra" -#: ../pyhoca/wxgui/frontend.py:961 +#: ../pyhoca/wxgui/frontend.py:973 msgid "X2Go Profile is now disconnected." msgstr "X2Go profilen er nå frakoblet." -#: ../pyhoca/wxgui/frontend.py:977 +#: ../pyhoca/wxgui/frontend.py:989 msgid "New Session Profile" msgstr "Ny sesjonsprofil" -#: ../pyhoca/wxgui/frontend.py:1029 +#: ../pyhoca/wxgui/frontend.py:1041 #, python-format msgid "Really Delete Session Profile ,,%s''?" msgstr "Virkelig slette sesjonsprofilen \"%s\"?" -#: ../pyhoca/wxgui/frontend.py:1035 +#: ../pyhoca/wxgui/frontend.py:1047 #, python-format msgid "%s - profile deleted" msgstr "%s - profilen er slettet" -#: ../pyhoca/wxgui/frontend.py:1035 +#: ../pyhoca/wxgui/frontend.py:1047 msgid "The session profile has been deleted." msgstr "Sesjonsprofilen har blitt slettet." -#: ../pyhoca/wxgui/frontend.py:1053 +#: ../pyhoca/wxgui/frontend.py:1065 #, python-format msgid "%s - share local folder with sessions of this profile" msgstr "%s - del lokal mappe med sesjoner av denne profilen" -#: ../pyhoca/wxgui/frontend.py:1194 +#: ../pyhoca/wxgui/frontend.py:1206 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -1039,17 +1063,17 @@ msgstr "" "\n" "Er du sikker på at du vil fortsette tilkoblingen?" -#: ../pyhoca/wxgui/frontend.py:1202 +#: ../pyhoca/wxgui/frontend.py:1214 #, python-format msgid "%s: Confirm Host Authorization" msgstr "%s: Verifiser vert autorisasjonen" -#: ../pyhoca/wxgui/frontend.py:1247 +#: ../pyhoca/wxgui/frontend.py:1259 #, python-format msgid "%s - channel error" msgstr "%s - feil med kanalen" -#: ../pyhoca/wxgui/frontend.py:1247 +#: ../pyhoca/wxgui/frontend.py:1259 #, python-format msgid "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " @@ -1058,22 +1082,22 @@ msgstr "" "Mistet uventet forbindelsen til server %s ! Forsøk å autentisiere deg på " "nytt til serveren..." -#: ../pyhoca/wxgui/frontend.py:1265 ../pyhoca/wxgui/frontend.py:1283 -#: ../pyhoca/wxgui/frontend.py:1285 ../pyhoca/wxgui/frontend.py:1321 +#: ../pyhoca/wxgui/frontend.py:1277 ../pyhoca/wxgui/frontend.py:1295 +#: ../pyhoca/wxgui/frontend.py:1297 ../pyhoca/wxgui/frontend.py:1333 #, python-format msgid "%s - session failure" msgstr "%s - sesjonsfeil" -#: ../pyhoca/wxgui/frontend.py:1265 +#: ../pyhoca/wxgui/frontend.py:1277 msgid "The session startup failed." msgstr "Oppstart av sesjonen feilet." -#: ../pyhoca/wxgui/frontend.py:1283 +#: ../pyhoca/wxgui/frontend.py:1295 #, python-format msgid "The command ,,%s'' is not available on X2Go server." msgstr "Kommandoen \"%s\" er ikke tilgjengelig på X2Go serveren." -#: ../pyhoca/wxgui/frontend.py:1285 +#: ../pyhoca/wxgui/frontend.py:1297 #, python-format msgid "" "The command ,,%s'' is not available on X2Go server\n" @@ -1082,7 +1106,7 @@ msgstr "" "Kommandoen \"%s\" er ikke tilgjengelig på X2Go server\n" "%s." -#: ../pyhoca/wxgui/frontend.py:1302 +#: ../pyhoca/wxgui/frontend.py:1314 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " @@ -1091,7 +1115,7 @@ msgstr "" "Revers TCP port videresendingsforespørselen for sesjon %s til server port %s " "har blitt avvist." -#: ../pyhoca/wxgui/frontend.py:1321 +#: ../pyhoca/wxgui/frontend.py:1333 #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " @@ -1100,37 +1124,37 @@ msgstr "" "Tunnel videresendingsforespørsel til [%s]:%s for sesjon %s ble avvist av den " "eksterne X2Go/SSH serveren. Oppstart av sesjonen feilet." -#: ../pyhoca/wxgui/frontend.py:1340 +#: ../pyhoca/wxgui/frontend.py:1352 #, python-format msgid "%s - audio warning" msgstr "%s - advarsel om lyd" -#: ../pyhoca/wxgui/frontend.py:1340 +#: ../pyhoca/wxgui/frontend.py:1352 msgid "" "The X2Go PulseAudio system is not available within Remote Desktop sessions." msgstr "" "X2Go PulseAudio systemet er ikke tilgjengelig inne i Terminal server " "sesjoner (RDP)." -#: ../pyhoca/wxgui/frontend.py:1347 ../pyhoca/wxgui/frontend.py:1354 +#: ../pyhoca/wxgui/frontend.py:1359 ../pyhoca/wxgui/frontend.py:1366 #, python-format msgid "%s - audio error" msgstr "%s - feil med lyden" -#: ../pyhoca/wxgui/frontend.py:1347 +#: ../pyhoca/wxgui/frontend.py:1359 msgid "The X2Go PulseAudio system could not be started." msgstr "X2Go PulseAudio systemet kan ikke bli startet." -#: ../pyhoca/wxgui/frontend.py:1354 +#: ../pyhoca/wxgui/frontend.py:1366 msgid "The X2Go PulseAudio system has died unexpectedly." msgstr "X2Go PulseAudio systemet har uventet stoppet." -#: ../pyhoca/wxgui/frontend.py:1366 +#: ../pyhoca/wxgui/frontend.py:1378 #, python-format msgid "%s - audio problem" msgstr "%s - problem med lyden" -#: ../pyhoca/wxgui/frontend.py:1366 +#: ../pyhoca/wxgui/frontend.py:1378 #, python-format msgid "" "The audio connection could not be set up for this session.\n" @@ -1139,12 +1163,12 @@ msgstr "" "Klarte ikke å sette opp lydforbindelsen for denne sesjonen.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1378 +#: ../pyhoca/wxgui/frontend.py:1390 #, python-format msgid "%s - client-side printing not available" msgstr "%s - klient-side utskrift er ikke tilgjengelig" -#: ../pyhoca/wxgui/frontend.py:1378 +#: ../pyhoca/wxgui/frontend.py:1390 #, python-format msgid "" "The server denies client-side printing from within this session.\n" @@ -1153,12 +1177,12 @@ msgstr "" "Serveren nekter klient-side utskrift innenfra denne sesjonen.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1390 +#: ../pyhoca/wxgui/frontend.py:1402 #, python-format msgid "%s - MIME box not available" msgstr "%s - MIME boks ikke tilgjengelig" -#: ../pyhoca/wxgui/frontend.py:1390 +#: ../pyhoca/wxgui/frontend.py:1402 #, python-format msgid "" "The server does not support the X2Go MIME box.\n" @@ -1167,12 +1191,12 @@ msgstr "" "Serveren støtter ikke X2Go MIME boks.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1402 +#: ../pyhoca/wxgui/frontend.py:1414 #, python-format msgid "%s - client-side folders not sharable" msgstr "%s - klient-side mapper er ikke mulig å dele" -#: ../pyhoca/wxgui/frontend.py:1402 +#: ../pyhoca/wxgui/frontend.py:1414 #, python-format msgid "" "The server denies client-side folder sharing with this session.\n" @@ -1181,12 +1205,12 @@ msgstr "" "Serveren nekter klient-side mapperdeling med denne sesjonen.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1414 +#: ../pyhoca/wxgui/frontend.py:1426 #, python-format msgid "%s - client resources not sharable" msgstr "%s - klient ressurser er ikke mulig å dele" -#: ../pyhoca/wxgui/frontend.py:1414 +#: ../pyhoca/wxgui/frontend.py:1426 #, python-format msgid "" "Client-side folders and printers cannot be shared with this session.\n" @@ -1195,12 +1219,12 @@ msgstr "" "Klient-side mapper og skrivere kan ikke bli delt med denne sesjonen.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1433 ../pyhoca/wxgui/frontend.py:1435 +#: ../pyhoca/wxgui/frontend.py:1445 ../pyhoca/wxgui/frontend.py:1447 #, python-format msgid "%s - print error" msgstr "%s - feil ved utskrift" -#: ../pyhoca/wxgui/frontend.py:1433 +#: ../pyhoca/wxgui/frontend.py:1445 #, python-format msgid "" "%s\n" @@ -1211,7 +1235,7 @@ msgstr "" "...oppstod på skriver %s fra sesjon\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1435 +#: ../pyhoca/wxgui/frontend.py:1447 #, python-format msgid "" "%s\n" @@ -1222,12 +1246,12 @@ msgstr "" "...oppstod fra sesjon\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1450 ../pyhoca/wxgui/frontend.py:1465 +#: ../pyhoca/wxgui/frontend.py:1462 ../pyhoca/wxgui/frontend.py:1477 #, python-format msgid "%s - start" msgstr "%s - start" -#: ../pyhoca/wxgui/frontend.py:1450 +#: ../pyhoca/wxgui/frontend.py:1462 #, python-format msgid "" "New X2Go session starting up...\n" @@ -1236,7 +1260,7 @@ msgstr "" "Ny X2Go sesjon starter opp...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1465 +#: ../pyhoca/wxgui/frontend.py:1477 #, python-format msgid "" "Another client started X2Go session\n" @@ -1245,12 +1269,12 @@ msgstr "" "En annen klient startet X2Go sesjon\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1480 ../pyhoca/wxgui/frontend.py:1495 +#: ../pyhoca/wxgui/frontend.py:1492 ../pyhoca/wxgui/frontend.py:1507 #, python-format msgid "%s - resume" msgstr "%s - gjenoppta" -#: ../pyhoca/wxgui/frontend.py:1480 +#: ../pyhoca/wxgui/frontend.py:1492 #, python-format msgid "" "Resuming X2Go session...\n" @@ -1259,7 +1283,7 @@ msgstr "" "Gjenopptar X2Go sesjon...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1495 +#: ../pyhoca/wxgui/frontend.py:1507 #, python-format msgid "" "Another client resumed X2Go session\n" @@ -1268,12 +1292,12 @@ msgstr "" "En annen klient gjenopptok X2Go sesjon\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1510 +#: ../pyhoca/wxgui/frontend.py:1522 #, python-format msgid "%s - running" msgstr "%s - aktiv" -#: ../pyhoca/wxgui/frontend.py:1510 +#: ../pyhoca/wxgui/frontend.py:1522 #, python-format msgid "" "Found already running session\n" @@ -1282,12 +1306,12 @@ msgstr "" "Fant allerede kjørende sesjon\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1530 +#: ../pyhoca/wxgui/frontend.py:1542 #, python-format msgid "%s - suspend" msgstr "%s - koble fra" -#: ../pyhoca/wxgui/frontend.py:1530 +#: ../pyhoca/wxgui/frontend.py:1542 #, python-format msgid "" "X2Go Session has been suspended\n" @@ -1296,12 +1320,12 @@ msgstr "" "X2Go sesjonen har blitt frakoblet\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1557 +#: ../pyhoca/wxgui/frontend.py:1569 #, python-format msgid "%s - terminate" msgstr "%s - avslutt" -#: ../pyhoca/wxgui/frontend.py:1557 +#: ../pyhoca/wxgui/frontend.py:1569 #, python-format msgid "" "X2Go Session has terminated\n" @@ -1445,6 +1469,12 @@ msgstr "Endre sesjonstittelen til" msgid "OK" msgstr "OK" +#~ msgid "RSA/DSA private key" +#~ msgstr "RSA/DSA privat nøkkel" + +#~ msgid "Host[:Port]" +#~ msgstr "Vert[:Port]" + #~ msgid "us" #~ msgstr "no" diff --git a/po/nl.po b/po/nl.po index 076e429..7970ecc 100644 --- a/po/nl.po +++ b/po/nl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-10 21:18+0200\n" +"POT-Creation-Date: 2012-09-28 10:00+0200\n" "PO-Revision-Date: 2012-06-10 21:16+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: nl <dick.kniep(a)lindix.nl>\n" @@ -49,96 +49,96 @@ msgstr "Sessie login" msgid "SSH proxy server login" msgstr "Login via SSH Proxy" -#: ../pyhoca/wxgui/logon.py:133 ../pyhoca/wxgui/profilemanager.py:322 +#: ../pyhoca/wxgui/logon.py:133 ../pyhoca/wxgui/profilemanager.py:346 #: ../pyhoca/wxgui/messages.py:132 ../pyhoca/wxgui/printingprefs.py:147 #: ../pyhoca/wxgui/sessiontitle.py:85 msgid "Cancel" msgstr "Afbreken" -#: ../pyhoca/wxgui/logon.py:292 ../pyhoca/wxgui/logon.py:334 -#: ../pyhoca/wxgui/frontend.py:603 +#: ../pyhoca/wxgui/logon.py:301 ../pyhoca/wxgui/logon.py:343 +#: ../pyhoca/wxgui/frontend.py:604 #, python-format msgid "%s - connect failure" msgstr "%s - verbinden mislukt" -#: ../pyhoca/wxgui/logon.py:293 ../pyhoca/wxgui/frontend.py:603 +#: ../pyhoca/wxgui/logon.py:302 ../pyhoca/wxgui/frontend.py:604 msgid "User is not allowed to start X2Go sessions!" msgstr "Gebruiker mag geen X2Go sessie starten!" -#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:610 +#: ../pyhoca/wxgui/logon.py:307 ../pyhoca/wxgui/frontend.py:611 #, python-format msgid "%s - connect" msgstr "%s - verbinden" -#: ../pyhoca/wxgui/logon.py:299 +#: ../pyhoca/wxgui/logon.py:308 msgid "Authentication has been successful." msgstr "Authenticatie is gelukt." -#: ../pyhoca/wxgui/logon.py:330 +#: ../pyhoca/wxgui/logon.py:339 msgid "SSH tunnel started" msgstr "SSH Tunnel gestart" -#: ../pyhoca/wxgui/logon.py:335 +#: ../pyhoca/wxgui/logon.py:344 msgid "Authentication failed!" msgstr "Authenticatie mislukt!" -#: ../pyhoca/wxgui/logon.py:342 +#: ../pyhoca/wxgui/logon.py:351 #, python-format msgid "%s - SSH proxy" msgstr "%s - SSH Proxy" -#: ../pyhoca/wxgui/logon.py:343 +#: ../pyhoca/wxgui/logon.py:352 msgid "Authentication to the SSH proxy server failed!" msgstr "Authenticatie via SSH Proxy Server mislukt!" -#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:658 +#: ../pyhoca/wxgui/logon.py:374 ../pyhoca/wxgui/frontend.py:662 #, python-format msgid "%s - socket error" msgstr "%s - socket fout" -#: ../pyhoca/wxgui/logon.py:372 ../pyhoca/wxgui/frontend.py:637 -#: ../pyhoca/wxgui/frontend.py:644 +#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:641 +#: ../pyhoca/wxgui/frontend.py:648 #, python-format msgid "%s - host key error" msgstr "%s - server sleutel fout" -#: ../pyhoca/wxgui/logon.py:373 ../pyhoca/wxgui/frontend.py:637 +#: ../pyhoca/wxgui/logon.py:382 ../pyhoca/wxgui/frontend.py:641 msgid "" "The remote server's host key is invalid or has not been accepted by the user" msgstr "" "De sleutel van de server is ongeldig of is niet geaccepteerd door de " "gebruiker" -#: ../pyhoca/wxgui/logon.py:380 ../pyhoca/wxgui/frontend.py:679 +#: ../pyhoca/wxgui/logon.py:389 ../pyhoca/wxgui/frontend.py:683 #, python-format msgid "%s - missing home directory" msgstr "%s - home directory niet aanwezig" -#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:679 +#: ../pyhoca/wxgui/logon.py:390 ../pyhoca/wxgui/frontend.py:683 msgid "The remote user's home directory does not exist." msgstr "De home directory op afstand van de gebruiker bestaat niet" -#: ../pyhoca/wxgui/logon.py:388 +#: ../pyhoca/wxgui/logon.py:397 #, python-format msgid "%s - key error" msgstr "%s - sleutel fout" -#: ../pyhoca/wxgui/logon.py:396 ../pyhoca/wxgui/frontend.py:686 +#: ../pyhoca/wxgui/logon.py:405 ../pyhoca/wxgui/frontend.py:690 #, python-format msgid "%s - auth error" msgstr "%s - authenticatie fout" -#: ../pyhoca/wxgui/logon.py:404 ../pyhoca/wxgui/frontend.py:630 +#: ../pyhoca/wxgui/logon.py:413 ../pyhoca/wxgui/frontend.py:634 #, python-format msgid "%s - SSH error" msgstr "%s - sleutel fout" -#: ../pyhoca/wxgui/logon.py:412 +#: ../pyhoca/wxgui/logon.py:421 #, python-format msgid "%s - unknown error" msgstr "%s - onbekende fout" -#: ../pyhoca/wxgui/logon.py:413 +#: ../pyhoca/wxgui/logon.py:422 msgid "An unknown error occured during authentication!" msgstr "Een onbekende fout is bij de authenticatie opgetreden" @@ -174,490 +174,498 @@ msgstr "" "PyHoca-GUI (Python X2goClient)\n" "Verbinding met remote X2Go server aan het opbouwen" -#: ../pyhoca/wxgui/profilemanager.py:82 +#: ../pyhoca/wxgui/profilemanager.py:83 msgid "GNOME Desktop (GNOME)" msgstr "GNOME Desktop (GNOME)" -#: ../pyhoca/wxgui/profilemanager.py:83 +#: ../pyhoca/wxgui/profilemanager.py:84 msgid "K Desktop Environment (KDE)" msgstr "K Desktop Environment (KDE)" -#: ../pyhoca/wxgui/profilemanager.py:84 +#: ../pyhoca/wxgui/profilemanager.py:85 msgid "Lightweight X Desktop (LXDE)" msgstr "Lightweight X Desktop (LXDE)" -#: ../pyhoca/wxgui/profilemanager.py:85 +#: ../pyhoca/wxgui/profilemanager.py:86 msgid "Trinity X Desktop (KDE3-like)" msgstr "Trinity X Desktop (KDE3)" -#: ../pyhoca/wxgui/profilemanager.py:86 +#: ../pyhoca/wxgui/profilemanager.py:87 msgid "Unity X Desktop Shell (UNITY)" msgstr "Unity X Desktop Shell (UNITY)" -#: ../pyhoca/wxgui/profilemanager.py:87 +#: ../pyhoca/wxgui/profilemanager.py:88 msgid "XFCE4 Desktop (XFCE4)" msgstr "XFCE4 Desktop (XFCE4)" -#: ../pyhoca/wxgui/profilemanager.py:88 +#: ../pyhoca/wxgui/profilemanager.py:89 msgid "Published Applications" msgstr "Gepubliceerde applicaties" -#: ../pyhoca/wxgui/profilemanager.py:89 +#: ../pyhoca/wxgui/profilemanager.py:90 msgid "Single Application" msgstr "Enkelvoudige Applicatie" -#: ../pyhoca/wxgui/profilemanager.py:90 +#: ../pyhoca/wxgui/profilemanager.py:91 msgid "XDMCP Query" msgstr "XDMCP Query" -#: ../pyhoca/wxgui/profilemanager.py:91 -msgid "Windows Terminal Server (RDP-proxy)" +#: ../pyhoca/wxgui/profilemanager.py:92 +#, fuzzy +msgid "Windows Terminal Server (X2Go-proxied RDP)" msgstr "Windows Terminalserver (RDP-proxy)" -#. 'DirectRDP': 'Windows Terminal Server (RDP-direct)', -#: ../pyhoca/wxgui/profilemanager.py:93 ../pyhoca/wxgui/profilemanager.py:207 +#: ../pyhoca/wxgui/profilemanager.py:94 ../pyhoca/wxgui/profilemanager.py:227 msgid "Custom command" msgstr "Speciaal Commando" -#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:398 +#: ../pyhoca/wxgui/profilemanager.py:99 ../pyhoca/wxgui/menus_taskbar.py:398 msgid "Internet Browser" msgstr "Internetbrowser" -#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:399 +#: ../pyhoca/wxgui/profilemanager.py:100 ../pyhoca/wxgui/menus_taskbar.py:399 msgid "Email Client" msgstr "E-Mail Programma" -#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:400 +#: ../pyhoca/wxgui/profilemanager.py:101 ../pyhoca/wxgui/menus_taskbar.py:400 msgid "Office" msgstr "Office" -#: ../pyhoca/wxgui/profilemanager.py:99 ../pyhoca/wxgui/menus_taskbar.py:401 +#: ../pyhoca/wxgui/profilemanager.py:102 ../pyhoca/wxgui/menus_taskbar.py:401 msgid "Terminal" msgstr "Terminal" -#: ../pyhoca/wxgui/profilemanager.py:113 +#: ../pyhoca/wxgui/profilemanager.py:120 msgid "Open file with system's default application" msgstr "Open bestand met het geassocieerde programma" -#: ../pyhoca/wxgui/profilemanager.py:114 +#: ../pyhoca/wxgui/profilemanager.py:121 msgid "Open application chooser dialog" msgstr "Open dialoog, om Applicatie te kiezen" -#: ../pyhoca/wxgui/profilemanager.py:115 +#: ../pyhoca/wxgui/profilemanager.py:122 msgid "Save incoming file as ..." msgstr "Opslaan bestand als ..." -#: ../pyhoca/wxgui/profilemanager.py:143 +#: ../pyhoca/wxgui/profilemanager.py:150 msgid "settings derived from " msgstr "configuratie afgeleid van" #. boxes for all tabs -#: ../pyhoca/wxgui/profilemanager.py:160 +#: ../pyhoca/wxgui/profilemanager.py:170 msgid "Session Title" msgstr "Sessie naam" -#: ../pyhoca/wxgui/profilemanager.py:161 +#: ../pyhoca/wxgui/profilemanager.py:171 msgid "Session Window" msgstr "Sessie Window" -#: ../pyhoca/wxgui/profilemanager.py:162 +#: ../pyhoca/wxgui/profilemanager.py:172 msgid "Session Startup" msgstr "Sessie start" -#: ../pyhoca/wxgui/profilemanager.py:163 +#: ../pyhoca/wxgui/profilemanager.py:173 msgid "Server" msgstr "Server" -#: ../pyhoca/wxgui/profilemanager.py:164 +#: ../pyhoca/wxgui/profilemanager.py:174 +msgid "Proxy" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:175 msgid "Connection Link Speed" msgstr "Verbindings snelheid" -#: ../pyhoca/wxgui/profilemanager.py:165 +#: ../pyhoca/wxgui/profilemanager.py:176 msgid "Compression" msgstr "Compressie" -#: ../pyhoca/wxgui/profilemanager.py:166 +#: ../pyhoca/wxgui/profilemanager.py:177 msgid "Display" msgstr "Display" -#: ../pyhoca/wxgui/profilemanager.py:167 +#: ../pyhoca/wxgui/profilemanager.py:178 msgid "Keyboard" msgstr "Toetsenbord" -#: ../pyhoca/wxgui/profilemanager.py:168 +#: ../pyhoca/wxgui/profilemanager.py:179 msgid "Sound" msgstr "Geluid" -#: ../pyhoca/wxgui/profilemanager.py:169 +#: ../pyhoca/wxgui/profilemanager.py:180 msgid "Printing" msgstr "Afdrukken" -#: ../pyhoca/wxgui/profilemanager.py:170 +#: ../pyhoca/wxgui/profilemanager.py:181 msgid "Folder Exports" msgstr "Map export" -#: ../pyhoca/wxgui/profilemanager.py:171 +#: ../pyhoca/wxgui/profilemanager.py:182 msgid "File Import" msgstr "Bestands import" #. ## #. ## widgets for the PROFILE tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:176 +#: ../pyhoca/wxgui/profilemanager.py:187 msgid "Name" msgstr "Naam" -#: ../pyhoca/wxgui/profilemanager.py:183 +#: ../pyhoca/wxgui/profilemanager.py:194 msgid "Set session window title" msgstr "Stel sessiescherm titel in" -#: ../pyhoca/wxgui/profilemanager.py:184 +#: ../pyhoca/wxgui/profilemanager.py:195 msgid "Use a default session window title" msgstr "Gebruik een standaard sessienaam" -#: ../pyhoca/wxgui/profilemanager.py:185 +#: ../pyhoca/wxgui/profilemanager.py:196 msgid "Custom session window title" msgstr "Aangepaste sessienaam" -#: ../pyhoca/wxgui/profilemanager.py:195 +#: ../pyhoca/wxgui/profilemanager.py:215 msgid "Window Icon" msgstr "Scherm icoon" #. ## #. ## widgets for the SESSION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:201 +#: ../pyhoca/wxgui/profilemanager.py:221 msgid "Start session automatically after login" msgstr "Start sessie automatisch na login" -#: ../pyhoca/wxgui/profilemanager.py:202 +#: ../pyhoca/wxgui/profilemanager.py:222 #, python-format msgid "Login automatically after %s has started" msgstr "Login automatisch nadat %s is gestart" -#: ../pyhoca/wxgui/profilemanager.py:203 +#: ../pyhoca/wxgui/profilemanager.py:223 msgid "Type" msgstr "Type" -#: ../pyhoca/wxgui/profilemanager.py:205 +#: ../pyhoca/wxgui/profilemanager.py:225 msgid "Application" msgstr "Applicatie" -#: ../pyhoca/wxgui/profilemanager.py:209 +#: ../pyhoca/wxgui/profilemanager.py:229 msgid "XDMCP server" msgstr "XDMCP Server" -#: ../pyhoca/wxgui/profilemanager.py:211 +#: ../pyhoca/wxgui/profilemanager.py:231 msgid "RDP server" msgstr "RDP Server" -#: ../pyhoca/wxgui/profilemanager.py:213 +#: ../pyhoca/wxgui/profilemanager.py:233 msgid "RDP options" msgstr "RDP Opties" -#: ../pyhoca/wxgui/profilemanager.py:215 +#: ../pyhoca/wxgui/profilemanager.py:235 msgid "Integrate remote application(s) into local desktop (rootless mode)" msgstr "Integreer remote toepassing in de lokale desktop (rootless mode)" -#: ../pyhoca/wxgui/profilemanager.py:216 +#: ../pyhoca/wxgui/profilemanager.py:236 msgid "Menu of published applications" msgstr "Menu met gepubliceerde applicaties" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:223 ../pyhoca/wxgui/profilemanager.py:233 +#: ../pyhoca/wxgui/profilemanager.py:243 ../pyhoca/wxgui/profilemanager.py:253 msgid "User" msgstr "Gebruiker" -#: ../pyhoca/wxgui/profilemanager.py:225 +#: ../pyhoca/wxgui/profilemanager.py:245 ../pyhoca/wxgui/profilemanager.py:260 msgid "Host" msgstr "Host" -#: ../pyhoca/wxgui/profilemanager.py:227 +#: ../pyhoca/wxgui/profilemanager.py:247 ../pyhoca/wxgui/profilemanager.py:262 msgid "Port" msgstr "Port" -#: ../pyhoca/wxgui/profilemanager.py:229 -msgid "RSA/DSA private key" -msgstr "Private RSA/DSA Key" +#: ../pyhoca/wxgui/profilemanager.py:249 +msgid "Key" +msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:232 +#: ../pyhoca/wxgui/profilemanager.py:252 msgid "Server behind SSH proxy" msgstr "Server achter SSH-Proxy" -#: ../pyhoca/wxgui/profilemanager.py:235 +#: ../pyhoca/wxgui/profilemanager.py:255 +msgid "Use same username for X2Go and proxy host" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:256 +msgid "Use same authentication for X2Go and proxy host" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:257 msgid "Key file" msgstr "Sleutel" -#: ../pyhoca/wxgui/profilemanager.py:238 -msgid "Host[:Port]" -msgstr "Host[:Port]" - -#: ../pyhoca/wxgui/profilemanager.py:240 +#: ../pyhoca/wxgui/profilemanager.py:264 msgid "SSH Proxy Tunnel" msgstr "SSH Proxy Tunnel" -#: ../pyhoca/wxgui/profilemanager.py:248 +#: ../pyhoca/wxgui/profilemanager.py:272 msgid "Modem" msgstr "Modem" -#: ../pyhoca/wxgui/profilemanager.py:249 +#: ../pyhoca/wxgui/profilemanager.py:273 msgid "ISDN" msgstr "ISDN" -#: ../pyhoca/wxgui/profilemanager.py:250 +#: ../pyhoca/wxgui/profilemanager.py:274 msgid "ADSL" msgstr "ADSL" -#: ../pyhoca/wxgui/profilemanager.py:251 +#: ../pyhoca/wxgui/profilemanager.py:275 msgid "WAN" msgstr "WAN" -#: ../pyhoca/wxgui/profilemanager.py:252 +#: ../pyhoca/wxgui/profilemanager.py:276 msgid "LAN" msgstr "LAN" -#: ../pyhoca/wxgui/profilemanager.py:254 +#: ../pyhoca/wxgui/profilemanager.py:278 msgid "Method" msgstr "Methode" -#: ../pyhoca/wxgui/profilemanager.py:256 +#: ../pyhoca/wxgui/profilemanager.py:280 msgid "Image quality" msgstr "Beeldkwaliteit" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:262 +#: ../pyhoca/wxgui/profilemanager.py:286 msgid "Fullscreen" msgstr "Fullscreen" -#: ../pyhoca/wxgui/profilemanager.py:263 +#: ../pyhoca/wxgui/profilemanager.py:287 msgid "Custom Size" msgstr "Grootte instellen" -#: ../pyhoca/wxgui/profilemanager.py:268 +#: ../pyhoca/wxgui/profilemanager.py:292 msgid "Set display DPI" msgstr "DPI-waarde instellen" -#: ../pyhoca/wxgui/profilemanager.py:270 +#: ../pyhoca/wxgui/profilemanager.py:294 msgid "Do not set (use server-side tools to configure the keyboard)" msgstr "Uitzetten (gebruik server-side tools om het toetsenbord in te stellen)" -#: ../pyhoca/wxgui/profilemanager.py:271 +#: ../pyhoca/wxgui/profilemanager.py:295 msgid "" "Automatically detect and use client-side keyboard configuration inside the " "session" msgstr "Gebruik automatisch gedetecteerd toetsenbord in de sessie" -#: ../pyhoca/wxgui/profilemanager.py:272 +#: ../pyhoca/wxgui/profilemanager.py:296 msgid "Use custom keyboard settings as provided below" msgstr "Gebruik de onderstaande speciale toetsenbord instellingen" -#: ../pyhoca/wxgui/profilemanager.py:273 +#: ../pyhoca/wxgui/profilemanager.py:297 msgid "Keyboard model" msgstr "Toetsenbord model" -#: ../pyhoca/wxgui/profilemanager.py:275 +#: ../pyhoca/wxgui/profilemanager.py:299 msgid "Layout" msgstr "Layout" -#: ../pyhoca/wxgui/profilemanager.py:277 +#: ../pyhoca/wxgui/profilemanager.py:301 msgid "Layout variant" msgstr "Layout variant" -#: ../pyhoca/wxgui/profilemanager.py:279 +#: ../pyhoca/wxgui/profilemanager.py:303 msgid "Enable sound support" msgstr "Geluid gebruiken" -#: ../pyhoca/wxgui/profilemanager.py:280 +#: ../pyhoca/wxgui/profilemanager.py:304 msgid "Pulse Audio" msgstr "Pulse Audio" #. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated. #. However, config files can contain an Arts configuration, so we will honour this -#: ../pyhoca/wxgui/profilemanager.py:284 +#: ../pyhoca/wxgui/profilemanager.py:308 msgid "Arts (not supported)" msgstr "Arts (niet ondersteund)" -#: ../pyhoca/wxgui/profilemanager.py:287 +#: ../pyhoca/wxgui/profilemanager.py:311 msgid "esd" msgstr "esd" -#: ../pyhoca/wxgui/profilemanager.py:288 +#: ../pyhoca/wxgui/profilemanager.py:312 msgid "Use default sound port" msgstr "Standaard Audio-Port gebruiken" -#: ../pyhoca/wxgui/profilemanager.py:289 +#: ../pyhoca/wxgui/profilemanager.py:313 msgid "Custom sound port" msgstr "Speciale Audio-Port" -#: ../pyhoca/wxgui/profilemanager.py:291 +#: ../pyhoca/wxgui/profilemanager.py:315 msgid "Client Side printing" msgstr "Afdrukken via deze computer" -#: ../pyhoca/wxgui/profilemanager.py:293 +#: ../pyhoca/wxgui/profilemanager.py:317 msgid "Use local folder sharing" msgstr "Delen van lokale mappen" -#: ../pyhoca/wxgui/profilemanager.py:294 +#: ../pyhoca/wxgui/profilemanager.py:318 msgid "Path" msgstr "Pad" -#: ../pyhoca/wxgui/profilemanager.py:297 ../pyhoca/wxgui/profilemanager.py:316 +#: ../pyhoca/wxgui/profilemanager.py:321 ../pyhoca/wxgui/profilemanager.py:340 msgid "Add" msgstr "Toevoegen" -#: ../pyhoca/wxgui/profilemanager.py:299 +#: ../pyhoca/wxgui/profilemanager.py:323 msgid "Local Path" msgstr "Lokaal Pad" -#: ../pyhoca/wxgui/profilemanager.py:300 +#: ../pyhoca/wxgui/profilemanager.py:324 msgid "Connect Method" msgstr "Verbindingsmethode" -#: ../pyhoca/wxgui/profilemanager.py:301 +#: ../pyhoca/wxgui/profilemanager.py:325 msgid "Delete" msgstr "Verwijderen" -#: ../pyhoca/wxgui/profilemanager.py:303 +#: ../pyhoca/wxgui/profilemanager.py:327 msgid "Convert between client and server encodings" msgstr "Encoding tussen client en server vertalen" -#: ../pyhoca/wxgui/profilemanager.py:304 +#: ../pyhoca/wxgui/profilemanager.py:328 msgid "Client encoding" msgstr "Client encoding" -#: ../pyhoca/wxgui/profilemanager.py:306 +#: ../pyhoca/wxgui/profilemanager.py:330 msgid "Server encoding" msgstr "Server encoding" -#: ../pyhoca/wxgui/profilemanager.py:309 +#: ../pyhoca/wxgui/profilemanager.py:333 msgid "Use file MIME box for local file import" msgstr "Importeren lokale bestanden via MIME box" -#: ../pyhoca/wxgui/profilemanager.py:310 +#: ../pyhoca/wxgui/profilemanager.py:334 msgid "Extensions" msgstr "Uitbreidingen" -#: ../pyhoca/wxgui/profilemanager.py:312 +#: ../pyhoca/wxgui/profilemanager.py:336 msgid "Action" msgstr "Actie" -#: ../pyhoca/wxgui/profilemanager.py:317 +#: ../pyhoca/wxgui/profilemanager.py:341 msgid "Defaults" msgstr "Standaardwaarden" -#: ../pyhoca/wxgui/profilemanager.py:319 +#: ../pyhoca/wxgui/profilemanager.py:343 msgid "Save" msgstr "Opslaan" -#: ../pyhoca/wxgui/profilemanager.py:320 +#: ../pyhoca/wxgui/profilemanager.py:344 msgid "Reset" msgstr "Reset" -#: ../pyhoca/wxgui/profilemanager.py:365 -#: ../pyhoca/wxgui/profilemanager.py:1078 -#: ../pyhoca/wxgui/profilemanager.py:1832 +#: ../pyhoca/wxgui/profilemanager.py:394 +#: ../pyhoca/wxgui/profilemanager.py:1089 +#: ../pyhoca/wxgui/profilemanager.py:1983 msgid "automatically" msgstr "automatisch" -#: ../pyhoca/wxgui/profilemanager.py:367 -#: ../pyhoca/wxgui/profilemanager.py:1080 +#: ../pyhoca/wxgui/profilemanager.py:396 +#: ../pyhoca/wxgui/profilemanager.py:1091 msgid "manually" msgstr "handmatig" -#: ../pyhoca/wxgui/profilemanager.py:376 +#: ../pyhoca/wxgui/profilemanager.py:405 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "PyHoca-GUI Profiel manager - nieuw profiel" -#: ../pyhoca/wxgui/profilemanager.py:378 +#: ../pyhoca/wxgui/profilemanager.py:407 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "PyHoca-GUI Profiel manager - %s (verbonden)" -#: ../pyhoca/wxgui/profilemanager.py:380 +#: ../pyhoca/wxgui/profilemanager.py:409 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "PyHoca-GUI Profiel manager - %s" -#: ../pyhoca/wxgui/profilemanager.py:751 +#: ../pyhoca/wxgui/profilemanager.py:769 msgid "Profile" msgstr "Profiel" -#: ../pyhoca/wxgui/profilemanager.py:752 +#: ../pyhoca/wxgui/profilemanager.py:770 msgid "Session" msgstr "Sessie" -#: ../pyhoca/wxgui/profilemanager.py:753 +#: ../pyhoca/wxgui/profilemanager.py:771 msgid "Connection" msgstr "Verbinding" -#: ../pyhoca/wxgui/profilemanager.py:754 +#: ../pyhoca/wxgui/profilemanager.py:772 msgid "Settings" msgstr "Instellingen" -#: ../pyhoca/wxgui/profilemanager.py:755 +#: ../pyhoca/wxgui/profilemanager.py:773 msgid "Sharing" msgstr "Delen" -#: ../pyhoca/wxgui/profilemanager.py:996 +#: ../pyhoca/wxgui/profilemanager.py:1007 msgid "<xkbtype>" msgstr "pc105/us" -#: ../pyhoca/wxgui/profilemanager.py:997 +#: ../pyhoca/wxgui/profilemanager.py:1008 msgid "<xkblayout>" msgstr "us" -#: ../pyhoca/wxgui/profilemanager.py:998 +#: ../pyhoca/wxgui/profilemanager.py:1009 msgid "<xkbvariant>" msgstr "intl" -#: ../pyhoca/wxgui/profilemanager.py:1284 +#: ../pyhoca/wxgui/profilemanager.py:1306 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "Icon Bestanden (*.png)|*.png|Alle Bestanden (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1287 +#: ../pyhoca/wxgui/profilemanager.py:1309 msgid "Choose an icon for this session profile" msgstr "Icon voor dit Profiel kiezen" -#: ../pyhoca/wxgui/profilemanager.py:1509 +#: ../pyhoca/wxgui/profilemanager.py:1600 msgid "All files (*.*)|*" msgstr "Alle Bestanden (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1511 -#: ../pyhoca/wxgui/profilemanager.py:1533 +#: ../pyhoca/wxgui/profilemanager.py:1602 +#: ../pyhoca/wxgui/profilemanager.py:1626 msgid "Choose a public SSH key" msgstr "Kies een public SSH-key" -#: ../pyhoca/wxgui/profilemanager.py:1784 +#: ../pyhoca/wxgui/profilemanager.py:1935 msgid "Choose a folder to share within a session" msgstr "Kies een map om te delen" -#: ../pyhoca/wxgui/profilemanager.py:1912 -#: ../pyhoca/wxgui/profilemanager.py:1915 -#: ../pyhoca/wxgui/profilemanager.py:1918 -#: ../pyhoca/wxgui/profilemanager.py:1923 -#: ../pyhoca/wxgui/profilemanager.py:1933 ../pyhoca/wxgui/menus_taskbar.py:118 +#: ../pyhoca/wxgui/profilemanager.py:2063 +#: ../pyhoca/wxgui/profilemanager.py:2066 +#: ../pyhoca/wxgui/profilemanager.py:2069 +#: ../pyhoca/wxgui/profilemanager.py:2074 +#: ../pyhoca/wxgui/profilemanager.py:2084 ../pyhoca/wxgui/menus_taskbar.py:118 msgid "Profile Manager" msgstr "Profiel manager" -#: ../pyhoca/wxgui/profilemanager.py:1912 +#: ../pyhoca/wxgui/profilemanager.py:2063 msgid "Profile name is missing, profile unusable!!!" msgstr "Profiel naam ontbreekt, kan niet gebruikt worden!!!" -#: ../pyhoca/wxgui/profilemanager.py:1915 -#: ../pyhoca/wxgui/profilemanager.py:1918 +#: ../pyhoca/wxgui/profilemanager.py:2066 +#: ../pyhoca/wxgui/profilemanager.py:2069 #, python-format msgid "Profile name %s already exists!!!" msgstr "Profiel %s bestaat al" -#: ../pyhoca/wxgui/profilemanager.py:1923 +#: ../pyhoca/wxgui/profilemanager.py:2074 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "SSH Proxy Configuratie is niet volledig! Opnieuw proberen..." -#: ../pyhoca/wxgui/profilemanager.py:1933 +#: ../pyhoca/wxgui/profilemanager.py:2084 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -668,21 +676,21 @@ msgstr "" "SSH proxy.\n" "Verander de SSH proxy instelling om dit probleem te verhelpen." -#: ../pyhoca/wxgui/profilemanager.py:1960 +#: ../pyhoca/wxgui/profilemanager.py:2111 #, python-format msgid "%s - profile added" msgstr "%s - Profiel toegevoegd" -#: ../pyhoca/wxgui/profilemanager.py:1961 +#: ../pyhoca/wxgui/profilemanager.py:2112 msgid "A new session profile has been added." msgstr "Een nieuw Profiel is toegevoegd" -#: ../pyhoca/wxgui/profilemanager.py:1965 +#: ../pyhoca/wxgui/profilemanager.py:2116 #, python-format msgid "%s - modified" msgstr "%s - gewijzigd" -#: ../pyhoca/wxgui/profilemanager.py:1966 +#: ../pyhoca/wxgui/profilemanager.py:2117 msgid "Changes to profile have been saved." msgstr "Wijzigingen in het profiel zijn opgeslagen." @@ -940,86 +948,102 @@ msgstr "%s - server waarschuwing" msgid "The X2Go Server does not publish an application menu." msgstr "De X2go server publiceert geen applicatie menu" -#: ../pyhoca/wxgui/frontend.py:610 +#: ../pyhoca/wxgui/frontend.py:611 msgid "Public SSH key authentication has been successful." msgstr "Public SSH-key authenticatie is gelukt." -#: ../pyhoca/wxgui/frontend.py:644 +#: ../pyhoca/wxgui/frontend.py:648 msgid "" "The SSH proxy's host key is invalid or has not been accepted by the user" msgstr "" "De sleutel van de SSH proxy is ongeldig of is niet geaccepteerd door de " "gebruiker" -#: ../pyhoca/wxgui/frontend.py:665 +#: ../pyhoca/wxgui/frontend.py:669 #, python-format msgid "%s - EOF error" msgstr "%s - EOF fout" -#: ../pyhoca/wxgui/frontend.py:665 +#: ../pyhoca/wxgui/frontend.py:669 msgid "Authentication protocol communication incomplete! Try again..." msgstr "Authenticatie was niet volledig! Opnieuw proberen..." -#: ../pyhoca/wxgui/frontend.py:672 +#: ../pyhoca/wxgui/frontend.py:676 #, python-format msgid "%s - auth key error" msgstr "%s - Verbindingsfout met auth. key" -#: ../pyhoca/wxgui/frontend.py:693 +#: ../pyhoca/wxgui/frontend.py:697 msgid "An unknown error occurred during authentication!" msgstr "Een onbekende fout is bij de authenticatie opgetreden" +#: ../pyhoca/wxgui/frontend.py:725 +#, fuzzy, python-format +msgid "%s: DirectRDP not supported yet" +msgstr "Arts (niet ondersteund)" + #: ../pyhoca/wxgui/frontend.py:726 +#, python-format +msgid "" +"We apologize for the inconvenience...\n" +"\n" +"Session profiles of type ,,DirectRDP'' are not\n" +"supported by %s (%s), yet!!\n" +"\n" +"DirectRDP support will be available in %s (>= 0.2.2.0)." +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:738 msgid "Unknown session profile, configure before using it..." msgstr "Onekend sessie profiel, stel dit in voordat je het gebruikt..." -#: ../pyhoca/wxgui/frontend.py:784 ../pyhoca/wxgui/frontend.py:1302 +#: ../pyhoca/wxgui/frontend.py:796 ../pyhoca/wxgui/frontend.py:1314 #, python-format msgid "%s - session warning" msgstr "%s - sessie waarschuwing" -#: ../pyhoca/wxgui/frontend.py:784 +#: ../pyhoca/wxgui/frontend.py:796 #, python-format msgid "Execution of command ,,%s'' failed." msgstr "Uitvoering van commando \"%s\" faalde" -#: ../pyhoca/wxgui/frontend.py:926 +#: ../pyhoca/wxgui/frontend.py:938 msgid "Cleaning X2Go sessions..." msgstr "Opschonen X2Go sessies..." -#: ../pyhoca/wxgui/frontend.py:961 +#: ../pyhoca/wxgui/frontend.py:973 #, python-format msgid "%s - disconnect" msgstr "%s - verbinding verbreken" -#: ../pyhoca/wxgui/frontend.py:961 +#: ../pyhoca/wxgui/frontend.py:973 msgid "X2Go Profile is now disconnected." msgstr "X2Go Profiel is nu niet meer verbonden." -#: ../pyhoca/wxgui/frontend.py:977 +#: ../pyhoca/wxgui/frontend.py:989 msgid "New Session Profile" msgstr "Nieuw Profiel" -#: ../pyhoca/wxgui/frontend.py:1029 +#: ../pyhoca/wxgui/frontend.py:1041 #, python-format msgid "Really Delete Session Profile ,,%s''?" msgstr "Verwijder sessie profiel ,,%s''?" -#: ../pyhoca/wxgui/frontend.py:1035 +#: ../pyhoca/wxgui/frontend.py:1047 #, python-format msgid "%s - profile deleted" msgstr "%s - Profiel is verwijderd!" -#: ../pyhoca/wxgui/frontend.py:1035 +#: ../pyhoca/wxgui/frontend.py:1047 msgid "The session profile has been deleted." msgstr "Het sessie profiel is verwijderd." -#: ../pyhoca/wxgui/frontend.py:1053 +#: ../pyhoca/wxgui/frontend.py:1065 #, python-format msgid "%s - share local folder with sessions of this profile" msgstr "%s - deel lokale map met dit Profiel" -#: ../pyhoca/wxgui/frontend.py:1194 +#: ../pyhoca/wxgui/frontend.py:1206 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -1032,17 +1056,17 @@ msgstr "" "\n" "Weet u zeker dat u de verbinding wilt maken?" -#: ../pyhoca/wxgui/frontend.py:1202 +#: ../pyhoca/wxgui/frontend.py:1214 #, python-format msgid "%s: Confirm Host Authorization" msgstr "%s: Bevestig dat de Host geautoriseerd is" -#: ../pyhoca/wxgui/frontend.py:1247 +#: ../pyhoca/wxgui/frontend.py:1259 #, python-format msgid "%s - channel error" msgstr "%s - Verbindingsfout (channel error)" -#: ../pyhoca/wxgui/frontend.py:1247 +#: ../pyhoca/wxgui/frontend.py:1259 #, python-format msgid "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " @@ -1051,22 +1075,22 @@ msgstr "" "De Verbinding met de server %s werd onverwacht verbroken! Probeer om u " "opnieuw aan te melden..." -#: ../pyhoca/wxgui/frontend.py:1265 ../pyhoca/wxgui/frontend.py:1283 -#: ../pyhoca/wxgui/frontend.py:1285 ../pyhoca/wxgui/frontend.py:1321 +#: ../pyhoca/wxgui/frontend.py:1277 ../pyhoca/wxgui/frontend.py:1295 +#: ../pyhoca/wxgui/frontend.py:1297 ../pyhoca/wxgui/frontend.py:1333 #, python-format msgid "%s - session failure" msgstr "%s - sessie fout" -#: ../pyhoca/wxgui/frontend.py:1265 +#: ../pyhoca/wxgui/frontend.py:1277 msgid "The session startup failed." msgstr "Opstarten van de sessie is mislukt" -#: ../pyhoca/wxgui/frontend.py:1283 +#: ../pyhoca/wxgui/frontend.py:1295 #, python-format msgid "The command ,,%s'' is not available on X2Go server." msgstr "Het commando ,,%s'' is niet beschikbaar op de X2Go server." -#: ../pyhoca/wxgui/frontend.py:1285 +#: ../pyhoca/wxgui/frontend.py:1297 #, python-format msgid "" "The command ,,%s'' is not available on X2Go server\n" @@ -1075,7 +1099,7 @@ msgstr "" "Het commando ,,%s'' is niet beschikbaar op de X2Go server\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1302 +#: ../pyhoca/wxgui/frontend.py:1314 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " @@ -1084,7 +1108,7 @@ msgstr "" "Reverse TCP port forwarding request for session %s to server port %s has " "been denied." -#: ../pyhoca/wxgui/frontend.py:1321 +#: ../pyhoca/wxgui/frontend.py:1333 #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " @@ -1093,36 +1117,36 @@ msgstr "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " "X2go/SSH server. Session startup failed." -#: ../pyhoca/wxgui/frontend.py:1340 +#: ../pyhoca/wxgui/frontend.py:1352 #, python-format msgid "%s - audio warning" msgstr "%s - audio waarschuwing" -#: ../pyhoca/wxgui/frontend.py:1340 +#: ../pyhoca/wxgui/frontend.py:1352 msgid "" "The X2Go PulseAudio system is not available within Remote Desktop sessions." msgstr "" "Het X2Go PulseAudio systeem is niet beschikbaar voor Remote Desktop sessies" -#: ../pyhoca/wxgui/frontend.py:1347 ../pyhoca/wxgui/frontend.py:1354 +#: ../pyhoca/wxgui/frontend.py:1359 ../pyhoca/wxgui/frontend.py:1366 #, python-format msgid "%s - audio error" msgstr "%s - audio fout" -#: ../pyhoca/wxgui/frontend.py:1347 +#: ../pyhoca/wxgui/frontend.py:1359 msgid "The X2Go PulseAudio system could not be started." msgstr "Het X2Go PulseAudio systeem kon niet gestart worden" -#: ../pyhoca/wxgui/frontend.py:1354 +#: ../pyhoca/wxgui/frontend.py:1366 msgid "The X2Go PulseAudio system has died unexpectedly." msgstr "Het X2Go PulseAudio systeem is gecrashed" -#: ../pyhoca/wxgui/frontend.py:1366 +#: ../pyhoca/wxgui/frontend.py:1378 #, python-format msgid "%s - audio problem" msgstr "%s - audio probleem" -#: ../pyhoca/wxgui/frontend.py:1366 +#: ../pyhoca/wxgui/frontend.py:1378 #, python-format msgid "" "The audio connection could not be set up for this session.\n" @@ -1131,36 +1155,36 @@ msgstr "" "De audio verbinding kon niet worden gemaakt voor deze sessie.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1378 +#: ../pyhoca/wxgui/frontend.py:1390 #, python-format msgid "%s - client-side printing not available" msgstr "%s - client-side print systeem niet beschikbaar" -#: ../pyhoca/wxgui/frontend.py:1378 +#: ../pyhoca/wxgui/frontend.py:1390 #, python-format msgid "" "The server denies client-side printing from within this session.\n" "%s" msgstr "De server staat client-side printing niet toe" -#: ../pyhoca/wxgui/frontend.py:1390 +#: ../pyhoca/wxgui/frontend.py:1402 #, python-format msgid "%s - MIME box not available" msgstr "%s- MIME box is niet beschikbaar" -#: ../pyhoca/wxgui/frontend.py:1390 +#: ../pyhoca/wxgui/frontend.py:1402 #, python-format msgid "" "The server does not support the X2Go MIME box.\n" "%s" msgstr "De server ondersteunt geen X2Go MIME box" -#: ../pyhoca/wxgui/frontend.py:1402 +#: ../pyhoca/wxgui/frontend.py:1414 #, python-format msgid "%s - client-side folders not sharable" msgstr "%s - client-side mappen worden niet gedeeld" -#: ../pyhoca/wxgui/frontend.py:1402 +#: ../pyhoca/wxgui/frontend.py:1414 #, python-format msgid "" "The server denies client-side folder sharing with this session.\n" @@ -1169,12 +1193,12 @@ msgstr "" "De server staat client-side mappen deling in deze sessie niet toe.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1414 +#: ../pyhoca/wxgui/frontend.py:1426 #, python-format msgid "%s - client resources not sharable" msgstr "%s - client bronnen kunnen niet gedeeld worden" -#: ../pyhoca/wxgui/frontend.py:1414 +#: ../pyhoca/wxgui/frontend.py:1426 #, python-format msgid "" "Client-side folders and printers cannot be shared with this session.\n" @@ -1183,12 +1207,12 @@ msgstr "" "Client-side mappen en printers kunnen niet gedeeld worden in deze sessie.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1433 ../pyhoca/wxgui/frontend.py:1435 +#: ../pyhoca/wxgui/frontend.py:1445 ../pyhoca/wxgui/frontend.py:1447 #, python-format msgid "%s - print error" msgstr "%s - Printfout" -#: ../pyhoca/wxgui/frontend.py:1433 +#: ../pyhoca/wxgui/frontend.py:1445 #, python-format msgid "" "%s\n" @@ -1199,7 +1223,7 @@ msgstr "" "...veroorzaakt door printer %s in sessie\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1435 +#: ../pyhoca/wxgui/frontend.py:1447 #, python-format msgid "" "%s\n" @@ -1210,12 +1234,12 @@ msgstr "" "...veroorzaakt door sessie\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1450 ../pyhoca/wxgui/frontend.py:1465 +#: ../pyhoca/wxgui/frontend.py:1462 ../pyhoca/wxgui/frontend.py:1477 #, python-format msgid "%s - start" msgstr "%s - Start" -#: ../pyhoca/wxgui/frontend.py:1450 +#: ../pyhoca/wxgui/frontend.py:1462 #, python-format msgid "" "New X2Go session starting up...\n" @@ -1224,7 +1248,7 @@ msgstr "" "Nieuwe X2Go sessie wordt gestart...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1465 +#: ../pyhoca/wxgui/frontend.py:1477 #, python-format msgid "" "Another client started X2Go session\n" @@ -1233,12 +1257,12 @@ msgstr "" "Een andere X2Go-client heeft deze sessie gestart\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1480 ../pyhoca/wxgui/frontend.py:1495 +#: ../pyhoca/wxgui/frontend.py:1492 ../pyhoca/wxgui/frontend.py:1507 #, python-format msgid "%s - resume" msgstr "%s - hervatten" -#: ../pyhoca/wxgui/frontend.py:1480 +#: ../pyhoca/wxgui/frontend.py:1492 #, python-format msgid "" "Resuming X2Go session...\n" @@ -1247,7 +1271,7 @@ msgstr "" "X2Go Sessie wordt hervat...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1495 +#: ../pyhoca/wxgui/frontend.py:1507 #, python-format msgid "" "Another client resumed X2Go session\n" @@ -1256,12 +1280,12 @@ msgstr "" "Een andere X2Go-client heeft de Sessie hervat\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1510 +#: ../pyhoca/wxgui/frontend.py:1522 #, python-format msgid "%s - running" msgstr "%s - actief" -#: ../pyhoca/wxgui/frontend.py:1510 +#: ../pyhoca/wxgui/frontend.py:1522 #, python-format msgid "" "Found already running session\n" @@ -1270,12 +1294,12 @@ msgstr "" "Reeds actieve sessie gevonden\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1530 +#: ../pyhoca/wxgui/frontend.py:1542 #, python-format msgid "%s - suspend" msgstr "%s - suspend" -#: ../pyhoca/wxgui/frontend.py:1530 +#: ../pyhoca/wxgui/frontend.py:1542 #, python-format msgid "" "X2Go Session has been suspended\n" @@ -1284,12 +1308,12 @@ msgstr "" "X2Go Sessie is suspended\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1557 +#: ../pyhoca/wxgui/frontend.py:1569 #, python-format msgid "%s - terminate" msgstr "%s - beëindigen" -#: ../pyhoca/wxgui/frontend.py:1557 +#: ../pyhoca/wxgui/frontend.py:1569 #, python-format msgid "" "X2Go Session has terminated\n" @@ -1433,6 +1457,12 @@ msgstr "Wijzig sessie naam naar" msgid "OK" msgstr "OK" +#~ msgid "RSA/DSA private key" +#~ msgstr "Private RSA/DSA Key" + +#~ msgid "Host[:Port]" +#~ msgstr "Host[:Port]" + #~ msgid "us" #~ msgstr "us" diff --git a/po/ru.po b/po/ru.po index 0983b7a..21bc35e 100644 --- a/po/ru.po +++ b/po/ru.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-10 21:18+0200\n" +"POT-Creation-Date: 2012-09-28 10:00+0200\n" "PO-Revision-Date: 2012-09-05 10:51+0200\n" "Last-Translator: Oleksandr Shneyder <o.shneyder(a)phoca-gmbh.de>\n" "Language-Team: Russian <x2go-i18n(a)lists.berlios.de>\n" @@ -17,8 +17,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<" -"=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Poedit-Language: Russian\n" "X-Poedit-Country: Russian\n" "X-Poedit-SourceCharset: utf-8\n" @@ -55,94 +55,94 @@ msgstr "Логин сессии" msgid "SSH proxy server login" msgstr "Логин SSH прокси сервера" -#: ../pyhoca/wxgui/logon.py:133 ../pyhoca/wxgui/profilemanager.py:322 +#: ../pyhoca/wxgui/logon.py:133 ../pyhoca/wxgui/profilemanager.py:346 #: ../pyhoca/wxgui/messages.py:132 ../pyhoca/wxgui/printingprefs.py:147 #: ../pyhoca/wxgui/sessiontitle.py:85 msgid "Cancel" msgstr "Отмена" -#: ../pyhoca/wxgui/logon.py:292 ../pyhoca/wxgui/logon.py:334 -#: ../pyhoca/wxgui/frontend.py:603 +#: ../pyhoca/wxgui/logon.py:301 ../pyhoca/wxgui/logon.py:343 +#: ../pyhoca/wxgui/frontend.py:604 #, python-format msgid "%s - connect failure" msgstr "%s - ошибка соединения" -#: ../pyhoca/wxgui/logon.py:293 ../pyhoca/wxgui/frontend.py:603 +#: ../pyhoca/wxgui/logon.py:302 ../pyhoca/wxgui/frontend.py:604 msgid "User is not allowed to start X2Go sessions!" msgstr "Пользователю не разрешено открывать X2Go сессии!" -#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:610 +#: ../pyhoca/wxgui/logon.py:307 ../pyhoca/wxgui/frontend.py:611 #, python-format msgid "%s - connect" msgstr "%s - соединение" -#: ../pyhoca/wxgui/logon.py:299 +#: ../pyhoca/wxgui/logon.py:308 msgid "Authentication has been successful." msgstr "Авторизация успешна." -#: ../pyhoca/wxgui/logon.py:330 +#: ../pyhoca/wxgui/logon.py:339 msgid "SSH tunnel started" msgstr "SSH туннель установлен" -#: ../pyhoca/wxgui/logon.py:335 +#: ../pyhoca/wxgui/logon.py:344 msgid "Authentication failed!" msgstr "Ошибка авторизации!" -#: ../pyhoca/wxgui/logon.py:342 +#: ../pyhoca/wxgui/logon.py:351 #, python-format msgid "%s - SSH proxy" msgstr "%s - SSH прокси" -#: ../pyhoca/wxgui/logon.py:343 +#: ../pyhoca/wxgui/logon.py:352 msgid "Authentication to the SSH proxy server failed!" msgstr "Ошибка авторизации на прокси сервере SSH!" -#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:658 +#: ../pyhoca/wxgui/logon.py:374 ../pyhoca/wxgui/frontend.py:662 #, python-format msgid "%s - socket error" msgstr "%s - ошибка сокета" -#: ../pyhoca/wxgui/logon.py:372 ../pyhoca/wxgui/frontend.py:637 -#: ../pyhoca/wxgui/frontend.py:644 +#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:641 +#: ../pyhoca/wxgui/frontend.py:648 #, python-format msgid "%s - host key error" msgstr "%s - ошибка ключа хоста" -#: ../pyhoca/wxgui/logon.py:373 ../pyhoca/wxgui/frontend.py:637 +#: ../pyhoca/wxgui/logon.py:382 ../pyhoca/wxgui/frontend.py:641 msgid "" "The remote server's host key is invalid or has not been accepted by the user" msgstr "Удаленный серверный ключ недействителен и не был принят пользователем" -#: ../pyhoca/wxgui/logon.py:380 ../pyhoca/wxgui/frontend.py:679 +#: ../pyhoca/wxgui/logon.py:389 ../pyhoca/wxgui/frontend.py:683 #, python-format msgid "%s - missing home directory" msgstr "%s - домашний каталог отсутствует" -#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:679 +#: ../pyhoca/wxgui/logon.py:390 ../pyhoca/wxgui/frontend.py:683 msgid "The remote user's home directory does not exist." msgstr "Домашний каталог удаленного пользователя не существует." -#: ../pyhoca/wxgui/logon.py:388 +#: ../pyhoca/wxgui/logon.py:397 #, python-format msgid "%s - key error" msgstr "%s - ошибка ключа" -#: ../pyhoca/wxgui/logon.py:396 ../pyhoca/wxgui/frontend.py:686 +#: ../pyhoca/wxgui/logon.py:405 ../pyhoca/wxgui/frontend.py:690 #, python-format msgid "%s - auth error" msgstr "%s - ошибка авторизации" -#: ../pyhoca/wxgui/logon.py:404 ../pyhoca/wxgui/frontend.py:630 +#: ../pyhoca/wxgui/logon.py:413 ../pyhoca/wxgui/frontend.py:634 #, python-format msgid "%s - SSH error" msgstr "%s - ошибка SSH" -#: ../pyhoca/wxgui/logon.py:412 +#: ../pyhoca/wxgui/logon.py:421 #, python-format msgid "%s - unknown error" msgstr "%s - неизвестная ошибка" -#: ../pyhoca/wxgui/logon.py:413 +#: ../pyhoca/wxgui/logon.py:422 msgid "An unknown error occured during authentication!" msgstr "Неизвестная ошибка при авторизации!" @@ -178,486 +178,498 @@ msgstr "" "PyHoca-GUI (Python X2goClient)\n" "Для соединения с удаленным сервером X2Go" -#: ../pyhoca/wxgui/profilemanager.py:82 +#: ../pyhoca/wxgui/profilemanager.py:83 msgid "GNOME Desktop (GNOME)" msgstr "GNOME Desktop (GNOME)" -#: ../pyhoca/wxgui/profilemanager.py:83 +#: ../pyhoca/wxgui/profilemanager.py:84 msgid "K Desktop Environment (KDE)" msgstr "K Desktop Environment (KDE)" -#: ../pyhoca/wxgui/profilemanager.py:84 +#: ../pyhoca/wxgui/profilemanager.py:85 msgid "Lightweight X Desktop (LXDE)" msgstr "Lightweight X Desktop (LXDE)" -#: ../pyhoca/wxgui/profilemanager.py:85 +#: ../pyhoca/wxgui/profilemanager.py:86 msgid "Trinity X Desktop (KDE3-like)" msgstr "Trinity X Desktop (KDE3-like)" -#: ../pyhoca/wxgui/profilemanager.py:86 +#: ../pyhoca/wxgui/profilemanager.py:87 msgid "Unity X Desktop Shell (UNITY)" msgstr "Unity X Desktop Shell (UNITY)" -#: ../pyhoca/wxgui/profilemanager.py:87 +#: ../pyhoca/wxgui/profilemanager.py:88 msgid "XFCE4 Desktop (XFCE4)" msgstr "XFCE4 Desktop (XFCE4)" -#: ../pyhoca/wxgui/profilemanager.py:88 +#: ../pyhoca/wxgui/profilemanager.py:89 msgid "Published Applications" msgstr "Удаленные приложения" -#: ../pyhoca/wxgui/profilemanager.py:89 +#: ../pyhoca/wxgui/profilemanager.py:90 msgid "Single Application" msgstr "Приложения" -#: ../pyhoca/wxgui/profilemanager.py:90 +#: ../pyhoca/wxgui/profilemanager.py:91 msgid "XDMCP Query" msgstr "XDMCP Запрос" -#: ../pyhoca/wxgui/profilemanager.py:91 -msgid "Windows Terminal Server (RDP-proxy)" +#: ../pyhoca/wxgui/profilemanager.py:92 +#, fuzzy +msgid "Windows Terminal Server (X2Go-proxied RDP)" msgstr "Сервер терминалов Windows (RDP-прокси)" -#. 'DirectRDP': 'Windows Terminal Server (RDP-direct)', -#: ../pyhoca/wxgui/profilemanager.py:93 ../pyhoca/wxgui/profilemanager.py:207 +#: ../pyhoca/wxgui/profilemanager.py:94 ../pyhoca/wxgui/profilemanager.py:227 msgid "Custom command" msgstr "Команда пользователя" -#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:398 +#: ../pyhoca/wxgui/profilemanager.py:99 ../pyhoca/wxgui/menus_taskbar.py:398 msgid "Internet Browser" msgstr "Веб-броузер" -#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:399 +#: ../pyhoca/wxgui/profilemanager.py:100 ../pyhoca/wxgui/menus_taskbar.py:399 msgid "Email Client" msgstr "Почтовый клиент" -#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:400 +#: ../pyhoca/wxgui/profilemanager.py:101 ../pyhoca/wxgui/menus_taskbar.py:400 msgid "Office" msgstr "Офис" -#: ../pyhoca/wxgui/profilemanager.py:99 ../pyhoca/wxgui/menus_taskbar.py:401 +#: ../pyhoca/wxgui/profilemanager.py:102 ../pyhoca/wxgui/menus_taskbar.py:401 msgid "Terminal" msgstr "Терминал" -#: ../pyhoca/wxgui/profilemanager.py:113 +#: ../pyhoca/wxgui/profilemanager.py:120 msgid "Open file with system's default application" msgstr "Открыть файл с приложением по умолчанию" -#: ../pyhoca/wxgui/profilemanager.py:114 +#: ../pyhoca/wxgui/profilemanager.py:121 msgid "Open application chooser dialog" msgstr "Открыть диалог выбора приложения" -#: ../pyhoca/wxgui/profilemanager.py:115 +#: ../pyhoca/wxgui/profilemanager.py:122 msgid "Save incoming file as ..." msgstr "Сохранить файл как ..." -#: ../pyhoca/wxgui/profilemanager.py:143 +#: ../pyhoca/wxgui/profilemanager.py:150 msgid "settings derived from " msgstr "настройки импортированы из " #. boxes for all tabs -#: ../pyhoca/wxgui/profilemanager.py:160 +#: ../pyhoca/wxgui/profilemanager.py:170 msgid "Session Title" msgstr "Заголовок сессии" -#: ../pyhoca/wxgui/profilemanager.py:161 +#: ../pyhoca/wxgui/profilemanager.py:171 msgid "Session Window" msgstr "Окно сессии" -#: ../pyhoca/wxgui/profilemanager.py:162 +#: ../pyhoca/wxgui/profilemanager.py:172 msgid "Session Startup" msgstr "Запуск сессии" -#: ../pyhoca/wxgui/profilemanager.py:163 +#: ../pyhoca/wxgui/profilemanager.py:173 msgid "Server" msgstr "Сервер" -#: ../pyhoca/wxgui/profilemanager.py:164 +#: ../pyhoca/wxgui/profilemanager.py:174 +msgid "Proxy" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:175 msgid "Connection Link Speed" msgstr "Скорость соединения" -#: ../pyhoca/wxgui/profilemanager.py:165 +#: ../pyhoca/wxgui/profilemanager.py:176 msgid "Compression" msgstr "Компрессия" -#: ../pyhoca/wxgui/profilemanager.py:166 +#: ../pyhoca/wxgui/profilemanager.py:177 msgid "Display" msgstr "Дисплей" -#: ../pyhoca/wxgui/profilemanager.py:167 +#: ../pyhoca/wxgui/profilemanager.py:178 msgid "Keyboard" msgstr "Клавиатура" -#: ../pyhoca/wxgui/profilemanager.py:168 +#: ../pyhoca/wxgui/profilemanager.py:179 msgid "Sound" msgstr "Звук" -#: ../pyhoca/wxgui/profilemanager.py:169 +#: ../pyhoca/wxgui/profilemanager.py:180 msgid "Printing" msgstr "Печать" -#: ../pyhoca/wxgui/profilemanager.py:170 +#: ../pyhoca/wxgui/profilemanager.py:181 msgid "Folder Exports" msgstr "Экспорт каталогов" -#: ../pyhoca/wxgui/profilemanager.py:171 +#: ../pyhoca/wxgui/profilemanager.py:182 msgid "File Import" msgstr "Импорт файлов" #. ## #. ## widgets for the PROFILE tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:176 +#: ../pyhoca/wxgui/profilemanager.py:187 msgid "Name" msgstr "Имя" -#: ../pyhoca/wxgui/profilemanager.py:183 +#: ../pyhoca/wxgui/profilemanager.py:194 msgid "Set session window title" msgstr "Установить заголовок окна сессии" -#: ../pyhoca/wxgui/profilemanager.py:184 +#: ../pyhoca/wxgui/profilemanager.py:195 msgid "Use a default session window title" msgstr "Использовать заголовок окна сессии по умолчанию" -#: ../pyhoca/wxgui/profilemanager.py:185 +#: ../pyhoca/wxgui/profilemanager.py:196 msgid "Custom session window title" msgstr "Произвольный заголовок окна сессии" -#: ../pyhoca/wxgui/profilemanager.py:195 +#: ../pyhoca/wxgui/profilemanager.py:215 msgid "Window Icon" msgstr "Пиктограмма" #. ## #. ## widgets for the SESSION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:201 +#: ../pyhoca/wxgui/profilemanager.py:221 msgid "Start session automatically after login" msgstr "Запускать сессию автоматически после входа" -#: ../pyhoca/wxgui/profilemanager.py:202 +#: ../pyhoca/wxgui/profilemanager.py:222 #, python-format msgid "Login automatically after %s has started" msgstr "Автоматический вход после запуска %s" -#: ../pyhoca/wxgui/profilemanager.py:203 +#: ../pyhoca/wxgui/profilemanager.py:223 msgid "Type" msgstr "Тип" -#: ../pyhoca/wxgui/profilemanager.py:205 +#: ../pyhoca/wxgui/profilemanager.py:225 msgid "Application" msgstr "Приложение" -#: ../pyhoca/wxgui/profilemanager.py:209 +#: ../pyhoca/wxgui/profilemanager.py:229 msgid "XDMCP server" msgstr "XDMCP сервер" -#: ../pyhoca/wxgui/profilemanager.py:211 +#: ../pyhoca/wxgui/profilemanager.py:231 msgid "RDP server" msgstr "RDP сервер" -#: ../pyhoca/wxgui/profilemanager.py:213 +#: ../pyhoca/wxgui/profilemanager.py:233 msgid "RDP options" msgstr "Опции RDP" -#: ../pyhoca/wxgui/profilemanager.py:215 +#: ../pyhoca/wxgui/profilemanager.py:235 msgid "Integrate remote application(s) into local desktop (rootless mode)" msgstr "Интегрировать удаленное приложение в локальный десктоп" -#: ../pyhoca/wxgui/profilemanager.py:216 +#: ../pyhoca/wxgui/profilemanager.py:236 msgid "Menu of published applications" msgstr "Меню удаленных приложений" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:223 ../pyhoca/wxgui/profilemanager.py:233 +#: ../pyhoca/wxgui/profilemanager.py:243 ../pyhoca/wxgui/profilemanager.py:253 msgid "User" msgstr "Пользователь" -#: ../pyhoca/wxgui/profilemanager.py:225 +#: ../pyhoca/wxgui/profilemanager.py:245 ../pyhoca/wxgui/profilemanager.py:260 msgid "Host" msgstr "Хост" -#: ../pyhoca/wxgui/profilemanager.py:227 +#: ../pyhoca/wxgui/profilemanager.py:247 ../pyhoca/wxgui/profilemanager.py:262 msgid "Port" msgstr "Порт" -#: ../pyhoca/wxgui/profilemanager.py:229 -msgid "RSA/DSA private key" -msgstr "личный ключ RSA/DSA" +#: ../pyhoca/wxgui/profilemanager.py:249 +msgid "Key" +msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:232 +#: ../pyhoca/wxgui/profilemanager.py:252 msgid "Server behind SSH proxy" msgstr "Сервер за SSH прокси" -#: ../pyhoca/wxgui/profilemanager.py:235 +#: ../pyhoca/wxgui/profilemanager.py:255 +msgid "Use same username for X2Go and proxy host" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:256 +msgid "Use same authentication for X2Go and proxy host" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:257 msgid "Key file" msgstr "Файл ключа" -#: ../pyhoca/wxgui/profilemanager.py:238 -msgid "Host[:Port]" -msgstr "Хост[:порт]" - -#: ../pyhoca/wxgui/profilemanager.py:240 +#: ../pyhoca/wxgui/profilemanager.py:264 msgid "SSH Proxy Tunnel" msgstr "SSH прокси туннель" -#: ../pyhoca/wxgui/profilemanager.py:248 +#: ../pyhoca/wxgui/profilemanager.py:272 msgid "Modem" msgstr "Модем" -#: ../pyhoca/wxgui/profilemanager.py:249 +#: ../pyhoca/wxgui/profilemanager.py:273 msgid "ISDN" msgstr "ISDN" -#: ../pyhoca/wxgui/profilemanager.py:250 +#: ../pyhoca/wxgui/profilemanager.py:274 msgid "ADSL" msgstr "ADSL" -#: ../pyhoca/wxgui/profilemanager.py:251 +#: ../pyhoca/wxgui/profilemanager.py:275 msgid "WAN" msgstr "WAN" -#: ../pyhoca/wxgui/profilemanager.py:252 +#: ../pyhoca/wxgui/profilemanager.py:276 msgid "LAN" msgstr "LAN" -#: ../pyhoca/wxgui/profilemanager.py:254 +#: ../pyhoca/wxgui/profilemanager.py:278 msgid "Method" msgstr "Метод" -#: ../pyhoca/wxgui/profilemanager.py:256 +#: ../pyhoca/wxgui/profilemanager.py:280 msgid "Image quality" msgstr "Качество изображения" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:262 +#: ../pyhoca/wxgui/profilemanager.py:286 msgid "Fullscreen" msgstr "Полноэкранный режим" -#: ../pyhoca/wxgui/profilemanager.py:263 +#: ../pyhoca/wxgui/profilemanager.py:287 msgid "Custom Size" msgstr "Другой размер" -#: ../pyhoca/wxgui/profilemanager.py:268 +#: ../pyhoca/wxgui/profilemanager.py:292 msgid "Set display DPI" msgstr "Установить DPI" -#: ../pyhoca/wxgui/profilemanager.py:270 +#: ../pyhoca/wxgui/profilemanager.py:294 msgid "Do not set (use server-side tools to configure the keyboard)" msgstr "Не устанавливать (конфигурация на стороне сервера)" -#: ../pyhoca/wxgui/profilemanager.py:271 +#: ../pyhoca/wxgui/profilemanager.py:295 msgid "" "Automatically detect and use client-side keyboard configuration inside the " "session" msgstr "автоматически определять и использовать установки на стороне сервера" -#: ../pyhoca/wxgui/profilemanager.py:272 +#: ../pyhoca/wxgui/profilemanager.py:296 msgid "Use custom keyboard settings as provided below" msgstr "Использовать следующие установки" -#: ../pyhoca/wxgui/profilemanager.py:273 +#: ../pyhoca/wxgui/profilemanager.py:297 msgid "Keyboard model" msgstr "Модель" -#: ../pyhoca/wxgui/profilemanager.py:275 +#: ../pyhoca/wxgui/profilemanager.py:299 msgid "Layout" msgstr "Раскладка" -#: ../pyhoca/wxgui/profilemanager.py:277 +#: ../pyhoca/wxgui/profilemanager.py:301 msgid "Layout variant" msgstr "Вариант раскладки" -#: ../pyhoca/wxgui/profilemanager.py:279 +#: ../pyhoca/wxgui/profilemanager.py:303 msgid "Enable sound support" msgstr "Активировать звук" -#: ../pyhoca/wxgui/profilemanager.py:280 +#: ../pyhoca/wxgui/profilemanager.py:304 msgid "Pulse Audio" msgstr "Pulse Audio" #. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated. #. However, config files can contain an Arts configuration, so we will honour this -#: ../pyhoca/wxgui/profilemanager.py:284 +#: ../pyhoca/wxgui/profilemanager.py:308 msgid "Arts (not supported)" msgstr "Arts (не поддерживается)" -#: ../pyhoca/wxgui/profilemanager.py:287 +#: ../pyhoca/wxgui/profilemanager.py:311 msgid "esd" msgstr "esd" -#: ../pyhoca/wxgui/profilemanager.py:288 +#: ../pyhoca/wxgui/profilemanager.py:312 msgid "Use default sound port" msgstr "Звуковой порт по умолчанию" -#: ../pyhoca/wxgui/profilemanager.py:289 +#: ../pyhoca/wxgui/profilemanager.py:313 msgid "Custom sound port" msgstr "Другой звуковой порт" -#: ../pyhoca/wxgui/profilemanager.py:291 +#: ../pyhoca/wxgui/profilemanager.py:315 msgid "Client Side printing" msgstr "Печать на стороне клиента" -#: ../pyhoca/wxgui/profilemanager.py:293 +#: ../pyhoca/wxgui/profilemanager.py:317 msgid "Use local folder sharing" msgstr "Доступ к локальным каталогам" -#: ../pyhoca/wxgui/profilemanager.py:294 +#: ../pyhoca/wxgui/profilemanager.py:318 msgid "Path" msgstr "Путь" -#: ../pyhoca/wxgui/profilemanager.py:297 ../pyhoca/wxgui/profilemanager.py:316 +#: ../pyhoca/wxgui/profilemanager.py:321 ../pyhoca/wxgui/profilemanager.py:340 msgid "Add" msgstr "Добавить" -#: ../pyhoca/wxgui/profilemanager.py:299 +#: ../pyhoca/wxgui/profilemanager.py:323 msgid "Local Path" msgstr "Локальный путь" -#: ../pyhoca/wxgui/profilemanager.py:300 +#: ../pyhoca/wxgui/profilemanager.py:324 msgid "Connect Method" msgstr "Метод подключения" -#: ../pyhoca/wxgui/profilemanager.py:301 +#: ../pyhoca/wxgui/profilemanager.py:325 msgid "Delete" msgstr "Удалить" -#: ../pyhoca/wxgui/profilemanager.py:303 +#: ../pyhoca/wxgui/profilemanager.py:327 msgid "Convert between client and server encodings" msgstr "Кодировка имен файлов" -#: ../pyhoca/wxgui/profilemanager.py:304 +#: ../pyhoca/wxgui/profilemanager.py:328 msgid "Client encoding" msgstr "На стороне клиента" -#: ../pyhoca/wxgui/profilemanager.py:306 +#: ../pyhoca/wxgui/profilemanager.py:330 msgid "Server encoding" msgstr "На стороне сервера" -#: ../pyhoca/wxgui/profilemanager.py:309 +#: ../pyhoca/wxgui/profilemanager.py:333 msgid "Use file MIME box for local file import" msgstr "Использовать MIME box для импорта локальных файлов" -#: ../pyhoca/wxgui/profilemanager.py:310 +#: ../pyhoca/wxgui/profilemanager.py:334 msgid "Extensions" msgstr "Расширения" -#: ../pyhoca/wxgui/profilemanager.py:312 +#: ../pyhoca/wxgui/profilemanager.py:336 msgid "Action" msgstr "Действие" -#: ../pyhoca/wxgui/profilemanager.py:317 +#: ../pyhoca/wxgui/profilemanager.py:341 msgid "Defaults" msgstr "По умолчанию" -#: ../pyhoca/wxgui/profilemanager.py:319 +#: ../pyhoca/wxgui/profilemanager.py:343 msgid "Save" msgstr "Сохранить" -#: ../pyhoca/wxgui/profilemanager.py:320 +#: ../pyhoca/wxgui/profilemanager.py:344 msgid "Reset" msgstr "Восстановить" -#: ../pyhoca/wxgui/profilemanager.py:365 ../pyhoca/wxgui/profilemanager.py:1078 -#: ../pyhoca/wxgui/profilemanager.py:1832 +#: ../pyhoca/wxgui/profilemanager.py:394 +#: ../pyhoca/wxgui/profilemanager.py:1089 +#: ../pyhoca/wxgui/profilemanager.py:1983 msgid "automatically" msgstr "автоматически" -#: ../pyhoca/wxgui/profilemanager.py:367 ../pyhoca/wxgui/profilemanager.py:1080 +#: ../pyhoca/wxgui/profilemanager.py:396 +#: ../pyhoca/wxgui/profilemanager.py:1091 msgid "manually" msgstr "в ручную" -#: ../pyhoca/wxgui/profilemanager.py:376 +#: ../pyhoca/wxgui/profilemanager.py:405 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "PyHoca-GUI Profile Manager - новый профиль" -#: ../pyhoca/wxgui/profilemanager.py:378 +#: ../pyhoca/wxgui/profilemanager.py:407 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "PyHoca-GUI Profile Manager - %s (соединение)" -#: ../pyhoca/wxgui/profilemanager.py:380 +#: ../pyhoca/wxgui/profilemanager.py:409 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "PyHoca-GUI Profile Manager - %s" -#: ../pyhoca/wxgui/profilemanager.py:751 +#: ../pyhoca/wxgui/profilemanager.py:769 msgid "Profile" msgstr "Профиль" -#: ../pyhoca/wxgui/profilemanager.py:752 +#: ../pyhoca/wxgui/profilemanager.py:770 msgid "Session" msgstr "Сессия" -#: ../pyhoca/wxgui/profilemanager.py:753 +#: ../pyhoca/wxgui/profilemanager.py:771 msgid "Connection" msgstr "Соединение" -#: ../pyhoca/wxgui/profilemanager.py:754 +#: ../pyhoca/wxgui/profilemanager.py:772 msgid "Settings" msgstr "Установки" -#: ../pyhoca/wxgui/profilemanager.py:755 +#: ../pyhoca/wxgui/profilemanager.py:773 msgid "Sharing" msgstr "Доступ" -#: ../pyhoca/wxgui/profilemanager.py:996 +#: ../pyhoca/wxgui/profilemanager.py:1007 msgid "<xkbtype>" msgstr "<xkbtype>" -#: ../pyhoca/wxgui/profilemanager.py:997 +#: ../pyhoca/wxgui/profilemanager.py:1008 msgid "<xkblayout>" msgstr "<xkblayout>" -#: ../pyhoca/wxgui/profilemanager.py:998 +#: ../pyhoca/wxgui/profilemanager.py:1009 msgid "<xkbvariant>" msgstr "<xkbvariant>" -#: ../pyhoca/wxgui/profilemanager.py:1284 +#: ../pyhoca/wxgui/profilemanager.py:1306 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "Графические файлы (*.png)|*.png|Все файлы (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1287 +#: ../pyhoca/wxgui/profilemanager.py:1309 msgid "Choose an icon for this session profile" msgstr "Выбрать пиктограмму" -#: ../pyhoca/wxgui/profilemanager.py:1509 +#: ../pyhoca/wxgui/profilemanager.py:1600 msgid "All files (*.*)|*" msgstr "Все файлы (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1511 ../pyhoca/wxgui/profilemanager.py:1533 +#: ../pyhoca/wxgui/profilemanager.py:1602 +#: ../pyhoca/wxgui/profilemanager.py:1626 msgid "Choose a public SSH key" msgstr "Выбрать публичный ключ SSH" -#: ../pyhoca/wxgui/profilemanager.py:1784 +#: ../pyhoca/wxgui/profilemanager.py:1935 msgid "Choose a folder to share within a session" msgstr "Выбрать экспортируемый каталог" -#: ../pyhoca/wxgui/profilemanager.py:1912 -#: ../pyhoca/wxgui/profilemanager.py:1915 -#: ../pyhoca/wxgui/profilemanager.py:1918 -#: ../pyhoca/wxgui/profilemanager.py:1923 -#: ../pyhoca/wxgui/profilemanager.py:1933 ../pyhoca/wxgui/menus_taskbar.py:118 +#: ../pyhoca/wxgui/profilemanager.py:2063 +#: ../pyhoca/wxgui/profilemanager.py:2066 +#: ../pyhoca/wxgui/profilemanager.py:2069 +#: ../pyhoca/wxgui/profilemanager.py:2074 +#: ../pyhoca/wxgui/profilemanager.py:2084 ../pyhoca/wxgui/menus_taskbar.py:118 msgid "Profile Manager" msgstr "Profile Manager" -#: ../pyhoca/wxgui/profilemanager.py:1912 +#: ../pyhoca/wxgui/profilemanager.py:2063 msgid "Profile name is missing, profile unusable!!!" msgstr "Имя профиля не установлено!!!" -#: ../pyhoca/wxgui/profilemanager.py:1915 ../pyhoca/wxgui/profilemanager.py:1918 +#: ../pyhoca/wxgui/profilemanager.py:2066 +#: ../pyhoca/wxgui/profilemanager.py:2069 #, python-format msgid "Profile name %s already exists!!!" msgstr "Профиль с именем %s существует!!!" -#: ../pyhoca/wxgui/profilemanager.py:1923 +#: ../pyhoca/wxgui/profilemanager.py:2074 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "Конфигурация SSH прокси не завершена. Попробуйте еще раз." -#: ../pyhoca/wxgui/profilemanager.py:1933 +#: ../pyhoca/wxgui/profilemanager.py:2084 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -668,21 +680,21 @@ msgstr "" "прокси.\n" "Измените настройки SSH прокси." -#: ../pyhoca/wxgui/profilemanager.py:1960 +#: ../pyhoca/wxgui/profilemanager.py:2111 #, python-format msgid "%s - profile added" msgstr "%s - профиль добавлен" -#: ../pyhoca/wxgui/profilemanager.py:1961 +#: ../pyhoca/wxgui/profilemanager.py:2112 msgid "A new session profile has been added." msgstr "Новый профиль сессии добавлен." -#: ../pyhoca/wxgui/profilemanager.py:1965 +#: ../pyhoca/wxgui/profilemanager.py:2116 #, python-format msgid "%s - modified" msgstr "%s - модифицирован" -#: ../pyhoca/wxgui/profilemanager.py:1966 +#: ../pyhoca/wxgui/profilemanager.py:2117 msgid "Changes to profile have been saved." msgstr "Изменения в профиле сохранены." @@ -940,84 +952,100 @@ msgstr "%s - предупреждение сервера" msgid "The X2Go Server does not publish an application menu." msgstr "Сервер X2Go не публикует меню приложений." -#: ../pyhoca/wxgui/frontend.py:610 +#: ../pyhoca/wxgui/frontend.py:611 msgid "Public SSH key authentication has been successful." msgstr "Авторизация по публичному ключу завершена." -#: ../pyhoca/wxgui/frontend.py:644 +#: ../pyhoca/wxgui/frontend.py:648 msgid "" "The SSH proxy's host key is invalid or has not been accepted by the user" msgstr "SSH прокси ключ недействителен и не был принят пользователем" -#: ../pyhoca/wxgui/frontend.py:665 +#: ../pyhoca/wxgui/frontend.py:669 #, python-format msgid "%s - EOF error" msgstr "%s - EOF ошибка" -#: ../pyhoca/wxgui/frontend.py:665 +#: ../pyhoca/wxgui/frontend.py:669 msgid "Authentication protocol communication incomplete! Try again..." msgstr "Ошибка авторизации! Попробуйте еще раз..." -#: ../pyhoca/wxgui/frontend.py:672 +#: ../pyhoca/wxgui/frontend.py:676 #, python-format msgid "%s - auth key error" msgstr "%s - ошибка ключа" -#: ../pyhoca/wxgui/frontend.py:693 +#: ../pyhoca/wxgui/frontend.py:697 msgid "An unknown error occurred during authentication!" msgstr "Неизвестная ошибка при авторизации!" +#: ../pyhoca/wxgui/frontend.py:725 +#, fuzzy, python-format +msgid "%s: DirectRDP not supported yet" +msgstr "Arts (не поддерживается)" + #: ../pyhoca/wxgui/frontend.py:726 +#, python-format +msgid "" +"We apologize for the inconvenience...\n" +"\n" +"Session profiles of type ,,DirectRDP'' are not\n" +"supported by %s (%s), yet!!\n" +"\n" +"DirectRDP support will be available in %s (>= 0.2.2.0)." +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:738 msgid "Unknown session profile, configure before using it..." msgstr "Неизвестный профиль сессии..." -#: ../pyhoca/wxgui/frontend.py:784 ../pyhoca/wxgui/frontend.py:1302 +#: ../pyhoca/wxgui/frontend.py:796 ../pyhoca/wxgui/frontend.py:1314 #, python-format msgid "%s - session warning" msgstr "%s - предупреждение" -#: ../pyhoca/wxgui/frontend.py:784 +#: ../pyhoca/wxgui/frontend.py:796 #, python-format msgid "Execution of command ,,%s'' failed." msgstr "Невозможно выполнить команду ,,%s''." -#: ../pyhoca/wxgui/frontend.py:926 +#: ../pyhoca/wxgui/frontend.py:938 msgid "Cleaning X2Go sessions..." msgstr "Очищаем сессии X2Go..." -#: ../pyhoca/wxgui/frontend.py:961 +#: ../pyhoca/wxgui/frontend.py:973 #, python-format msgid "%s - disconnect" msgstr "%s - разъединение" -#: ../pyhoca/wxgui/frontend.py:961 +#: ../pyhoca/wxgui/frontend.py:973 msgid "X2Go Profile is now disconnected." msgstr "X2Go Профиль отсоединен." -#: ../pyhoca/wxgui/frontend.py:977 +#: ../pyhoca/wxgui/frontend.py:989 msgid "New Session Profile" msgstr "Новый профиль" -#: ../pyhoca/wxgui/frontend.py:1029 +#: ../pyhoca/wxgui/frontend.py:1041 #, python-format msgid "Really Delete Session Profile ,,%s''?" msgstr "Удалить профиль ,,%s''?" -#: ../pyhoca/wxgui/frontend.py:1035 +#: ../pyhoca/wxgui/frontend.py:1047 #, python-format msgid "%s - profile deleted" msgstr "%s - профиль удален" -#: ../pyhoca/wxgui/frontend.py:1035 +#: ../pyhoca/wxgui/frontend.py:1047 msgid "The session profile has been deleted." msgstr "Профиль был удален." -#: ../pyhoca/wxgui/frontend.py:1053 +#: ../pyhoca/wxgui/frontend.py:1065 #, python-format msgid "%s - share local folder with sessions of this profile" msgstr "%s - экспортируемый каталог" -#: ../pyhoca/wxgui/frontend.py:1194 +#: ../pyhoca/wxgui/frontend.py:1206 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -1030,39 +1058,39 @@ msgstr "" "\n" "Продолжить соединение?" -#: ../pyhoca/wxgui/frontend.py:1202 +#: ../pyhoca/wxgui/frontend.py:1214 #, python-format msgid "%s: Confirm Host Authorization" msgstr "%s: Подтвердите авторизацию хоста" -#: ../pyhoca/wxgui/frontend.py:1247 +#: ../pyhoca/wxgui/frontend.py:1259 #, python-format msgid "%s - channel error" msgstr "%s - ошибка канала" -#: ../pyhoca/wxgui/frontend.py:1247 +#: ../pyhoca/wxgui/frontend.py:1259 #, python-format msgid "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " "server..." msgstr "Соединение с сервером %s утрачено. Попытайтесь соединиться еще раз..." -#: ../pyhoca/wxgui/frontend.py:1265 ../pyhoca/wxgui/frontend.py:1283 -#: ../pyhoca/wxgui/frontend.py:1285 ../pyhoca/wxgui/frontend.py:1321 +#: ../pyhoca/wxgui/frontend.py:1277 ../pyhoca/wxgui/frontend.py:1295 +#: ../pyhoca/wxgui/frontend.py:1297 ../pyhoca/wxgui/frontend.py:1333 #, python-format msgid "%s - session failure" msgstr "%s - ошибка сессии" -#: ../pyhoca/wxgui/frontend.py:1265 +#: ../pyhoca/wxgui/frontend.py:1277 msgid "The session startup failed." msgstr "Запуск сессии не удался." -#: ../pyhoca/wxgui/frontend.py:1283 +#: ../pyhoca/wxgui/frontend.py:1295 #, python-format msgid "The command ,,%s'' is not available on X2Go server." msgstr "Команда ,,%s'' недоступна на сервере X2Go." -#: ../pyhoca/wxgui/frontend.py:1285 +#: ../pyhoca/wxgui/frontend.py:1297 #, python-format msgid "" "The command ,,%s'' is not available on X2Go server\n" @@ -1071,7 +1099,7 @@ msgstr "" "Команда ,,%s'' недоступна на сервере X2Go\n" "%s." -#: ../pyhoca/wxgui/frontend.py:1302 +#: ../pyhoca/wxgui/frontend.py:1314 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " @@ -1079,7 +1107,7 @@ msgid "" msgstr "" "Запрос ретрансляции порта TCP для сессии %s к порту сервера %S был отклонен." -#: ../pyhoca/wxgui/frontend.py:1321 +#: ../pyhoca/wxgui/frontend.py:1333 #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " @@ -1088,35 +1116,35 @@ msgstr "" "Запрос туннеля к серверу [%s]:%s для сессии %s был отклонен удаленным " "сервером X2go/SSH. Запуск сессии не удался." -#: ../pyhoca/wxgui/frontend.py:1340 +#: ../pyhoca/wxgui/frontend.py:1352 #, python-format msgid "%s - audio warning" msgstr "%s - предупреждение audio" -#: ../pyhoca/wxgui/frontend.py:1340 +#: ../pyhoca/wxgui/frontend.py:1352 msgid "" "The X2Go PulseAudio system is not available within Remote Desktop sessions." msgstr "Система X2Go PulseAudio недоступна в сессиях удаленного десктопа." -#: ../pyhoca/wxgui/frontend.py:1347 ../pyhoca/wxgui/frontend.py:1354 +#: ../pyhoca/wxgui/frontend.py:1359 ../pyhoca/wxgui/frontend.py:1366 #, python-format msgid "%s - audio error" msgstr "%s - ошибка audio" -#: ../pyhoca/wxgui/frontend.py:1347 +#: ../pyhoca/wxgui/frontend.py:1359 msgid "The X2Go PulseAudio system could not be started." msgstr "Система X2Go PulseAudio не может быть запущена." -#: ../pyhoca/wxgui/frontend.py:1354 +#: ../pyhoca/wxgui/frontend.py:1366 msgid "The X2Go PulseAudio system has died unexpectedly." msgstr "Сбой системы X2Go PulseAudio." -#: ../pyhoca/wxgui/frontend.py:1366 +#: ../pyhoca/wxgui/frontend.py:1378 #, python-format msgid "%s - audio problem" msgstr "%s - ошибка audio" -#: ../pyhoca/wxgui/frontend.py:1366 +#: ../pyhoca/wxgui/frontend.py:1378 #, python-format msgid "" "The audio connection could not be set up for this session.\n" @@ -1126,12 +1154,12 @@ msgstr "" "%s" # %s - печать недоступна -#: ../pyhoca/wxgui/frontend.py:1378 +#: ../pyhoca/wxgui/frontend.py:1390 #, python-format msgid "%s - client-side printing not available" msgstr "%s - печать недоступна" -#: ../pyhoca/wxgui/frontend.py:1378 +#: ../pyhoca/wxgui/frontend.py:1390 #, python-format msgid "" "The server denies client-side printing from within this session.\n" @@ -1140,12 +1168,12 @@ msgstr "" "Сервер отклонил печать внутри этой сессии.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1390 +#: ../pyhoca/wxgui/frontend.py:1402 #, python-format msgid "%s - MIME box not available" msgstr "%s - MIME box недоступен" -#: ../pyhoca/wxgui/frontend.py:1390 +#: ../pyhoca/wxgui/frontend.py:1402 #, python-format msgid "" "The server does not support the X2Go MIME box.\n" @@ -1154,12 +1182,12 @@ msgstr "" "Сервер не поддерживает X2Go MIME box.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1402 +#: ../pyhoca/wxgui/frontend.py:1414 #, python-format msgid "%s - client-side folders not sharable" msgstr "%s - клиентские каталоги не экспотируемы" -#: ../pyhoca/wxgui/frontend.py:1402 +#: ../pyhoca/wxgui/frontend.py:1414 #, python-format msgid "" "The server denies client-side folder sharing with this session.\n" @@ -1168,12 +1196,12 @@ msgstr "" "Сервер отклонил экспорт каталогов внутри этой сессии.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1414 +#: ../pyhoca/wxgui/frontend.py:1426 #, python-format msgid "%s - client resources not sharable" msgstr "%s - клиентские ресурсы не экспортируемы" -#: ../pyhoca/wxgui/frontend.py:1414 +#: ../pyhoca/wxgui/frontend.py:1426 #, python-format msgid "" "Client-side folders and printers cannot be shared with this session.\n" @@ -1183,12 +1211,12 @@ msgstr "" "этой сессии.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1433 ../pyhoca/wxgui/frontend.py:1435 +#: ../pyhoca/wxgui/frontend.py:1445 ../pyhoca/wxgui/frontend.py:1447 #, python-format msgid "%s - print error" msgstr "%s - ошибка печати" -#: ../pyhoca/wxgui/frontend.py:1433 +#: ../pyhoca/wxgui/frontend.py:1445 #, python-format msgid "" "%s\n" @@ -1199,7 +1227,7 @@ msgstr "" "...на принтере %s в сессии\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1435 +#: ../pyhoca/wxgui/frontend.py:1447 #, python-format msgid "" "%s\n" @@ -1210,12 +1238,12 @@ msgstr "" "...в сессии\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1450 ../pyhoca/wxgui/frontend.py:1465 +#: ../pyhoca/wxgui/frontend.py:1462 ../pyhoca/wxgui/frontend.py:1477 #, python-format msgid "%s - start" msgstr "%s - пуск" -#: ../pyhoca/wxgui/frontend.py:1450 +#: ../pyhoca/wxgui/frontend.py:1462 #, python-format msgid "" "New X2Go session starting up...\n" @@ -1224,7 +1252,7 @@ msgstr "" "Новая сессия X2Go запускается...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1465 +#: ../pyhoca/wxgui/frontend.py:1477 #, python-format msgid "" "Another client started X2Go session\n" @@ -1233,12 +1261,12 @@ msgstr "" "Другой клиент запускает сессию X2Go\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1480 ../pyhoca/wxgui/frontend.py:1495 +#: ../pyhoca/wxgui/frontend.py:1492 ../pyhoca/wxgui/frontend.py:1507 #, python-format msgid "%s - resume" msgstr "%s - восстановить" -#: ../pyhoca/wxgui/frontend.py:1480 +#: ../pyhoca/wxgui/frontend.py:1492 #, python-format msgid "" "Resuming X2Go session...\n" @@ -1247,7 +1275,7 @@ msgstr "" "Восстанавливаем X2Go сессию...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1495 +#: ../pyhoca/wxgui/frontend.py:1507 #, python-format msgid "" "Another client resumed X2Go session\n" @@ -1256,12 +1284,12 @@ msgstr "" "Другой клиент восстанавливает сессию X2Go\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1510 +#: ../pyhoca/wxgui/frontend.py:1522 #, python-format msgid "%s - running" msgstr "%s - выполняется" -#: ../pyhoca/wxgui/frontend.py:1510 +#: ../pyhoca/wxgui/frontend.py:1522 #, python-format msgid "" "Found already running session\n" @@ -1270,12 +1298,12 @@ msgstr "" "Найдена уже запущенная сессия\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1530 +#: ../pyhoca/wxgui/frontend.py:1542 #, python-format msgid "%s - suspend" msgstr "%s - прервать" -#: ../pyhoca/wxgui/frontend.py:1530 +#: ../pyhoca/wxgui/frontend.py:1542 #, python-format msgid "" "X2Go Session has been suspended\n" @@ -1284,12 +1312,12 @@ msgstr "" "X2Go сессия прервана\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1557 +#: ../pyhoca/wxgui/frontend.py:1569 #, python-format msgid "%s - terminate" msgstr "%s - завершить" -#: ../pyhoca/wxgui/frontend.py:1557 +#: ../pyhoca/wxgui/frontend.py:1569 #, python-format msgid "" "X2Go Session has terminated\n" @@ -1430,4 +1458,8 @@ msgstr "Изменить заголовок сессии на" msgid "OK" msgstr "ОК" +#~ msgid "RSA/DSA private key" +#~ msgstr "личный ключ RSA/DSA" +#~ msgid "Host[:Port]" +#~ msgstr "Хост[:порт]" diff --git a/po/sv.po b/po/sv.po index 7abe572..3a9594a 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-06-10 21:18+0200\n" +"POT-Creation-Date: 2012-09-28 10:00+0200\n" "PO-Revision-Date: 2012-06-01 17:59+0100\n" "Last-Translator: Daniel Lindgren <dali.spam(a)gmail.com>\n" "Language-Team: Swedish <x2go-i18n(a)lists.berlios.de>\n" @@ -50,94 +50,94 @@ msgstr "Sessionsinloggning" msgid "SSH proxy server login" msgstr "SSH proxyserverinloggning" -#: ../pyhoca/wxgui/logon.py:133 ../pyhoca/wxgui/profilemanager.py:322 +#: ../pyhoca/wxgui/logon.py:133 ../pyhoca/wxgui/profilemanager.py:346 #: ../pyhoca/wxgui/messages.py:132 ../pyhoca/wxgui/printingprefs.py:147 #: ../pyhoca/wxgui/sessiontitle.py:85 msgid "Cancel" msgstr "Avbryt" -#: ../pyhoca/wxgui/logon.py:292 ../pyhoca/wxgui/logon.py:334 -#: ../pyhoca/wxgui/frontend.py:603 +#: ../pyhoca/wxgui/logon.py:301 ../pyhoca/wxgui/logon.py:343 +#: ../pyhoca/wxgui/frontend.py:604 #, python-format msgid "%s - connect failure" msgstr "%s - anslutning misslyckades" -#: ../pyhoca/wxgui/logon.py:293 ../pyhoca/wxgui/frontend.py:603 +#: ../pyhoca/wxgui/logon.py:302 ../pyhoca/wxgui/frontend.py:604 msgid "User is not allowed to start X2Go sessions!" msgstr "Användaren har inte rätt att starta X2Go-sessioner!" -#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:610 +#: ../pyhoca/wxgui/logon.py:307 ../pyhoca/wxgui/frontend.py:611 #, python-format msgid "%s - connect" msgstr "%s - anslut" -#: ../pyhoca/wxgui/logon.py:299 +#: ../pyhoca/wxgui/logon.py:308 msgid "Authentication has been successful." msgstr "Autentisering lyckades." -#: ../pyhoca/wxgui/logon.py:330 +#: ../pyhoca/wxgui/logon.py:339 msgid "SSH tunnel started" msgstr "SSH-tunnel startad" -#: ../pyhoca/wxgui/logon.py:335 +#: ../pyhoca/wxgui/logon.py:344 msgid "Authentication failed!" msgstr "Autentisering misslyckades!" -#: ../pyhoca/wxgui/logon.py:342 +#: ../pyhoca/wxgui/logon.py:351 #, python-format msgid "%s - SSH proxy" msgstr "%s - SSH-proxy" -#: ../pyhoca/wxgui/logon.py:343 +#: ../pyhoca/wxgui/logon.py:352 msgid "Authentication to the SSH proxy server failed!" msgstr "Autentisering till SSH-proxy misslyckades!" -#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:658 +#: ../pyhoca/wxgui/logon.py:374 ../pyhoca/wxgui/frontend.py:662 #, python-format msgid "%s - socket error" msgstr "%s - socketfel" -#: ../pyhoca/wxgui/logon.py:372 ../pyhoca/wxgui/frontend.py:637 -#: ../pyhoca/wxgui/frontend.py:644 +#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:641 +#: ../pyhoca/wxgui/frontend.py:648 #, python-format msgid "%s - host key error" msgstr "%s - fel på serverns nyckel" -#: ../pyhoca/wxgui/logon.py:373 ../pyhoca/wxgui/frontend.py:637 +#: ../pyhoca/wxgui/logon.py:382 ../pyhoca/wxgui/frontend.py:641 msgid "" "The remote server's host key is invalid or has not been accepted by the user" msgstr "Serverns nyckel är felaktig eller har inte accepterats av användaren" -#: ../pyhoca/wxgui/logon.py:380 ../pyhoca/wxgui/frontend.py:679 +#: ../pyhoca/wxgui/logon.py:389 ../pyhoca/wxgui/frontend.py:683 #, python-format msgid "%s - missing home directory" msgstr "%s - hemkatalog saknas" -#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:679 +#: ../pyhoca/wxgui/logon.py:390 ../pyhoca/wxgui/frontend.py:683 msgid "The remote user's home directory does not exist." msgstr "Fjärranvändarens hemkatalog saknas." -#: ../pyhoca/wxgui/logon.py:388 +#: ../pyhoca/wxgui/logon.py:397 #, python-format msgid "%s - key error" msgstr "%s - nyckelfel" -#: ../pyhoca/wxgui/logon.py:396 ../pyhoca/wxgui/frontend.py:686 +#: ../pyhoca/wxgui/logon.py:405 ../pyhoca/wxgui/frontend.py:690 #, python-format msgid "%s - auth error" msgstr "%s - autentiseringsfel" -#: ../pyhoca/wxgui/logon.py:404 ../pyhoca/wxgui/frontend.py:630 +#: ../pyhoca/wxgui/logon.py:413 ../pyhoca/wxgui/frontend.py:634 #, python-format msgid "%s - SSH error" msgstr "%s - SSH-fel" -#: ../pyhoca/wxgui/logon.py:412 +#: ../pyhoca/wxgui/logon.py:421 #, python-format msgid "%s - unknown error" msgstr "%s - okänt fel" -#: ../pyhoca/wxgui/logon.py:413 +#: ../pyhoca/wxgui/logon.py:422 msgid "An unknown error occured during authentication!" msgstr "Ett okänt fel inträffade vid autentisering!" @@ -175,279 +175,287 @@ msgstr "" "PyHoca-GUI (Python X2Go-klient)\n" "Klient för att ansluta dig till en X2Go-server" -#: ../pyhoca/wxgui/profilemanager.py:82 +#: ../pyhoca/wxgui/profilemanager.py:83 msgid "GNOME Desktop (GNOME)" msgstr "GNOME Desktop (GNOME)" -#: ../pyhoca/wxgui/profilemanager.py:83 +#: ../pyhoca/wxgui/profilemanager.py:84 msgid "K Desktop Environment (KDE)" msgstr "K Desktop Environment (KDE)" -#: ../pyhoca/wxgui/profilemanager.py:84 +#: ../pyhoca/wxgui/profilemanager.py:85 msgid "Lightweight X Desktop (LXDE)" msgstr "Lightweight X Desktop (LXDE)" -#: ../pyhoca/wxgui/profilemanager.py:85 +#: ../pyhoca/wxgui/profilemanager.py:86 msgid "Trinity X Desktop (KDE3-like)" msgstr "Trinity X Desktop (KDE3-liknande)" -#: ../pyhoca/wxgui/profilemanager.py:86 +#: ../pyhoca/wxgui/profilemanager.py:87 msgid "Unity X Desktop Shell (UNITY)" msgstr "Unity X Desktop Shell (UNITY)" -#: ../pyhoca/wxgui/profilemanager.py:87 +#: ../pyhoca/wxgui/profilemanager.py:88 msgid "XFCE4 Desktop (XFCE4)" msgstr "XFCE4 Desktop (XFCE4)" -#: ../pyhoca/wxgui/profilemanager.py:88 +#: ../pyhoca/wxgui/profilemanager.py:89 msgid "Published Applications" msgstr "Publicerade applikationer" -#: ../pyhoca/wxgui/profilemanager.py:89 +#: ../pyhoca/wxgui/profilemanager.py:90 msgid "Single Application" msgstr "Applikation" -#: ../pyhoca/wxgui/profilemanager.py:90 +#: ../pyhoca/wxgui/profilemanager.py:91 msgid "XDMCP Query" msgstr "XDMCP" -#: ../pyhoca/wxgui/profilemanager.py:91 -msgid "Windows Terminal Server (RDP-proxy)" +#: ../pyhoca/wxgui/profilemanager.py:92 +#, fuzzy +msgid "Windows Terminal Server (X2Go-proxied RDP)" msgstr "Windows Terminal Server (RDP-proxy)" -#. 'DirectRDP': 'Windows Terminal Server (RDP-direct)', -#: ../pyhoca/wxgui/profilemanager.py:93 ../pyhoca/wxgui/profilemanager.py:207 +#: ../pyhoca/wxgui/profilemanager.py:94 ../pyhoca/wxgui/profilemanager.py:227 msgid "Custom command" msgstr "Anpassat kommando" -#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:398 +#: ../pyhoca/wxgui/profilemanager.py:99 ../pyhoca/wxgui/menus_taskbar.py:398 msgid "Internet Browser" msgstr "Webbbläsare" -#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:399 +#: ../pyhoca/wxgui/profilemanager.py:100 ../pyhoca/wxgui/menus_taskbar.py:399 msgid "Email Client" msgstr "E-postklient" -#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:400 +#: ../pyhoca/wxgui/profilemanager.py:101 ../pyhoca/wxgui/menus_taskbar.py:400 msgid "Office" msgstr "Office" -#: ../pyhoca/wxgui/profilemanager.py:99 ../pyhoca/wxgui/menus_taskbar.py:401 +#: ../pyhoca/wxgui/profilemanager.py:102 ../pyhoca/wxgui/menus_taskbar.py:401 msgid "Terminal" msgstr "Terminal" -#: ../pyhoca/wxgui/profilemanager.py:113 +#: ../pyhoca/wxgui/profilemanager.py:120 msgid "Open file with system's default application" msgstr "Öppna med systemets standardapplikation" -#: ../pyhoca/wxgui/profilemanager.py:114 +#: ../pyhoca/wxgui/profilemanager.py:121 msgid "Open application chooser dialog" msgstr "Öppna applikationsväljare" -#: ../pyhoca/wxgui/profilemanager.py:115 +#: ../pyhoca/wxgui/profilemanager.py:122 msgid "Save incoming file as ..." msgstr "Spara inkommande fil som ..." -#: ../pyhoca/wxgui/profilemanager.py:143 +#: ../pyhoca/wxgui/profilemanager.py:150 msgid "settings derived from " msgstr "inställningar hämtade från" #. boxes for all tabs -#: ../pyhoca/wxgui/profilemanager.py:160 +#: ../pyhoca/wxgui/profilemanager.py:170 msgid "Session Title" msgstr "Sessionsnamn" -#: ../pyhoca/wxgui/profilemanager.py:161 +#: ../pyhoca/wxgui/profilemanager.py:171 msgid "Session Window" msgstr "Sessionsfönster" -#: ../pyhoca/wxgui/profilemanager.py:162 +#: ../pyhoca/wxgui/profilemanager.py:172 msgid "Session Startup" msgstr "Sessionsstart" -#: ../pyhoca/wxgui/profilemanager.py:163 +#: ../pyhoca/wxgui/profilemanager.py:173 msgid "Server" msgstr "Server" -#: ../pyhoca/wxgui/profilemanager.py:164 +#: ../pyhoca/wxgui/profilemanager.py:174 +msgid "Proxy" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:175 msgid "Connection Link Speed" msgstr "Anslutningshastighet" -#: ../pyhoca/wxgui/profilemanager.py:165 +#: ../pyhoca/wxgui/profilemanager.py:176 msgid "Compression" msgstr "Komprimering" -#: ../pyhoca/wxgui/profilemanager.py:166 +#: ../pyhoca/wxgui/profilemanager.py:177 msgid "Display" msgstr "Skärm" -#: ../pyhoca/wxgui/profilemanager.py:167 +#: ../pyhoca/wxgui/profilemanager.py:178 msgid "Keyboard" msgstr "Tangentbord" -#: ../pyhoca/wxgui/profilemanager.py:168 +#: ../pyhoca/wxgui/profilemanager.py:179 msgid "Sound" msgstr "Ljud" -#: ../pyhoca/wxgui/profilemanager.py:169 +#: ../pyhoca/wxgui/profilemanager.py:180 msgid "Printing" msgstr "Utskrifter" -#: ../pyhoca/wxgui/profilemanager.py:170 +#: ../pyhoca/wxgui/profilemanager.py:181 msgid "Folder Exports" msgstr "Delade mappar" -#: ../pyhoca/wxgui/profilemanager.py:171 +#: ../pyhoca/wxgui/profilemanager.py:182 msgid "File Import" msgstr "Filimport" #. ## #. ## widgets for the PROFILE tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:176 +#: ../pyhoca/wxgui/profilemanager.py:187 msgid "Name" msgstr "Namn" -#: ../pyhoca/wxgui/profilemanager.py:183 +#: ../pyhoca/wxgui/profilemanager.py:194 msgid "Set session window title" msgstr "Ange fönstertitel för session" -#: ../pyhoca/wxgui/profilemanager.py:184 +#: ../pyhoca/wxgui/profilemanager.py:195 msgid "Use a default session window title" msgstr "Använd standard fönstertitel för session" -#: ../pyhoca/wxgui/profilemanager.py:185 +#: ../pyhoca/wxgui/profilemanager.py:196 msgid "Custom session window title" msgstr "Anpassad fönstertitel för session" -#: ../pyhoca/wxgui/profilemanager.py:195 +#: ../pyhoca/wxgui/profilemanager.py:215 msgid "Window Icon" msgstr "Fönsterikon" #. ## #. ## widgets for the SESSION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:201 +#: ../pyhoca/wxgui/profilemanager.py:221 msgid "Start session automatically after login" msgstr "Starta session automatiskt efter inloggning" -#: ../pyhoca/wxgui/profilemanager.py:202 +#: ../pyhoca/wxgui/profilemanager.py:222 #, python-format msgid "Login automatically after %s has started" msgstr "Logga in automatiskt när %s har startat" -#: ../pyhoca/wxgui/profilemanager.py:203 +#: ../pyhoca/wxgui/profilemanager.py:223 msgid "Type" msgstr "Typ" -#: ../pyhoca/wxgui/profilemanager.py:205 +#: ../pyhoca/wxgui/profilemanager.py:225 msgid "Application" msgstr "Applikation" -#: ../pyhoca/wxgui/profilemanager.py:209 +#: ../pyhoca/wxgui/profilemanager.py:229 msgid "XDMCP server" msgstr "XDMCP-server" -#: ../pyhoca/wxgui/profilemanager.py:211 +#: ../pyhoca/wxgui/profilemanager.py:231 msgid "RDP server" msgstr "RDP-server" -#: ../pyhoca/wxgui/profilemanager.py:213 +#: ../pyhoca/wxgui/profilemanager.py:233 msgid "RDP options" msgstr "RDP-alternativ" -#: ../pyhoca/wxgui/profilemanager.py:215 +#: ../pyhoca/wxgui/profilemanager.py:235 msgid "Integrate remote application(s) into local desktop (rootless mode)" msgstr "Integrera fjärrapplikation i lokalt Skrivbord (rootless)" -#: ../pyhoca/wxgui/profilemanager.py:216 +#: ../pyhoca/wxgui/profilemanager.py:236 msgid "Menu of published applications" msgstr "Meny med publicerade applikationer" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:223 ../pyhoca/wxgui/profilemanager.py:233 +#: ../pyhoca/wxgui/profilemanager.py:243 ../pyhoca/wxgui/profilemanager.py:253 msgid "User" msgstr "Användare" -#: ../pyhoca/wxgui/profilemanager.py:225 +#: ../pyhoca/wxgui/profilemanager.py:245 ../pyhoca/wxgui/profilemanager.py:260 msgid "Host" msgstr "Server" -#: ../pyhoca/wxgui/profilemanager.py:227 +#: ../pyhoca/wxgui/profilemanager.py:247 ../pyhoca/wxgui/profilemanager.py:262 msgid "Port" msgstr "Port" -#: ../pyhoca/wxgui/profilemanager.py:229 -msgid "RSA/DSA private key" -msgstr "RSA/DSA privat nyckel" +#: ../pyhoca/wxgui/profilemanager.py:249 +msgid "Key" +msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:232 +#: ../pyhoca/wxgui/profilemanager.py:252 msgid "Server behind SSH proxy" msgstr "Server bakom SSH-proxy" -#: ../pyhoca/wxgui/profilemanager.py:235 +#: ../pyhoca/wxgui/profilemanager.py:255 +msgid "Use same username for X2Go and proxy host" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:256 +msgid "Use same authentication for X2Go and proxy host" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:257 msgid "Key file" msgstr "Nyckelfil" -#: ../pyhoca/wxgui/profilemanager.py:238 -msgid "Host[:Port]" -msgstr "Server[:Port]" - -#: ../pyhoca/wxgui/profilemanager.py:240 +#: ../pyhoca/wxgui/profilemanager.py:264 msgid "SSH Proxy Tunnel" msgstr "SSH proxytunnel" -#: ../pyhoca/wxgui/profilemanager.py:248 +#: ../pyhoca/wxgui/profilemanager.py:272 msgid "Modem" msgstr "Modem" -#: ../pyhoca/wxgui/profilemanager.py:249 +#: ../pyhoca/wxgui/profilemanager.py:273 msgid "ISDN" msgstr "ISDN" -#: ../pyhoca/wxgui/profilemanager.py:250 +#: ../pyhoca/wxgui/profilemanager.py:274 msgid "ADSL" msgstr "ADSL" -#: ../pyhoca/wxgui/profilemanager.py:251 +#: ../pyhoca/wxgui/profilemanager.py:275 msgid "WAN" msgstr "WAN" -#: ../pyhoca/wxgui/profilemanager.py:252 +#: ../pyhoca/wxgui/profilemanager.py:276 msgid "LAN" msgstr "LAN" -#: ../pyhoca/wxgui/profilemanager.py:254 +#: ../pyhoca/wxgui/profilemanager.py:278 msgid "Method" msgstr "Metod" -#: ../pyhoca/wxgui/profilemanager.py:256 +#: ../pyhoca/wxgui/profilemanager.py:280 msgid "Image quality" msgstr "Bildkvalitet" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:262 +#: ../pyhoca/wxgui/profilemanager.py:286 msgid "Fullscreen" msgstr "Fullskärm" -#: ../pyhoca/wxgui/profilemanager.py:263 +#: ../pyhoca/wxgui/profilemanager.py:287 msgid "Custom Size" msgstr "Anpassad storlek" -#: ../pyhoca/wxgui/profilemanager.py:268 +#: ../pyhoca/wxgui/profilemanager.py:292 msgid "Set display DPI" msgstr "Ange skärmupplösning (DPI)" -#: ../pyhoca/wxgui/profilemanager.py:270 +#: ../pyhoca/wxgui/profilemanager.py:294 msgid "Do not set (use server-side tools to configure the keyboard)" msgstr "" "Konfigurera inte (använd verktyg på server för att konfigurera tangentbord)" -#: ../pyhoca/wxgui/profilemanager.py:271 +#: ../pyhoca/wxgui/profilemanager.py:295 msgid "" "Automatically detect and use client-side keyboard configuration inside the " "session" @@ -455,213 +463,213 @@ msgstr "" "Detektera automatiskt och använd klientinställningar för tangentbord i " "session" -#: ../pyhoca/wxgui/profilemanager.py:272 +#: ../pyhoca/wxgui/profilemanager.py:296 msgid "Use custom keyboard settings as provided below" msgstr "Använd nedan angivna tangentbordsinställningar" -#: ../pyhoca/wxgui/profilemanager.py:273 +#: ../pyhoca/wxgui/profilemanager.py:297 msgid "Keyboard model" msgstr "Tangentbordsmodell" -#: ../pyhoca/wxgui/profilemanager.py:275 +#: ../pyhoca/wxgui/profilemanager.py:299 msgid "Layout" msgstr "Tangentbordslayout" -#: ../pyhoca/wxgui/profilemanager.py:277 +#: ../pyhoca/wxgui/profilemanager.py:301 msgid "Layout variant" msgstr "Variant" -#: ../pyhoca/wxgui/profilemanager.py:279 +#: ../pyhoca/wxgui/profilemanager.py:303 msgid "Enable sound support" msgstr "Aktivera ljudstöd" -#: ../pyhoca/wxgui/profilemanager.py:280 +#: ../pyhoca/wxgui/profilemanager.py:304 msgid "Pulse Audio" msgstr "Pulse Audio" #. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated. #. However, config files can contain an Arts configuration, so we will honour this -#: ../pyhoca/wxgui/profilemanager.py:284 +#: ../pyhoca/wxgui/profilemanager.py:308 msgid "Arts (not supported)" msgstr "Arts (ej supportad)" -#: ../pyhoca/wxgui/profilemanager.py:287 +#: ../pyhoca/wxgui/profilemanager.py:311 msgid "esd" msgstr "esd" -#: ../pyhoca/wxgui/profilemanager.py:288 +#: ../pyhoca/wxgui/profilemanager.py:312 msgid "Use default sound port" msgstr "Använd standardport för ljud" -#: ../pyhoca/wxgui/profilemanager.py:289 +#: ../pyhoca/wxgui/profilemanager.py:313 msgid "Custom sound port" msgstr "Anpassad ljudport" -#: ../pyhoca/wxgui/profilemanager.py:291 +#: ../pyhoca/wxgui/profilemanager.py:315 msgid "Client Side printing" msgstr "Stöd för utskrifter via klienten" -#: ../pyhoca/wxgui/profilemanager.py:293 +#: ../pyhoca/wxgui/profilemanager.py:317 msgid "Use local folder sharing" msgstr "Använd lokal mappdelning" -#: ../pyhoca/wxgui/profilemanager.py:294 +#: ../pyhoca/wxgui/profilemanager.py:318 msgid "Path" msgstr "Sökväg" -#: ../pyhoca/wxgui/profilemanager.py:297 ../pyhoca/wxgui/profilemanager.py:316 +#: ../pyhoca/wxgui/profilemanager.py:321 ../pyhoca/wxgui/profilemanager.py:340 msgid "Add" msgstr "Lägg till" -#: ../pyhoca/wxgui/profilemanager.py:299 +#: ../pyhoca/wxgui/profilemanager.py:323 msgid "Local Path" msgstr "Lokal sökväg" -#: ../pyhoca/wxgui/profilemanager.py:300 +#: ../pyhoca/wxgui/profilemanager.py:324 msgid "Connect Method" msgstr "Anslutningsmetod" -#: ../pyhoca/wxgui/profilemanager.py:301 +#: ../pyhoca/wxgui/profilemanager.py:325 msgid "Delete" msgstr "Radera" -#: ../pyhoca/wxgui/profilemanager.py:303 +#: ../pyhoca/wxgui/profilemanager.py:327 msgid "Convert between client and server encodings" msgstr "Konvertera kodtabell mellan klient och server" -#: ../pyhoca/wxgui/profilemanager.py:304 +#: ../pyhoca/wxgui/profilemanager.py:328 msgid "Client encoding" msgstr "Kodtabell klient" -#: ../pyhoca/wxgui/profilemanager.py:306 +#: ../pyhoca/wxgui/profilemanager.py:330 msgid "Server encoding" msgstr "Kodtabell server" -#: ../pyhoca/wxgui/profilemanager.py:309 +#: ../pyhoca/wxgui/profilemanager.py:333 msgid "Use file MIME box for local file import" msgstr "Använd MIME för lokal filimport" -#: ../pyhoca/wxgui/profilemanager.py:310 +#: ../pyhoca/wxgui/profilemanager.py:334 msgid "Extensions" msgstr "Filändelser" -#: ../pyhoca/wxgui/profilemanager.py:312 +#: ../pyhoca/wxgui/profilemanager.py:336 msgid "Action" msgstr "Hantering" -#: ../pyhoca/wxgui/profilemanager.py:317 +#: ../pyhoca/wxgui/profilemanager.py:341 msgid "Defaults" msgstr "Standard" -#: ../pyhoca/wxgui/profilemanager.py:319 +#: ../pyhoca/wxgui/profilemanager.py:343 msgid "Save" msgstr "Spara" -#: ../pyhoca/wxgui/profilemanager.py:320 +#: ../pyhoca/wxgui/profilemanager.py:344 msgid "Reset" msgstr "Återställ" -#: ../pyhoca/wxgui/profilemanager.py:365 -#: ../pyhoca/wxgui/profilemanager.py:1078 -#: ../pyhoca/wxgui/profilemanager.py:1832 +#: ../pyhoca/wxgui/profilemanager.py:394 +#: ../pyhoca/wxgui/profilemanager.py:1089 +#: ../pyhoca/wxgui/profilemanager.py:1983 msgid "automatically" msgstr "automatisk" -#: ../pyhoca/wxgui/profilemanager.py:367 -#: ../pyhoca/wxgui/profilemanager.py:1080 +#: ../pyhoca/wxgui/profilemanager.py:396 +#: ../pyhoca/wxgui/profilemanager.py:1091 msgid "manually" msgstr "manuellt" -#: ../pyhoca/wxgui/profilemanager.py:376 +#: ../pyhoca/wxgui/profilemanager.py:405 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "PyHoca-GUI Profilhanterare - ny profil" -#: ../pyhoca/wxgui/profilemanager.py:378 +#: ../pyhoca/wxgui/profilemanager.py:407 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr " PyHoca-GUI Profilhanterare - %s (ansluten)" -#: ../pyhoca/wxgui/profilemanager.py:380 +#: ../pyhoca/wxgui/profilemanager.py:409 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "PyHoca-GUI Profilhanterare - %s" -#: ../pyhoca/wxgui/profilemanager.py:751 +#: ../pyhoca/wxgui/profilemanager.py:769 msgid "Profile" msgstr "Profil" -#: ../pyhoca/wxgui/profilemanager.py:752 +#: ../pyhoca/wxgui/profilemanager.py:770 msgid "Session" msgstr "Session" -#: ../pyhoca/wxgui/profilemanager.py:753 +#: ../pyhoca/wxgui/profilemanager.py:771 msgid "Connection" msgstr "Anslutning" -#: ../pyhoca/wxgui/profilemanager.py:754 +#: ../pyhoca/wxgui/profilemanager.py:772 msgid "Settings" msgstr "Inställningar" -#: ../pyhoca/wxgui/profilemanager.py:755 +#: ../pyhoca/wxgui/profilemanager.py:773 msgid "Sharing" msgstr "Delning" -#: ../pyhoca/wxgui/profilemanager.py:996 +#: ../pyhoca/wxgui/profilemanager.py:1007 msgid "<xkbtype>" msgstr "pc105" -#: ../pyhoca/wxgui/profilemanager.py:997 +#: ../pyhoca/wxgui/profilemanager.py:1008 msgid "<xkblayout>" msgstr "se" -#: ../pyhoca/wxgui/profilemanager.py:998 +#: ../pyhoca/wxgui/profilemanager.py:1009 msgid "<xkbvariant>" msgstr "se" -#: ../pyhoca/wxgui/profilemanager.py:1284 +#: ../pyhoca/wxgui/profilemanager.py:1306 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "Ikonfiler (*.png)|*.png|Alla filer (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1287 +#: ../pyhoca/wxgui/profilemanager.py:1309 msgid "Choose an icon for this session profile" msgstr "Välj en ikon för denna sessionsprofil" -#: ../pyhoca/wxgui/profilemanager.py:1509 +#: ../pyhoca/wxgui/profilemanager.py:1600 msgid "All files (*.*)|*" msgstr "Alla filer (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1511 -#: ../pyhoca/wxgui/profilemanager.py:1533 +#: ../pyhoca/wxgui/profilemanager.py:1602 +#: ../pyhoca/wxgui/profilemanager.py:1626 msgid "Choose a public SSH key" msgstr "Välj en public SSH-nyckel" -#: ../pyhoca/wxgui/profilemanager.py:1784 +#: ../pyhoca/wxgui/profilemanager.py:1935 msgid "Choose a folder to share within a session" msgstr "Välj en mapp att dela i en session" -#: ../pyhoca/wxgui/profilemanager.py:1912 -#: ../pyhoca/wxgui/profilemanager.py:1915 -#: ../pyhoca/wxgui/profilemanager.py:1918 -#: ../pyhoca/wxgui/profilemanager.py:1923 -#: ../pyhoca/wxgui/profilemanager.py:1933 ../pyhoca/wxgui/menus_taskbar.py:118 +#: ../pyhoca/wxgui/profilemanager.py:2063 +#: ../pyhoca/wxgui/profilemanager.py:2066 +#: ../pyhoca/wxgui/profilemanager.py:2069 +#: ../pyhoca/wxgui/profilemanager.py:2074 +#: ../pyhoca/wxgui/profilemanager.py:2084 ../pyhoca/wxgui/menus_taskbar.py:118 msgid "Profile Manager" msgstr "Profilhanterare" -#: ../pyhoca/wxgui/profilemanager.py:1912 +#: ../pyhoca/wxgui/profilemanager.py:2063 msgid "Profile name is missing, profile unusable!!!" msgstr "Profilnamn saknas, profil oanvändbar!" -#: ../pyhoca/wxgui/profilemanager.py:1915 -#: ../pyhoca/wxgui/profilemanager.py:1918 +#: ../pyhoca/wxgui/profilemanager.py:2066 +#: ../pyhoca/wxgui/profilemanager.py:2069 #, python-format msgid "Profile name %s already exists!!!" msgstr "Profilen %s finns redan!" -#: ../pyhoca/wxgui/profilemanager.py:1923 +#: ../pyhoca/wxgui/profilemanager.py:2074 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "Konfigurationen av SSH-proxy är inte komplett. Försök igen." -#: ../pyhoca/wxgui/profilemanager.py:1933 +#: ../pyhoca/wxgui/profilemanager.py:2084 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -672,21 +680,21 @@ msgstr "" "proxy.\n" "Ändra konfiguration för SSH-proxy ." -#: ../pyhoca/wxgui/profilemanager.py:1960 +#: ../pyhoca/wxgui/profilemanager.py:2111 #, python-format msgid "%s - profile added" msgstr "%s - profil tillagd" -#: ../pyhoca/wxgui/profilemanager.py:1961 +#: ../pyhoca/wxgui/profilemanager.py:2112 msgid "A new session profile has been added." msgstr "En ny sessionsprofil har lagts till." -#: ../pyhoca/wxgui/profilemanager.py:1965 +#: ../pyhoca/wxgui/profilemanager.py:2116 #, python-format msgid "%s - modified" msgstr "%s - ändrad" -#: ../pyhoca/wxgui/profilemanager.py:1966 +#: ../pyhoca/wxgui/profilemanager.py:2117 msgid "Changes to profile have been saved." msgstr "Ändringar av profil har sparats." @@ -944,85 +952,101 @@ msgstr "%s - servervarning" msgid "The X2Go Server does not publish an application menu." msgstr "X2Go-servern publicerar inte en applikationsmeny." -#: ../pyhoca/wxgui/frontend.py:610 +#: ../pyhoca/wxgui/frontend.py:611 msgid "Public SSH key authentication has been successful." msgstr "Autentisering med publik SSH-nyckel lyckades." -#: ../pyhoca/wxgui/frontend.py:644 +#: ../pyhoca/wxgui/frontend.py:648 msgid "" "The SSH proxy's host key is invalid or has not been accepted by the user" msgstr "" "SSH-proxyns nyckel är felaktig eller har inte accepterats av användaren" -#: ../pyhoca/wxgui/frontend.py:665 +#: ../pyhoca/wxgui/frontend.py:669 #, python-format msgid "%s - EOF error" msgstr "%s - EOF fel" -#: ../pyhoca/wxgui/frontend.py:665 +#: ../pyhoca/wxgui/frontend.py:669 msgid "Authentication protocol communication incomplete! Try again..." msgstr "Autentisering slutfördes ej! Prova igen..." -#: ../pyhoca/wxgui/frontend.py:672 +#: ../pyhoca/wxgui/frontend.py:676 #, python-format msgid "%s - auth key error" msgstr "%s - autentiseringsnyckel fel" -#: ../pyhoca/wxgui/frontend.py:693 +#: ../pyhoca/wxgui/frontend.py:697 msgid "An unknown error occurred during authentication!" msgstr "Ett okänt fel inträffade vid autentisering!" +#: ../pyhoca/wxgui/frontend.py:725 +#, fuzzy, python-format +msgid "%s: DirectRDP not supported yet" +msgstr "Arts (ej supportad)" + #: ../pyhoca/wxgui/frontend.py:726 +#, python-format +msgid "" +"We apologize for the inconvenience...\n" +"\n" +"Session profiles of type ,,DirectRDP'' are not\n" +"supported by %s (%s), yet!!\n" +"\n" +"DirectRDP support will be available in %s (>= 0.2.2.0)." +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:738 msgid "Unknown session profile, configure before using it..." msgstr "Okänd sessionsprofil, konfigurera före användning..." -#: ../pyhoca/wxgui/frontend.py:784 ../pyhoca/wxgui/frontend.py:1302 +#: ../pyhoca/wxgui/frontend.py:796 ../pyhoca/wxgui/frontend.py:1314 #, python-format msgid "%s - session warning" msgstr "%s - sessionsvarning" -#: ../pyhoca/wxgui/frontend.py:784 +#: ../pyhoca/wxgui/frontend.py:796 #, python-format msgid "Execution of command ,,%s'' failed." msgstr "Exekvering av kommando \"%s\" misslyckades." -#: ../pyhoca/wxgui/frontend.py:926 +#: ../pyhoca/wxgui/frontend.py:938 msgid "Cleaning X2Go sessions..." msgstr "Rensar X2Go-sessioner..." -#: ../pyhoca/wxgui/frontend.py:961 +#: ../pyhoca/wxgui/frontend.py:973 #, python-format msgid "%s - disconnect" msgstr "%s - koppla från" -#: ../pyhoca/wxgui/frontend.py:961 +#: ../pyhoca/wxgui/frontend.py:973 msgid "X2Go Profile is now disconnected." msgstr "X2Go-profil är nu frånkopplad" -#: ../pyhoca/wxgui/frontend.py:977 +#: ../pyhoca/wxgui/frontend.py:989 msgid "New Session Profile" msgstr "Ny sessionsprofil" -#: ../pyhoca/wxgui/frontend.py:1029 +#: ../pyhoca/wxgui/frontend.py:1041 #, python-format msgid "Really Delete Session Profile ,,%s''?" msgstr "Är du säker på att du vill radera profil ,,%s''?" -#: ../pyhoca/wxgui/frontend.py:1035 +#: ../pyhoca/wxgui/frontend.py:1047 #, python-format msgid "%s - profile deleted" msgstr "%s - profil raderad" -#: ../pyhoca/wxgui/frontend.py:1035 +#: ../pyhoca/wxgui/frontend.py:1047 msgid "The session profile has been deleted." msgstr "Profilen har raderats." -#: ../pyhoca/wxgui/frontend.py:1053 +#: ../pyhoca/wxgui/frontend.py:1065 #, python-format msgid "%s - share local folder with sessions of this profile" msgstr "%s - dela lokal mapp med sessioner som använder denna profil" -#: ../pyhoca/wxgui/frontend.py:1194 +#: ../pyhoca/wxgui/frontend.py:1206 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -1035,17 +1059,17 @@ msgstr "" "\n" "Litar du på denna nyckel?" -#: ../pyhoca/wxgui/frontend.py:1202 +#: ../pyhoca/wxgui/frontend.py:1214 #, python-format msgid "%s: Confirm Host Authorization" msgstr "%s: Bekräfta tillägg av server" -#: ../pyhoca/wxgui/frontend.py:1247 +#: ../pyhoca/wxgui/frontend.py:1259 #, python-format msgid "%s - channel error" msgstr "%s - kanalfel" -#: ../pyhoca/wxgui/frontend.py:1247 +#: ../pyhoca/wxgui/frontend.py:1259 #, python-format msgid "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " @@ -1053,22 +1077,22 @@ msgid "" msgstr "" "Anslutning till %s avslutades oväntat! Försök återansluta till server..." -#: ../pyhoca/wxgui/frontend.py:1265 ../pyhoca/wxgui/frontend.py:1283 -#: ../pyhoca/wxgui/frontend.py:1285 ../pyhoca/wxgui/frontend.py:1321 +#: ../pyhoca/wxgui/frontend.py:1277 ../pyhoca/wxgui/frontend.py:1295 +#: ../pyhoca/wxgui/frontend.py:1297 ../pyhoca/wxgui/frontend.py:1333 #, python-format msgid "%s - session failure" msgstr "%s - session misslyckades" -#: ../pyhoca/wxgui/frontend.py:1265 +#: ../pyhoca/wxgui/frontend.py:1277 msgid "The session startup failed." msgstr "Sessionsstart misslyckades." -#: ../pyhoca/wxgui/frontend.py:1283 +#: ../pyhoca/wxgui/frontend.py:1295 #, python-format msgid "The command ,,%s'' is not available on X2Go server." msgstr "Kommandot ,,%s'' finns inte på X2Go-server." -#: ../pyhoca/wxgui/frontend.py:1285 +#: ../pyhoca/wxgui/frontend.py:1297 #, python-format msgid "" "The command ,,%s'' is not available on X2Go server\n" @@ -1077,7 +1101,7 @@ msgstr "" "Kommandot ,,%s'' finns inte på X2Go-server\n" "%s." -#: ../pyhoca/wxgui/frontend.py:1302 +#: ../pyhoca/wxgui/frontend.py:1314 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " @@ -1085,7 +1109,7 @@ msgid "" msgstr "" "Omvänd TCP port forwarding för session %s till serverport %s har nekats." -#: ../pyhoca/wxgui/frontend.py:1321 +#: ../pyhoca/wxgui/frontend.py:1333 #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " @@ -1094,35 +1118,35 @@ msgstr "" "Begäran om tunnel till [%s]:%s för session %s nekades av X2Go/SSH-server. " "Sessionsstart misslyckades." -#: ../pyhoca/wxgui/frontend.py:1340 +#: ../pyhoca/wxgui/frontend.py:1352 #, python-format msgid "%s - audio warning" msgstr "%s - ljudvarning" -#: ../pyhoca/wxgui/frontend.py:1340 +#: ../pyhoca/wxgui/frontend.py:1352 msgid "" "The X2Go PulseAudio system is not available within Remote Desktop sessions." msgstr "X2Go PulseAudio är inte tillgängligt i Remote Desktop-sessioner." -#: ../pyhoca/wxgui/frontend.py:1347 ../pyhoca/wxgui/frontend.py:1354 +#: ../pyhoca/wxgui/frontend.py:1359 ../pyhoca/wxgui/frontend.py:1366 #, python-format msgid "%s - audio error" msgstr "%s - ljudfel" -#: ../pyhoca/wxgui/frontend.py:1347 +#: ../pyhoca/wxgui/frontend.py:1359 msgid "The X2Go PulseAudio system could not be started." msgstr "X2Go PulseAudio kunde ej startas." -#: ../pyhoca/wxgui/frontend.py:1354 +#: ../pyhoca/wxgui/frontend.py:1366 msgid "The X2Go PulseAudio system has died unexpectedly." msgstr "X2Go PulseAudio avslutades oväntat." -#: ../pyhoca/wxgui/frontend.py:1366 +#: ../pyhoca/wxgui/frontend.py:1378 #, python-format msgid "%s - audio problem" msgstr "%s - ljudproblem" -#: ../pyhoca/wxgui/frontend.py:1366 +#: ../pyhoca/wxgui/frontend.py:1378 #, python-format msgid "" "The audio connection could not be set up for this session.\n" @@ -1131,12 +1155,12 @@ msgstr "" "Anslutning för ljud kunde ej genomföras för denna session.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1378 +#: ../pyhoca/wxgui/frontend.py:1390 #, python-format msgid "%s - client-side printing not available" msgstr "%s - klientdelade utskrifter ej tillgängliga" -#: ../pyhoca/wxgui/frontend.py:1378 +#: ../pyhoca/wxgui/frontend.py:1390 #, python-format msgid "" "The server denies client-side printing from within this session.\n" @@ -1145,12 +1169,12 @@ msgstr "" "Servern tillåter ej utskrifter via klient från denna session.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1390 +#: ../pyhoca/wxgui/frontend.py:1402 #, python-format msgid "%s - MIME box not available" msgstr "%s - MIME ej tillgängligt" -#: ../pyhoca/wxgui/frontend.py:1390 +#: ../pyhoca/wxgui/frontend.py:1402 #, python-format msgid "" "The server does not support the X2Go MIME box.\n" @@ -1159,12 +1183,12 @@ msgstr "" "Servern stöder ej X2Go MIME.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1402 +#: ../pyhoca/wxgui/frontend.py:1414 #, python-format msgid "%s - client-side folders not sharable" msgstr "%s - klientmappar ej delningsbara" -#: ../pyhoca/wxgui/frontend.py:1402 +#: ../pyhoca/wxgui/frontend.py:1414 #, python-format msgid "" "The server denies client-side folder sharing with this session.\n" @@ -1173,12 +1197,12 @@ msgstr "" "Servern tillåter ej klientdelade mappar i denna session.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1414 +#: ../pyhoca/wxgui/frontend.py:1426 #, python-format msgid "%s - client resources not sharable" msgstr "%s - klientresurser ej delningsbara" -#: ../pyhoca/wxgui/frontend.py:1414 +#: ../pyhoca/wxgui/frontend.py:1426 #, python-format msgid "" "Client-side folders and printers cannot be shared with this session.\n" @@ -1187,12 +1211,12 @@ msgstr "" "Klientdelade mappar och utskrifter kan ej delas med denna session.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1433 ../pyhoca/wxgui/frontend.py:1435 +#: ../pyhoca/wxgui/frontend.py:1445 ../pyhoca/wxgui/frontend.py:1447 #, python-format msgid "%s - print error" msgstr "%s - utskriftsfel" -#: ../pyhoca/wxgui/frontend.py:1433 +#: ../pyhoca/wxgui/frontend.py:1445 #, python-format msgid "" "%s\n" @@ -1203,7 +1227,7 @@ msgstr "" "... orsakat på skrivare %s av session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1435 +#: ../pyhoca/wxgui/frontend.py:1447 #, python-format msgid "" "%s\n" @@ -1214,12 +1238,12 @@ msgstr "" "...orsakat av session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1450 ../pyhoca/wxgui/frontend.py:1465 +#: ../pyhoca/wxgui/frontend.py:1462 ../pyhoca/wxgui/frontend.py:1477 #, python-format msgid "%s - start" msgstr "%s - startar" -#: ../pyhoca/wxgui/frontend.py:1450 +#: ../pyhoca/wxgui/frontend.py:1462 #, python-format msgid "" "New X2Go session starting up...\n" @@ -1228,7 +1252,7 @@ msgstr "" "Ny X2Go-session startar ...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1465 +#: ../pyhoca/wxgui/frontend.py:1477 #, python-format msgid "" "Another client started X2Go session\n" @@ -1237,12 +1261,12 @@ msgstr "" "En annan klient startade X2Go-session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1480 ../pyhoca/wxgui/frontend.py:1495 +#: ../pyhoca/wxgui/frontend.py:1492 ../pyhoca/wxgui/frontend.py:1507 #, python-format msgid "%s - resume" msgstr "%s - återanslut" -#: ../pyhoca/wxgui/frontend.py:1480 +#: ../pyhoca/wxgui/frontend.py:1492 #, python-format msgid "" "Resuming X2Go session...\n" @@ -1251,7 +1275,7 @@ msgstr "" "Återansluter X2Go-session...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1495 +#: ../pyhoca/wxgui/frontend.py:1507 #, python-format msgid "" "Another client resumed X2Go session\n" @@ -1260,12 +1284,12 @@ msgstr "" "En annan klient återanslöt X2Go-session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1510 +#: ../pyhoca/wxgui/frontend.py:1522 #, python-format msgid "%s - running" msgstr "%s - aktiv" -#: ../pyhoca/wxgui/frontend.py:1510 +#: ../pyhoca/wxgui/frontend.py:1522 #, python-format msgid "" "Found already running session\n" @@ -1274,12 +1298,12 @@ msgstr "" "Hittade aktiv session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1530 +#: ../pyhoca/wxgui/frontend.py:1542 #, python-format msgid "%s - suspend" msgstr "%s - vila" -#: ../pyhoca/wxgui/frontend.py:1530 +#: ../pyhoca/wxgui/frontend.py:1542 #, python-format msgid "" "X2Go Session has been suspended\n" @@ -1288,12 +1312,12 @@ msgstr "" "X2Go-session har försatts i vila\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1557 +#: ../pyhoca/wxgui/frontend.py:1569 #, python-format msgid "%s - terminate" msgstr "%s - avsluta" -#: ../pyhoca/wxgui/frontend.py:1557 +#: ../pyhoca/wxgui/frontend.py:1569 #, python-format msgid "" "X2Go Session has terminated\n" @@ -1436,6 +1460,12 @@ msgstr "Ändra sessionstitel till" msgid "OK" msgstr "OK" +#~ msgid "RSA/DSA private key" +#~ msgstr "RSA/DSA privat nyckel" + +#~ msgid "Host[:Port]" +#~ msgstr "Server[:Port]" + #~ msgid "us" #~ msgstr "se" diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index d7b7907..5f8821b 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -723,7 +723,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): if self.session_profiles.get_profile_config(profile_name)['directrdp']: m = messages.PyHoca_MessageWindow_Ok(self, title=_(u'%s: DirectRDP not supported yet') % self.appname, - msg=_(u'We apologize for the inconvenience...\n\nSession profiles of type ,,DirectRDP\'\'are not\nsupported by %s (%s), yet!!\n\nDirectRDP support will be available in %s >= 0.2.2.0.' % (self.appname, self.version, self.appname)), + msg=_(u"We apologize for the inconvenience...\n\nSession profiles of type ,,DirectRDP'' are not\nsupported by %s (%s), yet!!\n\nDirectRDP support will be available in %s (>= 0.2.2.0).") % (self.appname, self.version, self.appname), icon='warning', profile_name=profile_name) m.ShowModal() hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

pyhoca-gui.git - master (branch) updated: 0.2.0.4-24-g965079d
by git-admin＠x2go.org 28 Sep '12

28 Sep '12

The branch, master has been updated via 965079da790f5814e741af789de3b8f8e5c67c08 (commit) from 2f797259c147c7d5546f1024bdf39e356236cf29 (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 965079da790f5814e741af789de3b8f8e5c67c08 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Sep 28 09:48:19 2012 +0200 Rework session profile manager around SSH proxy settings. Implement session profile options ,,sshproxysameuser'' and ,,sshproxysamepass''. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 + pyhoca/wxgui/frontend.py | 8 +- pyhoca/wxgui/logon.py | 11 +- pyhoca/wxgui/profilemanager.py | 465 ++++++++++++++++++++++------------------ 4 files changed, 280 insertions(+), 206 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 85c302f..ceabfbe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,8 @@ pyhoca-gui (0.2.0.5-0~x2go1) UNRELEASED; urgency=low X2Go server via SSH. - Configure SSH proxy port in a separate session profile option (sshproxyport). - Make sure that SSH proxy port migration works flawlessly. + - Rework session profile manager around SSH proxy settings. Implement session + profile options ,,sshproxysameuser'' and ,,sshproxysamepass''. * /debian/control: + Maintainer change in package: X2Go Developers <x2go-dev(a)lists.berlios.de>. + Add Oleksandr Shneyder to Uploaders. diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index d5bc355..d7b7907 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -597,6 +597,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): _can_session_auto_connect = self._X2goClient__session_can_auto_connect(session_uuid) _can_sshproxy_auto_connect = self._X2goClient__session_can_sshproxy_auto_connect(session_uuid) _session_uses_sshproxy = self._X2goClient__session_uses_sshproxy(session_uuid) + _session_reuses_sshproxy_authinfo = self._X2goClient__session_reuses_sshproxy_authinfo(session_uuid) if _can_session_auto_connect: self._X2goClient__connect_session(session_uuid) if not self._X2goClient__server_valid_x2gouser(session_uuid): @@ -615,7 +616,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): except ValueError: pass else: - _logon_window = logon.PyHocaGUI_DialogBoxPassword(self, profile_name, caller=self, sshproxy_auth=(not _can_sshproxy_auto_connect) and _session_uses_sshproxy) + _logon_window = logon.PyHocaGUI_DialogBoxPassword(self, profile_name, caller=self, sshproxy_auth=((not _can_sshproxy_auto_connect) and _session_uses_sshproxy and (not _session_reuses_sshproxy_authinfo))) self._logon_windows[profile_name] = _logon_window except x2go.AuthenticationException: @@ -624,7 +625,10 @@ class PyHocaGUI(wx.App, x2go.X2goClient): self._logon_windows[profile_name] = _logon_window except x2go.X2goSSHProxyAuthenticationException: self._pyhoca_logger('public SSH key authentication for SSH proxy failed, trying next auth-mechanism', loglevel=x2go.log.loglevel_INFO, ) - _logon_window = logon.PyHocaGUI_DialogBoxPassword(self, profile_name, caller=self, sshproxy_auth=True ) + if _session_reuses_sshproxy_authinfo: + _logon_window = logon.PyHocaGUI_DialogBoxPassword(self, profile_name, caller=self, sshproxy_auth=False, ) + else: + _logon_window = logon.PyHocaGUI_DialogBoxPassword(self, profile_name, caller=self, sshproxy_auth=True, ) self._logon_windows[profile_name] = _logon_window except x2go.SSHException, e: self.notifier.send(_(u'%s - SSH error') % profile_name, u'%s!' % str(e), icon='auth_error', timeout=4000) diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py index e5ba605..95ea87f 100644 --- a/pyhoca/wxgui/logon.py +++ b/pyhoca/wxgui/logon.py @@ -194,8 +194,13 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog): if self.sshproxy_auth: + print self.current_profile_config if self.current_profile_config.has_key('sshproxyuser'): - self.sshProxyUserTxt.SetValue(self.current_profile_config['sshproxyuser']) + if self.current_profile_config.has_key('sshproxysameuser') and not self.current_profile_config['sshproxysameuser']: + self.sshProxyUserTxt.SetValue(self.current_profile_config['sshproxyuser']) + if self.current_profile_config.has_key('user'): + if self.current_profile_config.has_key('sshproxysameuser') and self.current_profile_config['sshproxysameuser']: + self.sshProxyUserTxt.SetValue(self.current_profile_config['user']) # Logged in variable self.loggedIn = False @@ -262,6 +267,10 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog): self.sshProxyLoginBtn.Enable(False) self.cancelBtn.Enable(False) + elif self.current_profile_config['sshproxysamepass']: + sshproxy_user = None + sshproxy_password = self.passwordTxt.GetValue() + else: sshproxy_user = sshproxy_password = None diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index 0b52f4a..7404e97 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -90,7 +90,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): 'APPLICATION': _(u'Single Application'), 'XDMCP': _(u'XDMCP Query'), 'RDP': _(u'Windows Terminal Server (X2Go-proxied RDP)'), - 'DirectRDP': 'Windows Terminal Server (direct RDP)', + 'DirectRDP': 'Windows Terminal Server (Direct RDP)', 'CUSTOM': _(u'Custom command'), } if self.action == 'EDIT_CONNECTED': @@ -171,6 +171,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.staticbox_Window = wx.StaticBox(self.tab_Profile, -1, ' %s ' % _(u'Session Window')) self.staticbox_SessionType = wx.StaticBox(self.tab_Session, -1, ' %s ' % _(u'Session Startup')) self.staticbox_Server = wx.StaticBox(self.tab_Connection, -1, ' %s ' % _(u"Server")) + self.staticbox_Proxy = wx.StaticBox(self.tab_Connection, -1, ' %s ' % _(u"Proxy")) self.staticbox_LinkSpeed = wx.StaticBox(self.tab_Connection, -1, ' %s ' % _(u"Connection Link Speed")) self.staticbox_Compression = wx.StaticBox(self.tab_Connection, -1, ' %s ' % _(u"Compression")) self.staticbox_Display = wx.StaticBox(self.tab_Settings, -1, ' %s ' % _(u"Display")) @@ -183,7 +184,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): ### ### widgets for the PROFILE tab ### - self.ProfileNameLabel = wx.StaticText(self.tab_Profile, -1, _(u"Name")+":") + self.ProfileNameLabel = wx.StaticText(self.tab_Profile, -1, _(u"Name")+": ") self.ProfileName = wx.TextCtrl(self.tab_Profile, -1, "") if self.action in ("ADD_EXPLICITLY", "EDIT_EXPLICITLY"): @@ -192,7 +193,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SetSessionWindowTitle = wx.CheckBox(self.tab_Profile, -1, _(u"Set session window title")) self.UseDefaultSessionWindowTitle = wx.CheckBox(self.tab_Profile, -1, _(u"Use a default session window title")) - self.CustomSessionWindowTitleLabel = wx.StaticText(self.tab_Profile, -1, _(u"Custom session window title") + ":") + self.CustomSessionWindowTitleLabel = wx.StaticText(self.tab_Profile, -1, _(u"Custom session window title") + ": ") self.CustomSessionWindowTitle = wx.TextCtrl(self.tab_Profile, -1, "") path_to_icon = os.path.normpath('%s/PyHoca/128x128/pyhoca-session.png' % _icons_location) self.default_icon = True @@ -211,7 +212,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): path_to_icon = os.path.normpath('%s/PyHoca/128x128/pyhoca-session.png' % _icons_location) self.default_icon = True self.IconPath = path_to_icon - self.IconButtonLabel = wx.StaticText(self.tab_Profile, -1, _(u"Window Icon")+':') + self.IconButtonLabel = wx.StaticText(self.tab_Profile, -1, _(u"Window Icon")+": ") self.IconButton = wx.BitmapButton(self.tab_Profile, -1, wx.Bitmap(path_to_icon, wx.BITMAP_TYPE_ANY), size=wx.Size(136,136), ) ### @@ -219,17 +220,17 @@ class PyHocaGUI_ProfileManager(wx.Dialog): ### self.AutoStartSession = wx.CheckBox(self.tab_Session, -1, _(u"Start session automatically after login")) self.AutoLoginSessionProfile = wx.CheckBox(self.tab_Session, -1, _(u"Login automatically after %s has started") % self._PyHocaGUI.appname) - self.SessionTypeLabel = wx.StaticText(self.tab_Session, -1, _(u"Type")+':') + self.SessionTypeLabel = wx.StaticText(self.tab_Session, -1, _(u"Type")+": ") self.SessionType = wx.ComboBox(self.tab_Session, -1, choices=self.sessionChoices.values(), style=wx.CB_DROPDOWN|wx.CB_READONLY) - self.ApplicationLabel = wx.StaticText(self.tab_Session, -1, _(u"Application")+':') + self.ApplicationLabel = wx.StaticText(self.tab_Session, -1, _(u"Application")+": ") self.Application = wx.ComboBox(self.tab_Session, -1, choices=self.applicationChoices.values(), style=wx.CB_DROPDOWN|wx.CB_READONLY) - self.CommandLabel = wx.StaticText(self.tab_Session, -1, _(u"Custom command")+':') + self.CommandLabel = wx.StaticText(self.tab_Session, -1, _(u"Custom command")+": ") self.Command = wx.TextCtrl(self.tab_Session, -1, "", ) - self.XDMCPServerLabel = wx.StaticText(self.tab_Session, -1, _(u"XDMCP server")+':') + self.XDMCPServerLabel = wx.StaticText(self.tab_Session, -1, _(u"XDMCP server")+": ") self.XDMCPServer = wx.TextCtrl(self.tab_Session, -1, "", ) - self.RDPServerLabel = wx.StaticText(self.tab_Session, -1, _(u"RDP server")+':') + self.RDPServerLabel = wx.StaticText(self.tab_Session, -1, _(u"RDP server")+": ") self.RDPServer = wx.TextCtrl(self.tab_Session, -1, "", ) - self.RDPOptionsLabel = wx.StaticText(self.tab_Session, -1, _(u"RDP options")+':') + self.RDPOptionsLabel = wx.StaticText(self.tab_Session, -1, _(u"RDP options")+": ") self.RDPOptions = wx.TextCtrl(self.tab_Session, -1, "", ) self.RootlessSession = wx.CheckBox(self.tab_Session, -1, _(u"Integrate remote application(s) into local desktop (rootless mode)")) self.UsePublishedApplications = wx.CheckBox(self.tab_Session, -1, _(u"Menu of published applications")) @@ -239,29 +240,33 @@ class PyHocaGUI_ProfileManager(wx.Dialog): ### ### widgets for the CONNECTION tab ### - self.UserNameLabel = wx.StaticText(self.tab_Connection, -1, _(u"User")+':') + self.UserNameLabel = wx.StaticText(self.tab_Connection, -1, _(u"User")+": ") self.UserName = wx.TextCtrl(self.tab_Connection, -1, "", size=wx.Size(200,20)) - self.HostLabel = wx.StaticText(self.tab_Connection, -1, _(u"Host")+':') + self.HostLabel = wx.StaticText(self.tab_Connection, -1, _(u"Host")+": ") self.Host = wx.TextCtrl(self.tab_Connection, -1, "", size=wx.Size(200,20)) - self.SSHPortLabel = wx.StaticText(self.tab_Connection, -1, _(u"Port")+':') - self.SSHPort = wx.SpinCtrl(self.tab_Connection, -1, "0", min=1, max=65534) - self.SSHKeyFileLabel = wx.StaticText(self.tab_Connection, -1, _(u"RSA/DSA private key")+':') + self.SSHPortLabel = wx.StaticText(self.tab_Connection, -1, _(u"Port")+": ") + self.SSHPort = wx.SpinCtrl(self.tab_Connection, -1, "22", min=1, max=65534) + self.SSHKeyFileLabel = wx.StaticText(self.tab_Connection, -1, _(u"Key")+": ") self.SSHKeyFile = wx.TextCtrl(self.tab_Connection, -1, style=wx.TE_PROCESS_ENTER) self.SSHKeyFileBrowseButton = wx.BitmapButton(self.tab_Connection, -1, wx.Bitmap('%s/PyHoca/16x16/system-search.png' % _icons_location, wx.BITMAP_TYPE_ANY), size=wx.Size(self._textfield_height,self._textfield_height), ) self.UseSSHProxy = wx.CheckBox(self.tab_Connection, -1, _(u"Server behind SSH proxy")) - self.SSHProxyUserLabel = wx.StaticText(self.tab_Connection, -1, _(u"User")+':') + self.SSHProxyUserLabel = wx.StaticText(self.tab_Connection, -1, _(u"User")+": ") self.SSHProxyUser = wx.TextCtrl(self.tab_Connection, -1, "", size=wx.Size(80,20)) - self.SSHProxyKeyFileLabel = wx.StaticText(self.tab_Connection, -1, _(u"Key file")+':') + self.SSHProxySameUser = wx.CheckBox(self.tab_Connection, -1, _(u"Use same username for X2Go and proxy host")) + self.SSHProxySamePassword = wx.CheckBox(self.tab_Connection, -1, _(u"Use same authentication for X2Go and proxy host")) + self.SSHProxyKeyFileLabel = wx.StaticText(self.tab_Connection, -1, _(u"Key file")+": ") self.SSHProxyKeyFile = wx.TextCtrl(self.tab_Connection, -1, style=wx.TE_PROCESS_ENTER) self.SSHProxyKeyFileBrowseButton = wx.BitmapButton(self.tab_Connection, -1, wx.Bitmap('%s/PyHoca/16x16/system-search.png' % _icons_location, wx.BITMAP_TYPE_ANY), size=wx.Size(self._textfield_height,self._textfield_height), ) - self.SSHProxyHostLabel = wx.StaticText(self.tab_Connection, -1, _(u"Host[:Port]")+':') + self.SSHProxyHostLabel = wx.StaticText(self.tab_Connection, -1, _(u"Host")+": ") self.SSHProxyHost = wx.TextCtrl(self.tab_Connection, -1, "", size=wx.Size(80,20)) - self.SSHProxyTunnelLabel = wx.StaticText(self.tab_Connection, -1, _(u"SSH Proxy Tunnel")+':') + self.SSHProxyPortLabel = wx.StaticText(self.tab_Connection, -1, _(u"Port")+": ") + self.SSHProxyPort = wx.SpinCtrl(self.tab_Connection, -1, "22", min=1, max=65534) + self.SSHProxyTunnelLabel = wx.StaticText(self.tab_Connection, -1, _(u"SSH Proxy Tunnel")+": ") self.SSHProxyTunnelFromHost = wx.TextCtrl(self.tab_Connection, -1, "", size=wx.Size(200,20)) - self.SSHProxyTunnelFromPort = wx.SpinCtrl(self.tab_Connection, -1, "0", min=1, max=65534) + self.SSHProxyTunnelFromPort = wx.SpinCtrl(self.tab_Connection, -1, "44444", min=1, max=65534) self.SSHProxyTunnelBetweenLabel = wx.StaticText(self.tab_Connection, -1, " -> ") self.SSHProxyTunnelToHost = wx.TextCtrl(self.tab_Connection, -1, "", size=wx.Size(200,20)) - self.SSHProxyTunnelToPort = wx.SpinCtrl(self.tab_Connection, -1, "0", min=1, max=65534) + self.SSHProxyTunnelToPort = wx.SpinCtrl(self.tab_Connection, -1, "22", min=1, max=65534) self.LinkSpeed = wx.Slider(self.tab_Connection, -1, 0, 0, 4) self.ModemLabel = wx.StaticText(self.tab_Connection, -1, "|\n "+_(u"Modem"), style=wx.ALIGN_CENTRE) @@ -270,30 +275,30 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.WANLabel = wx.StaticText(self.tab_Connection, -1, "|\n"+_(u"WAN"), style=wx.ALIGN_CENTRE) self.LANLabel = wx.StaticText(self.tab_Connection, -1, "|\n"+_(u"LAN"), style=wx.ALIGN_CENTRE) - self.CompressionLabel = wx.StaticText(self.tab_Connection, -1, _(u"Method")+':') + self.CompressionLabel = wx.StaticText(self.tab_Connection, -1, _(u"Method")+": ") self.Compression = wx.ComboBox(self.tab_Connection, -1, choices=self.compressionChoices.values(), style=wx.CB_DROPDOWN) - self.ImageQualityLabel = wx.StaticText(self.tab_Connection, -1, _(u"Image quality")+':') + self.ImageQualityLabel = wx.StaticText(self.tab_Connection, -1, _(u"Image quality")+": ") self.ImageQuality = wx.SpinCtrl(self.tab_Connection, -1, "9", min=0, max=9) ### ### wigdets for the SETTINGS tab ### self.DisplayTypeFullscreen = wx.RadioButton(self.tab_Settings, -1, _(u"Fullscreen"), style=wx.RB_GROUP) - self.DisplayTypeCustom = wx.RadioButton(self.tab_Settings, -1, _(u"Custom Size")+':') + self.DisplayTypeCustom = wx.RadioButton(self.tab_Settings, -1, _(u"Custom Size")+": ") self.ScreenWidthLabel = wx.StaticText(self.tab_Settings, -1, '') self.ScreenWidth = wx.SpinCtrl(self.tab_Settings, -1, "800", min=400, max=3000) self.ScreenHeightLabel = wx.StaticText(self.tab_Settings, -1, "x") self.ScreenHeight = wx.SpinCtrl(self.tab_Settings, -1, "600", min=500, max=3000) - self.SetDisplayDPI = wx.CheckBox(self.tab_Settings, -1, _(u"Set display DPI")+':') + self.SetDisplayDPI = wx.CheckBox(self.tab_Settings, -1, _(u"Set display DPI")+": ") self.DisplayDPI = wx.SpinCtrl(self.tab_Settings, -1, "96", min=32, max=512) self.DontSetKeyboard = wx.RadioButton(self.tab_Settings, -1, label=_(u"Do not set (use server-side tools to configure the keyboard)"), style=wx.RB_GROUP) self.AutoSetKeyboard = wx.RadioButton(self.tab_Settings, -1, label=_(u"Automatically detect and use client-side keyboard configuration inside the session")) - self.CustomSetKeyboard = wx.RadioButton(self.tab_Settings, -1, label=_(u"Use custom keyboard settings as provided below") + ':') - self.KeyboardModelLabel = wx.StaticText(self.tab_Settings, -1, _(u"Keyboard model")+':') + self.CustomSetKeyboard = wx.RadioButton(self.tab_Settings, -1, label=_(u"Use custom keyboard settings as provided below") + ": ") + self.KeyboardModelLabel = wx.StaticText(self.tab_Settings, -1, _(u"Keyboard model")+": ") self.KeyboardModel = wx.TextCtrl(self.tab_Settings, -1, "") - self.KeyboardLayoutLabel = wx.StaticText(self.tab_Settings, -1, _(u"Layout")+':') + self.KeyboardLayoutLabel = wx.StaticText(self.tab_Settings, -1, _(u"Layout")+": ") self.KeyboardLayout = wx.TextCtrl(self.tab_Settings, -1, "") - self.KeyboardVariantLabel = wx.StaticText(self.tab_Settings, -1, _(u"Layout variant")+':') + self.KeyboardVariantLabel = wx.StaticText(self.tab_Settings, -1, _(u"Layout variant")+": ") self.KeyboardVariant = wx.TextCtrl(self.tab_Settings, -1, "") self.EnableSound = wx.CheckBox(self.tab_Settings, -1, _(u"Enable sound support")) self.PulseAudio = wx.RadioButton(self.tab_Settings, -1, _(u"Pulse Audio"), style=wx.RB_GROUP) @@ -305,12 +310,12 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.Esd = wx.RadioButton(self.tab_Settings, -1, _(u"esd")) self.DefaultSoundPort = wx.CheckBox(self.tab_Settings, -1, _(u"Use default sound port")) - self.SoundPortLabel = wx.StaticText(self.tab_Settings, -1, _(u"Custom sound port")+':') + self.SoundPortLabel = wx.StaticText(self.tab_Settings, -1, _(u"Custom sound port")+": ") self.SoundPort = wx.SpinCtrl(self.tab_Settings, -1, "4713", min=23, max=64889) self.ClientSidePrinting = wx.CheckBox(self.tab_Settings, -1, _(u"Client Side printing")) self.UseLocalFolderSharing = wx.CheckBox(self.tab_SharedFilesAndFolders, -1, _(u"Use local folder sharing")) - self.SharedFolderPathLabel = wx.StaticText(self.tab_SharedFilesAndFolders, -1, _(u"Path")+':') + self.SharedFolderPathLabel = wx.StaticText(self.tab_SharedFilesAndFolders, -1, _(u"Path")+": ") self.SharedFolderPath = wx.TextCtrl(self.tab_SharedFilesAndFolders, -1, "", style=wx.TE_PROCESS_ENTER) self.SharedFolderPathBrowseButton = wx.BitmapButton(self.tab_SharedFilesAndFolders, -1, wx.Bitmap('%s/PyHoca/16x16/system-search.png' % _icons_location, wx.BITMAP_TYPE_ANY), size=wx.Size(self._textfield_height,self._textfield_height), ) self.AddSharedFolderPathButton = wx.Button(self.tab_SharedFilesAndFolders, -1, _(u"Add")) @@ -320,15 +325,15 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.DeleteSharedFolderPathButton = wx.Button(self.tab_SharedFilesAndFolders, -1, _(u"Delete")) self.UseEncodingConverter = wx.CheckBox(self.tab_SharedFilesAndFolders, -1, _(u"Convert between client and server encodings")) - self.ClientEncodingLabel = wx.StaticText(self.tab_SharedFilesAndFolders, -1, _(u"Client encoding")+':') + self.ClientEncodingLabel = wx.StaticText(self.tab_SharedFilesAndFolders, -1, _(u"Client encoding")+": ") self.ClientEncoding = wx.ComboBox(self.tab_SharedFilesAndFolders, -1, choices=_known_encodings, style=wx.CB_DROPDOWN|wx.CB_READONLY) - self.ServerEncodingLabel = wx.StaticText(self.tab_SharedFilesAndFolders, -1, _(u"Server encoding")+':') + self.ServerEncodingLabel = wx.StaticText(self.tab_SharedFilesAndFolders, -1, _(u"Server encoding")+": ") self.ServerEncoding = wx.ComboBox(self.tab_SharedFilesAndFolders, -1, choices=_known_encodings, style=wx.CB_DROPDOWN|wx.CB_READONLY) self.UseFileMIMEbox = wx.CheckBox(self.tab_SharedFilesAndFolders, -1, _(u"Use file MIME box for local file import")) - self.FileMIMEboxExtensionsLabel = wx.StaticText(self.tab_SharedFilesAndFolders, -1, _(u"Extensions")+':') + self.FileMIMEboxExtensionsLabel = wx.StaticText(self.tab_SharedFilesAndFolders, -1, _(u"Extensions")+": ") self.FileMIMEboxExtensions = wx.TextCtrl(self.tab_SharedFilesAndFolders, -1, "", style=wx.TE_PROCESS_ENTER) - self.FileMIMEboxActionLabel = wx.StaticText(self.tab_SharedFilesAndFolders, -1, _(u"Action")+':') + self.FileMIMEboxActionLabel = wx.StaticText(self.tab_SharedFilesAndFolders, -1, _(u"Action")+": ") self.FileMIMEboxAction = wx.ComboBox(self.tab_SharedFilesAndFolders, -1, choices=self.mimeboxactionChoices.values(), style=wx.CB_DROPDOWN|wx.CB_READONLY) if self.action == 'ADD': @@ -348,10 +353,14 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.Bind(wx.EVT_COMBOBOX, self.OnSessionTypeSelected, self.SessionType) self.Bind(wx.EVT_CHECKBOX, self.OnUseDefaultSessionWindowTitle, self.UseDefaultSessionWindowTitle) self.Bind(wx.EVT_CHECKBOX, self.OnSetSessionWindowTitle, self.SetSessionWindowTitle) + self.Bind(wx.EVT_TEXT, self.OnUserNameKeyPressed, self.UserName) self.Bind(wx.EVT_TEXT, self.OnHostKeyPressed, self.Host) + self.Bind(wx.EVT_TEXT, self.OnSSHKeyFileKeyPressed, self.SSHKeyFile) self.Bind(wx.EVT_BUTTON, self.OnSSHKeyFileBrowse, self.SSHKeyFileBrowseButton) self.Bind(wx.EVT_BUTTON, self.OnSSHProxyKeyFileBrowse, self.SSHProxyKeyFileBrowseButton) self.Bind(wx.EVT_CHECKBOX, self.OnUseSSHProxy, self.UseSSHProxy) + self.Bind(wx.EVT_CHECKBOX, self.OnSSHProxySameUser, self.SSHProxySameUser) + self.Bind(wx.EVT_CHECKBOX, self.OnSSHProxySamePassword, self.SSHProxySamePassword) self.Bind(wx.EVT_TEXT, self.OnUpdateSSHProxyTunnelFromHost, self.SSHProxyTunnelFromHost) self.Bind(wx.EVT_TEXT, self.OnUpdateSSHProxyTunnelFromPort, self.SSHProxyTunnelFromPort) self.Bind(wx.EVT_COMBOBOX, self.OnCompressionSelected, self.Compression) @@ -427,24 +436,26 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.RootlessSession.SetMinSize((-1, self._textfield_height)) self.UsePublishedApplications.SetMinSize((-1, self._textfield_height)) - self.UserNameLabel.SetMinSize((110, 16)) + self.UserNameLabel.SetMinSize((-1, 16)) self.UserName.SetMinSize((220, self._textfield_height)) - self.HostLabel.SetMinSize((110, 16)) + self.HostLabel.SetMinSize((-1, 16)) self.Host.SetMinSize((220, self._textfield_height)) - self.SSHPortLabel.SetMinSize((110, 16)) + self.SSHPortLabel.SetMinSize((-1, 16)) self.SSHPort.SetMinSize((65, self._textfield_height)) self.SSHKeyFileLabel.SetMinSize((-1, 16)) - self.SSHKeyFile.SetMinSize((152, self._textfield_height)) - self.SSHProxyUserLabel.SetMinSize((140, 16)) - self.SSHProxyUser.SetMinSize((180, self._textfield_height)) - self.SSHProxyHostLabel.SetMinSize((140, 16)) - self.SSHProxyHost.SetMinSize((180, self._textfield_height)) - self.SSHProxyKeyFile.SetMinSize((120, self._textfield_height)) - self.SSHProxyTunnelLabel.SetMinSize((140, 16)) - self.SSHProxyTunnelFromPort.SetMinSize((60, self._textfield_height)) - self.SSHProxyTunnelToPort.SetMinSize((60, self._textfield_height)) - self.SSHProxyTunnelFromHost.SetMinSize((120, self._textfield_height)) - self.SSHProxyTunnelToHost.SetMinSize((120, self._textfield_height)) + self.SSHKeyFile.SetMinSize((220, self._textfield_height)) + self.SSHProxyUserLabel.SetMinSize((-1, 16)) + self.SSHProxyUser.SetMinSize((220, self._textfield_height)) + self.SSHProxyHostLabel.SetMinSize((-1, 16)) + self.SSHProxyHost.SetMinSize((220, self._textfield_height)) + self.SSHProxyPortLabel.SetMinSize((-1, 16)) + self.SSHProxyPort.SetMinSize((65, self._textfield_height)) + self.SSHProxyKeyFile.SetMinSize((220, self._textfield_height)) + self.SSHProxyTunnelLabel.SetMinSize((-1, 16)) + self.SSHProxyTunnelFromPort.SetMinSize((65, self._textfield_height)) + self.SSHProxyTunnelToPort.SetMinSize((65, self._textfield_height)) + self.SSHProxyTunnelFromHost.SetMinSize((140, self._textfield_height)) + self.SSHProxyTunnelToHost.SetMinSize((140, self._textfield_height)) if X2GOCLIENT_OS == 'Windows': self.LinkSpeed.SetMinSize((425, self._textfield_height)) else: @@ -547,94 +558,81 @@ class PyHocaGUI_ProfileManager(wx.Dialog): ## CONNECTION TAB sizer_3 = wx.BoxSizer(wx.VERTICAL) sizer_3_1 = wx.StaticBoxSizer(self.staticbox_Server, wx.VERTICAL) - sizer_3_1_1 = wx.BoxSizer(wx.VERTICAL) - sizer_3_1_1_1 = wx.BoxSizer(wx.HORIZONTAL) - sizer_3_1_1_1.Add(self.UserNameLabel, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_3_1_1_1.Add(self.UserName) - sizer_3_1_1_1.Add((0,32)) - sizer_3_1_1_2 = wx.BoxSizer(wx.HORIZONTAL) - sizer_3_1_1_2.Add(self.HostLabel, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_3_1_1_2.Add(self.Host) - sizer_3_1_1_2.Add((0,32)) - sizer_3_1_1_3 = wx.BoxSizer(wx.HORIZONTAL) - sizer_3_1_1_3.Add(self.SSHPortLabel, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_3_1_1_3.Add(self.SSHPort) - sizer_3_1_1_3.Add((16,0)) - sizer_3_1_1_3.Add(self.SSHKeyFileLabel, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_3_1_1_3.Add((8,0)) - sizer_3_1_1_3.Add(self.SSHKeyFile, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_3_1_1_3.Add(self.SSHKeyFileBrowseButton, flag=wx.ALIGN_CENTRE_VERTICAL|wx.LEFT, border=2) - sizer_3_1_1_3.Add((0,32)) - sizer_3_1_1.Add(sizer_3_1_1_1, flag=wx.EXPAND) - sizer_3_1_1.Add(sizer_3_1_1_2, flag=wx.EXPAND) - sizer_3_1_1.Add(sizer_3_1_1_3, flag=wx.EXPAND) - - sizer_3_1_2 = wx.BoxSizer(wx.VERTICAL) - sizer_3_1_2_1 = wx.BoxSizer(wx.HORIZONTAL) - sizer_3_1_2_1.Add(self.UseSSHProxy, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_3_1_2_2 = wx.BoxSizer(wx.HORIZONTAL) - sizer_3_1_2_2.Add(self.SSHProxyUserLabel, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_3_1_2_2.Add(self.SSHProxyUser, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_3_1_2_2.Add((16,0)) - sizer_3_1_2_2.Add(self.SSHProxyKeyFileLabel, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_3_1_2_2.Add((8,0)) - sizer_3_1_2_2.Add(self.SSHProxyKeyFile, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_3_1_2_2.Add(self.SSHProxyKeyFileBrowseButton, flag=wx.ALIGN_CENTRE_VERTICAL|wx.LEFT, border=2) - sizer_3_1_2_2.Add((0,32)) - sizer_3_1_2_3 = wx.BoxSizer(wx.HORIZONTAL) - sizer_3_1_2_3.Add(self.SSHProxyHostLabel, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_3_1_2_3.Add(self.SSHProxyHost, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_3_1_2_3.Add((0,32)) - sizer_3_1_2_4 = wx.BoxSizer(wx.HORIZONTAL) - sizer_3_1_2_4.Add(self.SSHProxyTunnelLabel, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_3_1_2_4.Add(self.SSHProxyTunnelFromHost, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_3_1_2_4.Add((4, 0)) - sizer_3_1_2_4.Add(self.SSHProxyTunnelFromPort, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_3_1_2_4.Add((8, 0)) - sizer_3_1_2_4.Add(self.SSHProxyTunnelBetweenLabel, flag=wx.ALIGN_CENTRE_VERTICAL|wx.ALIGN_CENTRE_HORIZONTAL) - sizer_3_1_2_4.Add((8, 0)) - sizer_3_1_2_4.Add(self.SSHProxyTunnelToHost, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_3_1_2_4.Add((4, 0)) - sizer_3_1_2_4.Add(self.SSHProxyTunnelToPort, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_3_1_2_4.Add((0,32)) - sizer_3_1_2.Add(sizer_3_1_2_1, flag=wx.EXPAND) - sizer_3_1_2.Add(sizer_3_1_2_2, flag=wx.EXPAND) - sizer_3_1_2.Add(sizer_3_1_2_3, flag=wx.EXPAND) - sizer_3_1_2.Add(sizer_3_1_2_4, flag=wx.EXPAND) + sizer_3_1_1 = wx.GridBagSizer(hgap=3,vgap=6) + sizer_3_1_1.Add(self.UserNameLabel, pos=(0,0), flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_1_1.Add(self.UserName, pos=(0,1)) + sizer_3_1_1.Add((16,0), pos=(0,2)) + sizer_3_1_1.Add(self.SSHKeyFileLabel, pos=(0,3), flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_1_1.Add(self.SSHKeyFile, pos=(0,4), flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_1_1.Add(self.SSHKeyFileBrowseButton, pos=(0,5), flag=wx.ALIGN_CENTRE_VERTICAL|wx.LEFT, border=2) + sizer_3_1_1.Add(self.HostLabel, pos=(1,0), flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_1_1.Add(self.Host, pos=(1,1)) + sizer_3_1_1.Add(self.SSHPortLabel, pos=(1,3), flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_1_1.Add(self.SSHPort, pos=(1,4), span=(1,2)) + sizer_3_1_1.Add(self.UseSSHProxy, pos=(2,0), span=(1,6), flag=wx.ALIGN_CENTRE_VERTICAL) sizer_3_1.Add(sizer_3_1_1, flag=wx.EXPAND|wx.ALL, border=7) - sizer_3_1.Add(sizer_3_1_2, flag=wx.EXPAND|wx.ALL, border=7) - - sizer_3_2 = wx.StaticBoxSizer(self.staticbox_LinkSpeed, wx.VERTICAL) - sizer_3_2_1 = wx.BoxSizer(wx.VERTICAL) - sizer_3_2_1_1 = wx.BoxSizer(wx.VERTICAL) - sizer_3_2_1_1.Add(self.LinkSpeed) - sizer_3_2_1_2 = wx.GridSizer(1,5,0,0) - sizer_3_2_1_2.SetMinSize((454/5*6 - 30, 36)) - sizer_3_2_1_2.Add(self.ModemLabel, flag=wx.ALIGN_CENTRE_HORIZONTAL) - sizer_3_2_1_2.Add(self.ISDNLabel, flag=wx.ALIGN_CENTRE_HORIZONTAL) - sizer_3_2_1_2.Add(self.ADSLLabel, flag=wx.ALIGN_CENTRE_HORIZONTAL) - sizer_3_2_1_2.Add(self.WANLabel, flag=wx.ALIGN_CENTRE_HORIZONTAL) - sizer_3_2_1_2.Add(self.LANLabel, flag=wx.ALIGN_CENTRE_HORIZONTAL) - sizer_3_2_1.Add(sizer_3_2_1_1, flag=wx.ALIGN_CENTRE_HORIZONTAL) - sizer_3_2_1.Add(sizer_3_2_1_2, flag=wx.ALIGN_CENTRE_HORIZONTAL) + + sizer_3_2 = wx.StaticBoxSizer(self.staticbox_Proxy, wx.VERTICAL) + sizer_3_2_1 = wx.GridBagSizer(hgap=5,vgap=6) + sizer_3_2_1.Add(self.SSHProxySameUser, pos=(0,0), span=(1,6)) + sizer_3_2_1.Add(self.SSHProxySamePassword, pos=(1,0), span=(1,6), flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_2_1.Add(self.SSHProxyUserLabel, pos=(2,0), flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_2_1.Add(self.SSHProxyUser, pos=(2,1), flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_2_1.Add((16,0), pos=(2,2)) + sizer_3_2_1.Add(self.SSHProxyKeyFileLabel, pos=(2,3), flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_2_1.Add(self.SSHProxyKeyFile, pos=(2,4), flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_2_1.Add(self.SSHProxyKeyFileBrowseButton, pos=(2,5), flag=wx.ALIGN_CENTRE_VERTICAL|wx.LEFT, border=2) + sizer_3_2_1.Add(self.SSHProxyHostLabel, pos=(3,0), flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_2_1.Add(self.SSHProxyHost, pos=(3,1), flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_2_1.Add(self.SSHProxyPortLabel, pos=(3,3), flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_2_1.Add(self.SSHProxyPort, pos=(3,4), span=(1,2), flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_2_1_1 = wx.BoxSizer(wx.HORIZONTAL) + sizer_3_2_1_1.Add(self.SSHProxyTunnelLabel, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_2_1_1.Add(self.SSHProxyTunnelFromHost, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_2_1_1.Add((4, 0)) + sizer_3_2_1_1.Add(self.SSHProxyTunnelFromPort, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_2_1_1.Add((8, 0)) + sizer_3_2_1_1.Add(self.SSHProxyTunnelBetweenLabel, flag=wx.ALIGN_CENTRE_VERTICAL|wx.ALIGN_CENTRE_HORIZONTAL) + sizer_3_2_1_1.Add((8, 0)) + sizer_3_2_1_1.Add(self.SSHProxyTunnelToHost, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_2_1_1.Add((4, 0)) + sizer_3_2_1_1.Add(self.SSHProxyTunnelToPort, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_2_1_1.Add((0,32)) + sizer_3_2_1.Add(sizer_3_2_1_1, pos=(4,0), span=(1,6)) sizer_3_2.Add(sizer_3_2_1, flag=wx.EXPAND|wx.ALL, border=7) - sizer_3_3 = wx.StaticBoxSizer(self.staticbox_Compression, wx.VERTICAL) + sizer_3_3 = wx.StaticBoxSizer(self.staticbox_LinkSpeed, wx.VERTICAL) sizer_3_3_1 = wx.BoxSizer(wx.VERTICAL) - sizer_3_3_1_1 = wx.BoxSizer(wx.HORIZONTAL) - sizer_3_3_1_1.Add(self.CompressionLabel, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_3_3_1_1.Add(self.Compression) - sizer_3_3_1_1.Add((0,32)) - sizer_3_3_1_2 = wx.BoxSizer(wx.HORIZONTAL) - sizer_3_3_1_2.Add(self.ImageQualityLabel, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_3_3_1_2.Add(self.ImageQuality) - sizer_3_3_1.Add(sizer_3_3_1_1, flag=wx.EXPAND) - sizer_3_3_1.Add(sizer_3_3_1_2, flag=wx.EXPAND) - sizer_3_3.Add(sizer_3_3_1, proportion=1, flag=wx.EXPAND|wx.ALL, border=7) + sizer_3_3_1_1 = wx.BoxSizer(wx.VERTICAL) + sizer_3_3_1_1.Add(self.LinkSpeed) + sizer_3_3_1_2 = wx.GridSizer(1,5,0,0) + sizer_3_3_1_2.SetMinSize((454/5*6 - 30, 36)) + sizer_3_3_1_2.Add(self.ModemLabel, flag=wx.ALIGN_CENTRE_HORIZONTAL) + sizer_3_3_1_2.Add(self.ISDNLabel, flag=wx.ALIGN_CENTRE_HORIZONTAL) + sizer_3_3_1_2.Add(self.ADSLLabel, flag=wx.ALIGN_CENTRE_HORIZONTAL) + sizer_3_3_1_2.Add(self.WANLabel, flag=wx.ALIGN_CENTRE_HORIZONTAL) + sizer_3_3_1_2.Add(self.LANLabel, flag=wx.ALIGN_CENTRE_HORIZONTAL) + sizer_3_3_1.Add(sizer_3_3_1_1, flag=wx.ALIGN_CENTRE_HORIZONTAL) + sizer_3_3_1.Add(sizer_3_3_1_2, flag=wx.ALIGN_CENTRE_HORIZONTAL) + sizer_3_3.Add(sizer_3_3_1, flag=wx.EXPAND|wx.ALL, border=7) + + sizer_3_4 = wx.StaticBoxSizer(self.staticbox_Compression, wx.VERTICAL) + sizer_3_4_1 = wx.BoxSizer(wx.VERTICAL) + sizer_3_4_1_1 = wx.BoxSizer(wx.HORIZONTAL) + sizer_3_4_1_1.Add(self.CompressionLabel, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_4_1_1.Add(self.Compression) + sizer_3_4_1_1.Add((0,32)) + sizer_3_4_1_2 = wx.BoxSizer(wx.HORIZONTAL) + sizer_3_4_1_2.Add(self.ImageQualityLabel, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_4_1_2.Add(self.ImageQuality) + sizer_3_4_1.Add(sizer_3_4_1_1, flag=wx.EXPAND) + sizer_3_4_1.Add(sizer_3_4_1_2, flag=wx.EXPAND) + sizer_3_4.Add(sizer_3_4_1, proportion=1, flag=wx.EXPAND|wx.ALL, border=7) sizer_3.Add(sizer_3_1, flag=wx.EXPAND|wx.ALL, border=5) - sizer_3.Add(sizer_3_2, proportion=1, flag=wx.EXPAND|wx.ALL, border=5) - sizer_3.Add(sizer_3_3, flag=wx.EXPAND|wx.ALL, border=5) + sizer_3.Add(sizer_3_2, flag=wx.EXPAND|wx.ALL, border=5) + sizer_3.Add(sizer_3_3, proportion=1, flag=wx.EXPAND|wx.ALL, border=5) + sizer_3.Add(sizer_3_4, flag=wx.EXPAND|wx.ALL, border=5) self.tab_Connection.SetSizerAndFit(sizer_3) self.tab_Connection.Layout() @@ -836,13 +834,22 @@ class PyHocaGUI_ProfileManager(wx.Dialog): _ssh_proxy = self.profile_config['usesshproxy'] _ssh_proxy_host = self.profile_config['sshproxyhost'] _ssh_proxy_port = 22 - if self.profile_config['sshproxyport']: + try: _ssh_proxy_port = int(self.profile_config['sshproxyport']) + except TypeError: + pass if ":" in _ssh_proxy_host: - _ssh_proxy_port = _ssh_proxy_host.split(":")[1] + try: + _ssh_proxy_port = int(_ssh_proxy_host.split(":")[1]) + except TypeError: + pass _ssh_proxy_host = _ssh_proxy_host.split(":")[0] - self.SSHProxyHost.SetValue("%s:%s" % (_ssh_proxy_host, _ssh_proxy_port)) - self.SSHProxyUser.SetValue(self.profile_config['sshproxyuser']) + self.SSHProxyHost.SetValue(_ssh_proxy_host) + self.SSHProxyPort.SetValue(_ssh_proxy_port) + if self.profile_config['sshproxysameuser']: + self.SSHProxyUser.SetValue(self.profile_config['user']) + else: + self.SSHProxyUser.SetValue(self.profile_config['sshproxyuser']) self.SSHProxyKeyFile.SetValue(self.profile_config['sshproxykeyfile']) _from_host = _from_port = _to_host = _to_port = None @@ -856,46 +863,11 @@ class PyHocaGUI_ProfileManager(wx.Dialog): if _from_port: self.SSHProxyTunnelFromPort.SetValue(int(_from_port)) if _to_host: self.SSHProxyTunnelToHost.SetValue(_to_host) if _to_port: self.SSHProxyTunnelToPort.SetValue(int(_to_port)) - if _ssh_proxy: - self.SSHProxyHostLabel.Enable(True) - self.SSHProxyHost.Enable(True) - self.SSHProxyUserLabel.Enable(True) - self.SSHProxyUser.Enable(True) - self.SSHProxyKeyFileLabel.Enable(True) - self.SSHProxyKeyFile.Enable(True) - self.SSHProxyKeyFileBrowseButton.Enable(True) - self.SSHProxyTunnelLabel.Enable(True) - self.SSHProxyTunnelFromHost.Enable(True) - self.SSHProxyTunnelFromPort.Enable(True) - self.SSHProxyTunnelBetweenLabel.Enable(True) - self.SSHProxyTunnelToHost.Enable(True) - self.SSHProxyTunnelToPort.Enable(True) - self.Host.Enable(False) - self.HostLabel.Enable(False) - self.Host.SetValue(self.SSHProxyTunnelFromHost.GetValue()) - self.SSHPort.Enable(False) - self.SSHPortLabel.Enable(False) - self.SSHPort.SetValue(self.SSHProxyTunnelFromPort.GetValue()) - else: - self.SSHProxyHostLabel.Enable(False) - self.SSHProxyHost.Enable(False) - self.SSHProxyUserLabel.Enable(False) - self.SSHProxyUser.Enable(False) - self.SSHProxyKeyFileLabel.Enable(False) - self.SSHProxyKeyFile.Enable(False) - self.SSHProxyKeyFileBrowseButton.Enable(False) - self.SSHProxyTunnelLabel.Enable(False) - self.SSHProxyTunnelFromHost.Enable(False) - self.SSHProxyTunnelFromPort.Enable(False) - self.SSHProxyTunnelBetweenLabel.Enable(False) - self.SSHProxyTunnelToHost.Enable(False) - self.SSHProxyTunnelToPort.Enable(False) - self.Host.Enable(True) - self.HostLabel.Enable(True) - self.Host.SetValue(self.profile_config_bak['host']) - self.SSHPort.Enable(True) - self.SSHPortLabel.Enable(True) - self.SSHPort.SetValue(self.profile_config_bak['sshport']) + + self.UseSSHProxy.SetValue(_ssh_proxy) + self.SSHProxySameUser.SetValue(self.profile_config['sshproxysameuser']) + self.SSHProxySamePassword.SetValue(self.profile_config['sshproxysamepass']) + self.ToggleSSHProxy() self.AutoStartSession.SetValue(self.profile_config['autostart']) self.AutoLoginSessionProfile.SetValue(self.profile_config['autologin']) @@ -960,6 +932,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): if _command == 'RDP': if self.profile_config['directrdp']: self.enable_DirectRDP() + self.SSHPort.SetValue(self.profile_config['rdpport']) self.RDPOptions.SetValue(self.profile_config['directrdpsettings']) self.RDPServerLabel.Enable(True) self.RDPServer.Enable(False) @@ -1164,19 +1137,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SSHKeyFileLabel.Enable(False) self.SSHKeyFile.Enable(False) self.UseSSHProxy.Enable(False) - self.SSHProxyHostLabel.Enable(False) - self.SSHProxyHost.Enable(False) - self.SSHProxyUserLabel.Enable(False) - self.SSHProxyUser.Enable(False) - self.SSHProxyKeyFileLabel.Enable(False) - self.SSHProxyKeyFile.Enable(False) - self.SSHProxyKeyFileBrowseButton.Enable(False) - self.SSHProxyTunnelLabel.Enable(False) - self.SSHProxyTunnelFromHost.Enable(False) - self.SSHProxyTunnelFromPort.Enable(False) - self.SSHProxyTunnelBetweenLabel.Enable(False) - self.SSHProxyTunnelToHost.Enable(False) - self.SSHProxyTunnelToPort.Enable(False) + self.staticbox_Proxy.Enable(False) def __update_from_screen(self): """\ @@ -1201,27 +1162,33 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.profile_config['key'] = self.SSHKeyFile.GetValue() if self.UseSSHProxy.GetValue(): self.profile_config['usesshproxy'] = True + self.profile_config['sshproxyautologin'] = self.profile_config['autologin'] self.profile_config['host'] = self.SSHProxyTunnelFromHost.GetValue() self.profile_config['sshport'] = self.SSHProxyTunnelFromPort.GetValue() else: self.profile_config['usesshproxy'] = False + self.profile_config['sshproxyautologin'] = False self.profile_config['host'] = self.Host.GetValue() if _session_type != 'DirectRDP': self.profile_config['sshport'] = self.SSHPort.GetValue() - _ssh_proxy_host = self.SSHProxyHost.GetValue() - _ssh_proxy_port = 22 - if ":" in _ssh_proxy_host: - _ssh_proxy_port = _ssh_proxy_host.split(":")[1] - _ssh_proxy_host = _ssh_proxy_host.split(":")[0] - self.profile_config['sshproxyhost'] = _ssh_proxy_host - self.profile_config['sshproxyport'] = _ssh_proxy_port - self.profile_config['sshproxyuser'] = self.SSHProxyUser.GetValue() + self.profile_config['sshproxysameuser'] = self.SSHProxySameUser.GetValue() + self.profile_config['sshproxysamepass'] = self.SSHProxySamePassword.GetValue() + + self.profile_config['sshproxyhost'] = self.SSHProxyHost.GetValue() + self.profile_config['sshproxyport'] = self.SSHProxyPort.GetValue() self.profile_config['sshproxytunnel'] = '%s:%s:%s:%s' % (self.SSHProxyTunnelFromHost.GetValue(), self.SSHProxyTunnelFromPort.GetValue(), self.SSHProxyTunnelToHost.GetValue(), self.SSHProxyTunnelToPort.GetValue(), ) - self.profile_config['sshproxykeyfile'] = self.SSHProxyKeyFile.GetValue() + if self.profile_config['sshproxysameuser']: + self.profile_config['sshproxyuser'] = '' + else: + self.profile_config['sshproxyuser'] = self.SSHProxyUser.GetValue() + if self.profile_config['sshproxysamepass']: + self.profile_config['sshproxykeyfile'] = '' + else: + self.profile_config['sshproxykeyfile'] = self.SSHProxyKeyFile.GetValue() self.profile_config['applications'] = self.applicationChoices.keys() self.profile_config['directrdp'] = False @@ -1516,6 +1483,9 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.XDMCPServer.Enable(False) if _session_type == 'DirectRDP': + self.profile_config_bak['sshport'] = self.SSHPort.GetValue() + self.profile_config_bak['rdpserver'] = self.RDPServer.GetValue() + self.profile_config_bak['rdpoptions'] = self.RDPOptions.GetValue() self.enable_DirectRDP() self.RDPServerLabel.Enable(True) self.RDPServer.Enable(False) @@ -1526,6 +1496,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.RootlessSession.SetValue(False) self.RootlessSession.Enable(False) elif _session_type == 'RDP': + self.profile_config_bak['rdpport'] = self.SSHPort.GetValue() + self.profile_config_bak['directrdpsettings'] = self.RDPOptions.GetValue() self.disable_DirectRDP() self.RDPServerLabel.Enable(True) self.RDPServer.Enable(True) @@ -1536,6 +1508,11 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.RootlessSession.SetValue(False) self.RootlessSession.Enable(False) else: + self.profile_config_bak['rdpport'] = self.SSHPort.GetValue() + self.profile_config_bak['directrdpsettings'] = self.RDPOptions.GetValue() + if self.RDPServer.GetValue() != self.Host.GetValue(): + self.profile_config_bak['rdpserver'] = self.RDPServer.GetValue() + self.profile_config_bak['rdpoptions'] = self.RDPOptions.GetValue() self.disable_DirectRDP() self.RDPServerLabel.Enable(False) self.RDPServer.Enable(False) @@ -1576,6 +1553,28 @@ class PyHocaGUI_ProfileManager(wx.Dialog): else: self.ImageQuality.Enable(False) + def OnUserNameKeyPressed(self, event): + """\ + Gets called whenever something gets typed in the user name field. + + @param event: event + @type event: C{obj} + + """ + if self.UseSSHProxy.GetValue() and self.SSHProxySameUser.GetValue(): + self.SSHProxyUser.SetValue(self.UserName.GetValue()) + + def OnSSHKeyFileKeyPressed(self, event): + """\ + Gets called whenever something gets typed in the SSH key file field. + + @param event: event + @type event: C{obj} + + """ + if self.UseSSHProxy.GetValue() and self.SSHProxySamePassword.GetValue(): + self.SSHProxyKeyFile.SetValue(self.SSHKeyFile.GetValue()) + def OnHostKeyPressed(self, event): """\ Gets called whenever something gets typed in the host name field. @@ -1608,6 +1607,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog): # This returns a Python list of files that were selected. path = dlg.GetPath() self.SSHKeyFile.SetValue(path) + if self.SSHProxySamePassword.GetValue(): + self.SSHProxyKeyFile.SetValue(path) def OnSSHProxyKeyFileBrowse(self, event): """\ @@ -1640,17 +1641,70 @@ class PyHocaGUI_ProfileManager(wx.Dialog): """ if self.UseSSHProxy.GetValue(): + self.profile_config_bak['host'] = self.Host.GetValue() + self.profile_config_bak['sshport'] = self.SSHPort.GetValue() + self.ToggleSSHProxy() + + def OnSSHProxySameUser(self, event): + """\ + Gets called if the use-same-user-for-proxy checkbox gets marked. + + @param event: event + @type event: C{obj} + + """ + if self.SSHProxySameUser.GetValue(): + self.profile_config_bak['sshproxyuser'] = self.SSHProxyUser.GetValue() + self.ToggleSSHProxy() + + def OnSSHProxySamePassword(self, event): + """\ + Gets called if the use-same-user-authinfo checkbox gets marked. + + @param event: event + @type event: C{obj} + + """ + if self.SSHProxySamePassword.GetValue(): + self.profile_config_bak['sshproxykeyfile'] = self.SSHProxyKeyFile.GetValue() + self.ToggleSSHProxy() + + def ToggleSSHProxy(self): + """\ + Gets called if the use-ssh-proxy checkbox gets marked. + + @param event: event + @type event: C{obj} + + """ + if self.UseSSHProxy.GetValue(): + self.staticbox_Proxy.Enable(True) + self.SSHProxySameUser.Enable(True) + self.SSHProxySamePassword.Enable(True) self.SSHProxyHostLabel.Enable(True) self.SSHProxyHost.Enable(True) - self.SSHProxyUserLabel.Enable(True) - self.SSHProxyUser.Enable(True) - self.SSHProxyKeyFileLabel.Enable(True) - self.SSHProxyKeyFile.Enable(True) - self.SSHProxyKeyFileBrowseButton.Enable(True) + self.SSHProxyPortLabel.Enable(True) + self.SSHProxyPort.Enable(True) + if self.SSHProxySameUser.GetValue(): + self.SSHProxyUser.SetValue(self.UserName.GetValue()) + self.SSHProxyUser.Enable(False) + else: + self.SSHProxyUser.SetValue(self.profile_config_bak['sshproxyuser']) + self.SSHProxyUserLabel.Enable(True) + self.SSHProxyUser.Enable(True) + if self.SSHProxySamePassword.GetValue(): + self.SSHProxyKeyFile.SetValue(self.SSHKeyFile.GetValue()) + self.SSHProxyKeyFile.Enable(False) + self.SSHProxyKeyFileBrowseButton.Enable(False) + else: + self.SSHProxyKeyFile.SetValue(self.profile_config_bak['sshproxykeyfile']) + self.SSHProxyKeyFileLabel.Enable(True) + self.SSHProxyKeyFile.Enable(True) + self.SSHProxyKeyFileBrowseButton.Enable(True) self.SSHProxyTunnelLabel.Enable(True) self.SSHProxyTunnelFromHost.Enable(True) - self.SSHProxyTunnelBetweenLabel.Enable(True) self.SSHProxyTunnelFromPort.Enable(True) + self.SSHProxyTunnelBetweenLabel.Enable(True) self.SSHProxyTunnelToHost.Enable(True) self.SSHProxyTunnelToPort.Enable(True) self.Host.Enable(False) @@ -1660,8 +1714,13 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SSHPortLabel.Enable(False) self.SSHPort.SetValue(self.SSHProxyTunnelFromPort.GetValue()) else: + self.staticbox_Proxy.Enable(False) + self.SSHProxySameUser.Enable(False) + self.SSHProxySamePassword.Enable(False) self.SSHProxyHostLabel.Enable(False) self.SSHProxyHost.Enable(False) + self.SSHProxyPortLabel.Enable(False) + self.SSHProxyPort.Enable(False) self.SSHProxyUserLabel.Enable(False) self.SSHProxyUser.Enable(False) self.SSHProxyKeyFileLabel.Enable(False) hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

x2goclient.git - master (branch) updated: 3.99.2.2-58-gdd0bb5c
by git-admin＠x2go.org 27 Sep '12

27 Sep '12

The branch, master has been updated via dd0bb5c56aab629a2476e7d3890382da462f25d7 (commit) via 7fb1879eb1e103522a5c5696e126d81ee4181594 (commit) via 5e08c788d5003464b5f576eac1398748bdffc448 (commit) via 53a6371c0d98e5735abdbb9971b4aef933524e37 (commit) from 6607e91be09fbbf18972e14fa65fef2a71e54833 (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 dd0bb5c56aab629a2476e7d3890382da462f25d7 Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Date: Thu Sep 27 17:12:02 2012 +0200 commandline options --broker-user and --broker-noauth commit 7fb1879eb1e103522a5c5696e126d81ee4181594 Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Date: Thu Sep 27 16:18:11 2012 +0200 improve brocker code add support for "usebrockerpass" config variable to use brocker pass for ssh auth on X2Go server commit 5e08c788d5003464b5f576eac1398748bdffc448 Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Date: Thu Sep 27 13:23:48 2012 +0200 it is possible to add several ssh keys from commandline in form: --ssh-key=[user@][server:][port:]<path to key> it can be usefull for TCE or login over broker commit 53a6371c0d98e5735abdbb9971b4aef933524e37 Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Date: Thu Sep 27 12:30:55 2012 +0200 clean some broker code ----------------------------------------------------------------------- Summary of changes: debian/changelog | 7 + httpbrokerclient.cpp | 372 ++++++++++---------------------------------------- httpbrokerclient.h | 11 +- onmainwindow.cpp | 285 ++++++++++++++++++++++++-------------- onmainwindow.h | 16 ++- 5 files changed, 275 insertions(+), 416 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 682eb7c..3193042 100644 --- a/debian/changelog +++ b/debian/changelog @@ -60,6 +60,13 @@ x2goclient (3.99.3.0-0~x2go1) UNRELEASED; urgency=low - SshMasterConnection emit signal to GUI thread if it need a passphrase to decrypt a ssh key. GUI thread use input dialog to read a passphrase from user - Add support for SSH proxy (HTTP and SSH) to X2Go Client Gui + - clean some broker code + - it is possible to add several ssh keys from commandline in form: + --ssh-key=[user@][server:][port:]<path to key> + it can be usefull for TCE or login over broker + - improve brocker code + add support for "usebrockerpass" config variable to use brocker pass for ssh auth on X2Go server + - commandline options --broker-user and --broker-noauth [ Ricardo Diaz ] * New upstream version (3.99.3.0): diff --git a/httpbrokerclient.cpp b/httpbrokerclient.cpp index 8402e0c..36d3e1b 100644 --- a/httpbrokerclient.cpp +++ b/httpbrokerclient.cpp @@ -30,7 +30,6 @@ HttpBrokerClient::HttpBrokerClient ( ONMainWindow* wnd, ConfigFile* cfg ) { config=cfg; mainWindow=wnd; - cmdRequest=sinfoKeyRequest=sinfoRequest=-1; QUrl lurl ( config->brokerurl ); http=new QHttp ( this ); @@ -45,24 +44,21 @@ HttpBrokerClient::HttpBrokerClient ( ONMainWindow* wnd, ConfigFile* cfg ) SLOT ( slotRequestFinished ( int,bool ) ) ); connect ( http,SIGNAL ( sslErrors ( const QList<QSslError>& ) ),this, SLOT ( slotSslErrors ( const QList<QSslError>& ) ) ); - if (!wnd->brokerMode) - getSInfoFromBroker ( true ); } HttpBrokerClient::~HttpBrokerClient() { - } void HttpBrokerClient::getUserSessions() { QString req; QTextStream ( &req ) << - "task=listsessions&"<< - "user="<<config->brokerUser<<"&"<< - "password="<<config->brokerPass<<"&"<< - "authid="<<config->brokerUserId; + "task=listsessions&"<< + "user="<<config->brokerUser<<"&"<< + "password="<<config->brokerPass<<"&"<< + "authid="<<config->brokerUserId; QUrl lurl ( config->brokerurl ); httpSessionAnswer.close(); httpSessionAnswer.setData ( 0,0 ); @@ -76,11 +72,11 @@ void HttpBrokerClient::selectUserSession(const QString& session) // x2goDebug<<"selected sid: "<<session; QString req; QTextStream ( &req ) << - "task=selectsession&"<< - "sid="<<session<<"&"<< - "user="<<config->brokerUser<<"&"<< - "password="<<config->brokerPass<<"&"<< - "authid="<<config->brokerUserId; + "task=selectsession&"<< + "sid="<<session<<"&"<< + "user="<<config->brokerUser<<"&"<< + "password="<<config->brokerPass<<"&"<< + "authid="<<config->brokerUserId; QUrl lurl ( config->brokerurl ); httpSessionAnswer.close(); httpSessionAnswer.setData ( 0,0 ); @@ -93,11 +89,11 @@ void HttpBrokerClient::changePassword(QString newPass) newBrokerPass=newPass; QString req; QTextStream ( &req ) << - "task=setpass&"<< - "newpass="<<newPass<<"&"<< - "user="<<config->brokerUser<<"&"<< - "password="<<config->brokerPass<<"&"<< - "authid="<<config->brokerUserId; + "task=setpass&"<< + "newpass="<<newPass<<"&"<< + "user="<<config->brokerUser<<"&"<< + "password="<<config->brokerPass<<"&"<< + "authid="<<config->brokerUserId; QUrl lurl ( config->brokerurl ); httpSessionAnswer.close(); httpSessionAnswer.setData ( 0,0 ); @@ -109,14 +105,13 @@ void HttpBrokerClient::testConnection() { QString req; QTextStream ( &req ) << - "task=testcon"; - + "task=testcon"; + QUrl lurl ( config->brokerurl ); httpSessionAnswer.close(); httpSessionAnswer.setData ( 0,0 ); requestTime.start(); testConRequest=http->post ( lurl.path(),req.toUtf8(),&httpSessionAnswer ); - } @@ -134,169 +129,6 @@ void HttpBrokerClient::createIniFile(const QString& content) mainWindow->config.iniFile=cont; } -QString HttpBrokerClient::getSInfoFromBroker ( bool getKey ) -{ - - QString pack; - bool fullscreen; - int height; - int width; - int quality; - int speed; - bool usekbd; - bool setDPI=false; - uint dpi=96; - QString layout; - QString type; - QString homeDir=mainWindow->getHomeDirectory(); - X2goSettings st( "sessions" ); - - QString sid; - sid="embedded"; - pack=st.setting()->value ( sid+"/pack", - ( QVariant ) "16m-jpeg" ).toString(); - fullscreen=st.setting()->value ( sid+"/fullscreen", - ( QVariant ) - false ).toBool(); - height=st.setting()->value ( sid+"/height", - ( QVariant ) 600 ).toInt(); - width=st.setting()->value ( sid+"/width", - ( QVariant ) 800 ).toInt(); - setDPI=st.setting()->value ( sid+"/setdpi", - ( QVariant ) false ).toBool(); - dpi=st.setting()->value ( sid+"/dpi", - ( QVariant ) 96 ).toUInt(); - quality=st.setting()->value ( - sid+"/quality", - ( QVariant ) 9 ).toInt(); - speed=st.setting()->value ( sid+"/speed", - ( QVariant ) 2 ).toInt(); - usekbd=st.setting()->value ( sid+"/usekbd", - ( QVariant ) true ).toBool(); - layout=st.setting()->value ( sid+"/layout", - ( QVariant ) - tr ( "us" ) ).toString(); - type=st.setting()->value ( sid+"/type", - ( QVariant ) - tr ( "pc105/us" ) ).toString(); - bool startEmbedded=false; - if ( st.setting()->value ( sid+"/startembed", - ( QVariant ) true ).toBool() ) - { - startEmbedded=true; - fullscreen=false; - QSize sz=mainWindow->getEmbedAreaSize(); - height=sz.height(); - width=sz.width(); - - } - - QString geometry; - if ( fullscreen ) - { - geometry="fullscreen"; -#ifdef Q_OS_WIN - fullscreen=false; -#endif - } - if ( ! fullscreen ) - { - geometry=QString::number ( width ) +"x"+ - QString::number ( height ); - - } - QString link; - switch ( speed ) - { - case 0: - link="modem"; - break; - case 1: - link="isdn"; - break; - case 2: - link="adsl"; - break; - case 3: - link="wan"; - break; - case 4: - link="lan"; - break; - } - - QFile file ( ":/txt/packs" ); - file.open ( QIODevice::ReadOnly | QIODevice::Text ); - QTextStream in ( &file ); - while ( !in.atEnd() ) - { - QString pc=in.readLine(); - if ( pc.indexOf ( "-%" ) !=-1 ) - { - pc=pc.left ( pc.indexOf ( "-%" ) ); - if ( pc==pack ) - { - pack+="-"+QString::number ( quality ); - break; - } - } - } - file.close(); - - QDesktopWidget wd; - QString depth=QString::number ( wd.depth() ); -#ifdef Q_OS_DARWIN - usekbd=0; - type="query"; -#endif - QString dpiS; - if ( setDPI ) - { - dpiS=QString::number ( dpi ); - } - else - dpiS="noset"; - QString useKbdS; - if ( usekbd ) - useKbdS="1"; - else - useKbdS="0"; - - - QString req; - QTextStream ( &req ) << - "mode=getsinfo&"<< - "geometry="<<geometry<<"&" - "link="<<link<<"&" - "pack="<<pack<<"&" - "depth="<<depth<<"&" - "layout="<<layout<<"&" - "type="<<type<<"&" - "usekbd="<<useKbdS<<"&" - "dpi="<<dpiS<<"&" - "user="<<config->user<<"&"<< - "connectionts="<<config->connectionts<<"&"<< - "cookie="<<config->cookie; - QUrl lurl ( config->brokerurl ); - httpSIAnswer.close(); - httpSIAnswer.setData ( 0,0 ); - if ( getKey ) - { - QTextStream ( &req ) <<"&" - "getkey=true"; - sinfoKeyRequest=http->post ( lurl.path(), - req.toUtf8(),&httpSIAnswer ); - x2goDebug<<"requested key :"<<sinfoKeyRequest; - } - else - { - sinfoRequest=http->post ( lurl.path(), - req.toUtf8(),&httpSIAnswer ); - x2goDebug<<"requested session :"<<sinfoRequest; - } - return QString::null; -} - void HttpBrokerClient::slotRequestFinished ( int id, bool error ) { @@ -312,10 +144,10 @@ void HttpBrokerClient::slotRequestFinished ( int id, bool error ) if (id==testConRequest) { - + //x2goDebug<<"cmd request answer: "<<answer; - x2goDebug<<"elapsed: "<<requestTime.elapsed()<<"received:"<<httpSessionAnswer.size()<<endl; - emit connectionTime(requestTime.elapsed(),httpSessionAnswer.size()); + x2goDebug<<"elapsed: "<<requestTime.elapsed()<<"received:"<<httpSessionAnswer.size()<<endl; + emit connectionTime(requestTime.elapsed(),httpSessionAnswer.size()); return; } if ( id== sessionsRequest || id == selSessRequest || id==chPassRequest) @@ -339,7 +171,8 @@ void HttpBrokerClient::slotRequestFinished ( int id, bool error ) } if (id == selSessRequest) { - emit getSession(answer); + parseSession(answer); + } if ( id == chPassRequest) { @@ -354,67 +187,27 @@ void HttpBrokerClient::slotRequestFinished ( int id, bool error ) } } +} - if ( id==sinfoKeyRequest || id==sinfoRequest ) - { -// x2goDebug<<"Answer:"<<httpSIAnswer.data(); - QString key ( httpSIAnswer.data() ); - if ( key.indexOf ( "X2GO_BROKER_ERRORR-ACESS DENIED" ) !=-1 ) - { - QMessageBox::critical ( - 0,tr ( "Error" ), - tr ( "Your session was disconnected. " - "To get access to your running " - "session, please return to the login page " - "or use the \"reload\" function of " - "your browser." ) ); - emit fatalHttpError(); - return; - } - QStringList strings=key.split ( "\n" ); - for ( int i=0;i<strings.count();++i ) - { - if ( strings[i].indexOf ( "x2gosession=" ) !=-1 ) - { - QStringList vals=strings[i].split ( "=" ); - config->sessiondata=vals[1]; - } - if ( strings[i]=="rootless=false" ) - { - config->rootless=false; - } - if ( strings[i]=="rootless=true" ) - { - config->rootless=true; - } - } - if ( id==sinfoKeyRequest ) - { - emit haveSshKey ( key ); - QTimer::singleShot ( 5000, this, - SLOT ( slotGetConnectionCmd() ) ); - } - else - emit haveAgentInfo(); - } - if ( id==cmdRequest ) +void HttpBrokerClient::parseSession(QString sinfo) +{ + QStringList lst=sinfo.split("SERVER:",QString::SkipEmptyParts); + int keyStartPos=sinfo.indexOf("-----BEGIN DSA PRIVATE KEY-----"); + QString endStr="-----END DSA PRIVATE KEY-----"; + int keyEndPos=sinfo.indexOf(endStr); + if (! (keyEndPos == -1 || keyStartPos == -1 || lst.size()==0)) + config->key=sinfo.mid(keyStartPos, keyEndPos+endStr.length()-keyStartPos); + QString serverLine=(lst[1].split("\n"))[0]; + QStringList words=serverLine.split(":",QString::SkipEmptyParts); + config->serverIp=words[0]; + if (words.count()>1) + config->sshport=words[1]; + if (sinfo.indexOf("SESSION_INFO")!=-1) { - QString answer ( httpCmdAnswer.data() ); -// x2goDebug<<"cmd request answer: "<<answer; - if ( !error ) - { - answer=answer.split ( - "<body onload=\"checkPlugin()\">" ) [1]; - answer=answer.split ( "</body>" ) [0]; - if ( answer.indexOf ( "CMD:0:" ) !=-1 ) - { - x2goDebug<<"brocker sent reconnect cmd"; - emit cmdReconnect(); - } - } - QTimer::singleShot ( 3000, this, - SLOT ( slotGetConnectionCmd() ) ); + QStringList lst=sinfo.split("SESSION_INFO:",QString::SkipEmptyParts); + config->sessiondata=(lst[1].split("\n"))[0]; } + emit sessionSelected(); } @@ -422,7 +215,7 @@ void HttpBrokerClient::slotSslErrors ( const QList<QSslError> & errors ) { QStringList err; QSslCertificate cert; - for ( int i=0;i<errors.count();++i ) + for ( int i=0; i<errors.count(); ++i ) { x2goDebug<<"sslError ,code:"<<errors[i].error() <<":"; err<<errors[i].errorString(); @@ -463,37 +256,37 @@ void HttpBrokerClient::slotSslErrors ( const QList<QSslError> & errors ) text ); text=QString::null; QTextStream ( &text ) <<err.join ( "\n" ) <<"\n"<< - "------------\n"<< - tr ( "Issued to:\n" ) << - tr ( "Common Name(CN)\t" ) << - cert.issuerInfo ( QSslCertificate::CommonName ) - <<endl<< - tr ( "Organization(O)\t" ) << - cert.issuerInfo ( QSslCertificate::Organization ) - <<endl<< - tr ( "Organizational Unit(OU)\t" ) << - cert.issuerInfo ( QSslCertificate::OrganizationalUnitName ) - <<endl<< - tr ( "Serial Number\t" ) <<getHexVal ( cert.serialNumber() ) - <<endl<<endl<< - tr ( "Issued by:\n" ) << - tr ( "Common Name(CN)\t" ) << - cert.subjectInfo ( QSslCertificate::CommonName ) - <<endl<< - tr ( "Organization(O)\t" ) << - cert.subjectInfo ( QSslCertificate::Organization ) - <<endl<< - tr ( "Organizational Unit(OU)\t" ) << - cert.subjectInfo ( QSslCertificate::OrganizationalUnitName ) - <<endl<<endl<< - - tr ( "Validity:\n" ) << - tr ( "Issued on\t" ) <<cert.effectiveDate().toString() <<endl<< - tr ( "expires on\t" ) <<cert.expiryDate().toString() <<endl<<endl<< - tr ( "Fingerprints:\n" ) << - tr ( "SHA1\t" ) << - getHexVal ( cert.digest ( QCryptographicHash::Sha1 ) ) <<endl<< - tr ( "MD5\t" ) <<md5; + "------------\n"<< + tr ( "Issued to:\n" ) << + tr ( "Common Name(CN)\t" ) << + cert.issuerInfo ( QSslCertificate::CommonName ) + <<endl<< + tr ( "Organization(O)\t" ) << + cert.issuerInfo ( QSslCertificate::Organization ) + <<endl<< + tr ( "Organizational Unit(OU)\t" ) << + cert.issuerInfo ( QSslCertificate::OrganizationalUnitName ) + <<endl<< + tr ( "Serial Number\t" ) <<getHexVal ( cert.serialNumber() ) + <<endl<<endl<< + tr ( "Issued by:\n" ) << + tr ( "Common Name(CN)\t" ) << + cert.subjectInfo ( QSslCertificate::CommonName ) + <<endl<< + tr ( "Organization(O)\t" ) << + cert.subjectInfo ( QSslCertificate::Organization ) + <<endl<< + tr ( "Organizational Unit(OU)\t" ) << + cert.subjectInfo ( QSslCertificate::OrganizationalUnitName ) + <<endl<<endl<< + + tr ( "Validity:\n" ) << + tr ( "Issued on\t" ) <<cert.effectiveDate().toString() <<endl<< + tr ( "expires on\t" ) <<cert.expiryDate().toString() <<endl<<endl<< + tr ( "Fingerprints:\n" ) << + tr ( "SHA1\t" ) << + getHexVal ( cert.digest ( QCryptographicHash::Sha1 ) ) <<endl<< + tr ( "MD5\t" ) <<md5; @@ -518,7 +311,7 @@ void HttpBrokerClient::slotSslErrors ( const QList<QSslError> & errors ) fl.close(); http->ignoreSslErrors(); x2goDebug<<"store certificate in "<<homeDir+"/ssl/exceptions/"+ - lurl.host() +"/"+fname; + lurl.host() +"/"+fname; requestTime.restart(); } else @@ -529,7 +322,7 @@ void HttpBrokerClient::slotSslErrors ( const QList<QSslError> & errors ) QString HttpBrokerClient::getHexVal ( const QByteArray& ba ) { QStringList val; - for ( int i=0;i<ba.size();++i ) + for ( int i=0; i<ba.size(); ++i ) { QString bt; bt.sprintf ( "%02X", ( unsigned char ) ba[i] ); @@ -537,22 +330,3 @@ QString HttpBrokerClient::getHexVal ( const QByteArray& ba ) } return val.join ( ":" ); } - - -void HttpBrokerClient::slotGetConnectionCmd() -{ - QString req; - QTextStream ( &req ) << - "mode=getcmd&"<< - "user="<<config->user<<"&"<< - "connectionts="<<config->connectionts<<"&"<< - "cookie="<<config->cookie; - - QUrl lurl ( config->brokerurl ); - httpCmdAnswer.close(); - httpCmdAnswer.setData ( 0,0 ); - - cmdRequest=http->post ( lurl.path(), - req.toUtf8(),&httpCmdAnswer ); -// x2goDebug<<"requested brocker cmd :"<<cmdRequest; -} diff --git a/httpbrokerclient.h b/httpbrokerclient.h index 02d519c..e7b3b57 100644 --- a/httpbrokerclient.h +++ b/httpbrokerclient.h @@ -29,44 +29,37 @@ class HttpBrokerClient: public QObject public: HttpBrokerClient ( ONMainWindow* wnd, ConfigFile* cfg ); ~HttpBrokerClient(); - QString getSInfoFromBroker ( bool getKey=false ); void selectUserSession(const QString& session ); void changePassword(QString newPass); void testConnection(); private: - QBuffer httpSIAnswer; QBuffer httpCmdAnswer; QBuffer httpSessionAnswer; QHttp* http; - int sinfoRequest; - int sinfoKeyRequest; int sessionsRequest; int selSessRequest; - int cmdRequest; int chPassRequest; int testConRequest; QString newBrokerPass; ConfigFile* config; ONMainWindow* mainWindow; void createIniFile(const QString& content); + void parseSession(QString sInfo); QTime requestTime; private slots: void slotRequestFinished ( int id, bool error ); void slotSslErrors ( const QList<QSslError> & errors ) ; QString getHexVal ( const QByteArray& ba ); - void slotGetConnectionCmd(); public slots: void getUserSessions(); signals: void haveSshKey ( QString ); void fatalHttpError(); - void haveAgentInfo (); - void cmdReconnect (); void authFailed(); void sessionsLoaded(); - void getSession( QString ); + void sessionSelected( ); void passwordChanged( QString ); void connectionTime(int, int); }; diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 1ffd02c..2825e38 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -432,17 +432,11 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) if (brokerMode) { broker=new HttpBrokerClient ( this, &config ); - connect ( broker,SIGNAL ( haveSshKey ( QString ) ),this, - SLOT ( slotStartSshAgent ( QString ) ) ); - connect ( broker,SIGNAL ( haveAgentInfo () ),this, - SLOT ( slotStartNewBrokerSession () ) ); connect ( broker,SIGNAL ( fatalHttpError() ),this, SLOT ( close() ) ); - connect ( broker,SIGNAL ( cmdReconnect() ),this, - SLOT ( slotReconnectSession() ) ); connect ( broker, SIGNAL ( authFailed()), this ,SLOT ( slotGetBrokerAuth())); connect ( broker, SIGNAL( sessionsLoaded()), this, SLOT (slotReadSessions())); - connect ( broker, SIGNAL ( getSession(QString)), this, SLOT (slotGetBrokerSession(QString))); + connect ( broker, SIGNAL ( sessionSelected()), this, SLOT (slotGetBrokerSession())); connect ( broker, SIGNAL ( passwordChanged(QString)), this, SLOT ( slotPassChanged(QString))); } @@ -975,6 +969,13 @@ void ONMainWindow::slotGetBrokerAuth() nameLabel->setText ( text ); slotShowPassForm(); config.brokerAuthenticated=false; + if(config.brokerUser.length()>=0) + { + login->setText(config.brokerUser); + pass->setFocus(); + } + if(config.brokerNoAuth) + slotSessEnter(); } @@ -2552,6 +2553,7 @@ void ONMainWindow::slotSelectedFromList ( SessionButton* session ) QString userName; bool autologin=false; bool krblogin=false; + bool usebrokerpass=false; QString sessIcon; QPalette pal; QString sessionName; @@ -2563,50 +2565,56 @@ void ONMainWindow::slotSelectedFromList ( SessionButton* session ) sessionName=session->name(); QString sid=session->id(); + X2goSettings* st; if (brokerMode) { - broker->selectUserSession(session->id()); - setStatStatus ( tr ( "Connecting to broker" ) ); - stInfo->insertPlainText ( "broker url: "+config.brokerurl ); - setEnabled ( false ); - uname->hide(); - u->hide(); - return; + st=new X2goSettings( config.iniFile, QSettings::IniFormat ); + } + else + { + st = new X2goSettings( "sessions" ); } - X2goSettings st ( "sessions" ); - sessIcon=st.setting()->value ( + + sessIcon=st->setting()->value ( sid+"/icon", ( QVariant ) ":icons/128x128/x2gosession.png" ).toString(); - command=st.setting()->value ( + command=st->setting()->value ( sid+"/command", ( QVariant ) tr ( "KDE" ) ).toString(); - server=st.setting()->value ( sid+"/host", - ( QVariant ) QString::null - ).toString(); - userName=st.setting()->value ( + server=st->setting()->value ( sid+"/host", + ( QVariant ) QString::null + ).toString(); + userName=st->setting()->value ( sid+"/user", ( QVariant ) QString::null ).toString(); if (defaultUser && userName.length()<1) userName=defaultUserName; - sshPort=st.setting()->value ( + if(brokerMode) + usebrokerpass=st->setting()->value ( + sid+"/usebrokerpass", + false ).toBool(); + + + sshPort=st->setting()->value ( sid+"/sshport", ( QVariant ) defaultSshPort ).toString(); - currentKey=st.setting()->value ( + currentKey=st->setting()->value ( sid+"/key", ( QVariant ) QString::null ).toString(); - autologin=st.setting()->value ( + autologin=st->setting()->value ( sid+"/autologin", ( QVariant ) false ).toBool(); - krblogin=st.setting()->value ( + krblogin=st->setting()->value ( sid+"/krblogin", ( QVariant ) false ).toBool(); + delete st; #ifdef Q_OS_WIN if ( portable && u3Device.length() >0 ) @@ -2625,6 +2633,7 @@ void ONMainWindow::slotSelectedFromList ( SessionButton* session ) sessionName=config.session; currentKey=config.key; } + selectedCommand=command; command=transAppName ( command ); login->setText ( userName ); @@ -2646,6 +2655,11 @@ void ONMainWindow::slotSelectedFromList ( SessionButton* session ) fotoLabel->setFixedSize ( 48,48 ); } + if(currentKey.length()<=0) + { + currentKey=findSshKeyForServer(userName, server, sshPort); + } + if ( command=="RDP" ) { @@ -2673,6 +2687,12 @@ void ONMainWindow::slotSelectedFromList ( SessionButton* session ) /////////////////////////////////////////////////// + if(brokerMode &&usebrokerpass) + { + pass->setText(config.brokerPass); + slotSessEnter(); + } + if ( currentKey.length() >0 ) { nopass=true; @@ -2682,7 +2702,7 @@ void ONMainWindow::slotSelectedFromList ( SessionButton* session ) x2goDebug<<"Have key, starting session"<<endl; slotSessEnter(); } - if ( cardReady || autologin || krblogin ) + if ( cardReady || autologin || krblogin ) { nopass=true; if ( cardReady ) @@ -2738,10 +2758,6 @@ SshMasterConnection* ONMainWindow::startSshConnection ( QString host, QString po /////key/sshagent/env/ passForm->setEnabled ( false ); - if(cmdSshKey.length()>0) - { - currentKey=cmdSshKey; - } if(cmdAutologin) { autologin=true; @@ -2779,7 +2795,6 @@ void ONMainWindow::slotSshConnectionError ( QString message, QString lastSession QMessageBox::critical ( 0l,message,lastSessionError, QMessageBox::Ok, QMessageBox::NoButton ); -// currentKey=QString::null; setEnabled ( true ); passForm->setEnabled ( true ); slotShowPassForm(); @@ -2955,7 +2970,6 @@ void ONMainWindow::slotSshUserAuthError ( QString error ) QMessageBox::critical ( 0l,tr ( "Authentication failed" ),error, QMessageBox::Ok, QMessageBox::NoButton ); -// currentKey=QString::null; setEnabled ( true ); passForm->setEnabled ( true ); slotShowPassForm(); @@ -2993,11 +3007,25 @@ void ONMainWindow::slotSessEnter() } } + + resumingSession.sessionId=QString::null; resumingSession.server=QString::null; resumingSession.display=QString::null; setStatStatus ( tr ( "connecting" ) ); + if(brokerMode) + { + broker->selectUserSession(lastSession->id()); + config.session=lastSession->id(); + setStatStatus ( tr ( "Connecting to broker" ) ); + stInfo->insertPlainText ( "broker url: "+config.brokerurl ); + setEnabled ( false ); + uname->hide(); + u->hide(); + return; + } + QString sid=""; if ( !embedMode ) sid=lastSession->id(); @@ -3124,6 +3152,38 @@ void ONMainWindow::startDirectRDP() #endif +QString ONMainWindow::findSshKeyForServer(QString user, QString server, QString port) +{ + foreach (sshKey key, cmdSshKeys) + { + if(key.server == server && key.user == user && key.port == port) + return key.key; + } + foreach (sshKey key, cmdSshKeys) + { + if(key.server == server && key.user == user && key.port.length()<=0) + return key.key; + } + + foreach (sshKey key, cmdSshKeys) + { + if(key.server == server && key.user.length()<=0 && key.port==port) + return key.key; + } + + foreach (sshKey key, cmdSshKeys) + { + if(key.server == server && key.user.length()<=0 && key.port.length()<=0) + return key.key; + } + + foreach (sshKey key, cmdSshKeys) + { + if(key.server.length()<=0 && key.user.length()<=0 && key.port.length()<=0) + return key.key; + } + return QString::null; +} bool ONMainWindow::startSession ( const QString& sid ) @@ -3159,65 +3219,51 @@ bool ONMainWindow::startSession ( const QString& sid ) return true; } - if ( !embedMode && !brokerMode ) - { + X2goSettings* st; + if(!brokerMode) + st=new X2goSettings( "sessions" ); + else + st=new X2goSettings(config.iniFile, QSettings::IniFormat); - X2goSettings st ( "sessions" ); + passForm->setEnabled ( false ); + host=st->setting()->value ( sid+"/host", + ( QVariant ) QString::null ).toString(); + if(brokerMode) + { + sshPort=config.sshport; + x2goDebug<<"server: "<<host; + } - passForm->setEnabled ( false ); - host=st.setting()->value ( sid+"/host", - ( QVariant ) QString::null ).toString(); - QString cmd=st.setting()->value ( sid+"/command", - ( QVariant ) QString::null ).toString(); - autologin=st.setting()->value ( sid+"/autologin", - ( QVariant ) false ).toBool(); - krblogin=st.setting()->value ( sid+"/krblogin", - ( QVariant ) false ).toBool(); + QString cmd=st->setting()->value ( sid+"/command", + ( QVariant ) QString::null ).toString(); + autologin=st->setting()->value ( sid+"/autologin", + ( QVariant ) false ).toBool(); + krblogin=st->setting()->value ( sid+"/krblogin", + ( QVariant ) false ).toBool(); #ifdef Q_OS_LINUX - directRDP=st.setting()->value ( sid+"/directrdp", - ( QVariant ) false ).toBool(); - if (cmd =="RDP" && directRDP) - { - startDirectRDP(); - return true; - } -#endif - if ( cmd=="SHADOW" ) - shadowSession=true; - } - else + directRDP=st->setting()->value ( sid+"/directrdp", + ( QVariant ) false ).toBool(); + if (cmd =="RDP" && directRDP) { - host=config.server; - sshPort=config.sshport; - selectedCommand=config.command; + startDirectRDP(); + return true; } - if (!brokerMode) - passwd=getCurrentPass(); - else +#endif + if ( cmd=="SHADOW" ) + shadowSession=true; + passwd=getCurrentPass(); + if(brokerMode) { currentKey=config.key; - host=config.server; - X2goSettings st ( config.iniFile, QSettings::IniFormat ); - passForm->setEnabled ( false ); - user=st.setting()->value ( sid+"/user", - ( QVariant ) QString::null ).toString(); - login->setText(user); sshPort=config.sshport; - /* sshPort=st.setting()->value ( sid+"/sshport", - ( QVariant ) "22" ).toString();*/ } if (sshConnection) sshConnection->disconnectSession(); - - X2goSettings* st; - if(!brokerMode) - st=new X2goSettings( "sessions" ); - else - st=new X2goSettings(config.iniFile, QSettings::IniFormat); - - - + if(currentKey.length()<=0) + { + currentKey=findSshKeyForServer(user, host, sshPort); + } useproxy=(st->setting()->value ( sid+"/usesshproxy", @@ -3277,6 +3323,11 @@ bool ONMainWindow::startSession ( const QString& sid ) false ).toBool() ); + if(proxyKey.length()<=0 && proxyType==SshMasterConnection::PROXYSSH) + { + proxyKey=findSshKeyForServer(proxylogin, proxyserver, QString::number(proxyport)); + } + if(proxySameUser) proxylogin=user; if(proxySamePass) @@ -3287,12 +3338,18 @@ bool ONMainWindow::startSession ( const QString& sid ) { bool ok; proxypassword=QInputDialog::getText(0,proxylogin+"@"+proxyserver+":"+QString::number(proxyport), - tr("Enter passwort for SSH proxy"),QLineEdit::Password,QString::null, &ok); + tr("Enter password for SSH proxy"),QLineEdit::Password,QString::null, &ok); } } delete st; + if(brokerMode) + { + host=config.serverIp; + } + + sshConnection=startSshConnection ( host,sshPort,acceptRsa,user,passwd,autologin, krblogin, false, useproxy,proxyType,proxyserver, proxyport, proxylogin, proxypassword, proxyKey,proxyAutologin); return true; @@ -6153,6 +6210,11 @@ bool ONMainWindow::parseParameter ( QString param ) return true; } + if ( param == "--broker-noauth") + { + config.brokerNoAuth=true; + return true; + } QString setting,value; @@ -6277,9 +6339,42 @@ bool ONMainWindow::parseParameter ( QString param ) config.brokerurl=value; return true; } + if ( setting == "--broker-user") + { + config.brokerUser=value; + return true; + } if ( setting == "--ssh-key") { - cmdSshKey=value; + sshKey key; + QStringList parts=value.split(":"); + QString authPart; + switch(parts.length()) + { + case 1: + key.key=parts[0]; + break; + case 2: + key.key=parts[1]; + authPart=parts[0]; + break; + case 3: + authPart=parts[0]; + key.key=parts[2]; + key.port=parts[1]; + break; + } + if(authPart.length()>0) + { + if(authPart.indexOf("@")!=-1) + { + key.user=authPart.split("@")[0]; + key.server=authPart.split("@")[1]; + } + else + key.server=authPart; + } + cmdSshKeys<<key; return true; } if ( setting == "--broker-name") @@ -6670,7 +6765,6 @@ void ONMainWindow::slotGetServers ( bool result, QString output, QMessageBox::critical ( 0l,tr ( "Error" ),message, QMessageBox::Ok, QMessageBox::NoButton ); -// currentKey=QString::null; setEnabled ( true ); passForm->setEnabled ( true ); pass->setFocus(); @@ -8234,7 +8328,6 @@ void ONMainWindow::slotCmdMessage ( bool result,QString output, QMessageBox::critical ( 0l,tr ( "Error" ),message, QMessageBox::Ok, QMessageBox::NoButton ); -// currentKey=QString::null; setEnabled ( true ); passForm->setEnabled ( true ); pass->setFocus(); @@ -10805,7 +10898,6 @@ void ONMainWindow::slotReconnectSession() slotSelectedFromList ( ( SessionButton* ) 0 ); else { - broker->getSInfoFromBroker(); setEnabled ( false ); } } @@ -10832,28 +10924,9 @@ void ONMainWindow::slotStartBroker() broker->getUserSessions(); } -void ONMainWindow::slotGetBrokerSession(const QString& sinfo) -{ - //x2goDebug<<"broker session: "<<sinfo; - QStringList lst=sinfo.split("SERVER:",QString::SkipEmptyParts); - int keyStartPos=sinfo.indexOf("-----BEGIN DSA PRIVATE KEY-----"); - QString endStr="-----END DSA PRIVATE KEY-----"; - int keyEndPos=sinfo.indexOf(endStr); - if (! (keyEndPos == -1 || keyStartPos == -1 || lst.size()==0)) - config.key=sinfo.mid(keyStartPos, keyEndPos+endStr.length()-keyStartPos); - QString serverLine=(lst[1].split("\n"))[0]; - QStringList words=serverLine.split(":",QString::SkipEmptyParts); - config.server=words[0]; - if (words.count()>1) - config.sshport=words[1]; -// x2goDebug<<"server: "<<config.server<<endl<<" key: "<<config.key; - if (sinfo.indexOf("SESSION_INFO")!=-1) - { - QStringList lst=sinfo.split("SESSION_INFO:",QString::SkipEmptyParts); - config.sessiondata=(lst[1].split("\n"))[0]; -// x2goDebug<<"data: "<<config.sessiondata; - } - slotSessEnter(); +void ONMainWindow::slotGetBrokerSession() +{ + startSession ( config.session); } void ONMainWindow::slotStartNewBrokerSession ( ) diff --git a/onmainwindow.h b/onmainwindow.h index de15136..831599a 100644 --- a/onmainwindow.h +++ b/onmainwindow.h @@ -166,8 +166,10 @@ struct ConfigFile QString brokerUserId; QString brokerName; bool brokerAuthenticated; + bool brokerNoAuth; QString iniFile; QString server; + QString serverIp;//Can be different from server (use for loadballancing) QString sshport; QString command; QString key; @@ -214,6 +216,15 @@ struct ConfigFile }; +struct sshKey +{ + QString server; + QString port; + QString user; + QString key; +}; + + //wrapper to send mouse events under windows in embedded mode #ifdef Q_OS_WIN class WWrapper : public QPushButton @@ -510,7 +521,6 @@ private: QString statusString; QString autostartApp; bool cmdAutologin; - QString cmdSshKey; int defaultLink; int defaultQuality; int defaultWidth; @@ -549,6 +559,7 @@ private: int retSessions; QList<serv> x2goServers; QList<Application> applications; + QList<sshKey> cmdSshKeys; QPushButton* bSusp; QPushButton* bTerm; @@ -800,6 +811,7 @@ private: bool trayMaxDiscon; bool trayAutoHidden; + QString findSshKeyForServer(QString user, QString server, QString port); void installTranslator(); void loadSettings(); void showPass ( UserButton* user ); @@ -925,7 +937,7 @@ private slots: void slotTermSess(); void slotNewSess(); void slotGetBrokerAuth(); - void slotGetBrokerSession(const QString& sinfo); + void slotGetBrokerSession(); void slotCmdMessage ( bool result,QString output, SshProcess* ); void slotListSessions ( bool result,QString output, hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).

1 0

pyhoca-gui.git - master (branch) updated: 0.2.0.4-23-g2f79725
by git-admin＠x2go.org 27 Sep '12

27 Sep '12

The branch, master has been updated via 2f797259c147c7d5546f1024bdf39e356236cf29 (commit) from e61da26a3952164d7fced46dbaf9d8b71e3b030c (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 2f797259c147c7d5546f1024bdf39e356236cf29 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 27 16:51:44 2012 +0200 changelog cleanup ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index cab0f8b..85c302f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,10 +20,10 @@ pyhoca-gui (0.2.0.5-0~x2go1) UNRELEASED; urgency=low - Configure SSH proxy port in a separate session profile option (sshproxyport). - Make sure that SSH proxy port migration works flawlessly. * /debian/control: + + Maintainer change in package: X2Go Developers <x2go-dev(a)lists.berlios.de>. + Add Oleksandr Shneyder to Uploaders. + Depend on python-x2go (>=0.2.0.11-0~). + Reduce python version in Build-Depends to allow build against Ubuntu 10.04. - * Maintainer change in package: X2Go Developers <x2go-dev(a)lists.berlios.de>. * /debian/rules: + Allow package build on systems with missing dh_python2. hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

pyhoca-cli.git - master (branch) updated: 0.2.0.4-5-g49aa9fe
by git-admin＠x2go.org 27 Sep '12

27 Sep '12

The branch, master has been updated via 49aa9fef7e76a274a62bdbc801244ba875565532 (commit) from 84999ab5f157d234b1854aa8b7f3ca13bdbcd9cb (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 49aa9fef7e76a274a62bdbc801244ba875565532 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 27 16:53:15 2012 +0200 /debian/rules: Allow package build on systems with missing dh_python2. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ debian/rules | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 089eb78..eea9c9e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ pyhoca-cli (0.2.0.5-0~x2go1) UNRELEASED; urgency=low * /debian/control: + Maintainer change in package: X2Go Developers <x2go-dev(a)lists.berlios.de>. + Reduce python version in Build-Depends to allow build on Ubuntu 10.04. + * /debian/rules: + + Allow package build on systems with missing dh_python2. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 17 Aug 2012 16:38:54 +0200 diff --git a/debian/rules b/debian/rules index 8f217cb..c8ce66b 100755 --- a/debian/rules +++ b/debian/rules @@ -3,10 +3,10 @@ # Based on sample debian/rules file - for GNU Hello (1.3). # Copyright 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -PYVERS=$(shell pyversions -vr) +WITH_PYTHON2 = $(shell test -f /usr/bin/dh_python2 && echo "--with python2") %: - dh ${@} --with python2 + dh ${@} ${WITH_PYTHON2} override_dh_auto_clean: rm -Rf PyHoca_CLI.egg-info/ hooks/post-receive -- pyhoca-cli.git (Python X2Go Client (command line client)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-cli.git" (Python X2Go Client (command line client)).

1 0

pyhoca-gui.git - master (branch) updated: 0.2.0.4-22-ge61da26
by git-admin＠x2go.org 27 Sep '12

27 Sep '12

The branch, master has been updated via e61da26a3952164d7fced46dbaf9d8b71e3b030c (commit) from 684548520c09ff14d81f3be22f32676d5b3e7f29 (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 e61da26a3952164d7fced46dbaf9d8b71e3b030c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 27 16:51:21 2012 +0200 Allow package build on systems with missing dh_python2. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ debian/rules | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index d325e05..cab0f8b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,8 @@ pyhoca-gui (0.2.0.5-0~x2go1) UNRELEASED; urgency=low + Depend on python-x2go (>=0.2.0.11-0~). + Reduce python version in Build-Depends to allow build against Ubuntu 10.04. * Maintainer change in package: X2Go Developers <x2go-dev(a)lists.berlios.de>. + * /debian/rules: + + Allow package build on systems with missing dh_python2. [ Oleksandr Shneyder ] * New upstream version (0.2.0.5): diff --git a/debian/rules b/debian/rules index 3dca7bc..4e0c6f5 100755 --- a/debian/rules +++ b/debian/rules @@ -3,8 +3,10 @@ # Based on sample debian/rules file - for GNU Hello (1.3). # Copyright 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +WITH_PYTHON2 = $(shell test -f /usr/bin/dh_python2 && echo "--with python2") + %: - dh ${@} --with python2 + dh ${@} ${WITH_PYTHON2} override_dh_auto_build: cp po/PyHoca-GUI.pot po/PyHoca-GUI.pot.bak hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

python-x2go.git - master (branch) updated: 0.2.0.10-8-gfeac4d0
by git-admin＠x2go.org 27 Sep '12

27 Sep '12

The branch, master has been updated via feac4d0816d71ffe3fb3bf46c5dd0b9b919917ea (commit) from b08887f153ce00d3501b0992ba4e37a332d8af72 (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 feac4d0816d71ffe3fb3bf46c5dd0b9b919917ea Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 27 16:40:07 2012 +0200 /debian/rules: Allow package build on systems with missing dh_python2. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ debian/rules | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 8e2d929..dd87a28 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ python-x2go (0.2.0.11-0~x2go1) UNRELEASED; urgency=low - Prepare for staying compatible with new SSH proxy feature in X2Go Client. - Add sshproxy_port option to session (SSH proxy) options. + * /debian/rules: + + Allow package build on systems with missing dh_python2. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 26 Sep 2012 20:49:44 +0200 diff --git a/debian/rules b/debian/rules index d0a0f1d..214d87b 100755 --- a/debian/rules +++ b/debian/rules @@ -3,8 +3,10 @@ # Based on sample debian/rules file - for GNU Hello (1.3). # Copyright 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +WITH_PYTHON2 = $(shell test -f /usr/bin/dh_python2 && echo "--with python2") + %: - dh ${@} --with python2 + dh ${@} ${WITH_PYTHON2} override_dh_auto_build: mkdir -p .epydoc/html hooks/post-receive -- python-x2go.git (Python X2Go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2Go Client API).

1 0

python-x2go.git - master (branch) updated: 0.2.0.10-7-gb08887f
by git-admin＠x2go.org 27 Sep '12

27 Sep '12

The branch, master has been updated via b08887f153ce00d3501b0992ba4e37a332d8af72 (commit) from 80bec3b0f51d6abcfee150bf932701dfdd368586 (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 b08887f153ce00d3501b0992ba4e37a332d8af72 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 27 10:18:32 2012 +0200 Add sshproxy_port option to session (SSH proxy) options. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/backends/control/_stdout.py | 8 +++++--- x2go/session.py | 2 +- x2go/utils.py | 1 + 4 files changed, 8 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index d783dfb..8e2d929 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ python-x2go (0.2.0.11-0~x2go1) UNRELEASED; urgency=low * New upstream version (0.2.0.11): - Prepare for staying compatible with new SSH proxy feature in X2Go Client. + - Add sshproxy_port option to session (SSH proxy) options. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 26 Sep 2012 20:49:44 +0200 diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index 108d6ef..18458bd 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -605,7 +605,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): return checkhosts.check_ssh_host_key(self, hostname, port=port) def connect(self, hostname, port=22, username='', password='', pkey=None, - use_sshproxy=False, sshproxy_host='', sshproxy_user='', sshproxy_password='', + use_sshproxy=False, sshproxy_host='', sshproxy_port=22, sshproxy_user='', sshproxy_password='', sshproxy_key_filename='', sshproxy_tunnel='', key_filename=None, timeout=None, allow_agent=False, look_for_keys=False, session_instance=None, @@ -667,9 +667,10 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): @type session_instance: C{obj} @param use_sshproxy: connect through an SSH proxy @type use_sshproxy: C{True} if an SSH proxy is to be used for tunneling the connection - @param sshproxy_host: hostname of the SSH proxy server, use <hostname>:<port> to name a - non-standard SSH port + @param sshproxy_host: hostname of the SSH proxy server @type sshproxy_host: C{str} + @param sshproxy_port: port of the SSH proxy server + @type sshproxy_port: C{int} @param sshproxy_user: username that we use for authenticating against C{<sshproxy_host>} @type sshproxy_user: C{str} @param sshproxy_password: a password to use for SSH proxy authentication or for unlocking @@ -698,6 +699,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): try: self.sshproxy_session = sshproxy.X2goSSHProxy(known_hosts=self.known_hosts, sshproxy_host=sshproxy_host, + sshproxy_port=sshproxy_port, sshproxy_user=sshproxy_user, sshproxy_password=sshproxy_password, sshproxy_key_filename=sshproxy_key_filename, diff --git a/x2go/session.py b/x2go/session.py index c04a391..8609cbe 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -111,7 +111,7 @@ _X2GO_TERMINAL_PARAMS = ('geometry', 'depth', 'link', 'pack', 'dpi', 'profiles_backend', 'settings_backend', 'printing_backend', ) """A list of allowed X2Go terminal session parameters.""" -_X2GO_SSHPROXY_PARAMS = ('sshproxy_host', 'sshproxy_user', 'sshproxy_password', +_X2GO_SSHPROXY_PARAMS = ('sshproxy_host', 'sshproxy_port', 'sshproxy_user', 'sshproxy_password', 'sshproxy_key_filename', 'sshproxy_pkey', 'sshproxy_tunnel', ) """A list of allowed X2Go SSH proxy parameters.""" diff --git a/x2go/utils.py b/x2go/utils.py index 189e875..4e8d468 100644 --- a/x2go/utils.py +++ b/x2go/utils.py @@ -323,6 +323,7 @@ def _convert_SessionProfileOptions_2_SessionParams(options): 'sshproxytype', 'sshproxysameuser', 'sshproxysamepass', + 'sshproxyautologin', ] for i in _ignored_options: del _params[i] hooks/post-receive -- python-x2go.git (Python X2Go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2Go Client API).

1 0

pyhoca-gui.git - master (branch) updated: 0.2.0.4-21-g6845485
by git-admin＠x2go.org 27 Sep '12

27 Sep '12

The branch, master has been updated via 684548520c09ff14d81f3be22f32676d5b3e7f29 (commit) from d2ed0cc4ebcfc26835533fa4d9009692b08f2a2d (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 684548520c09ff14d81f3be22f32676d5b3e7f29 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Sep 27 09:16:56 2012 +0200 Make sure that SSH proxy port migration works flawlessly. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + pyhoca/wxgui/profilemanager.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4dbda61..d325e05 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,7 @@ pyhoca-gui (0.2.0.5-0~x2go1) UNRELEASED; urgency=low - Do not offer DirectRDP sessions in profile manager while connected to a real X2Go server via SSH. - Configure SSH proxy port in a separate session profile option (sshproxyport). + - Make sure that SSH proxy port migration works flawlessly. * /debian/control: + Add Oleksandr Shneyder to Uploaders. + Depend on python-x2go (>=0.2.0.11-0~). diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index 95566cc..0b52f4a 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -836,11 +836,11 @@ class PyHocaGUI_ProfileManager(wx.Dialog): _ssh_proxy = self.profile_config['usesshproxy'] _ssh_proxy_host = self.profile_config['sshproxyhost'] _ssh_proxy_port = 22 + if self.profile_config['sshproxyport']: + _ssh_proxy_port = int(self.profile_config['sshproxyport']) if ":" in _ssh_proxy_host: _ssh_proxy_port = _ssh_proxy_host.split(":")[1] _ssh_proxy_host = _ssh_proxy_host.split(":")[0] - if self.profile_config['sshproxyport']: - _ssh_proxy_port = int(self.profile_config['sshproxyport']) self.SSHProxyHost.SetValue("%s:%s" % (_ssh_proxy_host, _ssh_proxy_port)) self.SSHProxyUser.SetValue(self.profile_config['sshproxyuser']) self.SSHProxyKeyFile.SetValue(self.profile_config['sshproxykeyfile']) hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits