fix manifest

7 files changed, 144 insertions, 297 deletions

diff --git a/i18n/de.po b/i18n/de.po
index 4d2d8fcae..1c9bb57e9 100644
--- a/i18n/de.po
+++ b/i18n/de.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Taler Wallet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-27 16:55+0200\n"
+"POT-Creation-Date: 2016-10-10 17:44+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -27,22 +27,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pages/confirm-create-reserve.tsx:100
-#, c-format
-msgid "Error: URL is empty"
-msgstr ""
-
-#: pages/confirm-create-reserve.tsx:107
-#, c-format
-msgid "Error: URL may not be relative"
-msgstr ""
-
-#: pages/confirm-create-reserve.tsx:193
-#, c-format
-msgid "You are about to withdraw %1$s from your bank account into your wallet."
-msgstr ""
-
-#: pages/confirm-contract.tsx:80
+#: lib/wallet/renderHtml.tsx:37
 #, c-format
 msgid ""
 "%1$s\n"
@@ -53,86 +38,88 @@ msgstr ""
 "               möchte einen Vertrag über %2$s\n"
 "               mit Ihnen abschließen."
 
-#: pages/confirm-contract.tsx:85
+#: lib/wallet/renderHtml.tsx:42
 #, c-format
 msgid "You are about to purchase:"
 msgstr "Sie sind dabei, Folgendes zu kaufen:"
 
-#: pages/confirm-contract.tsx:91
-#, c-format
-msgid "Confirm Payment"
-msgstr "Bezahlung bestätigen"
-
-#: popup/popup.tsx:73
-#, c-format
-msgid "Balance"
-msgstr "Saldo"
-
-#: popup/popup.tsx:74
+#: pages/confirm-create-reserve.tsx:291
 #, c-format
-msgid "History"
-msgstr "Verlauf"
+msgid "Error: URL is empty"
+msgstr ""
 
-#: popup/popup.tsx:75
+#: pages/confirm-create-reserve.tsx:298
 #, c-format
-msgid "Debug"
-msgstr "Debug"
+msgid "Error: URL may not be relative"
+msgstr ""
 
-#: popup/popup.tsx:131
+#: pages/confirm-contract.tsx:116
 #, c-format
-msgid "Error: could not retrieve balance information."
+msgid "You have insufficient funds of the requested currency in your wallet."
 msgstr ""
 
-#: popup/popup.tsx:141
+#: popup/popup.tsx:222
 #, c-format
-msgid "help"
+msgid "Error: could not retrieve balance information."
 msgstr ""
 
-#: popup/popup.tsx:144
+#: popup/popup.tsx:267
 #, fuzzy, c-format
-msgid "You have no balance to show. Need some %1$s getting started?"
-msgstr "Sie haben kein Digitalgeld. Wollen Sie %1$s? abheben?"
-
-#: popup/popup.tsx:182
-#, c-format
-msgid "Created reserve (%1$s) of %2$s at %3$s"
-msgstr "Reserve (%1$s) mit %2$s bei %3$s erzeugt"
-
-#: popup/popup.tsx:187
-#, c-format
-msgid "Bank confirmed reserve (%1$s) at %2$s"
+msgid "Bank requested reserve (%1$s) for %2$s."
 msgstr "Bank bestätig anlegen der Reserve (%1$s) bei %2$s"
 
-#: popup/popup.tsx:191
-#, c-format
-msgid "Withdraw at %1$s"
-msgstr "Abheben bei %1$s"
-
-#: popup/popup.tsx:194
+#: popup/popup.tsx:278
 #, c-format
-msgid "Wallet depleted reserve (%1$s) at %2$s"
-msgstr "Geldbörse hat die Reserve (%1$s) erschöpft"
+msgid "Started to withdraw %1$s from %2$s (%3$s)."
+msgstr ""
 
-#: popup/popup.tsx:200
+#: popup/popup.tsx:288
 #, c-format
-msgid "Payment for %1$s to merchant %2$s. "
+msgid "Merchant %1$s offered contract %2$s."
 msgstr ""
 
-#: popup/popup.tsx:207
+#: popup/popup.tsx:297
+#, fuzzy, c-format
+msgid "Withdrew %1$s from %2$s (%3$s)."
+msgstr "Reserve (%1$s) mit %2$s bei %3$s erzeugt"
+
+#: popup/popup.tsx:307
 #, c-format
-msgid "Unknown event (%1$s)"
+msgid "Paid %1$s to merchant %2$s.  (%3$s)"
 msgstr ""
 
-#: popup/popup.tsx:246
+#: popup/popup.tsx:345
 #, c-format
 msgid "Error: could not retrieve event history"
 msgstr ""
 
-#: popup/popup.tsx:255
+#: popup/popup.tsx:379
 #, c-format
 msgid "Your wallet has no events recorded."
 msgstr "Ihre Geldbörse verzeichnet keine Vorkommnisse."
 
+#~ msgid "Confirm Payment"
+#~ msgstr "Bezahlung bestätigen"
+
+#~ msgid "Balance"
+#~ msgstr "Saldo"
+
+#~ msgid "History"
+#~ msgstr "Verlauf"
+
+#~ msgid "Debug"
+#~ msgstr "Debug"
+
+#, fuzzy
+#~ msgid "You have no balance to show. Need some %1$s getting started?"
+#~ msgstr "Sie haben kein Digitalgeld. Wollen Sie %1$s? abheben?"
+
+#~ msgid "Withdraw at %1$s"
+#~ msgstr "Abheben bei %1$s"
+
+#~ msgid "Wallet depleted reserve (%1$s) at %2$s"
+#~ msgstr "Geldbörse hat die Reserve (%1$s) erschöpft"
+
 #~ msgid "Please enter a URL"
 #~ msgstr "Bitte eine URL eingeben"
 
diff --git a/i18n/en-US.po b/i18n/en-US.po
index 34e7b5595..ba0ebb43c 100644
--- a/i18n/en-US.po
+++ b/i18n/en-US.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Taler Wallet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-27 16:55+0200\n"
+"POT-Creation-Date: 2016-10-10 17:44+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -27,22 +27,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pages/confirm-create-reserve.tsx:100
-#, c-format
-msgid "Error: URL is empty"
-msgstr ""
-
-#: pages/confirm-create-reserve.tsx:107
-#, c-format
-msgid "Error: URL may not be relative"
-msgstr ""
-
-#: pages/confirm-create-reserve.tsx:193
-#, c-format
-msgid "You are about to withdraw %1$s from your bank account into your wallet."
-msgstr ""
-
-#: pages/confirm-contract.tsx:80
+#: lib/wallet/renderHtml.tsx:37
 #, c-format
 msgid ""
 "%1$s\n"
@@ -50,82 +35,62 @@ msgid ""
 "               with you."
 msgstr ""
 
-#: pages/confirm-contract.tsx:85
+#: lib/wallet/renderHtml.tsx:42
 #, c-format
 msgid "You are about to purchase:"
 msgstr ""
 
-#: pages/confirm-contract.tsx:91
+#: pages/confirm-create-reserve.tsx:291
 #, c-format
-msgid "Confirm Payment"
-msgstr ""
-
-#: popup/popup.tsx:73
-#, c-format
-msgid "Balance"
+msgid "Error: URL is empty"
 msgstr ""
 
-#: popup/popup.tsx:74
+#: pages/confirm-create-reserve.tsx:298
 #, c-format
-msgid "History"
+msgid "Error: URL may not be relative"
 msgstr ""
 
-#: popup/popup.tsx:75
+#: pages/confirm-contract.tsx:116
 #, c-format
-msgid "Debug"
+msgid "You have insufficient funds of the requested currency in your wallet."
 msgstr ""
 
-#: popup/popup.tsx:131
+#: popup/popup.tsx:222
 #, c-format
 msgid "Error: could not retrieve balance information."
 msgstr ""
 
-#: popup/popup.tsx:141
-#, c-format
-msgid "help"
-msgstr ""
-
-#: popup/popup.tsx:144
-#, c-format
-msgid "You have no balance to show. Need some %1$s getting started?"
-msgstr ""
-
-#: popup/popup.tsx:182
-#, c-format
-msgid "Created reserve (%1$s) of %2$s at %3$s"
-msgstr ""
-
-#: popup/popup.tsx:187
+#: popup/popup.tsx:267
 #, c-format
-msgid "Bank confirmed reserve (%1$s) at %2$s"
+msgid "Bank requested reserve (%1$s) for %2$s."
 msgstr ""
 
-#: popup/popup.tsx:191
+#: popup/popup.tsx:278
 #, c-format
-msgid "Withdraw at %1$s"
+msgid "Started to withdraw %1$s from %2$s (%3$s)."
 msgstr ""
 
-#: popup/popup.tsx:194
+#: popup/popup.tsx:288
 #, c-format
-msgid "Wallet depleted reserve (%1$s) at %2$s"
+msgid "Merchant %1$s offered contract %2$s."
 msgstr ""
 
-#: popup/popup.tsx:200
+#: popup/popup.tsx:297
 #, c-format
-msgid "Payment for %1$s to merchant %2$s. "
+msgid "Withdrew %1$s from %2$s (%3$s)."
 msgstr ""
 
-#: popup/popup.tsx:207
+#: popup/popup.tsx:307
 #, c-format
-msgid "Unknown event (%1$s)"
+msgid "Paid %1$s to merchant %2$s.  (%3$s)"
 msgstr ""
 
-#: popup/popup.tsx:246
+#: popup/popup.tsx:345
 #, c-format
 msgid "Error: could not retrieve event history"
 msgstr ""
 
-#: popup/popup.tsx:255
+#: popup/popup.tsx:379
 #, c-format
 msgid "Your wallet has no events recorded."
 msgstr ""
diff --git a/i18n/fr.po b/i18n/fr.po
index a1306a389..3ed8ce37c 100644
--- a/i18n/fr.po
+++ b/i18n/fr.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Taler Wallet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-27 16:55+0200\n"
+"POT-Creation-Date: 2016-10-10 17:44+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -27,22 +27,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pages/confirm-create-reserve.tsx:100
-#, c-format
-msgid "Error: URL is empty"
-msgstr ""
-
-#: pages/confirm-create-reserve.tsx:107
-#, c-format
-msgid "Error: URL may not be relative"
-msgstr ""
-
-#: pages/confirm-create-reserve.tsx:193
-#, c-format
-msgid "You are about to withdraw %1$s from your bank account into your wallet."
-msgstr ""
-
-#: pages/confirm-contract.tsx:80
+#: lib/wallet/renderHtml.tsx:37
 #, c-format
 msgid ""
 "%1$s\n"
@@ -50,82 +35,62 @@ msgid ""
 "               with you."
 msgstr ""
 
-#: pages/confirm-contract.tsx:85
+#: lib/wallet/renderHtml.tsx:42
 #, c-format
 msgid "You are about to purchase:"
 msgstr ""
 
-#: pages/confirm-contract.tsx:91
+#: pages/confirm-create-reserve.tsx:291
 #, c-format
-msgid "Confirm Payment"
-msgstr ""
-
-#: popup/popup.tsx:73
-#, c-format
-msgid "Balance"
+msgid "Error: URL is empty"
 msgstr ""
 
-#: popup/popup.tsx:74
+#: pages/confirm-create-reserve.tsx:298
 #, c-format
-msgid "History"
+msgid "Error: URL may not be relative"
 msgstr ""
 
-#: popup/popup.tsx:75
+#: pages/confirm-contract.tsx:116
 #, c-format
-msgid "Debug"
+msgid "You have insufficient funds of the requested currency in your wallet."
 msgstr ""
 
-#: popup/popup.tsx:131
+#: popup/popup.tsx:222
 #, c-format
 msgid "Error: could not retrieve balance information."
 msgstr ""
 
-#: popup/popup.tsx:141
-#, c-format
-msgid "help"
-msgstr ""
-
-#: popup/popup.tsx:144
-#, c-format
-msgid "You have no balance to show. Need some %1$s getting started?"
-msgstr ""
-
-#: popup/popup.tsx:182
-#, c-format
-msgid "Created reserve (%1$s) of %2$s at %3$s"
-msgstr ""
-
-#: popup/popup.tsx:187
+#: popup/popup.tsx:267
 #, c-format
-msgid "Bank confirmed reserve (%1$s) at %2$s"
+msgid "Bank requested reserve (%1$s) for %2$s."
 msgstr ""
 
-#: popup/popup.tsx:191
+#: popup/popup.tsx:278
 #, c-format
-msgid "Withdraw at %1$s"
+msgid "Started to withdraw %1$s from %2$s (%3$s)."
 msgstr ""
 
-#: popup/popup.tsx:194
+#: popup/popup.tsx:288
 #, c-format
-msgid "Wallet depleted reserve (%1$s) at %2$s"
+msgid "Merchant %1$s offered contract %2$s."
 msgstr ""
 
-#: popup/popup.tsx:200
+#: popup/popup.tsx:297
 #, c-format
-msgid "Payment for %1$s to merchant %2$s. "
+msgid "Withdrew %1$s from %2$s (%3$s)."
 msgstr ""
 
-#: popup/popup.tsx:207
+#: popup/popup.tsx:307
 #, c-format
-msgid "Unknown event (%1$s)"
+msgid "Paid %1$s to merchant %2$s.  (%3$s)"
 msgstr ""
 
-#: popup/popup.tsx:246
+#: popup/popup.tsx:345
 #, c-format
 msgid "Error: could not retrieve event history"
 msgstr ""
 
-#: popup/popup.tsx:255
+#: popup/popup.tsx:379
 #, c-format
 msgid "Your wallet has no events recorded."
 msgstr ""
diff --git a/i18n/it.po b/i18n/it.po
index a1306a389..3ed8ce37c 100644
--- a/i18n/it.po
+++ b/i18n/it.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Taler Wallet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-27 16:55+0200\n"
+"POT-Creation-Date: 2016-10-10 17:44+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -27,22 +27,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pages/confirm-create-reserve.tsx:100
-#, c-format
-msgid "Error: URL is empty"
-msgstr ""
-
-#: pages/confirm-create-reserve.tsx:107
-#, c-format
-msgid "Error: URL may not be relative"
-msgstr ""
-
-#: pages/confirm-create-reserve.tsx:193
-#, c-format
-msgid "You are about to withdraw %1$s from your bank account into your wallet."
-msgstr ""
-
-#: pages/confirm-contract.tsx:80
+#: lib/wallet/renderHtml.tsx:37
 #, c-format
 msgid ""
 "%1$s\n"
@@ -50,82 +35,62 @@ msgid ""
 "               with you."
 msgstr ""
 
-#: pages/confirm-contract.tsx:85
+#: lib/wallet/renderHtml.tsx:42
 #, c-format
 msgid "You are about to purchase:"
 msgstr ""
 
-#: pages/confirm-contract.tsx:91
+#: pages/confirm-create-reserve.tsx:291
 #, c-format
-msgid "Confirm Payment"
-msgstr ""
-
-#: popup/popup.tsx:73
-#, c-format
-msgid "Balance"
+msgid "Error: URL is empty"
 msgstr ""
 
-#: popup/popup.tsx:74
+#: pages/confirm-create-reserve.tsx:298
 #, c-format
-msgid "History"
+msgid "Error: URL may not be relative"
 msgstr ""
 
-#: popup/popup.tsx:75
+#: pages/confirm-contract.tsx:116
 #, c-format
-msgid "Debug"
+msgid "You have insufficient funds of the requested currency in your wallet."
 msgstr ""
 
-#: popup/popup.tsx:131
+#: popup/popup.tsx:222
 #, c-format
 msgid "Error: could not retrieve balance information."
 msgstr ""
 
-#: popup/popup.tsx:141
-#, c-format
-msgid "help"
-msgstr ""
-
-#: popup/popup.tsx:144
-#, c-format
-msgid "You have no balance to show. Need some %1$s getting started?"
-msgstr ""
-
-#: popup/popup.tsx:182
-#, c-format
-msgid "Created reserve (%1$s) of %2$s at %3$s"
-msgstr ""
-
-#: popup/popup.tsx:187
+#: popup/popup.tsx:267
 #, c-format
-msgid "Bank confirmed reserve (%1$s) at %2$s"
+msgid "Bank requested reserve (%1$s) for %2$s."
 msgstr ""
 
-#: popup/popup.tsx:191
+#: popup/popup.tsx:278
 #, c-format
-msgid "Withdraw at %1$s"
+msgid "Started to withdraw %1$s from %2$s (%3$s)."
 msgstr ""
 
-#: popup/popup.tsx:194
+#: popup/popup.tsx:288
 #, c-format
-msgid "Wallet depleted reserve (%1$s) at %2$s"
+msgid "Merchant %1$s offered contract %2$s."
 msgstr ""
 
-#: popup/popup.tsx:200
+#: popup/popup.tsx:297
 #, c-format
-msgid "Payment for %1$s to merchant %2$s. "
+msgid "Withdrew %1$s from %2$s (%3$s)."
 msgstr ""
 
-#: popup/popup.tsx:207
+#: popup/popup.tsx:307
 #, c-format
-msgid "Unknown event (%1$s)"
+msgid "Paid %1$s to merchant %2$s.  (%3$s)"
 msgstr ""
 
-#: popup/popup.tsx:246
+#: popup/popup.tsx:345
 #, c-format
 msgid "Error: could not retrieve event history"
 msgstr ""
 
-#: popup/popup.tsx:255
+#: popup/popup.tsx:379
 #, c-format
 msgid "Your wallet has no events recorded."
 msgstr ""
diff --git a/i18n/strings.js b/i18n/strings.js
index b08efcac2..a782bf09c 100644
--- a/i18n/strings.js
+++ b/i18n/strings.js
@@ -1,7 +1,7 @@
 if (!window.i18n) {
   throw Error("Module loading order incorrect, please load i18n module before loading i18n-strings");
 }
-i18n.strings['de'] = {"domain":"de","locale_data":{"de":{"":{"domain":"de","plural_forms":"nplurals=2; plural=(n != 1);","lang":""},"Error: URL is empty":[""],"Error: URL may not be relative":[""],"You are about to withdraw %1$s from your bank account into your wallet.":[""],"%1$s\n               wants to enter a contract over %2$s\n               with you.":["%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:"],"Confirm Payment":["Bezahlung bestätigen"],"Balance":["Saldo"],"History":["Verlauf"],"Debug":["Debug"],"Error: could not retrieve balance information.":[""],"help":[""],"You have no balance to show. Need some %1$s getting started?":["Sie haben kein Digitalgeld. Wollen Sie %1$s? abheben?"],"Created reserve (%1$s) of %2$s at %3$s":["Reserve (%1$s) mit %2$s bei %3$s erzeugt"],"Bank confirmed reserve (%1$s) at %2$s":["Bank bestätig anlegen der Reserve (%1$s) bei %2$s"],"Withdraw at %1$s":["Abheben bei %1$s"],"Wallet depleted reserve (%1$s) at %2$s":["Geldbörse hat die Reserve (%1$s) erschöpft"],"Payment for %1$s to merchant %2$s. ":[""],"Unknown event (%1$s)":[""],"Error: could not retrieve event history":[""],"Your wallet has no events recorded.":["Ihre Geldbörse verzeichnet keine Vorkommnisse."]}}};
-i18n.strings['en-US'] = {"domain":"en-US","locale_data":{"en-US":{"":{"domain":"en-US","plural_forms":"nplurals=2; plural=(n != 1);","lang":""},"Error: URL is empty":[""],"Error: URL may not be relative":[""],"You are about to withdraw %1$s from your bank account into your wallet.":[""],"%1$s\n               wants to enter a contract over %2$s\n               with you.":[""],"You are about to purchase:":[""],"Confirm Payment":[""],"Balance":[""],"History":[""],"Debug":[""],"Error: could not retrieve balance information.":[""],"help":[""],"You have no balance to show. Need some %1$s getting started?":[""],"Created reserve (%1$s) of %2$s at %3$s":[""],"Bank confirmed reserve (%1$s) at %2$s":[""],"Withdraw at %1$s":[""],"Wallet depleted reserve (%1$s) at %2$s":[""],"Payment for %1$s to merchant %2$s. ":[""],"Unknown event (%1$s)":[""],"Error: could not retrieve event history":[""],"Your wallet has no events recorded.":[""]}}};
-i18n.strings['fr'] = {"domain":"fr","locale_data":{"fr":{"":{"domain":"fr","plural_forms":"nplurals=2; plural=(n != 1);","lang":""},"Error: URL is empty":[""],"Error: URL may not be relative":[""],"You are about to withdraw %1$s from your bank account into your wallet.":[""],"%1$s\n               wants to enter a contract over %2$s\n               with you.":[""],"You are about to purchase:":[""],"Confirm Payment":[""],"Balance":[""],"History":[""],"Debug":[""],"Error: could not retrieve balance information.":[""],"help":[""],"You have no balance to show. Need some %1$s getting started?":[""],"Created reserve (%1$s) of %2$s at %3$s":[""],"Bank confirmed reserve (%1$s) at %2$s":[""],"Withdraw at %1$s":[""],"Wallet depleted reserve (%1$s) at %2$s":[""],"Payment for %1$s to merchant %2$s. ":[""],"Unknown event (%1$s)":[""],"Error: could not retrieve event history":[""],"Your wallet has no events recorded.":[""]}}};
-i18n.strings['it'] = {"domain":"it","locale_data":{"it":{"":{"domain":"it","plural_forms":"nplurals=2; plural=(n != 1);","lang":""},"Error: URL is empty":[""],"Error: URL may not be relative":[""],"You are about to withdraw %1$s from your bank account into your wallet.":[""],"%1$s\n               wants to enter a contract over %2$s\n               with you.":[""],"You are about to purchase:":[""],"Confirm Payment":[""],"Balance":[""],"History":[""],"Debug":[""],"Error: could not retrieve balance information.":[""],"help":[""],"You have no balance to show. Need some %1$s getting started?":[""],"Created reserve (%1$s) of %2$s at %3$s":[""],"Bank confirmed reserve (%1$s) at %2$s":[""],"Withdraw at %1$s":[""],"Wallet depleted reserve (%1$s) at %2$s":[""],"Payment for %1$s to merchant %2$s. ":[""],"Unknown event (%1$s)":[""],"Error: could not retrieve event history":[""],"Your wallet has no events recorded.":[""]}}};
+i18n.strings['de'] = {"domain":"de","locale_data":{"de":{"":{"domain":"de","plural_forms":"nplurals=2; plural=(n != 1);","lang":""},"%1$s\n               wants to enter a contract over %2$s\n               with you.":["%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:"],"Error: URL is empty":[""],"Error: URL may not be relative":[""],"You have insufficient funds of the requested currency in your wallet.":[""],"Error: could not retrieve balance information.":[""],"Bank requested reserve (%1$s) for %2$s.":["Bank bestätig anlegen der Reserve (%1$s) bei %2$s"],"Started to withdraw %1$s from %2$s (%3$s).":[""],"Merchant %1$s offered contract %2$s.":[""],"Withdrew %1$s from %2$s (%3$s).":["Reserve (%1$s) mit %2$s bei %3$s erzeugt"],"Paid %1$s to merchant %2$s.  (%3$s)":[""],"Error: could not retrieve event history":[""],"Your wallet has no events recorded.":["Ihre Geldbörse verzeichnet keine Vorkommnisse."]}}};
+i18n.strings['en-US'] = {"domain":"en-US","locale_data":{"en-US":{"":{"domain":"en-US","plural_forms":"nplurals=2; plural=(n != 1);","lang":""},"%1$s\n               wants to enter a contract over %2$s\n               with you.":[""],"You are about to purchase:":[""],"Error: URL is empty":[""],"Error: URL may not be relative":[""],"You have insufficient funds of the requested currency in your wallet.":[""],"Error: could not retrieve balance information.":[""],"Bank requested reserve (%1$s) for %2$s.":[""],"Started to withdraw %1$s from %2$s (%3$s).":[""],"Merchant %1$s offered contract %2$s.":[""],"Withdrew %1$s from %2$s (%3$s).":[""],"Paid %1$s to merchant %2$s.  (%3$s)":[""],"Error: could not retrieve event history":[""],"Your wallet has no events recorded.":[""]}}};
+i18n.strings['fr'] = {"domain":"fr","locale_data":{"fr":{"":{"domain":"fr","plural_forms":"nplurals=2; plural=(n != 1);","lang":""},"%1$s\n               wants to enter a contract over %2$s\n               with you.":[""],"You are about to purchase:":[""],"Error: URL is empty":[""],"Error: URL may not be relative":[""],"You have insufficient funds of the requested currency in your wallet.":[""],"Error: could not retrieve balance information.":[""],"Bank requested reserve (%1$s) for %2$s.":[""],"Started to withdraw %1$s from %2$s (%3$s).":[""],"Merchant %1$s offered contract %2$s.":[""],"Withdrew %1$s from %2$s (%3$s).":[""],"Paid %1$s to merchant %2$s.  (%3$s)":[""],"Error: could not retrieve event history":[""],"Your wallet has no events recorded.":[""]}}};
+i18n.strings['it'] = {"domain":"it","locale_data":{"it":{"":{"domain":"it","plural_forms":"nplurals=2; plural=(n != 1);","lang":""},"%1$s\n               wants to enter a contract over %2$s\n               with you.":[""],"You are about to purchase:":[""],"Error: URL is empty":[""],"Error: URL may not be relative":[""],"You have insufficient funds of the requested currency in your wallet.":[""],"Error: could not retrieve balance information.":[""],"Bank requested reserve (%1$s) for %2$s.":[""],"Started to withdraw %1$s from %2$s (%3$s).":[""],"Merchant %1$s offered contract %2$s.":[""],"Withdrew %1$s from %2$s (%3$s).":[""],"Paid %1$s to merchant %2$s.  (%3$s)":[""],"Error: could not retrieve event history":[""],"Your wallet has no events recorded.":[""]}}};
diff --git a/i18n/taler-wallet-webex.pot b/i18n/taler-wallet-webex.pot
index a1306a389..3ed8ce37c 100644
--- a/i18n/taler-wallet-webex.pot
+++ b/i18n/taler-wallet-webex.pot
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Taler Wallet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-27 16:55+0200\n"
+"POT-Creation-Date: 2016-10-10 17:44+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -27,22 +27,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pages/confirm-create-reserve.tsx:100
-#, c-format
-msgid "Error: URL is empty"
-msgstr ""
-
-#: pages/confirm-create-reserve.tsx:107
-#, c-format
-msgid "Error: URL may not be relative"
-msgstr ""
-
-#: pages/confirm-create-reserve.tsx:193
-#, c-format
-msgid "You are about to withdraw %1$s from your bank account into your wallet."
-msgstr ""
-
-#: pages/confirm-contract.tsx:80
+#: lib/wallet/renderHtml.tsx:37
 #, c-format
 msgid ""
 "%1$s\n"
@@ -50,82 +35,62 @@ msgid ""
 "               with you."
 msgstr ""
 
-#: pages/confirm-contract.tsx:85
+#: lib/wallet/renderHtml.tsx:42
 #, c-format
 msgid "You are about to purchase:"
 msgstr ""
 
-#: pages/confirm-contract.tsx:91
+#: pages/confirm-create-reserve.tsx:291
 #, c-format
-msgid "Confirm Payment"
-msgstr ""
-
-#: popup/popup.tsx:73
-#, c-format
-msgid "Balance"
+msgid "Error: URL is empty"
 msgstr ""
 
-#: popup/popup.tsx:74
+#: pages/confirm-create-reserve.tsx:298
 #, c-format
-msgid "History"
+msgid "Error: URL may not be relative"
 msgstr ""
 
-#: popup/popup.tsx:75
+#: pages/confirm-contract.tsx:116
 #, c-format
-msgid "Debug"
+msgid "You have insufficient funds of the requested currency in your wallet."
 msgstr ""
 
-#: popup/popup.tsx:131
+#: popup/popup.tsx:222
 #, c-format
 msgid "Error: could not retrieve balance information."
 msgstr ""
 
-#: popup/popup.tsx:141
-#, c-format
-msgid "help"
-msgstr ""
-
-#: popup/popup.tsx:144
-#, c-format
-msgid "You have no balance to show. Need some %1$s getting started?"
-msgstr ""
-
-#: popup/popup.tsx:182
-#, c-format
-msgid "Created reserve (%1$s) of %2$s at %3$s"
-msgstr ""
-
-#: popup/popup.tsx:187
+#: popup/popup.tsx:267
 #, c-format
-msgid "Bank confirmed reserve (%1$s) at %2$s"
+msgid "Bank requested reserve (%1$s) for %2$s."
 msgstr ""
 
-#: popup/popup.tsx:191
+#: popup/popup.tsx:278
 #, c-format
-msgid "Withdraw at %1$s"
+msgid "Started to withdraw %1$s from %2$s (%3$s)."
 msgstr ""
 
-#: popup/popup.tsx:194
+#: popup/popup.tsx:288
 #, c-format
-msgid "Wallet depleted reserve (%1$s) at %2$s"
+msgid "Merchant %1$s offered contract %2$s."
 msgstr ""
 
-#: popup/popup.tsx:200
+#: popup/popup.tsx:297
 #, c-format
-msgid "Payment for %1$s to merchant %2$s. "
+msgid "Withdrew %1$s from %2$s (%3$s)."
 msgstr ""
 
-#: popup/popup.tsx:207
+#: popup/popup.tsx:307
 #, c-format
-msgid "Unknown event (%1$s)"
+msgid "Paid %1$s to merchant %2$s.  (%3$s)"
 msgstr ""
 
-#: popup/popup.tsx:246
+#: popup/popup.tsx:345
 #, c-format
 msgid "Error: could not retrieve event history"
 msgstr ""
 
-#: popup/popup.tsx:255
+#: popup/popup.tsx:379
 #, c-format
 msgid "Your wallet has no events recorded."
 msgstr ""
diff --git a/manifest.json b/manifest.json
index 743a4fa7b..65243513c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -10,7 +10,7 @@
   "applications": {
     "gecko": {
       "id": "devs@taler.net",
-      "strict_min_version": "50.*"
+      "strict_min_version": "50"
     }
   },