simplify translations build system

6 files changed, 1011 insertions, 284 deletions

diff --git a/src/i18n/de.po b/src/i18n/de.po
index df5e3c08e..01fa3d8f7 100644
--- a/src/i18n/de.po
+++ b/src/i18n/de.po
@@ -27,27 +27,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/pages/confirm-contract.tsx:62
+#: src/pages/confirm-contract.tsx:65
 #, c-format
 msgid "show more details\n"
 msgstr ""
 
-#: src/pages/confirm-contract.tsx:76
+#: src/pages/confirm-contract.tsx:79
 #, c-format
 msgid "Accepted exchanges:"
 msgstr ""
 
-#: src/pages/confirm-contract.tsx:81
+#: src/pages/confirm-contract.tsx:84
 #, c-format
 msgid "Exchanges in the wallet:"
 msgstr ""
 
-#: src/pages/confirm-contract.tsx:157
+#: src/pages/confirm-contract.tsx:160
 #, c-format
 msgid "You have insufficient funds of the requested currency in your wallet."
 msgstr ""
 
-#: src/pages/confirm-contract.tsx:158
+#: src/pages/confirm-contract.tsx:161
 #, c-format
 msgid ""
 "You do not have any funds from an exchange that is accepted by this "
@@ -55,214 +55,233 @@ msgid ""
 "wallet."
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:106
+#: src/pages/confirm-create-reserve.tsx:195
 #, fuzzy, c-format
 msgid "Withdrawal fees: %1$s"
 msgstr "Abheben bei %1$s"
 
-#: src/pages/confirm-create-reserve.tsx:107
+#: src/pages/confirm-create-reserve.tsx:196
 #, c-format
 msgid "Rounding loss: %1$s"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:110
+#: src/pages/confirm-create-reserve.tsx:197
+#, c-format
+msgid "Earliest expiration (for deposit): %1$s"
+msgstr ""
+
+#: src/pages/confirm-create-reserve.tsx:202
 #, c-format
 msgid "# Coins"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:111
+#: src/pages/confirm-create-reserve.tsx:203
 #, c-format
 msgid "Value"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:112
+#: src/pages/confirm-create-reserve.tsx:204
 #, fuzzy, c-format
 msgid "Withdraw Fee"
 msgstr "Abheben bei %1$s"
 
-#: src/pages/confirm-create-reserve.tsx:113
+#: src/pages/confirm-create-reserve.tsx:205
 #, c-format
 msgid "Refresh Fee"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:114
+#: src/pages/confirm-create-reserve.tsx:206
 #, c-format
 msgid "Deposit Fee"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:147
+#: src/pages/confirm-create-reserve.tsx:244
 #, fuzzy, c-format
 msgid "Withdraw fees:"
 msgstr "Abheben bei %1$s"
 
-#: src/pages/confirm-create-reserve.tsx:182
+#: src/pages/confirm-create-reserve.tsx:287
 #, c-format
-msgid "view fee structure / select different exchange provider"
+msgid "Select"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:196
+#: src/pages/confirm-create-reserve.tsx:303
+#, c-format
+msgid "Error: URL may not be relative"
+msgstr ""
+
+#: src/pages/confirm-create-reserve.tsx:371
+#, c-format
+msgid "The exchange is trusted by the wallet.\n"
+msgstr ""
+
+#: src/pages/confirm-create-reserve.tsx:377
+#, c-format
+msgid "The exchange is audited by a trusted auditor.\n"
+msgstr ""
+
+#: src/pages/confirm-create-reserve.tsx:383
 #, c-format
-msgid "Detailed Fee Structure"
+msgid ""
+"Warning:  The exchange is neither directly trusted nor audited by a trusted "
+"auditor.\n"
+"If you withdraw from this exchange, it will be trusted in the future.\n"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:212
+#: src/pages/confirm-create-reserve.tsx:392
 #, c-format
 msgid ""
+"Using exchange provider%1$s.\n"
 "The exchange provider will charge\n"
-" %1$s in fees.\n"
+" %2$s in fees.\n"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:224
+#: src/pages/confirm-create-reserve.tsx:406
 #, c-format
 msgid ""
 "Waiting for a response from\n"
 " %1$s"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:235
+#: src/pages/confirm-create-reserve.tsx:417
 #, c-format
-msgid "A problem occured, see below."
+msgid "A problem occured, see below. %1$s"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:241
+#: src/pages/confirm-create-reserve.tsx:423
 #, c-format
 msgid ""
 "Information about fees will be available when an exchange provider is "
 "selected."
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:249
-#, c-format
-msgid "You are about to withdraw %1$s from your bank account into your wallet."
-msgstr ""
-
-#: src/pages/confirm-create-reserve.tsx:258
+#: src/pages/confirm-create-reserve.tsx:435
 #, c-format
 msgid "Accept fees and withdraw"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:280
+#: src/pages/confirm-create-reserve.tsx:440
 #, c-format
-msgid "Error: URL is empty"
+msgid "Change Exchange Provider"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:288
+#: src/pages/confirm-create-reserve.tsx:496
 #, c-format
-msgid "Error: URL may not be relative"
+msgid "You are about to withdraw %1$s from your bank account into your wallet."
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:347
+#: src/pages/confirm-create-reserve.tsx:579
 #, c-format
 msgid ""
 "Oops, something went wrong. The wallet responded with error status (%1$s)."
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:374
+#: src/pages/confirm-create-reserve.tsx:590
 #, c-format
 msgid "Checking URL, please wait ..."
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:388
+#: src/pages/confirm-create-reserve.tsx:604
 #, c-format
 msgid "Can't parse amount: %1$s"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:396
+#: src/pages/confirm-create-reserve.tsx:612
 #, c-format
 msgid "Can't parse wire_types: %1$s"
 msgstr ""
 
 #. TODO:generic error reporting function or component.
-#: src/pages/confirm-create-reserve.tsx:413
+#: src/pages/confirm-create-reserve.tsx:632
 #, c-format
 msgid "Fatal error: \"%1$s\"."
 msgstr ""
 
-#: src/popup/popup.tsx:172
+#: src/pages/popup.tsx:157
 #, c-format
 msgid "Balance"
 msgstr "Saldo"
 
-#: src/popup/popup.tsx:175
+#: src/pages/popup.tsx:160
 #, c-format
 msgid "History"
 msgstr "Verlauf"
 
-#: src/popup/popup.tsx:178
+#: src/pages/popup.tsx:163
 #, c-format
 msgid "Debug"
 msgstr "Debug"
 
-#: src/popup/popup.tsx:238
+#: src/pages/popup.tsx:235
 #, c-format
 msgid "help"
 msgstr ""
 
-#: src/popup/popup.tsx:243
+#: src/pages/popup.tsx:240
 #, fuzzy, c-format
 msgid ""
 "You have no balance to show. Need some\n"
 " %1$s getting started?\n"
 msgstr "Sie haben kein Digitalgeld. Wollen Sie %1$s? abheben?"
 
-#: src/popup/popup.tsx:260
+#: src/pages/popup.tsx:257
 #, c-format
 msgid "%1$s incoming\n"
 msgstr ""
 
-#: src/popup/popup.tsx:273
+#: src/pages/popup.tsx:270
 #, c-format
 msgid "%1$s being spent\n"
 msgstr ""
 
-#: src/popup/popup.tsx:299
+#: src/pages/popup.tsx:296
 #, c-format
 msgid "Error: could not retrieve balance information."
 msgstr ""
 
-#: src/popup/popup.tsx:337
+#: src/pages/popup.tsx:337
 #, fuzzy, c-format
 msgid "Bank requested reserve (%1$s) for%2$s.\n"
 msgstr "Bank bestätig anlegen der Reserve (%1$s) bei %2$s"
 
-#: src/popup/popup.tsx:346
+#: src/pages/popup.tsx:346
 #, fuzzy, c-format
 msgid ""
 "Started to withdraw\n"
 " %1$s from%2$s(%3$s).\n"
 msgstr "Reserve (%1$s) mit %2$s bei %3$s erzeugt"
 
-#: src/popup/popup.tsx:358
+#: src/pages/popup.tsx:358
 #, c-format
 msgid "Merchant%1$soffered contract%2$s;\n"
 msgstr ""
 
-#: src/popup/popup.tsx:368
+#: src/pages/popup.tsx:368
 #, fuzzy, c-format
 msgid "Withdrew%1$sfrom%2$s(%3$s).\n"
 msgstr "Reserve (%1$s) mit %2$s bei %3$s erzeugt"
 
-#: src/popup/popup.tsx:379
+#: src/pages/popup.tsx:379
 #, fuzzy, c-format
 msgid "Paid%1$sto merchant%2$s.  (%3$s)\n"
 msgstr "Reserve (%1$s) mit %2$s bei %3$s erzeugt"
 
-#: src/popup/popup.tsx:386
+#: src/pages/popup.tsx:386
 #, c-format
 msgid "Unknown event (%1$s)"
 msgstr ""
 
-#: src/popup/popup.tsx:429
+#: src/pages/popup.tsx:429
 #, c-format
 msgid "Error: could not retrieve event history"
 msgstr ""
 
-#: src/popup/popup.tsx:463
+#: src/pages/popup.tsx:463
 #, c-format
 msgid "Your wallet has no events recorded."
 msgstr "Ihre Geldbörse verzeichnet keine Vorkommnisse."
 
-#: src/renderHtml.tsx:38
+#: src/renderHtml.tsx:44
 #, fuzzy, c-format
 msgid "The merchant%1$swants to enter a contract over%2$s with you.\n"
 msgstr ""
@@ -270,7 +289,7 @@ msgstr ""
 "               möchte einen Vertrag über %2$s\n"
 "               mit Ihnen abschließen."
 
-#: src/renderHtml.tsx:43
+#: src/renderHtml.tsx:49
 #, fuzzy, c-format
 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 fae9d5336..ed0f2d792 100644
--- a/src/i18n/en-US.po
+++ b/src/i18n/en-US.po
@@ -27,27 +27,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/pages/confirm-contract.tsx:62
+#: src/pages/confirm-contract.tsx:65
 #, c-format
 msgid "show more details\n"
 msgstr ""
 
-#: src/pages/confirm-contract.tsx:76
+#: src/pages/confirm-contract.tsx:79
 #, c-format
 msgid "Accepted exchanges:"
 msgstr ""
 
-#: src/pages/confirm-contract.tsx:81
+#: src/pages/confirm-contract.tsx:84
 #, c-format
 msgid "Exchanges in the wallet:"
 msgstr ""
 
-#: src/pages/confirm-contract.tsx:157
+#: src/pages/confirm-contract.tsx:160
 #, c-format
 msgid "You have insufficient funds of the requested currency in your wallet."
 msgstr ""
 
-#: src/pages/confirm-contract.tsx:158
+#: src/pages/confirm-contract.tsx:161
 #, c-format
 msgid ""
 "You do not have any funds from an exchange that is accepted by this "
@@ -55,219 +55,238 @@ msgid ""
 "wallet."
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:106
+#: src/pages/confirm-create-reserve.tsx:195
 #, c-format
 msgid "Withdrawal fees: %1$s"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:107
+#: src/pages/confirm-create-reserve.tsx:196
 #, c-format
 msgid "Rounding loss: %1$s"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:110
+#: src/pages/confirm-create-reserve.tsx:197
+#, c-format
+msgid "Earliest expiration (for deposit): %1$s"
+msgstr ""
+
+#: src/pages/confirm-create-reserve.tsx:202
 #, c-format
 msgid "# Coins"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:111
+#: src/pages/confirm-create-reserve.tsx:203
 #, c-format
 msgid "Value"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:112
+#: src/pages/confirm-create-reserve.tsx:204
 #, c-format
 msgid "Withdraw Fee"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:113
+#: src/pages/confirm-create-reserve.tsx:205
 #, c-format
 msgid "Refresh Fee"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:114
+#: src/pages/confirm-create-reserve.tsx:206
 #, c-format
 msgid "Deposit Fee"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:147
+#: src/pages/confirm-create-reserve.tsx:244
 #, c-format
 msgid "Withdraw fees:"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:182
+#: src/pages/confirm-create-reserve.tsx:287
 #, c-format
-msgid "view fee structure / select different exchange provider"
+msgid "Select"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:196
+#: src/pages/confirm-create-reserve.tsx:303
+#, c-format
+msgid "Error: URL may not be relative"
+msgstr ""
+
+#: src/pages/confirm-create-reserve.tsx:371
+#, c-format
+msgid "The exchange is trusted by the wallet.\n"
+msgstr ""
+
+#: src/pages/confirm-create-reserve.tsx:377
+#, c-format
+msgid "The exchange is audited by a trusted auditor.\n"
+msgstr ""
+
+#: src/pages/confirm-create-reserve.tsx:383
 #, c-format
-msgid "Detailed Fee Structure"
+msgid ""
+"Warning:  The exchange is neither directly trusted nor audited by a trusted "
+"auditor.\n"
+"If you withdraw from this exchange, it will be trusted in the future.\n"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:212
+#: src/pages/confirm-create-reserve.tsx:392
 #, c-format
 msgid ""
+"Using exchange provider%1$s.\n"
 "The exchange provider will charge\n"
-" %1$s in fees.\n"
+" %2$s in fees.\n"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:224
+#: src/pages/confirm-create-reserve.tsx:406
 #, c-format
 msgid ""
 "Waiting for a response from\n"
 " %1$s"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:235
+#: src/pages/confirm-create-reserve.tsx:417
 #, c-format
-msgid "A problem occured, see below."
+msgid "A problem occured, see below. %1$s"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:241
+#: src/pages/confirm-create-reserve.tsx:423
 #, c-format
 msgid ""
 "Information about fees will be available when an exchange provider is "
 "selected."
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:249
-#, c-format
-msgid "You are about to withdraw %1$s from your bank account into your wallet."
-msgstr ""
-
-#: src/pages/confirm-create-reserve.tsx:258
+#: src/pages/confirm-create-reserve.tsx:435
 #, c-format
 msgid "Accept fees and withdraw"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:280
+#: src/pages/confirm-create-reserve.tsx:440
 #, c-format
-msgid "Error: URL is empty"
+msgid "Change Exchange Provider"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:288
+#: src/pages/confirm-create-reserve.tsx:496
 #, c-format
-msgid "Error: URL may not be relative"
+msgid "You are about to withdraw %1$s from your bank account into your wallet."
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:347
+#: src/pages/confirm-create-reserve.tsx:579
 #, c-format
 msgid ""
 "Oops, something went wrong. The wallet responded with error status (%1$s)."
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:374
+#: src/pages/confirm-create-reserve.tsx:590
 #, c-format
 msgid "Checking URL, please wait ..."
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:388
+#: src/pages/confirm-create-reserve.tsx:604
 #, c-format
 msgid "Can't parse amount: %1$s"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:396
+#: src/pages/confirm-create-reserve.tsx:612
 #, c-format
 msgid "Can't parse wire_types: %1$s"
 msgstr ""
 
 #. TODO:generic error reporting function or component.
-#: src/pages/confirm-create-reserve.tsx:413
+#: src/pages/confirm-create-reserve.tsx:632
 #, c-format
 msgid "Fatal error: \"%1$s\"."
 msgstr ""
 
-#: src/popup/popup.tsx:172
+#: src/pages/popup.tsx:157
 #, c-format
 msgid "Balance"
 msgstr ""
 
-#: src/popup/popup.tsx:175
+#: src/pages/popup.tsx:160
 #, c-format
 msgid "History"
 msgstr ""
 
-#: src/popup/popup.tsx:178
+#: src/pages/popup.tsx:163
 #, c-format
 msgid "Debug"
 msgstr ""
 
-#: src/popup/popup.tsx:238
+#: src/pages/popup.tsx:235
 #, c-format
 msgid "help"
 msgstr ""
 
-#: src/popup/popup.tsx:243
+#: src/pages/popup.tsx:240
 #, c-format
 msgid ""
 "You have no balance to show. Need some\n"
 " %1$s getting started?\n"
 msgstr ""
 
-#: src/popup/popup.tsx:260
+#: src/pages/popup.tsx:257
 #, c-format
 msgid "%1$s incoming\n"
 msgstr ""
 
-#: src/popup/popup.tsx:273
+#: src/pages/popup.tsx:270
 #, c-format
 msgid "%1$s being spent\n"
 msgstr ""
 
-#: src/popup/popup.tsx:299
+#: src/pages/popup.tsx:296
 #, c-format
 msgid "Error: could not retrieve balance information."
 msgstr ""
 
-#: src/popup/popup.tsx:337
+#: src/pages/popup.tsx:337
 #, c-format
 msgid "Bank requested reserve (%1$s) for%2$s.\n"
 msgstr ""
 
-#: src/popup/popup.tsx:346
+#: src/pages/popup.tsx:346
 #, c-format
 msgid ""
 "Started to withdraw\n"
 " %1$s from%2$s(%3$s).\n"
 msgstr ""
 
-#: src/popup/popup.tsx:358
+#: src/pages/popup.tsx:358
 #, c-format
 msgid "Merchant%1$soffered contract%2$s;\n"
 msgstr ""
 
-#: src/popup/popup.tsx:368
+#: src/pages/popup.tsx:368
 #, c-format
 msgid "Withdrew%1$sfrom%2$s(%3$s).\n"
 msgstr ""
 
-#: src/popup/popup.tsx:379
+#: src/pages/popup.tsx:379
 #, c-format
 msgid "Paid%1$sto merchant%2$s.  (%3$s)\n"
 msgstr ""
 
-#: src/popup/popup.tsx:386
+#: src/pages/popup.tsx:386
 #, c-format
 msgid "Unknown event (%1$s)"
 msgstr ""
 
-#: src/popup/popup.tsx:429
+#: src/pages/popup.tsx:429
 #, c-format
 msgid "Error: could not retrieve event history"
 msgstr ""
 
-#: src/popup/popup.tsx:463
+#: src/pages/popup.tsx:463
 #, c-format
 msgid "Your wallet has no events recorded."
 msgstr ""
 
-#: src/renderHtml.tsx:38
+#: src/renderHtml.tsx:44
 #, c-format
 msgid "The merchant%1$swants to enter a contract over%2$s with you.\n"
 msgstr ""
 
-#: src/renderHtml.tsx:43
+#: src/renderHtml.tsx:49
 #, c-format
 msgid "You are about to purchase:"
 msgstr ""
diff --git a/src/i18n/fr.po b/src/i18n/fr.po
index 8bfdf57d0..86127399d 100644
--- a/src/i18n/fr.po
+++ b/src/i18n/fr.po
@@ -27,27 +27,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/pages/confirm-contract.tsx:62
+#: src/pages/confirm-contract.tsx:65
 #, c-format
 msgid "show more details\n"
 msgstr ""
 
-#: src/pages/confirm-contract.tsx:76
+#: src/pages/confirm-contract.tsx:79
 #, c-format
 msgid "Accepted exchanges:"
 msgstr ""
 
-#: src/pages/confirm-contract.tsx:81
+#: src/pages/confirm-contract.tsx:84
 #, c-format
 msgid "Exchanges in the wallet:"
 msgstr ""
 
-#: src/pages/confirm-contract.tsx:157
+#: src/pages/confirm-contract.tsx:160
 #, c-format
 msgid "You have insufficient funds of the requested currency in your wallet."
 msgstr ""
 
-#: src/pages/confirm-contract.tsx:158
+#: src/pages/confirm-contract.tsx:161
 #, c-format
 msgid ""
 "You do not have any funds from an exchange that is accepted by this "
@@ -55,219 +55,238 @@ msgid ""
 "wallet."
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:106
+#: src/pages/confirm-create-reserve.tsx:195
 #, c-format
 msgid "Withdrawal fees: %1$s"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:107
+#: src/pages/confirm-create-reserve.tsx:196
 #, c-format
 msgid "Rounding loss: %1$s"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:110
+#: src/pages/confirm-create-reserve.tsx:197
+#, c-format
+msgid "Earliest expiration (for deposit): %1$s"
+msgstr ""
+
+#: src/pages/confirm-create-reserve.tsx:202
 #, c-format
 msgid "# Coins"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:111
+#: src/pages/confirm-create-reserve.tsx:203
 #, c-format
 msgid "Value"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:112
+#: src/pages/confirm-create-reserve.tsx:204
 #, c-format
 msgid "Withdraw Fee"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:113
+#: src/pages/confirm-create-reserve.tsx:205
 #, c-format
 msgid "Refresh Fee"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:114
+#: src/pages/confirm-create-reserve.tsx:206
 #, c-format
 msgid "Deposit Fee"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:147
+#: src/pages/confirm-create-reserve.tsx:244
 #, c-format
 msgid "Withdraw fees:"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:182
+#: src/pages/confirm-create-reserve.tsx:287
 #, c-format
-msgid "view fee structure / select different exchange provider"
+msgid "Select"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:196
+#: src/pages/confirm-create-reserve.tsx:303
+#, c-format
+msgid "Error: URL may not be relative"
+msgstr ""
+
+#: src/pages/confirm-create-reserve.tsx:371
+#, c-format
+msgid "The exchange is trusted by the wallet.\n"
+msgstr ""
+
+#: src/pages/confirm-create-reserve.tsx:377
+#, c-format
+msgid "The exchange is audited by a trusted auditor.\n"
+msgstr ""
+
+#: src/pages/confirm-create-reserve.tsx:383
 #, c-format
-msgid "Detailed Fee Structure"
+msgid ""
+"Warning:  The exchange is neither directly trusted nor audited by a trusted "
+"auditor.\n"
+"If you withdraw from this exchange, it will be trusted in the future.\n"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:212
+#: src/pages/confirm-create-reserve.tsx:392
 #, c-format
 msgid ""
+"Using exchange provider%1$s.\n"
 "The exchange provider will charge\n"
-" %1$s in fees.\n"
+" %2$s in fees.\n"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:224
+#: src/pages/confirm-create-reserve.tsx:406
 #, c-format
 msgid ""
 "Waiting for a response from\n"
 " %1$s"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:235
+#: src/pages/confirm-create-reserve.tsx:417
 #, c-format
-msgid "A problem occured, see below."
+msgid "A problem occured, see below. %1$s"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:241
+#: src/pages/confirm-create-reserve.tsx:423
 #, c-format
 msgid ""
 "Information about fees will be available when an exchange provider is "
 "selected."
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:249
-#, c-format
-msgid "You are about to withdraw %1$s from your bank account into your wallet."
-msgstr ""
-
-#: src/pages/confirm-create-reserve.tsx:258
+#: src/pages/confirm-create-reserve.tsx:435
 #, c-format
 msgid "Accept fees and withdraw"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:280
+#: src/pages/confirm-create-reserve.tsx:440
 #, c-format
-msgid "Error: URL is empty"
+msgid "Change Exchange Provider"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:288
+#: src/pages/confirm-create-reserve.tsx:496
 #, c-format
-msgid "Error: URL may not be relative"
+msgid "You are about to withdraw %1$s from your bank account into your wallet."
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:347
+#: src/pages/confirm-create-reserve.tsx:579
 #, c-format
 msgid ""
 "Oops, something went wrong. The wallet responded with error status (%1$s)."
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:374
+#: src/pages/confirm-create-reserve.tsx:590
 #, c-format
 msgid "Checking URL, please wait ..."
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:388
+#: src/pages/confirm-create-reserve.tsx:604
 #, c-format
 msgid "Can't parse amount: %1$s"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:396
+#: src/pages/confirm-create-reserve.tsx:612
 #, c-format
 msgid "Can't parse wire_types: %1$s"
 msgstr ""
 
 #. TODO:generic error reporting function or component.
-#: src/pages/confirm-create-reserve.tsx:413
+#: src/pages/confirm-create-reserve.tsx:632
 #, c-format
 msgid "Fatal error: \"%1$s\"."
 msgstr ""
 
-#: src/popup/popup.tsx:172
+#: src/pages/popup.tsx:157
 #, c-format
 msgid "Balance"
 msgstr ""
 
-#: src/popup/popup.tsx:175
+#: src/pages/popup.tsx:160
 #, c-format
 msgid "History"
 msgstr ""
 
-#: src/popup/popup.tsx:178
+#: src/pages/popup.tsx:163
 #, c-format
 msgid "Debug"
 msgstr ""
 
-#: src/popup/popup.tsx:238
+#: src/pages/popup.tsx:235
 #, c-format
 msgid "help"
 msgstr ""
 
-#: src/popup/popup.tsx:243
+#: src/pages/popup.tsx:240
 #, c-format
 msgid ""
 "You have no balance to show. Need some\n"
 " %1$s getting started?\n"
 msgstr ""
 
-#: src/popup/popup.tsx:260
+#: src/pages/popup.tsx:257
 #, c-format
 msgid "%1$s incoming\n"
 msgstr ""
 
-#: src/popup/popup.tsx:273
+#: src/pages/popup.tsx:270
 #, c-format
 msgid "%1$s being spent\n"
 msgstr ""
 
-#: src/popup/popup.tsx:299
+#: src/pages/popup.tsx:296
 #, c-format
 msgid "Error: could not retrieve balance information."
 msgstr ""
 
-#: src/popup/popup.tsx:337
+#: src/pages/popup.tsx:337
 #, c-format
 msgid "Bank requested reserve (%1$s) for%2$s.\n"
 msgstr ""
 
-#: src/popup/popup.tsx:346
+#: src/pages/popup.tsx:346
 #, c-format
 msgid ""
 "Started to withdraw\n"
 " %1$s from%2$s(%3$s).\n"
 msgstr ""
 
-#: src/popup/popup.tsx:358
+#: src/pages/popup.tsx:358
 #, c-format
 msgid "Merchant%1$soffered contract%2$s;\n"
 msgstr ""
 
-#: src/popup/popup.tsx:368
+#: src/pages/popup.tsx:368
 #, c-format
 msgid "Withdrew%1$sfrom%2$s(%3$s).\n"
 msgstr ""
 
-#: src/popup/popup.tsx:379
+#: src/pages/popup.tsx:379
 #, c-format
 msgid "Paid%1$sto merchant%2$s.  (%3$s)\n"
 msgstr ""
 
-#: src/popup/popup.tsx:386
+#: src/pages/popup.tsx:386
 #, c-format
 msgid "Unknown event (%1$s)"
 msgstr ""
 
-#: src/popup/popup.tsx:429
+#: src/pages/popup.tsx:429
 #, c-format
 msgid "Error: could not retrieve event history"
 msgstr ""
 
-#: src/popup/popup.tsx:463
+#: src/pages/popup.tsx:463
 #, c-format
 msgid "Your wallet has no events recorded."
 msgstr ""
 
-#: src/renderHtml.tsx:38
+#: src/renderHtml.tsx:44
 #, c-format
 msgid "The merchant%1$swants to enter a contract over%2$s with you.\n"
 msgstr ""
 
-#: src/renderHtml.tsx:43
+#: src/renderHtml.tsx:49
 #, c-format
 msgid "You are about to purchase:"
 msgstr ""
diff --git a/src/i18n/it.po b/src/i18n/it.po
index 8bfdf57d0..86127399d 100644
--- a/src/i18n/it.po
+++ b/src/i18n/it.po
@@ -27,27 +27,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/pages/confirm-contract.tsx:62
+#: src/pages/confirm-contract.tsx:65
 #, c-format
 msgid "show more details\n"
 msgstr ""
 
-#: src/pages/confirm-contract.tsx:76
+#: src/pages/confirm-contract.tsx:79
 #, c-format
 msgid "Accepted exchanges:"
 msgstr ""
 
-#: src/pages/confirm-contract.tsx:81
+#: src/pages/confirm-contract.tsx:84
 #, c-format
 msgid "Exchanges in the wallet:"
 msgstr ""
 
-#: src/pages/confirm-contract.tsx:157
+#: src/pages/confirm-contract.tsx:160
 #, c-format
 msgid "You have insufficient funds of the requested currency in your wallet."
 msgstr ""
 
-#: src/pages/confirm-contract.tsx:158
+#: src/pages/confirm-contract.tsx:161
 #, c-format
 msgid ""
 "You do not have any funds from an exchange that is accepted by this "
@@ -55,219 +55,238 @@ msgid ""
 "wallet."
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:106
+#: src/pages/confirm-create-reserve.tsx:195
 #, c-format
 msgid "Withdrawal fees: %1$s"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:107
+#: src/pages/confirm-create-reserve.tsx:196
 #, c-format
 msgid "Rounding loss: %1$s"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:110
+#: src/pages/confirm-create-reserve.tsx:197
+#, c-format
+msgid "Earliest expiration (for deposit): %1$s"
+msgstr ""
+
+#: src/pages/confirm-create-reserve.tsx:202
 #, c-format
 msgid "# Coins"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:111
+#: src/pages/confirm-create-reserve.tsx:203
 #, c-format
 msgid "Value"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:112
+#: src/pages/confirm-create-reserve.tsx:204
 #, c-format
 msgid "Withdraw Fee"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:113
+#: src/pages/confirm-create-reserve.tsx:205
 #, c-format
 msgid "Refresh Fee"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:114
+#: src/pages/confirm-create-reserve.tsx:206
 #, c-format
 msgid "Deposit Fee"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:147
+#: src/pages/confirm-create-reserve.tsx:244
 #, c-format
 msgid "Withdraw fees:"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:182
+#: src/pages/confirm-create-reserve.tsx:287
 #, c-format
-msgid "view fee structure / select different exchange provider"
+msgid "Select"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:196
+#: src/pages/confirm-create-reserve.tsx:303
+#, c-format
+msgid "Error: URL may not be relative"
+msgstr ""
+
+#: src/pages/confirm-create-reserve.tsx:371
+#, c-format
+msgid "The exchange is trusted by the wallet.\n"
+msgstr ""
+
+#: src/pages/confirm-create-reserve.tsx:377
+#, c-format
+msgid "The exchange is audited by a trusted auditor.\n"
+msgstr ""
+
+#: src/pages/confirm-create-reserve.tsx:383
 #, c-format
-msgid "Detailed Fee Structure"
+msgid ""
+"Warning:  The exchange is neither directly trusted nor audited by a trusted "
+"auditor.\n"
+"If you withdraw from this exchange, it will be trusted in the future.\n"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:212
+#: src/pages/confirm-create-reserve.tsx:392
 #, c-format
 msgid ""
+"Using exchange provider%1$s.\n"
 "The exchange provider will charge\n"
-" %1$s in fees.\n"
+" %2$s in fees.\n"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:224
+#: src/pages/confirm-create-reserve.tsx:406
 #, c-format
 msgid ""
 "Waiting for a response from\n"
 " %1$s"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:235
+#: src/pages/confirm-create-reserve.tsx:417
 #, c-format
-msgid "A problem occured, see below."
+msgid "A problem occured, see below. %1$s"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:241
+#: src/pages/confirm-create-reserve.tsx:423
 #, c-format
 msgid ""
 "Information about fees will be available when an exchange provider is "
 "selected."
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:249
-#, c-format
-msgid "You are about to withdraw %1$s from your bank account into your wallet."
-msgstr ""
-
-#: src/pages/confirm-create-reserve.tsx:258
+#: src/pages/confirm-create-reserve.tsx:435
 #, c-format
 msgid "Accept fees and withdraw"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:280
+#: src/pages/confirm-create-reserve.tsx:440
 #, c-format
-msgid "Error: URL is empty"
+msgid "Change Exchange Provider"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:288
+#: src/pages/confirm-create-reserve.tsx:496
 #, c-format
-msgid "Error: URL may not be relative"
+msgid "You are about to withdraw %1$s from your bank account into your wallet."
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:347
+#: src/pages/confirm-create-reserve.tsx:579
 #, c-format
 msgid ""
 "Oops, something went wrong. The wallet responded with error status (%1$s)."
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:374
+#: src/pages/confirm-create-reserve.tsx:590
 #, c-format
 msgid "Checking URL, please wait ..."
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:388
+#: src/pages/confirm-create-reserve.tsx:604
 #, c-format
 msgid "Can't parse amount: %1$s"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:396
+#: src/pages/confirm-create-reserve.tsx:612
 #, c-format
 msgid "Can't parse wire_types: %1$s"
 msgstr ""
 
 #. TODO:generic error reporting function or component.
-#: src/pages/confirm-create-reserve.tsx:413
+#: src/pages/confirm-create-reserve.tsx:632
 #, c-format
 msgid "Fatal error: \"%1$s\"."
 msgstr ""
 
-#: src/popup/popup.tsx:172
+#: src/pages/popup.tsx:157
 #, c-format
 msgid "Balance"
 msgstr ""
 
-#: src/popup/popup.tsx:175
+#: src/pages/popup.tsx:160
 #, c-format
 msgid "History"
 msgstr ""
 
-#: src/popup/popup.tsx:178
+#: src/pages/popup.tsx:163
 #, c-format
 msgid "Debug"
 msgstr ""
 
-#: src/popup/popup.tsx:238
+#: src/pages/popup.tsx:235
 #, c-format
 msgid "help"
 msgstr ""
 
-#: src/popup/popup.tsx:243
+#: src/pages/popup.tsx:240
 #, c-format
 msgid ""
 "You have no balance to show. Need some\n"
 " %1$s getting started?\n"
 msgstr ""
 
-#: src/popup/popup.tsx:260
+#: src/pages/popup.tsx:257
 #, c-format
 msgid "%1$s incoming\n"
 msgstr ""
 
-#: src/popup/popup.tsx:273
+#: src/pages/popup.tsx:270
 #, c-format
 msgid "%1$s being spent\n"
 msgstr ""
 
-#: src/popup/popup.tsx:299
+#: src/pages/popup.tsx:296
 #, c-format
 msgid "Error: could not retrieve balance information."
 msgstr ""
 
-#: src/popup/popup.tsx:337
+#: src/pages/popup.tsx:337
 #, c-format
 msgid "Bank requested reserve (%1$s) for%2$s.\n"
 msgstr ""
 
-#: src/popup/popup.tsx:346
+#: src/pages/popup.tsx:346
 #, c-format
 msgid ""
 "Started to withdraw\n"
 " %1$s from%2$s(%3$s).\n"
 msgstr ""
 
-#: src/popup/popup.tsx:358
+#: src/pages/popup.tsx:358
 #, c-format
 msgid "Merchant%1$soffered contract%2$s;\n"
 msgstr ""
 
-#: src/popup/popup.tsx:368
+#: src/pages/popup.tsx:368
 #, c-format
 msgid "Withdrew%1$sfrom%2$s(%3$s).\n"
 msgstr ""
 
-#: src/popup/popup.tsx:379
+#: src/pages/popup.tsx:379
 #, c-format
 msgid "Paid%1$sto merchant%2$s.  (%3$s)\n"
 msgstr ""
 
-#: src/popup/popup.tsx:386
+#: src/pages/popup.tsx:386
 #, c-format
 msgid "Unknown event (%1$s)"
 msgstr ""
 
-#: src/popup/popup.tsx:429
+#: src/pages/popup.tsx:429
 #, c-format
 msgid "Error: could not retrieve event history"
 msgstr ""
 
-#: src/popup/popup.tsx:463
+#: src/pages/popup.tsx:463
 #, c-format
 msgid "Your wallet has no events recorded."
 msgstr ""
 
-#: src/renderHtml.tsx:38
+#: src/renderHtml.tsx:44
 #, c-format
 msgid "The merchant%1$swants to enter a contract over%2$s with you.\n"
 msgstr ""
 
-#: src/renderHtml.tsx:43
+#: src/renderHtml.tsx:49
 #, c-format
 msgid "You are about to purchase:"
 msgstr ""
diff --git a/src/i18n/strings.ts b/src/i18n/strings.ts
index 08ba92992..19a9293a4 100644
--- a/src/i18n/strings.ts
+++ b/src/i18n/strings.ts
@@ -15,7 +15,639 @@
  */
 
 export let strings: {[s: string]: any} = {};
-strings['de'] = {"domain":"de","locale_data":{"de":{"":{"domain":"de","plural_forms":"nplurals=2; plural=(n != 1);","lang":""},"show more details\n":[""],"Accepted exchanges:":[""],"Exchanges in the wallet:":[""],"You have insufficient funds of the requested currency in your wallet.":[""],"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.":[""],"Withdrawal fees: %1$s":["Abheben bei %1$s"],"Rounding loss: %1$s":[""],"# Coins":[""],"Value":[""],"Withdraw Fee":["Abheben bei %1$s"],"Refresh Fee":[""],"Deposit Fee":[""],"Withdraw fees:":["Abheben bei %1$s"],"view fee structure / select different exchange provider":[""],"Detailed Fee Structure":[""],"The exchange provider will charge\n %1$s in fees.\n":[""],"Waiting for a response from\n %1$s":[""],"A problem occured, see below.":[""],"Information about fees will be available when an exchange provider is selected.":[""],"You are about to withdraw %1$s from your bank account into your wallet.":[""],"Accept fees and withdraw":[""],"Error: URL is empty":[""],"Error: URL may not be relative":[""],"Oops, something went wrong. The wallet responded with error status (%1$s).":[""],"Checking URL, please wait ...":[""],"Can't parse amount: %1$s":[""],"Can't parse wire_types: %1$s":[""],"Fatal error: \"%1$s\".":[""],"Balance":["Saldo"],"History":["Verlauf"],"Debug":["Debug"],"help":[""],"You have no balance to show. Need some\n %1$s getting started?\n":["Sie haben kein Digitalgeld. Wollen Sie %1$s? abheben?"],"%1$s incoming\n":[""],"%1$s being spent\n":[""],"Error: could not retrieve balance information.":[""],"Bank requested reserve (%1$s) for%2$s.\n":["Bank bestätig anlegen der Reserve (%1$s) bei %2$s"],"Started to withdraw\n %1$s from%2$s(%3$s).\n":["Reserve (%1$s) mit %2$s bei %3$s erzeugt"],"Merchant%1$soffered contract%2$s;\n":[""],"Withdrew%1$sfrom%2$s(%3$s).\n":["Reserve (%1$s) mit %2$s bei %3$s erzeugt"],"Paid%1$sto merchant%2$s.  (%3$s)\n":["Reserve (%1$s) mit %2$s bei %3$s erzeugt"],"Unknown event (%1$s)":[""],"Error: could not retrieve event history":[""],"Your wallet has no events recorded.":["Ihre Geldbörse verzeichnet keine Vorkommnisse."],"The merchant%1$swants to enter a contract over%2$s with you.\n":["%1$s\n               möchte einen Vertrag über %2$s\n               mit Ihnen abschließen."],"You are about to purchase:":["Sie sind dabei, Folgendes zu kaufen:"]}}};
-strings['en-US'] = {"domain":"en-US","locale_data":{"en-US":{"":{"domain":"en-US","plural_forms":"nplurals=2; plural=(n != 1);","lang":""},"show more details\n":[""],"Accepted exchanges:":[""],"Exchanges in the wallet:":[""],"You have insufficient funds of the requested currency in your wallet.":[""],"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.":[""],"Withdrawal fees: %1$s":[""],"Rounding loss: %1$s":[""],"# Coins":[""],"Value":[""],"Withdraw Fee":[""],"Refresh Fee":[""],"Deposit Fee":[""],"Withdraw fees:":[""],"view fee structure / select different exchange provider":[""],"Detailed Fee Structure":[""],"The exchange provider will charge\n %1$s in fees.\n":[""],"Waiting for a response from\n %1$s":[""],"A problem occured, see below.":[""],"Information about fees will be available when an exchange provider is selected.":[""],"You are about to withdraw %1$s from your bank account into your wallet.":[""],"Accept fees and withdraw":[""],"Error: URL is empty":[""],"Error: URL may not be relative":[""],"Oops, something went wrong. The wallet responded with error status (%1$s).":[""],"Checking URL, please wait ...":[""],"Can't parse amount: %1$s":[""],"Can't parse wire_types: %1$s":[""],"Fatal error: \"%1$s\".":[""],"Balance":[""],"History":[""],"Debug":[""],"help":[""],"You have no balance to show. Need some\n %1$s getting started?\n":[""],"%1$s incoming\n":[""],"%1$s being spent\n":[""],"Error: could not retrieve balance information.":[""],"Bank requested reserve (%1$s) for%2$s.\n":[""],"Started to withdraw\n %1$s from%2$s(%3$s).\n":[""],"Merchant%1$soffered contract%2$s;\n":[""],"Withdrew%1$sfrom%2$s(%3$s).\n":[""],"Paid%1$sto merchant%2$s.  (%3$s)\n":[""],"Unknown event (%1$s)":[""],"Error: could not retrieve event history":[""],"Your wallet has no events recorded.":[""],"The merchant%1$swants to enter a contract over%2$s with you.\n":[""],"You are about to purchase:":[""]}}};
-strings['fr'] = {"domain":"fr","locale_data":{"fr":{"":{"domain":"fr","plural_forms":"nplurals=2; plural=(n != 1);","lang":""},"show more details\n":[""],"Accepted exchanges:":[""],"Exchanges in the wallet:":[""],"You have insufficient funds of the requested currency in your wallet.":[""],"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.":[""],"Withdrawal fees: %1$s":[""],"Rounding loss: %1$s":[""],"# Coins":[""],"Value":[""],"Withdraw Fee":[""],"Refresh Fee":[""],"Deposit Fee":[""],"Withdraw fees:":[""],"view fee structure / select different exchange provider":[""],"Detailed Fee Structure":[""],"The exchange provider will charge\n %1$s in fees.\n":[""],"Waiting for a response from\n %1$s":[""],"A problem occured, see below.":[""],"Information about fees will be available when an exchange provider is selected.":[""],"You are about to withdraw %1$s from your bank account into your wallet.":[""],"Accept fees and withdraw":[""],"Error: URL is empty":[""],"Error: URL may not be relative":[""],"Oops, something went wrong. The wallet responded with error status (%1$s).":[""],"Checking URL, please wait ...":[""],"Can't parse amount: %1$s":[""],"Can't parse wire_types: %1$s":[""],"Fatal error: \"%1$s\".":[""],"Balance":[""],"History":[""],"Debug":[""],"help":[""],"You have no balance to show. Need some\n %1$s getting started?\n":[""],"%1$s incoming\n":[""],"%1$s being spent\n":[""],"Error: could not retrieve balance information.":[""],"Bank requested reserve (%1$s) for%2$s.\n":[""],"Started to withdraw\n %1$s from%2$s(%3$s).\n":[""],"Merchant%1$soffered contract%2$s;\n":[""],"Withdrew%1$sfrom%2$s(%3$s).\n":[""],"Paid%1$sto merchant%2$s.  (%3$s)\n":[""],"Unknown event (%1$s)":[""],"Error: could not retrieve event history":[""],"Your wallet has no events recorded.":[""],"The merchant%1$swants to enter a contract over%2$s with you.\n":[""],"You are about to purchase:":[""]}}};
-strings['it'] = {"domain":"it","locale_data":{"it":{"":{"domain":"it","plural_forms":"nplurals=2; plural=(n != 1);","lang":""},"show more details\n":[""],"Accepted exchanges:":[""],"Exchanges in the wallet:":[""],"You have insufficient funds of the requested currency in your wallet.":[""],"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.":[""],"Withdrawal fees: %1$s":[""],"Rounding loss: %1$s":[""],"# Coins":[""],"Value":[""],"Withdraw Fee":[""],"Refresh Fee":[""],"Deposit Fee":[""],"Withdraw fees:":[""],"view fee structure / select different exchange provider":[""],"Detailed Fee Structure":[""],"The exchange provider will charge\n %1$s in fees.\n":[""],"Waiting for a response from\n %1$s":[""],"A problem occured, see below.":[""],"Information about fees will be available when an exchange provider is selected.":[""],"You are about to withdraw %1$s from your bank account into your wallet.":[""],"Accept fees and withdraw":[""],"Error: URL is empty":[""],"Error: URL may not be relative":[""],"Oops, something went wrong. The wallet responded with error status (%1$s).":[""],"Checking URL, please wait ...":[""],"Can't parse amount: %1$s":[""],"Can't parse wire_types: %1$s":[""],"Fatal error: \"%1$s\".":[""],"Balance":[""],"History":[""],"Debug":[""],"help":[""],"You have no balance to show. Need some\n %1$s getting started?\n":[""],"%1$s incoming\n":[""],"%1$s being spent\n":[""],"Error: could not retrieve balance information.":[""],"Bank requested reserve (%1$s) for%2$s.\n":[""],"Started to withdraw\n %1$s from%2$s(%3$s).\n":[""],"Merchant%1$soffered contract%2$s;\n":[""],"Withdrew%1$sfrom%2$s(%3$s).\n":[""],"Paid%1$sto merchant%2$s.  (%3$s)\n":[""],"Unknown event (%1$s)":[""],"Error: could not retrieve event history":[""],"Your wallet has no events recorded.":[""],"The merchant%1$swants to enter a contract over%2$s with you.\n":[""],"You are about to purchase:":[""]}}};
+strings['undefined'] = {
+  "domain": "messages",
+  "locale_data": {
+    "messages": {
+      "": {
+        "domain": "messages",
+        "plural_forms": "nplurals=2; plural=(n != 1);",
+        "lang": ""
+      },
+      "show more details\n": [
+        ""
+      ],
+      "Accepted exchanges:": [
+        ""
+      ],
+      "Exchanges in the wallet:": [
+        ""
+      ],
+      "You have insufficient funds of the requested currency in your wallet.": [
+        ""
+      ],
+      "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.": [
+        ""
+      ],
+      "Withdrawal fees: %1$s": [
+        "Abheben bei %1$s"
+      ],
+      "Rounding loss: %1$s": [
+        ""
+      ],
+      "Earliest expiration (for deposit): %1$s": [
+        ""
+      ],
+      "# Coins": [
+        ""
+      ],
+      "Value": [
+        ""
+      ],
+      "Withdraw Fee": [
+        "Abheben bei %1$s"
+      ],
+      "Refresh Fee": [
+        ""
+      ],
+      "Deposit Fee": [
+        ""
+      ],
+      "Withdraw fees:": [
+        "Abheben bei %1$s"
+      ],
+      "Select": [
+        ""
+      ],
+      "Error: URL may not be relative": [
+        ""
+      ],
+      "The exchange is trusted by the wallet.\n": [
+        ""
+      ],
+      "The exchange is audited by a trusted auditor.\n": [
+        ""
+      ],
+      "Warning:  The exchange is neither directly trusted nor audited by a trusted auditor.\nIf you withdraw from this exchange, it will be trusted in the future.\n": [
+        ""
+      ],
+      "Using exchange provider%1$s.\nThe exchange provider will charge\n %2$s in fees.\n": [
+        ""
+      ],
+      "Waiting for a response from\n %1$s": [
+        ""
+      ],
+      "A problem occured, see below. %1$s": [
+        ""
+      ],
+      "Information about fees will be available when an exchange provider is selected.": [
+        ""
+      ],
+      "Accept fees and withdraw": [
+        ""
+      ],
+      "Change Exchange Provider": [
+        ""
+      ],
+      "You are about to withdraw %1$s from your bank account into your wallet.": [
+        ""
+      ],
+      "Oops, something went wrong. The wallet responded with error status (%1$s).": [
+        ""
+      ],
+      "Checking URL, please wait ...": [
+        ""
+      ],
+      "Can't parse amount: %1$s": [
+        ""
+      ],
+      "Can't parse wire_types: %1$s": [
+        ""
+      ],
+      "Fatal error: \"%1$s\".": [
+        ""
+      ],
+      "Balance": [
+        "Saldo"
+      ],
+      "History": [
+        "Verlauf"
+      ],
+      "Debug": [
+        "Debug"
+      ],
+      "help": [
+        ""
+      ],
+      "You have no balance to show. Need some\n %1$s getting started?\n": [
+        "Sie haben kein Digitalgeld. Wollen Sie %1$s? abheben?"
+      ],
+      "%1$s incoming\n": [
+        ""
+      ],
+      "%1$s being spent\n": [
+        ""
+      ],
+      "Error: could not retrieve balance information.": [
+        ""
+      ],
+      "Bank requested reserve (%1$s) for%2$s.\n": [
+        "Bank bestätig anlegen der Reserve (%1$s) bei %2$s"
+      ],
+      "Started to withdraw\n %1$s from%2$s(%3$s).\n": [
+        "Reserve (%1$s) mit %2$s bei %3$s erzeugt"
+      ],
+      "Merchant%1$soffered contract%2$s;\n": [
+        ""
+      ],
+      "Withdrew%1$sfrom%2$s(%3$s).\n": [
+        "Reserve (%1$s) mit %2$s bei %3$s erzeugt"
+      ],
+      "Paid%1$sto merchant%2$s.  (%3$s)\n": [
+        "Reserve (%1$s) mit %2$s bei %3$s erzeugt"
+      ],
+      "Unknown event (%1$s)": [
+        ""
+      ],
+      "Error: could not retrieve event history": [
+        ""
+      ],
+      "Your wallet has no events recorded.": [
+        "Ihre Geldbörse verzeichnet keine Vorkommnisse."
+      ],
+      "The merchant%1$swants to enter a contract over%2$s with you.\n": [
+        "%1$s\n               möchte einen Vertrag über %2$s\n               mit Ihnen abschließen."
+      ],
+      "You are about to purchase:": [
+        "Sie sind dabei, Folgendes zu kaufen:"
+      ]
+    }
+  }
+};
+strings['undefined'] = {
+  "domain": "messages",
+  "locale_data": {
+    "messages": {
+      "": {
+        "domain": "messages",
+        "plural_forms": "nplurals=2; plural=(n != 1);",
+        "lang": ""
+      },
+      "show more details\n": [
+        ""
+      ],
+      "Accepted exchanges:": [
+        ""
+      ],
+      "Exchanges in the wallet:": [
+        ""
+      ],
+      "You have insufficient funds of the requested currency in your wallet.": [
+        ""
+      ],
+      "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.": [
+        ""
+      ],
+      "Withdrawal fees: %1$s": [
+        ""
+      ],
+      "Rounding loss: %1$s": [
+        ""
+      ],
+      "Earliest expiration (for deposit): %1$s": [
+        ""
+      ],
+      "# Coins": [
+        ""
+      ],
+      "Value": [
+        ""
+      ],
+      "Withdraw Fee": [
+        ""
+      ],
+      "Refresh Fee": [
+        ""
+      ],
+      "Deposit Fee": [
+        ""
+      ],
+      "Withdraw fees:": [
+        ""
+      ],
+      "Select": [
+        ""
+      ],
+      "Error: URL may not be relative": [
+        ""
+      ],
+      "The exchange is trusted by the wallet.\n": [
+        ""
+      ],
+      "The exchange is audited by a trusted auditor.\n": [
+        ""
+      ],
+      "Warning:  The exchange is neither directly trusted nor audited by a trusted auditor.\nIf you withdraw from this exchange, it will be trusted in the future.\n": [
+        ""
+      ],
+      "Using exchange provider%1$s.\nThe exchange provider will charge\n %2$s in fees.\n": [
+        ""
+      ],
+      "Waiting for a response from\n %1$s": [
+        ""
+      ],
+      "A problem occured, see below. %1$s": [
+        ""
+      ],
+      "Information about fees will be available when an exchange provider is selected.": [
+        ""
+      ],
+      "Accept fees and withdraw": [
+        ""
+      ],
+      "Change Exchange Provider": [
+        ""
+      ],
+      "You are about to withdraw %1$s from your bank account into your wallet.": [
+        ""
+      ],
+      "Oops, something went wrong. The wallet responded with error status (%1$s).": [
+        ""
+      ],
+      "Checking URL, please wait ...": [
+        ""
+      ],
+      "Can't parse amount: %1$s": [
+        ""
+      ],
+      "Can't parse wire_types: %1$s": [
+        ""
+      ],
+      "Fatal error: \"%1$s\".": [
+        ""
+      ],
+      "Balance": [
+        ""
+      ],
+      "History": [
+        ""
+      ],
+      "Debug": [
+        ""
+      ],
+      "help": [
+        ""
+      ],
+      "You have no balance to show. Need some\n %1$s getting started?\n": [
+        ""
+      ],
+      "%1$s incoming\n": [
+        ""
+      ],
+      "%1$s being spent\n": [
+        ""
+      ],
+      "Error: could not retrieve balance information.": [
+        ""
+      ],
+      "Bank requested reserve (%1$s) for%2$s.\n": [
+        ""
+      ],
+      "Started to withdraw\n %1$s from%2$s(%3$s).\n": [
+        ""
+      ],
+      "Merchant%1$soffered contract%2$s;\n": [
+        ""
+      ],
+      "Withdrew%1$sfrom%2$s(%3$s).\n": [
+        ""
+      ],
+      "Paid%1$sto merchant%2$s.  (%3$s)\n": [
+        ""
+      ],
+      "Unknown event (%1$s)": [
+        ""
+      ],
+      "Error: could not retrieve event history": [
+        ""
+      ],
+      "Your wallet has no events recorded.": [
+        ""
+      ],
+      "The merchant%1$swants to enter a contract over%2$s with you.\n": [
+        ""
+      ],
+      "You are about to purchase:": [
+        ""
+      ]
+    }
+  }
+};
+strings['undefined'] = {
+  "domain": "messages",
+  "locale_data": {
+    "messages": {
+      "": {
+        "domain": "messages",
+        "plural_forms": "nplurals=2; plural=(n != 1);",
+        "lang": ""
+      },
+      "show more details\n": [
+        ""
+      ],
+      "Accepted exchanges:": [
+        ""
+      ],
+      "Exchanges in the wallet:": [
+        ""
+      ],
+      "You have insufficient funds of the requested currency in your wallet.": [
+        ""
+      ],
+      "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.": [
+        ""
+      ],
+      "Withdrawal fees: %1$s": [
+        ""
+      ],
+      "Rounding loss: %1$s": [
+        ""
+      ],
+      "Earliest expiration (for deposit): %1$s": [
+        ""
+      ],
+      "# Coins": [
+        ""
+      ],
+      "Value": [
+        ""
+      ],
+      "Withdraw Fee": [
+        ""
+      ],
+      "Refresh Fee": [
+        ""
+      ],
+      "Deposit Fee": [
+        ""
+      ],
+      "Withdraw fees:": [
+        ""
+      ],
+      "Select": [
+        ""
+      ],
+      "Error: URL may not be relative": [
+        ""
+      ],
+      "The exchange is trusted by the wallet.\n": [
+        ""
+      ],
+      "The exchange is audited by a trusted auditor.\n": [
+        ""
+      ],
+      "Warning:  The exchange is neither directly trusted nor audited by a trusted auditor.\nIf you withdraw from this exchange, it will be trusted in the future.\n": [
+        ""
+      ],
+      "Using exchange provider%1$s.\nThe exchange provider will charge\n %2$s in fees.\n": [
+        ""
+      ],
+      "Waiting for a response from\n %1$s": [
+        ""
+      ],
+      "A problem occured, see below. %1$s": [
+        ""
+      ],
+      "Information about fees will be available when an exchange provider is selected.": [
+        ""
+      ],
+      "Accept fees and withdraw": [
+        ""
+      ],
+      "Change Exchange Provider": [
+        ""
+      ],
+      "You are about to withdraw %1$s from your bank account into your wallet.": [
+        ""
+      ],
+      "Oops, something went wrong. The wallet responded with error status (%1$s).": [
+        ""
+      ],
+      "Checking URL, please wait ...": [
+        ""
+      ],
+      "Can't parse amount: %1$s": [
+        ""
+      ],
+      "Can't parse wire_types: %1$s": [
+        ""
+      ],
+      "Fatal error: \"%1$s\".": [
+        ""
+      ],
+      "Balance": [
+        ""
+      ],
+      "History": [
+        ""
+      ],
+      "Debug": [
+        ""
+      ],
+      "help": [
+        ""
+      ],
+      "You have no balance to show. Need some\n %1$s getting started?\n": [
+        ""
+      ],
+      "%1$s incoming\n": [
+        ""
+      ],
+      "%1$s being spent\n": [
+        ""
+      ],
+      "Error: could not retrieve balance information.": [
+        ""
+      ],
+      "Bank requested reserve (%1$s) for%2$s.\n": [
+        ""
+      ],
+      "Started to withdraw\n %1$s from%2$s(%3$s).\n": [
+        ""
+      ],
+      "Merchant%1$soffered contract%2$s;\n": [
+        ""
+      ],
+      "Withdrew%1$sfrom%2$s(%3$s).\n": [
+        ""
+      ],
+      "Paid%1$sto merchant%2$s.  (%3$s)\n": [
+        ""
+      ],
+      "Unknown event (%1$s)": [
+        ""
+      ],
+      "Error: could not retrieve event history": [
+        ""
+      ],
+      "Your wallet has no events recorded.": [
+        ""
+      ],
+      "The merchant%1$swants to enter a contract over%2$s with you.\n": [
+        ""
+      ],
+      "You are about to purchase:": [
+        ""
+      ]
+    }
+  }
+};
+strings['undefined'] = {
+  "domain": "messages",
+  "locale_data": {
+    "messages": {
+      "": {
+        "domain": "messages",
+        "plural_forms": "nplurals=2; plural=(n != 1);",
+        "lang": ""
+      },
+      "show more details\n": [
+        ""
+      ],
+      "Accepted exchanges:": [
+        ""
+      ],
+      "Exchanges in the wallet:": [
+        ""
+      ],
+      "You have insufficient funds of the requested currency in your wallet.": [
+        ""
+      ],
+      "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.": [
+        ""
+      ],
+      "Withdrawal fees: %1$s": [
+        ""
+      ],
+      "Rounding loss: %1$s": [
+        ""
+      ],
+      "Earliest expiration (for deposit): %1$s": [
+        ""
+      ],
+      "# Coins": [
+        ""
+      ],
+      "Value": [
+        ""
+      ],
+      "Withdraw Fee": [
+        ""
+      ],
+      "Refresh Fee": [
+        ""
+      ],
+      "Deposit Fee": [
+        ""
+      ],
+      "Withdraw fees:": [
+        ""
+      ],
+      "Select": [
+        ""
+      ],
+      "Error: URL may not be relative": [
+        ""
+      ],
+      "The exchange is trusted by the wallet.\n": [
+        ""
+      ],
+      "The exchange is audited by a trusted auditor.\n": [
+        ""
+      ],
+      "Warning:  The exchange is neither directly trusted nor audited by a trusted auditor.\nIf you withdraw from this exchange, it will be trusted in the future.\n": [
+        ""
+      ],
+      "Using exchange provider%1$s.\nThe exchange provider will charge\n %2$s in fees.\n": [
+        ""
+      ],
+      "Waiting for a response from\n %1$s": [
+        ""
+      ],
+      "A problem occured, see below. %1$s": [
+        ""
+      ],
+      "Information about fees will be available when an exchange provider is selected.": [
+        ""
+      ],
+      "Accept fees and withdraw": [
+        ""
+      ],
+      "Change Exchange Provider": [
+        ""
+      ],
+      "You are about to withdraw %1$s from your bank account into your wallet.": [
+        ""
+      ],
+      "Oops, something went wrong. The wallet responded with error status (%1$s).": [
+        ""
+      ],
+      "Checking URL, please wait ...": [
+        ""
+      ],
+      "Can't parse amount: %1$s": [
+        ""
+      ],
+      "Can't parse wire_types: %1$s": [
+        ""
+      ],
+      "Fatal error: \"%1$s\".": [
+        ""
+      ],
+      "Balance": [
+        ""
+      ],
+      "History": [
+        ""
+      ],
+      "Debug": [
+        ""
+      ],
+      "help": [
+        ""
+      ],
+      "You have no balance to show. Need some\n %1$s getting started?\n": [
+        ""
+      ],
+      "%1$s incoming\n": [
+        ""
+      ],
+      "%1$s being spent\n": [
+        ""
+      ],
+      "Error: could not retrieve balance information.": [
+        ""
+      ],
+      "Bank requested reserve (%1$s) for%2$s.\n": [
+        ""
+      ],
+      "Started to withdraw\n %1$s from%2$s(%3$s).\n": [
+        ""
+      ],
+      "Merchant%1$soffered contract%2$s;\n": [
+        ""
+      ],
+      "Withdrew%1$sfrom%2$s(%3$s).\n": [
+        ""
+      ],
+      "Paid%1$sto merchant%2$s.  (%3$s)\n": [
+        ""
+      ],
+      "Unknown event (%1$s)": [
+        ""
+      ],
+      "Error: could not retrieve event history": [
+        ""
+      ],
+      "Your wallet has no events recorded.": [
+        ""
+      ],
+      "The merchant%1$swants to enter a contract over%2$s with you.\n": [
+        ""
+      ],
+      "You are about to purchase:": [
+        ""
+      ]
+    }
+  }
+};
diff --git a/src/i18n/taler-wallet-webex.pot b/src/i18n/taler-wallet-webex.pot
index 8bfdf57d0..86127399d 100644
--- a/src/i18n/taler-wallet-webex.pot
+++ b/src/i18n/taler-wallet-webex.pot
@@ -27,27 +27,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/pages/confirm-contract.tsx:62
+#: src/pages/confirm-contract.tsx:65
 #, c-format
 msgid "show more details\n"
 msgstr ""
 
-#: src/pages/confirm-contract.tsx:76
+#: src/pages/confirm-contract.tsx:79
 #, c-format
 msgid "Accepted exchanges:"
 msgstr ""
 
-#: src/pages/confirm-contract.tsx:81
+#: src/pages/confirm-contract.tsx:84
 #, c-format
 msgid "Exchanges in the wallet:"
 msgstr ""
 
-#: src/pages/confirm-contract.tsx:157
+#: src/pages/confirm-contract.tsx:160
 #, c-format
 msgid "You have insufficient funds of the requested currency in your wallet."
 msgstr ""
 
-#: src/pages/confirm-contract.tsx:158
+#: src/pages/confirm-contract.tsx:161
 #, c-format
 msgid ""
 "You do not have any funds from an exchange that is accepted by this "
@@ -55,219 +55,238 @@ msgid ""
 "wallet."
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:106
+#: src/pages/confirm-create-reserve.tsx:195
 #, c-format
 msgid "Withdrawal fees: %1$s"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:107
+#: src/pages/confirm-create-reserve.tsx:196
 #, c-format
 msgid "Rounding loss: %1$s"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:110
+#: src/pages/confirm-create-reserve.tsx:197
+#, c-format
+msgid "Earliest expiration (for deposit): %1$s"
+msgstr ""
+
+#: src/pages/confirm-create-reserve.tsx:202
 #, c-format
 msgid "# Coins"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:111
+#: src/pages/confirm-create-reserve.tsx:203
 #, c-format
 msgid "Value"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:112
+#: src/pages/confirm-create-reserve.tsx:204
 #, c-format
 msgid "Withdraw Fee"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:113
+#: src/pages/confirm-create-reserve.tsx:205
 #, c-format
 msgid "Refresh Fee"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:114
+#: src/pages/confirm-create-reserve.tsx:206
 #, c-format
 msgid "Deposit Fee"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:147
+#: src/pages/confirm-create-reserve.tsx:244
 #, c-format
 msgid "Withdraw fees:"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:182
+#: src/pages/confirm-create-reserve.tsx:287
 #, c-format
-msgid "view fee structure / select different exchange provider"
+msgid "Select"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:196
+#: src/pages/confirm-create-reserve.tsx:303
+#, c-format
+msgid "Error: URL may not be relative"
+msgstr ""
+
+#: src/pages/confirm-create-reserve.tsx:371
+#, c-format
+msgid "The exchange is trusted by the wallet.\n"
+msgstr ""
+
+#: src/pages/confirm-create-reserve.tsx:377
+#, c-format
+msgid "The exchange is audited by a trusted auditor.\n"
+msgstr ""
+
+#: src/pages/confirm-create-reserve.tsx:383
 #, c-format
-msgid "Detailed Fee Structure"
+msgid ""
+"Warning:  The exchange is neither directly trusted nor audited by a trusted "
+"auditor.\n"
+"If you withdraw from this exchange, it will be trusted in the future.\n"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:212
+#: src/pages/confirm-create-reserve.tsx:392
 #, c-format
 msgid ""
+"Using exchange provider%1$s.\n"
 "The exchange provider will charge\n"
-" %1$s in fees.\n"
+" %2$s in fees.\n"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:224
+#: src/pages/confirm-create-reserve.tsx:406
 #, c-format
 msgid ""
 "Waiting for a response from\n"
 " %1$s"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:235
+#: src/pages/confirm-create-reserve.tsx:417
 #, c-format
-msgid "A problem occured, see below."
+msgid "A problem occured, see below. %1$s"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:241
+#: src/pages/confirm-create-reserve.tsx:423
 #, c-format
 msgid ""
 "Information about fees will be available when an exchange provider is "
 "selected."
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:249
-#, c-format
-msgid "You are about to withdraw %1$s from your bank account into your wallet."
-msgstr ""
-
-#: src/pages/confirm-create-reserve.tsx:258
+#: src/pages/confirm-create-reserve.tsx:435
 #, c-format
 msgid "Accept fees and withdraw"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:280
+#: src/pages/confirm-create-reserve.tsx:440
 #, c-format
-msgid "Error: URL is empty"
+msgid "Change Exchange Provider"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:288
+#: src/pages/confirm-create-reserve.tsx:496
 #, c-format
-msgid "Error: URL may not be relative"
+msgid "You are about to withdraw %1$s from your bank account into your wallet."
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:347
+#: src/pages/confirm-create-reserve.tsx:579
 #, c-format
 msgid ""
 "Oops, something went wrong. The wallet responded with error status (%1$s)."
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:374
+#: src/pages/confirm-create-reserve.tsx:590
 #, c-format
 msgid "Checking URL, please wait ..."
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:388
+#: src/pages/confirm-create-reserve.tsx:604
 #, c-format
 msgid "Can't parse amount: %1$s"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:396
+#: src/pages/confirm-create-reserve.tsx:612
 #, c-format
 msgid "Can't parse wire_types: %1$s"
 msgstr ""
 
 #. TODO:generic error reporting function or component.
-#: src/pages/confirm-create-reserve.tsx:413
+#: src/pages/confirm-create-reserve.tsx:632
 #, c-format
 msgid "Fatal error: \"%1$s\"."
 msgstr ""
 
-#: src/popup/popup.tsx:172
+#: src/pages/popup.tsx:157
 #, c-format
 msgid "Balance"
 msgstr ""
 
-#: src/popup/popup.tsx:175
+#: src/pages/popup.tsx:160
 #, c-format
 msgid "History"
 msgstr ""
 
-#: src/popup/popup.tsx:178
+#: src/pages/popup.tsx:163
 #, c-format
 msgid "Debug"
 msgstr ""
 
-#: src/popup/popup.tsx:238
+#: src/pages/popup.tsx:235
 #, c-format
 msgid "help"
 msgstr ""
 
-#: src/popup/popup.tsx:243
+#: src/pages/popup.tsx:240
 #, c-format
 msgid ""
 "You have no balance to show. Need some\n"
 " %1$s getting started?\n"
 msgstr ""
 
-#: src/popup/popup.tsx:260
+#: src/pages/popup.tsx:257
 #, c-format
 msgid "%1$s incoming\n"
 msgstr ""
 
-#: src/popup/popup.tsx:273
+#: src/pages/popup.tsx:270
 #, c-format
 msgid "%1$s being spent\n"
 msgstr ""
 
-#: src/popup/popup.tsx:299
+#: src/pages/popup.tsx:296
 #, c-format
 msgid "Error: could not retrieve balance information."
 msgstr ""
 
-#: src/popup/popup.tsx:337
+#: src/pages/popup.tsx:337
 #, c-format
 msgid "Bank requested reserve (%1$s) for%2$s.\n"
 msgstr ""
 
-#: src/popup/popup.tsx:346
+#: src/pages/popup.tsx:346
 #, c-format
 msgid ""
 "Started to withdraw\n"
 " %1$s from%2$s(%3$s).\n"
 msgstr ""
 
-#: src/popup/popup.tsx:358
+#: src/pages/popup.tsx:358
 #, c-format
 msgid "Merchant%1$soffered contract%2$s;\n"
 msgstr ""
 
-#: src/popup/popup.tsx:368
+#: src/pages/popup.tsx:368
 #, c-format
 msgid "Withdrew%1$sfrom%2$s(%3$s).\n"
 msgstr ""
 
-#: src/popup/popup.tsx:379
+#: src/pages/popup.tsx:379
 #, c-format
 msgid "Paid%1$sto merchant%2$s.  (%3$s)\n"
 msgstr ""
 
-#: src/popup/popup.tsx:386
+#: src/pages/popup.tsx:386
 #, c-format
 msgid "Unknown event (%1$s)"
 msgstr ""
 
-#: src/popup/popup.tsx:429
+#: src/pages/popup.tsx:429
 #, c-format
 msgid "Error: could not retrieve event history"
 msgstr ""
 
-#: src/popup/popup.tsx:463
+#: src/pages/popup.tsx:463
 #, c-format
 msgid "Your wallet has no events recorded."
 msgstr ""
 
-#: src/renderHtml.tsx:38
+#: src/renderHtml.tsx:44
 #, c-format
 msgid "The merchant%1$swants to enter a contract over%2$s with you.\n"
 msgstr ""
 
-#: src/renderHtml.tsx:43
+#: src/renderHtml.tsx:49
 #, c-format
 msgid "You are about to purchase:"
 msgstr ""