The branch, master has been updated via ca7ff69387c1ca6c9a928f1e20ea19c9185fadb1 (commit) from 3c8ddea7b3db0e8cbf45a94861c85cc1f47a552a (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 ca7ff69387c1ca6c9a928f1e20ea19c9185fadb1 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Nov 21 23:21:42 2013 +0100 Slight notification layout change for HOOK_on_control_session_death() method. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + po/PyHoca-GUI.pot | 4 +++- po/bg.po | 4 +++- po/da.po | 8 ++++++-- po/de.po | 9 ++++++--- po/en.po | 8 ++++++-- po/es.po | 9 ++++++--- po/fi.po | 4 +++- po/fr.po | 4 +++- po/nb_NO.po | 9 ++++++--- po/nl.po | 9 ++++++--- po/ru.po | 8 ++++++-- po/sv.po | 8 ++++++-- pyhoca/wxgui/frontend.py | 2 +- 14 files changed, 62 insertions(+), 25 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 538f1f3..6058bdd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,7 @@ pyhoca-gui (0.4.0.9-0~x2go1) UNRELEASED; urgency=low - Fix termination of published application sessions. - Initialize thisPyHocaGUI instance as NoneType object before starting the wxApplication. + - Slight notification layout change for HOOK_on_control_session_death() method. * /debian/copyright: + Update file. Add entry for file icon2exe.py. * /debian/control: diff --git a/po/PyHoca-GUI.pot b/po/PyHoca-GUI.pot index 617979a..d86934d 100644 --- a/po/PyHoca-GUI.pot +++ b/po/PyHoca-GUI.pot @@ -1298,7 +1298,9 @@ msgstr "" #: ../pyhoca/wxgui/frontend.py:1554 #, python-format msgid "" -"Lost connection to server %s unexpectedly! Try to re-authenticate to the " +"Lost connection to server %s unexpectedly!\n" +"\n" +"Try to re-authenticate to the " "server..." msgstr "" diff --git a/po/bg.po b/po/bg.po index 10f5ff8..c8a213c 100644 --- a/po/bg.po +++ b/po/bg.po @@ -1302,7 +1302,9 @@ msgstr "" #: ../pyhoca/wxgui/frontend.py:1554 #, python-format msgid "" -"Lost connection to server %s unexpectedly! Try to re-authenticate to the " +"Lost connection to server %s unexpectedly!\n" +"\n" +"Try to re-authenticate to the " "server..." msgstr "" diff --git a/po/da.po b/po/da.po index 4e3dbdf..cc4dd8b 100644 --- a/po/da.po +++ b/po/da.po @@ -1350,10 +1350,14 @@ msgstr "%s - kanalfejl" #: ../pyhoca/wxgui/frontend.py:1554 #, python-format msgid "" -"Lost connection to server %s unexpectedly! Try to re-authenticate to the " +"Lost connection to server %s unexpectedly!\n" +"\n" +"Try to re-authenticate to the " "server..." msgstr "" -"Mistede forbindelsen til server %s! Prøv at re-autentificere til serveren..." +"Mistede forbindelsen til server %s!\n" +"\n" +"Prøv at re-autentificere til serveren..." #: ../pyhoca/wxgui/frontend.py:1572 #, fuzzy, python-format diff --git a/po/de.po b/po/de.po index be52b6b..8084b20 100644 --- a/po/de.po +++ b/po/de.po @@ -1376,11 +1376,14 @@ msgstr "%s - Verbindungsfehler" #: ../pyhoca/wxgui/frontend.py:1554 #, python-format msgid "" -"Lost connection to server %s unexpectedly! Try to re-authenticate to the " +"Lost connection to server %s unexpectedly!\n" +"\n" +"Try to re-authenticate to the " "server..." msgstr "" -"Die Verbindung zum Server %s wurde unerwartet unterbrochen! Bitte versuchen " -"Sie, sich neu am Server anzumelden..." +"Die Verbindung zum Server %s wurde unerwartet unterbrochen!\n" +"\n" +"Bitte versuchen Sie, sich neu am Server anzumelden..." #: ../pyhoca/wxgui/frontend.py:1572 #, fuzzy, python-format diff --git a/po/en.po b/po/en.po index 9d01a18..6ef7c31 100644 --- a/po/en.po +++ b/po/en.po @@ -1356,10 +1356,14 @@ msgstr "%s - channel error" #: ../pyhoca/wxgui/frontend.py:1554 #, python-format msgid "" -"Lost connection to server %s unexpectedly! Try to re-authenticate to the " +"Lost connection to server %s unexpectedly!\n" +"\n" +"Try to re-authenticate to the " "server..." msgstr "" -"Lost connection to server %s unexpectedly! Try to re-authenticate to the " +"Lost connection to server %s unexpectedly!\n" +"\n" +"Try to re-authenticate to the " "server..." #: ../pyhoca/wxgui/frontend.py:1572 diff --git a/po/es.po b/po/es.po index f3e95fe..e847af3 100644 --- a/po/es.po +++ b/po/es.po @@ -1375,11 +1375,14 @@ msgstr "%s - error en el canal" #: ../pyhoca/wxgui/frontend.py:1554 #, python-format msgid "" -"Lost connection to server %s unexpectedly! Try to re-authenticate to the " +"Lost connection to server %s unexpectedly!\n" +"\n" +"Try to re-authenticate to the " "server..." msgstr "" -"¡La conexión con el servidor %s ha finalizado inesperadamente! Intenta " -"iniciar sesión nuevamente..." +"¡La conexión con el servidor %s ha finalizado inesperadamente!\n" +"\n" +"Intenta iniciar sesión nuevamente..." #: ../pyhoca/wxgui/frontend.py:1572 #, fuzzy, python-format diff --git a/po/fi.po b/po/fi.po index 77c38f4..5d0adf0 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1301,7 +1301,9 @@ msgstr "" #: ../pyhoca/wxgui/frontend.py:1554 #, python-format msgid "" -"Lost connection to server %s unexpectedly! Try to re-authenticate to the " +"Lost connection to server %s unexpectedly!\n" +"\n" +"Try to re-authenticate to the " "server..." msgstr "" diff --git a/po/fr.po b/po/fr.po index 90029c5..b172928 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1302,7 +1302,9 @@ msgstr "" #: ../pyhoca/wxgui/frontend.py:1554 #, python-format msgid "" -"Lost connection to server %s unexpectedly! Try to re-authenticate to the " +"Lost connection to server %s unexpectedly!\n" +"\n" +"Try to re-authenticate to the " "server..." msgstr "" diff --git a/po/nb_NO.po b/po/nb_NO.po index 969c1f2..6960579 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -1363,11 +1363,14 @@ msgstr "%s - feil med kanalen" #: ../pyhoca/wxgui/frontend.py:1554 #, python-format msgid "" -"Lost connection to server %s unexpectedly! Try to re-authenticate to the " +"Lost connection to server %s unexpectedly!\n" +"\n" +"Try to re-authenticate to the " "server..." msgstr "" -"Mistet uventet forbindelsen til server %s ! Forsøk å autentisiere deg på " -"nytt til serveren..." +"Mistet uventet forbindelsen til server %s !\n" +"\n" +"Forsøk å autentisiere deg på nytt til serveren..." #: ../pyhoca/wxgui/frontend.py:1572 #, fuzzy, python-format diff --git a/po/nl.po b/po/nl.po index 06f4afd..dd8b230 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1342,11 +1342,14 @@ msgstr "%s - Verbindingsfout (channel error)" #: ../pyhoca/wxgui/frontend.py:1554 #, python-format msgid "" -"Lost connection to server %s unexpectedly! Try to re-authenticate to the " +"Lost connection to server %s unexpectedly!\n" +"\n" +"Try to re-authenticate to the " "server..." msgstr "" -"De Verbinding met de server %s werd onverwacht verbroken! Probeer om u " -"opnieuw aan te melden..." +"De Verbinding met de server %s werd onverwacht verbroken!\n" +"\n" +"Probeer om u opnieuw aan te melden..." #: ../pyhoca/wxgui/frontend.py:1572 #, fuzzy, python-format diff --git a/po/ru.po b/po/ru.po index 4647643..485965b 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1364,9 +1364,13 @@ msgstr "%s - ошибка канала" #: ../pyhoca/wxgui/frontend.py:1554 #, python-format msgid "" -"Lost connection to server %s unexpectedly! Try to re-authenticate to the " +"Lost connection to server %s unexpectedly!\n" +"\n" +"Try to re-authenticate to the " "server..." -msgstr "Соединение с сервером %s утрачено. Попытайтесь соединиться еще раз..." +msgstr "Соединение с сервером %s утрачено.\n" +"\n" +"Попытайтесь соединиться еще раз..." #: ../pyhoca/wxgui/frontend.py:1572 #, fuzzy, python-format diff --git a/po/sv.po b/po/sv.po index f06109b..6c3442b 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1361,10 +1361,14 @@ msgstr "%s - kanalfel" #: ../pyhoca/wxgui/frontend.py:1554 #, python-format msgid "" -"Lost connection to server %s unexpectedly! Try to re-authenticate to the " +"Lost connection to server %s unexpectedly!\n" +"\n" +"Try to re-authenticate to the " "server..." msgstr "" -"Anslutning till %s avslutades oväntat! Försök återansluta till server..." +"Anslutning till %s avslutades oväntat!\n" +"\n" +"Försök återansluta till server..." #: ../pyhoca/wxgui/frontend.py:1572 #, fuzzy, python-format diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index 9155aa5..bcedfdc 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -1553,7 +1553,7 @@ class PyHocaGUI(wx.App, x2go.X2GoClient): """ if not self._exiting: - self.notifier.send(_(u'%s - channel error') % profile_name, _(u'Lost connection to server %s unexpectedly! Try to re-authenticate to the server...') % profile_name, icon='session_warning', timeout=10000) + self.notifier.send(_(u'%s - channel error') % profile_name, _(u'Lost connection to server %s unexpectedly!\n\nTry to re-authenticate to the server...') % profile_name, icon='session_warning', timeout=10000) try: del self._temp_disabled_session_names[profile_name] except KeyError: 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)).