diff options
Diffstat (limited to 'merchant-terminal/src/main/res')
10 files changed, 401 insertions, 69 deletions
diff --git a/merchant-terminal/src/main/res/drawable/ic_dialpad.xml b/merchant-terminal/src/main/res/drawable/ic_dialpad.xml new file mode 100644 index 0000000..33ba1d9 --- /dev/null +++ b/merchant-terminal/src/main/res/drawable/ic_dialpad.xml @@ -0,0 +1,25 @@ +<!-- + ~ This file is part of GNU Taler + ~ (C) 2023 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/> + --> + +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + <path + android:fillColor="@android:color/white" + android:pathData="M12,19c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM6,1c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM6,7c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM6,13c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,5c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,13c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,13c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,7c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,7c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,1c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z" /> +</vector> diff --git a/merchant-terminal/src/main/res/layout/fragment_custom_dialog.xml b/merchant-terminal/src/main/res/layout/fragment_custom_dialog.xml new file mode 100644 index 0000000..8da50ad --- /dev/null +++ b/merchant-terminal/src/main/res/layout/fragment_custom_dialog.xml @@ -0,0 +1,117 @@ +<?xml version="1.0" encoding="utf-8"?><!-- + ~ This file is part of GNU Taler + ~ (C) 2023 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/> + --> + +<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <TextView + android:id="@+id/titleView" + style="@style/TextAppearance.Material3.TitleMedium" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:layout_marginTop="16dp" + android:layout_marginEnd="16dp" + android:text="@string/order_custom" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <com.google.android.material.textfield.TextInputLayout + android:id="@+id/productNameLayout" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:layout_marginTop="16dp" + android:layout_marginEnd="16dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/titleView"> + + <com.google.android.material.textfield.TextInputEditText + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:hint="@string/order_custom_product" + android:inputType="textShortMessage" + android:singleLine="true" + android:text="@string/order_custom_product_default" /> + </com.google.android.material.textfield.TextInputLayout> + + <com.google.android.material.textfield.TextInputLayout + android:id="@+id/amountLayout" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:layout_marginTop="16dp" + android:layout_marginEnd="8dp" + android:minEms="5" + app:layout_constraintEnd_toStartOf="@+id/currencyView" + app:layout_constraintHorizontal_bias="1.0" + app:layout_constraintHorizontal_chainStyle="packed" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/productNameLayout"> + + <com.google.android.material.textfield.TextInputEditText + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:hint="@string/refund_amount" + android:inputType="numberDecimal"> + + <requestFocus /> + </com.google.android.material.textfield.TextInputEditText> + </com.google.android.material.textfield.TextInputLayout> + + <TextView + android:id="@+id/currencyView" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginEnd="16dp" + app:layout_constraintBottom_toBottomOf="@+id/amountLayout" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.5" + app:layout_constraintStart_toEndOf="@+id/amountLayout" + app:layout_constraintTop_toTopOf="@+id/amountLayout" + tools:text="TESTKUDOS" /> + + <Button + android:id="@+id/addButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:layout_marginEnd="16dp" + android:layout_marginBottom="16dp" + android:text="@string/order_custom_add_button" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toBottomOf="@+id/amountLayout" + app:layout_constraintVertical_bias="0.0" /> + + <Button + android:id="@+id/cancelButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:layout_marginTop="16dp" + android:layout_marginEnd="16dp" + android:text="@android:string/cancel" + app:layout_constraintEnd_toStartOf="@+id/addButton" + app:layout_constraintHorizontal_bias="1.0" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/amountLayout" /> +</androidx.constraintlayout.widget.ConstraintLayout> diff --git a/merchant-terminal/src/main/res/layout/fragment_order.xml b/merchant-terminal/src/main/res/layout/fragment_order.xml index dc49db1..dd2edc5 100644 --- a/merchant-terminal/src/main/res/layout/fragment_order.xml +++ b/merchant-terminal/src/main/res/layout/fragment_order.xml @@ -25,7 +25,7 @@ android:layout_width="0dp" android:layout_height="0dp" android:layout_marginBottom="8dp" - app:layout_constraintBottom_toTopOf="@+id/restartButton" + app:layout_constraintBottom_toTopOf="@+id/buttonBar" app:layout_constraintEnd_toStartOf="@+id/guideline1" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" @@ -44,7 +44,7 @@ android:layout_width="0dp" android:layout_height="0dp" android:layout_marginBottom="8dp" - app:layout_constraintBottom_toTopOf="@+id/restartButton" + app:layout_constraintBottom_toTopOf="@+id/buttonBar" app:layout_constraintEnd_toStartOf="@+id/guideline2" app:layout_constraintStart_toStartOf="@+id/guideline1" app:layout_constraintTop_toTopOf="parent" @@ -63,75 +63,102 @@ android:layout_width="0dp" android:layout_height="0dp" android:layout_marginBottom="8dp" - app:layout_constraintBottom_toTopOf="@+id/restartButton" + app:layout_constraintBottom_toTopOf="@+id/buttonBar" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="@+id/guideline2" app:layout_constraintTop_toTopOf="parent" tools:layout="@layout/fragment_categories" /> - <Button - android:id="@+id/restartButton" - android:layout_width="wrap_content" + <HorizontalScrollView + android:id="@+id/buttonBar" + android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginStart="8dp" - android:backgroundTint="@color/button_bottom" - android:text="@string/order_restart" + android:scrollbars="horizontal" + android:fadeScrollbars="false" + app:layout_constraintStart_toStartOf="parent" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toStartOf="parent" /> + app:layout_constraintEnd_toStartOf="@id/completeButton"> - <Button - android:id="@+id/plusButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:minWidth="48dp" - android:text="+1" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toEndOf="@+id/minusButton" - tools:ignore="HardcodedText" /> + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="horizontal"> - <Button - android:id="@+id/minusButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="32dp" - android:minWidth="48dp" - android:text="-1" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toEndOf="@+id/restartButton" - tools:ignore="HardcodedText" /> + <Button + android:id="@+id/restartButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="8dp" + android:backgroundTint="@color/button_bottom" + android:text="@string/order_restart" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" /> - <Button - android:id="@+id/prevButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="32dp" - android:backgroundTint="@color/button_bottom" - android:text="@string/order_previous" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toEndOf="@+id/plusButton" /> + <Button + android:id="@+id/plusButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:minWidth="48dp" + android:text="+1" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toEndOf="@+id/minusButton" + tools:ignore="HardcodedText" /> - <Button - android:id="@+id/nextButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:backgroundTint="@color/button_bottom" - android:text="@string/order_next" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toEndOf="@+id/prevButton" /> + <Button + android:id="@+id/minusButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="8dp" + android:minWidth="48dp" + android:text="-1" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toEndOf="@+id/restartButton" + tools:ignore="HardcodedText" /> + + <Button + android:id="@+id/prevButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:backgroundTint="@color/button_bottom" + android:text="@string/order_previous" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toEndOf="@+id/plusButton" /> + + <Button + android:id="@+id/nextButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="8dp" + android:backgroundTint="@color/button_bottom" + android:text="@string/order_next" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toEndOf="@+id/prevButton" /> + + <ImageButton + android:id="@+id/customButton" + android:layout_width="48dp" + android:layout_height="48dp" + android:layout_marginStart="16dp" + android:layout_marginEnd="8dp" + android:backgroundTint="?colorPrimary" + app:srcCompat="@drawable/ic_dialpad" + android:contentDescription="@string/order_custom" /> + + </LinearLayout> + + </HorizontalScrollView> <Button android:id="@+id/completeButton" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="32dp" android:layout_marginEnd="8dp" - android:backgroundTint="@color/button_bottom" + android:backgroundTint="@color/green" android:text="@string/order_complete" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="1.0" - app:layout_constraintStart_toEndOf="@+id/nextButton" /> + app:layout_constraintHorizontal_bias="1.0" /> </androidx.constraintlayout.widget.ConstraintLayout> diff --git a/merchant-terminal/src/main/res/values-de/strings.xml b/merchant-terminal/src/main/res/values-de/strings.xml index 6d7730a..5936a52 100644 --- a/merchant-terminal/src/main/res/values-de/strings.xml +++ b/merchant-terminal/src/main/res/values-de/strings.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="app_name_short">Kassenterminal</string> + <string name="app_name_short">Merchant Terminal</string> <string name="project_name">GNU Taler</string> <string name="menu_order">Bestellungen</string> <string name="menu_history">Verlauf</string> @@ -18,37 +18,39 @@ <string name="config_error_network">Fehler: Es konnte keine Verbindung zum Konfigurationsserver hergestellt werden</string> <string name="config_error_category">Fehler: Keine gültige Produktkategorie gefunden</string> <string name="config_error_currency">Fehler: Produkt %1$s hat die Währung %2$s, aber %3$s wird erwartet</string> - <string name="config_error_product_category_id">Fehler: Produkt %1$s verweist auf unbekannte Kategorie ID %2$d</string> + <string name="config_error_product_category_id">Fehler: Produkt %1$s verweist auf unbekannte Kategorie %2$d</string> <string name="config_error_product_zero">Fehler: Keine gültigen Produkte gefunden</string> <string name="config_fetching">Konfiguration wird abgerufen…</string> <string name="config_save_password">Passwort merken</string> <string name="config_forget_password">Vergessen</string> <string name="config_fetching_label">Konfiguration wird abgerufen</string> - <string name="payment_intro_nfc">Bitte zum Bezahlen den QR-Code scannen oder per NFC empfangen</string> - <string name="payment_intro">Bitte scannen Sie den QR-Code um zu bezahlen</string> + <string name="payment_intro_nfc">Bitte zum Bezahlen den QR-Code scannen oder per NFC empfangen.</string> + <string name="payment_intro">Bitte lassen Sie zum Bezahlen den QR-Code scannen.</string> <string name="payment_cancel">Bezahlvorgang abbrechen</string> <string name="payment_received">Zahlung erhalten</string> <string name="payment_back_button">Weiter</string> <string name="payment_process_label">Kundenzahlung erforderlich</string> <string name="payment_canceled">Die Zahlung wurde abgebrochen</string> - <string name="history_label">Zahlungsverlauf</string> + <string name="history_label">Bisher getätigte Zahlungen</string> <string name="refund_amount">Betrag</string> <string name="refund_reason">Rückerstattungsgrund</string> <string name="refund_abort">Abbrechen</string> - <string name="refund_confirm">Rückerstattung geben</string> + <string name="refund_confirm">Rückerstattung bestätigen</string> <string name="refund_error_zero">Der Betrag muss positiv sein</string> <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="toast_back_to_exit">Klicken Sie zum Beenden erneut auf «zurück»</string> - <string name="app_name">Taler Merchant Kassenterminal</string> + <string name="refund_intro">Zur Rückerstattung lassen Sie bitte den QR-Code einscannen</string> + <string name="refund_order_ref">Referenznummer des Kaufs: %1$s +\n +\n%2$s</string> + <string name="toast_back_to_exit">Klicken Sie zum Beenden erneut auf «Zurück»</string> + <string name="app_name">GNU Taler Point-of-Sale</string> <string name="config_label">Händlereinstellungen</string> <string name="config_username">Benutzername</string> <string name="config_password">Passwort</string> - <string name="config_error_malformed">Fehler: Die JSON Konfiguration ist fehlerhaft</string> + <string name="config_error_malformed">Fehler: Die JSON-Konfiguration ist fehlerhaft</string> <string name="config_error_unknown">Fehler: Ungültige Konfiguration</string> <string name="config_docs">Informationen zum Konfigurationsformat finden Sie in <a href="https://docs.taler.net/taler-merchant-pos-terminal.html#apis-and-data-formats">der Dokumentation</a>.</string> - <string name="refund_error_max_amount">Größer als die Zahlung der Bestellung von %s</string> + <string name="refund_error_max_amount">Größer als Bestellmenge von %s</string> <string name="refund_error_backend">Fehler bei der Verarbeitung der Rückerstattung</string> <string name="refund_intro_nfc">Bitte scannen Sie den QR-Code oder verwenden Sie NFC, um eine Rückerstattung zu erhalten</string> <string name="config_changed">Neuer Händler für %s aktiviert</string> @@ -57,9 +59,10 @@ <string name="refund_error_invalid_amount">Ungültiger Betrag</string> <string name="refund_error_already_refunded">Bereits erstattet</string> <string name="payment_order_id">Beleg #%s</string> - <string name="history_unpaid">Unbezahlt</string> - <string name="error_cancelled">Zahlvorgang abgebrochen</string> + <string name="history_unpaid">Noch nicht bezahlt</string> + <string name="error_cancelled">Bezahlvorgang abgebrochen</string> <string name="error_payment">Fehler: Keine Zahlung erhalten</string> - <string name="error_timeout">Keine Zahlung innerhalb des Zahlungszeitraums, bitte versuchen Sie es erneut!</string> + <string name="error_timeout">Keine Zahlung innerhalb des vorgegebenen Zeitraums erhalten, bitte versuchen Sie es erneut!</string> <string name="error_history">Fehler beim Abrufen des Bestellverlaufs</string> + <string name="payment_claimed">Warten auf Zahlungsbestätigung durch Kunden…</string> </resources>
\ No newline at end of file diff --git a/merchant-terminal/src/main/res/values-es/strings.xml b/merchant-terminal/src/main/res/values-es/strings.xml index 7fcd835..4beb9fe 100644 --- a/merchant-terminal/src/main/res/values-es/strings.xml +++ b/merchant-terminal/src/main/res/values-es/strings.xml @@ -64,4 +64,9 @@ <string name="config_docs">Por favor refiérete <a href=\"https://docs.taler.net/taler-merchant-pos-terminal.html#apis-and-data-formats\">a la documentación</a> para la configuración del formato.<a href="https://docs.taler.net/taler-merchant-pos-terminal.html#apis-and-data-formats">the documentation</a> for the configuration format.</string> <string name="refund_error_max_amount">Mayor que la cantidad del pedido de %s</string> <string name="refund_intro_nfc">Por favor permite al cliente escanear el código QR o usar NFC para ofrecer reembolso</string> + <string name="payment_claimed">A la espera de que el cliente confirme el pago…</string> + <string name="order_custom_product">Nombre de producto personalizado</string> + <string name="order_custom_product_default">Consejo</string> + <string name="order_custom_add_button">Añadir</string> + <string name="order_custom">Añadir producto personalizado</string> </resources>
\ No newline at end of file diff --git a/merchant-terminal/src/main/res/values-fi/strings.xml b/merchant-terminal/src/main/res/values-fi/strings.xml new file mode 100644 index 0000000..ff7c02e --- /dev/null +++ b/merchant-terminal/src/main/res/values-fi/strings.xml @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="app_name">GNU Taler -myyntipiste</string> + <string name="app_name_short">Kauppiasterminaali</string> + <string name="project_name">GNU Taler</string> + <string name="menu_order">Tilaukset</string> + <string name="menu_history">Historia</string> + <string name="order_label_title">Tilaus #%s</string> + <string name="order_total">Yhteensä: #%s</string> + <string name="order_undo">Kumoa</string> + <string name="order_previous">Edellinen</string> + <string name="order_custom">Lisää mukautettu tuote</string> + <string name="order_complete">Valmis</string> + <string name="order_custom_product">Mukautettu tuotteen nimi</string> + <string name="order_custom_product_default">Tip</string> + <string name="config_label">Kauppiaan asetukset</string> + <string name="config_url">Määrityksen URL -osoite</string> + <string name="config_username">Käyttäjänimi</string> + <string name="config_password">Salasana</string> + <string name="config_ok">Nouda määritykset</string> + <string name="config_error_network">Virhe: Ei voitu muodostaa yhteyttä määrityspalvelimeen</string> + <string name="config_error_category">Virhe: kelvollista tuoteluokkaa ei löytynyt</string> + <string name="config_error_malformed">Virhe: Määrityksen JSON on virheellinen</string> + <string name="config_error_currency">Virhe: Tuotteen %1$s valuutta on %2$s, mutta %3$s odotetaan</string> + <string name="config_error_product_category_id">Virhe: Tuote %1$s viittaa tuntemattomaan luokkatunnukseen %2$d</string> + <string name="config_error_product_zero">Virhe: kelvollisia tuotteita ei löytynyt</string> + <string name="config_error_unknown">Virhe: Virheellinen määritys</string> + <string name="config_fetching">Haetaan määritystä…</string> + <string name="config_save_password">Muista salasana</string> + <string name="config_forget_password">Unohda</string> + <string name="config_changed">Vaihdettu uudeksi kauppiaaksi käyttämällä %s</string> + <string name="payment_intro_nfc">Anna asiakkaan skannata QR-koodi tai käyttää NFC:tä maksamiseen.</string> + <string name="payment_intro">Anna asiakkaan skannata QR-koodi maksaaksesi.</string> + <string name="payment_claimed">Odotetaan asiakkaan maksun vahvistamista…</string> + <string name="payment_cancel">Peruuta maksu</string> + <string name="payment_received">Maksu vastaanotettu</string> + <string name="payment_back_button">Jatka</string> + <string name="payment_order_id">Kuitti #%s</string> + <string name="payment_process_label">Maksua vaaditaan</string> + <string name="payment_canceled">Maksu peruutettu</string> + <string name="history_label">Maksu historia</string> + <string name="history_refund">Palautus</string> + <string name="history_unpaid">Maksamaton</string> + <string name="refund_amount">Summa</string> + <string name="refund_reason">Palautuksen syy</string> + <string name="refund_abort">Keskeytä</string> + <string name="refund_complete">Vastaanotettu</string> + <string name="refund_confirm">Hyväksy hyvitys</string> + <string name="refund_error_max_amount">Suurempi kuin tilausmäärä %s</string> + <string name="refund_error_invalid_amount">Virheellinen summa</string> + <string name="refund_error_zero">On oltava positiivinen määrä</string> + <string name="refund_error_backend">Hyvityksen käsittelyssä tapahtui virhe</string> + <string name="refund_error_already_refunded">Palautettu jo</string> + <string name="refund_intro_nfc">Anna asiakkaan skannata QR-koodi tai käyttää NFC:tä hyvityksen tarjoamiseksi</string> + <string name="refund_intro">Anna asiakkaan skannata QR-koodi hyvityksen tarjoamiseksi</string> + <string name="refund_order_ref">Ostoviite: %1$s +\n +\n%2$s</string> + <string name="error_payment">Virhe: Maksua ei vastaanotettu</string> + <string name="error_timeout">Maksua ei ole suoritettu maksuajan kuluessa, yritä uudelleen!</string> + <string name="error_cancelled">Maksu peruutettu</string> + <string name="error_history">Virhe noudettaessa tilaushistoriaa</string> + <string name="toast_back_to_exit">Napsauta «takaisin» uudelleen poistuaksesi</string> + <string name="menu_settings">Asetukset</string> + <string name="order_restart">Uudelleenkäynnistys</string> + <string name="order_next">Seuraava</string> + <string name="order_custom_add_button">Lisää</string> + <string name="config_auth_error">Virhe: Virheellinen käyttäjätunnus tai salasana</string> + <string name="config_fetching_label">Haetaan määritystä</string> + <string name="config_docs">Katso määritysmuodon <a href="https://docs.taler.net/taler-merchant-pos-terminal.html#apis-and-data-formats">dokumentaatiosta</a>.</string> + <string name="refund_error_deadline">Palautusaika on umpeutunut</string> +</resources>
\ No newline at end of file diff --git a/merchant-terminal/src/main/res/values-fr/strings.xml b/merchant-terminal/src/main/res/values-fr/strings.xml index 10c7af5..4d9636d 100644 --- a/merchant-terminal/src/main/res/values-fr/strings.xml +++ b/merchant-terminal/src/main/res/values-fr/strings.xml @@ -10,8 +10,8 @@ <string name="config_docs">Veuillez vous référer à <a href="https://docs.taler.net/taler-merchant-pos-terminal.html#apis-and-data-formats">la documentation</a> pour le format de configuration.</string> <string name="refund_confirm">Approuver le remboursement</string> <string name="refund_error_backend">Erreur lors du traitement du remboursement</string> - <string name="menu_settings">Réglages</string> - <string name="app_name">Point de vente GNU Taler</string> + <string name="menu_settings">Paramètres</string> + <string name="app_name">GNU Taler Point de vente</string> <string name="app_name_short">Terminal marchand</string> <string name="menu_order">Commandes</string> <string name="order_label_title">Commande numéro %s</string> @@ -59,4 +59,10 @@ \n \n%2$s</string> <string name="toast_back_to_exit">Cliquez à nouveau sur «retour» pour quitter</string> + <string name="error_payment">Erreur : Aucun paiement reçu</string> + <string name="history_unpaid">Non payé</string> + <string name="payment_claimed">En attendant que le client confirme le paiement…</string> + <string name="error_cancelled">Paiement annulé</string> + <string name="error_history">Erreur d\'accès à l\'historique des commandes</string> + <string name="error_timeout">Aucun paiement n\'a été effectué pendant la période de paiement, veuillez réessayer !</string> </resources>
\ No newline at end of file diff --git a/merchant-terminal/src/main/res/values-sv/strings.xml b/merchant-terminal/src/main/res/values-sv/strings.xml index b46c560..a6a7c17 100644 --- a/merchant-terminal/src/main/res/values-sv/strings.xml +++ b/merchant-terminal/src/main/res/values-sv/strings.xml @@ -64,4 +64,5 @@ <string name="refund_order_ref">Inköpsreferens: %1$s \n \n%2$s</string> + <string name="payment_claimed">Väntar på att kunden ska bekräfta betalningen…</string> </resources>
\ No newline at end of file diff --git a/merchant-terminal/src/main/res/values-tr/strings.xml b/merchant-terminal/src/main/res/values-tr/strings.xml new file mode 100644 index 0000000..bdd4d40 --- /dev/null +++ b/merchant-terminal/src/main/res/values-tr/strings.xml @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="config_username">Kullanıcı adı</string> + <string name="config_password">Şifre</string> + <string name="refund_amount">Miktar</string> + <string name="refund_reason">Geri ödeme nedeni</string> + <string name="refund_abort">Durdur</string> + <string name="refund_complete">Alındı</string> + <string name="refund_error_max_amount">%s sipariş miktarından büyük</string> + <string name="refund_error_invalid_amount">Geçersiz miktar</string> + <string name="refund_error_zero">Pozitif miktar olması gerekiyor</string> + <string name="refund_error_backend">Geri ödeme işlenirken hata oluştu</string> + <string name="refund_error_already_refunded">Çoktan geri ödendi</string> + <string name="refund_intro">Geri ödeme sunmak için lütfen müşterinin QR Kodunu taramasına izin verin</string> + <string name="refund_order_ref">Satın alma referansı %1$s +\n +\n%2$s</string> + <string name="error_payment">Hata: Ödeme alınmadı</string> + <string name="error_timeout">Ödeme süresi içinde ödeme yapılmadı, lütfen tekrar deneyin!</string> + <string name="error_cancelled">Ödeme iptal edildi</string> + <string name="error_history">Sipariş geçmişi getirilirken hata oluştu</string> + <string name="config_forget_password">Unut</string> + <string name="config_auth_error">Hata! Geçersiz kullanıcı adı veya şifre</string> + <string name="config_error_malformed">Hata: JSON konfigürasyonu hatalı oluşturulmuş</string> + <string name="config_error_unknown">Hata: Geçersiz kurulum</string> + <string name="history_refund">Geri ödeme</string> + <string name="refund_confirm">Geri ödemeyi onayla</string> + <string name="refund_error_deadline">Geri ödeme süresi geçti</string> + <string name="refund_intro_nfc">Geri ödeme sunmak için lütfen müşterinin QR Kodunu taramasına veya NFC\'yi kullanmasına izin verin</string> + <string name="toast_back_to_exit">Çıkmak için tekrar «geri» yi tıklayın</string> + <string name="config_changed">%s kullanılarak yeni satıcı olarak değiştirildi</string> + <string name="config_fetching_label">Kurulum getiriliyor</string> + <string name="config_docs">Lütfen kurulum formatı için <a href="https://docs.taler.net/taler-merchant-pos-terminal.html#apis-and-data-formats">belgelere</a> bakın.</string> + <string name="payment_intro_nfc">Lütfen müşterinin QR Kodunu taramasına veya ödeme yapmak için NFC\'yi kullanmasına izin verin.</string> + <string name="payment_intro">Lütfen müşterinin ödeme yapmak için QR Kodunu taramasına izin verin.</string> + <string name="payment_claimed">Müşterinin ödemeyi onaylaması bekleniyor…</string> + <string name="payment_cancel">Ödemeyi iptal et</string> + <string name="payment_received">Ödeme alındı</string> + <string name="payment_back_button">Devam et</string> + <string name="payment_order_id">Makbuz #%s</string> + <string name="payment_process_label">Ödeme gerekli</string> + <string name="payment_canceled">Ödeme iptal edildi</string> + <string name="history_label">Ödeme geçmişi</string> + <string name="history_unpaid">Ödenmemiş</string> + <string name="app_name">GNU Taler Satış Noktası</string> + <string name="app_name_short">Ticari Terminal</string> + <string name="project_name">GNU Taler</string> + <string name="menu_order">Siparişler</string> + <string name="menu_settings">Ayarlar</string> + <string name="order_label_title">Sipariş #%s</string> + <string name="order_total">Toplam: %s</string> + <string name="order_restart">Tekrar başlat</string> + <string name="order_undo">Geri al</string> + <string name="order_previous">Önceki</string> + <string name="order_next">Sonraki</string> + <string name="order_complete">Tamam</string> + <string name="config_label">Satıcı ayarları</string> + <string name="config_url">Konfigürasyon URL\'i</string> + <string name="config_ok">Konfigürasyonu getir</string> + <string name="config_error_network">Hata: Konfigürasyon sunucusuna bağlanılamadı</string> + <string name="config_error_category">Hata: Geçerli ürün kategorisi bulunamadı</string> + <string name="config_error_currency">"Hata: %1$s ürününün para birimi %2$s ama %3$s bekleniyor"</string> + <string name="config_error_product_category_id">Hata: Ürün %1$s, bilinmeyen kategori kimliğine referans veriyor %2$d</string> + <string name="config_error_product_zero">Hata: Geçerli ürün bulunamadı</string> + <string name="config_fetching">Kurulum getiriliyor…</string> + <string name="config_save_password">Şifreyi hatırla</string> + <string name="menu_history">Geçmiş</string> + <string name="order_custom">Özel ürün ekle</string> + <string name="order_custom_product">Özel ürünün ismi</string> + <string name="order_custom_product_default">Bahşiş</string> + <string name="order_custom_add_button">Ekle</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 f06866d..3cd2043 100644 --- a/merchant-terminal/src/main/res/values/strings.xml +++ b/merchant-terminal/src/main/res/values/strings.xml @@ -14,7 +14,11 @@ <string name="order_undo">Undo</string> <string name="order_previous">Prev</string> <string name="order_next">Next</string> + <string name="order_custom">Add custom product</string> <string name="order_complete">Complete</string> + <string name="order_custom_product">Custom product name</string> + <string name="order_custom_product_default">Tip</string> + <string name="order_custom_add_button">Add</string> <string name="config_label">Merchant settings</string> <string name="config_url">Configuration URL</string> |