commit 3d7c04d13441ee98b80f1a04b75bbba58c64b5ac parent 29603cc3166bee8365445e1f384ea7414b275dd0 Author: Iván Ávalos <avalos@disroot.org> Date: Thu, 14 Nov 2024 13:45:23 +0100 [wallet] Cleanup unused resources Diffstat:
18 files changed, 15 insertions(+), 410 deletions(-)
diff --git a/wallet/src/main/res/drawable/ic_dropdown.xml b/wallet/src/main/res/drawable/ic_dropdown.xml @@ -1,27 +0,0 @@ -<!-- - ~ This file is part of GNU Taler - ~ (C) 2024 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:height="24dp" - android:tint="?attr/colorControlNormal" - android:viewportHeight="24" - android:viewportWidth="24" - android:width="24dp"> - - <path android:fillColor="@android:color/white" android:pathData="M7,10l5,5 5,-5z"/> - -</vector> diff --git a/wallet/src/main/res/drawable/ic_edit.xml b/wallet/src/main/res/drawable/ic_edit.xml @@ -1,10 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:tint="?attr/colorControlNormal" - android:viewportWidth="24" - android:viewportHeight="24"> - <path - android:fillColor="#FFFFFF" - android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z" /> -</vector> diff --git a/wallet/src/main/res/drawable/ic_funds_receive.xml b/wallet/src/main/res/drawable/ic_funds_receive.xml @@ -1,5 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp"> - - <path android:fillColor="@android:color/white" android:pathData="M20,12l-1.41,-1.41L13,16.17V4h-2v12.17l-5.58,-5.59L4,12l8,8 8,-8z"/> - -</vector> diff --git a/wallet/src/main/res/drawable/ic_funds_send.xml b/wallet/src/main/res/drawable/ic_funds_send.xml @@ -1,5 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp"> - - <path android:fillColor="@android:color/white" android:pathData="M4,12l1.41,1.41L11,7.83V20h2V7.83l5.58,5.59L20,12l-8,-8 -8,8z"/> - -</vector> diff --git a/wallet/src/main/res/drawable/ic_search.xml b/wallet/src/main/res/drawable/ic_search.xml @@ -1,10 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:tint="?attr/colorControlNormal" - android:viewportWidth="24.0" - android:viewportHeight="24.0"> - <path - android:fillColor="#FF000000" - android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z" /> -</vector> diff --git a/wallet/src/main/res/drawable/ic_select_all.xml b/wallet/src/main/res/drawable/ic_select_all.xml @@ -1,10 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:tint="?attr/colorControlNormal" - android:viewportWidth="24.0" - android:viewportHeight="24.0"> - <path - android:fillColor="#FF000000" - android:pathData="M3,5h2L5,3c-1.1,0 -2,0.9 -2,2zM3,13h2v-2L3,11v2zM7,21h2v-2L7,19v2zM3,9h2L5,7L3,7v2zM13,3h-2v2h2L13,3zM19,3v2h2c0,-1.1 -0.9,-2 -2,-2zM5,21v-2L3,19c0,1.1 0.9,2 2,2zM3,17h2v-2L3,15v2zM9,3L7,3v2h2L9,3zM11,21h2v-2h-2v2zM19,13h2v-2h-2v2zM19,21c1.1,0 2,-0.9 2,-2h-2v2zM19,9h2L21,7h-2v2zM19,17h2v-2h-2v2zM15,21h2v-2h-2v2zM15,5h2L17,3h-2v2zM7,17h10L17,7L7,7v10zM9,9h6v6L9,15L9,9z" /> -</vector> diff --git a/wallet/src/main/res/drawable/ic_settings.xml b/wallet/src/main/res/drawable/ic_settings.xml @@ -1,9 +0,0 @@ -<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="#FF000000" - android:pathData="M19.1,12.9a2.8,2.8 0,0 0,0.1 -0.9,2.8 2.8,0 0,0 -0.1,-0.9l2.1,-1.6a0.7,0.7 0,0 0,0.1 -0.6L19.4,5.5a0.7,0.7 0,0 0,-0.6 -0.2l-2.4,1a6.5,6.5 0,0 0,-1.6 -0.9l-0.4,-2.6a0.5,0.5 0,0 0,-0.5 -0.4H10.1a0.5,0.5 0,0 0,-0.5 0.4L9.3,5.4a5.6,5.6 0,0 0,-1.7 0.9l-2.4,-1a0.4,0.4 0,0 0,-0.5 0.2l-2,3.4c-0.1,0.2 0,0.4 0.2,0.6l2,1.6a2.8,2.8 0,0 0,-0.1 0.9,2.8 2.8,0 0,0 0.1,0.9L2.8,14.5a0.7,0.7 0,0 0,-0.1 0.6l1.9,3.4a0.7,0.7 0,0 0,0.6 0.2l2.4,-1a6.5,6.5 0,0 0,1.6 0.9l0.4,2.6a0.5,0.5 0,0 0,0.5 0.4h3.8a0.5,0.5 0,0 0,0.5 -0.4l0.3,-2.6a5.6,5.6 0,0 0,1.7 -0.9l2.4,1a0.4,0.4 0,0 0,0.5 -0.2l2,-3.4c0.1,-0.2 0,-0.4 -0.2,-0.6ZM12,15.6A3.6,3.6 0,1 1,15.6 12,3.6 3.6,0 0,1 12,15.6Z" /> -</vector> diff --git a/wallet/src/main/res/drawable/side_nav_bar.xml b/wallet/src/main/res/drawable/side_nav_bar.xml @@ -1,24 +0,0 @@ -<!-- - ~ 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/> - --> - -<shape xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="rectangle"> - <gradient - android:angle="135" - android:endColor="@color/colorPrimaryDark" - android:startColor="@color/colorPrimary" - android:type="linear" /> -</shape> -\ No newline at end of file diff --git a/wallet/src/main/res/layout/fragment_manual_withdraw.xml b/wallet/src/main/res/layout/fragment_manual_withdraw.xml @@ -1,122 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?><!-- - ~ 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/> - --> - -<ScrollView - 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"> - <androidx.constraintlayout.widget.ConstraintLayout - android:layout_width="match_parent" - android:layout_height="wrap_content"> - <com.google.android.material.button.MaterialButton - android:id="@+id/qrCodeButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="32dp" - app:icon="@drawable/ic_scan_qr" - app:iconTint="?colorOnPrimary" - android:text="@string/button_scan_qr_code" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.5" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintVertical_chainStyle="packed" - tools:ignore="RtlHardcoded" /> - - <TextView - android:id="@+id/orView" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="32dp" - android:text="@string/or" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.5" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/qrCodeButton" /> - - <TextView - android:id="@+id/manualWithdrawIntro" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="32dp" - android:text="@string/withdraw_manual_title" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/orView" /> - - <com.google.android.material.textfield.TextInputLayout - android:id="@+id/amountLayout" - style="@style/Widget.Material3.TextInputLayout.OutlinedBox.Dense" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:layout_marginTop="16dp" - android:layout_marginEnd="16dp" - android:minWidth="128dp" - app:boxBackgroundMode="outline" - app:endIconDrawable="@drawable/ic_cancel" - app:endIconMode="clear_text" - app:layout_constraintEnd_toStartOf="@+id/currencyView" - app:layout_constraintHorizontal_chainStyle="packed" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/manualWithdrawIntro"> - - <com.google.android.material.textfield.TextInputEditText - android:id="@+id/amountView" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:inputType="numberDecimal" /> - - </com.google.android.material.textfield.TextInputLayout> - - <TextView - android:id="@+id/currencyView" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - app:layout_constraintBottom_toBottomOf="@+id/amountLayout" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toEndOf="@+id/amountLayout" - app:layout_constraintTop_toTopOf="@+id/amountLayout" - tools:text="TESTKUDOS123" /> - - <TextView - android:id="@+id/paymentOptionsLabel" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:layout_marginTop="32dp" - android:layout_marginEnd="16dp" - android:text="@string/withdraw_manual_payment_options" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/amountLayout" /> - - <Button - android:id="@+id/checkFeesButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="32dp" - android:layout_marginEnd="16dp" - android:text="@string/withdraw_manual_check_fees" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toBottomOf="@+id/paymentOptionsLabel" - app:layout_constraintVertical_bias="0.0" /> - - </androidx.constraintlayout.widget.ConstraintLayout> -</ScrollView> -\ No newline at end of file diff --git a/wallet/src/main/res/layout/list_item_age.xml b/wallet/src/main/res/layout/list_item_age.xml @@ -1,26 +0,0 @@ -<?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/> - --> - -<TextView xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@android:id/text1" - style="?android:attr/spinnerItemStyle" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:ellipsize="marquee" - android:padding="8dp" - android:singleLine="true" - android:textAlignment="inherit" - android:textSize="20sp" /> diff --git a/wallet/src/main/res/menu/transactions.xml b/wallet/src/main/res/menu/transactions.xml @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?><!-- - ~ 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/> - --> - -<menu xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto"> - <item - android:id="@+id/action_search" - android:icon="@drawable/ic_search" - android:title="@string/search" - app:actionViewClass="androidx.appcompat.widget.SearchView" - app:showAsAction="always|collapseActionView" /> -</menu> diff --git a/wallet/src/main/res/values-ar/strings.xml b/wallet/src/main/res/values-ar/strings.xml @@ -5,11 +5,8 @@ <string name="ok">موافق</string> <string name="menu_settings">الإعدادات</string> <string name="google_play_short_desc" tools:keep="@string/google_play_short_desc">يجعل نظام GNU Taler من معاملات الخصوصية سهلة الاستخدام عبر الإنترنت سريعة وميسرة.</string> - <string name="nav_header_title">نظام GNU Taler</string> - <string name="nav_header_subtitle">محفظة</string> <string name="nav_prompt_withdraw">سحب النقود الرقمية</string> <string name="nav_exchange_tos">شروط الخدمة لشركة الصرافة</string> - <string name="nav_exchange_select">اختر شركة الصرافة</string> <string name="nav_exchange_fees">رسوم شركة الصرافة</string> <string name="nav_error">خطأ</string> <string name="button_back">الرجوع إلى السابق</string> @@ -20,17 +17,13 @@ <string name="uri_invalid">مُعرّف الموارد الموحد لنظام Taler غير صحيح</string> <string name="cancel">إلغاء</string> <string name="menu">القائمة</string> - <string name="search">البحث</string> - <string name="or">أو</string> <string name="offline">تتطلب العملية الاتصال بالإنترنت. يرجى التأكد من أنّ اتصالك بالإنترنت يعمل وحاول مرة أخرى.</string> <string name="error_unsupported_uri">خطأ: مُعرّف الموارد الموحد لنظام URI غير معتمد.</string> - <string name="menu_retry_pending_operations">إعادة العمليات المعلقة</string> <string name="host_apdu_service_desc">مدفوعات الاتصال قريب المدى لنظام Taler</string> <string name="balances_title">الأرصدة</string> <string name="amount_positive">%s +</string> <string name="amount_negative">%s -</string> <string name="amount_chosen">المبلغ المختار</string> - <string name="balances_inbound_label">الوارد</string> <string name="balances_empty_state">لا يوجد عملة رقمية في محفظتك. \n \nيمكنك فحص المال من المصرف التجريبي: @@ -44,16 +37,13 @@ \n \n%s</string> <string name="transactions_detail_title">معاملة</string> - <string name="transactions_detail_title_balance">الرصيد: %s</string> <string name="transactions_delete">حذف</string> <string name="transactions_select_all">تحديد الكل</string> <string name="transaction_paid">مدفوع</string> <string name="transaction_order_total">المجموع</string> <string name="transaction_order">شراء</string> <string name="transaction_order_id">إيصال #%1$</string> - <string name="transaction_tip_from">إكرامية من %s</string> <string name="transaction_refund">استرداد المال</string> - <string name="transaction_refund_from">استرداد الأموال من %s</string> <string name="transaction_pending">معلق</string> <string name="transaction_refresh">رسوم تغيير انتهاء صلاحية العملة</string> <string name="payment_title">دفع</string> @@ -64,21 +54,13 @@ <string name="payment_aborted">ملغي</string> <string name="payment_failed">إخفاق</string> <string name="payment_initiated">بدء الدفع</string> - <string name="payment_already_paid_title">مدفوع الآن</string> <string name="withdraw_initiated">لقد بدأ السحب</string> <string name="withdraw_title">السحب</string> - <string name="withdraw_total">سحب النقود</string> - <string name="withdraw_fees">رسوم</string> + <string name="amount_fee">رسوم</string> <string name="withdraw_exchange">شركة الصرافة</string> <string name="withdraw_button_confirm">تأكيد السحب</string> <string name="withdraw_button_confirm_bank">التأكيد مع البنك</string> <string name="withdraw_button_tos">مراجعة الشروط</string> - <string name="withdraw_manual_title">حوّل تحويلاً يدويًا لشركة الصرافة</string> - <string name="withdraw_amount">ما مقدار المال الذي تريد سحبه؟</string> - <string name="withdraw_manual_payment_options">خياراتُ الدفع معتمدة من %1$s: -\n -\n%2$s</string> - <string name="withdraw_manual_check_fees">تحقق من الرسوم</string> <string name="withdraw_error_title">خطأ في السحب</string> <string name="withdraw_error_test">خطأ في سحب TESTKUDOS</string> <string name="exchange_settings_title">شركات الصرافة</string> @@ -101,9 +83,6 @@ <string name="exchange_fee_wire_fee_wire_fee">رسوم الحوالة: %1$s</string> <string name="exchange_fee_wire_fee_closing_fee">رسوم العملية المصرفية: %1$s</string> <string name="exchange_tos_accept">الموافقة على شروط الخدمة</string> - <string name="pending_operations_title">عمليات معلقة</string> - <string name="pending_operations_refuse">رفض العرض</string> - <string name="pending_operations_no_action">(لا تفعل شيئًا)</string> <string name="settings_dev_mode">وضع المُطوّر</string> <string name="settings_withdraw_testkudos">سحب TESTKUDOS</string> <string name="settings_withdraw_testkudos_summary">احصل على المال للاختبار</string> @@ -114,14 +93,11 @@ <string name="settings_version_unknown">غير معروف</string> <string name="settings_reset">إعادة تعيين المحفظة (خطر!)</string> <string name="settings_reset_summary">يسحب أموالك</string> - <string name="nav_settings_backup">نسخ احتياطي</string> - <string name="backup_last">النسخة الاحتياطية الأخيرة: %s</string> <string name="refund_title">استرداد الأموال</string> <string name="refund_success">استُلم المبلغ المسترد: %s</string> - <string name="tip_title">نصيحة</string> <string name="wifi_disabled_error">شغّل شبكة Wi-Fi للحصول على خدمة Wi-Fi مجانية</string> <string name="payment_button_confirm">تأكيد الدفع</string> - <string name="payment_label_amount_total">المبلغ الكلي:</string> + <string name="amount_total_label">المبلغ الكلي:</string> <string name="payment_already_paid">لقد دفعت الآن لعملية الشراء.</string> <string name="withdraw_waiting_confirm">بانتظار الموافقة</string> <string name="withdraw_amount_error">أدخل مبلغًا صحيحًا</string> diff --git a/wallet/src/main/res/values-ca/strings.xml b/wallet/src/main/res/values-ca/strings.xml @@ -29,7 +29,6 @@ <string name="button_scan_qr_code">Escaneja el codi QR de Taler</string> <string name="enter_uri">Entra l\'URI de Taler</string> <string name="copy" tools:override="true">Copia</string> - <string name="copy_uri">Copia l\'URI de Taler</string> <string name="paste">Enganxa</string> <string name="paste_invalid">El portaretalls conté un tipus invàlid de dada</string> <string name="uri_invalid">No és una URI de Taler vàlida</string> @@ -68,13 +67,11 @@ \n \n%s</string> <string name="transactions_detail_title">Transacció</string> - <string name="transactions_detail_title_currency">%s Transaccions</string> <string name="transactions_delete">Esborrar</string> <string name="transactions_select_all">Seleccionar-ho tot</string> <string name="transactions_delete_dialog_title">Esborrar la transacció</string> <string name="transactions_delete_dialog_message">Estàs segur que vols eliminar aquesta transacció de la teva cartera\?</string> <string name="transactions_delete_selected_dialog_message">Estàs segur que vols eliminar les transaccions seleccionades de la teva cartera\?</string> - <string name="transactions_cancel_dialog_message">Estàs segur que vols cancel·lar aquesta retirada\? Podries perdre els diners que encara estiguin en trànsit.</string> <!-- Transactions --> <string name="transaction_paid">Pagat</string> <string name="transaction_order_total">Total</string> @@ -90,11 +87,11 @@ <string name="transaction_peer_pull_credit">Factura</string> <string name="transaction_peer_pull_debit">Factura pagada</string> <string name="transaction_peer_push_credit">Pagament anticipat</string> - <string name="transaction_action_kyc">Completa KYC (política \'Know Your Customer\')</string> + <string name="transaction_action_kyc_bank">Completa KYC (política \'Know Your Customer\')</string> <string name="payment_title">Pagament</string> <string name="payment_fee">+%s comissió de pagament</string> <string name="payment_button_confirm">Confirma el pagament</string> - <string name="payment_label_amount_total">Quantitat total:</string> + <string name="amount_total">Quantitat total:</string> <string name="payment_label_order_summary">Compra</string> <string name="payment_error">Error: %s</string> <string name="payment_balance_insufficient">Saldo insuficient!</string> @@ -103,36 +100,26 @@ <string name="payment_initiated">Pagament començat</string> <string name="payment_already_paid_title">Ja pagat</string> <string name="payment_already_paid">Ja has pagat aquesta compra.</string> - <string name="receive_amount">Quantitat a rebre</string> - <string name="receive_amount_invalid">Quantitat invàlida</string> - <string name="receive_intro">Tria d\'on rebre els diners:</string> - <string name="receive_withdraw">Retirar diners d\'un compte bancari</string> + <string name="amount_receive">Quantitat a rebre</string> + <string name="amount_invalid">Quantitat invàlida</string> <string name="receive_peer">Factura una altra cartera</string> <string name="receive_peer_title">Sol·licitud de pagament</string> <string name="receive_peer_create_button">Crea factura</string> - <string name="receive_peer_invoice_instruction">Fes que el client escanegi aquest codi QR per pagar:</string> <string name="receive_peer_invoice_uri">Alternativament, copia i envia aquesta URI:</string> - <string name="send_amount">Quantitat a enviar</string> - <string name="send_intro">Tria on vols enviar els diners:</string> - <string name="send_deposit">A un compte bancari</string> - <string name="send_deposit_bitcoin">A una cartera de Bitcoin</string> + <string name="amount_send">Quantitat a enviar</string> <string name="send_deposit_title">Deposita a un compte bancari</string> <string name="send_deposit_iban">IBAN</string> - <string name="send_deposit_bic">BIC/SWIFT</string> <string name="send_deposit_name">Titular del compte</string> <string name="send_deposit_bitcoin_address">Adreça de Bitcoin</string> <string name="send_deposit_check_fees_button">Despeses de comprovació</string> - <string name="send_deposit_amount_effective">Quantitat efectiva</string> + <string name="amount_effective">Quantitat efectiva</string> <string name="send_deposit_create_button">Fes un dipòsit</string> <string name="send_deposit_bitcoin_create_button">Transferir Bitcoin</string> - <string name="send_peer">A una altra cartera</string> - <string name="send_peer_bitcoin">A una altra cartera de Taler</string> <string name="send_peer_title">Envia diners a una altra cartera</string> <string name="send_peer_create_button">Envia diners ara</string> - <string name="send_peer_warning">Avís: Els diners sortiran de la cartera immediatament.</string> <string name="send_peer_payment_instruction">Fes que el beneficiari escanegi aquest codi QR per rebre:</string> - <string name="send_peer_payment_amount_received">Quantitat rebuda</string> - <string name="send_peer_payment_amount_sent">Quantitat enviada</string> + <string name="amount_received">Quantitat rebuda</string> + <string name="amount_sent">Quantitat enviada</string> <string name="send_peer_expiration_period">Expira en</string> <string name="send_peer_expiration_1d">1 dia</string> <string name="send_peer_expiration_7d">7 dies</string> @@ -163,15 +150,12 @@ \n \n%2$s</string> <string name="withdraw_manual_check_fees">Comprova la comissió</string> - <string name="withdraw_manual_ready_title">L\'intercanvi està llest perquè retiris els diners!</string> <string name="withdraw_manual_ready_intro">Per completar el procés necessites transferir %s al teu compte bancari</string> <string name="withdraw_manual_ready_details_intro">Detalls de transferència bancària</string> - <string name="withdraw_manual_bitcoin_title">L\'intercanvi de Bitcoin està llest perquè retiris els dieners</string> <string name="withdraw_manual_bitcoin_intro">Ara fes una transacció dividida amb aquestes tres sortides.</string> <string name="withdraw_manual_ready_iban">IBAN</string> <string name="withdraw_manual_ready_subject">Concepte</string> <string name="withdraw_manual_ready_bank_button">Obre en una app bancària</string> - <string name="withdraw_manual_ready_cancel">Cancel·la la retidada de diners</string> <string name="withdraw_manual_ready_warning">Assegura\'t d\'emprar el concepte correcte, del contrari els diners no arribaran a la cartera.</string> <string name="withdraw_error_title">Error retirant els diners</string> <string name="withdraw_error_message">Retirar diners no és possible ara mateix. Si us plau, intenta-ho més tard!</string> @@ -233,18 +217,10 @@ <string name="refund_error"/> <string name="refund_success"/> <string name="tip_title"/> - <string name="tip_already_accepted"/> - <string name="tip_total"/> - <string name="tip_fees"/> - <string name="tip_exchange"/> - <string name="tip_merchant_url"/> - <string name="tip_button_confirm"/> - <string name="tip_received"/> <string name="wifi_disabled_error"/> <string name="wifi_connect_error"/> <string name="transaction_dummy_title">Transacció desconeguda</string> <string name="send_deposit_iban_error">L\'IBAN és invàlid</string> - <string name="send_deposit_bic_error">El BIC és invàlid</string> <string name="button_scan_qr_code_label">Escaneja el codi QR</string> <string name="payment_prompt_title">Revisar pagament</string> <string name="payment_pay_template_title">Personalitza la teva comanda</string> diff --git a/wallet/src/main/res/values-de/strings.xml b/wallet/src/main/res/values-de/strings.xml @@ -154,7 +154,6 @@ <string name="send_peer_create_button">Jetzt Geld senden</string> <string name="send_peer_title">Geld an ein anderes Wallet senden</string> <string name="send_deposit_bitcoin_address">Bitcoin-Adresse</string> - <string name="transaction_action_kyc">KYC abschließen</string> <string name="withdraw_restrict_age">Nutzung auf Alter beschränken</string> <string name="send_deposit_bitcoin_create_button">Bitcoin übertragen</string> <string name="settings_db_export">Datenbank exportieren</string> @@ -165,10 +164,8 @@ <string name="payment_pay_template_title">Passen Sie Ihre Bestellung an</string> <string name="send_intro">Wählen Sie aus, wohin Sie Geld senden möchten:</string> <string name="send_deposit_title">Auszahlung auf ein Bankkonto</string> - <string name="withdraw_bank">Bank</string> <string name="withdraw_manual_ready_account">Konto</string> <string name="withdraw_manual_ready_receiver">Name des Empfängers</string> - <string name="withdraw_transfer">Überweisung</string> <string name="exchange_delete_force">Löschung erzwingen (bereinigen)</string> <string name="settings_db_export_summary">Interne Datenbank speichern</string> <string name="settings_db_clear_error">Fehler beim Bereinigen der Datenbank</string> @@ -182,7 +179,6 @@ <string name="transaction_peer_pull_debit">Rechnung bezahlt</string> <string name="transaction_peer_pull_credit">Rechnung</string> <string name="transactions_receive_funds">Erhalten</string> - <string name="send_amount">Zu sendender Betrag</string> <string name="pay_peer_title">Rechnung bezahlen</string> <string name="pay_peer_intro">Möchten Sie diese Rechnung bezahlen?</string> <string name="receive_peer_payment_title">Zahlung erhalten</string> @@ -229,26 +225,20 @@ <string name="send_deposit_bitcoin">An ein Bitcoin-Wallet</string> <string name="send_peer_purpose">Buchungsvermerk</string> <string name="exchange_list_select">Zahlungsdienstleister auswählen</string> - <string name="exchange_dialog_delete_message">Sind Sie sicher, dass Sie diesen Zahlungsdienstleister löschen möchten? Wenn Sie diesen Vorgang erzwingen, führt dies zu einem Geldverlust.</string> <string name="settings_db_import_success">Datenbank aus Datei importiert</string> <string name="error_broken_uri">Fehler: Diese Taler-URI funktioniert (im Moment) nicht.</string> <string name="settings_alert_import_canceled">Import abgebrochen</string> <string name="import_db">Importieren</string> <string name="transactions_detail_title_currency">%s Transaktionen</string> <string name="receive_withdraw">Vom Bankkonto abheben</string> - <string name="send_deposit_amount_effective">Effektiver Betrag</string> <string name="send_deposit_create_button">Auszahlung ausführen</string> - <string name="receive_amount">Zu erhaltender Betrag</string> - <string name="receive_amount_invalid">Betrag ungültig</string> <string name="receive_intro">Wählen Sie aus, woher Sie Geld erhalten möchten:</string> <string name="amount_sent">Abzubuchender Betrag</string> <string name="amount_received">Empfangener Betrag</string> <string name="payment_pending">Zahlung nicht abgeschlossen - sie wird erneut versucht</string> - <string name="receive_peer_amount_invoiced">Rechnungsbetrag</string> <string name="send_peer_payment_instruction">Lassen Sie den Geldempfänger diesen QR-Code scannen, um den Betrag zu erhalten:</string> <string name="transaction_deposit">Überweisung (Einreichung auf Bankkonto)</string> <string name="exchange_list_error">Zahlungsdienstleister konnten nicht aufgelistet werden</string> - <string name="withdraw_conversion_support">Dieser Zahlungsdienstleister unterstützt Währungsumtausch</string> <string name="exchange_list_add_dev">Zahlungsdienstleister im Entwicklermodus hinzufügen</string> <string name="send_peer_expiration_30d">30 Tage</string> <string name="send_peer_expiration_7d">1 Woche</string> @@ -263,8 +253,6 @@ <string name="transactions_abort_dialog_message">Sind Sie sicher, dass Sie diese Transaktion abbrechen möchten? Gelder, die gerade noch übertragen werden, könnten verloren gehen.</string> <string name="transactions_fail">Verwerfen</string> <string name="transactions_fail_dialog_message">Sind Sie sicher, dass die Transaktion verworfen werden soll? Bereits abgesendete Guthaben GEHEN VERLOREN.</string> - <string name="transactions_receive_funds_title">%1$s erhalten</string> - <string name="transactions_send_funds_title">%1$s senden</string> <string name="payment_create_order">Auftrag anlegen</string> <string name="loading">Lädt Daten</string> <string name="open">Öffnen</string> diff --git a/wallet/src/main/res/values-es/strings.xml b/wallet/src/main/res/values-es/strings.xml @@ -188,8 +188,6 @@ <string name="send_peer">A otra cartera</string> <string name="send_peer_title">Enviar dinero a otra cartera</string> <string name="transaction_peer_push_debit">Pago push</string> - <string name="send_peer_payment_amount_received">Monto recibido</string> - <string name="send_peer_payment_amount_sent">Monto enviado</string> <string name="pay_peer_intro">¿Quieres pagar este cobro\?</string> <string name="receive_peer_payment_intro">¿Quieres recibir este pago\?</string> <string name="withdraw_manual_bitcoin_intro">Ahora haz una transacción dividida con las siguientes tres salidas.</string> @@ -254,7 +252,7 @@ <string name="withdraw_account">Cuenta #%1$d</string> <string name="withdraw_account_currency">Cuenta #%1$d (%2$s)</string> <string name="withdraw_transfer">Transferencia</string> - <string name="withdraw_conversion">Conversión</string> + <string name="amount_conversion">Conversión</string> <string name="withdraw_conversion_support">Este exchange soporta conversión de moneda</string> <string name="exchange_list_add_dev">Agregar proveedores de desarrollo</string> <string name="settings_db_import">Importar base de datos</string> @@ -276,7 +274,6 @@ <string name="transactions_send_funds_title">Enviar %1$s</string> <string name="show_logs">Mostrar bitácora</string> <string name="settings_db_clear_error">Error limpiando base de datos</string> - <string name="amount_conversion">Conversión</string> <string name="balances_inbound_amount">+%1$s entrante</string> <string name="transactions_receive_funds_title">Recibir %1$s</string> <string name="observability_title">Bitácora interna de eventos</string> diff --git a/wallet/src/main/res/values-fi/strings.xml b/wallet/src/main/res/values-fi/strings.xml @@ -137,7 +137,7 @@ <string name="receive_peer_create_button">Luo lasku</string> <string name="receive_peer_invoice_instruction">Anna maksajan skannata tämä QR koodi maksaakseen:</string> <string name="receive_peer_invoice_uri">Vaihtoehtoisesti kopioi ja lähetä tämä URI:</string> - <string name="receive_peer_amount_invoiced">Summa laskutettu</string> + <string name="amount_invoiced">Summa laskutettu</string> <string name="send_amount">Lähetettävä summa</string> <string name="send_intro">Valitse mihin lähetät rahaa:</string> <string name="send_deposit">Pankkitilille</string> @@ -208,7 +208,7 @@ <string name="withdraw_account">Tili #%1$d</string> <string name="withdraw_account_currency">Tili #%1$d (%2$s)</string> <string name="withdraw_transfer">Vaihda</string> - <string name="withdraw_conversion">Muuntaminen</string> + <string name="amount_conversion">Muuntaminen</string> <string name="withdraw_conversion_support">Tämä vaihto tukee valuutan muuntamista</string> <string name="exchange_settings_title">Vaihdot</string> <string name="exchange_settings_summary">Hallinnoi tämän lompakon tuntemien vaihtojen luetteloa</string> diff --git a/wallet/src/main/res/values/strings.xml b/wallet/src/main/res/values/strings.xml @@ -42,8 +42,6 @@ GNU Taler is immune against many types of fraud, such as phishing of credit card <string name="nav_error">Error</string> <string name="nav_exchange_fees">Provider fees</string> <string name="nav_exchange_tos">PSP\'s Terms of Service</string> - <string name="nav_header_subtitle">Wallet</string> - <string name="nav_header_title">GNU Taler</string> <string name="nav_prompt_withdraw">Withdraw Digital Cash</string> <!-- General --> @@ -67,11 +65,9 @@ GNU Taler is immune against many types of fraud, such as phishing of credit card <string name="offline_banner">No internet access</string> <string name="ok">OK</string> <string name="open">Open</string> - <string name="or">or</string> <string name="paste">Paste</string> <string name="paste_invalid">Clipboard contains an invalid data type</string> <string name="reset">Reset</string> - <string name="search">Search</string> <string name="share_payment">Share payment link</string> <string name="uri_invalid">Not a valid Taler URI</string> @@ -159,10 +155,10 @@ GNU Taler is immune against many types of fraud, such as phishing of credit card <string name="transactions_currency">%1$s (%2$s)</string> <string name="transactions_delete">Delete</string> <string name="transactions_delete_dialog_message">Are you sure you want to remove this transaction from your wallet?</string> - <string name="transactions_delete_dialog_title">Delete Transaction</string> + <string name="transactions_delete_dialog_title">Delete transaction</string> <string name="transactions_delete_selected_dialog_message">Are you sure you want to remove the selected transactions from your wallet?</string> + <string name="transactions_delete_selected_dialog_title">Delete transactions</string> <string name="transactions_detail_title">Transaction</string> - <string name="transactions_detail_title_currency">%s transactions</string> <string name="transactions_empty">You don\'t have any transactions</string> <string name="transactions_empty_search">No transactions found. Try a different search.</string> <string name="transactions_error">Could not load transactions\n\n%s</string> @@ -202,22 +198,18 @@ GNU Taler is immune against many types of fraud, such as phishing of credit card <!-- P2P receive --> - <string name="receive_intro">Choose where to receive money from:</string> <string name="receive_peer">Invoice another wallet</string> <string name="receive_peer_create_button">Create invoice</string> <string name="receive_peer_invoice_uri">Alternatively, copy and send this URI:</string> <string name="receive_peer_payment_intro">Do you want to receive this payment?</string> <string name="receive_peer_payment_title">Receive payment</string> <string name="receive_peer_title">Request payment</string> - <string name="receive_withdraw">Withdraw from bank account</string> <!-- P2P send --> <string name="pay_peer_intro">Do you want to pay this invoice?</string> <string name="pay_peer_title">Pay invoice</string> - <string name="send_deposit">To a bank account</string> <string name="send_deposit_account">Account</string> - <string name="send_deposit_bitcoin">To a Bitcoin wallet</string> <string name="send_deposit_bitcoin_address">Bitcoin address</string> <string name="send_deposit_bitcoin_create_button">Transfer Bitcoin</string> <string name="send_deposit_button_label">Deposit</string> @@ -230,9 +222,6 @@ GNU Taler is immune against many types of fraud, such as phishing of credit card <string name="send_deposit_no_methods_error">No supported wire methods</string> <string name="send_deposit_taler">x-taler-bank</string> <string name="send_deposit_title">Deposit to a bank account</string> - <string name="send_intro">Choose where to send money to:</string> - <string name="send_peer">To another wallet</string> - <string name="send_peer_bitcoin">To another Taler wallet</string> <string name="send_peer_create_button">Send funds now</string> <string name="send_peer_expiration_1d">1 day</string> <string name="send_peer_expiration_30d">30 days</string> @@ -261,8 +250,6 @@ GNU Taler is immune against many types of fraud, such as phishing of credit card <string name="withdraw_fee">+%1$s withdrawal fees</string> <string name="withdraw_initiated">Withdrawal initiated</string> <string name="withdraw_manual_bitcoin_intro">Now make a split transaction with the following three outputs.</string> - <string name="withdraw_manual_check_fees">Check fees</string> - <string name="withdraw_manual_payment_options">Payment options supported by %1$s:\n\n%2$s</string> <string name="withdraw_manual_qr_epc">EPC QR</string> <string name="withdraw_manual_qr_spc">Swiss QR</string> <string name="withdraw_manual_ready_account">Account</string> @@ -273,7 +260,6 @@ GNU Taler is immune against many types of fraud, such as phishing of credit card <string name="withdraw_manual_ready_receiver">Receiver name</string> <string name="withdraw_manual_ready_subject">Subject</string> <string name="withdraw_manual_ready_warning">Make sure to use the correct subject, otherwise the money will not arrive in this wallet.</string> - <string name="withdraw_manual_title">Make a manual transfer to the provider</string> <string name="withdraw_restrict_age">Restrict Usage to Age</string> <string name="withdraw_restrict_age_unrestricted">Unrestricted</string> <string name="withdraw_select_amount">Select amount</string> diff --git a/wallet/src/main/res/values/styles.xml b/wallet/src/main/res/values/styles.xml @@ -91,53 +91,10 @@ <item name="windowNoTitle">true</item> </style> - <style name="AppTheme.AppBarOverlay" parent="Widget.Material3.ActionBar.Solid" /> - - <style name="AppTheme.Toolbar" parent="Widget.Material3.Toolbar" /> - - <style name="DialogTheme" parent="Theme.Material3.DayNight.Dialog.Alert" /> - <style name="TransactionTitle"> <item name="android:textAppearance">@style/TextAppearance.Material3.TitleMedium</item> </style> - <style name="TransactionSubtitle"> - <item name="android:textAppearance">@style/TextAppearance.Material3.BodyMedium</item> - </style> - - <style name="TransactionTimestamp"> - <item name="android:textAppearance">@style/TextAppearance.Material3.LabelMedium</item> - </style> - - <style name="TransactionAmount"> - <item name="android:textAppearance">@style/TextAppearance.Material3.TitleLarge</item> - </style> - - <style name="TransactionLabel"> - <item name="android:layout_width">0dp</item> - <item name="android:layout_height">wrap_content</item> - <item name="android:layout_marginStart">16dp</item> - <item name="android:layout_marginTop">16dp</item> - <item name="android:layout_marginEnd">16dp</item> - <item name="android:gravity">center</item> - </style> - - <style name="TransactionLabel.Time"> - <item name="android:layout_marginBottom">16dp</item> - <item name="android:textAppearance">@style/TextAppearance.AppCompat.Medium</item> - </style> - - <style name="TransactionContent"> - <item name="android:layout_width">0dp</item> - <item name="android:layout_height">wrap_content</item> - <item name="android:layout_marginStart">16dp</item> - <item name="android:layout_marginTop">8dp</item> - <item name="android:layout_marginEnd">16dp</item> - <item name="android:layout_marginBottom">16dp</item> - <item name="android:textSize">24sp</item> - <item name="android:gravity">center</item> - </style> - <style name="BottomCard"> <item name="cardCornerRadius">0dp</item> <item name="cardElevation">8dp</item>