diff options
| -rw-r--r-- | manifest.json | 4 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | src/i18n/de.po | 196 | ||||
| -rw-r--r-- | src/i18n/en-US.po | 176 | ||||
| -rw-r--r-- | src/i18n/fr.po | 176 | ||||
| -rw-r--r-- | src/i18n/it.po | 176 | ||||
| -rw-r--r-- | src/i18n/strings.ts | 556 | ||||
| -rw-r--r-- | src/i18n/sv.po | 262 | ||||
| -rw-r--r-- | src/i18n/taler-wallet-webex.pot | 176 | ||||
| -rw-r--r-- | src/wallet.ts | 4 |
10 files changed, 303 insertions, 1425 deletions
diff --git a/manifest.json b/manifest.json index 809f5bab8..86928bf0d 100644 --- a/manifest.json +++ b/manifest.json @@ -4,8 +4,8 @@ "name": "GNU Taler Wallet (git)", "description": "Privacy preserving and transparent payments", "author": "GNU Taler Developers", - "version": "0.6.66", - "version_name": "0.5.2", + "version": "0.6.68", + "version_name": "0.6.0pre1", "minimum_chrome_version": "51", "minimum_opera_version": "36", diff --git a/package.json b/package.json index 184230a7c..8588b091d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "taler-wallet", - "version": "0.6.2", + "version": "0.6.3", "description": "", "main": "dist/node/index.js", "repository": { diff --git a/src/i18n/de.po b/src/i18n/de.po index fa55b7e9e..6a27556c7 100644 --- a/src/i18n/de.po +++ b/src/i18n/de.po @@ -37,87 +37,31 @@ msgstr "" msgid "time (ms/op)" msgstr "" -#: src/webex/pages/pay.tsx:78 -#, c-format -msgid "show more details" -msgstr "" - -#: src/webex/pages/pay.tsx:92 -#, c-format -msgid "Accepted exchanges:" -msgstr "" +#: src/webex/pages/pay.tsx:115 +#, 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:97 +#: src/webex/pages/pay.tsx:121 #, c-format -msgid "Exchanges in the wallet:" +msgid "The total price is %1$s (plus %2$s fees)." msgstr "" -#: src/webex/pages/pay.tsx:219 +#: src/webex/pages/pay.tsx:126 #, c-format -msgid "You have insufficient funds of the requested currency in your wallet." +msgid "The total price is %1$s." msgstr "" -#. tslint:disable-next-line:max-line-length -#: src/webex/pages/pay.tsx:221 +#: src/webex/pages/pay.tsx:140 #, c-format -msgid "" -"You do not have any funds from an exchange that is accepted by this " -"merchant. None of the exchanges accepted by the merchant is known to your " -"wallet." +msgid "Retry" msgstr "" -#: src/webex/pages/pay.tsx:322 +#: src/webex/pages/pay.tsx:148 #, fuzzy, c-format msgid "Confirm payment" msgstr "Bezahlung bestätigen" -#: src/webex/pages/pay.tsx:332 -#, fuzzy, c-format -msgid "Submitting payment" -msgstr "Bezahlung bestätigen" - -#: src/webex/pages/pay.tsx:343 -#, c-format -msgid "" -"You already paid for this, clicking \"Confirm payment\" will not cost money " -"again." -msgstr "" - -#: src/webex/pages/pay.tsx:357 -#, fuzzy, c-format -msgid "Aborting payment ..." -msgstr "Bezahlung bestätigen" - -#: src/webex/pages/pay.tsx:359 -#, c-format -msgid "Payment aborted!" -msgstr "" - -#: src/webex/pages/pay.tsx:362 -#, fuzzy, c-format -msgid "Retry Payment" -msgstr "Bezahlung bestätigen" - -#: src/webex/pages/pay.tsx:365 -#, fuzzy, c-format -msgid "Abort Payment" -msgstr "Bezahlung bestätigen" - -#: src/webex/pages/pay.tsx:374 -#, 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:383 -#, c-format -msgid "The total price is %1$s (plus %2$s fees)." -msgstr "" - -#: src/webex/pages/pay.tsx:387 -#, c-format -msgid "The total price is %1$s." -msgstr "" - #: src/webex/pages/popup.tsx:165 #, c-format msgid "Balance" @@ -259,123 +203,51 @@ msgstr "Saldo" #. #-#-#-#-# - (PACKAGE VERSION) #-#-#-#-# #. TODO:generic error reporting function or component. -#: src/webex/pages/tip.tsx:180 src/webex/pages/withdraw.tsx:519 +#: src/webex/pages/tip.tsx:118 src/webex/pages/withdraw.tsx:224 #, c-format msgid "Fatal error: \"%1$s\"." msgstr "" -#: src/webex/pages/withdraw.tsx:128 -#, c-format -msgid "Select" -msgstr "" - -#: src/webex/pages/withdraw.tsx:145 -#, c-format -msgid "Error: URL may not be relative" -msgstr "" - -#: src/webex/pages/withdraw.tsx:160 +#: src/webex/pages/withdraw.tsx:81 #, c-format -msgid "Invalid exchange URL (%1$s)" +msgid "Could not get details for withdraw operation:" msgstr "" -#: src/webex/pages/withdraw.tsx:210 +#: src/webex/pages/withdraw.tsx:97 src/webex/pages/withdraw.tsx:187 #, c-format -msgid "The exchange is trusted by the wallet." +msgid "Chose different exchange provider" msgstr "" -#: src/webex/pages/withdraw.tsx:216 -#, c-format -msgid "The exchange is audited by a trusted auditor." -msgstr "" - -#: src/webex/pages/withdraw.tsx:222 -#, c-format -msgid "" -"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/withdraw.tsx:231 -#, c-format -msgid "" -"Using exchange provider %1$s. The exchange provider will charge %2$s in fees." -msgstr "" - -#: src/webex/pages/withdraw.tsx:243 -#, c-format -msgid "Waiting for a response from %1$s %2$s" -msgstr "" - -#: src/webex/pages/withdraw.tsx:260 -#, c-format -msgid "" -"Information about fees will be available when an exchange provider is " -"selected." -msgstr "" - -#: src/webex/pages/withdraw.tsx:279 -#, c-format -msgid "" -"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/withdraw.tsx:290 -#, c-format -msgid "" -"The chosen exchange (protocol version %1$s might be outdated.%2$s The " -"exchange has a lower, incompatible protocol version than your wallet " -"(protocol version %3$s)." -msgstr "" - -#: src/webex/pages/withdraw.tsx:309 -#, c-format -msgid "Accept fees and withdraw" -msgstr "" - -#: src/webex/pages/withdraw.tsx:314 -#, c-format -msgid "Change Exchange Provider" -msgstr "" - -#: src/webex/pages/withdraw.tsx:335 +#: src/webex/pages/withdraw.tsx:116 #, c-format msgid "" "Please select an exchange. You can review the details before after your " "selection." msgstr "" -#: src/webex/pages/withdraw.tsx:341 src/webex/pages/withdraw.tsx:353 +#: src/webex/pages/withdraw.tsx:128 #, c-format msgid "Select %1$s" msgstr "" -#: src/webex/pages/withdraw.tsx:370 -#, c-format -msgid "You are about to withdraw %1$s from your bank account into your wallet." -msgstr "" - -#: src/webex/pages/withdraw.tsx:459 +#: src/webex/pages/withdraw.tsx:150 #, c-format -msgid "" -"Oops, something went wrong. The wallet responded with error status (%1$s)." +msgid "Select custom exchange" msgstr "" -#: src/webex/pages/withdraw.tsx:468 +#: src/webex/pages/withdraw.tsx:167 #, c-format -msgid "Checking URL, please wait ..." +msgid "You are about to withdraw %1$s from your bank account into your wallet." msgstr "" -#: src/webex/pages/withdraw.tsx:482 +#: src/webex/pages/withdraw.tsx:178 #, c-format -msgid "Can't parse amount: %1$s" +msgid "Accept fees and withdraw" msgstr "" -#: src/webex/pages/withdraw.tsx:489 +#: src/webex/pages/withdraw.tsx:196 #, c-format -msgid "Can't parse wire_types: %1$s" +msgid "Cancel withdraw operation" msgstr "" #: src/webex/renderHtml.tsx:225 @@ -438,6 +310,22 @@ msgstr "" msgid "Unknown Wire Detail" msgstr "" +#, fuzzy, c-format +#~ msgid "Submitting payment" +#~ msgstr "Bezahlung bestätigen" + +#, fuzzy, c-format +#~ msgid "Aborting payment ..." +#~ msgstr "Bezahlung bestätigen" + +#, fuzzy, c-format +#~ msgid "Retry Payment" +#~ msgstr "Bezahlung bestätigen" + +#, fuzzy, c-format +#~ msgid "Abort Payment" +#~ msgstr "Bezahlung bestätigen" + #, fuzzy #~ msgid "You are about to purchase:" #~ msgstr "Sie sind dabei, Folgendes zu kaufen:" diff --git a/src/i18n/en-US.po b/src/i18n/en-US.po index 83f25dd3e..558ec7177 100644 --- a/src/i18n/en-US.po +++ b/src/i18n/en-US.po @@ -37,87 +37,31 @@ msgstr "" msgid "time (ms/op)" msgstr "" -#: src/webex/pages/pay.tsx:78 +#: src/webex/pages/pay.tsx:115 #, c-format -msgid "show more details" +msgid "The merchant %1$s offers you to purchase:" msgstr "" -#: src/webex/pages/pay.tsx:92 +#: src/webex/pages/pay.tsx:121 #, c-format -msgid "Accepted exchanges:" +msgid "The total price is %1$s (plus %2$s fees)." msgstr "" -#: src/webex/pages/pay.tsx:97 +#: src/webex/pages/pay.tsx:126 #, c-format -msgid "Exchanges in the wallet:" +msgid "The total price is %1$s." msgstr "" -#: src/webex/pages/pay.tsx:219 +#: src/webex/pages/pay.tsx:140 #, c-format -msgid "You have insufficient funds of the requested currency in your wallet." +msgid "Retry" msgstr "" -#. tslint:disable-next-line:max-line-length -#: src/webex/pages/pay.tsx:221 -#, c-format -msgid "" -"You do not have any funds from an exchange that is accepted by this " -"merchant. None of the exchanges accepted by the merchant is known to your " -"wallet." -msgstr "" - -#: src/webex/pages/pay.tsx:322 +#: src/webex/pages/pay.tsx:148 #, c-format msgid "Confirm payment" msgstr "" -#: src/webex/pages/pay.tsx:332 -#, c-format -msgid "Submitting payment" -msgstr "" - -#: src/webex/pages/pay.tsx:343 -#, c-format -msgid "" -"You already paid for this, clicking \"Confirm payment\" will not cost money " -"again." -msgstr "" - -#: src/webex/pages/pay.tsx:357 -#, c-format -msgid "Aborting payment ..." -msgstr "" - -#: src/webex/pages/pay.tsx:359 -#, c-format -msgid "Payment aborted!" -msgstr "" - -#: src/webex/pages/pay.tsx:362 -#, c-format -msgid "Retry Payment" -msgstr "" - -#: src/webex/pages/pay.tsx:365 -#, c-format -msgid "Abort Payment" -msgstr "" - -#: src/webex/pages/pay.tsx:374 -#, c-format -msgid "The merchant %1$s offers you to purchase:" -msgstr "" - -#: src/webex/pages/pay.tsx:383 -#, c-format -msgid "The total price is %1$s (plus %2$s fees)." -msgstr "" - -#: src/webex/pages/pay.tsx:387 -#, c-format -msgid "The total price is %1$s." -msgstr "" - #: src/webex/pages/popup.tsx:165 #, c-format msgid "Balance" @@ -250,123 +194,51 @@ msgstr "" #. #-#-#-#-# - (PACKAGE VERSION) #-#-#-#-# #. TODO:generic error reporting function or component. -#: src/webex/pages/tip.tsx:180 src/webex/pages/withdraw.tsx:519 +#: src/webex/pages/tip.tsx:118 src/webex/pages/withdraw.tsx:224 #, c-format msgid "Fatal error: \"%1$s\"." msgstr "" -#: src/webex/pages/withdraw.tsx:128 -#, c-format -msgid "Select" -msgstr "" - -#: src/webex/pages/withdraw.tsx:145 -#, c-format -msgid "Error: URL may not be relative" -msgstr "" - -#: src/webex/pages/withdraw.tsx:160 -#, c-format -msgid "Invalid exchange URL (%1$s)" -msgstr "" - -#: src/webex/pages/withdraw.tsx:210 -#, c-format -msgid "The exchange is trusted by the wallet." -msgstr "" - -#: src/webex/pages/withdraw.tsx:216 -#, c-format -msgid "The exchange is audited by a trusted auditor." -msgstr "" - -#: src/webex/pages/withdraw.tsx:222 +#: src/webex/pages/withdraw.tsx:81 #, c-format -msgid "" -"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/withdraw.tsx:231 -#, c-format -msgid "" -"Using exchange provider %1$s. The exchange provider will charge %2$s in fees." +msgid "Could not get details for withdraw operation:" msgstr "" -#: src/webex/pages/withdraw.tsx:243 +#: src/webex/pages/withdraw.tsx:97 src/webex/pages/withdraw.tsx:187 #, c-format -msgid "Waiting for a response from %1$s %2$s" +msgid "Chose different exchange provider" msgstr "" -#: src/webex/pages/withdraw.tsx:260 -#, c-format -msgid "" -"Information about fees will be available when an exchange provider is " -"selected." -msgstr "" - -#: src/webex/pages/withdraw.tsx:279 -#, c-format -msgid "" -"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/withdraw.tsx:290 -#, c-format -msgid "" -"The chosen exchange (protocol version %1$s might be outdated.%2$s The " -"exchange has a lower, incompatible protocol version than your wallet " -"(protocol version %3$s)." -msgstr "" - -#: src/webex/pages/withdraw.tsx:309 -#, c-format -msgid "Accept fees and withdraw" -msgstr "" - -#: src/webex/pages/withdraw.tsx:314 -#, c-format -msgid "Change Exchange Provider" -msgstr "" - -#: src/webex/pages/withdraw.tsx:335 +#: src/webex/pages/withdraw.tsx:116 #, c-format msgid "" "Please select an exchange. You can review the details before after your " "selection." msgstr "" -#: src/webex/pages/withdraw.tsx:341 src/webex/pages/withdraw.tsx:353 +#: src/webex/pages/withdraw.tsx:128 #, c-format msgid "Select %1$s" msgstr "" -#: src/webex/pages/withdraw.tsx:370 -#, c-format -msgid "You are about to withdraw %1$s from your bank account into your wallet." -msgstr "" - -#: src/webex/pages/withdraw.tsx:459 +#: src/webex/pages/withdraw.tsx:150 #, c-format -msgid "" -"Oops, something went wrong. The wallet responded with error status (%1$s)." +msgid "Select custom exchange" msgstr "" -#: src/webex/pages/withdraw.tsx:468 +#: src/webex/pages/withdraw.tsx:167 #, c-format -msgid "Checking URL, please wait ..." +msgid "You are about to withdraw %1$s from your bank account into your wallet." msgstr "" -#: src/webex/pages/withdraw.tsx:482 +#: src/webex/pages/withdraw.tsx:178 #, c-format -msgid "Can't parse amount: %1$s" +msgid "Accept fees and withdraw" msgstr "" -#: src/webex/pages/withdraw.tsx:489 +#: src/webex/pages/withdraw.tsx:196 #, c-format -msgid "Can't parse wire_types: %1$s" +msgid "Cancel withdraw operation" msgstr "" #: src/webex/renderHtml.tsx:225 diff --git a/src/i18n/fr.po b/src/i18n/fr.po index 1f0dc2a47..ba7f9ecff 100644 --- a/src/i18n/fr.po +++ b/src/i18n/fr.po @@ -37,87 +37,31 @@ msgstr "" msgid "time (ms/op)" msgstr "" -#: src/webex/pages/pay.tsx:78 +#: src/webex/pages/pay.tsx:115 #, c-format -msgid "show more details" +msgid "The merchant %1$s offers you to purchase:" msgstr "" -#: src/webex/pages/pay.tsx:92 +#: src/webex/pages/pay.tsx:121 #, c-format -msgid "Accepted exchanges:" +msgid "The total price is %1$s (plus %2$s fees)." msgstr "" -#: src/webex/pages/pay.tsx:97 +#: src/webex/pages/pay.tsx:126 #, c-format -msgid "Exchanges in the wallet:" +msgid "The total price is %1$s." msgstr "" -#: src/webex/pages/pay.tsx:219 +#: src/webex/pages/pay.tsx:140 #, c-format -msgid "You have insufficient funds of the requested currency in your wallet." +msgid "Retry" msgstr "" -#. tslint:disable-next-line:max-line-length -#: src/webex/pages/pay.tsx:221 -#, c-format -msgid "" -"You do not have any funds from an exchange that is accepted by this " -"merchant. None of the exchanges accepted by the merchant is known to your " -"wallet." -msgstr "" - -#: src/webex/pages/pay.tsx:322 +#: src/webex/pages/pay.tsx:148 #, c-format msgid "Confirm payment" msgstr "" -#: src/webex/pages/pay.tsx:332 -#, c-format -msgid "Submitting payment" -msgstr "" - -#: src/webex/pages/pay.tsx:343 -#, c-format -msgid "" -"You already paid for this, clicking \"Confirm payment\" will not cost money " -"again." -msgstr "" - -#: src/webex/pages/pay.tsx:357 -#, c-format -msgid "Aborting payment ..." -msgstr "" - -#: src/webex/pages/pay.tsx:359 -#, c-format -msgid "Payment aborted!" -msgstr "" - -#: src/webex/pages/pay.tsx:362 -#, c-format -msgid "Retry Payment" -msgstr "" - -#: src/webex/pages/pay.tsx:365 -#, c-format -msgid "Abort Payment" -msgstr "" - -#: src/webex/pages/pay.tsx:374 -#, c-format -msgid "The merchant %1$s offers you to purchase:" -msgstr "" - -#: src/webex/pages/pay.tsx:383 -#, c-format -msgid "The total price is %1$s (plus %2$s fees)." -msgstr "" - -#: src/webex/pages/pay.tsx:387 -#, c-format -msgid "The total price is %1$s." -msgstr "" - #: src/webex/pages/popup.tsx:165 #, c-format msgid "Balance" @@ -250,123 +194,51 @@ msgstr "" #. #-#-#-#-# - (PACKAGE VERSION) #-#-#-#-# #. TODO:generic error reporting function or component. -#: src/webex/pages/tip.tsx:180 src/webex/pages/withdraw.tsx:519 +#: src/webex/pages/tip.tsx:118 src/webex/pages/withdraw.tsx:224 #, c-format msgid "Fatal error: \"%1$s\"." msgstr "" -#: src/webex/pages/withdraw.tsx:128 -#, c-format -msgid "Select" -msgstr "" - -#: src/webex/pages/withdraw.tsx:145 -#, c-format -msgid "Error: URL may not be relative" -msgstr "" - -#: src/webex/pages/withdraw.tsx:160 -#, c-format -msgid "Invalid exchange URL (%1$s)" -msgstr "" - -#: src/webex/pages/withdraw.tsx:210 -#, c-format -msgid "The exchange is trusted by the wallet." -msgstr "" - -#: src/webex/pages/withdraw.tsx:216 -#, c-format -msgid "The exchange is audited by a trusted auditor." -msgstr "" - -#: src/webex/pages/withdraw.tsx:222 +#: src/webex/pages/withdraw.tsx:81 #, c-format -msgid "" -"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/withdraw.tsx:231 -#, c-format -msgid "" -"Using exchange provider %1$s. The exchange provider will charge %2$s in fees." +msgid "Could not get details for withdraw operation:" msgstr "" -#: src/webex/pages/withdraw.tsx:243 +#: src/webex/pages/withdraw.tsx:97 src/webex/pages/withdraw.tsx:187 #, c-format -msgid "Waiting for a response from %1$s %2$s" +msgid "Chose different exchange provider" msgstr "" -#: src/webex/pages/withdraw.tsx:260 -#, c-format -msgid "" -"Information about fees will be available when an exchange provider is " -"selected." -msgstr "" - -#: src/webex/pages/withdraw.tsx:279 -#, c-format -msgid "" -"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/withdraw.tsx:290 -#, c-format -msgid "" -"The chosen exchange (protocol version %1$s might be outdated.%2$s The " -"exchange has a lower, incompatible protocol version than your wallet " -"(protocol version %3$s)." -msgstr "" - -#: src/webex/pages/withdraw.tsx:309 -#, c-format -msgid "Accept fees and withdraw" -msgstr "" - -#: src/webex/pages/withdraw.tsx:314 -#, c-format -msgid "Change Exchange Provider" -msgstr "" - -#: src/webex/pages/withdraw.tsx:335 +#: src/webex/pages/withdraw.tsx:116 #, c-format msgid "" "Please select an exchange. You can review the details before after your " "selection." msgstr "" -#: src/webex/pages/withdraw.tsx:341 src/webex/pages/withdraw.tsx:353 +#: src/webex/pages/withdraw.tsx:128 #, c-format msgid "Select %1$s" msgstr "" -#: src/webex/pages/withdraw.tsx:370 -#, c-format -msgid "You are about to withdraw %1$s from your bank account into your wallet." -msgstr "" - -#: src/webex/pages/withdraw.tsx:459 +#: src/webex/pages/withdraw.tsx:150 #, c-format -msgid "" -"Oops, something went wrong. The wallet responded with error status (%1$s)." +msgid "Select custom exchange" msgstr "" -#: src/webex/pages/withdraw.tsx:468 +#: src/webex/pages/withdraw.tsx:167 #, c-format -msgid "Checking URL, please wait ..." +msgid "You are about to withdraw %1$s from your bank account into your wallet." msgstr "" -#: src/webex/pages/withdraw.tsx:482 +#: src/webex/pages/withdraw.tsx:178 #, c-format -msgid "Can't parse amount: %1$s" +msgid "Accept fees and withdraw" msgstr "" -#: src/webex/pages/withdraw.tsx:489 +#: src/webex/pages/withdraw.tsx:196 #, c-format -msgid "Can't parse wire_types: %1$s" +msgid "Cancel withdraw operation" msgstr "" #: src/webex/renderHtml.tsx:225 diff --git a/src/i18n/it.po b/src/i18n/it.po index 1f0dc2a47..ba7f9ecff 100644 --- a/src/i18n/it.po +++ b/src/i18n/it.po @@ -37,87 +37,31 @@ msgstr "" msgid "time (ms/op)" msgstr "" -#: src/webex/pages/pay.tsx:78 +#: src/webex/pages/pay.tsx:115 #, c-format -msgid "show more details" +msgid "The merchant %1$s offers you to purchase:" msgstr "" -#: src/webex/pages/pay.tsx:92 +#: src/webex/pages/pay.tsx:121 #, c-format -msgid "Accepted exchanges:" +msgid "The total price is %1$s (plus %2$s fees)." msgstr "" -#: src/webex/pages/pay.tsx:97 +#: src/webex/pages/pay.tsx:126 #, c-format -msgid "Exchanges in the wallet:" +msgid "The total price is %1$s." msgstr "" -#: src/webex/pages/pay.tsx:219 +#: src/webex/pages/pay.tsx:140 #, c-format -msgid "You have insufficient funds of the requested currency in your wallet." +msgid "Retry" msgstr "" -#. tslint:disable-next-line:max-line-length -#: src/webex/pages/pay.tsx:221 -#, c-format -msgid "" -"You do not have any funds from an exchange that is accepted by this " -"merchant. None of the exchanges accepted by the merchant is known to your " -"wallet." -msgstr "" - -#: src/webex/pages/pay.tsx:322 +#: src/webex/pages/pay.tsx:148 #, c-format msgid "Confirm payment" msgstr "" -#: src/webex/pages/pay.tsx:332 -#, c-format -msgid "Submitting payment" -msgstr "" - -#: src/webex/pages/pay.tsx:343 -#, c-format -msgid "" -"You already paid for this, clicking \"Confirm payment\" will not cost money " -"again." -msgstr "" - -#: src/webex/pages/pay.tsx:357 -#, c-format -msgid "Aborting payment ..." -msgstr "" - -#: src/webex/pages/pay.tsx:359 -#, c-format -msgid "Payment aborted!" -msgstr "" - -#: src/webex/pages/pay.tsx:362 -#, c-format -msgid "Retry Payment" -msgstr "" - -#: src/webex/pages/pay.tsx:365 -#, c-format -msgid "Abort Payment" -msgstr "" - -#: src/webex/pages/pay.tsx:374 -#, c-format -msgid "The merchant %1$s offers you to purchase:" -msgstr "" - -#: src/webex/pages/pay.tsx:383 -#, c-format -msgid "The total price is %1$s (plus %2$s fees)." -msgstr "" - -#: src/webex/pages/pay.tsx:387 -#, c-format -msgid "The total price is %1$s." -msgstr "" - #: src/webex/pages/popup.tsx:165 #, c-format msgid "Balance" @@ -250,123 +194,51 @@ msgstr "" #. #-#-#-#-# - (PACKAGE VERSION) #-#-#-#-# #. TODO:generic error reporting function or component. -#: src/webex/pages/tip.tsx:180 src/webex/pages/withdraw.tsx:519 +#: src/webex/pages/tip.tsx:118 src/webex/pages/withdraw.tsx:224 #, c-format msgid "Fatal error: \"%1$s\"." msgstr "" -#: src/webex/pages/withdraw.tsx:128 -#, c-format -msgid "Select" -msgstr "" - -#: src/webex/pages/withdraw.tsx:145 -#, c-format -msgid "Error: URL may not be relative" -msgstr "" - -#: src/webex/pages/withdraw.tsx:160 -#, c-format -msgid "Invalid exchange URL (%1$s)" -msgstr "" - -#: src/webex/pages/withdraw.tsx:210 -#, c-format -msgid "The exchange is trusted by the wallet." -msgstr "" - -#: src/webex/pages/withdraw.tsx:216 -#, c-format -msgid "The exchange is audited by a trusted auditor." -msgstr "" - -#: src/webex/pages/withdraw.tsx:222 +#: src/webex/pages/withdraw.tsx:81 #, c-format -msgid "" -"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/withdraw.tsx:231 -#, c-format -msgid "" -"Using exchange provider %1$s. The exchange provider will charge %2$s in fees." +msgid "Could not get details for withdraw operation:" msgstr "" -#: src/webex/pages/withdraw.tsx:243 +#: src/webex/pages/withdraw.tsx:97 src/webex/pages/withdraw.tsx:187 #, c-format -msgid "Waiting for a response from %1$s %2$s" +msgid "Chose different exchange provider" msgstr "" -#: src/webex/pages/withdraw.tsx:260 -#, c-format -msgid "" -"Information about fees will be available when an exchange provider is " -"selected." -msgstr "" - -#: src/webex/pages/withdraw.tsx:279 -#, c-format -msgid "" -"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/withdraw.tsx:290 -#, c-format -msgid "" -"The chosen exchange (protocol version %1$s might be outdated.%2$s The " -"exchange has a lower, incompatible protocol version than your wallet " -"(protocol version %3$s)." -msgstr "" - -#: src/webex/pages/withdraw.tsx:309 -#, c-format -msgid "Accept fees and withdraw" -msgstr "" - -#: src/webex/pages/withdraw.tsx:314 -#, c-format -msgid "Change Exchange Provider" -msgstr "" - -#: src/webex/pages/withdraw.tsx:335 +#: src/webex/pages/withdraw.tsx:116 #, c-format msgid "" "Please select an exchange. You can review the details before after your " "selection." msgstr "" -#: src/webex/pages/withdraw.tsx:341 src/webex/pages/withdraw.tsx:353 +#: src/webex/pages/withdraw.tsx:128 #, c-format msgid "Select %1$s" msgstr "" -#: src/webex/pages/withdraw.tsx:370 -#, c-format -msgid "You are about to withdraw %1$s from your bank account into your wallet." -msgstr "" - -#: src/webex/pages/withdraw.tsx:459 +#: src/webex/pages/withdraw.tsx:150 #, c-format -msgid "" -"Oops, something went wrong. The wallet responded with error status (%1$s)." +msgid "Select custom exchange" msgstr "" -#: src/webex/pages/withdraw.tsx:468 +#: src/webex/pages/withdraw.tsx:167 #, c-format -msgid "Checking URL, please wait ..." +msgid "You are about to withdraw %1$s from your bank account into your wallet." msgstr "" -#: src/webex/pages/withdraw.tsx:482 +#: src/webex/pages/withdraw.tsx:178 #, c-format -msgid "Can't parse amount: %1$s" +msgid "Accept fees and withdraw" msgstr "" -#: src/webex/pages/withdraw.tsx:489 +#: src/webex/pages/withdraw.tsx:196 #, c-format -msgid "Can't parse wire_types: %1$s" +msgid "Cancel withdraw operation" msgstr "" #: src/webex/renderHtml.tsx:225 diff --git a/src/i18n/strings.ts b/src/i18n/strings.ts index 066becf16..069c92b40 100644 --- a/src/i18n/strings.ts +++ b/src/i18n/strings.ts @@ -32,23 +32,19 @@ strings['de'] = { null, "" ], - "show more details": [ - null, - "" - ], - "Accepted exchanges:": [ + "The merchant %1$s offers you to purchase:": [ null, - "" + "Der Händler %1$s möchte einen Vertrag über %2$s mit Ihnen abschließen." ], - "Exchanges in the wallet:": [ + "The total price is %1$s (plus %2$s fees).": [ null, "" ], - "You have insufficient funds of the requested currency in your wallet.": [ + "The total price is %1$s.": [ null, "" ], - "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.": [ + "Retry": [ null, "" ], @@ -56,42 +52,6 @@ strings['de'] = { null, "Bezahlung bestätigen" ], - "Submitting payment": [ - null, - "Bezahlung bestätigen" - ], - "You already paid for this, clicking \"Confirm payment\" will not cost money again.": [ - null, - "" - ], - "Aborting payment ...": [ - null, - "Bezahlung bestätigen" - ], - "Payment aborted!": [ - null, - "" - ], - "Retry Payment": [ - null, - "Bezahlung bestätigen" - ], - "Abort Payment": [ - null, - "Bezahlung bestätigen" - ], - "The merchant %1$s offers you to purchase:": [ - null, - "Der Händler %1$s möchte einen Vertrag über %2$s mit Ihnen abschließen." - ], - "The total price is %1$s (plus %2$s fees).": [ - null, - "" - ], - "The total price is %1$s.": [ - null, - "" - ], "Balance": [ null, "Saldo" @@ -200,55 +160,11 @@ strings['de'] = { null, "" ], - "Select": [ - null, - "" - ], - "Error: URL may not be relative": [ - null, - "" - ], - "Invalid exchange URL (%1$s)": [ - null, - "" - ], - "The exchange is trusted by the wallet.": [ + "Could not get details for withdraw operation:": [ null, "" ], - "The exchange is audited by a trusted auditor.": [ - null, - "" - ], - "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.": [ - null, - "" - ], - "Using exchange provider %1$s. The exchange provider will charge %2$s in fees.": [ - null, - "" - ], - "Waiting for a response from %1$s %2$s": [ - null, - "" - ], - "Information about fees will be available when an exchange provider is selected.": [ - null, - "" - ], - "Your wallet (protocol version %1$s) might be outdated.%2$s The exchange has a higher, incompatible protocol version (%3$s).": [ - null, - "" - ], - "The chosen exchange (protocol version %1$s might be outdated.%2$s The exchange has a lower, incompatible protocol version than your wallet (protocol version %3$s).": [ - null, - "" - ], - "Accept fees and withdraw": [ - null, - "" - ], - "Change Exchange Provider": [ + "Chose different exchange provider": [ null, "" ], @@ -260,23 +176,19 @@ strings['de'] = { null, "" ], - "You are about to withdraw %1$s from your bank account into your wallet.": [ - null, - "" - ], - "Oops, something went wrong. The wallet responded with error status (%1$s).": [ + "Select custom exchange": [ null, "" ], - "Checking URL, please wait ...": [ + "You are about to withdraw %1$s from your bank account into your wallet.": [ null, "" ], - "Can't parse amount: %1$s": [ + "Accept fees and withdraw": [ null, "" ], - "Can't parse wire_types: %1$s": [ + "Cancel withdraw operation": [ null, "" ], @@ -348,23 +260,19 @@ strings['en-US'] = { null, "" ], - "show more details": [ - null, - "" - ], - "Accepted exchanges:": [ + "The merchant %1$s offers you to purchase:": [ null, "" ], - "Exchanges in the wallet:": [ + "The total price is %1$s (plus %2$s fees).": [ null, "" ], - "You have insufficient funds of the requested currency in your wallet.": [ + "The total price is %1$s.": [ null, "" ], - "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.": [ + "Retry": [ null, "" ], @@ -372,42 +280,6 @@ strings['en-US'] = { null, "" ], - "Submitting payment": [ - null, - "" - ], - "You already paid for this, clicking \"Confirm payment\" will not cost money again.": [ - null, - "" - ], - "Aborting payment ...": [ - null, - "" - ], - "Payment aborted!": [ - null, - "" - ], - "Retry Payment": [ - null, - "" - ], - "Abort Payment": [ - null, - "" - ], - "The merchant %1$s offers you to purchase:": [ - null, - "" - ], - "The total price is %1$s (plus %2$s fees).": [ - null, - "" - ], - "The total price is %1$s.": [ - null, - "" - ], "Balance": [ null, "" @@ -516,55 +388,11 @@ strings['en-US'] = { null, "" ], - "Select": [ - null, - "" - ], - "Error: URL may not be relative": [ - null, - "" - ], - "Invalid exchange URL (%1$s)": [ + "Could not get details for withdraw operation:": [ null, "" ], - "The exchange is trusted by the wallet.": [ - null, - "" - ], - "The exchange is audited by a trusted auditor.": [ - null, - "" - ], - "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.": [ - null, - "" - ], - "Using exchange provider %1$s. The exchange provider will charge %2$s in fees.": [ - null, - "" - ], - "Waiting for a response from %1$s %2$s": [ - null, - "" - ], - "Information about fees will be available when an exchange provider is selected.": [ - null, - "" - ], - "Your wallet (protocol version %1$s) might be outdated.%2$s The exchange has a higher, incompatible protocol version (%3$s).": [ - null, - "" - ], - "The chosen exchange (protocol version %1$s might be outdated.%2$s The exchange has a lower, incompatible protocol version than your wallet (protocol version %3$s).": [ - null, - "" - ], - "Accept fees and withdraw": [ - null, - "" - ], - "Change Exchange Provider": [ + "Chose different exchange provider": [ null, "" ], @@ -576,23 +404,19 @@ strings['en-US'] = { null, "" ], - "You are about to withdraw %1$s from your bank account into your wallet.": [ - null, - "" - ], - "Oops, something went wrong. The wallet responded with error status (%1$s).": [ + "Select custom exchange": [ null, "" ], - "Checking URL, please wait ...": [ + "You are about to withdraw %1$s from your bank account into your wallet.": [ null, "" ], - "Can't parse amount: %1$s": [ + "Accept fees and withdraw": [ null, "" ], - "Can't parse wire_types: %1$s": [ + "Cancel withdraw operation": [ null, "" ], @@ -664,23 +488,19 @@ strings['fr'] = { null, "" ], - "show more details": [ - null, - "" - ], - "Accepted exchanges:": [ + "The merchant %1$s offers you to purchase:": [ null, "" ], - "Exchanges in the wallet:": [ + "The total price is %1$s (plus %2$s fees).": [ null, "" ], - "You have insufficient funds of the requested currency in your wallet.": [ + "The total price is %1$s.": [ null, "" ], - "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.": [ + "Retry": [ null, "" ], @@ -688,42 +508,6 @@ strings['fr'] = { null, "" ], - "Submitting payment": [ - null, - "" - ], - "You already paid for this, clicking \"Confirm payment\" will not cost money again.": [ - null, - "" - ], - "Aborting payment ...": [ - null, - "" - ], - "Payment aborted!": [ - null, - "" - ], - "Retry Payment": [ - null, - "" - ], - "Abort Payment": [ - null, - "" - ], - "The merchant %1$s offers you to purchase:": [ - null, - "" - ], - "The total price is %1$s (plus %2$s fees).": [ - null, - "" - ], - "The total price is %1$s.": [ - null, - "" - ], "Balance": [ null, "" @@ -832,55 +616,11 @@ strings['fr'] = { null, "" ], - "Select": [ - null, - "" - ], - "Error: URL may not be relative": [ + "Could not get details for withdraw operation:": [ null, "" ], - "Invalid exchange URL (%1$s)": [ - null, - "" - ], - "The exchange is trusted by the wallet.": [ - null, - "" - ], - "The exchange is audited by a trusted auditor.": [ - null, - "" - ], - "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.": [ - null, - "" - ], - "Using exchange provider %1$s. The exchange provider will charge %2$s in fees.": [ - null, - "" - ], - "Waiting for a response from %1$s %2$s": [ - null, - "" - ], - "Information about fees will be available when an exchange provider is selected.": [ - null, - "" - ], - "Your wallet (protocol version %1$s) might be outdated.%2$s The exchange has a higher, incompatible protocol version (%3$s).": [ - null, - "" - ], - "The chosen exchange (protocol version %1$s might be outdated.%2$s The exchange has a lower, incompatible protocol version than your wallet (protocol version %3$s).": [ - null, - "" - ], - "Accept fees and withdraw": [ - null, - "" - ], - "Change Exchange Provider": [ + "Chose different exchange provider": [ null, "" ], @@ -892,23 +632,19 @@ strings['fr'] = { null, "" ], - "You are about to withdraw %1$s from your bank account into your wallet.": [ - null, - "" - ], - "Oops, something went wrong. The wallet responded with error status (%1$s).": [ + "Select custom exchange": [ null, "" ], - "Checking URL, please wait ...": [ + "You are about to withdraw %1$s from your bank account into your wallet.": [ null, "" ], - "Can't parse amount: %1$s": [ + "Accept fees and withdraw": [ null, "" ], - "Can't parse wire_types: %1$s": [ + "Cancel withdraw operation": [ null, "" ], @@ -980,23 +716,19 @@ strings['it'] = { null, "" ], - "show more details": [ - null, - "" - ], - "Accepted exchanges:": [ + "The merchant %1$s offers you to purchase:": [ null, "" ], - "Exchanges in the wallet:": [ + "The total price is %1$s (plus %2$s fees).": [ null, "" ], - "You have insufficient funds of the requested currency in your wallet.": [ + "The total price is %1$s.": [ null, "" ], - "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.": [ + "Retry": [ null, "" ], @@ -1004,42 +736,6 @@ strings['it'] = { null, "" ], - "Submitting payment": [ - null, - "" - ], - "You already paid for this, clicking \"Confirm payment\" will not cost money again.": [ - null, - "" - ], - "Aborting payment ...": [ - null, - "" - ], - "Payment aborted!": [ - null, - "" - ], - "Retry Payment": [ - null, - "" - ], - "Abort Payment": [ - null, - "" - ], - "The merchant %1$s offers you to purchase:": [ - null, - "" - ], - "The total price is %1$s (plus %2$s fees).": [ - null, - "" - ], - "The total price is %1$s.": [ - null, - "" - ], "Balance": [ null, "" @@ -1148,55 +844,11 @@ strings['it'] = { null, "" ], - "Select": [ - null, - "" - ], - "Error: URL may not be relative": [ - null, - "" - ], - "Invalid exchange URL (%1$s)": [ - null, - "" - ], - "The exchange is trusted by the wallet.": [ - null, - "" - ], - "The exchange is audited by a trusted auditor.": [ - null, - "" - ], - "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.": [ - null, - "" - ], - "Using exchange provider %1$s. The exchange provider will charge %2$s in fees.": [ - null, - "" - ], - "Waiting for a response from %1$s %2$s": [ - null, - "" - ], - "Information about fees will be available when an exchange provider is selected.": [ + "Could not get details for withdraw operation:": [ null, "" ], - "Your wallet (protocol version %1$s) might be outdated.%2$s The exchange has a higher, incompatible protocol version (%3$s).": [ - null, - "" - ], - "The chosen exchange (protocol version %1$s might be outdated.%2$s The exchange has a lower, incompatible protocol version than your wallet (protocol version %3$s).": [ - null, - "" - ], - "Accept fees and withdraw": [ - null, - "" - ], - "Change Exchange Provider": [ + "Chose different exchange provider": [ null, "" ], @@ -1208,23 +860,19 @@ strings['it'] = { null, "" ], - "You are about to withdraw %1$s from your bank account into your wallet.": [ - null, - "" - ], - "Oops, something went wrong. The wallet responded with error status (%1$s).": [ + "Select custom exchange": [ null, "" ], - "Checking URL, please wait ...": [ + "You are about to withdraw %1$s from your bank account into your wallet.": [ null, "" ], - "Can't parse amount: %1$s": [ + "Accept fees and withdraw": [ null, "" ], - "Can't parse wire_types: %1$s": [ + "Cancel withdraw operation": [ null, "" ], @@ -1296,54 +944,6 @@ strings['sv'] = { null, "" ], - "show more details": [ - null, - "visa mer" - ], - "Accepted exchanges:": [ - null, - "Accepterade tjänsteleverantörer:" - ], - "Exchanges in the wallet:": [ - null, - "Tjänsteleverantörer i plånboken:" - ], - "You have insufficient funds of the requested currency in your wallet.": [ - null, - "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.": [ - null, - "plånboken" - ], - "Confirm payment": [ - null, - "Godkän betalning" - ], - "Submitting payment": [ - null, - "Bekräftar betalning" - ], - "You already paid for this, clicking \"Confirm payment\" will not cost money again.": [ - null, - "Du har redan betalat för det här, om du trycker \"Godkän betalning\" debiteras du inte igen" - ], - "Aborting payment ...": [ - null, - "Bekräftar betalning" - ], - "Payment aborted!": [ - null, - "" - ], - "Retry Payment": [ - null, - "" - ], - "Abort Payment": [ - null, - "Godkän betalning" - ], "The merchant %1$s offers you to purchase:": [ null, "Säljaren %1$s erbjuder följande:" @@ -1356,6 +956,14 @@ strings['sv'] = { null, "Det totala priset är %1$s." ], + "Retry": [ + null, + "" + ], + "Confirm payment": [ + null, + "Godkän betalning" + ], "Balance": [ null, "Balans" @@ -1464,55 +1072,11 @@ strings['sv'] = { null, "" ], - "Select": [ - null, - "Välj" - ], - "Error: URL may not be relative": [ - null, - "" - ], - "Invalid exchange URL (%1$s)": [ - null, - "" - ], - "The exchange is trusted by the wallet.": [ - null, - "Tjänsteleverantörer i plånboken:" - ], - "The exchange is audited by a trusted auditor.": [ - null, - "" - ], - "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.": [ - null, - "" - ], - "Using exchange provider %1$s. The exchange provider will charge %2$s in fees.": [ - null, - "" - ], - "Waiting for a response from %1$s %2$s": [ - null, - "" - ], - "Information about fees will be available when an exchange provider is selected.": [ + "Could not get details for withdraw operation:": [ null, "" ], - "Your wallet (protocol version %1$s) might be outdated.%2$s The exchange has a higher, incompatible protocol version (%3$s).": [ - null, - "tjänsteleverantörer plånboken" - ], - "The chosen exchange (protocol version %1$s might be outdated.%2$s The exchange has a lower, incompatible protocol version than your wallet (protocol version %3$s).": [ - null, - "tjänsteleverantörer plånboken" - ], - "Accept fees and withdraw": [ - null, - "Acceptera avgifter och utbetala" - ], - "Change Exchange Provider": [ + "Chose different exchange provider": [ null, "Ändra tjänsteleverantörer" ], @@ -1524,23 +1088,19 @@ strings['sv'] = { null, "Välj %1$s" ], - "You are about to withdraw %1$s from your bank account into your wallet.": [ - null, - "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).": [ + "Select custom exchange": [ null, - "plånboken" + "" ], - "Checking URL, please wait ...": [ + "You are about to withdraw %1$s from your bank account into your wallet.": [ null, - "" + "Du är på väg att ta ut\n %1$s från ditt bankkonto till din plånbok.\n" ], - "Can't parse amount: %1$s": [ + "Accept fees and withdraw": [ null, - "" + "Acceptera avgifter och utbetala" ], - "Can't parse wire_types: %1$s": [ + "Cancel withdraw operation": [ null, "" ], diff --git a/src/i18n/sv.po b/src/i18n/sv.po index 7e3ec5165..23e1a3645 100644 --- a/src/i18n/sv.po +++ b/src/i18n/sv.po @@ -37,89 +37,31 @@ msgstr "" msgid "time (ms/op)" msgstr "" -#: src/webex/pages/pay.tsx:78 -#, fuzzy, c-format -msgid "show more details" -msgstr "visa mer" - -#: src/webex/pages/pay.tsx:92 -#, c-format -msgid "Accepted exchanges:" -msgstr "Accepterade tjänsteleverantörer:" - -#: src/webex/pages/pay.tsx:97 -#, c-format -msgid "Exchanges in the wallet:" -msgstr "Tjänsteleverantörer i plånboken:" - -#: src/webex/pages/pay.tsx:219 -#, c-format -msgid "You have insufficient funds of the requested currency in your wallet." -msgstr "plånboken" - -#. tslint:disable-next-line:max-line-length -#: src/webex/pages/pay.tsx:221 -#, c-format -msgid "" -"You do not have any funds from an exchange that is accepted by this " -"merchant. None of the exchanges accepted by the merchant is known to your " -"wallet." -msgstr "plånboken" - -#: src/webex/pages/pay.tsx:322 -#, c-format -msgid "Confirm payment" -msgstr "Godkän betalning" - -#: src/webex/pages/pay.tsx:332 -#, c-format -msgid "Submitting payment" -msgstr "Bekräftar betalning" - -#: src/webex/pages/pay.tsx:343 -#, c-format -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" - -#: src/webex/pages/pay.tsx:357 -#, fuzzy, c-format -msgid "Aborting payment ..." -msgstr "Bekräftar betalning" - -#: src/webex/pages/pay.tsx:359 -#, c-format -msgid "Payment aborted!" -msgstr "" - -#: src/webex/pages/pay.tsx:362 -#, c-format -msgid "Retry Payment" -msgstr "" - -#: src/webex/pages/pay.tsx:365 -#, fuzzy, c-format -msgid "Abort Payment" -msgstr "Godkän betalning" - -#: src/webex/pages/pay.tsx:374 +#: src/webex/pages/pay.tsx:115 #, 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:383 +#: src/webex/pages/pay.tsx:121 #, 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:387 +#: src/webex/pages/pay.tsx:126 #, fuzzy, c-format msgid "The total price is %1$s." msgstr "Det totala priset är %1$s." +#: src/webex/pages/pay.tsx:140 +#, c-format +msgid "Retry" +msgstr "" + +#: src/webex/pages/pay.tsx:148 +#, c-format +msgid "Confirm payment" +msgstr "Godkän betalning" + #: src/webex/pages/popup.tsx:165 #, c-format msgid "Balance" @@ -254,125 +196,53 @@ msgstr "Avbryt" #. #-#-#-#-# - (PACKAGE VERSION) #-#-#-#-# #. TODO:generic error reporting function or component. -#: src/webex/pages/tip.tsx:180 src/webex/pages/withdraw.tsx:519 +#: src/webex/pages/tip.tsx:118 src/webex/pages/withdraw.tsx:224 #, c-format msgid "Fatal error: \"%1$s\"." msgstr "" -#: src/webex/pages/withdraw.tsx:128 -#, c-format -msgid "Select" -msgstr "Välj" - -#: src/webex/pages/withdraw.tsx:145 -#, c-format -msgid "Error: URL may not be relative" -msgstr "" - -#: src/webex/pages/withdraw.tsx:160 -#, c-format -msgid "Invalid exchange URL (%1$s)" -msgstr "" - -#: src/webex/pages/withdraw.tsx:210 -#, fuzzy, c-format -msgid "The exchange is trusted by the wallet." -msgstr "Tjänsteleverantörer i plånboken:" - -#: src/webex/pages/withdraw.tsx:216 -#, c-format -msgid "The exchange is audited by a trusted auditor." -msgstr "" - -#: src/webex/pages/withdraw.tsx:222 -#, c-format -msgid "" -"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/withdraw.tsx:231 +#: src/webex/pages/withdraw.tsx:81 #, c-format -msgid "" -"Using exchange provider %1$s. The exchange provider will charge %2$s in fees." -msgstr "" - -#: src/webex/pages/withdraw.tsx:243 -#, c-format -msgid "Waiting for a response from %1$s %2$s" -msgstr "" - -#: src/webex/pages/withdraw.tsx:260 -#, c-format -msgid "" -"Information about fees will be available when an exchange provider is " -"selected." +msgid "Could not get details for withdraw operation:" msgstr "" -#: src/webex/pages/withdraw.tsx:279 +#: src/webex/pages/withdraw.tsx:97 src/webex/pages/withdraw.tsx:187 #, fuzzy, c-format -msgid "" -"Your wallet (protocol version %1$s) might be outdated.%2$s The exchange has " -"a higher, incompatible protocol version (%3$s)." -msgstr "tjänsteleverantörer plånboken" - -#: src/webex/pages/withdraw.tsx:290 -#, fuzzy, c-format -msgid "" -"The chosen exchange (protocol version %1$s might 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/withdraw.tsx:309 -#, c-format -msgid "Accept fees and withdraw" -msgstr "Acceptera avgifter och utbetala" - -#: src/webex/pages/withdraw.tsx:314 -#, c-format -msgid "Change Exchange Provider" +msgid "Chose different exchange provider" msgstr "Ändra tjänsteleverantörer" -#: src/webex/pages/withdraw.tsx:335 +#: src/webex/pages/withdraw.tsx:116 #, c-format msgid "" "Please select an exchange. You can review the details before after your " "selection." msgstr "" -#: src/webex/pages/withdraw.tsx:341 src/webex/pages/withdraw.tsx:353 +#: src/webex/pages/withdraw.tsx:128 #, fuzzy, c-format msgid "Select %1$s" msgstr "Välj %1$s" -#: src/webex/pages/withdraw.tsx:370 +#: src/webex/pages/withdraw.tsx:150 +#, c-format +msgid "Select custom exchange" +msgstr "" + +#: src/webex/pages/withdraw.tsx:167 #, 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:459 -#, fuzzy, c-format -msgid "" -"Oops, something went wrong. The wallet responded with error status (%1$s)." -msgstr "plånboken" - -#: src/webex/pages/withdraw.tsx:468 +#: src/webex/pages/withdraw.tsx:178 #, c-format -msgid "Checking URL, please wait ..." -msgstr "" - -#: src/webex/pages/withdraw.tsx:482 -#, c-format -msgid "Can't parse amount: %1$s" -msgstr "" +msgid "Accept fees and withdraw" +msgstr "Acceptera avgifter och utbetala" -#: src/webex/pages/withdraw.tsx:489 +#: src/webex/pages/withdraw.tsx:196 #, c-format -msgid "Can't parse wire_types: %1$s" +msgid "Cancel withdraw operation" msgstr "" #: src/webex/renderHtml.tsx:225 @@ -434,3 +304,73 @@ msgstr "" #, fuzzy, c-format msgid "Unknown Wire Detail" msgstr "visa mer" + +#, fuzzy, c-format +#~ msgid "show more details" +#~ msgstr "visa mer" + +#, c-format +#~ msgid "Accepted exchanges:" +#~ msgstr "Accepterade tjänsteleverantörer:" + +#, c-format +#~ msgid "Exchanges in the wallet:" +#~ msgstr "Tjänsteleverantörer i plånboken:" + +#, c-format +#~ msgid "" +#~ "You have insufficient funds of the requested currency in your wallet." +#~ msgstr "plånboken" + +#, c-format +#~ msgid "" +#~ "You do not have any funds from an exchange that is accepted by this " +#~ "merchant. None of the exchanges accepted by the merchant is known to your " +#~ "wallet." +#~ msgstr "plånboken" + +#, c-format +#~ msgid "Submitting payment" +#~ msgstr "Bekräftar betalning" + +#, c-format +#~ 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" + +#, fuzzy, c-format +#~ msgid "Aborting payment ..." +#~ msgstr "Bekräftar betalning" + +#, fuzzy, c-format +#~ msgid "Abort Payment" +#~ msgstr "Godkän betalning" + +#, c-format +#~ msgid "Select" +#~ msgstr "Välj" + +#, fuzzy, c-format +#~ msgid "The exchange is trusted by the wallet." +#~ msgstr "Tjänsteleverantörer i plånboken:" + +#, fuzzy, c-format +#~ msgid "" +#~ "Your wallet (protocol version %1$s) might be outdated.%2$s The exchange " +#~ "has a higher, incompatible protocol version (%3$s)." +#~ msgstr "tjänsteleverantörer plånboken" + +#, fuzzy, c-format +#~ msgid "" +#~ "The chosen exchange (protocol version %1$s might 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" + +#, fuzzy, c-format +#~ msgid "" +#~ "Oops, something went wrong. The wallet responded with error status (%1$s)." +#~ msgstr "plånboken" diff --git a/src/i18n/taler-wallet-webex.pot b/src/i18n/taler-wallet-webex.pot index 1f0dc2a47..ba7f9ecff 100644 --- a/src/i18n/taler-wallet-webex.pot +++ b/src/i18n/taler-wallet-webex.pot @@ -37,87 +37,31 @@ msgstr "" msgid "time (ms/op)" msgstr "" -#: src/webex/pages/pay.tsx:78 +#: src/webex/pages/pay.tsx:115 #, c-format -msgid "show more details" +msgid "The merchant %1$s offers you to purchase:" msgstr "" -#: src/webex/pages/pay.tsx:92 +#: src/webex/pages/pay.tsx:121 #, c-format -msgid "Accepted exchanges:" +msgid "The total price is %1$s (plus %2$s fees)." msgstr "" -#: src/webex/pages/pay.tsx:97 +#: src/webex/pages/pay.tsx:126 #, c-format -msgid "Exchanges in the wallet:" +msgid "The total price is %1$s." msgstr "" -#: src/webex/pages/pay.tsx:219 +#: src/webex/pages/pay.tsx:140 #, c-format -msgid "You have insufficient funds of the requested currency in your wallet." +msgid "Retry" msgstr "" -#. tslint:disable-next-line:max-line-length -#: src/webex/pages/pay.tsx:221 -#, c-format -msgid "" -"You do not have any funds from an exchange that is accepted by this " -"merchant. None of the exchanges accepted by the merchant is known to your " -"wallet." -msgstr "" - -#: src/webex/pages/pay.tsx:322 +#: src/webex/pages/pay.tsx:148 #, c-format msgid "Confirm payment" msgstr "" -#: src/webex/pages/pay.tsx:332 -#, c-format -msgid "Submitting payment" -msgstr "" - -#: src/webex/pages/pay.tsx:343 -#, c-format -msgid "" -"You already paid for this, clicking \"Confirm payment\" will not cost money " -"again." -msgstr "" - -#: src/webex/pages/pay.tsx:357 -#, c-format -msgid "Aborting payment ..." -msgstr "" - -#: src/webex/pages/pay.tsx:359 -#, c-format -msgid "Payment aborted!" -msgstr "" - -#: src/webex/pages/pay.tsx:362 -#, c-format -msgid "Retry Payment" -msgstr "" - -#: src/webex/pages/pay.tsx:365 -#, c-format -msgid "Abort Payment" -msgstr "" - -#: src/webex/pages/pay.tsx:374 -#, c-format -msgid "The merchant %1$s offers you to purchase:" -msgstr "" - -#: src/webex/pages/pay.tsx:383 -#, c-format -msgid "The total price is %1$s (plus %2$s fees)." -msgstr "" - -#: src/webex/pages/pay.tsx:387 -#, c-format -msgid "The total price is %1$s." -msgstr "" - #: src/webex/pages/popup.tsx:165 #, c-format msgid "Balance" @@ -250,123 +194,51 @@ msgstr "" #. #-#-#-#-# - (PACKAGE VERSION) #-#-#-#-# #. TODO:generic error reporting function or component. -#: src/webex/pages/tip.tsx:180 src/webex/pages/withdraw.tsx:519 +#: src/webex/pages/tip.tsx:118 src/webex/pages/withdraw.tsx:224 #, c-format msgid "Fatal error: \"%1$s\"." msgstr "" -#: src/webex/pages/withdraw.tsx:128 -#, c-format -msgid "Select" -msgstr "" - -#: src/webex/pages/withdraw.tsx:145 -#, c-format -msgid "Error: URL may not be relative" -msgstr "" - -#: src/webex/pages/withdraw.tsx:160 -#, c-format -msgid "Invalid exchange URL (%1$s)" -msgstr "" - -#: src/webex/pages/withdraw.tsx:210 -#, c-format -msgid "The exchange is trusted by the wallet." -msgstr "" - -#: src/webex/pages/withdraw.tsx:216 -#, c-format -msgid "The exchange is audited by a trusted auditor." -msgstr "" - -#: src/webex/pages/withdraw.tsx:222 +#: src/webex/pages/withdraw.tsx:81 #, c-format -msgid "" -"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/withdraw.tsx:231 -#, c-format -msgid "" -"Using exchange provider %1$s. The exchange provider will charge %2$s in fees." +msgid "Could not get details for withdraw operation:" msgstr "" -#: src/webex/pages/withdraw.tsx:243 +#: src/webex/pages/withdraw.tsx:97 src/webex/pages/withdraw.tsx:187 #, c-format -msgid "Waiting for a response from %1$s %2$s" +msgid "Chose different exchange provider" msgstr "" -#: src/webex/pages/withdraw.tsx:260 -#, c-format -msgid "" -"Information about fees will be available when an exchange provider is " -"selected." -msgstr "" - -#: src/webex/pages/withdraw.tsx:279 -#, c-format -msgid "" -"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/withdraw.tsx:290 -#, c-format -msgid "" -"The chosen exchange (protocol version %1$s might be outdated.%2$s The " -"exchange has a lower, incompatible protocol version than your wallet " -"(protocol version %3$s)." -msgstr "" - -#: src/webex/pages/withdraw.tsx:309 -#, c-format -msgid "Accept fees and withdraw" -msgstr "" - -#: src/webex/pages/withdraw.tsx:314 -#, c-format -msgid "Change Exchange Provider" -msgstr "" - -#: src/webex/pages/withdraw.tsx:335 +#: src/webex/pages/withdraw.tsx:116 #, c-format msgid "" "Please select an exchange. You can review the details before after your " "selection." msgstr "" -#: src/webex/pages/withdraw.tsx:341 src/webex/pages/withdraw.tsx:353 +#: src/webex/pages/withdraw.tsx:128 #, c-format msgid "Select %1$s" msgstr "" -#: src/webex/pages/withdraw.tsx:370 -#, c-format -msgid "You are about to withdraw %1$s from your bank account into your wallet." -msgstr "" - -#: src/webex/pages/withdraw.tsx:459 +#: src/webex/pages/withdraw.tsx:150 #, c-format -msgid "" -"Oops, something went wrong. The wallet responded with error status (%1$s)." +msgid "Select custom exchange" msgstr "" -#: src/webex/pages/withdraw.tsx:468 +#: src/webex/pages/withdraw.tsx:167 #, c-format -msgid "Checking URL, please wait ..." +msgid "You are about to withdraw %1$s from your bank account into your wallet." msgstr "" -#: src/webex/pages/withdraw.tsx:482 +#: src/webex/pages/withdraw.tsx:178 #, c-format -msgid "Can't parse amount: %1$s" +msgid "Accept fees and withdraw" msgstr "" -#: src/webex/pages/withdraw.tsx:489 +#: src/webex/pages/withdraw.tsx:196 #, c-format -msgid "Can't parse wire_types: %1$s" +msgid "Cancel withdraw operation" msgstr "" #: src/webex/renderHtml.tsx:225 diff --git a/src/wallet.ts b/src/wallet.ts index 825763173..3785f912e 100644 --- a/src/wallet.ts +++ b/src/wallet.ts @@ -132,6 +132,8 @@ interface SpeculativePayData { */ export const WALLET_PROTOCOL_VERSION = "3:0:0"; +const WALLET_CACHE_BREAKER="01"; + const builtinCurrencies: CurrencyRecord[] = [ { auditors: [ @@ -1953,7 +1955,7 @@ export class Wallet { */ async updateExchangeFromUrl(baseUrl: string): Promise<ExchangeRecord> { baseUrl = canonicalizeBaseUrl(baseUrl); - const keysUrl = new URI("keys").absoluteTo(baseUrl); + const keysUrl = new URI("keys").absoluteTo(baseUrl).addQuery("cacheBreaker", WALLET_CACHE_BREAKER); const keysResp = await this.http.get(keysUrl.href()); if (keysResp.status !== 200) { throw Error("/keys request failed"); |