fix i18n build task

9 files changed, 690 insertions, 751 deletions

diff --git a/Makefile b/Makefile
index 6d0bacbbc..f637983eb 100644
--- a/Makefile
+++ b/Makefile
@@ -60,7 +60,12 @@ i18n: yarn-install
 	  msgmerge -o $$pofile $$pofile src/i18n/$(poname).pot; \
 	done;
 	# generate .ts file containing all translations
-	./contrib/po2ts
+	cat src/i18n/strings-prelude > src/i18n/strings.ts
+	@for pofile in src/i18n/*.po; do \
+	  echo appending $$pofile; \
+	  ./contrib/po2ts $$pofile >> src/i18n/strings.ts; \
+	done;
+	./node_modules/.bin/prettier --config .prettierrc --write src/i18n/strings.ts
 
 # Some commands are only available when ./configure has been run
 
diff --git a/contrib/po2ts b/contrib/po2ts
new file mode 100755
index 000000000..4d349663d
--- /dev/null
+++ b/contrib/po2ts
@@ -0,0 +1,42 @@
+#!/usr/bin/env node
+/*
+ This file is part of GNU Taler
+ (C) 2020 Taler Systems S.A.
+
+ GNU 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.
+
+ GNU 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
+ GNU Taler; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
+ */
+
+/**
+ * Convert a <lang>.po file into a JavaScript / TypeScript expression.
+ */
+
+const po2json = require("po2json");
+
+const filename = process.argv[2];
+
+if (!filename) {
+  console.error("error: missing filename");
+  process.exit(1);
+}
+
+const m = filename.match(/([a-zA-Z0-9-_]+).po/);
+
+if (!m) {
+  console.error("error: unexpected filename (expected <lang>.po)");
+  process.exit(1);
+}
+
+const lang = m[1];
+const pojson = po2json.parseFileSync(filename);
+const s =
+  "strings['" + lang + "'] = " + JSON.stringify(pojson, null, "  ") + ";\n";
+console.log(s);
diff --git a/src/i18n/de.po b/src/i18n/de.po
index c8d728e70..bb355403d 100644
--- a/src/i18n/de.po
+++ b/src/i18n/de.po
@@ -27,47 +27,47 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/util/wire.ts:38
+#: src/util/wire.ts:37
 #, c-format
 msgid "Invalid Wire"
 msgstr ""
 
-#: src/util/wire.ts:43 src/util/wire.ts:46
+#: src/util/wire.ts:42 src/util/wire.ts:45
 #, c-format
 msgid "Invalid Test Wire Detail"
 msgstr ""
 
-#: src/util/wire.ts:48
+#: src/util/wire.ts:47
 #, c-format
 msgid "Test Wire Acct #%1$s on %2$s"
 msgstr ""
 
-#: src/util/wire.ts:50
+#: src/util/wire.ts:49
 #, c-format
 msgid "Unknown Wire Detail"
 msgstr ""
 
-#: src/webex/pages/benchmark.tsx:57
+#: src/webex/pages/benchmark.tsx:52
 #, c-format
 msgid "Operation"
 msgstr ""
 
-#: src/webex/pages/benchmark.tsx:58
+#: src/webex/pages/benchmark.tsx:53
 #, c-format
 msgid "time (ms/op)"
 msgstr ""
 
-#: src/webex/pages/pay.tsx:132
+#: src/webex/pages/pay.tsx:130
 #, fuzzy, c-format
 msgid "The merchant %1$s offers you to purchase:"
 msgstr "Der Händler %1$s möchte einen Vertrag über %2$s mit Ihnen abschließen."
 
-#: src/webex/pages/pay.tsx:138
+#: src/webex/pages/pay.tsx:136
 #, c-format
 msgid "The total price is %1$s (plus %2$s fees)."
 msgstr ""
 
-#: src/webex/pages/pay.tsx:143
+#: src/webex/pages/pay.tsx:141
 #, c-format
 msgid "The total price is %1$s."
 msgstr ""
@@ -77,226 +77,214 @@ msgstr ""
 msgid "Retry"
 msgstr ""
 
-#: src/webex/pages/pay.tsx:172
+#: src/webex/pages/pay.tsx:173
 #, fuzzy, c-format
 msgid "Confirm payment"
 msgstr "Bezahlung bestätigen"
 
-#: src/webex/pages/popup.tsx:162
+#: src/webex/pages/popup.tsx:153
 #, c-format
 msgid "Balance"
 msgstr "Saldo"
 
-#: src/webex/pages/popup.tsx:163
+#: src/webex/pages/popup.tsx:154
 #, c-format
 msgid "History"
 msgstr "Verlauf"
 
-#: src/webex/pages/popup.tsx:164
+#: src/webex/pages/popup.tsx:155
 #, c-format
 msgid "Debug"
 msgstr "Debug"
 
-#: src/webex/pages/popup.tsx:198
+#: src/webex/pages/popup.tsx:175
 #, 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?"
 
-#: src/webex/pages/popup.tsx:261
+#: src/webex/pages/popup.tsx:238
 #, c-format
 msgid "%1$s incoming"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:273
+#: src/webex/pages/popup.tsx:250
 #, c-format
 msgid "%1$s being spent"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:304
+#: src/webex/pages/popup.tsx:281
 #, c-format
 msgid "Error: could not retrieve balance information."
 msgstr ""
 
-#: src/webex/pages/popup.tsx:409
+#: src/webex/pages/popup.tsx:390
 #, c-format
 msgid "Invalid "
 msgstr ""
 
-#: src/webex/pages/popup.tsx:415
+#: src/webex/pages/popup.tsx:396
 #, c-format
 msgid "Fees "
 msgstr ""
 
-#: src/webex/pages/popup.tsx:454
+#: src/webex/pages/popup.tsx:434
 #, c-format
 msgid "Refresh sessions has completed"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:471
+#: src/webex/pages/popup.tsx:451
 #, c-format
 msgid "Order Refused"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:485
+#: src/webex/pages/popup.tsx:465
 #, c-format
 msgid "Order redirected"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:502
+#: src/webex/pages/popup.tsx:482
 #, c-format
 msgid "Payment aborted"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:535
+#: src/webex/pages/popup.tsx:512
 #, c-format
 msgid "Payment Sent"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:562
+#: src/webex/pages/popup.tsx:536
 #, c-format
 msgid "Order accepted"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:573
+#: src/webex/pages/popup.tsx:547
 #, c-format
 msgid "Reserve balance updated"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:589
+#: src/webex/pages/popup.tsx:559
 #, c-format
 msgid "Payment refund"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:614
+#: src/webex/pages/popup.tsx:584
 #, fuzzy, c-format
 msgid "Withdrawn"
 msgstr "Abheben bei %1$s"
 
-#: src/webex/pages/popup.tsx:626
+#: src/webex/pages/popup.tsx:596
 #, c-format
 msgid "Tip Accepted"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:636
+#: src/webex/pages/popup.tsx:606
 #, c-format
 msgid "Tip Declined"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:645
+#: src/webex/pages/popup.tsx:615
 #, c-format
 msgid "%1$s"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:703
-#, c-format
-msgid "Error: could not retrieve event history"
-msgstr ""
-
-#: src/webex/pages/popup.tsx:739
+#: src/webex/pages/popup.tsx:707
 #, c-format
 msgid "Your wallet has no events recorded."
 msgstr "Ihre Geldbörse verzeichnet keine Vorkommnisse."
 
-#: src/webex/pages/return-coins.tsx:105
+#: src/webex/pages/return-coins.tsx:124
 #, c-format
 msgid "Wire to bank account"
 msgstr ""
 
-#: src/webex/pages/return-coins.tsx:173
+#: src/webex/pages/return-coins.tsx:206
 #, fuzzy, c-format
 msgid "Confirm"
 msgstr "Bezahlung bestätigen"
 
-#: src/webex/pages/return-coins.tsx:176
+#: src/webex/pages/return-coins.tsx:209
 #, fuzzy, c-format
 msgid "Cancel"
 msgstr "Saldo"
 
-#. #-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#
-#. TODO:generic error reporting function or component.
-#: src/webex/pages/tip.tsx:116 src/webex/pages/withdraw.tsx:215
-#, c-format
-msgid "Fatal error: \"%1$s\"."
-msgstr ""
-
-#: src/webex/pages/withdraw.tsx:72
+#: src/webex/pages/withdraw.tsx:73
 #, c-format
 msgid "Could not get details for withdraw operation:"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:88 src/webex/pages/withdraw.tsx:179
+#: src/webex/pages/withdraw.tsx:89 src/webex/pages/withdraw.tsx:183
 #, c-format
 msgid "Chose different exchange provider"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:108
+#: src/webex/pages/withdraw.tsx:109
 #, c-format
 msgid ""
 "Please select an exchange.  You can review the details before after your "
 "selection."
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:120
+#: src/webex/pages/withdraw.tsx:121
 #, c-format
 msgid "Select %1$s"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:142
+#: src/webex/pages/withdraw.tsx:143
 #, c-format
 msgid "Select custom exchange"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:159
+#: src/webex/pages/withdraw.tsx:163
 #, c-format
 msgid "You are about to withdraw %1$s from your bank account into your wallet."
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:170
+#: src/webex/pages/withdraw.tsx:174
 #, c-format
 msgid "Accept fees and withdraw"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:188
+#: src/webex/pages/withdraw.tsx:192
 #, c-format
 msgid "Cancel withdraw operation"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:238
+#: src/webex/renderHtml.tsx:249
 #, fuzzy, c-format
 msgid "Withdrawal fees:"
 msgstr "Abheben bei"
 
-#: src/webex/renderHtml.tsx:241
+#: src/webex/renderHtml.tsx:252
 #, c-format
 msgid "Rounding loss:"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:243
+#: src/webex/renderHtml.tsx:254
 #, c-format
 msgid "Earliest expiration (for deposit): %1$s"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:250
+#: src/webex/renderHtml.tsx:262
 #, c-format
 msgid "# Coins"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:251
+#: src/webex/renderHtml.tsx:263
 #, c-format
 msgid "Value"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:252
+#: src/webex/renderHtml.tsx:264
 #, fuzzy, c-format
 msgid "Withdraw Fee"
 msgstr "Abheben bei %1$s"
 
-#: src/webex/renderHtml.tsx:253
+#: src/webex/renderHtml.tsx:265
 #, c-format
 msgid "Refresh Fee"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:254
+#: src/webex/renderHtml.tsx:266
 #, c-format
 msgid "Deposit Fee"
 msgstr ""
diff --git a/src/i18n/en-US.po b/src/i18n/en-US.po
index 5b94188e8..4fe38d5e9 100644
--- a/src/i18n/en-US.po
+++ b/src/i18n/en-US.po
@@ -27,47 +27,47 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/util/wire.ts:38
+#: src/util/wire.ts:37
 #, c-format
 msgid "Invalid Wire"
 msgstr ""
 
-#: src/util/wire.ts:43 src/util/wire.ts:46
+#: src/util/wire.ts:42 src/util/wire.ts:45
 #, c-format
 msgid "Invalid Test Wire Detail"
 msgstr ""
 
-#: src/util/wire.ts:48
+#: src/util/wire.ts:47
 #, c-format
 msgid "Test Wire Acct #%1$s on %2$s"
 msgstr ""
 
-#: src/util/wire.ts:50
+#: src/util/wire.ts:49
 #, c-format
 msgid "Unknown Wire Detail"
 msgstr ""
 
-#: src/webex/pages/benchmark.tsx:57
+#: src/webex/pages/benchmark.tsx:52
 #, c-format
 msgid "Operation"
 msgstr ""
 
-#: src/webex/pages/benchmark.tsx:58
+#: src/webex/pages/benchmark.tsx:53
 #, c-format
 msgid "time (ms/op)"
 msgstr ""
 
-#: src/webex/pages/pay.tsx:132
+#: src/webex/pages/pay.tsx:130
 #, c-format
 msgid "The merchant %1$s offers you to purchase:"
 msgstr ""
 
-#: src/webex/pages/pay.tsx:138
+#: src/webex/pages/pay.tsx:136
 #, c-format
 msgid "The total price is %1$s (plus %2$s fees)."
 msgstr ""
 
-#: src/webex/pages/pay.tsx:143
+#: src/webex/pages/pay.tsx:141
 #, c-format
 msgid "The total price is %1$s."
 msgstr ""
@@ -77,226 +77,214 @@ msgstr ""
 msgid "Retry"
 msgstr ""
 
-#: src/webex/pages/pay.tsx:172
+#: src/webex/pages/pay.tsx:173
 #, c-format
 msgid "Confirm payment"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:162
+#: src/webex/pages/popup.tsx:153
 #, c-format
 msgid "Balance"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:163
+#: src/webex/pages/popup.tsx:154
 #, c-format
 msgid "History"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:164
+#: src/webex/pages/popup.tsx:155
 #, c-format
 msgid "Debug"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:198
+#: src/webex/pages/popup.tsx:175
 #, c-format
 msgid "You have no balance to show. Need some %1$s getting started?"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:261
+#: src/webex/pages/popup.tsx:238
 #, c-format
 msgid "%1$s incoming"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:273
+#: src/webex/pages/popup.tsx:250
 #, c-format
 msgid "%1$s being spent"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:304
+#: src/webex/pages/popup.tsx:281
 #, c-format
 msgid "Error: could not retrieve balance information."
 msgstr ""
 
-#: src/webex/pages/popup.tsx:409
+#: src/webex/pages/popup.tsx:390
 #, c-format
 msgid "Invalid "
 msgstr ""
 
-#: src/webex/pages/popup.tsx:415
+#: src/webex/pages/popup.tsx:396
 #, c-format
 msgid "Fees "
 msgstr ""
 
-#: src/webex/pages/popup.tsx:454
+#: src/webex/pages/popup.tsx:434
 #, c-format
 msgid "Refresh sessions has completed"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:471
+#: src/webex/pages/popup.tsx:451
 #, c-format
 msgid "Order Refused"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:485
+#: src/webex/pages/popup.tsx:465
 #, c-format
 msgid "Order redirected"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:502
+#: src/webex/pages/popup.tsx:482
 #, c-format
 msgid "Payment aborted"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:535
+#: src/webex/pages/popup.tsx:512
 #, c-format
 msgid "Payment Sent"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:562
+#: src/webex/pages/popup.tsx:536
 #, c-format
 msgid "Order accepted"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:573
+#: src/webex/pages/popup.tsx:547
 #, c-format
 msgid "Reserve balance updated"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:589
+#: src/webex/pages/popup.tsx:559
 #, c-format
 msgid "Payment refund"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:614
+#: src/webex/pages/popup.tsx:584
 #, c-format
 msgid "Withdrawn"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:626
+#: src/webex/pages/popup.tsx:596
 #, c-format
 msgid "Tip Accepted"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:636
+#: src/webex/pages/popup.tsx:606
 #, c-format
 msgid "Tip Declined"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:645
+#: src/webex/pages/popup.tsx:615
 #, c-format
 msgid "%1$s"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:703
-#, c-format
-msgid "Error: could not retrieve event history"
-msgstr ""
-
-#: src/webex/pages/popup.tsx:739
+#: src/webex/pages/popup.tsx:707
 #, c-format
 msgid "Your wallet has no events recorded."
 msgstr ""
 
-#: src/webex/pages/return-coins.tsx:105
+#: src/webex/pages/return-coins.tsx:124
 #, c-format
 msgid "Wire to bank account"
 msgstr ""
 
-#: src/webex/pages/return-coins.tsx:173
+#: src/webex/pages/return-coins.tsx:206
 #, c-format
 msgid "Confirm"
 msgstr ""
 
-#: src/webex/pages/return-coins.tsx:176
+#: src/webex/pages/return-coins.tsx:209
 #, c-format
 msgid "Cancel"
 msgstr ""
 
-#. #-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#
-#. TODO:generic error reporting function or component.
-#: src/webex/pages/tip.tsx:116 src/webex/pages/withdraw.tsx:215
-#, c-format
-msgid "Fatal error: \"%1$s\"."
-msgstr ""
-
-#: src/webex/pages/withdraw.tsx:72
+#: src/webex/pages/withdraw.tsx:73
 #, c-format
 msgid "Could not get details for withdraw operation:"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:88 src/webex/pages/withdraw.tsx:179
+#: src/webex/pages/withdraw.tsx:89 src/webex/pages/withdraw.tsx:183
 #, c-format
 msgid "Chose different exchange provider"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:108
+#: src/webex/pages/withdraw.tsx:109
 #, c-format
 msgid ""
 "Please select an exchange.  You can review the details before after your "
 "selection."
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:120
+#: src/webex/pages/withdraw.tsx:121
 #, c-format
 msgid "Select %1$s"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:142
+#: src/webex/pages/withdraw.tsx:143
 #, c-format
 msgid "Select custom exchange"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:159
+#: src/webex/pages/withdraw.tsx:163
 #, c-format
 msgid "You are about to withdraw %1$s from your bank account into your wallet."
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:170
+#: src/webex/pages/withdraw.tsx:174
 #, c-format
 msgid "Accept fees and withdraw"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:188
+#: src/webex/pages/withdraw.tsx:192
 #, c-format
 msgid "Cancel withdraw operation"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:238
+#: src/webex/renderHtml.tsx:249
 #, c-format
 msgid "Withdrawal fees:"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:241
+#: src/webex/renderHtml.tsx:252
 #, c-format
 msgid "Rounding loss:"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:243
+#: src/webex/renderHtml.tsx:254
 #, c-format
 msgid "Earliest expiration (for deposit): %1$s"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:250
+#: src/webex/renderHtml.tsx:262
 #, c-format
 msgid "# Coins"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:251
+#: src/webex/renderHtml.tsx:263
 #, c-format
 msgid "Value"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:252
+#: src/webex/renderHtml.tsx:264
 #, c-format
 msgid "Withdraw Fee"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:253
+#: src/webex/renderHtml.tsx:265
 #, c-format
 msgid "Refresh Fee"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:254
+#: src/webex/renderHtml.tsx:266
 #, c-format
 msgid "Deposit Fee"
 msgstr ""
diff --git a/src/i18n/fr.po b/src/i18n/fr.po
index fcc0c7173..67b09de1a 100644
--- a/src/i18n/fr.po
+++ b/src/i18n/fr.po
@@ -27,47 +27,47 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/util/wire.ts:38
+#: src/util/wire.ts:37
 #, c-format
 msgid "Invalid Wire"
 msgstr ""
 
-#: src/util/wire.ts:43 src/util/wire.ts:46
+#: src/util/wire.ts:42 src/util/wire.ts:45
 #, c-format
 msgid "Invalid Test Wire Detail"
 msgstr ""
 
-#: src/util/wire.ts:48
+#: src/util/wire.ts:47
 #, c-format
 msgid "Test Wire Acct #%1$s on %2$s"
 msgstr ""
 
-#: src/util/wire.ts:50
+#: src/util/wire.ts:49
 #, c-format
 msgid "Unknown Wire Detail"
 msgstr ""
 
-#: src/webex/pages/benchmark.tsx:57
+#: src/webex/pages/benchmark.tsx:52
 #, c-format
 msgid "Operation"
 msgstr ""
 
-#: src/webex/pages/benchmark.tsx:58
+#: src/webex/pages/benchmark.tsx:53
 #, c-format
 msgid "time (ms/op)"
 msgstr ""
 
-#: src/webex/pages/pay.tsx:132
+#: src/webex/pages/pay.tsx:130
 #, c-format
 msgid "The merchant %1$s offers you to purchase:"
 msgstr ""
 
-#: src/webex/pages/pay.tsx:138
+#: src/webex/pages/pay.tsx:136
 #, c-format
 msgid "The total price is %1$s (plus %2$s fees)."
 msgstr ""
 
-#: src/webex/pages/pay.tsx:143
+#: src/webex/pages/pay.tsx:141
 #, c-format
 msgid "The total price is %1$s."
 msgstr ""
@@ -77,226 +77,214 @@ msgstr ""
 msgid "Retry"
 msgstr ""
 
-#: src/webex/pages/pay.tsx:172
+#: src/webex/pages/pay.tsx:173
 #, c-format
 msgid "Confirm payment"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:162
+#: src/webex/pages/popup.tsx:153
 #, c-format
 msgid "Balance"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:163
+#: src/webex/pages/popup.tsx:154
 #, c-format
 msgid "History"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:164
+#: src/webex/pages/popup.tsx:155
 #, c-format
 msgid "Debug"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:198
+#: src/webex/pages/popup.tsx:175
 #, c-format
 msgid "You have no balance to show. Need some %1$s getting started?"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:261
+#: src/webex/pages/popup.tsx:238
 #, c-format
 msgid "%1$s incoming"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:273
+#: src/webex/pages/popup.tsx:250
 #, c-format
 msgid "%1$s being spent"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:304
+#: src/webex/pages/popup.tsx:281
 #, c-format
 msgid "Error: could not retrieve balance information."
 msgstr ""
 
-#: src/webex/pages/popup.tsx:409
+#: src/webex/pages/popup.tsx:390
 #, c-format
 msgid "Invalid "
 msgstr ""
 
-#: src/webex/pages/popup.tsx:415
+#: src/webex/pages/popup.tsx:396
 #, c-format
 msgid "Fees "
 msgstr ""
 
-#: src/webex/pages/popup.tsx:454
+#: src/webex/pages/popup.tsx:434
 #, c-format
 msgid "Refresh sessions has completed"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:471
+#: src/webex/pages/popup.tsx:451
 #, c-format
 msgid "Order Refused"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:485
+#: src/webex/pages/popup.tsx:465
 #, c-format
 msgid "Order redirected"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:502
+#: src/webex/pages/popup.tsx:482
 #, c-format
 msgid "Payment aborted"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:535
+#: src/webex/pages/popup.tsx:512
 #, c-format
 msgid "Payment Sent"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:562
+#: src/webex/pages/popup.tsx:536
 #, c-format
 msgid "Order accepted"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:573
+#: src/webex/pages/popup.tsx:547
 #, c-format
 msgid "Reserve balance updated"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:589
+#: src/webex/pages/popup.tsx:559
 #, c-format
 msgid "Payment refund"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:614
+#: src/webex/pages/popup.tsx:584
 #, c-format
 msgid "Withdrawn"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:626
+#: src/webex/pages/popup.tsx:596
 #, c-format
 msgid "Tip Accepted"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:636
+#: src/webex/pages/popup.tsx:606
 #, c-format
 msgid "Tip Declined"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:645
+#: src/webex/pages/popup.tsx:615
 #, c-format
 msgid "%1$s"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:703
-#, c-format
-msgid "Error: could not retrieve event history"
-msgstr ""
-
-#: src/webex/pages/popup.tsx:739
+#: src/webex/pages/popup.tsx:707
 #, c-format
 msgid "Your wallet has no events recorded."
 msgstr ""
 
-#: src/webex/pages/return-coins.tsx:105
+#: src/webex/pages/return-coins.tsx:124
 #, c-format
 msgid "Wire to bank account"
 msgstr ""
 
-#: src/webex/pages/return-coins.tsx:173
+#: src/webex/pages/return-coins.tsx:206
 #, c-format
 msgid "Confirm"
 msgstr ""
 
-#: src/webex/pages/return-coins.tsx:176
+#: src/webex/pages/return-coins.tsx:209
 #, c-format
 msgid "Cancel"
 msgstr ""
 
-#. #-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#
-#. TODO:generic error reporting function or component.
-#: src/webex/pages/tip.tsx:116 src/webex/pages/withdraw.tsx:215
-#, c-format
-msgid "Fatal error: \"%1$s\"."
-msgstr ""
-
-#: src/webex/pages/withdraw.tsx:72
+#: src/webex/pages/withdraw.tsx:73
 #, c-format
 msgid "Could not get details for withdraw operation:"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:88 src/webex/pages/withdraw.tsx:179
+#: src/webex/pages/withdraw.tsx:89 src/webex/pages/withdraw.tsx:183
 #, c-format
 msgid "Chose different exchange provider"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:108
+#: src/webex/pages/withdraw.tsx:109
 #, c-format
 msgid ""
 "Please select an exchange.  You can review the details before after your "
 "selection."
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:120
+#: src/webex/pages/withdraw.tsx:121
 #, c-format
 msgid "Select %1$s"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:142
+#: src/webex/pages/withdraw.tsx:143
 #, c-format
 msgid "Select custom exchange"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:159
+#: src/webex/pages/withdraw.tsx:163
 #, c-format
 msgid "You are about to withdraw %1$s from your bank account into your wallet."
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:170
+#: src/webex/pages/withdraw.tsx:174
 #, c-format
 msgid "Accept fees and withdraw"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:188
+#: src/webex/pages/withdraw.tsx:192
 #, c-format
 msgid "Cancel withdraw operation"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:238
+#: src/webex/renderHtml.tsx:249
 #, c-format
 msgid "Withdrawal fees:"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:241
+#: src/webex/renderHtml.tsx:252
 #, c-format
 msgid "Rounding loss:"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:243
+#: src/webex/renderHtml.tsx:254
 #, c-format
 msgid "Earliest expiration (for deposit): %1$s"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:250
+#: src/webex/renderHtml.tsx:262
 #, c-format
 msgid "# Coins"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:251
+#: src/webex/renderHtml.tsx:263
 #, c-format
 msgid "Value"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:252
+#: src/webex/renderHtml.tsx:264
 #, c-format
 msgid "Withdraw Fee"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:253
+#: src/webex/renderHtml.tsx:265
 #, c-format
 msgid "Refresh Fee"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:254
+#: src/webex/renderHtml.tsx:266
 #, c-format
 msgid "Deposit Fee"
 msgstr ""
diff --git a/src/i18n/it.po b/src/i18n/it.po
index fcc0c7173..67b09de1a 100644
--- a/src/i18n/it.po
+++ b/src/i18n/it.po
@@ -27,47 +27,47 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/util/wire.ts:38
+#: src/util/wire.ts:37
 #, c-format
 msgid "Invalid Wire"
 msgstr ""
 
-#: src/util/wire.ts:43 src/util/wire.ts:46
+#: src/util/wire.ts:42 src/util/wire.ts:45
 #, c-format
 msgid "Invalid Test Wire Detail"
 msgstr ""
 
-#: src/util/wire.ts:48
+#: src/util/wire.ts:47
 #, c-format
 msgid "Test Wire Acct #%1$s on %2$s"
 msgstr ""
 
-#: src/util/wire.ts:50
+#: src/util/wire.ts:49
 #, c-format
 msgid "Unknown Wire Detail"
 msgstr ""
 
-#: src/webex/pages/benchmark.tsx:57
+#: src/webex/pages/benchmark.tsx:52
 #, c-format
 msgid "Operation"
 msgstr ""
 
-#: src/webex/pages/benchmark.tsx:58
+#: src/webex/pages/benchmark.tsx:53
 #, c-format
 msgid "time (ms/op)"
 msgstr ""
 
-#: src/webex/pages/pay.tsx:132
+#: src/webex/pages/pay.tsx:130
 #, c-format
 msgid "The merchant %1$s offers you to purchase:"
 msgstr ""
 
-#: src/webex/pages/pay.tsx:138
+#: src/webex/pages/pay.tsx:136
 #, c-format
 msgid "The total price is %1$s (plus %2$s fees)."
 msgstr ""
 
-#: src/webex/pages/pay.tsx:143
+#: src/webex/pages/pay.tsx:141
 #, c-format
 msgid "The total price is %1$s."
 msgstr ""
@@ -77,226 +77,214 @@ msgstr ""
 msgid "Retry"
 msgstr ""
 
-#: src/webex/pages/pay.tsx:172
+#: src/webex/pages/pay.tsx:173
 #, c-format
 msgid "Confirm payment"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:162
+#: src/webex/pages/popup.tsx:153
 #, c-format
 msgid "Balance"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:163
+#: src/webex/pages/popup.tsx:154
 #, c-format
 msgid "History"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:164
+#: src/webex/pages/popup.tsx:155
 #, c-format
 msgid "Debug"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:198
+#: src/webex/pages/popup.tsx:175
 #, c-format
 msgid "You have no balance to show. Need some %1$s getting started?"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:261
+#: src/webex/pages/popup.tsx:238
 #, c-format
 msgid "%1$s incoming"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:273
+#: src/webex/pages/popup.tsx:250
 #, c-format
 msgid "%1$s being spent"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:304
+#: src/webex/pages/popup.tsx:281
 #, c-format
 msgid "Error: could not retrieve balance information."
 msgstr ""
 
-#: src/webex/pages/popup.tsx:409
+#: src/webex/pages/popup.tsx:390
 #, c-format
 msgid "Invalid "
 msgstr ""
 
-#: src/webex/pages/popup.tsx:415
+#: src/webex/pages/popup.tsx:396
 #, c-format
 msgid "Fees "
 msgstr ""
 
-#: src/webex/pages/popup.tsx:454
+#: src/webex/pages/popup.tsx:434
 #, c-format
 msgid "Refresh sessions has completed"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:471
+#: src/webex/pages/popup.tsx:451
 #, c-format
 msgid "Order Refused"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:485
+#: src/webex/pages/popup.tsx:465
 #, c-format
 msgid "Order redirected"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:502
+#: src/webex/pages/popup.tsx:482
 #, c-format
 msgid "Payment aborted"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:535
+#: src/webex/pages/popup.tsx:512
 #, c-format
 msgid "Payment Sent"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:562
+#: src/webex/pages/popup.tsx:536
 #, c-format
 msgid "Order accepted"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:573
+#: src/webex/pages/popup.tsx:547
 #, c-format
 msgid "Reserve balance updated"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:589
+#: src/webex/pages/popup.tsx:559
 #, c-format
 msgid "Payment refund"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:614
+#: src/webex/pages/popup.tsx:584
 #, c-format
 msgid "Withdrawn"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:626
+#: src/webex/pages/popup.tsx:596
 #, c-format
 msgid "Tip Accepted"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:636
+#: src/webex/pages/popup.tsx:606
 #, c-format
 msgid "Tip Declined"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:645
+#: src/webex/pages/popup.tsx:615
 #, c-format
 msgid "%1$s"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:703
-#, c-format
-msgid "Error: could not retrieve event history"
-msgstr ""
-
-#: src/webex/pages/popup.tsx:739
+#: src/webex/pages/popup.tsx:707
 #, c-format
 msgid "Your wallet has no events recorded."
 msgstr ""
 
-#: src/webex/pages/return-coins.tsx:105
+#: src/webex/pages/return-coins.tsx:124
 #, c-format
 msgid "Wire to bank account"
 msgstr ""
 
-#: src/webex/pages/return-coins.tsx:173
+#: src/webex/pages/return-coins.tsx:206
 #, c-format
 msgid "Confirm"
 msgstr ""
 
-#: src/webex/pages/return-coins.tsx:176
+#: src/webex/pages/return-coins.tsx:209
 #, c-format
 msgid "Cancel"
 msgstr ""
 
-#. #-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#
-#. TODO:generic error reporting function or component.
-#: src/webex/pages/tip.tsx:116 src/webex/pages/withdraw.tsx:215
-#, c-format
-msgid "Fatal error: \"%1$s\"."
-msgstr ""
-
-#: src/webex/pages/withdraw.tsx:72
+#: src/webex/pages/withdraw.tsx:73
 #, c-format
 msgid "Could not get details for withdraw operation:"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:88 src/webex/pages/withdraw.tsx:179
+#: src/webex/pages/withdraw.tsx:89 src/webex/pages/withdraw.tsx:183
 #, c-format
 msgid "Chose different exchange provider"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:108
+#: src/webex/pages/withdraw.tsx:109
 #, c-format
 msgid ""
 "Please select an exchange.  You can review the details before after your "
 "selection."
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:120
+#: src/webex/pages/withdraw.tsx:121
 #, c-format
 msgid "Select %1$s"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:142
+#: src/webex/pages/withdraw.tsx:143
 #, c-format
 msgid "Select custom exchange"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:159
+#: src/webex/pages/withdraw.tsx:163
 #, c-format
 msgid "You are about to withdraw %1$s from your bank account into your wallet."
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:170
+#: src/webex/pages/withdraw.tsx:174
 #, c-format
 msgid "Accept fees and withdraw"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:188
+#: src/webex/pages/withdraw.tsx:192
 #, c-format
 msgid "Cancel withdraw operation"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:238
+#: src/webex/renderHtml.tsx:249
 #, c-format
 msgid "Withdrawal fees:"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:241
+#: src/webex/renderHtml.tsx:252
 #, c-format
 msgid "Rounding loss:"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:243
+#: src/webex/renderHtml.tsx:254
 #, c-format
 msgid "Earliest expiration (for deposit): %1$s"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:250
+#: src/webex/renderHtml.tsx:262
 #, c-format
 msgid "# Coins"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:251
+#: src/webex/renderHtml.tsx:263
 #, c-format
 msgid "Value"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:252
+#: src/webex/renderHtml.tsx:264
 #, c-format
 msgid "Withdraw Fee"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:253
+#: src/webex/renderHtml.tsx:265
 #, c-format
 msgid "Refresh Fee"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:254
+#: src/webex/renderHtml.tsx:266
 #, c-format
 msgid "Deposit Fee"
 msgstr ""
diff --git a/src/i18n/strings.ts b/src/i18n/strings.ts
index 06fb7a896..6d9161f24 100644
--- a/src/i18n/strings.ts
+++ b/src/i18n/strings.ts
@@ -16,389 +16,353 @@
 
 export const strings: { [s: string]: any } = {};
 strings["de"] = {
-  domain: "messages",
-  locale_data: {
-    messages: {
-      "": {
-        domain: "messages",
-        plural_forms: "nplurals=2; plural=(n != 1);",
-        lang: "",
-      },
-      "Invalid Wire": [null, ""],
-      "Invalid Test Wire Detail": [null, ""],
-      "Test Wire Acct #%1$s on %2$s": [null, ""],
-      "Unknown Wire Detail": [null, ""],
-      Operation: [null, ""],
-      "time (ms/op)": [null, ""],
-      "The merchant %1$s offers you to purchase:": [
-        null,
-        "Der Händler %1$s möchte einen Vertrag über %2$s mit Ihnen abschließen.",
-      ],
-      "The total price is %1$s (plus %2$s fees).": [null, ""],
-      "The total price is %1$s.": [null, ""],
-      Retry: [null, ""],
-      "Confirm payment": [null, "Bezahlung bestätigen"],
-      Balance: [null, "Saldo"],
-      History: [null, "Verlauf"],
-      Debug: [null, "Debug"],
-      "You have no balance to show. Need some %1$s getting started?": [
-        null,
-        "Sie haben kein Digitalgeld. Wollen Sie %1$s? abheben?",
-      ],
-      "%1$s incoming": [null, ""],
-      "%1$s being spent": [null, ""],
-      "Error: could not retrieve balance information.": [null, ""],
-      "Invalid ": [null, ""],
-      "Fees ": [null, ""],
-      "Refresh sessions has completed": [null, ""],
-      "Order Refused": [null, ""],
-      "Order redirected": [null, ""],
-      "Payment aborted": [null, ""],
-      "Payment Sent": [null, ""],
-      "Order accepted": [null, ""],
-      "Reserve balance updated": [null, ""],
-      "Payment refund": [null, ""],
-      Withdrawn: [null, "Abheben bei %1$s"],
-      "Tip Accepted": [null, ""],
-      "Tip Declined": [null, ""],
-      "%1$s": [null, ""],
-      "Error: could not retrieve event history": [null, ""],
-      "Your wallet has no events recorded.": [
-        null,
-        "Ihre Geldbörse verzeichnet keine Vorkommnisse.",
-      ],
-      "Wire to bank account": [null, ""],
-      Confirm: [null, "Bezahlung bestätigen"],
-      Cancel: [null, "Saldo"],
-      'Fatal error: "%1$s".': [null, ""],
-      "Could not get details for withdraw operation:": [null, ""],
-      "Chose different exchange provider": [null, ""],
-      "Please select an exchange.  You can review the details before after your selection.": [
-        null,
-        "",
-      ],
-      "Select %1$s": [null, ""],
-      "Select custom exchange": [null, ""],
-      "You are about to withdraw %1$s from your bank account into your wallet.": [
-        null,
-        "",
-      ],
-      "Accept fees and withdraw": [null, ""],
-      "Cancel withdraw operation": [null, ""],
-      "Withdrawal fees:": [null, "Abheben bei"],
-      "Rounding loss:": [null, ""],
-      "Earliest expiration (for deposit): %1$s": [null, ""],
-      "# Coins": [null, ""],
-      Value: [null, ""],
-      "Withdraw Fee": [null, "Abheben bei %1$s"],
-      "Refresh Fee": [null, ""],
-      "Deposit Fee": [null, ""],
-    },
+  "Invalid Wire": [null, ""],
+  "Invalid Test Wire Detail": [null, ""],
+  "Test Wire Acct #%1$s on %2$s": [null, ""],
+  "Unknown Wire Detail": [null, ""],
+  Operation: [null, ""],
+  "time (ms/op)": [null, ""],
+  "The total price is %1$s (plus %2$s fees).": [null, ""],
+  "The total price is %1$s.": [null, ""],
+  Retry: [null, ""],
+  Balance: [null, "Saldo"],
+  History: [null, "Verlauf"],
+  Debug: [null, "Debug"],
+  "%1$s incoming": [null, ""],
+  "%1$s being spent": [null, ""],
+  "Error: could not retrieve balance information.": [null, ""],
+  "Invalid ": [null, ""],
+  "Fees ": [null, ""],
+  "Refresh sessions has completed": [null, ""],
+  "Order Refused": [null, ""],
+  "Order redirected": [null, ""],
+  "Payment aborted": [null, ""],
+  "Payment Sent": [null, ""],
+  "Order accepted": [null, ""],
+  "Reserve balance updated": [null, ""],
+  "Payment refund": [null, ""],
+  "Tip Accepted": [null, ""],
+  "Tip Declined": [null, ""],
+  "%1$s": [null, ""],
+  "Your wallet has no events recorded.": [
+    null,
+    "Ihre Geldbörse verzeichnet keine Vorkommnisse.",
+  ],
+  "Wire to bank account": [null, ""],
+  "Could not get details for withdraw operation:": [null, ""],
+  "Chose different exchange provider": [null, ""],
+  "Please select an exchange.  You can review the details before after your selection.": [
+    null,
+    "",
+  ],
+  "Select %1$s": [null, ""],
+  "Select custom exchange": [null, ""],
+  "You are about to withdraw %1$s from your bank account into your wallet.": [
+    null,
+    "",
+  ],
+  "Accept fees and withdraw": [null, ""],
+  "Cancel withdraw operation": [null, ""],
+  "Rounding loss:": [null, ""],
+  "Earliest expiration (for deposit): %1$s": [null, ""],
+  "# Coins": [null, ""],
+  Value: [null, ""],
+  "Refresh Fee": [null, ""],
+  "Deposit Fee": [null, ""],
+  "": {
+    "project-id-version": "Taler Wallet",
+    "report-msgid-bugs-to": "",
+    "pot-creation-date": "2016-11-23 00:00+0100",
+    "po-revision-date": "YEAR-MO-DA HO:MI+ZONE",
+    "last-translator": "FULL NAME <EMAIL@ADDRESS>",
+    "language-team": "LANGUAGE <LL@li.org>",
+    language: "",
+    "mime-version": "1.0",
+    "content-type": "text/plain; charset=UTF-8",
+    "content-transfer-encoding": "8bit",
+    "plural-forms": "nplurals=2; plural=(n != 1);",
   },
 };
+
 strings["en-US"] = {
-  domain: "messages",
-  locale_data: {
-    messages: {
-      "": {
-        domain: "messages",
-        plural_forms: "nplurals=2; plural=(n != 1);",
-        lang: "",
-      },
-      "Invalid Wire": [null, ""],
-      "Invalid Test Wire Detail": [null, ""],
-      "Test Wire Acct #%1$s on %2$s": [null, ""],
-      "Unknown Wire Detail": [null, ""],
-      Operation: [null, ""],
-      "time (ms/op)": [null, ""],
-      "The merchant %1$s offers you to purchase:": [null, ""],
-      "The total price is %1$s (plus %2$s fees).": [null, ""],
-      "The total price is %1$s.": [null, ""],
-      Retry: [null, ""],
-      "Confirm payment": [null, ""],
-      Balance: [null, ""],
-      History: [null, ""],
-      Debug: [null, ""],
-      "You have no balance to show. Need some %1$s getting started?": [
-        null,
-        "",
-      ],
-      "%1$s incoming": [null, ""],
-      "%1$s being spent": [null, ""],
-      "Error: could not retrieve balance information.": [null, ""],
-      "Invalid ": [null, ""],
-      "Fees ": [null, ""],
-      "Refresh sessions has completed": [null, ""],
-      "Order Refused": [null, ""],
-      "Order redirected": [null, ""],
-      "Payment aborted": [null, ""],
-      "Payment Sent": [null, ""],
-      "Order accepted": [null, ""],
-      "Reserve balance updated": [null, ""],
-      "Payment refund": [null, ""],
-      Withdrawn: [null, ""],
-      "Tip Accepted": [null, ""],
-      "Tip Declined": [null, ""],
-      "%1$s": [null, ""],
-      "Error: could not retrieve event history": [null, ""],
-      "Your wallet has no events recorded.": [null, ""],
-      "Wire to bank account": [null, ""],
-      Confirm: [null, ""],
-      Cancel: [null, ""],
-      'Fatal error: "%1$s".': [null, ""],
-      "Could not get details for withdraw operation:": [null, ""],
-      "Chose different exchange provider": [null, ""],
-      "Please select an exchange.  You can review the details before after your selection.": [
-        null,
-        "",
-      ],
-      "Select %1$s": [null, ""],
-      "Select custom exchange": [null, ""],
-      "You are about to withdraw %1$s from your bank account into your wallet.": [
-        null,
-        "",
-      ],
-      "Accept fees and withdraw": [null, ""],
-      "Cancel withdraw operation": [null, ""],
-      "Withdrawal fees:": [null, ""],
-      "Rounding loss:": [null, ""],
-      "Earliest expiration (for deposit): %1$s": [null, ""],
-      "# Coins": [null, ""],
-      Value: [null, ""],
-      "Withdraw Fee": [null, ""],
-      "Refresh Fee": [null, ""],
-      "Deposit Fee": [null, ""],
-    },
+  "Invalid Wire": [null, ""],
+  "Invalid Test Wire Detail": [null, ""],
+  "Test Wire Acct #%1$s on %2$s": [null, ""],
+  "Unknown Wire Detail": [null, ""],
+  Operation: [null, ""],
+  "time (ms/op)": [null, ""],
+  "The merchant %1$s offers you to purchase:": [null, ""],
+  "The total price is %1$s (plus %2$s fees).": [null, ""],
+  "The total price is %1$s.": [null, ""],
+  Retry: [null, ""],
+  "Confirm payment": [null, ""],
+  Balance: [null, ""],
+  History: [null, ""],
+  Debug: [null, ""],
+  "You have no balance to show. Need some %1$s getting started?": [null, ""],
+  "%1$s incoming": [null, ""],
+  "%1$s being spent": [null, ""],
+  "Error: could not retrieve balance information.": [null, ""],
+  "Invalid ": [null, ""],
+  "Fees ": [null, ""],
+  "Refresh sessions has completed": [null, ""],
+  "Order Refused": [null, ""],
+  "Order redirected": [null, ""],
+  "Payment aborted": [null, ""],
+  "Payment Sent": [null, ""],
+  "Order accepted": [null, ""],
+  "Reserve balance updated": [null, ""],
+  "Payment refund": [null, ""],
+  Withdrawn: [null, ""],
+  "Tip Accepted": [null, ""],
+  "Tip Declined": [null, ""],
+  "%1$s": [null, ""],
+  "Your wallet has no events recorded.": [null, ""],
+  "Wire to bank account": [null, ""],
+  Confirm: [null, ""],
+  Cancel: [null, ""],
+  "Could not get details for withdraw operation:": [null, ""],
+  "Chose different exchange provider": [null, ""],
+  "Please select an exchange.  You can review the details before after your selection.": [
+    null,
+    "",
+  ],
+  "Select %1$s": [null, ""],
+  "Select custom exchange": [null, ""],
+  "You are about to withdraw %1$s from your bank account into your wallet.": [
+    null,
+    "",
+  ],
+  "Accept fees and withdraw": [null, ""],
+  "Cancel withdraw operation": [null, ""],
+  "Withdrawal fees:": [null, ""],
+  "Rounding loss:": [null, ""],
+  "Earliest expiration (for deposit): %1$s": [null, ""],
+  "# Coins": [null, ""],
+  Value: [null, ""],
+  "Withdraw Fee": [null, ""],
+  "Refresh Fee": [null, ""],
+  "Deposit Fee": [null, ""],
+  "": {
+    "project-id-version": "Taler Wallet",
+    "report-msgid-bugs-to": "",
+    "pot-creation-date": "2016-11-23 00:00+0100",
+    "po-revision-date": "YEAR-MO-DA HO:MI+ZONE",
+    "last-translator": "FULL NAME <EMAIL@ADDRESS>",
+    "language-team": "LANGUAGE <LL@li.org>",
+    language: "",
+    "mime-version": "1.0",
+    "content-type": "text/plain; charset=UTF-8",
+    "content-transfer-encoding": "8bit",
+    "plural-forms": "nplurals=2; plural=(n != 1);",
   },
 };
+
 strings["fr"] = {
-  domain: "messages",
-  locale_data: {
-    messages: {
-      "": {
-        domain: "messages",
-        plural_forms: "nplurals=2; plural=(n != 1);",
-        lang: "",
-      },
-      "Invalid Wire": [null, ""],
-      "Invalid Test Wire Detail": [null, ""],
-      "Test Wire Acct #%1$s on %2$s": [null, ""],
-      "Unknown Wire Detail": [null, ""],
-      Operation: [null, ""],
-      "time (ms/op)": [null, ""],
-      "The merchant %1$s offers you to purchase:": [null, ""],
-      "The total price is %1$s (plus %2$s fees).": [null, ""],
-      "The total price is %1$s.": [null, ""],
-      Retry: [null, ""],
-      "Confirm payment": [null, ""],
-      Balance: [null, ""],
-      History: [null, ""],
-      Debug: [null, ""],
-      "You have no balance to show. Need some %1$s getting started?": [
-        null,
-        "",
-      ],
-      "%1$s incoming": [null, ""],
-      "%1$s being spent": [null, ""],
-      "Error: could not retrieve balance information.": [null, ""],
-      "Invalid ": [null, ""],
-      "Fees ": [null, ""],
-      "Refresh sessions has completed": [null, ""],
-      "Order Refused": [null, ""],
-      "Order redirected": [null, ""],
-      "Payment aborted": [null, ""],
-      "Payment Sent": [null, ""],
-      "Order accepted": [null, ""],
-      "Reserve balance updated": [null, ""],
-      "Payment refund": [null, ""],
-      Withdrawn: [null, ""],
-      "Tip Accepted": [null, ""],
-      "Tip Declined": [null, ""],
-      "%1$s": [null, ""],
-      "Error: could not retrieve event history": [null, ""],
-      "Your wallet has no events recorded.": [null, ""],
-      "Wire to bank account": [null, ""],
-      Confirm: [null, ""],
-      Cancel: [null, ""],
-      'Fatal error: "%1$s".': [null, ""],
-      "Could not get details for withdraw operation:": [null, ""],
-      "Chose different exchange provider": [null, ""],
-      "Please select an exchange.  You can review the details before after your selection.": [
-        null,
-        "",
-      ],
-      "Select %1$s": [null, ""],
-      "Select custom exchange": [null, ""],
-      "You are about to withdraw %1$s from your bank account into your wallet.": [
-        null,
-        "",
-      ],
-      "Accept fees and withdraw": [null, ""],
-      "Cancel withdraw operation": [null, ""],
-      "Withdrawal fees:": [null, ""],
-      "Rounding loss:": [null, ""],
-      "Earliest expiration (for deposit): %1$s": [null, ""],
-      "# Coins": [null, ""],
-      Value: [null, ""],
-      "Withdraw Fee": [null, ""],
-      "Refresh Fee": [null, ""],
-      "Deposit Fee": [null, ""],
-    },
+  "Invalid Wire": [null, ""],
+  "Invalid Test Wire Detail": [null, ""],
+  "Test Wire Acct #%1$s on %2$s": [null, ""],
+  "Unknown Wire Detail": [null, ""],
+  Operation: [null, ""],
+  "time (ms/op)": [null, ""],
+  "The merchant %1$s offers you to purchase:": [null, ""],
+  "The total price is %1$s (plus %2$s fees).": [null, ""],
+  "The total price is %1$s.": [null, ""],
+  Retry: [null, ""],
+  "Confirm payment": [null, ""],
+  Balance: [null, ""],
+  History: [null, ""],
+  Debug: [null, ""],
+  "You have no balance to show. Need some %1$s getting started?": [null, ""],
+  "%1$s incoming": [null, ""],
+  "%1$s being spent": [null, ""],
+  "Error: could not retrieve balance information.": [null, ""],
+  "Invalid ": [null, ""],
+  "Fees ": [null, ""],
+  "Refresh sessions has completed": [null, ""],
+  "Order Refused": [null, ""],
+  "Order redirected": [null, ""],
+  "Payment aborted": [null, ""],
+  "Payment Sent": [null, ""],
+  "Order accepted": [null, ""],
+  "Reserve balance updated": [null, ""],
+  "Payment refund": [null, ""],
+  Withdrawn: [null, ""],
+  "Tip Accepted": [null, ""],
+  "Tip Declined": [null, ""],
+  "%1$s": [null, ""],
+  "Your wallet has no events recorded.": [null, ""],
+  "Wire to bank account": [null, ""],
+  Confirm: [null, ""],
+  Cancel: [null, ""],
+  "Could not get details for withdraw operation:": [null, ""],
+  "Chose different exchange provider": [null, ""],
+  "Please select an exchange.  You can review the details before after your selection.": [
+    null,
+    "",
+  ],
+  "Select %1$s": [null, ""],
+  "Select custom exchange": [null, ""],
+  "You are about to withdraw %1$s from your bank account into your wallet.": [
+    null,
+    "",
+  ],
+  "Accept fees and withdraw": [null, ""],
+  "Cancel withdraw operation": [null, ""],
+  "Withdrawal fees:": [null, ""],
+  "Rounding loss:": [null, ""],
+  "Earliest expiration (for deposit): %1$s": [null, ""],
+  "# Coins": [null, ""],
+  Value: [null, ""],
+  "Withdraw Fee": [null, ""],
+  "Refresh Fee": [null, ""],
+  "Deposit Fee": [null, ""],
+  "": {
+    "project-id-version": "Taler Wallet",
+    "report-msgid-bugs-to": "",
+    "pot-creation-date": "2016-11-23 00:00+0100",
+    "po-revision-date": "YEAR-MO-DA HO:MI+ZONE",
+    "last-translator": "FULL NAME <EMAIL@ADDRESS>",
+    "language-team": "LANGUAGE <LL@li.org>",
+    language: "",
+    "mime-version": "1.0",
+    "content-type": "text/plain; charset=UTF-8",
+    "content-transfer-encoding": "8bit",
+    "plural-forms": "nplurals=2; plural=(n != 1);",
   },
 };
+
 strings["it"] = {
-  domain: "messages",
-  locale_data: {
-    messages: {
-      "": {
-        domain: "messages",
-        plural_forms: "nplurals=2; plural=(n != 1);",
-        lang: "",
-      },
-      "Invalid Wire": [null, ""],
-      "Invalid Test Wire Detail": [null, ""],
-      "Test Wire Acct #%1$s on %2$s": [null, ""],
-      "Unknown Wire Detail": [null, ""],
-      Operation: [null, ""],
-      "time (ms/op)": [null, ""],
-      "The merchant %1$s offers you to purchase:": [null, ""],
-      "The total price is %1$s (plus %2$s fees).": [null, ""],
-      "The total price is %1$s.": [null, ""],
-      Retry: [null, ""],
-      "Confirm payment": [null, ""],
-      Balance: [null, ""],
-      History: [null, ""],
-      Debug: [null, ""],
-      "You have no balance to show. Need some %1$s getting started?": [
-        null,
-        "",
-      ],
-      "%1$s incoming": [null, ""],
-      "%1$s being spent": [null, ""],
-      "Error: could not retrieve balance information.": [null, ""],
-      "Invalid ": [null, ""],
-      "Fees ": [null, ""],
-      "Refresh sessions has completed": [null, ""],
-      "Order Refused": [null, ""],
-      "Order redirected": [null, ""],
-      "Payment aborted": [null, ""],
-      "Payment Sent": [null, ""],
-      "Order accepted": [null, ""],
-      "Reserve balance updated": [null, ""],
-      "Payment refund": [null, ""],
-      Withdrawn: [null, ""],
-      "Tip Accepted": [null, ""],
-      "Tip Declined": [null, ""],
-      "%1$s": [null, ""],
-      "Error: could not retrieve event history": [null, ""],
-      "Your wallet has no events recorded.": [null, ""],
-      "Wire to bank account": [null, ""],
-      Confirm: [null, ""],
-      Cancel: [null, ""],
-      'Fatal error: "%1$s".': [null, ""],
-      "Could not get details for withdraw operation:": [null, ""],
-      "Chose different exchange provider": [null, ""],
-      "Please select an exchange.  You can review the details before after your selection.": [
-        null,
-        "",
-      ],
-      "Select %1$s": [null, ""],
-      "Select custom exchange": [null, ""],
-      "You are about to withdraw %1$s from your bank account into your wallet.": [
-        null,
-        "",
-      ],
-      "Accept fees and withdraw": [null, ""],
-      "Cancel withdraw operation": [null, ""],
-      "Withdrawal fees:": [null, ""],
-      "Rounding loss:": [null, ""],
-      "Earliest expiration (for deposit): %1$s": [null, ""],
-      "# Coins": [null, ""],
-      Value: [null, ""],
-      "Withdraw Fee": [null, ""],
-      "Refresh Fee": [null, ""],
-      "Deposit Fee": [null, ""],
-    },
+  "Invalid Wire": [null, ""],
+  "Invalid Test Wire Detail": [null, ""],
+  "Test Wire Acct #%1$s on %2$s": [null, ""],
+  "Unknown Wire Detail": [null, ""],
+  Operation: [null, ""],
+  "time (ms/op)": [null, ""],
+  "The merchant %1$s offers you to purchase:": [null, ""],
+  "The total price is %1$s (plus %2$s fees).": [null, ""],
+  "The total price is %1$s.": [null, ""],
+  Retry: [null, ""],
+  "Confirm payment": [null, ""],
+  Balance: [null, ""],
+  History: [null, ""],
+  Debug: [null, ""],
+  "You have no balance to show. Need some %1$s getting started?": [null, ""],
+  "%1$s incoming": [null, ""],
+  "%1$s being spent": [null, ""],
+  "Error: could not retrieve balance information.": [null, ""],
+  "Invalid ": [null, ""],
+  "Fees ": [null, ""],
+  "Refresh sessions has completed": [null, ""],
+  "Order Refused": [null, ""],
+  "Order redirected": [null, ""],
+  "Payment aborted": [null, ""],
+  "Payment Sent": [null, ""],
+  "Order accepted": [null, ""],
+  "Reserve balance updated": [null, ""],
+  "Payment refund": [null, ""],
+  Withdrawn: [null, ""],
+  "Tip Accepted": [null, ""],
+  "Tip Declined": [null, ""],
+  "%1$s": [null, ""],
+  "Your wallet has no events recorded.": [null, ""],
+  "Wire to bank account": [null, ""],
+  Confirm: [null, ""],
+  Cancel: [null, ""],
+  "Could not get details for withdraw operation:": [null, ""],
+  "Chose different exchange provider": [null, ""],
+  "Please select an exchange.  You can review the details before after your selection.": [
+    null,
+    "",
+  ],
+  "Select %1$s": [null, ""],
+  "Select custom exchange": [null, ""],
+  "You are about to withdraw %1$s from your bank account into your wallet.": [
+    null,
+    "",
+  ],
+  "Accept fees and withdraw": [null, ""],
+  "Cancel withdraw operation": [null, ""],
+  "Withdrawal fees:": [null, ""],
+  "Rounding loss:": [null, ""],
+  "Earliest expiration (for deposit): %1$s": [null, ""],
+  "# Coins": [null, ""],
+  Value: [null, ""],
+  "Withdraw Fee": [null, ""],
+  "Refresh Fee": [null, ""],
+  "Deposit Fee": [null, ""],
+  "": {
+    "project-id-version": "Taler Wallet",
+    "report-msgid-bugs-to": "",
+    "pot-creation-date": "2016-11-23 00:00+0100",
+    "po-revision-date": "YEAR-MO-DA HO:MI+ZONE",
+    "last-translator": "FULL NAME <EMAIL@ADDRESS>",
+    "language-team": "LANGUAGE <LL@li.org>",
+    language: "",
+    "mime-version": "1.0",
+    "content-type": "text/plain; charset=UTF-8",
+    "content-transfer-encoding": "8bit",
+    "plural-forms": "nplurals=2; plural=(n != 1);",
   },
 };
+
 strings["sv"] = {
-  domain: "messages",
-  locale_data: {
-    messages: {
-      "": {
-        domain: "messages",
-        plural_forms: "nplurals=2; plural=(n != 1);",
-        lang: "",
-      },
-      "Invalid Wire": [null, ""],
-      "Invalid Test Wire Detail": [null, ""],
-      "Test Wire Acct #%1$s on %2$s": [null, ""],
-      "Unknown Wire Detail": [null, "visa mer"],
-      Operation: [null, ""],
-      "time (ms/op)": [null, ""],
-      "The merchant %1$s offers you to purchase:": [
-        null,
-        "Säljaren %1$s erbjuder följande:",
-      ],
-      "The total price is %1$s (plus %2$s fees).": [
-        null,
-        "Det totala priset är %1$s (plus %2$s avgifter).\n",
-      ],
-      "The total price is %1$s.": [null, "Det totala priset är %1$s."],
-      Retry: [null, ""],
-      "Confirm payment": [null, "Godkän betalning"],
-      Balance: [null, "Balans"],
-      History: [null, "Historia"],
-      Debug: [null, ""],
-      "You have no balance to show. Need some %1$s getting started?": [
-        null,
-        "Du har ingen balans att visa. Behöver du\n %1$s att börja?\n",
-      ],
-      "%1$s incoming": [null, "%1$s inkommande"],
-      "%1$s being spent": [null, ""],
-      "Error: could not retrieve balance information.": [null, ""],
-      "Invalid ": [null, ""],
-      "Fees ": [null, ""],
-      "Refresh sessions has completed": [null, ""],
-      "Order Refused": [null, ""],
-      "Order redirected": [null, ""],
-      "Payment aborted": [null, ""],
-      "Payment Sent": [null, ""],
-      "Order accepted": [null, ""],
-      "Reserve balance updated": [null, ""],
-      "Payment refund": [null, ""],
-      Withdrawn: [null, "Utbetalnings avgift"],
-      "Tip Accepted": [null, ""],
-      "Tip Declined": [null, ""],
-      "%1$s": [null, ""],
-      "Error: could not retrieve event history": [null, ""],
-      "Your wallet has no events recorded.": [null, "plånboken"],
-      "Wire to bank account": [null, "Övervisa till bank konto"],
-      Confirm: [null, "Bekräfta"],
-      Cancel: [null, "Avbryt"],
-      'Fatal error: "%1$s".': [null, ""],
-      "Could not get details for withdraw operation:": [null, ""],
-      "Chose different exchange provider": [null, "Ändra tjänsteleverantörer"],
-      "Please select an exchange.  You can review the details before after your selection.": [
-        null,
-        "",
-      ],
-      "Select %1$s": [null, "Välj %1$s"],
-      "Select custom exchange": [null, ""],
-      "You are about to withdraw %1$s from your bank account into your wallet.": [
-        null,
-        "Du är på väg att ta ut\n %1$s från ditt bankkonto till din plånbok.\n",
-      ],
-      "Accept fees and withdraw": [null, "Acceptera avgifter och utbetala"],
-      "Cancel withdraw operation": [null, ""],
-      "Withdrawal fees:": [null, "Utbetalnings avgifter:"],
-      "Rounding loss:": [null, ""],
-      "Earliest expiration (for deposit): %1$s": [null, ""],
-      "# Coins": [null, "# Mynt"],
-      Value: [null, "Värde"],
-      "Withdraw Fee": [null, "Utbetalnings avgift"],
-      "Refresh Fee": [null, "Återhämtnings avgift"],
-      "Deposit Fee": [null, "Depostitions avgift"],
-    },
+  "Invalid Wire": [null, ""],
+  "Invalid Test Wire Detail": [null, ""],
+  "Test Wire Acct #%1$s on %2$s": [null, ""],
+  Operation: [null, ""],
+  "time (ms/op)": [null, ""],
+  Retry: [null, ""],
+  "Confirm payment": [null, "Godkän betalning"],
+  Balance: [null, "Balans"],
+  History: [null, "Historia"],
+  Debug: [null, ""],
+  "%1$s being spent": [null, ""],
+  "Error: could not retrieve balance information.": [null, ""],
+  "Invalid ": [null, ""],
+  "Fees ": [null, ""],
+  "Refresh sessions has completed": [null, ""],
+  "Order Refused": [null, ""],
+  "Order redirected": [null, ""],
+  "Payment aborted": [null, ""],
+  "Payment Sent": [null, ""],
+  "Order accepted": [null, ""],
+  "Reserve balance updated": [null, ""],
+  "Payment refund": [null, ""],
+  "Tip Accepted": [null, ""],
+  "Tip Declined": [null, ""],
+  "%1$s": [null, ""],
+  "Your wallet has no events recorded.": [null, "plånboken"],
+  "Wire to bank account": [null, "Övervisa till bank konto"],
+  Confirm: [null, "Bekräfta"],
+  Cancel: [null, "Avbryt"],
+  "Could not get details for withdraw operation:": [null, ""],
+  "Please select an exchange.  You can review the details before after your selection.": [
+    null,
+    "",
+  ],
+  "Select custom exchange": [null, ""],
+  "Accept fees and withdraw": [null, "Acceptera avgifter och utbetala"],
+  "Cancel withdraw operation": [null, ""],
+  "Withdrawal fees:": [null, "Utbetalnings avgifter:"],
+  "Rounding loss:": [null, ""],
+  "Earliest expiration (for deposit): %1$s": [null, ""],
+  "# Coins": [null, "# Mynt"],
+  Value: [null, "Värde"],
+  "Withdraw Fee": [null, "Utbetalnings avgift"],
+  "Refresh Fee": [null, "Återhämtnings avgift"],
+  "Deposit Fee": [null, "Depostitions avgift"],
+  "": {
+    "project-id-version": "Taler Wallet",
+    "report-msgid-bugs-to": "",
+    "pot-creation-date": "2016-11-23 00:00+0100",
+    "po-revision-date": "YEAR-MO-DA HO:MI+ZONE",
+    "last-translator": "Flo Reitz <EMAIL@ADDRESS>",
+    "language-team": "LANGUAGE <LL@li.org>",
+    language: "",
+    "mime-version": "1.0",
+    "content-type": "text/plain; charset=UTF-8",
+    "content-transfer-encoding": "8bit",
+    "plural-forms": "nplurals=2; plural=(n != 1);",
   },
 };
diff --git a/src/i18n/sv.po b/src/i18n/sv.po
index 956ae8964..c6a739789 100644
--- a/src/i18n/sv.po
+++ b/src/i18n/sv.po
@@ -27,47 +27,47 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/util/wire.ts:38
+#: src/util/wire.ts:37
 #, c-format
 msgid "Invalid Wire"
 msgstr ""
 
-#: src/util/wire.ts:43 src/util/wire.ts:46
+#: src/util/wire.ts:42 src/util/wire.ts:45
 #, c-format
 msgid "Invalid Test Wire Detail"
 msgstr ""
 
-#: src/util/wire.ts:48
+#: src/util/wire.ts:47
 #, c-format
 msgid "Test Wire Acct #%1$s on %2$s"
 msgstr ""
 
-#: src/util/wire.ts:50
+#: src/util/wire.ts:49
 #, fuzzy, c-format
 msgid "Unknown Wire Detail"
 msgstr "visa mer"
 
-#: src/webex/pages/benchmark.tsx:57
+#: src/webex/pages/benchmark.tsx:52
 #, c-format
 msgid "Operation"
 msgstr ""
 
-#: src/webex/pages/benchmark.tsx:58
+#: src/webex/pages/benchmark.tsx:53
 #, c-format
 msgid "time (ms/op)"
 msgstr ""
 
-#: src/webex/pages/pay.tsx:132
+#: src/webex/pages/pay.tsx:130
 #, fuzzy, c-format
 msgid "The merchant %1$s offers you to purchase:"
 msgstr "Säljaren %1$s erbjuder följande:"
 
-#: src/webex/pages/pay.tsx:138
+#: src/webex/pages/pay.tsx:136
 #, fuzzy, c-format
 msgid "The total price is %1$s (plus %2$s fees)."
 msgstr "Det totala priset är %1$s (plus %2$s avgifter).\n"
 
-#: src/webex/pages/pay.tsx:143
+#: src/webex/pages/pay.tsx:141
 #, fuzzy, c-format
 msgid "The total price is %1$s."
 msgstr "Det totala priset är %1$s."
@@ -77,230 +77,218 @@ msgstr "Det totala priset är %1$s."
 msgid "Retry"
 msgstr ""
 
-#: src/webex/pages/pay.tsx:172
+#: src/webex/pages/pay.tsx:173
 #, c-format
 msgid "Confirm payment"
 msgstr "Godkän betalning"
 
-#: src/webex/pages/popup.tsx:162
+#: src/webex/pages/popup.tsx:153
 #, c-format
 msgid "Balance"
 msgstr "Balans"
 
-#: src/webex/pages/popup.tsx:163
+#: src/webex/pages/popup.tsx:154
 #, c-format
 msgid "History"
 msgstr "Historia"
 
-#: src/webex/pages/popup.tsx:164
+#: src/webex/pages/popup.tsx:155
 #, c-format
 msgid "Debug"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:198
+#: src/webex/pages/popup.tsx:175
 #, fuzzy, c-format
 msgid "You have no balance to show. Need some %1$s getting started?"
 msgstr ""
 "Du har ingen balans att visa. Behöver du\n"
 " %1$s att börja?\n"
 
-#: src/webex/pages/popup.tsx:261
+#: src/webex/pages/popup.tsx:238
 #, fuzzy, c-format
 msgid "%1$s incoming"
 msgstr "%1$s inkommande"
 
-#: src/webex/pages/popup.tsx:273
+#: src/webex/pages/popup.tsx:250
 #, c-format
 msgid "%1$s being spent"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:304
+#: src/webex/pages/popup.tsx:281
 #, c-format
 msgid "Error: could not retrieve balance information."
 msgstr ""
 
-#: src/webex/pages/popup.tsx:409
+#: src/webex/pages/popup.tsx:390
 #, c-format
 msgid "Invalid "
 msgstr ""
 
-#: src/webex/pages/popup.tsx:415
+#: src/webex/pages/popup.tsx:396
 #, c-format
 msgid "Fees "
 msgstr ""
 
-#: src/webex/pages/popup.tsx:454
+#: src/webex/pages/popup.tsx:434
 #, c-format
 msgid "Refresh sessions has completed"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:471
+#: src/webex/pages/popup.tsx:451
 #, c-format
 msgid "Order Refused"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:485
+#: src/webex/pages/popup.tsx:465
 #, c-format
 msgid "Order redirected"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:502
+#: src/webex/pages/popup.tsx:482
 #, c-format
 msgid "Payment aborted"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:535
+#: src/webex/pages/popup.tsx:512
 #, c-format
 msgid "Payment Sent"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:562
+#: src/webex/pages/popup.tsx:536
 #, c-format
 msgid "Order accepted"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:573
+#: src/webex/pages/popup.tsx:547
 #, c-format
 msgid "Reserve balance updated"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:589
+#: src/webex/pages/popup.tsx:559
 #, c-format
 msgid "Payment refund"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:614
+#: src/webex/pages/popup.tsx:584
 #, fuzzy, c-format
 msgid "Withdrawn"
 msgstr "Utbetalnings avgift"
 
-#: src/webex/pages/popup.tsx:626
+#: src/webex/pages/popup.tsx:596
 #, c-format
 msgid "Tip Accepted"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:636
+#: src/webex/pages/popup.tsx:606
 #, c-format
 msgid "Tip Declined"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:645
+#: src/webex/pages/popup.tsx:615
 #, c-format
 msgid "%1$s"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:703
-#, c-format
-msgid "Error: could not retrieve event history"
-msgstr ""
-
-#: src/webex/pages/popup.tsx:739
+#: src/webex/pages/popup.tsx:707
 #, c-format
 msgid "Your wallet has no events recorded."
 msgstr "plånboken"
 
-#: src/webex/pages/return-coins.tsx:105
+#: src/webex/pages/return-coins.tsx:124
 #, c-format
 msgid "Wire to bank account"
 msgstr "Övervisa till bank konto"
 
-#: src/webex/pages/return-coins.tsx:173
+#: src/webex/pages/return-coins.tsx:206
 #, c-format
 msgid "Confirm"
 msgstr "Bekräfta"
 
-#: src/webex/pages/return-coins.tsx:176
+#: src/webex/pages/return-coins.tsx:209
 #, c-format
 msgid "Cancel"
 msgstr "Avbryt"
 
-#. #-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#
-#. TODO:generic error reporting function or component.
-#: src/webex/pages/tip.tsx:116 src/webex/pages/withdraw.tsx:215
-#, c-format
-msgid "Fatal error: \"%1$s\"."
-msgstr ""
-
-#: src/webex/pages/withdraw.tsx:72
+#: src/webex/pages/withdraw.tsx:73
 #, c-format
 msgid "Could not get details for withdraw operation:"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:88 src/webex/pages/withdraw.tsx:179
+#: src/webex/pages/withdraw.tsx:89 src/webex/pages/withdraw.tsx:183
 #, fuzzy, c-format
 msgid "Chose different exchange provider"
 msgstr "Ändra tjänsteleverantörer"
 
-#: src/webex/pages/withdraw.tsx:108
+#: src/webex/pages/withdraw.tsx:109
 #, c-format
 msgid ""
 "Please select an exchange.  You can review the details before after your "
 "selection."
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:120
+#: src/webex/pages/withdraw.tsx:121
 #, fuzzy, c-format
 msgid "Select %1$s"
 msgstr "Välj %1$s"
 
-#: src/webex/pages/withdraw.tsx:142
+#: src/webex/pages/withdraw.tsx:143
 #, c-format
 msgid "Select custom exchange"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:159
+#: src/webex/pages/withdraw.tsx:163
 #, fuzzy, c-format
 msgid "You are about to withdraw %1$s from your bank account into your wallet."
 msgstr ""
 "Du är på väg att ta ut\n"
 " %1$s från ditt bankkonto till din plånbok.\n"
 
-#: src/webex/pages/withdraw.tsx:170
+#: src/webex/pages/withdraw.tsx:174
 #, c-format
 msgid "Accept fees and withdraw"
 msgstr "Acceptera avgifter och utbetala"
 
-#: src/webex/pages/withdraw.tsx:188
+#: src/webex/pages/withdraw.tsx:192
 #, c-format
 msgid "Cancel withdraw operation"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:238
+#: src/webex/renderHtml.tsx:249
 #, c-format
 msgid "Withdrawal fees:"
 msgstr "Utbetalnings avgifter:"
 
-#: src/webex/renderHtml.tsx:241
+#: src/webex/renderHtml.tsx:252
 #, c-format
 msgid "Rounding loss:"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:243
+#: src/webex/renderHtml.tsx:254
 #, c-format
 msgid "Earliest expiration (for deposit): %1$s"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:250
+#: src/webex/renderHtml.tsx:262
 #, c-format
 msgid "# Coins"
 msgstr "# Mynt"
 
-#: src/webex/renderHtml.tsx:251
+#: src/webex/renderHtml.tsx:263
 #, c-format
 msgid "Value"
 msgstr "Värde"
 
-#: src/webex/renderHtml.tsx:252
+#: src/webex/renderHtml.tsx:264
 #, c-format
 msgid "Withdraw Fee"
 msgstr "Utbetalnings avgift"
 
-#: src/webex/renderHtml.tsx:253
+#: src/webex/renderHtml.tsx:265
 #, c-format
 msgid "Refresh Fee"
 msgstr "Återhämtnings avgift"
 
-#: src/webex/renderHtml.tsx:254
+#: src/webex/renderHtml.tsx:266
 #, c-format
 msgid "Deposit Fee"
 msgstr "Depostitions avgift"
diff --git a/src/i18n/taler-wallet-webex.pot b/src/i18n/taler-wallet-webex.pot
index fcc0c7173..67b09de1a 100644
--- a/src/i18n/taler-wallet-webex.pot
+++ b/src/i18n/taler-wallet-webex.pot
@@ -27,47 +27,47 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/util/wire.ts:38
+#: src/util/wire.ts:37
 #, c-format
 msgid "Invalid Wire"
 msgstr ""
 
-#: src/util/wire.ts:43 src/util/wire.ts:46
+#: src/util/wire.ts:42 src/util/wire.ts:45
 #, c-format
 msgid "Invalid Test Wire Detail"
 msgstr ""
 
-#: src/util/wire.ts:48
+#: src/util/wire.ts:47
 #, c-format
 msgid "Test Wire Acct #%1$s on %2$s"
 msgstr ""
 
-#: src/util/wire.ts:50
+#: src/util/wire.ts:49
 #, c-format
 msgid "Unknown Wire Detail"
 msgstr ""
 
-#: src/webex/pages/benchmark.tsx:57
+#: src/webex/pages/benchmark.tsx:52
 #, c-format
 msgid "Operation"
 msgstr ""
 
-#: src/webex/pages/benchmark.tsx:58
+#: src/webex/pages/benchmark.tsx:53
 #, c-format
 msgid "time (ms/op)"
 msgstr ""
 
-#: src/webex/pages/pay.tsx:132
+#: src/webex/pages/pay.tsx:130
 #, c-format
 msgid "The merchant %1$s offers you to purchase:"
 msgstr ""
 
-#: src/webex/pages/pay.tsx:138
+#: src/webex/pages/pay.tsx:136
 #, c-format
 msgid "The total price is %1$s (plus %2$s fees)."
 msgstr ""
 
-#: src/webex/pages/pay.tsx:143
+#: src/webex/pages/pay.tsx:141
 #, c-format
 msgid "The total price is %1$s."
 msgstr ""
@@ -77,226 +77,214 @@ msgstr ""
 msgid "Retry"
 msgstr ""
 
-#: src/webex/pages/pay.tsx:172
+#: src/webex/pages/pay.tsx:173
 #, c-format
 msgid "Confirm payment"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:162
+#: src/webex/pages/popup.tsx:153
 #, c-format
 msgid "Balance"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:163
+#: src/webex/pages/popup.tsx:154
 #, c-format
 msgid "History"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:164
+#: src/webex/pages/popup.tsx:155
 #, c-format
 msgid "Debug"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:198
+#: src/webex/pages/popup.tsx:175
 #, c-format
 msgid "You have no balance to show. Need some %1$s getting started?"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:261
+#: src/webex/pages/popup.tsx:238
 #, c-format
 msgid "%1$s incoming"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:273
+#: src/webex/pages/popup.tsx:250
 #, c-format
 msgid "%1$s being spent"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:304
+#: src/webex/pages/popup.tsx:281
 #, c-format
 msgid "Error: could not retrieve balance information."
 msgstr ""
 
-#: src/webex/pages/popup.tsx:409
+#: src/webex/pages/popup.tsx:390
 #, c-format
 msgid "Invalid "
 msgstr ""
 
-#: src/webex/pages/popup.tsx:415
+#: src/webex/pages/popup.tsx:396
 #, c-format
 msgid "Fees "
 msgstr ""
 
-#: src/webex/pages/popup.tsx:454
+#: src/webex/pages/popup.tsx:434
 #, c-format
 msgid "Refresh sessions has completed"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:471
+#: src/webex/pages/popup.tsx:451
 #, c-format
 msgid "Order Refused"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:485
+#: src/webex/pages/popup.tsx:465
 #, c-format
 msgid "Order redirected"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:502
+#: src/webex/pages/popup.tsx:482
 #, c-format
 msgid "Payment aborted"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:535
+#: src/webex/pages/popup.tsx:512
 #, c-format
 msgid "Payment Sent"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:562
+#: src/webex/pages/popup.tsx:536
 #, c-format
 msgid "Order accepted"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:573
+#: src/webex/pages/popup.tsx:547
 #, c-format
 msgid "Reserve balance updated"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:589
+#: src/webex/pages/popup.tsx:559
 #, c-format
 msgid "Payment refund"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:614
+#: src/webex/pages/popup.tsx:584
 #, c-format
 msgid "Withdrawn"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:626
+#: src/webex/pages/popup.tsx:596
 #, c-format
 msgid "Tip Accepted"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:636
+#: src/webex/pages/popup.tsx:606
 #, c-format
 msgid "Tip Declined"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:645
+#: src/webex/pages/popup.tsx:615
 #, c-format
 msgid "%1$s"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:703
-#, c-format
-msgid "Error: could not retrieve event history"
-msgstr ""
-
-#: src/webex/pages/popup.tsx:739
+#: src/webex/pages/popup.tsx:707
 #, c-format
 msgid "Your wallet has no events recorded."
 msgstr ""
 
-#: src/webex/pages/return-coins.tsx:105
+#: src/webex/pages/return-coins.tsx:124
 #, c-format
 msgid "Wire to bank account"
 msgstr ""
 
-#: src/webex/pages/return-coins.tsx:173
+#: src/webex/pages/return-coins.tsx:206
 #, c-format
 msgid "Confirm"
 msgstr ""
 
-#: src/webex/pages/return-coins.tsx:176
+#: src/webex/pages/return-coins.tsx:209
 #, c-format
 msgid "Cancel"
 msgstr ""
 
-#. #-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#
-#. TODO:generic error reporting function or component.
-#: src/webex/pages/tip.tsx:116 src/webex/pages/withdraw.tsx:215
-#, c-format
-msgid "Fatal error: \"%1$s\"."
-msgstr ""
-
-#: src/webex/pages/withdraw.tsx:72
+#: src/webex/pages/withdraw.tsx:73
 #, c-format
 msgid "Could not get details for withdraw operation:"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:88 src/webex/pages/withdraw.tsx:179
+#: src/webex/pages/withdraw.tsx:89 src/webex/pages/withdraw.tsx:183
 #, c-format
 msgid "Chose different exchange provider"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:108
+#: src/webex/pages/withdraw.tsx:109
 #, c-format
 msgid ""
 "Please select an exchange.  You can review the details before after your "
 "selection."
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:120
+#: src/webex/pages/withdraw.tsx:121
 #, c-format
 msgid "Select %1$s"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:142
+#: src/webex/pages/withdraw.tsx:143
 #, c-format
 msgid "Select custom exchange"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:159
+#: src/webex/pages/withdraw.tsx:163
 #, c-format
 msgid "You are about to withdraw %1$s from your bank account into your wallet."
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:170
+#: src/webex/pages/withdraw.tsx:174
 #, c-format
 msgid "Accept fees and withdraw"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:188
+#: src/webex/pages/withdraw.tsx:192
 #, c-format
 msgid "Cancel withdraw operation"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:238
+#: src/webex/renderHtml.tsx:249
 #, c-format
 msgid "Withdrawal fees:"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:241
+#: src/webex/renderHtml.tsx:252
 #, c-format
 msgid "Rounding loss:"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:243
+#: src/webex/renderHtml.tsx:254
 #, c-format
 msgid "Earliest expiration (for deposit): %1$s"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:250
+#: src/webex/renderHtml.tsx:262
 #, c-format
 msgid "# Coins"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:251
+#: src/webex/renderHtml.tsx:263
 #, c-format
 msgid "Value"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:252
+#: src/webex/renderHtml.tsx:264
 #, c-format
 msgid "Withdraw Fee"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:253
+#: src/webex/renderHtml.tsx:265
 #, c-format
 msgid "Refresh Fee"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:254
+#: src/webex/renderHtml.tsx:266
 #, c-format
 msgid "Deposit Fee"
 msgstr ""