x2go-commits

x2go-commits@lists.x2go.org

37909 discussions

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

06 Jun '12

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

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.10-269-gd79526f
by git-admin＠x2go.org 05 Jun '12

05 Jun '12

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

1 0

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

04 Jun '12

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

1 0

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

04 Jun '12

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

1 0

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

04 Jun '12

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

1 0

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

04 Jun '12

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

1 0

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

04 Jun '12

The branch, master has been updated via 1b920af010da32ea7b4c9e52ea02a5c690da8f8b (commit) from 70ea8219a29ccaae472cd75f193e5d8aad01c55d (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 1b920af010da32ea7b4c9e52ea02a5c690da8f8b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jun 4 08:03:39 2012 +0200 Update Swedish translation (pre-release). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + po/sv.po | 240 +++++++++++++++++++++++++++++------------------------- 2 files changed, 130 insertions(+), 111 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 3a98fc9..ba3102f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -167,6 +167,7 @@ pyhoca-gui (0.2.0.0-0~x2go1) UNRELEASED; urgency=low - Fine-tune Swedish translation. - Update Swedish translation. - Update Swedish translation (published applications). + - Update Swedish translation (pre-release). [ Dick Kniep ] * New upstream version (0.2.0.0): diff --git a/po/sv.po b/po/sv.po index f9b0c99..f18fab9 100644 --- a/po/sv.po +++ b/po/sv.po @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-05-31 22:04+0200\n" -"PO-Revision-Date: 2012-04-06 09:56+0100\n" -"Last-Translator: Daniel Lindgren <bd.dali(a)gmail.com>\n" +"PO-Revision-Date: 2012-06-01 17:59+0100\n" +"Last-Translator: Daniel Lindgren <dali.spam(a)gmail.com>\n" "Language-Team: Swedish <x2go-i18n(a)lists.berlios.de>\n" "Language: sv\n" "MIME-Version: 1.0\n" @@ -26,11 +26,13 @@ msgstr "" msgid "%s (via %s)" msgstr "%s (via %s)" -#: ../pyhoca/wxgui/logon.py:84 ../pyhoca/wxgui/logon.py:96 +#: ../pyhoca/wxgui/logon.py:84 +#: ../pyhoca/wxgui/logon.py:96 msgid "Username" msgstr "Användarnamn" -#: ../pyhoca/wxgui/logon.py:86 ../pyhoca/wxgui/logon.py:98 +#: ../pyhoca/wxgui/logon.py:86 +#: ../pyhoca/wxgui/logon.py:98 msgid "Password" msgstr "Lösenord" @@ -50,23 +52,28 @@ msgstr "Sessionsinloggning" msgid "SSH proxy server login" msgstr "SSH proxyserverinloggning" -#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:313 -#: ../pyhoca/wxgui/messages.py:109 ../pyhoca/wxgui/printingprefs.py:138 +#: ../pyhoca/wxgui/logon.py:121 +#: ../pyhoca/wxgui/profilemanager.py:313 +#: ../pyhoca/wxgui/messages.py:109 +#: ../pyhoca/wxgui/printingprefs.py:138 #: ../pyhoca/wxgui/sessiontitle.py:75 msgid "Cancel" msgstr "Avbryt" -#: ../pyhoca/wxgui/logon.py:277 ../pyhoca/wxgui/logon.py:319 +#: ../pyhoca/wxgui/logon.py:277 +#: ../pyhoca/wxgui/logon.py:319 #: ../pyhoca/wxgui/frontend.py:482 #, python-format msgid "%s - connect failure" msgstr "%s - anslutning misslyckades" -#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:482 +#: ../pyhoca/wxgui/logon.py:278 +#: ../pyhoca/wxgui/frontend.py:482 msgid "User is not allowed to start X2Go sessions!" msgstr "Användaren har inte rätt att starta X2Go-sessioner!" -#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:489 +#: ../pyhoca/wxgui/logon.py:283 +#: ../pyhoca/wxgui/frontend.py:489 #, python-format msgid "%s - connect" msgstr "%s - anslut" @@ -84,7 +91,7 @@ msgid "Authentication failed!" msgstr "Autentisering misslyckades!" #: ../pyhoca/wxgui/logon.py:327 -#, fuzzy, python-format +#, python-format msgid "%s - SSH proxy" msgstr "%s - SSH-proxy" @@ -92,28 +99,32 @@ msgstr "%s - SSH-proxy" msgid "Authentication to the SSH proxy server failed!" msgstr "Autentisering till SSH-proxy misslyckades!" -#: ../pyhoca/wxgui/logon.py:350 ../pyhoca/wxgui/frontend.py:537 -#, fuzzy, python-format +#: ../pyhoca/wxgui/logon.py:350 +#: ../pyhoca/wxgui/frontend.py:537 +#, python-format msgid "%s - socket error" -msgstr "%s - nyckelfel" +msgstr "%s - socketfel" -#: ../pyhoca/wxgui/logon.py:357 ../pyhoca/wxgui/frontend.py:516 +#: ../pyhoca/wxgui/logon.py:357 +#: ../pyhoca/wxgui/frontend.py:516 #: ../pyhoca/wxgui/frontend.py:523 #, python-format msgid "%s - host key error" msgstr "%s - fel på serverns nyckel" -#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:516 -msgid "" -"The remote server's host key is invalid or has not been accepted by the user" +#: ../pyhoca/wxgui/logon.py:358 +#: ../pyhoca/wxgui/frontend.py:516 +msgid "The remote server's host key is invalid or has not been accepted by the user" msgstr "Serverns nyckel är felaktig eller har inte accepterats av användaren" -#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:558 +#: ../pyhoca/wxgui/logon.py:365 +#: ../pyhoca/wxgui/frontend.py:558 #, python-format msgid "%s - missing home directory" msgstr "%s - hemkatalog saknas" -#: ../pyhoca/wxgui/logon.py:366 ../pyhoca/wxgui/frontend.py:558 +#: ../pyhoca/wxgui/logon.py:366 +#: ../pyhoca/wxgui/frontend.py:558 msgid "The remote user's home directory does not exist." msgstr "Fjärranvändarens hemkatalog saknas." @@ -122,20 +133,22 @@ msgstr "Fjärranvändarens hemkatalog saknas." msgid "%s - key error" msgstr "%s - nyckelfel" -#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:565 +#: ../pyhoca/wxgui/logon.py:381 +#: ../pyhoca/wxgui/frontend.py:565 #, python-format msgid "%s - auth error" msgstr "%s - autentiseringsfel" -#: ../pyhoca/wxgui/logon.py:389 ../pyhoca/wxgui/frontend.py:509 -#, fuzzy, python-format +#: ../pyhoca/wxgui/logon.py:389 +#: ../pyhoca/wxgui/frontend.py:509 +#, python-format msgid "%s - SSH error" -msgstr "%s - nyckelfel" +msgstr "%s - SSH-fel" #: ../pyhoca/wxgui/logon.py:397 -#, fuzzy, python-format +#, python-format msgid "%s - unknown error" -msgstr "%s - ljudfel" +msgstr "%s - okänt fel" #: ../pyhoca/wxgui/logon.py:398 msgid "An unknown error occured during authentication!" @@ -148,7 +161,7 @@ msgid "" "Connecting you to ,,%s''" msgstr "" "PyHoca-GUI\n" -"Ansluter till ,,%s''" +"Ansluter till \"%s\"" #: ../pyhoca/wxgui/taskbar.py:83 #, python-format @@ -157,7 +170,7 @@ msgid "" "Currently connecting you to remote X2Go server ,,%s''" msgstr "" "PyHoca-GUI (Python X2Go-klient)\n" -"Anslutning till ,,%s'' pågår" +"Anslutning till \"%s\" pågår" #: ../pyhoca/wxgui/taskbar.py:89 msgid "" @@ -216,23 +229,28 @@ msgid "Windows Terminal Server (RDP-proxy)" msgstr "Windows Terminal Server (RDP-proxy)" #. 'DirectRDP': 'Windows Terminal Server (RDP-direct)', -#: ../pyhoca/wxgui/profilemanager.py:84 ../pyhoca/wxgui/profilemanager.py:198 +#: ../pyhoca/wxgui/profilemanager.py:84 +#: ../pyhoca/wxgui/profilemanager.py:198 msgid "Custom command" msgstr "Anpassat kommando" -#: ../pyhoca/wxgui/profilemanager.py:87 ../pyhoca/wxgui/menus_taskbar.py:355 +#: ../pyhoca/wxgui/profilemanager.py:87 +#: ../pyhoca/wxgui/menus_taskbar.py:355 msgid "Internet Browser" msgstr "Webbbläsare" -#: ../pyhoca/wxgui/profilemanager.py:88 ../pyhoca/wxgui/menus_taskbar.py:356 +#: ../pyhoca/wxgui/profilemanager.py:88 +#: ../pyhoca/wxgui/menus_taskbar.py:356 msgid "Email Client" msgstr "E-postklient" -#: ../pyhoca/wxgui/profilemanager.py:89 ../pyhoca/wxgui/menus_taskbar.py:357 +#: ../pyhoca/wxgui/profilemanager.py:89 +#: ../pyhoca/wxgui/menus_taskbar.py:357 msgid "Office" msgstr "Office" -#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/menus_taskbar.py:358 +#: ../pyhoca/wxgui/profilemanager.py:90 +#: ../pyhoca/wxgui/menus_taskbar.py:358 msgid "Terminal" msgstr "Terminal" @@ -358,7 +376,7 @@ msgstr "RDP-alternativ" #: ../pyhoca/wxgui/profilemanager.py:206 msgid "Integrate remote application(s) into local desktop (rootless mode)" -msgstr "" +msgstr "Integrera fjärrapplikation i lokalt Skrivbord (rootless)" #: ../pyhoca/wxgui/profilemanager.py:207 msgid "Menu of published applications" @@ -367,7 +385,8 @@ msgstr "Meny med publicerade applikationer" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:214 ../pyhoca/wxgui/profilemanager.py:224 +#: ../pyhoca/wxgui/profilemanager.py:214 +#: ../pyhoca/wxgui/profilemanager.py:224 msgid "User" msgstr "Användare" @@ -444,18 +463,15 @@ msgstr "Ange skärmupplösning (DPI)" #: ../pyhoca/wxgui/profilemanager.py:261 msgid "Do not set (use server-side tools to configure the keyboard)" -msgstr "" +msgstr "Konfigurera inte (använd verktyg på server för att konfigurera tangentbord)" #: ../pyhoca/wxgui/profilemanager.py:262 -msgid "" -"Automatically detect and use client-side keyboard configuration inside the " -"session" -msgstr "" +msgid "Automatically detect and use client-side keyboard configuration inside the session" +msgstr "Detektera automatiskt och använd klientinställningar för tangentbord i session" #: ../pyhoca/wxgui/profilemanager.py:263 -#, fuzzy msgid "Use custom keyboard settings as provided below" -msgstr "Behåll aktuella tangentbordsinställningar" +msgstr "Använd nedan angivna tangentbordsinställningar" #: ../pyhoca/wxgui/profilemanager.py:264 msgid "Keyboard model" @@ -463,11 +479,11 @@ msgstr "Tangentbordsmodell" #: ../pyhoca/wxgui/profilemanager.py:266 msgid "Layout" -msgstr "" +msgstr "Tangentbordslayout" #: ../pyhoca/wxgui/profilemanager.py:268 msgid "Layout variant" -msgstr "" +msgstr "Variant" #: ../pyhoca/wxgui/profilemanager.py:270 msgid "Enable sound support" @@ -507,7 +523,8 @@ msgstr "Använd lokal mappdelning" msgid "Path" msgstr "Sökväg" -#: ../pyhoca/wxgui/profilemanager.py:288 ../pyhoca/wxgui/profilemanager.py:307 +#: ../pyhoca/wxgui/profilemanager.py:288 +#: ../pyhoca/wxgui/profilemanager.py:307 msgid "Add" msgstr "Lägg till" @@ -606,15 +623,15 @@ msgstr "Delning" #: ../pyhoca/wxgui/profilemanager.py:977 msgid "<xkbtype>" -msgstr "" +msgstr "pc105" #: ../pyhoca/wxgui/profilemanager.py:978 msgid "<xkblayout>" -msgstr "" +msgstr "se" #: ../pyhoca/wxgui/profilemanager.py:979 msgid "<xkbvariant>" -msgstr "" +msgstr "se" #: ../pyhoca/wxgui/profilemanager.py:1249 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" @@ -641,7 +658,8 @@ msgstr "Välj en mapp att dela i en session" #: ../pyhoca/wxgui/profilemanager.py:1666 #: ../pyhoca/wxgui/profilemanager.py:1669 #: ../pyhoca/wxgui/profilemanager.py:1674 -#: ../pyhoca/wxgui/profilemanager.py:1684 ../pyhoca/wxgui/menus_taskbar.py:106 +#: ../pyhoca/wxgui/profilemanager.py:1684 +#: ../pyhoca/wxgui/menus_taskbar.py:106 msgid "Profile Manager" msgstr "Profilhanterare" @@ -662,12 +680,10 @@ msgstr "Konfigurationen av SSH-proxy är inte komplett. Försök igen." #: ../pyhoca/wxgui/profilemanager.py:1684 #, python-format msgid "" -"Another session profile (%s) already uses [%s]:%s for binding a local SSH " -"proxy to.\n" +"Another session profile (%s) already uses [%s]:%s for binding a local SSH proxy to.\n" "Please change the SSH proxy settings accordingly." msgstr "" -"En annan session (%s) använder redan [%s]:%s för att ansluta till lokal SSH-" -"proxy.\n" +"En annan session (%s) använder redan [%s]:%s för att ansluta till lokal SSH-proxy.\n" "Ändra konfiguration för SSH-proxy ." #: ../pyhoca/wxgui/profilemanager.py:1704 @@ -717,7 +733,8 @@ msgstr "Utskriftspreferenser" msgid "Client Options" msgstr "Klientalternativ" -#: ../pyhoca/wxgui/menus_taskbar.py:144 ../pyhoca/wxgui/menus_taskbar.py:723 +#: ../pyhoca/wxgui/menus_taskbar.py:144 +#: ../pyhoca/wxgui/menus_taskbar.py:723 #: ../pyhoca/wxgui/menus_taskbar.py:885 msgid "E&xit" msgstr "&Avsluta" @@ -726,7 +743,8 @@ msgstr "&Avsluta" msgid "Window title" msgstr "Fönstertitel" -#: ../pyhoca/wxgui/menus_taskbar.py:209 ../pyhoca/wxgui/menus_taskbar.py:551 +#: ../pyhoca/wxgui/menus_taskbar.py:209 +#: ../pyhoca/wxgui/menus_taskbar.py:551 msgid "Resume Session" msgstr "Återanslut session" @@ -742,37 +760,40 @@ msgstr "Flytta session" msgid "Transfer Session (not possible)" msgstr "Flytta session (ej möjligt)" -#: ../pyhoca/wxgui/menus_taskbar.py:228 ../pyhoca/wxgui/menus_taskbar.py:542 -#, fuzzy +#: ../pyhoca/wxgui/menus_taskbar.py:228 +#: ../pyhoca/wxgui/menus_taskbar.py:542 msgid "Suspend Session (and disconnect/exit)" msgstr "Försätt session i vila och avsluta" -#: ../pyhoca/wxgui/menus_taskbar.py:230 ../pyhoca/wxgui/menus_taskbar.py:544 -#, fuzzy +#: ../pyhoca/wxgui/menus_taskbar.py:230 +#: ../pyhoca/wxgui/menus_taskbar.py:544 msgid "Suspend Session (and disconnect)" -msgstr "Försätt session i vila och avsluta" +msgstr "Försätt session i vila och koppla från" -#: ../pyhoca/wxgui/menus_taskbar.py:232 ../pyhoca/wxgui/menus_taskbar.py:546 +#: ../pyhoca/wxgui/menus_taskbar.py:232 +#: ../pyhoca/wxgui/menus_taskbar.py:546 msgid "Suspend Session" msgstr "Försätt session i vila" -#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:555 -#, fuzzy +#: ../pyhoca/wxgui/menus_taskbar.py:238 +#: ../pyhoca/wxgui/menus_taskbar.py:555 msgid "Terminate Session (and disconnect/exit)" msgstr "Avsluta session" -#: ../pyhoca/wxgui/menus_taskbar.py:240 ../pyhoca/wxgui/menus_taskbar.py:557 -#, fuzzy +#: ../pyhoca/wxgui/menus_taskbar.py:240 +#: ../pyhoca/wxgui/menus_taskbar.py:557 msgid "Terminate Session (and disconnect)" -msgstr "Avsluta session" +msgstr "Koppla från session" -#: ../pyhoca/wxgui/menus_taskbar.py:242 ../pyhoca/wxgui/menus_taskbar.py:559 +#: ../pyhoca/wxgui/menus_taskbar.py:242 +#: ../pyhoca/wxgui/menus_taskbar.py:559 msgid "Terminate Session" msgstr "Avsluta session" -#: ../pyhoca/wxgui/menus_taskbar.py:246 ../pyhoca/wxgui/menus_taskbar.py:539 +#: ../pyhoca/wxgui/menus_taskbar.py:246 +#: ../pyhoca/wxgui/menus_taskbar.py:539 msgid "Refresh menu tree" -msgstr "" +msgstr "Uppdatera menyträd" #: ../pyhoca/wxgui/menus_taskbar.py:255 msgid "Rename Session Window" @@ -838,7 +859,8 @@ msgstr "Verktyg" msgid "Other Applications" msgstr "Övriga applikationer" -#: ../pyhoca/wxgui/menus_taskbar.py:464 ../pyhoca/wxgui/menus_taskbar.py:476 +#: ../pyhoca/wxgui/menus_taskbar.py:464 +#: ../pyhoca/wxgui/menus_taskbar.py:476 #, python-format msgid "Connect %s" msgstr "Anslut %s" @@ -851,11 +873,13 @@ msgstr "Anslutning pågår..." msgid "Start &new Desktop Session" msgstr "Starta &ny Skrivbordssession" -#: ../pyhoca/wxgui/menus_taskbar.py:489 ../pyhoca/wxgui/menus_taskbar.py:627 +#: ../pyhoca/wxgui/menus_taskbar.py:489 +#: ../pyhoca/wxgui/menus_taskbar.py:627 msgid "Retrieving Application Menu..." msgstr "Hämtar applikationsmeny..." -#: ../pyhoca/wxgui/menus_taskbar.py:493 ../pyhoca/wxgui/menus_taskbar.py:630 +#: ../pyhoca/wxgui/menus_taskbar.py:493 +#: ../pyhoca/wxgui/menus_taskbar.py:630 msgid "Retrieve Application Menu" msgstr "Hämta applikationsmeny" @@ -896,14 +920,12 @@ msgid "&Disconnect from Server" msgstr "&Koppla från server" #: ../pyhoca/wxgui/menus_taskbar.py:715 -#, fuzzy msgid "Suspend Session and E&xit application" -msgstr "Försätter session i vila och avslutar..." +msgstr "Försätt session i vila och avsluta" #: ../pyhoca/wxgui/menus_taskbar.py:719 -#, fuzzy msgid "Disconnect and E&xit application" -msgstr "Kopplar från %s och avslutar ..." +msgstr "Kopplar från och &avsluta" #: ../pyhoca/wxgui/menus_taskbar.py:748 msgid "Add Profile" @@ -921,7 +943,8 @@ msgstr "Starta/återanslut session" msgid "Connect Server" msgstr "Anslut till server" -#: ../pyhoca/wxgui/about.py:66 ../pyhoca/wxgui/about.py:68 +#: ../pyhoca/wxgui/about.py:66 +#: ../pyhoca/wxgui/about.py:68 #, python-format msgid "About %s ..." msgstr "Om %s ..." @@ -931,9 +954,9 @@ msgid "Suspending sessions and exiting application..." msgstr "Försätter session i vila och avslutar..." #: ../pyhoca/wxgui/frontend.py:374 -#, fuzzy, python-format +#, python-format msgid "Disconnecting %s and exiting application..." -msgstr "Kopplar från %s och avslutar ..." +msgstr "Kopplar från %s och avslutar applikation..." #: ../pyhoca/wxgui/frontend.py:376 msgid "Exiting application..." @@ -953,15 +976,13 @@ msgid "Public SSH key authentication has been successful." msgstr "Autentisering med publik SSH-nyckel lyckades." #: ../pyhoca/wxgui/frontend.py:523 -msgid "" -"The SSH proxy's host key is invalid or has not been accepted by the user" -msgstr "" -"SSH-proxyns nyckel är felaktig eller har inte accepterats av användaren" +msgid "The SSH proxy's host key is invalid or has not been accepted by the user" +msgstr "SSH-proxyns nyckel är felaktig eller har inte accepterats av användaren" #: ../pyhoca/wxgui/frontend.py:544 -#, fuzzy, python-format +#, python-format msgid "%s - EOF error" -msgstr "%s - nyckelfel" +msgstr "%s - EOF fel" #: ../pyhoca/wxgui/frontend.py:544 msgid "Authentication protocol communication incomplete! Try again..." @@ -980,7 +1001,8 @@ msgstr "Ett okänt fel inträffade vid autentisering!" msgid "Unknown session profile, configure before using it..." msgstr "Okänd sessionsprofil, konfigurera före användning..." -#: ../pyhoca/wxgui/frontend.py:655 ../pyhoca/wxgui/frontend.py:979 +#: ../pyhoca/wxgui/frontend.py:655 +#: ../pyhoca/wxgui/frontend.py:979 #, python-format msgid "%s - session warning" msgstr "%s - sessionsvarning" @@ -988,7 +1010,7 @@ msgstr "%s - sessionsvarning" #: ../pyhoca/wxgui/frontend.py:655 #, python-format msgid "Execution of command ,,%s'' failed." -msgstr "" +msgstr "Exekvering av kommando \"%s\" misslyckades." #: ../pyhoca/wxgui/frontend.py:731 msgid "Cleaning X2Go sessions..." @@ -1051,14 +1073,13 @@ msgstr "%s - kanalfel" #: ../pyhoca/wxgui/frontend.py:953 #, python-format -msgid "" -"Lost connection to server %s unexpectedly! Try to re-authenticate to the " -"server..." -msgstr "" -"Anslutning till %s avslutades oväntat! Försök återansluta till server..." +msgid "Lost connection to server %s unexpectedly! Try to re-authenticate to the server..." +msgstr "Anslutning till %s avslutades oväntat! Försök återansluta till server..." -#: ../pyhoca/wxgui/frontend.py:964 ../pyhoca/wxgui/frontend.py:971 -#: ../pyhoca/wxgui/frontend.py:973 ../pyhoca/wxgui/frontend.py:985 +#: ../pyhoca/wxgui/frontend.py:964 +#: ../pyhoca/wxgui/frontend.py:971 +#: ../pyhoca/wxgui/frontend.py:973 +#: ../pyhoca/wxgui/frontend.py:985 #, python-format msgid "%s - session failure" msgstr "%s - session misslyckades" @@ -1083,20 +1104,13 @@ msgstr "" #: ../pyhoca/wxgui/frontend.py:979 #, python-format -msgid "" -"Reverse TCP port forwarding request for session %s to server port %s has " -"been denied." -msgstr "" -"Omvänd TCP port forwarding för session %s till serverport %s har nekats." +msgid "Reverse TCP port forwarding request for session %s to server port %s has been denied." +msgstr "Omvänd TCP port forwarding för session %s till serverport %s har nekats." #: ../pyhoca/wxgui/frontend.py:985 #, python-format -msgid "" -"Forwarding tunnel request to [%s]:%s for session %s was denied by remote " -"X2go/SSH server. Session startup failed." -msgstr "" -"Begäran om tunnel till [%s]:%s för session %s nekades av X2Go/SSH-server. " -"Sessionsstart misslyckades." +msgid "Forwarding tunnel request to [%s]:%s for session %s was denied by remote X2go/SSH server. Session startup failed." +msgstr "Begäran om tunnel till [%s]:%s för session %s nekades av X2Go/SSH-server. Sessionsstart misslyckades." #: ../pyhoca/wxgui/frontend.py:1000 #, python-format @@ -1104,11 +1118,11 @@ msgid "%s - audio warning" msgstr "%s - ljudvarning" #: ../pyhoca/wxgui/frontend.py:1000 -msgid "" -"The X2Go PulseAudio system is not available within Remote Desktop sessions." +msgid "The X2Go PulseAudio system is not available within Remote Desktop sessions." msgstr "X2Go PulseAudio är inte tillgängligt i Remote Desktop-sessioner." -#: ../pyhoca/wxgui/frontend.py:1003 ../pyhoca/wxgui/frontend.py:1006 +#: ../pyhoca/wxgui/frontend.py:1003 +#: ../pyhoca/wxgui/frontend.py:1006 #, python-format msgid "%s - audio error" msgstr "%s - ljudfel" @@ -1191,7 +1205,8 @@ msgstr "" "Klientdelade mappar och utskrifter kan ej delas med denna session.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1035 ../pyhoca/wxgui/frontend.py:1037 +#: ../pyhoca/wxgui/frontend.py:1035 +#: ../pyhoca/wxgui/frontend.py:1037 #, python-format msgid "%s - print error" msgstr "%s - utskriftsfel" @@ -1218,7 +1233,8 @@ msgstr "" "...orsakat av session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1041 ../pyhoca/wxgui/frontend.py:1045 +#: ../pyhoca/wxgui/frontend.py:1041 +#: ../pyhoca/wxgui/frontend.py:1045 #, python-format msgid "%s - start" msgstr "%s - startar" @@ -1241,7 +1257,8 @@ msgstr "" "En annan klient startade X2Go-session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1049 ../pyhoca/wxgui/frontend.py:1053 +#: ../pyhoca/wxgui/frontend.py:1049 +#: ../pyhoca/wxgui/frontend.py:1053 #, python-format msgid "%s - resume" msgstr "%s - återanslut" @@ -1337,7 +1354,8 @@ msgstr "Ja" msgid "No" msgstr "Nej" -#: ../pyhoca/wxgui/messages.py:103 ../pyhoca/wxgui/printingprefs.py:133 +#: ../pyhoca/wxgui/messages.py:103 +#: ../pyhoca/wxgui/printingprefs.py:133 msgid "Ok" msgstr "OK" hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

x2goclient.git - master (branch) updated: 3.99.2.0-18-gadefcb0
by git-admin＠x2go.org 02 Jun '12

02 Jun '12

The branch, master has been updated via adefcb0cd27987107424e251a4d172b930390a14 (commit) via f388d5f473a4939730a10ecb1e50611c45732717 (commit) via 1b21d75f2c10609f3586f5b5e0b4ceb7fca83fdd (commit) via dd0a6376138afbaec5b5447360a32bf6bdf24d7b (commit) via bad7a0bdb342649e5cad359d644bd5e33cbf7d54 (commit) via 367b245a575649a16fe01320f0ba412cc5fa73a5 (commit) via ea3adb1cce7727a6114537ee3039e044f297d2dd (commit) via 82e8f77fc996de04b148ae9c6d53a78f37442ec9 (commit) from 4f41b1600794e06c5a9ec5e14b1621c52f867ae0 (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 adefcb0cd27987107424e251a4d172b930390a14 Author: Mihai Moldovan <ionic(a)ionic.de> Date: Sat May 26 05:29:33 2012 +0200 Add support for Mac OS X 10.4 Tiger. It won't be officially supported though. This patch enables a compatibility mode for Mac OS X 10.4. Using this, interaction with the local X11 server and a remote server works fine. Note however, that there is one limitation: x2goclient will start one X11 server per connection. For security reasons, this is necessary. It will *not* clean up X11 server processes. This is left to the user. More information about 10.4 support will be posted on the x2go-dev mailing list (shortly). commit f388d5f473a4939730a10ecb1e50611c45732717 Author: Mihai Moldovan <ionic(a)ionic.de> Date: Sat May 26 04:09:47 2012 +0200 Add easy to turn on/off SSH packet logging to sshmasterconnection.cpp. From now on, simply use the defines at the beginning of the file. commit 1b21d75f2c10609f3586f5b5e0b4ceb7fca83fdd Author: Mihai Moldovan <ionic(a)ionic.de> Date: Sat May 26 04:06:42 2012 +0200 Fix a potential bug in the handling of ssh hosts given to libssh. Do the conversion as suggested by the Qt FAQ at http://qt-project.org/faq/answer/how_can_i_convert_a_qstring_to_char_and_vi… commit dd0a6376138afbaec5b5447360a32bf6bdf24d7b Author: Mihai Moldovan <ionic(a)ionic.de> Date: Sat May 26 03:59:41 2012 +0200 Fix copyright header on sshmasterconnection.cpp commit bad7a0bdb342649e5cad359d644bd5e33cbf7d54 Author: Mihai Moldovan <ionic(a)ionic.de> Date: Sat May 26 03:53:27 2012 +0200 Change the Makefile to not delete more temporary files than necessary. A maxdepth of two will crush all temp files in the build directories. Do not mess with other stuff, especially if users are building bundled software inside a contrib/dist directory under the main tree. commit 367b245a575649a16fe01320f0ba412cc5fa73a5 Author: Mihai Moldovan <ionic(a)ionic.de> Date: Sat May 26 03:47:47 2012 +0200 Add support for PowerPC on Mac OS X. Add the Info.plist file to x2goclient.pro commit ea3adb1cce7727a6114537ee3039e044f297d2dd Author: Mihai Moldovan <ionic(a)ionic.de> Date: Sat May 26 03:41:05 2012 +0200 Minor style/whitespace fixes for x2goclient.pro. commit 82e8f77fc996de04b148ae9c6d53a78f37442ec9 Author: Mihai Moldovan <ionic(a)ionic.de> Date: Sat May 26 03:38:05 2012 +0200 Add translation file processing to x2goclient.pro. Automatically build the required x2goclient_*.qm files based on the x2goclient_*.ts translation files. ----------------------------------------------------------------------- Summary of changes: Makefile | 8 ++-- onmainwindow.cpp | 132 ++++++++++++++++++++++++++++++++++++++++++++--- sshmasterconnection.cpp | 19 +++++-- x2goclient.pro | 31 +++++++++--- 4 files changed, 166 insertions(+), 24 deletions(-) The diff of changes is: diff --git a/Makefile b/Makefile index 30c12dc..19d83db 100755 --- a/Makefile +++ b/Makefile @@ -41,10 +41,10 @@ build_man: ${MAKE} -f Makefile.man2html build clean: clean_client clean_plugin clean_man - find . -type f -name '*.o' -exec rm -vf {} + - find . -type f -name 'moc_*.cpp' -exec rm -vf {} + - find . -type f -name 'ui_*.h' -exec rm -vf {} + - find . -type f -name 'qrc_*.cpp' -exec rm -vf {} + + find . -type f -maxdepth 2 -name '*.o' -exec rm -vf {} + + find . -type f -maxdepth 2 -name 'moc_*.cpp' -exec rm -vf {} + + find . -type f -maxdepth 2 -name 'ui_*.h' -exec rm -vf {} + + find . -type f -maxdepth 2 -name 'qrc_*.cpp' -exec rm -vf {} + rm -f x2goclient rm -f x2goclient.tag diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 9a55755..7bda2ed 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -4730,10 +4730,22 @@ void ONMainWindow::slotTunnelOk() } #endif // Q_OS_WIN #if defined ( Q_OS_DARWIN ) - //setting /usr/X11/bin to find xauth + // setting /usr/X11/bin to find xauth + // /usr/X11R6/bin is added for compatibility reasons with OS X 10.4. env.insert ( 0, - "PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin" ); + "PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin:/usr/X11R6/bin" ); + // Set the NX base dir to bundle/exe/, used for finding nxauth. + { + QDir tmpDir (appDir); + tmpDir.cd ("../exe"); + env.append ("NX_SYSTEM=" + tmpDir.absolutePath ()); + } + if (dispInd == -1) + { + x2goDebug << "No DISPLAY variable found in global environment, using autodetected setting."; + env.append ("DISPLAY=" + disp); + } #endif nxproxy->setEnvironment ( env ); /* x2goDebug<<"new env:"<<endl; @@ -7592,19 +7604,123 @@ QString ONMainWindow::getXDisplay() QLocalSocket unixSocket (this); QString xsocket (getenv ("DISPLAY")); - // OS X starts the X11 server automatically, as soon as the launchd UNIX socket - // is accessed. + if (xsocket.isEmpty ()) + { + // Mac OS X 10.4 compatibility mode. + // There, it is possible no $DISPLAY variable is set. + // Start X11 manually. First, find a free display number. + x2goDebug << "entering 10.4 compat mode, checking for free X11 display"; + + int xFreeDisp = 0; + QDir xtmpdir ("/tmp/.X11-unix"); + + if (xtmpdir.exists ()) + { + xtmpdir.setFilter (QDir::Files | QDir::System | QDir::NoSymLinks | QDir::NoDotAndDotDot); + xtmpdir.setSorting (QDir::Name); + + QFileInfoList xtmpdirList = xtmpdir.entryInfoList (); + bool foundFreeDisp = FALSE; + xFreeDisp = -1; + + for (int i = 0; (i < 2000) && (!foundFreeDisp); ++i) + { + QFileInfo xtmpdirFile (xtmpdir.absolutePath () + "/X" + QString::number (i)); + + if ((!xtmpdirFile.exists ()) && (!xtmpdirFile.isSymLink ())) + { + xFreeDisp = i; + foundFreeDisp = TRUE; + } + } + } + + // Control flow will go to error condition if no free display port has been found. + if (xFreeDisp != -1) + { + xsocket = "/tmp/.X11-unix/X" + QString::number (xFreeDisp); + x2goDebug << "Successfully detected free socket " << xsocket << "."; + } + + if (!(xsocket.isEmpty ())) + { + QString xname = ConfigDialog::getXDarwinDirectory () + "/Contents/MacOS/X11"; + QString xopt = ":" + QString::number (xFreeDisp); + QProcessEnvironment env = QProcessEnvironment::systemEnvironment (); + QProcess* startx = new QProcess (this); + + x2goDebug << "Starting the X server on free display port."; + env.insert (0, "PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11R6/bin"); + + startx->setProcessEnvironment (env); + startx->start (xname + QString (" ") + xopt, QIODevice::NotOpen); + if (startx->waitForStarted (3000)) + { + x2goDebug << "sleeping for three seconds"; + int sleeptime = 3; + while ((sleeptime = sleep (sleeptime))) {}; + + x2goDebug << "Leaving OS X 10.4 compat mode."; + } + } + } + + // OS X >= 10.5 starts the X11 server automatically, as soon as the + // launchd UNIX socket is accessed. // On user login, the DISPLAY environment variable is set to this said existing // socket. - // By now, we should have a socket. Test, if connecting works. - if ((!xsocket.isEmpty ())) - { + // By now, we should have a socket, even on 10.4. Test, if connecting works. + // Note: common sense may tell you to change this if into an else. Don't. + // We do not want to skip this part, if coming from the compat section above. + if (!(xsocket.isEmpty ())) + { + if (xsocket[0] == ':') + { + // Be backwards compatible with 10.4. + // Delete the ":" character. + xsocket.remove (0, 1); + // xsocket may now contain the display value (one integer), + // or something like "0.0" - we're only interested in the + // display value, so keep the first char only. + if (xsocket.indexOf (".") != -1) + { + xsocket = xsocket.left (xsocket.indexOf (".")); + } + // Prepend the well-known socket path. + xsocket.prepend ("/tmp/.X11-unix/X"); + x2goDebug << "xsocket in compat mode: " << xsocket; + } + unixSocket.connectToServer (xsocket); if (unixSocket.waitForConnected (10000)) { unixSocket.disconnectFromServer (); - return (xsocket); + + // Mac OS X 10.4 compat: nxproxy expects + // a DISPLAY variable like ":0", passing + // an UNIX socket will just make it error out. + // Instead of altering the nxproxy code, which does + // already try to connect to "/tmp/.X11-unix/Xi" with + // i = display number, pass ":i" as DISPLAY. + if (xsocket.left (16).compare ("/tmp/.x11-unix/x", Qt::CaseInsensitive) == 0) + { + bool ok = FALSE; + int tmp = -1; + + xsocket = xsocket.mid (16); + tmp = xsocket.toInt (&ok); + + if (ok) + { + x2goDebug << "Returning" << QString (":") + xsocket; + return (QString (":") + xsocket); + } + } + else + { + return (xsocket); + } } } // And if not, error out. diff --git a/sshmasterconnection.cpp b/sshmasterconnection.cpp index 1f7b724..9eba130 100644 --- a/sshmasterconnection.cpp +++ b/sshmasterconnection.cpp @@ -1,7 +1,7 @@ /*************************************************************************** - * Copyright (C) 2005-2012 by Oleksandr Shneyder * - * oleksandr.shneyder(a)obviously-nice.de * + * Copyright (C) 2005-2012 by Oleksandr Shneyder * + * oleksandr.shneyder(a)obviously-nice.de * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -46,6 +46,9 @@ #undef DEBUG //#define DEBUG +//#define SSH_DEBUG +#undef SSH_DEBUG + static bool isLibSshInited=false; @@ -142,7 +145,12 @@ void SshMasterConnection::run() } #endif -// int verbosity=SSH_LOG_PROTOCOL; +#ifdef SSH_DEBUG + int verbosity=SSH_LOG_PACKET; +#else + int verbosity=SSH_LOG_NOLOG; +#endif + long timeout = 60; my_ssh_session = ssh_new(); @@ -159,7 +167,7 @@ void SshMasterConnection::run() #ifdef Q_OS_WIN ssh_options_set ( my_ssh_session, SSH_OPTIONS_SSH_DIR, (mainWnd->getHomeDirectory()+"/ssh").toAscii()); #endif -// ssh_options_set(my_ssh_session, SSH_OPTIONS_LOG_VERBOSITY, &verbosity); + ssh_options_set(my_ssh_session, SSH_OPTIONS_LOG_VERBOSITY, &verbosity); ssh_options_set(my_ssh_session, SSH_OPTIONS_TIMEOUT, &timeout); @@ -277,7 +285,8 @@ void SshMasterConnection::finalizeLibSsh() bool SshMasterConnection::sshConnect() { int rc; - ssh_options_set ( my_ssh_session, SSH_OPTIONS_HOST, host.toAscii() ); + QByteArray tmpBA = host.toLocal8Bit(); + ssh_options_set ( my_ssh_session, SSH_OPTIONS_HOST, tmpBA.data() ); ssh_options_set ( my_ssh_session, SSH_OPTIONS_PORT, &port ); rc = ssh_connect ( my_ssh_session ); if ( rc != SSH_OK ) diff --git a/x2goclient.pro b/x2goclient.pro index e9b3599..e831f5b 100755 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -105,7 +105,7 @@ LIBS += -lssh plugin { TARGET = x2goplugin } -else{ +else { RC_FILE = x2goclient.rc SOURCES += x2goclient.cpp TARGET = x2goclient @@ -113,6 +113,24 @@ else{ message(if you want to build x2goplugin you should export X2GO_CLIENT_TARGET=plugin) } +!isEmpty(TRANSLATIONS) { + isEmpty(QMAKE_LRELEASE) { + win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe + else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease + } + + isEmpty(TS_DIR):TS_DIR = . + + TSQM.name = lrelease ${QMAKE_FILE_IN} + TSQM.input = TRANSLATIONS + TSQM.output = $$TS_DIR/${QMAKE_FILE_BASE}.qm + TSQM.commands = $$QMAKE_LRELEASE ${QMAKE_FILE_IN} + TSQM.CONFIG = no_link + QMAKE_EXTRA_COMPILERS += TSQM + PRE_TARGETDEPS += compiler_TSQM_make_all +} +else:message(No translation files in project) + TEMPLATE = app DEPENDPATH += . INCLUDEPATH += . @@ -136,7 +154,7 @@ x2go_linux_static { macx { message(building $$TARGET with ldap and cups) LIBS += -framework LDAP -lcups -lcrypto -lssl -lz - CONFIG += x86 x86_64 + CONFIG += x86 x86_64 ppc } win32-* { message(building $$TARGET for windows without ldap and cups) @@ -144,12 +162,12 @@ win32-* { CONFIG += static release } QT += svg network -ICON =icons/x2go-mac.icns +ICON = icons/x2go-mac.icns +QMAKE_INFO_PLIST = Info.plist QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.5.sdk QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5 -plugin{ - +plugin { DEFINES += CFGPLUGIN linux-g++ { include(qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin.pri) @@ -161,7 +179,6 @@ plugin{ DEFINES += QT_NODLL CONFIG += qaxserver include(qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin.pri) - } + } RC_FILE = x2goplugin.rc - } hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.10-266-g70ea821
by git-admin＠x2go.org 01 Jun '12

01 Jun '12

The branch, master has been updated via 70ea8219a29ccaae472cd75f193e5d8aad01c55d (commit) from b95753e5e00970953d7b39ff4f255ec3d09057b0 (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 70ea8219a29ccaae472cd75f193e5d8aad01c55d Author: Ricardo Díaz Martín <oceanosoftlapalma(a)gmail.com> Date: Fri Jun 1 13:30:26 2012 +0200 Update Spanish translation file. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 + po/es.po | 236 +++++++++++++++++++++++++----------------------------- 2 files changed, 113 insertions(+), 127 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f00e06d..3a98fc9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -172,6 +172,10 @@ pyhoca-gui (0.2.0.0-0~x2go1) UNRELEASED; urgency=low * New upstream version (0.2.0.0): - Update Dutch translation file. + [ Ricardo Díaz Martín ] + * New upstream version (0.2.0.0): + - Update Spanish translation file. + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 09 Nov 2011 03:13:09 +0100 pyhoca-gui (0.1.0.10-0~x2go1) unstable; urgency=low diff --git a/po/es.po b/po/es.po index 33194c5..b3a8fc6 100644 --- a/po/es.po +++ b/po/es.po @@ -5,23 +5,25 @@ # # Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>, 2011. # Ricardo Diaz Martin, 2011. +# Ricardo Díaz Martín <oceanosoftlapalma(a)gmail.com>, 2012. +# msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-05-31 22:04+0200\n" -"PO-Revision-Date: 2011-11-30 15:59+0100\n" -"Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" -"Language-Team: Spanish <x2go-dev(a)lists.berlios.de>\n" +"PO-Revision-Date: 2012-06-01 09:28+0200\n" +"Last-Translator: Ricardo Díaz Martín <oceanosoftlapalma(a)gmail.com>\n" +"Language-Team: Español; Castellano <>\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" +"Content-Transfer-Encoding: 8bits\n" "X-Poedit-Language: Spanish\n" "X-Poedit-Country: SPAIN\n" "X-Poedit-SourceCharset: utf-8\n" "X-Generator: Lokalize 1.2\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" #: ../pyhoca/wxgui/logon.py:80 #, python-format @@ -83,21 +85,21 @@ msgstr "Iniciado tunel SSH" #: ../pyhoca/wxgui/logon.py:320 msgid "Authentication failed!" -msgstr "Error en el nombre de usuario o contraseña!" +msgstr "¡Error en el nombre de usuario o contraseña!" #: ../pyhoca/wxgui/logon.py:327 -#, fuzzy, python-format +#, python-format msgid "%s - SSH proxy" -msgstr "%s - proxy ssh" +msgstr "%s - proxy SSH" #: ../pyhoca/wxgui/logon.py:328 msgid "Authentication to the SSH proxy server failed!" msgstr "¡Nombre de usuario o contraseña erróneo en el servidor proxy SSH!" #: ../pyhoca/wxgui/logon.py:350 ../pyhoca/wxgui/frontend.py:537 -#, fuzzy, python-format +#, python-format msgid "%s - socket error" -msgstr "%s - error en la clave" +msgstr "%s - error de socket" #: ../pyhoca/wxgui/logon.py:357 ../pyhoca/wxgui/frontend.py:516 #: ../pyhoca/wxgui/frontend.py:523 @@ -132,14 +134,14 @@ msgid "%s - auth error" msgstr "%s - error en la autenticación" #: ../pyhoca/wxgui/logon.py:389 ../pyhoca/wxgui/frontend.py:509 -#, fuzzy, python-format +#, python-format msgid "%s - SSH error" -msgstr "%s - error en la clave" +msgstr "%s - error de SSH" #: ../pyhoca/wxgui/logon.py:397 -#, fuzzy, python-format +#, python-format msgid "%s - unknown error" -msgstr "%s - error en el audio" +msgstr "%s - error desconocido" #: ../pyhoca/wxgui/logon.py:398 msgid "An unknown error occured during authentication!" @@ -153,7 +155,7 @@ msgid "" "Connecting you to ,,%s''" msgstr "" "PyHoca-GUI\n" -"Conectándote a ,,%s''" +"Conectando a \"%s\"" #: ../pyhoca/wxgui/taskbar.py:83 #, python-format @@ -162,7 +164,7 @@ msgid "" "Currently connecting you to remote X2Go server ,,%s''" msgstr "" "PyHoca-GUI (Python X2goClient)\n" -"Conectándote a tu servidor X2Go \"%s''" +"Conectando con tu servidor remoto X2Go \"%s\"" #: ../pyhoca/wxgui/taskbar.py:89 msgid "" @@ -170,7 +172,7 @@ msgid "" "Connecting you to X2Go..." msgstr "" "PyHoca-GUI\n" -"Conectándote a X2Go..." +"Conectando a X2Go..." #: ../pyhoca/wxgui/taskbar.py:93 msgid "" @@ -205,9 +207,8 @@ msgid "XFCE4 Desktop (XFCE4)" msgstr "XFCE4 Desktop (XFCE4)" #: ../pyhoca/wxgui/profilemanager.py:79 -#, fuzzy msgid "Published Applications" -msgstr "Aplicación" +msgstr "Aplicaciones publicadas" #: ../pyhoca/wxgui/profilemanager.py:80 msgid "Single Application" @@ -235,9 +236,8 @@ msgid "Email Client" msgstr "Cliente de Correo" #: ../pyhoca/wxgui/profilemanager.py:89 ../pyhoca/wxgui/menus_taskbar.py:357 -#, fuzzy msgid "Office" -msgstr "Openoffice.org" +msgstr "Office" #: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/menus_taskbar.py:358 msgid "Terminal" @@ -257,23 +257,20 @@ msgstr "Guardar archivo recibido como ..." #: ../pyhoca/wxgui/profilemanager.py:134 msgid "settings derived from " -msgstr "" +msgstr "configuraciones recuperadas de " #. boxes for all tabs #: ../pyhoca/wxgui/profilemanager.py:151 -#, fuzzy msgid "Session Title" -msgstr "Perfil de Sesión" +msgstr "Título de la Sesión" #: ../pyhoca/wxgui/profilemanager.py:152 -#, fuzzy msgid "Session Window" -msgstr "Retomar Sesión" +msgstr "Ventana de Sesión" #: ../pyhoca/wxgui/profilemanager.py:153 -#, fuzzy msgid "Session Startup" -msgstr "Sesión" +msgstr "Inicio de Sesión" #: ../pyhoca/wxgui/profilemanager.py:154 msgid "Server" @@ -319,36 +316,32 @@ msgid "Name" msgstr "Nombre" #: ../pyhoca/wxgui/profilemanager.py:174 -#, fuzzy msgid "Set session window title" -msgstr "Título de Sesión" +msgstr "Establecer título de la sesión" #: ../pyhoca/wxgui/profilemanager.py:175 -#, fuzzy msgid "Use a default session window title" -msgstr "Título de Sesión" +msgstr "Usar título de sesión por defecto" #: ../pyhoca/wxgui/profilemanager.py:176 -#, fuzzy msgid "Custom session window title" -msgstr "Título de Sesión" +msgstr "Título de sesión personalizado" #: ../pyhoca/wxgui/profilemanager.py:186 -#, fuzzy msgid "Window Icon" -msgstr "Título de Sesión" +msgstr "Icono de la ventana" #. ## #. ## widgets for the SESSION tab #. ## #: ../pyhoca/wxgui/profilemanager.py:192 msgid "Start session automatically after login" -msgstr "" +msgstr "Iniciar sesión automáticamente tras el login" #: ../pyhoca/wxgui/profilemanager.py:193 #, python-format msgid "Login automatically after %s has started" -msgstr "" +msgstr "El inicio de sesión automático ha comenzado tras %s" #: ../pyhoca/wxgui/profilemanager.py:194 msgid "Type" @@ -372,11 +365,11 @@ msgstr "Opciones RDP" #: ../pyhoca/wxgui/profilemanager.py:206 msgid "Integrate remote application(s) into local desktop (rootless mode)" -msgstr "" +msgstr "Integrar aplicaciones en el escritorio local (modo rootless)" #: ../pyhoca/wxgui/profilemanager.py:207 msgid "Menu of published applications" -msgstr "" +msgstr "Menú de aplicaciones publicadas" #. ## #. ## widgets for the CONNECTION tab @@ -459,17 +452,20 @@ msgstr "Establecer DPI" #: ../pyhoca/wxgui/profilemanager.py:261 msgid "Do not set (use server-side tools to configure the keyboard)" msgstr "" +"No establecido (usar las herramientas del lado del servidor para configurar " +"el teclado)" #: ../pyhoca/wxgui/profilemanager.py:262 msgid "" "Automatically detect and use client-side keyboard configuration inside the " "session" msgstr "" +"Detectar automáticamente y usar la configuración de teclado del lado del " +"cliente en la sesión remota" #: ../pyhoca/wxgui/profilemanager.py:263 -#, fuzzy msgid "Use custom keyboard settings as provided below" -msgstr "Mantener configuración actual del teclado" +msgstr "Ussar configuración de teclado personalizada" #: ../pyhoca/wxgui/profilemanager.py:264 msgid "Keyboard model" @@ -477,11 +473,11 @@ msgstr "Modelo de teclado" #: ../pyhoca/wxgui/profilemanager.py:266 msgid "Layout" -msgstr "" +msgstr "Capa" #: ../pyhoca/wxgui/profilemanager.py:268 msgid "Layout variant" -msgstr "" +msgstr "Variante de la capa" #: ../pyhoca/wxgui/profilemanager.py:270 msgid "Enable sound support" @@ -599,9 +595,8 @@ msgid "PyHoca-GUI Profile Manager - %s" msgstr "PyHoca-GUI Gestor de Perfiles - %s" #: ../pyhoca/wxgui/profilemanager.py:735 -#, fuzzy msgid "Profile" -msgstr "Perfil " +msgstr "Perfil" #: ../pyhoca/wxgui/profilemanager.py:736 msgid "Session" @@ -621,15 +616,15 @@ msgstr "Compartir" #: ../pyhoca/wxgui/profilemanager.py:977 msgid "<xkbtype>" -msgstr "" +msgstr "<xkbtype>" #: ../pyhoca/wxgui/profilemanager.py:978 msgid "<xkblayout>" -msgstr "" +msgstr "<xkblayout>" #: ../pyhoca/wxgui/profilemanager.py:979 msgid "<xkbvariant>" -msgstr "" +msgstr "<xkbvariant>" #: ../pyhoca/wxgui/profilemanager.py:1249 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" @@ -711,7 +706,7 @@ msgstr "Editar Perfil" #: ../pyhoca/wxgui/menus_taskbar.py:71 msgid "Use as Template for New Profile" -msgstr "" +msgstr "Usar como Plantilla para Nuevos Perfiles" #: ../pyhoca/wxgui/menus_taskbar.py:72 msgid "Delete Profile" @@ -723,9 +718,8 @@ msgid "About %s (%s)..." msgstr "Acerca de %s (%s) ..." #: ../pyhoca/wxgui/menus_taskbar.py:121 -#, fuzzy msgid "Manage Session Profile" -msgstr "Nuevo Perfil de Sesión" +msgstr "Gestionar Perfil de Sesión" #: ../pyhoca/wxgui/menus_taskbar.py:130 msgid "Printing Preferences" @@ -741,9 +735,8 @@ msgid "E&xit" msgstr "S&alir" #: ../pyhoca/wxgui/menus_taskbar.py:203 -#, fuzzy msgid "Window title" -msgstr "Título de Sesión" +msgstr "Título de la ventana" #: ../pyhoca/wxgui/menus_taskbar.py:209 ../pyhoca/wxgui/menus_taskbar.py:551 msgid "Resume Session" @@ -762,28 +755,24 @@ msgid "Transfer Session (not possible)" msgstr "Transferir Sesión (no disponible)" #: ../pyhoca/wxgui/menus_taskbar.py:228 ../pyhoca/wxgui/menus_taskbar.py:542 -#, fuzzy msgid "Suspend Session (and disconnect/exit)" -msgstr "Suspender Sesión" +msgstr "Suspender Sesión (y desconectar/salir)" #: ../pyhoca/wxgui/menus_taskbar.py:230 ../pyhoca/wxgui/menus_taskbar.py:544 -#, fuzzy msgid "Suspend Session (and disconnect)" -msgstr "Suspender Sesión" +msgstr "Suspender Sesión (y desconectar)" #: ../pyhoca/wxgui/menus_taskbar.py:232 ../pyhoca/wxgui/menus_taskbar.py:546 msgid "Suspend Session" msgstr "Suspender Sesión" #: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:555 -#, fuzzy msgid "Terminate Session (and disconnect/exit)" -msgstr "Finalizar Sesión" +msgstr "Finalizar Sesión (y desconectar/salir)" #: ../pyhoca/wxgui/menus_taskbar.py:240 ../pyhoca/wxgui/menus_taskbar.py:557 -#, fuzzy msgid "Terminate Session (and disconnect)" -msgstr "Finalizar Sesión" +msgstr "Finalizar Sesión (y desconectar)" #: ../pyhoca/wxgui/menus_taskbar.py:242 ../pyhoca/wxgui/menus_taskbar.py:559 msgid "Terminate Session" @@ -791,17 +780,15 @@ msgstr "Finalizar Sesión" #: ../pyhoca/wxgui/menus_taskbar.py:246 ../pyhoca/wxgui/menus_taskbar.py:539 msgid "Refresh menu tree" -msgstr "" +msgstr "Actualizar árbol de menús" #: ../pyhoca/wxgui/menus_taskbar.py:255 -#, fuzzy msgid "Rename Session Window" -msgstr "Retomar Sesión" +msgstr "Renombrar la Ventana de la Sesión" #: ../pyhoca/wxgui/menus_taskbar.py:256 -#, fuzzy msgid "Show Session Window" -msgstr "Retomar Sesión" +msgstr "Mostrar la Ventana de la Sesión" #: ../pyhoca/wxgui/menus_taskbar.py:289 msgid "&Share custom local folder" @@ -821,85 +808,76 @@ msgstr "Dejar de compartir tod&as las carpetas locales" #: ../pyhoca/wxgui/menus_taskbar.py:390 msgid "Multimedia" -msgstr "" +msgstr "Multimedia" #: ../pyhoca/wxgui/menus_taskbar.py:391 msgid "Development" -msgstr "" +msgstr "Desarrollo" #: ../pyhoca/wxgui/menus_taskbar.py:392 -#, fuzzy msgid "Education" -msgstr "Acción" +msgstr "Educación" #: ../pyhoca/wxgui/menus_taskbar.py:393 msgid "Games" -msgstr "" +msgstr "Juegos" #: ../pyhoca/wxgui/menus_taskbar.py:394 msgid "Graphics" -msgstr "" +msgstr "Gráficos" #: ../pyhoca/wxgui/menus_taskbar.py:395 -#, fuzzy msgid "Internet" -msgstr "Navegador web" +msgstr "Internet" #: ../pyhoca/wxgui/menus_taskbar.py:396 -#, fuzzy msgid "Office Applications" -msgstr "Aplicación" +msgstr "Ofimática" #: ../pyhoca/wxgui/menus_taskbar.py:397 msgid "System" -msgstr "" +msgstr "Sistema" #: ../pyhoca/wxgui/menus_taskbar.py:398 msgid "Utilities" -msgstr "" +msgstr "Utilidades" #: ../pyhoca/wxgui/menus_taskbar.py:399 -#, fuzzy msgid "Other Applications" -msgstr "Aplicación" +msgstr "Otras Aplicaciones" #: ../pyhoca/wxgui/menus_taskbar.py:464 ../pyhoca/wxgui/menus_taskbar.py:476 -#, fuzzy, python-format +#, python-format msgid "Connect %s" -msgstr "Conexión" +msgstr "Conectar %s" #: ../pyhoca/wxgui/menus_taskbar.py:470 msgid "Currently connecting..." -msgstr "" +msgstr "Conectando..." #: ../pyhoca/wxgui/menus_taskbar.py:484 -#, fuzzy msgid "Start &new Desktop Session" -msgstr "Iniciar &nueva Sesión" +msgstr "Iniciar &nueva Sesión de Escritorio" #: ../pyhoca/wxgui/menus_taskbar.py:489 ../pyhoca/wxgui/menus_taskbar.py:627 -#, fuzzy msgid "Retrieving Application Menu..." -msgstr "Aplicación" +msgstr "Recuperando Menú de Aplicación..." #: ../pyhoca/wxgui/menus_taskbar.py:493 ../pyhoca/wxgui/menus_taskbar.py:630 -#, fuzzy msgid "Retrieve Application Menu" -msgstr "Aplicación" +msgstr "Recibido Menú de Aplicación" #: ../pyhoca/wxgui/menus_taskbar.py:496 msgid "Start &new Session" msgstr "Iniciar &nueva Sesión" #: ../pyhoca/wxgui/menus_taskbar.py:576 -#, fuzzy msgid "Launch Single Application" -msgstr "Aplicación" +msgstr "Ejecutar la aplicación" #: ../pyhoca/wxgui/menus_taskbar.py:614 -#, fuzzy msgid "Manage Application Menu" -msgstr "Aplicación" +msgstr "Gestionar el Menú de la Aplicación" #: ../pyhoca/wxgui/menus_taskbar.py:657 msgid "Running" @@ -926,14 +904,12 @@ msgid "&Disconnect from Server" msgstr "&Desconectar del servidor" #: ../pyhoca/wxgui/menus_taskbar.py:715 -#, fuzzy msgid "Suspend Session and E&xit application" -msgstr "Suspender Sesión" +msgstr "Suspender Sesión y Salir (e&xit) de la aplicación" #: ../pyhoca/wxgui/menus_taskbar.py:719 -#, fuzzy msgid "Disconnect and E&xit application" -msgstr "Suspender Sesión" +msgstr "Desconectar y Salir (e&xit) de la aplicación" #: ../pyhoca/wxgui/menus_taskbar.py:748 msgid "Add Profile" @@ -957,28 +933,26 @@ msgid "About %s ..." msgstr "Acerca de %s ..." #: ../pyhoca/wxgui/frontend.py:371 -#, fuzzy msgid "Suspending sessions and exiting application..." -msgstr "Suspender Sesión" +msgstr "Suspendiendo sesiones y saliendo de las aplicaciones..." #: ../pyhoca/wxgui/frontend.py:374 -#, fuzzy, python-format +#, python-format msgid "Disconnecting %s and exiting application..." -msgstr "Suspender Sesión" +msgstr "Desconectando %s y saliendo de las aplicaciones..." #: ../pyhoca/wxgui/frontend.py:376 -#, fuzzy msgid "Exiting application..." -msgstr "Aplicación" +msgstr "Saliendo de la aplicación..." #: ../pyhoca/wxgui/frontend.py:456 -#, fuzzy, python-format +#, python-format msgid "%s - server warning" -msgstr "%s - advertencia durante la sesión" +msgstr "%s - advertencia del servidor" #: ../pyhoca/wxgui/frontend.py:456 msgid "The X2Go Server does not publish an application menu." -msgstr "" +msgstr "El servidor X2GO no publica menú de la aplicación" #: ../pyhoca/wxgui/frontend.py:489 msgid "Public SSH key authentication has been successful." @@ -991,9 +965,9 @@ msgstr "" "La clave SSH del proxy no es válida o no ha sido aceptada por el usuario" #: ../pyhoca/wxgui/frontend.py:544 -#, fuzzy, python-format +#, python-format msgid "%s - EOF error" -msgstr "%s - error en la clave" +msgstr "%s - error EOF" #: ../pyhoca/wxgui/frontend.py:544 msgid "Authentication protocol communication incomplete! Try again..." @@ -1012,19 +986,18 @@ msgstr "" "¡Error desconocido al tratar de validar el nombre de usuario y la contraseña!" #: ../pyhoca/wxgui/frontend.py:600 -#, fuzzy msgid "Unknown session profile, configure before using it..." -msgstr "Nuevo Perfil de Sesión" +msgstr "Perfil de Sesión Desconocido, configúralo antes de usar..." #: ../pyhoca/wxgui/frontend.py:655 ../pyhoca/wxgui/frontend.py:979 #, python-format msgid "%s - session warning" -msgstr "%s - advertencia durante la sesión" +msgstr "%s - advertencia de la sesión" #: ../pyhoca/wxgui/frontend.py:655 #, python-format msgid "Execution of command ,,%s'' failed." -msgstr "" +msgstr "Fallo al ejecutar el comando \"%s\"." #: ../pyhoca/wxgui/frontend.py:731 msgid "Cleaning X2Go sessions..." @@ -1071,7 +1044,7 @@ msgid "" "Are you sure you want to continue connecting?" msgstr "" "La autenticidad del servidor [%s]:%s no puede comprobarse.\n" -"la huella de la clave %s es ,,%s''.\n" +"la huella de la clave %s es \"%s\".\n" "\n" "¿Continuar con la conexión?" @@ -1115,7 +1088,7 @@ msgid "" "The command ,,%s'' is not available on X2Go server\n" "%s." msgstr "" -"El comando ,,%s'' no está presente en el servidor X2go\n" +"El comando \"%s\" no está disponible en el servidor X2go\n" "%s." #: ../pyhoca/wxgui/frontend.py:979 @@ -1176,9 +1149,10 @@ msgstr "" "%s" #: ../pyhoca/wxgui/frontend.py:1012 -#, fuzzy, python-format +#, python-format msgid "%s - client-side printing not available" -msgstr "- el sistema de impresión no está disponible -" +msgstr "" +"%s - el sistema de impresión en el lado del cliente no está disponible -" #: ../pyhoca/wxgui/frontend.py:1012 #, python-format @@ -1186,11 +1160,13 @@ msgid "" "The server denies client-side printing from within this session.\n" "%s" msgstr "" +"El servidor no permite la impresión del lado del cliente para esta sesión.\n" +"%s" #: ../pyhoca/wxgui/frontend.py:1015 #, python-format msgid "%s - MIME box not available" -msgstr "" +msgstr "%s - No está disponible el contexto MIME" #: ../pyhoca/wxgui/frontend.py:1015 #, python-format @@ -1198,11 +1174,13 @@ msgid "" "The server does not support the X2Go MIME box.\n" "%s" msgstr "" +"El servidor no soporta el contexto X2Go MIME.\n" +"%s" #: ../pyhoca/wxgui/frontend.py:1018 #, python-format msgid "%s - client-side folders not sharable" -msgstr "" +msgstr "%s - las carpetas del lado del cliente no están compartidas" #: ../pyhoca/wxgui/frontend.py:1018 #, python-format @@ -1210,11 +1188,14 @@ msgid "" "The server denies client-side folder sharing with this session.\n" "%s" msgstr "" +"El servidor no permite compartir carpetas del lado del cliente en esta " +"sesión.\n" +"%s" #: ../pyhoca/wxgui/frontend.py:1021 #, python-format msgid "%s - client resources not sharable" -msgstr "" +msgstr "%s - el recurso del cliente no está marcado como compartido" #: ../pyhoca/wxgui/frontend.py:1021 #, python-format @@ -1222,6 +1203,9 @@ msgid "" "Client-side folders and printers cannot be shared with this session.\n" "%s" msgstr "" +"La impresión y el acceso a las carpetas del lado del cliente no están " +"permitidas en esta sesión.\n" +"%s" #: ../pyhoca/wxgui/frontend.py:1035 ../pyhoca/wxgui/frontend.py:1037 #, python-format @@ -1442,9 +1426,8 @@ msgid "Print" msgstr "Imprimir" #: ../pyhoca/wxgui/printingprefs.py:231 -#, fuzzy msgid "- no printers installed -" -msgstr "- el sistema de impresión no está disponible -" +msgstr "- hay impresoras instaladas -" #: ../pyhoca/wxgui/printingprefs.py:236 msgid "- print system is not available -" @@ -1459,18 +1442,17 @@ msgid "Choose PDF saving location" msgstr "Elegir localización para los PDFs" #: ../pyhoca/wxgui/sessiontitle.py:69 -#, fuzzy, python-format +#, python-format msgid "Session Title - %s" -msgstr "Perfil de Sesión" +msgstr "Título de la sesión - %s" #: ../pyhoca/wxgui/sessiontitle.py:71 -#, fuzzy msgid "Change session title to" -msgstr "Nuevo Perfil de Sesión" +msgstr "Cambiar título de la sesión a" #: ../pyhoca/wxgui/sessiontitle.py:73 msgid "OK" -msgstr "" +msgstr "Ok" #~ msgid "Keyboard layout" #~ msgstr "Máscara de teclado" hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.10-266-g979fe29
by git-admin＠x2go.org 01 Jun '12

01 Jun '12

The branch, master has been updated via 979fe29ab1369b064996da3843d4de6cc3dffc43 (commit) from b95753e5e00970953d7b39ff4f255ec3d09057b0 (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 979fe29ab1369b064996da3843d4de6cc3dffc43 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Jun 1 13:30:26 2012 +0200 Update Spanish translation file. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 + po/es.po | 236 +++++++++++++++++++++++++----------------------------- 2 files changed, 113 insertions(+), 127 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f00e06d..3a98fc9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -172,6 +172,10 @@ pyhoca-gui (0.2.0.0-0~x2go1) UNRELEASED; urgency=low * New upstream version (0.2.0.0): - Update Dutch translation file. + [ Ricardo Díaz Martín ] + * New upstream version (0.2.0.0): + - Update Spanish translation file. + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 09 Nov 2011 03:13:09 +0100 pyhoca-gui (0.1.0.10-0~x2go1) unstable; urgency=low diff --git a/po/es.po b/po/es.po index 33194c5..b3a8fc6 100644 --- a/po/es.po +++ b/po/es.po @@ -5,23 +5,25 @@ # # Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>, 2011. # Ricardo Diaz Martin, 2011. +# Ricardo Díaz Martín <oceanosoftlapalma(a)gmail.com>, 2012. +# msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-05-31 22:04+0200\n" -"PO-Revision-Date: 2011-11-30 15:59+0100\n" -"Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" -"Language-Team: Spanish <x2go-dev(a)lists.berlios.de>\n" +"PO-Revision-Date: 2012-06-01 09:28+0200\n" +"Last-Translator: Ricardo Díaz Martín <oceanosoftlapalma(a)gmail.com>\n" +"Language-Team: Español; Castellano <>\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" +"Content-Transfer-Encoding: 8bits\n" "X-Poedit-Language: Spanish\n" "X-Poedit-Country: SPAIN\n" "X-Poedit-SourceCharset: utf-8\n" "X-Generator: Lokalize 1.2\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" #: ../pyhoca/wxgui/logon.py:80 #, python-format @@ -83,21 +85,21 @@ msgstr "Iniciado tunel SSH" #: ../pyhoca/wxgui/logon.py:320 msgid "Authentication failed!" -msgstr "Error en el nombre de usuario o contraseña!" +msgstr "¡Error en el nombre de usuario o contraseña!" #: ../pyhoca/wxgui/logon.py:327 -#, fuzzy, python-format +#, python-format msgid "%s - SSH proxy" -msgstr "%s - proxy ssh" +msgstr "%s - proxy SSH" #: ../pyhoca/wxgui/logon.py:328 msgid "Authentication to the SSH proxy server failed!" msgstr "¡Nombre de usuario o contraseña erróneo en el servidor proxy SSH!" #: ../pyhoca/wxgui/logon.py:350 ../pyhoca/wxgui/frontend.py:537 -#, fuzzy, python-format +#, python-format msgid "%s - socket error" -msgstr "%s - error en la clave" +msgstr "%s - error de socket" #: ../pyhoca/wxgui/logon.py:357 ../pyhoca/wxgui/frontend.py:516 #: ../pyhoca/wxgui/frontend.py:523 @@ -132,14 +134,14 @@ msgid "%s - auth error" msgstr "%s - error en la autenticación" #: ../pyhoca/wxgui/logon.py:389 ../pyhoca/wxgui/frontend.py:509 -#, fuzzy, python-format +#, python-format msgid "%s - SSH error" -msgstr "%s - error en la clave" +msgstr "%s - error de SSH" #: ../pyhoca/wxgui/logon.py:397 -#, fuzzy, python-format +#, python-format msgid "%s - unknown error" -msgstr "%s - error en el audio" +msgstr "%s - error desconocido" #: ../pyhoca/wxgui/logon.py:398 msgid "An unknown error occured during authentication!" @@ -153,7 +155,7 @@ msgid "" "Connecting you to ,,%s''" msgstr "" "PyHoca-GUI\n" -"Conectándote a ,,%s''" +"Conectando a \"%s\"" #: ../pyhoca/wxgui/taskbar.py:83 #, python-format @@ -162,7 +164,7 @@ msgid "" "Currently connecting you to remote X2Go server ,,%s''" msgstr "" "PyHoca-GUI (Python X2goClient)\n" -"Conectándote a tu servidor X2Go \"%s''" +"Conectando con tu servidor remoto X2Go \"%s\"" #: ../pyhoca/wxgui/taskbar.py:89 msgid "" @@ -170,7 +172,7 @@ msgid "" "Connecting you to X2Go..." msgstr "" "PyHoca-GUI\n" -"Conectándote a X2Go..." +"Conectando a X2Go..." #: ../pyhoca/wxgui/taskbar.py:93 msgid "" @@ -205,9 +207,8 @@ msgid "XFCE4 Desktop (XFCE4)" msgstr "XFCE4 Desktop (XFCE4)" #: ../pyhoca/wxgui/profilemanager.py:79 -#, fuzzy msgid "Published Applications" -msgstr "Aplicación" +msgstr "Aplicaciones publicadas" #: ../pyhoca/wxgui/profilemanager.py:80 msgid "Single Application" @@ -235,9 +236,8 @@ msgid "Email Client" msgstr "Cliente de Correo" #: ../pyhoca/wxgui/profilemanager.py:89 ../pyhoca/wxgui/menus_taskbar.py:357 -#, fuzzy msgid "Office" -msgstr "Openoffice.org" +msgstr "Office" #: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/menus_taskbar.py:358 msgid "Terminal" @@ -257,23 +257,20 @@ msgstr "Guardar archivo recibido como ..." #: ../pyhoca/wxgui/profilemanager.py:134 msgid "settings derived from " -msgstr "" +msgstr "configuraciones recuperadas de " #. boxes for all tabs #: ../pyhoca/wxgui/profilemanager.py:151 -#, fuzzy msgid "Session Title" -msgstr "Perfil de Sesión" +msgstr "Título de la Sesión" #: ../pyhoca/wxgui/profilemanager.py:152 -#, fuzzy msgid "Session Window" -msgstr "Retomar Sesión" +msgstr "Ventana de Sesión" #: ../pyhoca/wxgui/profilemanager.py:153 -#, fuzzy msgid "Session Startup" -msgstr "Sesión" +msgstr "Inicio de Sesión" #: ../pyhoca/wxgui/profilemanager.py:154 msgid "Server" @@ -319,36 +316,32 @@ msgid "Name" msgstr "Nombre" #: ../pyhoca/wxgui/profilemanager.py:174 -#, fuzzy msgid "Set session window title" -msgstr "Título de Sesión" +msgstr "Establecer título de la sesión" #: ../pyhoca/wxgui/profilemanager.py:175 -#, fuzzy msgid "Use a default session window title" -msgstr "Título de Sesión" +msgstr "Usar título de sesión por defecto" #: ../pyhoca/wxgui/profilemanager.py:176 -#, fuzzy msgid "Custom session window title" -msgstr "Título de Sesión" +msgstr "Título de sesión personalizado" #: ../pyhoca/wxgui/profilemanager.py:186 -#, fuzzy msgid "Window Icon" -msgstr "Título de Sesión" +msgstr "Icono de la ventana" #. ## #. ## widgets for the SESSION tab #. ## #: ../pyhoca/wxgui/profilemanager.py:192 msgid "Start session automatically after login" -msgstr "" +msgstr "Iniciar sesión automáticamente tras el login" #: ../pyhoca/wxgui/profilemanager.py:193 #, python-format msgid "Login automatically after %s has started" -msgstr "" +msgstr "El inicio de sesión automático ha comenzado tras %s" #: ../pyhoca/wxgui/profilemanager.py:194 msgid "Type" @@ -372,11 +365,11 @@ msgstr "Opciones RDP" #: ../pyhoca/wxgui/profilemanager.py:206 msgid "Integrate remote application(s) into local desktop (rootless mode)" -msgstr "" +msgstr "Integrar aplicaciones en el escritorio local (modo rootless)" #: ../pyhoca/wxgui/profilemanager.py:207 msgid "Menu of published applications" -msgstr "" +msgstr "Menú de aplicaciones publicadas" #. ## #. ## widgets for the CONNECTION tab @@ -459,17 +452,20 @@ msgstr "Establecer DPI" #: ../pyhoca/wxgui/profilemanager.py:261 msgid "Do not set (use server-side tools to configure the keyboard)" msgstr "" +"No establecido (usar las herramientas del lado del servidor para configurar " +"el teclado)" #: ../pyhoca/wxgui/profilemanager.py:262 msgid "" "Automatically detect and use client-side keyboard configuration inside the " "session" msgstr "" +"Detectar automáticamente y usar la configuración de teclado del lado del " +"cliente en la sesión remota" #: ../pyhoca/wxgui/profilemanager.py:263 -#, fuzzy msgid "Use custom keyboard settings as provided below" -msgstr "Mantener configuración actual del teclado" +msgstr "Ussar configuración de teclado personalizada" #: ../pyhoca/wxgui/profilemanager.py:264 msgid "Keyboard model" @@ -477,11 +473,11 @@ msgstr "Modelo de teclado" #: ../pyhoca/wxgui/profilemanager.py:266 msgid "Layout" -msgstr "" +msgstr "Capa" #: ../pyhoca/wxgui/profilemanager.py:268 msgid "Layout variant" -msgstr "" +msgstr "Variante de la capa" #: ../pyhoca/wxgui/profilemanager.py:270 msgid "Enable sound support" @@ -599,9 +595,8 @@ msgid "PyHoca-GUI Profile Manager - %s" msgstr "PyHoca-GUI Gestor de Perfiles - %s" #: ../pyhoca/wxgui/profilemanager.py:735 -#, fuzzy msgid "Profile" -msgstr "Perfil " +msgstr "Perfil" #: ../pyhoca/wxgui/profilemanager.py:736 msgid "Session" @@ -621,15 +616,15 @@ msgstr "Compartir" #: ../pyhoca/wxgui/profilemanager.py:977 msgid "<xkbtype>" -msgstr "" +msgstr "<xkbtype>" #: ../pyhoca/wxgui/profilemanager.py:978 msgid "<xkblayout>" -msgstr "" +msgstr "<xkblayout>" #: ../pyhoca/wxgui/profilemanager.py:979 msgid "<xkbvariant>" -msgstr "" +msgstr "<xkbvariant>" #: ../pyhoca/wxgui/profilemanager.py:1249 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" @@ -711,7 +706,7 @@ msgstr "Editar Perfil" #: ../pyhoca/wxgui/menus_taskbar.py:71 msgid "Use as Template for New Profile" -msgstr "" +msgstr "Usar como Plantilla para Nuevos Perfiles" #: ../pyhoca/wxgui/menus_taskbar.py:72 msgid "Delete Profile" @@ -723,9 +718,8 @@ msgid "About %s (%s)..." msgstr "Acerca de %s (%s) ..." #: ../pyhoca/wxgui/menus_taskbar.py:121 -#, fuzzy msgid "Manage Session Profile" -msgstr "Nuevo Perfil de Sesión" +msgstr "Gestionar Perfil de Sesión" #: ../pyhoca/wxgui/menus_taskbar.py:130 msgid "Printing Preferences" @@ -741,9 +735,8 @@ msgid "E&xit" msgstr "S&alir" #: ../pyhoca/wxgui/menus_taskbar.py:203 -#, fuzzy msgid "Window title" -msgstr "Título de Sesión" +msgstr "Título de la ventana" #: ../pyhoca/wxgui/menus_taskbar.py:209 ../pyhoca/wxgui/menus_taskbar.py:551 msgid "Resume Session" @@ -762,28 +755,24 @@ msgid "Transfer Session (not possible)" msgstr "Transferir Sesión (no disponible)" #: ../pyhoca/wxgui/menus_taskbar.py:228 ../pyhoca/wxgui/menus_taskbar.py:542 -#, fuzzy msgid "Suspend Session (and disconnect/exit)" -msgstr "Suspender Sesión" +msgstr "Suspender Sesión (y desconectar/salir)" #: ../pyhoca/wxgui/menus_taskbar.py:230 ../pyhoca/wxgui/menus_taskbar.py:544 -#, fuzzy msgid "Suspend Session (and disconnect)" -msgstr "Suspender Sesión" +msgstr "Suspender Sesión (y desconectar)" #: ../pyhoca/wxgui/menus_taskbar.py:232 ../pyhoca/wxgui/menus_taskbar.py:546 msgid "Suspend Session" msgstr "Suspender Sesión" #: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:555 -#, fuzzy msgid "Terminate Session (and disconnect/exit)" -msgstr "Finalizar Sesión" +msgstr "Finalizar Sesión (y desconectar/salir)" #: ../pyhoca/wxgui/menus_taskbar.py:240 ../pyhoca/wxgui/menus_taskbar.py:557 -#, fuzzy msgid "Terminate Session (and disconnect)" -msgstr "Finalizar Sesión" +msgstr "Finalizar Sesión (y desconectar)" #: ../pyhoca/wxgui/menus_taskbar.py:242 ../pyhoca/wxgui/menus_taskbar.py:559 msgid "Terminate Session" @@ -791,17 +780,15 @@ msgstr "Finalizar Sesión" #: ../pyhoca/wxgui/menus_taskbar.py:246 ../pyhoca/wxgui/menus_taskbar.py:539 msgid "Refresh menu tree" -msgstr "" +msgstr "Actualizar árbol de menús" #: ../pyhoca/wxgui/menus_taskbar.py:255 -#, fuzzy msgid "Rename Session Window" -msgstr "Retomar Sesión" +msgstr "Renombrar la Ventana de la Sesión" #: ../pyhoca/wxgui/menus_taskbar.py:256 -#, fuzzy msgid "Show Session Window" -msgstr "Retomar Sesión" +msgstr "Mostrar la Ventana de la Sesión" #: ../pyhoca/wxgui/menus_taskbar.py:289 msgid "&Share custom local folder" @@ -821,85 +808,76 @@ msgstr "Dejar de compartir tod&as las carpetas locales" #: ../pyhoca/wxgui/menus_taskbar.py:390 msgid "Multimedia" -msgstr "" +msgstr "Multimedia" #: ../pyhoca/wxgui/menus_taskbar.py:391 msgid "Development" -msgstr "" +msgstr "Desarrollo" #: ../pyhoca/wxgui/menus_taskbar.py:392 -#, fuzzy msgid "Education" -msgstr "Acción" +msgstr "Educación" #: ../pyhoca/wxgui/menus_taskbar.py:393 msgid "Games" -msgstr "" +msgstr "Juegos" #: ../pyhoca/wxgui/menus_taskbar.py:394 msgid "Graphics" -msgstr "" +msgstr "Gráficos" #: ../pyhoca/wxgui/menus_taskbar.py:395 -#, fuzzy msgid "Internet" -msgstr "Navegador web" +msgstr "Internet" #: ../pyhoca/wxgui/menus_taskbar.py:396 -#, fuzzy msgid "Office Applications" -msgstr "Aplicación" +msgstr "Ofimática" #: ../pyhoca/wxgui/menus_taskbar.py:397 msgid "System" -msgstr "" +msgstr "Sistema" #: ../pyhoca/wxgui/menus_taskbar.py:398 msgid "Utilities" -msgstr "" +msgstr "Utilidades" #: ../pyhoca/wxgui/menus_taskbar.py:399 -#, fuzzy msgid "Other Applications" -msgstr "Aplicación" +msgstr "Otras Aplicaciones" #: ../pyhoca/wxgui/menus_taskbar.py:464 ../pyhoca/wxgui/menus_taskbar.py:476 -#, fuzzy, python-format +#, python-format msgid "Connect %s" -msgstr "Conexión" +msgstr "Conectar %s" #: ../pyhoca/wxgui/menus_taskbar.py:470 msgid "Currently connecting..." -msgstr "" +msgstr "Conectando..." #: ../pyhoca/wxgui/menus_taskbar.py:484 -#, fuzzy msgid "Start &new Desktop Session" -msgstr "Iniciar &nueva Sesión" +msgstr "Iniciar &nueva Sesión de Escritorio" #: ../pyhoca/wxgui/menus_taskbar.py:489 ../pyhoca/wxgui/menus_taskbar.py:627 -#, fuzzy msgid "Retrieving Application Menu..." -msgstr "Aplicación" +msgstr "Recuperando Menú de Aplicación..." #: ../pyhoca/wxgui/menus_taskbar.py:493 ../pyhoca/wxgui/menus_taskbar.py:630 -#, fuzzy msgid "Retrieve Application Menu" -msgstr "Aplicación" +msgstr "Recibido Menú de Aplicación" #: ../pyhoca/wxgui/menus_taskbar.py:496 msgid "Start &new Session" msgstr "Iniciar &nueva Sesión" #: ../pyhoca/wxgui/menus_taskbar.py:576 -#, fuzzy msgid "Launch Single Application" -msgstr "Aplicación" +msgstr "Ejecutar la aplicación" #: ../pyhoca/wxgui/menus_taskbar.py:614 -#, fuzzy msgid "Manage Application Menu" -msgstr "Aplicación" +msgstr "Gestionar el Menú de la Aplicación" #: ../pyhoca/wxgui/menus_taskbar.py:657 msgid "Running" @@ -926,14 +904,12 @@ msgid "&Disconnect from Server" msgstr "&Desconectar del servidor" #: ../pyhoca/wxgui/menus_taskbar.py:715 -#, fuzzy msgid "Suspend Session and E&xit application" -msgstr "Suspender Sesión" +msgstr "Suspender Sesión y Salir (e&xit) de la aplicación" #: ../pyhoca/wxgui/menus_taskbar.py:719 -#, fuzzy msgid "Disconnect and E&xit application" -msgstr "Suspender Sesión" +msgstr "Desconectar y Salir (e&xit) de la aplicación" #: ../pyhoca/wxgui/menus_taskbar.py:748 msgid "Add Profile" @@ -957,28 +933,26 @@ msgid "About %s ..." msgstr "Acerca de %s ..." #: ../pyhoca/wxgui/frontend.py:371 -#, fuzzy msgid "Suspending sessions and exiting application..." -msgstr "Suspender Sesión" +msgstr "Suspendiendo sesiones y saliendo de las aplicaciones..." #: ../pyhoca/wxgui/frontend.py:374 -#, fuzzy, python-format +#, python-format msgid "Disconnecting %s and exiting application..." -msgstr "Suspender Sesión" +msgstr "Desconectando %s y saliendo de las aplicaciones..." #: ../pyhoca/wxgui/frontend.py:376 -#, fuzzy msgid "Exiting application..." -msgstr "Aplicación" +msgstr "Saliendo de la aplicación..." #: ../pyhoca/wxgui/frontend.py:456 -#, fuzzy, python-format +#, python-format msgid "%s - server warning" -msgstr "%s - advertencia durante la sesión" +msgstr "%s - advertencia del servidor" #: ../pyhoca/wxgui/frontend.py:456 msgid "The X2Go Server does not publish an application menu." -msgstr "" +msgstr "El servidor X2GO no publica menú de la aplicación" #: ../pyhoca/wxgui/frontend.py:489 msgid "Public SSH key authentication has been successful." @@ -991,9 +965,9 @@ msgstr "" "La clave SSH del proxy no es válida o no ha sido aceptada por el usuario" #: ../pyhoca/wxgui/frontend.py:544 -#, fuzzy, python-format +#, python-format msgid "%s - EOF error" -msgstr "%s - error en la clave" +msgstr "%s - error EOF" #: ../pyhoca/wxgui/frontend.py:544 msgid "Authentication protocol communication incomplete! Try again..." @@ -1012,19 +986,18 @@ msgstr "" "¡Error desconocido al tratar de validar el nombre de usuario y la contraseña!" #: ../pyhoca/wxgui/frontend.py:600 -#, fuzzy msgid "Unknown session profile, configure before using it..." -msgstr "Nuevo Perfil de Sesión" +msgstr "Perfil de Sesión Desconocido, configúralo antes de usar..." #: ../pyhoca/wxgui/frontend.py:655 ../pyhoca/wxgui/frontend.py:979 #, python-format msgid "%s - session warning" -msgstr "%s - advertencia durante la sesión" +msgstr "%s - advertencia de la sesión" #: ../pyhoca/wxgui/frontend.py:655 #, python-format msgid "Execution of command ,,%s'' failed." -msgstr "" +msgstr "Fallo al ejecutar el comando \"%s\"." #: ../pyhoca/wxgui/frontend.py:731 msgid "Cleaning X2Go sessions..." @@ -1071,7 +1044,7 @@ msgid "" "Are you sure you want to continue connecting?" msgstr "" "La autenticidad del servidor [%s]:%s no puede comprobarse.\n" -"la huella de la clave %s es ,,%s''.\n" +"la huella de la clave %s es \"%s\".\n" "\n" "¿Continuar con la conexión?" @@ -1115,7 +1088,7 @@ msgid "" "The command ,,%s'' is not available on X2Go server\n" "%s." msgstr "" -"El comando ,,%s'' no está presente en el servidor X2go\n" +"El comando \"%s\" no está disponible en el servidor X2go\n" "%s." #: ../pyhoca/wxgui/frontend.py:979 @@ -1176,9 +1149,10 @@ msgstr "" "%s" #: ../pyhoca/wxgui/frontend.py:1012 -#, fuzzy, python-format +#, python-format msgid "%s - client-side printing not available" -msgstr "- el sistema de impresión no está disponible -" +msgstr "" +"%s - el sistema de impresión en el lado del cliente no está disponible -" #: ../pyhoca/wxgui/frontend.py:1012 #, python-format @@ -1186,11 +1160,13 @@ msgid "" "The server denies client-side printing from within this session.\n" "%s" msgstr "" +"El servidor no permite la impresión del lado del cliente para esta sesión.\n" +"%s" #: ../pyhoca/wxgui/frontend.py:1015 #, python-format msgid "%s - MIME box not available" -msgstr "" +msgstr "%s - No está disponible el contexto MIME" #: ../pyhoca/wxgui/frontend.py:1015 #, python-format @@ -1198,11 +1174,13 @@ msgid "" "The server does not support the X2Go MIME box.\n" "%s" msgstr "" +"El servidor no soporta el contexto X2Go MIME.\n" +"%s" #: ../pyhoca/wxgui/frontend.py:1018 #, python-format msgid "%s - client-side folders not sharable" -msgstr "" +msgstr "%s - las carpetas del lado del cliente no están compartidas" #: ../pyhoca/wxgui/frontend.py:1018 #, python-format @@ -1210,11 +1188,14 @@ msgid "" "The server denies client-side folder sharing with this session.\n" "%s" msgstr "" +"El servidor no permite compartir carpetas del lado del cliente en esta " +"sesión.\n" +"%s" #: ../pyhoca/wxgui/frontend.py:1021 #, python-format msgid "%s - client resources not sharable" -msgstr "" +msgstr "%s - el recurso del cliente no está marcado como compartido" #: ../pyhoca/wxgui/frontend.py:1021 #, python-format @@ -1222,6 +1203,9 @@ msgid "" "Client-side folders and printers cannot be shared with this session.\n" "%s" msgstr "" +"La impresión y el acceso a las carpetas del lado del cliente no están " +"permitidas en esta sesión.\n" +"%s" #: ../pyhoca/wxgui/frontend.py:1035 ../pyhoca/wxgui/frontend.py:1037 #, python-format @@ -1442,9 +1426,8 @@ msgid "Print" msgstr "Imprimir" #: ../pyhoca/wxgui/printingprefs.py:231 -#, fuzzy msgid "- no printers installed -" -msgstr "- el sistema de impresión no está disponible -" +msgstr "- hay impresoras instaladas -" #: ../pyhoca/wxgui/printingprefs.py:236 msgid "- print system is not available -" @@ -1459,18 +1442,17 @@ msgid "Choose PDF saving location" msgstr "Elegir localización para los PDFs" #: ../pyhoca/wxgui/sessiontitle.py:69 -#, fuzzy, python-format +#, python-format msgid "Session Title - %s" -msgstr "Perfil de Sesión" +msgstr "Título de la sesión - %s" #: ../pyhoca/wxgui/sessiontitle.py:71 -#, fuzzy msgid "Change session title to" -msgstr "Nuevo Perfil de Sesión" +msgstr "Cambiar título de la sesión a" #: ../pyhoca/wxgui/sessiontitle.py:73 msgid "OK" -msgstr "" +msgstr "Ok" #~ msgid "Keyboard layout" #~ msgstr "Máscara de teclado" hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits