From 0030ad13496571616501500dfd9df18652869004 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 8 Sep 2020 15:14:43 -0300
Subject: [pos] use bottom sheet for showing errors instead of snackbar

---
 merchant-terminal/src/main/res/values-de/strings.xml | 1 -
 merchant-terminal/src/main/res/values-fr/strings.xml | 1 -
 merchant-terminal/src/main/res/values/strings.xml    | 4 ++--
 3 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'merchant-terminal/src/main/res')

diff --git a/merchant-terminal/src/main/res/values-de/strings.xml b/merchant-terminal/src/main/res/values-de/strings.xml
index 03877cb..22f9450 100644
--- a/merchant-terminal/src/main/res/values-de/strings.xml
+++ b/merchant-terminal/src/main/res/values-de/strings.xml
@@ -40,7 +40,6 @@
     <string name="refund_error_deadline">Die Rückerstattungsfrist ist abgelaufen</string>
     <string name="refund_intro">Bitte scannen Sie den QR-Code, um eine Rückerstattung zu erhalten</string>
     <string name="refund_order_ref">Bestellreferenz: %1$s\n\n%2$s</string>
-    <string name="error_network">Netzwerkfehler</string>
     <string name="toast_back_to_exit">Klicken Sie zum Beenden erneut auf «zurück»</string>
     <string name="app_name">Taler Merchant Kassenterminal</string>
     <string name="config_label">Händlereinstellungen</string>
diff --git a/merchant-terminal/src/main/res/values-fr/strings.xml b/merchant-terminal/src/main/res/values-fr/strings.xml
index bcc2a16..10c7af5 100644
--- a/merchant-terminal/src/main/res/values-fr/strings.xml
+++ b/merchant-terminal/src/main/res/values-fr/strings.xml
@@ -58,6 +58,5 @@
     <string name="refund_order_ref">Référence d\'achat : %1$s
 \n
 \n%2$s</string>
-    <string name="error_network">Erreur réseau</string>
     <string name="toast_back_to_exit">Cliquez à nouveau sur «retour» pour quitter</string>
 </resources>
\ No newline at end of file
diff --git a/merchant-terminal/src/main/res/values/strings.xml b/merchant-terminal/src/main/res/values/strings.xml
index f7a62da..bedc486 100644
--- a/merchant-terminal/src/main/res/values/strings.xml
+++ b/merchant-terminal/src/main/res/values/strings.xml
@@ -64,8 +64,8 @@
     <string name="refund_intro">Please let customer scan QR Code to offer refund</string>
     <string name="refund_order_ref">Purchase reference: %1$s\n\n%2$s</string>
 
-    <string name="error_network">Network error</string>
-    <string name="error_timeout">No payment found, please try again!</string>
+    <string name="error_payment">Error: No payment received</string>
+    <string name="error_timeout">No payment made within payment period, please try again!</string>
     <string name="error_cancelled">Payment cancelled</string>
 
     <string name="toast_back_to_exit">Click «back» again to exit</string>
-- 
cgit v1.2.3