x2go-commits

x2go-commits@lists.x2go.org

1 participants
37903 discussions

python-x2go.git - master (branch) updated: 0.2.0.1-11-gccec42e
by git-admin＠x2go.org 07 Jun '12

07 Jun '12

The branch, master has been updated via ccec42eda30c802ce9d777a3711750fe1ace2e2f (commit) from 907069213701818b0530242e7d735f6ad88347c2 (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 ccec42eda30c802ce9d777a3711750fe1ace2e2f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Jun 8 00:26:34 2012 +0200 The master_sessions dict may never have None values. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/registry.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 1f20cfb..a987596 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ python-x2go (0.2.0.2-0~x2go1) UNRELEASED; urgency=low - Catch control session deaths when querying X2goSession.is_alive(). - Do not create a high CPU load after a network failure, do not try to execute a remote command if the session has already died away. + - The master_sessions dict may never have None values. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 30 May 2012 00:27:03 +0200 diff --git a/x2go/registry.py b/x2go/registry.py index f9bf5ad..85ddf3f 100644 --- a/x2go/registry.py +++ b/x2go/registry.py @@ -1047,7 +1047,8 @@ class X2goSessionRegistry(object): _session = self.master_sessions[profile_name] if not _session.is_master_session(): - self.master_sessions[profile_name] = None + del self.master_sessions[profile_name] + return None if return_object: return _session hooks/post-receive -- python-x2go.git (Python X2Go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2Go Client API).

1 0

python-x2go.git - master (branch) updated: 0.2.0.1-10-g9070692
by git-admin＠x2go.org 07 Jun '12

07 Jun '12

The branch, master has been updated via 907069213701818b0530242e7d735f6ad88347c2 (commit) via cf525d5c61ed6c238174ab3a5141f72758883766 (commit) via a58f12c5bbe45b817fd0b7a2e7105e3dcf5017c2 (commit) from ab5473d6e4c446309c589f8f5f8413f320e87b7a (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 907069213701818b0530242e7d735f6ad88347c2 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jun 7 21:27:38 2012 +0200 Do not create a high CPU load after a network failure, do not try to execute a remote command if the session has already died away. commit cf525d5c61ed6c238174ab3a5141f72758883766 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jun 7 20:53:51 2012 +0200 Catch control session deaths when querying X2goSession.is_alive(). commit a58f12c5bbe45b817fd0b7a2e7105e3dcf5017c2 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jun 7 19:18:18 2012 +0200 revert a tiny bit of commit 0983bbcce7c7ff1cfd98b9dd96045607fc2a8a1d, that introduced profile disconnections after sessions had been suspended / terminated ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +++ x2go/backends/control/_stdout.py | 27 +++++++++++++++++++++------ x2go/cache.py | 5 ++++- x2go/session.py | 21 ++++++++++++++++++--- 4 files changed, 46 insertions(+), 10 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 8c59458..1f20cfb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,9 @@ python-x2go (0.2.0.2-0~x2go1) UNRELEASED; urgency=low - Add support to X2goSession class to launch sessions for the Python command line in five steps. - Mark sessions as dead whenever an X2goControlSessionException occurs. + - Catch control session deaths when querying X2goSession.is_alive(). + - Do not create a high CPU load after a network failure, do not try to + execute a remote command if the session has already died away. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 30 May 2012 00:27:03 +0200 diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index 2ec995f..05f355c 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -36,6 +36,7 @@ import random import re import locale import threading +import cStringIO from gevent import socket @@ -362,21 +363,26 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): @raise X2goControlSessionException: if the command execution failed (due to a lost connection) """ - self._transport_lock.acquire() - - _retval = None - if type(cmd_line) == types.ListType: cmd = " ".join(cmd_line) else: cmd = cmd_line + + if self.session_died: + self.logger("control session seams to be dead, not executing command ,,%s'' on X2Go server %s" % (_rerewrite_blanks(cmd), self.profile_name,), loglevel=loglevel) + return (cStringIO.StringIO(), cStringIO.StringIO(), cStringIO.StringIO('failed to execute command')) + + self._transport_lock.acquire() + + _retval = None + ssh_transport = self.get_transport() if ssh_transport and ssh_transport.is_authenticated(): timer = gevent.Timeout(timeout) timer.start() try: - self.logger("executing command on X2Go server ,,%s'': %s" % (self.profile_name, _rerewrite_blanks(cmd)), loglevel) + self.logger("executing command on X2Go server ,,%s'': %s" % (self.profile_name, _rerewrite_blanks(cmd)), loglevel=loglevel) _retval = self.exec_command(_rewrite_password(cmd, user=self.get_transport().get_username(), password=self._session_password), **kwargs) except AttributeError: self.session_died = True @@ -848,7 +854,6 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): pass except x2go_exceptions.X2goControlSessionException: self.session_died - pass t_obj.__del__() for t_name in t_names: try: @@ -909,6 +914,16 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): self.session_died = True return False + def has_session_died(self): + """\ + Test if the connection to the remote X2Go server died on the way. + + @return: C{True} if the connection has died, C{False} otherwise + @rtype: C{bool} + + """ + return self.session_died + def get_published_applications(self, lang=None, refresh=False, raw=False, very_raw=False, max_no_submenus=defaults.PUBAPP_MAX_NO_SUBMENUS): """\ Retrieve the menu tree of published applications from the remote X2Go server. diff --git a/x2go/cache.py b/x2go/cache.py index 6892d8a..5d90191 100644 --- a/x2go/cache.py +++ b/x2go/cache.py @@ -82,7 +82,7 @@ class X2goListSessionsCache(object): """ while self.protected: - gevent.sleep() + gevent.sleep(.1) try: del self.x2go_listsessions_cache[profile_name] except KeyError: pass @@ -155,6 +155,7 @@ class X2goListSessionsCache(object): except x2go_exceptions.X2goControlSessionException, e: if profile_name in self.x2go_listsessions_cache.keys(): del self.x2go_listsessions_cache[profile_name] + self.protected = False raise e except x2go_exceptions.X2goTimeOutException: pass @@ -175,6 +176,7 @@ class X2goListSessionsCache(object): except x2go_exceptions.X2goControlSessionException, e: if profile_name in self.x2go_listsessions_cache.keys(): del self.x2go_listsessions_cache[profile_name] + self.protected = False raise e except x2go_exceptions.X2goTimeOutException: pass @@ -194,6 +196,7 @@ class X2goListSessionsCache(object): except x2go_exceptions.X2goControlSessionException, e: if profile_name in self.x2go_listsessions_cache.keys(): del self.x2go_listsessions_cache[profile_name] + self.protected = False raise e def list_sessions(self, session_uuid): diff --git a/x2go/session.py b/x2go/session.py index 8fe7b98..9368d96 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -358,6 +358,19 @@ class X2goSession(object): """ return self.client_instance + def HOOK_on_control_session_death(self): + """\ + HOOK method: called if a control session (server connection) has unexpectedly encountered a failure. + + @param profile_name: profile name of session that called this hook method + @type profile_name: C{str} + + """ + if self.client_instance: + self.client_instance.HOOK_on_control_session_death(profile_name=self.profile_name) + else: + self.logger('HOOK_on_control_session_death: the control session of profile %s has died unexpectedly' % self.profile_name, loglevel=log.loglevel_WARN) + def HOOK_auto_connect(self): """\ HOOK method: called if the session demands to auto connect. @@ -620,9 +633,6 @@ class X2goSession(object): Class destructor. """ - if self.is_connected(): - self.disconnect() - if self.has_control_session() and self.has_terminal_session(): self.get_control_session().dissociate(self.get_terminal_session()) @@ -1243,6 +1253,8 @@ class X2goSession(object): """ self.connected = self.control_session.is_alive() + if self.control_session.has_session_died(): + self.HOOK_on_control_session_death() if not self.connected: self._X2goSession__disconnect() return self.connected @@ -1284,6 +1296,7 @@ class X2goSession(object): try: return self.control_session.list_sessions(raw=raw) except x2go_exceptions.X2goControlSessionException: + self.HOOK_on_control_session_death() self._X2goSession__disconnect() return None __list_sessions = list_sessions @@ -1303,6 +1316,7 @@ class X2goSession(object): try: return self.control_session.list_desktops(raw=raw) except x2go_exceptions.X2goControlSessionException: + self.HOOK_on_control_session_death() self._X2goSession__disconnect() return None __list_desktops = list_desktops @@ -1323,6 +1337,7 @@ class X2goSession(object): try: return self.control_session.list_mounts(self.session_name, raw=raw) except x2go_exceptions.X2goControlSessionException: + self.HOOK_on_control_session_death() self._X2goSession__disconnect() return None hooks/post-receive -- python-x2go.git (Python X2Go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2Go Client API).

1 0

python-x2go.git - master (branch) updated: 0.2.0.1-7-gab5473d
by git-admin＠x2go.org 07 Jun '12

07 Jun '12

The branch, master has been updated via ab5473d6e4c446309c589f8f5f8413f320e87b7a (commit) via 699da4c0fe1a13fc8e0a4988360b4101348cce77 (commit) from 6184896fab1e7e2551f561e854db30e07d4ec032 (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 ab5473d6e4c446309c589f8f5f8413f320e87b7a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jun 7 09:02:54 2012 +0200 Mark sessions as dead whenever an X2goControlSessionException occurs. commit 699da4c0fe1a13fc8e0a4988360b4101348cce77 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jun 7 09:02:11 2012 +0200 Add support to X2goSession class to launch sessions for the Python command line in five steps. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 ++ x2go/backends/control/_stdout.py | 19 ++++++++---- x2go/guardian.py | 1 - x2go/session.py | 60 +++++++++++++++++++++++++++++++++---- 4 files changed, 69 insertions(+), 14 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index b100123..8c59458 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,9 @@ python-x2go (0.2.0.2-0~x2go1) UNRELEASED; urgency=low forwarding tunnel. - Improve session management, handle exceptions more gracefully. - Ignoring timeouts for x2golistmounts and x2golistdesktops. + - Add support to X2goSession class to launch sessions for the Python + command line in five steps. + - Mark sessions as dead whenever an X2goControlSessionException occurs. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 30 May 2012 00:27:03 +0200 diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index 06bef97..2ec995f 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -275,6 +275,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): self.sftp_client.put(os.path.normpath(local_path), remote_path) except x2go_exceptions.SSHException, socket.error: # react to connection dropped error for SSH connections + self.session_died = True self._transport_lock.release() raise x2go_exceptions.X2goControlSessionException('The SSH connection was dropped during an sFTP put action.') self.sftp_client = None @@ -305,6 +306,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): remote_fileobj.write(content) remote_fileobj.close() except x2go_exceptions.SSHException, socket.error: + self.session_died = True self._transport_lock.release() self.logger('sFTP-write: opening remote file %s on host %s failed' % (remote_path, self.remote_peername()), loglevel=log.loglevel_WARN) raise x2go_exceptions.X2goControlSessionException('The SSH connection was dropped during an sFTP write action.') @@ -331,6 +333,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): try: self.sftp_client.remove(remote_path) except x2go_exceptions.SSHException, socket.error: + self.session_died = True self._transport_lock.release() self.logger('sFTP-write: removing remote file %s on host %s failed' % (remote_path, self.remote_peername()), loglevel=log.loglevel_WARN) raise x2go_exceptions.X2goControlSessionException('The SSH connection was dropped during an sFTP remove action.') @@ -377,33 +380,33 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): _retval = self.exec_command(_rewrite_password(cmd, user=self.get_transport().get_username(), password=self._session_password), **kwargs) except AttributeError: self.session_died = True + self._transport_lock.release() if self.sshproxy_session: self.sshproxy_session.stop_thread() - self._transport_lock.release() raise x2go_exceptions.X2goControlSessionException('the X2Go control session has died unexpectedly') except EOFError: self.session_died = True + self._transport_lock.release() if self.sshproxy_session: self.sshproxy_session.stop_thread() - self._transport_lock.release() raise x2go_exceptions.X2goControlSessionException('the X2Go control session has died unexpectedly') except x2go_exceptions.SSHException: self.session_died = True + self._transport_lock.release() if self.sshproxy_session: self.sshproxy_session.stop_thread() - self._transport_lock.release() raise x2go_exceptions.X2goControlSessionException('the X2Go control session has died unexpectedly') except gevent.timeout.Timeout: self.session_died = True + self._transport_lock.release() if self.sshproxy_session: self.sshproxy_session.stop_thread() - self._transport_lock.release() raise x2go_exceptions.X2goControlSessionException('the X2Go control session command timed out') except socket.error: self.session_died = True + self._transport_lock.release() if self.sshproxy_session: self.sshproxy_session.stop_thread() - self._transport_lock.release() raise x2go_exceptions.X2goControlSessionException('the X2Go control session has died unexpectedly') finally: timer.cancel() @@ -521,6 +524,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): try: self._remote_username = self.get_transport().get_username() except: + self.session_died = True raise x2go_exceptions.X2goControlSessionException('Lost connection to X2Go server') return self._remote_username @@ -539,6 +543,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): try: self._remote_peername = self.get_transport().getpeername() except: + self.session_died = True raise x2go_exceptions.X2goControlSessionException('Lost connection to X2Go server') return self._remote_peername @@ -842,6 +847,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): except x2go_exceptions.X2goTerminalSessionException: pass except x2go_exceptions.X2goControlSessionException: + self.session_died pass t_obj.__del__() for t_name in t_names: @@ -900,7 +906,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): if self._x2go_exec_command('echo', loglevel=log.loglevel_DEBUG): return True except x2go_exceptions.X2goControlSessionException: - pass + self.session_died = True return False def get_published_applications(self, lang=None, refresh=False, raw=False, very_raw=False, max_no_submenus=defaults.PUBAPP_MAX_NO_SUBMENUS): @@ -1350,6 +1356,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): gevent.sleep(1) if _count >= _maxwait: + self.session_died = True raise x2go_exceptions.X2goControlSessionException('x2golistsessions command failed after we have tried 20 times') # update internal variables when list_sessions() is called diff --git a/x2go/guardian.py b/x2go/guardian.py index 927811d..ba5d5b2 100644 --- a/x2go/guardian.py +++ b/x2go/guardian.py @@ -106,7 +106,6 @@ class X2goSessionGuardian(threading.Thread): self.logger('Entering X2Go Guardian client management loop...', loglevel=log.loglevel_DEBUG) - if self.auto_update_listsessions_cache: self.client_instance.update_cache_all_profiles(update_sessions=self.auto_update_listsessions_cache, update_desktops=self.auto_update_listdesktops_cache, diff --git a/x2go/session.py b/x2go/session.py index 6350d0c..8fe7b98 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -25,7 +25,30 @@ This class is normally embedded into the context of an L{X2goClient} instance, but it is also possible to address L{X2goSession}s directly via this class. +To launch a session manually from the Python interactive shell, perform these +simple steps:: + + $ python + Python 2.6.6 (r266:84292, Dec 26 2010, 22:31:48) + [GCC 4.4.5] on linux2 + Type "help", "copyright", "credits" or "license" for more information. + >>> import x2go + >>> import gevent + Xlib.protocol.request.QueryExtension + >>> s = x2go.session.X2goSession() + >>> s.set_server('<my.x2go.server>') + >>> s.set_port(<ssh-port>) + >>> s.connect('<my-login>', '<my-password>') + [<pidno>] (x2gocontrolsession-pylib) NOTICE: connecting to [<my.x2go.server>]:<ssh-port> + [<pidno>] (x2gosession-pylib) NOTICE: SSH host key verification for host [<my.x2go.server>]:<ssh-port> with SSH-RSA fingerprint ,,<ssh-fingerprint>'' initiated. We are seeing this X2Go server for the first time. + [<pidno>] (x2gosession-pylib) WARN: HOOK_check_host_dialog: host check requested for [<my.x2go.server>]:<ssh-port> with SSH-RSA fingerprint: ,,<ssh-fingerprint>''. Automatically adding host as known host. + True + >>> s.start(cmd="LXDE") + True + >>> while True: gevent.sleep(1) + """ + __NAME__ = 'x2gosession-pylib' import os @@ -105,7 +128,7 @@ class X2goSession(object): sessions etc.). """ - def __init__(self, server=None, control_session=None, + def __init__(self, server=None, port=22, control_session=None, use_sshproxy=False, profile_id=None, profile_name='UNKNOWN', session_name=None, @@ -232,6 +255,7 @@ class X2goSession(object): self.profile_name = profile_name self.session_name = session_name self.server = server + self.port = port self._last_status = None @@ -342,7 +366,7 @@ class X2goSession(object): if self.client_instance: self.client_instance.HOOK_profile_auto_connect(profile_name=self.profile_name) else: - self.logger('HOOK_auto_connect: profile ,,%s'' wants to auto-connect to the X2Go server.' % self.profile_name, loglevel=log.loglevel_WARN) + self.logger('HOOK_auto_connect: profile ,,%s\'\' wants to auto-connect to the X2Go server.' % self.profile_name, loglevel=log.loglevel_WARN) def HOOK_session_startup_failed(self): """\ @@ -352,7 +376,7 @@ class X2goSession(object): if self.client_instance: self.client_instance.HOOK_session_startup_failed(profile_name=self.profile_name) else: - self.logger('HOOK_session_startup_failed: session startup for session profile ,,%s'' failed.' % self.profile_name, loglevel=log.loglevel_WARN) + self.logger('HOOK_session_startup_failed: session startup for session profile ,,%s\'\' failed.' % self.profile_name, loglevel=log.loglevel_WARN) def HOOK_rforward_request_denied(self, server_port=0): """\ @@ -450,7 +474,7 @@ class X2goSession(object): if self.client_instance: return self.client_instance.HOOK_check_host_dialog(profile_name=self.profile_name, host=host, port=port, fingerprint=fingerprint, fingerprint_type=fingerprint_type) else: - self.logger('HOOK_check_host_dialog: host check requested for [%s]:%s with %s fingerprint: ,,%s.\'\'. Automatically adding host as known host.' % (host, port, fingerprint_type, fingerprint), loglevel=log.loglevel_WARN) + self.logger('HOOK_check_host_dialog: host check requested for [%s]:%s with %s fingerprint: ,,%s\'\'. Automatically adding host as known host.' % (host, port, fingerprint_type, fingerprint), loglevel=log.loglevel_WARN) return True def init_control_session(self): @@ -539,6 +563,16 @@ class X2goSession(object): """ self.server = server + def set_port(self, port): + """\ + Modify server port after L{X2goSession} has already been initialized. + + @param port: socket port of server to connect to + @type port: C{int} + + """ + self.port = port + def set_profile_name(self, profile_name): """\ Modify session profile name after L{X2goSession} has already been initialized. @@ -1064,6 +1098,9 @@ class X2goSession(object): _params.update(self.control_params) _params.update(self.sshproxy_params) + if 'port' not in _params: + _params['port'] = self.port + try: self.connected = self.control_session.connect(self.server, use_sshproxy=self.use_sshproxy, @@ -1477,7 +1514,7 @@ class X2goSession(object): if not self.published_applications: return self.start() - def resume(self, session_name=None, session_list=None): + def resume(self, session_name=None, session_list=None, cmd=None): """\ Resume or continue a suspended / running X2Go session on the remote X2Go server. @@ -1486,6 +1523,9 @@ class X2goSession(object): @type session_name: C{str} @param session_list: a session list to avoid a server-side session list query @type session_list: C{dict} + @param cmd: if starting a new session, manually hand over the command to be launched in + the new session + @type cmd: C{str} @return: returns C{True} if resuming the session has been successful, C{False} otherwise @rtype: C{bool} @@ -1520,6 +1560,9 @@ class X2goSession(object): # FIXME: test the code to see what exceptions may occur here... raise + if cmd is not None: + self.terminal_params['cmd'] = cmd + self.terminal_session = _control.resume(session_name=self.session_name, session_instance=self, session_list=session_list, @@ -1606,16 +1649,19 @@ class X2goSession(object): __resume = resume - def start(self): + def start(self, cmd=None): """\ Start a new X2Go session on the remote X2Go server. + @param cmd: manually hand over the command that is to be launched in the new session + @type cmd: C{str} + @return: returns C{True} if starting the session has been successful, C{False} otherwise @rtype: C{bool} """ self.session_name = None - return self.resume() + return self.resume(cmd=cmd) __start = start def share_desktop(self, desktop=None, user=None, display=None, share_mode=0, check_desktop_list=True): 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

x2goclient.git - master (branch) updated: 3.99.2.0-19-g4ccfeaf
by git-admin＠x2go.org 06 Jun '12

06 Jun '12

The branch, master has been updated via 4ccfeaffa19e3ccc20084f3683ccd4512926b5f9 (commit) from adefcb0cd27987107424e251a4d172b930390a14 (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 4ccfeaffa19e3ccc20084f3683ccd4512926b5f9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jun 6 23:57:18 2012 +0200 Add Ubuntu-2d (Unity) support to X2Go Client. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++++ icons/128x128/unity.png | Bin 0 -> 17622 bytes icons/16x16/unity.png | Bin 0 -> 1410 bytes icons/32x32/unity.png | Bin 0 -> 2984 bytes icons/64x64/unity.png | Bin 0 -> 7241 bytes onmainwindow.cpp | 4 ++++ resources.rcc | 1 + sessionbutton.cpp | 16 ++++++++++++++++ sessionbutton.h | 2 +- sessionwidget.cpp | 6 ++++++ sessionwidget.h | 2 +- svg/unity.svg | 8 ++++++++ 12 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 icons/128x128/unity.png create mode 100644 icons/16x16/unity.png create mode 100644 icons/32x32/unity.png create mode 100644 icons/64x64/unity.png create mode 100644 svg/unity.svg The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 126827b..2392946 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,10 @@ x2goclient (3.99.2.1-0~x2go1) UNRELEASED; urgency=low * New upstream version (3.99.2.1): - German i18n update for published applications. + [ Mike Gabriel ] + * New upstream version (3.99.2.1): + - Add Ubuntu-2d (Unity) support to X2Go Client. + -- Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Mon, 16 Apr 2012 13:15:47 +0200 x2goclient (3.99.2.0-0~x2go1) unstable; urgency=low diff --git a/icons/128x128/unity.png b/icons/128x128/unity.png new file mode 100644 index 0000000..e953c76 Binary files /dev/null and b/icons/128x128/unity.png differ diff --git a/icons/16x16/unity.png b/icons/16x16/unity.png new file mode 100644 index 0000000..f6fc88d Binary files /dev/null and b/icons/16x16/unity.png differ diff --git a/icons/32x32/unity.png b/icons/32x32/unity.png new file mode 100644 index 0000000..c13cf9a Binary files /dev/null and b/icons/32x32/unity.png differ diff --git a/icons/64x64/unity.png b/icons/64x64/unity.png new file mode 100644 index 0000000..3062e96 Binary files /dev/null and b/icons/64x64/unity.png differ diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 7bda2ed..6cbd6b4 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -5470,6 +5470,10 @@ void ONMainWindow::runCommand() { command="gnome-session"; } + else if ( command=="UNITY" ) + { + command="unity"; + } else if ( command=="LXDE" ) { command="startlxde"; diff --git a/resources.rcc b/resources.rcc index 4263b23..3953a75 100644 --- a/resources.rcc +++ b/resources.rcc @@ -54,6 +54,7 @@ <file>icons/16x16/delete.png</file> <file>icons/16x16/edit.png</file> <file>icons/16x16/gnome.png</file> + <file>icons/16x16/unity.png</file> <file>icons/16x16/kde.png</file> <file>icons/16x16/new_file.png</file> <file>icons/16x16/resolution.png</file> diff --git a/sessionbutton.cpp b/sessionbutton.cpp index 63be020..f53d82a 100644 --- a/sessionbutton.cpp +++ b/sessionbutton.cpp @@ -337,6 +337,7 @@ void SessionButton::redraw() cmdBox->addItem ( "KDE" ); cmdBox->addItem ( "GNOME" ); cmdBox->addItem ( "LXDE" ); + cmdBox->addItem ( "UNITY" ); cmdBox->addItem ( tr ( "RDP connection" ) ); cmdBox->addItem ( tr ( "XDMCP" ) ); cmdBox->addItem ( tr ( "Connection to local desktop" ) ); @@ -355,6 +356,11 @@ void SessionButton::redraw() cmdpix.load ( par->iconsPath ( "/16x16/gnome.png" ) ); cmdBox->setCurrentIndex ( GNOME ); } + else if ( command =="UNITY" ) + { + cmdpix.load ( par->iconsPath ( "/16x16/unity.png" ) ); + cmdBox->setCurrentIndex ( UNITY ); + } else if ( command =="LXDE" ) { cmdpix.load ( par->iconsPath ( "/16x16/lxde.png" ) ); @@ -631,6 +637,11 @@ void SessionButton::slot_cmd_change ( const QString& command ) newRootless=false; pix.load ( par->iconsPath ( "/16x16/lxde.png" ) ); } + else if ( command =="UNITY" ) + { + newRootless=false; + pix.load ( par->iconsPath ( "/16x16/unity.png" ) ); + } else if ( command ==tr ( "Connection to local desktop" ) ) { newRootless=false; @@ -669,6 +680,11 @@ void SessionButton::slot_cmd_change ( const QString& command ) cmd="LXDE"; newRootless=false; } + if ( command=="unity" ) + { + cmd="UNITY"; + newRootless=false; + } if (command== tr("Published applications")) { published=true; diff --git a/sessionbutton.h b/sessionbutton.h index a12aaf6..c5eea1e 100644 --- a/sessionbutton.h +++ b/sessionbutton.h @@ -26,7 +26,7 @@ class SessionButton : public SVGFrame { Q_OBJECT public: - enum {KDE,GNOME,LXDE,RDP,XDMCP,SHADOW,PUBLISHED,OTHER,APPLICATION}; + enum {KDE,GNOME,UNITY,LXDE,RDP,XDMCP,SHADOW,PUBLISHED,OTHER,APPLICATION}; SessionButton ( ONMainWindow* mw, QWidget* parent,QString id ); ~SessionButton(); QString id() { diff --git a/sessionwidget.cpp b/sessionwidget.cpp index 6e12843..2f66aa2 100644 --- a/sessionwidget.cpp +++ b/sessionwidget.cpp @@ -124,6 +124,7 @@ SessionWidget::SessionWidget ( QString id, ONMainWindow * mw, sessBox->addItem ( "KDE" ); sessBox->addItem ( "GNOME" ); sessBox->addItem ( "LXDE" ); + sessBox->addItem ( "UNITY" ); sessBox->addItem ( tr ( "Connect to Windows terminal server" ) ); sessBox->addItem ( tr ( "XDMCP" ) ); sessBox->addItem ( tr ( "Connect to local desktop" ) ); @@ -391,6 +392,11 @@ void SessionWidget::readConfig() sessBox->setCurrentIndex ( LXDE ); cmd->setEnabled ( false ); } + else if ( command=="UNITY" ) + { + sessBox->setCurrentIndex ( UNITY ); + cmd->setEnabled ( false ); + } else if ( command=="SHADOW" ) { sessBox->setCurrentIndex ( SHADOW ); diff --git a/sessionwidget.h b/sessionwidget.h index 5dd0bd4..869d9bb 100644 --- a/sessionwidget.h +++ b/sessionwidget.h @@ -40,7 +40,7 @@ private slots: void slot_rdpOptions(); private: - enum {KDE,GNOME,LXDE,RDP,XDMCP,SHADOW,OTHER,APPLICATION,PUBLISHED}; + enum {KDE,GNOME,LXDE,UNITY,RDP,XDMCP,SHADOW,OTHER,APPLICATION,PUBLISHED}; QLineEdit* sessName; QLineEdit* uname; QLineEdit* server; diff --git a/svg/unity.svg b/svg/unity.svg new file mode 100644 index 0000000..5c1f9cf --- /dev/null +++ b/svg/unity.svg @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="60.513618" height="60.513618" id="svg3036" style="display:inline"> + <g transform="translate(-1.7431908,-1.4941635)" id="layer1" style="display:inline"> + <path d="M 30.25,0 C 13.539626,0 0,13.539626 0,30.25 0,46.960374 13.539626,60.5 30.25,60.5 46.960374,60.5 60.5,46.960374 60.5,30.25 c 0,-2.078212 -0.194675,-4.102133 -0.59375,-6.0625 -0.304345,1.200557 -0.637476,2.348209 -1,3.46875 -0.410672,1.260002 -0.836505,2.461168 -1.3125,3.5625 -0.186671,0.419999 -0.388421,0.763832 -0.59375,1.0625 -0.196003,0.307998 -0.413587,0.553998 -0.65625,0.75 -0.242669,0.195998 -0.535753,0.344164 -0.84375,0.4375 -0.298669,0.09333 -0.617335,0.156247 -1,0.15625 -0.102668,-3e-6 -0.231751,-0.01259 -0.34375,-0.03125 -0.112001,-0.0093 -0.200501,-0.0345 -0.3125,-0.0625 -0.102667,-0.01867 -0.219167,-0.0345 -0.3125,-0.0625 -0.084,-0.028 -0.150167,-0.04384 -0.1875,-0.0625 l 0.25,-1.0625 c 0.102666,0.04666 0.247583,0.08767 0.40625,0.125 0.167999,0.04666 0.310082,0.0625 0.46875,0.0625 0.513332,-2e-6 0.929415,-0.110418 1.21875,-0.34375 0.289331,-0.224001 0.547914,-0.580417 0.78125,-1.09375 -0.588003,-1.119999 -1.142919,-2.311831 -1.65625,-3.5625 -0.504001,- 1.259995 -0.914001,-2.524494 -1.25,-3.8125 l 1.375,0 c 0.102665,0.420007 0.234998,0.858423 0.375,1.34375 0.149331,0.485339 0.322664,0.986672 0.5,1.5 0.177331,0.513337 0.357164,1.01792 0.5625,1.53125 0.20533,0.513336 0.432246,1.024002 0.65625,1.5 0.354663,-0.979998 0.644912,-1.944913 0.90625,-2.90625 0.261328,-0.961328 0.516662,-1.95141 0.75,-2.96875 l 1.125,0 C 56.82527,10.149634 44.716711,0 30.25,0 z m 29.5625,23.71875 c 0.03198,0.145258 0.06387,0.291467 0.09375,0.4375 0.03784,-0.149571 0.08807,-0.286689 0.125,-0.4375 l -0.21875,0 z M 45.78125,20.6875 c 0.233331,10e-6 0.435081,0.06009 0.59375,0.21875 0.167997,0.149343 0.249997,0.363676 0.25,0.625 -3e-6,0.261343 -0.082,0.466342 -0.25,0.625 -0.158669,0.149342 -0.360419,0.218759 -0.59375,0.21875 -0.233335,9e-6 -0.425751,-0.06941 -0.59375,-0.21875 -0.158668,-0.158658 -0.218751,-0.363657 -0.21875,-0.625 -10e-7,-0.261324 0.06008,-0.475657 0.21875,-0.625 0.167999,-0.158656 0.360415,-0.21874 0.59375,-0.21875 z m 4.1875,0.75 0,2.281 25 2.78125,0 0,1.09375 -2.78125,0 0,3.34375 c -2e-6,0.364002 0.03775,0.663585 0.09375,0.90625 0.056,0.233335 0.137997,0.422501 0.25,0.5625 0.111997,0.130668 0.269497,0.225251 0.4375,0.28125 0.167997,0.056 0.338497,0.09375 0.5625,0.09375 0.391996,1e-6 0.704162,-0.041 0.9375,-0.125 0.242662,-0.09333 0.406662,-0.181415 0.5,-0.21875 L 53.03125,30.75 c -0.130672,0.06533 -0.360838,0.156667 -0.6875,0.25 -0.326671,0.102667 -0.705004,0.125 -1.125,0.125 -0.49467,0 -0.923336,-0.03492 -1.25,-0.15625 C 49.651415,30.838083 49.414748,30.627 49.21875,30.375 49.022749,30.123001 48.865249,29.832751 48.78125,29.46875 48.70658,29.095419 48.6875,28.672836 48.6875,28.1875 l 0,-6.5 1.28125,-0.25 z m -38.9375,1.90625 5.1875,0 0,15.25 c -9e-6,3.546677 0.56749,6.063091 1.6875,7.59375 1.119988,1.530671 3.005569,2.312504 5.65625,2.3125 0.559983,4e-6 1.152649,-0.02516 1.75,-0.0625 0.597314,-0.03733 1.164814,-0.08766 1.6875,-0.125 0.522646,-0.07466 0.964312,-0.118912 1.375,-0.15625 0.447978,-0.07466 0.78 2061,-0.144079 0.96875,-0.21875 l 0,-24.59375 5.1875,0 0,28.28125 c -1.194693,0.298667 -2.771358,0.63275 -4.75,0.96875 -1.941354,0.336 -4.205269,0.499999 -6.78125,0.5 -2.240014,-10e-7 -4.125595,-0.334084 -5.65625,-0.96875 -1.530676,-0.671999 -2.754174,-1.586581 -3.6875,-2.78125 -0.933339,-1.194662 -1.589339,-2.613411 -2,-4.21875 -0.410671,-1.642658 -0.625004,-3.458823 -0.625,-5.4375 l 0,-16.34375 z m 28.9375,0.21875 c 0.578662,7e-6 1.054828,0.08201 1.4375,0.25 0.382661,0.158674 0.682244,0.38884 0.90625,0.6875 0.233327,0.28934 0.40666,0.620589 0.5,1.03125 0.09333,0.410672 0.124993,0.880338 0.125,1.375 l 0,4.09375 -1.3125,0 0,-3.8125 c -6e-6,-0.447996 -0.02842,-0.838912 -0.09375,-1.15625 C 41.475244,25.713922 41.389995,25.446006 41.25,25.25 c -0.140005,-0.195994 -0.329172,-0.322244 -0.5625,-0.40625 -0.233338,-0.09333 -0.529671,-0.156244 -0.875,-0.15625 -0.140004,6e-6 -0.28817,0.02192 -0.4375,0.03125 -0.149337,0.0093 -0.297503,0.01259 -0.4375,0.03125 -0.13067,0.0093 -0.231753,0 .04384 -0.34375,0.0625 -0.102669,0.01867 -0.172086,0.02192 -0.21875,0.03125 l 0,6.15625 -1.3125,0 0,-7.09375 c 0.298665,-0.07466 0.692831,-0.134743 1.1875,-0.21875 0.494664,-0.08399 1.074747,-0.124993 1.71875,-0.125 z m 5.1875,0.15625 1.3125,0 0,7.28125 -1.3125,0 0,-7.28125 z" transform="translate(1.7431908,1.4941635)" id="path3047" style="fill:#982e6f;fill-opacity:1;stroke:none" /> + </g> +</svg> hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).

1 0

python-x2go.git - master (branch) updated: 0.2.0.1-5-g6184896
by git-admin＠x2go.org 06 Jun '12

06 Jun '12

The branch, master has been updated via 6184896fab1e7e2551f561e854db30e07d4ec032 (commit) via 0983bbcce7c7ff1cfd98b9dd96045607fc2a8a1d (commit) from 44542ee31e44307378364c316a0539341abd3a0d (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 6184896fab1e7e2551f561e854db30e07d4ec032 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jun 6 22:31:47 2012 +0200 Ignoring timeouts for x2golistmounts and x2golistdesktops. commit 0983bbcce7c7ff1cfd98b9dd96045607fc2a8a1d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jun 6 22:30:10 2012 +0200 Improve session management, handle exceptions more gracefully. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2go/backends/control/_stdout.py | 19 ++++++++++++------- x2go/backends/terminal/_stdout.py | 5 +++++ x2go/cache.py | 4 ++++ x2go/session.py | 21 ++++++++++++++++----- 5 files changed, 39 insertions(+), 12 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index ef52702..b100123 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ python-x2go (0.2.0.2-0~x2go1) UNRELEASED; urgency=low * Bugfix release (0.2.0.2): - Be tolerant if we can not terminate a session after failure of the forwarding tunnel. + - Improve session management, handle exceptions more gracefully. + - Ignoring timeouts for x2golistmounts and x2golistdesktops. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 30 May 2012 00:27:03 +0200 diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index a5c2fd6..06bef97 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -896,8 +896,11 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): @rtype: C{bool} """ - if self._x2go_exec_command('echo', loglevel=log.loglevel_DEBUG): - return True + try: + if self._x2go_exec_command('echo', loglevel=log.loglevel_DEBUG): + return True + except x2go_exceptions.X2goControlSessionException: + pass return False def get_published_applications(self, lang=None, refresh=False, raw=False, very_raw=False, max_no_submenus=defaults.PUBAPP_MAX_NO_SUBMENUS): @@ -1158,11 +1161,13 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): **kwargs) _success = False - if session_name is not None: - _success = _terminal.resume() - - else: - _success = _terminal.start() + try: + if session_name is not None: + _success = _terminal.resume() + else: + _success = _terminal.start() + except x2go_exceptions.X2goTerminalSessionException: + _success = False if _success: while not _terminal.ok(): diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index b1f1259..bcd6771 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -1440,6 +1440,9 @@ class X2goTerminalSessionSTDOUT(object): if self.params.published_applications: self.control_session.get_published_applications() + else: + raise x2go_exceptions.X2goTerminalSessionException("failed to start X2Go session") + return proxy_ok def resume(self): @@ -1524,6 +1527,8 @@ class X2goTerminalSessionSTDOUT(object): if self.is_published_applications_provider(): self.control_session.get_published_applications() self.published_applications = True + else: + raise x2go_exceptions.X2goTerminalSessionException("failed to start X2Go session") return proxy_ok diff --git a/x2go/cache.py b/x2go/cache.py index 2b6f9ec..6892d8a 100644 --- a/x2go/cache.py +++ b/x2go/cache.py @@ -156,6 +156,8 @@ class X2goListSessionsCache(object): if profile_name in self.x2go_listsessions_cache.keys(): del self.x2go_listsessions_cache[profile_name] raise e + except x2go_exceptions.X2goTimeOutException: + pass def _update_desktops(self, profile_name, control_session): """\ @@ -174,6 +176,8 @@ class X2goListSessionsCache(object): if profile_name in self.x2go_listsessions_cache.keys(): del self.x2go_listsessions_cache[profile_name] raise e + except x2go_exceptions.X2goTimeOutException: + pass def _update_sessions(self, profile_name, control_session): """\ diff --git a/x2go/session.py b/x2go/session.py index b157e8e..6350d0c 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -486,9 +486,9 @@ class X2goSession(object): @rtype: C{bool} """ - if self.master_session is None: + if self.master_session is None and self.client_instance is None: return True - return self.master_session + return bool(self.master_session) def set_master_session(self, wait=0, max_wait=20): """\ @@ -586,6 +586,9 @@ class X2goSession(object): Class destructor. """ + if self.is_connected(): + self.disconnect() + if self.has_control_session() and self.has_terminal_session(): self.get_control_session().dissociate(self.get_terminal_session()) @@ -616,8 +619,6 @@ class X2goSession(object): self.get_control_session().__del__() self.control_session = None - self.master_session = None - if self.has_terminal_session(): self.get_terminal_session().__del__() self.terminal_session = None @@ -1113,7 +1114,8 @@ class X2goSession(object): self.suspended = None self.terminated = None self.faults = None - self.master_session = None + self.active = False + self.unset_master_session() try: self.update_status(force_update=True) except x2go_exceptions.X2goControlSessionException: @@ -1528,6 +1530,7 @@ class X2goSession(object): try: self.session_name = self.terminal_session.session_info.name except AttributeError: + # if self.terminal_session is None, we end up with a session failure... self.HOOK_session_startup_failed() return False @@ -1708,10 +1711,13 @@ class X2goSession(object): self.suspended = True self.terminated = False self.faulty = False + self.active = False # unmount shared folders self.unshare_all_local_folders(force_all=True) + self.unset_master_session() + if self.terminal_session.suspend(): self.session_cleanup() @@ -1726,6 +1732,7 @@ class X2goSession(object): self.suspended = True self.terminated = False self.faulty = False + self.active = False self.session_cleanup() return True @@ -1755,10 +1762,13 @@ class X2goSession(object): self.suspended = False self.terminated = True self.faulty = False + self.active = False # unmount shared folders self.unshare_all_local_folders(force_all=True) + self.unset_master_session() + if self.terminal_session.terminate(): self.session_cleanup() del self.terminal_session @@ -1772,6 +1782,7 @@ class X2goSession(object): self.suspended = False self.terminated = True self.faulty = False + self.active = False self.session_cleanup() return True else: 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-269-gd79526f
by git-admin＠x2go.org 05 Jun '12

05 Jun '12

The branch, master has been updated via d79526f48ac661c653fe35866b685bde9bb52cde (commit) from 82e608434314fa8419a725d1f2758142bb072c67 (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 d79526f48ac661c653fe35866b685bde9bb52cde Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jun 5 10:39:30 2012 +0200 Update Bokmal translation (pre-release). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + po/nb_NO.po | 336 +++++++++++++++++++++++++++-------------------------- 2 files changed, 172 insertions(+), 165 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index ba3102f..de95b0f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -160,6 +160,7 @@ pyhoca-gui (0.2.0.0-0~x2go1) UNRELEASED; urgency=low * New upstream version (0.2.0.0): - Add Bokmal (Norway) translation file (not complete, yet). - Fine-tune Bokmal (Norway translation file. + - Update Bokmal translation (pre-release). [ Daniel Lindgren ] * New upstream version (0.2.0.0): diff --git a/po/nb_NO.po b/po/nb_NO.po index ab649c3..31133c6 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-06-04 08:04+0200\n" -"PO-Revision-Date: 2012-02-19 23:16+0100\n" +"PO-Revision-Date: 2012-06-03 14:30+0100\n" "Last-Translator: Terje Andersen <teranders(a)gmail.com>\n" "Language-Team: nb_NO <x2go-i18n(a)lists.berlios.de>\n" "Language: nb_NO\n" @@ -25,11 +25,13 @@ msgstr "" msgid "%s (via %s)" msgstr "%s (via %s)" -#: ../pyhoca/wxgui/logon.py:84 ../pyhoca/wxgui/logon.py:96 +#: ../pyhoca/wxgui/logon.py:84 +#: ../pyhoca/wxgui/logon.py:96 msgid "Username" msgstr "Brukernavn" -#: ../pyhoca/wxgui/logon.py:86 ../pyhoca/wxgui/logon.py:98 +#: ../pyhoca/wxgui/logon.py:86 +#: ../pyhoca/wxgui/logon.py:98 msgid "Password" msgstr "Passord" @@ -49,23 +51,28 @@ msgstr "Sesjons innlogging" msgid "SSH proxy server login" msgstr "logg inn via en SSH mellomtjener" -#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:313 -#: ../pyhoca/wxgui/messages.py:109 ../pyhoca/wxgui/printingprefs.py:138 +#: ../pyhoca/wxgui/logon.py:121 +#: ../pyhoca/wxgui/profilemanager.py:313 +#: ../pyhoca/wxgui/messages.py:109 +#: ../pyhoca/wxgui/printingprefs.py:138 #: ../pyhoca/wxgui/sessiontitle.py:75 msgid "Cancel" msgstr "Avbryt" -#: ../pyhoca/wxgui/logon.py:277 ../pyhoca/wxgui/logon.py:319 +#: ../pyhoca/wxgui/logon.py:277 +#: ../pyhoca/wxgui/logon.py:319 #: ../pyhoca/wxgui/frontend.py:482 #, python-format msgid "%s - connect failure" msgstr "%s - tilkoblingsfeil" -#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:482 +#: ../pyhoca/wxgui/logon.py:278 +#: ../pyhoca/wxgui/frontend.py:482 msgid "User is not allowed to start X2Go sessions!" msgstr "Bruker kontoen har ikke tillatelse til å starte X2Go sesjoner!" -#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:489 +#: ../pyhoca/wxgui/logon.py:283 +#: ../pyhoca/wxgui/frontend.py:489 #, python-format msgid "%s - connect" msgstr "%s - koble til" @@ -83,7 +90,7 @@ msgid "Authentication failed!" msgstr "Autentiseringen feilet!" #: ../pyhoca/wxgui/logon.py:327 -#, fuzzy, python-format +#, python-format msgid "%s - SSH proxy" msgstr "%s - ssh mellomtjener" @@ -91,30 +98,32 @@ msgstr "%s - ssh mellomtjener" msgid "Authentication to the SSH proxy server failed!" msgstr "Autentiseringenen til SSH mellomtjeneren feilet!" -#: ../pyhoca/wxgui/logon.py:350 ../pyhoca/wxgui/frontend.py:537 -#, fuzzy, python-format +#: ../pyhoca/wxgui/logon.py:350 +#: ../pyhoca/wxgui/frontend.py:537 +#, python-format msgid "%s - socket error" -msgstr "%s - nøkkel feil" +msgstr "%s - sokkel feil" -#: ../pyhoca/wxgui/logon.py:357 ../pyhoca/wxgui/frontend.py:516 +#: ../pyhoca/wxgui/logon.py:357 +#: ../pyhoca/wxgui/frontend.py:516 #: ../pyhoca/wxgui/frontend.py:523 #, python-format msgid "%s - host key error" msgstr "%s - verts nøkkel feil" -#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:516 -msgid "" -"The remote server's host key is invalid or has not been accepted by the user" -msgstr "" -"Den eksterne serverens verts nøkkel er ugyldig, eller ikke blitt akseptert " -"av brukeren" +#: ../pyhoca/wxgui/logon.py:358 +#: ../pyhoca/wxgui/frontend.py:516 +msgid "The remote server's host key is invalid or has not been accepted by the user" +msgstr "Den eksterne serverens verts nøkkel er ugyldig, eller ikke blitt akseptert av brukeren" -#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:558 +#: ../pyhoca/wxgui/logon.py:365 +#: ../pyhoca/wxgui/frontend.py:558 #, python-format msgid "%s - missing home directory" msgstr "%s - mangler hjemmekatalog" -#: ../pyhoca/wxgui/logon.py:366 ../pyhoca/wxgui/frontend.py:558 +#: ../pyhoca/wxgui/logon.py:366 +#: ../pyhoca/wxgui/frontend.py:558 msgid "The remote user's home directory does not exist." msgstr "Brukerens hjemmekatalog på den eksterne serveren finnes ikke." @@ -123,20 +132,22 @@ msgstr "Brukerens hjemmekatalog på den eksterne serveren finnes ikke." msgid "%s - key error" msgstr "%s - nøkkel feil" -#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:565 +#: ../pyhoca/wxgui/logon.py:381 +#: ../pyhoca/wxgui/frontend.py:565 #, python-format msgid "%s - auth error" msgstr "%s - autentiseringens feil" -#: ../pyhoca/wxgui/logon.py:389 ../pyhoca/wxgui/frontend.py:509 -#, fuzzy, python-format +#: ../pyhoca/wxgui/logon.py:389 +#: ../pyhoca/wxgui/frontend.py:509 +#, python-format msgid "%s - SSH error" -msgstr "%s - nøkkel feil" +msgstr "%s - SSH feil" #: ../pyhoca/wxgui/logon.py:397 -#, fuzzy, python-format +#, python-format msgid "%s - unknown error" -msgstr "%s - feil med lyden" +msgstr "%s - ukjent feil" #: ../pyhoca/wxgui/logon.py:398 msgid "An unknown error occured during authentication!" @@ -201,9 +212,8 @@ msgid "XFCE4 Desktop (XFCE4)" msgstr "XFCE4 skrivebord (XFCE4)" #: ../pyhoca/wxgui/profilemanager.py:79 -#, fuzzy msgid "Published Applications" -msgstr "Enkelt applikasjon" +msgstr "Publiserte applikasjoner" #: ../pyhoca/wxgui/profilemanager.py:80 msgid "Single Application" @@ -218,23 +228,28 @@ 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:198 +#: ../pyhoca/wxgui/profilemanager.py:84 +#: ../pyhoca/wxgui/profilemanager.py:198 msgid "Custom command" msgstr "Selvvalgt kommando" -#: ../pyhoca/wxgui/profilemanager.py:87 ../pyhoca/wxgui/menus_taskbar.py:355 +#: ../pyhoca/wxgui/profilemanager.py:87 +#: ../pyhoca/wxgui/menus_taskbar.py:355 msgid "Internet Browser" msgstr "Nettleser" -#: ../pyhoca/wxgui/profilemanager.py:88 ../pyhoca/wxgui/menus_taskbar.py:356 +#: ../pyhoca/wxgui/profilemanager.py:88 +#: ../pyhoca/wxgui/menus_taskbar.py:356 msgid "Email Client" msgstr "Epost klient" -#: ../pyhoca/wxgui/profilemanager.py:89 ../pyhoca/wxgui/menus_taskbar.py:357 +#: ../pyhoca/wxgui/profilemanager.py:89 +#: ../pyhoca/wxgui/menus_taskbar.py:357 msgid "Office" msgstr "Kontor" -#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/menus_taskbar.py:358 +#: ../pyhoca/wxgui/profilemanager.py:90 +#: ../pyhoca/wxgui/menus_taskbar.py:358 msgid "Terminal" msgstr "Terminal" @@ -331,12 +346,12 @@ msgstr "Vindusikon" #. ## #: ../pyhoca/wxgui/profilemanager.py:192 msgid "Start session automatically after login" -msgstr "" +msgstr "Start sesjonen automatisk etter innlogging" #: ../pyhoca/wxgui/profilemanager.py:193 #, python-format msgid "Login automatically after %s has started" -msgstr "" +msgstr "Logg inn automatisk etter at %s har startet" #: ../pyhoca/wxgui/profilemanager.py:194 msgid "Type" @@ -360,16 +375,17 @@ msgstr "RDP alternativer" #: ../pyhoca/wxgui/profilemanager.py:206 msgid "Integrate remote application(s) into local desktop (rootless mode)" -msgstr "" +msgstr "Integrer eksterne applikasjon(er) inn i det lokale skrivebordet (rotløs modus)" #: ../pyhoca/wxgui/profilemanager.py:207 msgid "Menu of published applications" -msgstr "" +msgstr "Meny med publiserte applikasjoner" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:214 ../pyhoca/wxgui/profilemanager.py:224 +#: ../pyhoca/wxgui/profilemanager.py:214 +#: ../pyhoca/wxgui/profilemanager.py:224 msgid "User" msgstr "Bruker" @@ -446,18 +462,15 @@ msgstr "Sett skjermens DPI" #: ../pyhoca/wxgui/profilemanager.py:261 msgid "Do not set (use server-side tools to configure the keyboard)" -msgstr "" +msgstr "Ikke angi (benytt server-side verktøy for å konfigurere tastaturet)" #: ../pyhoca/wxgui/profilemanager.py:262 -msgid "" -"Automatically detect and use client-side keyboard configuration inside the " -"session" -msgstr "" +msgid "Automatically detect and use client-side keyboard configuration inside the session" +msgstr "Automatisk oppdag og benytt klient-side konfigurasjon for tastaturet inne i sesjonen" #: ../pyhoca/wxgui/profilemanager.py:263 -#, fuzzy msgid "Use custom keyboard settings as provided below" -msgstr "Behold gjeldende tastaturoppsett" +msgstr "Benytt tilpasset innstillinger for tastaturoppsett som gitt nedenfor" #: ../pyhoca/wxgui/profilemanager.py:264 msgid "Keyboard model" @@ -465,11 +478,11 @@ msgstr "Tastaturmodell" #: ../pyhoca/wxgui/profilemanager.py:266 msgid "Layout" -msgstr "" +msgstr "Utforming" #: ../pyhoca/wxgui/profilemanager.py:268 msgid "Layout variant" -msgstr "" +msgstr "Utformingsvariant" #: ../pyhoca/wxgui/profilemanager.py:270 msgid "Enable sound support" @@ -509,7 +522,8 @@ msgstr "Benytt lokal mappedeling" msgid "Path" msgstr "Sti" -#: ../pyhoca/wxgui/profilemanager.py:288 ../pyhoca/wxgui/profilemanager.py:307 +#: ../pyhoca/wxgui/profilemanager.py:288 +#: ../pyhoca/wxgui/profilemanager.py:307 msgid "Add" msgstr "Legg til" @@ -608,15 +622,15 @@ msgstr "Deling" #: ../pyhoca/wxgui/profilemanager.py:977 msgid "<xkbtype>" -msgstr "" +msgstr "<xkbtype>" #: ../pyhoca/wxgui/profilemanager.py:978 msgid "<xkblayout>" -msgstr "" +msgstr "<xkblayout>" #: ../pyhoca/wxgui/profilemanager.py:979 msgid "<xkbvariant>" -msgstr "" +msgstr "<xkbvariant>" #: ../pyhoca/wxgui/profilemanager.py:1249 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" @@ -643,7 +657,8 @@ msgstr "Velg en mappe som skal deles i en sesjon" #: ../pyhoca/wxgui/profilemanager.py:1666 #: ../pyhoca/wxgui/profilemanager.py:1669 #: ../pyhoca/wxgui/profilemanager.py:1674 -#: ../pyhoca/wxgui/profilemanager.py:1684 ../pyhoca/wxgui/menus_taskbar.py:106 +#: ../pyhoca/wxgui/profilemanager.py:1684 +#: ../pyhoca/wxgui/menus_taskbar.py:106 msgid "Profile Manager" msgstr "Profil håndterer" @@ -664,12 +679,10 @@ msgstr "SSH mellomtjener konfigurasjonen er ufullstendig. Forsøk igjen." #: ../pyhoca/wxgui/profilemanager.py:1684 #, python-format msgid "" -"Another session profile (%s) already uses [%s]:%s for binding a local SSH " -"proxy to.\n" +"Another session profile (%s) already uses [%s]:%s for binding a local SSH proxy to.\n" "Please change the SSH proxy settings accordingly." msgstr "" -"En annen sesjonsprofil (%s) benytter allerede [%s]:%s for å portbinde en " -"lokal SSH mellomtjener.\n" +"En annen sesjonsprofil (%s) benytter allerede [%s]:%s for å portbinde en lokal SSH mellomtjener.\n" "Vennligst endre SSH mellomtjener innstillingene tilsvarende." #: ../pyhoca/wxgui/profilemanager.py:1704 @@ -708,9 +721,8 @@ msgid "About %s (%s)..." msgstr "Om %s (%s) ..." #: ../pyhoca/wxgui/menus_taskbar.py:121 -#, fuzzy msgid "Manage Session Profile" -msgstr "Ny sesjonsprofil" +msgstr "Håndter sesjonsprofil" #: ../pyhoca/wxgui/menus_taskbar.py:130 msgid "Printing Preferences" @@ -720,7 +732,8 @@ msgstr "Utksriftsinnstillinger" msgid "Client Options" msgstr "Klient alternativer" -#: ../pyhoca/wxgui/menus_taskbar.py:144 ../pyhoca/wxgui/menus_taskbar.py:723 +#: ../pyhoca/wxgui/menus_taskbar.py:144 +#: ../pyhoca/wxgui/menus_taskbar.py:723 #: ../pyhoca/wxgui/menus_taskbar.py:885 msgid "E&xit" msgstr "&Avslutt" @@ -729,7 +742,8 @@ msgstr "&Avslutt" msgid "Window title" msgstr "Vindustittel" -#: ../pyhoca/wxgui/menus_taskbar.py:209 ../pyhoca/wxgui/menus_taskbar.py:551 +#: ../pyhoca/wxgui/menus_taskbar.py:209 +#: ../pyhoca/wxgui/menus_taskbar.py:551 msgid "Resume Session" msgstr "Gjenoppta sesjon" @@ -745,37 +759,40 @@ msgstr "Overfør sesjon" msgid "Transfer Session (not possible)" msgstr "Overfør sesjon (ikke mulig)" -#: ../pyhoca/wxgui/menus_taskbar.py:228 ../pyhoca/wxgui/menus_taskbar.py:542 -#, fuzzy +#: ../pyhoca/wxgui/menus_taskbar.py:228 +#: ../pyhoca/wxgui/menus_taskbar.py:542 msgid "Suspend Session (and disconnect/exit)" -msgstr "Frakoble sesjon" +msgstr "Koble fra sesjonen (og avslutte)" -#: ../pyhoca/wxgui/menus_taskbar.py:230 ../pyhoca/wxgui/menus_taskbar.py:544 -#, fuzzy +#: ../pyhoca/wxgui/menus_taskbar.py:230 +#: ../pyhoca/wxgui/menus_taskbar.py:544 msgid "Suspend Session (and disconnect)" -msgstr "Frakoble sesjon" +msgstr "Koble fra sesjonen" -#: ../pyhoca/wxgui/menus_taskbar.py:232 ../pyhoca/wxgui/menus_taskbar.py:546 +#: ../pyhoca/wxgui/menus_taskbar.py:232 +#: ../pyhoca/wxgui/menus_taskbar.py:546 msgid "Suspend Session" msgstr "Frakoble sesjon" -#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:555 -#, fuzzy +#: ../pyhoca/wxgui/menus_taskbar.py:238 +#: ../pyhoca/wxgui/menus_taskbar.py:555 msgid "Terminate Session (and disconnect/exit)" -msgstr "Avslutte sesjon" +msgstr "Avslutte sesjonen (og " -#: ../pyhoca/wxgui/menus_taskbar.py:240 ../pyhoca/wxgui/menus_taskbar.py:557 -#, fuzzy +#: ../pyhoca/wxgui/menus_taskbar.py:240 +#: ../pyhoca/wxgui/menus_taskbar.py:557 msgid "Terminate Session (and disconnect)" -msgstr "Avslutte sesjon" +msgstr "Avslutte sesjon (og koble fra)" -#: ../pyhoca/wxgui/menus_taskbar.py:242 ../pyhoca/wxgui/menus_taskbar.py:559 +#: ../pyhoca/wxgui/menus_taskbar.py:242 +#: ../pyhoca/wxgui/menus_taskbar.py:559 msgid "Terminate Session" msgstr "Avslutte sesjon" -#: ../pyhoca/wxgui/menus_taskbar.py:246 ../pyhoca/wxgui/menus_taskbar.py:539 +#: ../pyhoca/wxgui/menus_taskbar.py:246 +#: ../pyhoca/wxgui/menus_taskbar.py:539 msgid "Refresh menu tree" -msgstr "" +msgstr "Oppfrisk menytreet" #: ../pyhoca/wxgui/menus_taskbar.py:255 msgid "Rename Session Window" @@ -803,70 +820,67 @@ msgstr "Stopp deling på a&lle lokale mapper" #: ../pyhoca/wxgui/menus_taskbar.py:390 msgid "Multimedia" -msgstr "" +msgstr "Multimedia" #: ../pyhoca/wxgui/menus_taskbar.py:391 msgid "Development" -msgstr "" +msgstr "Utvikling" #: ../pyhoca/wxgui/menus_taskbar.py:392 -#, fuzzy msgid "Education" -msgstr "Handling" +msgstr "Opplæring" #: ../pyhoca/wxgui/menus_taskbar.py:393 msgid "Games" -msgstr "" +msgstr "Spill" #: ../pyhoca/wxgui/menus_taskbar.py:394 msgid "Graphics" -msgstr "" +msgstr "Grafikk" #: ../pyhoca/wxgui/menus_taskbar.py:395 -#, fuzzy msgid "Internet" -msgstr "Nettleser" +msgstr "Internett" #: ../pyhoca/wxgui/menus_taskbar.py:396 -#, fuzzy msgid "Office Applications" -msgstr "Enkelt applikasjon" +msgstr "Kontorapplikasjoner" #: ../pyhoca/wxgui/menus_taskbar.py:397 msgid "System" -msgstr "" +msgstr "System" #: ../pyhoca/wxgui/menus_taskbar.py:398 msgid "Utilities" -msgstr "" +msgstr "Verktøy" #: ../pyhoca/wxgui/menus_taskbar.py:399 -#, fuzzy msgid "Other Applications" -msgstr "Applikasjon" +msgstr "Andre applikasjoner" -#: ../pyhoca/wxgui/menus_taskbar.py:464 ../pyhoca/wxgui/menus_taskbar.py:476 -#, fuzzy, python-format +#: ../pyhoca/wxgui/menus_taskbar.py:464 +#: ../pyhoca/wxgui/menus_taskbar.py:476 +#, python-format msgid "Connect %s" -msgstr "Tilkobling" +msgstr "Koble til %s" #: ../pyhoca/wxgui/menus_taskbar.py:470 msgid "Currently connecting..." -msgstr "" +msgstr "Kobler til..." #: ../pyhoca/wxgui/menus_taskbar.py:484 msgid "Start &new Desktop Session" msgstr "Start &ny sesjon" -#: ../pyhoca/wxgui/menus_taskbar.py:489 ../pyhoca/wxgui/menus_taskbar.py:627 -#, fuzzy +#: ../pyhoca/wxgui/menus_taskbar.py:489 +#: ../pyhoca/wxgui/menus_taskbar.py:627 msgid "Retrieving Application Menu..." -msgstr "Enkelt applikasjon" +msgstr "Henter applikasjonsmenyen..." -#: ../pyhoca/wxgui/menus_taskbar.py:493 ../pyhoca/wxgui/menus_taskbar.py:630 -#, fuzzy +#: ../pyhoca/wxgui/menus_taskbar.py:493 +#: ../pyhoca/wxgui/menus_taskbar.py:630 msgid "Retrieve Application Menu" -msgstr "Enkelt applikasjon" +msgstr "Hent applikasjonsmenyen" #: ../pyhoca/wxgui/menus_taskbar.py:496 msgid "Start &new Session" @@ -877,9 +891,8 @@ msgid "Launch Single Application" msgstr "Start enkelt applikasjon" #: ../pyhoca/wxgui/menus_taskbar.py:614 -#, fuzzy msgid "Manage Application Menu" -msgstr "Enkelt applikasjon" +msgstr "Administrer applkasjonsmenyen" #: ../pyhoca/wxgui/menus_taskbar.py:657 msgid "Running" @@ -906,14 +919,12 @@ msgid "&Disconnect from Server" msgstr "&Koble fra serveren" #: ../pyhoca/wxgui/menus_taskbar.py:715 -#, fuzzy msgid "Suspend Session and E&xit application" -msgstr "Frakoble sesjon" +msgstr "Koble fra sesjonen og &Avslutt applikasjonen" #: ../pyhoca/wxgui/menus_taskbar.py:719 -#, fuzzy msgid "Disconnect and E&xit application" -msgstr "Frakoble sesjon" +msgstr "Koble fra sesjonen og &Avslutt applikasjonen" #: ../pyhoca/wxgui/menus_taskbar.py:748 msgid "Add Profile" @@ -931,55 +942,50 @@ msgstr "Start/gjenoppta sesjon" msgid "Connect Server" msgstr "Koble til server" -#: ../pyhoca/wxgui/about.py:66 ../pyhoca/wxgui/about.py:68 +#: ../pyhoca/wxgui/about.py:66 +#: ../pyhoca/wxgui/about.py:68 #, python-format msgid "About %s ..." msgstr "Om %s ..." #: ../pyhoca/wxgui/frontend.py:371 -#, fuzzy msgid "Suspending sessions and exiting application..." -msgstr "Frakoble sesjon" +msgstr "Koble fra sesjonene og avslutt applikasjonen..." #: ../pyhoca/wxgui/frontend.py:374 -#, fuzzy, python-format +#, python-format msgid "Disconnecting %s and exiting application..." -msgstr "Frakoble sesjon" +msgstr "Kobler fra %s og avslutter applikasjonen..." #: ../pyhoca/wxgui/frontend.py:376 -#, fuzzy msgid "Exiting application..." -msgstr "Enkelt applikasjon" +msgstr "Avslutter applikasjonen..." #: ../pyhoca/wxgui/frontend.py:456 -#, fuzzy, python-format +#, python-format msgid "%s - server warning" -msgstr "%s - advarsel om sesjon" +msgstr "%s - server advarsel" #: ../pyhoca/wxgui/frontend.py:456 msgid "The X2Go Server does not publish an application menu." -msgstr "" +msgstr "X2Go serveren publiserer ikke en applikasjonsmeny" #: ../pyhoca/wxgui/frontend.py:489 msgid "Public SSH key authentication has been successful." msgstr "Offentlig SSH nøkkel autentisering var vellykket." #: ../pyhoca/wxgui/frontend.py:523 -msgid "" -"The SSH proxy's host key is invalid or has not been accepted by the user" -msgstr "" -"SSH mellomtjenerens vertsnøkkel er ugyldig, eller har ikke blitt akseptert " -"av brukeren" +msgid "The SSH proxy's host key is invalid or has not been accepted by the user" +msgstr "SSH mellomtjenerens vertsnøkkel er ugyldig, eller har ikke blitt akseptert av brukeren" #: ../pyhoca/wxgui/frontend.py:544 -#, fuzzy, python-format +#, python-format msgid "%s - EOF error" -msgstr "%s - nøkkel feil" +msgstr "%s - EOF feil" #: ../pyhoca/wxgui/frontend.py:544 msgid "Authentication protocol communication incomplete! Try again..." -msgstr "" -"Autentiseringens protokoll kommunikasjon er ufullstendig! Forsøk igjen." +msgstr "Autentiseringens protokoll kommunikasjon er ufullstendig! Forsøk igjen." #: ../pyhoca/wxgui/frontend.py:551 #, python-format @@ -991,11 +997,11 @@ msgid "An unknown error occurred during authentication!" msgstr "En ukjent feil oppstod under autentiseringen! " #: ../pyhoca/wxgui/frontend.py:600 -#, fuzzy msgid "Unknown session profile, configure before using it..." -msgstr "ny sesjonsprofil" +msgstr "Ukjent sesjonsprofil, konfigurer den først..." -#: ../pyhoca/wxgui/frontend.py:655 ../pyhoca/wxgui/frontend.py:979 +#: ../pyhoca/wxgui/frontend.py:655 +#: ../pyhoca/wxgui/frontend.py:979 #, python-format msgid "%s - session warning" msgstr "%s - advarsel om sesjon" @@ -1003,7 +1009,7 @@ msgstr "%s - advarsel om sesjon" #: ../pyhoca/wxgui/frontend.py:655 #, python-format msgid "Execution of command ,,%s'' failed." -msgstr "" +msgstr "Utførelsen av kommandoen \"%s\" feilet." #: ../pyhoca/wxgui/frontend.py:731 msgid "Cleaning X2Go sessions..." @@ -1066,15 +1072,13 @@ msgstr "%s - feil med kanalen" #: ../pyhoca/wxgui/frontend.py:953 #, python-format -msgid "" -"Lost connection to server %s unexpectedly! Try to re-authenticate to the " -"server..." -msgstr "" -"Mistet uventet forbindelsen til server %s ! Forsøk å autentisiere deg på " -"nytt til serveren..." +msgid "Lost connection to server %s unexpectedly! Try to re-authenticate to the server..." +msgstr "Mistet uventet forbindelsen til server %s ! Forsøk å autentisiere deg på nytt til serveren..." -#: ../pyhoca/wxgui/frontend.py:964 ../pyhoca/wxgui/frontend.py:971 -#: ../pyhoca/wxgui/frontend.py:973 ../pyhoca/wxgui/frontend.py:985 +#: ../pyhoca/wxgui/frontend.py:964 +#: ../pyhoca/wxgui/frontend.py:971 +#: ../pyhoca/wxgui/frontend.py:973 +#: ../pyhoca/wxgui/frontend.py:985 #, python-format msgid "%s - session failure" msgstr "%s - sesjonsfeil" @@ -1099,21 +1103,13 @@ msgstr "" #: ../pyhoca/wxgui/frontend.py:979 #, python-format -msgid "" -"Reverse TCP port forwarding request for session %s to server port %s has " -"been denied." -msgstr "" -"Revers TCP port videresendingsforespørselen for sesjon %s til server port %s " -"har blitt avvist." +msgid "Reverse TCP port forwarding request for session %s to server port %s has been denied." +msgstr "Revers TCP port videresendingsforespørselen for sesjon %s til server port %s har blitt avvist." #: ../pyhoca/wxgui/frontend.py:985 #, python-format -msgid "" -"Forwarding tunnel request to [%s]:%s for session %s was denied by remote " -"X2go/SSH server. Session startup failed." -msgstr "" -"Tunnel videresendingsforespørsel til [%s]:%s for sesjon %s ble avvist av den " -"eksterne X2Go/SSH serveren. Oppstart av sesjonen feilet." +msgid "Forwarding tunnel request to [%s]:%s for session %s was denied by remote X2go/SSH server. Session startup failed." +msgstr "Tunnel videresendingsforespørsel til [%s]:%s for sesjon %s ble avvist av den eksterne X2Go/SSH serveren. Oppstart av sesjonen feilet." #: ../pyhoca/wxgui/frontend.py:1000 #, python-format @@ -1121,13 +1117,11 @@ msgid "%s - audio warning" msgstr "%s - advarsel om lyd" #: ../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)." +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:1003 ../pyhoca/wxgui/frontend.py:1006 +#: ../pyhoca/wxgui/frontend.py:1003 +#: ../pyhoca/wxgui/frontend.py:1006 #, python-format msgid "%s - audio error" msgstr "%s - feil med lyden" @@ -1155,9 +1149,9 @@ msgstr "" "%s" #: ../pyhoca/wxgui/frontend.py:1012 -#, fuzzy, python-format +#, python-format msgid "%s - client-side printing not available" -msgstr "- utskriftssystemet er ikke tilgjengelig -" +msgstr "%s - klient-side utskrift er ikke tilgjengelig" #: ../pyhoca/wxgui/frontend.py:1012 #, python-format @@ -1165,11 +1159,13 @@ msgid "" "The server denies client-side printing from within this session.\n" "%s" msgstr "" +"Serveren nekter klient-side utskrift innenfra denne sesjonen.\n" +"%s" #: ../pyhoca/wxgui/frontend.py:1015 #, python-format msgid "%s - MIME box not available" -msgstr "" +msgstr "%s - MIME boks ikke tilgjengelig" #: ../pyhoca/wxgui/frontend.py:1015 #, python-format @@ -1177,11 +1173,13 @@ msgid "" "The server does not support the X2Go MIME box.\n" "%s" msgstr "" +"Serveren støtter ikke X2Go MIME boks.\n" +"%s" #: ../pyhoca/wxgui/frontend.py:1018 #, python-format msgid "%s - client-side folders not sharable" -msgstr "" +msgstr "%s - klient-side mapper er ikke mulig å dele" #: ../pyhoca/wxgui/frontend.py:1018 #, python-format @@ -1189,11 +1187,13 @@ msgid "" "The server denies client-side folder sharing with this session.\n" "%s" msgstr "" +"Serveren nekter klient-side mapperdeling med denne sesjonen.\n" +"%s" #: ../pyhoca/wxgui/frontend.py:1021 #, python-format msgid "%s - client resources not sharable" -msgstr "" +msgstr "%s - klient ressurser er ikke mulig å dele" #: ../pyhoca/wxgui/frontend.py:1021 #, python-format @@ -1201,8 +1201,11 @@ msgid "" "Client-side folders and printers cannot be shared with this session.\n" "%s" msgstr "" +"Klient-side mapper og skrivere kan ikke bli delt med denne sesjonen.\n" +"%s" -#: ../pyhoca/wxgui/frontend.py:1035 ../pyhoca/wxgui/frontend.py:1037 +#: ../pyhoca/wxgui/frontend.py:1035 +#: ../pyhoca/wxgui/frontend.py:1037 #, python-format msgid "%s - print error" msgstr "%s - feil ved utskrift" @@ -1229,7 +1232,8 @@ msgstr "" "...oppstod fra sesjon\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1041 ../pyhoca/wxgui/frontend.py:1045 +#: ../pyhoca/wxgui/frontend.py:1041 +#: ../pyhoca/wxgui/frontend.py:1045 #, python-format msgid "%s - start" msgstr "%s - start" @@ -1252,7 +1256,8 @@ msgstr "" "En annen klient startet X2Go sesjon\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1049 ../pyhoca/wxgui/frontend.py:1053 +#: ../pyhoca/wxgui/frontend.py:1049 +#: ../pyhoca/wxgui/frontend.py:1053 #, python-format msgid "%s - resume" msgstr "%s - gjenoppta" @@ -1349,7 +1354,8 @@ msgstr "Ja" msgid "No" msgstr "Nei" -#: ../pyhoca/wxgui/messages.py:103 ../pyhoca/wxgui/printingprefs.py:133 +#: ../pyhoca/wxgui/messages.py:103 +#: ../pyhoca/wxgui/printingprefs.py:133 msgid "Ok" msgstr "Ok" 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

nx-libs.git - master (branch) updated: redist-server/3.5.0.13-5-gdd7b5eb
by git-admin＠x2go.org 04 Jun '12

04 Jun '12

The branch, master has been updated via dd7b5eb3c1c868bd38b8af71ed1236fc03fd4d8c (commit) from e2e7008b3e4f7283b135a9fc2821a64386253ee0 (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 dd7b5eb3c1c868bd38b8af71ed1236fc03fd4d8c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jun 4 08:19:19 2012 +0200 Add patch: 052_nxcomp_macos10-nxauth-location.full+lite.patch, change nxauth search location on Mac OS X to $NX_SYSTEM/nxauth to facilitate application bundle building. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 +++ ..._nxcomp_macos10-nxauth-location.full+lite.patch | 38 ++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 45 insertions(+), 0 deletions(-) create mode 100644 debian/patches/052_nxcomp_macos10-nxauth-location.full+lite.patch The diff of changes is: diff --git a/debian/changelog b/debian/changelog index de39c40..6cc8506 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,16 @@ nx-libs (2:3.5.0.14-0) UNRELEASED; urgency=low + [ Mike Gabriel ] * New upstream release of nxagent (3.5.0-9). * Adapt patch series (all hunks succeeded automatically). * Drop patch: 120_nxagent_libcairo-null-source-drawables.full.patch, the issue has been fixed by NoMachine (TR05J02703). + [ Mihai Moldovan ] + * Add patch: 052_nxcomp_macos10-nxauth-location.full+lite.patch, change + nxauth search location on Mac OS X to $NX_SYSTEM/nxauth to facilitate + application bundle building. + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 11 May 2012 23:57:18 +0200 nx-libs (2:3.5.0.13-0) unstable; urgency=low diff --git a/debian/patches/052_nxcomp_macos10-nxauth-location.full+lite.patch b/debian/patches/052_nxcomp_macos10-nxauth-location.full+lite.patch new file mode 100644 index 0000000..4960c9d --- /dev/null +++ b/debian/patches/052_nxcomp_macos10-nxauth-location.full+lite.patch @@ -0,0 +1,38 @@ +--- a/nxcomp/Auth.cpp ++++ b/nxcomp/Auth.cpp +@@ -217,22 +217,31 @@ + + // + // Use the nxauth command on Windows and the Mac, xauth +- // on all the other platforms. On Windows and on the Mac +- // we assume that the nxauth command is located under +- // bin in the client installation directory. On all the ++ // on all the other platforms. On Windows we assume that ++ // the nxauth command is located under bin in the client ++ // installation directory. On Mac OS X we assume that the ++ // command is located directly in the client installation ++ // directory, to make bundle shipping easier. On all the + // other platforms we use the default xauth command that + // is in our path. + // + + char command[DEFAULT_STRING_LIMIT]; + +- #if defined(__CYGWIN32__) || defined(__APPLE__) ++ #if defined(__CYGWIN32__) + + snprintf(command, DEFAULT_STRING_LIMIT - 1, + "%s/bin/nxauth", control -> SystemPath); + + *(command + DEFAULT_STRING_LIMIT - 1) = '\0'; + ++ #elif defined(__APPLE__) ++ ++ snprintf(command, DEFAULT_STRING_LIMIT - 1, ++ "%s/nxauth", control -> SystemPath); ++ ++ *(command + DEFAULT_STRING_LIMIT - 1) = '\0'; ++ + #else + + strcpy(command, "xauth"); diff --git a/debian/patches/series b/debian/patches/series index dc42d85..d772a0e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -26,6 +26,7 @@ 031_nx-X11_parallel-make.full.patch 032_no-x11r6.full.patch 051_nxcomp_macos105-fdisset.full+lite.patch +052_nxcomp_macos10-nxauth-location.full+lite.patch 101_nxagent_set-rgb-path.full.patch 102_xserver-xext_set-securitypolicy-path.full.patch 103_nxagent_set-X0-config-path.full.patch hooks/post-receive -- nx-libs.git (NX (redistributed)) 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 "nx-libs.git" (NX (redistributed)).

1 0

nx-libs.git - master (branch) updated: redist-server/3.5.0.13-5-g375e0e8
by git-admin＠x2go.org 04 Jun '12

04 Jun '12

The branch, master has been updated via 375e0e8b3aa9793745808e5410aae584baad5a35 (commit) from e2e7008b3e4f7283b135a9fc2821a64386253ee0 (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 375e0e8b3aa9793745808e5410aae584baad5a35 Author: Mihai Moldovan <ionic(a)ionic.de> Date: Mon Jun 4 08:15:51 2012 +0200 Add patch: 052_nxcomp_macos10-nxauth-location.full+lite.patch, change nxauth search location on Mac OS X to $NX_SYSTEM/nxauth to facilitate application bundle building. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 ++ ..._nxcomp_macos10-nxauth-location.full+lite.patch | 38 ++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 42 insertions(+), 0 deletions(-) create mode 100644 debian/patches/052_nxcomp_macos10-nxauth-location.full+lite.patch The diff of changes is: diff --git a/debian/changelog b/debian/changelog index de39c40..9c5b09e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,9 @@ nx-libs (2:3.5.0.12-0) unstable; urgency=low to the FD_ISSET macro/function, instead of the struct itself. * Update patch: 005_nxcomp_gcc43.full+lite.patch, fix faulty path to nxcomp/Split.cpp. + * Add patch: 052_nxcomp_macos10-nxauth-location.full+lite.patch, change + nxauth search location on Mac OS X to $NX_SYSTEM/nxauth to facilitate + application bundle building. [ Oleksandr Shneyder ] * Add patch: 203_nxagent_disable-rootless-exit.full.patch, add command line diff --git a/debian/patches/052_nxcomp_macos10-nxauth-location.full+lite.patch b/debian/patches/052_nxcomp_macos10-nxauth-location.full+lite.patch new file mode 100644 index 0000000..4960c9d --- /dev/null +++ b/debian/patches/052_nxcomp_macos10-nxauth-location.full+lite.patch @@ -0,0 +1,38 @@ +--- a/nxcomp/Auth.cpp ++++ b/nxcomp/Auth.cpp +@@ -217,22 +217,31 @@ + + // + // Use the nxauth command on Windows and the Mac, xauth +- // on all the other platforms. On Windows and on the Mac +- // we assume that the nxauth command is located under +- // bin in the client installation directory. On all the ++ // on all the other platforms. On Windows we assume that ++ // the nxauth command is located under bin in the client ++ // installation directory. On Mac OS X we assume that the ++ // command is located directly in the client installation ++ // directory, to make bundle shipping easier. On all the + // other platforms we use the default xauth command that + // is in our path. + // + + char command[DEFAULT_STRING_LIMIT]; + +- #if defined(__CYGWIN32__) || defined(__APPLE__) ++ #if defined(__CYGWIN32__) + + snprintf(command, DEFAULT_STRING_LIMIT - 1, + "%s/bin/nxauth", control -> SystemPath); + + *(command + DEFAULT_STRING_LIMIT - 1) = '\0'; + ++ #elif defined(__APPLE__) ++ ++ snprintf(command, DEFAULT_STRING_LIMIT - 1, ++ "%s/nxauth", control -> SystemPath); ++ ++ *(command + DEFAULT_STRING_LIMIT - 1) = '\0'; ++ + #else + + strcpy(command, "xauth"); diff --git a/debian/patches/series b/debian/patches/series index dc42d85..d772a0e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -26,6 +26,7 @@ 031_nx-X11_parallel-make.full.patch 032_no-x11r6.full.patch 051_nxcomp_macos105-fdisset.full+lite.patch +052_nxcomp_macos10-nxauth-location.full+lite.patch 101_nxagent_set-rgb-path.full.patch 102_xserver-xext_set-securitypolicy-path.full.patch 103_nxagent_set-X0-config-path.full.patch hooks/post-receive -- nx-libs.git (NX (redistributed)) 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 "nx-libs.git" (NX (redistributed)).

1 0

nx-libs.git - master (branch) updated: redist-server/3.5.0.13-5-g5cd6055
by git-admin＠x2go.org 04 Jun '12

04 Jun '12

The branch, master has been updated via 5cd6055dda0fe53ae058ab608860b18bf7470401 (commit) from e2e7008b3e4f7283b135a9fc2821a64386253ee0 (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 5cd6055dda0fe53ae058ab608860b18bf7470401 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jun 4 08:15:51 2012 +0200 Add patch: 052_nxcomp_macos10-nxauth-location.full+lite.patch, change nxauth search location on Mac OS X to $NX_SYSTEM/nxauth to facilitate application bundle building. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 ++ ..._nxcomp_macos10-nxauth-location.full+lite.patch | 38 ++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 42 insertions(+), 0 deletions(-) create mode 100644 debian/patches/052_nxcomp_macos10-nxauth-location.full+lite.patch The diff of changes is: diff --git a/debian/changelog b/debian/changelog index de39c40..9c5b09e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,9 @@ nx-libs (2:3.5.0.12-0) unstable; urgency=low to the FD_ISSET macro/function, instead of the struct itself. * Update patch: 005_nxcomp_gcc43.full+lite.patch, fix faulty path to nxcomp/Split.cpp. + * Add patch: 052_nxcomp_macos10-nxauth-location.full+lite.patch, change + nxauth search location on Mac OS X to $NX_SYSTEM/nxauth to facilitate + application bundle building. [ Oleksandr Shneyder ] * Add patch: 203_nxagent_disable-rootless-exit.full.patch, add command line diff --git a/debian/patches/052_nxcomp_macos10-nxauth-location.full+lite.patch b/debian/patches/052_nxcomp_macos10-nxauth-location.full+lite.patch new file mode 100644 index 0000000..4960c9d --- /dev/null +++ b/debian/patches/052_nxcomp_macos10-nxauth-location.full+lite.patch @@ -0,0 +1,38 @@ +--- a/nxcomp/Auth.cpp ++++ b/nxcomp/Auth.cpp +@@ -217,22 +217,31 @@ + + // + // Use the nxauth command on Windows and the Mac, xauth +- // on all the other platforms. On Windows and on the Mac +- // we assume that the nxauth command is located under +- // bin in the client installation directory. On all the ++ // on all the other platforms. On Windows we assume that ++ // the nxauth command is located under bin in the client ++ // installation directory. On Mac OS X we assume that the ++ // command is located directly in the client installation ++ // directory, to make bundle shipping easier. On all the + // other platforms we use the default xauth command that + // is in our path. + // + + char command[DEFAULT_STRING_LIMIT]; + +- #if defined(__CYGWIN32__) || defined(__APPLE__) ++ #if defined(__CYGWIN32__) + + snprintf(command, DEFAULT_STRING_LIMIT - 1, + "%s/bin/nxauth", control -> SystemPath); + + *(command + DEFAULT_STRING_LIMIT - 1) = '\0'; + ++ #elif defined(__APPLE__) ++ ++ snprintf(command, DEFAULT_STRING_LIMIT - 1, ++ "%s/nxauth", control -> SystemPath); ++ ++ *(command + DEFAULT_STRING_LIMIT - 1) = '\0'; ++ + #else + + strcpy(command, "xauth"); diff --git a/debian/patches/series b/debian/patches/series index dc42d85..d772a0e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -26,6 +26,7 @@ 031_nx-X11_parallel-make.full.patch 032_no-x11r6.full.patch 051_nxcomp_macos105-fdisset.full+lite.patch +052_nxcomp_macos10-nxauth-location.full+lite.patch 101_nxagent_set-rgb-path.full.patch 102_xserver-xext_set-securitypolicy-path.full.patch 103_nxagent_set-X0-config-path.full.patch hooks/post-receive -- nx-libs.git (NX (redistributed)) 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 "nx-libs.git" (NX (redistributed)).

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.10-268-g82e6084
by git-admin＠x2go.org 04 Jun '12

04 Jun '12

The branch, master has been updated via 82e608434314fa8419a725d1f2758142bb072c67 (commit) from 1b920af010da32ea7b4c9e52ea02a5c690da8f8b (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 82e608434314fa8419a725d1f2758142bb072c67 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jun 4 08:04:41 2012 +0200 rebuilt i18n .mo files ----------------------------------------------------------------------- Summary of changes: build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo | Bin 541 -> 541 bytes build/mo/de/LC_MESSAGES/PyHoca-GUI.mo | Bin 23789 -> 23789 bytes build/mo/en/LC_MESSAGES/PyHoca-GUI.mo | Bin 22238 -> 22238 bytes build/mo/es/LC_MESSAGES/PyHoca-GUI.mo | Bin 17540 -> 23773 bytes build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo | Bin 18139 -> 18139 bytes build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo | Bin 21826 -> 21826 bytes build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo | Bin 20316 -> 22180 bytes po/PyHoca-GUI.pot | 2 +- po/bg.po | 2 +- po/de.po | 2 +- po/en.po | 2 +- po/es.po | 2 +- po/nb_NO.po | 2 +- po/nl.po | 2 +- po/sv.po | 182 +++++++++++++----------------- 15 files changed, 87 insertions(+), 109 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 f390977..8a6e609 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 70a8f4b..2cc0168 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 4faabc0..04515a6 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 19ca5f7..4d5771f 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 7546d29..bb2ec47 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 958349d..e8e70ef 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 eb9648b..305f3e2 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/po/PyHoca-GUI.pot b/po/PyHoca-GUI.pot index 976f4d9..5b55e13 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-31 22:04+0200\n" +"POT-Creation-Date: 2012-06-04 08:04+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" diff --git a/po/bg.po b/po/bg.po index 3783c61..7331ea1 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-31 22:04+0200\n" +"POT-Creation-Date: 2012-06-04 08:04+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" diff --git a/po/de.po b/po/de.po index f8d836b..84eed3b 100644 --- a/po/de.po +++ b/po/de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-31 22:04+0200\n" +"POT-Creation-Date: 2012-06-04 08:04+0200\n" "PO-Revision-Date: 2012-05-31 22:04+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: de <mike.gabriel(a)das-netzwerkteam.de>\n" diff --git a/po/en.po b/po/en.po index e5af9f9..4ee2ebf 100644 --- a/po/en.po +++ b/po/en.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-31 22:04+0200\n" +"POT-Creation-Date: 2012-06-04 08:04+0200\n" "PO-Revision-Date: 2012-05-31 21:44+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: en <mike.gabriel(a)das-netzwerkteam.de>\n" diff --git a/po/es.po b/po/es.po index b3a8fc6..e58998d 100644 --- a/po/es.po +++ b/po/es.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-31 22:04+0200\n" +"POT-Creation-Date: 2012-06-04 08:04+0200\n" "PO-Revision-Date: 2012-06-01 09:28+0200\n" "Last-Translator: Ricardo Díaz Martín <oceanosoftlapalma(a)gmail.com>\n" "Language-Team: Español; Castellano <>\n" diff --git a/po/nb_NO.po b/po/nb_NO.po index df5d47b..ab649c3 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-31 22:04+0200\n" +"POT-Creation-Date: 2012-06-04 08:04+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" diff --git a/po/nl.po b/po/nl.po index 6cf2a84..c67b39c 100644 --- a/po/nl.po +++ b/po/nl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-31 22:04+0200\n" +"POT-Creation-Date: 2012-06-04 08:04+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" diff --git a/po/sv.po b/po/sv.po index f18fab9..5a35667 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-31 22:04+0200\n" +"POT-Creation-Date: 2012-06-04 08:04+0200\n" "PO-Revision-Date: 2012-06-01 17:59+0100\n" "Last-Translator: Daniel Lindgren <dali.spam(a)gmail.com>\n" "Language-Team: Swedish <x2go-i18n(a)lists.berlios.de>\n" @@ -26,13 +26,11 @@ msgstr "" msgid "%s (via %s)" msgstr "%s (via %s)" -#: ../pyhoca/wxgui/logon.py:84 -#: ../pyhoca/wxgui/logon.py:96 +#: ../pyhoca/wxgui/logon.py:84 ../pyhoca/wxgui/logon.py:96 msgid "Username" msgstr "Användarnamn" -#: ../pyhoca/wxgui/logon.py:86 -#: ../pyhoca/wxgui/logon.py:98 +#: ../pyhoca/wxgui/logon.py:86 ../pyhoca/wxgui/logon.py:98 msgid "Password" msgstr "Lösenord" @@ -52,28 +50,23 @@ msgstr "Sessionsinloggning" msgid "SSH proxy server login" msgstr "SSH proxyserverinloggning" -#: ../pyhoca/wxgui/logon.py:121 -#: ../pyhoca/wxgui/profilemanager.py:313 -#: ../pyhoca/wxgui/messages.py:109 -#: ../pyhoca/wxgui/printingprefs.py:138 +#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:313 +#: ../pyhoca/wxgui/messages.py:109 ../pyhoca/wxgui/printingprefs.py:138 #: ../pyhoca/wxgui/sessiontitle.py:75 msgid "Cancel" msgstr "Avbryt" -#: ../pyhoca/wxgui/logon.py:277 -#: ../pyhoca/wxgui/logon.py:319 +#: ../pyhoca/wxgui/logon.py:277 ../pyhoca/wxgui/logon.py:319 #: ../pyhoca/wxgui/frontend.py:482 #, python-format msgid "%s - connect failure" msgstr "%s - anslutning misslyckades" -#: ../pyhoca/wxgui/logon.py:278 -#: ../pyhoca/wxgui/frontend.py:482 +#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:482 msgid "User is not allowed to start X2Go sessions!" msgstr "Användaren har inte rätt att starta X2Go-sessioner!" -#: ../pyhoca/wxgui/logon.py:283 -#: ../pyhoca/wxgui/frontend.py:489 +#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:489 #, python-format msgid "%s - connect" msgstr "%s - anslut" @@ -99,32 +92,28 @@ msgstr "%s - SSH-proxy" msgid "Authentication to the SSH proxy server failed!" msgstr "Autentisering till SSH-proxy misslyckades!" -#: ../pyhoca/wxgui/logon.py:350 -#: ../pyhoca/wxgui/frontend.py:537 +#: ../pyhoca/wxgui/logon.py:350 ../pyhoca/wxgui/frontend.py:537 #, python-format msgid "%s - socket error" msgstr "%s - socketfel" -#: ../pyhoca/wxgui/logon.py:357 -#: ../pyhoca/wxgui/frontend.py:516 +#: ../pyhoca/wxgui/logon.py:357 ../pyhoca/wxgui/frontend.py:516 #: ../pyhoca/wxgui/frontend.py:523 #, python-format msgid "%s - host key error" msgstr "%s - fel på serverns nyckel" -#: ../pyhoca/wxgui/logon.py:358 -#: ../pyhoca/wxgui/frontend.py:516 -msgid "The remote server's host key is invalid or has not been accepted by the user" +#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:516 +msgid "" +"The remote server's host key is invalid or has not been accepted by the user" msgstr "Serverns nyckel är felaktig eller har inte accepterats av användaren" -#: ../pyhoca/wxgui/logon.py:365 -#: ../pyhoca/wxgui/frontend.py:558 +#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:558 #, python-format msgid "%s - missing home directory" msgstr "%s - hemkatalog saknas" -#: ../pyhoca/wxgui/logon.py:366 -#: ../pyhoca/wxgui/frontend.py:558 +#: ../pyhoca/wxgui/logon.py:366 ../pyhoca/wxgui/frontend.py:558 msgid "The remote user's home directory does not exist." msgstr "Fjärranvändarens hemkatalog saknas." @@ -133,14 +122,12 @@ msgstr "Fjärranvändarens hemkatalog saknas." msgid "%s - key error" msgstr "%s - nyckelfel" -#: ../pyhoca/wxgui/logon.py:381 -#: ../pyhoca/wxgui/frontend.py:565 +#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:565 #, python-format msgid "%s - auth error" msgstr "%s - autentiseringsfel" -#: ../pyhoca/wxgui/logon.py:389 -#: ../pyhoca/wxgui/frontend.py:509 +#: ../pyhoca/wxgui/logon.py:389 ../pyhoca/wxgui/frontend.py:509 #, python-format msgid "%s - SSH error" msgstr "%s - SSH-fel" @@ -229,28 +216,23 @@ 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:198 +#: ../pyhoca/wxgui/profilemanager.py:84 ../pyhoca/wxgui/profilemanager.py:198 msgid "Custom command" msgstr "Anpassat kommando" -#: ../pyhoca/wxgui/profilemanager.py:87 -#: ../pyhoca/wxgui/menus_taskbar.py:355 +#: ../pyhoca/wxgui/profilemanager.py:87 ../pyhoca/wxgui/menus_taskbar.py:355 msgid "Internet Browser" msgstr "Webbbläsare" -#: ../pyhoca/wxgui/profilemanager.py:88 -#: ../pyhoca/wxgui/menus_taskbar.py:356 +#: ../pyhoca/wxgui/profilemanager.py:88 ../pyhoca/wxgui/menus_taskbar.py:356 msgid "Email Client" msgstr "E-postklient" -#: ../pyhoca/wxgui/profilemanager.py:89 -#: ../pyhoca/wxgui/menus_taskbar.py:357 +#: ../pyhoca/wxgui/profilemanager.py:89 ../pyhoca/wxgui/menus_taskbar.py:357 msgid "Office" msgstr "Office" -#: ../pyhoca/wxgui/profilemanager.py:90 -#: ../pyhoca/wxgui/menus_taskbar.py:358 +#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/menus_taskbar.py:358 msgid "Terminal" msgstr "Terminal" @@ -385,8 +367,7 @@ msgstr "Meny med publicerade applikationer" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:214 -#: ../pyhoca/wxgui/profilemanager.py:224 +#: ../pyhoca/wxgui/profilemanager.py:214 ../pyhoca/wxgui/profilemanager.py:224 msgid "User" msgstr "Användare" @@ -463,11 +444,16 @@ msgstr "Ange skärmupplösning (DPI)" #: ../pyhoca/wxgui/profilemanager.py:261 msgid "Do not set (use server-side tools to configure the keyboard)" -msgstr "Konfigurera inte (använd verktyg på server för att konfigurera tangentbord)" +msgstr "" +"Konfigurera inte (använd verktyg på server för att konfigurera tangentbord)" #: ../pyhoca/wxgui/profilemanager.py:262 -msgid "Automatically detect and use client-side keyboard configuration inside the session" -msgstr "Detektera automatiskt och använd klientinställningar för tangentbord i session" +msgid "" +"Automatically detect and use client-side keyboard configuration inside the " +"session" +msgstr "" +"Detektera automatiskt och använd klientinställningar för tangentbord i " +"session" #: ../pyhoca/wxgui/profilemanager.py:263 msgid "Use custom keyboard settings as provided below" @@ -523,8 +509,7 @@ msgstr "Använd lokal mappdelning" msgid "Path" msgstr "Sökväg" -#: ../pyhoca/wxgui/profilemanager.py:288 -#: ../pyhoca/wxgui/profilemanager.py:307 +#: ../pyhoca/wxgui/profilemanager.py:288 ../pyhoca/wxgui/profilemanager.py:307 msgid "Add" msgstr "Lägg till" @@ -658,8 +643,7 @@ msgstr "Välj en mapp att dela i en session" #: ../pyhoca/wxgui/profilemanager.py:1666 #: ../pyhoca/wxgui/profilemanager.py:1669 #: ../pyhoca/wxgui/profilemanager.py:1674 -#: ../pyhoca/wxgui/profilemanager.py:1684 -#: ../pyhoca/wxgui/menus_taskbar.py:106 +#: ../pyhoca/wxgui/profilemanager.py:1684 ../pyhoca/wxgui/menus_taskbar.py:106 msgid "Profile Manager" msgstr "Profilhanterare" @@ -680,10 +664,12 @@ msgstr "Konfigurationen av SSH-proxy är inte komplett. Försök igen." #: ../pyhoca/wxgui/profilemanager.py:1684 #, python-format msgid "" -"Another session profile (%s) already uses [%s]:%s for binding a local SSH proxy to.\n" +"Another session profile (%s) already uses [%s]:%s for binding a local SSH " +"proxy to.\n" "Please change the SSH proxy settings accordingly." msgstr "" -"En annan session (%s) använder redan [%s]:%s för att ansluta till lokal SSH-proxy.\n" +"En annan session (%s) använder redan [%s]:%s för att ansluta till lokal SSH-" +"proxy.\n" "Ändra konfiguration för SSH-proxy ." #: ../pyhoca/wxgui/profilemanager.py:1704 @@ -733,8 +719,7 @@ msgstr "Utskriftspreferenser" msgid "Client Options" msgstr "Klientalternativ" -#: ../pyhoca/wxgui/menus_taskbar.py:144 -#: ../pyhoca/wxgui/menus_taskbar.py:723 +#: ../pyhoca/wxgui/menus_taskbar.py:144 ../pyhoca/wxgui/menus_taskbar.py:723 #: ../pyhoca/wxgui/menus_taskbar.py:885 msgid "E&xit" msgstr "&Avsluta" @@ -743,8 +728,7 @@ msgstr "&Avsluta" msgid "Window title" msgstr "Fönstertitel" -#: ../pyhoca/wxgui/menus_taskbar.py:209 -#: ../pyhoca/wxgui/menus_taskbar.py:551 +#: ../pyhoca/wxgui/menus_taskbar.py:209 ../pyhoca/wxgui/menus_taskbar.py:551 msgid "Resume Session" msgstr "Återanslut session" @@ -760,38 +744,31 @@ msgstr "Flytta session" msgid "Transfer Session (not possible)" msgstr "Flytta session (ej möjligt)" -#: ../pyhoca/wxgui/menus_taskbar.py:228 -#: ../pyhoca/wxgui/menus_taskbar.py:542 +#: ../pyhoca/wxgui/menus_taskbar.py:228 ../pyhoca/wxgui/menus_taskbar.py:542 msgid "Suspend Session (and disconnect/exit)" msgstr "Försätt session i vila och avsluta" -#: ../pyhoca/wxgui/menus_taskbar.py:230 -#: ../pyhoca/wxgui/menus_taskbar.py:544 +#: ../pyhoca/wxgui/menus_taskbar.py:230 ../pyhoca/wxgui/menus_taskbar.py:544 msgid "Suspend Session (and disconnect)" msgstr "Försätt session i vila och koppla från" -#: ../pyhoca/wxgui/menus_taskbar.py:232 -#: ../pyhoca/wxgui/menus_taskbar.py:546 +#: ../pyhoca/wxgui/menus_taskbar.py:232 ../pyhoca/wxgui/menus_taskbar.py:546 msgid "Suspend Session" msgstr "Försätt session i vila" -#: ../pyhoca/wxgui/menus_taskbar.py:238 -#: ../pyhoca/wxgui/menus_taskbar.py:555 +#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:555 msgid "Terminate Session (and disconnect/exit)" msgstr "Avsluta session" -#: ../pyhoca/wxgui/menus_taskbar.py:240 -#: ../pyhoca/wxgui/menus_taskbar.py:557 +#: ../pyhoca/wxgui/menus_taskbar.py:240 ../pyhoca/wxgui/menus_taskbar.py:557 msgid "Terminate Session (and disconnect)" msgstr "Koppla från session" -#: ../pyhoca/wxgui/menus_taskbar.py:242 -#: ../pyhoca/wxgui/menus_taskbar.py:559 +#: ../pyhoca/wxgui/menus_taskbar.py:242 ../pyhoca/wxgui/menus_taskbar.py:559 msgid "Terminate Session" msgstr "Avsluta session" -#: ../pyhoca/wxgui/menus_taskbar.py:246 -#: ../pyhoca/wxgui/menus_taskbar.py:539 +#: ../pyhoca/wxgui/menus_taskbar.py:246 ../pyhoca/wxgui/menus_taskbar.py:539 msgid "Refresh menu tree" msgstr "Uppdatera menyträd" @@ -859,8 +836,7 @@ msgstr "Verktyg" msgid "Other Applications" msgstr "Övriga applikationer" -#: ../pyhoca/wxgui/menus_taskbar.py:464 -#: ../pyhoca/wxgui/menus_taskbar.py:476 +#: ../pyhoca/wxgui/menus_taskbar.py:464 ../pyhoca/wxgui/menus_taskbar.py:476 #, python-format msgid "Connect %s" msgstr "Anslut %s" @@ -873,13 +849,11 @@ msgstr "Anslutning pågår..." msgid "Start &new Desktop Session" msgstr "Starta &ny Skrivbordssession" -#: ../pyhoca/wxgui/menus_taskbar.py:489 -#: ../pyhoca/wxgui/menus_taskbar.py:627 +#: ../pyhoca/wxgui/menus_taskbar.py:489 ../pyhoca/wxgui/menus_taskbar.py:627 msgid "Retrieving Application Menu..." msgstr "Hämtar applikationsmeny..." -#: ../pyhoca/wxgui/menus_taskbar.py:493 -#: ../pyhoca/wxgui/menus_taskbar.py:630 +#: ../pyhoca/wxgui/menus_taskbar.py:493 ../pyhoca/wxgui/menus_taskbar.py:630 msgid "Retrieve Application Menu" msgstr "Hämta applikationsmeny" @@ -943,8 +917,7 @@ msgstr "Starta/återanslut session" msgid "Connect Server" msgstr "Anslut till server" -#: ../pyhoca/wxgui/about.py:66 -#: ../pyhoca/wxgui/about.py:68 +#: ../pyhoca/wxgui/about.py:66 ../pyhoca/wxgui/about.py:68 #, python-format msgid "About %s ..." msgstr "Om %s ..." @@ -976,8 +949,10 @@ msgid "Public SSH key authentication has been successful." msgstr "Autentisering med publik SSH-nyckel lyckades." #: ../pyhoca/wxgui/frontend.py:523 -msgid "The SSH proxy's host key is invalid or has not been accepted by the user" -msgstr "SSH-proxyns nyckel är felaktig eller har inte accepterats av användaren" +msgid "" +"The SSH proxy's host key is invalid or has not been accepted by the user" +msgstr "" +"SSH-proxyns nyckel är felaktig eller har inte accepterats av användaren" #: ../pyhoca/wxgui/frontend.py:544 #, python-format @@ -1001,8 +976,7 @@ msgstr "Ett okänt fel inträffade vid autentisering!" msgid "Unknown session profile, configure before using it..." msgstr "Okänd sessionsprofil, konfigurera före användning..." -#: ../pyhoca/wxgui/frontend.py:655 -#: ../pyhoca/wxgui/frontend.py:979 +#: ../pyhoca/wxgui/frontend.py:655 ../pyhoca/wxgui/frontend.py:979 #, python-format msgid "%s - session warning" msgstr "%s - sessionsvarning" @@ -1073,13 +1047,14 @@ msgstr "%s - kanalfel" #: ../pyhoca/wxgui/frontend.py:953 #, python-format -msgid "Lost connection to server %s unexpectedly! Try to re-authenticate to the server..." -msgstr "Anslutning till %s avslutades oväntat! Försök återansluta till server..." +msgid "" +"Lost connection to server %s unexpectedly! Try to re-authenticate to the " +"server..." +msgstr "" +"Anslutning till %s avslutades oväntat! Försök återansluta till server..." -#: ../pyhoca/wxgui/frontend.py:964 -#: ../pyhoca/wxgui/frontend.py:971 -#: ../pyhoca/wxgui/frontend.py:973 -#: ../pyhoca/wxgui/frontend.py:985 +#: ../pyhoca/wxgui/frontend.py:964 ../pyhoca/wxgui/frontend.py:971 +#: ../pyhoca/wxgui/frontend.py:973 ../pyhoca/wxgui/frontend.py:985 #, python-format msgid "%s - session failure" msgstr "%s - session misslyckades" @@ -1104,13 +1079,20 @@ msgstr "" #: ../pyhoca/wxgui/frontend.py:979 #, python-format -msgid "Reverse TCP port forwarding request for session %s to server port %s has been denied." -msgstr "Omvänd TCP port forwarding för session %s till serverport %s har nekats." +msgid "" +"Reverse TCP port forwarding request for session %s to server port %s has " +"been denied." +msgstr "" +"Omvänd TCP port forwarding för session %s till serverport %s har nekats." #: ../pyhoca/wxgui/frontend.py:985 #, python-format -msgid "Forwarding tunnel request to [%s]:%s for session %s was denied by remote X2go/SSH server. Session startup failed." -msgstr "Begäran om tunnel till [%s]:%s för session %s nekades av X2Go/SSH-server. Sessionsstart misslyckades." +msgid "" +"Forwarding tunnel request to [%s]:%s for session %s was denied by remote " +"X2go/SSH server. Session startup failed." +msgstr "" +"Begäran om tunnel till [%s]:%s för session %s nekades av X2Go/SSH-server. " +"Sessionsstart misslyckades." #: ../pyhoca/wxgui/frontend.py:1000 #, python-format @@ -1118,11 +1100,11 @@ msgid "%s - audio warning" msgstr "%s - ljudvarning" #: ../pyhoca/wxgui/frontend.py:1000 -msgid "The X2Go PulseAudio system is not available within Remote Desktop sessions." +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:1003 -#: ../pyhoca/wxgui/frontend.py:1006 +#: ../pyhoca/wxgui/frontend.py:1003 ../pyhoca/wxgui/frontend.py:1006 #, python-format msgid "%s - audio error" msgstr "%s - ljudfel" @@ -1205,8 +1187,7 @@ msgstr "" "Klientdelade mappar och utskrifter kan ej delas med denna session.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1035 -#: ../pyhoca/wxgui/frontend.py:1037 +#: ../pyhoca/wxgui/frontend.py:1035 ../pyhoca/wxgui/frontend.py:1037 #, python-format msgid "%s - print error" msgstr "%s - utskriftsfel" @@ -1233,8 +1214,7 @@ msgstr "" "...orsakat av session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1041 -#: ../pyhoca/wxgui/frontend.py:1045 +#: ../pyhoca/wxgui/frontend.py:1041 ../pyhoca/wxgui/frontend.py:1045 #, python-format msgid "%s - start" msgstr "%s - startar" @@ -1257,8 +1237,7 @@ msgstr "" "En annan klient startade X2Go-session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1049 -#: ../pyhoca/wxgui/frontend.py:1053 +#: ../pyhoca/wxgui/frontend.py:1049 ../pyhoca/wxgui/frontend.py:1053 #, python-format msgid "%s - resume" msgstr "%s - återanslut" @@ -1354,8 +1333,7 @@ msgstr "Ja" msgid "No" msgstr "Nej" -#: ../pyhoca/wxgui/messages.py:103 -#: ../pyhoca/wxgui/printingprefs.py:133 +#: ../pyhoca/wxgui/messages.py:103 ../pyhoca/wxgui/printingprefs.py:133 msgid "Ok" msgstr "OK" hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits