Dont write version header by default

7 files changed, 15 insertions, 15 deletions

diff --git a/OpenKeychain/src/main/res/values-de/strings.xml b/OpenKeychain/src/main/res/values-de/strings.xml
index c563267cc..a843a154a 100644
--- a/OpenKeychain/src/main/res/values-de/strings.xml
+++ b/OpenKeychain/src/main/res/values-de/strings.xml
@@ -81,8 +81,8 @@
   <string name="label_passphrase_again">Passwort wiederholen</string>
   <string name="label_algorithm">Algorithmus</string>
   <string name="label_file_ascii_armor">Datei: ASCII Armor</string>
-  <string name="label_conceal_pgp_application">Lass andere wissen dass du OpenKeychain nutzt</string>
-  <string name="label_conceal_pgp_application_summary">Fügt \'OpenKeychain v2.7\' zu OpenPGP Signaturen, Daten und exportierten Schlüsseln hinzu</string>
+  <string name="label_write_version_header">Lass andere wissen dass du OpenKeychain nutzt</string>
+  <string name="label_write_version_header_summary">Fügt \'OpenKeychain v2.7\' zu OpenPGP Signaturen, Daten und exportierten Schlüsseln hinzu</string>
   <string name="label_asymmetric_from">Von:</string>
   <string name="label_to">An:</string>
   <string name="label_delete_after_encryption">Dateien: Nach Verschlüsselung löschen</string>
diff --git a/OpenKeychain/src/main/res/values-es/strings.xml b/OpenKeychain/src/main/res/values-es/strings.xml
index eddfb4593..80c2060d1 100644
--- a/OpenKeychain/src/main/res/values-es/strings.xml
+++ b/OpenKeychain/src/main/res/values-es/strings.xml
@@ -84,8 +84,8 @@
   <string name="label_algorithm">Algoritmo</string>
   <string name="label_ascii_armor">Armadura ASCII del fichero</string>
   <string name="label_file_ascii_armor">Ficheros: Armadura ASCII</string>
-  <string name="label_conceal_pgp_application">Permitir a otros saber que está usando OpenKeychain</string>
-  <string name="label_conceal_pgp_application_summary">Escribe \'OpenKeychain v2.7\' en las firmas OpenPGP, el texto cifrado, y las claves exportadas</string>
+  <string name="label_write_version_header">Permitir a otros saber que está usando OpenKeychain</string>
+  <string name="label_write_version_header_summary">Escribe \'OpenKeychain v2.7\' en las firmas OpenPGP, el texto cifrado, y las claves exportadas</string>
   <string name="label_asymmetric_from">Desde:</string>
   <string name="label_to">Hacia:</string>
   <string name="label_delete_after_encryption">Ficheros: Borrar después del cifrado</string>
diff --git a/OpenKeychain/src/main/res/values-fr/strings.xml b/OpenKeychain/src/main/res/values-fr/strings.xml
index d2a13ef2d..e30ebb883 100644
--- a/OpenKeychain/src/main/res/values-fr/strings.xml
+++ b/OpenKeychain/src/main/res/values-fr/strings.xml
@@ -84,8 +84,8 @@
   <string name="label_algorithm">Algorithme</string>
   <string name="label_ascii_armor">Fichier ASCII Armor</string>
   <string name="label_file_ascii_armor">Fichier : ASCII Armor</string>
-  <string name="label_conceal_pgp_application">Informez les autres de votre utilisation d\'OpenKeychain</string>
-  <string name="label_conceal_pgp_application_summary">Ajoute « OpenKeychain v2.7 » aux signatures OpenPGP, aux cryptogrammes, et aux clefs exportées</string>
+  <string name="label_write_version_header">Informez les autres de votre utilisation d\'OpenKeychain</string>
+  <string name="label_write_version_header_summary">Ajoute « OpenKeychain v2.7 » aux signatures OpenPGP, aux cryptogrammes, et aux clefs exportées</string>
   <string name="label_asymmetric_from">De :</string>
   <string name="label_to">À :</string>
   <string name="label_delete_after_encryption">Fichier : supprimer après chiffrement</string>
diff --git a/OpenKeychain/src/main/res/values-it/strings.xml b/OpenKeychain/src/main/res/values-it/strings.xml
index a3941e147..89e09783b 100644
--- a/OpenKeychain/src/main/res/values-it/strings.xml
+++ b/OpenKeychain/src/main/res/values-it/strings.xml
@@ -69,8 +69,8 @@
   <string name="label_passphrase">Frase di Accesso</string>
   <string name="label_passphrase_again">Ripeti Frase di Accesso</string>
   <string name="label_algorithm">Algortimo</string>
-  <string name="label_conceal_pgp_application">Fai sapere agli altri che utilizzi OpenKeychain</string>
-  <string name="label_conceal_pgp_application_summary">Scrive \'OpenKeychain v2.7\' nelle firme OpenPGP, testi cifrati e chiavi esportate</string>
+  <string name="label_write_version_header">Fai sapere agli altri che utilizzi OpenKeychain</string>
+  <string name="label_write_version_header_summary">Scrive \'OpenKeychain v2.7\' nelle firme OpenPGP, testi cifrati e chiavi esportate</string>
   <string name="label_delete_after_decryption">Cancella Dopo Decodifica</string>
   <string name="label_encryption_algorithm">Algoritmo di Codifica</string>
   <string name="label_hash_algorithm">Algoritmo di Hash</string>
diff --git a/OpenKeychain/src/main/res/values-ja/strings.xml b/OpenKeychain/src/main/res/values-ja/strings.xml
index d4fc5f976..dbb52d208 100644
--- a/OpenKeychain/src/main/res/values-ja/strings.xml
+++ b/OpenKeychain/src/main/res/values-ja/strings.xml
@@ -84,8 +84,8 @@
   <string name="label_algorithm">アルゴリズム</string>
   <string name="label_ascii_armor">アスキー形式ファイル</string>
   <string name="label_file_ascii_armor">ファイル: アスキー形式</string>
-  <string name="label_conceal_pgp_application">他の人にあなたがOpenKeychain使用していることを知ってもらいましょう</string>
-  <string name="label_conceal_pgp_application_summary">OpenPGPの 署名、暗号文、そしてエクスポートした鍵に  \'OpenKeychain v2.7\' と書くようになりました</string>
+  <string name="label_write_version_header">他の人にあなたがOpenKeychain使用していることを知ってもらいましょう</string>
+  <string name="label_write_version_header_summary">OpenPGPの 署名、暗号文、そしてエクスポートした鍵に  \'OpenKeychain v2.7\' と書くようになりました</string>
   <string name="label_asymmetric_from">差出人:</string>
   <string name="label_to">宛先</string>
   <string name="label_delete_after_encryption">ファイル: 暗号化後に削除</string>
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 352ca951c..8ccb92854 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -90,8 +90,8 @@
     <string name="label_algorithm">Algorithm</string>
     <string name="label_ascii_armor">File ASCII Armor</string>
     <string name="label_file_ascii_armor">Files: ASCII Armor</string>
-    <string name="label_conceal_pgp_application">Let others know that you\'re using OpenKeychain</string>
-    <string name="label_conceal_pgp_application_summary">Writes \'OpenKeychain v2.7\' to OpenPGP signatures, ciphertext, and exported keys</string>
+    <string name="label_write_version_header">Let others know that you\'re using OpenKeychain</string>
+    <string name="label_write_version_header_summary">Writes \'OpenKeychain v2.7\' to OpenPGP signatures, ciphertext, and exported keys</string>
     <string name="label_asymmetric_from">From:</string>
     <string name="label_to">To:</string>
     <string name="label_delete_after_encryption">Files: Delete After Encryption</string>
diff --git a/OpenKeychain/src/main/res/xml/adv_preferences.xml b/OpenKeychain/src/main/res/xml/adv_preferences.xml
index a07ae06bb..588a6e62d 100644
--- a/OpenKeychain/src/main/res/xml/adv_preferences.xml
+++ b/OpenKeychain/src/main/res/xml/adv_preferences.xml
@@ -40,10 +40,10 @@
             android:title="@string/label_ascii_armor" />
 
         <CheckBoxPreference
-            android:key="concealPgpApplication"
+            android:key="writeVersionHeader"
             android:persistent="false"
-            android:title="@string/label_conceal_pgp_application"
-            android:summary="@string/label_conceal_pgp_application_summary" />
+            android:title="@string/label_write_version_header"
+            android:summary="@string/label_write_version_header_summary" />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/section_advanced" >
         <CheckBoxPreference