diff options
Diffstat (limited to 'app/src/main')
-rw-r--r-- | app/src/main/java/app/passwordstore/util/git/operation/GitOperation.kt | 5 | ||||
-rw-r--r-- | app/src/main/res/values-de/strings.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/values-fr/strings.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/values-gl/strings.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/values-it/strings.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/values-pl-rPL/strings.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/values-pt-rBR/strings.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/values-ru/strings.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/values-zh-rCN/strings.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/values/strings.xml | 2 |
10 files changed, 11 insertions, 12 deletions
diff --git a/app/src/main/java/app/passwordstore/util/git/operation/GitOperation.kt b/app/src/main/java/app/passwordstore/util/git/operation/GitOperation.kt index 7ee34404..92f17890 100644 --- a/app/src/main/java/app/passwordstore/util/git/operation/GitOperation.kt +++ b/app/src/main/java/app/passwordstore/util/git/operation/GitOperation.kt @@ -144,9 +144,8 @@ abstract class GitOperation(protected val callingActivity: FragmentActivity) { MaterialAlertDialogBuilder(callingActivity) .setMessage(callingActivity.resources.getString(R.string.ssh_preferences_dialog_text)) .setTitle(callingActivity.resources.getString(R.string.ssh_preferences_dialog_title)) - .setPositiveButton( - callingActivity.resources.getString(R.string.ssh_preferences_dialog_import) - ) { _, _ -> + .setPositiveButton(callingActivity.resources.getString(R.string.button_label_import)) { _, _ + -> getSshKey(false) } .setNegativeButton( diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index f47a9c6a..0a1bfd5e 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -42,7 +42,7 @@ <!-- Git Handler --> <string name="ssh_preferences_dialog_text">Bitte importieren oder generieren Sie Ihre SSH-Schlüsseldatei in den Einstellungen</string> <string name="ssh_preferences_dialog_title">Kein SSH-Key angegeben</string> - <string name="ssh_preferences_dialog_import">Importieren</string> + <string name="button_label_import">Importieren</string> <string name="ssh_preferences_dialog_generate">Generieren</string> <string name="passphrase_dialog_title">Authentifizieren</string> <string name="passphrase_dialog_text">Bitte setze ein Passwort für deinen SSH-Key. Lasse das Feld leer, wenn kein Passwort vergeben werden soll.</string> diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index aa364e8a..ea648db0 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -46,7 +46,7 @@ <!-- Git Handler --> <string name="ssh_preferences_dialog_text">Vous devez importer ou générer votre fichier de clef SSH dans les préférences</string> <string name="ssh_preferences_dialog_title">Absence de clef SSH</string> - <string name="ssh_preferences_dialog_import">Importer</string> + <string name="button_label_import">Importer</string> <string name="ssh_preferences_dialog_generate">Générer</string> <string name="passphrase_dialog_title">Authentification</string> <string name="passphrase_dialog_text">Saisissez le mot de passe associé à votre clef SSH. Laisser vide si il n\'y a pas de mot de passe.</string> diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 4e41912d..09bcbf15 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -46,7 +46,7 @@ <!-- Git Handler --> <string name="ssh_preferences_dialog_text">Importa ou crea o ficheiro de chave SSH nas preferencias</string> <string name="ssh_preferences_dialog_title">Sen chave SSH</string> - <string name="ssh_preferences_dialog_import">Importar</string> + <string name="button_label_import">Importar</string> <string name="ssh_preferences_dialog_generate">Crear</string> <string name="passphrase_dialog_title">Autenticar</string> <string name="passphrase_dialog_text">Escribe a frase de paso para a chave SSH</string> diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 28fe1809..0d84e6ef 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -46,7 +46,7 @@ <!-- Git Handler --> <string name="ssh_preferences_dialog_text">Sei pregato di importare o generare il tuo file della chiave SSH nelle preferenze</string> <string name="ssh_preferences_dialog_title">Nessuna chiave SSH</string> - <string name="ssh_preferences_dialog_import">Importa</string> + <string name="button_label_import">Importa</string> <string name="ssh_preferences_dialog_generate">Genera</string> <string name="passphrase_dialog_title">Autentica</string> <string name="passphrase_dialog_text">Sei pregato di fornire una frase segreta per la tua chiave SSH</string> diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml index f4bc361c..a13fc679 100644 --- a/app/src/main/res/values-pl-rPL/strings.xml +++ b/app/src/main/res/values-pl-rPL/strings.xml @@ -45,7 +45,7 @@ <!-- Git Handler --> <string name="ssh_preferences_dialog_text">Zaimportuj lub wygeneruj plik klucza SSH w preferencjach</string> <string name="ssh_preferences_dialog_title">Brak klucza SSH</string> - <string name="ssh_preferences_dialog_import">Importuj</string> + <string name="button_label_import">Importuj</string> <string name="ssh_preferences_dialog_generate">Wygeneruj</string> <string name="passphrase_dialog_title">Uwierzytelnij</string> <string name="passphrase_dialog_text">Podaj hasło dla klucza SSH</string> diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index fa453a6a..b9829a21 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -46,7 +46,7 @@ <!-- Git Handler --> <string name="ssh_preferences_dialog_text">Por favor, importe ou gere seu arquivo de chave SSH nas preferências</string> <string name="ssh_preferences_dialog_title">Nenhuma chave SSH</string> - <string name="ssh_preferences_dialog_import">Importar</string> + <string name="button_label_import">Importar</string> <string name="ssh_preferences_dialog_generate">Gerar</string> <string name="passphrase_dialog_title">Autenticar</string> <string name="passphrase_dialog_text">Por favor, forneça a senha para a sua chave SSH</string> diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index a9f383b0..1121783a 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -50,7 +50,7 @@ <!-- Git Handler --> <string name="ssh_preferences_dialog_text">Пожалуйста, импортируйте или сгенерируйте новый SSH ключ в настройках</string> <string name="ssh_preferences_dialog_title">Нет SSH ключа</string> - <string name="ssh_preferences_dialog_import">Импортировать</string> + <string name="button_label_import">Импортировать</string> <string name="ssh_preferences_dialog_generate">Сгенерировать</string> <string name="passphrase_dialog_title">Авторизоваться</string> <string name="passphrase_dialog_text">Пожалуйста, введите пароль от SSH ключа. Оставьте поле пустым, если пароль отсутствует.</string> diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 9df6c623..e72d0d86 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -45,7 +45,7 @@ <!-- Git Handler --> <string name="ssh_preferences_dialog_text">请在首选项中导入或生成您的SSH密钥文件</string> <string name="ssh_preferences_dialog_title">没有SSH密钥</string> - <string name="ssh_preferences_dialog_import">导入</string> + <string name="button_label_import">导入</string> <string name="ssh_preferences_dialog_generate">生成</string> <string name="passphrase_dialog_title">认证</string> <string name="passphrase_dialog_text">请提供您的SSH密钥的密码</string> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 89ce628b..9b28814f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -56,7 +56,7 @@ <!-- Git Handler --> <string name="ssh_preferences_dialog_text">Please import or generate your SSH key file in the preferences</string> <string name="ssh_preferences_dialog_title">No SSH key</string> - <string name="ssh_preferences_dialog_import">Import</string> + <string name="button_label_import">Import</string> <string name="ssh_preferences_dialog_generate">Generate</string> <string name="passphrase_dialog_title">Authenticate</string> <string name="passphrase_dialog_text">Please provide the passphrase for your SSH key</string> |