diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 0a1bfd5eb..99acea1e8 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -276,7 +276,6 @@
   <string name="git_operation_running">Git-Operation wird ausgeführt…</string>
   <string name="git_break_out_of_detached_success">Es gab einen Klonflikt während des rebase-Prozesses. Dein lokaler %1$s branch wurde auf einen anderen Branch namens %2$s gepusht.\nNutze diesen Branch um Konflikte auf deinem Computer zu beheben</string>
   <string name="git_break_out_of_detached_unneeded">Das Repository befindet sich nicht im Rebase-Prozess, es ist nicht nötig, den Zustand auf einen weiteren Branch zu pushen</string>
-  <!-- OpenKeychain not installed -->
   <!-- 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>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index ea648db0f..7894b1623 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -280,7 +280,6 @@
   <string name="git_operation_running">Opération git en cours…</string>
   <string name="git_break_out_of_detached_success">Il y a eu un conflit lors de la tentative de rebase. Votre branche locale %1$s a été poussée vers une autre branche nommée %2$s\n Utilisez cette branche pour résoudre les conflits sur votre ordinateur</string>
   <string name="git_break_out_of_detached_unneeded">Le dépôt n\'est pas rebasé, pas besoin de pousser vers une autre branche</string>
-  <!-- OpenKeychain not installed -->
   <!-- GPG key selection in folder creation -->
   <string name="folder_creation_err_file_exists">Un fichier portant ce nom existe déjà</string>
   <string name="folder_creation_err_folder_exists">Un dossier portant ce nom existe déjà</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 912efcb87..93a9b9140 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -36,6 +36,7 @@
   <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 cos IDs GPG en %1$s.</string>
   <!-- PGPHandler -->
   <string name="clipboard_copied_text">Copiado ao portapapeis</string>
   <string name="file_toast_text">Debes proporcionar un nome de ficheiro</string>
@@ -71,6 +72,7 @@
   <string name="action_search">Buscar</string>
   <string name="password">Contrasinal</string>
   <string name="username">Identificador</string>
+  <string name="copy_label">Copiar</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>
@@ -116,6 +118,8 @@
   <string name="pref_import_pgp_key_title">Importar chave PGP</string>
   <string name="pref_pgp_key_manager_title">Xestor de chaves</string>
   <string name="pref_pgp_ascii_armor_title">Cifrar co modo ASCII armor</string>
+  <string name="pref_passphrase_cache_title">Permitir usar a caché para frase de paso</string>
+  <string name="pref_passphrase_cache_summary">AVISO: esta ferramenta é funcional pero aínda experimental.</string>
   <!-- PasswordGenerator fragment -->
   <string name="pwgen_title">Crear contrasinal</string>
   <string name="pwgen_generate">Crear</string>
@@ -288,8 +292,8 @@ a app desde unha fonte de confianza, como a Play Store, Amazon Appstore, F-Droid
   <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 -->
   <!-- GPG key selection in folder creation -->
+  <string name="gpg_key_select_mandatory">Hai que elexir unha chave GPG para continuar</string>
   <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>
   <!-- Onboarding flow -->
@@ -337,4 +341,5 @@ a app desde unha fonte de confianza, como a Play Store, Amazon Appstore, F-Droid
   <string name="pgp_key_manager_no_keys_guidance">Importar unha chave usando o botón inferior Engadir</string>
   <string name="no_keys_imported_dialog_title">Non se importaron chaves</string>
   <string name="no_keys_imported_dialog_message">Aínda non hai chaves PGP importadas na app, preme no botón inferior para seleccionar un ficheiro de chave</string>
+  <string name="biometric_prompt_title_gpg_passphrase_cache">Desbloquear cache da frase de paso</string>
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 0d84e6efe..e6db2e846 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -274,7 +274,6 @@
   <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 -->
   <!-- GPG key selection in folder creation -->
   <string name="folder_creation_err_file_exists">Un file con quel nome esiste già</string>
   <string name="folder_creation_err_folder_exists">Una cartella con quel nome esiste già</string>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index a13fc6794..84c22a9dc 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -281,7 +281,6 @@
   <string name="git_operation_running">Operacja Git w toku…</string>
   <string name="git_break_out_of_detached_success">Podczas operacji \"rebase\" wystąpił konflikt. Twoja lokalna gałąź %1$s została przepchnięta do innej gałęzi o nazwie %2$s\n Użyj tej gałęzi do rozwiązania konfliktu na komputerze</string>
   <string name="git_break_out_of_detached_unneeded">Repozytorium nie jest w trakcie operacji \"rebase\", nie ma potrzeby wypychać do innej gałęzi</string>
-  <!-- OpenKeychain not installed -->
   <!-- GPG key selection in folder creation -->
   <string name="folder_creation_err_file_exists">Plik o tej nazwie już istnieje</string>
   <string name="folder_creation_err_folder_exists">Folder o tej nazwie już istnieje</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 4efac5416..d42bc7e03 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -287,7 +287,6 @@
   <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 -->
   <!-- GPG key selection in folder creation -->
   <string name="folder_creation_err_file_exists">Já existe um arquivo com esse nome</string>
   <string name="folder_creation_err_folder_exists">Já existe uma pasta com esse nome</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index a913f8434..9a528cd92 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -282,7 +282,6 @@
   <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 -->
   <!-- GPG key selection in folder creation -->
   <string name="folder_creation_err_file_exists">Файл с таким именем уже существует</string>
   <string name="folder_creation_err_folder_exists">Папка с таким именем уже существует</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 11a879438..7e3094e90 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -35,6 +35,7 @@
   <string name="git_commit_remove_text">从仓库中删除%1$s</string>
   <string name="git_commit_move_text">将%1$s重命名为%2$s</string>
   <string name="git_commit_move_multiple_text">将多个密码移至%1$s</string>
+  <string name="git_commit_gpg_id">初始化 %1$s 中的 GPG ID</string>
   <!-- PGPHandler -->
   <string name="clipboard_copied_text">复制到剪切板</string>
   <string name="file_toast_text">请提供文件名</string>
@@ -70,6 +71,7 @@
   <string name="action_search">搜索</string>
   <string name="password">密码</string>
   <string name="username">用户名</string>
+  <string name="copy_label">复制</string>
   <string name="edit_password">编辑密码</string>
   <string name="copy_password">复制密码</string>
   <string name="share_as_plaintext">用明文分享</string>
@@ -115,6 +117,8 @@
   <string name="pref_import_pgp_key_title">导入 PGP 密钥</string>
   <string name="pref_pgp_key_manager_title">密钥管理器</string>
   <string name="pref_pgp_ascii_armor_title">以 ASCII 装甲模式加密</string>
+  <string name="pref_passphrase_cache_title">启用密码短语缓存</string>
+  <string name="pref_passphrase_cache_summary">警告：此功能可正常工作，但仍然非常实验性。</string>
   <!-- PasswordGenerator fragment -->
   <string name="pwgen_title">生成密码</string>
   <string name="pwgen_generate">生成</string>
@@ -284,14 +288,16 @@ personal.com</string>
   <!-- GitException messages -->
   <string name="git_unknown_error">未知错误</string>
   <string name="git_pull_merge_fail_error">合并失败，你处于冲突状态。TODO：添加恢复方法。</string>
+  <string name="git_push_nff_error">推送被远端拒绝，在推送前运行拉取。您可以使用同步而不是拉取/推送，因为它实现了这两种功能。</string>
   <string name="git_push_generic_error">推送被远程拒绝,原因: %1$s</string>
+  <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">尝试变更时发生冲突,您的本地%1$s分支被推送到另一个名为%2$s的分支
 使用此分支解决计算机上的冲突</string>
   <string name="git_break_out_of_detached_unneeded">存储库没有变更,无需推送到另一个分支</string>
-  <!-- OpenKeychain not installed -->
   <!-- GPG key selection in folder creation -->
+  <string name="gpg_key_select_mandatory">选择一个 GPG 密钥才能继续</string>
   <string name="folder_creation_err_file_exists">该名称的文件已存在</string>
   <string name="folder_creation_err_folder_exists">该名称的文件夹已存在</string>
   <!-- Onboarding flow -->
@@ -342,4 +348,5 @@ GPG
   <string name="pgp_key_manager_no_keys_guidance">使用下面的添加按钮导入密钥</string>
   <string name="no_keys_imported_dialog_title">未导入密钥</string>
   <string name="no_keys_imported_dialog_message">应用中还没有导入PGP密钥，按下下面的按钮选择一个密钥文件</string>
+  <string name="biometric_prompt_title_gpg_passphrase_cache">解锁密码短语缓存</string>
 </resources>