From 5897019e19da9bef80c667591b93beb20d98c332 Mon Sep 17 00:00:00 2001 From: Jens Lody Date: Fri, 22 Jul 2016 12:34:57 +0200 Subject: [PATCH] Update po-files via Makefile with gettext instead of using update.js . Get rid of (mostly unmaintained) intltools. Make gsettings schema translatable --- README.md | 2 +- configure.ac | 5 +- data/Makefile.am | 9 +-- ...ome.shell.extensions.panel-osd.gschema.xml | 32 ++++++++ ....shell.extensions.panel-osd.gschema.xml.in | 32 -------- gnome-shell-extension-panel-osd.cbp | 6 +- gnome-shell-extension-panel-osd.spec | 11 ++- po/LINGUAS | 3 +- po/Makevars | 78 ++++++++++++++++++ po/POTFILES.in | 7 +- po/de.po | 58 +++++++++++--- po/gnome-shell-extension-panel-osd.pot | 58 ++++++++++---- po/pl.po | 79 ++++++++++--------- po/pt_BR.po | 58 ++++++++++---- po/update.js | 54 ------------- po/zh_CN.po | 58 +++++++++++--- 16 files changed, 356 insertions(+), 194 deletions(-) create mode 100644 data/org.gnome.shell.extensions.panel-osd.gschema.xml delete mode 100644 data/org.gnome.shell.extensions.panel-osd.gschema.xml.in create mode 100644 po/Makevars delete mode 100644 po/update.js diff --git a/README.md b/README.md index 9ef8d00..32ba986 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ Make sure you have the following dependencies installed: * *autoconf*, * *automake*, * *gnome-tweak-tool*, -* *intltool*. +* *gettext-devel* Run the following commands: diff --git a/configure.ac b/configure.ac index 370afd9..28316b6 100644 --- a/configure.ac +++ b/configure.ac @@ -15,7 +15,10 @@ GETTEXT_PACKAGE=gnome-shell-extension-panel-osd AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [The prefix for our gettext translation domains.]) -IT_PROG_INTLTOOL(0.26) +# i18n +AM_GNU_GETTEXT([external]) +AM_GNU_GETTEXT_VERSION([0.19.4]) + PKG_PROG_PKG_CONFIG([0.22]) GLIB_GSETTINGS diff --git a/data/Makefile.am b/data/Makefile.am index da10db4..197fd0a 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -21,11 +21,8 @@ metadata.json: metadata.json.in $(top_builddir)/config.status CLEANFILES = metadata.json -gschemas_in = org.gnome.shell.extensions.panel-osd.gschema.xml.in +gsettings_SCHEMAS = org.gnome.shell.extensions.panel-osd.gschema.xml -@INTLTOOL_XML_NOMERGE_RULE@ +@GSETTINGS_RULES@ -gsettings_SCHEMAS = $(gschemas_in:.xml.in=.xml) @GSETTINGS_RULES@ - -EXTRA_DIST += $(gschemas_in) -CLEANFILES += $(gschemas_in:.xml.in=.valid) $(gsettings_SCHEMAS) +EXTRA_DIST += $(gsettings_SCHEMAS) diff --git a/data/org.gnome.shell.extensions.panel-osd.gschema.xml b/data/org.gnome.shell.extensions.panel-osd.gschema.xml new file mode 100644 index 0000000..f99ee70 --- /dev/null +++ b/data/org.gnome.shell.extensions.panel-osd.gschema.xml @@ -0,0 +1,32 @@ + + + + 50.0 + Horizontal position of notification. + + + 100.0 + Vertical position of notification. + + + false + Allow resetting horizontal position of notification. + + + false + Allow resetting vertical position of notification. + + + false + Always expand notifications. + + + 1.0 + Delay before test notification is shown. + + + false + If the value is true a test-notification is send and then set back to false. + + + diff --git a/data/org.gnome.shell.extensions.panel-osd.gschema.xml.in b/data/org.gnome.shell.extensions.panel-osd.gschema.xml.in deleted file mode 100644 index 82a3079..0000000 --- a/data/org.gnome.shell.extensions.panel-osd.gschema.xml.in +++ /dev/null @@ -1,32 +0,0 @@ - - - - 50.0 - <_summary>Horizontal position of notification. - - - 100.0 - <_summary>Vertical position of notification. - - - false - <_summary>Allow resetting horizontal position of notification. - - - false - <_summary>Allow resetting vertical position of notification. - - - false - <_summary>Always expand notifications. - - - 1.0 - <_summary>Delay before test notification is shown. - - - false - <_summary>If the value is true a test-notification is send and then set back to false. - - - diff --git a/gnome-shell-extension-panel-osd.cbp b/gnome-shell-extension-panel-osd.cbp index 334328b..eb36119 100644 --- a/gnome-shell-extension-panel-osd.cbp +++ b/gnome-shell-extension-panel-osd.cbp @@ -31,17 +31,17 @@ - + + - + - diff --git a/gnome-shell-extension-panel-osd.spec b/gnome-shell-extension-panel-osd.spec index 37e2d1b..f43343d 100644 --- a/gnome-shell-extension-panel-osd.spec +++ b/gnome-shell-extension-panel-osd.spec @@ -1,12 +1,12 @@ -%global git e052ded +%global git 6ad19f0 %global uuid panel-osd@berend.de.schouwer.gmail.com %global github jenslody-gnome-shell-extension-panel-osd %global checkout git%{git} -%global checkout_date 20160325 +%global checkout_date 20160721 Name: gnome-shell-extension-panel-osd Version: 1 -Release: 0.13.%{checkout_date}%{checkout}%{?dist} +Release: 0.14.%{checkout_date}%{checkout}%{?dist} Summary: Configure the place where notifications are shown Group: User Interface/Desktops @@ -18,7 +18,7 @@ Source0: https://github.com/jenslody/gnome-shell-extension-panel-osd/tarb BuildArch: noarch # The version of gnome-common in CentOS7 is only 3.7.4 -BuildRequires: autoconf, automake, glib2-devel, gnome-common >= 3.7.4, intltool +BuildRequires: autoconf, automake, glib2-devel, gnome-common >= 3.7.4, gettext-devel Requires: gnome-shell >= 3.10.0 @@ -66,6 +66,9 @@ fi %{_datadir}/gnome-shell/extensions/%{uuid} %changelog +* Thu Jul 21 2016 Jens Lody - 1-0.14.20160721git6ad19f0 +- Fixes layout on multimonitor-systems or when using bottom-panel extensions. + * Fri Mar 25 2016 Jens Lody - 1-0.13.20160325gite052ded - Fix build error, due to incorrect git-commit number. diff --git a/po/LINGUAS b/po/LINGUAS index 7ccb9d2..9c9a8dd 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1,5 +1,4 @@ zh_CN pt_BR pl -de -de_DE \ No newline at end of file +de \ No newline at end of file diff --git a/po/Makevars b/po/Makevars new file mode 100644 index 0000000..7fa9745 --- /dev/null +++ b/po/Makevars @@ -0,0 +1,78 @@ +# Makefile variables for PO directory in any package using GNU gettext. + +# Usually the message domain is the same as the package name. +DOMAIN = gnome-shell-extension-panel-osd + +# These two variables depend on the location of this directory. +subdir = po +top_builddir = .. + +# These options get passed to xgettext. +XGETTEXT_OPTIONS = --keyword=_ --keyword=translatable + +# This is the copyright holder that gets inserted into the header of the +# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding +# package. (Note that the msgstr strings, extracted from the package's +# sources, belong to the copyright holder of the package.) Translators are +# expected to transfer the copyright for their translations to this person +# or entity, or to disclaim their copyright. The empty string stands for +# the public domain; in this case the translators are expected to disclaim +# their copyright. +COPYRIGHT_HOLDER = Jens Lody + +# This tells whether or not to prepend "GNU " prefix to the package +# name that gets inserted into the header of the $(DOMAIN).pot file. +# Possible values are "yes", "no", or empty. If it is empty, try to +# detect it automatically by scanning the files in $(top_srcdir) for +# "GNU packagename" string. +PACKAGE_GNU = no + +# This is the email address or URL to which the translators shall report +# bugs in the untranslated strings: +# - Strings which are not entire sentences, see the maintainer guidelines +# in the GNU gettext documentation, section 'Preparing Strings'. +# - Strings which use unclear terms or require additional context to be +# understood. +# - Strings which make invalid assumptions about notation of date, time or +# money. +# - Pluralisation problems. +# - Incorrect English spelling. +# - Incorrect formatting. +# It can be your email address, or a mailing list address where translators +# can write to without being subscribed, or the URL of a web page through +# which the translators can contact you. +MSGID_BUGS_ADDRESS = $(PACKAGE_BUGREPORT) + +# This is the list of locale categories, beyond LC_MESSAGES, for which the +# message catalogs shall be used. It is usually empty. +EXTRA_LOCALE_CATEGORIES = + +# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt' +# context. Possible values are "yes" and "no". Set this to yes if the +# package uses functions taking also a message context, like pgettext(), or +# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument. +USE_MSGCTXT = no + +# These options get passed to msgmerge. +# Useful options are in particular: +# --previous to keep previous msgids of translated messages, +# --quiet to reduce the verbosity. +MSGMERGE_OPTIONS = --previous + +# These options get passed to msginit. +# If you want to disable line wrapping when writing PO files, add +# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and +# MSGINIT_OPTIONS. +MSGINIT_OPTIONS = + +# This tells whether or not to regenerate a PO file when $(DOMAIN).pot +# has changed. Possible values are "yes" and "no". Set this to no if +# the POT file is checked in the repository and the version control +# program ignores timestamps. +PO_DEPENDS_ON_POT = no + +# This tells whether or not to forcibly update $(DOMAIN).pot and +# regenerate PO files on "make dist". Possible values are "yes" and +# "no". Set this to no if the POT file and PO files are maintained +# externally. +DIST_DEPENDS_ON_UPDATE_PO = yes diff --git a/po/POTFILES.in b/po/POTFILES.in index 90194d4..c839a54 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,3 +1,4 @@ -../src/extension.js -../src/prefs.js -../data/panel-osd-settings.ui +src/extension.js +src/prefs.js +data/org.gnome.shell.extensions.panel-osd.gschema.xml +data/panel-osd-settings.ui diff --git a/po/de.po b/po/de.po index 06dec6d..a589c00 100644 --- a/po/de.po +++ b/po/de.po @@ -6,9 +6,10 @@ msgid "" msgstr "" "Project-Id-Version: gnome-shell-extension-panel-osd\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-21 23:09+0200\n" -"PO-Revision-Date: 2016-07-21 23:08+0200\n" +"Report-Msgid-Bugs-To: https://github.com/jenslody/gnome-shell-extension-" +"panel-osd/issues\n" +"POT-Creation-Date: 2016-07-22 02:19+0200\n" +"PO-Revision-Date: 2016-07-22 00:42+0200\n" "Last-Translator: Jens Lody \n" "Language-Team: Deutsch \n" "Language: de\n" @@ -18,7 +19,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Gtranslator 2.91.7\n" -#: ../src/extension.js:119 +#: src/extension.js:119 msgid "" "This is just a multiline test-message to show where the notification will be " "placed and to test expansion (showing details)." @@ -26,38 +27,69 @@ msgstr "" "Dies ist nur eine einfache mehrzeilige Meldung um zu Zeigen, wo die Meldung " "angezeigt wird, und um das Erweitern (Details) zu zeigen. " -#: ../data/panel-osd-settings.ui:39 +#: data/org.gnome.shell.extensions.panel-osd.gschema.xml:5 +msgid "Horizontal position of notification." +msgstr "Horizontale Position der Meldung." + +#: data/org.gnome.shell.extensions.panel-osd.gschema.xml:9 +msgid "Vertical position of notification." +msgstr "Vertikale Position der Meldung." + +#: data/org.gnome.shell.extensions.panel-osd.gschema.xml:13 +msgid "Allow resetting horizontal position of notification." +msgstr "Zurücksetzen der horizontalen Position auf Standardwert ermöglichen." + +#: data/org.gnome.shell.extensions.panel-osd.gschema.xml:17 +msgid "Allow resetting vertical position of notification." +msgstr "Zurücksetzen der vertikalen Position auf Standardwert ermöglichen." + +#: data/org.gnome.shell.extensions.panel-osd.gschema.xml:21 +msgid "Always expand notifications." +msgstr "Meldung immer erweitert anzeigen." + +#: data/org.gnome.shell.extensions.panel-osd.gschema.xml:25 +msgid "Delay before test notification is shown." +msgstr "Verzögerung bevor die Test-Meldung gezeigt wird." + +#: data/org.gnome.shell.extensions.panel-osd.gschema.xml:29 +msgid "" +"If the value is true a test-notification is send and then set back to false." +msgstr "" +"Wird dieser Wert wahr, wird eine Testmeldung gezeigt und der Wert wieder auf " +"unwahr gesetzt." + +#: data/panel-osd-settings.ui:39 msgid "Horizontal position [%] from 0% (left) to 100% (right)" msgstr "Horizontale Position [%] von links (0%) bis rechts (100%)" -#: ../data/panel-osd-settings.ui:86 +#: data/panel-osd-settings.ui:86 msgid "Vertical position [%] from 0% (bottom) to 100% (top)" msgstr "Vertikale Position [%] von unten (0%) bis oben (100%)" -#: ../data/panel-osd-settings.ui:170 +#: data/panel-osd-settings.ui:170 msgid "Reset horizontal position to defaults" msgstr "Horizontale Position auf Standardwert zurücksetzen" -#: ../data/panel-osd-settings.ui:183 +#: data/panel-osd-settings.ui:183 msgid "Reset vertical position to defaults" msgstr "Vertikale Position auf Standardwert zurücksetzen" -#: ../data/panel-osd-settings.ui:199 +#: data/panel-osd-settings.ui:199 msgid "Reset" msgstr "Zurücksetzen" -#: ../data/panel-osd-settings.ui:257 +#: data/panel-osd-settings.ui:257 msgid "Force showing details for all notifications" msgstr "Zeige alle Meldungen erweitert" -#: ../data/panel-osd-settings.ui:299 +#: data/panel-osd-settings.ui:299 msgid "" "Delay [s] before test-notification is shown. If it is too short, the " "notification might close immediately after it is shown." msgstr "" -"Verzögerung [s] before die Test-Meldung gezeigt wird. Ist die Zeit zu kurz " +"Verzögerung [s] bevor die Test-Meldung gezeigt wird. Ist die Zeit zu kurz " "wird die Meldung sofort wieder geschlossen." -#: ../data/panel-osd-settings.ui:328 +#: data/panel-osd-settings.ui:328 msgid "Show test notification" msgstr "Zeige Test-Meldung" diff --git a/po/gnome-shell-extension-panel-osd.pot b/po/gnome-shell-extension-panel-osd.pot index 559a6ce..4cf4bb8 100644 --- a/po/gnome-shell-extension-panel-osd.pot +++ b/po/gnome-shell-extension-panel-osd.pot @@ -1,14 +1,15 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. +# Copyright (C) YEAR Jens Lody +# This file is distributed under the same license as the gnome-shell-extension-panel-osd package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-21 23:09+0200\n" +"Project-Id-Version: gnome-shell-extension-panel-osd 1.1\n" +"Report-Msgid-Bugs-To: https://github.com/jenslody/gnome-shell-extension-" +"panel-osd/issues\n" +"POT-Creation-Date: 2016-07-22 02:19+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,42 +18,71 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: ../src/extension.js:119 +#: src/extension.js:119 msgid "" "This is just a multiline test-message to show where the notification will be " "placed and to test expansion (showing details)." msgstr "" -#: ../data/panel-osd-settings.ui:39 +#: data/org.gnome.shell.extensions.panel-osd.gschema.xml:5 +msgid "Horizontal position of notification." +msgstr "" + +#: data/org.gnome.shell.extensions.panel-osd.gschema.xml:9 +msgid "Vertical position of notification." +msgstr "" + +#: data/org.gnome.shell.extensions.panel-osd.gschema.xml:13 +msgid "Allow resetting horizontal position of notification." +msgstr "" + +#: data/org.gnome.shell.extensions.panel-osd.gschema.xml:17 +msgid "Allow resetting vertical position of notification." +msgstr "" + +#: data/org.gnome.shell.extensions.panel-osd.gschema.xml:21 +msgid "Always expand notifications." +msgstr "" + +#: data/org.gnome.shell.extensions.panel-osd.gschema.xml:25 +msgid "Delay before test notification is shown." +msgstr "" + +#: data/org.gnome.shell.extensions.panel-osd.gschema.xml:29 +msgid "" +"If the value is true a test-notification is send and then set back to false." +msgstr "" + +#: data/panel-osd-settings.ui:39 msgid "Horizontal position [%] from 0% (left) to 100% (right)" msgstr "" -#: ../data/panel-osd-settings.ui:86 +#: data/panel-osd-settings.ui:86 msgid "Vertical position [%] from 0% (bottom) to 100% (top)" msgstr "" -#: ../data/panel-osd-settings.ui:170 +#: data/panel-osd-settings.ui:170 msgid "Reset horizontal position to defaults" msgstr "" -#: ../data/panel-osd-settings.ui:183 +#: data/panel-osd-settings.ui:183 msgid "Reset vertical position to defaults" msgstr "" -#: ../data/panel-osd-settings.ui:199 +#: data/panel-osd-settings.ui:199 msgid "Reset" msgstr "" -#: ../data/panel-osd-settings.ui:257 +#: data/panel-osd-settings.ui:257 msgid "Force showing details for all notifications" msgstr "" -#: ../data/panel-osd-settings.ui:299 +#: data/panel-osd-settings.ui:299 msgid "" "Delay [s] before test-notification is shown. If it is too short, the " "notification might close immediately after it is shown." msgstr "" -#: ../data/panel-osd-settings.ui:328 +#: data/panel-osd-settings.ui:328 msgid "Show test notification" msgstr "" diff --git a/po/pl.po b/po/pl.po index ac5047e..3d0f9e5 100644 --- a/po/pl.po +++ b/po/pl.po @@ -7,8 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: gnome-shell-extension-panel-osd\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-21 22:58+0200\n" +"Report-Msgid-Bugs-To: https://github.com/jenslody/gnome-shell-extension-" +"panel-osd/issues\n" +"POT-Creation-Date: 2016-07-22 02:19+0200\n" "PO-Revision-Date: 2016-07-21 16:20+0200\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" @@ -19,7 +20,7 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -#: ../src/extension.js:119 +#: src/extension.js:119 msgid "" "This is just a multiline test-message to show where the notification will be " "placed and to test expansion (showing details)." @@ -27,31 +28,62 @@ msgstr "" "To wielowierszowy komunikat testowy pokazujący, gdzie powiadomienie będzie " "umieszczane i testujący rozszerzanie (wyświetlanie szczegółów)." -#: ../data/panel-osd-settings.ui:39 +#: data/org.gnome.shell.extensions.panel-osd.gschema.xml:5 +msgid "Horizontal position of notification." +msgstr "Poziome położenie powiadomienia." + +#: data/org.gnome.shell.extensions.panel-osd.gschema.xml:9 +msgid "Vertical position of notification." +msgstr "Pionowe położenie powiadomienia." + +#: data/org.gnome.shell.extensions.panel-osd.gschema.xml:13 +msgid "Allow resetting horizontal position of notification." +msgstr "Umożliwia przywrócenie poziomego położenia powiadomienia." + +#: data/org.gnome.shell.extensions.panel-osd.gschema.xml:17 +msgid "Allow resetting vertical position of notification." +msgstr "Umożliwia przywrócenie pionowego położenia powiadomienia." + +#: data/org.gnome.shell.extensions.panel-osd.gschema.xml:21 +msgid "Always expand notifications." +msgstr "Rozszerzanie wszystkich powiadomień." + +#: data/org.gnome.shell.extensions.panel-osd.gschema.xml:25 +msgid "Delay before test notification is shown." +msgstr "Opóźnienie przed wyświetleniem powiadomienia testowego." + +#: data/org.gnome.shell.extensions.panel-osd.gschema.xml:29 +msgid "" +"If the value is true a test-notification is send and then set back to false." +msgstr "" +"Jeśli wartość wynosi „true”, to wysłane zostanie powiadomienie testowe, a " +"następnie przywrócona wartość „false”." + +#: data/panel-osd-settings.ui:39 msgid "Horizontal position [%] from 0% (left) to 100% (right)" msgstr "Poziome położenie (w procentach) od 0% (lewo) do 100% (prawo)" -#: ../data/panel-osd-settings.ui:86 +#: data/panel-osd-settings.ui:86 msgid "Vertical position [%] from 0% (bottom) to 100% (top)" msgstr "Pionowe położenie (w procentach) od 0% (dół) do 100% (góra)" -#: ../data/panel-osd-settings.ui:170 +#: data/panel-osd-settings.ui:170 msgid "Reset horizontal position to defaults" msgstr "Przywrócenie poziomego położenia do wartości domyślnych" -#: ../data/panel-osd-settings.ui:183 +#: data/panel-osd-settings.ui:183 msgid "Reset vertical position to defaults" msgstr "Przywrócenie pionowego położenia do wartości domyślnych" -#: ../data/panel-osd-settings.ui:199 +#: data/panel-osd-settings.ui:199 msgid "Reset" msgstr "Przywróć" -#: ../data/panel-osd-settings.ui:257 +#: data/panel-osd-settings.ui:257 msgid "Force showing details for all notifications" msgstr "Wymuszenie wyświetlania szczegółów wszystkich powiadomień" -#: ../data/panel-osd-settings.ui:299 +#: data/panel-osd-settings.ui:299 msgid "" "Delay [s] before test-notification is shown. If it is too short, the " "notification might close immediately after it is shown." @@ -60,34 +92,9 @@ msgstr "" "jest za krótkie, to powiadomienie może zostać zamknięte natychmiast po " "wyświetleniu." -#: ../data/panel-osd-settings.ui:328 +#: data/panel-osd-settings.ui:328 msgid "Show test notification" msgstr "Wyświetl powiadomienie testowe" -#~ msgid "Horizontal position of notification." -#~ msgstr "Poziome położenie powiadomienia." - -#~ msgid "Vertical position of notification." -#~ msgstr "Pionowe położenie powiadomienia." - -#~ msgid "Allow resetting horizontal position of notification." -#~ msgstr "Umożliwia przywrócenie poziomego położenia powiadomienia." - -#~ msgid "Allow resetting vertical position of notification." -#~ msgstr "Umożliwia przywrócenie pionowego położenia powiadomienia." - -#~ msgid "Always expand notifications." -#~ msgstr "Rozszerzanie wszystkich powiadomień." - -#~ msgid "Delay before test notification is shown." -#~ msgstr "Opóźnienie przed wyświetleniem powiadomienia testowego." - -#~ msgid "" -#~ "If the value is true a test-notification is send and then set back to " -#~ "false." -#~ msgstr "" -#~ "Jeśli wartość wynosi „true”, to wysłane zostanie powiadomienie testowe, a " -#~ "następnie przywrócona wartość „false”." - #~ msgid "border-radius: %dpx %dpx %dpx %dpx;" #~ msgstr "border-radius: %dpx %dpx %dpx %dpx;" diff --git a/po/pt_BR.po b/po/pt_BR.po index d8ee632..d37ea14 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1,24 +1,25 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# Fábio Nogueira , 2015 - 2016. +# Fábio Nogueira , 2015 - 2016, 2016. # msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-21 22:58+0200\n" -"PO-Revision-Date: 2016-01-28 16:37-0300\n" +"Report-Msgid-Bugs-To: https://github.com/jenslody/gnome-shell-extension-" +"panel-osd/issues\n" +"POT-Creation-Date: 2016-07-22 02:19+0200\n" +"PO-Revision-Date: 2016-07-22 02:16+0200\n" "Last-Translator: Fábio Nogueira \n" "Language-Team: Português do Brasil\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.8.6\n" +"X-Generator: Gtranslator 2.91.7\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: ../src/extension.js:119 +#: src/extension.js:119 msgid "" "This is just a multiline test-message to show where the notification will be " "placed and to test expansion (showing details)." @@ -26,31 +27,60 @@ msgstr "" "Esta é apenas uma mensagem de teste de várias linhas para mostrar onde a " "notificação será posicionada e testar sua expansão (mostrando detalhes)." -#: ../data/panel-osd-settings.ui:39 +#: data/org.gnome.shell.extensions.panel-osd.gschema.xml:5 +msgid "Horizontal position of notification." +msgstr "" + +#: data/org.gnome.shell.extensions.panel-osd.gschema.xml:9 +msgid "Vertical position of notification." +msgstr "" + +#: data/org.gnome.shell.extensions.panel-osd.gschema.xml:13 +msgid "Allow resetting horizontal position of notification." +msgstr "" + +#: data/org.gnome.shell.extensions.panel-osd.gschema.xml:17 +msgid "Allow resetting vertical position of notification." +msgstr "" + +#: data/org.gnome.shell.extensions.panel-osd.gschema.xml:21 +msgid "Always expand notifications." +msgstr "" + +#: data/org.gnome.shell.extensions.panel-osd.gschema.xml:25 +msgid "Delay before test notification is shown." +msgstr "Atraso antes da notificação teste ser mostrada." + +#: data/org.gnome.shell.extensions.panel-osd.gschema.xml:29 +msgid "" +"If the value is true a test-notification is send and then set back to false." +msgstr "" + +#: data/panel-osd-settings.ui:39 msgid "Horizontal position [%] from 0% (left) to 100% (right)" msgstr "Posição horizontal [%] a partir de 0% (esquerda) a 100% (à direita)" -#: ../data/panel-osd-settings.ui:86 +#: data/panel-osd-settings.ui:86 msgid "Vertical position [%] from 0% (bottom) to 100% (top)" msgstr "Posição vertical [%] a partir de 0% (base) a 100% (topo)" -#: ../data/panel-osd-settings.ui:170 +#: data/panel-osd-settings.ui:170 msgid "Reset horizontal position to defaults" msgstr "Redefinir posição horizontal para os padrões" -#: ../data/panel-osd-settings.ui:183 +#: data/panel-osd-settings.ui:183 msgid "Reset vertical position to defaults" msgstr "Redefinir posição vertical para os padrões" -#: ../data/panel-osd-settings.ui:199 +#: data/panel-osd-settings.ui:199 msgid "Reset" msgstr "Redefinir" -#: ../data/panel-osd-settings.ui:257 +#: data/panel-osd-settings.ui:257 msgid "Force showing details for all notifications" msgstr "Forçar exibição dos detalhes para todas as notificações" -#: ../data/panel-osd-settings.ui:299 +#: data/panel-osd-settings.ui:299 msgid "" "Delay [s] before test-notification is shown. If it is too short, the " "notification might close immediately after it is shown." @@ -58,6 +88,6 @@ msgstr "" "Atraso [s] antes da notificação teste ser mostrada. Se muito curto, a " "notificação pode fechar imediatamente depois de ser exibida." -#: ../data/panel-osd-settings.ui:328 +#: data/panel-osd-settings.ui:328 msgid "Show test notification" msgstr "Mostrar notificação de teste" diff --git a/po/update.js b/po/update.js deleted file mode 100644 index bcf02ae..0000000 --- a/po/update.js +++ /dev/null @@ -1,54 +0,0 @@ -#!/usr/bin/env seed - -/* - * - * PO Updater for GNOME Shell Extension Panel OSD - * - * Copyright (C) 2012 - * Christian METZLER - * 2014 Jens Lody - * - * - * This file is part of gnome-shell-extension-panel-osd. - * - * gnome-shell-extension-panel-osd is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * gnome-shell-extension-panel-osd is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with gnome-shell-extension-panel-osd. If not, see . - * - */ - -Gio = imports.gi.Gio; - -print("Generate gnome-shell-extension-panel-osd.pot"); -var xgettext = Seed.spawn("xgettext -o gnome-shell-extension-panel-osd.pot --from-code=utf-8 --keyword=_ --keyword=translatable -f POTFILES.in"); - -if (xgettext.stderr) - print(xgettext.stderr); -else { - var file = Gio.file_new_for_path("."); - var enumerator = file.enumerate_children("standard::name,standard::size"); - var linguas = ""; - var n = ""; - var i = 0; - while (child = enumerator.next_file()) - if (child.get_name().search(/.po$/) != -1) { - print("Generate " + child.get_name()); - linguas += n + (child.get_name().split(".po")[0]); - Seed.spawn("msgmerge -U " + child.get_name() + " gnome-shell-extension-panel-osd.pot"); - n = "\n"; - i++; - } - - print("Write LINGUAS file"); - Gio.simple_write("LINGUAS", linguas); - print("Successfully generated " + i + " entry"); -} diff --git a/po/zh_CN.po b/po/zh_CN.po index 3edfd1f..2a10c64 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,8 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: gnome-shell-extension-panel-osd VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-21 22:58+0200\n" +"Report-Msgid-Bugs-To: https://github.com/jenslody/gnome-shell-extension-" +"panel-osd/issues\n" +"POT-Creation-Date: 2016-07-22 02:19+0200\n" "PO-Revision-Date: 2015-09-20 18:29+0800\n" "Last-Translator: 绿色圣光 \n" "Language-Team: Chinese (Simplified) <>\n" @@ -19,7 +20,7 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Gtranslator 2.91.7\n" -#: ../src/extension.js:119 +#: src/extension.js:119 msgid "" "This is just a multiline test-message to show where the notification will be " "placed and to test expansion (showing details)." @@ -27,37 +28,72 @@ msgstr "" "这仅仅是一个多行的测试消息，用来展示通知将被显示在什么地方，同时测试一下扩展" "功能（显示细节）。" -#: ../data/panel-osd-settings.ui:39 +#: data/org.gnome.shell.extensions.panel-osd.gschema.xml:5 +#, fuzzy +msgid "Horizontal position of notification." +msgstr "重置水平位置到默认值" + +#: data/org.gnome.shell.extensions.panel-osd.gschema.xml:9 +#, fuzzy +msgid "Vertical position of notification." +msgstr "重置垂直位置到默认值" + +#: data/org.gnome.shell.extensions.panel-osd.gschema.xml:13 +#, fuzzy +msgid "Allow resetting horizontal position of notification." +msgstr "重置水平位置到默认值" + +#: data/org.gnome.shell.extensions.panel-osd.gschema.xml:17 +#, fuzzy +msgid "Allow resetting vertical position of notification." +msgstr "重置垂直位置到默认值" + +#: data/org.gnome.shell.extensions.panel-osd.gschema.xml:21 +#, fuzzy +msgid "Always expand notifications." +msgstr "显示测试通知" + +#: data/org.gnome.shell.extensions.panel-osd.gschema.xml:25 +#, fuzzy +msgid "Delay before test notification is shown." +msgstr "显示测试通知" + +#: data/org.gnome.shell.extensions.panel-osd.gschema.xml:29 +msgid "" +"If the value is true a test-notification is send and then set back to false." +msgstr "" + +#: data/panel-osd-settings.ui:39 msgid "Horizontal position [%] from 0% (left) to 100% (right)" msgstr "水平位置百分比，从 0% （左侧）到 100% （右侧）" -#: ../data/panel-osd-settings.ui:86 +#: data/panel-osd-settings.ui:86 msgid "Vertical position [%] from 0% (bottom) to 100% (top)" msgstr "垂直位置百分比，从 0% （底端）到 100% （顶端）" -#: ../data/panel-osd-settings.ui:170 +#: data/panel-osd-settings.ui:170 msgid "Reset horizontal position to defaults" msgstr "重置水平位置到默认值" -#: ../data/panel-osd-settings.ui:183 +#: data/panel-osd-settings.ui:183 msgid "Reset vertical position to defaults" msgstr "重置垂直位置到默认值" -#: ../data/panel-osd-settings.ui:199 +#: data/panel-osd-settings.ui:199 msgid "Reset" msgstr "重置" -#: ../data/panel-osd-settings.ui:257 +#: data/panel-osd-settings.ui:257 msgid "Force showing details for all notifications" msgstr "强制所有通知显示细节" -#: ../data/panel-osd-settings.ui:299 +#: data/panel-osd-settings.ui:299 msgid "" "Delay [s] before test-notification is shown. If it is too short, the " "notification might close immediately after it is shown." msgstr "" "测试通知显示前延迟的秒数。如果太短，通知可能会在显示出来后，被立即关掉。" -#: ../data/panel-osd-settings.ui:328 +#: data/panel-osd-settings.ui:328 msgid "Show test notification" msgstr "显示测试通知"