diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 93a9b9140..7119947e0 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -119,7 +119,7 @@
   <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>
+  <string name="pref_passphrase_cache_summary">AVISO: esta característica funciona ben pero é experimental. Require que a pantalla estea bloqueada.</string>
   <!-- PasswordGenerator fragment -->
   <string name="pwgen_title">Crear contrasinal</string>
   <string name="pwgen_generate">Crear</string>
@@ -278,6 +278,7 @@ a app desde unha fonte de confianza, como a Play Store, Amazon Appstore, F-Droid
   <string name="otp_import_failure_no_selection">Non se seleccionou ningún ficheiro de imaxe</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_gpg_id">Atopouse .gpg-id, pero contén un ID hex curto, ao que non damos soporte</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>
diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml
index 51bf34853..43f73e3a4 100644
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@@ -117,7 +117,7 @@
   <string name="pref_pgp_key_manager_title">키 관리자</string>
   <string name="pref_pgp_ascii_armor_title">ASCII armor 모드로 암호화</string>
   <string name="pref_passphrase_cache_title">비밀번호 캐쉬 활성화</string>
-  <string name="pref_passphrase_cache_summary">경고: 이 기능은 매우 실험적인 기능입니다.</string>
+  <string name="pref_passphrase_cache_summary">경고: 이 기능은 기능적이지만 매우 실험적인 기능입니다. 화면 잠금이 활성화되어 있어야 합니다.</string>
   <!-- PasswordGenerator fragment -->
   <string name="pwgen_title">암호 생성</string>
   <string name="pwgen_generate">생성</string>
@@ -277,6 +277,7 @@ username@example.com:…</string>
   <string name="otp_import_failure_no_selection">선택한 이미지 파일이 없습니다</string>
   <string name="exporting_passwords">비밀번호 내보내는 중…</string>
   <string name="invalid_gpg_id">.gpg-id를 찾았지만 잘못된 키 ID, 지문 또는 사용자 ID가 포함되어 있습니다</string>
+  <string name="short_gpg_id">.gpg-id를 찾았지만, 지원되지 않는 짧은 16진수 ID가 포함되어 있습니다.</string>
   <string name="invalid_filename_text">파일 이름에 \'/\'가 포함되어서는 안됩니다. 위의 디렉터리를 설정하세요</string>
   <string name="directory_hint">디렉토리</string>
   <string name="new_folder_set_gpg_key">디렉토리의 GPG 키 설정</string>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index 84c22a9dc..c6130f58a 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -115,6 +115,7 @@
   <string name="pref_import_pgp_key_title">Importuj klucz PGP</string>
   <string name="pref_pgp_key_manager_title">Menedżer kluczy</string>
   <string name="pref_pgp_ascii_armor_title">Szyfruj w trybie ASCII-armor</string>
+  <string name="pref_passphrase_cache_summary">UWAGA: ta funkcjonalność powinna działać poprawnie, ale jest bardzo eksperymentalna. Wymaga aktywnej blokady ekranu.</string>
   <!-- PasswordGenerator fragment -->
   <string name="pwgen_title">Generuj hasło</string>
   <string name="pwgen_generate">Wygeneruj</string>
@@ -267,6 +268,7 @@
   <string name="otp_import_success">Pomyślnie zaimportowano konfigurację TOTP</string>
   <string name="exporting_passwords">Eksportowanie haseł…</string>
   <string name="invalid_gpg_id">Znaleziono .gpg-id, ale zawiera nieprawidłowy identyfikator klucza, odcisk palca lub identyfikator użytkownika</string>
+  <string name="short_gpg_id">Znaleziono .gpg-id, ale zawarty w nim skrócony identyfikator nie jest obsługiwany</string>
   <string name="invalid_filename_text">Nazwa pliku nie może zawierać \'/\', ustaw katalog powyżej</string>
   <string name="directory_hint">Katalog</string>
   <string name="new_folder_set_gpg_key">Ustaw klucz GPG dla katalogu</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 33a6d925a..ac0b1b80b 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -116,7 +116,6 @@
   <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>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 7e3094e90..f8174fb49 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -118,7 +118,7 @@
   <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>
+  <string name="pref_passphrase_cache_summary">警告：此功能可以运作，但非常实验性，需要活跃的屏幕锁。</string>
   <!-- PasswordGenerator fragment -->
   <string name="pwgen_title">生成密码</string>
   <string name="pwgen_generate">生成</string>
@@ -282,6 +282,7 @@ personal.com</string>
   <string name="otp_import_failure_no_selection">没有选择镜像文件</string>
   <string name="exporting_passwords">正在导出密码…</string>
   <string name="invalid_gpg_id">找到了 .gpg-id，但它包含无效的密钥ID、指纹或用户ID</string>
+  <string name="short_gpg_id">找到 .gpg-id 但它包含一个不受支持的短十六进制ID。</string>
   <string name="invalid_filename_text">文件名不能包含\'/\'</string>
   <string name="directory_hint">目录</string>
   <string name="new_folder_set_gpg_key">为目录设置GPG密钥</string>
diff --git a/app/src/nonFree/res/values-ko-rKR/strings.xml b/app/src/nonFree/res/values-ko-rKR/strings.xml
new file mode 100644
index 000000000..3d6561cc0
--- /dev/null
+++ b/app/src/nonFree/res/values-ko-rKR/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved.
+  ~ SPDX-License-Identifier: GPL-3.0-only
+  -->
+<resources>
+  <string name="oreo_autofill_waiting_for_sms">SMS를 기다리는 중입니다…</string>
+</resources>