Sync localisations with Crowdin (#1256)

Fixes #1254

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
(cherry picked from commit 37c8b416d5ed657e89878b5f28394fa4640294e9)
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

12 files changed, 937 insertions, 785 deletions

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
deleted file mode 100644
index 05f1dd91..00000000
--- a/app/src/main/res/values-ar/strings.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
-  ~ SPDX-License-Identifier: GPL-3.0-only
-  -->
-<resources>
-    <!-- Activity names -->
-    <string name="action_settings">الإعدادات</string>
-    <string name="dialog_delete_title">إنّ المجلد موجود</string>
-    <string name="dialog_delete">حذف المجلد</string>
-    <string name="dialog_do_not_delete">إلغاء</string>
-    <string name="title_activity_git_clone">معلومات حول المستودع</string>
-    <!-- Password Store -->
-    <string name="move">نقل</string>
-    <string name="edit">تعديل</string>
-    <string name="delete">حذف</string>
-    <!-- git commits -->
-    <!-- PGPHandler -->
-    <string name="file_toast_text">الرجاء إدخال إسم ملف</string>
-    <!-- Git Async Task -->
-    <!-- Git Handler -->
-    <string name="ssh_preferences_dialog_title">خال من مفاتيح الـ SSH</string>
-    <string name="ssh_preferences_dialog_import">إستيراد</string>
-    <string name="ssh_preferences_dialog_generate">توليد</string>
-    <string name="passphrase_dialog_title">المصادقة</string>
-    <!-- Clone fragment -->
-    <string name="server_name">الخادوم</string>
-    <string name="connection_mode">نوع المصادقة</string>
-    <!-- Git Config fragment -->
-    <string name="git_user_name_hint">إسم المستخدم</string>
-    <string name="invalid_email_dialog_text">يرجى إدخال عنوان بريد إلكتروني صالح</string>
-    <string name="clone_button">أنسخ !</string>
-    <!-- PGP Handler -->
-    <string name="crypto_name_hint">التسمية</string>
-    <string name="crypto_pass_label">كلمة السر</string>
-    <string name="crypto_select">إختر</string>
-    <string name="crypto_save">حفظ</string>
-    <!-- DECRYPT Layout -->
-    <string name="action_search">البحث</string>
-    <string name="password">كلمة السر :</string>
-    <string name="extra_content">بيانات إضافية :</string>
-    <string name="username">إسم المستخدم :</string>
-    <string name="edit_password">تعديل كلمة السر</string>
-    <string name="copy_password">نسخ كلمة السر</string>
-    <string name="share_as_plaintext">شارك كنص مجرد</string>
-    <string name="last_changed">آخِر تعديل %s</string>
-    <!-- Preferences -->
-    <string name="pref_ssh_title">إستيراد مفتاح الـ SSH</string>
-    <string name="pref_ssh_keygen_title">توليد مفتاحَي الـ SSH</string>
-    <string name="pref_ssh_see_key_title">إظهار مفتاح الـ SSH العمومي الذي تم توليده</string>
-    <string name="pref_git_delete_repo">حذف المستودع</string>
-    <string name="pref_dialog_delete_title">تنحية المستودع</string>
-    <string name="pref_category_general_title">الإعدادات العامة</string>
-    <string name="pref_copy_title">نسخ كلمة السر تلقائيًا</string>
-    <string name="ssh_key_success_dialog_title">تم استيراد مفتاح الـ SSH</string>
-    <string name="ssh_key_error_dialog_text">نص الرسالة : \n</string>
-    <string name="pref_autofill_title">الملئ التلقائي</string>
-    <string name="pref_autofill_enable_title">تشغيل الملئ التلقائي</string>
-    <string name="pref_autofill_apps_title">إعدادات التطبيق و الموقع</string>
-    <string name="pref_autofill_default_title">تطابق تلقائي إفتراضي</string>
-    <string name="pref_autofill_always_title">إظهار مربع الحوار دائما</string>
-    <string name="pref_misc_title">أخرى</string>
-    <string name="pref_clear_clipboard_title">تنظيف الحافظة 20 مرة</string>
-    <string name="pref_external_repository">مستودع تخزين خارجي</string>
-    <string name="pref_external_repository_summary">إستخدم كلمة مرور المستودع الخارجي</string>
-    <string name="pref_select_external_repository">إختيار مستودع التخزين الخارجي</string>
-    <string name="prefs_export_passwords_title">تصدير كلمات السر</string>
-    <string name="prefs_version">النسخة</string>
-    <!-- PasswordGenerator fragment -->
-    <string name="pwgen_generate">توليد</string>
-    <string name="pwgen_include">تحتوي على</string>
-    <string name="pwgen_length">الطول</string>
-    <string name="pwgen_numerals">أرقام</string>
-    <string name="pwgen_symbols">رموز</string>
-    <string name="pwgen_uppercase">حروف كبيرة</string>
-    <string name="pwgen_ambiguous">مبهمة</string>
-    <string name="pwgen_pronounceable">منطوقة</string>
-    <!-- XKPWD password generator -->
-    <!-- XKPWD prefs -->
-    <!-- ssh keygen fragment -->
-    <string name="ssh_keygen_passphrase">العبارة السرية</string>
-    <string name="ssh_keygen_generate">توليد</string>
-    <!-- SSH Android Keystore auth -->
-    <!-- Misc -->
-    <string name="dialog_ok">حسناً</string>
-    <string name="dialog_yes">نعم</string>
-    <string name="dialog_no">لا</string>
-    <string name="dialog_cancel">إلغاء</string>
-    <string name="git_sync">زامن المستودع</string>
-    <string name="show_password_pref_title">إظهار كلمة السر</string>
-    <string name="show_extra_content_pref_title">إظهار المزيد من المحتوى</string>
-    <string name="pwd_generate_button">توليد</string>
-    <string name="refresh_list">تحديث القائمة</string>
-    <string name="app_icon_hint">أيقونة التطبيق</string>
-    <!-- Oreo Autofill -->
-    <!-- Autofill -->
-    <string name="autofill_apps_default">إستخدم الإعداد الإفتراضي</string>
-    <string name="autofill_apps_match_ellipsis">طابق مع ...</string>
-    <string name="autofill_apps_match">طابق مع</string>
-    <string name="autofill_apps_never">لا تطابق أبدا</string>
-    <string name="autofill_apps_delete">حذف</string>
-    <string name="autofill_pick">إختر</string>
-    <string name="autofill_pick_and_match">إختر و طابق مع ...</string>
-    <string name="autofill_paste">إلصاق</string>
-    <string name="new_password_title">كلمة السر الجديدة</string>
-    <!-- OpenKeychain errors -->
-    <!-- Password creation failure -->
-    <!-- GitException messages -->
-    <!-- OpenKeychain not installed -->
-    <!-- GPG key selection in folder creation -->
-    <!-- Onboarding flow -->
-    <!-- SSH port validation -->
-</resources>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
deleted file mode 100644
index 97c715b5..00000000
--- a/app/src/main/res/values-cs/strings.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
-  ~ SPDX-License-Identifier: GPL-3.0-only
-  -->
-<resources>
-    <!-- Activity names -->
-    <string name="action_settings">Nastavení</string>
-    <string name="dialog_delete_title">Adresář již existuje</string>
-    <string name="dialog_delete_msg">Cílový adresář již existuje. Aktuální verze podporuje pouze jedno úložiště. Opravdu smazat aktuální adresář úložiště hesel\n(%1$s)</string>
-    <string name="dialog_delete">Smazat adresář</string>
-    <string name="dialog_do_not_delete">Zrušit</string>
-    <string name="title_activity_git_clone">Informace repozitáře</string>
-    <!-- Password Store -->
-    <string name="creation_dialog_text">Naklonujte nebo vytvořte nový repozitář před pokusem přidat heslo nebo spustit synchronizaci.</string>
-    <string name="move">Přesunout</string>
-    <string name="edit">Editovat</string>
-    <string name="delete">Smazat</string>
-    <string name="change">Změnit</string>
-    <string name="use">Použít</string>
-    <string name="directory_selected_title">Tento adresář je již vybrán</string>
-    <string name="password_exists_title">Heslo již existuje!</string>
-    <string name="password_exists_message">Toto přepíše%1$s %2$s .</string>
-    <!-- git commits -->
-    <string name="git_commit_add_text">Přídat generované heslo pro %1$s s použítím Android Password Store.</string>
-    <string name="git_commit_edit_text">Upravit heslo %1$s s použítím Android Password Store.</string>
-    <string name="git_commit_remove_text">Odstranit %1$s ze store. </string>
-    <!-- PGPHandler -->
-    <string name="clipboard_password_toast_text">Heslo zkopírováno do schránky, máte %d sekund na jeho zkopírování.</string>
-    <string name="clipboard_password_no_clear_toast_text">Heslo zkopírováno do schránky</string>
-    <string name="file_toast_text">Zadejte prosím jméno souboru</string>
-    <string name="path_toast_text">Prosím zadejte cestu k souboru</string>
-    <string name="empty_toast_text">Nelze zadat prázdné heslo nebo další obsah</string>
-    <!-- Git Async Task -->
-    <string name="jgit_error_dialog_title">Došlo k vnitřní výjimce</string>
-    <!-- Git Handler -->
-    <string name="ssh_preferences_dialog_text">Importujte nebo si prosím vygenerujte svůj SSH klíč v nastavení aplikace</string>
-    <string name="ssh_preferences_dialog_title">Žádný SSH klíč</string>
-    <string name="ssh_preferences_dialog_generate">Generovat</string>
-    <string name="passphrase_dialog_title">Ověření</string>
-    <string name="passphrase_dialog_text">Zadejte prosím heslo pro svůj SSH klíč. Nechte prázdné pokud je bez hesla.</string>
-    <string name="password_dialog_text">Zadejte prosím heslo k tomuto repozitáři</string>
-    <!-- Clone fragment -->
-    <string name="location_sdcard">SD-Karta</string>
-    <string name="location_hidden">Skryté (Preferováno)</string>
-    <string name="external_repository_dialog_title">Vyberte kam ukládat hesla</string>
-    <string name="connection_mode">Mód ověření</string>
-    <!-- Git Config fragment -->
-    <string name="git_user_name_hint">Jméno</string>
-    <string name="invalid_email_dialog_text">Zadejte prosím platnou emailovou adresu</string>
-    <string name="clone_button">Klonovat!</string>
-    <!-- PGP Handler -->
-    <string name="crypto_name_hint">jméno</string>
-    <string name="crypto_pass_label">Heslo</string>
-    <string name="crypto_extra_label">Extra</string>
-    <string name="crypto_encrypt_username_label">Zašifrovat jméno</string>
-    <string name="crypto_select">Vybrat</string>
-    <string name="crypto_save">Uložit</string>
-    <string name="crypto_save_and_copy">Uložit kopii</string>
-    <!-- DECRYPT Layout -->
-    <string name="action_search">Hledat</string>
-    <string name="password">Heslo:</string>
-    <string name="extra_content">Další data:</string>
-    <string name="username">Jméno:</string>
-    <string name="edit_password">Editovat heslo</string>
-    <string name="copy_password">Kopírovat heslo</string>
-    <string name="share_as_plaintext">Sdílet v nešifrované podobě</string>
-    <string name="last_changed">Naposled změněno %s</string>
-    <!-- Preferences -->
-    <string name="pref_ssh_title">Importovat SSH klíč</string>
-    <string name="pref_ssh_keygen_title">Generovat SSH klíč</string>
-    <string name="pref_ssh_see_key_title">Zobrazit vygenerovaný veřejný SSH klíč</string>
-    <string name="pref_git_delete_repo">Smazat repozitář</string>
-    <string name="pref_dialog_delete_title">Vyčistit repozitář</string>
-    <string name="pref_category_general_title">Všeobecné</string>
-    <string name="pref_copy_title">Automaticky kopírovat heslo</string>
-    <string name="pref_copy_dialog_title">Automatické kopírování hesla do schránky po úspěšném dešifrování.</string>
-    <string name="ssh_key_success_dialog_title">SSH-key importován</string>
-    <string name="ssh_key_error_dialog_text">Zpráva : \n</string>
-    <string name="pref_recursive_filter">Rekurzivní filtrování</string>
-    <string name="pref_recursive_filter_hint">Rekurzivní hledání hesel v aktuálním adresáři.</string>
-    <string name="pref_autofill_enable_title">Povolit automatické vyplňování</string>
-    <string name="pref_autofill_enable_msg">Ťukni na OK pro zobrazení nastavení přístupnosti. Tam poté ťuknout mezi službami na Password Store a přepínačem lze zapnout nebo vypnout.</string>
-    <string name="pref_autofill_enable_msg2">Jakmile bude služba zapnuta, po kliknutí na pole hesla bude zobrazeno dialogové okno pokud je pro používanou aplikaci heslo dostupné.</string>
-    <string name="pref_autofill_enable_msg3">Password Store se automaticky pokouší najít odpovídající heslo k aplikacím. Toto výchozí nastavení spolu s nastavením pro jednotlivé aplikace lze změnit.</string>
-    <string name="pref_autofill_apps_title">Nastavení aplikace a webové stránky</string>
-    <string name="pref_autofill_default_title">Automaticky párovat ve výchozím nastavení</string>
-    <string name="pref_autofill_default_hint">Ve výchozím nastavení \'Automaticky párovat\' u aplikací bez vybraného nastavení. Jinak, \'Nikdy nepárovat.\'</string>
-    <string name="pref_autofill_always_title">Vždy zobrazit dialog</string>
-    <string name="pref_autofill_full_path_title">Ukaž plnou cestu</string>
-    <string name="pref_clear_clipboard_title">Zaplnit schránku 20krát</string>
-    <string name="pref_clear_clipboard_hint">Uložit dvacet náhodných textů do schránky namísto pouze jednoho. Užitečné pro telefony Samsung, které nabízejí funkci historie schránky.</string>
-    <string name="pref_git_delete_repo_summary">Smaže místní (skrytý) repozitář</string>
-    <string name="pref_external_repository">Externí repozitář</string>
-    <string name="pref_external_repository_summary">Použít externí repozitář hesel</string>
-    <string name="pref_select_external_repository">Vybrat externí repozitář</string>
-    <string name="prefs_export_passwords_title">Exportovat hesla</string>
-    <string name="prefs_export_passwords_summary">Exportuje encryptovaná hesla do externího adresáře</string>
-    <string name="prefs_version">Verze</string>
-    <!-- PasswordGenerator fragment -->
-    <string name="pwgen_title">Vygenerovat heslo</string>
-    <string name="pwgen_generate">Generovat</string>
-    <string name="pwgen_include">Vložit</string>
-    <string name="pwgen_length">Délka</string>
-    <string name="pwgen_numerals">Čísla</string>
-    <string name="pwgen_symbols">Symboly</string>
-    <string name="pwgen_uppercase">Velká písmena</string>
-    <string name="pwgen_ambiguous">Dvouznačné</string>
-    <!-- XKPWD password generator -->
-    <!-- XKPWD prefs -->
-    <!-- ssh keygen fragment -->
-    <string name="ssh_keygen_passphrase">Bezpečnostní fráze</string>
-    <string name="ssh_keygen_generate">Generovat</string>
-    <!-- SSH Android Keystore auth -->
-    <!-- Misc -->
-    <string name="dialog_yes">Ano</string>
-    <string name="dialog_no">Ne</string>
-    <string name="dialog_cancel">Zrušit</string>
-    <string name="git_sync">Synchronizovat repozitář</string>
-    <string name="git_pull">Stáhnout ze serveru</string>
-    <string name="git_push">Uložit na server</string>
-    <string name="show_password_pref_title">Zobrazit heslo</string>
-    <string name="show_password_pref_summary">Hlídat viditelnost hesel po dešifrování, toto nevypíná možnost kopírovat heslo</string>
-    <string name="pwd_generate_button">Generovat</string>
-    <string name="refresh_list">Obnovit seznam</string>
-    <string name="no_repo_selected">Nebyl vybrát externí repozitář</string>
-    <string name="send_plaintext_password_to">Odeslat heslo jako plaintext za použití…</string>
-    <!-- Oreo Autofill -->
-    <!-- Autofill -->
-    <string name="autofill_description">Automaticky vyplňuje pole hesel v aplikacích. Funguje pouze pro verzi Androidu 4.3 a vyšší. Není závislé na schránce pro Android verze 5.0 a vyšší.</string>
-    <string name="autofill_apps_default">Použít výchozí nastavení</string>
-    <string name="autofill_apps_first">Automaticky spárovat</string>
-    <string name="autofill_apps_match_ellipsis">Spárovat s…</string>
-    <string name="autofill_apps_match">Spárovat s</string>
-    <string name="autofill_apps_never">Nikdy nepárovat</string>
-    <string name="autofill_apps_delete">Smazat</string>
-    <!-- OpenKeychain errors -->
-    <!-- Password creation failure -->
-    <!-- GitException messages -->
-    <!-- OpenKeychain not installed -->
-    <!-- GPG key selection in folder creation -->
-    <!-- Onboarding flow -->
-    <!-- SSH port validation -->
-</resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index f4f99924..5fbe389d 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!--
+<?xml version="1.0" encoding="utf-8"?>
+<!--
   ~ Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
   ~ SPDX-License-Identifier: GPL-3.0-only
   -->
@@ -14,12 +15,15 @@
     <string name="dialog_delete">Ordner löschen</string>
     <string name="dialog_do_not_delete">Abbruch</string>
     <string name="title_activity_git_clone">Repository Informationen</string>
+    <string name="title_activity_git_log">Commit-Log</string>
     <!-- Password Store -->
     <string name="creation_dialog_text">Bitte klone oder erstelle ein neues Repository, bevor du versuchst ein Passwort hinzuzufügen oder jegliche Synchronisation-Operation durchführst.</string>
+    <string name="delete_directory_progress_text">Lösche…</string>
     <string name="move">Verschieben</string>
     <string name="edit">Bearbeiten</string>
     <string name="delete">Löschen</string>
     <string name="change">Ändern</string>
+    <string name="use">Nutze</string>
     <string name="directory_selected_title">Ordner bereits ausgewählt</string>
     <string name="directory_selected_message">Möchtest du \"%1$s\" verwenden?</string>
     <string name="password_exists_title">Passwort existiert bereits!</string>
@@ -29,8 +33,10 @@
     <!-- git commits -->
     <string name="git_commit_add_text">Füge generiertes Passwort für %1$s mittels Android Passwort Store hinzu.</string>
     <string name="git_commit_edit_text">Bearbeite das Passwort für %1$s mittels Android Password Store.</string>
+    <string name="git_commit_remove_text">%1$s aus dem Shop 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>
@@ -50,16 +56,22 @@
     <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>
     <string name="password_dialog_text">Bitte setze ein Passwort für dieses Repository</string>
     <!-- Clone fragment -->
+    <string name="location_dialog_create_text">Wählen Sie aus, wo Sie Ihr Passwort-Repository erstellen möchten</string>
     <string name="location_sdcard">SD-Karte</string>
     <string name="location_hidden">Versteckt (bevorzugt)</string>
     <string name="external_repository_dialog_title">Wählen Sie, wo die Passwörter gespeichert werden sollen</string>
     <string name="external_repository_dialog_text">Sie müssen ein Verzeichnis auswählen, in dem Ihre Passwörter gespeichert werden sollen. Wenn Sie Ihre Passwörter innerhalb des versteckten Speichers der Anwendung speichern möchten, brechen Sie diesen Dialog ab und deaktivieren Sie die Option \"Externe Repository\".</string>
+    <string name="server_name">Server</string>
+    <string name="server_url">Repository-URL</string>
+    <string name="server_branch">Branch</string>
     <string name="connection_mode">Authentifizierungsmethode</string>
     <!-- Git Config fragment -->
     <string name="git_user_name_hint">Nutzername</string>
+    <string name="git_user_email">E-Mail-Adresse</string>
     <string name="invalid_email_dialog_text">Bitte valide Email eingeben</string>
     <string name="clone_button">Klone!</string>
     <!-- PGP Handler -->
+    <string name="crypto_name_hint">Name</string>
     <string name="crypto_pass_label">Passwort</string>
     <string name="crypto_extra_label">Extra</string>
     <string name="crypto_encrypt_username_label">Benutzername verschlüsseln</string>
@@ -69,6 +81,7 @@
     <!-- DECRYPT Layout -->
     <string name="action_search">Suche</string>
     <string name="password">Passwort:</string>
+    <string name="otp">OTP:</string>
     <string name="extra_content">Weiterer Inhalt:</string>
     <string name="username">Benutzername:</string>
     <string name="edit_password">Passwort bearbeiten</string>
@@ -76,6 +89,9 @@
     <string name="share_as_plaintext">Als Klartext teilen</string>
     <string name="last_changed">Zuletzt geändert %s</string>
     <!-- Preferences -->
+    <string name="pref_repository_title">Repository</string>
+    <string name="pref_edit_server_info">Git-Server Einstellungen</string>
+    <string name="pref_edit_git_config">Lokale Git Konfiguration &amp; Dienstprogramme</string>
     <string name="pref_ssh_title">Importiere SSH-Key</string>
     <string name="pref_ssh_keygen_title">Erstelle SSH-Schlüsselpaar</string>
     <string name="pref_ssh_see_key_title">Zeige erstellten öffentlichen SSH-Key</string>
@@ -83,6 +99,7 @@
     <string name="pref_dialog_delete_title">Repository löschen</string>
     <string name="pref_category_general_title">Allgemein</string>
     <string name="pref_category_title_passwords">Passwörter</string>
+    <string name="pref_clipboard_timeout_title">Timeout für das Kopieren des Passwortes</string>
     <string name="pref_clipboard_timeout_summary">Legen Sie die Zeit (in Sekunden) fest, die das Passwort in der Zwischenablage liegen soll. 0 bedeutet für immer. Aktueller Wert: %1$s</string>
     <string name="pref_copy_title">Kopiere Passwort automatisch</string>
     <string name="pref_copy_dialog_title">Kopiert das Passwort in die Zwischenablage, wenn der Eintrag entschlüsselt wurde.</string>
@@ -97,6 +114,7 @@
     <string name="pref_file_first_sort_order">Dateien zuerst</string>
     <string name="pref_type_independent_sort_order">Typ unabhängig</string>
     <string name="pref_recently_used_sort_order">Zuletzt verwendet</string>
+    <string name="pref_autofill_title">Automatisch ausfüllen</string>
     <string name="pref_autofill_enable_title">Autofill aktivieren</string>
     <string name="pref_autofill_enable_msg">Wähle OK, um zu den Bedienungshilfen-Einstellungen zu gelangen. Dort aktiviere oder deaktiviere den Password Store unter Dienste.</string>
     <string name="pref_autofill_enable_msg2">Wenn der Hintergrunddienst aktiviert ist, erscheint immer dann ein Dialog, wenn du auf ein Passwortfeld in einer App klickst und ein dazu passender Eintrag existiert.</string>
@@ -116,9 +134,11 @@
     <string name="pref_select_external_repository">Wähle ein externes Repository</string>
     <string name="prefs_export_passwords_title">Passwörter exportieren</string>
     <string name="prefs_export_passwords_summary">Exportiert die verschlüsselten Passwörter in ein externes Verzeichnis</string>
+    <string name="prefs_version">Version</string>
     <!-- PasswordGenerator fragment -->
     <string name="pwgen_title">Passwort generieren</string>
     <string name="pwgen_generate">Generieren</string>
+    <string name="pwgen_include">Einschließen</string>
     <string name="pwgen_length">Länge</string>
     <string name="pwgen_numerals">Nummern</string>
     <string name="pwgen_symbols">Symbole</string>
@@ -126,23 +146,46 @@
     <string name="pwgen_lowercase">Kleinbuchstaben</string>
     <string name="pwgen_ambiguous">Zweideutig</string>
     <string name="pwgen_pronounceable">Aussprechbar</string>
+    <string name="pwgen_no_chars_error">Keine Zeichen hinzugefügt</string>
     <string name="pwgen_length_too_short_error">Länge zu kurz für ausgewählte Kriterien</string>
     <string name="pwgen_max_iterations_exceeded">Fehler beim Generieren eines Passworts, das die Einschränkungen erfüllt. Versuchen Sie, die Länge zu erhöhen.</string>
     <!-- XKPWD password generator -->
+    <string name="xkpwgen_title">Xkpasswd Generator</string>
+    <string name="xkpwgen_length">Wörter insgesamt</string>
     <string name="xkpwgen_separator">Trennzeichen</string>
     <string name="xkpwgen_custom_dict_imported">Eigene Wortliste: %1$s</string>
     <string name="xkpwgen_builder_error">Das ausgewählte Wörterbuch enthält nicht genügend Wörter der angegebenen Länge %1$d..%2$d</string>
     <!-- XKPWD prefs -->
+    <string name="xkpwgen_pref_gentype_title">Passwortgenerator</string>
     <string name="xkpwgen_pref_custom_dict_title">Eigene Wortliste</string>
+    <string name="xkpwgen_pref_custom_dict_summary_on">Eigene Wordlist-Datei verwenden</string>
     <string name="xkpwgen_pref_custom_dict_summary_off">Integrierte Wortliste verwenden</string>
     <string name="xkpwgen_pref_custom_dict_picker_title">Eigene Wortliste</string>
     <string name="xkpwgen_pref_custom_dict_picker_summary">Tippen Sie, um eine benutzerdefinierte Wordlist-Datei mit einem Wort pro Zeile auszuwählen</string>
     <!-- ssh keygen fragment -->
     <string name="ssh_keygen_passphrase">Passwort</string>
     <string name="ssh_keygen_generate">Generieren</string>
+    <string name="ssh_keygen_share">Teilen</string>
+    <string name="ssh_keygen_later">Später</string>
+    <string name="ssh_keygen_message">%1$s\n\nFüge den Public-Key zu Deinem Git-Server hinzu.</string>
     <string name="ssh_key_gen_generating_progress">Schlüssel werden generiert…</string>
+    <string name="ssh_keygen_require_authentication">Mit Anmeldedaten für Bildschirmsperre schützen</string>
+    <string name="ssh_keygen_label_rsa">RSA</string>
+    <string name="ssh_keygen_label_ecdsa">ECDSA</string>
+    <string name="ssh_keygen_label_ed25519">Ed25519</string>
+    <string name="ssh_keygen_explanation_rsa"><b>RSA (3072 Bit)</b>\nWird von allen Servern unterstützt, allerdings ist die Authentifizierung recht langsam.</string>
+    <string name="ssh_keygen_explanation_ecdsa"><b>ECDSA (NIST P-256)</b>\nSchnelle Authentifizierung und unterstützt von den meisten Servern, die noch Updates erhalten.</string>
+    <string name="ssh_keygen_explanation_ed25519"><b>Ed25519</b>\nSchnelle Authentifizierung, aber nur von eher modernen Servern unterstützt.</string>
+    <string name="ssh_keygen_existing_title">SSH-Schlüssel</string>
+    <string name="ssh_keygen_existing_message">Existierenden SSH-Schlüssel ersetzen? Möglicherweise verlieren Sie den Zugriff auf Ihren Server.</string>
+    <string name="ssh_keygen_existing_replace">Ersetzen</string>
+    <string name="ssh_keygen_existing_keep">Behalten</string>
     <!-- SSH Android Keystore auth -->
+    <string name="biometric_auth_generic_failure">Authentifizierung der Bildschirmsperre fehlgeschlagen</string>
+    <string name="biometric_prompt_title_ssh_auth">SSH-Schlüssel freischalten</string>
+    <string name="biometric_prompt_title_ssh_keygen">SSH-Schlüssel generieren</string>
     <!-- Misc -->
+    <string name="dialog_ok">OK</string>
     <string name="dialog_yes">Ja</string>
     <string name="dialog_no">Nein</string>
     <string name="dialog_cancel">Abbruch</string>
@@ -150,6 +193,8 @@
     <string name="git_sync">Synchronisiere Repository</string>
     <string name="git_pull">Git Pull</string>
     <string name="git_push">Git Push</string>
+    <string name="git_push_up_to_date">Alles aktuell</string>
+    <string name="git_log">Commit-Log anzeigen</string>
     <string name="show_password_pref_title">Zeige das Password</string>
     <string name="show_password_pref_summary">Soll das entschlüsselte Passwort sichtbar sein? Dies deaktiviert nicht das Kopieren.</string>
     <string name="show_extra_content_pref_title">Zeige weiteren Inhalt</string>
@@ -161,14 +206,34 @@
     <string name="app_icon_hint">App Icon</string>
     <!-- Oreo Autofill -->
     <string name="oreo_autofill_strict_domain_search">Phishing-resistente Suche</string>
+    <string name="oreo_autofill_match_with">Übereinstimmung mit %1$s</string>
+    <string name="oreo_autofill_matches_clear_existing">Bestehende Übereinstimmungen löschen</string>
     <string name="oreo_autofill_filter_no_results">Keine Ergebnisse.</string>
+    <string name="oreo_autofill_search_in_store">Suche im Shop…</string>
     <string name="oreo_autofill_save_internal_error">Speichern aufgrund eines internen Fehlers fehlgeschlagen</string>
     <string name="oreo_autofill_save_app_not_supported">Diese App wird derzeit nicht unterstützt</string>
     <string name="oreo_autofill_save_passwords_dont_match">Die Passwörter stimmen nicht überein</string>
     <string name="oreo_autofill_generate_password">Passwort generieren…</string>
+    <string name="oreo_autofill_fill_otp_from_sms">Code aus SMS extrahieren…</string>
+    <string name="oreo_autofill_max_matches_reached">Maximale Anzahl an Übereinstimmungen (%1$d) erreicht; Lösche Übereinstimmungen, bevor neue hinzugefügt werden.</string>
+    <string name="oreo_autofill_warning_publisher_header">Der Hersteller dieser App hat sich geändert, seit Sie einen Eintrag zum Passwort-Shop mit ihm verknüpft haben:</string>
     <string name="oreo_autofill_warning_publisher_footer"><b>Die derzeit installierte App versucht, Ihre Anmeldeinformationen zu stehlen, indem sie vorgibt, eine vertrauenswürdige App zu sein.</b>\n\nVersuchen Sie die App zu deinstallieren und installieren Sie sie erneut aus einer vertrauenswürdigen Quelle wie dem Play Store, Amazon Appstore, F-Droid oder dem Shop Ihres Telefonherstellers.</string>
     <string name="oreo_autofill_warning_publisher_install_time">Installiert: %1$s</string>
+    <string name="oreo_autofill_warning_publisher_advanced_info_button">Erweiterte Informationen</string>
+    <string name="oreo_autofill_warning_publisher_changed_disable_autofill_button">Autofill deaktiviert lassen</string>
+    <string name="oreo_autofill_warning_publisher_reenable_button">Autofill erneut aktivieren</string>
     <string name="oreo_autofill_warning_publisher_warning_sign_description">Warnung</string>
+    <string name="oreo_autofill_warning_publisher_dataset_summary">Für Details antippen…</string>
+    <string name="oreo_autofill_warning_publisher_dataset_title">Mögliche Phishing-Versuche</string>
+    <string name="oreo_autofill_general_fill_and_save_support">Anmeldedaten ausfüllen und speichern</string>
+    <string name="oreo_autofill_general_fill_support">Anmeldedaten ausfüllen</string>
+    <string name="oreo_autofill_password_fill_support">Passwörter ausfüllen</string>
+    <string name="oreo_autofill_flaky_fill_support">Passwörter ausfüllen (kann manchmal sein, dass Sie den Browser neu starten müssen)</string>
+    <string name="oreo_autofill_no_support">Kein Support</string>
+    <string name="oreo_autofill_preference_directory_structure">Passwort-Datei-Organisation</string>
+    <string name="oreo_autofill_enable_dialog_description">Password Store kann das Ausfüllen von Anmeldeformularen und sogar das Speichern von Anmeldedaten in Apps oder auf Webseiten übernehmen.</string>
+    <string name="oreo_autofill_enable_dialog_instructions">Um diese Funktion zu aktivieren, tippen Sie auf OK, um zu Autofill-Einstellungen zu gelangen. Dort wählen Sie \"Passwortd Store\" aus der Liste und bestätigen Sie die Bestätigungsaufforderung mit \"OK\".</string>
+    <string name="oreo_autofill_enable_dialog_installed_browsers">Autofill-Unterstützung mit installierten Browsern:</string>
     <!-- Autofill -->
     <string name="autofill_description">Füge das Passwort automatisch in Apps ein (Autofill). Funktioniert nur unter Android 4.3 und höher. Dies basiert nicht auf der Zwischenablage für Android 5.0 oder höher.</string>
     <string name="autofill_apps_default">Nutze Standardeinstellung</string>
@@ -187,6 +252,14 @@
     <string name="autofill_ins_1_hint">Bildschirmfoto Accessibility Services</string>
     <string name="autofill_ins_2_hint">Bildschirmfoto des Schalters in Accessibility Services</string>
     <string name="autofill_ins_3_hint">Bildschirmfoto von Autofill in Aktion</string>
+    <string name="clear_saved_passphrase_ssh">Gespeicherte Passphrase für lokalen SSH-Schlüssel löschen</string>
+    <string name="clear_saved_passphrase_https">Gespeichertes HTTPS-Passwort löschen</string>
+    <string name="git_operation_remember_passphrase">Schlüsselpasswort merken</string>
+    <string name="git_head_missing">Kann HEAD nicht lokalisieren</string>
+    <string name="sdcard_root_warning_title">Wurzelverzeichnis der SD-Karte ausgewählt</string>
+    <string name="sdcard_root_warning_message">Sie haben das Wurzelverzeichnis der SD-Karte als Speicherort gewählt. Das ist sehr gefährlich, da der Inhalt letztendlich gelöscht wird</string>
+    <string name="git_abort_and_push_title">Abbrechen und hochladen</string>
+    <string name="biometric_prompt_title">Biometrische Abfrage</string>
     <string name="biometric_auth_error">Authentifizierungsfehler</string>
     <string name="biometric_auth_error_reason">Authentifizierungsfehler: %s</string>
     <string name="biometric_auth_title">Biometrische Authentifizierung aktivieren</string>
@@ -196,30 +269,81 @@
     <string name="access_sdcard_text">Der Speicherort befindet sich in Ihrer SD-Karte oder im internen Speicher, aber die App hat nicht die Berechtigung, darauf zuzugreifen.</string>
     <string name="your_public_key">Ihr öffentlicher Schlüssel</string>
     <string name="error_generate_ssh_key">Fehler beim Generieren des SSH-Schlüssels</string>
+    <string name="pref_show_hidden_title">Dateien und Ordner anzeigen</string>
+    <string name="pref_show_hidden_summary">Nicht-Passwort Dateien und Ordner in der Passwortliste mit einbeziehen</string>
     <string name="title_create_folder">Ordner erstellen</string>
     <string name="title_rename_folder">Ordner umbenennen</string>
+    <string name="message_category_error_empty_field">Der Name der Kategorie darf nicht leer sein</string>
+    <string name="message_category_error_category_exists">Der Kategoriename existiert bereits</string>
+    <string name="message_error_destination_outside_repo">Ziel muss innerhalb des repository sein</string>
+    <string name="message_rename_folder">Ziel für %1$s angeben</string>
+    <string name="button_create">Erstellen</string>
     <string name="pref_search_on_start">Suchfeld beim Start öffnen</string>
     <string name="pref_search_on_start_hint">Suchleiste beim Start der App anzeigen</string>
+    <string name="password_generator_category_title">Passwort Generator</string>
     <string name="tap_clear_clipboard">Hier tippen, um die Zwischenablage zu löschen</string>
+    <string name="clone_git_repo">Das Repository muss geklont werden, bevor Änderungen synchronisert werden können.</string>
+    <string name="theme_title">App Farbthema</string>
+    <string name="theme_light">Hell</string>
+    <string name="theme_dark">Dunkel</string>
+    <string name="theme_battery_saver">Durch Energiesparmodus gesetzt</string>
+    <string name="theme_follow_system">Systemstandard</string>
     <string name="connection_mode_ssh_key">SSH-Schlüssel</string>
     <string name="connection_mode_basic_authentication">Passwort</string>
     <string name="git_server_config_save_success">Konfiguration erfolgreich gespeichert</string>
+    <string name="git_server_config_save_error">Die angegebene Repository URL ist ungültig</string>
+    <string name="git_server_config_save_missing_username_https">Bitte geben Sie den HTTPS Benutzernamen in der Form https://username@example.com/… an</string>
+    <string name="git_server_config_save_missing_username_ssh">Bitte geben Sie den SSH Benutzernamen in der Form username@example.com:… an</string>
+    <string name="git_server_config_save_auth_mode_mismatch">Gültige Authentifizierungsarten für %1$s: %2$s</string>
     <string name="git_operation_wrong_passphrase">Falsches Kennwort</string>
     <string name="git_operation_wrong_password">Falsches Passwort</string>
+    <string name="bottom_sheet_create_new_folder">Neuen Ordner erstellen</string>
+    <string name="bottom_sheet_create_new_password">Neues Passwort erstellen</string>
+    <string name="pref_debug_logging_summary">Debug logging aktivieren (Erfordert Neustart der App)</string>
+    <string name="pref_debug_logging_title">Debug logging</string>
+    <string name="preference_default_username_summary">Wenn Autofill den Benutzernamen nicht aus der Passwortdatei oder dem Ordner herleiten kann, wird der hier festgelegte Wert verwendet</string>
+    <string name="preference_default_username_title">Standard Benutzername</string>
+    <string name="git_operation_remember_password">Passwort merken</string>
+    <string name="git_operation_hint_password">Passwort</string>
+    <string name="preference_custom_public_suffixes_title">Benutzerdefinierte Domains</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>
+    <string name="password_creation_file_delete_fail_message">Fehler beim Löschen der Passwortdatei %1$s vom Speicher, bitte löschen Sie die Datei von Hand.</string>
+    <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="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="directory_hint">Ordner</string>
+    <string name="new_folder_set_gpg_key">GPG Schlüssel für Ordner festlegen</string>
     <!-- GitException messages -->
     <string name="git_unknown_error">Unbekannter Fehler</string>
+    <string name="git_unknown_host">Unbekannter Host: %1$s</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>
     <!-- Onboarding flow -->
+    <string name="let_s_go">Los geht\'s</string>
+    <string name="select_n_repository_type">Wähle\nRepository Art</string>
+    <string name="select_repo_type_text">Wählen Sie aus, ob sie ein lokales Repository, oder ein remote Repository anlegen möchten.</string>
+    <string name="clone_remote_repo">Remote Repository klonen</string>
+    <string name="create_local_repo">Lokales Repository anlegen</string>
     <!-- SSH port validation -->
+    <string name="ssh_scheme_needed_title">Möglicherweise inkorrekte URL</string>
+    <string name="ssh_scheme_needed_message">Es sieht so aus, als ob Sie einen benutzerdefinierten Port in Ihrer URL angegeben haben, aber nicht in dem ssh://-Schema.\nDas kann dazu führen, dass Ihr Port als Teil des Pfades betrachtet wird. Drücken Sie hier auf OK um die URL zu korrigieren.</string>
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
deleted file mode 100644
index e489512a..00000000
--- a/app/src/main/res/values-es/strings.xml
+++ /dev/null
@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
-  ~ SPDX-License-Identifier: GPL-3.0-only
-  -->
-<resources>
-    <!-- Activity names -->
-    <string name="action_settings">Ajustes</string>
-    <string name="dialog_delete_title">El directorio ya existe</string>
-    <string name="dialog_delete_msg">El directorio seleccionado ya existe. La versión actual solo soporta un almacén de contraseñas. ¿Quieres eliminar el almacén actual?\n(%1$s)</string>
-    <string name="dialog_delete">Eliminar directorio</string>
-    <string name="dialog_do_not_delete">Cancelar</string>
-    <string name="title_activity_git_clone">Información de repositorio</string>
-    <!-- Password Store -->
-    <string name="creation_dialog_text">Por favor clona o crea un nuevo repositorio antes de añadir una contraseña o ejecutar una operación de sincronización.</string>
-    <string name="move">Mover</string>
-    <string name="edit">Editar</string>
-    <string name="delete">Eliminar</string>
-    <!-- git commits -->
-    <string name="git_commit_add_text">Contraseña para %1$s agregada usando Android Password Store.</string>
-    <string name="git_commit_edit_text">%1$s editada usando Android Password Store.</string>
-    <string name="git_commit_remove_text">%1$s eliminada del almacén usando Android Password Store.</string>
-    <string name="git_commit_move_text">Renombrado %1$s a %2$s usando Android Password Store..</string>
-    <!-- PGPHandler -->
-    <string name="clipboard_password_toast_text">Contraseña copiada al portapapeles, tienes %d segundos para pegarla.</string>
-    <string name="clipboard_password_no_clear_toast_text">Contraseña copiada al portapapeles</string>
-    <string name="file_toast_text">Por favor selecciona un nombre de archivo</string>
-    <string name="empty_toast_text">No puedes dejar la contraseña y el contenido extra ambos vacíos</string>
-    <!-- Git Async Task -->
-    <string name="jgit_error_dialog_title">Ocurrió un error durante la operación de Git</string>
-    <!-- Git Handler -->
-    <string name="ssh_preferences_dialog_text">Por favor importa o genera tu llave SSH en los ajustes</string>
-    <string name="ssh_preferences_dialog_title">No hay llave SSH</string>
-    <string name="ssh_preferences_dialog_import">Importar</string>
-    <string name="ssh_preferences_dialog_generate">Generar</string>
-    <string name="passphrase_dialog_title">Autenticar</string>
-    <string name="passphrase_dialog_text">Por favor ingresa una contraseña para tu llave SSH</string>
-    <string name="password_dialog_text">Por favor ingresa una contraseña para este repositorio</string>
-    <!-- Clone fragment -->
-    <string name="location_sdcard">Tarjeta SD</string>
-    <string name="location_hidden">Oculto (Recomendado)</string>
-    <string name="external_repository_dialog_title">Selecciona dónde almacenar tus contraseñas</string>
-    <string name="external_repository_dialog_text">Debes seleccionar un directorio para almacenar tus contraseñas. Si quieres guardarlas dentro del almacenamiento oculto de la aplicación, cancela este diálogo y deshabilita la opción \"Repositorio externo\".</string>
-    <string name="server_name">Servidor</string>
-    <string name="connection_mode">Modo de autenticación</string>
-    <!-- Git Config fragment -->
-    <string name="git_user_name_hint">Nombre de usuario</string>
-    <string name="invalid_email_dialog_text">Por favor ingresa una dirección de correo</string>
-    <string name="clone_button">¡Clonar!</string>
-    <!-- PGP Handler -->
-    <string name="crypto_name_hint">Nombre</string>
-    <string name="crypto_pass_label">Contraseña:</string>
-    <string name="crypto_extra_label">Extra:</string>
-    <string name="crypto_select">Seleccionar</string>
-    <string name="crypto_save">Guardar</string>
-    <!-- DECRYPT Layout -->
-    <string name="action_search">Buscar</string>
-    <string name="password">Contraseña:</string>
-    <string name="extra_content">Contenido extra:</string>
-    <string name="username">Nombre de usuario:</string>
-    <string name="edit_password">Editar contraseña</string>
-    <string name="copy_password">Copiar contraseña</string>
-    <string name="share_as_plaintext">Compartir como texto plano</string>
-    <string name="last_changed">Última modificación %s</string>
-    <!-- Preferences -->
-    <string name="pref_ssh_title">Importar llave SSH</string>
-    <string name="pref_ssh_keygen_title">Generar par de llaves SSH</string>
-    <string name="pref_ssh_see_key_title">Ver llave pública SSH generada</string>
-    <string name="pref_git_delete_repo">Eliminar repositorio</string>
-    <string name="pref_dialog_delete_title">Limpiar repositorio</string>
-    <string name="pref_copy_title">Copiar contraseña automáticamente</string>
-    <string name="pref_copy_dialog_title">Automáticamente copia la contraseña al portapapeles si el descifrado fue exitoso.</string>
-    <string name="ssh_key_success_dialog_title">Llave SSH importada</string>
-    <string name="ssh_key_error_dialog_text">Mensaje: \n</string>
-    <string name="pref_recursive_filter">Búsqueda recursiva</string>
-    <string name="pref_recursive_filter_hint">Busca contraseñas recursivamente en el directorio actual.</string>
-    <string name="pref_sort_order_title">Ordenamiento de contraseñas</string>
-    <string name="pref_folder_first_sort_order">Primero directorios</string>
-    <string name="pref_file_first_sort_order">Primero archivos</string>
-    <string name="pref_type_independent_sort_order">Independiente del tipo</string>
-    <string name="pref_autofill_title">Autollenado</string>
-    <string name="pref_autofill_enable_title">Habilitar autollenado</string>
-    <string name="pref_autofill_enable_msg">Pulsa OK para ir a los ajustes de Accesibilidad. Ahí, pulsa Password Store debajo de Servicios, luego pulsa el switch en la esquina superior derecha para (des)activarlo.</string>
-    <string name="pref_autofill_enable_msg2">Una vez que el servicio está activo, un diálogo aparecerá cuando pulses sobre un campo de contraseña en una app si existe un registro ligado.</string>
-    <string name="pref_autofill_enable_msg3">Password Store intenta ligar las contraseñas automáticamente. Puedes cambiar este ajuste predeterminado y cada ajuste por aplicación.</string>
-    <string name="pref_autofill_apps_title">Ajustes de aplicaciones y sitios web</string>
-    <string name="pref_autofill_default_title">Ligar automáticamente por defecto</string>
-    <string name="pref_autofill_default_hint">Por defecto usar \'Ligar automáticamente\' para aplicaciones sin ajustes personalizados. De otra forma, usar \'Nunca ligar.\'</string>
-    <string name="pref_autofill_always_title">Siempre mostrar diálogo</string>
-    <string name="pref_misc_title">Miscelánea</string>
-    <string name="pref_clear_clipboard_title">Limpiar portapapeles 20 veces</string>
-    <string name="pref_clear_clipboard_hint">Almacena números consecutivos en el portapapeles 20 veces. Útil en teléfonos Samsung con historial de portapapeles.</string>
-    <string name="pref_git_delete_repo_summary">Eliminar repositorio local (oculto)</string>
-    <string name="pref_external_repository">Repositorio externo</string>
-    <string name="pref_external_repository_summary">Usar un repositorio externo para contraseñas</string>
-    <string name="pref_select_external_repository">Seleccionar repositorio externo</string>
-    <string name="prefs_export_passwords_title">Exportar contraseñas</string>
-    <string name="prefs_export_passwords_summary">Exporta las contraseñas cifradas a un directorio externo.</string>
-    <string name="prefs_version">Versión</string>
-    <!-- PasswordGenerator fragment -->
-    <string name="pwgen_title">Generar Contraseña</string>
-    <string name="pwgen_generate">Generar</string>
-    <string name="pwgen_include">Incluir:</string>
-    <string name="pwgen_length">Longitud:</string>
-    <string name="pwgen_numerals">Números</string>
-    <string name="pwgen_symbols">Símbolos</string>
-    <string name="pwgen_uppercase">Mayúsculas</string>
-    <string name="pwgen_lowercase">Minúsculas</string>
-    <string name="pwgen_ambiguous">Caracteres ambiguos</string>
-    <string name="pwgen_pronounceable">Pronunciable</string>
-    <string name="pwgen_no_chars_error">No se han incluído caracteres</string>
-    <string name="pwgen_length_too_short_error">Longitud demasiado corta para el criterio seleccionado</string>
-    <!-- XKPWD password generator -->
-    <!-- XKPWD prefs -->
-    <!-- ssh keygen fragment -->
-    <string name="ssh_keygen_passphrase">Contraseña</string>
-    <string name="ssh_keygen_generate">Generar</string>
-    <!-- SSH Android Keystore auth -->
-    <!-- Misc -->
-    <string name="dialog_yes">Sí</string>
-    <string name="dialog_cancel">Cancelar</string>
-    <string name="git_sync">Sincronizar con servidor</string>
-    <string name="git_pull">Descargar del servidor</string>
-    <string name="git_push">Subir al servidor</string>
-    <string name="show_password_pref_title">Mostrar contraseña</string>
-    <string name="show_password_pref_summary">Controla la visibilidad de las contraseñas una vez descifradas. Esto no deshabilita el copiado de la contraseña.</string>
-    <string name="show_extra_content_pref_title">Mostrar contenido extra</string>
-    <string name="show_extra_content_pref_summary">Controla la visibilidad del contenido extra una vez descifrado.</string>
-    <string name="pwd_generate_button">Generar</string>
-    <string name="refresh_list">Actualizar lista</string>
-    <string name="no_repo_selected">Ningún repositorio externo seleccionado</string>
-    <string name="send_plaintext_password_to">Enviar contraseña en texto plano usando…</string>
-    <string name="app_icon_hint">Ícono de app</string>
-    <!-- Oreo Autofill -->
-    <string name="oreo_autofill_match_with">Coincide con %1$s</string>
-    <string name="oreo_autofill_filter_no_results">Sin resultados.</string>
-    <string name="oreo_autofill_search_in_store">Buscar en la tienda…</string>
-    <string name="oreo_autofill_save_internal_error">Error al guardar debido a un error interno</string>
-    <string name="oreo_autofill_save_app_not_supported">Esta aplicación no es compatible actualmente</string>
-    <string name="oreo_autofill_save_passwords_dont_match">Las contraseñas no coinciden</string>
-    <string name="oreo_autofill_generate_password">Generar contraseña…</string>
-    <string name="oreo_autofill_warning_publisher_install_time">Instalada: %1$s</string>
-    <string name="oreo_autofill_warning_publisher_advanced_info_button">Información avanzada</string>
-    <string name="oreo_autofill_warning_publisher_changed_disable_autofill_button">Mantener el Autocompletado desactivado</string>
-    <string name="oreo_autofill_warning_publisher_reenable_button">Reactivar el Autocompletado</string>
-    <string name="oreo_autofill_warning_publisher_warning_sign_description">Advertencia</string>
-    <string name="oreo_autofill_warning_publisher_dataset_summary">Pulse para ver detalles…</string>
-    <string name="oreo_autofill_warning_publisher_dataset_title">Posible intento de suplantación de identidad</string>
-    <string name="oreo_autofill_general_fill_and_save_support">Rellena y guarda las credenciales</string>
-    <string name="oreo_autofill_general_fill_support">Rellena las credenciales</string>
-    <string name="oreo_autofill_password_fill_support">Rellenar las contraseñas</string>
-    <!-- Autofill -->
-    <string name="autofill_description">Autollena campos de contraseña en aplicaciones. Solo funciona en Android 4.3 y superiores. No depende del portapapales en Android 5.0 y superiores.</string>
-    <string name="autofill_apps_default">Usar la opción predeterminada</string>
-    <string name="autofill_apps_first">Ligar automáticamente</string>
-    <string name="autofill_apps_match_ellipsis">Ligar a…</string>
-    <string name="autofill_apps_match">Ligar a</string>
-    <string name="autofill_apps_never">Nunca ligar</string>
-    <string name="autofill_apps_delete">Eliminar</string>
-    <string name="autofill_pick">Seleccionar…</string>
-    <string name="autofill_pick_and_match">Seleccionar y ligar…</string>
-    <string name="autofill_paste">Pegar</string>
-    <string name="autofill_paste_username">Pegar nombre de usuario?\n\n%s</string>
-    <string name="autofill_toast_username">Selecciona un campo editable para pegar el nombre de usuario.\nNombre de usuario disponible por %d segundos.</string>
-    <string name="ssh_key_does_not_exist">Imposible abrir la llave privada SSH. Por favor verifica que el archivo exista</string>
-    <string name="new_password_title">Nueva contraseña</string>
-    <string name="autofill_ins_1_hint">Pantalla de Servicios de Accesibilidad</string>
-    <string name="autofill_ins_2_hint">Pantalla de activación en Servicios de Accesibilidad</string>
-    <string name="autofill_ins_3_hint">Pantalla de servicio de autollenado en acción</string>
-    <string name="git_operation_remember_passphrase">Recordar contraseñagit  (inseguro)</string>
-    <string name="abort_rebase">Abortar rebase</string>
-    <!-- OpenKeychain errors -->
-    <!-- Password creation failure -->
-    <!-- GitException messages -->
-    <string name="git_push_nff_error">La subida fue rechazada por el servidor, Ejecuta \'Descargar desde servidor\' antes de subir o pulsa \'Sincronizar con servidor\' para realizar ambas acciones.</string>
-    <!-- OpenKeychain not installed -->
-    <!-- GPG key selection in folder creation -->
-    <!-- Onboarding flow -->
-    <!-- SSH port validation -->
-</resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index b4e35467..3133bd52 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!--
+<?xml version="1.0" encoding="utf-8"?>
+<!--
   ~ Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
   ~ SPDX-License-Identifier: GPL-3.0-only
   -->
@@ -14,6 +15,7 @@
     <string name="dialog_delete">Supprimer le répertoire</string>
     <string name="dialog_do_not_delete">Annuler</string>
     <string name="title_activity_git_clone">Information sur le dépôt Git</string>
+    <string name="title_activity_git_log">Historique des commits</string>
     <!-- Password Store -->
     <string name="creation_dialog_text">Clonez ou créez un dépôt suivant avant d\'essayer d\'ajouter un mot de passe ou d\'effectuer une opération de synchronisation.</string>
     <plurals name="delete_dialog_text">
@@ -35,7 +37,7 @@
     <!-- git commits -->
     <string name="git_commit_add_text">Ajout par Android Password Store d\'un mot de passe pour %1$s.</string>
     <string name="git_commit_edit_text">Modification par Android Password Store du mot de passe pour %1$s.</string>
-    <string name="git_commit_remove_text">Retirer %1$s de la mémoire.</string>
+    <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>
@@ -90,6 +92,8 @@
     <string name="last_changed">Dernière modification le %s</string>
     <!-- Preferences -->
     <string name="pref_repository_title">Dépôt</string>
+    <string name="pref_edit_server_info">Modifier les paramètres du serveur Git</string>
+    <string name="pref_edit_git_config">Configuration locale de Git &amp; utilitaires</string>
     <string name="pref_ssh_title">Importer une clef SSH</string>
     <string name="pref_ssh_keygen_title">Générer une paire de clefs SSH</string>
     <string name="pref_ssh_see_key_title">Voir la clef publique SSH générée</string>
@@ -110,6 +114,7 @@
     <string name="pref_sort_order_title">Ordre de tri des mots de passe</string>
     <string name="pref_folder_first_sort_order">Dossiers en premier</string>
     <string name="pref_file_first_sort_order">Fichiers en premier</string>
+    <string name="pref_type_independent_sort_order">Indifférent au type d\'entrée</string>
     <string name="pref_recently_used_sort_order">Récemment utilisé</string>
     <string name="pref_autofill_title">Saisie automatique</string>
     <string name="pref_autofill_enable_title">Saisie automatique</string>
@@ -162,7 +167,21 @@
     <!-- ssh keygen fragment -->
     <string name="ssh_keygen_passphrase">Mot de passe</string>
     <string name="ssh_keygen_generate">Générer</string>
+    <string name="ssh_keygen_share">Partager</string>
+    <string name="ssh_keygen_later">Plus tard</string>
+    <string name="ssh_keygen_message">%1$s\n\nFournissez cette clé publique à votre serveur Git.</string>
     <string name="ssh_key_gen_generating_progress">Génération des clés…</string>
+    <string name="ssh_keygen_require_authentication">Protéger avec les identifiants de verrouillage de l\'écran</string>
+    <string name="ssh_keygen_label_rsa">RSA</string>
+    <string name="ssh_keygen_label_ecdsa">ECDSA</string>
+    <string name="ssh_keygen_label_ed25519">Ed25519</string>
+    <string name="ssh_keygen_explanation_rsa"><b>RSA (3072 bits)</b>\nAuthentification lente mais prise en charge par tous les serveurs.</string>
+    <string name="ssh_keygen_explanation_ecdsa"><b>ECDSA (NIST P-256)</b>\nAuthentification rapide et prise en charge par la plupart des serveurs.</string>
+    <string name="ssh_keygen_explanation_ed25519"><b>Ed25519</b>\nAuthentification rapide mais prise en charge uniquement par des serveurs récents.</string>
+    <string name="ssh_keygen_existing_title">Clé SSH</string>
+    <string name="ssh_keygen_existing_message">Remplacer la clé SSH existante ? Vous risquez de perdre l\'accès à votre serveur.</string>
+    <string name="ssh_keygen_existing_replace">Remplacer</string>
+    <string name="ssh_keygen_existing_keep">Annuler</string>
     <!-- SSH Android Keystore auth -->
     <!-- Misc -->
     <string name="dialog_ok">Ok</string>
@@ -174,6 +193,7 @@
     <string name="git_pull">Importer du serveur</string>
     <string name="git_push">Pousser sur le serveur</string>
     <string name="git_push_up_to_date">Dépôt à jour</string>
+    <string name="git_log">Afficher l\'historique des commits</string>
     <string name="show_password_pref_title">Montrer le mot de passe</string>
     <string name="show_password_pref_summary">Contrôle la visibilité des mots de passe une fois déchifrées, ceci n\'empêche pas de copier le mot de passe</string>
     <string name="show_extra_content_pref_title">Afficher le contenu supplémentaire</string>
@@ -232,6 +252,8 @@
     <string name="biometric_auth_summary_error">Lecteur d\'empreinte digitale non accessible ou manquant</string>
     <string name="your_public_key">Votre clé publique</string>
     <string name="error_generate_ssh_key">Une erreur est survenue pendant la génération de la clé ssh</string>
+    <string name="pref_show_hidden_title">Afficher tous les fichiers et dossiers</string>
+    <string name="pref_show_hidden_summary">Montrer les fichiers et dossiers autre que des mots de passe dans la liste</string>
     <string name="title_create_folder">Créer un dossier</string>
     <string name="title_rename_folder">Renommer le dossier</string>
     <string name="message_rename_folder">Entrez le chemin pour %1$s</string>
@@ -244,7 +266,11 @@
     <string name="theme_light">Clair</string>
     <string name="theme_dark">Sombre</string>
     <string name="theme_follow_system">Thème système</string>
+    <string name="connection_mode_ssh_key">Clé SSH</string>
     <string name="connection_mode_basic_authentication">Mot de passe</string>
+    <string name="git_server_config_save_error">L\'URL du dépôt fournie n\'est pas valide</string>
+    <string name="git_server_config_save_missing_username_https">Veuillez spécifier le nom d\'utilisateur HTTPS sous la forme https://nom@exemple.com/…</string>
+    <string name="git_server_config_save_missing_username_ssh">Veuillez spécifier le nom d\'utilisateur SSH sous la forme nom@example.com:…</string>
     <string name="git_operation_wrong_password">Mot de passe incorrect</string>
     <string name="bottom_sheet_create_new_folder">Créer un dossier</string>
     <string name="bottom_sheet_create_new_password">Créer un mot de passe</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
new file mode 100644
index 00000000..b8155fed
--- /dev/null
+++ b/app/src/main/res/values-gl/strings.xml
@@ -0,0 +1,348 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
+  ~ SPDX-License-Identifier: GPL-3.0-only
+  -->
+<resources>
+    <plurals name="delete_title">
+        <item quantity="one">%d elemento seleccionado</item>
+        <item quantity="other">%d elementos seleccionados</item>
+    </plurals>
+    <!-- Activity names -->
+    <string name="action_settings">Axustes</string>
+    <string name="dialog_delete_title">Xa existe o directorio</string>
+    <string name="dialog_delete_msg">O directorio escollido xa existe. A versión actual só admite un almacenaxe. Desexas eliminar o directorio actual de password store?\n(%1$s)</string>
+    <string name="dialog_delete">Eliminar directorio</string>
+    <string name="dialog_do_not_delete">Cancelar</string>
+    <string name="title_activity_git_clone">Información do repositorio</string>
+    <string name="title_activity_git_log">Rexistro de cambios</string>
+    <!-- Password Store -->
+    <string name="creation_dialog_text">Clona ou crea un novo repositorio aquí antes de intentar engadir un contrasinal ou realizar unha sincronización.</string>
+    <plurals name="delete_dialog_text">
+        <item quantity="one">¿Tes a certeza de querer eliminar o contrasinal?</item>
+        <item quantity="other">¿Tes a certeza de querer eliminar %d contrasinais?</item>
+    </plurals>
+    <string name="delete_directory_progress_text">Eliminando…</string>
+    <string name="move">Mover</string>
+    <string name="edit">Editar</string>
+    <string name="delete">Eliminar</string>
+    <string name="change">Cambiar</string>
+    <string name="use">Usar</string>
+    <string name="directory_selected_title">O directorio xa está seleccionado</string>
+    <string name="directory_selected_message">Queres usar \"%1$s\"?</string>
+    <string name="password_exists_title">O contrasinal xa existe!</string>
+    <string name="password_exists_message">Vas sobreescribir %1$s con %2$s.</string>
+    <string name="password_move_error_title">Fallo ó mover os contrasinais</string>
+    <string name="password_move_error_message">Fallou o movemento de %1$s a %2$s</string>
+    <!-- git commits -->
+    <string name="git_commit_add_text">Engadir o contrasinal creado para %1$s usando android password store.</string>
+    <string name="git_commit_edit_text">Editar contrasinal para %1$s usando android password store.</string>
+    <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>
+    <string name="clipboard_copied_text">Copiada ó portapapeis</string>
+    <string name="clipboard_otp_copied_text">Código OTP copiado ó portapapeis</string>
+    <string name="file_toast_text">Debes proporcionar un nome de ficheiro</string>
+    <string name="path_toast_text">Por favor indica a ruta ao ficheiro</string>
+    <string name="empty_toast_text">Non podes deixar baleiro o contrasinal ou o contido extra</string>
+    <!-- Git Async Task -->
+    <string name="jgit_error_dialog_title">Algo fallou na operación de Git</string>
+    <!-- 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="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>
+    <string name="password_dialog_text">Escribe o contrasinal de este repositorio</string>
+    <!-- Clone fragment -->
+    <string name="location_dialog_create_text">Escolle onde queres crear o teu repositorio de contrasinais</string>
+    <string name="location_sdcard">Tarxeta-SD</string>
+    <string name="location_hidden">Agochado (preferible)</string>
+    <string name="external_repository_dialog_title">Escolle onde gardar os contrasinais</string>
+    <string name="external_repository_dialog_text">Tes que escoller un directorio para gardar os contrasinais. Se queres gardalos dentro do directorio oculto da aplicación, cancela este diálogo e desactiva a opción \"Repositorio Externo\".</string>
+    <string name="server_name">Servidor</string>
+    <string name="server_url">URL do servidor</string>
+    <string name="server_branch">Póla</string>
+    <string name="connection_mode">Modo de autenticación</string>
+    <!-- Git Config fragment -->
+    <string name="git_user_name_hint">Nome de usuaria</string>
+    <string name="git_user_email">Email</string>
+    <string name="invalid_email_dialog_text">Escribe un enderezo de email válido</string>
+    <string name="clone_button">Clonar!</string>
+    <!-- PGP Handler -->
+    <string name="crypto_name_hint">Nome</string>
+    <string name="crypto_pass_label">Contrasinal</string>
+    <string name="crypto_extra_label">Contido extra</string>
+    <string name="crypto_encrypt_username_label">Cifrar nome de usuaria</string>
+    <string name="crypto_select">Seleccionar</string>
+    <string name="crypto_save">Gardar</string>
+    <string name="crypto_save_and_copy">Gardar e copiar</string>
+    <!-- DECRYPT Layout -->
+    <string name="action_search">Buscar</string>
+    <string name="password">Contrasinal:</string>
+    <string name="otp">OTP:</string>
+    <string name="extra_content">Contido extra:</string>
+    <string name="username">Nome de usuaria:</string>
+    <string name="edit_password">Editar contrasinal</string>
+    <string name="copy_password">Copiar contrasinal</string>
+    <string name="share_as_plaintext">Compartir como texto plano</string>
+    <string name="last_changed">Último cambio %s</string>
+    <!-- Preferences -->
+    <string name="pref_repository_title">Repositorio</string>
+    <string name="pref_edit_server_info">Editar axustes do servidor git</string>
+    <string name="pref_edit_git_config">Utilidades Git</string>
+    <string name="pref_ssh_title">Importar chave SSH</string>
+    <string name="pref_ssh_keygen_title">Crear par de chaves SSH</string>
+    <string name="pref_ssh_see_key_title">Ver a chave pública SSH creada</string>
+    <string name="pref_git_delete_repo">Eliminar repositorio</string>
+    <string name="pref_dialog_delete_title">Baleirar repositorio</string>
+    <string name="pref_category_general_title">Xeral</string>
+    <string name="pref_category_title_passwords">Contrasinais</string>
+    <string name="pref_clipboard_timeout_title">Caducidade do copiado do contrasinal</string>
+    <string name="pref_clipboard_timeout_summary">Establece os segundos que queres que o contrasinal permaneza copiado no portapapeis. 0 significa para sempre. Valor actual: %1$s</string>
+    <string name="pref_copy_title">Copiar contrasinal automáticamente</string>
+    <string name="pref_copy_dialog_title">Copia automáticamente o contrasinal ao portapapeis se o descifra correctamente</string>
+    <string name="ssh_key_import_error_not_an_ssh_key_message">O ficheiro escollido non semella ser unha chave privada SSH.</string>
+    <string name="ssh_key_success_dialog_title">Chave-SSH importada</string>
+    <string name="ssh_key_error_dialog_title">Houbo un fallo ao importar a chave ssh</string>
+    <string name="ssh_key_error_dialog_text">Mensaxe : \n</string>
+    <string name="pref_recursive_filter">Filtro recursivo</string>
+    <string name="pref_recursive_filter_hint">Atopa as chaves de xeito recursivo no directorio actual.</string>
+    <string name="pref_sort_order_title">Orde para mostrar contrasinais</string>
+    <string name="pref_folder_first_sort_order">Primeiro cartafoles</string>
+    <string name="pref_file_first_sort_order">Primeiro ficheiros</string>
+    <string name="pref_type_independent_sort_order">Independentemente do tipo</string>
+    <string name="pref_recently_used_sort_order">Usadas recentemente</string>
+    <string name="pref_autofill_title">Completado automático</string>
+    <string name="pref_autofill_enable_title">Activar completado automático</string>
+    <string name="pref_misc_title">Varios</string>
+    <string name="pref_clear_clipboard_title">Baleirar portapapeis 20 veces</string>
+    <string name="pref_clear_clipboard_hint">Gardar números consecutivos no portapapeis 20 veces. Resulta útil nos móbiles Samsung que gardan historial no portapapeis.</string>
+    <string name="pref_git_delete_repo_summary">Elimina repositorio local (oculto).</string>
+    <string name="pref_external_repository">Repositorio externo</string>
+    <string name="pref_external_repository_summary">Usar un repositorio externo de contrasinais</string>
+    <string name="pref_select_external_repository">Selecciona repositorio externo</string>
+    <string name="prefs_export_passwords_title">Exportar contrasinais</string>
+    <string name="prefs_export_passwords_summary">Exporta os contrasinais cifrados a un directorio externo</string>
+    <string name="prefs_version">Versión</string>
+    <!-- PasswordGenerator fragment -->
+    <string name="pwgen_title">Crear contrasinal</string>
+    <string name="pwgen_generate">Crear</string>
+    <string name="pwgen_include">Incluír</string>
+    <string name="pwgen_length">Lonxitude</string>
+    <string name="pwgen_numerals">Números</string>
+    <string name="pwgen_symbols">Símbolos</string>
+    <string name="pwgen_uppercase">Maiúsculas</string>
+    <string name="pwgen_lowercase">Minúsculas</string>
+    <string name="pwgen_ambiguous">Ambíguo</string>
+    <string name="pwgen_pronounceable">Pronunciable</string>
+    <string name="pwgen_no_chars_error">Sen caracteres incluídos</string>
+    <string name="pwgen_length_too_short_error">Lonxitude demasiado curta para o criterio</string>
+    <string name="pwgen_max_iterations_exceeded">Fallou a creación do contrasinal satisfacendo os requerimentos. Intenta aumentar a lonxitude.</string>
+    <!-- XKPWD password generator -->
+    <string name="xkpwgen_title">Xkpasswd Generator</string>
+    <string name="xkpwgen_length">Total de palabras</string>
+    <string name="xkpwgen_separator">Separador</string>
+    <string name="xkpwgen_custom_dict_imported">Lista persoal de palabras: %1$s</string>
+    <string name="xkpwgen_builder_error">O dicionario non contén palabras suficientes da lonxitude dada %1$d .. %2$d</string>
+    <!-- XKPWD prefs -->
+    <string name="xkpwgen_pref_gentype_title">Tipo de creador de contrasinais</string>
+    <string name="xkpwgen_pref_custom_dict_title">Lista persoal de palabras</string>
+    <string name="xkpwgen_pref_custom_dict_summary_on">Usar ficheiro con palabras personalizadas</string>
+    <string name="xkpwgen_pref_custom_dict_summary_off">Usar lista de palabras incluída</string>
+    <string name="xkpwgen_pref_custom_dict_picker_title">Ficheiro persoal de palabras</string>
+    <string name="xkpwgen_pref_custom_dict_picker_summary">Toca para escoller un ficheiro persoal con palabras que conteña unha palabra por liña</string>
+    <!-- ssh keygen fragment -->
+    <string name="ssh_keygen_passphrase">Frase de paso</string>
+    <string name="ssh_keygen_generate">Crear</string>
+    <string name="ssh_keygen_share">Compartir</string>
+    <string name="ssh_keygen_later">Máis tarde</string>
+    <string name="ssh_keygen_message">%1$s\n\nUsa esta chave pública no teu servidor Git.</string>
+    <string name="ssh_key_gen_generating_progress">Creando chaves…</string>
+    <string name="ssh_keygen_require_authentication">Protexe con credenciais de bloqueo de pantalla</string>
+    <string name="ssh_keygen_label_rsa">RSA</string>
+    <string name="ssh_keygen_label_ecdsa">ECDSA</string>
+    <string name="ssh_keygen_label_ed25519">Ed25519</string>
+    <string name="ssh_keygen_explanation_rsa"><b>RSA (3072 bit)</b>\nSoportado por tódolos servidores, mais a autenticación é algo máis lenta.</string>
+    <string name="ssh_keygen_explanation_ecdsa"><b>ECDSA (NIST P-256)</b>\nAutenticación rápida e soportado pola maioría dos servidores que estén actualizados.</string>
+    <string name="ssh_keygen_explanation_ed25519"><b>Ed25519</b>\nAutenticación rápida, pero só soportado polos servidores máis modernos.</string>
+    <string name="ssh_keygen_existing_title">Chave SSH</string>
+    <string name="ssh_keygen_existing_message">¿Substituír a chave SSH actual? Poderías perder o acceso ó servidor.</string>
+    <string name="ssh_keygen_existing_replace">Substituír</string>
+    <string name="ssh_keygen_existing_keep">Manter</string>
+    <!-- SSH Android Keystore auth -->
+    <string name="biometric_auth_generic_failure">Fallou a autenticación do bloqueo de pantalla</string>
+    <string name="biometric_prompt_title_ssh_auth">Desbloquear chave SSH</string>
+    <string name="biometric_prompt_title_ssh_keygen">Crear chave SSH</string>
+    <!-- Misc -->
+    <string name="dialog_ok">OK</string>
+    <string name="dialog_yes">Si</string>
+    <string name="dialog_no">Non</string>
+    <string name="dialog_cancel">Cancelar</string>
+    <string name="dialog_skip">Saltar</string>
+    <string name="git_sync">Sincronizar repositorio</string>
+    <string name="git_pull">Traer desde remoto</string>
+    <string name="git_push">Enviar a remoto</string>
+    <string name="git_push_up_to_date">Todo ó día</string>
+    <string name="git_log">Mostrar rexistro dos cambios</string>
+    <string name="show_password_pref_title">Mostrar contrasinal</string>
+    <string name="show_password_pref_summary">Controlar a visibilidade do contrasinal unha vez descifrado, esto non desactiva o copiado do contrasinal</string>
+    <string name="show_extra_content_pref_title">Mostrar contido extra</string>
+    <string name="show_extra_content_pref_summary">Controla a visibilidade do contido extra unha vez descifrado</string>
+    <string name="pwd_generate_button">Crear</string>
+    <string name="refresh_list">Actualizar lista</string>
+    <string name="no_repo_selected">Non hai seleccionado ningún repositorio externo</string>
+    <string name="send_plaintext_password_to">Enviar contrasinal como texto plano usando...</string>
+    <string name="app_icon_hint">Icona da app</string>
+    <!-- Oreo Autofill -->
+    <string name="oreo_autofill_strict_domain_search">Busca resistente ó phishing</string>
+    <string name="oreo_autofill_match_with">Coincidencia con %1$s</string>
+    <string name="oreo_autofill_matches_clear_existing">Baleirar coincidencias existentes</string>
+    <string name="oreo_autofill_filter_no_results">Sen resultados.</string>
+    <string name="oreo_autofill_search_in_store">Buscar no almacenaxe...</string>
+    <string name="oreo_autofill_save_internal_error">Non se puido gardar por un fallo interno</string>
+    <string name="oreo_autofill_save_app_not_supported">Esta app non está soportada actualmente</string>
+    <string name="oreo_autofill_save_passwords_dont_match">Non concordan os contrasinais</string>
+    <string name="oreo_autofill_generate_password">Crear contrasinal...</string>
+    <string name="oreo_autofill_fill_otp_from_sms">Extraer código do SMS…</string>
+    <string name="oreo_autofill_max_matches_reached">Acadouse o máximo número de coincidencias (%1$d); eliminar as coincidencias antes de engadir máis.</string>
+    <string name="oreo_autofill_warning_publisher_header">A autoría desta app cambiou desde que rexistraches a entrada Password Store con ela:</string>
+    <string name="oreo_autofill_warning_publisher_footer"><b>A aplicación actualmente instalada podería intentar roubar as túas credenciais pretendendo ser unha app de confianza.</b>\n\nIntenta desinstalar e reinstalar
+a app desde unha fonte de confianza, como a Play Store, Amazon Appstore, F-Droid ou a tenda do fabricante do teu móbil.</string>
+    <string name="oreo_autofill_warning_publisher_install_time">Instalada: %1$s</string>
+    <string name="oreo_autofill_warning_publisher_advanced_info_button">Información avanzada</string>
+    <string name="oreo_autofill_warning_publisher_changed_disable_autofill_button">Manter desactivado o autocompletado</string>
+    <string name="oreo_autofill_warning_publisher_reenable_button">Reactivar autocompletado</string>
+    <string name="oreo_autofill_warning_publisher_warning_sign_description">Aviso</string>
+    <string name="oreo_autofill_warning_publisher_dataset_summary">Toca para detalles...</string>
+    <string name="oreo_autofill_warning_publisher_dataset_title">Posible intento de phishing</string>
+    <string name="oreo_autofill_general_fill_and_save_support">Completar e gardar credenciais</string>
+    <string name="oreo_autofill_general_fill_support">Completar credenciais</string>
+    <string name="oreo_autofill_password_fill_support">Completar contrasinais</string>
+    <string name="oreo_autofill_flaky_fill_support">Completa as credenciais (poderías ter que reiniciar o navegador de cando en vez)</string>
+    <string name="oreo_autofill_no_support">Sen soporte</string>
+    <string name="oreo_autofill_preference_directory_structure">Organización dos contrasinais</string>
+    <string name="oreo_autofill_enable_dialog_description">Password Store pode ofrecerche completar formularios e incluso gardar contrasinais que escribes en apps e sitios web.</string>
+    <string name="oreo_autofill_enable_dialog_instructions">Para habilitar esta característica toca en OK e vaite ós axustes de autocompletado. Alí, escolle Password Store da lista e confirma a solicitude premendo no OK.</string>
+    <string name="oreo_autofill_enable_dialog_installed_browsers">Soporte de autocompletado cos navegadores:</string>
+    <!-- Autofill -->
+    <string name="ssh_key_does_not_exist">Non se pode abrir a chave privada ssh, comproba que existe tal ficheiro</string>
+    <string name="new_password_title">Novo contrasinal</string>
+    <string name="clear_saved_passphrase_ssh">Baleirar a frase de paso gardada para a chave SSH local</string>
+    <string name="clear_saved_passphrase_https">Baleirar contrasinal HTTPS gardado</string>
+    <string name="git_operation_remember_passphrase">Lembrar frase de paso da chave</string>
+    <string name="git_tools">Ferramentas</string>
+    <string name="abort_rebase">Abortar rebase e push a unha nova rama</string>
+    <string name="reset_to_remote">Hard reset na rama remota</string>
+    <string name="git_head_on_branch">Na póla %1$s</string>
+    <string name="git_head_detached">HEAD desligado a %1$s</string>
+    <string name="git_head_missing">Non se localiza o HEAD</string>
+    <string name="sdcard_root_warning_title">Raíz da Tarxeta-SD non seleccionada</string>
+    <string name="sdcard_root_warning_message">Escolleches a raíz da tarxeta SD para a almacenaxe. Esto é moi perigoso e perderás todos os datos e contido se, por calquera razón, son eliminados.</string>
+    <string name="git_abort_and_push_title">Abortar e Push</string>
+    <string name="biometric_prompt_title">Petición biométrica</string>
+    <string name="biometric_auth_error">Fallo de autenticación</string>
+    <string name="biometric_auth_error_reason">Fallou a autenticación: %s</string>
+    <string name="biometric_auth_title">Activar autenticación biométrica</string>
+    <string name="biometric_auth_summary">Ao activala, Password Store vaiche pedir a túa pegada dactilar ao iniciar a app</string>
+    <string name="biometric_auth_summary_error">O hardware de pegada dixital non é accesible ou existente</string>
+    <string name="ssh_openkeystore_clear_keyid">Eliminar o ID lembrado da chave SSH en OpenKeystore</string>
+    <string name="access_sdcard_text">O almacenaxe está na tarxeta SD pero a app non ten permiso para acceder a el. Por favor concédelle permiso.</string>
+    <string name="your_public_key">A túa chave pública</string>
+    <string name="error_generate_ssh_key">Algo fallou ao intentar crear a chave-ssh</string>
+    <string name="pref_show_hidden_title">Mostar cartafoles ocultos</string>
+    <string name="pref_show_hidden_summary">Incluír cartafoles ocultos na lista de contrasinais</string>
+    <string name="title_create_folder">Crear cartafol</string>
+    <string name="title_rename_folder">Renomear cartafol</string>
+    <string name="message_category_error_empty_field">O nome da categoría non pode estar baleiro</string>
+    <string name="message_category_error_category_exists">Xa existe o nome da categoría</string>
+    <string name="message_error_destination_outside_repo">O destino debe estar dentro do repositorio</string>
+    <string name="message_rename_folder">Escribe o destino para %1$s</string>
+    <string name="button_create">Crear</string>
+    <string name="pref_search_on_start">Abrir busca ao inicio</string>
+    <string name="pref_search_on_start_hint">Abrir a barra de busca cando se inicia a app</string>
+    <string name="password_generator_category_title">Creador de contrasinais</string>
+    <string name="tap_clear_clipboard">Toca aquí para baleirar o portapapeis</string>
+    <string name="clone_git_repo">Clonar un repositorio git para sincronizar os cambios</string>
+    <string name="theme_title">Decorado da App</string>
+    <string name="theme_light">Claro</string>
+    <string name="theme_dark">Escuro</string>
+    <string name="theme_battery_saver">Establecido polo Aforrador de enerxía</string>
+    <string name="theme_follow_system">Por omisión do sistema</string>
+    <string name="connection_mode_ssh_key">Chave SSH</string>
+    <string name="connection_mode_basic_authentication">Contrasinal</string>
+    <string name="git_server_config_save_success">Configuración gardada</string>
+    <string name="git_server_config_save_error">O URL do repositorio proporcionado non é válido</string>
+    <string name="git_server_config_save_missing_username_https">Indica o nome de usuaria HTTPS coa estructura https://username@example.com/…</string>
+    <string name="git_server_config_save_missing_username_ssh">Indica o nome de usuaria SSH na forma username@example.com:…</string>
+    <string name="git_server_config_save_auth_mode_mismatch">Modos válidos de autenticación para %1$s: %2$s</string>
+    <string name="git_operation_wrong_passphrase">Frase de paso incorrecta</string>
+    <string name="git_operation_wrong_password">Contrasinal incorrecto</string>
+    <string name="bottom_sheet_create_new_folder">Crear novo cartafol</string>
+    <string name="bottom_sheet_create_new_password">Crear novo contrasinal</string>
+    <string name="snackbar_action_grant">Permitir</string>
+    <string name="pref_debug_logging_summary">Activar o rexistro de problemas (require reinicio)</string>
+    <string name="pref_debug_logging_title">Rexistro de problemas</string>
+    <string name="preference_default_username_summary">Se Autocompletado non é quen de determinar o nome de usuaria no ficheiro do contrasinal ou estructura de directorios, utilizará o valor indicado aquí</string>
+    <string name="preference_default_username_title">Nome de usuaria por omisión</string>
+    <string name="git_operation_remember_password">Lembrar contrasinal</string>
+    <string name="git_operation_hint_password">Contrasinal</string>
+    <string name="preference_custom_public_suffixes_title">Dominios personalizados</string>
+    <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>
+    <string name="password_creation_file_delete_fail_message">Fallou a eliminación do ficheiro de contrasinal %1$s no almacén, intenta eliminalo manualmente.</string>
+    <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="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>
+    <!-- GitException messages -->
+    <string name="git_unknown_error">Fallo descoñecido</string>
+    <string name="git_pull_fail_error">Fallou a acción pull, estás nun head diferente. Utiliza \"axustes &gt; utilidades git\", garda os cambios no remoto nunha nova rama e resolve o conflicto nun ordenador.</string>
+    <string name="git_push_nff_error">O push foi rexeitado polo remoto, executa pull antes de voltar a subilos de novo. Podes usar Sincronizar mellor que push/pull xa que inclú ambos.</string>
+    <string name="git_push_generic_error">O push foi rexeitado polo remoto, razón:</string>
+    <string name="git_push_other_error">O remoto rexeitou o push non-fast-forward. Comproba a variable receive.denyNonFastForwards no ficheiro de configuración do repositorio de destino.</string>
+    <string name="git_unknown_host">Host descoñecido: %1$s</string>
+    <string name="git_operation_running">Realizando operación git…</string>
+    <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>
+    <string name="xkpwgen_extrachars_label">Díxitos/Símbolos (d/s)</string>
+    <string name="xk_numbers_symbols_append_default">ds</string>
+    <!-- Onboarding flow -->
+    <string name="repository_n_location">Repositorio \nLocalización</string>
+    <string name="let_s_go">Imos alá</string>
+    <string name="select_n_repository_type">Escolle \nTipo de repositorio</string>
+    <string name="select_repo_type_text">Escolle se queres crear un repositorio local ou clonar un remoto.</string>
+    <string name="clone_remote_repo">Clonar repositorio remoto</string>
+    <string name="create_local_repo">Crear repositorio local</string>
+    <!-- SSH port validation -->
+    <string name="ssh_scheme_needed_title">URL potencialmente incorrecto</string>
+    <string name="ssh_scheme_needed_message">Semella que o teu URL contén un porto personalizado, pero non indica o esquema ssh://.\nEsto pode facer que o porto sexa considerado parte do enderezo. Preme aquí en OK para arranxalo URL.</string>
+</resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
new file mode 100644
index 00000000..63a605eb
--- /dev/null
+++ b/app/src/main/res/values-it/strings.xml
@@ -0,0 +1,347 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
+  ~ SPDX-License-Identifier: GPL-3.0-only
+  -->
+<resources>
+    <plurals name="delete_title">
+        <item quantity="one">%d elemento selezionato</item>
+        <item quantity="other">%d elementi selezionati</item>
+    </plurals>
+    <!-- Activity names -->
+    <string name="action_settings">Impostazioni</string>
+    <string name="dialog_delete_title">La directory esiste già</string>
+    <string name="dialog_delete_msg">La directory di destinazione esiste già. La versione corrente supporta solo un negozio singolo. Vuoi eliminare la directory dell\'archivio delle password corrente?\n(%1$s)</string>
+    <string name="dialog_delete">Elimina directory</string>
+    <string name="dialog_do_not_delete">Annulla</string>
+    <string name="title_activity_git_clone">Informazioni della repository</string>
+    <string name="title_activity_git_log">Conferma registro</string>
+    <!-- Password Store -->
+    <string name="creation_dialog_text">Sei pregato di clonare o creare una nuova repository sotto prima di provare ad aggiungere una password o eseguire qualsiasi operazione di sincronizzazione.</string>
+    <plurals name="delete_dialog_text">
+        <item quantity="one">Sei sicuro di voler eliminare la password?</item>
+        <item quantity="other">Sei sicuro di voler eliminare %d password?</item>
+    </plurals>
+    <string name="delete_directory_progress_text">Eliminando…</string>
+    <string name="move">Sposta</string>
+    <string name="edit">Modifica</string>
+    <string name="delete">Elimina</string>
+    <string name="change">Modifica</string>
+    <string name="use">Usa</string>
+    <string name="directory_selected_title">Directory già selezionata</string>
+    <string name="directory_selected_message">Vuoi usare \"%1$s\"?</string>
+    <string name="password_exists_title">La password esiste già!</string>
+    <string name="password_exists_message">Questo sovrascriverà %1$s con %2$s.</string>
+    <string name="password_move_error_title">Errore spostando le password</string>
+    <string name="password_move_error_message">Impossibile spostare %1$s a %2$s</string>
+    <!-- git commits -->
+    <string name="git_commit_add_text">Aggiungi password generata per %1$s usando Android Password Store.</string>
+    <string name="git_commit_edit_text">Modifica password per %1$s usando Android Password Store.</string>
+    <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>
+    <string name="clipboard_copied_text">Copiato negli appunti</string>
+    <string name="clipboard_otp_copied_text">Codice OTP copiato negli appunti</string>
+    <string name="file_toast_text">Sei pregato di fornire il nome di un file</string>
+    <string name="path_toast_text">Sei pregato di fornire il percorso di un file</string>
+    <string name="empty_toast_text">Non puoi usare una password vuota o dei contenuti extra vuoti</string>
+    <!-- Git Async Task -->
+    <string name="jgit_error_dialog_title">Si è verificato un errore durante un operazione di Git</string>
+    <!-- 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="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>
+    <string name="password_dialog_text">Sei pregato di fornire la password per questa repository</string>
+    <!-- Clone fragment -->
+    <string name="location_dialog_create_text">Seleziona dove vuoi creare la tua repository della password</string>
+    <string name="location_sdcard">Scheda-SD</string>
+    <string name="location_hidden">Nascosto (Preferito)</string>
+    <string name="external_repository_dialog_title">Scegli dove memorizzare le password</string>
+    <string name="external_repository_dialog_text">Devi selezionare una directory in cui memorizzare le tue password. Se vuoi memorizzare le tue password entro l\'archiviazione nascosta dell\'applicazione, annulla questa finestra di dialogo e disabilita l\'opzione \"Repository Esterna\".</string>
+    <string name="server_name">Server</string>
+    <string name="server_url">URL della repository</string>
+    <string name="server_branch">Ramo</string>
+    <string name="connection_mode">Modalità di Autenticazione</string>
+    <!-- Git Config fragment -->
+    <string name="git_user_name_hint">Nome Utente</string>
+    <string name="git_user_email">Email</string>
+    <string name="invalid_email_dialog_text">Sei pregato di inserire un indirizzo email valido</string>
+    <string name="clone_button">Clona</string>
+    <!-- PGP Handler -->
+    <string name="crypto_name_hint">Nome</string>
+    <string name="crypto_pass_label">Password</string>
+    <string name="crypto_extra_label">Contenuto extra</string>
+    <string name="crypto_encrypt_username_label">Crittografa nome utente</string>
+    <string name="crypto_select">Seleziona</string>
+    <string name="crypto_save">Salva</string>
+    <string name="crypto_save_and_copy">Salva e Copia</string>
+    <!-- DECRYPT Layout -->
+    <string name="action_search">Cerca</string>
+    <string name="password">Password:</string>
+    <string name="otp">OTP:</string>
+    <string name="extra_content">Contenuto extra:</string>
+    <string name="username">Nome Utente:</string>
+    <string name="edit_password">Modifica password</string>
+    <string name="copy_password">Copia password</string>
+    <string name="share_as_plaintext">Condividi come testo semplice</string>
+    <string name="last_changed">Ultima modifica %s</string>
+    <!-- Preferences -->
+    <string name="pref_repository_title">Repository</string>
+    <string name="pref_edit_server_info">Modifica impostazioni del server di Git</string>
+    <string name="pref_edit_git_config">Configurazione &amp; utilità della configurazione di Git</string>
+    <string name="pref_ssh_title">Importa chiave SSH</string>
+    <string name="pref_ssh_keygen_title">Genera coppia di chiavi SSH</string>
+    <string name="pref_ssh_see_key_title">Visualizza la chiave SSH pubblica generata</string>
+    <string name="pref_git_delete_repo">Elimina repository</string>
+    <string name="pref_dialog_delete_title">Cancella repository</string>
+    <string name="pref_category_general_title">Generale</string>
+    <string name="pref_category_title_passwords">Password</string>
+    <string name="pref_clipboard_timeout_title">Timeout copia della password</string>
+    <string name="pref_clipboard_timeout_summary">Imposta per quanto tempo (in secondi) vuoi che la password rimanga negli appunti. 0 significa per sempre. Valore corrente: %1$s</string>
+    <string name="pref_copy_title">Copia automaticamente la password</string>
+    <string name="pref_copy_dialog_title">Copia automaticamente la password negli appunti dopo il successo della decifratura.</string>
+    <string name="ssh_key_import_error_not_an_ssh_key_message">Il file selezionato non sembra essere una chiave privata SSH.</string>
+    <string name="ssh_key_success_dialog_title">Chiave SSH importata</string>
+    <string name="ssh_key_error_dialog_title">Errore di importazione della chiave</string>
+    <string name="ssh_key_error_dialog_text">Messaggio : \n</string>
+    <string name="pref_recursive_filter">Filtro ricorsivo</string>
+    <string name="pref_recursive_filter_hint">Trova ricorsivamente le password della directory corrente.</string>
+    <string name="pref_sort_order_title">Ordine password</string>
+    <string name="pref_folder_first_sort_order">Prima le cartelle</string>
+    <string name="pref_file_first_sort_order">Prima i file</string>
+    <string name="pref_type_independent_sort_order">Tipo indipendente</string>
+    <string name="pref_recently_used_sort_order">Usato di recente</string>
+    <string name="pref_autofill_title">Auto-compilazione</string>
+    <string name="pref_autofill_enable_title">Abilita Auto-Compilazione</string>
+    <string name="pref_misc_title">Varie</string>
+    <string name="pref_clear_clipboard_title">Cancella 20 volte gli appunti</string>
+    <string name="pref_clear_clipboard_hint">Archivia i numeri consecutivi negli appunti per 20 volte. Utile sui telefoni Samsung che presentano la cronologia degli appunti.</string>
+    <string name="pref_git_delete_repo_summary">Elimina repository locale (nascosta)</string>
+    <string name="pref_external_repository">Repository Esterna</string>
+    <string name="pref_external_repository_summary">Usa una repository di password esterna</string>
+    <string name="pref_select_external_repository">Seleziona repository esterna</string>
+    <string name="prefs_export_passwords_title">Esporta password</string>
+    <string name="prefs_export_passwords_summary">Esporta le password crittografate ad una directory esterna</string>
+    <string name="prefs_version">Versione</string>
+    <!-- PasswordGenerator fragment -->
+    <string name="pwgen_title">Genera Password</string>
+    <string name="pwgen_generate">Genera</string>
+    <string name="pwgen_include">Includi</string>
+    <string name="pwgen_length">Lunghezza</string>
+    <string name="pwgen_numerals">Numerici</string>
+    <string name="pwgen_symbols">Simboli</string>
+    <string name="pwgen_uppercase">Maiuscolo</string>
+    <string name="pwgen_lowercase">Minuscolo</string>
+    <string name="pwgen_ambiguous">Ambiguo</string>
+    <string name="pwgen_pronounceable">Pronunciabile</string>
+    <string name="pwgen_no_chars_error">Nessun carattere incluso</string>
+    <string name="pwgen_length_too_short_error">Lunghezza troppo breve per i criteri selezionati</string>
+    <string name="pwgen_max_iterations_exceeded">Impossibile generare una password che soddisfi i vincoli. Prova ad aumentare la lunghezza.</string>
+    <!-- XKPWD password generator -->
+    <string name="xkpwgen_title">Generatore di Xkpasswd</string>
+    <string name="xkpwgen_length">Parole totali</string>
+    <string name="xkpwgen_separator">Separatore</string>
+    <string name="xkpwgen_custom_dict_imported">Lista di parole personalizzata: %1$s</string>
+    <string name="xkpwgen_builder_error">Il dizionario selezionato non contiene abbastanza parole della data lunghezza %1$d..%2$d</string>
+    <!-- XKPWD prefs -->
+    <string name="xkpwgen_pref_gentype_title">Tipo di generatore di password</string>
+    <string name="xkpwgen_pref_custom_dict_title">Lista di parole personalizzata</string>
+    <string name="xkpwgen_pref_custom_dict_summary_on">Usando file di elenco di parole personalizzati</string>
+    <string name="xkpwgen_pref_custom_dict_summary_off">Usando liste di parole integrate</string>
+    <string name="xkpwgen_pref_custom_dict_picker_title">File di elenco di parole personalizzato</string>
+    <string name="xkpwgen_pref_custom_dict_picker_summary">Tocca per selezionare un file di lista di parole personalizzato contenente una parola per riga</string>
+    <!-- ssh keygen fragment -->
+    <string name="ssh_keygen_passphrase">Frase Segreta</string>
+    <string name="ssh_keygen_generate">Genera</string>
+    <string name="ssh_keygen_share">Condividi</string>
+    <string name="ssh_keygen_later">Più tardi</string>
+    <string name="ssh_keygen_message">%1$s\n\nFornisci questa chiave pubblica al tuo server Git.</string>
+    <string name="ssh_key_gen_generating_progress">Generando le chiavi…</string>
+    <string name="ssh_keygen_require_authentication">Proteggi con credenziali di blocco schermo</string>
+    <string name="ssh_keygen_label_rsa">RSA</string>
+    <string name="ssh_keygen_label_ecdsa">ECDSA</string>
+    <string name="ssh_keygen_label_ed25519">Ed25519</string>
+    <string name="ssh_keygen_explanation_rsa"><b>RSA (3072 bit)</b>\nSupportato da tutti i server, ma l\'autenticazione è relativamente lenta.</string>
+    <string name="ssh_keygen_explanation_ecdsa"><b>ECDSA (NIST P-256)</b>\nAutenticazione veloce e supportata da gran parte dei server che ricevono ancora aggiornamenti.</string>
+    <string name="ssh_keygen_explanation_ed25519"><b>Ed25519</b>\nAutenticazione veloce, ma supportata solo da server piuttosto moderni.</string>
+    <string name="ssh_keygen_existing_title">Chiave SSH</string>
+    <string name="ssh_keygen_existing_message">Sostituire la chiave SSH esistente? Potresti perdere l\'accesso al tuo server.</string>
+    <string name="ssh_keygen_existing_replace">Sostituisci</string>
+    <string name="ssh_keygen_existing_keep">Mantieni</string>
+    <!-- SSH Android Keystore auth -->
+    <string name="biometric_auth_generic_failure">Autenticazione del blocco schermo fallita</string>
+    <string name="biometric_prompt_title_ssh_auth">Sblocca chiave SSH</string>
+    <string name="biometric_prompt_title_ssh_keygen">Genera chiave SSH</string>
+    <!-- Misc -->
+    <string name="dialog_ok">OK</string>
+    <string name="dialog_yes">Sì</string>
+    <string name="dialog_no">No</string>
+    <string name="dialog_cancel">Annulla</string>
+    <string name="dialog_skip">Salta</string>
+    <string name="git_sync">Sincronizza repository</string>
+    <string name="git_pull">Trascina da remoto</string>
+    <string name="git_push">Spingi da remoto</string>
+    <string name="git_push_up_to_date">Tutto aggiornato</string>
+    <string name="git_log">Mostra registro di conferma</string>
+    <string name="show_password_pref_title">Mostra la password</string>
+    <string name="show_password_pref_summary">Controlla la visibilità delle password una volta decrittografate. Questo non disabilita la copia negli appunti.</string>
+    <string name="show_extra_content_pref_title">Mostra contenuti extra</string>
+    <string name="show_extra_content_pref_summary">Controlla la visibilità del contenuto extra una volta decrittografato.</string>
+    <string name="pwd_generate_button">Genera</string>
+    <string name="refresh_list">Aggiorna elenco</string>
+    <string name="no_repo_selected">Nessuna repository esterna selezionata</string>
+    <string name="send_plaintext_password_to">Invia password come testo semplice usando…</string>
+    <string name="app_icon_hint">Icona app</string>
+    <!-- Oreo Autofill -->
+    <string name="oreo_autofill_strict_domain_search">Ricerca resistente al phishing</string>
+    <string name="oreo_autofill_match_with">Abbina con %1$s</string>
+    <string name="oreo_autofill_matches_clear_existing">Cancella abbinamenti esistenti</string>
+    <string name="oreo_autofill_filter_no_results">Nessun risultato.</string>
+    <string name="oreo_autofill_search_in_store">Cerca nell\'archiviazione…</string>
+    <string name="oreo_autofill_save_internal_error">Salvataggio fallito a causa di un errore interno</string>
+    <string name="oreo_autofill_save_app_not_supported">Quest\'app non è attualmente supportata</string>
+    <string name="oreo_autofill_save_passwords_dont_match">Le password non corrispondono</string>
+    <string name="oreo_autofill_generate_password">Genera password…</string>
+    <string name="oreo_autofill_fill_otp_from_sms">Estrai codice da SMS…</string>
+    <string name="oreo_autofill_max_matches_reached">Numero massimo di abbinamenti (%1$d) raggiunto; cancella le corrispondenze prima di aggiungerne di nuove.</string>
+    <string name="oreo_autofill_warning_publisher_header">L\'editore di quest\'app è cambiato da quando hai associato per la prima volta una voce di Password Store con essa:</string>
+    <string name="oreo_autofill_warning_publisher_footer"><b>L\'app correntemente installata potrebbe provare a rubare le tue credenziali pretendendo di essere un\'app affidabile.</b>\n\nProva a disinstallare e reinstallare l\'app da una fonte affidabile, come Play Store, Amazon, Appstore, F-Droid, o il negozio del produttore del tuo telefono.</string>
+    <string name="oreo_autofill_warning_publisher_install_time">Installata: %1$s</string>
+    <string name="oreo_autofill_warning_publisher_advanced_info_button">Informazioni avanzate</string>
+    <string name="oreo_autofill_warning_publisher_changed_disable_autofill_button">Mantieni l\'Auto-Completamento disabilitato</string>
+    <string name="oreo_autofill_warning_publisher_reenable_button">Riabilita l\'Auto-Completamento</string>
+    <string name="oreo_autofill_warning_publisher_warning_sign_description">Avviso</string>
+    <string name="oreo_autofill_warning_publisher_dataset_summary">Tocca per i dettagli…</string>
+    <string name="oreo_autofill_warning_publisher_dataset_title">Possibile tentativo di phishing</string>
+    <string name="oreo_autofill_general_fill_and_save_support">Compila e salva le credenziali</string>
+    <string name="oreo_autofill_general_fill_support">Compila le credenziali</string>
+    <string name="oreo_autofill_password_fill_support">Compila le password</string>
+    <string name="oreo_autofill_flaky_fill_support">Compila le password (potrebbe richiedere il riavvio del browser di tanto in tanto)</string>
+    <string name="oreo_autofill_no_support">Nessun supporto</string>
+    <string name="oreo_autofill_preference_directory_structure">Organizzazione dei file di password</string>
+    <string name="oreo_autofill_enable_dialog_description">Password Store può offrire di compilare i moduli di accesso e persino di salvare le credenziali che inserisci in app o su siti web.</string>
+    <string name="oreo_autofill_enable_dialog_instructions">Per abilitare questa funzionalità, tocca OK per andare alle impostazioni di Auto-Compilazione. Lì, seleziona Password Store dall\'elenco e conferma la richiesta di conferma con OK.</string>
+    <string name="oreo_autofill_enable_dialog_installed_browsers">Supporto all\'auto-compilazione con i browser installati:</string>
+    <!-- Autofill -->
+    <string name="ssh_key_does_not_exist">Impossibile aprire la chiave privata ssh, sei pregato di controllare che il file esista</string>
+    <string name="new_password_title">Nuova password</string>
+    <string name="clear_saved_passphrase_ssh">Cancella la frase segreta salvata per la chiave SSH locale</string>
+    <string name="clear_saved_passphrase_https">Cancella la password HTTPS salvata</string>
+    <string name="git_operation_remember_passphrase">Ricorda la frase segreta chiave</string>
+    <string name="git_tools">Utilità</string>
+    <string name="abort_rebase">Interrompi il rebase e premi nuovo ramo</string>
+    <string name="reset_to_remote">Hard reset a ramo remoto</string>
+    <string name="git_head_on_branch">Sul ramo %1$s</string>
+    <string name="git_head_detached">HEAD staccata a %1$s</string>
+    <string name="git_head_missing">Impossibile localizzare HEAD</string>
+    <string name="sdcard_root_warning_title">Root della Scheda-SD selezionato</string>
+    <string name="sdcard_root_warning_message">Hai selezionato il root della tua sdcard per il negozio. Questo è estremamente pericoloso e perderai i tuoi dati poiché i suoi contenuti saranno, infine, eliminati</string>
+    <string name="git_abort_and_push_title">Interrompi e Spingi</string>
+    <string name="biometric_prompt_title">Richiesta Biometrica</string>
+    <string name="biometric_auth_error">Autenticazione non riuscita</string>
+    <string name="biometric_auth_error_reason">Autenticazione non riuscita: %s</string>
+    <string name="biometric_auth_title">Abilita autenticazione biometrica</string>
+    <string name="biometric_auth_summary">Quando abilitata, il Password Store ti chiederà la tua impronta digitale al lancio dell\'app</string>
+    <string name="biometric_auth_summary_error">L\'hardware delle impronte digitali non è accessibile o mancante</string>
+    <string name="ssh_openkeystore_clear_keyid">Elimina l\'ID della Chiave SSH di OpenKeystore memorizzato</string>
+    <string name="access_sdcard_text">La posizione dell\'archiviazione nella tua Scheda SD o Archiviazione Interna, ma l\'app non ha i permessi per accedervi.</string>
+    <string name="your_public_key">La tua chiave pubblica</string>
+    <string name="error_generate_ssh_key">Errore provando a generare la chiave-ssh</string>
+    <string name="pref_show_hidden_title">Mostra tutti i file e cartelle</string>
+    <string name="pref_show_hidden_summary">Includi file e directory non password nell\'elenco delle password</string>
+    <string name="title_create_folder">Crea cartella</string>
+    <string name="title_rename_folder">Rinomina cartella</string>
+    <string name="message_category_error_empty_field">Il nome della categoria non può essere vuoto</string>
+    <string name="message_category_error_category_exists">Il nome della categoria esiste già</string>
+    <string name="message_error_destination_outside_repo">La destinazione deve essere nella repository</string>
+    <string name="message_rename_folder">Inserire destinazione per %1$s</string>
+    <string name="button_create">Crea</string>
+    <string name="pref_search_on_start">Apri ricerca all\'avvio</string>
+    <string name="pref_search_on_start_hint">Apri la barra di ricerca al lancio dell\'app</string>
+    <string name="password_generator_category_title">Generatore di Password</string>
+    <string name="tap_clear_clipboard">Tocca qui per cancellare gli appunti</string>
+    <string name="clone_git_repo">La repository deve essere clonata prima di sincronizzare le modifiche.</string>
+    <string name="theme_title">Tema dell\'App</string>
+    <string name="theme_light">Chiaro</string>
+    <string name="theme_dark">Scuro</string>
+    <string name="theme_battery_saver">Impostato dal Risparmio Energetico</string>
+    <string name="theme_follow_system">Predefinito del sistema</string>
+    <string name="connection_mode_ssh_key">Chiave SSH</string>
+    <string name="connection_mode_basic_authentication">Password</string>
+    <string name="git_server_config_save_success">Configurazione correttamente salvata</string>
+    <string name="git_server_config_save_error">L\'URL fornito della repository non è valido</string>
+    <string name="git_server_config_save_missing_username_https">Sei pregato di specificare il nome utente HTTPS nella forma https://username@example.com/…</string>
+    <string name="git_server_config_save_missing_username_ssh">Sei pregato di specificare il nome utente SSH nella forma username@example.com:…</string>
+    <string name="git_server_config_save_auth_mode_mismatch">Modalità di autenticazione valide per %1$s: %2$s</string>
+    <string name="git_operation_wrong_passphrase">Frase segreta errata</string>
+    <string name="git_operation_wrong_password">Password errata</string>
+    <string name="bottom_sheet_create_new_folder">Crea nuova cartella</string>
+    <string name="bottom_sheet_create_new_password">Crea nuova password</string>
+    <string name="snackbar_action_grant">Garantisci</string>
+    <string name="pref_debug_logging_summary">Abilita la registrazione di debug (richiede il riavvio dell\'app)</string>
+    <string name="pref_debug_logging_title">Registrazione di debug</string>
+    <string name="preference_default_username_summary">Se l\'autocompletamento non può determinare un nome utente dal tuo file della password o la struttura della directory, userà il valore qui specificato</string>
+    <string name="preference_default_username_title">Nome utente predefinito</string>
+    <string name="git_operation_remember_password">Ricorda password</string>
+    <string name="git_operation_hint_password">Password</string>
+    <string name="preference_custom_public_suffixes_title">Domini personalizzati</string>
+    <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>
+    <string name="password_creation_file_delete_fail_message">Impossibile eliminare il file della password %1$s dal negozio, sei pregato di eliminarlo manualmente.</string>
+    <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="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>
+    <!-- GitException messages -->
+    <string name="git_unknown_error">Errore sconosciuto</string>
+    <string name="git_pull_fail_error">Pull non è riuscito, sei in un capo distaccato. Usando \"impostazioni e utilità di git\", salvi le tue modifiche in remoto in un nuovo ramo e risolvi il conflitto sul tuo computer.</string>
+    <string name="git_push_nff_error">Push è stato rifiutato da remoto, esegui pull prima di premere nuovamente. Puoi usare Sincronizza piuttosto che pull/push implementando entrambi</string>
+    <string name="git_push_generic_error">Push è stato rifiutato da remoto, ragione: %1$s</string>
+    <string name="git_push_other_error">Remoto ha rifiutato il push non avanti veloce. Controlla la variabile receive.denyNonFastForwards nel file di configurazione della repository di destinazione.</string>
+    <string name="git_unknown_host">Host sconosciuto: %1$s</string>
+    <string name="git_operation_running">Eseguendo l\'operazione di git…</string>
+    <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>
+    <string name="xkpwgen_extrachars_label">Cifre/Simboli (c/s)</string>
+    <string name="xk_numbers_symbols_append_default">cs</string>
+    <!-- Onboarding flow -->
+    <string name="repository_n_location">Repository \nLocation</string>
+    <string name="let_s_go">Andiamo</string>
+    <string name="select_n_repository_type">Seleziona \nTipo di repository</string>
+    <string name="select_repo_type_text">Seleziona se vuoi creare una repo locale o clonarne una remota.</string>
+    <string name="clone_remote_repo">Clona Repo Remota</string>
+    <string name="create_local_repo">Crea Repo Locale</string>
+    <!-- SSH port validation -->
+    <string name="ssh_scheme_needed_title">URL potenzialmente errato</string>
+    <string name="ssh_scheme_needed_message">Sembra che il tuo URL contenga una porta personalizzata, ma non specifichi lo schema ssh://.\nQuesto può causare che la porta sia considerata una parte del tuo percorso. Premi OK qui per correggere l\'URL.</string>
+</resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
deleted file mode 100644
index 9fff40d3..00000000
--- a/app/src/main/res/values-ja/strings.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
-  ~ SPDX-License-Identifier: GPL-3.0-only
-  -->
-<resources>
-    <!-- Activity names -->
-    <string name="action_settings">設定</string>
-    <string name="dialog_delete_title">ディレクトリーはすでに存在します</string>
-    <string name="dialog_delete_msg">対象のディレクトリーはすでに存在します。 現在のバージョンは1つのストアのみをサポートしています。 現在のパスワードストアのディレクトリーを削除しますか\n(%1$s)</string>
-    <string name="dialog_delete">ディレクトリーを削除</string>
-    <string name="dialog_do_not_delete">キャンセル</string>
-    <string name="title_activity_git_clone">リポジトリ情報</string>
-    <!-- Password Store -->
-    <string name="creation_dialog_text">パスワードや同期操作を追加する前に、以下の新しいリポジトリをクローンまたは作成してください。</string>
-    <string name="delete">削除</string>
-    <!-- git commits -->
-    <string name="git_commit_add_text">追加 %1$s ストアから。</string>
-    <string name="git_commit_edit_text">編集 %1$s ストアから。</string>
-    <!-- PGPHandler -->
-    <string name="clipboard_password_toast_text">パスワードをクリップボードにコピーしました %d 秒以内に貼り付けしてください。</string>
-    <string name="file_toast_text">ファイル名を入力してください</string>
-    <string name="empty_toast_text">空のパスワードを使用したり、追加のコンテンツを空にすることはできません</string>
-    <!-- Git Async Task -->
-    <string name="jgit_error_dialog_title">Git 操作中にエラーが発生しました</string>
-    <!-- Git Handler -->
-    <string name="ssh_preferences_dialog_text">プリファレンスで SSH 鍵ファイルをインポートまたは生成してください</string>
-    <string name="ssh_preferences_dialog_title">SSH 鍵がありませんkey</string>
-    <string name="ssh_preferences_dialog_import">インポート</string>
-    <string name="ssh_preferences_dialog_generate">生成</string>
-    <string name="passphrase_dialog_title">認証</string>
-    <string name="passphrase_dialog_text">SSH 鍵のパスフレーズを入力してください。 パスフレーズがない場合は空のままにします。</string>
-    <string name="password_dialog_text">このリポジトリのパスワードを入力してください</string>
-    <!-- Clone fragment -->
-    <string name="server_name">サーバー</string>
-    <string name="connection_mode">認証モード</string>
-    <!-- Git Config fragment -->
-    <string name="git_user_name_hint">ユーザー名</string>
-    <!-- PGP Handler -->
-    <string name="crypto_name_hint">名前</string>
-    <string name="crypto_pass_label">パスワード</string>
-    <string name="crypto_extra_label">追加</string>
-    <!-- DECRYPT Layout -->
-    <string name="action_search">検索</string>
-    <!-- Preferences -->
-    <string name="pref_ssh_title">SSH 鍵のインポート</string>
-    <string name="pref_ssh_keygen_title">SSH 鍵ペアを生成</string>
-    <string name="pref_ssh_see_key_title">生成した公開 SSH 鍵を表示</string>
-    <string name="pref_git_delete_repo">リポジトリを削除</string>
-    <string name="pref_dialog_delete_title">リポジトリをクリア</string>
-    <string name="pref_category_general_title">全般</string>
-    <string name="pref_copy_title">自動的にパスワードをコピー</string>
-    <string name="pref_copy_dialog_title">復号化が成功した後、自動的にパスワードをクリップボードにコピーします。</string>
-    <string name="ssh_key_success_dialog_title">SSH 鍵をインポートしました</string>
-    <string name="ssh_key_error_dialog_text">メッセージ : \n</string>
-    <string name="pref_recursive_filter">再帰的フィルタリング</string>
-    <string name="pref_recursive_filter_hint">現在のディレクトリーのパスワードを再帰的に検索します。</string>
-    <string name="pref_autofill_title">自動入力</string>
-    <string name="pref_autofill_enable_title">自動入力を有効にする</string>
-    <string name="pref_autofill_enable_msg">OK をタップするとアクセシビリティ設定に移動します。 ここで、サービスの下の Password Store をタップし、右上のスイッチをタップしてオンまたはオフにします。</string>
-    <string name="pref_autofill_enable_msg2">サービスがオンになると、アプリのパスワードフィールドをクリックすとダイアログが表示され、一致するアプリのパスワードが存在すると表示されます。</string>
-    <string name="pref_autofill_enable_msg3">Password Store は、自動的にアプリをパスワードと照合します。 このデフォルト設定を変更することも、アプリごとに設定を変更することもできます。</string>
-    <string name="pref_autofill_apps_title">アプリとウェブサイトの設定</string>
-    <string name="pref_autofill_default_title">デフォルトで自動的に一致</string>
-    <string name="pref_autofill_default_hint">カスタム設定のないアプリは、デフォルトは \'自動的に一致\' になります。 それ以外の場合は、\'一致しない\'。</string>
-    <string name="pref_autofill_always_title">常にダイアログを表示</string>
-    <string name="pref_misc_title">その他</string>
-    <string name="pref_clear_clipboard_title">クリップボードを 20 回クリア</string>
-    <string name="pref_clear_clipboard_hint">一度ではなく、無意味な言葉をクリップボードに 20 回保存します。 クリップボードの履歴を表示する Samsung の携帯電話で役に立ちます。</string>
-    <string name="pref_git_delete_repo_summary">ローカルの (非表示) リポジトリを削除</string>
-    <string name="pref_external_repository">外部リポジトリ</string>
-    <string name="pref_external_repository_summary">外部パスワードリポジトリを使用する</string>
-    <string name="pref_select_external_repository">外部リポジトリを選択</string>
-    <!-- PasswordGenerator fragment -->
-    <string name="pwgen_generate">生成</string>
-    <string name="pwgen_include">含める</string>
-    <string name="pwgen_length">長さ</string>
-    <string name="pwgen_numerals">数字</string>
-    <string name="pwgen_symbols">記号</string>
-    <string name="pwgen_uppercase">大文字</string>
-    <string name="pwgen_ambiguous">あいまい</string>
-    <string name="pwgen_pronounceable">発音可能</string>
-    <!-- XKPWD password generator -->
-    <!-- XKPWD prefs -->
-    <!-- ssh keygen fragment -->
-    <string name="ssh_keygen_passphrase">パスフレーズ</string>
-    <string name="ssh_keygen_generate">生成</string>
-    <!-- SSH Android Keystore auth -->
-    <!-- Misc -->
-    <string name="dialog_yes">はい</string>
-    <string name="dialog_no">いいえ</string>
-    <string name="dialog_cancel">キャンセル</string>
-    <string name="git_sync">リポジトリを同期</string>
-    <string name="git_pull">リモートからプル</string>
-    <string name="git_push">リモートにプッシュ</string>
-    <string name="show_password_pref_title">パスワードを表示</string>
-    <string name="show_password_pref_summary">一度復号化されたパスワードの可視性を制御します。これはパスワードのコピーを無効にしません</string>
-    <string name="pwd_generate_button">生成</string>
-    <string name="refresh_list">リストを更新</string>
-    <string name="no_repo_selected">外部リポジトリが選択されていません</string>
-    <string name="send_plaintext_password_to">パスワードをプレーンテキストとして送信…</string>
-    <!-- Oreo Autofill -->
-    <!-- Autofill -->
-    <string name="autofill_description">アプリのパスワードフィールドを自動入力します。 Android バージョン 4.3 以降でのみ動作します。 Android 5.0 以降のクリップボードには依存しません。</string>
-    <string name="autofill_apps_default">デフォルト設定を使用する</string>
-    <string name="autofill_apps_first">自動的に一致</string>
-    <string name="autofill_apps_match_ellipsis">一致…</string>
-    <string name="autofill_apps_match">一致</string>
-    <string name="autofill_apps_never">一致しない</string>
-    <string name="autofill_apps_delete">削除</string>
-    <!-- OpenKeychain errors -->
-    <!-- Password creation failure -->
-    <!-- GitException messages -->
-    <!-- OpenKeychain not installed -->
-    <!-- GPG key selection in folder creation -->
-    <!-- Onboarding flow -->
-    <!-- SSH port validation -->
-</resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 846a9993..3c9e1a45 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!--
+<?xml version="1.0" encoding="utf-8"?>
+<!--
   ~ Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
   ~ SPDX-License-Identifier: GPL-3.0-only
   -->
@@ -14,6 +15,7 @@
     <string name="dialog_delete">Excluir diretório</string>
     <string name="dialog_do_not_delete">Cancelar</string>
     <string name="title_activity_git_clone">Informações do repositório</string>
+    <string name="title_activity_git_log">Log de Commits</string>
     <!-- Password Store -->
     <string name="creation_dialog_text">Por favor, clone ou crie um novo repositório abaixo antes de tentar adicionar uma senha ou executar qualquer operação de sincronização.</string>
     <plurals name="delete_dialog_text">
@@ -58,6 +60,7 @@
     <string name="passphrase_dialog_text">Por favor, forneça a senha para a sua chave SSH</string>
     <string name="password_dialog_text">Por favor, forneça a senha para este repositório</string>
     <!-- Clone fragment -->
+    <string name="location_dialog_create_text">Selecione onde você deseja criar o repositório de suas senhas</string>
     <string name="location_sdcard">Cartão SD</string>
     <string name="location_hidden">Oculto (preferencial)</string>
     <string name="external_repository_dialog_title">Escolha onde armazenar as senhas</string>
@@ -91,6 +94,8 @@
     <string name="last_changed">Última alteração %s</string>
     <!-- Preferences -->
     <string name="pref_repository_title">Repositório</string>
+    <string name="pref_edit_server_info">Editar configurações do servidor Git</string>
+    <string name="pref_edit_git_config">Configuração local do Git &amp; utilitários</string>
     <string name="pref_ssh_title">Importar chave SSH</string>
     <string name="pref_ssh_keygen_title">Gerar um par de chave SSH</string>
     <string name="pref_ssh_see_key_title">Ver a chave SSH pública gerada</string>
@@ -164,8 +169,25 @@
     <!-- ssh keygen fragment -->
     <string name="ssh_keygen_passphrase">Frase Secreta</string>
     <string name="ssh_keygen_generate">Gerar</string>
+    <string name="ssh_keygen_share">Compartilhar</string>
+    <string name="ssh_keygen_later">Depois</string>
+    <string name="ssh_keygen_message">%1$s\n\nForneça esta chave pública para seu servidor Git.</string>
     <string name="ssh_key_gen_generating_progress">Gerando chaves…</string>
+    <string name="ssh_keygen_require_authentication">Proteja com credenciais de bloqueio de tela</string>
+    <string name="ssh_keygen_label_rsa">RSA</string>
+    <string name="ssh_keygen_label_ecdsa">ECDSA</string>
+    <string name="ssh_keygen_label_ed25519">Ed25519</string>
+    <string name="ssh_keygen_explanation_rsa"><b>RSA (3072 bits)</b>\nSuportado por todos os servidores, mas a autenticação é relativamente lenta.</string>
+    <string name="ssh_keygen_explanation_ecdsa"><b>ECDSA (NIST P-256)</b>\nAutenticação rápida e suportada pela maioria dos servidores que ainda estão recebendo atualizações.</string>
+    <string name="ssh_keygen_explanation_ed25519"><b>Ed25519</b>\nAutenticação rápida, mas apenas suportada por servidores bastante modernos.</string>
+    <string name="ssh_keygen_existing_title">Chave SSH</string>
+    <string name="ssh_keygen_existing_message">Substituir a chave SSH existente? Você pode perder o acesso ao seu servidor.</string>
+    <string name="ssh_keygen_existing_replace">Substituir</string>
+    <string name="ssh_keygen_existing_keep">Manter</string>
     <!-- SSH Android Keystore auth -->
+    <string name="biometric_auth_generic_failure">Falha na autenticação de bloqueio de tela</string>
+    <string name="biometric_prompt_title_ssh_auth">Desbloquear chave SSH</string>
+    <string name="biometric_prompt_title_ssh_keygen">Gerar chave SSH</string>
     <!-- Misc -->
     <string name="dialog_ok">OK</string>
     <string name="dialog_yes">Sim</string>
@@ -176,6 +198,7 @@
     <string name="git_pull">Pull do remoto</string>
     <string name="git_push">Push do remoto</string>
     <string name="git_push_up_to_date">Tudo atualizado</string>
+    <string name="git_log">Mostrar log de commit</string>
     <string name="show_password_pref_title">Mostrar a senha</string>
     <string name="show_password_pref_summary">Controle a visibilidade das senhas quando descriptografadas. Isso não desativa a cópia para a área de transferência.</string>
     <string name="show_extra_content_pref_title">Exibir conteúdo extra</string>
@@ -236,8 +259,12 @@
     <string name="clear_saved_passphrase_ssh">Limpar a frase secreta salva para chave SSH local</string>
     <string name="clear_saved_passphrase_https">Limpar senha HTTPS salva</string>
     <string name="git_operation_remember_passphrase">Lembrar senha da chave</string>
+    <string name="git_tools">Utilitários</string>
     <string name="abort_rebase">Abortar rebase e realizar push do novo branch</string>
     <string name="reset_to_remote">Hard reset no branch remoto</string>
+    <string name="git_head_on_branch">Na branch %1$s</string>
+    <string name="git_head_detached">HEAD destacada em %1$s</string>
+    <string name="git_head_missing">Impossível localizar o HEAD</string>
     <string name="sdcard_root_warning_title">Raiz do cartão SD selecionada</string>
     <string name="sdcard_root_warning_message">Você selecionou a raiz do seu cartão SD para armazenar. Isto é extremamente perigoso e você perderá seus dados, pois seu conteúdo será eventualmente apagado</string>
     <string name="git_abort_and_push_title">Abortar e executar Push</string>
@@ -251,6 +278,8 @@
     <string name="access_sdcard_text">O local do armazenamento está em seu cartão SD ou armazenamento interno, mas o aplicativo não tem permissão para acessá-lo.</string>
     <string name="your_public_key">Sua chave pública</string>
     <string name="error_generate_ssh_key">Erro ao tentar gerar a chave SSH</string>
+    <string name="pref_show_hidden_title">Mostrar todos os arquivos e pastas</string>
+    <string name="pref_show_hidden_summary">Incluir arquivos sem senha e diretórios na lista de senhas</string>
     <string name="title_create_folder">Criar pasta</string>
     <string name="title_rename_folder">Renomear pasta</string>
     <string name="message_category_error_empty_field">O nome da categoria não pode ser vazio</string>
@@ -272,6 +301,9 @@
     <string name="connection_mode_basic_authentication">Senha</string>
     <string name="git_server_config_save_success">Configuração salva com sucesso</string>
     <string name="git_server_config_save_error">A URL do repositório fornecido não é válida</string>
+    <string name="git_server_config_save_missing_username_https">Por favor, especifique o nome de usuário HTTPS no formulário https://username@example.com/…</string>
+    <string name="git_server_config_save_missing_username_ssh">Por favor, especifique o nome de usuário SSH no formulário@exemplo.com:…</string>
+    <string name="git_server_config_save_auth_mode_mismatch">Modos de autenticação válidos para %1$s: %2$s</string>
     <string name="git_operation_wrong_passphrase">Frase segura incorreta</string>
     <string name="git_operation_wrong_password">Senha incorreta</string>
     <string name="bottom_sheet_create_new_folder">Criar nova pasta</string>
@@ -312,6 +344,8 @@
     <string name="git_push_other_error">O remoto rejeito o push non-fast-foward. Cheque a variável receive.denyNonFastForwards no arquivo de configuração do repositório de destino.</string>
     <string name="git_unknown_host">Host desconhecido: %1$s</string>
     <string name="git_operation_running">Executando operação do git…</string>
+    <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>
@@ -325,5 +359,13 @@
     <string name="xkpwgen_extrachars_label">Dígitos/Símbolos (d/s)</string>
     <string name="xk_numbers_symbols_append_default">ds</string>
     <!-- Onboarding flow -->
+    <string name="repository_n_location">Local \ndo repositório</string>
+    <string name="let_s_go">Vamos lá</string>
+    <string name="select_n_repository_type">Selecione \nTipo de Repositório</string>
+    <string name="select_repo_type_text">Selecione se você quer criar um repositório local ou clonar um repositório remoto.</string>
+    <string name="clone_remote_repo">Clonar repositório remoto</string>
+    <string name="create_local_repo">Criar repositório local</string>
     <!-- SSH port validation -->
+    <string name="ssh_scheme_needed_title">URL potencialmente incorreta</string>
+    <string name="ssh_scheme_needed_message">Parece que sua URL contém uma porta personalizada, mas não especifica o esquema ssh://\nIsto pode fazer com que a porta seja considerada uma parte do seu caminho. Pressione OK aqui para corrigir o URL.</string>
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 3bf97f11..d467c44f 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!--
+<?xml version="1.0" encoding="utf-8"?>
+<!--
   ~ Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
   ~ SPDX-License-Identifier: GPL-3.0-only
   -->
@@ -6,7 +7,7 @@
     <plurals name="delete_title">
         <item quantity="one">Выбран %d элемент</item>
         <item quantity="few">Выбрано %d элемента</item>
-        <item quantity="many">Выбрано %d элемента</item>
+        <item quantity="many">Выбрано %d элементов</item>
         <item quantity="other">Выбрано %d элементов</item>
     </plurals>
     <!-- Activity names -->
@@ -16,6 +17,7 @@
     <string name="dialog_delete">Удалить директорию</string>
     <string name="dialog_do_not_delete">Отменить</string>
     <string name="title_activity_git_clone">Информация о репозитории</string>
+    <string name="title_activity_git_log">Журнал изменений</string>
     <!-- Password Store -->
     <string name="creation_dialog_text">Пожалуйста, клонируйте или создайте новый репозиторий перед тем, как добавлять пароль или выполнять синхронизацию.</string>
     <plurals name="delete_dialog_text">
@@ -62,6 +64,7 @@
     <string name="passphrase_dialog_text">Пожалуйста, введите пароль от SSH ключа. Оставьте поле пустым, если пароль отсутствует.</string>
     <string name="password_dialog_text">Пожалуйста, введите пароль для репозитория</string>
     <!-- Clone fragment -->
+    <string name="location_dialog_create_text">Выберите, где вы хотите создать хранилище паролей</string>
     <string name="location_sdcard">SD-Карта</string>
     <string name="location_hidden">Скрытый (Предпочтительно)</string>
     <string name="external_repository_dialog_title">Выберете где хранить пароли</string>
@@ -95,6 +98,8 @@
     <string name="last_changed">Последние изменение %s</string>
     <!-- Preferences -->
     <string name="pref_repository_title">Репозиторий</string>
+    <string name="pref_edit_server_info">Изменить настройки сервера Git</string>
+    <string name="pref_edit_git_config">Конфигурация локального Git</string>
     <string name="pref_ssh_title">Импортировать SSH ключ</string>
     <string name="pref_ssh_keygen_title">Сгенерировать пару SSH ключей</string>
     <string name="pref_ssh_see_key_title">Просмотреть публичный SSH ключ</string>
@@ -168,8 +173,25 @@
     <!-- ssh keygen fragment -->
     <string name="ssh_keygen_passphrase">Пароль</string>
     <string name="ssh_keygen_generate">Сгенерировать</string>
+    <string name="ssh_keygen_share">Поделиться</string>
+    <string name="ssh_keygen_later">Не сейчас</string>
+    <string name="ssh_keygen_message">%1$s\n\nДобавьте этот публичный ключ на сервер Git.</string>
     <string name="ssh_key_gen_generating_progress">Создание ключей…</string>
+    <string name="ssh_keygen_require_authentication">Использовать настройки блокировки экрана устройства</string>
+    <string name="ssh_keygen_label_rsa">RSA</string>
+    <string name="ssh_keygen_label_ecdsa">ECDSA</string>
+    <string name="ssh_keygen_label_ed25519">Ed25519</string>
+    <string name="ssh_keygen_explanation_rsa"><b>RSA (3072 бит)</b>\nПоддерживается всеми серверами, но аутентификация является относительно медленной.</string>
+    <string name="ssh_keygen_explanation_ecdsa"><b>ECDSA (NIST P-256)</b>\nБыстрая аутентификация, поддерживается большинством современных серверов.</string>
+    <string name="ssh_keygen_explanation_ed25519"><b>Ed25519</b>\nБыстрая аутентификация, но поддерживается только современными серверами.</string>
+    <string name="ssh_keygen_existing_title">SSH ключ</string>
+    <string name="ssh_keygen_existing_message">Заменить существующий SSH ключ? Вы можете потерять доступ к вашему серверу.</string>
+    <string name="ssh_keygen_existing_replace">Заменить</string>
+    <string name="ssh_keygen_existing_keep">Оставить</string>
     <!-- SSH Android Keystore auth -->
+    <string name="biometric_auth_generic_failure">Ошибка разблокировки экрана устройства</string>
+    <string name="biometric_prompt_title_ssh_auth">Разблокировать SSH ключ</string>
+    <string name="biometric_prompt_title_ssh_keygen">Создать SSH ключ</string>
     <!-- Misc -->
     <string name="dialog_ok">OK</string>
     <string name="dialog_yes">Да</string>
@@ -180,6 +202,7 @@
     <string name="git_pull">Пулл с удаленного сервера</string>
     <string name="git_push">Пуш на удаленный сервер</string>
     <string name="git_push_up_to_date">Все обновлено</string>
+    <string name="git_log">Показать журнал изменений</string>
     <string name="show_password_pref_title">Показывать пароли</string>
     <string name="show_password_pref_summary">Видимость расшифрованных паролей, не влияет на копирование в буфер.</string>
     <string name="show_extra_content_pref_title">Показать дополнительную информацию</string>
@@ -240,8 +263,12 @@
     <string name="clear_saved_passphrase_ssh">Очистить сохраненную кодовую фразу для локального SSH ключа</string>
     <string name="clear_saved_passphrase_https">Очистить сохраненный пароль HTTPS</string>
     <string name="git_operation_remember_passphrase">Заполнить парольную фразу в конфигурации приложнеия (небезопасно)</string>
+    <string name="git_tools">Утилиты</string>
     <string name="abort_rebase">Прервать перебазирование и записать изменения в новую ветку</string>
     <string name="reset_to_remote">Полный сброс до состояния удаленной ветки</string>
+    <string name="git_head_on_branch">Используется ветка %1$s</string>
+    <string name="git_head_detached">HEAD отсоединён на %1$s</string>
+    <string name="git_head_missing">HEAD не найден</string>
     <string name="sdcard_root_warning_title">Выбран корень SD-Карты</string>
     <string name="sdcard_root_warning_message">Вы выбрали корень вашей sd-карты для хранения. Это очень опасно и вы потеряете ваши данные, поскольку они будут в конечном итоге удалены</string>
     <string name="git_abort_and_push_title">Прервать и записать изменения</string>
@@ -255,6 +282,8 @@
     <string name="access_sdcard_text">Хранилище расположено на вашей SD-карте или во внутреннем хранилище, но у приложения нет разрешения на доступ к нему.</string>
     <string name="your_public_key">Ваш публичный ключ</string>
     <string name="error_generate_ssh_key">Возникла ошибка при попытке генерации ssh ключа</string>
+    <string name="pref_show_hidden_title">Показать все файлы и директории</string>
+    <string name="pref_show_hidden_summary">Отображать пустые файлы и папки</string>
     <string name="title_create_folder">Создать папку</string>
     <string name="title_rename_folder">Переименовать папку</string>
     <string name="message_category_error_empty_field">Название категории не может быть пустым</string>
@@ -276,6 +305,9 @@
     <string name="connection_mode_basic_authentication">Пароль</string>
     <string name="git_server_config_save_success">Конфигурация успешно сохранена</string>
     <string name="git_server_config_save_error">Указанный URL репозитория недействителен</string>
+    <string name="git_server_config_save_missing_username_https">Пожалуйста, укажите имя пользователя (username) в формате https://usrname@example.com/…</string>
+    <string name="git_server_config_save_missing_username_ssh">Пожалуйста, укажите имя пользователя (username) в формате usrname@example.com:…</string>
+    <string name="git_server_config_save_auth_mode_mismatch">Методы аутентификации для %1$s: %2$s</string>
     <string name="git_operation_wrong_passphrase">Неправильная ключевая фраза</string>
     <string name="git_operation_wrong_password">Неверный пароль</string>
     <string name="bottom_sheet_create_new_folder">Новая папка</string>
@@ -316,6 +348,8 @@
     <string name="git_push_other_error">Удаленный репозиторий отклонил запись изменений без быстрой перемотки вперед. Проверьте переменную receive.denyNonFastForwards в файле конфигурации репозитория назначения.</string>
     <string name="git_unknown_host">Неизвестный хост: %1$s</string>
     <string name="git_operation_running">Выполнение операции git…</string>
+    <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>
@@ -326,6 +360,16 @@
     <!-- GPG key selection in folder creation -->
     <string name="folder_creation_err_file_exists">Файл с таким именем уже существует</string>
     <string name="folder_creation_err_folder_exists">Папка с таким именем уже существует</string>
+    <string name="xkpwgen_extrachars_label">Цыфры / Символы (d/s)</string>
+    <string name="xk_numbers_symbols_append_default">ds</string>
     <!-- Onboarding flow -->
+    <string name="repository_n_location">Расположение \nрепозитория</string>
+    <string name="let_s_go">Поехали</string>
+    <string name="select_n_repository_type">Выберите \nтип репозитория</string>
+    <string name="select_repo_type_text">Создать локальное хранилище, или клонировать существующее.</string>
+    <string name="clone_remote_repo">Клонировать удаленный репозиторий</string>
+    <string name="create_local_repo">Создать локальное хранилище</string>
     <!-- SSH port validation -->
+    <string name="ssh_scheme_needed_title">Потенциально неправильный URL</string>
+    <string name="ssh_scheme_needed_message">Указание порта в URL будет работать только при использовании SSH (ssh://), иначе порт будет расцениваться как часть URL. Исправить URL?</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
deleted file mode 100644
index edc45165..00000000
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
-  ~ SPDX-License-Identifier: GPL-3.0-only
-  -->
-<resources>
-    <!-- Activity names -->
-    <string name="action_settings">设置</string>
-    <string name="dialog_delete_title">目录已存在</string>
-    <string name="dialog_delete_msg">目标目录已存在. 当前版本仅支持单一储存. 真的要删除当前Password Store目录吗\n(%1$s)</string>
-    <string name="dialog_delete">删除目录</string>
-    <string name="dialog_do_not_delete">取消</string>
-    <string name="title_activity_git_clone">Repo 信息</string>
-    <!-- Password Store -->
-    <string name="creation_dialog_text">在尝试添加密码或任何同步操作前请在下方克隆或添加一个新的 Repo</string>
-    <string name="delete">删除</string>
-    <!-- git commits -->
-    <string name="git_commit_add_text">使用Android Password Store来添加 %1$s</string>
-    <string name="git_commit_edit_text">使用Android Password Store来修改 %1$s</string>
-    <!-- PGPHandler -->
-    <string name="clipboard_password_toast_text">密码已复制到剪贴板, 你有 %d 秒的时间将其粘贴到其他地方.</string>
-    <string name="file_toast_text">请提供一个文件名</string>
-    <string name="empty_toast_text">无法使用空白密码或者空白的额外内容</string>
-    <!-- Git Async Task -->
-    <string name="jgit_error_dialog_title">内部错误</string>
-    <!-- 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="ssh_preferences_dialog_generate">生成</string>
-    <string name="passphrase_dialog_title">认证</string>
-    <string name="passphrase_dialog_text">请为您的 SSH 密钥提供口令. 若口令为空则请留空</string>
-    <string name="password_dialog_text">请提供当前 Repo 的密码</string>
-    <!-- Clone fragment -->
-    <string name="server_name">服务器</string>
-    <string name="connection_mode">认证模式</string>
-    <!-- Git Config fragment -->
-    <string name="git_user_name_hint">用户名</string>
-    <!-- PGP Handler -->
-    <string name="crypto_name_hint">名称</string>
-    <string name="crypto_pass_label">密码</string>
-    <string name="crypto_extra_label">备注</string>
-    <!-- DECRYPT Layout -->
-    <string name="action_search">搜索</string>
-    <!-- Preferences -->
-    <string name="pref_ssh_title">导入 SSH 密钥</string>
-    <string name="pref_ssh_keygen_title">生成 SSH 密钥对</string>
-    <string name="pref_ssh_see_key_title">查看生成的 SSH 公钥</string>
-    <string name="pref_git_delete_repo">删除 Repo</string>
-    <string name="pref_dialog_delete_title">清空 Repo</string>
-    <string name="pref_category_general_title">通用</string>
-    <string name="pref_copy_title">自动复制密码</string>
-    <string name="pref_copy_dialog_title">解密成功后自动将密码复制到剪贴板</string>
-    <string name="ssh_key_success_dialog_title">成功导入SSH密钥</string>
-    <string name="ssh_key_error_dialog_text">信息:</string>
-    <string name="pref_recursive_filter">搜索子文件夹</string>
-    <string name="pref_recursive_filter_hint">在当前目录的子目录中查找密码</string>
-    <string name="pref_autofill_enable_title">启动自动填充</string>
-    <string name="pref_autofill_enable_msg">点击 OK 进入无障碍设置. 在那里的服务选项中选中点选 Password Store 并单击右上方的开关将其开启或关闭</string>
-    <string name="pref_autofill_enable_msg2">服务启动之后, 在你点击一个应用的密码栏时如果该应用有匹配的密码则会弹出对话框.</string>
-    <string name="pref_autofill_enable_msg3">Password Store 会自动尝试将应用与密码匹配. 你可以更改这个默认设置以及每个应用的匹配设置.</string>
-    <string name="pref_autofill_apps_title">应用及网站设置</string>
-    <string name="pref_autofill_default_title">默认为自动匹配</string>
-    <string name="pref_autofill_default_hint">无自定义设置的应用将默认采用 \'自动匹配\' . 否则将采用\'从不匹配\'</string>
-    <string name="pref_autofill_always_title">总是显示对话框</string>
-    <string name="pref_clear_clipboard_title">清空剪贴版20次</string>
-    <string name="pref_clear_clipboard_hint">将剪贴版复写20次. 这在有储存剪贴版历史功能的三星手机上很有用.</string>
-    <string name="pref_git_delete_repo_summary">删除本地的 (隐藏) Repo</string>
-    <string name="pref_external_repository">外部 Repo</string>
-    <string name="pref_external_repository_summary">使用一个外部的密码Repo</string>
-    <string name="pref_select_external_repository">选择外部 Repo</string>
-    <!-- PasswordGenerator fragment -->
-    <string name="pwgen_generate">生成</string>
-    <string name="pwgen_include">包括</string>
-    <string name="pwgen_length">长度</string>
-    <string name="pwgen_numerals">数字</string>
-    <string name="pwgen_symbols">特殊符号</string>
-    <string name="pwgen_uppercase">大写</string>
-    <string name="pwgen_ambiguous">混淆</string>
-    <!-- XKPWD password generator -->
-    <!-- XKPWD prefs -->
-    <!-- ssh keygen fragment -->
-    <string name="ssh_keygen_passphrase">口令</string>
-    <string name="ssh_keygen_generate">生成</string>
-    <!-- SSH Android Keystore auth -->
-    <!-- Misc -->
-    <string name="dialog_ok">确定</string>
-    <string name="dialog_yes">确定</string>
-    <string name="dialog_no">否</string>
-    <string name="dialog_cancel">取消</string>
-    <string name="git_sync">同步 Repo</string>
-    <string name="git_pull">Git Pull</string>
-    <string name="git_push">Git Push</string>
-    <string name="show_password_pref_title">显示密码</string>
-    <string name="show_password_pref_summary">控制密码被解密后的可见性, 这并不影响密码的复制</string>
-    <string name="pwd_generate_button">生成</string>
-    <string name="refresh_list">刷新列表</string>
-    <string name="no_repo_selected">未选择外部 Repo</string>
-    <string name="send_plaintext_password_to">将密码以纯文本发送…</string>
-    <!-- Oreo Autofill -->
-    <!-- Autofill -->
-    <string name="autofill_description">在app中自动输入密码. 此功能只在 Andorid 4.3 及以上版本中可用. 在 Andorid 5.0 及以上版本中不依赖剪贴板</string>
-    <string name="autofill_apps_default">使用默认设置</string>
-    <string name="autofill_apps_first">自动匹配</string>
-    <string name="autofill_apps_match_ellipsis">匹配…</string>
-    <string name="autofill_apps_match">匹配</string>
-    <string name="autofill_apps_never">从不匹配</string>
-    <string name="autofill_apps_delete">删除</string>
-    <!-- OpenKeychain errors -->
-    <!-- Password creation failure -->
-    <!-- GitException messages -->
-    <!-- OpenKeychain not installed -->
-    <!-- GPG key selection in folder creation -->
-    <!-- Onboarding flow -->
-    <!-- SSH port validation -->
-</resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
deleted file mode 100644
index f7851176..00000000
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
-  ~ SPDX-License-Identifier: GPL-3.0-only
-  -->
-<resources>
-    <!-- Activity names -->
-    <string name="action_settings">設定</string>
-    <string name="dialog_delete_title">目錄已存在</string>
-    <string name="dialog_delete_msg">目標目錄已存在. 目前版本僅支援單一儲存區. 真的要刪除現有的 Password Store 目錄嗎\n(%1$s)</string>
-    <string name="dialog_delete">刪除目錄</string>
-    <string name="dialog_do_not_delete">取消</string>
-    <string name="title_activity_git_clone">Repo 訊息</string>
-    <!-- Password Store -->
-    <string name="creation_dialog_text">在嘗試新增密碼或任何同步操作之前請在下方 clone 或新增一個新的 Repo</string>
-    <string name="delete">刪除</string>
-    <!-- git commits -->
-    <!-- PGPHandler -->
-    <string name="clipboard_password_toast_text">密碼已複製到剪貼簿, 你有 %d 秒的時間將其貼上到其他地方.</string>
-    <string name="file_toast_text">請填寫文件名稱</string>
-    <string name="empty_toast_text">不能使用空白密碼或者空白的備註</string>
-    <!-- Git Async Task -->
-    <string name="jgit_error_dialog_title">内部錯誤</string>
-    <!-- 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="ssh_preferences_dialog_generate">產生</string>
-    <string name="passphrase_dialog_title">認證</string>
-    <string name="passphrase_dialog_text">請為你的 SSH 金鑰設定密碼. 若密碼為空請留空</string>
-    <string name="password_dialog_text">請提供目前 Repo 的密碼</string>
-    <!-- Clone fragment -->
-    <string name="server_name">伺服器</string>
-    <string name="connection_mode">認證模式</string>
-    <!-- Git Config fragment -->
-    <string name="git_user_name_hint">使用者名稱</string>
-    <!-- PGP Handler -->
-    <string name="crypto_name_hint">名稱</string>
-    <string name="crypto_pass_label">密碼</string>
-    <string name="crypto_extra_label">備註</string>
-    <!-- DECRYPT Layout -->
-    <string name="action_search">搜尋</string>
-    <!-- Preferences -->
-    <string name="pref_ssh_title">匯入 SSH 私鑰</string>
-    <string name="pref_ssh_keygen_title">生成 SSH 金鑰</string>
-    <string name="pref_ssh_see_key_title">顯示生成的 SSH 公鑰</string>
-    <string name="pref_git_delete_repo">刪除 Repo</string>
-    <string name="pref_dialog_delete_title">清空 Repo</string>
-    <string name="pref_category_general_title">一般</string>
-    <string name="pref_copy_title">自動複製密碼</string>
-    <string name="pref_copy_dialog_title">解密成功後自動將密碼複製到剪貼簿</string>
-    <string name="ssh_key_success_dialog_title">成功匯入 SSH 金鑰</string>
-    <string name="ssh_key_error_dialog_text">訊息:</string>
-    <string name="pref_recursive_filter">搜尋子資料夾</string>
-    <string name="pref_recursive_filter_hint">在目前目錄的子目錄中查詢密碼</string>
-    <string name="pref_autofill_enable_title">啟動自動填入</string>
-    <string name="pref_autofill_enable_msg">點擊 OK 進入無障礙設定. 在那裡的請選擇 Password Store 並點擊右上方的開關將其開起或關閉</string>
-    <string name="pref_autofill_enable_msg2">服務起動後, 在你點擊一個 app 的密碼欄時如果該 app 有匹配的密碼將會彈出對話框.</string>
-    <string name="pref_autofill_enable_msg3">Password Store 會自動嘗試將 app 與密碼匹配. 你可以更改這個預設選項以及每個 app 的個別設定.</string>
-    <string name="pref_autofill_apps_title">app 及網站設定</string>
-    <string name="pref_autofill_default_title">使用自動選取</string>
-    <string name="pref_autofill_default_hint">無自定設定的 app 將預設使用 \'自動選取\' . 否則將使用\'手動\'</string>
-    <string name="pref_autofill_always_title">總是顯示對話框</string>
-    <string name="pref_clear_clipboard_title">清空剪貼簿 20 次</string>
-    <string name="pref_clear_clipboard_hint">将剪貼簿複寫 20 次. 這在有儲存剪貼簿版歷史紀錄的三星手機上很有用.</string>
-    <string name="pref_git_delete_repo_summary">刪除本機的 (隱藏) Repo</string>
-    <string name="pref_external_repository">外部 Repo</string>
-    <string name="pref_external_repository_summary">使用外部的 Repo</string>
-    <string name="pref_select_external_repository">選擇外部 Repo</string>
-    <!-- PasswordGenerator fragment -->
-    <string name="pwgen_generate">產生</string>
-    <string name="pwgen_include">包括</string>
-    <string name="pwgen_length">長度</string>
-    <string name="pwgen_numerals">數字</string>
-    <string name="pwgen_symbols">特殊符號</string>
-    <string name="pwgen_uppercase">大寫</string>
-    <string name="pwgen_ambiguous">混淆</string>
-    <!-- XKPWD password generator -->
-    <!-- XKPWD prefs -->
-    <!-- ssh keygen fragment -->
-    <string name="ssh_keygen_passphrase">密碼</string>
-    <string name="ssh_keygen_generate">產生</string>
-    <!-- SSH Android Keystore auth -->
-    <!-- Misc -->
-    <string name="dialog_ok">確定</string>
-    <string name="dialog_yes">確定</string>
-    <string name="dialog_no">否</string>
-    <string name="dialog_cancel">取消</string>
-    <string name="git_sync">同步 Repo</string>
-    <string name="git_pull">Git Pull</string>
-    <string name="git_push">Git Push</string>
-    <string name="show_password_pref_title">顯示密碼</string>
-    <string name="show_password_pref_summary">控制密碼被解密後是否顯示密碼, 這不影響密碼的複製</string>
-    <string name="pwd_generate_button">產生</string>
-    <string name="refresh_list">重新整理</string>
-    <string name="no_repo_selected">未選擇外部 Repo</string>
-    <string name="send_plaintext_password_to">將密碼以純文字傳送…</string>
-    <!-- Oreo Autofill -->
-    <!-- Autofill -->
-    <string name="autofill_description">在app中自動填入密碼. 此功能只能在 Andorid 4.3 及以上版本中使用. 在 Andorid 5.0 及以上版本中不需要剪貼簿</string>
-    <string name="autofill_apps_default">使用預設值</string>
-    <string name="autofill_apps_first">自動選取</string>
-    <string name="autofill_apps_match_ellipsis">匹配…</string>
-    <string name="autofill_apps_match">自動填入</string>
-    <string name="autofill_apps_never">手動</string>
-    <string name="autofill_apps_delete">刪除</string>
-    <!-- OpenKeychain errors -->
-    <!-- Password creation failure -->
-    <!-- GitException messages -->
-    <!-- OpenKeychain not installed -->
-    <!-- GPG key selection in folder creation -->
-    <!-- Onboarding flow -->
-    <!-- SSH port validation -->
-</resources>