Fix reset dialog texts and buttons

2024-12-23 10:11:52 +03:00 · 2024-01-26 10:46:41 +01:00 · 2024-01-26 10:46:41 +01:00 · aee0824bf3
commit aee0824bf3
parent 5fdb34f343
6 changed files with 29 additions and 4 deletions
--- a/lib/app/views/reset_dialog.dart
+++ b/lib/app/views/reset_dialog.dart
@ -164,6 +164,7 @@ class _ResetDialogState extends ConsumerState<ResetDialog> {
          children: [
            SegmentedButton<Capability>(
              emptySelectionAllowed: true,
+              //showSelectedIcon: false,
              segments: [
                Capability.oath,
                Capability.fido2,
@ -172,7 +173,11 @@ class _ResetDialogState extends ConsumerState<ResetDialog> {
                  .where((c) => supported & c.value != 0)
                  .map((c) => ButtonSegment(
                        value: c,
-                        label: Text(c.getDisplayName(l10n)),
+                        icon: const Icon(null),
+                        label: Padding(
+                          padding: const EdgeInsets.only(right: 22),
+                          child: Text(c.getDisplayName(l10n)),
+                        ),
                        enabled: enabled & c.value != 0,
                      ))
                  .toList(),
@ -188,7 +193,7 @@ class _ResetDialogState extends ConsumerState<ResetDialog> {
                Capability.oath => l10n.p_warning_factory_reset,
                Capability.piv => l10n.p_warning_piv_reset,
                Capability.fido2 => l10n.p_warning_deletes_accounts,
-                _ => 'Factory reset an application.',
+                _ => l10n.p_factory_reset_an_app,
              },
              style: Theme.of(context)
                  .textTheme
@ -200,7 +205,7 @@ class _ResetDialogState extends ConsumerState<ResetDialog> {
                Capability.oath => l10n.p_warning_disable_credentials,
                Capability.piv => l10n.p_warning_piv_reset_desc,
                Capability.fido2 => l10n.p_warning_disable_accounts,
-                _ => 'Select an application above to reset.',
+                _ => l10n.p_factory_reset_desc,
              },
            ),
            if (_application == Capability.fido2 && _currentStep >= 0) ...[
--- a/lib/l10n/app_de.arb
+++ b/lib/l10n/app_de.arb
@ -660,12 +660,16 @@
    },
    "s_reset_piv": null,
    "l_piv_app_reset": null,
+    "p_factory_reset_an_app": null,
+    "p_factory_reset_desc": null,
    "p_warning_factory_reset": "Achtung! Das löscht alle OATH TOTP/HOTP Konten unwiederbringlich von Ihrem YubiKey.",
    "p_warning_disable_credentials": "Ihre OATH Anmeldeinformationen und jedes gesetzte Passwort wird von diesem YubiKey entfernt. Deaktivieren Sie diese zuerst auf den zugehörigen Webseiten, um nicht aus ihren Konten ausgesperrt zu werden.",
    "p_warning_deletes_accounts": "Achtung! Das löscht alle U2F und FIDO2 Konten unwiederbringlich von Ihrem YubiKey.",
    "p_warning_disable_accounts": "Ihre Anmeldeinformationen und jede gesetzte PIN wird von diesem YubiKey entfernt. Deaktivieren Sie diese zuerst auf den zugehörigen Webseiten, um nicht aus ihren Konten ausgesperrt zu werden.",
    "p_warning_piv_reset": null,
    "p_warning_piv_reset_desc": null,
+    "p_warning_global_reset": null,
+    "p_warning_global_reset_desc": null,

    "@_copy_to_clipboard": {},
    "l_copy_to_clipboard": "In die Zwischenablage kopieren",
--- a/lib/l10n/app_en.arb
+++ b/lib/l10n/app_en.arb
@ -660,12 +660,16 @@
    },
    "s_reset_piv": "Reset PIV",
    "l_piv_app_reset": "PIV application reset",
+    "p_factory_reset_an_app": "Factory reset an application on your YubiKey.",
+    "p_factory_reset_desc": "Data is stored in multiple applications on the YubiKey, some of which can be factory reset independently of each other.\n\nSelect an application above to reset.",
    "p_warning_factory_reset": "Warning! This will irrevocably delete all OATH TOTP/HOTP accounts from your YubiKey.",
    "p_warning_disable_credentials": "Your OATH credentials, as well as any password set, will be removed from this YubiKey. Make sure to first disable these from their respective web sites to avoid being locked out of your accounts.",
-    "p_warning_deletes_accounts": "Warning! This will irrevocably delete all U2F and FIDO2 accounts from your YubiKey.",
+    "p_warning_deletes_accounts": "Warning! This will irrevocably delete all U2F and FIDO2 accounts, such as Passkeys, from your YubiKey.",
    "p_warning_disable_accounts": "Your credentials, as well as any PIN set, will be removed from this YubiKey. Make sure to first disable these from their respective web sites to avoid being locked out of your accounts.",
    "p_warning_piv_reset": "Warning! All data stored for PIV will be irrevocably deleted from your YubiKey.",
    "p_warning_piv_reset_desc": "This includes private keys and certificates. Your PIN, PUK, and management key will be reset to their factory default values.",
+    "p_warning_global_reset": "Warning! This will irrevocably delete all saved data, including credentials, from your YubiKey.",
+    "p_warning_global_reset_desc": "Factory reset the applications on your YubiKey. PIN will be reset to its factorey default value, and registered fingerprints will be removed. Any keys, certificates, or other credentials will all be permanently removed.",

    "@_copy_to_clipboard": {},
    "l_copy_to_clipboard": "Copy to clipboard",
--- a/lib/l10n/app_fr.arb
+++ b/lib/l10n/app_fr.arb
@ -660,12 +660,16 @@
    },
    "s_reset_piv": "Réinitialiser le PIV",
    "l_piv_app_reset": "L'application PIV à été réinitialisée",
+    "p_factory_reset_an_app": null,
+    "p_factory_reset_desc": null,
    "p_warning_factory_reset": "Attention! Cette action supprimera de manière irrévocable tous les comptes OATH TOTP/HOTP de votre YubiKey.",
    "p_warning_disable_credentials": "Vos identifiants OATH, ainsi que vos mots de passes, seront supprimés de votre YubiKey. Assurez vous de désactiver les identifiants des sites pour ne pas être verrouillé hors de vos comptes.",
    "p_warning_deletes_accounts": "Attention! Cette action supprimera de manière irrévocable tous les comptes U2F et FIDO2 de votre YubiKey.",
    "p_warning_disable_accounts": "Vos identifiants, ainsi que les codes PIN associés, seront supprimés de votre YubiKey. Assurez vous de désactiver les identifiants des sites pour ne pas être verrouillé hors de vos comptes.",
    "p_warning_piv_reset": "Attention! Cette action supprimera de manière irrévocable toutes les données PIV stockées sur votre YubiKey.",
    "p_warning_piv_reset_desc": "Cela inclus les clé privées et les certificats. Votre PIN, PUK, clé de management seront réinitialisés à leur valeurs d'usine.",
+    "p_warning_global_reset": null,
+    "p_warning_global_reset_desc": null,

    "@_copy_to_clipboard": {},
    "l_copy_to_clipboard": "Copier vers le presse papier",
--- a/lib/l10n/app_ja.arb
+++ b/lib/l10n/app_ja.arb
@ -660,12 +660,16 @@
    },
    "s_reset_piv": "PIVのリセット",
    "l_piv_app_reset": "PIVアプリケーションのリセット",
+    "p_factory_reset_an_app": null,
+    "p_factory_reset_desc": null,
    "p_warning_factory_reset": "警告！これによりすべてのOATH TOTP/HOTPアカウントがYubiKeyから削除されて、復旧不可能となります",
    "p_warning_disable_credentials": "あなたのOATHクレデンシャル情報とパスワードは、このYubiKeyから削除されます。アカウントからロックアウトされないように、まずそれぞれのWebサイトからこれらを無効化してください",
    "p_warning_deletes_accounts": ":警告！これによりYubiKeyからすべてのU2FおよびFIDO2アカウントが削除されて、復旧不可能となります",
    "p_warning_disable_accounts": "あなたのクレデンシャル情報とすべてのPINは、このYubiKeyから削除されます。 アカウントからロックアウトされないように、まずそれぞれのWebサイトでこれらを無効化してください",
    "p_warning_piv_reset": "警告！PIVデータは、YubiKeyから削除されて、復旧不可能となります",
    "p_warning_piv_reset_desc": "これには秘密鍵と証明書が含まれます。 PIN、PUK、およびManagement keyは工場出荷時のデフォルト値にリセットされます",
+    "p_warning_global_reset": null,
+    "p_warning_global_reset_desc": null,

    "@_copy_to_clipboard": {},
    "l_copy_to_clipboard": "クリップボードにコピー",
--- a/lib/l10n/app_pl.arb
+++ b/lib/l10n/app_pl.arb
@ -660,12 +660,16 @@
    },
    "s_reset_piv": "Resetuj PIV",
    "l_piv_app_reset": "Funkcja PIV została zresetowana",
+    "p_factory_reset_an_app": null,
+    "p_factory_reset_desc": null,
    "p_warning_factory_reset": "Uwaga! Spowoduje to nieodwracalne usunięcie wszystkich kont OATH TOTP/HOTP z klucza YubiKey.",
    "p_warning_disable_credentials": "Twoje poświadczenia OATH, jak również wszelkie ustawione hasła, zostaną usunięte z tego klucza YubiKey. Upewnij się, że najpierw wyłączono je w odpowiednich witrynach internetowych, aby uniknąć zablokowania kont.",
    "p_warning_deletes_accounts": "Uwaga! Spowoduje to nieodwracalne usunięcie wszystkich kont U2F i FIDO2 z klucza YubiKey.",
    "p_warning_disable_accounts": "Twoje poświadczenia, a także wszelkie ustawione kody PIN, zostaną usunięte z tego klucza YubiKey. Upewnij się, że najpierw wyłączono je w odpowiednich witrynach internetowych, aby uniknąć zablokowania kont.",
    "p_warning_piv_reset": "Ostrzeżenie! Wszystkie dane przechowywane dla PIV zostaną nieodwracalnie usunięte z klucza YubiKey.",
    "p_warning_piv_reset_desc": "Obejmuje to klucze prywatne i certyfikaty. Kod PIN, PUK i klucz zarządzania zostaną zresetowane do domyślnych wartości fabrycznych.",
+    "p_warning_global_reset": null,
+    "p_warning_global_reset_desc": null,

    "@_copy_to_clipboard": {},
    "l_copy_to_clipboard": "Skopiuj do schowka",