The branch, master has been updated via 4f77721cc61f95bca156e6b548c2a2e9ebb1c693 (commit) via 3b35f6c1274bdc00ebe61d38cd60eceeb4ee0484 (commit) from 5d3209c70a8bdde0789870afc2f141e1efbbcb53 (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 4f77721cc61f95bca156e6b548c2a2e9ebb1c693 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Feb 19 20:26:45 2012 +0100 rebuild i18n binaries, add Swedish and Bokmal i18n binaries, update i18n .po files from source tree commit 3b35f6c1274bdc00ebe61d38cd60eceeb4ee0484 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Feb 19 20:25:43 2012 +0100 Handle the situation that no printers are installed with CUPS/WinSpool. ----------------------------------------------------------------------- Summary of changes: build/mo/bg/LC_MESSAGES/pyhoca-gui.mo | Bin 541 -> 541 bytes build/mo/de/LC_MESSAGES/pyhoca-gui.mo | Bin 19174 -> 19174 bytes build/mo/en/LC_MESSAGES/pyhoca-gui.mo | Bin 17976 -> 17976 bytes build/mo/es/LC_MESSAGES/pyhoca-gui.mo | Bin 17906 -> 17906 bytes build/mo/nb_NO/LC_MESSAGES/pyhoca-gui.mo | Bin 0 -> 15207 bytes build/mo/nl/LC_MESSAGES/pyhoca-gui.mo | Bin 17240 -> 17240 bytes build/mo/sv/LC_MESSAGES/pyhoca-gui.mo | Bin 0 -> 17940 bytes debian/changelog | 1 + po/bg.po | 10 +++++++--- po/de.po | 11 ++++++++--- po/en.po | 10 +++++++--- po/es.po | 11 ++++++++--- po/nb_NO.po | 11 ++++++++--- po/nl.po | 11 ++++++++--- po/pyhoca-gui.pot | 10 +++++++--- po/sv.po | 11 ++++++++--- pyhoca/wxgui/printingprefs.py | 5 +++++ 17 files changed, 67 insertions(+), 24 deletions(-) create mode 100644 build/mo/nb_NO/LC_MESSAGES/pyhoca-gui.mo create mode 100644 build/mo/sv/LC_MESSAGES/pyhoca-gui.mo 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 8b930bd..e68f094 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 1624841..9adca8f 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 7596f12..b808f4d 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 2bd7cf0..7f0f9d9 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 new file mode 100644 index 0000000..4fc259d Binary files /dev/null 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 5c11197..d3a3b1f 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 new file mode 100644 index 0000000..33620f7 Binary files /dev/null and b/build/mo/sv/LC_MESSAGES/pyhoca-gui.mo differ diff --git a/debian/changelog b/debian/changelog index a15dd3a..69fafc6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -41,6 +41,7 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Provide empty translation file nb_NO.po. - Fix profile manager GUI layout, make default keyboard layout i18n capable. + - Handle the situation that no printers are installed with CUPS/WinSpool. * Depend on Python X2Go 0.1.2.0. * Install GNOME icons via dh_links. * Install X2Go icons with explicit install paths. diff --git a/po/bg.po b/po/bg.po index 6e1eae1..7b801f0 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-02-19 20:17+0100\n" +"POT-Creation-Date: 2012-02-19 20:23+0100\n" "PO-Revision-Date: 2011-09-17 02:17+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>\n" "Language-Team: Bulgarian <chepati@yahoo.com>\n" @@ -1127,14 +1127,18 @@ msgid "Print" msgstr "" #: ../pyhoca/wxgui/printingprefs.py:227 +msgid "- no printers installed -" +msgstr "" + +#: ../pyhoca/wxgui/printingprefs.py:232 msgid "- print system is not available -" msgstr "" -#: ../pyhoca/wxgui/printingprefs.py:334 +#: ../pyhoca/wxgui/printingprefs.py:339 msgid "Choose PDF viewer application" msgstr "" -#: ../pyhoca/wxgui/printingprefs.py:350 +#: ../pyhoca/wxgui/printingprefs.py:355 msgid "Choose PDF saving location" msgstr "" diff --git a/po/de.po b/po/de.po index 5742b64..64bebe3 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-02-19 20:17+0100\n" +"POT-Creation-Date: 2012-02-19 20:23+0100\n" "PO-Revision-Date: 2012-02-07 23:29+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>\n" "Language-Team: de <mike.gabriel@das-netzwerkteam.de>\n" @@ -1187,14 +1187,19 @@ msgid "Print" msgstr "Drucken" #: ../pyhoca/wxgui/printingprefs.py:227 +#, fuzzy +msgid "- no printers installed -" +msgstr "- es sind keine Drucker installiert -" + +#: ../pyhoca/wxgui/printingprefs.py:232 msgid "- print system is not available -" msgstr "- das Drucksystem ist nicht bereit -" -#: ../pyhoca/wxgui/printingprefs.py:334 +#: ../pyhoca/wxgui/printingprefs.py:339 msgid "Choose PDF viewer application" msgstr "Applikation für PDF-Anzeige auswählen" -#: ../pyhoca/wxgui/printingprefs.py:350 +#: ../pyhoca/wxgui/printingprefs.py:355 msgid "Choose PDF saving location" msgstr "Speicherort für eingehende Druckaufträge (PDFs) auswählen" diff --git a/po/en.po b/po/en.po index 44be6ee..1479ebc 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-02-19 20:17+0100\n" +"POT-Creation-Date: 2012-02-19 20:23+0100\n" "PO-Revision-Date: 2012-02-07 23:28+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>\n" "Language-Team: en <mike.gabriel@das-netzwerkteam.de>\n" @@ -1181,14 +1181,18 @@ msgid "Print" msgstr "Print" #: ../pyhoca/wxgui/printingprefs.py:227 +msgid "- no printers installed -" +msgstr "- no printers installed -" + +#: ../pyhoca/wxgui/printingprefs.py:232 msgid "- print system is not available -" msgstr "- print system is not available -" -#: ../pyhoca/wxgui/printingprefs.py:334 +#: ../pyhoca/wxgui/printingprefs.py:339 msgid "Choose PDF viewer application" msgstr "Choose PDF viewer application" -#: ../pyhoca/wxgui/printingprefs.py:350 +#: ../pyhoca/wxgui/printingprefs.py:355 msgid "Choose PDF saving location" msgstr "Choose PDF saving location" diff --git a/po/es.po b/po/es.po index 3dc5bcb..8b6dcf0 100644 --- a/po/es.po +++ b/po/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-19 20:17+0100\n" +"POT-Creation-Date: 2012-02-19 20:23+0100\n" "PO-Revision-Date: 2011-11-30 15:59+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>\n" "Language-Team: Spanish <x2go-dev@lists.berlios.de>\n" @@ -1203,14 +1203,19 @@ msgid "Print" msgstr "Imprimir" #: ../pyhoca/wxgui/printingprefs.py:227 +#, fuzzy +msgid "- no printers installed -" +msgstr "- el sistema de impresión no está disponible -" + +#: ../pyhoca/wxgui/printingprefs.py:232 msgid "- print system is not available -" msgstr "- el sistema de impresión no está disponible -" -#: ../pyhoca/wxgui/printingprefs.py:334 +#: ../pyhoca/wxgui/printingprefs.py:339 msgid "Choose PDF viewer application" msgstr "Elegir visor PDF" -#: ../pyhoca/wxgui/printingprefs.py:350 +#: ../pyhoca/wxgui/printingprefs.py:355 msgid "Choose PDF saving location" msgstr "Elegir localización para los PDFs" diff --git a/po/nb_NO.po b/po/nb_NO.po index f3c4515..47b4bd9 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-02-19 20:17+0100\n" +"POT-Creation-Date: 2012-02-19 20:23+0100\n" "PO-Revision-Date: 2012-02-19 14:26+0100\n" "Last-Translator: Terje Andersen <teranders@gmail.com>\n" "Language-Team: nb_NO <x2go-i18n@lists.berlios.de>\n" @@ -1204,14 +1204,19 @@ msgid "Print" msgstr "Skriv ut" #: ../pyhoca/wxgui/printingprefs.py:227 +#, fuzzy +msgid "- no printers installed -" +msgstr "- utskriftssystemet er ikke tilgjengelig -" + +#: ../pyhoca/wxgui/printingprefs.py:232 msgid "- print system is not available -" msgstr "- utskriftssystemet er ikke tilgjengelig -" -#: ../pyhoca/wxgui/printingprefs.py:334 +#: ../pyhoca/wxgui/printingprefs.py:339 msgid "Choose PDF viewer application" msgstr "Velg PDF leseprogram" -#: ../pyhoca/wxgui/printingprefs.py:350 +#: ../pyhoca/wxgui/printingprefs.py:355 msgid "Choose PDF saving location" msgstr "Velg plassering for PDF lagring" diff --git a/po/nl.po b/po/nl.po index 3b64d5e..abe5768 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-02-19 20:17+0100\n" +"POT-Creation-Date: 2012-02-19 20:23+0100\n" "PO-Revision-Date: 2012-02-07 23:31+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>\n" "Language-Team: nl <dick.kniep@lindix.nl>\n" @@ -1192,14 +1192,19 @@ msgid "Print" msgstr "Afdrukken" #: ../pyhoca/wxgui/printingprefs.py:227 +#, fuzzy +msgid "- no printers installed -" +msgstr "- print systeem niet beschikbaar" + +#: ../pyhoca/wxgui/printingprefs.py:232 msgid "- print system is not available -" msgstr "- print systeem niet beschikbaar" -#: ../pyhoca/wxgui/printingprefs.py:334 +#: ../pyhoca/wxgui/printingprefs.py:339 msgid "Choose PDF viewer application" msgstr "Kies PDF viewer toepassing" -#: ../pyhoca/wxgui/printingprefs.py:350 +#: ../pyhoca/wxgui/printingprefs.py:355 msgid "Choose PDF saving location" msgstr "Kies locatie om PDF op te slaan" diff --git a/po/pyhoca-gui.pot b/po/pyhoca-gui.pot index 48d938e..6738911 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-02-19 20:17+0100\n" +"POT-Creation-Date: 2012-02-19 20:23+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1123,14 +1123,18 @@ msgid "Print" msgstr "" #: ../pyhoca/wxgui/printingprefs.py:227 +msgid "- no printers installed -" +msgstr "" + +#: ../pyhoca/wxgui/printingprefs.py:232 msgid "- print system is not available -" msgstr "" -#: ../pyhoca/wxgui/printingprefs.py:334 +#: ../pyhoca/wxgui/printingprefs.py:339 msgid "Choose PDF viewer application" msgstr "" -#: ../pyhoca/wxgui/printingprefs.py:350 +#: ../pyhoca/wxgui/printingprefs.py:355 msgid "Choose PDF saving location" msgstr "" diff --git a/po/sv.po b/po/sv.po index 91fb0d8..534cc2b 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-02-19 20:17+0100\n" +"POT-Creation-Date: 2012-02-19 20:23+0100\n" "PO-Revision-Date: 2012-02-19 11:01+0100\n" "Last-Translator: Daniel Lindgren <bd.dali@gmail.com>\n" "Language-Team: Swedish <x2go-i18n@lists.berlios.de>\n" @@ -1177,14 +1177,19 @@ msgid "Print" msgstr "Skriv ut" #: ../pyhoca/wxgui/printingprefs.py:227 +#, fuzzy +msgid "- no printers installed -" +msgstr "- utskrifter ej tillgängliga -" + +#: ../pyhoca/wxgui/printingprefs.py:232 msgid "- print system is not available -" msgstr "- utskrifter ej tillgängliga -" -#: ../pyhoca/wxgui/printingprefs.py:334 +#: ../pyhoca/wxgui/printingprefs.py:339 msgid "Choose PDF viewer application" msgstr "Välj PDF-visare" -#: ../pyhoca/wxgui/printingprefs.py:350 +#: ../pyhoca/wxgui/printingprefs.py:355 msgid "Choose PDF saving location" msgstr "Välj mapp att spara PDF:er i" diff --git a/pyhoca/wxgui/printingprefs.py b/pyhoca/wxgui/printingprefs.py index 25693a9..6089087 100644 --- a/pyhoca/wxgui/printingprefs.py +++ b/pyhoca/wxgui/printingprefs.py @@ -223,6 +223,11 @@ class PyHocaGUI_PrintingPreferences(wx.Dialog): _printer_name = self._availablePrinters[self.client_printing.get_property('printer')] except KeyError: _printer_name = self._availablePrinters[self._defaultPrinter] + elif self._defaultPrinter == None: + _printer_name = _(u'- no printers installed -') + self.PrintPrinter.Clear() + self.PrintPrinter.Append(_(_printer_name)) + self.PrintPrinter.Enable(False) else: _printer_name = _(u'- print system is not available -') self.PrintPrinter.Clear() 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)).