modularize i18n

8 files changed, 336 insertions, 247 deletions

diff --git a/src/i18n/de.po b/src/i18n/de.po
index e1486d233..df5e3c08e 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:61
+#: src/pages/confirm-contract.tsx:62
 #, c-format
 msgid "show more details\n"
 msgstr ""
 
-#: src/pages/confirm-contract.tsx:75
+#: src/pages/confirm-contract.tsx:76
 #, c-format
 msgid "Accepted exchanges:"
 msgstr ""
 
-#: src/pages/confirm-contract.tsx:80
+#: src/pages/confirm-contract.tsx:81
 #, c-format
 msgid "Exchanges in the wallet:"
 msgstr ""
 
-#: src/pages/confirm-contract.tsx:156
+#: src/pages/confirm-contract.tsx:157
 #, c-format
 msgid "You have insufficient funds of the requested currency in your wallet."
 msgstr ""
 
-#: src/pages/confirm-contract.tsx:157
+#: src/pages/confirm-contract.tsx:158
 #, c-format
 msgid ""
 "You do not have any funds from an exchange that is accepted by this "
@@ -55,196 +55,203 @@ msgid ""
 "wallet."
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:105
+#: src/pages/confirm-create-reserve.tsx:106
 #, fuzzy, c-format
 msgid "Withdrawal fees: %1$s"
 msgstr "Abheben bei %1$s"
 
-#: src/pages/confirm-create-reserve.tsx:106
+#: src/pages/confirm-create-reserve.tsx:107
 #, c-format
 msgid "Rounding loss: %1$s"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:109
+#: src/pages/confirm-create-reserve.tsx:110
 #, c-format
 msgid "# Coins"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:110
+#: src/pages/confirm-create-reserve.tsx:111
 #, c-format
 msgid "Value"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:111
+#: src/pages/confirm-create-reserve.tsx:112
 #, fuzzy, c-format
 msgid "Withdraw Fee"
 msgstr "Abheben bei %1$s"
 
-#: src/pages/confirm-create-reserve.tsx:112
+#: src/pages/confirm-create-reserve.tsx:113
 #, c-format
 msgid "Refresh Fee"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:113
+#: src/pages/confirm-create-reserve.tsx:114
 #, c-format
 msgid "Deposit Fee"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:146
+#: src/pages/confirm-create-reserve.tsx:147
 #, fuzzy, c-format
 msgid "Withdraw fees:"
 msgstr "Abheben bei %1$s"
 
-#: src/pages/confirm-create-reserve.tsx:180
+#: src/pages/confirm-create-reserve.tsx:182
 #, c-format
 msgid "view fee structure / select different exchange provider"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:194
+#: src/pages/confirm-create-reserve.tsx:196
 #, c-format
 msgid "Detailed Fee Structure"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:210
+#: src/pages/confirm-create-reserve.tsx:212
 #, c-format
 msgid ""
 "The exchange provider will charge\n"
 " %1$s in fees.\n"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:222
+#: src/pages/confirm-create-reserve.tsx:224
 #, c-format
 msgid ""
 "Waiting for a response from\n"
 " %1$s"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:233
+#: src/pages/confirm-create-reserve.tsx:235
 #, c-format
 msgid "A problem occured, see below."
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:239
+#: src/pages/confirm-create-reserve.tsx:241
 #, c-format
 msgid ""
 "Information about fees will be available when an exchange provider is "
 "selected."
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:247
+#: 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:256
+#: src/pages/confirm-create-reserve.tsx:258
 #, c-format
 msgid "Accept fees and withdraw"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:278
+#: src/pages/confirm-create-reserve.tsx:280
 #, c-format
 msgid "Error: URL is empty"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:286
+#: src/pages/confirm-create-reserve.tsx:288
 #, c-format
 msgid "Error: URL may not be relative"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:344
+#: src/pages/confirm-create-reserve.tsx:347
 #, c-format
 msgid ""
 "Oops, something went wrong. The wallet responded with error status (%1$s)."
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:371
+#: src/pages/confirm-create-reserve.tsx:374
 #, c-format
 msgid "Checking URL, please wait ..."
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:385
+#: src/pages/confirm-create-reserve.tsx:388
 #, c-format
 msgid "Can't parse amount: %1$s"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:393
+#: src/pages/confirm-create-reserve.tsx:396
 #, c-format
 msgid "Can't parse wire_types: %1$s"
 msgstr ""
 
 #. TODO:generic error reporting function or component.
-#: src/pages/confirm-create-reserve.tsx:410
+#: src/pages/confirm-create-reserve.tsx:413
 #, c-format
 msgid "Fatal error: \"%1$s\"."
 msgstr ""
 
-#: src/popup/popup.tsx:173
+#: src/popup/popup.tsx:172
 #, c-format
 msgid "Balance"
 msgstr "Saldo"
 
-#: src/popup/popup.tsx:176
+#: src/popup/popup.tsx:175
 #, c-format
 msgid "History"
 msgstr "Verlauf"
 
-#: src/popup/popup.tsx:179
+#: src/popup/popup.tsx:178
 #, c-format
 msgid "Debug"
 msgstr "Debug"
 
-#: src/popup/popup.tsx:239
+#: src/popup/popup.tsx:238
 #, c-format
 msgid "help"
 msgstr ""
 
-#: src/popup/popup.tsx:244
+#: src/popup/popup.tsx:243
 #, 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:261
+#: src/popup/popup.tsx:260
 #, c-format
 msgid "%1$s incoming\n"
 msgstr ""
 
-#: src/popup/popup.tsx:274
+#: src/popup/popup.tsx:273
 #, c-format
 msgid "%1$s being spent\n"
 msgstr ""
 
-#: src/popup/popup.tsx:300
+#: src/popup/popup.tsx:299
 #, c-format
 msgid "Error: could not retrieve balance information."
 msgstr ""
 
-#: src/popup/popup.tsx:340
+#: src/popup/popup.tsx:337
 #, fuzzy, c-format
-msgid "Bank requested reserve (%1$s) for %2$s."
+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:351
+#: src/popup/popup.tsx:346
 #, fuzzy, c-format
-msgid "Started to withdraw %1$s from %2$s (%3$s)."
+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:361
+#: src/popup/popup.tsx:358
 #, c-format
-msgid "Merchant %1$s offered contract %2$s."
+msgid "Merchant%1$soffered contract%2$s;\n"
 msgstr ""
 
-#: src/popup/popup.tsx:371
+#: src/popup/popup.tsx:368
 #, fuzzy, c-format
-msgid "Withdrew %1$s from %2$s (%3$s)."
+msgid "Withdrew%1$sfrom%2$s(%3$s).\n"
 msgstr "Reserve (%1$s) mit %2$s bei %3$s erzeugt"
 
-#: src/popup/popup.tsx:382
+#: src/popup/popup.tsx:379
 #, fuzzy, c-format
-msgid "Paid %1$s to merchant %2$s.  (%3$s)"
+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
+#, c-format
+msgid "Unknown event (%1$s)"
+msgstr ""
+
 #: src/popup/popup.tsx:429
 #, c-format
 msgid "Error: could not retrieve event history"
@@ -255,20 +262,19 @@ msgstr ""
 msgid "Your wallet has no events recorded."
 msgstr "Ihre Geldbörse verzeichnet keine Vorkommnisse."
 
-#: src/renderHtml.tsx:42
+#: src/renderHtml.tsx:38
+#, fuzzy, c-format
+msgid "The merchant%1$swants to enter a contract over%2$s with you.\n"
+msgstr ""
+"%1$s\n"
+"               möchte einen Vertrag über %2$s\n"
+"               mit Ihnen abschließen."
+
+#: src/renderHtml.tsx:43
 #, fuzzy, c-format
 msgid "You are about to purchase:"
 msgstr "Sie sind dabei, Folgendes zu kaufen:"
 
-#~ msgid ""
-#~ "%1$s\n"
-#~ "               wants to enter a contract over %2$s\n"
-#~ "               with you."
-#~ msgstr ""
-#~ "%1$s\n"
-#~ "               möchte einen Vertrag über %2$s\n"
-#~ "               mit Ihnen abschließen."
-
 #~ msgid "Confirm Payment"
 #~ msgstr "Bezahlung bestätigen"
 
diff --git a/src/i18n/en-US.po b/src/i18n/en-US.po
index 7ff886a01..fae9d5336 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:61
+#: src/pages/confirm-contract.tsx:62
 #, c-format
 msgid "show more details\n"
 msgstr ""
 
-#: src/pages/confirm-contract.tsx:75
+#: src/pages/confirm-contract.tsx:76
 #, c-format
 msgid "Accepted exchanges:"
 msgstr ""
 
-#: src/pages/confirm-contract.tsx:80
+#: src/pages/confirm-contract.tsx:81
 #, c-format
 msgid "Exchanges in the wallet:"
 msgstr ""
 
-#: src/pages/confirm-contract.tsx:156
+#: src/pages/confirm-contract.tsx:157
 #, c-format
 msgid "You have insufficient funds of the requested currency in your wallet."
 msgstr ""
 
-#: src/pages/confirm-contract.tsx:157
+#: src/pages/confirm-contract.tsx:158
 #, c-format
 msgid ""
 "You do not have any funds from an exchange that is accepted by this "
@@ -55,194 +55,201 @@ msgid ""
 "wallet."
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:105
+#: src/pages/confirm-create-reserve.tsx:106
 #, c-format
 msgid "Withdrawal fees: %1$s"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:106
+#: src/pages/confirm-create-reserve.tsx:107
 #, c-format
 msgid "Rounding loss: %1$s"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:109
+#: src/pages/confirm-create-reserve.tsx:110
 #, c-format
 msgid "# Coins"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:110
+#: src/pages/confirm-create-reserve.tsx:111
 #, c-format
 msgid "Value"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:111
+#: src/pages/confirm-create-reserve.tsx:112
 #, c-format
 msgid "Withdraw Fee"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:112
+#: src/pages/confirm-create-reserve.tsx:113
 #, c-format
 msgid "Refresh Fee"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:113
+#: src/pages/confirm-create-reserve.tsx:114
 #, c-format
 msgid "Deposit Fee"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:146
+#: src/pages/confirm-create-reserve.tsx:147
 #, c-format
 msgid "Withdraw fees:"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:180
+#: src/pages/confirm-create-reserve.tsx:182
 #, c-format
 msgid "view fee structure / select different exchange provider"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:194
+#: src/pages/confirm-create-reserve.tsx:196
 #, c-format
 msgid "Detailed Fee Structure"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:210
+#: src/pages/confirm-create-reserve.tsx:212
 #, c-format
 msgid ""
 "The exchange provider will charge\n"
 " %1$s in fees.\n"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:222
+#: src/pages/confirm-create-reserve.tsx:224
 #, c-format
 msgid ""
 "Waiting for a response from\n"
 " %1$s"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:233
+#: src/pages/confirm-create-reserve.tsx:235
 #, c-format
 msgid "A problem occured, see below."
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:239
+#: src/pages/confirm-create-reserve.tsx:241
 #, c-format
 msgid ""
 "Information about fees will be available when an exchange provider is "
 "selected."
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:247
+#: 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:256
+#: src/pages/confirm-create-reserve.tsx:258
 #, c-format
 msgid "Accept fees and withdraw"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:278
+#: src/pages/confirm-create-reserve.tsx:280
 #, c-format
 msgid "Error: URL is empty"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:286
+#: src/pages/confirm-create-reserve.tsx:288
 #, c-format
 msgid "Error: URL may not be relative"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:344
+#: src/pages/confirm-create-reserve.tsx:347
 #, c-format
 msgid ""
 "Oops, something went wrong. The wallet responded with error status (%1$s)."
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:371
+#: src/pages/confirm-create-reserve.tsx:374
 #, c-format
 msgid "Checking URL, please wait ..."
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:385
+#: src/pages/confirm-create-reserve.tsx:388
 #, c-format
 msgid "Can't parse amount: %1$s"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:393
+#: src/pages/confirm-create-reserve.tsx:396
 #, c-format
 msgid "Can't parse wire_types: %1$s"
 msgstr ""
 
 #. TODO:generic error reporting function or component.
-#: src/pages/confirm-create-reserve.tsx:410
+#: src/pages/confirm-create-reserve.tsx:413
 #, c-format
 msgid "Fatal error: \"%1$s\"."
 msgstr ""
 
-#: src/popup/popup.tsx:173
+#: src/popup/popup.tsx:172
 #, c-format
 msgid "Balance"
 msgstr ""
 
-#: src/popup/popup.tsx:176
+#: src/popup/popup.tsx:175
 #, c-format
 msgid "History"
 msgstr ""
 
-#: src/popup/popup.tsx:179
+#: src/popup/popup.tsx:178
 #, c-format
 msgid "Debug"
 msgstr ""
 
-#: src/popup/popup.tsx:239
+#: src/popup/popup.tsx:238
 #, c-format
 msgid "help"
 msgstr ""
 
-#: src/popup/popup.tsx:244
+#: src/popup/popup.tsx:243
 #, c-format
 msgid ""
 "You have no balance to show. Need some\n"
 " %1$s getting started?\n"
 msgstr ""
 
-#: src/popup/popup.tsx:261
+#: src/popup/popup.tsx:260
 #, c-format
 msgid "%1$s incoming\n"
 msgstr ""
 
-#: src/popup/popup.tsx:274
+#: src/popup/popup.tsx:273
 #, c-format
 msgid "%1$s being spent\n"
 msgstr ""
 
-#: src/popup/popup.tsx:300
+#: src/popup/popup.tsx:299
 #, c-format
 msgid "Error: could not retrieve balance information."
 msgstr ""
 
-#: src/popup/popup.tsx:340
+#: src/popup/popup.tsx:337
 #, c-format
-msgid "Bank requested reserve (%1$s) for %2$s."
+msgid "Bank requested reserve (%1$s) for%2$s.\n"
 msgstr ""
 
-#: src/popup/popup.tsx:351
+#: src/popup/popup.tsx:346
 #, c-format
-msgid "Started to withdraw %1$s from %2$s (%3$s)."
+msgid ""
+"Started to withdraw\n"
+" %1$s from%2$s(%3$s).\n"
 msgstr ""
 
-#: src/popup/popup.tsx:361
+#: src/popup/popup.tsx:358
 #, c-format
-msgid "Merchant %1$s offered contract %2$s."
+msgid "Merchant%1$soffered contract%2$s;\n"
 msgstr ""
 
-#: src/popup/popup.tsx:371
+#: src/popup/popup.tsx:368
 #, c-format
-msgid "Withdrew %1$s from %2$s (%3$s)."
+msgid "Withdrew%1$sfrom%2$s(%3$s).\n"
 msgstr ""
 
-#: src/popup/popup.tsx:382
+#: src/popup/popup.tsx:379
 #, c-format
-msgid "Paid %1$s to merchant %2$s.  (%3$s)"
+msgid "Paid%1$sto merchant%2$s.  (%3$s)\n"
+msgstr ""
+
+#: src/popup/popup.tsx:386
+#, c-format
+msgid "Unknown event (%1$s)"
 msgstr ""
 
 #: src/popup/popup.tsx:429
@@ -255,7 +262,12 @@ msgstr ""
 msgid "Your wallet has no events recorded."
 msgstr ""
 
-#: src/renderHtml.tsx:42
+#: src/renderHtml.tsx:38
+#, c-format
+msgid "The merchant%1$swants to enter a contract over%2$s with you.\n"
+msgstr ""
+
+#: src/renderHtml.tsx:43
 #, c-format
 msgid "You are about to purchase:"
 msgstr ""
diff --git a/src/i18n/fr.po b/src/i18n/fr.po
index 8c68a63f1..8bfdf57d0 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:61
+#: src/pages/confirm-contract.tsx:62
 #, c-format
 msgid "show more details\n"
 msgstr ""
 
-#: src/pages/confirm-contract.tsx:75
+#: src/pages/confirm-contract.tsx:76
 #, c-format
 msgid "Accepted exchanges:"
 msgstr ""
 
-#: src/pages/confirm-contract.tsx:80
+#: src/pages/confirm-contract.tsx:81
 #, c-format
 msgid "Exchanges in the wallet:"
 msgstr ""
 
-#: src/pages/confirm-contract.tsx:156
+#: src/pages/confirm-contract.tsx:157
 #, c-format
 msgid "You have insufficient funds of the requested currency in your wallet."
 msgstr ""
 
-#: src/pages/confirm-contract.tsx:157
+#: src/pages/confirm-contract.tsx:158
 #, c-format
 msgid ""
 "You do not have any funds from an exchange that is accepted by this "
@@ -55,194 +55,201 @@ msgid ""
 "wallet."
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:105
+#: src/pages/confirm-create-reserve.tsx:106
 #, c-format
 msgid "Withdrawal fees: %1$s"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:106
+#: src/pages/confirm-create-reserve.tsx:107
 #, c-format
 msgid "Rounding loss: %1$s"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:109
+#: src/pages/confirm-create-reserve.tsx:110
 #, c-format
 msgid "# Coins"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:110
+#: src/pages/confirm-create-reserve.tsx:111
 #, c-format
 msgid "Value"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:111
+#: src/pages/confirm-create-reserve.tsx:112
 #, c-format
 msgid "Withdraw Fee"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:112
+#: src/pages/confirm-create-reserve.tsx:113
 #, c-format
 msgid "Refresh Fee"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:113
+#: src/pages/confirm-create-reserve.tsx:114
 #, c-format
 msgid "Deposit Fee"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:146
+#: src/pages/confirm-create-reserve.tsx:147
 #, c-format
 msgid "Withdraw fees:"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:180
+#: src/pages/confirm-create-reserve.tsx:182
 #, c-format
 msgid "view fee structure / select different exchange provider"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:194
+#: src/pages/confirm-create-reserve.tsx:196
 #, c-format
 msgid "Detailed Fee Structure"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:210
+#: src/pages/confirm-create-reserve.tsx:212
 #, c-format
 msgid ""
 "The exchange provider will charge\n"
 " %1$s in fees.\n"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:222
+#: src/pages/confirm-create-reserve.tsx:224
 #, c-format
 msgid ""
 "Waiting for a response from\n"
 " %1$s"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:233
+#: src/pages/confirm-create-reserve.tsx:235
 #, c-format
 msgid "A problem occured, see below."
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:239
+#: src/pages/confirm-create-reserve.tsx:241
 #, c-format
 msgid ""
 "Information about fees will be available when an exchange provider is "
 "selected."
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:247
+#: 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:256
+#: src/pages/confirm-create-reserve.tsx:258
 #, c-format
 msgid "Accept fees and withdraw"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:278
+#: src/pages/confirm-create-reserve.tsx:280
 #, c-format
 msgid "Error: URL is empty"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:286
+#: src/pages/confirm-create-reserve.tsx:288
 #, c-format
 msgid "Error: URL may not be relative"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:344
+#: src/pages/confirm-create-reserve.tsx:347
 #, c-format
 msgid ""
 "Oops, something went wrong. The wallet responded with error status (%1$s)."
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:371
+#: src/pages/confirm-create-reserve.tsx:374
 #, c-format
 msgid "Checking URL, please wait ..."
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:385
+#: src/pages/confirm-create-reserve.tsx:388
 #, c-format
 msgid "Can't parse amount: %1$s"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:393
+#: src/pages/confirm-create-reserve.tsx:396
 #, c-format
 msgid "Can't parse wire_types: %1$s"
 msgstr ""
 
 #. TODO:generic error reporting function or component.
-#: src/pages/confirm-create-reserve.tsx:410
+#: src/pages/confirm-create-reserve.tsx:413
 #, c-format
 msgid "Fatal error: \"%1$s\"."
 msgstr ""
 
-#: src/popup/popup.tsx:173
+#: src/popup/popup.tsx:172
 #, c-format
 msgid "Balance"
 msgstr ""
 
-#: src/popup/popup.tsx:176
+#: src/popup/popup.tsx:175
 #, c-format
 msgid "History"
 msgstr ""
 
-#: src/popup/popup.tsx:179
+#: src/popup/popup.tsx:178
 #, c-format
 msgid "Debug"
 msgstr ""
 
-#: src/popup/popup.tsx:239
+#: src/popup/popup.tsx:238
 #, c-format
 msgid "help"
 msgstr ""
 
-#: src/popup/popup.tsx:244
+#: src/popup/popup.tsx:243
 #, c-format
 msgid ""
 "You have no balance to show. Need some\n"
 " %1$s getting started?\n"
 msgstr ""
 
-#: src/popup/popup.tsx:261
+#: src/popup/popup.tsx:260
 #, c-format
 msgid "%1$s incoming\n"
 msgstr ""
 
-#: src/popup/popup.tsx:274
+#: src/popup/popup.tsx:273
 #, c-format
 msgid "%1$s being spent\n"
 msgstr ""
 
-#: src/popup/popup.tsx:300
+#: src/popup/popup.tsx:299
 #, c-format
 msgid "Error: could not retrieve balance information."
 msgstr ""
 
-#: src/popup/popup.tsx:340
+#: src/popup/popup.tsx:337
 #, c-format
-msgid "Bank requested reserve (%1$s) for %2$s."
+msgid "Bank requested reserve (%1$s) for%2$s.\n"
 msgstr ""
 
-#: src/popup/popup.tsx:351
+#: src/popup/popup.tsx:346
 #, c-format
-msgid "Started to withdraw %1$s from %2$s (%3$s)."
+msgid ""
+"Started to withdraw\n"
+" %1$s from%2$s(%3$s).\n"
 msgstr ""
 
-#: src/popup/popup.tsx:361
+#: src/popup/popup.tsx:358
 #, c-format
-msgid "Merchant %1$s offered contract %2$s."
+msgid "Merchant%1$soffered contract%2$s;\n"
 msgstr ""
 
-#: src/popup/popup.tsx:371
+#: src/popup/popup.tsx:368
 #, c-format
-msgid "Withdrew %1$s from %2$s (%3$s)."
+msgid "Withdrew%1$sfrom%2$s(%3$s).\n"
 msgstr ""
 
-#: src/popup/popup.tsx:382
+#: src/popup/popup.tsx:379
 #, c-format
-msgid "Paid %1$s to merchant %2$s.  (%3$s)"
+msgid "Paid%1$sto merchant%2$s.  (%3$s)\n"
+msgstr ""
+
+#: src/popup/popup.tsx:386
+#, c-format
+msgid "Unknown event (%1$s)"
 msgstr ""
 
 #: src/popup/popup.tsx:429
@@ -255,7 +262,12 @@ msgstr ""
 msgid "Your wallet has no events recorded."
 msgstr ""
 
-#: src/renderHtml.tsx:42
+#: src/renderHtml.tsx:38
+#, c-format
+msgid "The merchant%1$swants to enter a contract over%2$s with you.\n"
+msgstr ""
+
+#: src/renderHtml.tsx:43
 #, c-format
 msgid "You are about to purchase:"
 msgstr ""
diff --git a/src/i18n/it.po b/src/i18n/it.po
index 8c68a63f1..8bfdf57d0 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:61
+#: src/pages/confirm-contract.tsx:62
 #, c-format
 msgid "show more details\n"
 msgstr ""
 
-#: src/pages/confirm-contract.tsx:75
+#: src/pages/confirm-contract.tsx:76
 #, c-format
 msgid "Accepted exchanges:"
 msgstr ""
 
-#: src/pages/confirm-contract.tsx:80
+#: src/pages/confirm-contract.tsx:81
 #, c-format
 msgid "Exchanges in the wallet:"
 msgstr ""
 
-#: src/pages/confirm-contract.tsx:156
+#: src/pages/confirm-contract.tsx:157
 #, c-format
 msgid "You have insufficient funds of the requested currency in your wallet."
 msgstr ""
 
-#: src/pages/confirm-contract.tsx:157
+#: src/pages/confirm-contract.tsx:158
 #, c-format
 msgid ""
 "You do not have any funds from an exchange that is accepted by this "
@@ -55,194 +55,201 @@ msgid ""
 "wallet."
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:105
+#: src/pages/confirm-create-reserve.tsx:106
 #, c-format
 msgid "Withdrawal fees: %1$s"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:106
+#: src/pages/confirm-create-reserve.tsx:107
 #, c-format
 msgid "Rounding loss: %1$s"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:109
+#: src/pages/confirm-create-reserve.tsx:110
 #, c-format
 msgid "# Coins"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:110
+#: src/pages/confirm-create-reserve.tsx:111
 #, c-format
 msgid "Value"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:111
+#: src/pages/confirm-create-reserve.tsx:112
 #, c-format
 msgid "Withdraw Fee"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:112
+#: src/pages/confirm-create-reserve.tsx:113
 #, c-format
 msgid "Refresh Fee"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:113
+#: src/pages/confirm-create-reserve.tsx:114
 #, c-format
 msgid "Deposit Fee"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:146
+#: src/pages/confirm-create-reserve.tsx:147
 #, c-format
 msgid "Withdraw fees:"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:180
+#: src/pages/confirm-create-reserve.tsx:182
 #, c-format
 msgid "view fee structure / select different exchange provider"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:194
+#: src/pages/confirm-create-reserve.tsx:196
 #, c-format
 msgid "Detailed Fee Structure"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:210
+#: src/pages/confirm-create-reserve.tsx:212
 #, c-format
 msgid ""
 "The exchange provider will charge\n"
 " %1$s in fees.\n"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:222
+#: src/pages/confirm-create-reserve.tsx:224
 #, c-format
 msgid ""
 "Waiting for a response from\n"
 " %1$s"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:233
+#: src/pages/confirm-create-reserve.tsx:235
 #, c-format
 msgid "A problem occured, see below."
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:239
+#: src/pages/confirm-create-reserve.tsx:241
 #, c-format
 msgid ""
 "Information about fees will be available when an exchange provider is "
 "selected."
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:247
+#: 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:256
+#: src/pages/confirm-create-reserve.tsx:258
 #, c-format
 msgid "Accept fees and withdraw"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:278
+#: src/pages/confirm-create-reserve.tsx:280
 #, c-format
 msgid "Error: URL is empty"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:286
+#: src/pages/confirm-create-reserve.tsx:288
 #, c-format
 msgid "Error: URL may not be relative"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:344
+#: src/pages/confirm-create-reserve.tsx:347
 #, c-format
 msgid ""
 "Oops, something went wrong. The wallet responded with error status (%1$s)."
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:371
+#: src/pages/confirm-create-reserve.tsx:374
 #, c-format
 msgid "Checking URL, please wait ..."
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:385
+#: src/pages/confirm-create-reserve.tsx:388
 #, c-format
 msgid "Can't parse amount: %1$s"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:393
+#: src/pages/confirm-create-reserve.tsx:396
 #, c-format
 msgid "Can't parse wire_types: %1$s"
 msgstr ""
 
 #. TODO:generic error reporting function or component.
-#: src/pages/confirm-create-reserve.tsx:410
+#: src/pages/confirm-create-reserve.tsx:413
 #, c-format
 msgid "Fatal error: \"%1$s\"."
 msgstr ""
 
-#: src/popup/popup.tsx:173
+#: src/popup/popup.tsx:172
 #, c-format
 msgid "Balance"
 msgstr ""
 
-#: src/popup/popup.tsx:176
+#: src/popup/popup.tsx:175
 #, c-format
 msgid "History"
 msgstr ""
 
-#: src/popup/popup.tsx:179
+#: src/popup/popup.tsx:178
 #, c-format
 msgid "Debug"
 msgstr ""
 
-#: src/popup/popup.tsx:239
+#: src/popup/popup.tsx:238
 #, c-format
 msgid "help"
 msgstr ""
 
-#: src/popup/popup.tsx:244
+#: src/popup/popup.tsx:243
 #, c-format
 msgid ""
 "You have no balance to show. Need some\n"
 " %1$s getting started?\n"
 msgstr ""
 
-#: src/popup/popup.tsx:261
+#: src/popup/popup.tsx:260
 #, c-format
 msgid "%1$s incoming\n"
 msgstr ""
 
-#: src/popup/popup.tsx:274
+#: src/popup/popup.tsx:273
 #, c-format
 msgid "%1$s being spent\n"
 msgstr ""
 
-#: src/popup/popup.tsx:300
+#: src/popup/popup.tsx:299
 #, c-format
 msgid "Error: could not retrieve balance information."
 msgstr ""
 
-#: src/popup/popup.tsx:340
+#: src/popup/popup.tsx:337
 #, c-format
-msgid "Bank requested reserve (%1$s) for %2$s."
+msgid "Bank requested reserve (%1$s) for%2$s.\n"
 msgstr ""
 
-#: src/popup/popup.tsx:351
+#: src/popup/popup.tsx:346
 #, c-format
-msgid "Started to withdraw %1$s from %2$s (%3$s)."
+msgid ""
+"Started to withdraw\n"
+" %1$s from%2$s(%3$s).\n"
 msgstr ""
 
-#: src/popup/popup.tsx:361
+#: src/popup/popup.tsx:358
 #, c-format
-msgid "Merchant %1$s offered contract %2$s."
+msgid "Merchant%1$soffered contract%2$s;\n"
 msgstr ""
 
-#: src/popup/popup.tsx:371
+#: src/popup/popup.tsx:368
 #, c-format
-msgid "Withdrew %1$s from %2$s (%3$s)."
+msgid "Withdrew%1$sfrom%2$s(%3$s).\n"
 msgstr ""
 
-#: src/popup/popup.tsx:382
+#: src/popup/popup.tsx:379
 #, c-format
-msgid "Paid %1$s to merchant %2$s.  (%3$s)"
+msgid "Paid%1$sto merchant%2$s.  (%3$s)\n"
+msgstr ""
+
+#: src/popup/popup.tsx:386
+#, c-format
+msgid "Unknown event (%1$s)"
 msgstr ""
 
 #: src/popup/popup.tsx:429
@@ -255,7 +262,12 @@ msgstr ""
 msgid "Your wallet has no events recorded."
 msgstr ""
 
-#: src/renderHtml.tsx:42
+#: src/renderHtml.tsx:38
+#, c-format
+msgid "The merchant%1$swants to enter a contract over%2$s with you.\n"
+msgstr ""
+
+#: src/renderHtml.tsx:43
 #, c-format
 msgid "You are about to purchase:"
 msgstr ""
diff --git a/src/i18n/strings-prelude b/src/i18n/strings-prelude
new file mode 100644
index 000000000..147b6c939
--- /dev/null
+++ b/src/i18n/strings-prelude
@@ -0,0 +1,17 @@
+/*
+ This file is part of TALER
+ (C) 2016 Inria
+
+ TALER is free software; you can redistribute it and/or modify it under the
+ terms of the GNU General Public License as published by the Free Software
+ Foundation; either version 3, or (at your option) any later version.
+
+ TALER is distributed in the hope that it will be useful, but WITHOUT ANY
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along with
+ TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
+ */
+
+export let strings: {[s: string]: any} = {};
diff --git a/src/i18n/strings-prelude.js b/src/i18n/strings-prelude.js
deleted file mode 100644
index 0e9ddc468..000000000
--- a/src/i18n/strings-prelude.js
+++ /dev/null
@@ -1,3 +0,0 @@
-if (!window.i18n) {
-  throw Error("Module loading order incorrect, please load i18n module before loading i18n-strings");
-}
diff --git a/src/i18n/strings.ts b/src/i18n/strings.ts
new file mode 100644
index 000000000..08ba92992
--- /dev/null
+++ b/src/i18n/strings.ts
@@ -0,0 +1,21 @@
+/*
+ This file is part of TALER
+ (C) 2016 Inria
+
+ TALER is free software; you can redistribute it and/or modify it under the
+ terms of the GNU General Public License as published by the Free Software
+ Foundation; either version 3, or (at your option) any later version.
+
+ TALER is distributed in the hope that it will be useful, but WITHOUT ANY
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along with
+ TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
+ */
+
+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:":[""]}}};
diff --git a/src/i18n/taler-wallet-webex.pot b/src/i18n/taler-wallet-webex.pot
index 8c68a63f1..8bfdf57d0 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:61
+#: src/pages/confirm-contract.tsx:62
 #, c-format
 msgid "show more details\n"
 msgstr ""
 
-#: src/pages/confirm-contract.tsx:75
+#: src/pages/confirm-contract.tsx:76
 #, c-format
 msgid "Accepted exchanges:"
 msgstr ""
 
-#: src/pages/confirm-contract.tsx:80
+#: src/pages/confirm-contract.tsx:81
 #, c-format
 msgid "Exchanges in the wallet:"
 msgstr ""
 
-#: src/pages/confirm-contract.tsx:156
+#: src/pages/confirm-contract.tsx:157
 #, c-format
 msgid "You have insufficient funds of the requested currency in your wallet."
 msgstr ""
 
-#: src/pages/confirm-contract.tsx:157
+#: src/pages/confirm-contract.tsx:158
 #, c-format
 msgid ""
 "You do not have any funds from an exchange that is accepted by this "
@@ -55,194 +55,201 @@ msgid ""
 "wallet."
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:105
+#: src/pages/confirm-create-reserve.tsx:106
 #, c-format
 msgid "Withdrawal fees: %1$s"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:106
+#: src/pages/confirm-create-reserve.tsx:107
 #, c-format
 msgid "Rounding loss: %1$s"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:109
+#: src/pages/confirm-create-reserve.tsx:110
 #, c-format
 msgid "# Coins"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:110
+#: src/pages/confirm-create-reserve.tsx:111
 #, c-format
 msgid "Value"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:111
+#: src/pages/confirm-create-reserve.tsx:112
 #, c-format
 msgid "Withdraw Fee"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:112
+#: src/pages/confirm-create-reserve.tsx:113
 #, c-format
 msgid "Refresh Fee"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:113
+#: src/pages/confirm-create-reserve.tsx:114
 #, c-format
 msgid "Deposit Fee"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:146
+#: src/pages/confirm-create-reserve.tsx:147
 #, c-format
 msgid "Withdraw fees:"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:180
+#: src/pages/confirm-create-reserve.tsx:182
 #, c-format
 msgid "view fee structure / select different exchange provider"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:194
+#: src/pages/confirm-create-reserve.tsx:196
 #, c-format
 msgid "Detailed Fee Structure"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:210
+#: src/pages/confirm-create-reserve.tsx:212
 #, c-format
 msgid ""
 "The exchange provider will charge\n"
 " %1$s in fees.\n"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:222
+#: src/pages/confirm-create-reserve.tsx:224
 #, c-format
 msgid ""
 "Waiting for a response from\n"
 " %1$s"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:233
+#: src/pages/confirm-create-reserve.tsx:235
 #, c-format
 msgid "A problem occured, see below."
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:239
+#: src/pages/confirm-create-reserve.tsx:241
 #, c-format
 msgid ""
 "Information about fees will be available when an exchange provider is "
 "selected."
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:247
+#: 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:256
+#: src/pages/confirm-create-reserve.tsx:258
 #, c-format
 msgid "Accept fees and withdraw"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:278
+#: src/pages/confirm-create-reserve.tsx:280
 #, c-format
 msgid "Error: URL is empty"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:286
+#: src/pages/confirm-create-reserve.tsx:288
 #, c-format
 msgid "Error: URL may not be relative"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:344
+#: src/pages/confirm-create-reserve.tsx:347
 #, c-format
 msgid ""
 "Oops, something went wrong. The wallet responded with error status (%1$s)."
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:371
+#: src/pages/confirm-create-reserve.tsx:374
 #, c-format
 msgid "Checking URL, please wait ..."
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:385
+#: src/pages/confirm-create-reserve.tsx:388
 #, c-format
 msgid "Can't parse amount: %1$s"
 msgstr ""
 
-#: src/pages/confirm-create-reserve.tsx:393
+#: src/pages/confirm-create-reserve.tsx:396
 #, c-format
 msgid "Can't parse wire_types: %1$s"
 msgstr ""
 
 #. TODO:generic error reporting function or component.
-#: src/pages/confirm-create-reserve.tsx:410
+#: src/pages/confirm-create-reserve.tsx:413
 #, c-format
 msgid "Fatal error: \"%1$s\"."
 msgstr ""
 
-#: src/popup/popup.tsx:173
+#: src/popup/popup.tsx:172
 #, c-format
 msgid "Balance"
 msgstr ""
 
-#: src/popup/popup.tsx:176
+#: src/popup/popup.tsx:175
 #, c-format
 msgid "History"
 msgstr ""
 
-#: src/popup/popup.tsx:179
+#: src/popup/popup.tsx:178
 #, c-format
 msgid "Debug"
 msgstr ""
 
-#: src/popup/popup.tsx:239
+#: src/popup/popup.tsx:238
 #, c-format
 msgid "help"
 msgstr ""
 
-#: src/popup/popup.tsx:244
+#: src/popup/popup.tsx:243
 #, c-format
 msgid ""
 "You have no balance to show. Need some\n"
 " %1$s getting started?\n"
 msgstr ""
 
-#: src/popup/popup.tsx:261
+#: src/popup/popup.tsx:260
 #, c-format
 msgid "%1$s incoming\n"
 msgstr ""
 
-#: src/popup/popup.tsx:274
+#: src/popup/popup.tsx:273
 #, c-format
 msgid "%1$s being spent\n"
 msgstr ""
 
-#: src/popup/popup.tsx:300
+#: src/popup/popup.tsx:299
 #, c-format
 msgid "Error: could not retrieve balance information."
 msgstr ""
 
-#: src/popup/popup.tsx:340
+#: src/popup/popup.tsx:337
 #, c-format
-msgid "Bank requested reserve (%1$s) for %2$s."
+msgid "Bank requested reserve (%1$s) for%2$s.\n"
 msgstr ""
 
-#: src/popup/popup.tsx:351
+#: src/popup/popup.tsx:346
 #, c-format
-msgid "Started to withdraw %1$s from %2$s (%3$s)."
+msgid ""
+"Started to withdraw\n"
+" %1$s from%2$s(%3$s).\n"
 msgstr ""
 
-#: src/popup/popup.tsx:361
+#: src/popup/popup.tsx:358
 #, c-format
-msgid "Merchant %1$s offered contract %2$s."
+msgid "Merchant%1$soffered contract%2$s;\n"
 msgstr ""
 
-#: src/popup/popup.tsx:371
+#: src/popup/popup.tsx:368
 #, c-format
-msgid "Withdrew %1$s from %2$s (%3$s)."
+msgid "Withdrew%1$sfrom%2$s(%3$s).\n"
 msgstr ""
 
-#: src/popup/popup.tsx:382
+#: src/popup/popup.tsx:379
 #, c-format
-msgid "Paid %1$s to merchant %2$s.  (%3$s)"
+msgid "Paid%1$sto merchant%2$s.  (%3$s)\n"
+msgstr ""
+
+#: src/popup/popup.tsx:386
+#, c-format
+msgid "Unknown event (%1$s)"
 msgstr ""
 
 #: src/popup/popup.tsx:429
@@ -255,7 +262,12 @@ msgstr ""
 msgid "Your wallet has no events recorded."
 msgstr ""
 
-#: src/renderHtml.tsx:42
+#: src/renderHtml.tsx:38
+#, c-format
+msgid "The merchant%1$swants to enter a contract over%2$s with you.\n"
+msgstr ""
+
+#: src/renderHtml.tsx:43
 #, c-format
 msgid "You are about to purchase:"
 msgstr ""