x2go-commits January 2013

x2go-commits@lists.x2go.org

1 participants
160 discussions

python-x2go.git - master (branch) updated: 0.2.1.1-30-g5415362
by git-admin＠x2go.org 14 Jan '13

14 Jan '13

The branch, master has been updated via 5415362f73739312014478cb6b382369dbd3d5c7 (commit) from 4557a946e0a316c04d5f0c368c7137c2d15d8056 (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 5415362f73739312014478cb6b382369dbd3d5c7 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jan 14 02:55:49 2013 +0100 make it possible to use the unique host key aliases code without SSH proxy, as well ----------------------------------------------------------------------- Summary of changes: x2go/backends/control/_stdout.py | 3 +++ 1 file changed, 3 insertions(+) The diff of changes is: diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index 844efe2..a8e8fca 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -730,6 +730,9 @@ class X2GoControlSessionSTDOUT(paramiko.SSHClient): if unique_hostkey_aliases is not None: self.unique_hostkey_aliases = unique_hostkey_aliases + # prep the fake hostname with the real hostname, so we trigger the corresponding code path in + # x2go.checkhosts and either of its missing host key policies + _fake_hostname = "[%s]:%s" % (hostname, port) if use_sshproxy and sshproxy_host and sshproxy_user: try: 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.1.1-29-g4557a94
by git-admin＠x2go.org 14 Jan '13

14 Jan '13

The branch, master has been updated via 4557a946e0a316c04d5f0c368c7137c2d15d8056 (commit) from c30e67e43d69963013b04c27f73e641c671996a3 (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 4557a946e0a316c04d5f0c368c7137c2d15d8056 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jan 14 02:37:38 2013 +0100 fix __doc__ strings ----------------------------------------------------------------------- Summary of changes: x2go/backends/profiles/_file.py | 2 -- 1 file changed, 2 deletions(-) The diff of changes is: diff --git a/x2go/backends/profiles/_file.py b/x2go/backends/profiles/_file.py index e5f1432..fcf678f 100644 --- a/x2go/backends/profiles/_file.py +++ b/x2go/backends/profiles/_file.py @@ -376,8 +376,6 @@ class X2GoSessionProfilesFILE(inifiles.X2GoIniFile): @param profile_id_or_name: profile ID or profile name @type profile_id_or_name: C{str} - @param skip_writing: do not perform a write operation after deleting the session profile - @type skip_writing: C{bool} """ _profile_id = self.check_profile_id_or_name(profile_id_or_name) 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.1.1-28-gc30e67e
by git-admin＠x2go.org 14 Jan '13

14 Jan '13

The branch, master has been updated via c30e67e43d69963013b04c27f73e641c671996a3 (commit) from 7c04590d15e7b41656614a91288d538d28735066 (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 c30e67e43d69963013b04c27f73e641c671996a3 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jan 14 02:34:43 2013 +0100 Avoid false-positive notifications of dead control session directly after a disconnect request from the user. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2go/client.py | 16 +++++++++------- x2go/session.py | 7 +++---- 3 files changed, 14 insertions(+), 11 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index a1dc40a..87f6a60 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,8 @@ python-x2go (0.4.0.0-0~x2go1) UNRELEASED; urgency=low Re-arrange class structure for MissingHostKey policies, also provide an X2goAutoAddPolicy class. - Fix auto-starting and auto-resuming of sessions. + - Avoid false-positive notifications of dead control session directly after + a disconnect request from the user. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 20 Dec 2012 08:58:44 +0100 diff --git a/x2go/client.py b/x2go/client.py index 3f4c38c..3a091f2 100644 --- a/x2go/client.py +++ b/x2go/client.py @@ -1542,7 +1542,7 @@ class X2GoClient(object): return self.session_registry(session_uuid).resume(session_name=session_name, session_list=self._X2GoClient__list_sessions(session_uuid=session_uuid), **sessionopts) except x2go_exceptions.X2GoControlSessionException: profile_name = self.get_session_profile_name(session_uuid) - self.HOOK_on_control_session_death(profile_name) + if self.session_registry(session_uuid).connected: self.HOOK_on_control_session_death(profile_name) self.disconnect_profile(profile_name) __resume_session = resume_session @@ -1595,7 +1595,7 @@ class X2GoClient(object): return self.session_registry(session_uuid).control_session.suspend(session_name=session_name, **sessionopts) except x2go_exceptions.X2GoControlSessionException: profile_name = self.get_session_profile_name(session_uuid) - self.HOOK_on_control_session_death(profile_name) + if self.session_registry(session_uuid).conntected: self.HOOK_on_control_session_death(profile_name) self.disconnect_profile(profile_name) __suspend_session = suspend_session @@ -1647,7 +1647,7 @@ class X2GoClient(object): return self.session_registry(session_uuid).control_session.terminate(session_name=session_name, **sessionopts) except x2go_exceptions.X2GoControlSessionException: profile_name = self.get_session_profile_name(session_uuid) - self.HOOK_on_control_session_death(profile_name) + if self.session_registry(session_uuid).conntected: self.HOOK_on_control_session_death(profile_name) self.disconnect_profile(profile_name) __terminate_session = terminate_session @@ -2324,7 +2324,7 @@ class X2GoClient(object): return self.session_registry(session_uuid).is_alive() except x2go_exceptions.X2GoControlSessionException: profile_name = self.get_session_profile_name(session_uuid) - self.HOOK_on_control_session_death(profile_name) + if self.session_registry(session_uuid).conntected: self.HOOK_on_control_session_death(profile_name) self.disconnect_profile(profile_name) return False __server_is_alive = server_is_alive @@ -2900,7 +2900,7 @@ class X2GoClient(object): try: self.session_registry.update_status(profile_name=profile_name, session_list=session_list) except x2go_exceptions.X2GoControlSessionException: - self.HOOK_on_control_session_death(profile_name) + if self.session_registry(session_uuids[0]).connected: self.HOOK_on_control_session_death(profile_name) self.disconnect_profile(profile_name) __update_sessionregistry_status_by_profile_name = update_sessionregistry_status_by_profile_name @@ -2954,7 +2954,8 @@ class X2GoClient(object): try: self.listsessions_cache.update(profile_name, update_sessions=_update_sessions, update_desktops=_update_desktops, update_mounts=_update_mounts, ) except x2go_exceptions.X2GoControlSessionException: - self.HOOK_on_control_session_death(profile_name) + c_sessions = self.client_connected_sessions_of_profile_name(profile_name, return_objects=True) + if len(c_sessions) and c_sessions[0].connected: self.HOOK_on_control_session_death(profile_name) self.disconnect_profile(profile_name) __update_cache_by_profile_name = update_cache_by_profile_name @@ -3040,7 +3041,8 @@ class X2GoClient(object): try: self.session_registry.register_available_server_sessions(profile_name, session_list=session_list, re_register=re_register, skip_pubapp_sessions=skip_pubapp_sessions) except x2go_exceptions.X2GoControlSessionException, e: - self.HOOK_on_control_session_death(profile_name) + c_sessions = self.client_connected_sessions_of_profile_name(profile_name, return_objects=True) + if len(c_sessions) and c_sessions[0].connected: self.HOOK_on_control_session_death(profile_name) self.disconnect_profile(profile_name) raise e __register_available_server_sessions_by_profile_name = register_available_server_sessions_by_profile_name diff --git a/x2go/session.py b/x2go/session.py index 0328c41..2284c09 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -1432,7 +1432,7 @@ class X2GoSession(object): try: return self.control_session.list_sessions(raw=raw) except x2go_exceptions.X2GoControlSessionException: - self.HOOK_on_control_session_death() + if self.connected: self.HOOK_on_control_session_death() self._X2GoSession__disconnect() return None __list_sessions = list_sessions @@ -1452,7 +1452,7 @@ class X2GoSession(object): try: return self.control_session.list_desktops(raw=raw) except x2go_exceptions.X2GoControlSessionException: - self.HOOK_on_control_session_death() + if self.connected: self.HOOK_on_control_session_death() self._X2GoSession__disconnect() return None __list_desktops = list_desktops @@ -1473,7 +1473,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() + if self.connected: self.HOOK_on_control_session_death() self._X2GoSession__disconnect() return None __list_mounts = list_mounts @@ -1659,7 +1659,6 @@ class X2GoSession(object): if session_infos: sorted_session_names = utils.session_names_by_timestamp(session_infos) - print sorted_session_names if newest: if sorted_session_names[0].find('RDP') == -1: return self.resume(session_name=sorted_session_names[-1]) hooks/post-receive -- python-x2go.git (Python X2Go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2Go Client API).

1 0

pyhoca-gui.git - master (branch) updated: 0.2.1.1-41-g1f9b630
by git-admin＠x2go.org 14 Jan '13

14 Jan '13

The branch, master has been updated via 1f9b6304ae56a69d46c6748f221ed326f48065aa (commit) from c867d1838cbeb2cd08588e46ca29a2679f25159d (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 1f9b6304ae56a69d46c6748f221ed326f48065aa Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jan 14 02:34:05 2013 +0100 picky pyflakes looked at the pyhoca-gui code ----------------------------------------------------------------------- Summary of changes: pyhoca/wxgui/notify.py | 1 - pyhoca/wxgui/profilemanager.py | 1 - 2 files changed, 2 deletions(-) The diff of changes is: diff --git a/pyhoca/wxgui/notify.py b/pyhoca/wxgui/notify.py index 476842c..1dc2587 100644 --- a/pyhoca/wxgui/notify.py +++ b/pyhoca/wxgui/notify.py @@ -18,7 +18,6 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -import os import wx from x2go import X2GOCLIENT_OS from x2go import log diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index b0c07ec..504e33e 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -602,7 +602,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog): sizer_3_2_1.Add(self.SSHProxyPortLabel, pos=(4,3), flag=wx.ALIGN_CENTRE_VERTICAL) sizer_3_2_1.Add(self.SSHProxyPort, pos=(4,4), span=(1,2), flag=wx.ALIGN_CENTRE_VERTICAL) sizer_3_2_1.Add(self.SSHProxyAutoLogin, pos=(5,0), span=(1,6), flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_3_2_1_1 = wx.BoxSizer(wx.HORIZONTAL) sizer_3_2.Add(sizer_3_2_1, flag=wx.EXPAND|wx.ALL, border=7) sizer_3.Add(sizer_3_1, flag=wx.EXPAND|wx.ALL, border=5) hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

pyhoca-gui.git - master (branch) updated: 0.2.1.1-40-gc867d18
by git-admin＠x2go.org 14 Jan '13

14 Jan '13

The branch, master has been updated via c867d1838cbeb2cd08588e46ca29a2679f25159d (commit) from 6aad78f748de23f72065f4c09232f3447df27df9 (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 c867d1838cbeb2cd08588e46ca29a2679f25159d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jan 14 02:25:03 2013 +0100 only use ,,Connect Server'' in menu ----------------------------------------------------------------------- Summary of changes: pyhoca/wxgui/menus_taskbar.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py index 21ed35e..9aca407 100644 --- a/pyhoca/wxgui/menus_taskbar.py +++ b/pyhoca/wxgui/menus_taskbar.py @@ -975,7 +975,7 @@ class PyHocaGUI_Menu_TaskbarSessionManager(wx.Menu): ID_AUTHENTICATE = wx.NewId() ID_EXIT = wx.NewId() - _auth_menu_text = self._PyHocaGUI.start_on_connect and _(u'Start/Resume Session') or _(u'Connect Server') + _auth_menu_text = _(u'Connect Server') self.AppendMenu(id=ID_AUTHENTICATE, text=_auth_menu_text, submenu=PyHocaGUI_Menu_TaskbarProfileNames(self._PyHocaGUI, hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

pyhoca-gui.git - master (branch) updated: 0.2.1.1-39-g6aad78f
by git-admin＠x2go.org 14 Jan '13

14 Jan '13

The branch, master has been updated via 6aad78f748de23f72065f4c09232f3447df27df9 (commit) from 82047923404f6b180002ec9dfa009c1022e17856 (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 6aad78f748de23f72065f4c09232f3447df27df9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jan 14 02:07:58 2013 +0100 promise DirectRDP for 1.0.0.0 ----------------------------------------------------------------------- Summary of changes: po/PyHoca-GUI.pot | 2 +- po/bg.po | 2 +- po/da.po | 4 ++-- po/de.po | 4 ++-- po/en.po | 4 ++-- po/es.po | 4 ++-- po/fr.po | 2 +- po/nb_NO.po | 4 ++-- po/nl.po | 4 ++-- po/ru.po | 4 ++-- po/sv.po | 4 ++-- pyhoca/wxgui/frontend.py | 2 +- 12 files changed, 20 insertions(+), 20 deletions(-) The diff of changes is: diff --git a/po/PyHoca-GUI.pot b/po/PyHoca-GUI.pot index 5a36aa9..2a50ba6 100644 --- a/po/PyHoca-GUI.pot +++ b/po/PyHoca-GUI.pot @@ -1007,7 +1007,7 @@ msgid "" "Session profiles of type ,,DirectRDP'' are not\n" "supported by %s (%s), yet!!\n" "\n" -"DirectRDP support will be available in %s (>= 0.3.0.0)." +"DirectRDP support will be available in %s (>= 1.0.0.0)." msgstr "" #: ../pyhoca/wxgui/frontend.py:743 diff --git a/po/bg.po b/po/bg.po index 76f08dc..4851edb 100644 --- a/po/bg.po +++ b/po/bg.po @@ -1011,7 +1011,7 @@ msgid "" "Session profiles of type ,,DirectRDP'' are not\n" "supported by %s (%s), yet!!\n" "\n" -"DirectRDP support will be available in %s (>= 0.3.0.0)." +"DirectRDP support will be available in %s (>= 1.0.0.0)." msgstr "" #: ../pyhoca/wxgui/frontend.py:743 diff --git a/po/da.po b/po/da.po index b82bf56..abb5e2c 100644 --- a/po/da.po +++ b/po/da.po @@ -1023,14 +1023,14 @@ msgid "" "Session profiles of type ,,DirectRDP'' are not\n" "supported by %s (%s), yet!!\n" "\n" -"DirectRDP support will be available in %s (>= 0.3.0.0)." +"DirectRDP support will be available in %s (>= 1.0.0.0)." msgstr "" "Vi undskylder ulejligheden...\n" "\n" "Sessionsprofiler af typen ,,DirectRDP'' er ikke\n" "understøttet af %s (%s), endnu!!\n" "\n" -"DirectRDP understøttelse vil være tilgængelig i %s (>= 0.3.0.0)." +"DirectRDP understøttelse vil være tilgængelig i %s (>= 1.0.0.0)." #: ../pyhoca/wxgui/frontend.py:743 msgid "Unknown session profile, configure before using it..." diff --git a/po/de.po b/po/de.po index 588cea1..706c529 100644 --- a/po/de.po +++ b/po/de.po @@ -1030,14 +1030,14 @@ msgid "" "Session profiles of type ,,DirectRDP'' are not\n" "supported by %s (%s), yet!!\n" "\n" -"DirectRDP support will be available in %s (>= 0.3.0.0)." +"DirectRDP support will be available in %s (>= 1.0.0.0)." msgstr "" "Entschuldigung...\n" "\n" "Sitzungsprofile vom Typ ,,DirectRDP'' werden momentan von\n" "%s (%s) noch nicht unterstützt!!\n" "\n" -"DirectRDP wird in %s (>= 0.3.0.0) verfügbar sein." +"DirectRDP wird in %s (>= 1.0.0.0) verfügbar sein." #: ../pyhoca/wxgui/frontend.py:743 msgid "Unknown session profile, configure before using it..." diff --git a/po/en.po b/po/en.po index 408a1bd..610edeb 100644 --- a/po/en.po +++ b/po/en.po @@ -1022,14 +1022,14 @@ msgid "" "Session profiles of type ,,DirectRDP'' are not\n" "supported by %s (%s), yet!!\n" "\n" -"DirectRDP support will be available in %s (>= 0.3.0.0)." +"DirectRDP support will be available in %s (>= 1.0.0.0)." msgstr "" "We apologize for the inconvenience...\n" "\n" "Session profiles of type ,,DirectRDP'' are not\n" "supported by %s (%s), yet!!\n" "\n" -"DirectRDP support will be available in %s (>= 0.3.0.0)." +"DirectRDP support will be available in %s (>= 1.0.0.0)." #: ../pyhoca/wxgui/frontend.py:743 msgid "Unknown session profile, configure before using it..." diff --git a/po/es.po b/po/es.po index f67f2fa..4712e79 100644 --- a/po/es.po +++ b/po/es.po @@ -1039,14 +1039,14 @@ msgid "" "Session profiles of type ,,DirectRDP'' are not\n" "supported by %s (%s), yet!!\n" "\n" -"DirectRDP support will be available in %s (>= 0.3.0.0)." +"DirectRDP support will be available in %s (>= 1.0.0.0)." msgstr "" "Pedimos disculpas por los inconvenientes\n" "\n" "Los perfiles de sesión del tipo \"DirectRDP\" no están\n" "soportados por %s (%s) todavía\n" "\n" -"El soporte DirectRDP estará disponible en %s (>= 0.3.0.0)." +"El soporte DirectRDP estará disponible en %s (>= 1.0.0.0)." #: ../pyhoca/wxgui/frontend.py:743 msgid "Unknown session profile, configure before using it..." diff --git a/po/fr.po b/po/fr.po index 30b6351..e029875 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1011,7 +1011,7 @@ msgid "" "Session profiles of type ,,DirectRDP'' are not\n" "supported by %s (%s), yet!!\n" "\n" -"DirectRDP support will be available in %s (>= 0.3.0.0)." +"DirectRDP support will be available in %s (>= 1.0.0.0)." msgstr "" #: ../pyhoca/wxgui/frontend.py:743 diff --git a/po/nb_NO.po b/po/nb_NO.po index 7fdfd48..7c54bd2 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -1030,14 +1030,14 @@ msgid "" "Session profiles of type ,,DirectRDP'' are not\n" "supported by %s (%s), yet!!\n" "\n" -"DirectRDP support will be available in %s (>= 0.3.0.0)." +"DirectRDP support will be available in %s (>= 1.0.0.0)." msgstr "" "Vi beklager for det inntrufne... \n" "\n" "Sesjonsprofiler av typen ,,DirectRDP'' er ikke\n" "støttet av %s (%s), enda!\n" "\n" -"DirectRDP støtte vil være tilgjengelig i %s (>= 0.3.0.0)." +"DirectRDP støtte vil være tilgjengelig i %s (>= 1.0.0.0)." #: ../pyhoca/wxgui/frontend.py:743 msgid "Unknown session profile, configure before using it..." diff --git a/po/nl.po b/po/nl.po index 3edf198..406e52d 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1026,14 +1026,14 @@ msgid "" "Session profiles of type ,,DirectRDP'' are not\n" "supported by %s (%s), yet!!\n" "\n" -"DirectRDP support will be available in %s (>= 0.3.0.0)." +"DirectRDP support will be available in %s (>= 1.0.0.0)." msgstr "" "Excuses voor het ongemak...\n" "\n" "Sessie profielen voor DirectRDP worden door\n" "%s (%s) nog niet ondersteund!!\n" "\n" -"DirectRDP wordt ondersteund in %s (>= 0.3.0.0)." +"DirectRDP wordt ondersteund in %s (>= 1.0.0.0)." #: ../pyhoca/wxgui/frontend.py:743 msgid "Unknown session profile, configure before using it..." diff --git a/po/ru.po b/po/ru.po index ea6be6d..4972e07 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1033,14 +1033,14 @@ msgid "" "Session profiles of type ,,DirectRDP'' are not\n" "supported by %s (%s), yet!!\n" "\n" -"DirectRDP support will be available in %s (>= 0.3.0.0)." +"DirectRDP support will be available in %s (>= 1.0.0.0)." msgstr "" "Приносим наши извинения за неудобства...\n" "\n" "Профиль сессии типа ,,DirectRDP'' пока что\n" "не поддерживается %s (%s)!!\n" "\n" -"Поддержка DirectRDP будет доступна в %s (>= 0.3.0.0)." +"Поддержка DirectRDP будет доступна в %s (>= 1.0.0.0)." #: ../pyhoca/wxgui/frontend.py:743 msgid "Unknown session profile, configure before using it..." diff --git a/po/sv.po b/po/sv.po index 271d397..0242edf 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1026,14 +1026,14 @@ msgid "" "Session profiles of type ,,DirectRDP'' are not\n" "supported by %s (%s), yet!!\n" "\n" -"DirectRDP support will be available in %s (>= 0.3.0.0)." +"DirectRDP support will be available in %s (>= 1.0.0.0)." msgstr "" "Vi ber om ursäkt...\n" "\n" "Sessionsprofiler av typen \"DirectRDP\" stöds inte\n" "av %s (%s)!\n" "\n" -"Stöd för DirectRDP kommer i %s (>=0.3.0.0)" +"Stöd för DirectRDP kommer i %s (>=1.0.0.0)" #: ../pyhoca/wxgui/frontend.py:743 msgid "Unknown session profile, configure before using it..." diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index 42382f2..4254f26 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -728,7 +728,7 @@ class PyHocaGUI(wx.App, x2go.X2GoClient): if self.session_profiles.get_profile_config(profile_name)['directrdp']: m = messages.PyHoca_MessageWindow_Ok(self, title=_(u'%s: DirectRDP not supported yet') % self.appname, - msg=_(u"We apologize for the inconvenience...\n\nSession profiles of type ,,DirectRDP'' are not\nsupported by %s (%s), yet!!\n\nDirectRDP support will be available in %s (>= 0.3.0.0).") % (self.appname, self.version, self.appname), + msg=_(u"We apologize for the inconvenience...\n\nSession profiles of type ,,DirectRDP'' are not\nsupported by %s (%s), yet!!\n\nDirectRDP support will be available in %s (>= 1.0.0.0).") % (self.appname, self.version, self.appname), icon='warning', profile_name=profile_name) m.ShowModal() hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

python-x2go.git - master (branch) updated: 0.2.1.1-27-g7c04590
by git-admin＠x2go.org 14 Jan '13

14 Jan '13

The branch, master has been updated via 7c04590d15e7b41656614a91288d538d28735066 (commit) from 9a9712d918b999c87c2ff01b07b0526c3a855835 (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 7c04590d15e7b41656614a91288d538d28735066 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jan 14 01:41:12 2013 +0100 Fix auto-starting and auto-resuming of sessions. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/backends/control/_stdout.py | 3 +-- x2go/backends/proxy/_nx3.py | 4 ++-- x2go/backends/terminal/_stdout.py | 12 ++++++------ x2go/session.py | 8 ++++++-- 5 files changed, 16 insertions(+), 12 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index ccbd43b..a1dc40a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,7 @@ python-x2go (0.4.0.0-0~x2go1) UNRELEASED; urgency=low <hostname>:<port>. Update session profile IDs on hostname changes. Re-arrange class structure for MissingHostKey policies, also provide an X2goAutoAddPolicy class. + - Fix auto-starting and auto-resuming of sessions. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 20 Dec 2012 08:58:44 +0100 diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index 264e8b3..844efe2 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -1257,14 +1257,13 @@ class X2GoControlSessionSTDOUT(paramiko.SSHClient): if not self.is_x2gouser(self.get_transport().get_username()): raise x2go_exceptions.X2GoUserException('remote user %s is not allowed to run X2Go commands' % self.get_transport().get_username()) + session_info = None try: if session_name is not None: if session_list: session_info = session_list[session_name] else: session_info = self.list_sessions()[session_name] - else: - session_info = None except KeyError: _success = False diff --git a/x2go/backends/proxy/_nx3.py b/x2go/backends/proxy/_nx3.py index 67cc00e..ac57ff7 100644 --- a/x2go/backends/proxy/_nx3.py +++ b/x2go/backends/proxy/_nx3.py @@ -76,7 +76,7 @@ class X2GoProxyNX3(base.X2GoProxyBASE): "connect=127.0.0.1", "clipboard=1", "cookie=%s" % self.session_info.cookie, - "port=%d" % self.session_info.graphics_port, + "port=%s" % self.session_info.graphics_port, "errors=%s" % os.path.join(".", "..", "S-%s" % self.session_info.name, self.session_log, ), ] else: @@ -87,7 +87,7 @@ class X2GoProxyNX3(base.X2GoProxyBASE): "connect=127.0.0.1", "clipboard=1", "cookie=%s" % self.session_info.cookie, - "port=%d" % self.session_info.graphics_port, + "port=%s" % self.session_info.graphics_port, "errors=%s" % os.path.join(self.session_info.local_container, self.session_log, ), ] diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index 6044a56..0156700 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -1518,6 +1518,12 @@ class X2GoTerminalSessionSTDOUT(object): except IndexError: continue + # local path may be a Windows path, so we use the path separator of the local system + self.session_info.local_container = os.path.join(self.params.rootdir, 'S-%s' % self.session_info.name) + # remote path is always a UniX path... + self.session_info.remote_container = '%s/.x2go/C-%s' % (self.control_session._x2go_remote_home, + self.session_info.name, + ) self.proxy = self.proxy_backend(session_info=self.session_info, ssh_transport=self.control_session.get_transport(), sessions_rootdir=self.sessions_rootdir, @@ -1527,12 +1533,6 @@ class X2GoTerminalSessionSTDOUT(object): self.proxy_subprocess, proxy_ok = self.proxy.start_proxy() if proxy_ok: - # local path may be a Windows path, so we use the path separator of the local system - self.session_info.local_container = os.path.join(self.params.rootdir, 'S-%s' % self.session_info.name) - # remote path is always a UniX path... - self.session_info.remote_container = '%s/.x2go/C-%s' % (self.control_session._x2go_remote_home, - self.session_info.name, - ) self.params.depth = self.session_info.name.split('_')[2][2:] # on a session resume the user name comes in as a user ID. We have to translate this... diff --git a/x2go/session.py b/x2go/session.py index cf9a2ea..0328c41 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -1658,10 +1658,14 @@ class X2GoSession(object): del session_infos[session_name] if session_infos: + sorted_session_names = utils.session_names_by_timestamp(session_infos) + print sorted_session_names if newest: - return self.resume(session_name=utils.session_names_by_timestamp(session_infos)[-1]) + if sorted_session_names[0].find('RDP') == -1: + return self.resume(session_name=sorted_session_names[-1]) elif oldest: - return self.resume(session_name=utils.session_names_by_timestamp(session_infos)[-1]) + if sorted_session_names[-1].find('RDP') == -1: + return self.resume(session_name=sorted_session_names[0]) elif all_suspended: for session_name in [ _sn for _sn in session_infos.keys() if session_infos[_sn].is_suspended() ]: return self.resume(session_name=session_name) hooks/post-receive -- python-x2go.git (Python X2Go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2Go Client API).

1 0

pyhoca-gui.git - master (branch) updated: 0.2.1.1-38-g8204792
by git-admin＠x2go.org 14 Jan '13

14 Jan '13

The branch, master has been updated via 82047923404f6b180002ec9dfa009c1022e17856 (commit) via d2ac0cf2f987699d35a4b4f37566f9d4804a95c2 (commit) from 9d9e83cfdd5e0e5af32444f29ef851812dca21bd (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 82047923404f6b180002ec9dfa009c1022e17856 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jan 14 01:40:17 2013 +0100 Give control of auto-starting and auto-resuming fully into the hands of the session profiles. No extra cmdline options needed anymore to activate auto-starting/-resuming of sessions. commit d2ac0cf2f987699d35a4b4f37566f9d4804a95c2 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jan 14 01:39:04 2013 +0100 fix some i18n statements ----------------------------------------------------------------------- Summary of changes: build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo | Bin 550 -> 550 bytes build/mo/da/LC_MESSAGES/PyHoca-GUI.mo | Bin 23366 -> 23267 bytes build/mo/de/LC_MESSAGES/PyHoca-GUI.mo | Bin 26549 -> 26597 bytes build/mo/en/LC_MESSAGES/PyHoca-GUI.mo | Bin 24823 -> 24869 bytes build/mo/es/LC_MESSAGES/PyHoca-GUI.mo | Bin 24857 -> 24746 bytes build/mo/fr/LC_MESSAGES/PyHoca-GUI.mo | Bin 546 -> 546 bytes build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo | Bin 23771 -> 23670 bytes build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo | Bin 23448 -> 23353 bytes build/mo/ru/LC_MESSAGES/PyHoca-GUI.mo | Bin 28394 -> 28270 bytes build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo | Bin 23213 -> 23115 bytes debian/changelog | 3 +++ man/man1/pyhoca-gui.1 | 7 +++++-- po/PyHoca-GUI.pot | 4 ++-- po/bg.po | 4 ++-- po/da.po | 6 +++--- po/de.po | 6 +++--- po/en.po | 6 +++--- po/es.po | 6 +++--- po/fr.po | 4 ++-- po/nb_NO.po | 6 +++--- po/nl.po | 6 +++--- po/ru.po | 6 +++--- po/sv.po | 6 +++--- pyhoca-gui | 4 ++-- pyhoca/wxgui/frontend.py | 12 ++++++------ pyhoca/wxgui/profilemanager.py | 2 +- 26 files changed, 47 insertions(+), 41 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 86f85c8..fcec64e 100644 Binary files a/build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/da/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/da/LC_MESSAGES/PyHoca-GUI.mo index 7a9e44f..612cad6 100644 Binary files a/build/mo/da/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/da/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/de/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/de/LC_MESSAGES/PyHoca-GUI.mo index 538c9d5..cef4572 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 61682df..bbe235f 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 114d9f0..9a40aad 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/fr/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/fr/LC_MESSAGES/PyHoca-GUI.mo index 169cde9..bb650cd 100644 Binary files a/build/mo/fr/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/fr/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo index 1ef5a26..f616200 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 aeffa30..e9126d3 100644 Binary files a/build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/ru/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/ru/LC_MESSAGES/PyHoca-GUI.mo index 85116a5..b8a2bfa 100644 Binary files a/build/mo/ru/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/ru/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo index 8058add..1b036c1 100644 Binary files a/build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/debian/changelog b/debian/changelog index e5df2ed..8398714 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,9 @@ pyhoca-gui (0.4.0.0-0~x2go1) UNRELEASED; urgency=low manager. - Show ,,Start RDP sessions'' in menu if RDP (X2Go-proxied) has been selected as command. + - Give control of auto-starting and auto-resuming fully into the hands + of the session profiles. No extra cmdline options needed anymore to + activate auto-starting/-resuming of sessions. * /debian/control: + Thanks to Orion's patch in bug #91 we can drop many build dependencies. + Versioned Depend: on python-x2go (>= 0.4.0.0-0~). diff --git a/man/man1/pyhoca-gui.1 b/man/man1/pyhoca-gui.1 index 8f07e83..0d59829 100644 --- a/man/man1/pyhoca-gui.1 +++ b/man/man1/pyhoca-gui.1 @@ -101,13 +101,16 @@ Automatically add host key fingerprint to .ssh/known_hosts in case of "authentic Handle this option with care: Using it lessens the security/integrity of your SSH client setup. .TP \*(T<\fB\-\-start-on-connect\fR\*(T> -Start a session directly after authentication (only if no suspended sessions are available). +DEPRECATED: Start a session directly after authentication (only if no suspended sessions are available). This switch is now fully controlled from within +the session profiles. This option itself remains here for compatibility with older versions of \fBPyHoca-GUI\fR. .TP \*(T<\fB\-\-exit-on-disconnect\fR\*(T> Exit \fBpyhoca-gui\fR cleanly once a session has been disconnected. .TP \*(T<\fB\-\-resume-on-connect, \-\-resume-newest-on-connect\fR\*(T> -After authentication directly auto-resume the newest available running/suspended session. +DEPRECATED: After authentication directly auto-resume the newest available running/suspended session. This switch is now fully controlled from within +the session profiles, resuming the newest session is the hard-coded default. However, you can influence the resuming behaviour with the next two command line options. This option itself remains here +for compatibility with older versions of \fBPyHoca-GUI\fR. .TP \*(T<\fB\-\-resume-oldest-on-connect\fR\*(T> After authentication directly auto-resume the oldest available running/suspended session. diff --git a/po/PyHoca-GUI.pot b/po/PyHoca-GUI.pot index c9c6e9d..5a36aa9 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: 2013-01-14 00:53+0100\n" +"POT-Creation-Date: 2013-01-14 01:38+0100\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" @@ -328,7 +328,7 @@ msgstr "" #: ../pyhoca/wxgui/profilemanager.py:231 #, python-format -msgid "Login automatically after %s has started" +msgid "Login automatically after %s has started (needs --auto-connect)" msgstr "" #: ../pyhoca/wxgui/profilemanager.py:232 diff --git a/po/bg.po b/po/bg.po index fff2fc7..76f08dc 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: 2013-01-14 00:53+0100\n" +"POT-Creation-Date: 2013-01-14 01:38+0100\n" "PO-Revision-Date: 2011-09-17 02:17+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n" @@ -332,7 +332,7 @@ msgstr "" #: ../pyhoca/wxgui/profilemanager.py:231 #, python-format -msgid "Login automatically after %s has started" +msgid "Login automatically after %s has started (needs --auto-connect)" msgstr "" #: ../pyhoca/wxgui/profilemanager.py:232 diff --git a/po/da.po b/po/da.po index c02dec0..b82bf56 100644 --- a/po/da.po +++ b/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI 0.2.0.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-14 00:53+0100\n" +"POT-Creation-Date: 2013-01-14 01:38+0100\n" "PO-Revision-Date: 2012-12-07 13:16+0100\n" "Last-Translator: Christoffer Krakou <christoffer(a)fleten.net>\n" "Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n" @@ -337,8 +337,8 @@ msgid "Start session automatically after login" msgstr "Start session automatisk efter login" #: ../pyhoca/wxgui/profilemanager.py:231 -#, python-format -msgid "Login automatically after %s has started" +#, fuzzy, python-format +msgid "Login automatically after %s has started (needs --auto-connect)" msgstr "Log ind automatisk efter at %s er startet" #: ../pyhoca/wxgui/profilemanager.py:232 diff --git a/po/de.po b/po/de.po index 4ef35da..588cea1 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: 2013-01-14 00:53+0100\n" +"POT-Creation-Date: 2013-01-14 01:38+0100\n" "PO-Revision-Date: 2013-01-13 23:41+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n" @@ -340,8 +340,8 @@ msgstr "Sitzung nach Anmeldung automatisch starten" #: ../pyhoca/wxgui/profilemanager.py:231 #, python-format -msgid "Login automatically after %s has started" -msgstr "Automatisch anmelden nach %s Programmstart" +msgid "Login automatically after %s has started (needs --auto-connect)" +msgstr "Automatisch anmelden nach %s Programmstart (nur mit --auto-connect)" #: ../pyhoca/wxgui/profilemanager.py:232 msgid "Type" diff --git a/po/en.po b/po/en.po index b3c1f7e..408a1bd 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: 2013-01-14 00:53+0100\n" +"POT-Creation-Date: 2013-01-14 01:38+0100\n" "PO-Revision-Date: 2013-01-13 23:44+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n" @@ -340,8 +340,8 @@ msgstr "Start session automatically after login" #: ../pyhoca/wxgui/profilemanager.py:231 #, python-format -msgid "Login automatically after %s has started" -msgstr "Login automatically after %s has started" +msgid "Login automatically after %s has started (needs --auto-connect)" +msgstr "Login automatically after %s has started (needs --auto-connect)" #: ../pyhoca/wxgui/profilemanager.py:232 msgid "Type" diff --git a/po/es.po b/po/es.po index f83220f..f67f2fa 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: 2013-01-14 00:53+0100\n" +"POT-Creation-Date: 2013-01-14 01:38+0100\n" "PO-Revision-Date: 2012-11-26 14:23+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n" @@ -346,8 +346,8 @@ msgid "Start session automatically after login" msgstr "Iniciar sesión automáticamente tras el login" #: ../pyhoca/wxgui/profilemanager.py:231 -#, python-format -msgid "Login automatically after %s has started" +#, fuzzy, python-format +msgid "Login automatically after %s has started (needs --auto-connect)" msgstr "El inicio de sesión automático ha comenzado tras %s" #: ../pyhoca/wxgui/profilemanager.py:232 diff --git a/po/fr.po b/po/fr.po index 17dc158..30b6351 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-14 00:53+0100\n" +"POT-Creation-Date: 2013-01-14 01:38+0100\n" "PO-Revision-Date: 2011-09-17 02:17+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n" @@ -332,7 +332,7 @@ msgstr "" #: ../pyhoca/wxgui/profilemanager.py:231 #, python-format -msgid "Login automatically after %s has started" +msgid "Login automatically after %s has started (needs --auto-connect)" msgstr "" #: ../pyhoca/wxgui/profilemanager.py:232 diff --git a/po/nb_NO.po b/po/nb_NO.po index cba620b..7fdfd48 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: 2013-01-14 00:53+0100\n" +"POT-Creation-Date: 2013-01-14 01:38+0100\n" "PO-Revision-Date: 2012-11-26 14:24+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n" @@ -340,8 +340,8 @@ msgid "Start session automatically after login" msgstr "Start sesjonen automatisk etter innlogging" #: ../pyhoca/wxgui/profilemanager.py:231 -#, python-format -msgid "Login automatically after %s has started" +#, fuzzy, python-format +msgid "Login automatically after %s has started (needs --auto-connect)" msgstr "Logg inn automatisk etter at %s har startet" #: ../pyhoca/wxgui/profilemanager.py:232 diff --git a/po/nl.po b/po/nl.po index 221d5e9..3edf198 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: 2013-01-14 00:53+0100\n" +"POT-Creation-Date: 2013-01-14 01:38+0100\n" "PO-Revision-Date: 2012-11-26 14:23+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n" @@ -338,8 +338,8 @@ msgid "Start session automatically after login" msgstr "Start sessie automatisch na login" #: ../pyhoca/wxgui/profilemanager.py:231 -#, python-format -msgid "Login automatically after %s has started" +#, fuzzy, python-format +msgid "Login automatically after %s has started (needs --auto-connect)" msgstr "Login automatisch nadat %s is gestart" #: ../pyhoca/wxgui/profilemanager.py:232 diff --git a/po/ru.po b/po/ru.po index eefe3b4..ea6be6d 100644 --- a/po/ru.po +++ b/po/ru.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-14 00:53+0100\n" +"POT-Creation-Date: 2013-01-14 01:38+0100\n" "PO-Revision-Date: 2012-11-19 13:51+0100\n" "Last-Translator: Oleksandr Shneyder <o.shneyder(a)phoca-gmbh.de>\n" "Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n" @@ -342,8 +342,8 @@ msgid "Start session automatically after login" msgstr "Запускать сессию автоматически после входа" #: ../pyhoca/wxgui/profilemanager.py:231 -#, python-format -msgid "Login automatically after %s has started" +#, fuzzy, python-format +msgid "Login automatically after %s has started (needs --auto-connect)" msgstr "Автоматический вход после запуска %s" #: ../pyhoca/wxgui/profilemanager.py:232 diff --git a/po/sv.po b/po/sv.po index 97908fb..271d397 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: 2013-01-14 00:53+0100\n" +"POT-Creation-Date: 2013-01-14 01:38+0100\n" "PO-Revision-Date: 2012-11-26 14:24+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n" @@ -339,8 +339,8 @@ msgid "Start session automatically after login" msgstr "Starta session automatiskt efter inloggning" #: ../pyhoca/wxgui/profilemanager.py:231 -#, python-format -msgid "Login automatically after %s has started" +#, fuzzy, python-format +msgid "Login automatically after %s has started (needs --auto-connect)" msgstr "Logga in automatiskt när %s har startat" #: ../pyhoca/wxgui/profilemanager.py:232 diff --git a/pyhoca-gui b/pyhoca-gui index 9c54b38..0555dd6 100755 --- a/pyhoca-gui +++ b/pyhoca-gui @@ -207,9 +207,9 @@ x2go_gui_options = [ {'args':['--tray-icon-connecting'], 'default': None, 'metavar': '<your-logo-while-connecting>', 'help': 'define an alternative system tray icon file while connecting to a server (PNG files only, leave out file extension here, size 22x22 on Linux, 16x16 on Windows)', }, {'args':['--restricted-trayicon'], 'default': False, 'action': 'store_true', 'help': 'restricts session manager\'s main icon functionality to information window and application exit; on left-click only a minimal session menu is shown', }, {'args':['--add-to-known-hosts'], 'default': False, 'action': 'store_true', 'help': 'automatically add SSH host keys to the known_hosts files of the client-side user', }, - {'args':['--start-on-connect'], 'default': False, 'action': 'store_true', 'help': 'start a session directly after authentication if no session is currently running/suspended', }, + {'args':['--start-on-connect'], 'default': False, 'action': 'store_true', 'help': 'This is now the hard-coded default. start a session directly after authentication if no session is currently running/suspended', }, {'args':['--exit-on-disconnect'], 'default': False, 'action': 'store_true', 'help': 'exit the session manager after a server connection has died', }, - {'args':['--resume-newest-on-connect', '--resume-on-connect'], 'default': False, 'action': 'store_true', 'help': 'on connect auto-resume the newest suspended session', }, + {'args':['--resume-newest-on-connect', '--resume-on-connect'], 'default': False, 'action': 'store_true', 'help': 'This is now the hard-coded default. On connect auto-resume the newest suspended session', }, {'args':['--resume-oldest-on-connect'], 'default': False, 'action': 'store_true', 'help': 'on connect auto-resume the oldest suspended session', }, {'args':['--resume-all-on-connect'], 'default': False, 'action': 'store_true', 'help': 'auto-resume all suspended sessions on connect', }, {'args':['--disconnect-on-suspend'], 'default': False, 'action': 'store_true', 'help': 'disconnect a server if a session has been suspended', }, diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index f2d0cf1..42382f2 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -277,8 +277,8 @@ class PyHocaGUI(wx.App, x2go.X2GoClient): # cmd line options self.add_to_known_hosts = self.args.add_to_known_hosts self.auto_connect = self.args.auto_connect - self.start_on_connect = self.args.start_on_connect - self.resume_newest_on_connect = self.args.resume_newest_on_connect + self.start_on_connect = True + self.resume_newest_on_connect = True self.resume_oldest_on_connect = self.args.resume_oldest_on_connect self.resume_all_on_connect = self.args.resume_all_on_connect self.exit_on_disconnect = self.args.exit_on_disconnect @@ -404,12 +404,12 @@ class PyHocaGUI(wx.App, x2go.X2GoClient): """ if not self.get_session(session_uuid).published_applications: - if self.resume_newest_on_connect: - self._X2GoClient__session_auto_start_or_resume(session_uuid, newest=True, start=self.start_on_connect, **kwargs) - elif self.resume_oldest_on_connect: + if self.resume_oldest_on_connect: self._X2GoClient__session_auto_start_or_resume(session_uuid, newest=False, oldest=True, start=self.start_on_connect, **kwargs) - elif self.resume_all_on_connect: + if self.resume_all_on_connect: self._X2GoClient__session_auto_start_or_resume(session_uuid, newest=False, all_suspended=True, start=self.start_on_connect, **kwargs) + elif self.resume_newest_on_connect: + self._X2GoClient__session_auto_start_or_resume(session_uuid, newest=True, start=self.start_on_connect, **kwargs) def _exit_handler(self, *args): """\ diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index 7f926b9..b0c07ec 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -228,7 +228,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): ### widgets for the SESSION tab ### self.AutoStartSession = wx.CheckBox(self.tab_Session, -1, _(u"Start session automatically after login")) - self.AutoConnectSessionProfile = wx.CheckBox(self.tab_Session, -1, _(u"Login automatically after %s has started") % self._PyHocaGUI.appname) + self.AutoConnectSessionProfile = wx.CheckBox(self.tab_Session, -1, _(u"Login automatically after %s has started (needs --auto-connect)") % self._PyHocaGUI.appname) self.SessionTypeLabel = wx.StaticText(self.tab_Session, -1, _(u"Type")+": ") self.SessionType = wx.ComboBox(self.tab_Session, -1, choices=self.sessionChoices.values(), style=wx.CB_DROPDOWN|wx.CB_READONLY) self.ApplicationLabel = wx.StaticText(self.tab_Session, -1, _(u"Application")+": ") hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

pyhoca-gui.git - master (branch) updated: 0.2.1.1-36-g9d9e83c
by git-admin＠x2go.org 13 Jan '13

13 Jan '13

The branch, master has been updated via 9d9e83cfdd5e0e5af32444f29ef851812dca21bd (commit) from 019efe7d6b347dd6000439aa160167ab4a8c5b70 (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 9d9e83cfdd5e0e5af32444f29ef851812dca21bd Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jan 14 00:54:21 2013 +0100 Show ,,Start RDP sessions'' in menu if RDP (X2Go-proxied) has been selected as command. ----------------------------------------------------------------------- Summary of changes: build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo | Bin 550 -> 550 bytes build/mo/da/LC_MESSAGES/PyHoca-GUI.mo | Bin 23305 -> 23366 bytes build/mo/de/LC_MESSAGES/PyHoca-GUI.mo | Bin 26484 -> 26549 bytes build/mo/en/LC_MESSAGES/PyHoca-GUI.mo | Bin 24761 -> 24823 bytes build/mo/es/LC_MESSAGES/PyHoca-GUI.mo | Bin 24791 -> 24857 bytes build/mo/fr/LC_MESSAGES/PyHoca-GUI.mo | Bin 546 -> 546 bytes build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo | Bin 23711 -> 23771 bytes build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo | Bin 23382 -> 23448 bytes build/mo/ru/LC_MESSAGES/PyHoca-GUI.mo | Bin 28307 -> 28394 bytes build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo | Bin 23151 -> 23213 bytes debian/changelog | 2 + po/PyHoca-GUI.pot | 62 ++++--- po/bg.po | 62 ++++--- po/da.po | 63 ++++--- po/de.po | 292 ++++++++++++++++-------------- po/en.po | 253 +++++++++++++------------- po/es.po | 63 ++++--- po/fr.po | 62 ++++--- po/nb_NO.po | 63 ++++--- po/nl.po | 63 ++++--- po/ru.po | 63 ++++--- po/sv.po | 63 ++++--- pyhoca/wxgui/menus_taskbar.py | 3 + 23 files changed, 596 insertions(+), 518 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 c9b45c1..86f85c8 100644 Binary files a/build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/da/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/da/LC_MESSAGES/PyHoca-GUI.mo index 90d9932..7a9e44f 100644 Binary files a/build/mo/da/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/da/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/de/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/de/LC_MESSAGES/PyHoca-GUI.mo index 3d55717..538c9d5 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 b1f1ba4..61682df 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 655201a..114d9f0 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/fr/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/fr/LC_MESSAGES/PyHoca-GUI.mo index 65ca2a7..169cde9 100644 Binary files a/build/mo/fr/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/fr/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo index 9958e2c..1ef5a26 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 737f9bb..aeffa30 100644 Binary files a/build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/ru/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/ru/LC_MESSAGES/PyHoca-GUI.mo index 5b39069..85116a5 100644 Binary files a/build/mo/ru/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/ru/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo index 2ef20b3..8058add 100644 Binary files a/build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/debian/changelog b/debian/changelog index efbab0d..e5df2ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,8 @@ pyhoca-gui (0.4.0.0-0~x2go1) UNRELEASED; urgency=low to the client's known_hosts file. - Add checkbox for unique host key aliases feature to session profile manager. + - Show ,,Start RDP sessions'' in menu if RDP (X2Go-proxied) has been + selected as command. * /debian/control: + Thanks to Orion's patch in bug #91 we can drop many build dependencies. + Versioned Depend: on python-x2go (>= 0.4.0.0-0~). diff --git a/po/PyHoca-GUI.pot b/po/PyHoca-GUI.pot index a3ffbab..c9c6e9d 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: 2013-01-14 00:04+0100\n" +"POT-Creation-Date: 2013-01-14 00:53+0100\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" @@ -726,8 +726,8 @@ msgstr "" msgid "Client Options" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:160 ../pyhoca/wxgui/menus_taskbar.py:800 -#: ../pyhoca/wxgui/menus_taskbar.py:1005 +#: ../pyhoca/wxgui/menus_taskbar.py:160 ../pyhoca/wxgui/menus_taskbar.py:803 +#: ../pyhoca/wxgui/menus_taskbar.py:1008 msgid "E&xit" msgstr "" @@ -735,7 +735,7 @@ msgstr "" msgid "Window title" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:613 +#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:616 msgid "Resume Session" msgstr "" @@ -751,31 +751,31 @@ msgstr "" msgid "Transfer Session (not possible)" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:257 ../pyhoca/wxgui/menus_taskbar.py:604 +#: ../pyhoca/wxgui/menus_taskbar.py:257 ../pyhoca/wxgui/menus_taskbar.py:607 msgid "Suspend Session (and disconnect/exit)" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:259 ../pyhoca/wxgui/menus_taskbar.py:606 +#: ../pyhoca/wxgui/menus_taskbar.py:259 ../pyhoca/wxgui/menus_taskbar.py:609 msgid "Suspend Session (and disconnect)" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:261 ../pyhoca/wxgui/menus_taskbar.py:608 +#: ../pyhoca/wxgui/menus_taskbar.py:261 ../pyhoca/wxgui/menus_taskbar.py:611 msgid "Suspend Session" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:267 ../pyhoca/wxgui/menus_taskbar.py:617 +#: ../pyhoca/wxgui/menus_taskbar.py:267 ../pyhoca/wxgui/menus_taskbar.py:620 msgid "Terminate Session (and disconnect/exit)" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:269 ../pyhoca/wxgui/menus_taskbar.py:619 +#: ../pyhoca/wxgui/menus_taskbar.py:269 ../pyhoca/wxgui/menus_taskbar.py:622 msgid "Terminate Session (and disconnect)" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:271 ../pyhoca/wxgui/menus_taskbar.py:621 +#: ../pyhoca/wxgui/menus_taskbar.py:271 ../pyhoca/wxgui/menus_taskbar.py:624 msgid "Terminate Session" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:275 ../pyhoca/wxgui/menus_taskbar.py:601 +#: ../pyhoca/wxgui/menus_taskbar.py:275 ../pyhoca/wxgui/menus_taskbar.py:604 msgid "Refresh menu tree" msgstr "" @@ -860,79 +860,83 @@ msgstr "" msgid "Start &new Desktop Session" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:551 ../pyhoca/wxgui/menus_taskbar.py:689 +#: ../pyhoca/wxgui/menus_taskbar.py:551 ../pyhoca/wxgui/menus_taskbar.py:692 msgid "Retrieving Application Menu..." msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:555 ../pyhoca/wxgui/menus_taskbar.py:692 +#: ../pyhoca/wxgui/menus_taskbar.py:555 ../pyhoca/wxgui/menus_taskbar.py:695 msgid "Retrieve Application Menu" msgstr "" #: ../pyhoca/wxgui/menus_taskbar.py:558 +msgid "Start &new RDP Session" +msgstr "" + +#: ../pyhoca/wxgui/menus_taskbar.py:561 msgid "Start &new Session" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:638 +#: ../pyhoca/wxgui/menus_taskbar.py:641 msgid "Launch Single Application" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:676 +#: ../pyhoca/wxgui/menus_taskbar.py:679 msgid "Manage Application Menu" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:731 +#: ../pyhoca/wxgui/menus_taskbar.py:734 msgid "Running" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:733 +#: ../pyhoca/wxgui/menus_taskbar.py:736 msgid "Suspended" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:752 +#: ../pyhoca/wxgui/menus_taskbar.py:755 msgid "&Clean all sessions" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:758 +#: ../pyhoca/wxgui/menus_taskbar.py:761 msgid "Customize &profile" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:773 +#: ../pyhoca/wxgui/menus_taskbar.py:776 msgid "Shared &folders" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:785 +#: ../pyhoca/wxgui/menus_taskbar.py:788 msgid "&Disconnect from Server" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:792 +#: ../pyhoca/wxgui/menus_taskbar.py:795 msgid "Suspend Session and E&xit application" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:796 +#: ../pyhoca/wxgui/menus_taskbar.py:799 msgid "Disconnect and E&xit application" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:850 +#: ../pyhoca/wxgui/menus_taskbar.py:853 msgid "Add Profile" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:926 +#: ../pyhoca/wxgui/menus_taskbar.py:929 msgid "No session profiles defined" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:937 +#: ../pyhoca/wxgui/menus_taskbar.py:940 msgid "Export all Profiles" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:939 +#: ../pyhoca/wxgui/menus_taskbar.py:942 msgid "Export Profile Group" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:975 +#: ../pyhoca/wxgui/menus_taskbar.py:978 msgid "Start/Resume Session" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:975 +#: ../pyhoca/wxgui/menus_taskbar.py:978 msgid "Connect Server" msgstr "" diff --git a/po/bg.po b/po/bg.po index 7260db4..fff2fc7 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: 2013-01-13 23:25+0100\n" +"POT-Creation-Date: 2013-01-14 00:53+0100\n" "PO-Revision-Date: 2011-09-17 02:17+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n" @@ -730,8 +730,8 @@ msgstr "" msgid "Client Options" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:160 ../pyhoca/wxgui/menus_taskbar.py:800 -#: ../pyhoca/wxgui/menus_taskbar.py:1005 +#: ../pyhoca/wxgui/menus_taskbar.py:160 ../pyhoca/wxgui/menus_taskbar.py:803 +#: ../pyhoca/wxgui/menus_taskbar.py:1008 msgid "E&xit" msgstr "" @@ -739,7 +739,7 @@ msgstr "" msgid "Window title" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:613 +#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:616 msgid "Resume Session" msgstr "" @@ -755,31 +755,31 @@ msgstr "" msgid "Transfer Session (not possible)" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:257 ../pyhoca/wxgui/menus_taskbar.py:604 +#: ../pyhoca/wxgui/menus_taskbar.py:257 ../pyhoca/wxgui/menus_taskbar.py:607 msgid "Suspend Session (and disconnect/exit)" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:259 ../pyhoca/wxgui/menus_taskbar.py:606 +#: ../pyhoca/wxgui/menus_taskbar.py:259 ../pyhoca/wxgui/menus_taskbar.py:609 msgid "Suspend Session (and disconnect)" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:261 ../pyhoca/wxgui/menus_taskbar.py:608 +#: ../pyhoca/wxgui/menus_taskbar.py:261 ../pyhoca/wxgui/menus_taskbar.py:611 msgid "Suspend Session" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:267 ../pyhoca/wxgui/menus_taskbar.py:617 +#: ../pyhoca/wxgui/menus_taskbar.py:267 ../pyhoca/wxgui/menus_taskbar.py:620 msgid "Terminate Session (and disconnect/exit)" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:269 ../pyhoca/wxgui/menus_taskbar.py:619 +#: ../pyhoca/wxgui/menus_taskbar.py:269 ../pyhoca/wxgui/menus_taskbar.py:622 msgid "Terminate Session (and disconnect)" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:271 ../pyhoca/wxgui/menus_taskbar.py:621 +#: ../pyhoca/wxgui/menus_taskbar.py:271 ../pyhoca/wxgui/menus_taskbar.py:624 msgid "Terminate Session" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:275 ../pyhoca/wxgui/menus_taskbar.py:601 +#: ../pyhoca/wxgui/menus_taskbar.py:275 ../pyhoca/wxgui/menus_taskbar.py:604 msgid "Refresh menu tree" msgstr "" @@ -864,79 +864,83 @@ msgstr "" msgid "Start &new Desktop Session" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:551 ../pyhoca/wxgui/menus_taskbar.py:689 +#: ../pyhoca/wxgui/menus_taskbar.py:551 ../pyhoca/wxgui/menus_taskbar.py:692 msgid "Retrieving Application Menu..." msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:555 ../pyhoca/wxgui/menus_taskbar.py:692 +#: ../pyhoca/wxgui/menus_taskbar.py:555 ../pyhoca/wxgui/menus_taskbar.py:695 msgid "Retrieve Application Menu" msgstr "" #: ../pyhoca/wxgui/menus_taskbar.py:558 +msgid "Start &new RDP Session" +msgstr "" + +#: ../pyhoca/wxgui/menus_taskbar.py:561 msgid "Start &new Session" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:638 +#: ../pyhoca/wxgui/menus_taskbar.py:641 msgid "Launch Single Application" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:676 +#: ../pyhoca/wxgui/menus_taskbar.py:679 msgid "Manage Application Menu" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:731 +#: ../pyhoca/wxgui/menus_taskbar.py:734 msgid "Running" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:733 +#: ../pyhoca/wxgui/menus_taskbar.py:736 msgid "Suspended" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:752 +#: ../pyhoca/wxgui/menus_taskbar.py:755 msgid "&Clean all sessions" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:758 +#: ../pyhoca/wxgui/menus_taskbar.py:761 msgid "Customize &profile" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:773 +#: ../pyhoca/wxgui/menus_taskbar.py:776 msgid "Shared &folders" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:785 +#: ../pyhoca/wxgui/menus_taskbar.py:788 msgid "&Disconnect from Server" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:792 +#: ../pyhoca/wxgui/menus_taskbar.py:795 msgid "Suspend Session and E&xit application" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:796 +#: ../pyhoca/wxgui/menus_taskbar.py:799 msgid "Disconnect and E&xit application" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:850 +#: ../pyhoca/wxgui/menus_taskbar.py:853 msgid "Add Profile" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:926 +#: ../pyhoca/wxgui/menus_taskbar.py:929 msgid "No session profiles defined" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:937 +#: ../pyhoca/wxgui/menus_taskbar.py:940 msgid "Export all Profiles" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:939 +#: ../pyhoca/wxgui/menus_taskbar.py:942 msgid "Export Profile Group" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:975 +#: ../pyhoca/wxgui/menus_taskbar.py:978 msgid "Start/Resume Session" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:975 +#: ../pyhoca/wxgui/menus_taskbar.py:978 msgid "Connect Server" msgstr "" diff --git a/po/da.po b/po/da.po index 5dc81a9..c02dec0 100644 --- a/po/da.po +++ b/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI 0.2.0.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-13 23:25+0100\n" +"POT-Creation-Date: 2013-01-14 00:53+0100\n" "PO-Revision-Date: 2012-12-07 13:16+0100\n" "Last-Translator: Christoffer Krakou <christoffer(a)fleten.net>\n" "Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n" @@ -738,8 +738,8 @@ msgstr "Printerindstillinger" msgid "Client Options" msgstr "Klientparamentre" -#: ../pyhoca/wxgui/menus_taskbar.py:160 ../pyhoca/wxgui/menus_taskbar.py:800 -#: ../pyhoca/wxgui/menus_taskbar.py:1005 +#: ../pyhoca/wxgui/menus_taskbar.py:160 ../pyhoca/wxgui/menus_taskbar.py:803 +#: ../pyhoca/wxgui/menus_taskbar.py:1008 msgid "E&xit" msgstr "E&xit" @@ -747,7 +747,7 @@ msgstr "E&xit" msgid "Window title" msgstr "Vinduestitel" -#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:613 +#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:616 msgid "Resume Session" msgstr "Fortsæt Session" @@ -763,31 +763,31 @@ msgstr "Overfør Session" msgid "Transfer Session (not possible)" msgstr "Overfør Session (ikke muligt)" -#: ../pyhoca/wxgui/menus_taskbar.py:257 ../pyhoca/wxgui/menus_taskbar.py:604 +#: ../pyhoca/wxgui/menus_taskbar.py:257 ../pyhoca/wxgui/menus_taskbar.py:607 msgid "Suspend Session (and disconnect/exit)" msgstr "Suspendér Session (og afbryd forbindelse/luk)" -#: ../pyhoca/wxgui/menus_taskbar.py:259 ../pyhoca/wxgui/menus_taskbar.py:606 +#: ../pyhoca/wxgui/menus_taskbar.py:259 ../pyhoca/wxgui/menus_taskbar.py:609 msgid "Suspend Session (and disconnect)" msgstr "Suspendér Session (og afbryd forbindelse)" -#: ../pyhoca/wxgui/menus_taskbar.py:261 ../pyhoca/wxgui/menus_taskbar.py:608 +#: ../pyhoca/wxgui/menus_taskbar.py:261 ../pyhoca/wxgui/menus_taskbar.py:611 msgid "Suspend Session" msgstr "Suspendér Session" -#: ../pyhoca/wxgui/menus_taskbar.py:267 ../pyhoca/wxgui/menus_taskbar.py:617 +#: ../pyhoca/wxgui/menus_taskbar.py:267 ../pyhoca/wxgui/menus_taskbar.py:620 msgid "Terminate Session (and disconnect/exit)" msgstr "Terminér Session (og afbryd forbindelse/luk)" -#: ../pyhoca/wxgui/menus_taskbar.py:269 ../pyhoca/wxgui/menus_taskbar.py:619 +#: ../pyhoca/wxgui/menus_taskbar.py:269 ../pyhoca/wxgui/menus_taskbar.py:622 msgid "Terminate Session (and disconnect)" msgstr "Terminér Session (og afbryd forbindelse)" -#: ../pyhoca/wxgui/menus_taskbar.py:271 ../pyhoca/wxgui/menus_taskbar.py:621 +#: ../pyhoca/wxgui/menus_taskbar.py:271 ../pyhoca/wxgui/menus_taskbar.py:624 msgid "Terminate Session" msgstr "Terminér Session" -#: ../pyhoca/wxgui/menus_taskbar.py:275 ../pyhoca/wxgui/menus_taskbar.py:601 +#: ../pyhoca/wxgui/menus_taskbar.py:275 ../pyhoca/wxgui/menus_taskbar.py:604 msgid "Refresh menu tree" msgstr "Opfrisk menu" @@ -872,81 +872,85 @@ msgstr "Forbinder..." msgid "Start &new Desktop Session" msgstr "Start &ny Skrivebordssession" -#: ../pyhoca/wxgui/menus_taskbar.py:551 ../pyhoca/wxgui/menus_taskbar.py:689 +#: ../pyhoca/wxgui/menus_taskbar.py:551 ../pyhoca/wxgui/menus_taskbar.py:692 msgid "Retrieving Application Menu..." msgstr "Henter Applikationsmenu" -#: ../pyhoca/wxgui/menus_taskbar.py:555 ../pyhoca/wxgui/menus_taskbar.py:692 +#: ../pyhoca/wxgui/menus_taskbar.py:555 ../pyhoca/wxgui/menus_taskbar.py:695 msgid "Retrieve Application Menu" msgstr "Hent Applikationsmenu" #: ../pyhoca/wxgui/menus_taskbar.py:558 +msgid "Start &new RDP Session" +msgstr "Start &ny RDP Session" + +#: ../pyhoca/wxgui/menus_taskbar.py:561 msgid "Start &new Session" msgstr "Start &ny Session" -#: ../pyhoca/wxgui/menus_taskbar.py:638 +#: ../pyhoca/wxgui/menus_taskbar.py:641 msgid "Launch Single Application" msgstr "Start en enkelt Applikation" -#: ../pyhoca/wxgui/menus_taskbar.py:676 +#: ../pyhoca/wxgui/menus_taskbar.py:679 msgid "Manage Application Menu" msgstr "Håndter Applikationsmenu" -#: ../pyhoca/wxgui/menus_taskbar.py:731 +#: ../pyhoca/wxgui/menus_taskbar.py:734 msgid "Running" msgstr "Kører" -#: ../pyhoca/wxgui/menus_taskbar.py:733 +#: ../pyhoca/wxgui/menus_taskbar.py:736 msgid "Suspended" msgstr "Suspenderet" -#: ../pyhoca/wxgui/menus_taskbar.py:752 +#: ../pyhoca/wxgui/menus_taskbar.py:755 msgid "&Clean all sessions" msgstr "&Rens alle sessioner" -#: ../pyhoca/wxgui/menus_taskbar.py:758 +#: ../pyhoca/wxgui/menus_taskbar.py:761 msgid "Customize &profile" msgstr "Tilpas &profil" -#: ../pyhoca/wxgui/menus_taskbar.py:773 +#: ../pyhoca/wxgui/menus_taskbar.py:776 msgid "Shared &folders" msgstr "Delte &mapper" -#: ../pyhoca/wxgui/menus_taskbar.py:785 +#: ../pyhoca/wxgui/menus_taskbar.py:788 msgid "&Disconnect from Server" msgstr "&Afbryd forbindelse til Server" -#: ../pyhoca/wxgui/menus_taskbar.py:792 +#: ../pyhoca/wxgui/menus_taskbar.py:795 msgid "Suspend Session and E&xit application" msgstr "Suspendér Session og L&uk applikation" -#: ../pyhoca/wxgui/menus_taskbar.py:796 +#: ../pyhoca/wxgui/menus_taskbar.py:799 msgid "Disconnect and E&xit application" msgstr "Afbryd forbindese og L&uk programmet" -#: ../pyhoca/wxgui/menus_taskbar.py:850 +#: ../pyhoca/wxgui/menus_taskbar.py:853 msgid "Add Profile" msgstr "Tilføj Profil" -#: ../pyhoca/wxgui/menus_taskbar.py:926 +#: ../pyhoca/wxgui/menus_taskbar.py:929 msgid "No session profiles defined" msgstr "Ingen sessionsprofiler er defineret" -#: ../pyhoca/wxgui/menus_taskbar.py:937 +#: ../pyhoca/wxgui/menus_taskbar.py:940 #, fuzzy msgid "Export all Profiles" msgstr "Rediger Profil" -#: ../pyhoca/wxgui/menus_taskbar.py:939 +#: ../pyhoca/wxgui/menus_taskbar.py:942 #, fuzzy msgid "Export Profile Group" msgstr "Rediger Profil" -#: ../pyhoca/wxgui/menus_taskbar.py:975 +#: ../pyhoca/wxgui/menus_taskbar.py:978 msgid "Start/Resume Session" msgstr "Start/Genoptag Session" -#: ../pyhoca/wxgui/menus_taskbar.py:975 +#: ../pyhoca/wxgui/menus_taskbar.py:978 msgid "Connect Server" msgstr "Forbind Server" @@ -1012,6 +1016,7 @@ msgid "%s: DirectRDP not supported yet" msgstr "%s: DirektRDP er ikke undersøttet endnu" #: ../pyhoca/wxgui/frontend.py:731 +#, python-format msgid "" "We apologize for the inconvenience...\n" "\n" diff --git a/po/de.po b/po/de.po index 944c6d9..4ef35da 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: 2013-01-13 23:25+0100\n" +"POT-Creation-Date: 2013-01-14 00:53+0100\n" "PO-Revision-Date: 2013-01-13 23:41+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n" @@ -25,13 +25,11 @@ msgstr "" msgid "%s (via %s)" msgstr "%s (via %s)" -#: ../pyhoca/wxgui/logon.py:90 -#: ../pyhoca/wxgui/logon.py:102 +#: ../pyhoca/wxgui/logon.py:90 ../pyhoca/wxgui/logon.py:102 msgid "Username" msgstr "Benutzername" -#: ../pyhoca/wxgui/logon.py:92 -#: ../pyhoca/wxgui/logon.py:104 +#: ../pyhoca/wxgui/logon.py:92 ../pyhoca/wxgui/logon.py:104 msgid "Password" msgstr "Kennwort" @@ -51,28 +49,23 @@ msgstr "Sitzungslogin" msgid "SSH proxy server login" msgstr "Anmeldung an SSH Proxy" -#: ../pyhoca/wxgui/logon.py:127 -#: ../pyhoca/wxgui/profilemanager.py:357 -#: ../pyhoca/wxgui/messages.py:130 -#: ../pyhoca/wxgui/printingprefs.py:147 +#: ../pyhoca/wxgui/logon.py:127 ../pyhoca/wxgui/profilemanager.py:357 +#: ../pyhoca/wxgui/messages.py:130 ../pyhoca/wxgui/printingprefs.py:147 #: ../pyhoca/wxgui/sessiontitle.py:85 msgid "Cancel" msgstr "Abbrechen" -#: ../pyhoca/wxgui/logon.py:297 -#: ../pyhoca/wxgui/logon.py:339 +#: ../pyhoca/wxgui/logon.py:297 ../pyhoca/wxgui/logon.py:339 #: ../pyhoca/wxgui/frontend.py:608 #, python-format msgid "%s - connect failure" msgstr "%s - Verbindung fehlgeschlagen" -#: ../pyhoca/wxgui/logon.py:298 -#: ../pyhoca/wxgui/frontend.py:608 +#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:608 msgid "User is not allowed to start X2Go sessions!" msgstr "Benutzer darf keine X2Go Sitzungen starten!" -#: ../pyhoca/wxgui/logon.py:303 -#: ../pyhoca/wxgui/frontend.py:615 +#: ../pyhoca/wxgui/logon.py:303 ../pyhoca/wxgui/frontend.py:615 #, python-format msgid "%s - connect" msgstr "%s - verbinden" @@ -98,48 +91,45 @@ msgstr "%s - SSH Proxy" msgid "Authentication to the SSH proxy server failed!" msgstr "Anmeldung am SSH Proxy Server ist fehlgeschlagen" -#: ../pyhoca/wxgui/logon.py:376 -#: ../pyhoca/wxgui/frontend.py:666 +#: ../pyhoca/wxgui/logon.py:376 ../pyhoca/wxgui/frontend.py:666 #, python-format msgid "%s - socket error" msgstr "%s - Socket-Fehler" -#: ../pyhoca/wxgui/logon.py:383 -#: ../pyhoca/wxgui/frontend.py:645 +#: ../pyhoca/wxgui/logon.py:383 ../pyhoca/wxgui/frontend.py:645 #: ../pyhoca/wxgui/frontend.py:652 #, python-format msgid "%s - host key error" msgstr "%s - ungültiger Server-Schlüssel" -#: ../pyhoca/wxgui/logon.py:384 -#: ../pyhoca/wxgui/frontend.py:645 -msgid "The remote server's host key is invalid or has not been accepted by the user" -msgstr "Der Host-Schlüssel des X2Go Servers ist ungültig oder wurde vom Benutzer nicht akzeptiert" +#: ../pyhoca/wxgui/logon.py:384 ../pyhoca/wxgui/frontend.py:645 +msgid "" +"The remote server's host key is invalid or has not been accepted by the user" +msgstr "" +"Der Host-Schlüssel des X2Go Servers ist ungültig oder wurde vom Benutzer " +"nicht akzeptiert" -#: ../pyhoca/wxgui/logon.py:391 -#: ../pyhoca/wxgui/frontend.py:687 +#: ../pyhoca/wxgui/logon.py:391 ../pyhoca/wxgui/frontend.py:687 #, python-format msgid "%s - missing home directory" msgstr "%s - Benutzerverzeichnis nicht vorhanden" -#: ../pyhoca/wxgui/logon.py:392 -#: ../pyhoca/wxgui/frontend.py:687 +#: ../pyhoca/wxgui/logon.py:392 ../pyhoca/wxgui/frontend.py:687 msgid "The remote user's home directory does not exist." -msgstr "Das serverseitige Benutzerverzeichnis (HOME-Verzeichnis) existiert nicht." +msgstr "" +"Das serverseitige Benutzerverzeichnis (HOME-Verzeichnis) existiert nicht." #: ../pyhoca/wxgui/logon.py:399 #, python-format msgid "%s - key error" msgstr "%s - ungültiger Schlüssel" -#: ../pyhoca/wxgui/logon.py:407 -#: ../pyhoca/wxgui/frontend.py:694 +#: ../pyhoca/wxgui/logon.py:407 ../pyhoca/wxgui/frontend.py:694 #, python-format msgid "%s - auth error" msgstr "%s - Anmeldefehler" -#: ../pyhoca/wxgui/logon.py:415 -#: ../pyhoca/wxgui/frontend.py:638 +#: ../pyhoca/wxgui/logon.py:415 ../pyhoca/wxgui/frontend.py:638 #, python-format msgid "%s - SSH error" msgstr "%s - SSH-Fehler" @@ -229,28 +219,23 @@ msgstr "Windows Terminalserver (RDP via X2Go-Proxy)" msgid "Windows Terminal Server (Direct RDP)" msgstr "Windows Terminal Server (Direktes RDP)" -#: ../pyhoca/wxgui/profilemanager.py:90 -#: ../pyhoca/wxgui/profilemanager.py:236 +#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/profilemanager.py:236 msgid "Custom command" msgstr "Benutzerdef. Kommando" -#: ../pyhoca/wxgui/profilemanager.py:95 -#: ../pyhoca/wxgui/menus_taskbar.py:398 +#: ../pyhoca/wxgui/profilemanager.py:95 ../pyhoca/wxgui/menus_taskbar.py:398 msgid "Internet Browser" msgstr "Internetbrowser" -#: ../pyhoca/wxgui/profilemanager.py:96 -#: ../pyhoca/wxgui/menus_taskbar.py:399 +#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:399 msgid "Email Client" msgstr "E-Mail Programm" -#: ../pyhoca/wxgui/profilemanager.py:97 -#: ../pyhoca/wxgui/menus_taskbar.py:400 +#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:400 msgid "Office" msgstr "Büroprogramm (Office)" -#: ../pyhoca/wxgui/profilemanager.py:98 -#: ../pyhoca/wxgui/menus_taskbar.py:401 +#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:401 msgid "Terminal" msgstr "Terminalkonsole" @@ -380,7 +365,9 @@ msgstr "RDP Optionen" #: ../pyhoca/wxgui/profilemanager.py:244 msgid "Integrate remote application(s) into local desktop (rootless mode)" -msgstr "Serverseitige Anwendung(en) in lokalen Desktop integrieren (sog. rootless Modus)" +msgstr "" +"Serverseitige Anwendung(en) in lokalen Desktop integrieren (sog. rootless " +"Modus)" #: ../pyhoca/wxgui/profilemanager.py:245 msgid "Menu of published applications" @@ -389,18 +376,15 @@ msgstr "Menü mit Server-publizierten Anwendungen" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:252 -#: ../pyhoca/wxgui/profilemanager.py:265 +#: ../pyhoca/wxgui/profilemanager.py:252 ../pyhoca/wxgui/profilemanager.py:265 msgid "User" msgstr "Benutzer" -#: ../pyhoca/wxgui/profilemanager.py:254 -#: ../pyhoca/wxgui/profilemanager.py:273 +#: ../pyhoca/wxgui/profilemanager.py:254 ../pyhoca/wxgui/profilemanager.py:273 msgid "Host" msgstr "Hostname" -#: ../pyhoca/wxgui/profilemanager.py:256 -#: ../pyhoca/wxgui/profilemanager.py:275 +#: ../pyhoca/wxgui/profilemanager.py:256 ../pyhoca/wxgui/profilemanager.py:275 msgid "Port" msgstr "Port" @@ -430,7 +414,8 @@ msgstr "Verwende die gleichen Anmeldeinformationen für X2Go Server und Proxy" #: ../pyhoca/wxgui/profilemanager.py:269 msgid "Store SSH host keys under (unique) X2Go session profile ID" -msgstr "SSH Host-Schlüssel unter der (eindeutigen) X2Go Sitzungsprofil-ID speichern" +msgstr "" +"SSH Host-Schlüssel unter der (eindeutigen) X2Go Sitzungsprofil-ID speichern" #: ../pyhoca/wxgui/profilemanager.py:270 msgid "Key file" @@ -489,11 +474,17 @@ msgstr "DPI-Wert für Anzeige setzen" #: ../pyhoca/wxgui/profilemanager.py:303 msgid "Do not set (use server-side tools to configure the keyboard)" -msgstr "Keine Einstellungen (zum Konfigurieren der Tastatur müssen Server-seitige Tools verwendet werden)" +msgstr "" +"Keine Einstellungen (zum Konfigurieren der Tastatur müssen Server-seitige " +"Tools verwendet werden)" #: ../pyhoca/wxgui/profilemanager.py:304 -msgid "Automatically detect and use client-side keyboard configuration inside the session" -msgstr "Tastaturkonfiguration dieses Computers automatisch erkennen und in der Sitzung verwenden" +msgid "" +"Automatically detect and use client-side keyboard configuration inside the " +"session" +msgstr "" +"Tastaturkonfiguration dieses Computers automatisch erkennen und in der " +"Sitzung verwenden" #: ../pyhoca/wxgui/profilemanager.py:305 msgid "Use custom keyboard settings as provided below" @@ -549,8 +540,7 @@ msgstr "Freigabenliste nach Sitzungsende speichern" msgid "Path" msgstr "Pfad" -#: ../pyhoca/wxgui/profilemanager.py:330 -#: ../pyhoca/wxgui/profilemanager.py:351 +#: ../pyhoca/wxgui/profilemanager.py:330 ../pyhoca/wxgui/profilemanager.py:351 msgid "Add" msgstr "Hinzufügen" @@ -690,8 +680,7 @@ msgstr "Ordner zur Freigabe für Sitzungen auswählen" #: ../pyhoca/wxgui/profilemanager.py:2267 #: ../pyhoca/wxgui/profilemanager.py:2270 -#: ../pyhoca/wxgui/profilemanager.py:2273 -#: ../pyhoca/wxgui/menus_taskbar.py:122 +#: ../pyhoca/wxgui/profilemanager.py:2273 ../pyhoca/wxgui/menus_taskbar.py:122 msgid "Profile Manager" msgstr "Profilmanager" @@ -756,9 +745,8 @@ msgstr "Druckeinstellungen" msgid "Client Options" msgstr "Optionen" -#: ../pyhoca/wxgui/menus_taskbar.py:160 -#: ../pyhoca/wxgui/menus_taskbar.py:800 -#: ../pyhoca/wxgui/menus_taskbar.py:1005 +#: ../pyhoca/wxgui/menus_taskbar.py:160 ../pyhoca/wxgui/menus_taskbar.py:803 +#: ../pyhoca/wxgui/menus_taskbar.py:1008 msgid "E&xit" msgstr "&Beenden" @@ -766,8 +754,7 @@ msgstr "&Beenden" msgid "Window title" msgstr "Fenstertitel" -#: ../pyhoca/wxgui/menus_taskbar.py:238 -#: ../pyhoca/wxgui/menus_taskbar.py:613 +#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:616 msgid "Resume Session" msgstr "Sitzung fortsetzen" @@ -783,38 +770,31 @@ msgstr "Sitzung übernehmen" msgid "Transfer Session (not possible)" msgstr "Sitzung übernehmen (nicht möglich)" -#: ../pyhoca/wxgui/menus_taskbar.py:257 -#: ../pyhoca/wxgui/menus_taskbar.py:604 +#: ../pyhoca/wxgui/menus_taskbar.py:257 ../pyhoca/wxgui/menus_taskbar.py:607 msgid "Suspend Session (and disconnect/exit)" msgstr "Sitzung anhalten (und Verbindung trenen / Anwendung beenden)" -#: ../pyhoca/wxgui/menus_taskbar.py:259 -#: ../pyhoca/wxgui/menus_taskbar.py:606 +#: ../pyhoca/wxgui/menus_taskbar.py:259 ../pyhoca/wxgui/menus_taskbar.py:609 msgid "Suspend Session (and disconnect)" msgstr "Sitzungen anhalten (und Verbindung trennen)" -#: ../pyhoca/wxgui/menus_taskbar.py:261 -#: ../pyhoca/wxgui/menus_taskbar.py:608 +#: ../pyhoca/wxgui/menus_taskbar.py:261 ../pyhoca/wxgui/menus_taskbar.py:611 msgid "Suspend Session" msgstr "Sitzung anhalten" -#: ../pyhoca/wxgui/menus_taskbar.py:267 -#: ../pyhoca/wxgui/menus_taskbar.py:617 +#: ../pyhoca/wxgui/menus_taskbar.py:267 ../pyhoca/wxgui/menus_taskbar.py:620 msgid "Terminate Session (and disconnect/exit)" msgstr "Sitzung beenden (und Verbindung trennen / Anwendung beenden)" -#: ../pyhoca/wxgui/menus_taskbar.py:269 -#: ../pyhoca/wxgui/menus_taskbar.py:619 +#: ../pyhoca/wxgui/menus_taskbar.py:269 ../pyhoca/wxgui/menus_taskbar.py:622 msgid "Terminate Session (and disconnect)" msgstr "Sitzung beenden (und Verbindung trennen)" -#: ../pyhoca/wxgui/menus_taskbar.py:271 -#: ../pyhoca/wxgui/menus_taskbar.py:621 +#: ../pyhoca/wxgui/menus_taskbar.py:271 ../pyhoca/wxgui/menus_taskbar.py:624 msgid "Terminate Session" msgstr "Sitzung beenden" -#: ../pyhoca/wxgui/menus_taskbar.py:275 -#: ../pyhoca/wxgui/menus_taskbar.py:601 +#: ../pyhoca/wxgui/menus_taskbar.py:275 ../pyhoca/wxgui/menus_taskbar.py:604 msgid "Refresh menu tree" msgstr "Menübaum aktualisieren" @@ -886,8 +866,7 @@ msgstr "Dienstprogramme" msgid "Other Applications" msgstr "Weitere Anwendungen" -#: ../pyhoca/wxgui/menus_taskbar.py:526 -#: ../pyhoca/wxgui/menus_taskbar.py:538 +#: ../pyhoca/wxgui/menus_taskbar.py:526 ../pyhoca/wxgui/menus_taskbar.py:538 #, python-format msgid "Connect %s" msgstr "Mit %s verbinden" @@ -900,86 +879,87 @@ msgstr "Verbindung wird aufgebaut..." msgid "Start &new Desktop Session" msgstr "&Neue Desktopsitzung starten" -#: ../pyhoca/wxgui/menus_taskbar.py:551 -#: ../pyhoca/wxgui/menus_taskbar.py:689 +#: ../pyhoca/wxgui/menus_taskbar.py:551 ../pyhoca/wxgui/menus_taskbar.py:692 msgid "Retrieving Application Menu..." msgstr "Hole Anwendungsmenü..." -#: ../pyhoca/wxgui/menus_taskbar.py:555 -#: ../pyhoca/wxgui/menus_taskbar.py:692 +#: ../pyhoca/wxgui/menus_taskbar.py:555 ../pyhoca/wxgui/menus_taskbar.py:695 msgid "Retrieve Application Menu" msgstr "Hole Anwendungsmenü" #: ../pyhoca/wxgui/menus_taskbar.py:558 +msgid "Start &new RDP Session" +msgstr "&Neue RDP-Sitzung starten" + +#: ../pyhoca/wxgui/menus_taskbar.py:561 msgid "Start &new Session" msgstr "&Neue Sitzung starten" -#: ../pyhoca/wxgui/menus_taskbar.py:638 +#: ../pyhoca/wxgui/menus_taskbar.py:641 msgid "Launch Single Application" msgstr "Einzelne Anwendung starten" -#: ../pyhoca/wxgui/menus_taskbar.py:676 +#: ../pyhoca/wxgui/menus_taskbar.py:679 msgid "Manage Application Menu" msgstr "Anwendungsmenü verwalten" -#: ../pyhoca/wxgui/menus_taskbar.py:731 +#: ../pyhoca/wxgui/menus_taskbar.py:734 msgid "Running" msgstr "aktiv" -#: ../pyhoca/wxgui/menus_taskbar.py:733 +#: ../pyhoca/wxgui/menus_taskbar.py:736 msgid "Suspended" msgstr "angehalten" -#: ../pyhoca/wxgui/menus_taskbar.py:752 +#: ../pyhoca/wxgui/menus_taskbar.py:755 msgid "&Clean all sessions" msgstr "Alle Sitzungen beenden" -#: ../pyhoca/wxgui/menus_taskbar.py:758 +#: ../pyhoca/wxgui/menus_taskbar.py:761 msgid "Customize &profile" msgstr "Sitzungsprofil anpassen" -#: ../pyhoca/wxgui/menus_taskbar.py:773 +#: ../pyhoca/wxgui/menus_taskbar.py:776 msgid "Shared &folders" msgstr "Freigegebene Ordner" -#: ../pyhoca/wxgui/menus_taskbar.py:785 +#: ../pyhoca/wxgui/menus_taskbar.py:788 msgid "&Disconnect from Server" msgstr "Von Server trennen" -#: ../pyhoca/wxgui/menus_taskbar.py:792 +#: ../pyhoca/wxgui/menus_taskbar.py:795 msgid "Suspend Session and E&xit application" msgstr "Sitzung anhalten und Anwendung beenden" -#: ../pyhoca/wxgui/menus_taskbar.py:796 +#: ../pyhoca/wxgui/menus_taskbar.py:799 msgid "Disconnect and E&xit application" msgstr "Verbindung Trennen und Anwendung schließen" -#: ../pyhoca/wxgui/menus_taskbar.py:850 +#: ../pyhoca/wxgui/menus_taskbar.py:853 msgid "Add Profile" msgstr "Sitzungsprofil hinzufügen" -#: ../pyhoca/wxgui/menus_taskbar.py:926 +#: ../pyhoca/wxgui/menus_taskbar.py:929 msgid "No session profiles defined" msgstr "keine Sitzungsprofile definiert" -#: ../pyhoca/wxgui/menus_taskbar.py:937 +#: ../pyhoca/wxgui/menus_taskbar.py:940 msgid "Export all Profiles" msgstr "Alle Sitzungsprofile exportieren" -#: ../pyhoca/wxgui/menus_taskbar.py:939 +#: ../pyhoca/wxgui/menus_taskbar.py:942 msgid "Export Profile Group" msgstr "Sitzungsprofilgruppe exportieren" -#: ../pyhoca/wxgui/menus_taskbar.py:975 +#: ../pyhoca/wxgui/menus_taskbar.py:978 msgid "Start/Resume Session" msgstr "Sitzung starten/fortsetzen" -#: ../pyhoca/wxgui/menus_taskbar.py:975 +#: ../pyhoca/wxgui/menus_taskbar.py:978 msgid "Connect Server" msgstr "Serververbindung aufbauen" -#: ../pyhoca/wxgui/about.py:78 -#: ../pyhoca/wxgui/about.py:80 +#: ../pyhoca/wxgui/about.py:78 ../pyhoca/wxgui/about.py:80 #, python-format msgid "About %s ..." msgstr "Über %s ..." @@ -1011,8 +991,11 @@ msgid "SSH key authentication has been successful." msgstr "Authentifizierung mit SSH Schlüssel war erfolgreich." #: ../pyhoca/wxgui/frontend.py:652 -msgid "The SSH proxy's host key is invalid or has not been accepted by the user" -msgstr "Der Host-Schlüssel des SSH Proxy-Servers ist ungültig oder wurde vom Benutzer nicht akzeptiert" +msgid "" +"The SSH proxy's host key is invalid or has not been accepted by the user" +msgstr "" +"Der Host-Schlüssel des SSH Proxy-Servers ist ungültig oder wurde vom " +"Benutzer nicht akzeptiert" #: ../pyhoca/wxgui/frontend.py:673 #, python-format @@ -1021,7 +1004,9 @@ msgstr "%s - EOF-Fehler" #: ../pyhoca/wxgui/frontend.py:673 msgid "Authentication protocol communication incomplete! Try again..." -msgstr "Kommunikation während Authentifizierungsprotokoll unvollständig! Nochmal versuchen..." +msgstr "" +"Kommunikation während Authentifizierungsprotokoll unvollständig! Nochmal " +"versuchen..." #: ../pyhoca/wxgui/frontend.py:680 #, python-format @@ -1058,8 +1043,7 @@ msgstr "" msgid "Unknown session profile, configure before using it..." msgstr "Unbekanntes Sitzungsprofil, vor Benutzung bitte einrichten..." -#: ../pyhoca/wxgui/frontend.py:800 -#: ../pyhoca/wxgui/frontend.py:1413 +#: ../pyhoca/wxgui/frontend.py:800 ../pyhoca/wxgui/frontend.py:1413 #, python-format msgid "%s - session warning" msgstr "%s - Sitzungsfunktion eingeschränkt" @@ -1134,7 +1118,8 @@ msgstr "%s - Sitzungsprofilexport" #: ../pyhoca/wxgui/frontend.py:1126 #, python-format msgid "Successfully exported session profile group »%s« to file »%s«." -msgstr "Der Export der Sitzungsprofilgruppe ,,%s'' in Datei ,,%s'' war erfolgreich." +msgstr "" +"Der Export der Sitzungsprofilgruppe ,,%s'' in Datei ,,%s'' war erfolgreich." #: ../pyhoca/wxgui/frontend.py:1128 #, python-format @@ -1144,7 +1129,9 @@ msgstr "%s - Sitzungsprofilexport" #: ../pyhoca/wxgui/frontend.py:1128 #, python-format msgid "Successfully exported single session profile »%s« to file »%s«." -msgstr "Der Export des einzelnen Sitzungsprofils ,,%s'' in Datei ,,%s'' war erfolgreich." +msgstr "" +"Der Export des einzelnen Sitzungsprofils ,,%s'' in Datei ,,%s'' war " +"erfolgreich." #: ../pyhoca/wxgui/frontend.py:1132 #, python-format @@ -1162,7 +1149,8 @@ msgstr "" "Die/das ausgewählte(n) Sitzungsprofil(e) konnte(n) nicht exportiert\n" "werden in Datei ,,%s''.\n" "\n" -"Bitte häufige Fehlerursachen prüfen (Datenträger voll, unzureichender Zugriff, usw)." +"Bitte häufige Fehlerursachen prüfen (Datenträger voll, unzureichender " +"Zugriff, usw)." #: ../pyhoca/wxgui/frontend.py:1152 #, python-format @@ -1194,13 +1182,15 @@ msgstr "%s - Verbindungsfehler" #: ../pyhoca/wxgui/frontend.py:1358 #, python-format -msgid "Lost connection to server %s unexpectedly! Try to re-authenticate to the server..." -msgstr "Die Verbindung zum Server %s wurde unerwartet unterbrochen! Bitte versuchen Sie, sich neu am Server anzumelden..." +msgid "" +"Lost connection to server %s unexpectedly! Try to re-authenticate to the " +"server..." +msgstr "" +"Die Verbindung zum Server %s wurde unerwartet unterbrochen! Bitte versuchen " +"Sie, sich neu am Server anzumelden..." -#: ../pyhoca/wxgui/frontend.py:1376 -#: ../pyhoca/wxgui/frontend.py:1394 -#: ../pyhoca/wxgui/frontend.py:1396 -#: ../pyhoca/wxgui/frontend.py:1432 +#: ../pyhoca/wxgui/frontend.py:1376 ../pyhoca/wxgui/frontend.py:1394 +#: ../pyhoca/wxgui/frontend.py:1396 ../pyhoca/wxgui/frontend.py:1432 #, python-format msgid "%s - session failure" msgstr "%s - Verbindung fehlgeschlagen" @@ -1225,13 +1215,21 @@ msgstr "" #: ../pyhoca/wxgui/frontend.py:1413 #, python-format -msgid "Reverse TCP port forwarding request for session %s to server port %s has been denied." -msgstr "Eine Reverse TCP Port Weiterleitungsanfrage für Sitzung %s an Serverport %s wurde vom X2Go Server abgelehnt." +msgid "" +"Reverse TCP port forwarding request for session %s to server port %s has " +"been denied." +msgstr "" +"Eine Reverse TCP Port Weiterleitungsanfrage für Sitzung %s an Serverport %s " +"wurde vom X2Go Server abgelehnt." #: ../pyhoca/wxgui/frontend.py:1432 #, python-format -msgid "Forwarding tunnel request to [%s]:%s for session %s was denied by remote X2Go/SSH server. Session startup failed." -msgstr "SSH Forwarding Tunnel zu [%s]:%s wurde für Sitzung %s vom X2Go/SSH Server verweigert. Die Sitzung konnte nicht gestartet werden." +msgid "" +"Forwarding tunnel request to [%s]:%s for session %s was denied by remote " +"X2Go/SSH server. Session startup failed." +msgstr "" +"SSH Forwarding Tunnel zu [%s]:%s wurde für Sitzung %s vom X2Go/SSH Server " +"verweigert. Die Sitzung konnte nicht gestartet werden." #: ../pyhoca/wxgui/frontend.py:1451 #, python-format @@ -1239,11 +1237,13 @@ msgid "%s - audio warning" msgstr "%s - Warnung Audiosystem" #: ../pyhoca/wxgui/frontend.py:1451 -msgid "The X2Go PulseAudio system is not available within Remote Desktop sessions." -msgstr "Das X2Go PulseAudio System ist innerhalb von Remote Desktop Sitzungen nicht verfügbar." +msgid "" +"The X2Go PulseAudio system is not available within Remote Desktop sessions." +msgstr "" +"Das X2Go PulseAudio System ist innerhalb von Remote Desktop Sitzungen nicht " +"verfügbar." -#: ../pyhoca/wxgui/frontend.py:1458 -#: ../pyhoca/wxgui/frontend.py:1465 +#: ../pyhoca/wxgui/frontend.py:1458 ../pyhoca/wxgui/frontend.py:1465 #, python-format msgid "%s - audio error" msgstr "%s - Audiofehler" @@ -1281,7 +1281,8 @@ msgid "" "The server denies client-side printing from within this session.\n" "%s" msgstr "" -"In dieser Sitzung können Client-seitige Drucker nicht verwendet werden. Der Server verweigert die Verbindung.\n" +"In dieser Sitzung können Client-seitige Drucker nicht verwendet werden. Der " +"Server verweigert die Verbindung.\n" "%s" #: ../pyhoca/wxgui/frontend.py:1501 @@ -1309,7 +1310,8 @@ msgid "" "The server denies client-side folder sharing with this session.\n" "%s" msgstr "" -"Client-seitige Ordner können in dieser Sitzung nicht freigegeben werden. Der Server verweigert die Verbindung.\n" +"Client-seitige Ordner können in dieser Sitzung nicht freigegeben werden. Der " +"Server verweigert die Verbindung.\n" "%s" #: ../pyhoca/wxgui/frontend.py:1525 @@ -1323,11 +1325,11 @@ msgid "" "Client-side folders and printers cannot be shared with this session.\n" "%s" msgstr "" -"Client-seitige Ordner und Drucker können für diese Sitzung nicht freigegeben werden.\n" +"Client-seitige Ordner und Drucker können für diese Sitzung nicht freigegeben " +"werden.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1544 -#: ../pyhoca/wxgui/frontend.py:1546 +#: ../pyhoca/wxgui/frontend.py:1544 ../pyhoca/wxgui/frontend.py:1546 #, python-format msgid "%s - print error" msgstr "%s - Druckfehler" @@ -1354,8 +1356,7 @@ msgstr "" "...verursacht von Sitzung\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1561 -#: ../pyhoca/wxgui/frontend.py:1576 +#: ../pyhoca/wxgui/frontend.py:1561 ../pyhoca/wxgui/frontend.py:1576 #, python-format msgid "%s - start" msgstr "%s - starten" @@ -1378,8 +1379,7 @@ msgstr "" "Ein anderes X2Go Programm hat diese Sitzung gestartet\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1591 -#: ../pyhoca/wxgui/frontend.py:1606 +#: ../pyhoca/wxgui/frontend.py:1591 ../pyhoca/wxgui/frontend.py:1606 #, python-format msgid "%s - resume" msgstr "%s - fortsetzen" @@ -1477,8 +1477,7 @@ msgstr "Ja" msgid "No" msgstr "Nein" -#: ../pyhoca/wxgui/messages.py:124 -#: ../pyhoca/wxgui/printingprefs.py:142 +#: ../pyhoca/wxgui/messages.py:124 ../pyhoca/wxgui/printingprefs.py:142 msgid "Ok" msgstr "OK" @@ -1583,9 +1582,11 @@ msgstr "Ok" #~ msgid "SSH Proxy Tunnel" #~ msgstr "SSH-Proxytunnel" + #~ msgid "The SSH proxy configuration is incomplete. Try again." #~ msgstr "" #~ "Die SSH Proxy Konfiguration ist unvollständig. Bitte nochmal versuchen." + #~ msgid "" #~ "Another session profile (%s) already uses [%s]:%s for binding a local SSH " #~ "proxy to.\n" @@ -1602,60 +1603,82 @@ msgstr "Ok" #, fuzzy #~ msgid "Shared Resources" #~ msgstr "Freigegebene Ordner" + #~ msgid "RSA/DSA private key" #~ msgstr "Privater RSA/DSA Schlüssel" + #~ msgid "Host[:Port]" #~ msgstr "Hostname[:Port]" + #~ msgid "us" #~ msgstr "de" + #~ msgid "pc105/us" #~ msgstr "pc105/de" + #~ msgid "Keyboard layout" #~ msgstr "Tastaturlayout" + #~ msgid "%s - DNS error" #~ msgstr "%s - DNS-Fehler" + #~ msgid "still loading" #~ msgstr "wird geladen" + #~ msgid "" #~ "On slow connections, the loading of the application menu can take a " #~ "couple of seconds." #~ msgstr "" #~ "Bei einer langsamen Verbindung, kann die Ladezeit des Anwendungsmenüs " #~ "einige Zeit dauern." + #~ msgid "Disconnect and E&xit" #~ msgstr "Verbindung trennen und &beenden" + #~ msgid "%s - connect error" #~ msgstr "%s - Verbindungsfehler" + #~ msgid "Exiting..." #~ msgstr "Programm wird beendet..." + #~ msgid "Unknown Session Profile" #~ msgstr "Unbekanntes Sitzungsprofil" + #~ msgid "Network" #~ msgstr "Netzwerk" + #~ msgid "Retrieving Application menu..." #~ msgstr "Hole Anwendungsmenü..." + #~ msgid "RDP settings" #~ msgstr "RDP Einstellungen" + #~ msgid "Session Profile" #~ msgstr "Sitzungsprofil" + #~ msgid "" #~ "Set session window title (leave field below empty for default title from " #~ "server)" #~ msgstr "" #~ "Titel für Sitzungsfenster setzen (das folgende Feld freilassen für einen " #~ "Server-seitigen Titel)" + #~ msgid "Bring to Foreground" #~ msgstr "In den Vordergrund" + #~ msgid "Icon" #~ msgstr "Symbol" + #~ msgid "All session profiles are connected" #~ msgstr "Alle Sitzungsprofile sind bereits verbunden" #, fuzzy #~ msgid "New Profile" #~ msgstr "Profil" + #~ msgid "%s - print job" #~ msgstr "%s - Druckauftrag" + #~ msgid "" #~ "Opening print job dialog not implemented yet!!!\n" #~ "%s" @@ -1663,8 +1686,9 @@ msgstr "Ok" #~ "Druckdialog für eingehende Druckaufträge ist bislang nicht " #~ "implementiert!!!\n" #~ "%s" + #~ msgid "Profile icon" #~ msgstr "Profilsymbol" + #~ msgid "Arts" #~ msgstr "Arts" - diff --git a/po/en.po b/po/en.po index de9d6d0..b3c1f7e 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: 2013-01-13 23:25+0100\n" +"POT-Creation-Date: 2013-01-14 00:53+0100\n" "PO-Revision-Date: 2013-01-13 23:44+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n" @@ -25,13 +25,11 @@ msgstr "" msgid "%s (via %s)" msgstr "%s (via %s)" -#: ../pyhoca/wxgui/logon.py:90 -#: ../pyhoca/wxgui/logon.py:102 +#: ../pyhoca/wxgui/logon.py:90 ../pyhoca/wxgui/logon.py:102 msgid "Username" msgstr "Username" -#: ../pyhoca/wxgui/logon.py:92 -#: ../pyhoca/wxgui/logon.py:104 +#: ../pyhoca/wxgui/logon.py:92 ../pyhoca/wxgui/logon.py:104 msgid "Password" msgstr "Password" @@ -51,28 +49,23 @@ msgstr "Session login" msgid "SSH proxy server login" msgstr "SSH proxy server login" -#: ../pyhoca/wxgui/logon.py:127 -#: ../pyhoca/wxgui/profilemanager.py:357 -#: ../pyhoca/wxgui/messages.py:130 -#: ../pyhoca/wxgui/printingprefs.py:147 +#: ../pyhoca/wxgui/logon.py:127 ../pyhoca/wxgui/profilemanager.py:357 +#: ../pyhoca/wxgui/messages.py:130 ../pyhoca/wxgui/printingprefs.py:147 #: ../pyhoca/wxgui/sessiontitle.py:85 msgid "Cancel" msgstr "Cancel" -#: ../pyhoca/wxgui/logon.py:297 -#: ../pyhoca/wxgui/logon.py:339 +#: ../pyhoca/wxgui/logon.py:297 ../pyhoca/wxgui/logon.py:339 #: ../pyhoca/wxgui/frontend.py:608 #, python-format msgid "%s - connect failure" msgstr "%s - connect failure" -#: ../pyhoca/wxgui/logon.py:298 -#: ../pyhoca/wxgui/frontend.py:608 +#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:608 msgid "User is not allowed to start X2Go sessions!" msgstr "User is not allowed to start X2Go sessions!" -#: ../pyhoca/wxgui/logon.py:303 -#: ../pyhoca/wxgui/frontend.py:615 +#: ../pyhoca/wxgui/logon.py:303 ../pyhoca/wxgui/frontend.py:615 #, python-format msgid "%s - connect" msgstr "%s - connect" @@ -98,32 +91,29 @@ msgstr "%s - SSH proxy" msgid "Authentication to the SSH proxy server failed!" msgstr "Authentication to the SSH proxy server failed!" -#: ../pyhoca/wxgui/logon.py:376 -#: ../pyhoca/wxgui/frontend.py:666 +#: ../pyhoca/wxgui/logon.py:376 ../pyhoca/wxgui/frontend.py:666 #, python-format msgid "%s - socket error" msgstr "%s - socket error" -#: ../pyhoca/wxgui/logon.py:383 -#: ../pyhoca/wxgui/frontend.py:645 +#: ../pyhoca/wxgui/logon.py:383 ../pyhoca/wxgui/frontend.py:645 #: ../pyhoca/wxgui/frontend.py:652 #, python-format msgid "%s - host key error" msgstr "%s - host key error" -#: ../pyhoca/wxgui/logon.py:384 -#: ../pyhoca/wxgui/frontend.py:645 -msgid "The remote server's host key is invalid or has not been accepted by the user" -msgstr "The remote server's host key is invalid or has not been accepted by the user" +#: ../pyhoca/wxgui/logon.py:384 ../pyhoca/wxgui/frontend.py:645 +msgid "" +"The remote server's host key is invalid or has not been accepted by the user" +msgstr "" +"The remote server's host key is invalid or has not been accepted by the user" -#: ../pyhoca/wxgui/logon.py:391 -#: ../pyhoca/wxgui/frontend.py:687 +#: ../pyhoca/wxgui/logon.py:391 ../pyhoca/wxgui/frontend.py:687 #, python-format msgid "%s - missing home directory" msgstr "%s - missing home directory" -#: ../pyhoca/wxgui/logon.py:392 -#: ../pyhoca/wxgui/frontend.py:687 +#: ../pyhoca/wxgui/logon.py:392 ../pyhoca/wxgui/frontend.py:687 msgid "The remote user's home directory does not exist." msgstr "The remote user's home directory does not exist." @@ -132,14 +122,12 @@ msgstr "The remote user's home directory does not exist." msgid "%s - key error" msgstr "%s - key error" -#: ../pyhoca/wxgui/logon.py:407 -#: ../pyhoca/wxgui/frontend.py:694 +#: ../pyhoca/wxgui/logon.py:407 ../pyhoca/wxgui/frontend.py:694 #, python-format msgid "%s - auth error" msgstr "%s - auth error" -#: ../pyhoca/wxgui/logon.py:415 -#: ../pyhoca/wxgui/frontend.py:638 +#: ../pyhoca/wxgui/logon.py:415 ../pyhoca/wxgui/frontend.py:638 #, python-format msgid "%s - SSH error" msgstr "%s - SSH error" @@ -231,28 +219,23 @@ msgstr "Windows Terminal Server (X2Go-proxied RDP)" msgid "Windows Terminal Server (Direct RDP)" msgstr "Windows Terminal Server (Direct RDP)" -#: ../pyhoca/wxgui/profilemanager.py:90 -#: ../pyhoca/wxgui/profilemanager.py:236 +#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/profilemanager.py:236 msgid "Custom command" msgstr "Custom command" -#: ../pyhoca/wxgui/profilemanager.py:95 -#: ../pyhoca/wxgui/menus_taskbar.py:398 +#: ../pyhoca/wxgui/profilemanager.py:95 ../pyhoca/wxgui/menus_taskbar.py:398 msgid "Internet Browser" msgstr "Internet Browser" -#: ../pyhoca/wxgui/profilemanager.py:96 -#: ../pyhoca/wxgui/menus_taskbar.py:399 +#: ../pyhoca/wxgui/profilemanager.py:96 ../pyhoca/wxgui/menus_taskbar.py:399 msgid "Email Client" msgstr "Email Client" -#: ../pyhoca/wxgui/profilemanager.py:97 -#: ../pyhoca/wxgui/menus_taskbar.py:400 +#: ../pyhoca/wxgui/profilemanager.py:97 ../pyhoca/wxgui/menus_taskbar.py:400 msgid "Office" msgstr "Office" -#: ../pyhoca/wxgui/profilemanager.py:98 -#: ../pyhoca/wxgui/menus_taskbar.py:401 +#: ../pyhoca/wxgui/profilemanager.py:98 ../pyhoca/wxgui/menus_taskbar.py:401 msgid "Terminal" msgstr "Terminal" @@ -391,18 +374,15 @@ msgstr "Menu of published applications" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:252 -#: ../pyhoca/wxgui/profilemanager.py:265 +#: ../pyhoca/wxgui/profilemanager.py:252 ../pyhoca/wxgui/profilemanager.py:265 msgid "User" msgstr "User" -#: ../pyhoca/wxgui/profilemanager.py:254 -#: ../pyhoca/wxgui/profilemanager.py:273 +#: ../pyhoca/wxgui/profilemanager.py:254 ../pyhoca/wxgui/profilemanager.py:273 msgid "Host" msgstr "Host" -#: ../pyhoca/wxgui/profilemanager.py:256 -#: ../pyhoca/wxgui/profilemanager.py:275 +#: ../pyhoca/wxgui/profilemanager.py:256 ../pyhoca/wxgui/profilemanager.py:275 msgid "Port" msgstr "Port" @@ -494,8 +474,12 @@ msgid "Do not set (use server-side tools to configure the keyboard)" msgstr "Do not set (use server-side tools to configure the keyboard)" #: ../pyhoca/wxgui/profilemanager.py:304 -msgid "Automatically detect and use client-side keyboard configuration inside the session" -msgstr "Automatically detect and use client-side keyboard configuration inside the session" +msgid "" +"Automatically detect and use client-side keyboard configuration inside the " +"session" +msgstr "" +"Automatically detect and use client-side keyboard configuration inside the " +"session" #: ../pyhoca/wxgui/profilemanager.py:305 msgid "Use custom keyboard settings as provided below" @@ -551,8 +535,7 @@ msgstr "Store share list at end of session" msgid "Path" msgstr "Path" -#: ../pyhoca/wxgui/profilemanager.py:330 -#: ../pyhoca/wxgui/profilemanager.py:351 +#: ../pyhoca/wxgui/profilemanager.py:330 ../pyhoca/wxgui/profilemanager.py:351 msgid "Add" msgstr "Add" @@ -692,8 +675,7 @@ msgstr "Choose a folder to share within a session" #: ../pyhoca/wxgui/profilemanager.py:2267 #: ../pyhoca/wxgui/profilemanager.py:2270 -#: ../pyhoca/wxgui/profilemanager.py:2273 -#: ../pyhoca/wxgui/menus_taskbar.py:122 +#: ../pyhoca/wxgui/profilemanager.py:2273 ../pyhoca/wxgui/menus_taskbar.py:122 msgid "Profile Manager" msgstr "Profile Manager" @@ -758,9 +740,8 @@ msgstr "Printing Preferences" msgid "Client Options" msgstr "Client Options" -#: ../pyhoca/wxgui/menus_taskbar.py:160 -#: ../pyhoca/wxgui/menus_taskbar.py:800 -#: ../pyhoca/wxgui/menus_taskbar.py:1005 +#: ../pyhoca/wxgui/menus_taskbar.py:160 ../pyhoca/wxgui/menus_taskbar.py:803 +#: ../pyhoca/wxgui/menus_taskbar.py:1008 msgid "E&xit" msgstr "E&xit" @@ -768,8 +749,7 @@ msgstr "E&xit" msgid "Window title" msgstr "Window title" -#: ../pyhoca/wxgui/menus_taskbar.py:238 -#: ../pyhoca/wxgui/menus_taskbar.py:613 +#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:616 msgid "Resume Session" msgstr "Resume Session" @@ -785,38 +765,31 @@ msgstr "Transfer Session" msgid "Transfer Session (not possible)" msgstr "Transfer Session (not possible)" -#: ../pyhoca/wxgui/menus_taskbar.py:257 -#: ../pyhoca/wxgui/menus_taskbar.py:604 +#: ../pyhoca/wxgui/menus_taskbar.py:257 ../pyhoca/wxgui/menus_taskbar.py:607 msgid "Suspend Session (and disconnect/exit)" msgstr "Suspend Session (and disconnect/exit)" -#: ../pyhoca/wxgui/menus_taskbar.py:259 -#: ../pyhoca/wxgui/menus_taskbar.py:606 +#: ../pyhoca/wxgui/menus_taskbar.py:259 ../pyhoca/wxgui/menus_taskbar.py:609 msgid "Suspend Session (and disconnect)" msgstr "Suspend Session (and disconnect)" -#: ../pyhoca/wxgui/menus_taskbar.py:261 -#: ../pyhoca/wxgui/menus_taskbar.py:608 +#: ../pyhoca/wxgui/menus_taskbar.py:261 ../pyhoca/wxgui/menus_taskbar.py:611 msgid "Suspend Session" msgstr "Suspend Session" -#: ../pyhoca/wxgui/menus_taskbar.py:267 -#: ../pyhoca/wxgui/menus_taskbar.py:617 +#: ../pyhoca/wxgui/menus_taskbar.py:267 ../pyhoca/wxgui/menus_taskbar.py:620 msgid "Terminate Session (and disconnect/exit)" msgstr "Terminate Session (and disconnect/exit)" -#: ../pyhoca/wxgui/menus_taskbar.py:269 -#: ../pyhoca/wxgui/menus_taskbar.py:619 +#: ../pyhoca/wxgui/menus_taskbar.py:269 ../pyhoca/wxgui/menus_taskbar.py:622 msgid "Terminate Session (and disconnect)" msgstr "Terminate Session (and disconnect)" -#: ../pyhoca/wxgui/menus_taskbar.py:271 -#: ../pyhoca/wxgui/menus_taskbar.py:621 +#: ../pyhoca/wxgui/menus_taskbar.py:271 ../pyhoca/wxgui/menus_taskbar.py:624 msgid "Terminate Session" msgstr "Terminate Session" -#: ../pyhoca/wxgui/menus_taskbar.py:275 -#: ../pyhoca/wxgui/menus_taskbar.py:601 +#: ../pyhoca/wxgui/menus_taskbar.py:275 ../pyhoca/wxgui/menus_taskbar.py:604 msgid "Refresh menu tree" msgstr "Refresh menu tree" @@ -888,8 +861,7 @@ msgstr "Utilities" msgid "Other Applications" msgstr "Other Applications" -#: ../pyhoca/wxgui/menus_taskbar.py:526 -#: ../pyhoca/wxgui/menus_taskbar.py:538 +#: ../pyhoca/wxgui/menus_taskbar.py:526 ../pyhoca/wxgui/menus_taskbar.py:538 #, python-format msgid "Connect %s" msgstr "Connect %s" @@ -902,86 +874,87 @@ msgstr "Currently connecting..." msgid "Start &new Desktop Session" msgstr "Start &new Desktop Session" -#: ../pyhoca/wxgui/menus_taskbar.py:551 -#: ../pyhoca/wxgui/menus_taskbar.py:689 +#: ../pyhoca/wxgui/menus_taskbar.py:551 ../pyhoca/wxgui/menus_taskbar.py:692 msgid "Retrieving Application Menu..." msgstr "Retrieving Application Menu..." -#: ../pyhoca/wxgui/menus_taskbar.py:555 -#: ../pyhoca/wxgui/menus_taskbar.py:692 +#: ../pyhoca/wxgui/menus_taskbar.py:555 ../pyhoca/wxgui/menus_taskbar.py:695 msgid "Retrieve Application Menu" msgstr "Retrieve Application Menu" #: ../pyhoca/wxgui/menus_taskbar.py:558 +msgid "Start &new RDP Session" +msgstr "Start &new RDP Session" + +#: ../pyhoca/wxgui/menus_taskbar.py:561 msgid "Start &new Session" msgstr "Start &new Session" -#: ../pyhoca/wxgui/menus_taskbar.py:638 +#: ../pyhoca/wxgui/menus_taskbar.py:641 msgid "Launch Single Application" msgstr "Launch Single Application" -#: ../pyhoca/wxgui/menus_taskbar.py:676 +#: ../pyhoca/wxgui/menus_taskbar.py:679 msgid "Manage Application Menu" msgstr "Manage Application Menu" -#: ../pyhoca/wxgui/menus_taskbar.py:731 +#: ../pyhoca/wxgui/menus_taskbar.py:734 msgid "Running" msgstr "Running" -#: ../pyhoca/wxgui/menus_taskbar.py:733 +#: ../pyhoca/wxgui/menus_taskbar.py:736 msgid "Suspended" msgstr "Suspended" -#: ../pyhoca/wxgui/menus_taskbar.py:752 +#: ../pyhoca/wxgui/menus_taskbar.py:755 msgid "&Clean all sessions" msgstr "&Clean all sessions" -#: ../pyhoca/wxgui/menus_taskbar.py:758 +#: ../pyhoca/wxgui/menus_taskbar.py:761 msgid "Customize &profile" msgstr "Customize &profile" -#: ../pyhoca/wxgui/menus_taskbar.py:773 +#: ../pyhoca/wxgui/menus_taskbar.py:776 msgid "Shared &folders" msgstr "Shared &folders" -#: ../pyhoca/wxgui/menus_taskbar.py:785 +#: ../pyhoca/wxgui/menus_taskbar.py:788 msgid "&Disconnect from Server" msgstr "&Disconnect from Server" -#: ../pyhoca/wxgui/menus_taskbar.py:792 +#: ../pyhoca/wxgui/menus_taskbar.py:795 msgid "Suspend Session and E&xit application" msgstr "Suspend Session and E&xit application" -#: ../pyhoca/wxgui/menus_taskbar.py:796 +#: ../pyhoca/wxgui/menus_taskbar.py:799 msgid "Disconnect and E&xit application" msgstr "Disconnect and E&xit application" -#: ../pyhoca/wxgui/menus_taskbar.py:850 +#: ../pyhoca/wxgui/menus_taskbar.py:853 msgid "Add Profile" msgstr "Add Profile" -#: ../pyhoca/wxgui/menus_taskbar.py:926 +#: ../pyhoca/wxgui/menus_taskbar.py:929 msgid "No session profiles defined" msgstr "No session profiles defined" -#: ../pyhoca/wxgui/menus_taskbar.py:937 +#: ../pyhoca/wxgui/menus_taskbar.py:940 msgid "Export all Profiles" msgstr "Export all Profiles" -#: ../pyhoca/wxgui/menus_taskbar.py:939 +#: ../pyhoca/wxgui/menus_taskbar.py:942 msgid "Export Profile Group" msgstr "Export Profile Group" -#: ../pyhoca/wxgui/menus_taskbar.py:975 +#: ../pyhoca/wxgui/menus_taskbar.py:978 msgid "Start/Resume Session" msgstr "Start/Resume Session" -#: ../pyhoca/wxgui/menus_taskbar.py:975 +#: ../pyhoca/wxgui/menus_taskbar.py:978 msgid "Connect Server" msgstr "Connect Server" -#: ../pyhoca/wxgui/about.py:78 -#: ../pyhoca/wxgui/about.py:80 +#: ../pyhoca/wxgui/about.py:78 ../pyhoca/wxgui/about.py:80 #, python-format msgid "About %s ..." msgstr "About %s ..." @@ -1013,8 +986,10 @@ msgid "SSH key authentication has been successful." msgstr "SSH key authentication has been successful." #: ../pyhoca/wxgui/frontend.py:652 -msgid "The SSH proxy's host key is invalid or has not been accepted by the user" -msgstr "The SSH proxy's host key is invalid or has not been accepted by the user" +msgid "" +"The SSH proxy's host key is invalid or has not been accepted by the user" +msgstr "" +"The SSH proxy's host key is invalid or has not been accepted by the user" #: ../pyhoca/wxgui/frontend.py:673 #, python-format @@ -1060,8 +1035,7 @@ msgstr "" msgid "Unknown session profile, configure before using it..." msgstr "Unknown session profile, configure before using it..." -#: ../pyhoca/wxgui/frontend.py:800 -#: ../pyhoca/wxgui/frontend.py:1413 +#: ../pyhoca/wxgui/frontend.py:800 ../pyhoca/wxgui/frontend.py:1413 #, python-format msgid "%s - session warning" msgstr "%s - session warning" @@ -1196,13 +1170,15 @@ msgstr "%s - channel error" #: ../pyhoca/wxgui/frontend.py:1358 #, python-format -msgid "Lost connection to server %s unexpectedly! Try to re-authenticate to the server..." -msgstr "Lost connection to server %s unexpectedly! Try to re-authenticate to the server..." +msgid "" +"Lost connection to server %s unexpectedly! Try to re-authenticate to the " +"server..." +msgstr "" +"Lost connection to server %s unexpectedly! Try to re-authenticate to the " +"server..." -#: ../pyhoca/wxgui/frontend.py:1376 -#: ../pyhoca/wxgui/frontend.py:1394 -#: ../pyhoca/wxgui/frontend.py:1396 -#: ../pyhoca/wxgui/frontend.py:1432 +#: ../pyhoca/wxgui/frontend.py:1376 ../pyhoca/wxgui/frontend.py:1394 +#: ../pyhoca/wxgui/frontend.py:1396 ../pyhoca/wxgui/frontend.py:1432 #, python-format msgid "%s - session failure" msgstr "%s - session failure" @@ -1227,13 +1203,21 @@ msgstr "" #: ../pyhoca/wxgui/frontend.py:1413 #, python-format -msgid "Reverse TCP port forwarding request for session %s to server port %s has been denied." -msgstr "Reverse TCP port forwarding request for session %s to server port %s has been denied." +msgid "" +"Reverse TCP port forwarding request for session %s to server port %s has " +"been denied." +msgstr "" +"Reverse TCP port forwarding request for session %s to server port %s has " +"been denied." #: ../pyhoca/wxgui/frontend.py:1432 #, python-format -msgid "Forwarding tunnel request to [%s]:%s for session %s was denied by remote X2Go/SSH server. Session startup failed." -msgstr "Forwarding tunnel request to [%s]:%s for session %s was denied by remote X2Go/SSH server. Session startup failed." +msgid "" +"Forwarding tunnel request to [%s]:%s for session %s was denied by remote " +"X2Go/SSH server. Session startup failed." +msgstr "" +"Forwarding tunnel request to [%s]:%s for session %s was denied by remote " +"X2Go/SSH server. Session startup failed." #: ../pyhoca/wxgui/frontend.py:1451 #, python-format @@ -1241,11 +1225,12 @@ msgid "%s - audio warning" msgstr "%s - audio warning" #: ../pyhoca/wxgui/frontend.py:1451 -msgid "The X2Go PulseAudio system is not available within Remote Desktop sessions." -msgstr "The X2Go PulseAudio system is not available within Remote Desktop sessions." +msgid "" +"The X2Go PulseAudio system is not available within Remote Desktop sessions." +msgstr "" +"The X2Go PulseAudio system is not available within Remote Desktop sessions." -#: ../pyhoca/wxgui/frontend.py:1458 -#: ../pyhoca/wxgui/frontend.py:1465 +#: ../pyhoca/wxgui/frontend.py:1458 ../pyhoca/wxgui/frontend.py:1465 #, python-format msgid "%s - audio error" msgstr "%s - audio error" @@ -1328,8 +1313,7 @@ msgstr "" "Client-side folders and printers cannot be shared with this session.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1544 -#: ../pyhoca/wxgui/frontend.py:1546 +#: ../pyhoca/wxgui/frontend.py:1544 ../pyhoca/wxgui/frontend.py:1546 #, python-format msgid "%s - print error" msgstr "%s - print error" @@ -1356,8 +1340,7 @@ msgstr "" "...caused by session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1561 -#: ../pyhoca/wxgui/frontend.py:1576 +#: ../pyhoca/wxgui/frontend.py:1561 ../pyhoca/wxgui/frontend.py:1576 #, python-format msgid "%s - start" msgstr "%s - start" @@ -1380,8 +1363,7 @@ msgstr "" "Another client started X2Go session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1591 -#: ../pyhoca/wxgui/frontend.py:1606 +#: ../pyhoca/wxgui/frontend.py:1591 ../pyhoca/wxgui/frontend.py:1606 #, python-format msgid "%s - resume" msgstr "%s - resume" @@ -1478,8 +1460,7 @@ msgstr "Yes" msgid "No" msgstr "No" -#: ../pyhoca/wxgui/messages.py:124 -#: ../pyhoca/wxgui/printingprefs.py:142 +#: ../pyhoca/wxgui/messages.py:124 ../pyhoca/wxgui/printingprefs.py:142 msgid "Ok" msgstr "Ok" @@ -1584,8 +1565,10 @@ msgstr "OK" #~ msgid "SSH Proxy Tunnel" #~ msgstr "SSH Proxy Tunnel" + #~ msgid "The SSH proxy configuration is incomplete. Try again." #~ msgstr "The SSH proxy configuration is incomplete. Try again." + #~ msgid "" #~ "Another session profile (%s) already uses [%s]:%s for binding a local SSH " #~ "proxy to.\n" @@ -1602,66 +1585,90 @@ msgstr "OK" #, fuzzy #~ msgid "Shared Resources" #~ msgstr "Shared &folders" + #~ msgid "RSA/DSA private key" #~ msgstr "RSA/DSA private key" + #~ msgid "Host[:Port]" #~ msgstr "Host[:Port]" + #~ msgid "us" #~ msgstr "us" + #~ msgid "pc105/us" #~ msgstr "pc105/us" + #~ msgid "Keyboard layout" #~ msgstr "Keyboard layout" + #~ msgid "%s - DNS error" #~ msgstr "%s - DNS error" + #~ msgid "still loading" #~ msgstr "still loading" + #~ msgid "" #~ "On slow connections, the loading of the application menu can take a " #~ "couple of seconds." #~ msgstr "" #~ "On slow connections, the loading of the application menu can take a " #~ "couple of seconds." + #~ msgid "Disconnect and E&xit" #~ msgstr "Disconnect and E&xit" + #~ msgid "%s - connect error" #~ msgstr "%s - connect error" + #~ msgid "Exiting..." #~ msgstr "Exiting..." + #~ msgid "Unknown Session Profile" #~ msgstr "Unknown Session Profile" + #~ msgid "Network" #~ msgstr "Network" + #~ msgid "Retrieving Application menu..." #~ msgstr "Retrieving Application menu..." + #~ msgid "RDP settings" #~ msgstr "RDP settings" + #~ msgid "Session Profile" #~ msgstr "Session Profile" + #~ msgid "" #~ "Set session window title (leave field below empty for default title from " #~ "server)" #~ msgstr "" #~ "Set session window title (leave field below empty for default title from " #~ "server)" + #~ msgid "Bring to Foreground" #~ msgstr "Bring to Foreground" + #~ msgid "Icon" #~ msgstr "Icon" + #~ msgid "All session profiles are connected" #~ msgstr "All session profiles are connected" + #~ msgid "New Profile" #~ msgstr "New Profile" + #~ msgid "%s - print job" #~ msgstr "%s - print job" + #~ msgid "" #~ "Opening print job dialog not implemented yet!!!\n" #~ "%s" #~ msgstr "" #~ "Opening print job dialog not implemented yet!!!\n" #~ "%s" + #~ msgid "Profile icon" #~ msgstr "Profile icon" + #~ msgid "Arts" #~ msgstr "Arts" - diff --git a/po/es.po b/po/es.po index 9b1563c..f83220f 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: 2013-01-13 23:25+0100\n" +"POT-Creation-Date: 2013-01-14 00:53+0100\n" "PO-Revision-Date: 2012-11-26 14:23+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n" @@ -752,8 +752,8 @@ msgstr "Preferencias de impresión" msgid "Client Options" msgstr "Opciones del Cliente" -#: ../pyhoca/wxgui/menus_taskbar.py:160 ../pyhoca/wxgui/menus_taskbar.py:800 -#: ../pyhoca/wxgui/menus_taskbar.py:1005 +#: ../pyhoca/wxgui/menus_taskbar.py:160 ../pyhoca/wxgui/menus_taskbar.py:803 +#: ../pyhoca/wxgui/menus_taskbar.py:1008 msgid "E&xit" msgstr "S&alir" @@ -761,7 +761,7 @@ msgstr "S&alir" msgid "Window title" msgstr "Título de la ventana" -#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:613 +#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:616 msgid "Resume Session" msgstr "Retomar Sesión" @@ -777,31 +777,31 @@ msgstr "Transferir Sesión" msgid "Transfer Session (not possible)" msgstr "Transferir Sesión (no disponible)" -#: ../pyhoca/wxgui/menus_taskbar.py:257 ../pyhoca/wxgui/menus_taskbar.py:604 +#: ../pyhoca/wxgui/menus_taskbar.py:257 ../pyhoca/wxgui/menus_taskbar.py:607 msgid "Suspend Session (and disconnect/exit)" msgstr "Suspender Sesión (y desconectar/salir)" -#: ../pyhoca/wxgui/menus_taskbar.py:259 ../pyhoca/wxgui/menus_taskbar.py:606 +#: ../pyhoca/wxgui/menus_taskbar.py:259 ../pyhoca/wxgui/menus_taskbar.py:609 msgid "Suspend Session (and disconnect)" msgstr "Suspender Sesión (y desconectar)" -#: ../pyhoca/wxgui/menus_taskbar.py:261 ../pyhoca/wxgui/menus_taskbar.py:608 +#: ../pyhoca/wxgui/menus_taskbar.py:261 ../pyhoca/wxgui/menus_taskbar.py:611 msgid "Suspend Session" msgstr "Suspender Sesión" -#: ../pyhoca/wxgui/menus_taskbar.py:267 ../pyhoca/wxgui/menus_taskbar.py:617 +#: ../pyhoca/wxgui/menus_taskbar.py:267 ../pyhoca/wxgui/menus_taskbar.py:620 msgid "Terminate Session (and disconnect/exit)" msgstr "Finalizar Sesión (y desconectar/salir)" -#: ../pyhoca/wxgui/menus_taskbar.py:269 ../pyhoca/wxgui/menus_taskbar.py:619 +#: ../pyhoca/wxgui/menus_taskbar.py:269 ../pyhoca/wxgui/menus_taskbar.py:622 msgid "Terminate Session (and disconnect)" msgstr "Finalizar Sesión (y desconectar)" -#: ../pyhoca/wxgui/menus_taskbar.py:271 ../pyhoca/wxgui/menus_taskbar.py:621 +#: ../pyhoca/wxgui/menus_taskbar.py:271 ../pyhoca/wxgui/menus_taskbar.py:624 msgid "Terminate Session" msgstr "Finalizar Sesión" -#: ../pyhoca/wxgui/menus_taskbar.py:275 ../pyhoca/wxgui/menus_taskbar.py:601 +#: ../pyhoca/wxgui/menus_taskbar.py:275 ../pyhoca/wxgui/menus_taskbar.py:604 msgid "Refresh menu tree" msgstr "Actualizar árbol de menús" @@ -886,81 +886,85 @@ msgstr "Conectando..." msgid "Start &new Desktop Session" msgstr "Iniciar &nueva Sesión de Escritorio" -#: ../pyhoca/wxgui/menus_taskbar.py:551 ../pyhoca/wxgui/menus_taskbar.py:689 +#: ../pyhoca/wxgui/menus_taskbar.py:551 ../pyhoca/wxgui/menus_taskbar.py:692 msgid "Retrieving Application Menu..." msgstr "Recuperando Menú de Aplicación..." -#: ../pyhoca/wxgui/menus_taskbar.py:555 ../pyhoca/wxgui/menus_taskbar.py:692 +#: ../pyhoca/wxgui/menus_taskbar.py:555 ../pyhoca/wxgui/menus_taskbar.py:695 msgid "Retrieve Application Menu" msgstr "Recibido Menú de Aplicación" #: ../pyhoca/wxgui/menus_taskbar.py:558 +msgid "Start &new RDP Session" +msgstr "Iniciar &nueva Sesión RDP" + +#: ../pyhoca/wxgui/menus_taskbar.py:561 msgid "Start &new Session" msgstr "Iniciar &nueva Sesión" -#: ../pyhoca/wxgui/menus_taskbar.py:638 +#: ../pyhoca/wxgui/menus_taskbar.py:641 msgid "Launch Single Application" msgstr "Ejecutar la aplicación" -#: ../pyhoca/wxgui/menus_taskbar.py:676 +#: ../pyhoca/wxgui/menus_taskbar.py:679 msgid "Manage Application Menu" msgstr "Gestionar el Menú de la Aplicación" -#: ../pyhoca/wxgui/menus_taskbar.py:731 +#: ../pyhoca/wxgui/menus_taskbar.py:734 msgid "Running" msgstr "Activa" -#: ../pyhoca/wxgui/menus_taskbar.py:733 +#: ../pyhoca/wxgui/menus_taskbar.py:736 msgid "Suspended" msgstr "Suspendida" -#: ../pyhoca/wxgui/menus_taskbar.py:752 +#: ../pyhoca/wxgui/menus_taskbar.py:755 msgid "&Clean all sessions" msgstr "&Limpiar el registro de sesiones" -#: ../pyhoca/wxgui/menus_taskbar.py:758 +#: ../pyhoca/wxgui/menus_taskbar.py:761 msgid "Customize &profile" msgstr "Configurar &perfil" -#: ../pyhoca/wxgui/menus_taskbar.py:773 +#: ../pyhoca/wxgui/menus_taskbar.py:776 msgid "Shared &folders" msgstr "Compartir &carpetas" -#: ../pyhoca/wxgui/menus_taskbar.py:785 +#: ../pyhoca/wxgui/menus_taskbar.py:788 msgid "&Disconnect from Server" msgstr "&Desconectar del servidor" -#: ../pyhoca/wxgui/menus_taskbar.py:792 +#: ../pyhoca/wxgui/menus_taskbar.py:795 msgid "Suspend Session and E&xit application" msgstr "Suspender Sesión y Salir (e&xit) de la aplicación" -#: ../pyhoca/wxgui/menus_taskbar.py:796 +#: ../pyhoca/wxgui/menus_taskbar.py:799 msgid "Disconnect and E&xit application" msgstr "Desconectar y Salir (e&xit) de la aplicación" -#: ../pyhoca/wxgui/menus_taskbar.py:850 +#: ../pyhoca/wxgui/menus_taskbar.py:853 msgid "Add Profile" msgstr "Añadir Perfil" -#: ../pyhoca/wxgui/menus_taskbar.py:926 +#: ../pyhoca/wxgui/menus_taskbar.py:929 msgid "No session profiles defined" msgstr "No se han definido perfiles de sesión" -#: ../pyhoca/wxgui/menus_taskbar.py:937 +#: ../pyhoca/wxgui/menus_taskbar.py:940 #, fuzzy msgid "Export all Profiles" msgstr "Editar Perfil" -#: ../pyhoca/wxgui/menus_taskbar.py:939 +#: ../pyhoca/wxgui/menus_taskbar.py:942 #, fuzzy msgid "Export Profile Group" msgstr "Editar Perfil" -#: ../pyhoca/wxgui/menus_taskbar.py:975 +#: ../pyhoca/wxgui/menus_taskbar.py:978 msgid "Start/Resume Session" msgstr "Iniciar/Retomar Sesión" -#: ../pyhoca/wxgui/menus_taskbar.py:975 +#: ../pyhoca/wxgui/menus_taskbar.py:978 msgid "Connect Server" msgstr "Conectar con el Servidor" @@ -1028,6 +1032,7 @@ msgid "%s: DirectRDP not supported yet" msgstr "%s; Sin soporte DirectRDP todavía" #: ../pyhoca/wxgui/frontend.py:731 +#, python-format msgid "" "We apologize for the inconvenience...\n" "\n" diff --git a/po/fr.po b/po/fr.po index 40dd3cd..17dc158 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-13 23:25+0100\n" +"POT-Creation-Date: 2013-01-14 00:53+0100\n" "PO-Revision-Date: 2011-09-17 02:17+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n" @@ -730,8 +730,8 @@ msgstr "" msgid "Client Options" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:160 ../pyhoca/wxgui/menus_taskbar.py:800 -#: ../pyhoca/wxgui/menus_taskbar.py:1005 +#: ../pyhoca/wxgui/menus_taskbar.py:160 ../pyhoca/wxgui/menus_taskbar.py:803 +#: ../pyhoca/wxgui/menus_taskbar.py:1008 msgid "E&xit" msgstr "" @@ -739,7 +739,7 @@ msgstr "" msgid "Window title" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:613 +#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:616 msgid "Resume Session" msgstr "" @@ -755,31 +755,31 @@ msgstr "" msgid "Transfer Session (not possible)" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:257 ../pyhoca/wxgui/menus_taskbar.py:604 +#: ../pyhoca/wxgui/menus_taskbar.py:257 ../pyhoca/wxgui/menus_taskbar.py:607 msgid "Suspend Session (and disconnect/exit)" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:259 ../pyhoca/wxgui/menus_taskbar.py:606 +#: ../pyhoca/wxgui/menus_taskbar.py:259 ../pyhoca/wxgui/menus_taskbar.py:609 msgid "Suspend Session (and disconnect)" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:261 ../pyhoca/wxgui/menus_taskbar.py:608 +#: ../pyhoca/wxgui/menus_taskbar.py:261 ../pyhoca/wxgui/menus_taskbar.py:611 msgid "Suspend Session" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:267 ../pyhoca/wxgui/menus_taskbar.py:617 +#: ../pyhoca/wxgui/menus_taskbar.py:267 ../pyhoca/wxgui/menus_taskbar.py:620 msgid "Terminate Session (and disconnect/exit)" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:269 ../pyhoca/wxgui/menus_taskbar.py:619 +#: ../pyhoca/wxgui/menus_taskbar.py:269 ../pyhoca/wxgui/menus_taskbar.py:622 msgid "Terminate Session (and disconnect)" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:271 ../pyhoca/wxgui/menus_taskbar.py:621 +#: ../pyhoca/wxgui/menus_taskbar.py:271 ../pyhoca/wxgui/menus_taskbar.py:624 msgid "Terminate Session" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:275 ../pyhoca/wxgui/menus_taskbar.py:601 +#: ../pyhoca/wxgui/menus_taskbar.py:275 ../pyhoca/wxgui/menus_taskbar.py:604 msgid "Refresh menu tree" msgstr "" @@ -864,79 +864,83 @@ msgstr "" msgid "Start &new Desktop Session" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:551 ../pyhoca/wxgui/menus_taskbar.py:689 +#: ../pyhoca/wxgui/menus_taskbar.py:551 ../pyhoca/wxgui/menus_taskbar.py:692 msgid "Retrieving Application Menu..." msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:555 ../pyhoca/wxgui/menus_taskbar.py:692 +#: ../pyhoca/wxgui/menus_taskbar.py:555 ../pyhoca/wxgui/menus_taskbar.py:695 msgid "Retrieve Application Menu" msgstr "" #: ../pyhoca/wxgui/menus_taskbar.py:558 +msgid "Start &new RDP Session" +msgstr "" + +#: ../pyhoca/wxgui/menus_taskbar.py:561 msgid "Start &new Session" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:638 +#: ../pyhoca/wxgui/menus_taskbar.py:641 msgid "Launch Single Application" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:676 +#: ../pyhoca/wxgui/menus_taskbar.py:679 msgid "Manage Application Menu" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:731 +#: ../pyhoca/wxgui/menus_taskbar.py:734 msgid "Running" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:733 +#: ../pyhoca/wxgui/menus_taskbar.py:736 msgid "Suspended" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:752 +#: ../pyhoca/wxgui/menus_taskbar.py:755 msgid "&Clean all sessions" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:758 +#: ../pyhoca/wxgui/menus_taskbar.py:761 msgid "Customize &profile" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:773 +#: ../pyhoca/wxgui/menus_taskbar.py:776 msgid "Shared &folders" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:785 +#: ../pyhoca/wxgui/menus_taskbar.py:788 msgid "&Disconnect from Server" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:792 +#: ../pyhoca/wxgui/menus_taskbar.py:795 msgid "Suspend Session and E&xit application" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:796 +#: ../pyhoca/wxgui/menus_taskbar.py:799 msgid "Disconnect and E&xit application" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:850 +#: ../pyhoca/wxgui/menus_taskbar.py:853 msgid "Add Profile" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:926 +#: ../pyhoca/wxgui/menus_taskbar.py:929 msgid "No session profiles defined" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:937 +#: ../pyhoca/wxgui/menus_taskbar.py:940 msgid "Export all Profiles" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:939 +#: ../pyhoca/wxgui/menus_taskbar.py:942 msgid "Export Profile Group" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:975 +#: ../pyhoca/wxgui/menus_taskbar.py:978 msgid "Start/Resume Session" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:975 +#: ../pyhoca/wxgui/menus_taskbar.py:978 msgid "Connect Server" msgstr "" diff --git a/po/nb_NO.po b/po/nb_NO.po index 19f9f45..cba620b 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: 2013-01-13 23:25+0100\n" +"POT-Creation-Date: 2013-01-14 00:53+0100\n" "PO-Revision-Date: 2012-11-26 14:24+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n" @@ -744,8 +744,8 @@ msgstr "Utksriftsinnstillinger" msgid "Client Options" msgstr "Klient alternativer" -#: ../pyhoca/wxgui/menus_taskbar.py:160 ../pyhoca/wxgui/menus_taskbar.py:800 -#: ../pyhoca/wxgui/menus_taskbar.py:1005 +#: ../pyhoca/wxgui/menus_taskbar.py:160 ../pyhoca/wxgui/menus_taskbar.py:803 +#: ../pyhoca/wxgui/menus_taskbar.py:1008 msgid "E&xit" msgstr "&Avslutt" @@ -753,7 +753,7 @@ msgstr "&Avslutt" msgid "Window title" msgstr "Vindustittel" -#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:613 +#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:616 msgid "Resume Session" msgstr "Gjenoppta sesjon" @@ -769,31 +769,31 @@ msgstr "Overfør sesjon" msgid "Transfer Session (not possible)" msgstr "Overfør sesjon (ikke mulig)" -#: ../pyhoca/wxgui/menus_taskbar.py:257 ../pyhoca/wxgui/menus_taskbar.py:604 +#: ../pyhoca/wxgui/menus_taskbar.py:257 ../pyhoca/wxgui/menus_taskbar.py:607 msgid "Suspend Session (and disconnect/exit)" msgstr "Koble fra sesjonen (og avslutte)" -#: ../pyhoca/wxgui/menus_taskbar.py:259 ../pyhoca/wxgui/menus_taskbar.py:606 +#: ../pyhoca/wxgui/menus_taskbar.py:259 ../pyhoca/wxgui/menus_taskbar.py:609 msgid "Suspend Session (and disconnect)" msgstr "Koble fra sesjonen" -#: ../pyhoca/wxgui/menus_taskbar.py:261 ../pyhoca/wxgui/menus_taskbar.py:608 +#: ../pyhoca/wxgui/menus_taskbar.py:261 ../pyhoca/wxgui/menus_taskbar.py:611 msgid "Suspend Session" msgstr "Frakoble sesjon" -#: ../pyhoca/wxgui/menus_taskbar.py:267 ../pyhoca/wxgui/menus_taskbar.py:617 +#: ../pyhoca/wxgui/menus_taskbar.py:267 ../pyhoca/wxgui/menus_taskbar.py:620 msgid "Terminate Session (and disconnect/exit)" msgstr "Avslutte sesjonen (og " -#: ../pyhoca/wxgui/menus_taskbar.py:269 ../pyhoca/wxgui/menus_taskbar.py:619 +#: ../pyhoca/wxgui/menus_taskbar.py:269 ../pyhoca/wxgui/menus_taskbar.py:622 msgid "Terminate Session (and disconnect)" msgstr "Avslutte sesjon (og koble fra)" -#: ../pyhoca/wxgui/menus_taskbar.py:271 ../pyhoca/wxgui/menus_taskbar.py:621 +#: ../pyhoca/wxgui/menus_taskbar.py:271 ../pyhoca/wxgui/menus_taskbar.py:624 msgid "Terminate Session" msgstr "Avslutte sesjon" -#: ../pyhoca/wxgui/menus_taskbar.py:275 ../pyhoca/wxgui/menus_taskbar.py:601 +#: ../pyhoca/wxgui/menus_taskbar.py:275 ../pyhoca/wxgui/menus_taskbar.py:604 msgid "Refresh menu tree" msgstr "Oppfrisk menytreet" @@ -878,81 +878,85 @@ msgstr "Kobler til..." msgid "Start &new Desktop Session" msgstr "Start &ny sesjon" -#: ../pyhoca/wxgui/menus_taskbar.py:551 ../pyhoca/wxgui/menus_taskbar.py:689 +#: ../pyhoca/wxgui/menus_taskbar.py:551 ../pyhoca/wxgui/menus_taskbar.py:692 msgid "Retrieving Application Menu..." msgstr "Henter applikasjonsmenyen..." -#: ../pyhoca/wxgui/menus_taskbar.py:555 ../pyhoca/wxgui/menus_taskbar.py:692 +#: ../pyhoca/wxgui/menus_taskbar.py:555 ../pyhoca/wxgui/menus_taskbar.py:695 msgid "Retrieve Application Menu" msgstr "Hent applikasjonsmenyen" #: ../pyhoca/wxgui/menus_taskbar.py:558 +msgid "Start &new RDP Session" +msgstr "Start &ny RDP sesjon" + +#: ../pyhoca/wxgui/menus_taskbar.py:561 msgid "Start &new Session" msgstr "Start &ny sesjon" -#: ../pyhoca/wxgui/menus_taskbar.py:638 +#: ../pyhoca/wxgui/menus_taskbar.py:641 msgid "Launch Single Application" msgstr "Start enkelt applikasjon" -#: ../pyhoca/wxgui/menus_taskbar.py:676 +#: ../pyhoca/wxgui/menus_taskbar.py:679 msgid "Manage Application Menu" msgstr "Administrer applkasjonsmenyen" -#: ../pyhoca/wxgui/menus_taskbar.py:731 +#: ../pyhoca/wxgui/menus_taskbar.py:734 msgid "Running" msgstr "Aktiv" -#: ../pyhoca/wxgui/menus_taskbar.py:733 +#: ../pyhoca/wxgui/menus_taskbar.py:736 msgid "Suspended" msgstr "Frakoblet" -#: ../pyhoca/wxgui/menus_taskbar.py:752 +#: ../pyhoca/wxgui/menus_taskbar.py:755 msgid "&Clean all sessions" msgstr "&Rensk opp alle sesjoner" -#: ../pyhoca/wxgui/menus_taskbar.py:758 +#: ../pyhoca/wxgui/menus_taskbar.py:761 msgid "Customize &profile" msgstr "TIlpass &profil" -#: ../pyhoca/wxgui/menus_taskbar.py:773 +#: ../pyhoca/wxgui/menus_taskbar.py:776 msgid "Shared &folders" msgstr "Delte &mapper" -#: ../pyhoca/wxgui/menus_taskbar.py:785 +#: ../pyhoca/wxgui/menus_taskbar.py:788 msgid "&Disconnect from Server" msgstr "&Koble fra serveren" -#: ../pyhoca/wxgui/menus_taskbar.py:792 +#: ../pyhoca/wxgui/menus_taskbar.py:795 msgid "Suspend Session and E&xit application" msgstr "Koble fra sesjonen og &Avslutt applikasjonen" -#: ../pyhoca/wxgui/menus_taskbar.py:796 +#: ../pyhoca/wxgui/menus_taskbar.py:799 msgid "Disconnect and E&xit application" msgstr "Koble fra sesjonen og &Avslutt applikasjonen" -#: ../pyhoca/wxgui/menus_taskbar.py:850 +#: ../pyhoca/wxgui/menus_taskbar.py:853 msgid "Add Profile" msgstr "Legg til profil" -#: ../pyhoca/wxgui/menus_taskbar.py:926 +#: ../pyhoca/wxgui/menus_taskbar.py:929 msgid "No session profiles defined" msgstr "Ingen sesjonsprofiler er definert" -#: ../pyhoca/wxgui/menus_taskbar.py:937 +#: ../pyhoca/wxgui/menus_taskbar.py:940 #, fuzzy msgid "Export all Profiles" msgstr "Rediger profil" -#: ../pyhoca/wxgui/menus_taskbar.py:939 +#: ../pyhoca/wxgui/menus_taskbar.py:942 #, fuzzy msgid "Export Profile Group" msgstr "Rediger profil" -#: ../pyhoca/wxgui/menus_taskbar.py:975 +#: ../pyhoca/wxgui/menus_taskbar.py:978 msgid "Start/Resume Session" msgstr "Start/gjenoppta sesjon" -#: ../pyhoca/wxgui/menus_taskbar.py:975 +#: ../pyhoca/wxgui/menus_taskbar.py:978 msgid "Connect Server" msgstr "Koble til server" @@ -1019,6 +1023,7 @@ msgid "%s: DirectRDP not supported yet" msgstr "%s: Direkte RDP er ikke støttet enda" #: ../pyhoca/wxgui/frontend.py:731 +#, python-format msgid "" "We apologize for the inconvenience...\n" "\n" diff --git a/po/nl.po b/po/nl.po index 723463a..221d5e9 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: 2013-01-13 23:25+0100\n" +"POT-Creation-Date: 2013-01-14 00:53+0100\n" "PO-Revision-Date: 2012-11-26 14:23+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n" @@ -741,8 +741,8 @@ msgstr "Voorkeur voor afdrukken" msgid "Client Options" msgstr "Opties" -#: ../pyhoca/wxgui/menus_taskbar.py:160 ../pyhoca/wxgui/menus_taskbar.py:800 -#: ../pyhoca/wxgui/menus_taskbar.py:1005 +#: ../pyhoca/wxgui/menus_taskbar.py:160 ../pyhoca/wxgui/menus_taskbar.py:803 +#: ../pyhoca/wxgui/menus_taskbar.py:1008 msgid "E&xit" msgstr "&Beeindigen" @@ -750,7 +750,7 @@ msgstr "&Beeindigen" msgid "Window title" msgstr "Scherm titel" -#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:613 +#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:616 msgid "Resume Session" msgstr "Sessie hervatten" @@ -766,31 +766,31 @@ msgstr "Sessie overnemen" msgid "Transfer Session (not possible)" msgstr "Sessie overnemen (niet mogelijk)" -#: ../pyhoca/wxgui/menus_taskbar.py:257 ../pyhoca/wxgui/menus_taskbar.py:604 +#: ../pyhoca/wxgui/menus_taskbar.py:257 ../pyhoca/wxgui/menus_taskbar.py:607 msgid "Suspend Session (and disconnect/exit)" msgstr "Suspend Sessie (en Verbinding verbreken / e&xit)" -#: ../pyhoca/wxgui/menus_taskbar.py:259 ../pyhoca/wxgui/menus_taskbar.py:606 +#: ../pyhoca/wxgui/menus_taskbar.py:259 ../pyhoca/wxgui/menus_taskbar.py:609 msgid "Suspend Session (and disconnect)" msgstr "Suspend Sessie (en Verbinding verbreken)" -#: ../pyhoca/wxgui/menus_taskbar.py:261 ../pyhoca/wxgui/menus_taskbar.py:608 +#: ../pyhoca/wxgui/menus_taskbar.py:261 ../pyhoca/wxgui/menus_taskbar.py:611 msgid "Suspend Session" msgstr "Suspend Sessie" -#: ../pyhoca/wxgui/menus_taskbar.py:267 ../pyhoca/wxgui/menus_taskbar.py:617 +#: ../pyhoca/wxgui/menus_taskbar.py:267 ../pyhoca/wxgui/menus_taskbar.py:620 msgid "Terminate Session (and disconnect/exit)" msgstr "Sessie beëindigen (en Verbinding verbreken / e&xit)" -#: ../pyhoca/wxgui/menus_taskbar.py:269 ../pyhoca/wxgui/menus_taskbar.py:619 +#: ../pyhoca/wxgui/menus_taskbar.py:269 ../pyhoca/wxgui/menus_taskbar.py:622 msgid "Terminate Session (and disconnect)" msgstr "Sessie beëindigen (en Verbinding verbreken)" -#: ../pyhoca/wxgui/menus_taskbar.py:271 ../pyhoca/wxgui/menus_taskbar.py:621 +#: ../pyhoca/wxgui/menus_taskbar.py:271 ../pyhoca/wxgui/menus_taskbar.py:624 msgid "Terminate Session" msgstr "Sessie beëindigen" -#: ../pyhoca/wxgui/menus_taskbar.py:275 ../pyhoca/wxgui/menus_taskbar.py:601 +#: ../pyhoca/wxgui/menus_taskbar.py:275 ../pyhoca/wxgui/menus_taskbar.py:604 msgid "Refresh menu tree" msgstr "Ververs menu" @@ -875,81 +875,85 @@ msgstr "Nu aan het verbinden..." msgid "Start &new Desktop Session" msgstr "&Nieuwe Desktop Sessie starten" -#: ../pyhoca/wxgui/menus_taskbar.py:551 ../pyhoca/wxgui/menus_taskbar.py:689 +#: ../pyhoca/wxgui/menus_taskbar.py:551 ../pyhoca/wxgui/menus_taskbar.py:692 msgid "Retrieving Application Menu..." msgstr "Bezig met ophalen applicatiemenu..." -#: ../pyhoca/wxgui/menus_taskbar.py:555 ../pyhoca/wxgui/menus_taskbar.py:692 +#: ../pyhoca/wxgui/menus_taskbar.py:555 ../pyhoca/wxgui/menus_taskbar.py:695 msgid "Retrieve Application Menu" msgstr "Haal applicatiemenu op" #: ../pyhoca/wxgui/menus_taskbar.py:558 +msgid "Start &new RDP Session" +msgstr "&Nieuwe RDP Sessie starten" + +#: ../pyhoca/wxgui/menus_taskbar.py:561 msgid "Start &new Session" msgstr "&Nieuwe Sessie starten" -#: ../pyhoca/wxgui/menus_taskbar.py:638 +#: ../pyhoca/wxgui/menus_taskbar.py:641 msgid "Launch Single Application" msgstr "Enkelvoudige Applicatie starten" -#: ../pyhoca/wxgui/menus_taskbar.py:676 +#: ../pyhoca/wxgui/menus_taskbar.py:679 msgid "Manage Application Menu" msgstr "Onderhoud applicatie menu" -#: ../pyhoca/wxgui/menus_taskbar.py:731 +#: ../pyhoca/wxgui/menus_taskbar.py:734 msgid "Running" msgstr "Aktief" -#: ../pyhoca/wxgui/menus_taskbar.py:733 +#: ../pyhoca/wxgui/menus_taskbar.py:736 msgid "Suspended" msgstr "Suspended" -#: ../pyhoca/wxgui/menus_taskbar.py:752 +#: ../pyhoca/wxgui/menus_taskbar.py:755 msgid "&Clean all sessions" msgstr "Alle Sessies beëindigen" -#: ../pyhoca/wxgui/menus_taskbar.py:758 +#: ../pyhoca/wxgui/menus_taskbar.py:761 msgid "Customize &profile" msgstr "Sessieprofiel wijzigen" -#: ../pyhoca/wxgui/menus_taskbar.py:773 +#: ../pyhoca/wxgui/menus_taskbar.py:776 msgid "Shared &folders" msgstr "Delen &mappen" -#: ../pyhoca/wxgui/menus_taskbar.py:785 +#: ../pyhoca/wxgui/menus_taskbar.py:788 msgid "&Disconnect from Server" msgstr "&Verbinding verbreken" -#: ../pyhoca/wxgui/menus_taskbar.py:792 +#: ../pyhoca/wxgui/menus_taskbar.py:795 msgid "Suspend Session and E&xit application" msgstr "Suspend Sessie en e&xit" -#: ../pyhoca/wxgui/menus_taskbar.py:796 +#: ../pyhoca/wxgui/menus_taskbar.py:799 msgid "Disconnect and E&xit application" msgstr "verbinding verbreken en e&xit" -#: ../pyhoca/wxgui/menus_taskbar.py:850 +#: ../pyhoca/wxgui/menus_taskbar.py:853 msgid "Add Profile" msgstr "Profiel toevoegen" -#: ../pyhoca/wxgui/menus_taskbar.py:926 +#: ../pyhoca/wxgui/menus_taskbar.py:929 msgid "No session profiles defined" msgstr "Geen Profiel gedefinieerd" -#: ../pyhoca/wxgui/menus_taskbar.py:937 +#: ../pyhoca/wxgui/menus_taskbar.py:940 #, fuzzy msgid "Export all Profiles" msgstr "Profiel bijwerken" -#: ../pyhoca/wxgui/menus_taskbar.py:939 +#: ../pyhoca/wxgui/menus_taskbar.py:942 #, fuzzy msgid "Export Profile Group" msgstr "Profiel bijwerken" -#: ../pyhoca/wxgui/menus_taskbar.py:975 +#: ../pyhoca/wxgui/menus_taskbar.py:978 msgid "Start/Resume Session" msgstr "Sessie starten/hervatten" -#: ../pyhoca/wxgui/menus_taskbar.py:975 +#: ../pyhoca/wxgui/menus_taskbar.py:978 msgid "Connect Server" msgstr "Verbinden met Server" @@ -1015,6 +1019,7 @@ msgid "%s: DirectRDP not supported yet" msgstr "%s: DirectRDP wordt nog niet ondersteund" #: ../pyhoca/wxgui/frontend.py:731 +#, python-format msgid "" "We apologize for the inconvenience...\n" "\n" diff --git a/po/ru.po b/po/ru.po index caa30bb..eefe3b4 100644 --- a/po/ru.po +++ b/po/ru.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-13 23:25+0100\n" +"POT-Creation-Date: 2013-01-14 00:53+0100\n" "PO-Revision-Date: 2012-11-19 13:51+0100\n" "Last-Translator: Oleksandr Shneyder <o.shneyder(a)phoca-gmbh.de>\n" "Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n" @@ -749,8 +749,8 @@ msgstr "Установки печати" msgid "Client Options" msgstr "Опции клиента" -#: ../pyhoca/wxgui/menus_taskbar.py:160 ../pyhoca/wxgui/menus_taskbar.py:800 -#: ../pyhoca/wxgui/menus_taskbar.py:1005 +#: ../pyhoca/wxgui/menus_taskbar.py:160 ../pyhoca/wxgui/menus_taskbar.py:803 +#: ../pyhoca/wxgui/menus_taskbar.py:1008 msgid "E&xit" msgstr "Вы&ход" @@ -758,7 +758,7 @@ msgstr "Вы&ход" msgid "Window title" msgstr "Заголовок окна" -#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:613 +#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:616 msgid "Resume Session" msgstr "Восстановить сессию" @@ -774,31 +774,31 @@ msgstr "Трансфер сессии" msgid "Transfer Session (not possible)" msgstr "Трансфер сессии (невозможен)" -#: ../pyhoca/wxgui/menus_taskbar.py:257 ../pyhoca/wxgui/menus_taskbar.py:604 +#: ../pyhoca/wxgui/menus_taskbar.py:257 ../pyhoca/wxgui/menus_taskbar.py:607 msgid "Suspend Session (and disconnect/exit)" msgstr "Прервать сессию (и разъединить/выйти)" -#: ../pyhoca/wxgui/menus_taskbar.py:259 ../pyhoca/wxgui/menus_taskbar.py:606 +#: ../pyhoca/wxgui/menus_taskbar.py:259 ../pyhoca/wxgui/menus_taskbar.py:609 msgid "Suspend Session (and disconnect)" msgstr "Прервать сессию (и разъединить)" -#: ../pyhoca/wxgui/menus_taskbar.py:261 ../pyhoca/wxgui/menus_taskbar.py:608 +#: ../pyhoca/wxgui/menus_taskbar.py:261 ../pyhoca/wxgui/menus_taskbar.py:611 msgid "Suspend Session" msgstr "Прервать сессию" -#: ../pyhoca/wxgui/menus_taskbar.py:267 ../pyhoca/wxgui/menus_taskbar.py:617 +#: ../pyhoca/wxgui/menus_taskbar.py:267 ../pyhoca/wxgui/menus_taskbar.py:620 msgid "Terminate Session (and disconnect/exit)" msgstr "Завершить сессию (и разъединить/выйти)" -#: ../pyhoca/wxgui/menus_taskbar.py:269 ../pyhoca/wxgui/menus_taskbar.py:619 +#: ../pyhoca/wxgui/menus_taskbar.py:269 ../pyhoca/wxgui/menus_taskbar.py:622 msgid "Terminate Session (and disconnect)" msgstr "Завершить сессию (и разъединить)" -#: ../pyhoca/wxgui/menus_taskbar.py:271 ../pyhoca/wxgui/menus_taskbar.py:621 +#: ../pyhoca/wxgui/menus_taskbar.py:271 ../pyhoca/wxgui/menus_taskbar.py:624 msgid "Terminate Session" msgstr "Завершить сессию" -#: ../pyhoca/wxgui/menus_taskbar.py:275 ../pyhoca/wxgui/menus_taskbar.py:601 +#: ../pyhoca/wxgui/menus_taskbar.py:275 ../pyhoca/wxgui/menus_taskbar.py:604 msgid "Refresh menu tree" msgstr "Обновить меню" @@ -883,81 +883,85 @@ msgstr "Соединение ..." msgid "Start &new Desktop Session" msgstr "Запустить &новую сессию" -#: ../pyhoca/wxgui/menus_taskbar.py:551 ../pyhoca/wxgui/menus_taskbar.py:689 +#: ../pyhoca/wxgui/menus_taskbar.py:551 ../pyhoca/wxgui/menus_taskbar.py:692 msgid "Retrieving Application Menu..." msgstr "Получаем меню приложений..." -#: ../pyhoca/wxgui/menus_taskbar.py:555 ../pyhoca/wxgui/menus_taskbar.py:692 +#: ../pyhoca/wxgui/menus_taskbar.py:555 ../pyhoca/wxgui/menus_taskbar.py:695 msgid "Retrieve Application Menu" msgstr "Получить меню приложений" #: ../pyhoca/wxgui/menus_taskbar.py:558 +msgid "Start &new RDP Session" +msgstr "Запустить &новую RDP сессию" + +#: ../pyhoca/wxgui/menus_taskbar.py:561 msgid "Start &new Session" msgstr "Запустить &новую сессию" -#: ../pyhoca/wxgui/menus_taskbar.py:638 +#: ../pyhoca/wxgui/menus_taskbar.py:641 msgid "Launch Single Application" msgstr "Запустить приложение" -#: ../pyhoca/wxgui/menus_taskbar.py:676 +#: ../pyhoca/wxgui/menus_taskbar.py:679 msgid "Manage Application Menu" msgstr "Управление меню приложений" -#: ../pyhoca/wxgui/menus_taskbar.py:731 +#: ../pyhoca/wxgui/menus_taskbar.py:734 msgid "Running" msgstr "Выполняется" -#: ../pyhoca/wxgui/menus_taskbar.py:733 +#: ../pyhoca/wxgui/menus_taskbar.py:736 msgid "Suspended" msgstr "Приостановлено" -#: ../pyhoca/wxgui/menus_taskbar.py:752 +#: ../pyhoca/wxgui/menus_taskbar.py:755 msgid "&Clean all sessions" msgstr "&Очистить все сессии" -#: ../pyhoca/wxgui/menus_taskbar.py:758 +#: ../pyhoca/wxgui/menus_taskbar.py:761 msgid "Customize &profile" msgstr "Изменить &профиль" -#: ../pyhoca/wxgui/menus_taskbar.py:773 +#: ../pyhoca/wxgui/menus_taskbar.py:776 msgid "Shared &folders" msgstr "Экспорт &каталогов" -#: ../pyhoca/wxgui/menus_taskbar.py:785 +#: ../pyhoca/wxgui/menus_taskbar.py:788 msgid "&Disconnect from Server" msgstr "&Отсоединить от сервера" -#: ../pyhoca/wxgui/menus_taskbar.py:792 +#: ../pyhoca/wxgui/menus_taskbar.py:795 msgid "Suspend Session and E&xit application" msgstr "&Прервать сессию и покинуть программу" -#: ../pyhoca/wxgui/menus_taskbar.py:796 +#: ../pyhoca/wxgui/menus_taskbar.py:799 msgid "Disconnect and E&xit application" msgstr "&Разъединить и покинуть программу" -#: ../pyhoca/wxgui/menus_taskbar.py:850 +#: ../pyhoca/wxgui/menus_taskbar.py:853 msgid "Add Profile" msgstr "Добавить профиль" -#: ../pyhoca/wxgui/menus_taskbar.py:926 +#: ../pyhoca/wxgui/menus_taskbar.py:929 msgid "No session profiles defined" msgstr "Профили не определены" -#: ../pyhoca/wxgui/menus_taskbar.py:937 +#: ../pyhoca/wxgui/menus_taskbar.py:940 #, fuzzy msgid "Export all Profiles" msgstr "Редактировать профиль" -#: ../pyhoca/wxgui/menus_taskbar.py:939 +#: ../pyhoca/wxgui/menus_taskbar.py:942 #, fuzzy msgid "Export Profile Group" msgstr "Редактировать профиль" -#: ../pyhoca/wxgui/menus_taskbar.py:975 +#: ../pyhoca/wxgui/menus_taskbar.py:978 msgid "Start/Resume Session" msgstr "Запуск/восстановление сессии" -#: ../pyhoca/wxgui/menus_taskbar.py:975 +#: ../pyhoca/wxgui/menus_taskbar.py:978 msgid "Connect Server" msgstr "Соединить с сервером" @@ -1022,6 +1026,7 @@ msgid "%s: DirectRDP not supported yet" msgstr "%s: DirectRDP пока не поддерживается" #: ../pyhoca/wxgui/frontend.py:731 +#, python-format msgid "" "We apologize for the inconvenience...\n" "\n" diff --git a/po/sv.po b/po/sv.po index 88a9cef..97908fb 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: 2013-01-13 23:25+0100\n" +"POT-Creation-Date: 2013-01-14 00:53+0100\n" "PO-Revision-Date: 2012-11-26 14:24+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n" @@ -742,8 +742,8 @@ msgstr "Utskriftspreferenser" msgid "Client Options" msgstr "Klientalternativ" -#: ../pyhoca/wxgui/menus_taskbar.py:160 ../pyhoca/wxgui/menus_taskbar.py:800 -#: ../pyhoca/wxgui/menus_taskbar.py:1005 +#: ../pyhoca/wxgui/menus_taskbar.py:160 ../pyhoca/wxgui/menus_taskbar.py:803 +#: ../pyhoca/wxgui/menus_taskbar.py:1008 msgid "E&xit" msgstr "&Avsluta" @@ -751,7 +751,7 @@ msgstr "&Avsluta" msgid "Window title" msgstr "Fönstertitel" -#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:613 +#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:616 msgid "Resume Session" msgstr "Återanslut session" @@ -767,31 +767,31 @@ msgstr "Flytta session" msgid "Transfer Session (not possible)" msgstr "Flytta session (ej möjligt)" -#: ../pyhoca/wxgui/menus_taskbar.py:257 ../pyhoca/wxgui/menus_taskbar.py:604 +#: ../pyhoca/wxgui/menus_taskbar.py:257 ../pyhoca/wxgui/menus_taskbar.py:607 msgid "Suspend Session (and disconnect/exit)" msgstr "Försätt session i vila och avsluta" -#: ../pyhoca/wxgui/menus_taskbar.py:259 ../pyhoca/wxgui/menus_taskbar.py:606 +#: ../pyhoca/wxgui/menus_taskbar.py:259 ../pyhoca/wxgui/menus_taskbar.py:609 msgid "Suspend Session (and disconnect)" msgstr "Försätt session i vila och koppla från" -#: ../pyhoca/wxgui/menus_taskbar.py:261 ../pyhoca/wxgui/menus_taskbar.py:608 +#: ../pyhoca/wxgui/menus_taskbar.py:261 ../pyhoca/wxgui/menus_taskbar.py:611 msgid "Suspend Session" msgstr "Försätt session i vila" -#: ../pyhoca/wxgui/menus_taskbar.py:267 ../pyhoca/wxgui/menus_taskbar.py:617 +#: ../pyhoca/wxgui/menus_taskbar.py:267 ../pyhoca/wxgui/menus_taskbar.py:620 msgid "Terminate Session (and disconnect/exit)" msgstr "Avsluta session" -#: ../pyhoca/wxgui/menus_taskbar.py:269 ../pyhoca/wxgui/menus_taskbar.py:619 +#: ../pyhoca/wxgui/menus_taskbar.py:269 ../pyhoca/wxgui/menus_taskbar.py:622 msgid "Terminate Session (and disconnect)" msgstr "Koppla från session" -#: ../pyhoca/wxgui/menus_taskbar.py:271 ../pyhoca/wxgui/menus_taskbar.py:621 +#: ../pyhoca/wxgui/menus_taskbar.py:271 ../pyhoca/wxgui/menus_taskbar.py:624 msgid "Terminate Session" msgstr "Avsluta session" -#: ../pyhoca/wxgui/menus_taskbar.py:275 ../pyhoca/wxgui/menus_taskbar.py:601 +#: ../pyhoca/wxgui/menus_taskbar.py:275 ../pyhoca/wxgui/menus_taskbar.py:604 msgid "Refresh menu tree" msgstr "Uppdatera menyträd" @@ -876,81 +876,85 @@ msgstr "Anslutning pågår..." msgid "Start &new Desktop Session" msgstr "Starta &ny Skrivbordssession" -#: ../pyhoca/wxgui/menus_taskbar.py:551 ../pyhoca/wxgui/menus_taskbar.py:689 +#: ../pyhoca/wxgui/menus_taskbar.py:551 ../pyhoca/wxgui/menus_taskbar.py:692 msgid "Retrieving Application Menu..." msgstr "Hämtar applikationsmeny..." -#: ../pyhoca/wxgui/menus_taskbar.py:555 ../pyhoca/wxgui/menus_taskbar.py:692 +#: ../pyhoca/wxgui/menus_taskbar.py:555 ../pyhoca/wxgui/menus_taskbar.py:695 msgid "Retrieve Application Menu" msgstr "Hämta applikationsmeny" #: ../pyhoca/wxgui/menus_taskbar.py:558 +msgid "Start &new RDP Session" +msgstr "Starta &ny RDP session" + +#: ../pyhoca/wxgui/menus_taskbar.py:561 msgid "Start &new Session" msgstr "Starta &ny session" -#: ../pyhoca/wxgui/menus_taskbar.py:638 +#: ../pyhoca/wxgui/menus_taskbar.py:641 msgid "Launch Single Application" msgstr "Starta applikation" -#: ../pyhoca/wxgui/menus_taskbar.py:676 +#: ../pyhoca/wxgui/menus_taskbar.py:679 msgid "Manage Application Menu" msgstr "Hantera applikationsmeny" -#: ../pyhoca/wxgui/menus_taskbar.py:731 +#: ../pyhoca/wxgui/menus_taskbar.py:734 msgid "Running" msgstr "Aktiv" -#: ../pyhoca/wxgui/menus_taskbar.py:733 +#: ../pyhoca/wxgui/menus_taskbar.py:736 msgid "Suspended" msgstr "Vilande" -#: ../pyhoca/wxgui/menus_taskbar.py:752 +#: ../pyhoca/wxgui/menus_taskbar.py:755 msgid "&Clean all sessions" msgstr "&Rensa alla sessioner" -#: ../pyhoca/wxgui/menus_taskbar.py:758 +#: ../pyhoca/wxgui/menus_taskbar.py:761 msgid "Customize &profile" msgstr "Anpassa &profil" -#: ../pyhoca/wxgui/menus_taskbar.py:773 +#: ../pyhoca/wxgui/menus_taskbar.py:776 msgid "Shared &folders" msgstr "Delade &mappar" -#: ../pyhoca/wxgui/menus_taskbar.py:785 +#: ../pyhoca/wxgui/menus_taskbar.py:788 msgid "&Disconnect from Server" msgstr "&Koppla från server" -#: ../pyhoca/wxgui/menus_taskbar.py:792 +#: ../pyhoca/wxgui/menus_taskbar.py:795 msgid "Suspend Session and E&xit application" msgstr "Försätt session i vila och avsluta" -#: ../pyhoca/wxgui/menus_taskbar.py:796 +#: ../pyhoca/wxgui/menus_taskbar.py:799 msgid "Disconnect and E&xit application" msgstr "Kopplar från och &avsluta" -#: ../pyhoca/wxgui/menus_taskbar.py:850 +#: ../pyhoca/wxgui/menus_taskbar.py:853 msgid "Add Profile" msgstr "Lägg till profil" -#: ../pyhoca/wxgui/menus_taskbar.py:926 +#: ../pyhoca/wxgui/menus_taskbar.py:929 msgid "No session profiles defined" msgstr "Inga sessionsprofiler har definierats" -#: ../pyhoca/wxgui/menus_taskbar.py:937 +#: ../pyhoca/wxgui/menus_taskbar.py:940 #, fuzzy msgid "Export all Profiles" msgstr "Redigera profil" -#: ../pyhoca/wxgui/menus_taskbar.py:939 +#: ../pyhoca/wxgui/menus_taskbar.py:942 #, fuzzy msgid "Export Profile Group" msgstr "Redigera profil" -#: ../pyhoca/wxgui/menus_taskbar.py:975 +#: ../pyhoca/wxgui/menus_taskbar.py:978 msgid "Start/Resume Session" msgstr "Starta/återanslut session" -#: ../pyhoca/wxgui/menus_taskbar.py:975 +#: ../pyhoca/wxgui/menus_taskbar.py:978 msgid "Connect Server" msgstr "Anslut till server" @@ -1015,6 +1019,7 @@ msgid "%s: DirectRDP not supported yet" msgstr "%s: DirectRDP stöds inte ännu" #: ../pyhoca/wxgui/frontend.py:731 +#, python-format msgid "" "We apologize for the inconvenience...\n" "\n" diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py index 864e58e..21ed35e 100644 --- a/pyhoca/wxgui/menus_taskbar.py +++ b/pyhoca/wxgui/menus_taskbar.py @@ -554,6 +554,9 @@ class PyHocaGUI_Menu_TaskbarSessionProfile(wx.Menu): self._PyHocaGUI._eventid_profilenames_map[ID_PUBAPPSESSIONSTART] = profile_name _pub_app_start_item = self.Append(id=ID_PUBAPPSESSIONSTART, text=_(u"Retrieve Application Menu")) self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnPubAppSessionStart, id=ID_PUBAPPSESSIONSTART) + elif current_profile_config['command'] == 'RDP': + self.Append(id=ID_SESSIONSTART, text=_(u"Start &new RDP Session")) + self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnSessionStart, id=ID_SESSIONSTART) else: self.Append(id=ID_SESSIONSTART, text=_(u"Start &new Session")) self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnSessionStart, id=ID_SESSIONSTART) hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

python-x2go.git - master (branch) updated: 0.2.1.1-26-g9a9712d
by git-admin＠x2go.org 13 Jan '13

13 Jan '13

The branch, master has been updated via 9a9712d918b999c87c2ff01b07b0526c3a855835 (commit) from 42b3141237a11af183bc4e682292c7b49f408460 (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 9a9712d918b999c87c2ff01b07b0526c3a855835 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jan 14 00:46:28 2013 +0100 fix modifying existing profiles ----------------------------------------------------------------------- Summary of changes: x2go/backends/profiles/_file.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/x2go/backends/profiles/_file.py b/x2go/backends/profiles/_file.py index 3c60ec2..e5f1432 100644 --- a/x2go/backends/profiles/_file.py +++ b/x2go/backends/profiles/_file.py @@ -148,14 +148,14 @@ class X2GoSessionProfilesFILE(inifiles.X2GoIniFile): def write(self): - # then update profile IDs for profiles that have a renamed host attribute... for profile_id in self._profiles_need_profile_id_renewal: _config = self.get_profile_config(profile_id=profile_id) self.iniConfig.remove_section(profile_id) try: self._cached_profile_ids.remove(profile_id) except ValueError: pass - self._cached_profile_ids.append(self.add_profile(profile_id=None, **_config)) + self.add_profile(profile_id=None, **_config) + self._cached_profile_names = [] self._profiles_need_profile_id_renewal = [] # at last write the profile config as is... @@ -360,6 +360,7 @@ class X2GoSessionProfilesFILE(inifiles.X2GoIniFile): """ if profile_id is None: profile_id = utils._genSessionProfileId() + for key, value in kwargs.items(): self.update_value(None, key, value, profile_id=profile_id) @@ -402,6 +403,9 @@ class X2GoSessionProfilesFILE(inifiles.X2GoIniFile): profile_id = profile_id or self.check_profile_id_or_name(section) except X2GoProfileException: profile_id = section + + inifiles.X2GoIniFile.update_value(self, profile_id, key, value) + if key == 'name': profile_name = value current_profile_name = self.get_value(profile_id, key) @@ -409,7 +413,7 @@ class X2GoSessionProfilesFILE(inifiles.X2GoIniFile): raise X2GoProfileException('profile name for profile id %s may not be empty' % profile_id) else: if profile_name != current_profile_name and profile_name in self.profile_names: - raise X2GoProfileException('a profile of name ,,%s'' already exists' % profile_name) + raise X2GoProfileException('a profile of name ,,%s\'\' already exists' % profile_name) self._cached_profile_names = [] if key == 'export' and type(value) == types.DictType: @@ -425,8 +429,6 @@ class X2GoSessionProfilesFILE(inifiles.X2GoIniFile): if _config.has_key('host') and _config['host'] != value: self._profiles_need_profile_id_renewal.append(profile_id) - inifiles.X2GoIniFile.update_value(self, profile_id, key, value) - def check_profile_id_or_name(self, profile_id_or_name): """\ Detect the profile ID from a given string which maybe profile ID or profile name. 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

← Newer
1
...
6
7
8
9
10
11
12
...
16
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits January 2013