diff options
Diffstat (limited to 'cashier/src/main/res')
| -rw-r--r-- | cashier/src/main/res/mipmap-anydpi-v26/ic_launcher.xml | 1 | ||||
| -rw-r--r-- | cashier/src/main/res/values-de/strings.xml | 9 | ||||
| -rw-r--r-- | cashier/src/main/res/values-es/strings.xml | 5 | ||||
| -rw-r--r-- | cashier/src/main/res/values-fi/strings.xml | 43 | ||||
| -rw-r--r-- | cashier/src/main/res/values-fr/strings.xml | 3 | ||||
| -rw-r--r-- | cashier/src/main/res/values-ru/strings.xml | 43 | ||||
| -rw-r--r-- | cashier/src/main/res/values-sv/strings.xml | 3 | ||||
| -rw-r--r-- | cashier/src/main/res/values-tr/strings.xml | 3 | ||||
| -rw-r--r-- | cashier/src/main/res/values/strings.xml | 3 | ||||
| -rw-r--r-- | cashier/src/main/res/xml/backup_descriptor.xml | 3 | ||||
| -rw-r--r-- | cashier/src/main/res/xml/data_extraction_rules.xml | 6 | ||||
| -rw-r--r-- | cashier/src/main/res/xml/network_security_config.xml | 2 |
12 files changed, 113 insertions, 11 deletions
diff --git a/cashier/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/cashier/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index ac94b34..0648fb4 100644 --- a/cashier/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/cashier/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -2,4 +2,5 @@ <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <background android:drawable="@color/ic_launcher_background" /> <foreground android:drawable="@drawable/ic_launcher_foreground" /> + <monochrome android:drawable="@drawable/ic_launcher_foreground" /> </adaptive-icon>
\ No newline at end of file diff --git a/cashier/src/main/res/values-de/strings.xml b/cashier/src/main/res/values-de/strings.xml index ef79109..626d909 100644 --- a/cashier/src/main/res/values-de/strings.xml +++ b/cashier/src/main/res/values-de/strings.xml @@ -3,7 +3,7 @@ <string name="config_button_save">Speichern</string> <string name="config_bank_url_error">Die Adresse ist ungültig.</string> <string name="config_username_error">Bitte geben Sie Ihren Benutzernamen ein!</string> - <string name="config_error">Fehler beim Abrufen der Konfiguration: %s</string> + <string name="config_error">Fehler beim Abrufen der Konfiguration</string> <string name="config_error_auth">Benutzername oder Passwort ungültig!</string> <string name="balance_current_label">Aktueller Saldo</string> <string name="balance_error">FEHLER: %s</string> @@ -24,7 +24,7 @@ <string name="transaction_button_back">Zurück</string> <string name="transaction_last_success">Letzte Transaktion: %s abgehoben</string> <string name="transaction_last_error">Letzte Transaktion: Fehler</string> - <string name="app_name">Taler Kassierer</string> + <string name="app_name">Taler Cashier</string> <string name="config_bank_url">Bank API Adresse</string> <string name="config_demo_hint">Zum Testen können Sie <![CDATA[<a href="%s">ein Testkonto bei der Demobank erstellen</a>]]>.</string> <string name="transaction_intro">Scannen Sie zum Abheben den Code mit dem Taler-Wallet:</string> @@ -33,10 +33,11 @@ <string name="config_username">Benutzername</string> <string name="withdraw_error_timeout">Bitte lassen Sie ein Wallet die Abhebung auslösen.</string> <string name="action_about">Info</string> - <string name="ok">OK</string> + <string name="ok">Bestätigen</string> <string name="about_title">GNU Taler Kassierer</string> <string name="about_license">Lizenz: %s</string> <string name="about_version">Version: %s</string> <string name="about_copyright">Copyright: %s</string> - <string name="about_supported_bank_api">Bank API Version: %s</string> + <string name="about_supported_bank_api">Bankschnittstellen-Version: %s</string> + <string name="withdraw_error_currency_mismatch">Fehler: Die Bank hat eine andere Währung gemeldet</string> </resources>
\ No newline at end of file diff --git a/cashier/src/main/res/values-es/strings.xml b/cashier/src/main/res/values-es/strings.xml index cfbfda6..c9ecc6b 100644 --- a/cashier/src/main/res/values-es/strings.xml +++ b/cashier/src/main/res/values-es/strings.xml @@ -3,11 +3,11 @@ <string name="config_username">Nombre de usuario</string> <string name="config_password">Contraseña</string> <string name="app_name">Cajero Taler</string> - <string name="config_bank_url">Banco dirección API</string> + <string name="config_bank_url">Dirección API del banco</string> <string name="config_button_save">Guardar</string> <string name="config_bank_url_error">La dirección es inválida.</string> <string name="config_username_error">Por favor inserta tu nombre de usuario!</string> - <string name="config_error">Error recuperando la configuración : %s</string> + <string name="config_error">Error recuperando la configuración</string> <string name="config_error_auth">Usuario o contraseña inválido!</string> <string name="config_demo_hint">Para realizar pruebas, puedes <a href=%s>crear una cuenta de test en el banco demo</a>.</string> <string name="balance_current_label">Balance actual</string> @@ -39,4 +39,5 @@ <string name="about_license">Licencia: %s</string> <string name="about_copyright">Copyright: %s</string> <string name="about_supported_bank_api">Banco Versión API: %s</string> + <string name="withdraw_error_currency_mismatch">Error: El banco reportó una divisa diferente</string> </resources>
\ No newline at end of file diff --git a/cashier/src/main/res/values-fi/strings.xml b/cashier/src/main/res/values-fi/strings.xml new file mode 100644 index 0000000..030008f --- /dev/null +++ b/cashier/src/main/res/values-fi/strings.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="config_bank_url">Pankin API-osoite</string> + <string name="config_username">Käyttäjänimi</string> + <string name="config_password">Salasana</string> + <string name="config_bank_url_error">Osoite on virheellinen.</string> + <string name="config_username_error">Anna käyttäjätunnuksesi!</string> + <string name="app_name">Taler kassa</string> + <string name="config_button_save">Tallenna</string> + <string name="config_error">Virhe noudettaessa määritystä</string> + <string name="config_error_auth">Virheellinen käyttäjätunnus tai salasana!</string> + <string name="balance_current_label">Nykyinen saldo</string> + <string name="balance_error">ERROR: %s</string> + <string name="balance_offline">Offline-tilassa. Muodosta yhteys Internetiin.</string> + <string name="ok">OK</string> + <string name="action_reconfigure">Määritä uudelleen</string> + <string name="action_lock">Lukitse</string> + <string name="action_about">Noin</string> + <string name="withdraw_input_amount">Summa</string> + <string name="withdraw_into">Kuinka paljon sähköistä käteistä pitäisi nostaa?</string> + <string name="withdraw_error_zero">Anna positiivinen summa!</string> + <string name="withdraw_error_currency_mismatch">Virhe: Pankki ilmoitti toisen valuutan</string> + <string name="withdraw_error_fetch">Virhe kommunikoitaessa pankin kanssa: %s</string> + <string name="withdraw_error_timeout">Mikään lompakko ei yrittänyt nostaa. Yritä uudelleen.</string> + <string name="withdraw_button_confirm">Nosta</string> + <string name="transaction_intro">Skannaa koodi Taler-lompakkosovelluksella nostaaksesi:</string> + <string name="transaction_intro_nfc">Skannaa koodi tai käytä NFC:tä Taler-lompakkosovelluksen kanssa nostaaksesi:</string> + <string name="transaction_intro_scanned">Vahvista tapahtuma!</string> + <string name="transaction_confirm">Vahvista</string> + <string name="transaction_abort">Keskeytä</string> + <string name="transaction_aborted">Toiminta keskeytetty</string> + <string name="transaction_button_back">Takaisin</string> + <string name="transaction_last_success">Viimeisin tapahtuma: %s nostettu</string> + <string name="transaction_last_aborted">Viimeisin tapahtuma: Keskeytetty</string> + <string name="transaction_last_error">Viimeisin tapahtuma: epäonnistui</string> + <string name="about_title">GNU Taler Kassa</string> + <string name="about_version">Versio: %s</string> + <string name="about_license">Lisenssi: %s</string> + <string name="about_copyright">Tekijänoikeus: %s</string> + <string name="about_supported_bank_api">Pankin API-versio: %s</string> + <string name="config_demo_hint">Testausta varten voit <a href=%s>luoda testitilin demopankkiin</a>.</string> + <string name="withdraw_error_insufficient_balance">Riittämätön saldo</string> +</resources>
\ No newline at end of file diff --git a/cashier/src/main/res/values-fr/strings.xml b/cashier/src/main/res/values-fr/strings.xml index 0d2fbd2..10ba6ea 100644 --- a/cashier/src/main/res/values-fr/strings.xml +++ b/cashier/src/main/res/values-fr/strings.xml @@ -7,7 +7,7 @@ <string name="config_button_save">Enregistrer</string> <string name="config_bank_url_error">L\'adresse est invalide.</string> <string name="config_username_error">Veuillez saisir votre identifiant !</string> - <string name="config_error">Erreur lors de la récupération de la configuration : %s</string> + <string name="config_error">Erreur lors de la récupération de la configuration</string> <string name="config_error_auth">Identifiant ou mot de passe invalide !</string> <string name="config_demo_hint" tools:ignore="StringFormatInvalid">Pour les tests, vous pouvez <a href=%s>créer un compte de test dans la banque de démonstration</a> .</string> <string name="balance_current_label">Solde actuel</string> @@ -39,4 +39,5 @@ <string name="about_copyright">Droits d\'auteur : %s</string> <string name="about_supported_bank_api">Version Bank API : %s</string> <string name="about_title">GNU Taler Cashier</string> + <string name="withdraw_error_currency_mismatch">Erreur : La banque a déclaré une devise différente</string> </resources>
\ No newline at end of file diff --git a/cashier/src/main/res/values-ru/strings.xml b/cashier/src/main/res/values-ru/strings.xml new file mode 100644 index 0000000..8d6fff9 --- /dev/null +++ b/cashier/src/main/res/values-ru/strings.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="app_name">Taler Кассир</string> + <string name="config_bank_url">API адрес банка</string> + <string name="config_username">Имя пользователя</string> + <string name="config_password">Пароль</string> + <string name="config_button_save">Сохранить</string> + <string name="config_error_auth">Неправильное имя пользователя или пароль!</string> + <string name="config_demo_hint">Для тестирования, вы можете <a href=%s>создать тестовую учётную запист в демонстрационном банке</a>.</string> + <string name="balance_current_label">Теущий баланс</string> + <string name="balance_error">ОШИБКА: %s</string> + <string name="balance_offline">Нет связи. Пожалуйста подключитесь к интернету.</string> + <string name="action_reconfigure">Переконфигурировать</string> + <string name="action_lock">Заблокировать</string> + <string name="action_about">О программе</string> + <string name="withdraw_input_amount">Количество</string> + <string name="ok">OK</string> + <string name="config_bank_url_error">Адрес неправильный.</string> + <string name="config_username_error">Пожалуйста введите ваше имя пользователя!</string> + <string name="config_error">Ошибка при получении конфигурации</string> + <string name="withdraw_into">Сколько e-cash должно быть списано?</string> + <string name="withdraw_error_zero">Введите позитивное количество!</string> + <string name="withdraw_error_insufficient_balance">Недостаточный баланс</string> + <string name="withdraw_error_currency_mismatch">Ошибка: Банк использует другую валюту</string> + <string name="withdraw_error_fetch">Ошибка при связи с банком: %s</string> + <string name="withdraw_error_timeout">Никакой кошелёк не попробоавл списать. Пожалуйста попробуйте ещё раз.</string> + <string name="withdraw_button_confirm">Списание</string> + <string name="transaction_intro">Отсканируйте код приложением Кошелька Taler чтобы списать:</string> + <string name="transaction_intro_nfc">Отсканируйте код или используйте NFC в приложении Кошелька Taler чтобы списать:</string> + <string name="transaction_intro_scanned">Пожалуйста подтвердите транзакцию!</string> + <string name="transaction_confirm">Подтвердить</string> + <string name="transaction_abort">Подробности</string> + <string name="transaction_aborted">Транзакция прервана</string> + <string name="transaction_button_back">Перейти назад</string> + <string name="transaction_last_success">Последняя Транзакция: %s списано</string> + <string name="transaction_last_aborted">Последняя Транзакция: Прервана</string> + <string name="transaction_last_error">Последняя Транзакция: Неуспешна</string> + <string name="about_title">Кассир GNU Taler</string> + <string name="about_version">Версия: %s</string> + <string name="about_license">Лицензия: %s</string> + <string name="about_copyright">Авторские права: %s</string> + <string name="about_supported_bank_api">Версия API банка: %s</string> +</resources>
\ No newline at end of file diff --git a/cashier/src/main/res/values-sv/strings.xml b/cashier/src/main/res/values-sv/strings.xml index 1794aa2..967cedb 100644 --- a/cashier/src/main/res/values-sv/strings.xml +++ b/cashier/src/main/res/values-sv/strings.xml @@ -5,7 +5,7 @@ <string name="config_password">Lösenord</string> <string name="config_button_save">Spara</string> <string name="config_username_error">Vänligen ange ditt användarnamn!</string> - <string name="config_error">Fel vid hämtning av konfiguration: %s</string> + <string name="config_error">Fel vid hämtning av konfiguration</string> <string name="config_error_auth">Ogiltigt användarnamn eller lösenord!</string> <string name="balance_current_label">Nuvarande saldo</string> <string name="balance_error">FEL: %s</string> @@ -39,4 +39,5 @@ <string name="config_bank_url_error">Adressen är ogiltig.</string> <string name="config_demo_hint">För testning kan du <a href=%s>skapa ett testkonto i demobanken</a> .</string> <string name="withdraw_error_fetch">Fel vid kommunikation med bank: %s</string> + <string name="withdraw_error_currency_mismatch">Fel: Banken har rapporterat en annan valuta</string> </resources>
\ No newline at end of file diff --git a/cashier/src/main/res/values-tr/strings.xml b/cashier/src/main/res/values-tr/strings.xml index b1afb2e..09db26f 100644 --- a/cashier/src/main/res/values-tr/strings.xml +++ b/cashier/src/main/res/values-tr/strings.xml @@ -7,7 +7,7 @@ <string name="config_bank_url_error">Bu adres geçersiz.</string> <string name="config_username_error">Lütfen kullanıcı adınızı giriniz!</string> <string name="app_name">Taler Kasiyer</string> - <string name="config_error">Konfigürasyon alınırken hata oluştu: %s</string> + <string name="config_error">Konfigürasyon alınırken hata oluştu</string> <string name="config_error_auth">Geçersiz kullanıcı adı yada şifre!</string> <string name="config_demo_hint">Test için <a href=%s>demo bankasında bir test hesabı oluşturabilirsiniz</a>.</string> <string name="balance_current_label">Mevcut bakiye</string> @@ -39,4 +39,5 @@ <string name="about_copyright">Telif Hakkı: %s</string> <string name="about_supported_bank_api">Banka API Sürümü: %s</string> <string name="about_version">Sürüm: %s</string> + <string name="withdraw_error_currency_mismatch">Hata: Banka farklı bir para birimi bildirdi</string> </resources>
\ No newline at end of file diff --git a/cashier/src/main/res/values/strings.xml b/cashier/src/main/res/values/strings.xml index 4c000d8..8e28d28 100644 --- a/cashier/src/main/res/values/strings.xml +++ b/cashier/src/main/res/values/strings.xml @@ -7,7 +7,7 @@ <string name="config_button_save">Save</string> <string name="config_bank_url_error">The address is invalid.</string> <string name="config_username_error">Please enter your username!</string> - <string name="config_error">Error retrieving configuration: %s</string> + <string name="config_error">Error retrieving configuration</string> <string name="config_error_auth">Invalid username or password!</string> <string name="config_error_offline" translatable="false">@string/balance_offline</string> <string name="config_demo_hint">For testing, you can <![CDATA[<a href="%s">create a test account at the demo bank</a>]]>.</string> @@ -26,6 +26,7 @@ <string name="withdraw_into">How much e-cash should be withdrawn?</string> <string name="withdraw_error_zero">Enter positive amount!</string> <string name="withdraw_error_insufficient_balance">Insufficient balance</string> + <string name="withdraw_error_currency_mismatch">Error: Bank reported a different currency</string> <string name="withdraw_error_fetch">Error communicating with bank: %s</string> <string name="withdraw_error_timeout">No wallet tried to withdraw. Please try again.</string> <string name="withdraw_error_offline" translatable="false">@string/balance_offline</string> diff --git a/cashier/src/main/res/xml/backup_descriptor.xml b/cashier/src/main/res/xml/backup_descriptor.xml index a298494..c5d3bc7 100644 --- a/cashier/src/main/res/xml/backup_descriptor.xml +++ b/cashier/src/main/res/xml/backup_descriptor.xml @@ -15,5 +15,6 @@ --> <full-backup-content> - + <!-- will not be able to decrypt this, causing crash --> + <exclude domain="sharedpref" path="secret_settings.xml"/> </full-backup-content> diff --git a/cashier/src/main/res/xml/data_extraction_rules.xml b/cashier/src/main/res/xml/data_extraction_rules.xml new file mode 100644 index 0000000..de53be5 --- /dev/null +++ b/cashier/src/main/res/xml/data_extraction_rules.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<data-extraction-rules> + <cloud-backup> + <exclude domain="sharedpref" path="secret_settings.xml"/> + </cloud-backup> +</data-extraction-rules> diff --git a/cashier/src/main/res/xml/network_security_config.xml b/cashier/src/main/res/xml/network_security_config.xml new file mode 100644 index 0000000..81cd5ce --- /dev/null +++ b/cashier/src/main/res/xml/network_security_config.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8"?> +<network-security-config /> |