[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-wallet-webex] 01/03: Swedish translation, i18n fixes
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [taler-wallet-webex] 01/03: Swedish translation, i18n fixes |
|
Date: |
Thu, 22 Feb 2018 10:26:27 +0100 |
This is an automated email from the git hooks/post-receive script.
dold pushed a commit to branch master
in repository wallet-webex.
commit f4d39c10e56a9ad1737dcdf290e31095ad66b7ee
Author: Florian Dold <address@hidden>
AuthorDate: Thu Feb 22 08:58:48 2018 +0100
Swedish translation, i18n fixes
---
node_modules/browserify-aes/readme.md | 18 ---
node_modules/evp_bytestokey/readme.md | 13 --
node_modules/pogen/pogen.js | 10 +-
node_modules/pogen/pogen.ts | 9 +-
src/i18n/de.po | 116 +++++++++++-----
src/i18n/en-US.po | 111 +++++++++++-----
src/i18n/fr.po | 111 +++++++++++-----
src/i18n/it.po | 111 +++++++++++-----
src/i18n/strings.ts | 206 +++++++++++++++++------------
src/i18n/{en-US.po => sv.po} | 195 ++++++++++++++++-----------
src/i18n/taler-wallet-webex.pot | 111 +++++++++++-----
src/webex/pages/confirm-contract.tsx | 11 +-
src/webex/pages/confirm-create-reserve.tsx | 16 ++-
tooling/pogen/pogen.js | 9 +-
tooling/pogen/pogen.ts | 9 +-
15 files changed, 692 insertions(+), 364 deletions(-)
diff --git a/node_modules/browserify-aes/readme.md
b/node_modules/browserify-aes/readme.md
deleted file mode 100644
index 1d7b0855..00000000
--- a/node_modules/browserify-aes/readme.md
+++ /dev/null
@@ -1,18 +0,0 @@
-browserify-aes
-====
-
-[](https://travis-ci.org/crypto-browserify/browserify-aes)
-
-Node style aes for use in the browser. Implements:
-
- - createCipher
- - createCipheriv
- - createDecipher
- - createDecipheriv
- - getCiphers
-
-In node.js, the `crypto` implementation is used, in browsers it falls back to
a pure JavaScript implementation.
-
-Much of this library has been taken from the aes implementation in
[triplesec](https://github.com/keybase/triplesec), a partial derivation of
[crypto-js](https://code.google.com/p/crypto-js/).
-
-`EVP_BytesToKey` is a straight up port of the same function from OpenSSL as
there is literally no documenation on it beyond it using 'undocumented
extensions' for longer keys.
diff --git a/node_modules/evp_bytestokey/readme.md
b/node_modules/evp_bytestokey/readme.md
deleted file mode 100644
index 86234dbf..00000000
--- a/node_modules/evp_bytestokey/readme.md
+++ /dev/null
@@ -1,13 +0,0 @@
-EVP_BytesToKey
-===
-
-The super secure [key derivation algorithm from
openssl](https://wiki.openssl.org/index.php/Manual:EVP_BytesToKey(3)) (spoiler
alert not actually secure, only every use it for compatibility reasons).
-
-Api:
-===
-
-```js
-var result = EVP_BytesToKey('password', 'salt', keyLen, ivLen);
-Buffer.isBuffer(result.password); // true
-Buffer.isBuffer(result.iv); // true
-```
diff --git a/node_modules/pogen/pogen.js b/node_modules/pogen/pogen.js
index 03cc0c34..1a0c49bf 100644
--- a/node_modules/pogen/pogen.js
+++ b/node_modules/pogen/pogen.js
@@ -188,7 +188,15 @@ function processFile(sourceFile) {
case ts.SyntaxKind.JsxText:
{
var e = childNode;
- var t = e.getText().split("\n").map(trim).join("\n");
+ var s = e.getText();
+ var t = s.split("\n").map(trim).join("\n");
+ if (s.length >= 1 && (s[0] === "\n" || s[0] === " ")) {
+ t = " " + t;
+ }
+ if (s.length >= 1 && (s[s.length - 1] === "\n" ||
s[s.length - 1] === " ")) {
+ t = t + " ";
+ }
+ console.log("got", JSON.stringify(s));
fragments.push(t);
}
case ts.SyntaxKind.JsxOpeningElement:
diff --git a/node_modules/pogen/pogen.ts b/node_modules/pogen/pogen.ts
index 5721b571..0903b9db 100644
--- a/node_modules/pogen/pogen.ts
+++ b/node_modules/pogen/pogen.ts
@@ -211,7 +211,14 @@ export function processFile(sourceFile: ts.SourceFile) {
case ts.SyntaxKind.JsxText:
{
let e = childNode as ts.JsxText;
- let t = e.getText().split("\n").map(trim).join("\n");
+ let s = e.getText();
+ let t = s.split("\n").map(trim).join("\n");
+ if (s.length >= 1 && (s[0] === "\n" || s[0] === " ")) {
+ t = " " + t;
+ }
+ if (s.length >= 1 && (s[s.length-1] === "\n" || s[s.length-1] === "
")) {
+ t = t + " ";
+ }
fragments.push(t);
}
case ts.SyntaxKind.JsxOpeningElement:
diff --git a/src/i18n/de.po b/src/i18n/de.po
index a43eb936..fce57861 100644
--- a/src/i18n/de.po
+++ b/src/i18n/de.po
@@ -29,7 +29,9 @@ msgstr ""
#: src/webex/pages/confirm-contract.tsx:76
#, c-format
-msgid "show more details\n"
+msgid ""
+"show more details\n"
+" "
msgstr ""
#: src/webex/pages/confirm-contract.tsx:90
@@ -95,7 +97,21 @@ msgstr "Bezahlung bestätigen"
#: src/webex/pages/confirm-contract.tsx:372
#, c-format
-msgid "The merchant%1$s offers you to purchase:\n"
+msgid ""
+"The merchant %1$soffers you to purchase:\n"
+" "
+msgstr ""
+
+#: src/webex/pages/confirm-contract.tsx:381
+#, c-format
+msgid ""
+"The total price is %1$s(plus %2$sfees).\n"
+" "
+msgstr ""
+
+#: src/webex/pages/confirm-contract.tsx:385
+#, c-format
+msgid "The total price is %1$s."
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:128
@@ -115,12 +131,16 @@ msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:210
#, c-format
-msgid "The exchange is trusted by the wallet.\n"
+msgid ""
+"The exchange is trusted by the wallet.\n"
+" "
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:216
#, c-format
-msgid "The exchange is audited by a trusted auditor.\n"
+msgid ""
+"The exchange is audited by a trusted auditor.\n"
+" "
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:222
@@ -129,21 +149,23 @@ msgid ""
"Warning: The exchange is neither directly trusted nor audited by a trusted "
"auditor.\n"
"If you withdraw from this exchange, it will be trusted in the future.\n"
+" "
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:231
#, c-format
msgid ""
-"Using exchange provider%1$s.\n"
+"Using exchange provider %1$s.\n"
"The exchange provider will charge\n"
-" %2$s in fees.\n"
+" %2$s%3$s%4$sin fees.\n"
+" "
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:245
#, c-format
msgid ""
"Waiting for a response from\n"
-" %1$s"
+" %1$s%2$s"
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:262
@@ -156,17 +178,19 @@ msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:281
#, c-format
msgid ""
-"Your wallet (protocol version%1$s) might be outdated.%2$sThe exchange has a "
+"Your wallet (protocol version %1$s) might be outdated.%2$sThe exchange has a "
"higher, incompatible\n"
"protocol version (%3$s).\n"
+" "
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:292
#, c-format
msgid ""
-"The chosen exchange (protocol version%1$smight be outdated.%2$sThe exchange "
+"The chosen exchange (protocol version %1$smight be outdated.%2$sThe exchange "
"has a lower, incompatible\n"
-"protocol version than your wallet (protocol version%3$s).\n"
+"protocol version than your wallet (protocol version %3$s).\n"
+" "
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:311
@@ -179,40 +203,51 @@ msgstr ""
msgid "Change Exchange Provider"
msgstr ""
+#: src/webex/pages/confirm-create-reserve.tsx:337
+#, c-format
+msgid ""
+"Please select an exchange. You can review the details before after your "
+"selection."
+msgstr ""
+
#: src/webex/pages/confirm-create-reserve.tsx:343
+#: src/webex/pages/confirm-create-reserve.tsx:355
#, c-format
-msgid "Select%1$s"
+msgid "Select %1$s"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:370
+#: src/webex/pages/confirm-create-reserve.tsx:372
#, c-format
-msgid "You are about to withdraw %1$s from your bank account into your wallet."
+msgid ""
+"You are about to withdraw\n"
+" %1$sfrom your bank account into your wallet.\n"
+" "
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:455
+#: src/webex/pages/confirm-create-reserve.tsx:457
#, c-format
msgid ""
"Oops, something went wrong. The wallet responded with error status (%1$s)."
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:464
+#: src/webex/pages/confirm-create-reserve.tsx:466
#, c-format
msgid "Checking URL, please wait ..."
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:478
+#: src/webex/pages/confirm-create-reserve.tsx:480
#, c-format
msgid "Can't parse amount: %1$s"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:485
+#: src/webex/pages/confirm-create-reserve.tsx:487
#, c-format
msgid "Can't parse wire_types: %1$s"
msgstr ""
#. #-#-#-#-# - (PACKAGE VERSION) #-#-#-#-#
#. TODO:generic error reporting function or component.
-#: src/webex/pages/confirm-create-reserve.tsx:511 src/webex/pages/tip.tsx:180
+#: src/webex/pages/confirm-create-reserve.tsx:513 src/webex/pages/tip.tsx:180
#, c-format
msgid "Fatal error: \"%1$s\"."
msgstr ""
@@ -241,17 +276,22 @@ msgstr ""
#, fuzzy, c-format
msgid ""
"You have no balance to show. Need some\n"
-" %1$s getting started?\n"
+" %1$s getting started?\n"
+" "
msgstr "Sie haben kein Digitalgeld. Wollen Sie %1$s? abheben?"
#: src/webex/pages/popup.tsx:270
#, c-format
-msgid "%1$s incoming\n"
+msgid ""
+"%1$s incoming\n"
+" "
msgstr ""
#: src/webex/pages/popup.tsx:283
#, c-format
-msgid "%1$s being spent\n"
+msgid ""
+"%1$s being spent\n"
+" "
msgstr ""
#: src/webex/pages/popup.tsx:310
@@ -278,19 +318,23 @@ msgstr ""
#, fuzzy, c-format
msgid ""
"Bank requested reserve (%1$s) for\n"
-" %2$s.\n"
+" %2$s.\n"
+" "
msgstr "Bank bestätig anlegen der Reserve (%1$s) bei %2$s"
#: src/webex/pages/popup.tsx:361
#, fuzzy, c-format
msgid ""
"Started to withdraw\n"
-" %1$s%2$sfrom%3$s(%4$s).\n"
+" %1$s%2$sfrom %3$s(%4$s).\n"
+" "
msgstr "Reserve (%1$s) mit %2$s bei %3$s erzeugt"
#: src/webex/pages/popup.tsx:370
#, fuzzy, c-format
-msgid "Merchant%1$soffered%2$scontract%3$s.\n"
+msgid ""
+"Merchant %1$soffered%2$scontract %3$s.\n"
+" "
msgstr ""
"%1$s\n"
" möchte einen Vertrag über %2$s\n"
@@ -298,27 +342,35 @@ msgstr ""
#: src/webex/pages/popup.tsx:381
#, fuzzy, c-format
-msgid "Withdrew%1$sfrom%2$s(%3$s).\n"
+msgid ""
+"Withdrew %1$sfrom %2$s(%3$s).\n"
+" "
msgstr "Reserve (%1$s) mit %2$s bei %3$s erzeugt"
#: src/webex/pages/popup.tsx:391
#, fuzzy, c-format
msgid ""
-"Paid%1$sto merchant%2$s.\n"
-"%3$s(%4$s)\n"
+"Paid %1$sto merchant %2$s.\n"
+" %3$s(%4$s)\n"
+" "
msgstr "Reserve (%1$s) mit %2$s bei %3$s erzeugt"
#: src/webex/pages/popup.tsx:401
-#, c-format
-msgid "Merchant%1$sgave a refund over%2$s.\n"
+#, fuzzy, c-format
+msgid ""
+"Merchant %1$sgave a refund over %2$s.\n"
+" "
msgstr ""
+"%1$s\n"
+" möchte einen Vertrag über %2$s\n"
+" mit Ihnen abschließen."
#: src/webex/pages/popup.tsx:411
#, fuzzy, c-format
msgid ""
-"Merchant%1$sgave\n"
-"a%2$sof%3$s.\n"
-"%4$s%5$s"
+"Merchant %1$sgave\n"
+"a %2$sof %3$s.\n"
+" %4$s%5$s"
msgstr ""
"%1$s\n"
" möchte einen Vertrag über %2$s\n"
diff --git a/src/i18n/en-US.po b/src/i18n/en-US.po
index 8541542f..b903c00d 100644
--- a/src/i18n/en-US.po
+++ b/src/i18n/en-US.po
@@ -29,7 +29,9 @@ msgstr ""
#: src/webex/pages/confirm-contract.tsx:76
#, c-format
-msgid "show more details\n"
+msgid ""
+"show more details\n"
+" "
msgstr ""
#: src/webex/pages/confirm-contract.tsx:90
@@ -95,7 +97,21 @@ msgstr ""
#: src/webex/pages/confirm-contract.tsx:372
#, c-format
-msgid "The merchant%1$s offers you to purchase:\n"
+msgid ""
+"The merchant %1$soffers you to purchase:\n"
+" "
+msgstr ""
+
+#: src/webex/pages/confirm-contract.tsx:381
+#, c-format
+msgid ""
+"The total price is %1$s(plus %2$sfees).\n"
+" "
+msgstr ""
+
+#: src/webex/pages/confirm-contract.tsx:385
+#, c-format
+msgid "The total price is %1$s."
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:128
@@ -115,12 +131,16 @@ msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:210
#, c-format
-msgid "The exchange is trusted by the wallet.\n"
+msgid ""
+"The exchange is trusted by the wallet.\n"
+" "
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:216
#, c-format
-msgid "The exchange is audited by a trusted auditor.\n"
+msgid ""
+"The exchange is audited by a trusted auditor.\n"
+" "
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:222
@@ -129,21 +149,23 @@ msgid ""
"Warning: The exchange is neither directly trusted nor audited by a trusted "
"auditor.\n"
"If you withdraw from this exchange, it will be trusted in the future.\n"
+" "
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:231
#, c-format
msgid ""
-"Using exchange provider%1$s.\n"
+"Using exchange provider %1$s.\n"
"The exchange provider will charge\n"
-" %2$s in fees.\n"
+" %2$s%3$s%4$sin fees.\n"
+" "
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:245
#, c-format
msgid ""
"Waiting for a response from\n"
-" %1$s"
+" %1$s%2$s"
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:262
@@ -156,17 +178,19 @@ msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:281
#, c-format
msgid ""
-"Your wallet (protocol version%1$s) might be outdated.%2$sThe exchange has a "
+"Your wallet (protocol version %1$s) might be outdated.%2$sThe exchange has a "
"higher, incompatible\n"
"protocol version (%3$s).\n"
+" "
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:292
#, c-format
msgid ""
-"The chosen exchange (protocol version%1$smight be outdated.%2$sThe exchange "
+"The chosen exchange (protocol version %1$smight be outdated.%2$sThe exchange "
"has a lower, incompatible\n"
-"protocol version than your wallet (protocol version%3$s).\n"
+"protocol version than your wallet (protocol version %3$s).\n"
+" "
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:311
@@ -179,40 +203,51 @@ msgstr ""
msgid "Change Exchange Provider"
msgstr ""
+#: src/webex/pages/confirm-create-reserve.tsx:337
+#, c-format
+msgid ""
+"Please select an exchange. You can review the details before after your "
+"selection."
+msgstr ""
+
#: src/webex/pages/confirm-create-reserve.tsx:343
+#: src/webex/pages/confirm-create-reserve.tsx:355
#, c-format
-msgid "Select%1$s"
+msgid "Select %1$s"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:370
+#: src/webex/pages/confirm-create-reserve.tsx:372
#, c-format
-msgid "You are about to withdraw %1$s from your bank account into your wallet."
+msgid ""
+"You are about to withdraw\n"
+" %1$sfrom your bank account into your wallet.\n"
+" "
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:455
+#: src/webex/pages/confirm-create-reserve.tsx:457
#, c-format
msgid ""
"Oops, something went wrong. The wallet responded with error status (%1$s)."
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:464
+#: src/webex/pages/confirm-create-reserve.tsx:466
#, c-format
msgid "Checking URL, please wait ..."
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:478
+#: src/webex/pages/confirm-create-reserve.tsx:480
#, c-format
msgid "Can't parse amount: %1$s"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:485
+#: src/webex/pages/confirm-create-reserve.tsx:487
#, c-format
msgid "Can't parse wire_types: %1$s"
msgstr ""
#. #-#-#-#-# - (PACKAGE VERSION) #-#-#-#-#
#. TODO:generic error reporting function or component.
-#: src/webex/pages/confirm-create-reserve.tsx:511 src/webex/pages/tip.tsx:180
+#: src/webex/pages/confirm-create-reserve.tsx:513 src/webex/pages/tip.tsx:180
#, c-format
msgid "Fatal error: \"%1$s\"."
msgstr ""
@@ -241,17 +276,22 @@ msgstr ""
#, c-format
msgid ""
"You have no balance to show. Need some\n"
-" %1$s getting started?\n"
+" %1$s getting started?\n"
+" "
msgstr ""
#: src/webex/pages/popup.tsx:270
#, c-format
-msgid "%1$s incoming\n"
+msgid ""
+"%1$s incoming\n"
+" "
msgstr ""
#: src/webex/pages/popup.tsx:283
#, c-format
-msgid "%1$s being spent\n"
+msgid ""
+"%1$s being spent\n"
+" "
msgstr ""
#: src/webex/pages/popup.tsx:310
@@ -278,44 +318,53 @@ msgstr ""
#, c-format
msgid ""
"Bank requested reserve (%1$s) for\n"
-" %2$s.\n"
+" %2$s.\n"
+" "
msgstr ""
#: src/webex/pages/popup.tsx:361
#, c-format
msgid ""
"Started to withdraw\n"
-" %1$s%2$sfrom%3$s(%4$s).\n"
+" %1$s%2$sfrom %3$s(%4$s).\n"
+" "
msgstr ""
#: src/webex/pages/popup.tsx:370
#, c-format
-msgid "Merchant%1$soffered%2$scontract%3$s.\n"
+msgid ""
+"Merchant %1$soffered%2$scontract %3$s.\n"
+" "
msgstr ""
#: src/webex/pages/popup.tsx:381
#, c-format
-msgid "Withdrew%1$sfrom%2$s(%3$s).\n"
+msgid ""
+"Withdrew %1$sfrom %2$s(%3$s).\n"
+" "
msgstr ""
#: src/webex/pages/popup.tsx:391
#, c-format
msgid ""
-"Paid%1$sto merchant%2$s.\n"
-"%3$s(%4$s)\n"
+"Paid %1$sto merchant %2$s.\n"
+" %3$s(%4$s)\n"
+" "
msgstr ""
#: src/webex/pages/popup.tsx:401
#, c-format
-msgid "Merchant%1$sgave a refund over%2$s.\n"
+msgid ""
+"Merchant %1$sgave a refund over %2$s.\n"
+" "
msgstr ""
#: src/webex/pages/popup.tsx:411
#, c-format
msgid ""
-"Merchant%1$sgave\n"
-"a%2$sof%3$s.\n"
-"%4$s%5$s"
+"Merchant %1$sgave\n"
+"a %2$sof %3$s.\n"
+" %4$s%5$s"
msgstr ""
#: src/webex/pages/popup.tsx:421
diff --git a/src/i18n/fr.po b/src/i18n/fr.po
index a4bffb01..28ce37de 100644
--- a/src/i18n/fr.po
+++ b/src/i18n/fr.po
@@ -29,7 +29,9 @@ msgstr ""
#: src/webex/pages/confirm-contract.tsx:76
#, c-format
-msgid "show more details\n"
+msgid ""
+"show more details\n"
+" "
msgstr ""
#: src/webex/pages/confirm-contract.tsx:90
@@ -95,7 +97,21 @@ msgstr ""
#: src/webex/pages/confirm-contract.tsx:372
#, c-format
-msgid "The merchant%1$s offers you to purchase:\n"
+msgid ""
+"The merchant %1$soffers you to purchase:\n"
+" "
+msgstr ""
+
+#: src/webex/pages/confirm-contract.tsx:381
+#, c-format
+msgid ""
+"The total price is %1$s(plus %2$sfees).\n"
+" "
+msgstr ""
+
+#: src/webex/pages/confirm-contract.tsx:385
+#, c-format
+msgid "The total price is %1$s."
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:128
@@ -115,12 +131,16 @@ msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:210
#, c-format
-msgid "The exchange is trusted by the wallet.\n"
+msgid ""
+"The exchange is trusted by the wallet.\n"
+" "
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:216
#, c-format
-msgid "The exchange is audited by a trusted auditor.\n"
+msgid ""
+"The exchange is audited by a trusted auditor.\n"
+" "
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:222
@@ -129,21 +149,23 @@ msgid ""
"Warning: The exchange is neither directly trusted nor audited by a trusted "
"auditor.\n"
"If you withdraw from this exchange, it will be trusted in the future.\n"
+" "
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:231
#, c-format
msgid ""
-"Using exchange provider%1$s.\n"
+"Using exchange provider %1$s.\n"
"The exchange provider will charge\n"
-" %2$s in fees.\n"
+" %2$s%3$s%4$sin fees.\n"
+" "
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:245
#, c-format
msgid ""
"Waiting for a response from\n"
-" %1$s"
+" %1$s%2$s"
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:262
@@ -156,17 +178,19 @@ msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:281
#, c-format
msgid ""
-"Your wallet (protocol version%1$s) might be outdated.%2$sThe exchange has a "
+"Your wallet (protocol version %1$s) might be outdated.%2$sThe exchange has a "
"higher, incompatible\n"
"protocol version (%3$s).\n"
+" "
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:292
#, c-format
msgid ""
-"The chosen exchange (protocol version%1$smight be outdated.%2$sThe exchange "
+"The chosen exchange (protocol version %1$smight be outdated.%2$sThe exchange "
"has a lower, incompatible\n"
-"protocol version than your wallet (protocol version%3$s).\n"
+"protocol version than your wallet (protocol version %3$s).\n"
+" "
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:311
@@ -179,40 +203,51 @@ msgstr ""
msgid "Change Exchange Provider"
msgstr ""
+#: src/webex/pages/confirm-create-reserve.tsx:337
+#, c-format
+msgid ""
+"Please select an exchange. You can review the details before after your "
+"selection."
+msgstr ""
+
#: src/webex/pages/confirm-create-reserve.tsx:343
+#: src/webex/pages/confirm-create-reserve.tsx:355
#, c-format
-msgid "Select%1$s"
+msgid "Select %1$s"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:370
+#: src/webex/pages/confirm-create-reserve.tsx:372
#, c-format
-msgid "You are about to withdraw %1$s from your bank account into your wallet."
+msgid ""
+"You are about to withdraw\n"
+" %1$sfrom your bank account into your wallet.\n"
+" "
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:455
+#: src/webex/pages/confirm-create-reserve.tsx:457
#, c-format
msgid ""
"Oops, something went wrong. The wallet responded with error status (%1$s)."
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:464
+#: src/webex/pages/confirm-create-reserve.tsx:466
#, c-format
msgid "Checking URL, please wait ..."
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:478
+#: src/webex/pages/confirm-create-reserve.tsx:480
#, c-format
msgid "Can't parse amount: %1$s"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:485
+#: src/webex/pages/confirm-create-reserve.tsx:487
#, c-format
msgid "Can't parse wire_types: %1$s"
msgstr ""
#. #-#-#-#-# - (PACKAGE VERSION) #-#-#-#-#
#. TODO:generic error reporting function or component.
-#: src/webex/pages/confirm-create-reserve.tsx:511 src/webex/pages/tip.tsx:180
+#: src/webex/pages/confirm-create-reserve.tsx:513 src/webex/pages/tip.tsx:180
#, c-format
msgid "Fatal error: \"%1$s\"."
msgstr ""
@@ -241,17 +276,22 @@ msgstr ""
#, c-format
msgid ""
"You have no balance to show. Need some\n"
-" %1$s getting started?\n"
+" %1$s getting started?\n"
+" "
msgstr ""
#: src/webex/pages/popup.tsx:270
#, c-format
-msgid "%1$s incoming\n"
+msgid ""
+"%1$s incoming\n"
+" "
msgstr ""
#: src/webex/pages/popup.tsx:283
#, c-format
-msgid "%1$s being spent\n"
+msgid ""
+"%1$s being spent\n"
+" "
msgstr ""
#: src/webex/pages/popup.tsx:310
@@ -278,44 +318,53 @@ msgstr ""
#, c-format
msgid ""
"Bank requested reserve (%1$s) for\n"
-" %2$s.\n"
+" %2$s.\n"
+" "
msgstr ""
#: src/webex/pages/popup.tsx:361
#, c-format
msgid ""
"Started to withdraw\n"
-" %1$s%2$sfrom%3$s(%4$s).\n"
+" %1$s%2$sfrom %3$s(%4$s).\n"
+" "
msgstr ""
#: src/webex/pages/popup.tsx:370
#, c-format
-msgid "Merchant%1$soffered%2$scontract%3$s.\n"
+msgid ""
+"Merchant %1$soffered%2$scontract %3$s.\n"
+" "
msgstr ""
#: src/webex/pages/popup.tsx:381
#, c-format
-msgid "Withdrew%1$sfrom%2$s(%3$s).\n"
+msgid ""
+"Withdrew %1$sfrom %2$s(%3$s).\n"
+" "
msgstr ""
#: src/webex/pages/popup.tsx:391
#, c-format
msgid ""
-"Paid%1$sto merchant%2$s.\n"
-"%3$s(%4$s)\n"
+"Paid %1$sto merchant %2$s.\n"
+" %3$s(%4$s)\n"
+" "
msgstr ""
#: src/webex/pages/popup.tsx:401
#, c-format
-msgid "Merchant%1$sgave a refund over%2$s.\n"
+msgid ""
+"Merchant %1$sgave a refund over %2$s.\n"
+" "
msgstr ""
#: src/webex/pages/popup.tsx:411
#, c-format
msgid ""
-"Merchant%1$sgave\n"
-"a%2$sof%3$s.\n"
-"%4$s%5$s"
+"Merchant %1$sgave\n"
+"a %2$sof %3$s.\n"
+" %4$s%5$s"
msgstr ""
#: src/webex/pages/popup.tsx:421
diff --git a/src/i18n/it.po b/src/i18n/it.po
index a4bffb01..28ce37de 100644
--- a/src/i18n/it.po
+++ b/src/i18n/it.po
@@ -29,7 +29,9 @@ msgstr ""
#: src/webex/pages/confirm-contract.tsx:76
#, c-format
-msgid "show more details\n"
+msgid ""
+"show more details\n"
+" "
msgstr ""
#: src/webex/pages/confirm-contract.tsx:90
@@ -95,7 +97,21 @@ msgstr ""
#: src/webex/pages/confirm-contract.tsx:372
#, c-format
-msgid "The merchant%1$s offers you to purchase:\n"
+msgid ""
+"The merchant %1$soffers you to purchase:\n"
+" "
+msgstr ""
+
+#: src/webex/pages/confirm-contract.tsx:381
+#, c-format
+msgid ""
+"The total price is %1$s(plus %2$sfees).\n"
+" "
+msgstr ""
+
+#: src/webex/pages/confirm-contract.tsx:385
+#, c-format
+msgid "The total price is %1$s."
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:128
@@ -115,12 +131,16 @@ msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:210
#, c-format
-msgid "The exchange is trusted by the wallet.\n"
+msgid ""
+"The exchange is trusted by the wallet.\n"
+" "
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:216
#, c-format
-msgid "The exchange is audited by a trusted auditor.\n"
+msgid ""
+"The exchange is audited by a trusted auditor.\n"
+" "
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:222
@@ -129,21 +149,23 @@ msgid ""
"Warning: The exchange is neither directly trusted nor audited by a trusted "
"auditor.\n"
"If you withdraw from this exchange, it will be trusted in the future.\n"
+" "
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:231
#, c-format
msgid ""
-"Using exchange provider%1$s.\n"
+"Using exchange provider %1$s.\n"
"The exchange provider will charge\n"
-" %2$s in fees.\n"
+" %2$s%3$s%4$sin fees.\n"
+" "
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:245
#, c-format
msgid ""
"Waiting for a response from\n"
-" %1$s"
+" %1$s%2$s"
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:262
@@ -156,17 +178,19 @@ msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:281
#, c-format
msgid ""
-"Your wallet (protocol version%1$s) might be outdated.%2$sThe exchange has a "
+"Your wallet (protocol version %1$s) might be outdated.%2$sThe exchange has a "
"higher, incompatible\n"
"protocol version (%3$s).\n"
+" "
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:292
#, c-format
msgid ""
-"The chosen exchange (protocol version%1$smight be outdated.%2$sThe exchange "
+"The chosen exchange (protocol version %1$smight be outdated.%2$sThe exchange "
"has a lower, incompatible\n"
-"protocol version than your wallet (protocol version%3$s).\n"
+"protocol version than your wallet (protocol version %3$s).\n"
+" "
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:311
@@ -179,40 +203,51 @@ msgstr ""
msgid "Change Exchange Provider"
msgstr ""
+#: src/webex/pages/confirm-create-reserve.tsx:337
+#, c-format
+msgid ""
+"Please select an exchange. You can review the details before after your "
+"selection."
+msgstr ""
+
#: src/webex/pages/confirm-create-reserve.tsx:343
+#: src/webex/pages/confirm-create-reserve.tsx:355
#, c-format
-msgid "Select%1$s"
+msgid "Select %1$s"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:370
+#: src/webex/pages/confirm-create-reserve.tsx:372
#, c-format
-msgid "You are about to withdraw %1$s from your bank account into your wallet."
+msgid ""
+"You are about to withdraw\n"
+" %1$sfrom your bank account into your wallet.\n"
+" "
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:455
+#: src/webex/pages/confirm-create-reserve.tsx:457
#, c-format
msgid ""
"Oops, something went wrong. The wallet responded with error status (%1$s)."
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:464
+#: src/webex/pages/confirm-create-reserve.tsx:466
#, c-format
msgid "Checking URL, please wait ..."
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:478
+#: src/webex/pages/confirm-create-reserve.tsx:480
#, c-format
msgid "Can't parse amount: %1$s"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:485
+#: src/webex/pages/confirm-create-reserve.tsx:487
#, c-format
msgid "Can't parse wire_types: %1$s"
msgstr ""
#. #-#-#-#-# - (PACKAGE VERSION) #-#-#-#-#
#. TODO:generic error reporting function or component.
-#: src/webex/pages/confirm-create-reserve.tsx:511 src/webex/pages/tip.tsx:180
+#: src/webex/pages/confirm-create-reserve.tsx:513 src/webex/pages/tip.tsx:180
#, c-format
msgid "Fatal error: \"%1$s\"."
msgstr ""
@@ -241,17 +276,22 @@ msgstr ""
#, c-format
msgid ""
"You have no balance to show. Need some\n"
-" %1$s getting started?\n"
+" %1$s getting started?\n"
+" "
msgstr ""
#: src/webex/pages/popup.tsx:270
#, c-format
-msgid "%1$s incoming\n"
+msgid ""
+"%1$s incoming\n"
+" "
msgstr ""
#: src/webex/pages/popup.tsx:283
#, c-format
-msgid "%1$s being spent\n"
+msgid ""
+"%1$s being spent\n"
+" "
msgstr ""
#: src/webex/pages/popup.tsx:310
@@ -278,44 +318,53 @@ msgstr ""
#, c-format
msgid ""
"Bank requested reserve (%1$s) for\n"
-" %2$s.\n"
+" %2$s.\n"
+" "
msgstr ""
#: src/webex/pages/popup.tsx:361
#, c-format
msgid ""
"Started to withdraw\n"
-" %1$s%2$sfrom%3$s(%4$s).\n"
+" %1$s%2$sfrom %3$s(%4$s).\n"
+" "
msgstr ""
#: src/webex/pages/popup.tsx:370
#, c-format
-msgid "Merchant%1$soffered%2$scontract%3$s.\n"
+msgid ""
+"Merchant %1$soffered%2$scontract %3$s.\n"
+" "
msgstr ""
#: src/webex/pages/popup.tsx:381
#, c-format
-msgid "Withdrew%1$sfrom%2$s(%3$s).\n"
+msgid ""
+"Withdrew %1$sfrom %2$s(%3$s).\n"
+" "
msgstr ""
#: src/webex/pages/popup.tsx:391
#, c-format
msgid ""
-"Paid%1$sto merchant%2$s.\n"
-"%3$s(%4$s)\n"
+"Paid %1$sto merchant %2$s.\n"
+" %3$s(%4$s)\n"
+" "
msgstr ""
#: src/webex/pages/popup.tsx:401
#, c-format
-msgid "Merchant%1$sgave a refund over%2$s.\n"
+msgid ""
+"Merchant %1$sgave a refund over %2$s.\n"
+" "
msgstr ""
#: src/webex/pages/popup.tsx:411
#, c-format
msgid ""
-"Merchant%1$sgave\n"
-"a%2$sof%3$s.\n"
-"%4$s%5$s"
+"Merchant %1$sgave\n"
+"a %2$sof %3$s.\n"
+" %4$s%5$s"
msgstr ""
#: src/webex/pages/popup.tsx:421
diff --git a/src/i18n/strings.ts b/src/i18n/strings.ts
index 821378fe..fc83aba3 100644
--- a/src/i18n/strings.ts
+++ b/src/i18n/strings.ts
@@ -24,7 +24,7 @@ strings['de'] = {
"plural_forms": "nplurals=2; plural=(n != 1);",
"lang": ""
},
- "show more details\n": [
+ "show more details\n ": [
""
],
"Accepted exchanges:": [
@@ -60,7 +60,13 @@ strings['de'] = {
"Abort Payment": [
"Bezahlung bestätigen"
],
- "The merchant%1$s offers you to purchase:\n": [
+ "The merchant %1$soffers you to purchase:\n ": [
+ ""
+ ],
+ "The total price is %1$s(plus %2$sfees).\n ": [
+ ""
+ ],
+ "The total price is %1$s.": [
""
],
"Select": [
@@ -72,28 +78,28 @@ strings['de'] = {
"Invalid exchange URL (%1$s)": [
""
],
- "The exchange is trusted by the wallet.\n": [
+ "The exchange is trusted by the wallet.\n ": [
""
],
- "The exchange is audited by a trusted auditor.\n": [
+ "The exchange is audited by a trusted auditor.\n ": [
""
],
- "Warning: The exchange is neither directly trusted nor audited by a
trusted auditor.\nIf you withdraw from this exchange, it will be trusted in the
future.\n": [
+ "Warning: The exchange is neither directly trusted nor audited by a
trusted auditor.\nIf you withdraw from this exchange, it will be trusted in the
future.\n ": [
""
],
- "Using exchange provider%1$s.\nThe exchange provider will charge\n %2$s
in fees.\n": [
+ "Using exchange provider %1$s.\nThe exchange provider will charge\n
%2$s%3$s%4$sin fees.\n ": [
""
],
- "Waiting for a response from\n %1$s": [
+ "Waiting for a response from\n %1$s%2$s": [
""
],
"Information about fees will be available when an exchange provider is
selected.": [
""
],
- "Your wallet (protocol version%1$s) might be outdated.%2$sThe exchange
has a higher, incompatible\nprotocol version (%3$s).\n": [
+ "Your wallet (protocol version %1$s) might be outdated.%2$sThe exchange
has a higher, incompatible\nprotocol version (%3$s).\n ": [
""
],
- "The chosen exchange (protocol version%1$smight be outdated.%2$sThe
exchange has a lower, incompatible\nprotocol version than your wallet (protocol
version%3$s).\n": [
+ "The chosen exchange (protocol version %1$smight be outdated.%2$sThe
exchange has a lower, incompatible\nprotocol version than your wallet (protocol
version %3$s).\n ": [
""
],
"Accept fees and withdraw": [
@@ -102,10 +108,13 @@ strings['de'] = {
"Change Exchange Provider": [
""
],
- "Select%1$s": [
+ "Please select an exchange. You can review the details before after
your selection.": [
""
],
- "You are about to withdraw %1$s from your bank account into your
wallet.": [
+ "Select %1$s": [
+ ""
+ ],
+ "You are about to withdraw\n %1$sfrom your bank account into your
wallet.\n ": [
""
],
"Oops, something went wrong. The wallet responded with error status
(%1$s).": [
@@ -135,13 +144,13 @@ strings['de'] = {
"help": [
""
],
- "You have no balance to show. Need some\n %1$s getting started?\n": [
+ "You have no balance to show. Need some\n %1$s getting started?\n ": [
"Sie haben kein Digitalgeld. Wollen Sie %1$s? abheben?"
],
- "%1$s incoming\n": [
+ "%1$s incoming\n ": [
""
],
- "%1$s being spent\n": [
+ "%1$s being spent\n ": [
""
],
"Error: could not retrieve balance information.": [
@@ -156,25 +165,25 @@ strings['de'] = {
"Manage Trusted Auditors and Exchanges": [
""
],
- "Bank requested reserve (%1$s) for\n %2$s.\n": [
+ "Bank requested reserve (%1$s) for\n %2$s.\n ": [
"Bank bestätig anlegen der Reserve (%1$s) bei %2$s"
],
- "Started to withdraw\n %1$s%2$sfrom%3$s(%4$s).\n": [
+ "Started to withdraw\n %1$s%2$sfrom %3$s(%4$s).\n ": [
"Reserve (%1$s) mit %2$s bei %3$s erzeugt"
],
- "Merchant%1$soffered%2$scontract%3$s.\n": [
+ "Merchant %1$soffered%2$scontract %3$s.\n ": [
"%1$s\n möchte einen Vertrag über %2$s\n
mit Ihnen abschließen."
],
- "Withdrew%1$sfrom%2$s(%3$s).\n": [
+ "Withdrew %1$sfrom %2$s(%3$s).\n ": [
"Reserve (%1$s) mit %2$s bei %3$s erzeugt"
],
- "Paid%1$sto merchant%2$s.\n%3$s(%4$s)\n": [
+ "Paid %1$sto merchant %2$s.\n %3$s(%4$s)\n ": [
"Reserve (%1$s) mit %2$s bei %3$s erzeugt"
],
- "Merchant%1$sgave a refund over%2$s.\n": [
- ""
+ "Merchant %1$sgave a refund over %2$s.\n ": [
+ "%1$s\n möchte einen Vertrag über %2$s\n
mit Ihnen abschließen."
],
- "Merchant%1$sgave\na%2$sof%3$s.\n%4$s%5$s": [
+ "Merchant %1$sgave\na %2$sof %3$s.\n %4$s%5$s": [
"%1$s\n möchte einen Vertrag über %2$s\n
mit Ihnen abschließen."
],
"Unknown event (%1$s)": [
@@ -243,7 +252,7 @@ strings['en-US'] = {
"plural_forms": "nplurals=2; plural=(n != 1);",
"lang": ""
},
- "show more details\n": [
+ "show more details\n ": [
""
],
"Accepted exchanges:": [
@@ -279,7 +288,13 @@ strings['en-US'] = {
"Abort Payment": [
""
],
- "The merchant%1$s offers you to purchase:\n": [
+ "The merchant %1$soffers you to purchase:\n ": [
+ ""
+ ],
+ "The total price is %1$s(plus %2$sfees).\n ": [
+ ""
+ ],
+ "The total price is %1$s.": [
""
],
"Select": [
@@ -291,28 +306,28 @@ strings['en-US'] = {
"Invalid exchange URL (%1$s)": [
""
],
- "The exchange is trusted by the wallet.\n": [
+ "The exchange is trusted by the wallet.\n ": [
""
],
- "The exchange is audited by a trusted auditor.\n": [
+ "The exchange is audited by a trusted auditor.\n ": [
""
],
- "Warning: The exchange is neither directly trusted nor audited by a
trusted auditor.\nIf you withdraw from this exchange, it will be trusted in the
future.\n": [
+ "Warning: The exchange is neither directly trusted nor audited by a
trusted auditor.\nIf you withdraw from this exchange, it will be trusted in the
future.\n ": [
""
],
- "Using exchange provider%1$s.\nThe exchange provider will charge\n %2$s
in fees.\n": [
+ "Using exchange provider %1$s.\nThe exchange provider will charge\n
%2$s%3$s%4$sin fees.\n ": [
""
],
- "Waiting for a response from\n %1$s": [
+ "Waiting for a response from\n %1$s%2$s": [
""
],
"Information about fees will be available when an exchange provider is
selected.": [
""
],
- "Your wallet (protocol version%1$s) might be outdated.%2$sThe exchange
has a higher, incompatible\nprotocol version (%3$s).\n": [
+ "Your wallet (protocol version %1$s) might be outdated.%2$sThe exchange
has a higher, incompatible\nprotocol version (%3$s).\n ": [
""
],
- "The chosen exchange (protocol version%1$smight be outdated.%2$sThe
exchange has a lower, incompatible\nprotocol version than your wallet (protocol
version%3$s).\n": [
+ "The chosen exchange (protocol version %1$smight be outdated.%2$sThe
exchange has a lower, incompatible\nprotocol version than your wallet (protocol
version %3$s).\n ": [
""
],
"Accept fees and withdraw": [
@@ -321,10 +336,13 @@ strings['en-US'] = {
"Change Exchange Provider": [
""
],
- "Select%1$s": [
+ "Please select an exchange. You can review the details before after
your selection.": [
+ ""
+ ],
+ "Select %1$s": [
""
],
- "You are about to withdraw %1$s from your bank account into your
wallet.": [
+ "You are about to withdraw\n %1$sfrom your bank account into your
wallet.\n ": [
""
],
"Oops, something went wrong. The wallet responded with error status
(%1$s).": [
@@ -354,13 +372,13 @@ strings['en-US'] = {
"help": [
""
],
- "You have no balance to show. Need some\n %1$s getting started?\n": [
+ "You have no balance to show. Need some\n %1$s getting started?\n ": [
""
],
- "%1$s incoming\n": [
+ "%1$s incoming\n ": [
""
],
- "%1$s being spent\n": [
+ "%1$s being spent\n ": [
""
],
"Error: could not retrieve balance information.": [
@@ -375,25 +393,25 @@ strings['en-US'] = {
"Manage Trusted Auditors and Exchanges": [
""
],
- "Bank requested reserve (%1$s) for\n %2$s.\n": [
+ "Bank requested reserve (%1$s) for\n %2$s.\n ": [
""
],
- "Started to withdraw\n %1$s%2$sfrom%3$s(%4$s).\n": [
+ "Started to withdraw\n %1$s%2$sfrom %3$s(%4$s).\n ": [
""
],
- "Merchant%1$soffered%2$scontract%3$s.\n": [
+ "Merchant %1$soffered%2$scontract %3$s.\n ": [
""
],
- "Withdrew%1$sfrom%2$s(%3$s).\n": [
+ "Withdrew %1$sfrom %2$s(%3$s).\n ": [
""
],
- "Paid%1$sto merchant%2$s.\n%3$s(%4$s)\n": [
+ "Paid %1$sto merchant %2$s.\n %3$s(%4$s)\n ": [
""
],
- "Merchant%1$sgave a refund over%2$s.\n": [
+ "Merchant %1$sgave a refund over %2$s.\n ": [
""
],
- "Merchant%1$sgave\na%2$sof%3$s.\n%4$s%5$s": [
+ "Merchant %1$sgave\na %2$sof %3$s.\n %4$s%5$s": [
""
],
"Unknown event (%1$s)": [
@@ -462,7 +480,7 @@ strings['fr'] = {
"plural_forms": "nplurals=2; plural=(n != 1);",
"lang": ""
},
- "show more details\n": [
+ "show more details\n ": [
""
],
"Accepted exchanges:": [
@@ -498,7 +516,13 @@ strings['fr'] = {
"Abort Payment": [
""
],
- "The merchant%1$s offers you to purchase:\n": [
+ "The merchant %1$soffers you to purchase:\n ": [
+ ""
+ ],
+ "The total price is %1$s(plus %2$sfees).\n ": [
+ ""
+ ],
+ "The total price is %1$s.": [
""
],
"Select": [
@@ -510,28 +534,28 @@ strings['fr'] = {
"Invalid exchange URL (%1$s)": [
""
],
- "The exchange is trusted by the wallet.\n": [
+ "The exchange is trusted by the wallet.\n ": [
""
],
- "The exchange is audited by a trusted auditor.\n": [
+ "The exchange is audited by a trusted auditor.\n ": [
""
],
- "Warning: The exchange is neither directly trusted nor audited by a
trusted auditor.\nIf you withdraw from this exchange, it will be trusted in the
future.\n": [
+ "Warning: The exchange is neither directly trusted nor audited by a
trusted auditor.\nIf you withdraw from this exchange, it will be trusted in the
future.\n ": [
""
],
- "Using exchange provider%1$s.\nThe exchange provider will charge\n %2$s
in fees.\n": [
+ "Using exchange provider %1$s.\nThe exchange provider will charge\n
%2$s%3$s%4$sin fees.\n ": [
""
],
- "Waiting for a response from\n %1$s": [
+ "Waiting for a response from\n %1$s%2$s": [
""
],
"Information about fees will be available when an exchange provider is
selected.": [
""
],
- "Your wallet (protocol version%1$s) might be outdated.%2$sThe exchange
has a higher, incompatible\nprotocol version (%3$s).\n": [
+ "Your wallet (protocol version %1$s) might be outdated.%2$sThe exchange
has a higher, incompatible\nprotocol version (%3$s).\n ": [
""
],
- "The chosen exchange (protocol version%1$smight be outdated.%2$sThe
exchange has a lower, incompatible\nprotocol version than your wallet (protocol
version%3$s).\n": [
+ "The chosen exchange (protocol version %1$smight be outdated.%2$sThe
exchange has a lower, incompatible\nprotocol version than your wallet (protocol
version %3$s).\n ": [
""
],
"Accept fees and withdraw": [
@@ -540,10 +564,13 @@ strings['fr'] = {
"Change Exchange Provider": [
""
],
- "Select%1$s": [
+ "Please select an exchange. You can review the details before after
your selection.": [
+ ""
+ ],
+ "Select %1$s": [
""
],
- "You are about to withdraw %1$s from your bank account into your
wallet.": [
+ "You are about to withdraw\n %1$sfrom your bank account into your
wallet.\n ": [
""
],
"Oops, something went wrong. The wallet responded with error status
(%1$s).": [
@@ -573,13 +600,13 @@ strings['fr'] = {
"help": [
""
],
- "You have no balance to show. Need some\n %1$s getting started?\n": [
+ "You have no balance to show. Need some\n %1$s getting started?\n ": [
""
],
- "%1$s incoming\n": [
+ "%1$s incoming\n ": [
""
],
- "%1$s being spent\n": [
+ "%1$s being spent\n ": [
""
],
"Error: could not retrieve balance information.": [
@@ -594,25 +621,25 @@ strings['fr'] = {
"Manage Trusted Auditors and Exchanges": [
""
],
- "Bank requested reserve (%1$s) for\n %2$s.\n": [
+ "Bank requested reserve (%1$s) for\n %2$s.\n ": [
""
],
- "Started to withdraw\n %1$s%2$sfrom%3$s(%4$s).\n": [
+ "Started to withdraw\n %1$s%2$sfrom %3$s(%4$s).\n ": [
""
],
- "Merchant%1$soffered%2$scontract%3$s.\n": [
+ "Merchant %1$soffered%2$scontract %3$s.\n ": [
""
],
- "Withdrew%1$sfrom%2$s(%3$s).\n": [
+ "Withdrew %1$sfrom %2$s(%3$s).\n ": [
""
],
- "Paid%1$sto merchant%2$s.\n%3$s(%4$s)\n": [
+ "Paid %1$sto merchant %2$s.\n %3$s(%4$s)\n ": [
""
],
- "Merchant%1$sgave a refund over%2$s.\n": [
+ "Merchant %1$sgave a refund over %2$s.\n ": [
""
],
- "Merchant%1$sgave\na%2$sof%3$s.\n%4$s%5$s": [
+ "Merchant %1$sgave\na %2$sof %3$s.\n %4$s%5$s": [
""
],
"Unknown event (%1$s)": [
@@ -681,7 +708,7 @@ strings['it'] = {
"plural_forms": "nplurals=2; plural=(n != 1);",
"lang": ""
},
- "show more details\n": [
+ "show more details\n ": [
""
],
"Accepted exchanges:": [
@@ -717,7 +744,13 @@ strings['it'] = {
"Abort Payment": [
""
],
- "The merchant%1$s offers you to purchase:\n": [
+ "The merchant %1$soffers you to purchase:\n ": [
+ ""
+ ],
+ "The total price is %1$s(plus %2$sfees).\n ": [
+ ""
+ ],
+ "The total price is %1$s.": [
""
],
"Select": [
@@ -729,28 +762,28 @@ strings['it'] = {
"Invalid exchange URL (%1$s)": [
""
],
- "The exchange is trusted by the wallet.\n": [
+ "The exchange is trusted by the wallet.\n ": [
""
],
- "The exchange is audited by a trusted auditor.\n": [
+ "The exchange is audited by a trusted auditor.\n ": [
""
],
- "Warning: The exchange is neither directly trusted nor audited by a
trusted auditor.\nIf you withdraw from this exchange, it will be trusted in the
future.\n": [
+ "Warning: The exchange is neither directly trusted nor audited by a
trusted auditor.\nIf you withdraw from this exchange, it will be trusted in the
future.\n ": [
""
],
- "Using exchange provider%1$s.\nThe exchange provider will charge\n %2$s
in fees.\n": [
+ "Using exchange provider %1$s.\nThe exchange provider will charge\n
%2$s%3$s%4$sin fees.\n ": [
""
],
- "Waiting for a response from\n %1$s": [
+ "Waiting for a response from\n %1$s%2$s": [
""
],
"Information about fees will be available when an exchange provider is
selected.": [
""
],
- "Your wallet (protocol version%1$s) might be outdated.%2$sThe exchange
has a higher, incompatible\nprotocol version (%3$s).\n": [
+ "Your wallet (protocol version %1$s) might be outdated.%2$sThe exchange
has a higher, incompatible\nprotocol version (%3$s).\n ": [
""
],
- "The chosen exchange (protocol version%1$smight be outdated.%2$sThe
exchange has a lower, incompatible\nprotocol version than your wallet (protocol
version%3$s).\n": [
+ "The chosen exchange (protocol version %1$smight be outdated.%2$sThe
exchange has a lower, incompatible\nprotocol version than your wallet (protocol
version %3$s).\n ": [
""
],
"Accept fees and withdraw": [
@@ -759,10 +792,13 @@ strings['it'] = {
"Change Exchange Provider": [
""
],
- "Select%1$s": [
+ "Please select an exchange. You can review the details before after
your selection.": [
+ ""
+ ],
+ "Select %1$s": [
""
],
- "You are about to withdraw %1$s from your bank account into your
wallet.": [
+ "You are about to withdraw\n %1$sfrom your bank account into your
wallet.\n ": [
""
],
"Oops, something went wrong. The wallet responded with error status
(%1$s).": [
@@ -792,13 +828,13 @@ strings['it'] = {
"help": [
""
],
- "You have no balance to show. Need some\n %1$s getting started?\n": [
+ "You have no balance to show. Need some\n %1$s getting started?\n ": [
""
],
- "%1$s incoming\n": [
+ "%1$s incoming\n ": [
""
],
- "%1$s being spent\n": [
+ "%1$s being spent\n ": [
""
],
"Error: could not retrieve balance information.": [
@@ -813,25 +849,25 @@ strings['it'] = {
"Manage Trusted Auditors and Exchanges": [
""
],
- "Bank requested reserve (%1$s) for\n %2$s.\n": [
+ "Bank requested reserve (%1$s) for\n %2$s.\n ": [
""
],
- "Started to withdraw\n %1$s%2$sfrom%3$s(%4$s).\n": [
+ "Started to withdraw\n %1$s%2$sfrom %3$s(%4$s).\n ": [
""
],
- "Merchant%1$soffered%2$scontract%3$s.\n": [
+ "Merchant %1$soffered%2$scontract %3$s.\n ": [
""
],
- "Withdrew%1$sfrom%2$s(%3$s).\n": [
+ "Withdrew %1$sfrom %2$s(%3$s).\n ": [
""
],
- "Paid%1$sto merchant%2$s.\n%3$s(%4$s)\n": [
+ "Paid %1$sto merchant %2$s.\n %3$s(%4$s)\n ": [
""
],
- "Merchant%1$sgave a refund over%2$s.\n": [
+ "Merchant %1$sgave a refund over %2$s.\n ": [
""
],
- "Merchant%1$sgave\na%2$sof%3$s.\n%4$s%5$s": [
+ "Merchant %1$sgave\na %2$sof %3$s.\n %4$s%5$s": [
""
],
"Unknown event (%1$s)": [
diff --git a/src/i18n/en-US.po b/src/i18n/sv.po
similarity index 68%
copy from src/i18n/en-US.po
copy to src/i18n/sv.po
index 8541542f..368bb321 100644
--- a/src/i18n/en-US.po
+++ b/src/i18n/sv.po
@@ -19,7 +19,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-23 00:00+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <address@hidden>\n"
+"Last-Translator: Flo Reitz <address@hidden>\n"
"Language-Team: LANGUAGE <address@hidden>\n"
"Language: \n"
"MIME-Version: 1.0\n"
@@ -29,23 +29,25 @@ msgstr ""
#: src/webex/pages/confirm-contract.tsx:76
#, c-format
-msgid "show more details\n"
-msgstr ""
+msgid ""
+"show more details\n"
+" "
+msgstr "visa mer"
#: src/webex/pages/confirm-contract.tsx:90
#, c-format
msgid "Accepted exchanges:"
-msgstr ""
+msgstr "Accepterade tjänsteleverantörer:"
#: src/webex/pages/confirm-contract.tsx:95
#, c-format
msgid "Exchanges in the wallet:"
-msgstr ""
+msgstr "Tjänsteleverantörer i plånboken:"
#: src/webex/pages/confirm-contract.tsx:217
#, c-format
msgid "You have insufficient funds of the requested currency in your wallet."
-msgstr ""
+msgstr "plånboken"
#. tslint:disable-next-line:max-line-length
#: src/webex/pages/confirm-contract.tsx:219
@@ -54,24 +56,24 @@ msgid ""
"You do not have any funds from an exchange that is accepted by this "
"merchant. None of the exchanges accepted by the merchant is known to your "
"wallet."
-msgstr ""
+msgstr "plånboken"
#: src/webex/pages/confirm-contract.tsx:320
#, c-format
msgid "Confirm payment"
-msgstr ""
+msgstr "Godkän betalning"
#: src/webex/pages/confirm-contract.tsx:330
#, c-format
msgid "Submitting payment"
-msgstr ""
+msgstr "Bekräftar betalning"
#: src/webex/pages/confirm-contract.tsx:341
#, c-format
msgid ""
"You already paid for this, clicking \"Confirm payment\" will not cost money "
"again."
-msgstr ""
+msgstr "Du har redan betalat för det här, om du trycker \"Godkän betalning\"
debiteras du inte igen"
#: src/webex/pages/confirm-contract.tsx:355
#, c-format
@@ -95,13 +97,27 @@ msgstr ""
#: src/webex/pages/confirm-contract.tsx:372
#, c-format
-msgid "The merchant%1$s offers you to purchase:\n"
-msgstr ""
+msgid ""
+"The merchant %1$soffers you to purchase:\n"
+" "
+msgstr "Säljaren %1$serbjuder följande:"
+
+#: src/webex/pages/confirm-contract.tsx:381
+#, c-format
+msgid ""
+"The total price is %1$s(plus %2$sfees).\n"
+" "
+msgstr "Det totala priset är %1$s(plus %2$savgifter).\n"
+
+#: src/webex/pages/confirm-contract.tsx:385
+#, c-format
+msgid "The total price is %1$s."
+msgstr "Det totala priset är %1$s."
#: src/webex/pages/confirm-create-reserve.tsx:128
#, c-format
msgid "Select"
-msgstr ""
+msgstr "Välj"
#: src/webex/pages/confirm-create-reserve.tsx:145
#, c-format
@@ -115,13 +131,17 @@ msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:210
#, c-format
-msgid "The exchange is trusted by the wallet.\n"
-msgstr ""
+msgid ""
+"The exchange is trusted by the wallet.\n"
+" "
+msgstr "tjänsteleverantörer"
#: src/webex/pages/confirm-create-reserve.tsx:216
#, c-format
-msgid "The exchange is audited by a trusted auditor.\n"
-msgstr ""
+msgid ""
+"The exchange is audited by a trusted auditor.\n"
+" "
+msgstr "tjänsteleverantörer"
#: src/webex/pages/confirm-create-reserve.tsx:222
#, c-format
@@ -129,21 +149,23 @@ msgid ""
"Warning: The exchange is neither directly trusted nor audited by a trusted "
"auditor.\n"
"If you withdraw from this exchange, it will be trusted in the future.\n"
+" "
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:231
#, c-format
msgid ""
-"Using exchange provider%1$s.\n"
+"Using exchange provider %1$s.\n"
"The exchange provider will charge\n"
-" %2$s in fees.\n"
-msgstr ""
+" %2$s%3$s%4$sin fees.\n"
+" "
+msgstr "tjänsteleverantörer"
#: src/webex/pages/confirm-create-reserve.tsx:245
#, c-format
msgid ""
"Waiting for a response from\n"
-" %1$s"
+" %1$s%2$s"
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:262
@@ -156,63 +178,76 @@ msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:281
#, c-format
msgid ""
-"Your wallet (protocol version%1$s) might be outdated.%2$sThe exchange has a "
+"Your wallet (protocol version %1$s) might be outdated.%2$sThe exchange has a "
"higher, incompatible\n"
"protocol version (%3$s).\n"
-msgstr ""
+" "
+msgstr "plånboken tjänsteleverantörer"
#: src/webex/pages/confirm-create-reserve.tsx:292
#, c-format
msgid ""
-"The chosen exchange (protocol version%1$smight be outdated.%2$sThe exchange "
+"The chosen exchange (protocol version %1$smight be outdated.%2$sThe exchange "
"has a lower, incompatible\n"
-"protocol version than your wallet (protocol version%3$s).\n"
-msgstr ""
+"protocol version than your wallet (protocol version %3$s).\n"
+" "
+msgstr "tjänsteleverantörer plånboken"
#: src/webex/pages/confirm-create-reserve.tsx:311
#, c-format
msgid "Accept fees and withdraw"
-msgstr ""
+msgstr "Acceptera avgifter och utbetala"
#: src/webex/pages/confirm-create-reserve.tsx:316
#, c-format
msgid "Change Exchange Provider"
-msgstr ""
+msgstr "Ändra tjänsteleverantörer"
+
+#: src/webex/pages/confirm-create-reserve.tsx:337
+#, c-format
+msgid ""
+"Please select an exchange. You can review the details before after your "
+"selection."
+msgstr "tjänsteleverantörer"
#: src/webex/pages/confirm-create-reserve.tsx:343
+#: src/webex/pages/confirm-create-reserve.tsx:355
#, c-format
-msgid "Select%1$s"
-msgstr ""
+msgid "Select %1$s"
+msgstr "Välj %1$s"
-#: src/webex/pages/confirm-create-reserve.tsx:370
+#: src/webex/pages/confirm-create-reserve.tsx:372
#, c-format
-msgid "You are about to withdraw %1$s from your bank account into your wallet."
-msgstr ""
+msgid ""
+"You are about to withdraw\n"
+" %1$sfrom your bank account into your wallet.\n"
+" "
+msgstr "Du är på väg att ta ut\n %1$sfrån ditt bankkonto till din plånbok.\n"
-#: src/webex/pages/confirm-create-reserve.tsx:455
+#: src/webex/pages/confirm-create-reserve.tsx:457
#, c-format
msgid ""
"Oops, something went wrong. The wallet responded with error status (%1$s)."
-msgstr ""
+msgstr "plånboken"
-#: src/webex/pages/confirm-create-reserve.tsx:464
+#: src/webex/pages/confirm-create-reserve.tsx:466
#, c-format
msgid "Checking URL, please wait ..."
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:478
+#: src/webex/pages/confirm-create-reserve.tsx:480
#, c-format
msgid "Can't parse amount: %1$s"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:485
+#: src/webex/pages/confirm-create-reserve.tsx:487
#, c-format
msgid "Can't parse wire_types: %1$s"
msgstr ""
#. #-#-#-#-# - (PACKAGE VERSION) #-#-#-#-#
#. TODO:generic error reporting function or component.
-#: src/webex/pages/confirm-create-reserve.tsx:511 src/webex/pages/tip.tsx:180
+#: src/webex/pages/confirm-create-reserve.tsx:513 src/webex/pages/tip.tsx:180
#, c-format
msgid "Fatal error: \"%1$s\"."
msgstr ""
@@ -220,12 +255,12 @@ msgstr ""
#: src/webex/pages/popup.tsx:162
#, c-format
msgid "Balance"
-msgstr ""
+msgstr "Balans"
#: src/webex/pages/popup.tsx:165
#, c-format
msgid "History"
-msgstr ""
+msgstr "Historia"
#: src/webex/pages/popup.tsx:168
#, c-format
@@ -235,23 +270,28 @@ msgstr ""
#: src/webex/pages/popup.tsx:248
#, c-format
msgid "help"
-msgstr ""
+msgstr "hjälp"
#: src/webex/pages/popup.tsx:253
#, c-format
msgid ""
"You have no balance to show. Need some\n"
-" %1$s getting started?\n"
-msgstr ""
+" %1$s getting started?\n"
+" "
+msgstr "Du har ingen balans att visa. Behöver du\n %1$s att börja?\n"
#: src/webex/pages/popup.tsx:270
#, c-format
-msgid "%1$s incoming\n"
-msgstr ""
+msgid ""
+"%1$s incoming\n"
+" "
+msgstr "%1$s inkommande"
#: src/webex/pages/popup.tsx:283
#, c-format
-msgid "%1$s being spent\n"
+msgid ""
+"%1$s being spent\n"
+" "
msgstr ""
#: src/webex/pages/popup.tsx:310
@@ -262,12 +302,12 @@ msgstr ""
#: src/webex/pages/popup.tsx:337
#, c-format
msgid "Payback"
-msgstr ""
+msgstr "Återbetalning"
#: src/webex/pages/popup.tsx:338
#, c-format
msgid "Return Electronic Cash to Bank Account"
-msgstr ""
+msgstr "Återlämna elektroniska pengar till bank konto"
#: src/webex/pages/popup.tsx:339
#, c-format
@@ -278,44 +318,53 @@ msgstr ""
#, c-format
msgid ""
"Bank requested reserve (%1$s) for\n"
-" %2$s.\n"
+" %2$s.\n"
+" "
msgstr ""
#: src/webex/pages/popup.tsx:361
#, c-format
msgid ""
"Started to withdraw\n"
-" %1$s%2$sfrom%3$s(%4$s).\n"
+" %1$s%2$sfrom %3$s(%4$s).\n"
+" "
msgstr ""
#: src/webex/pages/popup.tsx:370
#, c-format
-msgid "Merchant%1$soffered%2$scontract%3$s.\n"
-msgstr ""
+msgid ""
+"Merchant %1$soffered%2$scontract %3$s.\n"
+" "
+msgstr "Säljaren %1$serbjöd%2$skontrakt %3%s.\n"
#: src/webex/pages/popup.tsx:381
#, c-format
-msgid "Withdrew%1$sfrom%2$s(%3$s).\n"
+msgid ""
+"Withdrew %1$sfrom %2$s(%3$s).\n"
+" "
msgstr ""
#: src/webex/pages/popup.tsx:391
#, c-format
msgid ""
-"Paid%1$sto merchant%2$s.\n"
-"%3$s(%4$s)\n"
+"Paid %1$sto merchant %2$s.\n"
+" %3$s(%4$s)\n"
+" "
msgstr ""
#: src/webex/pages/popup.tsx:401
#, c-format
-msgid "Merchant%1$sgave a refund over%2$s.\n"
-msgstr ""
+msgid ""
+"Merchant %1$sgave a refund over %2$s.\n"
+" "
+msgstr "Säljaren %1$sgav en återbetalning på %2$s.\n"
#: src/webex/pages/popup.tsx:411
#, c-format
msgid ""
-"Merchant%1$sgave\n"
-"a%2$sof%3$s.\n"
-"%4$s%5$s"
+"Merchant %1$sgave\n"
+"a %2$sof %3$s.\n"
+" %4$s%5$s"
msgstr ""
#: src/webex/pages/popup.tsx:421
@@ -331,27 +380,27 @@ msgstr ""
#: src/webex/pages/popup.tsx:489
#, c-format
msgid "Your wallet has no events recorded."
-msgstr ""
+msgstr "plånboken"
#: src/webex/pages/return-coins.tsx:105
#, c-format
msgid "Wire to bank account"
-msgstr ""
+msgstr "Övervisa till bank konto"
#: src/webex/pages/return-coins.tsx:173
#, c-format
msgid "Confirm"
-msgstr ""
+msgstr "Bekräfta"
#: src/webex/pages/return-coins.tsx:176
#, c-format
msgid "Cancel"
-msgstr ""
+msgstr "Avbryt"
#: src/webex/renderHtml.tsx:225
#, c-format
msgid "Withdrawal fees:"
-msgstr ""
+msgstr "Utbetalnings avgifter:"
#: src/webex/renderHtml.tsx:226
#, c-format
@@ -366,27 +415,27 @@ msgstr ""
#: src/webex/renderHtml.tsx:233
#, c-format
msgid "# Coins"
-msgstr ""
+msgstr "# Mynt"
#: src/webex/renderHtml.tsx:234
#, c-format
msgid "Value"
-msgstr ""
+msgstr "Värde"
#: src/webex/renderHtml.tsx:235
#, c-format
msgid "Withdraw Fee"
-msgstr ""
+msgstr "Utbetalnings avgift"
#: src/webex/renderHtml.tsx:236
#, c-format
msgid "Refresh Fee"
-msgstr ""
+msgstr "Återhämtnings avgift"
#: src/webex/renderHtml.tsx:237
#, c-format
msgid "Deposit Fee"
-msgstr ""
+msgstr "Depostitions avgift"
#: src/wire.ts:38
#, c-format
@@ -407,7 +456,3 @@ msgstr ""
#, c-format
msgid "Unknown Wire Detail"
msgstr ""
-
-#, fuzzy
-#~ 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"
diff --git a/src/i18n/taler-wallet-webex.pot b/src/i18n/taler-wallet-webex.pot
index a4bffb01..28ce37de 100644
--- a/src/i18n/taler-wallet-webex.pot
+++ b/src/i18n/taler-wallet-webex.pot
@@ -29,7 +29,9 @@ msgstr ""
#: src/webex/pages/confirm-contract.tsx:76
#, c-format
-msgid "show more details\n"
+msgid ""
+"show more details\n"
+" "
msgstr ""
#: src/webex/pages/confirm-contract.tsx:90
@@ -95,7 +97,21 @@ msgstr ""
#: src/webex/pages/confirm-contract.tsx:372
#, c-format
-msgid "The merchant%1$s offers you to purchase:\n"
+msgid ""
+"The merchant %1$soffers you to purchase:\n"
+" "
+msgstr ""
+
+#: src/webex/pages/confirm-contract.tsx:381
+#, c-format
+msgid ""
+"The total price is %1$s(plus %2$sfees).\n"
+" "
+msgstr ""
+
+#: src/webex/pages/confirm-contract.tsx:385
+#, c-format
+msgid "The total price is %1$s."
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:128
@@ -115,12 +131,16 @@ msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:210
#, c-format
-msgid "The exchange is trusted by the wallet.\n"
+msgid ""
+"The exchange is trusted by the wallet.\n"
+" "
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:216
#, c-format
-msgid "The exchange is audited by a trusted auditor.\n"
+msgid ""
+"The exchange is audited by a trusted auditor.\n"
+" "
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:222
@@ -129,21 +149,23 @@ msgid ""
"Warning: The exchange is neither directly trusted nor audited by a trusted "
"auditor.\n"
"If you withdraw from this exchange, it will be trusted in the future.\n"
+" "
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:231
#, c-format
msgid ""
-"Using exchange provider%1$s.\n"
+"Using exchange provider %1$s.\n"
"The exchange provider will charge\n"
-" %2$s in fees.\n"
+" %2$s%3$s%4$sin fees.\n"
+" "
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:245
#, c-format
msgid ""
"Waiting for a response from\n"
-" %1$s"
+" %1$s%2$s"
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:262
@@ -156,17 +178,19 @@ msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:281
#, c-format
msgid ""
-"Your wallet (protocol version%1$s) might be outdated.%2$sThe exchange has a "
+"Your wallet (protocol version %1$s) might be outdated.%2$sThe exchange has a "
"higher, incompatible\n"
"protocol version (%3$s).\n"
+" "
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:292
#, c-format
msgid ""
-"The chosen exchange (protocol version%1$smight be outdated.%2$sThe exchange "
+"The chosen exchange (protocol version %1$smight be outdated.%2$sThe exchange "
"has a lower, incompatible\n"
-"protocol version than your wallet (protocol version%3$s).\n"
+"protocol version than your wallet (protocol version %3$s).\n"
+" "
msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:311
@@ -179,40 +203,51 @@ msgstr ""
msgid "Change Exchange Provider"
msgstr ""
+#: src/webex/pages/confirm-create-reserve.tsx:337
+#, c-format
+msgid ""
+"Please select an exchange. You can review the details before after your "
+"selection."
+msgstr ""
+
#: src/webex/pages/confirm-create-reserve.tsx:343
+#: src/webex/pages/confirm-create-reserve.tsx:355
#, c-format
-msgid "Select%1$s"
+msgid "Select %1$s"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:370
+#: src/webex/pages/confirm-create-reserve.tsx:372
#, c-format
-msgid "You are about to withdraw %1$s from your bank account into your wallet."
+msgid ""
+"You are about to withdraw\n"
+" %1$sfrom your bank account into your wallet.\n"
+" "
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:455
+#: src/webex/pages/confirm-create-reserve.tsx:457
#, c-format
msgid ""
"Oops, something went wrong. The wallet responded with error status (%1$s)."
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:464
+#: src/webex/pages/confirm-create-reserve.tsx:466
#, c-format
msgid "Checking URL, please wait ..."
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:478
+#: src/webex/pages/confirm-create-reserve.tsx:480
#, c-format
msgid "Can't parse amount: %1$s"
msgstr ""
-#: src/webex/pages/confirm-create-reserve.tsx:485
+#: src/webex/pages/confirm-create-reserve.tsx:487
#, c-format
msgid "Can't parse wire_types: %1$s"
msgstr ""
#. #-#-#-#-# - (PACKAGE VERSION) #-#-#-#-#
#. TODO:generic error reporting function or component.
-#: src/webex/pages/confirm-create-reserve.tsx:511 src/webex/pages/tip.tsx:180
+#: src/webex/pages/confirm-create-reserve.tsx:513 src/webex/pages/tip.tsx:180
#, c-format
msgid "Fatal error: \"%1$s\"."
msgstr ""
@@ -241,17 +276,22 @@ msgstr ""
#, c-format
msgid ""
"You have no balance to show. Need some\n"
-" %1$s getting started?\n"
+" %1$s getting started?\n"
+" "
msgstr ""
#: src/webex/pages/popup.tsx:270
#, c-format
-msgid "%1$s incoming\n"
+msgid ""
+"%1$s incoming\n"
+" "
msgstr ""
#: src/webex/pages/popup.tsx:283
#, c-format
-msgid "%1$s being spent\n"
+msgid ""
+"%1$s being spent\n"
+" "
msgstr ""
#: src/webex/pages/popup.tsx:310
@@ -278,44 +318,53 @@ msgstr ""
#, c-format
msgid ""
"Bank requested reserve (%1$s) for\n"
-" %2$s.\n"
+" %2$s.\n"
+" "
msgstr ""
#: src/webex/pages/popup.tsx:361
#, c-format
msgid ""
"Started to withdraw\n"
-" %1$s%2$sfrom%3$s(%4$s).\n"
+" %1$s%2$sfrom %3$s(%4$s).\n"
+" "
msgstr ""
#: src/webex/pages/popup.tsx:370
#, c-format
-msgid "Merchant%1$soffered%2$scontract%3$s.\n"
+msgid ""
+"Merchant %1$soffered%2$scontract %3$s.\n"
+" "
msgstr ""
#: src/webex/pages/popup.tsx:381
#, c-format
-msgid "Withdrew%1$sfrom%2$s(%3$s).\n"
+msgid ""
+"Withdrew %1$sfrom %2$s(%3$s).\n"
+" "
msgstr ""
#: src/webex/pages/popup.tsx:391
#, c-format
msgid ""
-"Paid%1$sto merchant%2$s.\n"
-"%3$s(%4$s)\n"
+"Paid %1$sto merchant %2$s.\n"
+" %3$s(%4$s)\n"
+" "
msgstr ""
#: src/webex/pages/popup.tsx:401
#, c-format
-msgid "Merchant%1$sgave a refund over%2$s.\n"
+msgid ""
+"Merchant %1$sgave a refund over %2$s.\n"
+" "
msgstr ""
#: src/webex/pages/popup.tsx:411
#, c-format
msgid ""
-"Merchant%1$sgave\n"
-"a%2$sof%3$s.\n"
-"%4$s%5$s"
+"Merchant %1$sgave\n"
+"a %2$sof %3$s.\n"
+" %4$s%5$s"
msgstr ""
#: src/webex/pages/popup.tsx:421
diff --git a/src/webex/pages/confirm-contract.tsx
b/src/webex/pages/confirm-contract.tsx
index 0aaed483..24e08aec 100644
--- a/src/webex/pages/confirm-contract.tsx
+++ b/src/webex/pages/confirm-contract.tsx
@@ -370,8 +370,7 @@ class ContractPrompt extends
React.Component<ContractPromptProps, ContractPrompt
return (
<div>
<i18n.Translate wrap="p">
- The merchant <span>{merchantName}</span> {" "}
- offers you to purchase:
+ The merchant <span>{merchantName} </span> offers you to purchase:
</i18n.Translate>
<div style={{"text-align": "center"}}>
<strong>{c.summary}</strong>
@@ -379,12 +378,12 @@ class ContractPrompt extends
React.Component<ContractPromptProps, ContractPrompt
<strong></strong>
{products}
{(this.state.payStatus && this.state.payStatus.coinSelection)
- ? <p>
- The total price is <span>{amount}</span>{" "}
+ ? <i18n.Translate wrap="p">
+ The total price is <span>{amount} </span>
(plus
<span>{renderAmount(this.state.payStatus.coinSelection.totalFees)}</span> fees).
- </p>
+ </i18n.Translate>
:
- <p>The total price is <span>{amount}</span>.</p>
+ <i18n.Translate wrap="p">The total price is
<span>{amount}</span>.</i18n.Translate>
}
{ this.state.confirmPayError
? PayErrorDialog()
diff --git a/src/webex/pages/confirm-create-reserve.tsx
b/src/webex/pages/confirm-create-reserve.tsx
index 3c5bb575..7a754374 100644
--- a/src/webex/pages/confirm-create-reserve.tsx
+++ b/src/webex/pages/confirm-create-reserve.tsx
@@ -231,9 +231,9 @@ class ExchangeSelection extends
ImplicitStateComponent<ExchangeSelectionProps> {
<i18n.Translate wrap="p">
Using exchange provider <strong>{this.url()}</strong>.
The exchange provider will charge
- {" "}
+ <span> </span>
<span>{renderAmount(totalCost)}</span>
- {" "}
+ <span> </span>
in fees.
</i18n.Translate>
{trustMessage}
@@ -245,7 +245,7 @@ class ExchangeSelection extends
ImplicitStateComponent<ExchangeSelectionProps> {
return (
<i18n.Translate wrap="p">
Waiting for a response from
- {" "}
+ <span> </span>
<em>{shortName}</em>
</i18n.Translate>
);
@@ -334,7 +334,7 @@ class ExchangeSelection extends
ImplicitStateComponent<ExchangeSelectionProps> {
console.log(exchanges);
return (
<div>
- i18n.str`Please select an exchange. You can review the details before
after your selection.`
+ {i18n.str`Please select an exchange. You can review the details
before after your selection.`}
{this.props.suggestedExchangeUrl && (
<div>
@@ -352,7 +352,9 @@ class ExchangeSelection extends
ImplicitStateComponent<ExchangeSelectionProps> {
<h2>Known Exchanges</h2>
{exchanges.map((e) => (
<button key={e.baseUrl} className="pure-button button-success"
onClick={() => this.select(e.baseUrl)}>
- Select <strong>{e.baseUrl}</strong>
+ <i18n.Translate>
+ Select <strong>{e.baseUrl}</strong>
+ </i18n.Translate>
</button>
))}
</div>
@@ -368,9 +370,9 @@ class ExchangeSelection extends
ImplicitStateComponent<ExchangeSelectionProps> {
return (
<div>
<i18n.Translate wrap="p">
- {"You are about to withdraw "}
+ You are about to withdraw
<strong>{renderAmount(this.props.amount)}</strong>
- {" from your bank account into your wallet."}
+ from your bank account into your wallet.
</i18n.Translate>
{this.selectingExchange() ? this.renderSelect() : this.renderConfirm()}
</div>
diff --git a/tooling/pogen/pogen.js b/tooling/pogen/pogen.js
index 03cc0c34..787a7ec7 100644
--- a/tooling/pogen/pogen.js
+++ b/tooling/pogen/pogen.js
@@ -188,7 +188,14 @@ function processFile(sourceFile) {
case ts.SyntaxKind.JsxText:
{
var e = childNode;
- var t = e.getText().split("\n").map(trim).join("\n");
+ var s = e.getText();
+ var t = s.split("\n").map(trim).join("\n");
+ if (s.length >= 1 && (s[0] === "\n" || s[0] === " ")) {
+ t = " " + t;
+ }
+ if (s.length >= 1 && (s[s.length - 1] === "\n" ||
s[s.length - 1] === " ")) {
+ t = t + " ";
+ }
fragments.push(t);
}
case ts.SyntaxKind.JsxOpeningElement:
diff --git a/tooling/pogen/pogen.ts b/tooling/pogen/pogen.ts
index 5721b571..0903b9db 100644
--- a/tooling/pogen/pogen.ts
+++ b/tooling/pogen/pogen.ts
@@ -211,7 +211,14 @@ export function processFile(sourceFile: ts.SourceFile) {
case ts.SyntaxKind.JsxText:
{
let e = childNode as ts.JsxText;
- let t = e.getText().split("\n").map(trim).join("\n");
+ let s = e.getText();
+ let t = s.split("\n").map(trim).join("\n");
+ if (s.length >= 1 && (s[0] === "\n" || s[0] === " ")) {
+ t = " " + t;
+ }
+ if (s.length >= 1 && (s[s.length-1] === "\n" || s[s.length-1] === "
")) {
+ t = t + " ";
+ }
fragments.push(t);
}
case ts.SyntaxKind.JsxOpeningElement:
--
To stop receiving notification emails like this one, please contact
address@hidden