From 122131ba9f05915b5a125cc890f39cdbc6a4e43a Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Thu, 23 Feb 2023 18:38:46 +0530
Subject: fix: clarify OTP import failure strings

---
 .../java/app/passwordstore/ui/crypto/PasswordCreationActivity.kt    | 6 +++---
 app/src/main/res/values-de/strings.xml                              | 2 +-
 app/src/main/res/values-fr/strings.xml                              | 2 +-
 app/src/main/res/values-gl/strings.xml                              | 2 +-
 app/src/main/res/values-it/strings.xml                              | 2 +-
 app/src/main/res/values-pt-rBR/strings.xml                          | 2 +-
 app/src/main/res/values-ru/strings.xml                              | 2 +-
 app/src/main/res/values-zh-rCN/strings.xml                          | 2 +-
 app/src/main/res/values/strings.xml                                 | 5 ++---
 9 files changed, 12 insertions(+), 13 deletions(-)

(limited to 'app')

diff --git a/app/src/main/java/app/passwordstore/ui/crypto/PasswordCreationActivity.kt b/app/src/main/java/app/passwordstore/ui/crypto/PasswordCreationActivity.kt
index 1d20eae9..9466daf2 100644
--- a/app/src/main/java/app/passwordstore/ui/crypto/PasswordCreationActivity.kt
+++ b/app/src/main/java/app/passwordstore/ui/crypto/PasswordCreationActivity.kt
@@ -96,14 +96,14 @@ class PasswordCreationActivity : BasePgpActivity() {
         else binding.extraContent.append(contents)
         snackbar(message = getString(R.string.otp_import_success))
       } else {
-        snackbar(message = getString(R.string.otp_import_failure))
+        snackbar(message = getString(R.string.otp_import_failure_generic))
       }
     }
 
   private val imageImportAction =
     registerForActivityResult(ActivityResultContracts.GetContent()) { imageUri ->
       if (imageUri == null) {
-        snackbar(message = getString(R.string.otp_import_failure))
+        snackbar(message = getString(R.string.otp_import_failure_no_selection))
         return@registerForActivityResult
       }
       val bitmap =
@@ -130,7 +130,7 @@ class PasswordCreationActivity : BasePgpActivity() {
           snackbar(message = getString(R.string.otp_import_success))
           binding.otpImportButton.isVisible = false
         }
-        .onFailure { snackbar(message = getString(R.string.otp_import_failure)) }
+        .onFailure { snackbar(message = getString(R.string.otp_import_failure_generic)) }
     }
 
   override fun onCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 4de86ad9..a36d2694 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -261,7 +261,7 @@
   <string name="password_creation_duplicate_error">Datei existiert bereits, bitte benutzen Sie einen anderen Dateinamen</string>
   <string name="add_otp">OTP hinzufügen</string>
   <string name="otp_import_success">TOTP-Konfiguration erfolgreich importiert</string>
-  <string name="otp_import_failure">Import der TOTP-Konfiguration fehlgeschlagen</string>
+  <string name="otp_import_failure_generic">Import der TOTP-Konfiguration fehlgeschlagen</string>
   <string name="exporting_passwords">Exportiere Passwörter…</string>
   <string name="invalid_filename_text">Dateiname darf nicht \'/\' enthalten, Verzeichnis oben setzen</string>
   <string name="directory_hint">Ordner</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index e71117c1..b6eba4ae 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -265,7 +265,7 @@
   <string name="password_creation_duplicate_error">Le fichier existe déjà, veuillez utiliser un autre nom</string>
   <string name="add_otp">Ajouter OTP</string>
   <string name="otp_import_success">Configuration TOTP importée avec succès</string>
-  <string name="otp_import_failure">Impossible d\'importer la configuration TOTP</string>
+  <string name="otp_import_failure_generic">Impossible d\'importer la configuration TOTP</string>
   <string name="exporting_passwords">Exportation des mots de passe…</string>
   <string name="invalid_filename_text">Le nom du fichier ne doit pas contenir \'/\', définir le répertoire parent</string>
   <string name="directory_hint">Dossier</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 0e0665db..361dd438 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -271,7 +271,7 @@ a app desde unha fonte de confianza, como a Play Store, Amazon Appstore, F-Droid
   <string name="password_creation_duplicate_error">Xa existe o ficheiro, usa un nome diferente</string>
   <string name="add_otp">Engade OTP</string>
   <string name="otp_import_success">Importouse correctamente a configuración TOTP</string>
-  <string name="otp_import_failure">Fallou a importación da configuración TOTP</string>
+  <string name="otp_import_failure_generic">Fallou a importación da configuración TOTP</string>
   <string name="exporting_passwords">Exportando contrasinais…</string>
   <string name="invalid_gpg_id">Atopouse .gpg-id, pero contén un ID de chave, impresión dixital ou ID de usuaria non válidos</string>
   <string name="invalid_filename_text">O nome do ficheiro non pode conter \'/\', establece un directorio superior</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index df83cd4a..35d1b242 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -260,7 +260,7 @@
   <string name="password_creation_duplicate_error">Il file esiste già, sei pregato di usare un nome differente</string>
   <string name="add_otp">Aggiungi OTP</string>
   <string name="otp_import_success">Configurazione TOTP importata correttamente</string>
-  <string name="otp_import_failure">Impossibile importare la configurazione di TOTP</string>
+  <string name="otp_import_failure_generic">Impossibile importare la configurazione di TOTP</string>
   <string name="exporting_passwords">Esportando le password…</string>
   <string name="invalid_filename_text">Il nome del file non deve contenere \'/0, imposta la directory sopra</string>
   <string name="directory_hint">Directory</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 19d2fac7..89dfb9e7 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -270,7 +270,7 @@
   <string name="password_creation_duplicate_error">O arquivo já existe, por favor use um nome diferente</string>
   <string name="add_otp">Adicionar OTP</string>
   <string name="otp_import_success">Configuração TOTP importada com sucesso</string>
-  <string name="otp_import_failure">Falha ao importar a configuração TOTP</string>
+  <string name="otp_import_failure_generic">Falha ao importar a configuração TOTP</string>
   <string name="exporting_passwords">Exportando senhas…</string>
   <string name="invalid_gpg_id">Encontrado .gpg-id, mas contém um ID de chave, fingerprint ou ID de usuário inválidos</string>
   <string name="invalid_filename_text">Nome do arquivo não deve conter \'/\', defina o diretório acima</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 9dc83951..06f0165c 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -263,7 +263,7 @@
   <string name="password_creation_duplicate_error">Файл с таким названием уже существует! Используйте другое имя</string>
   <string name="add_otp">Добавить OTP</string>
   <string name="otp_import_success">Конфигурация TOTP успешно импортирована</string>
-  <string name="otp_import_failure">Не удалось импортировать конфигурацию TOTP</string>
+  <string name="otp_import_failure_generic">Не удалось импортировать конфигурацию TOTP</string>
   <string name="exporting_passwords">Экспорт паролей…</string>
   <string name="invalid_filename_text">Имя файла не должно содержать \'/\', укажите директорию выше</string>
   <string name="directory_hint">Директория</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 9dfdd4ec..92903d65 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -275,7 +275,7 @@ personal.com</string>
   <string name="password_creation_duplicate_error">文件已存在,请使用其他名称</string>
   <string name="add_otp">添加 OTP</string>
   <string name="otp_import_success">导入TOTP配置成功</string>
-  <string name="otp_import_failure">导入TOTP配置失败</string>
+  <string name="otp_import_failure_generic">导入TOTP配置失败</string>
   <string name="exporting_passwords">正在导出密码…</string>
   <string name="invalid_gpg_id">找到了 .gpg-id，但它包含无效的密钥ID、指纹或用户ID</string>
   <string name="invalid_filename_text">文件名不能包含\'/\'</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c59d3486..db2be860 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -290,8 +290,6 @@
   <string name="preference_custom_public_suffixes_summary">Autofill will distinguish subdomains of these domains</string>
   <string name="preference_custom_public_suffixes_hint">company.com\npersonal.com</string>
 
-  <!-- OpenKeychain errors -->
-
   <!-- Password creation failure -->
   <string name="password_creation_file_fail_title">Error</string>
   <string name="password_creation_file_write_fail_message">Failed to write password file to the store, please try again.</string>
@@ -299,7 +297,8 @@
   <string name="password_creation_duplicate_error">File already exists, please use a different name</string>
   <string name="add_otp">Add OTP</string>
   <string name="otp_import_success">Successfully imported TOTP configuration</string>
-  <string name="otp_import_failure">Failed to import TOTP configuration</string>
+  <string name="otp_import_failure_generic">Failed to import TOTP configuration</string>
+  <string name="otp_import_failure_no_selection">No image file was selected</string>
   <string name="exporting_passwords">Exporting passwords…</string>
   <string name="invalid_gpg_id">Found .gpg-id, but it contains an invalid key ID, fingerprint or user ID</string>
   <string name="invalid_filename_text">File name must not contain \'/\', set directory above</string>
-- 
cgit v1.2.3