From 87e98b0aaeb486410c240d495a99346992080589 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Fri, 18 Mar 2016 17:35:52 +0100 Subject: [PATCH] clean up i18n --- .gitignore | 1 - Makefile | 43 ++++++------ gulpfile.js | 8 ++- taler-wallet-de-DE.po => i18n/de-DE.po | 87 ++++++++++++++++--------- taler-wallet-en-US.po => i18n/en-US.po | 90 ++++++++++++++------------ taler-wallet-fr-FR.po => i18n/fr-FR.po | 87 ++++++++++++++++--------- taler-wallet-it-IT.po => i18n/it-IT.po | 87 ++++++++++++++++--------- header.po => i18n/poheader | 0 i18n/strings.js | 4 ++ lib/i18n-strings.js | 8 +-- pages/confirm-contract.html | 2 +- pages/confirm-create-reserve.html | 2 +- popup/popup.html | 2 +- 13 files changed, 252 insertions(+), 169 deletions(-) rename taler-wallet-de-DE.po => i18n/de-DE.po (72%) rename taler-wallet-en-US.po => i18n/en-US.po (73%) rename taler-wallet-fr-FR.po => i18n/fr-FR.po (67%) rename taler-wallet-it-IT.po => i18n/it-IT.po (67%) rename header.po => i18n/poheader (100%) create mode 100644 i18n/strings.js diff --git a/.gitignore b/.gitignore index e7d82079e..01baabfe4 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,6 @@ lib/wallet/*.js pages/*.js lib/*.js !lib/module-trampoline.js -!lib/i18n-strings.js popup/*.js test/tests/*.js build/ diff --git a/Makefile b/Makefile index e2c4e2927..933c1a625 100644 --- a/Makefile +++ b/Makefile @@ -1,13 +1,13 @@ +SHELL = /bin/bash src = lib background content_scripts pages popup ts = $(shell git ls-files $(src) | grep '\.tsx\?$$') -langs = en-US de-DE fr-FR it-IT -poname = taler-wallet +poname = taler-wallet-webex gulp = node_modules/gulp/bin/gulp.js tsc = node_modules/typescript/bin/tsc po2json = node_modules/po2json/bin/po2json -.PHONY: node_modules pogen lib/i18n-strings.js +.PHONY: node_modules pogen i18n/strings.js package-stable: node_modules $(gulp) package-stable @@ -21,27 +21,23 @@ tsc: tsconfig.json node_modules tsconfig.json: gulpfile.js node_modules $(gulp) tsconfig -i18n: pogen lib/i18n-strings.js +i18n: pogen i18n/strings.js pogen/pogen.js: pogen/pogen.ts pogen/tsconfig.json node_modules cd pogen; ../$(tsc) pogen: $(ts) pogen/pogen.js node_modules - for ts in $(ts); do \ - echo $$ts; \ - node pogen/pogen.js $$ts > `dirname $$ts`/`basename $$ts .ts`.po; \ - done + find $(src) \( -name '*.ts' -or -name '*.tsx' \) ! -name '*.d.ts' \ + | xargs node pogen/pogen.js \ + | msguniq \ + | msgmerge i18n/poheader - \ + > i18n/$(poname).pot - pos=`find $(src) -name '*.po'`; \ - for lang in $(langs); do \ - echo $$lang; \ - test -e $(poname)-$$lang.po || cp header.po $(poname)-$$lang.po; \ - for po in $$pos; do \ - msguniq -o $$po $$po; \ - done; \ - msgcat $$pos | msgmerge -o $(poname)-$$lang.po $(poname)-$$lang.po -; \ +msgmerge: + @for pofile in i18n/*.po; do \ + echo merging $$pofile; \ + msgmerge -o $$pofile $$pofile i18n/$(poname).pot; \ done; \ - rm $$pos dist: node_modules $(gulp) srcdist @@ -49,13 +45,14 @@ dist: node_modules appdist: $(gulp) appdist -lib/i18n-strings.js: $(ts) node_modules - truncate -s0 $@ - for lang in $(langs); do \ - $(po2json) -F -f jed1.x -d $$lang $(poname)-$$lang.po $(poname)-$$lang.json; \ - (echo -n "i18n.strings['$$lang'] = "; cat $(poname)-$$lang.json; echo ';') >> $@; \ - rm $(poname)-$$lang.json; \ +i18n/strings.js: # $(ts) node_modules + for pofile in i18n/*.po; do \ + b=`basename $$pofile`; \ + lang=$${b%%.po}; \ + $(po2json) -F -f jed1.x -d $$lang $$pofile $$pofile.json; \ + (echo -n "i18n.strings['$$lang'] = "; cat $$pofile.json; echo ';') >> $@; \ done + node_modules: npm install . diff --git a/gulpfile.js b/gulpfile.js index 49715e4f2..5e8524cbb 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -60,11 +60,12 @@ const paths = { ], }, dist: [ - "*.po", + "i18n/*.po", + "i18n/*.pot", "img/*", "style/*.css", "lib/vendor/*", - "lib/i18n-strings.js", + "i18n/strings.js", "lib/emscripten/libwrapper.js", "lib/module-trampoline.js", "popup/**/*.{html,css}", @@ -85,7 +86,8 @@ const paths = { ], /* French copyright application */ appdist: [ - "*.po", + "i18n/*.po", + "i18n/*.pot", "style/*.css", "img/**", "lib/**/*.{ts,tsx}", diff --git a/taler-wallet-de-DE.po b/i18n/de-DE.po similarity index 72% rename from taler-wallet-de-DE.po rename to i18n/de-DE.po index ba76dec8f..6576fdb2d 100644 --- a/taler-wallet-de-DE.po +++ b/i18n/de-DE.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: Taler Wallet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-24 23:45+0100\n" +"POT-Creation-Date: 2016-03-18 16:54+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -27,12 +27,42 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/i18n.ts:39 popup/popup.tsx:117 +#: lib/i18n.ts:64 popup/popup.tsx:136 #, c-format msgid "free KUDOS" msgstr "" -#: pages/confirm-contract.tsx:41 +#: lib/i18n.ts:66 lib/i18n.ts:67 +#, c-format +msgid "DEBUG: Your balance on %1$s is %2$s KUDO. Get more at %3$s" +msgstr "" + +#: lib/i18n.ts:68 +#, c-format +msgid "DEBUG: Your balance is %1$s KUDO." +msgstr "" + +#: lib/i18n.ts:70 +#, c-format +msgid "DEBUG: #%1$s: Your balance is %2$s KUDO." +msgstr "" + +#: pages/confirm-create-reserve.tsx:92 +#, c-format +msgid "Please enter a URL" +msgstr "Bitte eine URL eingeben" + +#: pages/confirm-create-reserve.tsx:98 +#, c-format +msgid "The URL you've entered is not valid (must be absolute)" +msgstr "Die eingegebene URL ist nicht gültig (muss absolut sein)" + +#: pages/confirm-create-reserve.tsx:185 +#, c-format +msgid "The bank wants to create a reserve over %1$s." +msgstr "Die Bank möchte eine Reserve über %1$s anlegen." + +#: pages/confirm-contract.tsx:79 #, c-format msgid "" "%1$s\n" @@ -43,82 +73,77 @@ msgstr "" " möchte einen Vertrag über %2$s\n" " mit Ihnen abschließen." -#: pages/confirm-contract.tsx:46 +#: pages/confirm-contract.tsx:84 #, c-format msgid "You are about to purchase:" msgstr "Sie sind dabei, Folgendes zu kaufen:" -#: pages/confirm-contract.tsx:52 +#: pages/confirm-contract.tsx:90 #, c-format msgid "Confirm Payment" msgstr "Bezahlung bestätigen" -#: pages/confirm-create-reserve.tsx:84 -#, c-format -msgid "Please enter a URL" -msgstr "Bitte eine URL eingeben" - -#: pages/confirm-create-reserve.tsx:90 -#, c-format -msgid "The URL you've entered is not valid (must be absolute)" -msgstr "Die eingegebene URL ist nicht gültig (muss absolut sein)" - -#: pages/confirm-create-reserve.tsx:177 -#, c-format -msgid "The bank wants to create a reserve over %1$s." -msgstr "Die Bank möchte eine Reserve über %1$s anlegen." - -#: popup/popup.tsx:62 +#: popup/popup.tsx:70 #, c-format msgid "Balance" msgstr "Saldo" -#: popup/popup.tsx:63 +#: popup/popup.tsx:71 #, c-format msgid "History" msgstr "Verlauf" -#: popup/popup.tsx:64 +#: popup/popup.tsx:72 #, c-format msgid "Debug" msgstr "Debug" -#: popup/popup.tsx:120 +#: popup/popup.tsx:126 +#, c-format +msgid "Error: could not retrieve balance information." +msgstr "" + +#: popup/popup.tsx:139 #, c-format msgid "You have no balance to show. Want to get some %1$s?" msgstr "Sie haben kein Digitalgeld. Wollen Sie %1$s? abheben?" -#: popup/popup.tsx:158 +#: popup/popup.tsx:177 #, c-format msgid "Created reserve (%1$s) of %2$s at %3$s" msgstr "Reserve (%1$s) mit %2$s bei %3$s erzeugt" -#: popup/popup.tsx:163 +#: popup/popup.tsx:182 #, c-format msgid "Bank confirmed reserve (%1$s) at %2$s" msgstr "Bank bestätig anlegen der Reserve (%1$s) bei %2$s" -#: popup/popup.tsx:167 +#: popup/popup.tsx:186 #, c-format msgid "Withdraw at %1$s" msgstr "Abheben bei %1$s" -#: popup/popup.tsx:170 +#: popup/popup.tsx:189 #, c-format msgid "Wallet depleted reserve (%1$s) at %2$s" msgstr "Geldbörse hat die Reserve (%1$s) erschöpft" -#: popup/popup.tsx:176 +#: popup/popup.tsx:195 #, c-format msgid "Payment for %1$s to merchant %2$s. " msgstr "" -#: popup/popup.tsx:183 +#: popup/popup.tsx:202 #, c-format msgid "Unknown event (%1$s)" msgstr "" -#: popup/popup.tsx:220 +#: popup/popup.tsx:241 +#, c-format +msgid "Error: could not retrieve event history" +msgstr "" + +#: popup/popup.tsx:250 #, c-format msgid "Your wallet has no events recorded." msgstr "Ihre Geldbörse verzeichnet keine Vorkommnisse." diff --git a/taler-wallet-en-US.po b/i18n/en-US.po similarity index 73% rename from taler-wallet-en-US.po rename to i18n/en-US.po index 2f392edd1..c5a0ed2fb 100644 --- a/taler-wallet-en-US.po +++ b/i18n/en-US.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: Taler Wallet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-24 23:45+0100\n" +"POT-Creation-Date: 2016-03-18 16:54+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -27,31 +27,42 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/i18n.ts:39 popup/popup.tsx:117 +#: lib/i18n.ts:64 popup/popup.tsx:136 #, c-format msgid "free KUDOS" msgstr "" -#: lib/i18n.ts:41 lib/i18n.ts:42 +#: lib/i18n.ts:66 lib/i18n.ts:67 #, fuzzy, c-format msgid "DEBUG: Your balance on %1$s is %2$s KUDO. Get more at %3$s" msgstr "DEBUG: Your balance is %2$s KUDO on %1$s. Get more at %3$s" -#: lib/i18n.ts:43 -#, fuzzy, c-format +#: lib/i18n.ts:68 +#, c-format msgid "DEBUG: Your balance is %1$s KUDO." -msgid_plural "DEBUG: Your balance is %1$s KUDOs." -msgstr[0] "" -msgstr[1] "" +msgstr "" -#: lib/i18n.ts:45 -#, fuzzy, c-format +#: lib/i18n.ts:70 +#, c-format msgid "DEBUG: #%1$s: Your balance is %2$s KUDO." -msgid_plural "DEBUG: #%1$s: Your balance is %2$s KUDOs." -msgstr[0] "" -msgstr[1] "" +msgstr "" -#: pages/confirm-contract.tsx:41 +#: pages/confirm-create-reserve.tsx:92 +#, c-format +msgid "Please enter a URL" +msgstr "" + +#: pages/confirm-create-reserve.tsx:98 +#, c-format +msgid "The URL you've entered is not valid (must be absolute)" +msgstr "" + +#: pages/confirm-create-reserve.tsx:185 +#, c-format +msgid "The bank wants to create a reserve over %1$s." +msgstr "" + +#: pages/confirm-contract.tsx:79 #, c-format msgid "" "%1$s\n" @@ -59,82 +70,77 @@ msgid "" " with you." msgstr "" -#: pages/confirm-contract.tsx:46 +#: pages/confirm-contract.tsx:84 #, c-format msgid "You are about to purchase:" msgstr "" -#: pages/confirm-contract.tsx:52 +#: pages/confirm-contract.tsx:90 #, c-format msgid "Confirm Payment" msgstr "" -#: pages/confirm-create-reserve.tsx:84 -#, c-format -msgid "Please enter a URL" -msgstr "" - -#: pages/confirm-create-reserve.tsx:90 -#, c-format -msgid "The URL you've entered is not valid (must be absolute)" -msgstr "" - -#: pages/confirm-create-reserve.tsx:177 -#, c-format -msgid "The bank wants to create a reserve over %1$s." -msgstr "" - -#: popup/popup.tsx:62 +#: popup/popup.tsx:70 #, c-format msgid "Balance" msgstr "" -#: popup/popup.tsx:63 +#: popup/popup.tsx:71 #, c-format msgid "History" msgstr "" -#: popup/popup.tsx:64 +#: popup/popup.tsx:72 #, c-format msgid "Debug" msgstr "" -#: popup/popup.tsx:120 +#: popup/popup.tsx:126 +#, c-format +msgid "Error: could not retrieve balance information." +msgstr "" + +#: popup/popup.tsx:139 #, c-format msgid "You have no balance to show. Want to get some %1$s?" msgstr "" -#: popup/popup.tsx:158 +#: popup/popup.tsx:177 #, c-format msgid "Created reserve (%1$s) of %2$s at %3$s" msgstr "" -#: popup/popup.tsx:163 +#: popup/popup.tsx:182 #, c-format msgid "Bank confirmed reserve (%1$s) at %2$s" msgstr "" -#: popup/popup.tsx:167 +#: popup/popup.tsx:186 #, c-format msgid "Withdraw at %1$s" msgstr "" -#: popup/popup.tsx:170 +#: popup/popup.tsx:189 #, c-format msgid "Wallet depleted reserve (%1$s) at %2$s" msgstr "" -#: popup/popup.tsx:176 +#: popup/popup.tsx:195 #, c-format msgid "Payment for %1$s to merchant %2$s. " msgstr "" -#: popup/popup.tsx:183 +#: popup/popup.tsx:202 #, c-format msgid "Unknown event (%1$s)" msgstr "" -#: popup/popup.tsx:220 +#: popup/popup.tsx:241 +#, c-format +msgid "Error: could not retrieve event history" +msgstr "" + +#: popup/popup.tsx:250 #, c-format msgid "Your wallet has no events recorded." msgstr "" diff --git a/taler-wallet-fr-FR.po b/i18n/fr-FR.po similarity index 67% rename from taler-wallet-fr-FR.po rename to i18n/fr-FR.po index 63bbd8b5e..4ea763326 100644 --- a/taler-wallet-fr-FR.po +++ b/i18n/fr-FR.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: Taler Wallet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-24 23:45+0100\n" +"POT-Creation-Date: 2016-03-18 16:54+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -27,12 +27,42 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/i18n.ts:39 popup/popup.tsx:117 +#: lib/i18n.ts:64 popup/popup.tsx:136 #, c-format msgid "free KUDOS" msgstr "" -#: pages/confirm-contract.tsx:41 +#: lib/i18n.ts:66 lib/i18n.ts:67 +#, c-format +msgid "DEBUG: Your balance on %1$s is %2$s KUDO. Get more at %3$s" +msgstr "" + +#: lib/i18n.ts:68 +#, c-format +msgid "DEBUG: Your balance is %1$s KUDO." +msgstr "" + +#: lib/i18n.ts:70 +#, c-format +msgid "DEBUG: #%1$s: Your balance is %2$s KUDO." +msgstr "" + +#: pages/confirm-create-reserve.tsx:92 +#, c-format +msgid "Please enter a URL" +msgstr "" + +#: pages/confirm-create-reserve.tsx:98 +#, c-format +msgid "The URL you've entered is not valid (must be absolute)" +msgstr "" + +#: pages/confirm-create-reserve.tsx:185 +#, c-format +msgid "The bank wants to create a reserve over %1$s." +msgstr "" + +#: pages/confirm-contract.tsx:79 #, c-format msgid "" "%1$s\n" @@ -40,82 +70,77 @@ msgid "" " with you." msgstr "" -#: pages/confirm-contract.tsx:46 +#: pages/confirm-contract.tsx:84 #, c-format msgid "You are about to purchase:" msgstr "" -#: pages/confirm-contract.tsx:52 +#: pages/confirm-contract.tsx:90 #, c-format msgid "Confirm Payment" msgstr "" -#: pages/confirm-create-reserve.tsx:84 -#, c-format -msgid "Please enter a URL" -msgstr "" - -#: pages/confirm-create-reserve.tsx:90 -#, c-format -msgid "The URL you've entered is not valid (must be absolute)" -msgstr "" - -#: pages/confirm-create-reserve.tsx:177 -#, c-format -msgid "The bank wants to create a reserve over %1$s." -msgstr "" - -#: popup/popup.tsx:62 +#: popup/popup.tsx:70 #, c-format msgid "Balance" msgstr "" -#: popup/popup.tsx:63 +#: popup/popup.tsx:71 #, c-format msgid "History" msgstr "" -#: popup/popup.tsx:64 +#: popup/popup.tsx:72 #, c-format msgid "Debug" msgstr "" -#: popup/popup.tsx:120 +#: popup/popup.tsx:126 +#, c-format +msgid "Error: could not retrieve balance information." +msgstr "" + +#: popup/popup.tsx:139 #, c-format msgid "You have no balance to show. Want to get some %1$s?" msgstr "" -#: popup/popup.tsx:158 +#: popup/popup.tsx:177 #, c-format msgid "Created reserve (%1$s) of %2$s at %3$s" msgstr "" -#: popup/popup.tsx:163 +#: popup/popup.tsx:182 #, c-format msgid "Bank confirmed reserve (%1$s) at %2$s" msgstr "" -#: popup/popup.tsx:167 +#: popup/popup.tsx:186 #, c-format msgid "Withdraw at %1$s" msgstr "" -#: popup/popup.tsx:170 +#: popup/popup.tsx:189 #, c-format msgid "Wallet depleted reserve (%1$s) at %2$s" msgstr "" -#: popup/popup.tsx:176 +#: popup/popup.tsx:195 #, c-format msgid "Payment for %1$s to merchant %2$s. " msgstr "" -#: popup/popup.tsx:183 +#: popup/popup.tsx:202 #, c-format msgid "Unknown event (%1$s)" msgstr "" -#: popup/popup.tsx:220 +#: popup/popup.tsx:241 +#, c-format +msgid "Error: could not retrieve event history" +msgstr "" + +#: popup/popup.tsx:250 #, c-format msgid "Your wallet has no events recorded." msgstr "" diff --git a/taler-wallet-it-IT.po b/i18n/it-IT.po similarity index 67% rename from taler-wallet-it-IT.po rename to i18n/it-IT.po index 63bbd8b5e..4ea763326 100644 --- a/taler-wallet-it-IT.po +++ b/i18n/it-IT.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: Taler Wallet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-24 23:45+0100\n" +"POT-Creation-Date: 2016-03-18 16:54+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -27,12 +27,42 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/i18n.ts:39 popup/popup.tsx:117 +#: lib/i18n.ts:64 popup/popup.tsx:136 #, c-format msgid "free KUDOS" msgstr "" -#: pages/confirm-contract.tsx:41 +#: lib/i18n.ts:66 lib/i18n.ts:67 +#, c-format +msgid "DEBUG: Your balance on %1$s is %2$s KUDO. Get more at %3$s" +msgstr "" + +#: lib/i18n.ts:68 +#, c-format +msgid "DEBUG: Your balance is %1$s KUDO." +msgstr "" + +#: lib/i18n.ts:70 +#, c-format +msgid "DEBUG: #%1$s: Your balance is %2$s KUDO." +msgstr "" + +#: pages/confirm-create-reserve.tsx:92 +#, c-format +msgid "Please enter a URL" +msgstr "" + +#: pages/confirm-create-reserve.tsx:98 +#, c-format +msgid "The URL you've entered is not valid (must be absolute)" +msgstr "" + +#: pages/confirm-create-reserve.tsx:185 +#, c-format +msgid "The bank wants to create a reserve over %1$s." +msgstr "" + +#: pages/confirm-contract.tsx:79 #, c-format msgid "" "%1$s\n" @@ -40,82 +70,77 @@ msgid "" " with you." msgstr "" -#: pages/confirm-contract.tsx:46 +#: pages/confirm-contract.tsx:84 #, c-format msgid "You are about to purchase:" msgstr "" -#: pages/confirm-contract.tsx:52 +#: pages/confirm-contract.tsx:90 #, c-format msgid "Confirm Payment" msgstr "" -#: pages/confirm-create-reserve.tsx:84 -#, c-format -msgid "Please enter a URL" -msgstr "" - -#: pages/confirm-create-reserve.tsx:90 -#, c-format -msgid "The URL you've entered is not valid (must be absolute)" -msgstr "" - -#: pages/confirm-create-reserve.tsx:177 -#, c-format -msgid "The bank wants to create a reserve over %1$s." -msgstr "" - -#: popup/popup.tsx:62 +#: popup/popup.tsx:70 #, c-format msgid "Balance" msgstr "" -#: popup/popup.tsx:63 +#: popup/popup.tsx:71 #, c-format msgid "History" msgstr "" -#: popup/popup.tsx:64 +#: popup/popup.tsx:72 #, c-format msgid "Debug" msgstr "" -#: popup/popup.tsx:120 +#: popup/popup.tsx:126 +#, c-format +msgid "Error: could not retrieve balance information." +msgstr "" + +#: popup/popup.tsx:139 #, c-format msgid "You have no balance to show. Want to get some %1$s?" msgstr "" -#: popup/popup.tsx:158 +#: popup/popup.tsx:177 #, c-format msgid "Created reserve (%1$s) of %2$s at %3$s" msgstr "" -#: popup/popup.tsx:163 +#: popup/popup.tsx:182 #, c-format msgid "Bank confirmed reserve (%1$s) at %2$s" msgstr "" -#: popup/popup.tsx:167 +#: popup/popup.tsx:186 #, c-format msgid "Withdraw at %1$s" msgstr "" -#: popup/popup.tsx:170 +#: popup/popup.tsx:189 #, c-format msgid "Wallet depleted reserve (%1$s) at %2$s" msgstr "" -#: popup/popup.tsx:176 +#: popup/popup.tsx:195 #, c-format msgid "Payment for %1$s to merchant %2$s. " msgstr "" -#: popup/popup.tsx:183 +#: popup/popup.tsx:202 #, c-format msgid "Unknown event (%1$s)" msgstr "" -#: popup/popup.tsx:220 +#: popup/popup.tsx:241 +#, c-format +msgid "Error: could not retrieve event history" +msgstr "" + +#: popup/popup.tsx:250 #, c-format msgid "Your wallet has no events recorded." msgstr "" diff --git a/header.po b/i18n/poheader similarity index 100% rename from header.po rename to i18n/poheader diff --git a/i18n/strings.js b/i18n/strings.js new file mode 100644 index 000000000..92223aa73 --- /dev/null +++ b/i18n/strings.js @@ -0,0 +1,4 @@ +i18n.strings['de-DE'] = {"domain":"de-DE","locale_data":{"de-DE":{"":{"domain":"de-DE","plural_forms":"nplurals=2; plural=(n != 1);","lang":""},"free KUDOS":[""],"DEBUG: Your balance on %1$s is %2$s KUDO. Get more at %3$s":[""],"DEBUG: Your balance is %1$s KUDO.":[""],"DEBUG: #%1$s: Your balance is %2$s KUDO.":[""],"Please enter a URL":["Bitte eine URL eingeben"],"The URL you've entered is not valid (must be absolute)":["Die eingegebene URL ist nicht gültig (muss absolut sein)"],"The bank wants to create a reserve over %1$s.":["Die Bank möchte eine Reserve über %1$s anlegen."],"%1$s\n wants to enter a contract over %2$s\n with you.":["%1$s\n möchte einen Vertrag über %2$s\n mit Ihnen abschließen."],"You are about to purchase:":["Sie sind dabei, Folgendes zu kaufen:"],"Confirm Payment":["Bezahlung bestätigen"],"Balance":["Saldo"],"History":["Verlauf"],"Debug":["Debug"],"Error: could not retrieve balance information.":[""],"You have no balance to show. Want to get some %1$s?":["Sie haben kein Digitalgeld. Wollen Sie %1$s? abheben?"],"Created reserve (%1$s) of %2$s at %3$s":["Reserve (%1$s) mit %2$s bei %3$s erzeugt"],"Bank confirmed reserve (%1$s) at %2$s":["Bank bestätig anlegen der Reserve (%1$s) bei %2$s"],"Withdraw at %1$s":["Abheben bei %1$s"],"Wallet depleted reserve (%1$s) at %2$s":["Geldbörse hat die Reserve (%1$s) erschöpft"],"Payment for %1$s to merchant %2$s. ":[""],"Unknown event (%1$s)":[""],"Error: could not retrieve event history":[""],"Your wallet has no events recorded.":["Ihre Geldbörse verzeichnet keine Vorkommnisse."]}}}; +i18n.strings['en-US'] = {"domain":"en-US","locale_data":{"en-US":{"":{"domain":"en-US","plural_forms":"nplurals=2; plural=(n != 1);","lang":""},"free KUDOS":[""],"DEBUG: Your balance on %1$s is %2$s KUDO. Get more at %3$s":["DEBUG: Your balance is %2$s KUDO on %1$s. Get more at %3$s"],"DEBUG: Your balance is %1$s KUDO.":[""],"DEBUG: #%1$s: Your balance is %2$s KUDO.":[""],"Please enter a URL":[""],"The URL you've entered is not valid (must be absolute)":[""],"The bank wants to create a reserve over %1$s.":[""],"%1$s\n wants to enter a contract over %2$s\n with you.":[""],"You are about to purchase:":[""],"Confirm Payment":[""],"Balance":[""],"History":[""],"Debug":[""],"Error: could not retrieve balance information.":[""],"You have no balance to show. Want to get some %1$s?":[""],"Created reserve (%1$s) of %2$s at %3$s":[""],"Bank confirmed reserve (%1$s) at %2$s":[""],"Withdraw at %1$s":[""],"Wallet depleted reserve (%1$s) at %2$s":[""],"Payment for %1$s to merchant %2$s. ":[""],"Unknown event (%1$s)":[""],"Error: could not retrieve event history":[""],"Your wallet has no events recorded.":[""]}}}; +i18n.strings['fr-FR'] = {"domain":"fr-FR","locale_data":{"fr-FR":{"":{"domain":"fr-FR","plural_forms":"nplurals=2; plural=(n != 1);","lang":""},"free KUDOS":[""],"DEBUG: Your balance on %1$s is %2$s KUDO. Get more at %3$s":[""],"DEBUG: Your balance is %1$s KUDO.":[""],"DEBUG: #%1$s: Your balance is %2$s KUDO.":[""],"Please enter a URL":[""],"The URL you've entered is not valid (must be absolute)":[""],"The bank wants to create a reserve over %1$s.":[""],"%1$s\n wants to enter a contract over %2$s\n with you.":[""],"You are about to purchase:":[""],"Confirm Payment":[""],"Balance":[""],"History":[""],"Debug":[""],"Error: could not retrieve balance information.":[""],"You have no balance to show. Want to get some %1$s?":[""],"Created reserve (%1$s) of %2$s at %3$s":[""],"Bank confirmed reserve (%1$s) at %2$s":[""],"Withdraw at %1$s":[""],"Wallet depleted reserve (%1$s) at %2$s":[""],"Payment for %1$s to merchant %2$s. ":[""],"Unknown event (%1$s)":[""],"Error: could not retrieve event history":[""],"Your wallet has no events recorded.":[""]}}}; +i18n.strings['it-IT'] = {"domain":"it-IT","locale_data":{"it-IT":{"":{"domain":"it-IT","plural_forms":"nplurals=2; plural=(n != 1);","lang":""},"free KUDOS":[""],"DEBUG: Your balance on %1$s is %2$s KUDO. Get more at %3$s":[""],"DEBUG: Your balance is %1$s KUDO.":[""],"DEBUG: #%1$s: Your balance is %2$s KUDO.":[""],"Please enter a URL":[""],"The URL you've entered is not valid (must be absolute)":[""],"The bank wants to create a reserve over %1$s.":[""],"%1$s\n wants to enter a contract over %2$s\n with you.":[""],"You are about to purchase:":[""],"Confirm Payment":[""],"Balance":[""],"History":[""],"Debug":[""],"Error: could not retrieve balance information.":[""],"You have no balance to show. Want to get some %1$s?":[""],"Created reserve (%1$s) of %2$s at %3$s":[""],"Bank confirmed reserve (%1$s) at %2$s":[""],"Withdraw at %1$s":[""],"Wallet depleted reserve (%1$s) at %2$s":[""],"Payment for %1$s to merchant %2$s. ":[""],"Unknown event (%1$s)":[""],"Error: could not retrieve event history":[""],"Your wallet has no events recorded.":[""]}}}; diff --git a/lib/i18n-strings.js b/lib/i18n-strings.js index c58ad2c2d..a2b0fc568 100644 --- a/lib/i18n-strings.js +++ b/lib/i18n-strings.js @@ -1,4 +1,4 @@ -i18n.strings['en-US'] = {"domain":"en-US","locale_data":{"en-US":{"":{"domain":"en-US","plural_forms":"nplurals=2; plural=(n != 1);","lang":""},"free KUDOS":[""],"DEBUG: Your balance on %1$s is %2$s KUDO. Get more at %3$s":["DEBUG: Your balance is %2$s KUDO on %1$s. Get more at %3$s"],"DEBUG: Your balance is %1$s KUDO.":["","DEBUG: Your balance is %1$s KUDOs."],"DEBUG: #%1$s: Your balance is %2$s KUDO.":["","DEBUG: #%1$s: Your balance is %2$s KUDOs."],"%1$s\n wants to enter a contract over %2$s\n with you.":[""],"You are about to purchase:":[""],"Confirm Payment":[""],"Please enter a URL":[""],"The URL you've entered is not valid (must be absolute)":[""],"The bank wants to create a reserve over %1$s.":[""],"Balance":[""],"History":[""],"Debug":[""],"You have no balance to show. Want to get some %1$s?":[""],"Created reserve (%1$s) of %2$s at %3$s":[""],"Bank confirmed reserve (%1$s) at %2$s":[""],"Withdraw at %1$s":[""],"Wallet depleted reserve (%1$s) at %2$s":[""],"Payment for %1$s to merchant %2$s. ":[""],"Unknown event (%1$s)":[""],"Your wallet has no events recorded.":[""]}}}; -i18n.strings['de-DE'] = {"domain":"de-DE","locale_data":{"de-DE":{"":{"domain":"de-DE","plural_forms":"nplurals=2; plural=(n != 1);","lang":""},"free KUDOS":[""],"%1$s\n wants to enter a contract over %2$s\n with you.":["%1$s\n möchte einen Vertrag über %2$s\n mit Ihnen abschließen."],"You are about to purchase:":["Sie sind dabei, Folgendes zu kaufen:"],"Confirm Payment":["Bezahlung bestätigen"],"Please enter a URL":["Bitte eine URL eingeben"],"The URL you've entered is not valid (must be absolute)":["Die eingegebene URL ist nicht gültig (muss absolut sein)"],"The bank wants to create a reserve over %1$s.":["Die Bank möchte eine Reserve über %1$s anlegen."],"Balance":["Saldo"],"History":["Verlauf"],"Debug":["Debug"],"You have no balance to show. Want to get some %1$s?":["Sie haben kein Digitalgeld. Wollen Sie %1$s? abheben?"],"Created reserve (%1$s) of %2$s at %3$s":["Reserve (%1$s) mit %2$s bei %3$s erzeugt"],"Bank confirmed reserve (%1$s) at %2$s":["Bank bestätig anlegen der Reserve (%1$s) bei %2$s"],"Withdraw at %1$s":["Abheben bei %1$s"],"Wallet depleted reserve (%1$s) at %2$s":["Geldbörse hat die Reserve (%1$s) erschöpft"],"Payment for %1$s to merchant %2$s. ":[""],"Unknown event (%1$s)":[""],"Your wallet has no events recorded.":["Ihre Geldbörse verzeichnet keine Vorkommnisse."]}}}; -i18n.strings['fr-FR'] = {"domain":"fr-FR","locale_data":{"fr-FR":{"":{"domain":"fr-FR","plural_forms":"nplurals=2; plural=(n != 1);","lang":""},"free KUDOS":[""],"%1$s\n wants to enter a contract over %2$s\n with you.":[""],"You are about to purchase:":[""],"Confirm Payment":[""],"Please enter a URL":[""],"The URL you've entered is not valid (must be absolute)":[""],"The bank wants to create a reserve over %1$s.":[""],"Balance":[""],"History":[""],"Debug":[""],"You have no balance to show. Want to get some %1$s?":[""],"Created reserve (%1$s) of %2$s at %3$s":[""],"Bank confirmed reserve (%1$s) at %2$s":[""],"Withdraw at %1$s":[""],"Wallet depleted reserve (%1$s) at %2$s":[""],"Payment for %1$s to merchant %2$s. ":[""],"Unknown event (%1$s)":[""],"Your wallet has no events recorded.":[""]}}}; -i18n.strings['it-IT'] = {"domain":"it-IT","locale_data":{"it-IT":{"":{"domain":"it-IT","plural_forms":"nplurals=2; plural=(n != 1);","lang":""},"free KUDOS":[""],"%1$s\n wants to enter a contract over %2$s\n with you.":[""],"You are about to purchase:":[""],"Confirm Payment":[""],"Please enter a URL":[""],"The URL you've entered is not valid (must be absolute)":[""],"The bank wants to create a reserve over %1$s.":[""],"Balance":[""],"History":[""],"Debug":[""],"You have no balance to show. Want to get some %1$s?":[""],"Created reserve (%1$s) of %2$s at %3$s":[""],"Bank confirmed reserve (%1$s) at %2$s":[""],"Withdraw at %1$s":[""],"Wallet depleted reserve (%1$s) at %2$s":[""],"Payment for %1$s to merchant %2$s. ":[""],"Unknown event (%1$s)":[""],"Your wallet has no events recorded.":[""]}}}; +i18n.strings['en-US'] = {"domain":"en-US","locale_data":{"en-US":{"":{"domain":"en-US","plural_forms":"nplurals=2; plural=(n != 1);","lang":""},"free KUDOS":[""],"DEBUG: Your balance on %1$s is %2$s KUDO. Get more at %3$s":["DEBUG: Your balance is %2$s KUDO on %1$s. Get more at %3$s"],"DEBUG: Your balance is %1$s KUDO.":[""],"DEBUG: #%1$s: Your balance is %2$s KUDO.":[""],"Please enter a URL":[""],"The URL you've entered is not valid (must be absolute)":[""],"The bank wants to create a reserve over %1$s.":[""],"%1$s\n wants to enter a contract over %2$s\n with you.":[""],"You are about to purchase:":[""],"Confirm Payment":[""],"Balance":[""],"History":[""],"Debug":[""],"Error: could not retrieve balance information.":[""],"You have no balance to show. Want to get some %1$s?":[""],"Created reserve (%1$s) of %2$s at %3$s":[""],"Bank confirmed reserve (%1$s) at %2$s":[""],"Withdraw at %1$s":[""],"Wallet depleted reserve (%1$s) at %2$s":[""],"Payment for %1$s to merchant %2$s. ":[""],"Unknown event (%1$s)":[""],"Error: could not retrieve event history":[""],"Your wallet has no events recorded.":[""]}}}; +i18n.strings['de-DE'] = {"domain":"de-DE","locale_data":{"de-DE":{"":{"domain":"de-DE","plural_forms":"nplurals=2; plural=(n != 1);","lang":""},"free KUDOS":[""],"DEBUG: Your balance on %1$s is %2$s KUDO. Get more at %3$s":[""],"DEBUG: Your balance is %1$s KUDO.":[""],"DEBUG: #%1$s: Your balance is %2$s KUDO.":[""],"Please enter a URL":["Bitte eine URL eingeben"],"The URL you've entered is not valid (must be absolute)":["Die eingegebene URL ist nicht gültig (muss absolut sein)"],"The bank wants to create a reserve over %1$s.":["Die Bank möchte eine Reserve über %1$s anlegen."],"%1$s\n wants to enter a contract over %2$s\n with you.":["%1$s\n möchte einen Vertrag über %2$s\n mit Ihnen abschließen."],"You are about to purchase:":["Sie sind dabei, Folgendes zu kaufen:"],"Confirm Payment":["Bezahlung bestätigen"],"Balance":["Saldo"],"History":["Verlauf"],"Debug":["Debug"],"Error: could not retrieve balance information.":[""],"You have no balance to show. Want to get some %1$s?":["Sie haben kein Digitalgeld. Wollen Sie %1$s? abheben?"],"Created reserve (%1$s) of %2$s at %3$s":["Reserve (%1$s) mit %2$s bei %3$s erzeugt"],"Bank confirmed reserve (%1$s) at %2$s":["Bank bestätig anlegen der Reserve (%1$s) bei %2$s"],"Withdraw at %1$s":["Abheben bei %1$s"],"Wallet depleted reserve (%1$s) at %2$s":["Geldbörse hat die Reserve (%1$s) erschöpft"],"Payment for %1$s to merchant %2$s. ":[""],"Unknown event (%1$s)":[""],"Error: could not retrieve event history":[""],"Your wallet has no events recorded.":["Ihre Geldbörse verzeichnet keine Vorkommnisse."]}}}; +i18n.strings['fr-FR'] = {"domain":"fr-FR","locale_data":{"fr-FR":{"":{"domain":"fr-FR","plural_forms":"nplurals=2; plural=(n != 1);","lang":""},"free KUDOS":[""],"DEBUG: Your balance on %1$s is %2$s KUDO. Get more at %3$s":[""],"DEBUG: Your balance is %1$s KUDO.":[""],"DEBUG: #%1$s: Your balance is %2$s KUDO.":[""],"Please enter a URL":[""],"The URL you've entered is not valid (must be absolute)":[""],"The bank wants to create a reserve over %1$s.":[""],"%1$s\n wants to enter a contract over %2$s\n with you.":[""],"You are about to purchase:":[""],"Confirm Payment":[""],"Balance":[""],"History":[""],"Debug":[""],"Error: could not retrieve balance information.":[""],"You have no balance to show. Want to get some %1$s?":[""],"Created reserve (%1$s) of %2$s at %3$s":[""],"Bank confirmed reserve (%1$s) at %2$s":[""],"Withdraw at %1$s":[""],"Wallet depleted reserve (%1$s) at %2$s":[""],"Payment for %1$s to merchant %2$s. ":[""],"Unknown event (%1$s)":[""],"Error: could not retrieve event history":[""],"Your wallet has no events recorded.":[""]}}}; +i18n.strings['it-IT'] = {"domain":"it-IT","locale_data":{"it-IT":{"":{"domain":"it-IT","plural_forms":"nplurals=2; plural=(n != 1);","lang":""},"free KUDOS":[""],"DEBUG: Your balance on %1$s is %2$s KUDO. Get more at %3$s":[""],"DEBUG: Your balance is %1$s KUDO.":[""],"DEBUG: #%1$s: Your balance is %2$s KUDO.":[""],"Please enter a URL":[""],"The URL you've entered is not valid (must be absolute)":[""],"The bank wants to create a reserve over %1$s.":[""],"%1$s\n wants to enter a contract over %2$s\n with you.":[""],"You are about to purchase:":[""],"Confirm Payment":[""],"Balance":[""],"History":[""],"Debug":[""],"Error: could not retrieve balance information.":[""],"You have no balance to show. Want to get some %1$s?":[""],"Created reserve (%1$s) of %2$s at %3$s":[""],"Bank confirmed reserve (%1$s) at %2$s":[""],"Withdraw at %1$s":[""],"Wallet depleted reserve (%1$s) at %2$s":[""],"Payment for %1$s to merchant %2$s. ":[""],"Unknown event (%1$s)":[""],"Error: could not retrieve event history":[""],"Your wallet has no events recorded.":[""]}}}; diff --git a/pages/confirm-contract.html b/pages/confirm-contract.html index e80fb50c9..6abb65c67 100644 --- a/pages/confirm-contract.html +++ b/pages/confirm-contract.html @@ -12,8 +12,8 @@ + - diff --git a/pages/confirm-create-reserve.html b/pages/confirm-create-reserve.html index 88d01d2b1..ab0a7c954 100644 --- a/pages/confirm-create-reserve.html +++ b/pages/confirm-create-reserve.html @@ -10,8 +10,8 @@ + - diff --git a/popup/popup.html b/popup/popup.html index fbf9c2193..518d3c6cb 100644 --- a/popup/popup.html +++ b/popup/popup.html @@ -11,8 +11,8 @@ + -