x2go-commits May 2012

x2go-commits@lists.x2go.org

1 participants
85 discussions

python-x2go.git - master (branch) updated: 0.1.1.4-252-g144f7a4
by git-admin＠x2go.org 28 May '12

28 May '12

The branch, master has been updated via 144f7a489ea5aefcb13aca8a619438f329da3a66 (commit) from 3799cc549bc8120a72abe73b2fcdfd6971f0c73c (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 144f7a489ea5aefcb13aca8a619438f329da3a66 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon May 28 16:31:33 2012 +0200 __doc__ string fixes for terminal backend ----------------------------------------------------------------------- Summary of changes: x2go/backends/terminal/_stdout.py | 58 ++++++++++++++++++------------------ 1 files changed, 29 insertions(+), 29 deletions(-) The diff of changes is: diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index 60e1b92..ce80d32 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -208,35 +208,35 @@ class X2goTerminalSessionSTDOUT(object): @param geometry: screen geometry of the X2Go session. Can be either C{<width>x<height>} or C{fullscreen} - @type geometry: str + @type geometry: C{str} @param depth: color depth in bits (common values: C{16}, C{24}) - @type depth: int + @type depth: C{int} @param link: network link quality (either one of C{modem}, C{isdn}, C{adsl}, C{wan} or C{lan}) - @type link: str + @type link: C{str} @param pack: compression method for NX based session proxying - @type pack: str + @type pack: C{str} @param dpi: dots-per-inch value for the session screen (has an impact on the font size on screen) - @type dpi: str + @type dpi: C{str} @param cache_type: a dummy parameter that is passed to the L{X2goProxyBASE}. In NX Proxy (class C{X2goProxyNX3}) this originally is the session name. With X2Go it defines the name of the NX cache directory. Best is to leave it untouched. - @type cache_type: str + @type cache_type: C{str} @param kbtype: keyboard type, e.g. C{pc105/us} (default), C{pc105/de}, ... - @type kbtype: str + @type kbtype: C{str} @param kblayout: keyboard layout, e.g. C{us} (default), C{de}, C{fr}, ... - @type kblayout: str + @type kblayout: C{str} @param kbvariant: keyboard variant, e.g. C{nodeadkeys} (for C{de} layout), C{intl} (for C{us} layout), etc. - @type kbvariant: str + @type kbvariant: C{str} @param session_type: either C{desktop}, C{application} (rootless session) or C{shared} - @type session_type: str + @type session_type: C{str} @param snd_system: sound system to be used on server (C{none}, C{pulse} (default), C{arts} (obsolete) or C{esd}) - @type snd_system: str + @type snd_system: C{str} @param cmd: command to be run on X2Go server after session start (only used when L{X2goTerminalSessionSTDOUT.start()} is called, ignored on resume, suspend etc. - @type cmd: str + @type cmd: C{str} @param rootdir: X2Go session directory, normally C{~/.x2go} - @type rootdir: str + @type rootdir: C{str} @param info_backend: backend for handling storage of server session information @type info_backend: C{X2goServerSessionInfo*} instance @param list_backend: backend for handling storage of session list information @@ -245,7 +245,7 @@ class X2goTerminalSessionSTDOUT(object): @type proxy_backend: C{X2goProxy*} instance @param print_action: either a print action short name (PDFVIEW, PDFSAVE, PRINT, PRINTCMD) or the resp. C{X2goPrintActionXXX} class (where XXX equals one of the given short names) - @type print_action: str or class + @type print_action: C{str} or C{class} @param print_action_args: optional arguments for a given print_action (for further info refer to L{X2goPrintActionPDFVIEW}, L{X2goPrintActionPDFSAVE}, L{X2goPrintActionPRINT} and L{X2goPrintActionPRINTCMD}) @type print_action_args: dict @@ -257,7 +257,7 @@ class X2goTerminalSessionSTDOUT(object): @type logger: L{X2goLogger} instance @param loglevel: if no L{X2goLogger} object has been supplied a new one will be constructed with the given loglevel - @type loglevel: int + @type loglevel: C{int} """ self.proxy = None @@ -658,13 +658,13 @@ class X2goTerminalSessionSTDOUT(object): @param local_path: the full path to an existing folder on the local file system - @type local_path: str + @type local_path: C{str} @param folder_type: one of 'disk' (a folder on your local hard drive), 'rm' (removeable device), 'cdrom' (CD/DVD Rom) or 'spool' (for X2Go print spooling) - @type folder_type: str + @type folder_type: C{str} @return: returns C{True} if the local folder has been successfully mounted within the X2Go server session - @rtype: bool + @rtype: C{bool} """ if not self.control_session.is_sshfs_available(): @@ -776,7 +776,7 @@ class X2goTerminalSessionSTDOUT(object): Unshare all local folders mount in the X2Go session. @return: returns C{True} if all local folders could be successfully unmounted from the X2Go server session - @rtype: bool + @rtype: C{bool} """ self.logger('unsharing all local folders from session %s' % self.session_info, log.loglevel_INFO) @@ -799,7 +799,7 @@ class X2goTerminalSessionSTDOUT(object): Unshare local folder given as <local_path> from X2Go session. @return: returns C{True} if the local folder <local_path> could be successfully unmounted from the X2Go server session - @rtype: bool + @rtype: C{bool} """ self.logger('unsharing local folder from session %s' % self.session_info, log.loglevel_INFO) @@ -978,11 +978,11 @@ class X2goTerminalSessionSTDOUT(object): within the current X2Go session. @param cmd: Command to be run - @type cmd: str + @type cmd: C{str} @return: stdout.read() and stderr.read() as returned by the run command on the X2Go server - @rtype: tuple of str + @rtype: C{tuple} of C{str} """ if not self.has_command(_rewrite_cmd(self.params.cmd, params=self.params)): @@ -1132,7 +1132,7 @@ class X2goTerminalSessionSTDOUT(object): C{False} else @return: X2Go session OK? - @rtype: bool + @rtype: C{bool} """ _ok = bool(self.session_info.name and self.proxy.ok()) @@ -1144,7 +1144,7 @@ class X2goTerminalSessionSTDOUT(object): C{False} else. @return: X2Go session running? - @rtype: bool + @rtype: C{bool} """ return self.session_info.is_running() @@ -1155,7 +1155,7 @@ class X2goTerminalSessionSTDOUT(object): C{False} else. @return: X2Go session suspended? - @rtype: bool + @rtype: C{bool} """ return self.session_info.is_suspended() @@ -1166,7 +1166,7 @@ class X2goTerminalSessionSTDOUT(object): connected/authenticated, C{False} else. @return: X2Go session connected? - @rtype: bool + @rtype: C{bool} """ return self.control_session.is_connected() @@ -1270,7 +1270,7 @@ class X2goTerminalSessionSTDOUT(object): that can be passed to the class constructor. @return: True if the session could be successfully resumed - @rtype: bool + @rtype: C{bool} """ setkbd = "0" @@ -1353,7 +1353,7 @@ class X2goTerminalSessionSTDOUT(object): Suspend this X2Go session terminal. @return: True if the session terminal could be successfully suspended - @rtype: bool + @rtype: C{bool} """ self.control_session.suspend(session_name=self.session_info.name) @@ -1369,7 +1369,7 @@ class X2goTerminalSessionSTDOUT(object): Terminate this X2Go session. @return: True if the session terminal could be successfully terminate - @rtype: bool + @rtype: C{bool} """ self.control_session.terminate(session_name=self.session_info.name, destroy_terminals=False) 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.1.1.4-251-g3799cc5
by git-admin＠x2go.org 28 May '12

28 May '12

The branch, master has been updated via 3799cc549bc8120a72abe73b2fcdfd6971f0c73c (commit) from 0294d5b5fdd1174f63271dab28f7149df8d8c891 (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 3799cc549bc8120a72abe73b2fcdfd6971f0c73c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon May 28 16:28:37 2012 +0200 Give functionality to the ,,setdpi'' and the ,,dpi'' session profile parameter (setting the DPI allows font scaling). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2go/backends/terminal/_stdout.py | 10 ++++++++-- x2go/session.py | 2 +- x2go/utils.py | 6 ++++-- 4 files changed, 15 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index fc3d676..4a70238 100644 --- a/debian/changelog +++ b/debian/changelog @@ -138,6 +138,8 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Add support for re-registering sessions after session profile changes. - Add new session profile parameter: ,,variant''. Add support to set the keyboard layout _and_ the keyboard variant from the client-side. + - Give functionality to the ,,setdpi'' and the ,,dpi'' session profile + parameter (setting the DPI allows font scaling). * Depend on python-xlib. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 28 Sep 2012 01:44:21 +0100 diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index 91a7c8c..60e1b92 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -181,8 +181,8 @@ class X2goTerminalSessionSTDOUT(object): """ def __init__(self, control_session, session_info=None, - geometry="800x600", depth=_local_color_depth, link="adsl", pack="16m-jpeg-9", - cache_type="unix-kde", + geometry="800x600", depth=_local_color_depth, link="adsl", pack="16m-jpeg-9", dpi='', + cache_type="unix-kde", kbtype='null/null', kblayout='null', kbvariant='null', session_type="application", snd_system='pulse', snd_port=4713, cmd=None, published_applications=False, @@ -215,6 +215,8 @@ class X2goTerminalSessionSTDOUT(object): @type link: str @param pack: compression method for NX based session proxying @type pack: str + @param dpi: dots-per-inch value for the session screen (has an impact on the font size on screen) + @type dpi: str @param cache_type: a dummy parameter that is passed to the L{X2goProxyBASE}. In NX Proxy (class C{X2goProxyNX3}) this originally is the session name. With X2Go it defines the name of the NX cache directory. Best is to leave it untouched. @@ -285,6 +287,7 @@ class X2goTerminalSessionSTDOUT(object): self.params.geometry = str(geometry) self.params.link = str(link) self.params.pack = str(pack) + self.params.dpi = str(dpi) self.params.cache_type = str(cache_type) self.params.session_type = str(session_type) self.params.kbtype = str(kbtype) @@ -1207,6 +1210,9 @@ class X2goTerminalSessionSTDOUT(object): if self.params.cmd == 'XDMCP' and self.params.xdmcp_server: cmd_line = ['X2GOXDMCP=%s' % self.params.xdmcp_server] + cmd_line + if self.params.dpi: + cmd_line = ['X2GODPI=%s' % self.params.dpi] + cmd_line + (stdin, stdout, stderr) = self.control_session._x2go_exec_command(cmd_line) _stdout = stdout.read() diff --git a/x2go/session.py b/x2go/session.py index 26baeda..17b3aed 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -73,7 +73,7 @@ _X2GO_SESSION_PARAMS = ('use_sshproxy', 'profile_id', 'session_name', ) """A list of allowed X2Go pure session parameters (i.e. parameters that are passed on neither to an X2goControlSession, X2goSSHProxy nor an X2goControlSession object.""" # options of the paramiko.SSHClient().connect() method, any option that is allowed for a terminal session instance -_X2GO_TERMINAL_PARAMS = ('geometry', 'depth', 'link', 'pack', +_X2GO_TERMINAL_PARAMS = ('geometry', 'depth', 'link', 'pack', 'dpi', 'cache_type', 'kbtype', 'kblayout', 'kbvariant', 'session_type', 'snd_system', 'snd_port', 'cmd', 'set_session_title', 'session_title', diff --git a/x2go/utils.py b/x2go/utils.py index 99b4c13..06b6727 100644 --- a/x2go/utils.py +++ b/x2go/utils.py @@ -265,10 +265,12 @@ def _convert_SessionProfileOptions_2_SessionParams(_options): if not _params['kblayout'].strip(): _params['kblayout'] = 'null' if not _params['kbvariant'].strip(): _params['kbvariant'] = 'null' + if not _options['setdpi']: + del _params['dpi'] + del _params['setdpi'] + # currently known but ignored in Python X2go _ignored_options = [ - 'dpi', - 'setdpi', 'startsoundsystem', 'soundtunnel', 'defsndport', 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.1.1.4-250-g0294d5b
by git-admin＠x2go.org 28 May '12

28 May '12

The branch, master has been updated via 0294d5b5fdd1174f63271dab28f7149df8d8c891 (commit) via b4a9e5f4921f5713fb71acf692f1ae73ec843666 (commit) via 86aa11e89f7d667813ddadd61209466c57b843d7 (commit) from 476c6f3d70767ca3d4fe3fe98064427d47e46d92 (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 0294d5b5fdd1174f63271dab28f7149df8d8c891 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon May 28 16:08:27 2012 +0200 Add new session profile parameter: ,,variant''. Add support to set the keyboard layout _and_ the keyboard variant from the client-side. commit b4a9e5f4921f5713fb71acf692f1ae73ec843666 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon May 28 16:06:23 2012 +0200 drop experimental keyboard setting code commit 86aa11e89f7d667813ddadd61209466c57b843d7 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon May 28 16:05:04 2012 +0200 Add support for re-registering sessions after session profile changes. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 ++ x2go/backends/proxy/_nx3.py | 40 ------------------------ x2go/backends/terminal/_stdout.py | 60 ++++++++++++++++++++++++++++++------- x2go/client.py | 8 ++++- x2go/defaults.py | 2 +- x2go/registry.py | 12 +++++-- x2go/session.py | 2 +- x2go/utils.py | 6 ++++ 8 files changed, 74 insertions(+), 59 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 3e16857..fc3d676 100644 --- a/debian/changelog +++ b/debian/changelog @@ -135,6 +135,9 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low and make the notifiable via hooks. - Properly set setkbd value for x2gostartagent and x2goresume-session. - Fix local folder sharing when the master session changes during runtime. + - Add support for re-registering sessions after session profile changes. + - Add new session profile parameter: ,,variant''. Add support to set the + keyboard layout _and_ the keyboard variant from the client-side. * Depend on python-xlib. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 28 Sep 2012 01:44:21 +0100 diff --git a/x2go/backends/proxy/_nx3.py b/x2go/backends/proxy/_nx3.py index 7005178..271f318 100644 --- a/x2go/backends/proxy/_nx3.py +++ b/x2go/backends/proxy/_nx3.py @@ -116,46 +116,6 @@ class X2goProxyNX3(base.X2goProxyBASE): def process_proxy_options(self): - if self.proxy_options.has_key('defkeymap') and self.proxy_options['defkeymap']: - - # first: draw in xkb_rules_names from xprop output - xkb_rules_names = utils.xkb_rules_names() - _proxy_options = { - 'xkbrules': xkb_rules_names['rules'], - 'xkbmodel': xkb_rules_names['model'], - 'xkblayout': xkb_rules_names['layout'], - 'xkbvariant': xkb_rules_names['variant'], - 'xkboptions': xkb_rules_names['options'], - } - - # merge self.proxy_options into the proxy_options we obtained from xprop - _proxy_options.update(self.proxy_options) - self.proxy_options = _proxy_options - - del self.proxy_options['defkeymap'] - - # create keyboard file - _keyboard = """\ -rules=%s -model=%s -layout=%s -variant=%s -options=%s""" % ( self.proxy_options['xkbrules'], - self.proxy_options['xkbmodel'], - self.proxy_options['xkblayout'], - self.proxy_options['xkbvariant'], - self.proxy_options['xkboptions'], ) - - # remove processed options from self.process_options - del self.proxy_options['xkbrules'] - del self.proxy_options['xkbmodel'] - del self.proxy_options['xkblayout'] - del self.proxy_options['xkbvariant'] - del self.proxy_options['xkboptions'] - - # write the keyboard file into the remote session directory - self.session_instance.control_session._x2go_sftp_write('%s/keyboard' % self.session_info.remote_container, _keyboard) - # run the base variant of this method (basically for logging of ignored process_options) base.X2goProxyBASE.process_proxy_options(self) diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index 1f256a7..91a7c8c 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -183,7 +183,7 @@ class X2goTerminalSessionSTDOUT(object): def __init__(self, control_session, session_info=None, geometry="800x600", depth=_local_color_depth, link="adsl", pack="16m-jpeg-9", cache_type="unix-kde", - keyboard='', kblayout='null', kbtype='null/null', + kbtype='null/null', kblayout='null', kbvariant='null', session_type="application", snd_system='pulse', snd_port=4713, cmd=None, published_applications=False, set_session_title=False, session_title="", applications=[], @@ -219,10 +219,12 @@ class X2goTerminalSessionSTDOUT(object): (class C{X2goProxyNX3}) this originally is the session name. With X2Go it defines the name of the NX cache directory. Best is to leave it untouched. @type cache_type: str - @param kblayout: keyboard layout, e.g. C{us} (default), C{de}, C{fr}, ... - @type kblayout: str @param kbtype: keyboard type, e.g. C{pc105/us} (default), C{pc105/de}, ... @type kbtype: str + @param kblayout: keyboard layout, e.g. C{us} (default), C{de}, C{fr}, ... + @type kblayout: str + @param kbvariant: keyboard variant, e.g. C{nodeadkeys} (for C{de} layout), C{intl} (for C{us} layout), etc. + @type kbvariant: str @param session_type: either C{desktop}, C{application} (rootless session) or C{shared} @type session_type: str @param snd_system: sound system to be used on server (C{none}, C{pulse} (default), @@ -285,9 +287,9 @@ class X2goTerminalSessionSTDOUT(object): self.params.pack = str(pack) self.params.cache_type = str(cache_type) self.params.session_type = str(session_type) - self.params.keyboard = str(keyboard) - self.params.kblayout = str(kblayout) self.params.kbtype = str(kbtype) + self.params.kblayout = str(kblayout) + self.params.kbvariant = str(kbvariant) self.params.snd_system = str(snd_system) self.params.cmd = str(cmd) self.params.depth = str(depth) @@ -1025,6 +1027,9 @@ class X2goTerminalSessionSTDOUT(object): (stdin, stdout, stderr) = self.control_session._x2go_exec_command(cmd_line) + if self.params.kbtype not in ('null/null', 'auto') and (self.params.kblayout not in ('null', '') or self.params.kbvariant not in ('null', '')): + self.set_keyboard(layout=self.params.kblayout, variant=self.params.kbvariant) + return stdout.read(), stderr.read() def is_desktop_session(self): @@ -1051,6 +1056,39 @@ class X2goTerminalSessionSTDOUT(object): return self.session_info.is_published_applications_provider() return False + def set_keyboard(self, layout='null', variant='null'): + """\ + Set the keyboard layout and variant for this (running) session. + + @param layout: keyboard layout to be set + @type layout: C{str} + @param variant: keyboard variant to be set + @type variant: C{str} + + @return: returns C{True} if the {setxkbmap} command could be executed successfully. + @rtype: C{bool} + + """ + cmd_line = [ 'export DISPLAY=:%s && ' % str(self.session_info.display), + 'setxkbmap ' + ] + + if layout != 'null': + self.logger('setting keyboad layout ,,%s\'\' for session %s' % (layout, self.session_info), log.loglevel_INFO) + cmd_line.append('-layout %s' % layout) + if variant != 'null': + self.logger('setting keyboad variant ,,%s\'\' for session %s' % (variant, self.session_info), log.loglevel_INFO) + cmd_line.append('-variant %s' % variant) + + (stdin, stdout, stderr) = self.control_session._x2go_exec_command(cmd_line) + _stderr = stderr.read() + if not _stderr: + self.logger('setting keyboard layout ,,%s\'\' and variant ,,%s\'\' for session %s has been successful' % (layout, variant, self.session_info), log.loglevel_NOTICE) + return True + else: + self.logger('setting keyboard layout ,,%s\'\' and variant ,,%s\'\' for session %s failed: %s' % (layout, variant, self.session_info, _stderr.replace('\n', ' ')), log.loglevel_ERROR) + return False + def exec_published_application(self, exec_name, timeout=20, env={}): """\ Executed a published application. @@ -1146,7 +1184,7 @@ class X2goTerminalSessionSTDOUT(object): return False setkbd = "0" - if (self.params.kblayout != "null") or (self.params.kbtype != "null/null"): + if self.params.kbtype != "null/null": setkbd = "1" if '/' in self.params.cmd: @@ -1196,10 +1234,6 @@ class X2goTerminalSessionSTDOUT(object): self.session_info.name, ) - # let the proxy backend know that we want to define a very special keymap - if (self.params.kbtype.endswith('defkeymap') and self.params.kblayout == 'defkeymap'): - self.proxy_options.update({'defkeymap': True, }) - # set up SSH tunnel for X11 graphical elements self.proxy = self.proxy_backend(session_info=self.session_info, ssh_transport=self.control_session.get_transport(), @@ -1234,7 +1268,7 @@ class X2goTerminalSessionSTDOUT(object): """ setkbd = "0" - if (self.params.kblayout != "null") or (self.params.kbtype != "null/null"): + if self.params.kbtype != "null/null": setkbd = "1" cmd_line = [ "x2goresume-session", self.session_info.name, @@ -1290,9 +1324,13 @@ class X2goTerminalSessionSTDOUT(object): self.session_info.name, ) self.params.depth = self.session_info.name.split('_')[2][2:] + # on a session resume the user name comes in as a user ID. We have to translate this... self.session_info.username = self.control_session.remote_username() + if self.params.kbtype not in ('null/null', 'auto') and (self.params.kblayout not in ('null', '') or self.params.kbvariant not in ('null', '')): + self.set_keyboard(layout=self.params.kblayout, variant=self.params.kbvariant) + if self.params.session_type in ('D', 'S'): self.find_session_window() self.auto_session_window_title() diff --git a/x2go/client.py b/x2go/client.py index 5bbdb17..2f50823 100644 --- a/x2go/client.py +++ b/x2go/client.py @@ -2861,21 +2861,25 @@ class X2goClient(object): __update_cache_all_profiles = update_cache_all_profiles - def register_available_server_sessions_by_profile_name(self, profile_name): + def register_available_server_sessions_by_profile_name(self, profile_name, re_register=False): """\ Register available sessions that are found on the X2Go server the profile of name C{profile_name} is connected to. @param profile_name: the X2Go session profile name @type profile_name: C{str} + @param re_register: re-register available sessions, needs to be done after session profile changes + @type re_register: C{bool} """ + if profile_name not in self.client_connected_profiles(return_profile_names=True): + return session_list = self.list_sessions(profile_name=profile_name, update_sessionregistry=False, register_sessions=False, ) try: - self.session_registry.register_available_server_sessions(profile_name, session_list=session_list) + self.session_registry.register_available_server_sessions(profile_name, session_list=session_list, re_register=re_register) except x2go_exceptions.X2goControlSessionException: self.HOOK_on_control_session_death(profile_name) self.disconnect_profile(profile_name) diff --git a/x2go/defaults.py b/x2go/defaults.py index 8a12e23..a1da523 100644 --- a/x2go/defaults.py +++ b/x2go/defaults.py @@ -298,7 +298,7 @@ X2GO_SESSIONPROFILE_DEFAULTS = { 'usemimebox': False, 'mimeboxextensions': '', 'mimeboxaction': 'OPEN', 'fullscreen': False, 'width': 800,'height': 600,'dpi': 96,'setdpi': False, 'xinerama': False, 'multidisp': False, - 'usekbd': True, 'layout': 'us', 'type': 'pc105/us', + '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, diff --git a/x2go/registry.py b/x2go/registry.py index 87026a4..324e2c4 100644 --- a/x2go/registry.py +++ b/x2go/registry.py @@ -357,7 +357,7 @@ class X2goSessionRegistry(object): return True - def register_available_server_sessions(self, profile_name, session_list=None, newly_connected=False): + def register_available_server_sessions(self, profile_name, session_list=None, newly_connected=False, re_register=False): """\ Register server-side available X2Go sessions with this L{X2goSessionRegistry} instance for a given profile name. @@ -366,12 +366,16 @@ class X2goSessionRegistry(object): @param session_list: an optional C{X2goServerSessionList*} instance (as returned by the L{X2goClient.list_sessions()} command can be passed to this method. @type session_list: C{X2goServerSessionList*} instance + @param newly_connected: give a hint that the session profile got newly connected + @type newly_connected: C{bool} + @param re_register: re-register available sessions, needs to be done after changes to the session profile + @type re_register: C{bool} """ if self._last_available_session_registration is not None: _now = time.time() _time_delta = _now - self._last_available_session_registration - if _time_delta < 2: + if _time_delta < 2 and not re_register: self.logger('registration interval too short (%s), skipping automatic session registration...' % _time_delta, loglevel=log.loglevel_DEBUG) return self._last_available_session_registration = _now @@ -392,7 +396,7 @@ class X2goSessionRegistry(object): # (if the server name has changed, this will kick out obsolete X2goSessions) self.update_status(profile_name=profile_name, session_list=session_list, force_update=True) for session_name in session_list.keys(): - if session_name not in _session_names and not self._skip_auto_registration: + if (session_name not in _session_names and not self._skip_auto_registration) or re_register: server = _ctrl_session.get_server_hostname() profile_id = _ctrl_session.get_profile_id() @@ -421,7 +425,7 @@ class X2goSessionRegistry(object): except: pass # this if clause catches problems when x2golistsessions commands give weird results - if not self.has_session_of_session_name(session_name): + if not self.has_session_of_session_name(session_name) or re_register: session_uuid = self.register(server, profile_id, profile_name, session_name=session_name, virgin=False, **kwargs diff --git a/x2go/session.py b/x2go/session.py index 96c057f..26baeda 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -74,7 +74,7 @@ _X2GO_SESSION_PARAMS = ('use_sshproxy', 'profile_id', 'session_name', """A list of allowed X2Go pure session parameters (i.e. parameters that are passed on neither to an X2goControlSession, X2goSSHProxy nor an X2goControlSession object.""" # options of the paramiko.SSHClient().connect() method, any option that is allowed for a terminal session instance _X2GO_TERMINAL_PARAMS = ('geometry', 'depth', 'link', 'pack', - 'cache_type', 'kblayout', 'kbtype', + 'cache_type', 'kbtype', 'kblayout', 'kbvariant', 'session_type', 'snd_system', 'snd_port', 'cmd', 'set_session_title', 'session_title', 'rdp_server', 'rdp_options', 'applications', diff --git a/x2go/utils.py b/x2go/utils.py index 0333afe..99b4c13 100644 --- a/x2go/utils.py +++ b/x2go/utils.py @@ -144,6 +144,7 @@ def _convert_SessionProfileOptions_2_SessionParams(_options): 'sndport': 'snd_port', 'type': 'kbtype', 'layout': 'kblayout', + 'variant': 'kbvariant', 'speed': 'link', 'sshport': 'port', 'useexports': 'allow_share_local_folders', @@ -257,8 +258,13 @@ def _convert_SessionProfileOptions_2_SessionParams(_options): if not _options['usekbd']: _params['kbtype'] = 'null/null' _params['kblayout'] = 'null' + _params['kbvariant'] = 'null' del _params['usekbd'] + if not _params['kbtype'].strip(): _params['kbtype'] = 'null/null' + if not _params['kblayout'].strip(): _params['kblayout'] = 'null' + if not _params['kbvariant'].strip(): _params['kbvariant'] = 'null' + # currently known but ignored in Python X2go _ignored_options = [ 'dpi', 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.1.0.10-252-g469584f
by git-admin＠x2go.org 28 May '12

28 May '12

The branch, master has been updated via 469584fa40038761b9826971ea9af6d9e8e0ea82 (commit) from c9065ca07a3da3cb8a940fad2285a95dd2b3805b (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 469584fa40038761b9826971ea9af6d9e8e0ea82 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon May 28 16:03:01 2012 +0200 Re-register available/registered sessions after session profile changes. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + pyhoca/wxgui/profilemanager.py | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 908b3f8..4676122 100644 --- a/debian/changelog +++ b/debian/changelog @@ -138,6 +138,7 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Allow custom commands to be desktop sessions. - Make new session option keyboard ,,variant'' configurable in profile manager. + - Re-register available/registered sessions after session profile changes. * Depend on Python X2Go 0.1.2.0. * Install GNOME icons via dh_links. * Install X2Go icons with explicit install paths. diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index e16837f..580fc87 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -1691,6 +1691,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog): text=_(u'Changes to profile have been saved.'), icon='profile_save', ) + self._PyHocaGUI.register_available_server_sessions_by_profile_name(profile_name=self.profile_config['name'], re_register=True) + try: wx.EndBusyCursor() except: pass self.Close() 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.1.0.10-251-gc9065ca
by git-admin＠x2go.org 28 May '12

28 May '12

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

1 0

x2goserver.git - master (branch) updated: 3.1.1.0-25-g266caa3
by git-admin＠x2go.org 28 May '12

28 May '12

The branch, master has been updated via 266caa371a9fa8b393a0cf3ae7c5126531f95cc0 (commit) via 256fe8a5e2f9211367ecaf0e5a40cf7fee334d42 (commit) from 9a49f7672ec2bbde2b70c891fc5d005782efd7b6 (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 266caa371a9fa8b393a0cf3ae7c5126531f95cc0 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon May 28 10:08:41 2012 +0200 typo in changelog commit 256fe8a5e2f9211367ecaf0e5a40cf7fee334d42 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon May 28 10:08:26 2012 +0200 Make x2gosetkeyboard set the client-side keyboard on session start and resume if usekbd is set to True and the keyboard type is set ,,auto''. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- x2goserver/bin/x2goresume-session | 5 ++--- x2goserver/bin/x2gostartagent | 5 ++--- 3 files changed, 6 insertions(+), 8 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 1b8278b..537e086 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,8 +20,8 @@ x2goserver (3.1.1.1-0~x2go1) UNRELEASED; urgency=low in X2Go session cache directory. - Add support for client-side keyboard detection. Moved script x2gosetkeyboard from x2goserver-pyhoca into x2goserver package. - - Make x2gosetkeyboard set the client-side keyboard on sessino start and - resume. + - Make x2gosetkeyboard set the client-side keyboard on session start and + resume if usekbd is set to True and the keyboard type is set ,,auto''. - Reset keyboard settings to pc104/us before setting client-side keyboard parameters. * Depend on x2goagent (>= 2:3.5.0.12), make sure that x2goagent has the patch diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session index 78f96a6..3a9772f 100755 --- a/x2goserver/bin/x2goresume-session +++ b/x2goserver/bin/x2goresume-session @@ -128,8 +128,7 @@ LISTSTR=`echo "$OPTIONS" | awk -F, {'print $17'}` KTSTR=`echo "$KTSTR" | sed "s/\//\\\\\\\\\//"` X2GO_KBD_TYPE=`echo "$X2GO_KBD_TYPE" | sed "s/\//\\\\\\\\\//"` -if [ "$X2GO_SET_KBD" == "0" ] -then +if [ "$X2GO_SET_KBD" == "0" ] || [ "$X2GO_KBD_TYPE" == "auto" ]; then X2GO_KBD_TYPE="null\/null" fi @@ -175,7 +174,7 @@ kill -HUP $X2GO_AGENT_PID &>/dev/null && { (sleep 1; $X2GO_LIB_PATH/x2goresume "$X2GO_CLIENT" "$SESSION_NAME" "$GR_PORT" "$SOUND_PORT" "$FS_PORT" > /dev/null;) # set client-side keyboard model, type, variant, etc. - if [ "$X2GO_SET_KBD" == "0" ]; then + if [ "$X2GO_SET_KBD" != "0" ] && [ "$X2GO_KBD_TYPE" == "auto" ]; then X2GO_DISPLAY=$(echo $SESSION_NAME | cut -d"-" -f2) export DISPLAY=:$X2GO_DISPLAY.0 x2gosetkeyboard "$SESSION_NAME" >/dev/null 2>/dev/null & diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index 90b82b1..e772bf4 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -214,8 +214,7 @@ xauth -f "$XAUTHORITY" add "${HOSTNAME}/unix:${X2GO_PORT}" MIT-MAGIC-COOKIE-1 "$ xauth -f "$XAUTHORITY" add "${HOSTNAME}:${X2GO_PORT}" MIT-MAGIC-COOKIE-1 "${X2GO_COOKIE}" -if [ "$X2GO_SET_KBD" == "0" ] -then +if [ "$X2GO_SET_KBD" == "0" ] || [ "$X2GO_KBD_TYPE" == "auto" ];then X2GO_HOST="nx/nx,link=${X2GO_LINK},pack=${X2GO_PACK},limit=0,root=${SESSION_DIR},cache=8M,images=32M,type=${X2GO_TYPE},id=${SESSION_NAME},cookie=$X2GO_COOKIE,errors=${SESSION_DIR}/session.log,kbtype=null/null,geometry=${X2GO_GEOMETRY},resize=${X2GO_RESIZE},fullscreen=${X2GO_FULLSCREEN},accept=${REMOTE},listen=${GR_PORT},client=linux,menu=0" else X2GO_HOST="nx/nx,link=${X2GO_LINK},pack=${X2GO_PACK},limit=0,root=${SESSION_DIR},cache=8M,images=32M,type=${X2GO_TYPE},id=${SESSION_NAME},cookie=$X2GO_COOKIE,errors=${SESSION_DIR}/session.log,kbtype=${X2GO_KBD_TYPE},geometry=${X2GO_GEOMETRY},resize=${X2GO_RESIZE},fullscreen=${X2GO_FULLSCREEN},accept=${REMOTE},listen=${GR_PORT},client=linux,menu=0" @@ -273,7 +272,7 @@ X2GO_SND_PORT=1024 $X2GO_LIB_PATH/x2gocreatesession "$X2GO_COOKIE" "$X2GO_AGENT_PID" "$X2GO_CLIENT" "$GR_PORT" "$SOUND_PORT" "$FS_PORT" "$SESSION_NAME" > /dev/null -if [ "$X2GO_SET_KBD" != "0" ]; then +if [ "$X2GO_SET_KBD" == "0" ] || [ "$X2GO_KBD_TYPE" != "auto" ]; then $X2GO_LIB_PATH/x2gosyslog "$0" "info" "blocking creation of agent's keyboard file ${SESSION_DIR}/keyboard as requested by session startup command" mkdir -p ${SESSION_DIR}/keyboard fi hooks/post-receive -- x2goserver.git (X2Go Server) 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 "x2goserver.git" (X2Go Server).

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.10-249-g356a9f7
by git-admin＠x2go.org 27 May '12

27 May '12

The branch, master has been updated via 356a9f714a5a7e16502541770776bb2b549175aa (commit) from 6fdcabf69737e3ef53d8423b4b1f412ac93ec9af (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 356a9f714a5a7e16502541770776bb2b549175aa Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun May 27 21:28:01 2012 +0200 fix notification hiding for suspended sessions, hide terminate notifications if session startup fails ----------------------------------------------------------------------- Summary of changes: pyhoca/wxgui/frontend.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index a34f6b9..c77507b 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -983,6 +983,9 @@ class PyHocaGUI(wx.App, x2go.X2goClient): def HOOK_forwarding_tunnel_setup_failed(self, profile_name='UNKNOWN', session_name='UNKNOWN', chain_host='UNKNOWN', chain_port=0): self.notifier.send(_(u'%s - session failure') % profile_name, _(u'Forwarding tunnel request to [%s]:%s for session %s was denied by remote X2go/SSH server. Session startup failed.') % (chain_host, chain_port, session_name), icon='session_error', timeout=10000) + if not self._hide_notifications_map.has_key(profile_name): + self._hide_notifications_map[profile_name] = [] + self._hide_notfications_map[profile_name].append(session_name) try: self._temp_disabled_session_names[profile_name].remove(session_name) except KeyError: @@ -1056,6 +1059,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): def HOOK_on_session_has_been_suspended(self, session_uuid='UNKNOWN', profile_name='UNKNOWN', session_name='UNKNOWN'): self._enable_session_name(profile_name, session_name) if self._hide_notifications_map.has_key(profile_name) and session_name in self._hide_notifications_map[profile_name]: + self._hide_notifications_map[profile_name].remove(session_name) if not self._hide_notifications_map[profile_name]: del self._hide_notifications_map[profile_name] else: 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

x2gognomebindings.git - master (branch) updated: 2.0.1.5-3-g9585604
by git-admin＠x2go.org 27 May '12

27 May '12

The branch, master has been updated via 958560473227254b861cc03fdf12dddac05b8829 (commit) from e61a0c9fa0bcd462d987705876a1da6d29334705 (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 958560473227254b861cc03fdf12dddac05b8829 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun May 27 21:09:05 2012 +0200 Depend on desktop-file-utils (postinst uses script ,,update-desktop-database''). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ debian/control | 3 ++- 2 files changed, 4 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index d6befcb..9835c14 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ x2gognomebindings (2.0.1.6-0~x2go1) UNRELEASED; urgency=low * New upstream version (2.0.1.6): - Continue development... + * Depend on desktop-file-utils (postinst uses script + ,,update-desktop-database''). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 15 Apr 2012 18:32:22 +0200 diff --git a/debian/control b/debian/control index 64b78f9..6057837 100644 --- a/debian/control +++ b/debian/control @@ -28,7 +28,8 @@ Depends: ${shlibs:Depends}, x2goserver-extensions, zenity, gnome-menus, - gnome-colors-common + gnome-colors-common, + desktop-file-utils Description: Description: x2gognomebindings (GNOME mimetypes for X2go) X2go is a server based computing environment with - session resuming hooks/post-receive -- x2gognomebindings.git (GNOME bindings for X2Go) 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 "x2gognomebindings.git" (GNOME bindings for X2Go).

1 0

x2goserver.git - master (branch) updated: 3.1.1.0-23-g9a49f76
by git-admin＠x2go.org 27 May '12

27 May '12

The branch, master has been updated via 9a49f7672ec2bbde2b70c891fc5d005782efd7b6 (commit) from 5de98c2ed290873f044368348d310522ccda3004 (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 9a49f7672ec2bbde2b70c891fc5d005782efd7b6 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun May 27 19:58:15 2012 +0200 Reset keyboard settings to pc104/us before setting client-side keyboard parameters. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 ++- x2goserver/bin/x2gosetkeyboard | 5 +++++ 2 files changed, 7 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index bc71ddd..1b8278b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,10 +22,11 @@ x2goserver (3.1.1.1-0~x2go1) UNRELEASED; urgency=low x2gosetkeyboard from x2goserver-pyhoca into x2goserver package. - Make x2gosetkeyboard set the client-side keyboard on sessino start and resume. + - Reset keyboard settings to pc104/us before setting client-side keyboard + parameters. * Depend on x2goagent (>= 2:3.5.0.12), make sure that x2goagent has the patch 105_nxagent_export-remote-keyboard-config.full.patch included. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 04 Apr 2012 11:44:14 +0200 x2goserver (3.1.1.0-0~x2go1) unstable; urgency=low diff --git a/x2goserver/bin/x2gosetkeyboard b/x2goserver/bin/x2gosetkeyboard index 710daa9..949af5e 100755 --- a/x2goserver/bin/x2gosetkeyboard +++ b/x2goserver/bin/x2gosetkeyboard @@ -64,6 +64,10 @@ read_keyboard_file() { } +reset_keymap() { + setxkbmap -layout us -option "" -model pc104 +} + update_keymap() { if [ "$XKB_RULES" = "evdev" ]; then @@ -83,5 +87,6 @@ update_keymap() { ### main ### $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "Setting X keyboard according to ${X2GO_CLIENT_KBD_FILE}" read_keyboard_file +reset_keymap update_keymap hooks/post-receive -- x2goserver.git (X2Go Server) 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 "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - master (branch) updated: 3.1.1.0-22-g5de98c2
by git-admin＠x2go.org 27 May '12

27 May '12

The branch, master has been updated via 5de98c2ed290873f044368348d310522ccda3004 (commit) from c27e35304f21a73a85d7bc1c4191fed696d4c0a0 (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 5de98c2ed290873f044368348d310522ccda3004 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun May 27 18:25:15 2012 +0200 Depend on x2goagent (>= 2:3.5.0.12), make sure that x2goagent has the patch 105_nxagent_export-remote-keyboard-config.full.patch included. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +++ debian/control | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 9522e79..bc71ddd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,9 @@ x2goserver (3.1.1.1-0~x2go1) UNRELEASED; urgency=low x2gosetkeyboard from x2goserver-pyhoca into x2goserver package. - Make x2gosetkeyboard set the client-side keyboard on sessino start and resume. + * Depend on x2goagent (>= 2:3.5.0.12), make sure that x2goagent has the patch + 105_nxagent_export-remote-keyboard-config.full.patch included. + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 04 Apr 2012 11:44:14 +0200 diff --git a/debian/control b/debian/control index cc3af44..0b73ef4 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - x2goagent, + x2goagent (>= 2:3.5.0.12), lsof, openssh-client, openssh-server, hooks/post-receive -- x2goserver.git (X2Go Server) 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 "x2goserver.git" (X2Go Server).

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits May 2012