From 761397bdf20069f04159fcab5b1220f7e723cf42 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Fri, 6 Sep 2019 11:45:53 +0200 Subject: [PATCH] also re-submit payment when redirected to existing one --- src/i18n/de.po | 110 ++++++++++++---------------- src/i18n/en-US.po | 110 ++++++++++++---------------- src/i18n/fr.po | 110 ++++++++++++---------------- src/i18n/it.po | 110 ++++++++++++---------------- src/i18n/strings.ts | 100 +++----------------------- src/i18n/sv.po | 122 +++++++++++++++----------------- src/i18n/taler-wallet-webex.pot | 110 ++++++++++++---------------- src/wallet.ts | 3 + 8 files changed, 295 insertions(+), 480 deletions(-) diff --git a/src/i18n/de.po b/src/i18n/de.po index 9d0687909..7358c5507 100644 --- a/src/i18n/de.po +++ b/src/i18n/de.po @@ -27,107 +27,87 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/webex/pages/benchmark.tsx:58 +#: src/webex/pages/benchmark.tsx:57 #, c-format msgid "Operation" msgstr "" -#: src/webex/pages/benchmark.tsx:59 +#: src/webex/pages/benchmark.tsx:58 #, c-format msgid "time (ms/op)" msgstr "" -#: src/webex/pages/pay.tsx:115 +#: src/webex/pages/pay.tsx:113 #, fuzzy, c-format msgid "The merchant %1$s offers you to purchase:" msgstr "Der Händler %1$s möchte einen Vertrag über %2$s mit Ihnen abschließen." -#: src/webex/pages/pay.tsx:121 +#: src/webex/pages/pay.tsx:119 #, c-format msgid "The total price is %1$s (plus %2$s fees)." msgstr "" -#: src/webex/pages/pay.tsx:126 +#: src/webex/pages/pay.tsx:124 #, c-format msgid "The total price is %1$s." msgstr "" -#: src/webex/pages/pay.tsx:140 +#: src/webex/pages/pay.tsx:138 #, c-format msgid "Retry" msgstr "" -#: src/webex/pages/pay.tsx:148 +#: src/webex/pages/pay.tsx:146 #, fuzzy, c-format msgid "Confirm payment" msgstr "Bezahlung bestätigen" -#: src/webex/pages/popup.tsx:165 +#: src/webex/pages/popup.tsx:162 #, c-format msgid "Balance" msgstr "Saldo" -#: src/webex/pages/popup.tsx:168 +#: src/webex/pages/popup.tsx:163 #, c-format msgid "History" msgstr "Verlauf" -#: src/webex/pages/popup.tsx:171 +#: src/webex/pages/popup.tsx:164 #, c-format msgid "Debug" msgstr "Debug" -#: src/webex/pages/popup.tsx:251 -#, c-format -msgid "help" -msgstr "" - -#: src/webex/pages/popup.tsx:256 +#: src/webex/pages/popup.tsx:200 #, fuzzy, c-format 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:273 +#: src/webex/pages/popup.tsx:263 #, c-format msgid "%1$s incoming" msgstr "" -#: src/webex/pages/popup.tsx:286 +#: src/webex/pages/popup.tsx:275 #, c-format msgid "%1$s being spent" msgstr "" -#: src/webex/pages/popup.tsx:313 +#: src/webex/pages/popup.tsx:306 #, c-format msgid "Error: could not retrieve balance information." msgstr "" -#: src/webex/pages/popup.tsx:340 -#, c-format -msgid "Payback" -msgstr "" - -#: src/webex/pages/popup.tsx:341 -#, c-format -msgid "Return Electronic Cash to Bank Account" -msgstr "" - -#: src/webex/pages/popup.tsx:342 -#, c-format -msgid "Manage Trusted Auditors and Exchanges" -msgstr "" - -#: src/webex/pages/popup.tsx:354 +#: src/webex/pages/popup.tsx:335 #, fuzzy, c-format 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:364 +#: src/webex/pages/popup.tsx:344 #, fuzzy, c-format 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:373 +#: src/webex/pages/popup.tsx:353 #, fuzzy, c-format msgid "Merchant %1$s offered contract %2$s." msgstr "" @@ -135,17 +115,17 @@ msgstr "" " möchte einen Vertrag über %2$s\n" " mit Ihnen abschließen." -#: src/webex/pages/popup.tsx:384 +#: src/webex/pages/popup.tsx:366 #, fuzzy, c-format -msgid "Withdrew %1$s from %2$s (%3$s)." +msgid "Withdrew %1$s from %2$s ( %3$s)." msgstr "Reserve (%1$s) mit %2$s bei %3$s erzeugt" -#: src/webex/pages/popup.tsx:394 +#: src/webex/pages/popup.tsx:381 #, fuzzy, c-format -msgid "Paid %1$s to merchant %2$s. %3$s (%4$s)" +msgid "Paid %1$s to merchant %2$s.%3$s( %4$s)" msgstr "Reserve (%1$s) mit %2$s bei %3$s erzeugt" -#: src/webex/pages/popup.tsx:404 +#: src/webex/pages/popup.tsx:391 #, fuzzy, c-format msgid "Merchant %1$s gave a refund over %2$s." msgstr "" @@ -153,12 +133,12 @@ msgstr "" " möchte einen Vertrag über %2$s\n" " mit Ihnen abschließen." -#: src/webex/pages/popup.tsx:414 +#: src/webex/pages/popup.tsx:404 #, c-format msgid "tip" msgstr "" -#: src/webex/pages/popup.tsx:418 +#: src/webex/pages/popup.tsx:408 #, fuzzy, c-format msgid "Merchant %1$s gave a %2$s of %3$s." msgstr "" @@ -166,22 +146,22 @@ msgstr "" " möchte einen Vertrag über %2$s\n" " mit Ihnen abschließen." -#: src/webex/pages/popup.tsx:422 +#: src/webex/pages/popup.tsx:414 #, c-format msgid "You did not accept the tip yet." msgstr "" -#: src/webex/pages/popup.tsx:427 +#: src/webex/pages/popup.tsx:422 #, c-format msgid "Unknown event (%1$s)" msgstr "" -#: src/webex/pages/popup.tsx:470 +#: src/webex/pages/popup.tsx:464 #, c-format msgid "Error: could not retrieve event history" msgstr "" -#: src/webex/pages/popup.tsx:495 +#: src/webex/pages/popup.tsx:489 #, c-format msgid "Your wallet has no events recorded." msgstr "Ihre Geldbörse verzeichnet keine Vorkommnisse." @@ -203,89 +183,89 @@ msgstr "Saldo" #. #-#-#-#-# - (PACKAGE VERSION) #-#-#-#-# #. TODO:generic error reporting function or component. -#: src/webex/pages/tip.tsx:118 src/webex/pages/withdraw.tsx:224 +#: src/webex/pages/tip.tsx:118 src/webex/pages/withdraw.tsx:216 #, c-format msgid "Fatal error: \"%1$s\"." msgstr "" -#: src/webex/pages/withdraw.tsx:81 +#: src/webex/pages/withdraw.tsx:73 #, c-format msgid "Could not get details for withdraw operation:" msgstr "" -#: src/webex/pages/withdraw.tsx:97 src/webex/pages/withdraw.tsx:187 +#: src/webex/pages/withdraw.tsx:89 src/webex/pages/withdraw.tsx:179 #, c-format msgid "Chose different exchange provider" msgstr "" -#: src/webex/pages/withdraw.tsx:116 +#: src/webex/pages/withdraw.tsx:108 #, c-format msgid "" "Please select an exchange. You can review the details before after your " "selection." msgstr "" -#: src/webex/pages/withdraw.tsx:128 +#: src/webex/pages/withdraw.tsx:120 #, c-format msgid "Select %1$s" msgstr "" -#: src/webex/pages/withdraw.tsx:150 +#: src/webex/pages/withdraw.tsx:142 #, c-format msgid "Select custom exchange" msgstr "" -#: src/webex/pages/withdraw.tsx:167 +#: src/webex/pages/withdraw.tsx:159 #, c-format msgid "You are about to withdraw %1$s from your bank account into your wallet." msgstr "" -#: src/webex/pages/withdraw.tsx:178 +#: src/webex/pages/withdraw.tsx:170 #, c-format msgid "Accept fees and withdraw" msgstr "" -#: src/webex/pages/withdraw.tsx:196 +#: src/webex/pages/withdraw.tsx:188 #, c-format msgid "Cancel withdraw operation" msgstr "" -#: src/webex/renderHtml.tsx:226 +#: src/webex/renderHtml.tsx:237 #, fuzzy, c-format msgid "Withdrawal fees:" msgstr "Abheben bei" -#: src/webex/renderHtml.tsx:227 +#: src/webex/renderHtml.tsx:240 #, c-format msgid "Rounding loss:" msgstr "" -#: src/webex/renderHtml.tsx:228 +#: src/webex/renderHtml.tsx:242 #, c-format msgid "Earliest expiration (for deposit): %1$s" msgstr "" -#: src/webex/renderHtml.tsx:234 +#: src/webex/renderHtml.tsx:250 #, c-format msgid "# Coins" msgstr "" -#: src/webex/renderHtml.tsx:235 +#: src/webex/renderHtml.tsx:251 #, c-format msgid "Value" msgstr "" -#: src/webex/renderHtml.tsx:236 +#: src/webex/renderHtml.tsx:252 #, fuzzy, c-format msgid "Withdraw Fee" msgstr "Abheben bei %1$s" -#: src/webex/renderHtml.tsx:237 +#: src/webex/renderHtml.tsx:253 #, c-format msgid "Refresh Fee" msgstr "" -#: src/webex/renderHtml.tsx:238 +#: src/webex/renderHtml.tsx:254 #, c-format msgid "Deposit Fee" msgstr "" diff --git a/src/i18n/en-US.po b/src/i18n/en-US.po index 0f73aa141..508a1f1f9 100644 --- a/src/i18n/en-US.po +++ b/src/i18n/en-US.po @@ -27,152 +27,132 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/webex/pages/benchmark.tsx:58 +#: src/webex/pages/benchmark.tsx:57 #, c-format msgid "Operation" msgstr "" -#: src/webex/pages/benchmark.tsx:59 +#: src/webex/pages/benchmark.tsx:58 #, c-format msgid "time (ms/op)" msgstr "" -#: src/webex/pages/pay.tsx:115 +#: src/webex/pages/pay.tsx:113 #, c-format msgid "The merchant %1$s offers you to purchase:" msgstr "" -#: src/webex/pages/pay.tsx:121 +#: src/webex/pages/pay.tsx:119 #, c-format msgid "The total price is %1$s (plus %2$s fees)." msgstr "" -#: src/webex/pages/pay.tsx:126 +#: src/webex/pages/pay.tsx:124 #, c-format msgid "The total price is %1$s." msgstr "" -#: src/webex/pages/pay.tsx:140 +#: src/webex/pages/pay.tsx:138 #, c-format msgid "Retry" msgstr "" -#: src/webex/pages/pay.tsx:148 +#: src/webex/pages/pay.tsx:146 #, c-format msgid "Confirm payment" msgstr "" -#: src/webex/pages/popup.tsx:165 +#: src/webex/pages/popup.tsx:162 #, c-format msgid "Balance" msgstr "" -#: src/webex/pages/popup.tsx:168 +#: src/webex/pages/popup.tsx:163 #, c-format msgid "History" msgstr "" -#: src/webex/pages/popup.tsx:171 +#: src/webex/pages/popup.tsx:164 #, c-format msgid "Debug" msgstr "" -#: src/webex/pages/popup.tsx:251 -#, c-format -msgid "help" -msgstr "" - -#: src/webex/pages/popup.tsx:256 +#: src/webex/pages/popup.tsx:200 #, c-format msgid "You have no balance to show. Need some %1$s getting started?" msgstr "" -#: src/webex/pages/popup.tsx:273 +#: src/webex/pages/popup.tsx:263 #, c-format msgid "%1$s incoming" msgstr "" -#: src/webex/pages/popup.tsx:286 +#: src/webex/pages/popup.tsx:275 #, c-format msgid "%1$s being spent" msgstr "" -#: src/webex/pages/popup.tsx:313 +#: src/webex/pages/popup.tsx:306 #, c-format msgid "Error: could not retrieve balance information." msgstr "" -#: src/webex/pages/popup.tsx:340 -#, c-format -msgid "Payback" -msgstr "" - -#: src/webex/pages/popup.tsx:341 -#, c-format -msgid "Return Electronic Cash to Bank Account" -msgstr "" - -#: src/webex/pages/popup.tsx:342 -#, c-format -msgid "Manage Trusted Auditors and Exchanges" -msgstr "" - -#: src/webex/pages/popup.tsx:354 +#: src/webex/pages/popup.tsx:335 #, c-format msgid "Bank requested reserve (%1$s) for %2$s." msgstr "" -#: src/webex/pages/popup.tsx:364 +#: src/webex/pages/popup.tsx:344 #, c-format msgid "Started to withdraw %1$s from %2$s (%3$s)." msgstr "" -#: src/webex/pages/popup.tsx:373 +#: src/webex/pages/popup.tsx:353 #, c-format msgid "Merchant %1$s offered contract %2$s." msgstr "" -#: src/webex/pages/popup.tsx:384 +#: src/webex/pages/popup.tsx:366 #, c-format -msgid "Withdrew %1$s from %2$s (%3$s)." +msgid "Withdrew %1$s from %2$s ( %3$s)." msgstr "" -#: src/webex/pages/popup.tsx:394 +#: src/webex/pages/popup.tsx:381 #, c-format -msgid "Paid %1$s to merchant %2$s. %3$s (%4$s)" +msgid "Paid %1$s to merchant %2$s.%3$s( %4$s)" msgstr "" -#: src/webex/pages/popup.tsx:404 +#: src/webex/pages/popup.tsx:391 #, c-format msgid "Merchant %1$s gave a refund over %2$s." msgstr "" -#: src/webex/pages/popup.tsx:414 +#: src/webex/pages/popup.tsx:404 #, c-format msgid "tip" msgstr "" -#: src/webex/pages/popup.tsx:418 +#: src/webex/pages/popup.tsx:408 #, c-format msgid "Merchant %1$s gave a %2$s of %3$s." msgstr "" -#: src/webex/pages/popup.tsx:422 +#: src/webex/pages/popup.tsx:414 #, c-format msgid "You did not accept the tip yet." msgstr "" -#: src/webex/pages/popup.tsx:427 +#: src/webex/pages/popup.tsx:422 #, c-format msgid "Unknown event (%1$s)" msgstr "" -#: src/webex/pages/popup.tsx:470 +#: src/webex/pages/popup.tsx:464 #, c-format msgid "Error: could not retrieve event history" msgstr "" -#: src/webex/pages/popup.tsx:495 +#: src/webex/pages/popup.tsx:489 #, c-format msgid "Your wallet has no events recorded." msgstr "" @@ -194,89 +174,89 @@ msgstr "" #. #-#-#-#-# - (PACKAGE VERSION) #-#-#-#-# #. TODO:generic error reporting function or component. -#: src/webex/pages/tip.tsx:118 src/webex/pages/withdraw.tsx:224 +#: src/webex/pages/tip.tsx:118 src/webex/pages/withdraw.tsx:216 #, c-format msgid "Fatal error: \"%1$s\"." msgstr "" -#: src/webex/pages/withdraw.tsx:81 +#: src/webex/pages/withdraw.tsx:73 #, c-format msgid "Could not get details for withdraw operation:" msgstr "" -#: src/webex/pages/withdraw.tsx:97 src/webex/pages/withdraw.tsx:187 +#: src/webex/pages/withdraw.tsx:89 src/webex/pages/withdraw.tsx:179 #, c-format msgid "Chose different exchange provider" msgstr "" -#: src/webex/pages/withdraw.tsx:116 +#: src/webex/pages/withdraw.tsx:108 #, c-format msgid "" "Please select an exchange. You can review the details before after your " "selection." msgstr "" -#: src/webex/pages/withdraw.tsx:128 +#: src/webex/pages/withdraw.tsx:120 #, c-format msgid "Select %1$s" msgstr "" -#: src/webex/pages/withdraw.tsx:150 +#: src/webex/pages/withdraw.tsx:142 #, c-format msgid "Select custom exchange" msgstr "" -#: src/webex/pages/withdraw.tsx:167 +#: src/webex/pages/withdraw.tsx:159 #, c-format msgid "You are about to withdraw %1$s from your bank account into your wallet." msgstr "" -#: src/webex/pages/withdraw.tsx:178 +#: src/webex/pages/withdraw.tsx:170 #, c-format msgid "Accept fees and withdraw" msgstr "" -#: src/webex/pages/withdraw.tsx:196 +#: src/webex/pages/withdraw.tsx:188 #, c-format msgid "Cancel withdraw operation" msgstr "" -#: src/webex/renderHtml.tsx:226 +#: src/webex/renderHtml.tsx:237 #, c-format msgid "Withdrawal fees:" msgstr "" -#: src/webex/renderHtml.tsx:227 +#: src/webex/renderHtml.tsx:240 #, c-format msgid "Rounding loss:" msgstr "" -#: src/webex/renderHtml.tsx:228 +#: src/webex/renderHtml.tsx:242 #, c-format msgid "Earliest expiration (for deposit): %1$s" msgstr "" -#: src/webex/renderHtml.tsx:234 +#: src/webex/renderHtml.tsx:250 #, c-format msgid "# Coins" msgstr "" -#: src/webex/renderHtml.tsx:235 +#: src/webex/renderHtml.tsx:251 #, c-format msgid "Value" msgstr "" -#: src/webex/renderHtml.tsx:236 +#: src/webex/renderHtml.tsx:252 #, c-format msgid "Withdraw Fee" msgstr "" -#: src/webex/renderHtml.tsx:237 +#: src/webex/renderHtml.tsx:253 #, c-format msgid "Refresh Fee" msgstr "" -#: src/webex/renderHtml.tsx:238 +#: src/webex/renderHtml.tsx:254 #, c-format msgid "Deposit Fee" msgstr "" diff --git a/src/i18n/fr.po b/src/i18n/fr.po index ee6b66eb0..56eee1dd4 100644 --- a/src/i18n/fr.po +++ b/src/i18n/fr.po @@ -27,152 +27,132 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/webex/pages/benchmark.tsx:58 +#: src/webex/pages/benchmark.tsx:57 #, c-format msgid "Operation" msgstr "" -#: src/webex/pages/benchmark.tsx:59 +#: src/webex/pages/benchmark.tsx:58 #, c-format msgid "time (ms/op)" msgstr "" -#: src/webex/pages/pay.tsx:115 +#: src/webex/pages/pay.tsx:113 #, c-format msgid "The merchant %1$s offers you to purchase:" msgstr "" -#: src/webex/pages/pay.tsx:121 +#: src/webex/pages/pay.tsx:119 #, c-format msgid "The total price is %1$s (plus %2$s fees)." msgstr "" -#: src/webex/pages/pay.tsx:126 +#: src/webex/pages/pay.tsx:124 #, c-format msgid "The total price is %1$s." msgstr "" -#: src/webex/pages/pay.tsx:140 +#: src/webex/pages/pay.tsx:138 #, c-format msgid "Retry" msgstr "" -#: src/webex/pages/pay.tsx:148 +#: src/webex/pages/pay.tsx:146 #, c-format msgid "Confirm payment" msgstr "" -#: src/webex/pages/popup.tsx:165 +#: src/webex/pages/popup.tsx:162 #, c-format msgid "Balance" msgstr "" -#: src/webex/pages/popup.tsx:168 +#: src/webex/pages/popup.tsx:163 #, c-format msgid "History" msgstr "" -#: src/webex/pages/popup.tsx:171 +#: src/webex/pages/popup.tsx:164 #, c-format msgid "Debug" msgstr "" -#: src/webex/pages/popup.tsx:251 -#, c-format -msgid "help" -msgstr "" - -#: src/webex/pages/popup.tsx:256 +#: src/webex/pages/popup.tsx:200 #, c-format msgid "You have no balance to show. Need some %1$s getting started?" msgstr "" -#: src/webex/pages/popup.tsx:273 +#: src/webex/pages/popup.tsx:263 #, c-format msgid "%1$s incoming" msgstr "" -#: src/webex/pages/popup.tsx:286 +#: src/webex/pages/popup.tsx:275 #, c-format msgid "%1$s being spent" msgstr "" -#: src/webex/pages/popup.tsx:313 +#: src/webex/pages/popup.tsx:306 #, c-format msgid "Error: could not retrieve balance information." msgstr "" -#: src/webex/pages/popup.tsx:340 -#, c-format -msgid "Payback" -msgstr "" - -#: src/webex/pages/popup.tsx:341 -#, c-format -msgid "Return Electronic Cash to Bank Account" -msgstr "" - -#: src/webex/pages/popup.tsx:342 -#, c-format -msgid "Manage Trusted Auditors and Exchanges" -msgstr "" - -#: src/webex/pages/popup.tsx:354 +#: src/webex/pages/popup.tsx:335 #, c-format msgid "Bank requested reserve (%1$s) for %2$s." msgstr "" -#: src/webex/pages/popup.tsx:364 +#: src/webex/pages/popup.tsx:344 #, c-format msgid "Started to withdraw %1$s from %2$s (%3$s)." msgstr "" -#: src/webex/pages/popup.tsx:373 +#: src/webex/pages/popup.tsx:353 #, c-format msgid "Merchant %1$s offered contract %2$s." msgstr "" -#: src/webex/pages/popup.tsx:384 +#: src/webex/pages/popup.tsx:366 #, c-format -msgid "Withdrew %1$s from %2$s (%3$s)." +msgid "Withdrew %1$s from %2$s ( %3$s)." msgstr "" -#: src/webex/pages/popup.tsx:394 +#: src/webex/pages/popup.tsx:381 #, c-format -msgid "Paid %1$s to merchant %2$s. %3$s (%4$s)" +msgid "Paid %1$s to merchant %2$s.%3$s( %4$s)" msgstr "" -#: src/webex/pages/popup.tsx:404 +#: src/webex/pages/popup.tsx:391 #, c-format msgid "Merchant %1$s gave a refund over %2$s." msgstr "" -#: src/webex/pages/popup.tsx:414 +#: src/webex/pages/popup.tsx:404 #, c-format msgid "tip" msgstr "" -#: src/webex/pages/popup.tsx:418 +#: src/webex/pages/popup.tsx:408 #, c-format msgid "Merchant %1$s gave a %2$s of %3$s." msgstr "" -#: src/webex/pages/popup.tsx:422 +#: src/webex/pages/popup.tsx:414 #, c-format msgid "You did not accept the tip yet." msgstr "" -#: src/webex/pages/popup.tsx:427 +#: src/webex/pages/popup.tsx:422 #, c-format msgid "Unknown event (%1$s)" msgstr "" -#: src/webex/pages/popup.tsx:470 +#: src/webex/pages/popup.tsx:464 #, c-format msgid "Error: could not retrieve event history" msgstr "" -#: src/webex/pages/popup.tsx:495 +#: src/webex/pages/popup.tsx:489 #, c-format msgid "Your wallet has no events recorded." msgstr "" @@ -194,89 +174,89 @@ msgstr "" #. #-#-#-#-# - (PACKAGE VERSION) #-#-#-#-# #. TODO:generic error reporting function or component. -#: src/webex/pages/tip.tsx:118 src/webex/pages/withdraw.tsx:224 +#: src/webex/pages/tip.tsx:118 src/webex/pages/withdraw.tsx:216 #, c-format msgid "Fatal error: \"%1$s\"." msgstr "" -#: src/webex/pages/withdraw.tsx:81 +#: src/webex/pages/withdraw.tsx:73 #, c-format msgid "Could not get details for withdraw operation:" msgstr "" -#: src/webex/pages/withdraw.tsx:97 src/webex/pages/withdraw.tsx:187 +#: src/webex/pages/withdraw.tsx:89 src/webex/pages/withdraw.tsx:179 #, c-format msgid "Chose different exchange provider" msgstr "" -#: src/webex/pages/withdraw.tsx:116 +#: src/webex/pages/withdraw.tsx:108 #, c-format msgid "" "Please select an exchange. You can review the details before after your " "selection." msgstr "" -#: src/webex/pages/withdraw.tsx:128 +#: src/webex/pages/withdraw.tsx:120 #, c-format msgid "Select %1$s" msgstr "" -#: src/webex/pages/withdraw.tsx:150 +#: src/webex/pages/withdraw.tsx:142 #, c-format msgid "Select custom exchange" msgstr "" -#: src/webex/pages/withdraw.tsx:167 +#: src/webex/pages/withdraw.tsx:159 #, c-format msgid "You are about to withdraw %1$s from your bank account into your wallet." msgstr "" -#: src/webex/pages/withdraw.tsx:178 +#: src/webex/pages/withdraw.tsx:170 #, c-format msgid "Accept fees and withdraw" msgstr "" -#: src/webex/pages/withdraw.tsx:196 +#: src/webex/pages/withdraw.tsx:188 #, c-format msgid "Cancel withdraw operation" msgstr "" -#: src/webex/renderHtml.tsx:226 +#: src/webex/renderHtml.tsx:237 #, c-format msgid "Withdrawal fees:" msgstr "" -#: src/webex/renderHtml.tsx:227 +#: src/webex/renderHtml.tsx:240 #, c-format msgid "Rounding loss:" msgstr "" -#: src/webex/renderHtml.tsx:228 +#: src/webex/renderHtml.tsx:242 #, c-format msgid "Earliest expiration (for deposit): %1$s" msgstr "" -#: src/webex/renderHtml.tsx:234 +#: src/webex/renderHtml.tsx:250 #, c-format msgid "# Coins" msgstr "" -#: src/webex/renderHtml.tsx:235 +#: src/webex/renderHtml.tsx:251 #, c-format msgid "Value" msgstr "" -#: src/webex/renderHtml.tsx:236 +#: src/webex/renderHtml.tsx:252 #, c-format msgid "Withdraw Fee" msgstr "" -#: src/webex/renderHtml.tsx:237 +#: src/webex/renderHtml.tsx:253 #, c-format msgid "Refresh Fee" msgstr "" -#: src/webex/renderHtml.tsx:238 +#: src/webex/renderHtml.tsx:254 #, c-format msgid "Deposit Fee" msgstr "" diff --git a/src/i18n/it.po b/src/i18n/it.po index ee6b66eb0..56eee1dd4 100644 --- a/src/i18n/it.po +++ b/src/i18n/it.po @@ -27,152 +27,132 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/webex/pages/benchmark.tsx:58 +#: src/webex/pages/benchmark.tsx:57 #, c-format msgid "Operation" msgstr "" -#: src/webex/pages/benchmark.tsx:59 +#: src/webex/pages/benchmark.tsx:58 #, c-format msgid "time (ms/op)" msgstr "" -#: src/webex/pages/pay.tsx:115 +#: src/webex/pages/pay.tsx:113 #, c-format msgid "The merchant %1$s offers you to purchase:" msgstr "" -#: src/webex/pages/pay.tsx:121 +#: src/webex/pages/pay.tsx:119 #, c-format msgid "The total price is %1$s (plus %2$s fees)." msgstr "" -#: src/webex/pages/pay.tsx:126 +#: src/webex/pages/pay.tsx:124 #, c-format msgid "The total price is %1$s." msgstr "" -#: src/webex/pages/pay.tsx:140 +#: src/webex/pages/pay.tsx:138 #, c-format msgid "Retry" msgstr "" -#: src/webex/pages/pay.tsx:148 +#: src/webex/pages/pay.tsx:146 #, c-format msgid "Confirm payment" msgstr "" -#: src/webex/pages/popup.tsx:165 +#: src/webex/pages/popup.tsx:162 #, c-format msgid "Balance" msgstr "" -#: src/webex/pages/popup.tsx:168 +#: src/webex/pages/popup.tsx:163 #, c-format msgid "History" msgstr "" -#: src/webex/pages/popup.tsx:171 +#: src/webex/pages/popup.tsx:164 #, c-format msgid "Debug" msgstr "" -#: src/webex/pages/popup.tsx:251 -#, c-format -msgid "help" -msgstr "" - -#: src/webex/pages/popup.tsx:256 +#: src/webex/pages/popup.tsx:200 #, c-format msgid "You have no balance to show. Need some %1$s getting started?" msgstr "" -#: src/webex/pages/popup.tsx:273 +#: src/webex/pages/popup.tsx:263 #, c-format msgid "%1$s incoming" msgstr "" -#: src/webex/pages/popup.tsx:286 +#: src/webex/pages/popup.tsx:275 #, c-format msgid "%1$s being spent" msgstr "" -#: src/webex/pages/popup.tsx:313 +#: src/webex/pages/popup.tsx:306 #, c-format msgid "Error: could not retrieve balance information." msgstr "" -#: src/webex/pages/popup.tsx:340 -#, c-format -msgid "Payback" -msgstr "" - -#: src/webex/pages/popup.tsx:341 -#, c-format -msgid "Return Electronic Cash to Bank Account" -msgstr "" - -#: src/webex/pages/popup.tsx:342 -#, c-format -msgid "Manage Trusted Auditors and Exchanges" -msgstr "" - -#: src/webex/pages/popup.tsx:354 +#: src/webex/pages/popup.tsx:335 #, c-format msgid "Bank requested reserve (%1$s) for %2$s." msgstr "" -#: src/webex/pages/popup.tsx:364 +#: src/webex/pages/popup.tsx:344 #, c-format msgid "Started to withdraw %1$s from %2$s (%3$s)." msgstr "" -#: src/webex/pages/popup.tsx:373 +#: src/webex/pages/popup.tsx:353 #, c-format msgid "Merchant %1$s offered contract %2$s." msgstr "" -#: src/webex/pages/popup.tsx:384 +#: src/webex/pages/popup.tsx:366 #, c-format -msgid "Withdrew %1$s from %2$s (%3$s)." +msgid "Withdrew %1$s from %2$s ( %3$s)." msgstr "" -#: src/webex/pages/popup.tsx:394 +#: src/webex/pages/popup.tsx:381 #, c-format -msgid "Paid %1$s to merchant %2$s. %3$s (%4$s)" +msgid "Paid %1$s to merchant %2$s.%3$s( %4$s)" msgstr "" -#: src/webex/pages/popup.tsx:404 +#: src/webex/pages/popup.tsx:391 #, c-format msgid "Merchant %1$s gave a refund over %2$s." msgstr "" -#: src/webex/pages/popup.tsx:414 +#: src/webex/pages/popup.tsx:404 #, c-format msgid "tip" msgstr "" -#: src/webex/pages/popup.tsx:418 +#: src/webex/pages/popup.tsx:408 #, c-format msgid "Merchant %1$s gave a %2$s of %3$s." msgstr "" -#: src/webex/pages/popup.tsx:422 +#: src/webex/pages/popup.tsx:414 #, c-format msgid "You did not accept the tip yet." msgstr "" -#: src/webex/pages/popup.tsx:427 +#: src/webex/pages/popup.tsx:422 #, c-format msgid "Unknown event (%1$s)" msgstr "" -#: src/webex/pages/popup.tsx:470 +#: src/webex/pages/popup.tsx:464 #, c-format msgid "Error: could not retrieve event history" msgstr "" -#: src/webex/pages/popup.tsx:495 +#: src/webex/pages/popup.tsx:489 #, c-format msgid "Your wallet has no events recorded." msgstr "" @@ -194,89 +174,89 @@ msgstr "" #. #-#-#-#-# - (PACKAGE VERSION) #-#-#-#-# #. TODO:generic error reporting function or component. -#: src/webex/pages/tip.tsx:118 src/webex/pages/withdraw.tsx:224 +#: src/webex/pages/tip.tsx:118 src/webex/pages/withdraw.tsx:216 #, c-format msgid "Fatal error: \"%1$s\"." msgstr "" -#: src/webex/pages/withdraw.tsx:81 +#: src/webex/pages/withdraw.tsx:73 #, c-format msgid "Could not get details for withdraw operation:" msgstr "" -#: src/webex/pages/withdraw.tsx:97 src/webex/pages/withdraw.tsx:187 +#: src/webex/pages/withdraw.tsx:89 src/webex/pages/withdraw.tsx:179 #, c-format msgid "Chose different exchange provider" msgstr "" -#: src/webex/pages/withdraw.tsx:116 +#: src/webex/pages/withdraw.tsx:108 #, c-format msgid "" "Please select an exchange. You can review the details before after your " "selection." msgstr "" -#: src/webex/pages/withdraw.tsx:128 +#: src/webex/pages/withdraw.tsx:120 #, c-format msgid "Select %1$s" msgstr "" -#: src/webex/pages/withdraw.tsx:150 +#: src/webex/pages/withdraw.tsx:142 #, c-format msgid "Select custom exchange" msgstr "" -#: src/webex/pages/withdraw.tsx:167 +#: src/webex/pages/withdraw.tsx:159 #, c-format msgid "You are about to withdraw %1$s from your bank account into your wallet." msgstr "" -#: src/webex/pages/withdraw.tsx:178 +#: src/webex/pages/withdraw.tsx:170 #, c-format msgid "Accept fees and withdraw" msgstr "" -#: src/webex/pages/withdraw.tsx:196 +#: src/webex/pages/withdraw.tsx:188 #, c-format msgid "Cancel withdraw operation" msgstr "" -#: src/webex/renderHtml.tsx:226 +#: src/webex/renderHtml.tsx:237 #, c-format msgid "Withdrawal fees:" msgstr "" -#: src/webex/renderHtml.tsx:227 +#: src/webex/renderHtml.tsx:240 #, c-format msgid "Rounding loss:" msgstr "" -#: src/webex/renderHtml.tsx:228 +#: src/webex/renderHtml.tsx:242 #, c-format msgid "Earliest expiration (for deposit): %1$s" msgstr "" -#: src/webex/renderHtml.tsx:234 +#: src/webex/renderHtml.tsx:250 #, c-format msgid "# Coins" msgstr "" -#: src/webex/renderHtml.tsx:235 +#: src/webex/renderHtml.tsx:251 #, c-format msgid "Value" msgstr "" -#: src/webex/renderHtml.tsx:236 +#: src/webex/renderHtml.tsx:252 #, c-format msgid "Withdraw Fee" msgstr "" -#: src/webex/renderHtml.tsx:237 +#: src/webex/renderHtml.tsx:253 #, c-format msgid "Refresh Fee" msgstr "" -#: src/webex/renderHtml.tsx:238 +#: src/webex/renderHtml.tsx:254 #, c-format msgid "Deposit Fee" msgstr "" diff --git a/src/i18n/strings.ts b/src/i18n/strings.ts index 069c92b40..86de3d8b6 100644 --- a/src/i18n/strings.ts +++ b/src/i18n/strings.ts @@ -64,10 +64,6 @@ strings['de'] = { null, "Debug" ], - "help": [ - null, - "" - ], "You have no balance to show. Need some %1$s getting started?": [ null, "Sie haben kein Digitalgeld. Wollen Sie %1$s? abheben?" @@ -84,18 +80,6 @@ strings['de'] = { null, "" ], - "Payback": [ - null, - "" - ], - "Return Electronic Cash to Bank Account": [ - null, - "" - ], - "Manage Trusted Auditors and Exchanges": [ - null, - "" - ], "Bank requested reserve (%1$s) for %2$s.": [ null, "Bank bestätig anlegen der Reserve (%1$s) bei %2$s" @@ -108,11 +92,11 @@ strings['de'] = { null, "%1$s\n möchte einen Vertrag über %2$s\n mit Ihnen abschließen." ], - "Withdrew %1$s from %2$s (%3$s).": [ + "Withdrew %1$s from %2$s ( %3$s).": [ null, "Reserve (%1$s) mit %2$s bei %3$s erzeugt" ], - "Paid %1$s to merchant %2$s. %3$s (%4$s)": [ + "Paid %1$s to merchant %2$s.%3$s( %4$s)": [ null, "Reserve (%1$s) mit %2$s bei %3$s erzeugt" ], @@ -292,10 +276,6 @@ strings['en-US'] = { null, "" ], - "help": [ - null, - "" - ], "You have no balance to show. Need some %1$s getting started?": [ null, "" @@ -312,18 +292,6 @@ strings['en-US'] = { null, "" ], - "Payback": [ - null, - "" - ], - "Return Electronic Cash to Bank Account": [ - null, - "" - ], - "Manage Trusted Auditors and Exchanges": [ - null, - "" - ], "Bank requested reserve (%1$s) for %2$s.": [ null, "" @@ -336,11 +304,11 @@ strings['en-US'] = { null, "" ], - "Withdrew %1$s from %2$s (%3$s).": [ + "Withdrew %1$s from %2$s ( %3$s).": [ null, "" ], - "Paid %1$s to merchant %2$s. %3$s (%4$s)": [ + "Paid %1$s to merchant %2$s.%3$s( %4$s)": [ null, "" ], @@ -520,10 +488,6 @@ strings['fr'] = { null, "" ], - "help": [ - null, - "" - ], "You have no balance to show. Need some %1$s getting started?": [ null, "" @@ -540,18 +504,6 @@ strings['fr'] = { null, "" ], - "Payback": [ - null, - "" - ], - "Return Electronic Cash to Bank Account": [ - null, - "" - ], - "Manage Trusted Auditors and Exchanges": [ - null, - "" - ], "Bank requested reserve (%1$s) for %2$s.": [ null, "" @@ -564,11 +516,11 @@ strings['fr'] = { null, "" ], - "Withdrew %1$s from %2$s (%3$s).": [ + "Withdrew %1$s from %2$s ( %3$s).": [ null, "" ], - "Paid %1$s to merchant %2$s. %3$s (%4$s)": [ + "Paid %1$s to merchant %2$s.%3$s( %4$s)": [ null, "" ], @@ -748,10 +700,6 @@ strings['it'] = { null, "" ], - "help": [ - null, - "" - ], "You have no balance to show. Need some %1$s getting started?": [ null, "" @@ -768,18 +716,6 @@ strings['it'] = { null, "" ], - "Payback": [ - null, - "" - ], - "Return Electronic Cash to Bank Account": [ - null, - "" - ], - "Manage Trusted Auditors and Exchanges": [ - null, - "" - ], "Bank requested reserve (%1$s) for %2$s.": [ null, "" @@ -792,11 +728,11 @@ strings['it'] = { null, "" ], - "Withdrew %1$s from %2$s (%3$s).": [ + "Withdrew %1$s from %2$s ( %3$s).": [ null, "" ], - "Paid %1$s to merchant %2$s. %3$s (%4$s)": [ + "Paid %1$s to merchant %2$s.%3$s( %4$s)": [ null, "" ], @@ -976,10 +912,6 @@ strings['sv'] = { null, "" ], - "help": [ - null, - "hjälp" - ], "You have no balance to show. Need some %1$s getting started?": [ null, "Du har ingen balans att visa. Behöver du\n %1$s att börja?\n" @@ -996,18 +928,6 @@ strings['sv'] = { null, "" ], - "Payback": [ - null, - "Återbetalning" - ], - "Return Electronic Cash to Bank Account": [ - null, - "Återlämna elektroniska pengar till bank konto" - ], - "Manage Trusted Auditors and Exchanges": [ - null, - "" - ], "Bank requested reserve (%1$s) for %2$s.": [ null, "" @@ -1020,11 +940,11 @@ strings['sv'] = { null, "Säljaren %1$s erbjöd kontrakt %2$s.\n" ], - "Withdrew %1$s from %2$s (%3$s).": [ + "Withdrew %1$s from %2$s ( %3$s).": [ null, "" ], - "Paid %1$s to merchant %2$s. %3$s (%4$s)": [ + "Paid %1$s to merchant %2$s.%3$s( %4$s)": [ null, "" ], diff --git a/src/i18n/sv.po b/src/i18n/sv.po index 97e510f44..c1c0d4560 100644 --- a/src/i18n/sv.po +++ b/src/i18n/sv.po @@ -27,154 +27,134 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/webex/pages/benchmark.tsx:58 +#: src/webex/pages/benchmark.tsx:57 #, c-format msgid "Operation" msgstr "" -#: src/webex/pages/benchmark.tsx:59 +#: src/webex/pages/benchmark.tsx:58 #, c-format msgid "time (ms/op)" msgstr "" -#: src/webex/pages/pay.tsx:115 +#: src/webex/pages/pay.tsx:113 #, fuzzy, c-format msgid "The merchant %1$s offers you to purchase:" msgstr "Säljaren %1$s erbjuder följande:" -#: src/webex/pages/pay.tsx:121 +#: src/webex/pages/pay.tsx:119 #, fuzzy, c-format msgid "The total price is %1$s (plus %2$s fees)." msgstr "Det totala priset är %1$s (plus %2$s avgifter).\n" -#: src/webex/pages/pay.tsx:126 +#: src/webex/pages/pay.tsx:124 #, fuzzy, c-format msgid "The total price is %1$s." msgstr "Det totala priset är %1$s." -#: src/webex/pages/pay.tsx:140 +#: src/webex/pages/pay.tsx:138 #, c-format msgid "Retry" msgstr "" -#: src/webex/pages/pay.tsx:148 +#: src/webex/pages/pay.tsx:146 #, c-format msgid "Confirm payment" msgstr "Godkän betalning" -#: src/webex/pages/popup.tsx:165 +#: src/webex/pages/popup.tsx:162 #, c-format msgid "Balance" msgstr "Balans" -#: src/webex/pages/popup.tsx:168 +#: src/webex/pages/popup.tsx:163 #, c-format msgid "History" msgstr "Historia" -#: src/webex/pages/popup.tsx:171 +#: src/webex/pages/popup.tsx:164 #, c-format msgid "Debug" msgstr "" -#: src/webex/pages/popup.tsx:251 -#, c-format -msgid "help" -msgstr "hjälp" - -#: src/webex/pages/popup.tsx:256 +#: src/webex/pages/popup.tsx:200 #, 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:273 +#: src/webex/pages/popup.tsx:263 #, fuzzy, c-format msgid "%1$s incoming" msgstr "%1$s inkommande" -#: src/webex/pages/popup.tsx:286 +#: src/webex/pages/popup.tsx:275 #, c-format msgid "%1$s being spent" msgstr "" -#: src/webex/pages/popup.tsx:313 +#: src/webex/pages/popup.tsx:306 #, c-format msgid "Error: could not retrieve balance information." msgstr "" -#: src/webex/pages/popup.tsx:340 -#, c-format -msgid "Payback" -msgstr "Återbetalning" - -#: src/webex/pages/popup.tsx:341 -#, c-format -msgid "Return Electronic Cash to Bank Account" -msgstr "Återlämna elektroniska pengar till bank konto" - -#: src/webex/pages/popup.tsx:342 -#, c-format -msgid "Manage Trusted Auditors and Exchanges" -msgstr "" - -#: src/webex/pages/popup.tsx:354 +#: src/webex/pages/popup.tsx:335 #, c-format msgid "Bank requested reserve (%1$s) for %2$s." msgstr "" -#: src/webex/pages/popup.tsx:364 +#: src/webex/pages/popup.tsx:344 #, c-format msgid "Started to withdraw %1$s from %2$s (%3$s)." msgstr "" -#: src/webex/pages/popup.tsx:373 +#: src/webex/pages/popup.tsx:353 #, fuzzy, c-format msgid "Merchant %1$s offered contract %2$s." msgstr "Säljaren %1$s erbjöd kontrakt %2$s.\n" -#: src/webex/pages/popup.tsx:384 +#: src/webex/pages/popup.tsx:366 #, c-format -msgid "Withdrew %1$s from %2$s (%3$s)." +msgid "Withdrew %1$s from %2$s ( %3$s)." msgstr "" -#: src/webex/pages/popup.tsx:394 +#: src/webex/pages/popup.tsx:381 #, c-format -msgid "Paid %1$s to merchant %2$s. %3$s (%4$s)" +msgid "Paid %1$s to merchant %2$s.%3$s( %4$s)" msgstr "" -#: src/webex/pages/popup.tsx:404 +#: src/webex/pages/popup.tsx:391 #, fuzzy, c-format msgid "Merchant %1$s gave a refund over %2$s." msgstr "Säljaren %1$sgav en återbetalning på %2$s.\n" -#: src/webex/pages/popup.tsx:414 +#: src/webex/pages/popup.tsx:404 #, c-format msgid "tip" msgstr "" -#: src/webex/pages/popup.tsx:418 +#: src/webex/pages/popup.tsx:408 #, fuzzy, c-format msgid "Merchant %1$s gave a %2$s of %3$s." msgstr "Säljaren %1$sgav en återbetalning på %2$s.\n" -#: src/webex/pages/popup.tsx:422 +#: src/webex/pages/popup.tsx:414 #, c-format msgid "You did not accept the tip yet." msgstr "" -#: src/webex/pages/popup.tsx:427 +#: src/webex/pages/popup.tsx:422 #, c-format msgid "Unknown event (%1$s)" msgstr "" -#: src/webex/pages/popup.tsx:470 +#: src/webex/pages/popup.tsx:464 #, c-format msgid "Error: could not retrieve event history" msgstr "" -#: src/webex/pages/popup.tsx:495 +#: src/webex/pages/popup.tsx:489 #, c-format msgid "Your wallet has no events recorded." msgstr "plånboken" @@ -196,91 +176,91 @@ msgstr "Avbryt" #. #-#-#-#-# - (PACKAGE VERSION) #-#-#-#-# #. TODO:generic error reporting function or component. -#: src/webex/pages/tip.tsx:118 src/webex/pages/withdraw.tsx:224 +#: src/webex/pages/tip.tsx:118 src/webex/pages/withdraw.tsx:216 #, c-format msgid "Fatal error: \"%1$s\"." msgstr "" -#: src/webex/pages/withdraw.tsx:81 +#: src/webex/pages/withdraw.tsx:73 #, c-format msgid "Could not get details for withdraw operation:" msgstr "" -#: src/webex/pages/withdraw.tsx:97 src/webex/pages/withdraw.tsx:187 +#: src/webex/pages/withdraw.tsx:89 src/webex/pages/withdraw.tsx:179 #, fuzzy, c-format msgid "Chose different exchange provider" msgstr "Ändra tjänsteleverantörer" -#: src/webex/pages/withdraw.tsx:116 +#: src/webex/pages/withdraw.tsx:108 #, c-format msgid "" "Please select an exchange. You can review the details before after your " "selection." msgstr "" -#: src/webex/pages/withdraw.tsx:128 +#: src/webex/pages/withdraw.tsx:120 #, fuzzy, c-format msgid "Select %1$s" msgstr "Välj %1$s" -#: src/webex/pages/withdraw.tsx:150 +#: src/webex/pages/withdraw.tsx:142 #, c-format msgid "Select custom exchange" msgstr "" -#: src/webex/pages/withdraw.tsx:167 +#: src/webex/pages/withdraw.tsx:159 #, 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/withdraw.tsx:178 +#: src/webex/pages/withdraw.tsx:170 #, c-format msgid "Accept fees and withdraw" msgstr "Acceptera avgifter och utbetala" -#: src/webex/pages/withdraw.tsx:196 +#: src/webex/pages/withdraw.tsx:188 #, c-format msgid "Cancel withdraw operation" msgstr "" -#: src/webex/renderHtml.tsx:226 +#: src/webex/renderHtml.tsx:237 #, c-format msgid "Withdrawal fees:" msgstr "Utbetalnings avgifter:" -#: src/webex/renderHtml.tsx:227 +#: src/webex/renderHtml.tsx:240 #, c-format msgid "Rounding loss:" msgstr "" -#: src/webex/renderHtml.tsx:228 +#: src/webex/renderHtml.tsx:242 #, c-format msgid "Earliest expiration (for deposit): %1$s" msgstr "" -#: src/webex/renderHtml.tsx:234 +#: src/webex/renderHtml.tsx:250 #, c-format msgid "# Coins" msgstr "# Mynt" -#: src/webex/renderHtml.tsx:235 +#: src/webex/renderHtml.tsx:251 #, c-format msgid "Value" msgstr "Värde" -#: src/webex/renderHtml.tsx:236 +#: src/webex/renderHtml.tsx:252 #, c-format msgid "Withdraw Fee" msgstr "Utbetalnings avgift" -#: src/webex/renderHtml.tsx:237 +#: src/webex/renderHtml.tsx:253 #, c-format msgid "Refresh Fee" msgstr "Återhämtnings avgift" -#: src/webex/renderHtml.tsx:238 +#: src/webex/renderHtml.tsx:254 #, c-format msgid "Deposit Fee" msgstr "Depostitions avgift" @@ -305,6 +285,18 @@ msgstr "" msgid "Unknown Wire Detail" msgstr "visa mer" +#, c-format +#~ msgid "help" +#~ msgstr "hjälp" + +#, c-format +#~ msgid "Payback" +#~ msgstr "Återbetalning" + +#, c-format +#~ msgid "Return Electronic Cash to Bank Account" +#~ msgstr "Återlämna elektroniska pengar till bank konto" + #, fuzzy, c-format #~ msgid "show more details" #~ msgstr "visa mer" diff --git a/src/i18n/taler-wallet-webex.pot b/src/i18n/taler-wallet-webex.pot index ee6b66eb0..56eee1dd4 100644 --- a/src/i18n/taler-wallet-webex.pot +++ b/src/i18n/taler-wallet-webex.pot @@ -27,152 +27,132 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/webex/pages/benchmark.tsx:58 +#: src/webex/pages/benchmark.tsx:57 #, c-format msgid "Operation" msgstr "" -#: src/webex/pages/benchmark.tsx:59 +#: src/webex/pages/benchmark.tsx:58 #, c-format msgid "time (ms/op)" msgstr "" -#: src/webex/pages/pay.tsx:115 +#: src/webex/pages/pay.tsx:113 #, c-format msgid "The merchant %1$s offers you to purchase:" msgstr "" -#: src/webex/pages/pay.tsx:121 +#: src/webex/pages/pay.tsx:119 #, c-format msgid "The total price is %1$s (plus %2$s fees)." msgstr "" -#: src/webex/pages/pay.tsx:126 +#: src/webex/pages/pay.tsx:124 #, c-format msgid "The total price is %1$s." msgstr "" -#: src/webex/pages/pay.tsx:140 +#: src/webex/pages/pay.tsx:138 #, c-format msgid "Retry" msgstr "" -#: src/webex/pages/pay.tsx:148 +#: src/webex/pages/pay.tsx:146 #, c-format msgid "Confirm payment" msgstr "" -#: src/webex/pages/popup.tsx:165 +#: src/webex/pages/popup.tsx:162 #, c-format msgid "Balance" msgstr "" -#: src/webex/pages/popup.tsx:168 +#: src/webex/pages/popup.tsx:163 #, c-format msgid "History" msgstr "" -#: src/webex/pages/popup.tsx:171 +#: src/webex/pages/popup.tsx:164 #, c-format msgid "Debug" msgstr "" -#: src/webex/pages/popup.tsx:251 -#, c-format -msgid "help" -msgstr "" - -#: src/webex/pages/popup.tsx:256 +#: src/webex/pages/popup.tsx:200 #, c-format msgid "You have no balance to show. Need some %1$s getting started?" msgstr "" -#: src/webex/pages/popup.tsx:273 +#: src/webex/pages/popup.tsx:263 #, c-format msgid "%1$s incoming" msgstr "" -#: src/webex/pages/popup.tsx:286 +#: src/webex/pages/popup.tsx:275 #, c-format msgid "%1$s being spent" msgstr "" -#: src/webex/pages/popup.tsx:313 +#: src/webex/pages/popup.tsx:306 #, c-format msgid "Error: could not retrieve balance information." msgstr "" -#: src/webex/pages/popup.tsx:340 -#, c-format -msgid "Payback" -msgstr "" - -#: src/webex/pages/popup.tsx:341 -#, c-format -msgid "Return Electronic Cash to Bank Account" -msgstr "" - -#: src/webex/pages/popup.tsx:342 -#, c-format -msgid "Manage Trusted Auditors and Exchanges" -msgstr "" - -#: src/webex/pages/popup.tsx:354 +#: src/webex/pages/popup.tsx:335 #, c-format msgid "Bank requested reserve (%1$s) for %2$s." msgstr "" -#: src/webex/pages/popup.tsx:364 +#: src/webex/pages/popup.tsx:344 #, c-format msgid "Started to withdraw %1$s from %2$s (%3$s)." msgstr "" -#: src/webex/pages/popup.tsx:373 +#: src/webex/pages/popup.tsx:353 #, c-format msgid "Merchant %1$s offered contract %2$s." msgstr "" -#: src/webex/pages/popup.tsx:384 +#: src/webex/pages/popup.tsx:366 #, c-format -msgid "Withdrew %1$s from %2$s (%3$s)." +msgid "Withdrew %1$s from %2$s ( %3$s)." msgstr "" -#: src/webex/pages/popup.tsx:394 +#: src/webex/pages/popup.tsx:381 #, c-format -msgid "Paid %1$s to merchant %2$s. %3$s (%4$s)" +msgid "Paid %1$s to merchant %2$s.%3$s( %4$s)" msgstr "" -#: src/webex/pages/popup.tsx:404 +#: src/webex/pages/popup.tsx:391 #, c-format msgid "Merchant %1$s gave a refund over %2$s." msgstr "" -#: src/webex/pages/popup.tsx:414 +#: src/webex/pages/popup.tsx:404 #, c-format msgid "tip" msgstr "" -#: src/webex/pages/popup.tsx:418 +#: src/webex/pages/popup.tsx:408 #, c-format msgid "Merchant %1$s gave a %2$s of %3$s." msgstr "" -#: src/webex/pages/popup.tsx:422 +#: src/webex/pages/popup.tsx:414 #, c-format msgid "You did not accept the tip yet." msgstr "" -#: src/webex/pages/popup.tsx:427 +#: src/webex/pages/popup.tsx:422 #, c-format msgid "Unknown event (%1$s)" msgstr "" -#: src/webex/pages/popup.tsx:470 +#: src/webex/pages/popup.tsx:464 #, c-format msgid "Error: could not retrieve event history" msgstr "" -#: src/webex/pages/popup.tsx:495 +#: src/webex/pages/popup.tsx:489 #, c-format msgid "Your wallet has no events recorded." msgstr "" @@ -194,89 +174,89 @@ msgstr "" #. #-#-#-#-# - (PACKAGE VERSION) #-#-#-#-# #. TODO:generic error reporting function or component. -#: src/webex/pages/tip.tsx:118 src/webex/pages/withdraw.tsx:224 +#: src/webex/pages/tip.tsx:118 src/webex/pages/withdraw.tsx:216 #, c-format msgid "Fatal error: \"%1$s\"." msgstr "" -#: src/webex/pages/withdraw.tsx:81 +#: src/webex/pages/withdraw.tsx:73 #, c-format msgid "Could not get details for withdraw operation:" msgstr "" -#: src/webex/pages/withdraw.tsx:97 src/webex/pages/withdraw.tsx:187 +#: src/webex/pages/withdraw.tsx:89 src/webex/pages/withdraw.tsx:179 #, c-format msgid "Chose different exchange provider" msgstr "" -#: src/webex/pages/withdraw.tsx:116 +#: src/webex/pages/withdraw.tsx:108 #, c-format msgid "" "Please select an exchange. You can review the details before after your " "selection." msgstr "" -#: src/webex/pages/withdraw.tsx:128 +#: src/webex/pages/withdraw.tsx:120 #, c-format msgid "Select %1$s" msgstr "" -#: src/webex/pages/withdraw.tsx:150 +#: src/webex/pages/withdraw.tsx:142 #, c-format msgid "Select custom exchange" msgstr "" -#: src/webex/pages/withdraw.tsx:167 +#: src/webex/pages/withdraw.tsx:159 #, c-format msgid "You are about to withdraw %1$s from your bank account into your wallet." msgstr "" -#: src/webex/pages/withdraw.tsx:178 +#: src/webex/pages/withdraw.tsx:170 #, c-format msgid "Accept fees and withdraw" msgstr "" -#: src/webex/pages/withdraw.tsx:196 +#: src/webex/pages/withdraw.tsx:188 #, c-format msgid "Cancel withdraw operation" msgstr "" -#: src/webex/renderHtml.tsx:226 +#: src/webex/renderHtml.tsx:237 #, c-format msgid "Withdrawal fees:" msgstr "" -#: src/webex/renderHtml.tsx:227 +#: src/webex/renderHtml.tsx:240 #, c-format msgid "Rounding loss:" msgstr "" -#: src/webex/renderHtml.tsx:228 +#: src/webex/renderHtml.tsx:242 #, c-format msgid "Earliest expiration (for deposit): %1$s" msgstr "" -#: src/webex/renderHtml.tsx:234 +#: src/webex/renderHtml.tsx:250 #, c-format msgid "# Coins" msgstr "" -#: src/webex/renderHtml.tsx:235 +#: src/webex/renderHtml.tsx:251 #, c-format msgid "Value" msgstr "" -#: src/webex/renderHtml.tsx:236 +#: src/webex/renderHtml.tsx:252 #, c-format msgid "Withdraw Fee" msgstr "" -#: src/webex/renderHtml.tsx:237 +#: src/webex/renderHtml.tsx:253 #, c-format msgid "Refresh Fee" msgstr "" -#: src/webex/renderHtml.tsx:238 +#: src/webex/renderHtml.tsx:254 #, c-format msgid "Deposit Fee" msgstr "" diff --git a/src/wallet.ts b/src/wallet.ts index bbdcf9224..cec656ad0 100644 --- a/src/wallet.ts +++ b/src/wallet.ts @@ -785,6 +785,9 @@ export class Wallet { "merchant with different public key offered contract with same fulfillment URL as an existing purchase", ); } else { + if (uriResult.sessionId) { + await this.submitPay(differentPurchase.contractTermsHash, uriResult.sessionId); + } return { status: "paid", contractTerms: differentPurchase.contractTerms,