diff options
author | Harsh Shandilya <me@msfjarvis.dev> | 2022-07-19 02:17:06 +0530 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-18 20:47:06 +0000 |
commit | fc81ee83d96cc4b2c9bbc2c3ae743bf7a9acf86a (patch) | |
tree | 108e3dcc40c80aca895575488284c7682bd8f801 /app/src | |
parent | 018939f815d939cc5ee3e97bea373d26ce94626c (diff) |
Misc cleanups and bugfixes (#2019)
* Fix decrypt activity items being editable
* Remove unused resources and re-roll lint baseline
* Make lint mark all warnings as errors
Diffstat (limited to 'app/src')
-rw-r--r-- | app/src/main/res/layout/item_field.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/values-de/strings.xml | 13 | ||||
-rw-r--r-- | app/src/main/res/values-fr/strings.xml | 12 | ||||
-rw-r--r-- | app/src/main/res/values-gl/strings.xml | 13 | ||||
-rw-r--r-- | app/src/main/res/values-it/strings.xml | 12 | ||||
-rw-r--r-- | app/src/main/res/values-pt-rBR/strings.xml | 13 | ||||
-rw-r--r-- | app/src/main/res/values-ru/strings.xml | 13 | ||||
-rw-r--r-- | app/src/main/res/values/strings.xml | 14 |
8 files changed, 1 insertions, 91 deletions
diff --git a/app/src/main/res/layout/item_field.xml b/app/src/main/res/layout/item_field.xml index 9e8dec3c..3d275f35 100644 --- a/app/src/main/res/layout/item_field.xml +++ b/app/src/main/res/layout/item_field.xml @@ -21,7 +21,7 @@ android:id="@+id/item_text" android:layout_width="match_parent" android:layout_height="wrap_content" - android:inputType="none" + android:editable="false" android:textIsSelectable="true" tools:text="p@55w0rd!" /> diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index a582befb..bb54499a 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -32,7 +32,6 @@ <string name="git_commit_remove_text">%1$s aus dem Store entfernen.</string> <string name="git_commit_move_text">Benenne %1$s in %2$s um.</string> <string name="git_commit_move_multiple_text">Verschiebe mehrere Passwörter nach %1$s.</string> - <string name="git_commit_gpg_id">Initialisiere GPG-IDs in %1$s.</string> <!-- PGPHandler --> <string name="clipboard_password_toast_text">Passwort ist in der Zwischenablage, du hast %d Sekunden, um es einzufügen.</string> <string name="clipboard_password_no_clear_toast_text">Passwort wurde in die Zwischenablage kopiert</string> @@ -258,9 +257,6 @@ <string name="preference_custom_public_suffixes_summary">Autofill wird Subdomains dieser Domains unterscheiden</string> <string name="preference_custom_public_suffixes_hint">company.com\npersonal.com</string> <!-- OpenKeychain errors --> - <string name="openpgp_error_wrong_passphrase">Falsches Passwort</string> - <string name="openpgp_error_no_user_ids">Kein passender PGP Schlüssel gefunden</string> - <string name="openpgp_error_unknown">Fehler von OpenKeyChain : %s</string> <!-- Password creation failure --> <string name="password_creation_file_fail_title">Fehler</string> <string name="password_creation_file_write_fail_message">Fehler beim Speichern der Passwortdatei auf dem Speicher, bitte versuchen Sie es erneut.</string> @@ -270,8 +266,6 @@ <string name="otp_import_success">TOTP-Konfiguration erfolgreich importiert</string> <string name="otp_import_failure">Import der TOTP-Konfiguration fehlgeschlagen</string> <string name="exporting_passwords">Exportiere Passwörter…</string> - <string name="invalid_gpg_id">.gpg-id gefunden, enthält aber eine ungültige Schlüssel-ID, Fingerabdruck oder Benutzer-ID</string> - <string name="short_key_ids_unsupported">Eine Schlüssel-ID in .gpg-id ist zu kurz, bitte verwenden Sie entweder lange Schlüssel-IDs (16 Zeichen) oder Fingerabdrücke (40 Zeichen)</string> <string name="invalid_filename_text">Dateiname darf nicht \'/\' enthalten, Verzeichnis oben setzen</string> <string name="directory_hint">Ordner</string> <string name="new_folder_set_gpg_key">GPG Schlüssel für Ordner festlegen</string> @@ -287,12 +281,6 @@ <string name="git_break_out_of_detached_success">Es gab einen Klonflikt während des rebase-Prozesses. Dein lokaler %1$s branch wurde auf einen anderen Branch namens %2$s gepusht.\nNutze diesen Branch um Konflikte auf deinem Computer zu beheben</string> <string name="git_break_out_of_detached_unneeded">Das Repository befindet sich nicht im Rebase-Prozess, es ist nicht nötig, den Zustand auf einen weiteren Branch zu pushen</string> <!-- OpenKeychain not installed --> - <string name="openkeychain_not_installed_title">OpenKeychain nicht installiert</string> - <string name="openkeychain_not_installed_message">OpenKeychain wird für Password Store benötigt, bitte installieren Sie es von einem der unten aufgeführten Stores</string> - <string name="openkeychain_not_installed_google_play">Google Play</string> - <string name="play_deeplink_template">https://play.google.com/store/apps/details?id=%1$s</string> - <string name="openkeychain_not_installed_fdroid">F-Droid</string> - <string name="fdroid_deeplink_template">https://f-droid.org/en/packages/%1$s/</string> <!-- GPG key selection in folder creation --> <string name="folder_creation_err_file_exists">Dateiname bereits vergeben</string> <string name="folder_creation_err_folder_exists">Ein Ordner mit diesem Namen existiert bereits</string> @@ -324,7 +312,6 @@ <string name="otp_import_manual_entry">Manuell eingeben</string> <string name="otp_import_manual_hint_secret">Schlüssel</string> <string name="otp_import_manual_hint_account">Account</string> - <string name="gpg_key_select_mandatory">Die Auswahl eines GPG-Schlüssels ist notwendig, um fortzufahren</string> <string name="place_shortcut_on_home_screen">Verknüpfung auf dem Home-Screen erstellen</string> <string name="password_list_fab_content_description">Neues Passwort oder neuen Ordner erstellen</string> <string name="pgp_key_import_failed">Fehler beim Import des PGP-Keys</string> diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 9ed41153..711e91ed 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -36,7 +36,6 @@ <string name="git_commit_remove_text">Suppression de %1$s.</string> <string name="git_commit_move_text">Renommer %1$sà %2$s. </string> <string name="git_commit_move_multiple_text">Déplacement de mots de passe vers %1$s.</string> - <string name="git_commit_gpg_id">Initialisation des identifiants GPG dans %1$s.</string> <!-- PGPHandler --> <string name="clipboard_password_toast_text">Mot de passe copié dans le presse papier, vous avez %d secondes pour coller celui-ci.</string> <string name="clipboard_password_no_clear_toast_text">Mot de passe copié dans le presse-papiers</string> @@ -262,9 +261,6 @@ <string name="preference_custom_public_suffixes_summary">Le remplissage automatique distinguera les sous-domaines de ces domaines</string> <string name="preference_custom_public_suffixes_hint">societe.com\npersonnel.com</string> <!-- OpenKeychain errors --> - <string name="openpgp_error_wrong_passphrase">Phrase de passe incorrecte</string> - <string name="openpgp_error_no_user_ids">Aucune clé PGP correspondante trouvée</string> - <string name="openpgp_error_unknown">Erreur d\'OpenKeyChain : %s</string> <!-- Password creation failure --> <string name="password_creation_file_fail_title">Erreur</string> <string name="password_creation_file_write_fail_message">Impossible d\'écrire le fichier de mot de passe dans le magasin, veuillez réessayer.</string> @@ -274,8 +270,6 @@ <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="exporting_passwords">Exportation des mots de passe…</string> - <string name="invalid_gpg_id">.gpg-id trouvé, mais il contient un ID de clé, une empreinte digitale ou un ID utilisateur invalide</string> - <string name="short_key_ids_unsupported">Un ID de clé dans .gpg-id est trop court, veuillez utiliser soit des identifiants de clés longs (16 caractères) soit des empreintes digitales (40 caractères)</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> <string name="new_folder_set_gpg_key">Définir la clé GPG pour le dossier</string> @@ -291,12 +285,6 @@ <string name="git_break_out_of_detached_success">Il y a eu un conflit lors de la tentative de rebase. Votre branche locale %1$s a été poussée vers une autre branche nommée %2$s\n Utilisez cette branche pour résoudre les conflits sur votre ordinateur</string> <string name="git_break_out_of_detached_unneeded">Le dépôt n\'est pas rebasé, pas besoin de pousser vers une autre branche</string> <!-- OpenKeychain not installed --> - <string name="openkeychain_not_installed_title">OpenKeychain non installé</string> - <string name="openkeychain_not_installed_message">OpenKeychain est nécessaire pour le fonctionnement de Password Store, veuillez l\'installer depuis l\'une des boutiques d\'applications ci-dessous</string> - <string name="openkeychain_not_installed_google_play">Google Play</string> - <string name="play_deeplink_template">https://play.google.com/store/apps/details?id=%1$s</string> - <string name="openkeychain_not_installed_fdroid">F-Droid</string> - <string name="fdroid_deeplink_template">https://f-droid.org/fr/packages/%1$s/</string> <!-- GPG key selection in folder creation --> <string name="folder_creation_err_file_exists">Un fichier portant ce nom existe déjà</string> <string name="folder_creation_err_folder_exists">Un dossier portant ce nom existe déjà</string> diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 6bababb4..c2974b1c 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -36,7 +36,6 @@ <string name="git_commit_remove_text">Eliminar %1$s da almacenaxe.</string> <string name="git_commit_move_text">Mudar nome %1$s a %2$s.</string> <string name="git_commit_move_multiple_text">Mover varios contrasinais a %1$s.</string> - <string name="git_commit_gpg_id">Iniciar IDs GPG en %1$s.</string> <!-- PGPHandler --> <string name="clipboard_password_toast_text">Contrasinal copiado ao portapapeis, tes %d segundos para pegala nalgures.</string> <string name="clipboard_password_no_clear_toast_text">Contrasinal copiado ao portapapeis</string> @@ -263,9 +262,6 @@ a app desde unha fonte de confianza, como a Play Store, Amazon Appstore, F-Droid <string name="preference_custom_public_suffixes_summary">Autofill distinguirá entre subdominios nestes dominios</string> <string name="preference_custom_public_suffixes_hint">empresa.com\npersoal.com</string> <!-- OpenKeychain errors --> - <string name="openpgp_error_wrong_passphrase">Frase de paso incorrecta</string> - <string name="openpgp_error_no_user_ids">Non se atopan chaves PGP coincidentes</string> - <string name="openpgp_error_unknown">Fallo desde OpenKeyChain: %s</string> <!-- Password creation failure --> <string name="password_creation_file_fail_title">Fallo</string> <string name="password_creation_file_write_fail_message">Fallo ó escribir o ficheiro de contrasinal no almacén, inténtao outra vez.</string> @@ -275,8 +271,6 @@ a app desde unha fonte de confianza, como a Play Store, Amazon Appstore, F-Droid <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="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="short_key_ids_unsupported">O ID da chave no .gpg-id é demasiado curto, usa un ID de chave máis longo (16 caracteres) ou impresión dixital (40 caracteres)</string> <string name="invalid_filename_text">O nome do ficheiro non pode conter \'/\', establece un directorio superior</string> <string name="directory_hint">Directorio</string> <string name="new_folder_set_gpg_key">Establece chave GPG para o directorio</string> @@ -292,12 +286,6 @@ a app desde unha fonte de confianza, como a Play Store, Amazon Appstore, F-Droid <string name="git_break_out_of_detached_success">Hai un conflito ó realizar rebase. A túa póla local %1$s fixo push a outra póla chamada %2$s\nUsa esta póla para resolver o conflito na túa computadora</string> <string name="git_break_out_of_detached_unneeded">O repositorio non cambiou de base, non é preciso cambiar a outra póla</string> <!-- OpenKeychain not installed --> - <string name="openkeychain_not_installed_title">OpenKeychain non está instalada</string> - <string name="openkeychain_not_installed_message">OpenKeychain é requerida para que Password Store funcione, por favor instálaa desde algún destos repositorios</string> - <string name="openkeychain_not_installed_google_play">Google Play</string> - <string name="play_deeplink_template">https://play.google.com/store/apps/details?id=%1$s</string> - <string name="openkeychain_not_installed_fdroid">F-Droid</string> - <string name="fdroid_deeplink_template">https://f-droid.org/en/packages/%1$s/</string> <!-- GPG key selection in folder creation --> <string name="folder_creation_err_file_exists">Xa existe un ficheiro con ese nome</string> <string name="folder_creation_err_folder_exists">Xa existe un cartafol con ese nome</string> @@ -330,7 +318,6 @@ a app desde unha fonte de confianza, como a Play Store, Amazon Appstore, F-Droid <string name="otp_import_manual_entry">Escribir manualmente</string> <string name="otp_import_manual_hint_secret">Segredo</string> <string name="otp_import_manual_hint_account">Conta</string> - <string name="gpg_key_select_mandatory">É preciso elexir unha chave GPG para continuar</string> <string name="place_shortcut_on_home_screen">Crear atallo na pantalla de inicio</string> <string name="password_list_fab_content_description">Crear novo contrasinal ou cartafol</string> <string name="pgp_key_import_failed">Fallou a importación da chave PGP</string> diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 40505aef..1b994b28 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -36,7 +36,6 @@ <string name="git_commit_remove_text">Rimuovi %1$s dal negozio.</string> <string name="git_commit_move_text">Rinomina %1$s in %2$s.</string> <string name="git_commit_move_multiple_text">Sposta più password in %1$s.</string> - <string name="git_commit_gpg_id">Inizializza gli ID del GPG in %1$s.</string> <!-- PGPHandler --> <string name="clipboard_password_toast_text">Password copiata negli appunti, hai %d secondi per incollarla da qualche parte.</string> <string name="clipboard_password_no_clear_toast_text">Password copiata negli appunti</string> @@ -257,9 +256,6 @@ <string name="preference_custom_public_suffixes_summary">L\'auto-completamento distinguerà i sottodomini di questi domini</string> <string name="preference_custom_public_suffixes_hint">company.com\npersonal.com</string> <!-- OpenKeychain errors --> - <string name="openpgp_error_wrong_passphrase">Frase segreta scorretta</string> - <string name="openpgp_error_no_user_ids">Nessuna corrispondenza delle chiavi PGP trovata</string> - <string name="openpgp_error_unknown">Errore da OpenKeyChain : %s</string> <!-- Password creation failure --> <string name="password_creation_file_fail_title">Errore</string> <string name="password_creation_file_write_fail_message">Impossibile scrivere il file delle password al negozio, sei pregato di riprovare.</string> @@ -269,8 +265,6 @@ <string name="otp_import_success">Configurazione TOTP importata correttamente</string> <string name="otp_import_failure">Impossibile importare la configurazione di TOTP</string> <string name="exporting_passwords">Esportando le password…</string> - <string name="invalid_gpg_id">Trovato .gpg-id, ma contiene un ID del tasto, un\'impronta digitale o ID utente non valido</string> - <string name="short_key_ids_unsupported">Un ID del tasto in .gpg-id è troppo breve, sei pregato di usare un ID chiave lungo (16 caratteri) o le impronte digitali (40 caratteri)</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> <string name="new_folder_set_gpg_key">Imposta la chiave GPG per la directory</string> @@ -285,12 +279,6 @@ <string name="git_break_out_of_detached_success">Si è verificato un conflitto provando a ricollocare. Il tuo ramo locale %1$s è stato premuto all\'altro ramo denominato %2$s\n Usa questo ramo per risolvere il conflitto sul tuo computer</string> <string name="git_break_out_of_detached_unneeded">La repository non si sta ricollocando, nessun bisogno di spingere all\'altro ramo</string> <!-- OpenKeychain not installed --> - <string name="openkeychain_not_installed_title">OpenKeychain non installato</string> - <string name="openkeychain_not_installed_message">OpenKeychain è richiesto perché Password Store funzioni, sei pregato di installarlo dai negozi sotto</string> - <string name="openkeychain_not_installed_google_play">Google Play</string> - <string name="play_deeplink_template">https://play.google.com/store/apps/details?id=%1$s</string> - <string name="openkeychain_not_installed_fdroid">F-Droid</string> - <string name="fdroid_deeplink_template">https://f-droid.org/en/packages/%1$s/</string> <!-- GPG key selection in folder creation --> <string name="folder_creation_err_file_exists">Un file con quel nome esiste già</string> <string name="folder_creation_err_folder_exists">Una cartella con quel nome esiste già</string> diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 81dd8127..bd3290bb 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -36,7 +36,6 @@ <string name="git_commit_remove_text">Remova %1$s do armazenamento.</string> <string name="git_commit_move_text">Renomear %1$s para %2$s.</string> <string name="git_commit_move_multiple_text">Mova múltiplas senhas para %1$s.</string> - <string name="git_commit_gpg_id">Inicializar IDs GPG em %1$s.</string> <!-- PGPHandler --> <string name="clipboard_password_toast_text">Senha copiada para área de transferência, você tem %d segundos para colá-la em algum lugar.</string> <string name="clipboard_password_no_clear_toast_text">Senha copiada para área de transferência</string> @@ -262,9 +261,6 @@ <string name="preference_custom_public_suffixes_summary">O preenchimento automático distinguirá os subdomínios destes domínios</string> <string name="preference_custom_public_suffixes_hint">company.com\npersonal.com</string> <!-- OpenKeychain errors --> - <string name="openpgp_error_wrong_passphrase">Senha incorreta</string> - <string name="openpgp_error_no_user_ids">Nenhuma chave PGP correspondente foi encontrada</string> - <string name="openpgp_error_unknown">Erro do OpenKeyChain : %s</string> <!-- Password creation failure --> <string name="password_creation_file_fail_title">Erro</string> <string name="password_creation_file_write_fail_message">Falha ao armazenar o arquivo de senha. Por favor, tente novamente.</string> @@ -274,8 +270,6 @@ <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="exporting_passwords">Exportando senhas…</string> - <string name="invalid_gpg_id">Encontrado .gpg-id, mas contém uma ID de chave inválida, fingerprint ou ID de usuário</string> - <string name="short_key_ids_unsupported">O ID de chave em .gpg-id é muito curto, por favor utilize os IDs de chaves longos (16 caracteres) ou fingerprints (40 caracteres)</string> <string name="invalid_filename_text">Nome do arquivo não deve conter \'/\', defina o diretório acima</string> <string name="directory_hint">Diretório</string> <string name="new_folder_set_gpg_key">Definir chave GPG para diretório</string> @@ -291,12 +285,6 @@ <string name="git_break_out_of_detached_success">Houve um conflito ao executar o rebase. Houve um push de branch %1$s local para outra branch chamada %2$s\n Use esta branch para resolver o conflito no seu computador</string> <string name="git_break_out_of_detached_unneeded">O repositório não está sendo rebased, não há necessidade de fazer push para outro branch</string> <!-- OpenKeychain not installed --> - <string name="openkeychain_not_installed_title">OpenKeychain não instalado</string> - <string name="openkeychain_not_installed_message">OpenKeychain é necessário para que o Password Store funcione, por favor, instale-o a partir das lojas abaixo</string> - <string name="openkeychain_not_installed_google_play">Google Play</string> - <string name="play_deeplink_template">https://play.google.com/store/apps/details?id=%1$s</string> - <string name="openkeychain_not_installed_fdroid">F-Droid</string> - <string name="fdroid_deeplink_template">https://f-droid.org/pt/pacotes/%1$s/</string> <!-- GPG key selection in folder creation --> <string name="folder_creation_err_file_exists">Já existe um arquivo com esse nome</string> <string name="folder_creation_err_folder_exists">Já existe uma pasta com esse nome</string> @@ -329,7 +317,6 @@ <string name="otp_import_manual_entry">Inserir manualmente</string> <string name="otp_import_manual_hint_secret">Segredo</string> <string name="otp_import_manual_hint_account">Conta</string> - <string name="gpg_key_select_mandatory">A seleção de uma chave GPG é necessária para prosseguir</string> <string name="place_shortcut_on_home_screen">Criar atalho na tela inicial</string> <string name="password_list_fab_content_description">Criar nova senha ou pasta</string> <string name="pgp_key_import_failed">Falha ao importar a chave PGP</string> diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 911e917a..5119ed4d 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -40,7 +40,6 @@ <string name="git_commit_remove_text">Удалить %1$sиз хранилища.</string> <string name="git_commit_move_text">Переименовать %1$sв%2$s.</string> <string name="git_commit_move_multiple_text">Переместить несколько паролей в %1$s.</string> - <string name="git_commit_gpg_id">Инициализация GPG ID в %1$s.</string> <!-- PGPHandler --> <string name="clipboard_password_toast_text">Пароль скопирован в буфер обмена, у вас есть %d секунд чтобы вставить его.</string> <string name="clipboard_password_no_clear_toast_text">Пароль скопирован в буфер обмена</string> @@ -260,9 +259,6 @@ <string name="preference_custom_public_suffixes_summary">Автозаполнение будет разделять поддомены этих доменов</string> <string name="preference_custom_public_suffixes_hint">company.com\npersonal.com</string> <!-- OpenKeychain errors --> - <string name="openpgp_error_wrong_passphrase">Неверная ключевая фраза</string> - <string name="openpgp_error_no_user_ids">Не найдено подходящих PGP ключей</string> - <string name="openpgp_error_unknown">Ошибка OpenKeyChain : %s</string> <!-- Password creation failure --> <string name="password_creation_file_fail_title">Ошибка</string> <string name="password_creation_file_write_fail_message">Не удалось записать файл пароля в хранилище, пожалуйста, повторите попытку.</string> @@ -272,8 +268,6 @@ <string name="otp_import_success">Конфигурация TOTP успешно импортирована</string> <string name="otp_import_failure">Не удалось импортировать конфигурацию TOTP</string> <string name="exporting_passwords">Экспорт паролей…</string> - <string name="invalid_gpg_id">Найден .gpg-id, но он содержит неверный ID ключа, fingerprint или ID пользователя</string> - <string name="short_key_ids_unsupported">Идентификатор ключа в .gpg-id слишком короткий, пожалуйста, используйте длинные идентификаторы (16 символов) или fingerprint (40 символов)</string> <string name="invalid_filename_text">Имя файла не должно содержать \'/\', укажите директорию выше</string> <string name="directory_hint">Директория</string> <string name="new_folder_set_gpg_key">Установить GPG ключ для каталога</string> @@ -288,12 +282,6 @@ <string name="git_break_out_of_detached_success">При попытке rebase\'а возник конфликт. Ваша локальная ветка %1$s была запушена %2$s\n Используйте эту ветку для разрешения конфликтов с помощью компьютера</string> <string name="git_break_out_of_detached_unneeded">Не нужно пушить в другую ветку - rebase не был запущен</string> <!-- OpenKeychain not installed --> - <string name="openkeychain_not_installed_title">OpenKeychain не установлен</string> - <string name="openkeychain_not_installed_message">OpenKeychain необходим для работы Password Store, пожалуйста, установите его из магазина приложений ниже</string> - <string name="openkeychain_not_installed_google_play">Google Play</string> - <string name="play_deeplink_template">https://play.google.com/store/apps/details?id=%1$s</string> - <string name="openkeychain_not_installed_fdroid">F-Droid</string> - <string name="fdroid_deeplink_template">https://f-droid.org/en/packages/%1$s/</string> <!-- GPG key selection in folder creation --> <string name="folder_creation_err_file_exists">Файл с таким именем уже существует</string> <string name="folder_creation_err_folder_exists">Папка с таким именем уже существует</string> @@ -324,6 +312,5 @@ <string name="otp_import_qr_code">Отсканировать QR-код</string> <string name="otp_import_manual_entry">Ввести вручную</string> <string name="otp_import_manual_hint_account">Учетная запись</string> - <string name="gpg_key_select_mandatory">Для продолжения необходимо выбрать GPG-ключ</string> <string name="place_shortcut_on_home_screen">Разместить ярлык на рабочем столе</string> </resources> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 67b429f9..66e9374d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -43,7 +43,6 @@ <string name="git_commit_remove_text">Remove %1$s from store.</string> <string name="git_commit_move_text">Rename %1$s to %2$s.</string> <string name="git_commit_move_multiple_text">Move multiple passwords to %1$s.</string> - <string name="git_commit_gpg_id">Initialize GPG IDs in %1$s.</string> <!-- PGPHandler --> <string name="clipboard_password_toast_text">Password copied to clipboard, you have %d seconds to paste it somewhere.</string> @@ -272,7 +271,6 @@ <string name="pref_app_theme_value_follow_system">System default</string> <string name="connection_mode_ssh_key">SSH key</string> <string name="connection_mode_basic_authentication">Password</string> - <string name="connection_mode_openkeychain" translatable="false">OpenKeychain</string> <string name="git_server_config_save_success">Successfully saved configuration</string> <string name="git_server_config_save_error">The provided repository URL is not valid</string> <string name="git_server_config_save_missing_username_https">Please specify the HTTPS username in the form https://username@example.com/…</string> @@ -293,9 +291,6 @@ <string name="preference_custom_public_suffixes_hint">company.com\npersonal.com</string> <!-- OpenKeychain errors --> - <string name="openpgp_error_wrong_passphrase">Incorrect passphrase</string> - <string name="openpgp_error_no_user_ids">No matching PGP keys found</string> - <string name="openpgp_error_unknown">Error from OpenKeyChain : %s</string> <!-- Password creation failure --> <string name="password_creation_file_fail_title">Error</string> @@ -306,8 +301,6 @@ <string name="otp_import_success">Successfully imported TOTP configuration</string> <string name="otp_import_failure">Failed to import TOTP configuration</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="short_key_ids_unsupported">A key ID in .gpg-id is too short, please use either long key IDs (16 characters) or fingerprints (40 characters)</string> <string name="invalid_filename_text">File name must not contain \'/\', set directory above</string> <string name="directory_hint">Directory</string> <string name="new_folder_set_gpg_key">Set GPG key for directory</string> @@ -326,12 +319,6 @@ <string name="git_break_out_of_detached_unneeded">The repository is not rebasing, no need to push to another branch</string> <!-- OpenKeychain not installed --> - <string name="openkeychain_not_installed_title">OpenKeychain not installed</string> - <string name="openkeychain_not_installed_message">OpenKeychain is required for Password Store to function, please install it from the stores below</string> - <string name="openkeychain_not_installed_google_play">Google Play</string> - <string name="play_deeplink_template">https://play.google.com/store/apps/details?id=%1$s</string> - <string name="openkeychain_not_installed_fdroid">F-Droid</string> - <string name="fdroid_deeplink_template">https://f-droid.org/en/packages/%1$s/</string> <!-- GPG key selection in folder creation --> <string name="folder_creation_err_file_exists">A file by that name already exists</string> @@ -368,7 +355,6 @@ <string name="otp_import_manual_entry">Enter manually</string> <string name="otp_import_manual_hint_secret">Secret</string> <string name="otp_import_manual_hint_account">Account</string> - <string name="gpg_key_select_mandatory">Selecting a GPG key is necessary to proceed</string> <string name="place_shortcut_on_home_screen">Place shortcut on home screen</string> <string name="password_list_fab_content_description">Create new password or folder</string> <string name="pgp_key_import_failed">Failed to import PGP key</string> |