From a4e6966241d418b8df05ddd7fc5556ce3c6c97af Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Tue, 20 Feb 2018 17:17:36 +0100 Subject: [PATCH] i18n fixes --- src/i18n/de.po | 80 ++++++++++++++---- src/i18n/en-US.po | 80 ++++++++++++++---- src/i18n/fr.po | 80 ++++++++++++++---- src/i18n/it.po | 80 ++++++++++++++---- src/i18n/strings.ts | 96 ++++++++++++++++++++++ src/i18n/taler-wallet-webex.pot | 80 ++++++++++++++---- src/webex/pages/confirm-contract.tsx | 12 +-- src/webex/pages/confirm-create-reserve.tsx | 10 ++- 8 files changed, 430 insertions(+), 88 deletions(-) diff --git a/src/i18n/de.po b/src/i18n/de.po index d96299de1..a43eb936a 100644 --- a/src/i18n/de.po +++ b/src/i18n/de.po @@ -66,6 +66,33 @@ msgstr "Bezahlung bestätigen" msgid "Submitting payment" msgstr "" +#: src/webex/pages/confirm-contract.tsx:341 +#, c-format +msgid "" +"You already paid for this, clicking \"Confirm payment\" will not cost money " +"again." +msgstr "" + +#: src/webex/pages/confirm-contract.tsx:355 +#, c-format +msgid "Aborting payment ..." +msgstr "" + +#: src/webex/pages/confirm-contract.tsx:357 +#, c-format +msgid "Payment aborted!" +msgstr "" + +#: src/webex/pages/confirm-contract.tsx:360 +#, c-format +msgid "Retry Payment" +msgstr "" + +#: src/webex/pages/confirm-contract.tsx:363 +#, fuzzy, c-format +msgid "Abort Payment" +msgstr "Bezahlung bestätigen" + #: src/webex/pages/confirm-contract.tsx:372 #, c-format msgid "The merchant%1$s offers you to purchase:\n" @@ -126,45 +153,66 @@ msgid "" "selected." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:307 +#: src/webex/pages/confirm-create-reserve.tsx:281 +#, c-format +msgid "" +"Your wallet (protocol version%1$s) might be outdated.%2$sThe exchange has a " +"higher, incompatible\n" +"protocol version (%3$s).\n" +msgstr "" + +#: src/webex/pages/confirm-create-reserve.tsx:292 +#, c-format +msgid "" +"The chosen exchange (protocol version%1$smight be outdated.%2$sThe exchange " +"has a lower, incompatible\n" +"protocol version than your wallet (protocol version%3$s).\n" +msgstr "" + +#: src/webex/pages/confirm-create-reserve.tsx:311 #, c-format msgid "Accept fees and withdraw" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:312 +#: src/webex/pages/confirm-create-reserve.tsx:316 #, c-format msgid "Change Exchange Provider" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:364 +#: src/webex/pages/confirm-create-reserve.tsx:343 +#, c-format +msgid "Select%1$s" +msgstr "" + +#: src/webex/pages/confirm-create-reserve.tsx:370 #, c-format msgid "You are about to withdraw %1$s from your bank account into your wallet." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:449 +#: src/webex/pages/confirm-create-reserve.tsx:455 #, c-format msgid "" "Oops, something went wrong. The wallet responded with error status (%1$s)." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:458 +#: src/webex/pages/confirm-create-reserve.tsx:464 #, c-format msgid "Checking URL, please wait ..." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:472 +#: src/webex/pages/confirm-create-reserve.tsx:478 #, c-format msgid "Can't parse amount: %1$s" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:479 +#: src/webex/pages/confirm-create-reserve.tsx:485 #, c-format msgid "Can't parse wire_types: %1$s" msgstr "" #. #-#-#-#-# - (PACKAGE VERSION) #-#-#-#-# #. TODO:generic error reporting function or component. -#: src/webex/pages/confirm-create-reserve.tsx:505 src/webex/pages/tip.tsx:180 +#: src/webex/pages/confirm-create-reserve.tsx:511 src/webex/pages/tip.tsx:180 #, c-format msgid "Fatal error: \"%1$s\"." msgstr "" @@ -306,42 +354,42 @@ msgstr "Bezahlung bestätigen" msgid "Cancel" msgstr "Saldo" -#: src/webex/renderHtml.tsx:216 +#: src/webex/renderHtml.tsx:225 #, fuzzy, c-format msgid "Withdrawal fees:" msgstr "Abheben bei" -#: src/webex/renderHtml.tsx:217 +#: src/webex/renderHtml.tsx:226 #, c-format msgid "Rounding loss:" msgstr "" -#: src/webex/renderHtml.tsx:218 +#: src/webex/renderHtml.tsx:227 #, c-format msgid "Earliest expiration (for deposit): %1$s" msgstr "" -#: src/webex/renderHtml.tsx:224 +#: src/webex/renderHtml.tsx:233 #, c-format msgid "# Coins" msgstr "" -#: src/webex/renderHtml.tsx:225 +#: src/webex/renderHtml.tsx:234 #, c-format msgid "Value" msgstr "" -#: src/webex/renderHtml.tsx:226 +#: src/webex/renderHtml.tsx:235 #, fuzzy, c-format msgid "Withdraw Fee" msgstr "Abheben bei %1$s" -#: src/webex/renderHtml.tsx:227 +#: src/webex/renderHtml.tsx:236 #, c-format msgid "Refresh Fee" msgstr "" -#: src/webex/renderHtml.tsx:228 +#: src/webex/renderHtml.tsx:237 #, c-format msgid "Deposit Fee" msgstr "" diff --git a/src/i18n/en-US.po b/src/i18n/en-US.po index 665b2771a..8541542fa 100644 --- a/src/i18n/en-US.po +++ b/src/i18n/en-US.po @@ -66,6 +66,33 @@ msgstr "" msgid "Submitting payment" msgstr "" +#: src/webex/pages/confirm-contract.tsx:341 +#, c-format +msgid "" +"You already paid for this, clicking \"Confirm payment\" will not cost money " +"again." +msgstr "" + +#: src/webex/pages/confirm-contract.tsx:355 +#, c-format +msgid "Aborting payment ..." +msgstr "" + +#: src/webex/pages/confirm-contract.tsx:357 +#, c-format +msgid "Payment aborted!" +msgstr "" + +#: src/webex/pages/confirm-contract.tsx:360 +#, c-format +msgid "Retry Payment" +msgstr "" + +#: src/webex/pages/confirm-contract.tsx:363 +#, c-format +msgid "Abort Payment" +msgstr "" + #: src/webex/pages/confirm-contract.tsx:372 #, c-format msgid "The merchant%1$s offers you to purchase:\n" @@ -126,45 +153,66 @@ msgid "" "selected." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:307 +#: src/webex/pages/confirm-create-reserve.tsx:281 +#, c-format +msgid "" +"Your wallet (protocol version%1$s) might be outdated.%2$sThe exchange has a " +"higher, incompatible\n" +"protocol version (%3$s).\n" +msgstr "" + +#: src/webex/pages/confirm-create-reserve.tsx:292 +#, c-format +msgid "" +"The chosen exchange (protocol version%1$smight be outdated.%2$sThe exchange " +"has a lower, incompatible\n" +"protocol version than your wallet (protocol version%3$s).\n" +msgstr "" + +#: src/webex/pages/confirm-create-reserve.tsx:311 #, c-format msgid "Accept fees and withdraw" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:312 +#: src/webex/pages/confirm-create-reserve.tsx:316 #, c-format msgid "Change Exchange Provider" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:364 +#: src/webex/pages/confirm-create-reserve.tsx:343 +#, c-format +msgid "Select%1$s" +msgstr "" + +#: src/webex/pages/confirm-create-reserve.tsx:370 #, c-format msgid "You are about to withdraw %1$s from your bank account into your wallet." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:449 +#: src/webex/pages/confirm-create-reserve.tsx:455 #, c-format msgid "" "Oops, something went wrong. The wallet responded with error status (%1$s)." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:458 +#: src/webex/pages/confirm-create-reserve.tsx:464 #, c-format msgid "Checking URL, please wait ..." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:472 +#: src/webex/pages/confirm-create-reserve.tsx:478 #, c-format msgid "Can't parse amount: %1$s" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:479 +#: src/webex/pages/confirm-create-reserve.tsx:485 #, c-format msgid "Can't parse wire_types: %1$s" msgstr "" #. #-#-#-#-# - (PACKAGE VERSION) #-#-#-#-# #. TODO:generic error reporting function or component. -#: src/webex/pages/confirm-create-reserve.tsx:505 src/webex/pages/tip.tsx:180 +#: src/webex/pages/confirm-create-reserve.tsx:511 src/webex/pages/tip.tsx:180 #, c-format msgid "Fatal error: \"%1$s\"." msgstr "" @@ -300,42 +348,42 @@ msgstr "" msgid "Cancel" msgstr "" -#: src/webex/renderHtml.tsx:216 +#: src/webex/renderHtml.tsx:225 #, c-format msgid "Withdrawal fees:" msgstr "" -#: src/webex/renderHtml.tsx:217 +#: src/webex/renderHtml.tsx:226 #, c-format msgid "Rounding loss:" msgstr "" -#: src/webex/renderHtml.tsx:218 +#: src/webex/renderHtml.tsx:227 #, c-format msgid "Earliest expiration (for deposit): %1$s" msgstr "" -#: src/webex/renderHtml.tsx:224 +#: src/webex/renderHtml.tsx:233 #, c-format msgid "# Coins" msgstr "" -#: src/webex/renderHtml.tsx:225 +#: src/webex/renderHtml.tsx:234 #, c-format msgid "Value" msgstr "" -#: src/webex/renderHtml.tsx:226 +#: src/webex/renderHtml.tsx:235 #, c-format msgid "Withdraw Fee" msgstr "" -#: src/webex/renderHtml.tsx:227 +#: src/webex/renderHtml.tsx:236 #, c-format msgid "Refresh Fee" msgstr "" -#: src/webex/renderHtml.tsx:228 +#: src/webex/renderHtml.tsx:237 #, c-format msgid "Deposit Fee" msgstr "" diff --git a/src/i18n/fr.po b/src/i18n/fr.po index 4a50742b8..a4bffb01a 100644 --- a/src/i18n/fr.po +++ b/src/i18n/fr.po @@ -66,6 +66,33 @@ msgstr "" msgid "Submitting payment" msgstr "" +#: src/webex/pages/confirm-contract.tsx:341 +#, c-format +msgid "" +"You already paid for this, clicking \"Confirm payment\" will not cost money " +"again." +msgstr "" + +#: src/webex/pages/confirm-contract.tsx:355 +#, c-format +msgid "Aborting payment ..." +msgstr "" + +#: src/webex/pages/confirm-contract.tsx:357 +#, c-format +msgid "Payment aborted!" +msgstr "" + +#: src/webex/pages/confirm-contract.tsx:360 +#, c-format +msgid "Retry Payment" +msgstr "" + +#: src/webex/pages/confirm-contract.tsx:363 +#, c-format +msgid "Abort Payment" +msgstr "" + #: src/webex/pages/confirm-contract.tsx:372 #, c-format msgid "The merchant%1$s offers you to purchase:\n" @@ -126,45 +153,66 @@ msgid "" "selected." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:307 +#: src/webex/pages/confirm-create-reserve.tsx:281 +#, c-format +msgid "" +"Your wallet (protocol version%1$s) might be outdated.%2$sThe exchange has a " +"higher, incompatible\n" +"protocol version (%3$s).\n" +msgstr "" + +#: src/webex/pages/confirm-create-reserve.tsx:292 +#, c-format +msgid "" +"The chosen exchange (protocol version%1$smight be outdated.%2$sThe exchange " +"has a lower, incompatible\n" +"protocol version than your wallet (protocol version%3$s).\n" +msgstr "" + +#: src/webex/pages/confirm-create-reserve.tsx:311 #, c-format msgid "Accept fees and withdraw" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:312 +#: src/webex/pages/confirm-create-reserve.tsx:316 #, c-format msgid "Change Exchange Provider" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:364 +#: src/webex/pages/confirm-create-reserve.tsx:343 +#, c-format +msgid "Select%1$s" +msgstr "" + +#: src/webex/pages/confirm-create-reserve.tsx:370 #, c-format msgid "You are about to withdraw %1$s from your bank account into your wallet." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:449 +#: src/webex/pages/confirm-create-reserve.tsx:455 #, c-format msgid "" "Oops, something went wrong. The wallet responded with error status (%1$s)." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:458 +#: src/webex/pages/confirm-create-reserve.tsx:464 #, c-format msgid "Checking URL, please wait ..." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:472 +#: src/webex/pages/confirm-create-reserve.tsx:478 #, c-format msgid "Can't parse amount: %1$s" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:479 +#: src/webex/pages/confirm-create-reserve.tsx:485 #, c-format msgid "Can't parse wire_types: %1$s" msgstr "" #. #-#-#-#-# - (PACKAGE VERSION) #-#-#-#-# #. TODO:generic error reporting function or component. -#: src/webex/pages/confirm-create-reserve.tsx:505 src/webex/pages/tip.tsx:180 +#: src/webex/pages/confirm-create-reserve.tsx:511 src/webex/pages/tip.tsx:180 #, c-format msgid "Fatal error: \"%1$s\"." msgstr "" @@ -300,42 +348,42 @@ msgstr "" msgid "Cancel" msgstr "" -#: src/webex/renderHtml.tsx:216 +#: src/webex/renderHtml.tsx:225 #, c-format msgid "Withdrawal fees:" msgstr "" -#: src/webex/renderHtml.tsx:217 +#: src/webex/renderHtml.tsx:226 #, c-format msgid "Rounding loss:" msgstr "" -#: src/webex/renderHtml.tsx:218 +#: src/webex/renderHtml.tsx:227 #, c-format msgid "Earliest expiration (for deposit): %1$s" msgstr "" -#: src/webex/renderHtml.tsx:224 +#: src/webex/renderHtml.tsx:233 #, c-format msgid "# Coins" msgstr "" -#: src/webex/renderHtml.tsx:225 +#: src/webex/renderHtml.tsx:234 #, c-format msgid "Value" msgstr "" -#: src/webex/renderHtml.tsx:226 +#: src/webex/renderHtml.tsx:235 #, c-format msgid "Withdraw Fee" msgstr "" -#: src/webex/renderHtml.tsx:227 +#: src/webex/renderHtml.tsx:236 #, c-format msgid "Refresh Fee" msgstr "" -#: src/webex/renderHtml.tsx:228 +#: src/webex/renderHtml.tsx:237 #, c-format msgid "Deposit Fee" msgstr "" diff --git a/src/i18n/it.po b/src/i18n/it.po index 4a50742b8..a4bffb01a 100644 --- a/src/i18n/it.po +++ b/src/i18n/it.po @@ -66,6 +66,33 @@ msgstr "" msgid "Submitting payment" msgstr "" +#: src/webex/pages/confirm-contract.tsx:341 +#, c-format +msgid "" +"You already paid for this, clicking \"Confirm payment\" will not cost money " +"again." +msgstr "" + +#: src/webex/pages/confirm-contract.tsx:355 +#, c-format +msgid "Aborting payment ..." +msgstr "" + +#: src/webex/pages/confirm-contract.tsx:357 +#, c-format +msgid "Payment aborted!" +msgstr "" + +#: src/webex/pages/confirm-contract.tsx:360 +#, c-format +msgid "Retry Payment" +msgstr "" + +#: src/webex/pages/confirm-contract.tsx:363 +#, c-format +msgid "Abort Payment" +msgstr "" + #: src/webex/pages/confirm-contract.tsx:372 #, c-format msgid "The merchant%1$s offers you to purchase:\n" @@ -126,45 +153,66 @@ msgid "" "selected." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:307 +#: src/webex/pages/confirm-create-reserve.tsx:281 +#, c-format +msgid "" +"Your wallet (protocol version%1$s) might be outdated.%2$sThe exchange has a " +"higher, incompatible\n" +"protocol version (%3$s).\n" +msgstr "" + +#: src/webex/pages/confirm-create-reserve.tsx:292 +#, c-format +msgid "" +"The chosen exchange (protocol version%1$smight be outdated.%2$sThe exchange " +"has a lower, incompatible\n" +"protocol version than your wallet (protocol version%3$s).\n" +msgstr "" + +#: src/webex/pages/confirm-create-reserve.tsx:311 #, c-format msgid "Accept fees and withdraw" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:312 +#: src/webex/pages/confirm-create-reserve.tsx:316 #, c-format msgid "Change Exchange Provider" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:364 +#: src/webex/pages/confirm-create-reserve.tsx:343 +#, c-format +msgid "Select%1$s" +msgstr "" + +#: src/webex/pages/confirm-create-reserve.tsx:370 #, c-format msgid "You are about to withdraw %1$s from your bank account into your wallet." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:449 +#: src/webex/pages/confirm-create-reserve.tsx:455 #, c-format msgid "" "Oops, something went wrong. The wallet responded with error status (%1$s)." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:458 +#: src/webex/pages/confirm-create-reserve.tsx:464 #, c-format msgid "Checking URL, please wait ..." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:472 +#: src/webex/pages/confirm-create-reserve.tsx:478 #, c-format msgid "Can't parse amount: %1$s" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:479 +#: src/webex/pages/confirm-create-reserve.tsx:485 #, c-format msgid "Can't parse wire_types: %1$s" msgstr "" #. #-#-#-#-# - (PACKAGE VERSION) #-#-#-#-# #. TODO:generic error reporting function or component. -#: src/webex/pages/confirm-create-reserve.tsx:505 src/webex/pages/tip.tsx:180 +#: src/webex/pages/confirm-create-reserve.tsx:511 src/webex/pages/tip.tsx:180 #, c-format msgid "Fatal error: \"%1$s\"." msgstr "" @@ -300,42 +348,42 @@ msgstr "" msgid "Cancel" msgstr "" -#: src/webex/renderHtml.tsx:216 +#: src/webex/renderHtml.tsx:225 #, c-format msgid "Withdrawal fees:" msgstr "" -#: src/webex/renderHtml.tsx:217 +#: src/webex/renderHtml.tsx:226 #, c-format msgid "Rounding loss:" msgstr "" -#: src/webex/renderHtml.tsx:218 +#: src/webex/renderHtml.tsx:227 #, c-format msgid "Earliest expiration (for deposit): %1$s" msgstr "" -#: src/webex/renderHtml.tsx:224 +#: src/webex/renderHtml.tsx:233 #, c-format msgid "# Coins" msgstr "" -#: src/webex/renderHtml.tsx:225 +#: src/webex/renderHtml.tsx:234 #, c-format msgid "Value" msgstr "" -#: src/webex/renderHtml.tsx:226 +#: src/webex/renderHtml.tsx:235 #, c-format msgid "Withdraw Fee" msgstr "" -#: src/webex/renderHtml.tsx:227 +#: src/webex/renderHtml.tsx:236 #, c-format msgid "Refresh Fee" msgstr "" -#: src/webex/renderHtml.tsx:228 +#: src/webex/renderHtml.tsx:237 #, c-format msgid "Deposit Fee" msgstr "" diff --git a/src/i18n/strings.ts b/src/i18n/strings.ts index fa31de481..821378fed 100644 --- a/src/i18n/strings.ts +++ b/src/i18n/strings.ts @@ -45,6 +45,21 @@ strings['de'] = { "Submitting payment": [ "" ], + "You already paid for this, clicking \"Confirm payment\" will not cost money again.": [ + "" + ], + "Aborting payment ...": [ + "" + ], + "Payment aborted!": [ + "" + ], + "Retry Payment": [ + "" + ], + "Abort Payment": [ + "Bezahlung bestätigen" + ], "The merchant%1$s offers you to purchase:\n": [ "" ], @@ -75,12 +90,21 @@ strings['de'] = { "Information about fees will be available when an exchange provider is selected.": [ "" ], + "Your wallet (protocol version%1$s) might be outdated.%2$sThe exchange has a higher, incompatible\nprotocol version (%3$s).\n": [ + "" + ], + "The chosen exchange (protocol version%1$smight be outdated.%2$sThe exchange has a lower, incompatible\nprotocol version than your wallet (protocol version%3$s).\n": [ + "" + ], "Accept fees and withdraw": [ "" ], "Change Exchange Provider": [ "" ], + "Select%1$s": [ + "" + ], "You are about to withdraw %1$s from your bank account into your wallet.": [ "" ], @@ -240,6 +264,21 @@ strings['en-US'] = { "Submitting payment": [ "" ], + "You already paid for this, clicking \"Confirm payment\" will not cost money again.": [ + "" + ], + "Aborting payment ...": [ + "" + ], + "Payment aborted!": [ + "" + ], + "Retry Payment": [ + "" + ], + "Abort Payment": [ + "" + ], "The merchant%1$s offers you to purchase:\n": [ "" ], @@ -270,12 +309,21 @@ strings['en-US'] = { "Information about fees will be available when an exchange provider is selected.": [ "" ], + "Your wallet (protocol version%1$s) might be outdated.%2$sThe exchange has a higher, incompatible\nprotocol version (%3$s).\n": [ + "" + ], + "The chosen exchange (protocol version%1$smight be outdated.%2$sThe exchange has a lower, incompatible\nprotocol version than your wallet (protocol version%3$s).\n": [ + "" + ], "Accept fees and withdraw": [ "" ], "Change Exchange Provider": [ "" ], + "Select%1$s": [ + "" + ], "You are about to withdraw %1$s from your bank account into your wallet.": [ "" ], @@ -435,6 +483,21 @@ strings['fr'] = { "Submitting payment": [ "" ], + "You already paid for this, clicking \"Confirm payment\" will not cost money again.": [ + "" + ], + "Aborting payment ...": [ + "" + ], + "Payment aborted!": [ + "" + ], + "Retry Payment": [ + "" + ], + "Abort Payment": [ + "" + ], "The merchant%1$s offers you to purchase:\n": [ "" ], @@ -465,12 +528,21 @@ strings['fr'] = { "Information about fees will be available when an exchange provider is selected.": [ "" ], + "Your wallet (protocol version%1$s) might be outdated.%2$sThe exchange has a higher, incompatible\nprotocol version (%3$s).\n": [ + "" + ], + "The chosen exchange (protocol version%1$smight be outdated.%2$sThe exchange has a lower, incompatible\nprotocol version than your wallet (protocol version%3$s).\n": [ + "" + ], "Accept fees and withdraw": [ "" ], "Change Exchange Provider": [ "" ], + "Select%1$s": [ + "" + ], "You are about to withdraw %1$s from your bank account into your wallet.": [ "" ], @@ -630,6 +702,21 @@ strings['it'] = { "Submitting payment": [ "" ], + "You already paid for this, clicking \"Confirm payment\" will not cost money again.": [ + "" + ], + "Aborting payment ...": [ + "" + ], + "Payment aborted!": [ + "" + ], + "Retry Payment": [ + "" + ], + "Abort Payment": [ + "" + ], "The merchant%1$s offers you to purchase:\n": [ "" ], @@ -660,12 +747,21 @@ strings['it'] = { "Information about fees will be available when an exchange provider is selected.": [ "" ], + "Your wallet (protocol version%1$s) might be outdated.%2$sThe exchange has a higher, incompatible\nprotocol version (%3$s).\n": [ + "" + ], + "The chosen exchange (protocol version%1$smight be outdated.%2$sThe exchange has a lower, incompatible\nprotocol version than your wallet (protocol version%3$s).\n": [ + "" + ], "Accept fees and withdraw": [ "" ], "Change Exchange Provider": [ "" ], + "Select%1$s": [ + "" + ], "You are about to withdraw %1$s from your bank account into your wallet.": [ "" ], diff --git a/src/i18n/taler-wallet-webex.pot b/src/i18n/taler-wallet-webex.pot index 4a50742b8..a4bffb01a 100644 --- a/src/i18n/taler-wallet-webex.pot +++ b/src/i18n/taler-wallet-webex.pot @@ -66,6 +66,33 @@ msgstr "" msgid "Submitting payment" msgstr "" +#: src/webex/pages/confirm-contract.tsx:341 +#, c-format +msgid "" +"You already paid for this, clicking \"Confirm payment\" will not cost money " +"again." +msgstr "" + +#: src/webex/pages/confirm-contract.tsx:355 +#, c-format +msgid "Aborting payment ..." +msgstr "" + +#: src/webex/pages/confirm-contract.tsx:357 +#, c-format +msgid "Payment aborted!" +msgstr "" + +#: src/webex/pages/confirm-contract.tsx:360 +#, c-format +msgid "Retry Payment" +msgstr "" + +#: src/webex/pages/confirm-contract.tsx:363 +#, c-format +msgid "Abort Payment" +msgstr "" + #: src/webex/pages/confirm-contract.tsx:372 #, c-format msgid "The merchant%1$s offers you to purchase:\n" @@ -126,45 +153,66 @@ msgid "" "selected." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:307 +#: src/webex/pages/confirm-create-reserve.tsx:281 +#, c-format +msgid "" +"Your wallet (protocol version%1$s) might be outdated.%2$sThe exchange has a " +"higher, incompatible\n" +"protocol version (%3$s).\n" +msgstr "" + +#: src/webex/pages/confirm-create-reserve.tsx:292 +#, c-format +msgid "" +"The chosen exchange (protocol version%1$smight be outdated.%2$sThe exchange " +"has a lower, incompatible\n" +"protocol version than your wallet (protocol version%3$s).\n" +msgstr "" + +#: src/webex/pages/confirm-create-reserve.tsx:311 #, c-format msgid "Accept fees and withdraw" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:312 +#: src/webex/pages/confirm-create-reserve.tsx:316 #, c-format msgid "Change Exchange Provider" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:364 +#: src/webex/pages/confirm-create-reserve.tsx:343 +#, c-format +msgid "Select%1$s" +msgstr "" + +#: src/webex/pages/confirm-create-reserve.tsx:370 #, c-format msgid "You are about to withdraw %1$s from your bank account into your wallet." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:449 +#: src/webex/pages/confirm-create-reserve.tsx:455 #, c-format msgid "" "Oops, something went wrong. The wallet responded with error status (%1$s)." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:458 +#: src/webex/pages/confirm-create-reserve.tsx:464 #, c-format msgid "Checking URL, please wait ..." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:472 +#: src/webex/pages/confirm-create-reserve.tsx:478 #, c-format msgid "Can't parse amount: %1$s" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:479 +#: src/webex/pages/confirm-create-reserve.tsx:485 #, c-format msgid "Can't parse wire_types: %1$s" msgstr "" #. #-#-#-#-# - (PACKAGE VERSION) #-#-#-#-# #. TODO:generic error reporting function or component. -#: src/webex/pages/confirm-create-reserve.tsx:505 src/webex/pages/tip.tsx:180 +#: src/webex/pages/confirm-create-reserve.tsx:511 src/webex/pages/tip.tsx:180 #, c-format msgid "Fatal error: \"%1$s\"." msgstr "" @@ -300,42 +348,42 @@ msgstr "" msgid "Cancel" msgstr "" -#: src/webex/renderHtml.tsx:216 +#: src/webex/renderHtml.tsx:225 #, c-format msgid "Withdrawal fees:" msgstr "" -#: src/webex/renderHtml.tsx:217 +#: src/webex/renderHtml.tsx:226 #, c-format msgid "Rounding loss:" msgstr "" -#: src/webex/renderHtml.tsx:218 +#: src/webex/renderHtml.tsx:227 #, c-format msgid "Earliest expiration (for deposit): %1$s" msgstr "" -#: src/webex/renderHtml.tsx:224 +#: src/webex/renderHtml.tsx:233 #, c-format msgid "# Coins" msgstr "" -#: src/webex/renderHtml.tsx:225 +#: src/webex/renderHtml.tsx:234 #, c-format msgid "Value" msgstr "" -#: src/webex/renderHtml.tsx:226 +#: src/webex/renderHtml.tsx:235 #, c-format msgid "Withdraw Fee" msgstr "" -#: src/webex/renderHtml.tsx:227 +#: src/webex/renderHtml.tsx:236 #, c-format msgid "Refresh Fee" msgstr "" -#: src/webex/renderHtml.tsx:228 +#: src/webex/renderHtml.tsx:237 #, c-format msgid "Deposit Fee" msgstr "" diff --git a/src/webex/pages/confirm-contract.tsx b/src/webex/pages/confirm-contract.tsx index b851bf1d2..0aaed4837 100644 --- a/src/webex/pages/confirm-contract.tsx +++ b/src/webex/pages/confirm-contract.tsx @@ -84,7 +84,7 @@ class Details extends React.Component {
{i18n.str`Accepted exchanges:`} @@ -338,7 +338,7 @@ class ContractPrompt extends React.Component {(this.state.alreadyPaid ?

- You already paid for this, clicking "Confirm payment" will not cost money again. + {i18n.str`You already paid for this, clicking "Confirm payment" will not cost money again.`}

:

)} {(this.state.checkPayError ?

{this.state.checkPayError}

:

)} @@ -352,15 +352,15 @@ class ContractPrompt extends React.ComponentThere was an error paying (attempt #{this.state.payAttempt}):

{JSON.stringify(this.state.confirmPayError)}
{ this.state.abortStarted - ? Aborting payment ... + ? {i18n.str`Aborting payment ...`} : this.state.abortDone - ? Payment aborted! + ? {i18n.str`Payment aborted!`} : <> } diff --git a/src/webex/pages/confirm-create-reserve.tsx b/src/webex/pages/confirm-create-reserve.tsx index d83c56665..3c5bb5752 100644 --- a/src/webex/pages/confirm-create-reserve.tsx +++ b/src/webex/pages/confirm-create-reserve.tsx @@ -278,18 +278,22 @@ class ExchangeSelection extends ImplicitStateComponent { if (rci.versionMatch.currentCmp === -1) { return (

+ Your wallet (protocol version {rci.walletVersion}) might be outdated. The exchange has a higher, incompatible protocol version ({rci.exchangeVersion}). +

); } if (rci.versionMatch.currentCmp === 1) { return (

+ The chosen exchange (protocol version {rci.exchangeVersion} might be outdated. The exchange has a lower, incompatible protocol version than your wallet (protocol version {rci.walletVersion}). +

); } @@ -330,13 +334,15 @@ class ExchangeSelection extends ImplicitStateComponent { console.log(exchanges); return (
- Please select an exchange. You can review the details before after your selection. + i18n.str`Please select an exchange. You can review the details before after your selection.` {this.props.suggestedExchangeUrl && (

Bank Suggestion

)} @@ -352,7 +358,7 @@ class ExchangeSelection extends ImplicitStateComponent {
)} -

Manual Selection

+

i18n.str`Manual Selection`

this.select(url)} />
);