Use gettext domain autodetection (from metadata.json) and don't split strings where appropriate.

This commit is contained in:
Thomas Liebetraut 2013-11-02 00:30:05 +01:00 committed by Olaf Leidinger
parent 53b6e5b5ce
commit ab482a81cf
3 changed files with 18 additions and 20 deletions

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: TeaTime 7\n" "Project-Id-Version: TeaTime 7\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-10-31 09:30+0100\n" "POT-Creation-Date: 2013-11-02 00:18+0100\n"
"PO-Revision-Date: 2013-10-31 09:38+0100\n" "PO-Revision-Date: 2013-10-31 09:38+0100\n"
"Last-Translator: Olaf Leidinger <oleid@mescharet.de>\n" "Last-Translator: Olaf Leidinger <oleid@mescharet.de>\n"
"Language-Team: German\n" "Language-Team: German\n"
@ -19,40 +19,39 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 1.5.7\n" "X-Generator: Poedit 1.5.7\n"
#: ../src/extension.js:88 #: ../src/extension.js:87
msgid "TeaTime applet" msgid "TeaTime applet"
msgstr "TeaTime applet" msgstr "TeaTime applet"
#: ../src/extension.js:105 #: ../src/extension.js:104
msgid "Timer set!" msgid "Timer set!"
msgstr "Die Zeit läuft!" msgstr "Die Zeit läuft!"
#: ../src/extension.js:105 #: ../src/extension.js:104
msgid "s to go" #, fuzzy, javascript-format
msgstr "s verbleiben" msgid "%ss to go"
msgstr "%ss verbleiben"
#: ../src/extension.js:120 #: ../src/extension.js:119
msgid "Your tea is ready!" msgid "Your tea is ready!"
msgstr "Dein Tee ist fertig!" msgstr "Dein Tee ist fertig!"
#: ../src/extension.js:121 #: ../src/extension.js:120
msgid "Drink it, while it is hot!" msgid "Drink it, while it is hot!"
msgstr "Trink ihn, solange er noch heiß ist!" msgstr "Trink ihn, solange er noch heiß ist!"
#: ../src/prefs.js:68 #: ../src/prefs.js:67
msgid "Tea" msgid "Tea"
msgstr "Tee" msgstr "Tee"
#: ../src/prefs.js:83 #: ../src/prefs.js:82
msgid "Steep time" msgid "Steep time"
msgstr "Ziehzeit" msgstr "Ziehzeit"
#: ../src/schemas/org.gnome.shell.extensions.teatime.gschema.xml.in.h:1 #: ../src/schemas/org.gnome.shell.extensions.teatime.gschema.xml.in.h:1
msgid "" msgid "{ \"Green tea\": 180, \"Black tea\": 210, \"Fruit tea\": 420, \"White tea\": "
"{ \"Green tea\": 180, \"Black tea\": 210, \"Fruit tea\": 420, \"White tea\": "
"120 }" "120 }"
msgstr "" msgstr "{ \"Grüner Tee\": 180, \"Schwarztee\": 210, \"Früchtetee\": 420, \"Weißer Tee"
"{ \"Grüner Tee\": 180, \"Schwarztee\": 210, \"Früchtetee\": 420, \"Weißer Tee"
"\": 120 }" "\": 120 }"
#: ../src/schemas/org.gnome.shell.extensions.teatime.gschema.xml.in.h:2 #: ../src/schemas/org.gnome.shell.extensions.teatime.gschema.xml.in.h:2
@ -60,6 +59,5 @@ msgid "Tea drawing times list"
msgstr "Liste der Teeziehzeiten" msgstr "Liste der Teeziehzeiten"
#: ../src/schemas/org.gnome.shell.extensions.teatime.gschema.xml.in.h:3 #: ../src/schemas/org.gnome.shell.extensions.teatime.gschema.xml.in.h:3
msgid "" msgid "A mapping of a teas to their corresponding drawing time in seconds."
"A mapping of a tea times to their corresponding drawing time in seconds." msgstr "Eine Zuordnung zwischen Tees und Ziehzeiten in Sekunden."
msgstr "Eine Zuordnung zwischen Tees und Ziehzeiten"

View File

@ -25,7 +25,7 @@ const ExtensionUtils = imports.misc.extensionUtils;
const Me = ExtensionUtils.getCurrentExtension(); const Me = ExtensionUtils.getCurrentExtension();
const Utils = Me.imports.utils; const Utils = Me.imports.utils;
Utils.initTranslations("TeaTime"); Utils.initTranslations();
const _ = Gettext.gettext; const _ = Gettext.gettext;
const N_ = function(e) { return e; }; const N_ = function(e) { return e; };
@ -101,7 +101,7 @@ const TeaTime = new Lang.Class({
this.actor.remove_actor(this._logo); // show timer instead of default icon this.actor.remove_actor(this._logo); // show timer instead of default icon
this.actor.add_actor(this._timer); this.actor.add_actor(this._timer);
this._showNotification(_("Timer set!"), time + _("s to go")); this._showNotification(_("Timer set!"), _("%ss to go").format(time));
this._idleTimeout = Mainloop.timeout_add_seconds(this._dt, Lang.bind(this, this._doCountdown)); this._idleTimeout = Mainloop.timeout_add_seconds(this._dt, Lang.bind(this, this._doCountdown));
}, },
_getRemainingSec: function() { _getRemainingSec: function() {

View File

@ -20,7 +20,7 @@ const ExtensionUtils = imports.misc.extensionUtils;
const Me = ExtensionUtils.getCurrentExtension(); const Me = ExtensionUtils.getCurrentExtension();
const Utils = Me.imports.utils; const Utils = Me.imports.utils;
Utils.initTranslations("TeaTime"); Utils.initTranslations();
const _ = Gettext.gettext; const _ = Gettext.gettext;
const N_ = function(e) { return e; }; const N_ = function(e) { return e; };