Skip to content

Commit

Permalink
make message more consistent by filling in path to system settings
Browse files Browse the repository at this point in the history
  • Loading branch information
mtotschnig committed Jul 29, 2024
1 parent 0f4f513 commit 1ef5843
Show file tree
Hide file tree
Showing 32 changed files with 44 additions and 37 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ import org.totschnig.myexpenses.util.distrib.DistributionHelper.getVersionInfo
import org.totschnig.myexpenses.util.distrib.DistributionHelper.marketSelfUri
import org.totschnig.myexpenses.util.getLocale
import org.totschnig.myexpenses.util.licence.LicenceHandler
import org.totschnig.myexpenses.util.localizedQuote
import org.totschnig.myexpenses.util.readPrimaryTextColor
import org.totschnig.myexpenses.util.safeMessage
import org.totschnig.myexpenses.util.tracking.Tracker
Expand Down Expand Up @@ -689,12 +690,19 @@ abstract class BaseActivity : AppCompatActivity(), MessageDialogFragment.Message

open fun showDeviceLockScreenWarning() {
showSnackBar(
concatResStrings(
this,
" ",
R.string.warning_device_lock_screen_not_set_up_1,
R.string.warning_device_lock_screen_not_set_up_2
)
getString(R.string.warning_device_lock_screen_not_set_up_1) + " " +
getString(
R.string.warning_device_lock_screen_not_set_up_2,
localizedQuote(
concatResStrings(
this,
" -> ",
R.string.settings_label,
R.string.security_settings_title,
R.string.screen_lock
)
)
)
)
}

Expand Down
2 changes: 1 addition & 1 deletion myExpenses/src/main/res/values-ar/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -621,7 +621,7 @@
<string name="pref_protection_device_lock_screen_title">شاشة قفل الجهاز</string>
<string name="pref_warning_only_one_protection">قبل أن تتمكن من استخدام الحماية بنسبة %1$s، يجب إيقاف تشغيل الحماية بنسبة %2$s.</string>
<string name="warning_device_lock_screen_not_set_up_1">لم يتم إعداد شاشة تأمين الجهاز الآمن.</string>
<string name="warning_device_lock_screen_not_set_up_2">انتقل إلى \"الإعدادات -&gt; الأمان -&gt; قفل الشاشة\" لإعداد شاشة القفل.</string>
<string name="warning_device_lock_screen_not_set_up_2">انتقل إلى \"%s" لإعداد شاشة القفل.</string>
<string name="menu_history_show_balance">إظهار الرصيد</string>
<string name="menu_history_transfers">تضمين التحويلات</string>
<string name="menu_history">السجل</string>
Expand Down
2 changes: 1 addition & 1 deletion myExpenses/src/main/res/values-bg/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,7 @@
<string name="pref_protection_device_lock_screen_title">Екран за заключено устройство</string>
<string name="pref_warning_only_one_protection">Преди да можете да използвате защита от %1$s, трябва да изключите защитата от %2$s.</string>
<string name="warning_device_lock_screen_not_set_up_1">Защитният екран за заключено устройството не е настроен.</string>
<string name="warning_device_lock_screen_not_set_up_2">Отидете на „Настройки -&gt; Настройки -&gt; Заключен екран“, за да настроите заключен екран.</string>
<string name="warning_device_lock_screen_not_set_up_2">Отидете на %s, за да настроите заключен екран.</string>
<string name="menu_history_show_balance">Показване на салдото</string>
<string name="menu_history_transfers">Включи преводите</string>
<string name="menu_history">История</string>
Expand Down
2 changes: 1 addition & 1 deletion myExpenses/src/main/res/values-ca/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@
<string name="csv_import_delimiter_tab">Tabulador</string>
<string name="csv_import_no_mapping_found_for_amount">Siusplau, assigneu una columna o bé a import, ingrés o despesa.</string>
<string name="crash_dialog_title">{app_name} ha petat</string>
<string name="warning_device_lock_screen_not_set_up_2">Vagi a \"Configuració -&gt; Seguretat -&gt; Bloqueig de pantalla\" per a establir el bloqueig de pantalla.</string>
<string name="warning_device_lock_screen_not_set_up_2">Vagi a %s per a establir el bloqueig de pantalla.</string>
<string name="warning_change_fraction_digits_3">Si les quantitats s\'actualitzen, prendreu la informació sobre la seva part fraccionaria.</string>
<string name="import_accounts_success">%1$d comptes importats amb èxit.</string>
<string name="import_transactions_success" tools:ignore="PluralsCandidate">%1$d opreacions importades amb èxit al compte %2$s</string>
Expand Down
2 changes: 1 addition & 1 deletion myExpenses/src/main/res/values-cs/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,7 @@
<string name="pref_protection_device_lock_screen_title">Zamykací obrazovka zařízení</string>
<string name="pref_warning_only_one_protection">Než použijete ochranu %1$s, musíte vypnout ochranu %2$s.</string>
<string name="warning_device_lock_screen_not_set_up_1">Není nastaven bezpečný zámek obrazovky.</string>
<string name="warning_device_lock_screen_not_set_up_2">Zamykací obrazovku vytvoříte, když přejdete do Nastavení -&gt; Zabezpečení -&gt; Zámek obrazovky.</string>
<string name="warning_device_lock_screen_not_set_up_2">Zamykací obrazovku vytvoříte, když přejdete do %s.</string>
<string name="menu_history_show_balance">Ukázat zůstatek</string>
<string name="menu_history_transfers">Zahrnout převody</string>
<string name="menu_history">Historie</string>
Expand Down
2 changes: 1 addition & 1 deletion myExpenses/src/main/res/values-da/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -551,7 +551,7 @@
<string name="switch_to_monthly" tools:ignore="UnusedResources">Skift til månedligt abonnement</string>
<string name="budget_table_header_budgeted">Budgetteret</string>
<string name="menu_create_template_for_split">Ny opdelingsskabelon</string>
<string name="warning_device_lock_screen_not_set_up_2">Gå til \'Indstillinger -&gt; Sikkerhed -&gt; Skærmlås\' for at indstille en låseskærm.</string>
<string name="warning_device_lock_screen_not_set_up_2">Gå til %s for at indstille en låseskærm.</string>
<string name="credit_limit">Kreditgrænse</string>
<string name="content_description_expand">Udvid</string>
<string name="goal_or_limit">Mål / Grænse</string>
Expand Down
2 changes: 1 addition & 1 deletion myExpenses/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,7 @@
<string name="pref_protection_device_lock_screen_title">Gerätesperrbildschirm</string>
<string name="pref_warning_only_one_protection">Bevor Sie den Schutz durch %1$s verwenden können, müssen Sie den Schutz durch %2$s ausschalten.</string>
<string name="warning_device_lock_screen_not_set_up_1">Der sichere Gerätesperrbildschirm wurde nicht eingerichtet.</string>
<string name="warning_device_lock_screen_not_set_up_2">Gehen Sie zu Einstellungen -&gt; Sicherheit -&gt; Bildschirmsperre, um einen Sperrbildschirm einzurichten.</string>
<string name="warning_device_lock_screen_not_set_up_2">Gehen Sie zu %s, um einen Sperrbildschirm einzurichten.</string>
<string name="menu_history_show_balance">Saldo anzeigen</string>
<string name="menu_history_transfers">Umbuchungen einschließen</string>
<string name="menu_history">Verlauf</string>
Expand Down
2 changes: 1 addition & 1 deletion myExpenses/src/main/res/values-el/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,7 @@
<string name="pref_protection_device_lock_screen_title">Οθόνη κλειδώματος συσκευής</string>
<string name="pref_warning_only_one_protection">Για να μπορέσετε να χρησιμοποιήσετε την προστασία από %1$s, πρέπει να απενεργοποιήσετε την προστασία από %2$s.</string>
<string name="warning_device_lock_screen_not_set_up_1">Η ασφαλής οθόνη κλειδώματος συσκευής δεν έχει ρυθμιστεί.</string>
<string name="warning_device_lock_screen_not_set_up_2">Μεταβείτε στην ενότητα \"Ρυθμίσεις -&gt; Ασφάλεια -&gt; Προστασία\" για να ρυθμίσετε την οθόνη κλειδώματος.</string>
<string name="warning_device_lock_screen_not_set_up_2">Μεταβείτε στην ενότητα %s για να ρυθμίσετε την οθόνη κλειδώματος.</string>
<string name="menu_history_show_balance">Εμφάνιση υπολοίπου</string>
<string name="menu_history_transfers">Συμπερίληψη μεταφορών</string>
<string name="menu_history">Ιστορικό</string>
Expand Down
2 changes: 1 addition & 1 deletion myExpenses/src/main/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,7 @@
<string name="pref_protection_device_lock_screen_title">Bloqueo de pantalla</string>
<string name="pref_warning_only_one_protection">Antes de que pueda usar la protección por %1$s, tiene que desactivar la protección por %2$s.</string>
<string name="warning_device_lock_screen_not_set_up_1">La seguridad en el bloqueo de pantalla no ha sido configurada.</string>
<string name="warning_device_lock_screen_not_set_up_2">Vaya a \'Ajustes -&gt; Seguridad -&gt; Bloqueo de pantalla\' para configurar un bloqueo de pantalla.</string>
<string name="warning_device_lock_screen_not_set_up_2">Vaya a %s para configurar un bloqueo de pantalla.</string>
<string name="menu_history_show_balance">Mostrar balance</string>
<string name="menu_history_transfers">Incluir transferencias</string>
<string name="menu_history">Historial</string>
Expand Down
2 changes: 1 addition & 1 deletion myExpenses/src/main/res/values-fa/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,7 @@
<string name="progress_dialog_fetching_data_from_sync_backend">دریافت اطلاعات از سرور. ممکن است کمی طول بکشد.</string>
<string name="licence_removal_success">لایسنس با موفقیت از این دستگاه حذف شد.</string>
<string name="pref_home_currency_title">ارز اصلی</string>
<string name="warning_device_lock_screen_not_set_up_2">به «تنظیمات -&gt; امنیت -&gt; قفل صفحه» بروید و یک قفل تنظیم کنید</string>
<string name="warning_device_lock_screen_not_set_up_2">به %s بروید و یک قفل تنظیم کنید</string>
<plurals name="delete_success">
<item quantity="one">یک شئ با موفقیت حذف شد.</item>
<item quantity="other">%d شئ با موفقیت حذف شد.</item>
Expand Down
2 changes: 1 addition & 1 deletion myExpenses/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,7 @@
<string name="pref_protection_device_lock_screen_title">Écran de verrouillage de l\'appareil</string>
<string name="pref_warning_only_one_protection">Avant de pouvoir utiliser la protection par %1$s, vous devez désactiver la protection par %2$s.</string>
<string name="warning_device_lock_screen_not_set_up_1">L\'écran de verrouillage sécurisé de l\'appareil n\'a pas été configuré.</string>
<string name="warning_device_lock_screen_not_set_up_2">Allez dans Paramètres -&gt; Sécurité -&gt; Verrouillage écran pour configurer un écran de verrouillage.</string>
<string name="warning_device_lock_screen_not_set_up_2">Allez dans %s pour configurer un écran de verrouillage.</string>
<string name="menu_history_show_balance">Afficher le solde</string>
<string name="menu_history_transfers">Inclure les transferts</string>
<string name="menu_history">Historique</string>
Expand Down
2 changes: 1 addition & 1 deletion myExpenses/src/main/res/values-hr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@
<string name="menu_history">Povijest</string>
<string name="menu_history_transfers">Uključi prijenose</string>
<string name="menu_history_show_balance">Prikaži saldo</string>
<string name="warning_device_lock_screen_not_set_up_2">Za postavljanje zaključano ekrana, idi na „Postavke -&gt; Sigurnost -&gt; Zaključavanje ekrana”.</string>
<string name="warning_device_lock_screen_not_set_up_2">Za postavljanje zaključano ekrana, idi na %s.</string>
<string name="warning_device_lock_screen_not_set_up_1">Zaključavanje ekrana uređaja nije postavljeno.</string>
<string name="pref_warning_only_one_protection">Za korištenje zaštite od %1$s, moraš isključiti zaštitu od %2$s.</string>
<string name="pref_protection_device_lock_screen_title">Zaključavanje ekrana uređaja</string>
Expand Down
2 changes: 1 addition & 1 deletion myExpenses/src/main/res/values-hu/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -591,7 +591,7 @@
<string name="pref_protection_device_lock_screen_title">Eszköz zárolási képernyője</string>
<string name="pref_warning_only_one_protection">Mielőtt használhatná a(z) %1$s általi védelmet, ki kell kapcsolnia a(z) %2$s általi védelmet.</string>
<string name="warning_device_lock_screen_not_set_up_1">Nincs beállítva biztonságos zárolási képernyő a készüléken.</string>
<string name="warning_device_lock_screen_not_set_up_2">A zárolási képernyő beállításához lépjen a „Beállítások -&gt; Biztonság -&gt; Képernyőzár” menüpontra.</string>
<string name="warning_device_lock_screen_not_set_up_2">A zárolási képernyő beállításához lépjen a %s menüpontra.</string>
<string name="menu_history_show_balance">Egyenleg mutatása</string>
<string name="menu_history_transfers">Tartalmazza az átutalásokat</string>
<string name="menu_history">Előzmények</string>
Expand Down
2 changes: 1 addition & 1 deletion myExpenses/src/main/res/values-it/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,7 @@
<string name="pref_protection_device_lock_screen_title">Schermata di blocco del dispositivo</string>
<string name="pref_warning_only_one_protection">Prima di poter utilizzare la protezione con %1$s, è necessario disattivare la protezione con %2$s.</string>
<string name="warning_device_lock_screen_not_set_up_1">La schermata di blocco del dispositivo sicuro non è stata configurata.</string>
<string name="warning_device_lock_screen_not_set_up_2">Vai a Impostazioni -&gt; Sicurezza -&gt; Blocco schermo per impostare una schermata di blocco.</string>
<string name="warning_device_lock_screen_not_set_up_2">Vai a %s per impostare una schermata di blocco.</string>
<string name="menu_history_show_balance">Mostra equilibrio</string>
<string name="menu_history_transfers">Includi trasferimenti</string>
<string name="menu_history">Storico</string>
Expand Down
1 change: 0 additions & 1 deletion myExpenses/src/main/res/values-iw/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,6 @@
<string name="pref_protection_device_lock_screen_title">מסך נעילת מכשיר</string>
<string name="pref_warning_only_one_protection">לפני שתוכל להשתמש בהגנה על ידי%1$s, עליך לבטל את ההגנה על ידי%2$s.</string>
<string name="warning_device_lock_screen_not_set_up_1">מסך נעילת המכשיר המאובטח לא הוגדר.</string>
<string name="warning_device_lock_screen_not_set_up_2">יש לגשת להגדרות -&gt; אבטחה -&gt; נעילת מסך כדי להגדיר מסך נעילה.</string>
<string name="menu_history_show_balance">הצגת היתרה</string>
<string name="menu_history_transfers">לכלול העברות</string>
<string name="menu_history">היסטוריה</string>
Expand Down
2 changes: 1 addition & 1 deletion myExpenses/src/main/res/values-ja/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,7 @@
<string name="pref_protection_device_lock_screen_title">デバイスのロック画面</string>
<string name="pref_warning_only_one_protection">%1$s による保護を使用する前に、%2$s の保護をオフにする必要があります。</string>
<string name="warning_device_lock_screen_not_set_up_1">安全なデバイスロック画面は設定されていません。</string>
<string name="warning_device_lock_screen_not_set_up_2">\'設定 -&gt; セキュリティ -&gt; 画面ロック\' でロック画面を設定してください。</string>
<string name="warning_device_lock_screen_not_set_up_2">%s でロック画面を設定してください。</string>
<string name="menu_history_show_balance">残高を表示</string>
<string name="menu_history_transfers">振替を含む</string>
<string name="menu_history">履歴</string>
Expand Down
2 changes: 1 addition & 1 deletion myExpenses/src/main/res/values-kn/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,7 @@
<string name="pref_protection_device_lock_screen_title">ಸಾಧನ ಲಾಕ್ ಪರದೆ</string>
<string name="pref_warning_only_one_protection">ನೀವು %1$s ಮೂಲಕ ರಕ್ಷಣೆಯನ್ನು ಬಳಸುವ ಮೊದಲು, ನೀವು %2$s ಮೂಲಕ ರಕ್ಷಣೆಯನ್ನು ಆಫ್ ಮಾಡಬೇಕು.</string>
<string name="warning_device_lock_screen_not_set_up_1">ಸುರಕ್ಷಿತ ಸಾಧನ ಲಾಕ್ ಪರದೆಯನ್ನು ಹೊಂದಿಸಲಾಗಿಲ್ಲ.</string>
<string name="warning_device_lock_screen_not_set_up_2">ಲಾಕ್ ಪರದೆಯನ್ನು ಹೊಂದಿಸಲು \'ಸೆಟ್ಟಿಂಗ್‌ಗಳು -&gt; ಭದ್ರತೆ -&gt; ಸ್ಕ್ರೀನ್‌ಲಾಕ್\' ಗೆ ಹೋಗಿ.</string>
<string name="warning_device_lock_screen_not_set_up_2">ಲಾಕ್ ಪರದೆಯನ್ನು ಹೊಂದಿಸಲು %s ಗೆ ಹೋಗಿ.</string>
<string name="menu_history_show_balance">ಬಾಕಿ ಮೊತ್ತ ತೋರಿಸಿ</string>
<string name="menu_history_transfers">ವರ್ಗಾವಣೆಗಳನ್ನು ಸೇರಿಸಿ</string>
<string name="menu_history">ಇತಿಹಾಸ</string>
Expand Down
2 changes: 1 addition & 1 deletion myExpenses/src/main/res/values-ms/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -577,7 +577,7 @@
<string name="pref_protection_device_lock_screen_title">Skrin kunci peranti</string>
<string name="pref_warning_only_one_protection">Sebelum anda guna perlindungan oleh %1$s, anda mesti matikan perlindungan oleh %2$s.</string>
<string name="warning_device_lock_screen_not_set_up_1">Selamatkan skrin kunci peranti belum dipasangkan.</string>
<string name="warning_device_lock_screen_not_set_up_2">Pergi ke \'Tetapan -&gt; Keselamatan -&gt; KunciSkrin\' untuk tetapkan skrin kunci.</string>
<string name="warning_device_lock_screen_not_set_up_2">Pergi ke %s untuk tetapkan skrin kunci.</string>
<string name="menu_history_show_balance">Tunjuk baki</string>
<string name="menu_history_transfers">Sertakan pemindahan</string>
<string name="menu_history">Sejarah</string>
Expand Down
2 changes: 1 addition & 1 deletion myExpenses/src/main/res/values-nl/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@
<string name="professional_key">Professionele Sleutel</string>
<string name="switch_to_yearly" tools:ignore="UnusedResources">Overstappen naar een jaarabonnement</string>
<string name="pref_protection_device_lock_screen_title">Vergrendelscherm van apparaat</string>
<string name="warning_device_lock_screen_not_set_up_2">Ga naar \'Instellingen -&gt; Beveiliging -&gt; Schermvergrendeling\' om een vergrendelscherm in te stellen.</string>
<string name="warning_device_lock_screen_not_set_up_2">Ga naar %s om een vergrendelscherm in te stellen.</string>
<string name="menu_history_show_balance">Toon balans</string>
<string name="menu_history">Geschiedenis</string>
<string name="history_chart_out_label">Uitgaven</string>
Expand Down
2 changes: 1 addition & 1 deletion myExpenses/src/main/res/values-pl/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -592,7 +592,7 @@
<string name="feature_deprecated">Wycofano</string>
<string name="pref_protection_device_lock_screen_title">Ekran blokady</string>
<string name="warning_device_lock_screen_not_set_up_1">Ekran bezpiecznej blokady dla urządzenia nie został ustawiony.</string>
<string name="warning_device_lock_screen_not_set_up_2">Udaj się do \'Ustawienia -&gt; Bezpieczeństwo -&gt; Blokada Ekranu\' w celu ustawienia blokady ekranu.</string>
<string name="warning_device_lock_screen_not_set_up_2">Udaj się do %s w celu ustawienia blokady ekranu.</string>
<string name="menu_history_show_balance">Pokaż bilans</string>
<string name="menu_history_transfers">Uwzględnij transfery</string>
<string name="menu_history">Historia</string>
Expand Down
2 changes: 1 addition & 1 deletion myExpenses/src/main/res/values-pt-rBR/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,7 @@
<string name="pref_protection_device_lock_screen_title">Ecrã de bloqueio do aparelho</string>
<string name="pref_warning_only_one_protection">Antes de usar a proteção por %1$s, você deve desativar a proteção por %2$s.</string>
<string name="warning_device_lock_screen_not_set_up_1">O ecrã de bloqueio de segurança do aparelho não foi configurado.</string>
<string name="warning_device_lock_screen_not_set_up_2">Vá para \'Configurações -&gt; Segurança -&gt; Ecrã de bloqueio\' para definir um ecrã de bloqueio.</string>
<string name="warning_device_lock_screen_not_set_up_2">Vá para %s para definir um ecrã de bloqueio.</string>
<string name="menu_history_show_balance">Exibir saldo</string>
<string name="menu_history_transfers">Incluir transferências</string>
<string name="menu_history">Histórico</string>
Expand Down
Loading

0 comments on commit 1ef5843

Please sign in to comment.