diff --git a/OpenKeychain/src/main/res/raw-cs/help_changelog.md b/OpenKeychain/src/main/res/raw-cs/help_changelog.md
index 028497158..a93dad380 100644
--- a/OpenKeychain/src/main/res/raw-cs/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-cs/help_changelog.md
@@ -1,10 +1,16 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.1
+
+  * Better detection of emails and other content when opened
+
+
 ## 4.0
 
   * Experimental support for Security Tokens over USB
   * Allow password changing of stripped keys
 
+
 ## 3.9
 
   * Detection and handling of text data
@@ -267,7 +273,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
   * Basic keyserver support
   * App2sd
   * More choices for passphrase cache: 1, 2, 4, 8, hours
-  * Translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
+  * Translations: Norwegian Bokmål (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
   * Bugfixes
   * Optimizations
 
diff --git a/OpenKeychain/src/main/res/raw-de/help_changelog.md b/OpenKeychain/src/main/res/raw-de/help_changelog.md
index fa9e1a83c..a97222fc3 100644
--- a/OpenKeychain/src/main/res/raw-de/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-de/help_changelog.md
@@ -1,10 +1,16 @@
 [//]: # (Beachte: Bitte schreibe jeden Satz in eine eigene Zeile, Transifex wird jede Zeile in ein eigenes Übesetzungsfeld setzen!)
 
+## 4.1
+
+  * Better detection of emails and other content when opened
+
+
 ## 4.0
 
   * Experimentelle Unterstützung für Smartcards über USB
   * Erlaube Passwortänderung von gekürzten Schlüsseln
 
+
 ## 3.9
 
   * Erkennung und Bearbeitung von Textdaten
@@ -267,7 +273,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
   * Grundlegende Schlüsselserverunterstützung
   * App2SD
   * Mehr Auswahlmöglichkeiten für den Passwortzwischenspeicher: 1, 2, 4, 8, Stunden
-  * Übersetzungen: Norwegisch (Dank an Sander Danielsen), Chinesisch (Dank an Zhang Fredrick)
+  * Translations: Norwegian Bokmål (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
   * Fehlerbehebungen
   * Optimierungen
 
diff --git a/OpenKeychain/src/main/res/raw-es-rMX/help_changelog.md b/OpenKeychain/src/main/res/raw-es-rMX/help_changelog.md
index d08d562a5..3a7d999a0 100644
--- a/OpenKeychain/src/main/res/raw-es-rMX/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-es-rMX/help_changelog.md
@@ -1,10 +1,16 @@
 [//]: # (Observe: ¡Por favor ingrese cada enunciado en su propia línea, Transifex coloca cada línea en su propio campo de traducción!)
 
+## 4.1
+
+  * Better detection of emails and other content when opened
+
+
 ## 4.0
 
   * Experimental support for Security Tokens over USB
   * Allow password changing of stripped keys
 
+
 ## 3.9
 
   * Detection and handling of text data
@@ -267,7 +273,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
   * Basic keyserver support
   * App2sd
   * More choices for passphrase cache: 1, 2, 4, 8, hours
-  * Translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
+  * Translations: Norwegian Bokmål (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
   * Bugfixes
   * Optimizations
 
diff --git a/OpenKeychain/src/main/res/raw-es/help_changelog.md b/OpenKeychain/src/main/res/raw-es/help_changelog.md
index 2933319d1..2da8e6568 100644
--- a/OpenKeychain/src/main/res/raw-es/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-es/help_changelog.md
@@ -1,10 +1,16 @@
 [//]: # (NOTA: ¡Por favor ponga cada frase en su propia línea, Transifex pone cada línea en su propio campo de traducción!)
 
+## 4.1
+
+  * Better detection of emails and other content when opened
+
+
 ## 4.0
 
   * Experimental support for Security Tokens over USB
   * Allow password changing of stripped keys
 
+
 ## 3.9
 
   * Detection and handling of text data
@@ -267,7 +273,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
   * Soporte para servidor de claves básico
   * App2sd
   * Más opciones para la caché de frase-contraseña: 1,2,4,8 horas
-  * Traducciones: Noruego (gracias, Sander Danielsen), Chino (gracias, Zhang Fredrick)
+  * Translations: Norwegian Bokmål (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
   * Reparaciones de fallos
   * Optimizaciones
 
diff --git a/OpenKeychain/src/main/res/raw-eu/help_changelog.md b/OpenKeychain/src/main/res/raw-eu/help_changelog.md
index f6d23748c..3635d31ff 100644
--- a/OpenKeychain/src/main/res/raw-eu/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-eu/help_changelog.md
@@ -1,10 +1,16 @@
 [//]: # (OHARRA: Meseez jarri esaldi bakoitza bere lerroan, Transifex-ek lerroak bere itzulpen eremuan jartzen ditu!)
 
+## 4.1
+
+  * Better detection of emails and other content when opened
+
+
 ## 4.0
 
   * Experimental support for Security Tokens over USB
   * Allow password changing of stripped keys
 
+
 ## 3.9
 
   * Idazki datuen atzematea eta kudeaketa
@@ -267,7 +273,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
   * Basic keyserver support
   * App2sd
   * More choices for passphrase cache: 1, 2, 4, 8, hours
-  * Translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
+  * Translations: Norwegian Bokmål (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
   * Bugfixes
   * Optimizations
 
diff --git a/OpenKeychain/src/main/res/raw-fa/help_changelog.md b/OpenKeychain/src/main/res/raw-fa/help_changelog.md
index cd7a64443..c3517fe36 100644
--- a/OpenKeychain/src/main/res/raw-fa/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-fa/help_changelog.md
@@ -1,10 +1,16 @@
 [//]: # (تذکر: هر جمله در همان خط!)
 
+## 4.1
+
+  * Better detection of emails and other content when opened
+
+
 ## 4.0
 
   * Experimental support for Security Tokens over USB
   * Allow password changing of stripped keys
 
+
 ## 3.9
 
   * Detection and handling of text data
@@ -267,7 +273,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
   * Basic keyserver support
   * App2sd
   * More choices for passphrase cache: 1, 2, 4, 8, hours
-  * Translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
+  * Translations: Norwegian Bokmål (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
   تعمیر باگ‌ها
   * Optimizations
 
diff --git a/OpenKeychain/src/main/res/raw-fi/help_changelog.md b/OpenKeychain/src/main/res/raw-fi/help_changelog.md
index 028497158..a93dad380 100644
--- a/OpenKeychain/src/main/res/raw-fi/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-fi/help_changelog.md
@@ -1,10 +1,16 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.1
+
+  * Better detection of emails and other content when opened
+
+
 ## 4.0
 
   * Experimental support for Security Tokens over USB
   * Allow password changing of stripped keys
 
+
 ## 3.9
 
   * Detection and handling of text data
@@ -267,7 +273,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
   * Basic keyserver support
   * App2sd
   * More choices for passphrase cache: 1, 2, 4, 8, hours
-  * Translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
+  * Translations: Norwegian Bokmål (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
   * Bugfixes
   * Optimizations
 
diff --git a/OpenKeychain/src/main/res/raw-fr/help_changelog.md b/OpenKeychain/src/main/res/raw-fr/help_changelog.md
index 641f51a54..0f63dcce6 100644
--- a/OpenKeychain/src/main/res/raw-fr/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-fr/help_changelog.md
@@ -1,10 +1,16 @@
 [//] : # (NOTE : veuillez mettre chaque phrase sur sa propre ligne. Transifex met chaque ligne dans son propre champ de traduction !)
 
+## 4.1
+
+  * Better detection of emails and other content when opened
+
+
 ## 4.0
 
   * Prise en charge expérimentale des jetons de sécurité par USB
   * Autoriser le changement de mot de passe des clés dépouillées
 
+
 ## 3.9
 
   * Détection et gestion de données texte
@@ -114,7 +120,7 @@
   * Accepter et afficher les drapeaux d'authentification des clefs
   * Interface utilisateur pour générer des clefs personnalisées
   * Corrigé - Certificats de révocation des ID utilisateurs
-  * Nouvelle recherche nuagique (dans les serveurs traditionnels et dans keybase.io)
+  * Nouvelle recherche nuagique (sur les serveurs de clefs habituels et dans keybase.io)
   * Prise en charge du dépouillement des clefs dans OpenKeychain
   * Prise en charge expérimentale de la YubiKey : prise en charge de la génération de signature et le déchiffrement
 
@@ -267,7 +273,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
   * Prise en charge de base du serveur de clefs
   * App2sd
   * Plus de choix pour le cache de la phrase de passe : 1, 2, 4, 8 heures
-  * Traductions : norvégien (merci Sander Danielsen), chinois (merci Zhang Fredrick)
+  * Translations: Norwegian Bokmål (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
   * Correctifs de bogues
   * Optimisations
 
diff --git a/OpenKeychain/src/main/res/raw-hi/help_changelog.md b/OpenKeychain/src/main/res/raw-hi/help_changelog.md
index 028497158..a93dad380 100644
--- a/OpenKeychain/src/main/res/raw-hi/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-hi/help_changelog.md
@@ -1,10 +1,16 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.1
+
+  * Better detection of emails and other content when opened
+
+
 ## 4.0
 
   * Experimental support for Security Tokens over USB
   * Allow password changing of stripped keys
 
+
 ## 3.9
 
   * Detection and handling of text data
@@ -267,7 +273,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
   * Basic keyserver support
   * App2sd
   * More choices for passphrase cache: 1, 2, 4, 8, hours
-  * Translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
+  * Translations: Norwegian Bokmål (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
   * Bugfixes
   * Optimizations
 
diff --git a/OpenKeychain/src/main/res/raw-hu/help_changelog.md b/OpenKeychain/src/main/res/raw-hu/help_changelog.md
index 028497158..a93dad380 100644
--- a/OpenKeychain/src/main/res/raw-hu/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-hu/help_changelog.md
@@ -1,10 +1,16 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.1
+
+  * Better detection of emails and other content when opened
+
+
 ## 4.0
 
   * Experimental support for Security Tokens over USB
   * Allow password changing of stripped keys
 
+
 ## 3.9
 
   * Detection and handling of text data
@@ -267,7 +273,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
   * Basic keyserver support
   * App2sd
   * More choices for passphrase cache: 1, 2, 4, 8, hours
-  * Translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
+  * Translations: Norwegian Bokmål (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
   * Bugfixes
   * Optimizations
 
diff --git a/OpenKeychain/src/main/res/raw-id/help_changelog.md b/OpenKeychain/src/main/res/raw-id/help_changelog.md
index 1d2d1a29d..ac54f4619 100644
--- a/OpenKeychain/src/main/res/raw-id/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-id/help_changelog.md
@@ -1,10 +1,16 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.1
+
+  * Better detection of emails and other content when opened
+
+
 ## 4.0
 
   * Experimental support for Security Tokens over USB
   * Allow password changing of stripped keys
 
+
 ## 3.9
 
   * Detection and handling of text data
@@ -267,7 +273,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
   * Basic keyserver support
   * App2sd
   * More choices for passphrase cache: 1, 2, 4, 8, hours
-  * Translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
+  * Translations: Norwegian Bokmål (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
   * Bugfixes
   * Optimizations
 
diff --git a/OpenKeychain/src/main/res/raw-it/help_changelog.md b/OpenKeychain/src/main/res/raw-it/help_changelog.md
index 51c060ba0..afa6b8597 100644
--- a/OpenKeychain/src/main/res/raw-it/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-it/help_changelog.md
@@ -1,10 +1,16 @@
 [//]: # (NOTA: Si prega di mettere ogni frase in una propria linea, Transifex mette ogni riga nel proprio campo di traduzione!)
 
+## 4.1
+
+  * Better detection of emails and other content when opened
+
+
 ## 4.0
 
   * Experimental support for Security Tokens over USB
   * Allow password changing of stripped keys
 
+
 ## 3.9
 
   * Detection and handling of text data
@@ -267,7 +273,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
   * Basic keyserver support
   * App2sd
   * More choices for passphrase cache: 1, 2, 4, 8, hours
-  * Translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
+  * Translations: Norwegian Bokmål (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
   * Correzione di bug
   * Ottimizzazioni
 
diff --git a/OpenKeychain/src/main/res/raw-ja/help_changelog.md b/OpenKeychain/src/main/res/raw-ja/help_changelog.md
index 17afd2f41..650f1fb12 100644
--- a/OpenKeychain/src/main/res/raw-ja/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-ja/help_changelog.md
@@ -1,10 +1,16 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.1
+
+  * Better detection of emails and other content when opened
+
+
 ## 4.0
 
   * USB でのセキュリティトークンの実験的なサポート
   * ストリップした鍵のパスワード変更が可能
 
+
 ## 3.9
 
   * テキストデータの検出と処理
@@ -267,7 +273,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
   * 鍵サーバの基本サポート
   * App2SD
   * パスフレーズのキャッシュ時間についての選択肢追加: 1,2,4,8時間
-  * 翻訳: ノルウェー語 (ありがとう、Sander Danielsen)、中国語 (ありがとう、Zhang Fredrick) 追加
+  * Translations: Norwegian Bokmål (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
   * バグ修正
   * 最適化
 
diff --git a/OpenKeychain/src/main/res/raw-kn/help_changelog.md b/OpenKeychain/src/main/res/raw-kn/help_changelog.md
index 028497158..a93dad380 100644
--- a/OpenKeychain/src/main/res/raw-kn/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-kn/help_changelog.md
@@ -1,10 +1,16 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.1
+
+  * Better detection of emails and other content when opened
+
+
 ## 4.0
 
   * Experimental support for Security Tokens over USB
   * Allow password changing of stripped keys
 
+
 ## 3.9
 
   * Detection and handling of text data
@@ -267,7 +273,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
   * Basic keyserver support
   * App2sd
   * More choices for passphrase cache: 1, 2, 4, 8, hours
-  * Translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
+  * Translations: Norwegian Bokmål (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
   * Bugfixes
   * Optimizations
 
diff --git a/OpenKeychain/src/main/res/raw-ko/help_changelog.md b/OpenKeychain/src/main/res/raw-ko/help_changelog.md
index eff7d30b9..398eab5dc 100644
--- a/OpenKeychain/src/main/res/raw-ko/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-ko/help_changelog.md
@@ -1,10 +1,16 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.1
+
+  * Better detection of emails and other content when opened
+
+
 ## 4.0
 
   * Experimental support for Security Tokens over USB
   * Allow password changing of stripped keys
 
+
 ## 3.9
 
   * Detection and handling of text data
@@ -267,7 +273,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
   * 기본적인 키서버 지원
   * App2sd 지원
   * 암호구 캐시 시간 설정: 1, 2, 4, 8시간
-  * 번역: 노르웨이어 (Sander Danielsen씨 감사합니다), 중국어 (Zhang Fredrick씨 감사합니다)
+  * Translations: Norwegian Bokmål (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
   * 버그 수정
   * 최적화
 
diff --git a/OpenKeychain/src/main/res/raw-la/help_changelog.md b/OpenKeychain/src/main/res/raw-la/help_changelog.md
index 028497158..a93dad380 100644
--- a/OpenKeychain/src/main/res/raw-la/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-la/help_changelog.md
@@ -1,10 +1,16 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.1
+
+  * Better detection of emails and other content when opened
+
+
 ## 4.0
 
   * Experimental support for Security Tokens over USB
   * Allow password changing of stripped keys
 
+
 ## 3.9
 
   * Detection and handling of text data
@@ -267,7 +273,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
   * Basic keyserver support
   * App2sd
   * More choices for passphrase cache: 1, 2, 4, 8, hours
-  * Translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
+  * Translations: Norwegian Bokmål (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
   * Bugfixes
   * Optimizations
 
diff --git a/OpenKeychain/src/main/res/raw-nb/help_changelog.md b/OpenKeychain/src/main/res/raw-nb/help_changelog.md
index db78c8155..b9e6bff62 100644
--- a/OpenKeychain/src/main/res/raw-nb/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-nb/help_changelog.md
@@ -1,10 +1,16 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.1
+
+  * Better detection of emails and other content when opened
+
+
 ## 4.0
 
   * Experimental support for Security Tokens over USB
   * Allow password changing of stripped keys
 
+
 ## 3.9
 
   * Detection and handling of text data
@@ -267,7 +273,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
   * Enkel nøkkeltjener-støtte
   * App2sd
   * More choices for passphrase cache: 1, 2, 4, 8, hours
-  * Translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
+  * Translations: Norwegian Bokmål (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
   * Feilretting
   * Optimering
 
diff --git a/OpenKeychain/src/main/res/raw-nl/help_changelog.md b/OpenKeychain/src/main/res/raw-nl/help_changelog.md
index d64284078..16199ddef 100644
--- a/OpenKeychain/src/main/res/raw-nl/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-nl/help_changelog.md
@@ -1,10 +1,16 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.1
+
+  * Better detection of emails and other content when opened
+
+
 ## 4.0
 
   * Experimental support for Security Tokens over USB
   * Allow password changing of stripped keys
 
+
 ## 3.9
 
   * Detection and handling of text data
@@ -267,7 +273,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
   * Basisondersteuning voor sleutelservers
   * App2SD
   * Meer keuzes voor wachtwoordcache: 1, 2, 4, 8 uur
-  * Vertalingen: Noors (bedankt, Sander Danielsen), Chinees (bedankt, Zhang Fredrick)
+  * Translations: Norwegian Bokmål (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
   * Bugfixes
   * Optimalisaties
 
diff --git a/OpenKeychain/src/main/res/raw-pl/help_changelog.md b/OpenKeychain/src/main/res/raw-pl/help_changelog.md
index 028497158..a93dad380 100644
--- a/OpenKeychain/src/main/res/raw-pl/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-pl/help_changelog.md
@@ -1,10 +1,16 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.1
+
+  * Better detection of emails and other content when opened
+
+
 ## 4.0
 
   * Experimental support for Security Tokens over USB
   * Allow password changing of stripped keys
 
+
 ## 3.9
 
   * Detection and handling of text data
@@ -267,7 +273,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
   * Basic keyserver support
   * App2sd
   * More choices for passphrase cache: 1, 2, 4, 8, hours
-  * Translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
+  * Translations: Norwegian Bokmål (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
   * Bugfixes
   * Optimizations
 
diff --git a/OpenKeychain/src/main/res/raw-pt-rBR/help_changelog.md b/OpenKeychain/src/main/res/raw-pt-rBR/help_changelog.md
index 47bac6e97..b6a82bc86 100644
--- a/OpenKeychain/src/main/res/raw-pt-rBR/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-pt-rBR/help_changelog.md
@@ -1,10 +1,16 @@
 [//]: # (NOTA: coloque cada frase em sua própria linha, Transifex coloca cada linha em seu próprio campo de tradução!)
 
+## 4.1
+
+  * Better detection of emails and other content when opened
+
+
 ## 4.0
 
   * Experimental support for Security Tokens over USB
   * Allow password changing of stripped keys
 
+
 ## 3.9
 
   * Detecção e tratamento de dados de texto
@@ -267,7 +273,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
   * Basic keyserver support
   * App2sd
   * More choices for passphrase cache: 1, 2, 4, 8, hours
-  * Translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
+  * Translations: Norwegian Bokmål (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
   * Bugfixes
   * Optimizations
 
diff --git a/OpenKeychain/src/main/res/raw-ru/advanced.md b/OpenKeychain/src/main/res/raw-ru/advanced.md
index 70dc69ca6..74041df20 100644
--- a/OpenKeychain/src/main/res/raw-ru/advanced.md
+++ b/OpenKeychain/src/main/res/raw-ru/advanced.md
@@ -1,4 +1,4 @@
-[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
+[//]: # (ПРИМЕЧАНИЕ: пожалуйста, помещайте каждое предложение в свою собственную строку, Transifex помещает каждую строку в свою область перевода!)
 
 Дополнительный экран позволяет
 * публиковать ключ нерекомендуемыми способами
diff --git a/OpenKeychain/src/main/res/raw-ru/help_about.md b/OpenKeychain/src/main/res/raw-ru/help_about.md
index f624251e7..dd412974f 100644
--- a/OpenKeychain/src/main/res/raw-ru/help_about.md
+++ b/OpenKeychain/src/main/res/raw-ru/help_about.md
@@ -1,4 +1,4 @@
-[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
+[//]: # (ПРИМЕЧАНИЕ: пожалуйста, помещайте каждое предложение в свою собственную строку, Transifex помещает каждую строку в свою область перевода!)
 
 [https://www.openkeychain.org](https://www.openkeychain.org)
 
@@ -6,7 +6,7 @@
 
 Лицензия: GPLv3+
 
-[//]: # (NOTE: Alphabetic ordering)
+[//]: # (ПРИМЕЧАНИЕ: в алфавитном порядке)
 
 ## Ведущие разработчики
   * Dominik Schürmann (Ведущий разработчик)
@@ -51,7 +51,7 @@
   * Sreeram Boyapati
   * 'steelman'
 
-[//]: # (NOTE: Alphabetic ordering)
+[//]: # (ПРИМЕЧАНИЕ: в алфавитном порядке)
 
 ## Используемые библиотеки
   * [Android Support Libraries](http://developer.android.com/tools/support-library/index.html) (Apache License v2)
diff --git a/OpenKeychain/src/main/res/raw-ru/help_certification.md b/OpenKeychain/src/main/res/raw-ru/help_certification.md
index 34c361ea3..aa1a83b59 100644
--- a/OpenKeychain/src/main/res/raw-ru/help_certification.md
+++ b/OpenKeychain/src/main/res/raw-ru/help_certification.md
@@ -1,4 +1,4 @@
-[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
+[//]: # (ПРИМЕЧАНИЕ: пожалуйста, помещайте каждое предложение в свою собственную строку, Transifex помещает каждую строку в свою область перевода!)
 
 ## Подтверждение ключей
 Без подтверждения вы не можете быть уверены, что ключ принадлежит определённому человеку.
diff --git a/OpenKeychain/src/main/res/raw-ru/help_changelog.md b/OpenKeychain/src/main/res/raw-ru/help_changelog.md
index a0361632c..c070b9a86 100644
--- a/OpenKeychain/src/main/res/raw-ru/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-ru/help_changelog.md
@@ -1,10 +1,16 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.1
+
+  * Better detection of emails and other content when opened
+
+
 ## 4.0
 
-  * Experimental support for Security Tokens over USB
+  * Эксперементальная поддержка для токена безопасности через USB
   * Allow password changing of stripped keys
 
+
 ## 3.9
 
   * Detection and handling of text data
@@ -267,7 +273,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
   * Basic keyserver support
   * App2sd
   * More choices for passphrase cache: 1, 2, 4, 8, hours
-  * Translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
+  * Translations: Norwegian Bokmål (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
   * Bugfixes
   * Optimizations
 
@@ -323,9 +329,9 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 
 ## 1.0.0
 
-  * K-9 Mail integration, APG supporting beta build of K-9 Mail
-  * Support of more file managers (including ASTRO)
-  * Slovenian translation
-  * New database, much faster, less memory usage
+  * K-9 Mail интеграция, APG поддерживает beta-версию K-9 Mail
+  * Поддержка большего количества файловых менеджеров (включая ASTRO)
+  * Словенский перевод
+  Новая база данных, намного быстрее и компактнее
   * Defined Intents and content provider for other apps
   * Bugfixes
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/raw-ru/help_start.md b/OpenKeychain/src/main/res/raw-ru/help_start.md
index dd345c2d5..046b7c957 100644
--- a/OpenKeychain/src/main/res/raw-ru/help_start.md
+++ b/OpenKeychain/src/main/res/raw-ru/help_start.md
@@ -1,4 +1,4 @@
-[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
+[//]: # (ПРИМЕЧАНИЕ: пожалуйста, помещайте каждое предложение в свою собственную строку, Transifex помещает каждую строку в свою область перевода!)
 
 Как мне активировать OpenKeychain в K-9 Mail?
 Для использования OpenKeychain с K-9 Mail, необходимо выполнить следующие шаги:
diff --git a/OpenKeychain/src/main/res/raw-sl/help_changelog.md b/OpenKeychain/src/main/res/raw-sl/help_changelog.md
index 028497158..a93dad380 100644
--- a/OpenKeychain/src/main/res/raw-sl/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-sl/help_changelog.md
@@ -1,10 +1,16 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.1
+
+  * Better detection of emails and other content when opened
+
+
 ## 4.0
 
   * Experimental support for Security Tokens over USB
   * Allow password changing of stripped keys
 
+
 ## 3.9
 
   * Detection and handling of text data
@@ -267,7 +273,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
   * Basic keyserver support
   * App2sd
   * More choices for passphrase cache: 1, 2, 4, 8, hours
-  * Translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
+  * Translations: Norwegian Bokmål (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
   * Bugfixes
   * Optimizations
 
diff --git a/OpenKeychain/src/main/res/raw-sr/help_changelog.md b/OpenKeychain/src/main/res/raw-sr/help_changelog.md
index ceaa3dd85..23cca1e64 100644
--- a/OpenKeychain/src/main/res/raw-sr/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-sr/help_changelog.md
@@ -1,10 +1,16 @@
 [//]: #
 
+## 4.1
+
+  * Better detection of emails and other content when opened
+
+
 ## 4.0
 
   * Експериментална подршка за безбедносне токене преко УСБ-а
   * Мењање лозинке огољених кључева
 
+
 ## 3.9
 
   * Откривање и руковање текстуалним подацима
@@ -267,7 +273,7 @@
   * Основна подршка за сервер кључева
   * App2sd
   * Још избора за кеш лозинке: 1, 2, 4, 8 сати
-  * Преводи: норвешки (Сандер Даниелсен (Sander Danielsen)), кинески (Жанг Фредрик (Zhang Fredrick))
+  * Translations: Norwegian Bokmål (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
   * Поправке грешака
   * Оптимизације
 
diff --git a/OpenKeychain/src/main/res/raw-sv/help_changelog.md b/OpenKeychain/src/main/res/raw-sv/help_changelog.md
index 361229de5..3d1406cc2 100644
--- a/OpenKeychain/src/main/res/raw-sv/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-sv/help_changelog.md
@@ -1,10 +1,16 @@
 [//]: # (NOTERING: Var vänlig och sätt varje mening på sin egen rad, Transifex sätter varje rad i sitt eget fält för översättningar!)
 
+## 4.1
+
+  * Better detection of emails and other content when opened
+
+
 ## 4.0
 
   * Experimental support for Security Tokens over USB
   * Tillåt lösenord byte av avskalade nycklar
 
+
 ## 3.9
 
   * Detektering och hantering av textdata
@@ -267,7 +273,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
   * Basic keyserver support
   * App2sd
   * More choices for passphrase cache: 1, 2, 4, 8, hours
-  * Translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
+  * Translations: Norwegian Bokmål (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
   * Bugfixes
   * Optimizations
 
diff --git a/OpenKeychain/src/main/res/raw-tr/help_changelog.md b/OpenKeychain/src/main/res/raw-tr/help_changelog.md
index 028497158..a93dad380 100644
--- a/OpenKeychain/src/main/res/raw-tr/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-tr/help_changelog.md
@@ -1,10 +1,16 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.1
+
+  * Better detection of emails and other content when opened
+
+
 ## 4.0
 
   * Experimental support for Security Tokens over USB
   * Allow password changing of stripped keys
 
+
 ## 3.9
 
   * Detection and handling of text data
@@ -267,7 +273,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
   * Basic keyserver support
   * App2sd
   * More choices for passphrase cache: 1, 2, 4, 8, hours
-  * Translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
+  * Translations: Norwegian Bokmål (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
   * Bugfixes
   * Optimizations
 
diff --git a/OpenKeychain/src/main/res/raw-uk/help_changelog.md b/OpenKeychain/src/main/res/raw-uk/help_changelog.md
index 028497158..a93dad380 100644
--- a/OpenKeychain/src/main/res/raw-uk/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-uk/help_changelog.md
@@ -1,10 +1,16 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.1
+
+  * Better detection of emails and other content when opened
+
+
 ## 4.0
 
   * Experimental support for Security Tokens over USB
   * Allow password changing of stripped keys
 
+
 ## 3.9
 
   * Detection and handling of text data
@@ -267,7 +273,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
   * Basic keyserver support
   * App2sd
   * More choices for passphrase cache: 1, 2, 4, 8, hours
-  * Translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
+  * Translations: Norwegian Bokmål (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
   * Bugfixes
   * Optimizations
 
diff --git a/OpenKeychain/src/main/res/raw-vi/help_changelog.md b/OpenKeychain/src/main/res/raw-vi/help_changelog.md
index 028497158..a93dad380 100644
--- a/OpenKeychain/src/main/res/raw-vi/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-vi/help_changelog.md
@@ -1,10 +1,16 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.1
+
+  * Better detection of emails and other content when opened
+
+
 ## 4.0
 
   * Experimental support for Security Tokens over USB
   * Allow password changing of stripped keys
 
+
 ## 3.9
 
   * Detection and handling of text data
@@ -267,7 +273,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
   * Basic keyserver support
   * App2sd
   * More choices for passphrase cache: 1, 2, 4, 8, hours
-  * Translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
+  * Translations: Norwegian Bokmål (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
   * Bugfixes
   * Optimizations
 
diff --git a/OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.md b/OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.md
index 28f1656f6..4c21fe819 100644
--- a/OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.md
@@ -1,10 +1,16 @@
 [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
+## 4.1
+
+  * Better detection of emails and other content when opened
+
+
 ## 4.0
 
   * Experimental support for Security Tokens over USB
   * Allow password changing of stripped keys
 
+
 ## 3.9
 
   * Detection and handling of text data
@@ -267,7 +273,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
   * Basic keyserver support
   * App2sd
   * More choices for passphrase cache: 1, 2, 4, 8, hours
-  * Translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
+  * Translations: Norwegian Bokmål (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
   * Bugfixes
   * Optimizations
 
diff --git a/OpenKeychain/src/main/res/raw-zh/help_changelog.md b/OpenKeychain/src/main/res/raw-zh/help_changelog.md
index f3755ba49..70868e573 100644
--- a/OpenKeychain/src/main/res/raw-zh/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-zh/help_changelog.md
@@ -1,10 +1,16 @@
 [//]: # (注意：请把每个句子放在单独一行中， Transifex 将把每一行放置在独立的翻译表单内！)
 
+## 4.1
+
+  * Better detection of emails and other content when opened
+
+
 ## 4.0
 
-  * Experimental support for Security Tokens over USB
+  USB安全令牌的试验性支持
   * Allow password changing of stripped keys
 
+
 ## 3.9
 
   * 检测并处理文本数据
@@ -267,7 +273,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
   * 基本密钥服务器支持
   *  APP2SD
   * 密码缓存时间提供更多的选择：1，2，4，8，小时
-  * 翻译：挪威（感谢，Sander Danielsen），中国（感谢，Zhang Fredrick）
+  * Translations: Norwegian Bokmål (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
   *  Bug修复
   * 优化
 
diff --git a/OpenKeychain/src/main/res/values-fr/strings.xml b/OpenKeychain/src/main/res/values-fr/strings.xml
index dcbff56e4..6d507f9ff 100644
--- a/OpenKeychain/src/main/res/values-fr/strings.xml
+++ b/OpenKeychain/src/main/res/values-fr/strings.xml
@@ -182,7 +182,7 @@
   <string name="label_keyserver_dialog_delete">Supprimer le serveur de clefs</string>
   <string name="label_theme">Thème</string>
   <string name="pref_keyserver">Serveurs de clefs OpenPGP</string>
-  <string name="pref_keyserver_summary">Rechercher les clefs dans les serveurs de clefs OpenPGP choisis (protocole HKP)</string>
+  <string name="pref_keyserver_summary">Rechercher les clefs sur les serveurs de clefs OpenPGP choisis (protocole HKP)</string>
   <string name="pref_keybase">keybase.io</string>
   <string name="pref_keybase_summary">Rechercher les clefs sur keybase.io</string>
   <string name="pref_facebook">Facebook</string>
@@ -197,7 +197,7 @@
   <!--label shown in Android settings under the OpenKeychain account-->
   <string name="keyserver_sync_settings_title">Mises à jour automatiques des clefs</string>
   <string name="label_experimental_settings_desc_title">Avertissement</string>
-  <string name="label_experimental_settings_desc_summary">Ces fonctions ne sont pas encore terminées et n\'ont pas fait l\'objet de recherche sur leur convivialité, ni leur sécurité. Par conséquent, ne vous fiez pas à leur sécurité et veuillez ne pas rapporter les problèmes que vous rencontrez.</string>
+  <string name="label_experimental_settings_desc_summary">Ces fonctions ne sont pas encore terminées et n\'ont pas fait l\'objet de recherche sur leur convivialité ni leur sécurité. Par conséquent, ne vous fiez pas à leur sécurité et veuillez ne pas signaler les problèmes que vous rencontrez.</string>
   <string name="label_experimental_settings_word_confirm_title">Confirmer par des phrases</string>
   <string name="label_experimental_settings_word_confirm_summary">Confirmer les clefs par des phrases au lieu d\'empreintes hexadécimales</string>
   <string name="label_experimental_settings_linked_identities_title">Identités reliées</string>
diff --git a/OpenKeychain/src/main/res/values-it/strings.xml b/OpenKeychain/src/main/res/values-it/strings.xml
index 9df976aef..49eea3a94 100644
--- a/OpenKeychain/src/main/res/values-it/strings.xml
+++ b/OpenKeychain/src/main/res/values-it/strings.xml
@@ -14,6 +14,7 @@
   <string name="title_preferences">Impostazioni</string>
   <string name="title_api_registered_apps">Apps</string>
   <string name="title_key_server_preference">Server chiavi OpenPGP</string>
+  <string name="title_cache_ttl_preference">Cambia le scelte da \'Ricordare\'</string>
   <string name="title_change_passphrase">Cambia la password</string>
   <string name="title_share_fingerprint_with">Condivi impronta con...</string>
   <string name="title_share_key">Condividi chiave con...</string>
@@ -630,13 +631,30 @@ Permetti accesso?\n\nATTENZIONE: Se non sai perche\' questo schermata e\' appars
   <!--keybase proof stuff-->
   <string name="keybase_narrative_twitter">È presente su Twitter come %s</string>
   <string name="keybase_narrative_github">È presente su GitHub come %s</string>
+  <string name="keybase_narrative_dns">Controlla il/i nome/i dominio %s</string>
+  <string name="keybase_narrative_web_site">Può postare sul/i sito/i %s</string>
   <string name="keybase_narrative_reddit">È presente su Reddit come %s</string>
   <string name="keybase_narrative_coinbase">È presente su CoinBase come %s</string>
   <string name="keybase_narrative_hackernews">È presente su Hacker News come %s</string>
+  <string name="keybase_narrative_unknown">Tipo della prova sconosciuto %s</string>
+  <string name="keybase_proof_failure">Purtroppo questa prova non può essere verificata.</string>
+  <string name="keybase_unknown_proof_failure">Problema non riconosciuto nel controllo di prove</string>
   <string name="keybase_problem_fetching_evidence">Errore durante la verifica</string>
+  <string name="keybase_key_mismatch">L\'impronta della chiave non corrisponde con quella della prova</string>
+  <string name="keybase_dns_query_failure">Recupero DNS TXT Record fallito</string>
+  <string name="keybase_no_prover_found">Nessun controllo di prove trovato per</string>
+  <string name="keybase_message_payload_mismatch">La prova decifrata non corrisponde con il valore previsto</string>
+  <string name="keybase_message_fetching_data">Recupero della prova</string>
+  <string name="keybase_proof_succeeded">Questa prova è stata verificata!</string>
+  <string name="keybase_a_post">Un post</string>
+  <string name="keybase_fetched_from">recuperato da</string>
+  <string name="keybase_for_the_domain">per il dominio</string>
+  <string name="keybase_contained_signature">contiene un messaggio che può essere stato creato solo dal proprietario di questa chiave.</string>
   <string name="keybase_twitter_proof">Un tweet</string>
+  <string name="keybase_dns_proof">Un DNS TXT record</string>
   <string name="keybase_web_site_proof">Un file di testo</string>
   <string name="keybase_reddit_proof">Un file JSON</string>
+  <string name="keybase_reddit_attribution">attribuito da Reddit a</string>
   <string name="keybase_verify">Verifica</string>
   <!--Edit key-->
   <string name="edit_key_action_change_passphrase">Cambio password</string>
@@ -653,34 +671,61 @@ Permetti accesso?\n\nATTENZIONE: Se non sai perche\' questo schermata e\' appars
   <string name="edit_key_edit_user_id_revoked">Questa identità è stata revocata. Ciò non può essere annullato.</string>
   <string name="edit_key_edit_subkey_title">Seleziona un azione!</string>
   <string name="edit_key_new_subkey">nuova sottochiave</string>
+  <string name="edit_key_select_usage">Seleziona l\'uso della chiave!</string>
   <string name="edit_key_error_add_identity">Aggiungi almeno una identità</string>
   <string name="edit_key_error_add_subkey">Aggiungi almeno una sottochiave!</string>
+  <string name="edit_key_error_bad_security_token_algo">Algoritmo non supportato dal Token di Sicurezza!</string>
+  <string name="edit_key_error_bad_security_token_size">Dimensione chiave non supportata dal Token di Sicurezza!</string>
   <!--Create key-->
+  <string name="create_key_upload">Sincronizza con internet</string>
   <string name="create_key_empty">Questo campo è necessario</string>
   <string name="create_key_passphrases_not_equal">Le password non sono identiche</string>
   <string name="create_key_final_text">Hai inserito la seguente identità:</string>
   <string name="create_key_final_robot_text">La creazione di una chiave richiede un po\' di tempo, prendi un caffè nel frattempo...</string>
   <string name="create_key_rsa">(3 sottochiavi, RSA, 4096 bit)</string>
   <string name="create_key_custom">(personalizza la configurazione della chiave)</string>
+  <string name="create_key_name_text">Scegli un nome da associare alla chiave. Può essere un nome proprio, es. \'Mario Rossi\', o un soprannome, es. \'Mariuccio\'.</string>
+  <string name="create_key_email_text">Inserisci la tua email primaria usata per comunicazioni sicure.</string>
+  <string name="create_key_passphrase_text">Scegli una password complessa. Protegge la tua chiave quando il dispositivo viene rubato.</string>
   <string name="create_key_hint_full_name">Nome o nick</string>
   <string name="create_key_edit">Cambia configurazione della chiave</string>
   <string name="create_key_add_email">Aggiungi indirizzo email</string>
+  <string name="create_key_add_email_text">Anche altri inidirizzi email sono associati a questa chiave e possono essere usati per comunicazioni sicure.</string>
+  <string name="create_key_email_already_exists_text">L\'indirizzo email è già stato aggiunto.</string>
+  <string name="create_key_email_invalid_email">Il formato dell\'indirizzo email non è valido</string>
+  <string name="create_key_yubi_key_pin_text">Scegli un PIN con 6 numeri.</string>
+  <string name="create_key_yubi_key_admin_pin_text">Annota l\'Admin PIN e conservalo in un posto sicuro (richiesto quando inserisci 3 volte un PIN errato).</string>
   <string name="create_key_yubi_key_pin">PIN</string>
+  <string name="create_key_yubi_key_admin_pin">Admin PIN</string>
   <string name="create_key_yubi_key_pin_repeat">Ripeti il PIN</string>
   <string name="create_key_yubi_key_pin_not_correct">Il PIN è errato!</string>
   <string name="create_key_yubi_key_pin_too_short">Il PIN dovrebbe essere composto almeno da 6 numeri.</string>
+  <string name="create_key_yubi_key_pin_insecure">Scegli un PIN sicuro, non 000000, 123456 o combinazioni simili.</string>
   <!--View key-->
+  <string name="view_key_revoked">Revocata: la chiave non deve più essere usata!</string>
+  <string name="view_key_expired">Scaduta: il contatto deve estendere la validità della chiave!</string>
+  <string name="view_key_expired_secret">Scaduta: puoi estendere la validità della chiave modificandola!</string>
+  <string name="view_key_my_key">Mia chiave</string>
+  <string name="view_key_verified">Chiave confermata</string>
+  <string name="view_key_unverified">Non confermata: scansiona il codice QR per confermare la chiave!</string>
+  <string name="view_key_fragment_no_system_contact">&lt;nessuno&gt;</string>
   <!--Add/Edit keyserver-->
   <string name="add_keyserver_dialog_title">Aggiungi server delle chiavi</string>
+  <string name="edit_keyserver_dialog_title">Modifica server delle chiavi</string>
   <string name="add_keyserver_connection_verified">Connessione verificata.</string>
+  <string name="add_keyserver_without_verification">Server delle chiavi aggiunto senza verifica.</string>
   <string name="add_keyserver_invalid_url">URL non valido!</string>
+  <string name="add_keyserver_connection_failed">Connessione al server chiavi fallita. Controlla l\'URL e la tua connessione internet.</string>
   <string name="keyserver_preference_deleted">%s cancellato</string>
+  <string name="keyserver_preference_cannot_delete_last">Impossibile eliminare il server chiavi. Ne serve almeno uno!</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">Chiavi</string>
+  <string name="nav_encrypt_decrypt">Codifica/Decodifica</string>
   <string name="nav_apps">Apps</string>
   <string name="drawer_open">Apri drawer di navigazione</string>
   <string name="drawer_close">Chiudi drawer di navigazione</string>
   <string name="my_keys">Le Mie Chiavi</string>
+  <string name="nav_backup">Backup/Ripristina</string>
   <!--hints-->
   <string name="encrypt_content_edit_text_hint">Digita testo</string>
   <!--certs-->
@@ -706,6 +751,8 @@ Permetti accesso?\n\nATTENZIONE: Se non sai perche\' questo schermata e\' appars
   <string name="msg_ip_error_op_exc">Operazione fallita a causa di un errore della banca dati</string>
   <string name="msg_ip_error_remote_ex">Operazione fallita a causa di un errore interno</string>
   <string name="msg_ip">Importazione portachiavi pubblico %s</string>
+  <string name="msg_ip_fingerprint_error">L\'impronta della chiave importata non corrispondente!</string>
+  <string name="msg_ip_fingerprint_ok">Controllo impronta OK</string>
   <string name="msg_ip_insert_keyring">Codifica dati del portachiavi</string>
   <string name="msg_ip_insert_keys">Elaborazione chiavi</string>
   <string name="msg_ip_prepare">Preparazione operazioni banca dati</string>
@@ -729,6 +776,8 @@ Permetti accesso?\n\nATTENZIONE: Se non sai perche\' questo schermata e\' appars
   <string name="msg_ip_master_flags_xxsx">Caratteristiche chiave principale: firma</string>
   <string name="msg_ip_master_flags_xxxa">Caratteristiche chiave principale: autentica</string>
   <string name="msg_ip_master_flags_xxxx">Caratteristiche chiave principale: nessuna</string>
+  <string name="msg_ip_merge_public">Fusione dati importati nel portachiavi pubblico esistente</string>
+  <string name="msg_ip_merge_secret">Fusione dati importati nel portachiavi segreto esistente</string>
   <string name="msg_ip_subkey">Elaborazione sottochiave %s</string>
   <string name="msg_ip_subkey_expired">Sottochiave scaduta il %s</string>
   <string name="msg_ip_subkey_expires">La sottochiave scade il %s</string>
@@ -763,6 +812,27 @@ Permetti accesso?\n\nATTENZIONE: Se non sai perche\' questo schermata e\' appars
     <item quantity="one">Ignoro un certificato rilasciato da chiavi pubbliche sconosciute</item>
     <item quantity="other">Ignoro %s certificati rilasciati da chiavi pubbliche sconosciute</item>
   </plurals>
+  <string name="msg_ip_uid_classifying_zero">Classificazione ID utenti (nessuna chiave fidata disponibile)</string>
+  <plurals name="msg_ip_uid_classifying">
+    <item quantity="one">Classificazione ID utenti (usando una chiave fidata)</item>
+    <item quantity="other">Classificazione ID utenti (usando %s chiavi fidate)</item>
+  </plurals>
+  <string name="msg_ip_uid_reorder">Riordino ID utente</string>
+  <string name="msg_ip_uid_processing">Elaborazione ID utente %s</string>
+  <string name="msg_ip_uid_revoked">ID utente revocato</string>
+  <string name="msg_ip_uat_cert_bad">Riscontrato certificato sbagliato!</string>
+  <string name="msg_ip_uat_cert_error">Errore elaborazione certificato!</string>
+  <string name="msg_ip_uat_cert_nonrevoke">Hai già un certificato non revocabile, proseguo.</string>
+  <string name="msg_ip_uat_cert_old">Il certificato è più vecchio del precedente, proseguo.</string>
+  <string name="msg_ip_uat_cert_new">Il certificato è più recente, sostituzione del precedente.</string>
+  <string name="msg_ip_uat_cert_good">Trovato buon certificato da %1$s</string>
+  <string name="msg_ip_uat_cert_good_revoke">Trovato buon certificato di revoca da %1$s</string>
+  <plurals name="msg_ip_uat_certs_unknown">
+    <item quantity="one">Ignoro un certificato rilasciato da una chiave pubblica sconosciuta</item>
+    <item quantity="other">Ignoro %s certificati rilasciati da chiavi pubbliche sconosciute</item>
+  </plurals>
+  <string name="msg_ip_uat_classifying">Classificazione attributi utente</string>
+  <string name="msg_ip_uat_revoked">Attributo utente revocato</string>
   <string name="msg_is_bad_type_public">Ho cercato di importare portachiavi pubblico come privato. Questo è un bug, per cortesia inviateci un rapporto!</string>
   <string name="msg_is_bad_type_uncanon">Tentativo di importare un portachiavi senza canonicalizzazione. Questo è un bug, per cortesia inviateci un rapporto!</string>
   <!--Import Secret log entries-->
diff --git a/OpenKeychain/src/main/res/values-nl/strings.xml b/OpenKeychain/src/main/res/values-nl/strings.xml
index 345146a4a..e0d04a4b4 100644
--- a/OpenKeychain/src/main/res/values-nl/strings.xml
+++ b/OpenKeychain/src/main/res/values-nl/strings.xml
@@ -39,6 +39,7 @@
   <string name="title_alert_strip">Strip deze subsluetel</string>
   <!--section-->
   <string name="section_user_ids">Identiteiten</string>
+  <string name="section_security_token">Beveiligingscode</string>
   <string name="section_linked_system_contact">Verbonden systeemcontact</string>
   <string name="section_keybase_proofs">Keybase.io Bewijzen</string>
   <string name="section_should_you_trust">Zou je deze sleutel vertrouwen?</string>
@@ -47,16 +48,19 @@
   <string name="section_cloud_search">Zoek naar sleutels</string>
   <string name="section_cloud_search_summary">Keyserver, keybase.io</string>
   <string name="section_passphrase_cache">Wachtwoorden en PIN\'s</string>
+  <string name="section_passphrase_cache_summary">Afhandeling, gebruikersinterface, herrineringstijd</string>
   <string name="section_proxy_settings">Netwerkanonimiteit</string>
   <string name="section_proxy_settings_summary">Tor, Proxy-instellingen</string>
   <string name="section_gui">Interface</string>
   <string name="section_sync_settings">Synchronizatie</string>
+  <string name="section_sync_settings_summary">Automatische sleutelupdates, toevoegen aan contacten</string>
   <string name="section_experimental_features">Experimentele Functies</string>
   <string name="section_certify">Bevestigen</string>
   <string name="section_actions">Acties</string>
   <string name="section_share_key">Sleutel</string>
   <string name="section_key_server">Sleutelserver</string>
   <string name="section_fingerprint">Vingerafdruk</string>
+  <string name="section_phrases">Zinnen</string>
   <string name="section_encrypt">Versleutelen</string>
   <string name="section_decrypt">Ontsleutelen / verifiëren</string>
   <string name="section_current_expiry">Huidige verloopdatum</string>
@@ -77,6 +81,7 @@
   <string name="btn_back">Terug</string>
   <string name="btn_no">Nee</string>
   <string name="btn_match">Vingerafdrukken komen overeen</string>
+  <string name="btn_match_phrases">Zinnen komen overeen</string>
   <string name="btn_share_encrypted_signed">Versleutel/teken en deel tekst</string>
   <string name="btn_copy_encrypted_signed">Versleutel/teken en kopieër tekst</string>
   <string name="btn_paste_encrypted_signed">Versleutel/teken en plak tekst</string>
@@ -85,6 +90,7 @@
   <string name="btn_add_files">Bestand(en) toevoegen</string>
   <string name="btn_share_decrypted_text">Deel</string>
   <string name="btn_open_with">Open met...</string>
+  <string name="btn_copy_decrypted_text">Kopieer naar klembord</string>
   <string name="btn_decrypt_clipboard">Lezen van klembord</string>
   <string name="btn_decrypt_files">Kies invoerbestand</string>
   <string name="btn_encrypt_files">Bestanden versleutelen</string>
@@ -94,6 +100,7 @@
   <string name="btn_add_keyserver">Toevoegen</string>
   <string name="btn_save_default">Opslaan als standaard</string>
   <string name="btn_saved">Opgeslagen!</string>
+  <string name="btn_not_matching">Niet gelijk</string>
   <!--Content Description-->
   <string name="cd_encrypt_files">Versleutel bestanden</string>
   <string name="cd_exchange_keys">Wissel sleutels uit</string>
@@ -134,6 +141,7 @@
   <string name="label_file_ascii_armor">ASCII Armor aanzetten</string>
   <string name="label_write_version_header">Laat anderen weten dat je OpenKeychain gebruikt</string>
   <string name="label_write_version_header_summary">Voegt \'OpenKeychain v2.7\' toe aan OpenPGP ondertekeningen, cijfertekst en geëxporteerde sleutels</string>
+  <string name="label_use_num_keypad_for_security_token_pin">Gebruik numeriek toetsenbord voor beveilingscode PIN</string>
   <string name="label_asymmetric_from">Ondertekenen met:</string>
   <string name="label_to">Versleutelen naar</string>
   <string name="label_delete_after_encryption">Verwijder bestanden na versleuteling</string>
@@ -141,6 +149,7 @@
   <string name="label_encryption_algorithm">Versleutelingsalgoritme</string>
   <string name="label_hash_algorithm">Hashalgoritme</string>
   <string name="label_symmetric">Versleutelen met wachtwoord</string>
+  <string name="label_passphrase_cache_ttl">Pas \'Onthoud\' keuzes aan</string>
   <string name="label_passphrase_cache_subs">Onthou wachtwoorden per subsleutel</string>
   <string name="label_message_compression">Tekstcompressie</string>
   <string name="label_file_compression">Bestandscompressie</string>
@@ -183,12 +192,19 @@
   <string name="label_sync_settings_keyserver_summary_off">Sleutels worden niet automatisch geüpdatet</string>
   <string name="label_sync_settings_wifi_title">Synchroniseer aleen op Wi-Fi</string>
   <string name="label_sync_settings_contacts_title">Koppel sleutels aan contacten</string>
+  <string name="label_sync_settings_contacts_summary_on">Koppel sleutels aan contacten gebaseerd op namen en E-mailadressen. Dit gebeurt volledig offline op je apparaat.</string>
+  <string name="label_sync_settings_contacts_summary_off">Nieuwe sleutels zullen niet worden gekoppeld aan contacten</string>
   <!--label shown in Android settings under the OpenKeychain account-->
+  <string name="keyserver_sync_settings_title">Automatische sleutelupdates</string>
   <string name="label_experimental_settings_desc_title">Waarschuwing</string>
   <string name="label_experimental_settings_desc_summary">Deze functies zijn nog niet afgemaakt of resultaten van gebruikerservaringen/beveiligingsonderzoek. Vertrouw daarom niet op hun beveiliging en rapporteer geen problemen die je ervaart!</string>
   <string name="label_experimental_settings_word_confirm_title">Bevestig met zin</string>
   <string name="label_experimental_settings_word_confirm_summary">Bevestig sleutels met zinnen in plaats van hexadecimale vingerafdrukken</string>
+  <string name="label_experimental_settings_linked_identities_title">Gekoppelde identiteiten</string>
   <string name="label_experimental_settings_linked_identities_summary">Koppel sleutels aan Twitter, GitHub, websites of DNS (vergelijkbaar met keybase.io maar dan gedecentraliseerd)</string>
+  <string name="label_experimental_settings_keybase_title">Keybase.io bewijzen</string>
+  <string name="label_experimental_settings_keybase_summary">Maak contact met keybase.io voor bevestigingen van sleutels en weergeef dit elke keer als een sleutel wordt weer gegeven</string>
+  <string name="label_experimental_settings_theme_summary">(De iconnen en veel schermen zijn nog niet geoptimalizeerd voor het donkere thema)</string>
   <!--Proxy Preferences-->
   <string name="pref_proxy_tor_title">Tor aanzetten</string>
   <string name="pref_proxy_tor_summary">Vereist dat Orbot geïnstalleerd is</string>
@@ -251,6 +267,7 @@
   <string name="ecc_p256_description_html">heel kleine bestandsgrootte, wordt beschouwt als veilig tot 2040 &lt;br/&gt; &lt;u&gt; experimenteel en niet ondersteund door alle implementaties&lt;/u&gt;</string>
   <string name="ecc_p521">ECC P-521</string>
   <string name="ecc_p521_description_html">kleine bestandsgrootte, wordt beschouwt als veilig tot na 2040 &lt;br/&gt; &lt;u&gt; experimenteel en niet ondersteund door alle implementaties&lt;/u&gt;</string>
+  <string name="usage_none">Geen (alleen binden aan subsleutel)</string>
   <string name="usage_sign">Teken</string>
   <string name="usage_encrypt">Versleutel</string>
   <string name="usage_sign_and_encrypt">Teken en versleutel</string>
diff --git a/OpenKeychain/src/main/res/values-pt-rBR/strings.xml b/OpenKeychain/src/main/res/values-pt-rBR/strings.xml
index 36525c8fc..77e59f710 100644
--- a/OpenKeychain/src/main/res/values-pt-rBR/strings.xml
+++ b/OpenKeychain/src/main/res/values-pt-rBR/strings.xml
@@ -154,7 +154,7 @@
   <string name="label_message_compression">Compressão de texto</string>
   <string name="label_file_compression">Compressão de arquivo</string>
   <string name="label_keyservers">Selecionar servidores de chaves OpenPGP</string>
-  <string name="label_key_id">ID de chave</string>
+  <string name="label_key_id">ID da chave</string>
   <string name="label_key_created">Chave criada %s</string>
   <string name="label_key_type">Tipo</string>
   <string name="label_creation">Criação</string>
diff --git a/OpenKeychain/src/main/res/values-ru/strings.xml b/OpenKeychain/src/main/res/values-ru/strings.xml
index 0eaa6d58c..f56de4e95 100644
--- a/OpenKeychain/src/main/res/values-ru/strings.xml
+++ b/OpenKeychain/src/main/res/values-ru/strings.xml
@@ -684,7 +684,9 @@
   <string name="keybase_contained_signature">содержит сообщение, которое могло быть создано только владельцем этого ключа.</string>
   <string name="keybase_dns_proof">Запись DNS TXT</string>
   <string name="keybase_web_site_proof">Текстовый файл</string>
+  <string name="keybase_github_proof">Gist</string>
   <string name="keybase_reddit_proof">JSON file</string>
+  <string name="keybase_reddit_attribution">помечено Reddit для</string>
   <string name="keybase_verify">Подтвердить</string>
   <!--Edit key-->
   <string name="edit_key_action_change_passphrase">Изменить пароль</string>
@@ -1318,6 +1320,7 @@
   <string name="msg_lv_error_twitter_handle">Дескриптор учётной записи Twitter не соответствует ответному!</string>
   <string name="msg_lv_error_twitter_response">Неожиданный ответ от API сервиса Twitter!</string>
   <string name="msg_lv_error_github_handle">Дескриптор учётной записи GitHub не соответствует ответному!</string>
+  <string name="msg_lv_error_github_not_found">Gist не содержит соответствующие файлы!</string>
   <string name="msg_lv_fetch">URL извлечения \'%s\'</string>
   <string name="msg_lv_fetch_redir">Следование перенаправлению на \'%s\'</string>
   <string name="msg_lv_fetch_ok">Успешно извлечено (HTTP %s)</string>
@@ -1425,6 +1428,7 @@
   <string name="error_key_not_found">Ключ не найден!</string>
   <string name="error_key_processing">Ошибка обработки ключа!</string>
   <string name="key_stripped">отделено</string>
+  <string name="key_divert">отклонить токен безопасности</string>
   <string name="key_no_passphrase">без пароля</string>
   <string name="key_unavailable">недоступно</string>
   <string name="secret_cannot_multiple">Ваши собственные ключи можно удалять только по одному!</string>
@@ -1606,6 +1610,7 @@
   <string name="title_linked_id_create">Создать связанный идентификатор</string>
   <string name="linked_github_text">Эта операция связывает ключ с вашей учётной записью GitHub.\nПросто нажмите кнопку для продолжения.</string>
   <string name="linked_progress_auth_github">Авторизация при помощи GitHub...</string>
+  <string name="linked_progress_post_gist">Отправить gist…</string>
   <string name="linked_progress_update_key">Обновить ключ...</string>
   <string name="linked_button_start">Ссылка на аккаунт GitHub</string>
   <string name="linked_error_auth_failed">Авторизация не удалась!</string>
@@ -1662,4 +1667,13 @@
   <string name="prompt_fidesmo_app_install_button_positive">Установить</string>
   <string name="prompt_fidesmo_app_install_button_negative">Отмена</string>
   <string name="help_donation_paypal_item">Пожертвование на OpenKeychain</string>
+  <string-array name="help_donation_google_catalog_values">
+    <item>1 EUR</item>
+    <item>2 EUR</item>
+    <item>3 EUR</item>
+    <item>5 EUR</item>
+    <item>10 EUR</item>
+    <item>50 EUR</item>
+    <item>100 EUR</item>
+  </string-array>
 </resources>