diff options
| -rw-r--r-- | node_modules/pogen/pogen.js | 13 | ||||
| -rw-r--r-- | src/i18n.tsx | 6 | ||||
| -rw-r--r-- | src/i18n/de.po | 161 | ||||
| -rw-r--r-- | src/i18n/en-US.po | 149 | ||||
| -rw-r--r-- | src/i18n/fr.po | 149 | ||||
| -rw-r--r-- | src/i18n/it.po | 149 | ||||
| -rw-r--r-- | src/i18n/strings.ts | 448 | ||||
| -rw-r--r-- | src/i18n/sv.po | 193 | ||||
| -rw-r--r-- | src/i18n/taler-wallet-webex.pot | 149 | ||||
| -rw-r--r-- | src/webex/pages/confirm-create-reserve.tsx | 6 | ||||
| -rw-r--r-- | src/webex/pages/popup.tsx | 19 | ||||
| -rw-r--r-- | tooling/pogen/pogen.js | 12 | ||||
| -rw-r--r-- | tooling/pogen/pogen.ts | 12 |
13 files changed, 747 insertions, 719 deletions
diff --git a/node_modules/pogen/pogen.js b/node_modules/pogen/pogen.js index 1a0c49bf1..ed634ef0d 100644 --- a/node_modules/pogen/pogen.js +++ b/node_modules/pogen/pogen.js @@ -188,15 +188,8 @@ function processFile(sourceFile) { case ts.SyntaxKind.JsxText: { var e = childNode; - 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)); + var s = e.getFullText(); + var t = s.split("\n").map(trim).join(" "); fragments.push(t); } case ts.SyntaxKind.JsxOpeningElement: @@ -219,7 +212,7 @@ function processFile(sourceFile) { } }; ts.forEachChild(node, process); - return fragments.join(""); + return fragments.join("").trim().replace(/ +/g, " "); } function getJsxSingular(node) { var res; diff --git a/src/i18n.tsx b/src/i18n.tsx index cbc687090..540e3a9d2 100644 --- a/src/i18n.tsx +++ b/src/i18n.tsx @@ -41,6 +41,8 @@ if (!strings[lang]) { console.log(`language ${lang} not found, defaulting to english`); } +lang = "sv"; + const jed = new jedLib.Jed(strings[lang]); @@ -82,7 +84,9 @@ function stringifyChildren(children: any): string { } return `%${n++}$s`; }); - return ss.join(""); + const s = ss.join("").replace(/ +/g, " ").trim(); + console.log("translation lookup", JSON.stringify(s)); + return s; } diff --git a/src/i18n/de.po b/src/i18n/de.po index fce578619..172f8f118 100644 --- a/src/i18n/de.po +++ b/src/i18n/de.po @@ -29,9 +29,7 @@ msgstr "" #: src/webex/pages/confirm-contract.tsx:76 #, c-format -msgid "" -"show more details\n" -" " +msgid "show more details" msgstr "" #: src/webex/pages/confirm-contract.tsx:90 @@ -76,9 +74,9 @@ msgid "" msgstr "" #: src/webex/pages/confirm-contract.tsx:355 -#, c-format +#, fuzzy, c-format msgid "Aborting payment ..." -msgstr "" +msgstr "Bezahlung bestätigen" #: src/webex/pages/confirm-contract.tsx:357 #, c-format @@ -86,9 +84,9 @@ msgid "Payment aborted!" msgstr "" #: src/webex/pages/confirm-contract.tsx:360 -#, c-format +#, fuzzy, c-format msgid "Retry Payment" -msgstr "" +msgstr "Bezahlung bestätigen" #: src/webex/pages/confirm-contract.tsx:363 #, fuzzy, c-format @@ -96,22 +94,18 @@ msgid "Abort Payment" msgstr "Bezahlung bestätigen" #: src/webex/pages/confirm-contract.tsx:372 -#, c-format -msgid "" -"The merchant %1$soffers you to purchase:\n" -" " -msgstr "" +#, fuzzy, c-format +msgid "The merchant%1$soffers you to purchase:" +msgstr "Der Händler %1$s möchte einen Vertrag über %2$s mit Ihnen abschließen." #: src/webex/pages/confirm-contract.tsx:381 #, c-format -msgid "" -"The total price is %1$s(plus %2$sfees).\n" -" " +msgid "The total price is%1$s (plus%2$sfees)." msgstr "" #: src/webex/pages/confirm-contract.tsx:385 #, c-format -msgid "The total price is %1$s." +msgid "The total price is%1$s." msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:128 @@ -131,123 +125,107 @@ 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." 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." msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:222 #, c-format 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" -" " +"Warning: The exchange is neither directly trusted nor audited by a trusted " +"auditor. If you withdraw from this exchange, it will be trusted in the " +"future." msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:231 #, c-format msgid "" -"Using exchange provider %1$s.\n" -"The exchange provider will charge\n" -" %2$s%3$s%4$sin fees.\n" -" " +"Using exchange provider%1$s. The exchange provider will charge %2$s in fees." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:245 +#: src/webex/pages/confirm-create-reserve.tsx:243 #, c-format -msgid "" -"Waiting for a response from\n" -" %1$s%2$s" +msgid "Waiting for a response from %1$s %2$s" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:262 +#: src/webex/pages/confirm-create-reserve.tsx:260 #, c-format msgid "" "Information about fees will be available when an exchange provider is " "selected." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:281 +#: src/webex/pages/confirm-create-reserve.tsx:279 #, c-format msgid "" -"Your wallet (protocol version %1$s) might be outdated.%2$sThe exchange has a " -"higher, incompatible\n" -"protocol version (%3$s).\n" -" " +"Your wallet (protocol version%1$s) might be outdated.%2$s The exchange has a " +"higher, incompatible protocol version (%3$s)." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:292 +#: src/webex/pages/confirm-create-reserve.tsx:290 #, c-format msgid "" -"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" -" " +"The chosen exchange (protocol version%1$smight be outdated.%2$s The exchange " +"has a lower, incompatible protocol version than your wallet (protocol version" +"%3$s)." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:311 +#: src/webex/pages/confirm-create-reserve.tsx:309 #, c-format msgid "Accept fees and withdraw" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:316 +#: src/webex/pages/confirm-create-reserve.tsx:314 #, c-format msgid "Change Exchange Provider" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:337 +#: src/webex/pages/confirm-create-reserve.tsx:335 #, 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 +#: src/webex/pages/confirm-create-reserve.tsx:341 +#: src/webex/pages/confirm-create-reserve.tsx:353 #, c-format -msgid "Select %1$s" +msgid "Select%1$s" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:372 +#: src/webex/pages/confirm-create-reserve.tsx:370 #, c-format -msgid "" -"You are about to withdraw\n" -" %1$sfrom your bank account into your wallet.\n" -" " +msgid "You are about to withdraw %1$s from your bank account into your wallet." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:457 +#: src/webex/pages/confirm-create-reserve.tsx:455 #, c-format msgid "" "Oops, something went wrong. The wallet responded with error status (%1$s)." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:466 +#: src/webex/pages/confirm-create-reserve.tsx:464 #, c-format msgid "Checking URL, please wait ..." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:480 +#: src/webex/pages/confirm-create-reserve.tsx:478 #, c-format msgid "Can't parse amount: %1$s" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:487 +#: src/webex/pages/confirm-create-reserve.tsx:485 #, 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:513 src/webex/pages/tip.tsx:180 +#: src/webex/pages/confirm-create-reserve.tsx:511 src/webex/pages/tip.tsx:180 #, c-format msgid "Fatal error: \"%1$s\"." msgstr "" @@ -274,24 +252,17 @@ msgstr "" #: src/webex/pages/popup.tsx:253 #, fuzzy, c-format -msgid "" -"You have no balance to show. Need some\n" -" %1$s getting started?\n" -" " +msgid "You have no balance to show. Need some %1$s getting started?" 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" msgstr "" #: src/webex/pages/popup.tsx:283 #, c-format -msgid "" -"%1$s being spent\n" -" " +msgid "%1$s being spent" msgstr "" #: src/webex/pages/popup.tsx:310 @@ -316,25 +287,17 @@ msgstr "" #: src/webex/pages/popup.tsx:351 #, fuzzy, c-format -msgid "" -"Bank requested reserve (%1$s) for\n" -" %2$s.\n" -" " +msgid "Bank requested reserve (%1$s) for %2$s." 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" -" " +msgid "Started to withdraw %1$s from%2$s(%3$s)." 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 contract%2$s." msgstr "" "%1$s\n" " möchte einen Vertrag über %2$s\n" @@ -342,51 +305,51 @@ 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)." 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" -" " +msgid "Paid%1$sto merchant%2$s. %3$s (%4$s)" msgstr "Reserve (%1$s) mit %2$s bei %3$s erzeugt" #: src/webex/pages/popup.tsx:401 #, fuzzy, c-format -msgid "" -"Merchant %1$sgave a refund over %2$s.\n" -" " +msgid "Merchant%1$sgave a refund over%2$s." msgstr "" "%1$s\n" " möchte einen Vertrag über %2$s\n" " mit Ihnen abschließen." #: src/webex/pages/popup.tsx:411 +#, c-format +msgid "tip" +msgstr "" + +#: src/webex/pages/popup.tsx:414 #, fuzzy, c-format -msgid "" -"Merchant %1$sgave\n" -"a %2$sof %3$s.\n" -" %4$s%5$s" +msgid "Merchant%1$sgave a%2$sof%3$s." msgstr "" "%1$s\n" " möchte einen Vertrag über %2$s\n" " mit Ihnen abschließen." -#: src/webex/pages/popup.tsx:421 +#: src/webex/pages/popup.tsx:419 +#, c-format +msgid "You did not accept the tip yet." +msgstr "" + +#: src/webex/pages/popup.tsx:424 #, c-format msgid "Unknown event (%1$s)" msgstr "" -#: src/webex/pages/popup.tsx:464 +#: src/webex/pages/popup.tsx:467 #, c-format msgid "Error: could not retrieve event history" msgstr "" -#: src/webex/pages/popup.tsx:489 +#: src/webex/pages/popup.tsx:492 #, c-format msgid "Your wallet has no events recorded." msgstr "Ihre Geldbörse verzeichnet keine Vorkommnisse." diff --git a/src/i18n/en-US.po b/src/i18n/en-US.po index b903c00d0..5ca2bea75 100644 --- a/src/i18n/en-US.po +++ b/src/i18n/en-US.po @@ -29,9 +29,7 @@ msgstr "" #: src/webex/pages/confirm-contract.tsx:76 #, c-format -msgid "" -"show more details\n" -" " +msgid "show more details" msgstr "" #: src/webex/pages/confirm-contract.tsx:90 @@ -97,21 +95,17 @@ msgstr "" #: src/webex/pages/confirm-contract.tsx:372 #, c-format -msgid "" -"The merchant %1$soffers you to purchase:\n" -" " +msgid "The merchant%1$soffers you to purchase:" msgstr "" #: src/webex/pages/confirm-contract.tsx:381 #, c-format -msgid "" -"The total price is %1$s(plus %2$sfees).\n" -" " +msgid "The total price is%1$s (plus%2$sfees)." msgstr "" #: src/webex/pages/confirm-contract.tsx:385 #, c-format -msgid "The total price is %1$s." +msgid "The total price is%1$s." msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:128 @@ -131,123 +125,107 @@ 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." 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." msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:222 #, c-format 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" -" " +"Warning: The exchange is neither directly trusted nor audited by a trusted " +"auditor. If you withdraw from this exchange, it will be trusted in the " +"future." msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:231 #, c-format msgid "" -"Using exchange provider %1$s.\n" -"The exchange provider will charge\n" -" %2$s%3$s%4$sin fees.\n" -" " +"Using exchange provider%1$s. The exchange provider will charge %2$s in fees." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:245 +#: src/webex/pages/confirm-create-reserve.tsx:243 #, c-format -msgid "" -"Waiting for a response from\n" -" %1$s%2$s" +msgid "Waiting for a response from %1$s %2$s" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:262 +#: src/webex/pages/confirm-create-reserve.tsx:260 #, c-format msgid "" "Information about fees will be available when an exchange provider is " "selected." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:281 +#: src/webex/pages/confirm-create-reserve.tsx:279 #, c-format msgid "" -"Your wallet (protocol version %1$s) might be outdated.%2$sThe exchange has a " -"higher, incompatible\n" -"protocol version (%3$s).\n" -" " +"Your wallet (protocol version%1$s) might be outdated.%2$s The exchange has a " +"higher, incompatible protocol version (%3$s)." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:292 +#: src/webex/pages/confirm-create-reserve.tsx:290 #, c-format msgid "" -"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" -" " +"The chosen exchange (protocol version%1$smight be outdated.%2$s The exchange " +"has a lower, incompatible protocol version than your wallet (protocol version" +"%3$s)." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:311 +#: src/webex/pages/confirm-create-reserve.tsx:309 #, c-format msgid "Accept fees and withdraw" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:316 +#: src/webex/pages/confirm-create-reserve.tsx:314 #, c-format msgid "Change Exchange Provider" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:337 +#: src/webex/pages/confirm-create-reserve.tsx:335 #, 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 +#: src/webex/pages/confirm-create-reserve.tsx:341 +#: src/webex/pages/confirm-create-reserve.tsx:353 #, c-format -msgid "Select %1$s" +msgid "Select%1$s" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:372 +#: src/webex/pages/confirm-create-reserve.tsx:370 #, c-format -msgid "" -"You are about to withdraw\n" -" %1$sfrom your bank account into your wallet.\n" -" " +msgid "You are about to withdraw %1$s from your bank account into your wallet." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:457 +#: src/webex/pages/confirm-create-reserve.tsx:455 #, c-format msgid "" "Oops, something went wrong. The wallet responded with error status (%1$s)." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:466 +#: src/webex/pages/confirm-create-reserve.tsx:464 #, c-format msgid "Checking URL, please wait ..." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:480 +#: src/webex/pages/confirm-create-reserve.tsx:478 #, c-format msgid "Can't parse amount: %1$s" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:487 +#: src/webex/pages/confirm-create-reserve.tsx:485 #, 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:513 src/webex/pages/tip.tsx:180 +#: src/webex/pages/confirm-create-reserve.tsx:511 src/webex/pages/tip.tsx:180 #, c-format msgid "Fatal error: \"%1$s\"." msgstr "" @@ -274,24 +252,17 @@ msgstr "" #: src/webex/pages/popup.tsx:253 #, c-format -msgid "" -"You have no balance to show. Need some\n" -" %1$s getting started?\n" -" " +msgid "You have no balance to show. Need some %1$s getting started?" msgstr "" #: src/webex/pages/popup.tsx:270 #, c-format -msgid "" -"%1$s incoming\n" -" " +msgid "%1$s incoming" msgstr "" #: src/webex/pages/popup.tsx:283 #, c-format -msgid "" -"%1$s being spent\n" -" " +msgid "%1$s being spent" msgstr "" #: src/webex/pages/popup.tsx:310 @@ -316,68 +287,60 @@ msgstr "" #: src/webex/pages/popup.tsx:351 #, c-format -msgid "" -"Bank requested reserve (%1$s) for\n" -" %2$s.\n" -" " +msgid "Bank requested reserve (%1$s) for %2$s." msgstr "" #: src/webex/pages/popup.tsx:361 #, c-format -msgid "" -"Started to withdraw\n" -" %1$s%2$sfrom %3$s(%4$s).\n" -" " +msgid "Started to withdraw %1$s from%2$s(%3$s)." msgstr "" #: src/webex/pages/popup.tsx:370 #, c-format -msgid "" -"Merchant %1$soffered%2$scontract %3$s.\n" -" " +msgid "Merchant%1$soffered contract%2$s." 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)." msgstr "" #: src/webex/pages/popup.tsx:391 #, c-format -msgid "" -"Paid %1$sto merchant %2$s.\n" -" %3$s(%4$s)\n" -" " +msgid "Paid%1$sto merchant%2$s. %3$s (%4$s)" 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." msgstr "" #: src/webex/pages/popup.tsx:411 #, c-format -msgid "" -"Merchant %1$sgave\n" -"a %2$sof %3$s.\n" -" %4$s%5$s" +msgid "tip" +msgstr "" + +#: src/webex/pages/popup.tsx:414 +#, c-format +msgid "Merchant%1$sgave a%2$sof%3$s." +msgstr "" + +#: src/webex/pages/popup.tsx:419 +#, c-format +msgid "You did not accept the tip yet." msgstr "" -#: src/webex/pages/popup.tsx:421 +#: src/webex/pages/popup.tsx:424 #, c-format msgid "Unknown event (%1$s)" msgstr "" -#: src/webex/pages/popup.tsx:464 +#: src/webex/pages/popup.tsx:467 #, c-format msgid "Error: could not retrieve event history" msgstr "" -#: src/webex/pages/popup.tsx:489 +#: src/webex/pages/popup.tsx:492 #, c-format msgid "Your wallet has no events recorded." msgstr "" diff --git a/src/i18n/fr.po b/src/i18n/fr.po index 28ce37de4..38f817fae 100644 --- a/src/i18n/fr.po +++ b/src/i18n/fr.po @@ -29,9 +29,7 @@ msgstr "" #: src/webex/pages/confirm-contract.tsx:76 #, c-format -msgid "" -"show more details\n" -" " +msgid "show more details" msgstr "" #: src/webex/pages/confirm-contract.tsx:90 @@ -97,21 +95,17 @@ msgstr "" #: src/webex/pages/confirm-contract.tsx:372 #, c-format -msgid "" -"The merchant %1$soffers you to purchase:\n" -" " +msgid "The merchant%1$soffers you to purchase:" msgstr "" #: src/webex/pages/confirm-contract.tsx:381 #, c-format -msgid "" -"The total price is %1$s(plus %2$sfees).\n" -" " +msgid "The total price is%1$s (plus%2$sfees)." msgstr "" #: src/webex/pages/confirm-contract.tsx:385 #, c-format -msgid "The total price is %1$s." +msgid "The total price is%1$s." msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:128 @@ -131,123 +125,107 @@ 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." 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." msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:222 #, c-format 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" -" " +"Warning: The exchange is neither directly trusted nor audited by a trusted " +"auditor. If you withdraw from this exchange, it will be trusted in the " +"future." msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:231 #, c-format msgid "" -"Using exchange provider %1$s.\n" -"The exchange provider will charge\n" -" %2$s%3$s%4$sin fees.\n" -" " +"Using exchange provider%1$s. The exchange provider will charge %2$s in fees." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:245 +#: src/webex/pages/confirm-create-reserve.tsx:243 #, c-format -msgid "" -"Waiting for a response from\n" -" %1$s%2$s" +msgid "Waiting for a response from %1$s %2$s" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:262 +#: src/webex/pages/confirm-create-reserve.tsx:260 #, c-format msgid "" "Information about fees will be available when an exchange provider is " "selected." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:281 +#: src/webex/pages/confirm-create-reserve.tsx:279 #, c-format msgid "" -"Your wallet (protocol version %1$s) might be outdated.%2$sThe exchange has a " -"higher, incompatible\n" -"protocol version (%3$s).\n" -" " +"Your wallet (protocol version%1$s) might be outdated.%2$s The exchange has a " +"higher, incompatible protocol version (%3$s)." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:292 +#: src/webex/pages/confirm-create-reserve.tsx:290 #, c-format msgid "" -"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" -" " +"The chosen exchange (protocol version%1$smight be outdated.%2$s The exchange " +"has a lower, incompatible protocol version than your wallet (protocol version" +"%3$s)." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:311 +#: src/webex/pages/confirm-create-reserve.tsx:309 #, c-format msgid "Accept fees and withdraw" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:316 +#: src/webex/pages/confirm-create-reserve.tsx:314 #, c-format msgid "Change Exchange Provider" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:337 +#: src/webex/pages/confirm-create-reserve.tsx:335 #, 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 +#: src/webex/pages/confirm-create-reserve.tsx:341 +#: src/webex/pages/confirm-create-reserve.tsx:353 #, c-format -msgid "Select %1$s" +msgid "Select%1$s" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:372 +#: src/webex/pages/confirm-create-reserve.tsx:370 #, c-format -msgid "" -"You are about to withdraw\n" -" %1$sfrom your bank account into your wallet.\n" -" " +msgid "You are about to withdraw %1$s from your bank account into your wallet." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:457 +#: src/webex/pages/confirm-create-reserve.tsx:455 #, c-format msgid "" "Oops, something went wrong. The wallet responded with error status (%1$s)." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:466 +#: src/webex/pages/confirm-create-reserve.tsx:464 #, c-format msgid "Checking URL, please wait ..." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:480 +#: src/webex/pages/confirm-create-reserve.tsx:478 #, c-format msgid "Can't parse amount: %1$s" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:487 +#: src/webex/pages/confirm-create-reserve.tsx:485 #, 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:513 src/webex/pages/tip.tsx:180 +#: src/webex/pages/confirm-create-reserve.tsx:511 src/webex/pages/tip.tsx:180 #, c-format msgid "Fatal error: \"%1$s\"." msgstr "" @@ -274,24 +252,17 @@ msgstr "" #: src/webex/pages/popup.tsx:253 #, c-format -msgid "" -"You have no balance to show. Need some\n" -" %1$s getting started?\n" -" " +msgid "You have no balance to show. Need some %1$s getting started?" msgstr "" #: src/webex/pages/popup.tsx:270 #, c-format -msgid "" -"%1$s incoming\n" -" " +msgid "%1$s incoming" msgstr "" #: src/webex/pages/popup.tsx:283 #, c-format -msgid "" -"%1$s being spent\n" -" " +msgid "%1$s being spent" msgstr "" #: src/webex/pages/popup.tsx:310 @@ -316,68 +287,60 @@ msgstr "" #: src/webex/pages/popup.tsx:351 #, c-format -msgid "" -"Bank requested reserve (%1$s) for\n" -" %2$s.\n" -" " +msgid "Bank requested reserve (%1$s) for %2$s." msgstr "" #: src/webex/pages/popup.tsx:361 #, c-format -msgid "" -"Started to withdraw\n" -" %1$s%2$sfrom %3$s(%4$s).\n" -" " +msgid "Started to withdraw %1$s from%2$s(%3$s)." msgstr "" #: src/webex/pages/popup.tsx:370 #, c-format -msgid "" -"Merchant %1$soffered%2$scontract %3$s.\n" -" " +msgid "Merchant%1$soffered contract%2$s." 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)." msgstr "" #: src/webex/pages/popup.tsx:391 #, c-format -msgid "" -"Paid %1$sto merchant %2$s.\n" -" %3$s(%4$s)\n" -" " +msgid "Paid%1$sto merchant%2$s. %3$s (%4$s)" 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." msgstr "" #: src/webex/pages/popup.tsx:411 #, c-format -msgid "" -"Merchant %1$sgave\n" -"a %2$sof %3$s.\n" -" %4$s%5$s" +msgid "tip" +msgstr "" + +#: src/webex/pages/popup.tsx:414 +#, c-format +msgid "Merchant%1$sgave a%2$sof%3$s." +msgstr "" + +#: src/webex/pages/popup.tsx:419 +#, c-format +msgid "You did not accept the tip yet." msgstr "" -#: src/webex/pages/popup.tsx:421 +#: src/webex/pages/popup.tsx:424 #, c-format msgid "Unknown event (%1$s)" msgstr "" -#: src/webex/pages/popup.tsx:464 +#: src/webex/pages/popup.tsx:467 #, c-format msgid "Error: could not retrieve event history" msgstr "" -#: src/webex/pages/popup.tsx:489 +#: src/webex/pages/popup.tsx:492 #, c-format msgid "Your wallet has no events recorded." msgstr "" diff --git a/src/i18n/it.po b/src/i18n/it.po index 28ce37de4..38f817fae 100644 --- a/src/i18n/it.po +++ b/src/i18n/it.po @@ -29,9 +29,7 @@ msgstr "" #: src/webex/pages/confirm-contract.tsx:76 #, c-format -msgid "" -"show more details\n" -" " +msgid "show more details" msgstr "" #: src/webex/pages/confirm-contract.tsx:90 @@ -97,21 +95,17 @@ msgstr "" #: src/webex/pages/confirm-contract.tsx:372 #, c-format -msgid "" -"The merchant %1$soffers you to purchase:\n" -" " +msgid "The merchant%1$soffers you to purchase:" msgstr "" #: src/webex/pages/confirm-contract.tsx:381 #, c-format -msgid "" -"The total price is %1$s(plus %2$sfees).\n" -" " +msgid "The total price is%1$s (plus%2$sfees)." msgstr "" #: src/webex/pages/confirm-contract.tsx:385 #, c-format -msgid "The total price is %1$s." +msgid "The total price is%1$s." msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:128 @@ -131,123 +125,107 @@ 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." 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." msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:222 #, c-format 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" -" " +"Warning: The exchange is neither directly trusted nor audited by a trusted " +"auditor. If you withdraw from this exchange, it will be trusted in the " +"future." msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:231 #, c-format msgid "" -"Using exchange provider %1$s.\n" -"The exchange provider will charge\n" -" %2$s%3$s%4$sin fees.\n" -" " +"Using exchange provider%1$s. The exchange provider will charge %2$s in fees." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:245 +#: src/webex/pages/confirm-create-reserve.tsx:243 #, c-format -msgid "" -"Waiting for a response from\n" -" %1$s%2$s" +msgid "Waiting for a response from %1$s %2$s" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:262 +#: src/webex/pages/confirm-create-reserve.tsx:260 #, c-format msgid "" "Information about fees will be available when an exchange provider is " "selected." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:281 +#: src/webex/pages/confirm-create-reserve.tsx:279 #, c-format msgid "" -"Your wallet (protocol version %1$s) might be outdated.%2$sThe exchange has a " -"higher, incompatible\n" -"protocol version (%3$s).\n" -" " +"Your wallet (protocol version%1$s) might be outdated.%2$s The exchange has a " +"higher, incompatible protocol version (%3$s)." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:292 +#: src/webex/pages/confirm-create-reserve.tsx:290 #, c-format msgid "" -"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" -" " +"The chosen exchange (protocol version%1$smight be outdated.%2$s The exchange " +"has a lower, incompatible protocol version than your wallet (protocol version" +"%3$s)." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:311 +#: src/webex/pages/confirm-create-reserve.tsx:309 #, c-format msgid "Accept fees and withdraw" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:316 +#: src/webex/pages/confirm-create-reserve.tsx:314 #, c-format msgid "Change Exchange Provider" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:337 +#: src/webex/pages/confirm-create-reserve.tsx:335 #, 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 +#: src/webex/pages/confirm-create-reserve.tsx:341 +#: src/webex/pages/confirm-create-reserve.tsx:353 #, c-format -msgid "Select %1$s" +msgid "Select%1$s" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:372 +#: src/webex/pages/confirm-create-reserve.tsx:370 #, c-format -msgid "" -"You are about to withdraw\n" -" %1$sfrom your bank account into your wallet.\n" -" " +msgid "You are about to withdraw %1$s from your bank account into your wallet." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:457 +#: src/webex/pages/confirm-create-reserve.tsx:455 #, c-format msgid "" "Oops, something went wrong. The wallet responded with error status (%1$s)." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:466 +#: src/webex/pages/confirm-create-reserve.tsx:464 #, c-format msgid "Checking URL, please wait ..." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:480 +#: src/webex/pages/confirm-create-reserve.tsx:478 #, c-format msgid "Can't parse amount: %1$s" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:487 +#: src/webex/pages/confirm-create-reserve.tsx:485 #, 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:513 src/webex/pages/tip.tsx:180 +#: src/webex/pages/confirm-create-reserve.tsx:511 src/webex/pages/tip.tsx:180 #, c-format msgid "Fatal error: \"%1$s\"." msgstr "" @@ -274,24 +252,17 @@ msgstr "" #: src/webex/pages/popup.tsx:253 #, c-format -msgid "" -"You have no balance to show. Need some\n" -" %1$s getting started?\n" -" " +msgid "You have no balance to show. Need some %1$s getting started?" msgstr "" #: src/webex/pages/popup.tsx:270 #, c-format -msgid "" -"%1$s incoming\n" -" " +msgid "%1$s incoming" msgstr "" #: src/webex/pages/popup.tsx:283 #, c-format -msgid "" -"%1$s being spent\n" -" " +msgid "%1$s being spent" msgstr "" #: src/webex/pages/popup.tsx:310 @@ -316,68 +287,60 @@ msgstr "" #: src/webex/pages/popup.tsx:351 #, c-format -msgid "" -"Bank requested reserve (%1$s) for\n" -" %2$s.\n" -" " +msgid "Bank requested reserve (%1$s) for %2$s." msgstr "" #: src/webex/pages/popup.tsx:361 #, c-format -msgid "" -"Started to withdraw\n" -" %1$s%2$sfrom %3$s(%4$s).\n" -" " +msgid "Started to withdraw %1$s from%2$s(%3$s)." msgstr "" #: src/webex/pages/popup.tsx:370 #, c-format -msgid "" -"Merchant %1$soffered%2$scontract %3$s.\n" -" " +msgid "Merchant%1$soffered contract%2$s." 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)." msgstr "" #: src/webex/pages/popup.tsx:391 #, c-format -msgid "" -"Paid %1$sto merchant %2$s.\n" -" %3$s(%4$s)\n" -" " +msgid "Paid%1$sto merchant%2$s. %3$s (%4$s)" 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." msgstr "" #: src/webex/pages/popup.tsx:411 #, c-format -msgid "" -"Merchant %1$sgave\n" -"a %2$sof %3$s.\n" -" %4$s%5$s" +msgid "tip" +msgstr "" + +#: src/webex/pages/popup.tsx:414 +#, c-format +msgid "Merchant%1$sgave a%2$sof%3$s." +msgstr "" + +#: src/webex/pages/popup.tsx:419 +#, c-format +msgid "You did not accept the tip yet." msgstr "" -#: src/webex/pages/popup.tsx:421 +#: src/webex/pages/popup.tsx:424 #, c-format msgid "Unknown event (%1$s)" msgstr "" -#: src/webex/pages/popup.tsx:464 +#: src/webex/pages/popup.tsx:467 #, c-format msgid "Error: could not retrieve event history" msgstr "" -#: src/webex/pages/popup.tsx:489 +#: src/webex/pages/popup.tsx:492 #, c-format msgid "Your wallet has no events recorded." msgstr "" diff --git a/src/i18n/strings.ts b/src/i18n/strings.ts index fc83aba38..7251a5c54 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": [ "" ], "Accepted exchanges:": [ @@ -49,24 +49,24 @@ strings['de'] = { "" ], "Aborting payment ...": [ - "" + "Bezahlung bestätigen" ], "Payment aborted!": [ "" ], "Retry Payment": [ - "" + "Bezahlung bestätigen" ], "Abort Payment": [ "Bezahlung bestätigen" ], - "The merchant %1$soffers you to purchase:\n ": [ - "" + "The merchant%1$soffers you to purchase:": [ + "Der Händler %1$s möchte einen Vertrag über %2$s mit Ihnen abschließen." ], - "The total price is %1$s(plus %2$sfees).\n ": [ + "The total price is%1$s (plus%2$sfees).": [ "" ], - "The total price is %1$s.": [ + "The total price is%1$s.": [ "" ], "Select": [ @@ -78,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.": [ "" ], - "The exchange is audited by a trusted auditor.\n ": [ + "The exchange is audited by a trusted auditor.": [ "" ], - "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. If you withdraw from this exchange, it will be trusted in the future.": [ "" ], - "Using exchange provider %1$s.\nThe exchange provider will charge\n %2$s%3$s%4$sin fees.\n ": [ + "Using exchange provider%1$s. The exchange provider will charge %2$s in fees.": [ "" ], - "Waiting for a response from\n %1$s%2$s": [ + "Waiting for a response from %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$s The exchange has a higher, incompatible protocol version (%3$s).": [ "" ], - "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$s The exchange has a lower, incompatible protocol version than your wallet (protocol version%3$s).": [ "" ], "Accept fees and withdraw": [ @@ -111,10 +111,10 @@ strings['de'] = { "Please select an exchange. You can review the details before after your selection.": [ "" ], - "Select %1$s": [ + "Select%1$s": [ "" ], - "You are about to withdraw\n %1$sfrom your bank account into your wallet.\n ": [ + "You are about to withdraw %1$s from your bank account into your wallet.": [ "" ], "Oops, something went wrong. The wallet responded with error status (%1$s).": [ @@ -144,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 %1$s getting started?": [ "Sie haben kein Digitalgeld. Wollen Sie %1$s? abheben?" ], - "%1$s incoming\n ": [ + "%1$s incoming": [ "" ], - "%1$s being spent\n ": [ + "%1$s being spent": [ "" ], "Error: could not retrieve balance information.": [ @@ -165,27 +165,33 @@ strings['de'] = { "Manage Trusted Auditors and Exchanges": [ "" ], - "Bank requested reserve (%1$s) for\n %2$s.\n ": [ + "Bank requested reserve (%1$s) for %2$s.": [ "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 %1$s from%2$s(%3$s).": [ "Reserve (%1$s) mit %2$s bei %3$s erzeugt" ], - "Merchant %1$soffered%2$scontract %3$s.\n ": [ + "Merchant%1$soffered contract%2$s.": [ "%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).": [ "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. %3$s (%4$s)": [ "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.": [ "%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": [ + "tip": [ + "" + ], + "Merchant%1$sgave a%2$sof%3$s.": [ "%1$s\n möchte einen Vertrag über %2$s\n mit Ihnen abschließen." ], + "You did not accept the tip yet.": [ + "" + ], "Unknown event (%1$s)": [ "" ], @@ -252,7 +258,7 @@ strings['en-US'] = { "plural_forms": "nplurals=2; plural=(n != 1);", "lang": "" }, - "show more details\n ": [ + "show more details": [ "" ], "Accepted exchanges:": [ @@ -288,13 +294,13 @@ strings['en-US'] = { "Abort Payment": [ "" ], - "The merchant %1$soffers you to purchase:\n ": [ + "The merchant%1$soffers you to purchase:": [ "" ], - "The total price is %1$s(plus %2$sfees).\n ": [ + "The total price is%1$s (plus%2$sfees).": [ "" ], - "The total price is %1$s.": [ + "The total price is%1$s.": [ "" ], "Select": [ @@ -306,28 +312,28 @@ strings['en-US'] = { "Invalid exchange URL (%1$s)": [ "" ], - "The exchange is trusted by the wallet.\n ": [ + "The exchange is trusted by the wallet.": [ "" ], - "The exchange is audited by a trusted auditor.\n ": [ + "The exchange is audited by a trusted auditor.": [ "" ], - "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. If you withdraw from this exchange, it will be trusted in the future.": [ "" ], - "Using exchange provider %1$s.\nThe exchange provider will charge\n %2$s%3$s%4$sin fees.\n ": [ + "Using exchange provider%1$s. The exchange provider will charge %2$s in fees.": [ "" ], - "Waiting for a response from\n %1$s%2$s": [ + "Waiting for a response from %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$s The exchange has a higher, incompatible protocol version (%3$s).": [ "" ], - "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$s The exchange has a lower, incompatible protocol version than your wallet (protocol version%3$s).": [ "" ], "Accept fees and withdraw": [ @@ -339,10 +345,10 @@ strings['en-US'] = { "Please select an exchange. You can review the details before after your selection.": [ "" ], - "Select %1$s": [ + "Select%1$s": [ "" ], - "You are about to withdraw\n %1$sfrom your bank account into your wallet.\n ": [ + "You are about to withdraw %1$s from your bank account into your wallet.": [ "" ], "Oops, something went wrong. The wallet responded with error status (%1$s).": [ @@ -372,13 +378,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 %1$s getting started?": [ "" ], - "%1$s incoming\n ": [ + "%1$s incoming": [ "" ], - "%1$s being spent\n ": [ + "%1$s being spent": [ "" ], "Error: could not retrieve balance information.": [ @@ -393,25 +399,31 @@ strings['en-US'] = { "Manage Trusted Auditors and Exchanges": [ "" ], - "Bank requested reserve (%1$s) for\n %2$s.\n ": [ + "Bank requested reserve (%1$s) for %2$s.": [ + "" + ], + "Started to withdraw %1$s from%2$s(%3$s).": [ + "" + ], + "Merchant%1$soffered contract%2$s.": [ "" ], - "Started to withdraw\n %1$s%2$sfrom %3$s(%4$s).\n ": [ + "Withdrew%1$sfrom%2$s(%3$s).": [ "" ], - "Merchant %1$soffered%2$scontract %3$s.\n ": [ + "Paid%1$sto merchant%2$s. %3$s (%4$s)": [ "" ], - "Withdrew %1$sfrom %2$s(%3$s).\n ": [ + "Merchant%1$sgave a refund over%2$s.": [ "" ], - "Paid %1$sto merchant %2$s.\n %3$s(%4$s)\n ": [ + "tip": [ "" ], - "Merchant %1$sgave a refund over %2$s.\n ": [ + "Merchant%1$sgave a%2$sof%3$s.": [ "" ], - "Merchant %1$sgave\na %2$sof %3$s.\n %4$s%5$s": [ + "You did not accept the tip yet.": [ "" ], "Unknown event (%1$s)": [ @@ -480,7 +492,7 @@ strings['fr'] = { "plural_forms": "nplurals=2; plural=(n != 1);", "lang": "" }, - "show more details\n ": [ + "show more details": [ "" ], "Accepted exchanges:": [ @@ -516,13 +528,13 @@ strings['fr'] = { "Abort Payment": [ "" ], - "The merchant %1$soffers you to purchase:\n ": [ + "The merchant%1$soffers you to purchase:": [ "" ], - "The total price is %1$s(plus %2$sfees).\n ": [ + "The total price is%1$s (plus%2$sfees).": [ "" ], - "The total price is %1$s.": [ + "The total price is%1$s.": [ "" ], "Select": [ @@ -534,28 +546,28 @@ strings['fr'] = { "Invalid exchange URL (%1$s)": [ "" ], - "The exchange is trusted by the wallet.\n ": [ + "The exchange is trusted by the wallet.": [ "" ], - "The exchange is audited by a trusted auditor.\n ": [ + "The exchange is audited by a trusted auditor.": [ "" ], - "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. If you withdraw from this exchange, it will be trusted in the future.": [ "" ], - "Using exchange provider %1$s.\nThe exchange provider will charge\n %2$s%3$s%4$sin fees.\n ": [ + "Using exchange provider%1$s. The exchange provider will charge %2$s in fees.": [ "" ], - "Waiting for a response from\n %1$s%2$s": [ + "Waiting for a response from %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$s The exchange has a higher, incompatible protocol version (%3$s).": [ "" ], - "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$s The exchange has a lower, incompatible protocol version than your wallet (protocol version%3$s).": [ "" ], "Accept fees and withdraw": [ @@ -567,10 +579,10 @@ strings['fr'] = { "Please select an exchange. You can review the details before after your selection.": [ "" ], - "Select %1$s": [ + "Select%1$s": [ "" ], - "You are about to withdraw\n %1$sfrom your bank account into your wallet.\n ": [ + "You are about to withdraw %1$s from your bank account into your wallet.": [ "" ], "Oops, something went wrong. The wallet responded with error status (%1$s).": [ @@ -600,13 +612,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 %1$s getting started?": [ "" ], - "%1$s incoming\n ": [ + "%1$s incoming": [ "" ], - "%1$s being spent\n ": [ + "%1$s being spent": [ "" ], "Error: could not retrieve balance information.": [ @@ -621,25 +633,31 @@ strings['fr'] = { "Manage Trusted Auditors and Exchanges": [ "" ], - "Bank requested reserve (%1$s) for\n %2$s.\n ": [ + "Bank requested reserve (%1$s) for %2$s.": [ + "" + ], + "Started to withdraw %1$s from%2$s(%3$s).": [ "" ], - "Started to withdraw\n %1$s%2$sfrom %3$s(%4$s).\n ": [ + "Merchant%1$soffered contract%2$s.": [ "" ], - "Merchant %1$soffered%2$scontract %3$s.\n ": [ + "Withdrew%1$sfrom%2$s(%3$s).": [ "" ], - "Withdrew %1$sfrom %2$s(%3$s).\n ": [ + "Paid%1$sto merchant%2$s. %3$s (%4$s)": [ "" ], - "Paid %1$sto merchant %2$s.\n %3$s(%4$s)\n ": [ + "Merchant%1$sgave a refund over%2$s.": [ "" ], - "Merchant %1$sgave a refund over %2$s.\n ": [ + "tip": [ "" ], - "Merchant %1$sgave\na %2$sof %3$s.\n %4$s%5$s": [ + "Merchant%1$sgave a%2$sof%3$s.": [ + "" + ], + "You did not accept the tip yet.": [ "" ], "Unknown event (%1$s)": [ @@ -708,7 +726,7 @@ strings['it'] = { "plural_forms": "nplurals=2; plural=(n != 1);", "lang": "" }, - "show more details\n ": [ + "show more details": [ "" ], "Accepted exchanges:": [ @@ -744,13 +762,13 @@ strings['it'] = { "Abort Payment": [ "" ], - "The merchant %1$soffers you to purchase:\n ": [ + "The merchant%1$soffers you to purchase:": [ "" ], - "The total price is %1$s(plus %2$sfees).\n ": [ + "The total price is%1$s (plus%2$sfees).": [ "" ], - "The total price is %1$s.": [ + "The total price is%1$s.": [ "" ], "Select": [ @@ -762,28 +780,28 @@ strings['it'] = { "Invalid exchange URL (%1$s)": [ "" ], - "The exchange is trusted by the wallet.\n ": [ + "The exchange is trusted by the wallet.": [ "" ], - "The exchange is audited by a trusted auditor.\n ": [ + "The exchange is audited by a trusted auditor.": [ "" ], - "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. If you withdraw from this exchange, it will be trusted in the future.": [ "" ], - "Using exchange provider %1$s.\nThe exchange provider will charge\n %2$s%3$s%4$sin fees.\n ": [ + "Using exchange provider%1$s. The exchange provider will charge %2$s in fees.": [ "" ], - "Waiting for a response from\n %1$s%2$s": [ + "Waiting for a response from %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$s The exchange has a higher, incompatible protocol version (%3$s).": [ "" ], - "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$s The exchange has a lower, incompatible protocol version than your wallet (protocol version%3$s).": [ "" ], "Accept fees and withdraw": [ @@ -795,10 +813,10 @@ strings['it'] = { "Please select an exchange. You can review the details before after your selection.": [ "" ], - "Select %1$s": [ + "Select%1$s": [ "" ], - "You are about to withdraw\n %1$sfrom your bank account into your wallet.\n ": [ + "You are about to withdraw %1$s from your bank account into your wallet.": [ "" ], "Oops, something went wrong. The wallet responded with error status (%1$s).": [ @@ -828,13 +846,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 %1$s getting started?": [ "" ], - "%1$s incoming\n ": [ + "%1$s incoming": [ "" ], - "%1$s being spent\n ": [ + "%1$s being spent": [ "" ], "Error: could not retrieve balance information.": [ @@ -849,25 +867,31 @@ strings['it'] = { "Manage Trusted Auditors and Exchanges": [ "" ], - "Bank requested reserve (%1$s) for\n %2$s.\n ": [ + "Bank requested reserve (%1$s) for %2$s.": [ + "" + ], + "Started to withdraw %1$s from%2$s(%3$s).": [ + "" + ], + "Merchant%1$soffered contract%2$s.": [ "" ], - "Started to withdraw\n %1$s%2$sfrom %3$s(%4$s).\n ": [ + "Withdrew%1$sfrom%2$s(%3$s).": [ "" ], - "Merchant %1$soffered%2$scontract %3$s.\n ": [ + "Paid%1$sto merchant%2$s. %3$s (%4$s)": [ "" ], - "Withdrew %1$sfrom %2$s(%3$s).\n ": [ + "Merchant%1$sgave a refund over%2$s.": [ "" ], - "Paid %1$sto merchant %2$s.\n %3$s(%4$s)\n ": [ + "tip": [ "" ], - "Merchant %1$sgave a refund over %2$s.\n ": [ + "Merchant%1$sgave a%2$sof%3$s.": [ "" ], - "Merchant %1$sgave\na %2$sof %3$s.\n %4$s%5$s": [ + "You did not accept the tip yet.": [ "" ], "Unknown event (%1$s)": [ @@ -927,3 +951,237 @@ strings['it'] = { } } }; +strings['sv'] = { + "domain": "messages", + "locale_data": { + "messages": { + "": { + "domain": "messages", + "plural_forms": "nplurals=2; plural=(n != 1);", + "lang": "" + }, + "show more details": [ + "visa mer" + ], + "Accepted exchanges:": [ + "Accepterade tjänsteleverantörer:" + ], + "Exchanges in the wallet:": [ + "Tjänsteleverantörer i plånboken:" + ], + "You have insufficient funds of the requested currency in your wallet.": [ + "plånboken" + ], + "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.": [ + "plånboken" + ], + "Confirm payment": [ + "Godkän betalning" + ], + "Submitting payment": [ + "Bekräftar betalning" + ], + "You already paid for this, clicking \"Confirm payment\" will not cost money again.": [ + "Du har redan betalat för det här, om du trycker \"Godkän betalning\" debiteras du inte igen" + ], + "Aborting payment ...": [ + "" + ], + "Payment aborted!": [ + "" + ], + "Retry Payment": [ + "" + ], + "Abort Payment": [ + "" + ], + "The merchant%1$soffers you to purchase:": [ + "Säljaren %1$serbjuder följande:" + ], + "The total price is%1$s (plus%2$sfees).": [ + "Det totala priset är %1$s(plus %2$savgifter).\n" + ], + "The total price is%1$s.": [ + "Det totala priset är %1$s." + ], + "Select": [ + "Välj" + ], + "Error: URL may not be relative": [ + "" + ], + "Invalid exchange URL (%1$s)": [ + "" + ], + "The exchange is trusted by the wallet.": [ + "tjänsteleverantörer" + ], + "The exchange is audited by a trusted auditor.": [ + "tjänsteleverantörer" + ], + "Warning: The exchange is neither directly trusted nor audited by a trusted auditor. If you withdraw from this exchange, it will be trusted in the future.": [ + "" + ], + "Using exchange provider%1$s. The exchange provider will charge %2$s in fees.": [ + "tjänsteleverantörer" + ], + "Waiting for a response from %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$s The exchange has a higher, incompatible protocol version (%3$s).": [ + "plånboken tjänsteleverantörer" + ], + "The chosen exchange (protocol version%1$smight be outdated.%2$s The exchange has a lower, incompatible protocol version than your wallet (protocol version%3$s).": [ + "tjänsteleverantörer plånboken" + ], + "Accept fees and withdraw": [ + "Acceptera avgifter och utbetala" + ], + "Change Exchange Provider": [ + "Ändra tjänsteleverantörer" + ], + "Please select an exchange. You can review the details before after your selection.": [ + "tjänsteleverantörer" + ], + "Select%1$s": [ + "Välj %1$s" + ], + "You are about to withdraw %1$s from your bank account into your wallet.": [ + "Du är på väg att ta ut\n %1$s från ditt bankkonto till din plånbok.\n" + ], + "Oops, something went wrong. The wallet responded with error status (%1$s).": [ + "plånboken" + ], + "Checking URL, please wait ...": [ + "" + ], + "Can't parse amount: %1$s": [ + "" + ], + "Can't parse wire_types: %1$s": [ + "" + ], + "Fatal error: \"%1$s\".": [ + "" + ], + "Balance": [ + "Balans" + ], + "History": [ + "Historia" + ], + "Debug": [ + "" + ], + "help": [ + "hjälp" + ], + "You have no balance to show. Need some %1$s getting started?": [ + "Du har ingen balans att visa. Behöver du\n %1$s att börja?\n" + ], + "%1$s incoming": [ + "%1$s inkommande" + ], + "%1$s being spent": [ + "" + ], + "Error: could not retrieve balance information.": [ + "" + ], + "Payback": [ + "Återbetalning" + ], + "Return Electronic Cash to Bank Account": [ + "Återlämna elektroniska pengar till bank konto" + ], + "Manage Trusted Auditors and Exchanges": [ + "" + ], + "Bank requested reserve (%1$s) for %2$s.": [ + "" + ], + "Started to withdraw %1$s from%2$s(%3$s).": [ + "" + ], + "Merchant%1$soffered contract%2$s.": [ + "Säljaren %1$s erbjöd kontrakt %2$s.\n" + ], + "Withdrew%1$sfrom%2$s(%3$s).": [ + "" + ], + "Paid%1$sto merchant%2$s. %3$s (%4$s)": [ + "" + ], + "Merchant%1$sgave a refund over%2$s.": [ + "Säljaren %1$sgav en återbetalning på %2$s.\n" + ], + "tip": [ + "" + ], + "Merchant%1$sgave a%2$sof%3$s.": [ + "Säljaren %1$sgav en återbetalning på %2$s.\n" + ], + "You did not accept the tip yet.": [ + "" + ], + "Unknown event (%1$s)": [ + "" + ], + "Error: could not retrieve event history": [ + "" + ], + "Your wallet has no events recorded.": [ + "plånboken" + ], + "Wire to bank account": [ + "Övervisa till bank konto" + ], + "Confirm": [ + "Bekräfta" + ], + "Cancel": [ + "Avbryt" + ], + "Withdrawal fees:": [ + "Utbetalnings avgifter:" + ], + "Rounding loss:": [ + "" + ], + "Earliest expiration (for deposit): %1$s": [ + "" + ], + "# Coins": [ + "# Mynt" + ], + "Value": [ + "Värde" + ], + "Withdraw Fee": [ + "Utbetalnings avgift" + ], + "Refresh Fee": [ + "Återhämtnings avgift" + ], + "Deposit Fee": [ + "Depostitions avgift" + ], + "Invalid Wire": [ + "" + ], + "Invalid Test Wire Detail": [ + "" + ], + "Test Wire Acct #%1$s on %2$s": [ + "" + ], + "Unknown Wire Detail": [ + "" + ] + } + } +}; diff --git a/src/i18n/sv.po b/src/i18n/sv.po index 368bb321e..24573f74a 100644 --- a/src/i18n/sv.po +++ b/src/i18n/sv.po @@ -28,10 +28,8 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: src/webex/pages/confirm-contract.tsx:76 -#, c-format -msgid "" -"show more details\n" -" " +#, fuzzy, c-format +msgid "show more details" msgstr "visa mer" #: src/webex/pages/confirm-contract.tsx:90 @@ -73,7 +71,9 @@ msgstr "Bekräftar betalning" msgid "" "You already paid for this, clicking \"Confirm payment\" will not cost money " "again." -msgstr "Du har redan betalat för det här, om du trycker \"Godkän betalning\" debiteras du inte igen" +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 @@ -96,22 +96,18 @@ msgid "Abort Payment" msgstr "" #: src/webex/pages/confirm-contract.tsx:372 -#, c-format -msgid "" -"The merchant %1$soffers you to purchase:\n" -" " +#, fuzzy, c-format +msgid "The merchant%1$soffers you to purchase:" 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" -" " +#, fuzzy, c-format +msgid "The total price is%1$s (plus%2$sfees)." 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." +#, fuzzy, c-format +msgid "The total price is%1$s." msgstr "Det totala priset är %1$s." #: src/webex/pages/confirm-create-reserve.tsx:128 @@ -130,124 +126,110 @@ msgid "Invalid exchange URL (%1$s)" msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:210 -#, c-format -msgid "" -"The exchange is trusted by the wallet.\n" -" " +#, fuzzy, c-format +msgid "The exchange is trusted by the wallet." msgstr "tjänsteleverantörer" #: src/webex/pages/confirm-create-reserve.tsx:216 -#, c-format -msgid "" -"The exchange is audited by a trusted auditor.\n" -" " +#, fuzzy, c-format +msgid "The exchange is audited by a trusted auditor." msgstr "tjänsteleverantörer" #: src/webex/pages/confirm-create-reserve.tsx:222 #, c-format 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" -" " +"Warning: The exchange is neither directly trusted nor audited by a trusted " +"auditor. If you withdraw from this exchange, it will be trusted in the " +"future." msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:231 -#, c-format +#, fuzzy, c-format msgid "" -"Using exchange provider %1$s.\n" -"The exchange provider will charge\n" -" %2$s%3$s%4$sin fees.\n" -" " +"Using exchange provider%1$s. The exchange provider will charge %2$s in fees." msgstr "tjänsteleverantörer" -#: src/webex/pages/confirm-create-reserve.tsx:245 +#: src/webex/pages/confirm-create-reserve.tsx:243 #, c-format -msgid "" -"Waiting for a response from\n" -" %1$s%2$s" +msgid "Waiting for a response from %1$s %2$s" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:262 +#: src/webex/pages/confirm-create-reserve.tsx:260 #, c-format msgid "" "Information about fees will be available when an exchange provider is " "selected." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:281 -#, c-format +#: src/webex/pages/confirm-create-reserve.tsx:279 +#, fuzzy, c-format msgid "" -"Your wallet (protocol version %1$s) might be outdated.%2$sThe exchange has a " -"higher, incompatible\n" -"protocol version (%3$s).\n" -" " +"Your wallet (protocol version%1$s) might be outdated.%2$s The exchange has a " +"higher, incompatible protocol version (%3$s)." msgstr "plånboken tjänsteleverantörer" -#: src/webex/pages/confirm-create-reserve.tsx:292 -#, c-format +#: src/webex/pages/confirm-create-reserve.tsx:290 +#, fuzzy, c-format msgid "" -"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" -" " +"The chosen exchange (protocol version%1$smight be outdated.%2$s The exchange " +"has a lower, incompatible protocol version than your wallet (protocol version" +"%3$s)." msgstr "tjänsteleverantörer plånboken" -#: src/webex/pages/confirm-create-reserve.tsx:311 +#: src/webex/pages/confirm-create-reserve.tsx:309 #, c-format msgid "Accept fees and withdraw" msgstr "Acceptera avgifter och utbetala" -#: src/webex/pages/confirm-create-reserve.tsx:316 +#: src/webex/pages/confirm-create-reserve.tsx:314 #, c-format msgid "Change Exchange Provider" msgstr "Ändra tjänsteleverantörer" -#: src/webex/pages/confirm-create-reserve.tsx:337 +#: src/webex/pages/confirm-create-reserve.tsx:335 #, 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" +#: src/webex/pages/confirm-create-reserve.tsx:341 +#: src/webex/pages/confirm-create-reserve.tsx:353 +#, fuzzy, c-format +msgid "Select%1$s" msgstr "Välj %1$s" -#: src/webex/pages/confirm-create-reserve.tsx:372 -#, c-format -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:370 +#, fuzzy, c-format +msgid "You are about to withdraw %1$s from your bank account into your wallet." +msgstr "" +"Du är på väg att ta ut\n" +" %1$s från ditt bankkonto till din plånbok.\n" -#: src/webex/pages/confirm-create-reserve.tsx:457 +#: src/webex/pages/confirm-create-reserve.tsx:455 #, c-format msgid "" "Oops, something went wrong. The wallet responded with error status (%1$s)." msgstr "plånboken" -#: src/webex/pages/confirm-create-reserve.tsx:466 +#: src/webex/pages/confirm-create-reserve.tsx:464 #, c-format msgid "Checking URL, please wait ..." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:480 +#: src/webex/pages/confirm-create-reserve.tsx:478 #, c-format msgid "Can't parse amount: %1$s" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:487 +#: src/webex/pages/confirm-create-reserve.tsx:485 #, 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:513 src/webex/pages/tip.tsx:180 +#: src/webex/pages/confirm-create-reserve.tsx:511 src/webex/pages/tip.tsx:180 #, c-format msgid "Fatal error: \"%1$s\"." msgstr "" @@ -273,25 +255,20 @@ msgid "help" 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 "Du har ingen balans att visa. Behöver du\n %1$s att börja?\n" +#, fuzzy, c-format +msgid "You have no balance to show. Need some %1$s getting started?" +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" -" " +#, fuzzy, c-format +msgid "%1$s incoming" msgstr "%1$s inkommande" #: src/webex/pages/popup.tsx:283 #, c-format -msgid "" -"%1$s being spent\n" -" " +msgid "%1$s being spent" msgstr "" #: src/webex/pages/popup.tsx:310 @@ -316,68 +293,60 @@ msgstr "" #: src/webex/pages/popup.tsx:351 #, c-format -msgid "" -"Bank requested reserve (%1$s) for\n" -" %2$s.\n" -" " +msgid "Bank requested reserve (%1$s) for %2$s." msgstr "" #: src/webex/pages/popup.tsx:361 #, c-format -msgid "" -"Started to withdraw\n" -" %1$s%2$sfrom %3$s(%4$s).\n" -" " +msgid "Started to withdraw %1$s from%2$s(%3$s)." msgstr "" #: src/webex/pages/popup.tsx:370 -#, c-format -msgid "" -"Merchant %1$soffered%2$scontract %3$s.\n" -" " -msgstr "Säljaren %1$serbjöd%2$skontrakt %3%s.\n" +#, fuzzy, c-format +msgid "Merchant%1$soffered contract%2$s." +msgstr "Säljaren %1$s erbjöd kontrakt %2$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)." msgstr "" #: src/webex/pages/popup.tsx:391 #, c-format -msgid "" -"Paid %1$sto merchant %2$s.\n" -" %3$s(%4$s)\n" -" " +msgid "Paid%1$sto merchant%2$s. %3$s (%4$s)" msgstr "" #: 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." 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" +msgid "tip" +msgstr "" + +#: src/webex/pages/popup.tsx:414 +#, fuzzy, c-format +msgid "Merchant%1$sgave a%2$sof%3$s." +msgstr "Säljaren %1$sgav en återbetalning på %2$s.\n" + +#: src/webex/pages/popup.tsx:419 +#, c-format +msgid "You did not accept the tip yet." msgstr "" -#: src/webex/pages/popup.tsx:421 +#: src/webex/pages/popup.tsx:424 #, c-format msgid "Unknown event (%1$s)" msgstr "" -#: src/webex/pages/popup.tsx:464 +#: src/webex/pages/popup.tsx:467 #, c-format msgid "Error: could not retrieve event history" msgstr "" -#: src/webex/pages/popup.tsx:489 +#: src/webex/pages/popup.tsx:492 #, c-format msgid "Your wallet has no events recorded." msgstr "plånboken" diff --git a/src/i18n/taler-wallet-webex.pot b/src/i18n/taler-wallet-webex.pot index 28ce37de4..38f817fae 100644 --- a/src/i18n/taler-wallet-webex.pot +++ b/src/i18n/taler-wallet-webex.pot @@ -29,9 +29,7 @@ msgstr "" #: src/webex/pages/confirm-contract.tsx:76 #, c-format -msgid "" -"show more details\n" -" " +msgid "show more details" msgstr "" #: src/webex/pages/confirm-contract.tsx:90 @@ -97,21 +95,17 @@ msgstr "" #: src/webex/pages/confirm-contract.tsx:372 #, c-format -msgid "" -"The merchant %1$soffers you to purchase:\n" -" " +msgid "The merchant%1$soffers you to purchase:" msgstr "" #: src/webex/pages/confirm-contract.tsx:381 #, c-format -msgid "" -"The total price is %1$s(plus %2$sfees).\n" -" " +msgid "The total price is%1$s (plus%2$sfees)." msgstr "" #: src/webex/pages/confirm-contract.tsx:385 #, c-format -msgid "The total price is %1$s." +msgid "The total price is%1$s." msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:128 @@ -131,123 +125,107 @@ 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." 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." msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:222 #, c-format 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" -" " +"Warning: The exchange is neither directly trusted nor audited by a trusted " +"auditor. If you withdraw from this exchange, it will be trusted in the " +"future." msgstr "" #: src/webex/pages/confirm-create-reserve.tsx:231 #, c-format msgid "" -"Using exchange provider %1$s.\n" -"The exchange provider will charge\n" -" %2$s%3$s%4$sin fees.\n" -" " +"Using exchange provider%1$s. The exchange provider will charge %2$s in fees." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:245 +#: src/webex/pages/confirm-create-reserve.tsx:243 #, c-format -msgid "" -"Waiting for a response from\n" -" %1$s%2$s" +msgid "Waiting for a response from %1$s %2$s" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:262 +#: src/webex/pages/confirm-create-reserve.tsx:260 #, c-format msgid "" "Information about fees will be available when an exchange provider is " "selected." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:281 +#: src/webex/pages/confirm-create-reserve.tsx:279 #, c-format msgid "" -"Your wallet (protocol version %1$s) might be outdated.%2$sThe exchange has a " -"higher, incompatible\n" -"protocol version (%3$s).\n" -" " +"Your wallet (protocol version%1$s) might be outdated.%2$s The exchange has a " +"higher, incompatible protocol version (%3$s)." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:292 +#: src/webex/pages/confirm-create-reserve.tsx:290 #, c-format msgid "" -"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" -" " +"The chosen exchange (protocol version%1$smight be outdated.%2$s The exchange " +"has a lower, incompatible protocol version than your wallet (protocol version" +"%3$s)." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:311 +#: src/webex/pages/confirm-create-reserve.tsx:309 #, c-format msgid "Accept fees and withdraw" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:316 +#: src/webex/pages/confirm-create-reserve.tsx:314 #, c-format msgid "Change Exchange Provider" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:337 +#: src/webex/pages/confirm-create-reserve.tsx:335 #, 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 +#: src/webex/pages/confirm-create-reserve.tsx:341 +#: src/webex/pages/confirm-create-reserve.tsx:353 #, c-format -msgid "Select %1$s" +msgid "Select%1$s" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:372 +#: src/webex/pages/confirm-create-reserve.tsx:370 #, c-format -msgid "" -"You are about to withdraw\n" -" %1$sfrom your bank account into your wallet.\n" -" " +msgid "You are about to withdraw %1$s from your bank account into your wallet." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:457 +#: src/webex/pages/confirm-create-reserve.tsx:455 #, c-format msgid "" "Oops, something went wrong. The wallet responded with error status (%1$s)." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:466 +#: src/webex/pages/confirm-create-reserve.tsx:464 #, c-format msgid "Checking URL, please wait ..." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:480 +#: src/webex/pages/confirm-create-reserve.tsx:478 #, c-format msgid "Can't parse amount: %1$s" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:487 +#: src/webex/pages/confirm-create-reserve.tsx:485 #, 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:513 src/webex/pages/tip.tsx:180 +#: src/webex/pages/confirm-create-reserve.tsx:511 src/webex/pages/tip.tsx:180 #, c-format msgid "Fatal error: \"%1$s\"." msgstr "" @@ -274,24 +252,17 @@ msgstr "" #: src/webex/pages/popup.tsx:253 #, c-format -msgid "" -"You have no balance to show. Need some\n" -" %1$s getting started?\n" -" " +msgid "You have no balance to show. Need some %1$s getting started?" msgstr "" #: src/webex/pages/popup.tsx:270 #, c-format -msgid "" -"%1$s incoming\n" -" " +msgid "%1$s incoming" msgstr "" #: src/webex/pages/popup.tsx:283 #, c-format -msgid "" -"%1$s being spent\n" -" " +msgid "%1$s being spent" msgstr "" #: src/webex/pages/popup.tsx:310 @@ -316,68 +287,60 @@ msgstr "" #: src/webex/pages/popup.tsx:351 #, c-format -msgid "" -"Bank requested reserve (%1$s) for\n" -" %2$s.\n" -" " +msgid "Bank requested reserve (%1$s) for %2$s." msgstr "" #: src/webex/pages/popup.tsx:361 #, c-format -msgid "" -"Started to withdraw\n" -" %1$s%2$sfrom %3$s(%4$s).\n" -" " +msgid "Started to withdraw %1$s from%2$s(%3$s)." msgstr "" #: src/webex/pages/popup.tsx:370 #, c-format -msgid "" -"Merchant %1$soffered%2$scontract %3$s.\n" -" " +msgid "Merchant%1$soffered contract%2$s." 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)." msgstr "" #: src/webex/pages/popup.tsx:391 #, c-format -msgid "" -"Paid %1$sto merchant %2$s.\n" -" %3$s(%4$s)\n" -" " +msgid "Paid%1$sto merchant%2$s. %3$s (%4$s)" 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." msgstr "" #: src/webex/pages/popup.tsx:411 #, c-format -msgid "" -"Merchant %1$sgave\n" -"a %2$sof %3$s.\n" -" %4$s%5$s" +msgid "tip" +msgstr "" + +#: src/webex/pages/popup.tsx:414 +#, c-format +msgid "Merchant%1$sgave a%2$sof%3$s." +msgstr "" + +#: src/webex/pages/popup.tsx:419 +#, c-format +msgid "You did not accept the tip yet." msgstr "" -#: src/webex/pages/popup.tsx:421 +#: src/webex/pages/popup.tsx:424 #, c-format msgid "Unknown event (%1$s)" msgstr "" -#: src/webex/pages/popup.tsx:464 +#: src/webex/pages/popup.tsx:467 #, c-format msgid "Error: could not retrieve event history" msgstr "" -#: src/webex/pages/popup.tsx:489 +#: src/webex/pages/popup.tsx:492 #, c-format msgid "Your wallet has no events recorded." msgstr "" diff --git a/src/webex/pages/confirm-create-reserve.tsx b/src/webex/pages/confirm-create-reserve.tsx index 7a754374e..5be6fe351 100644 --- a/src/webex/pages/confirm-create-reserve.tsx +++ b/src/webex/pages/confirm-create-reserve.tsx @@ -231,9 +231,7 @@ 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> + {" "}<span>{renderAmount(totalCost)}</span>{" "} in fees. </i18n.Translate> {trustMessage} @@ -371,7 +369,7 @@ class ExchangeSelection extends ImplicitStateComponent<ExchangeSelectionProps> { <div> <i18n.Translate wrap="p"> You are about to withdraw - <strong>{renderAmount(this.props.amount)}</strong> + {" "}<strong>{renderAmount(this.props.amount)}</strong>{" "} from your bank account into your wallet. </i18n.Translate> {this.selectingExchange() ? this.renderSelect() : this.renderConfirm()} diff --git a/src/webex/pages/popup.tsx b/src/webex/pages/popup.tsx index 6bba10141..6d0134b84 100644 --- a/src/webex/pages/popup.tsx +++ b/src/webex/pages/popup.tsx @@ -361,7 +361,7 @@ function formatHistoryItem(historyItem: HistoryRecord) { return ( <i18n.Translate wrap="p"> Started to withdraw - {" "}{renderAmount(d.requestedAmount)}<span> </span> + <span>{renderAmount(d.requestedAmount)}</span> from <span>{exchange}</span> (<span>{pub}</span>). </i18n.Translate> ); @@ -369,7 +369,7 @@ function formatHistoryItem(historyItem: HistoryRecord) { case "offer-contract": { return ( <i18n.Translate wrap="p"> - Merchant <em>{abbrev(d.merchantName, 15)}</em> offered<span> </span> + Merchant <em>{abbrev(d.merchantName, 15)}</em> offered contract <span>{abbrev(d.contractTermsHash)}</span>. </i18n.Translate> ); @@ -408,13 +408,16 @@ function formatHistoryItem(historyItem: HistoryRecord) { const tipPageUrl = new URI(chrome.extension.getURL("/src/webex/pages/tip.html")); const params = { tip_id: d.tipId, merchant_domain: d.merchantDomain }; const url = tipPageUrl.query(params).href(); + const tipLink = <a href={url} onClick={openTab(url)}>{i18n.str`tip`}</a>; + // i18n: Tip return ( - <i18n.Translate wrap="p"> - Merchant <span>{d.merchantDomain}</span> gave - a <a href={url} onClick={openTab(url)}> tip</a> of <span>{renderAmount(d.amount)}</span>. - <span> </span> - { d.accepted ? null : <span>You did not accept the tip yet.</span> } - </i18n.Translate> + <> + <i18n.Translate wrap="p"> + Merchant <span>{d.merchantDomain}</span> gave + a <span>{tipLink}</span> of <span>{renderAmount(d.amount)}</span>. + </i18n.Translate> + <span> { d.accepted ? null : <i18n.Translate>You did not accept the tip yet.</i18n.Translate> }</span> + </> ); } default: diff --git a/tooling/pogen/pogen.js b/tooling/pogen/pogen.js index 787a7ec7e..ed634ef0d 100644 --- a/tooling/pogen/pogen.js +++ b/tooling/pogen/pogen.js @@ -188,14 +188,8 @@ function processFile(sourceFile) { case ts.SyntaxKind.JsxText: { var e = childNode; - 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 + " "; - } + var s = e.getFullText(); + var t = s.split("\n").map(trim).join(" "); fragments.push(t); } case ts.SyntaxKind.JsxOpeningElement: @@ -218,7 +212,7 @@ function processFile(sourceFile) { } }; ts.forEachChild(node, process); - return fragments.join(""); + return fragments.join("").trim().replace(/ +/g, " "); } function getJsxSingular(node) { var res; diff --git a/tooling/pogen/pogen.ts b/tooling/pogen/pogen.ts index 0903b9db7..391843912 100644 --- a/tooling/pogen/pogen.ts +++ b/tooling/pogen/pogen.ts @@ -211,14 +211,8 @@ export function processFile(sourceFile: ts.SourceFile) { case ts.SyntaxKind.JsxText: { let e = childNode as ts.JsxText; - 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 + " "; - } + let s = e.getFullText(); + let t = s.split("\n").map(trim).join(" "); fragments.push(t); } case ts.SyntaxKind.JsxOpeningElement: @@ -241,7 +235,7 @@ export function processFile(sourceFile: ts.SourceFile) { } }; ts.forEachChild(node, process); - return fragments.join(""); + return fragments.join("").trim().replace(/ +/g, " "); } function getJsxSingular(node: ts.Node) { |