diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-18 09:56:39 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-18 09:56:39 +0200 |
| commit | a10f582513bf9b2a75fb3049d91fde4cf92c1d04 (patch) | |
| tree | 953700e35e54495e606faa1248736e0abd7ca9b9 /OpenKeychain/src/main/res | |
| parent | d8ada7c1bb39e9eb93c8de5534dfe443b6f53c82 (diff) | |
| parent | 94e56a4542759948a862011e5a727db927918f43 (diff) | |
| download | open-keychain-a10f582513bf9b2a75fb3049d91fde4cf92c1d04.tar.gz open-keychain-a10f582513bf9b2a75fb3049d91fde4cf92c1d04.tar.bz2 open-keychain-a10f582513bf9b2a75fb3049d91fde4cf92c1d04.zip | |
Merge branch 'master' into yubikey
Diffstat (limited to 'OpenKeychain/src/main/res')
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 2 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/xml/adv_preferences.xml | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 32e35b0ba..c1c18effe 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -109,6 +109,8 @@ <string name="label_passphrase_again">Again</string> <string name="label_algorithm">Algorithm</string> <string name="label_ascii_armor">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_select_public_keys">Recipients</string> <string name="label_delete_after_encryption">Delete After Encryption</string> <string name="label_delete_after_decryption">Delete After Decryption</string> diff --git a/OpenKeychain/src/main/res/xml/adv_preferences.xml b/OpenKeychain/src/main/res/xml/adv_preferences.xml index fa3974199..a07ae06bb 100644 --- a/OpenKeychain/src/main/res/xml/adv_preferences.xml +++ b/OpenKeychain/src/main/res/xml/adv_preferences.xml @@ -38,11 +38,17 @@ android:key="defaultAsciiArmor" android:persistent="false" android:title="@string/label_ascii_armor" /> + + <CheckBoxPreference + android:key="concealPgpApplication" + android:persistent="false" + android:title="@string/label_conceal_pgp_application" + android:summary="@string/label_conceal_pgp_application_summary" /> </PreferenceCategory> <PreferenceCategory android:title="@string/section_advanced" > <CheckBoxPreference android:key="forceV3Signatures" android:persistent="false" - android:title="@string/label_force_v3_signature" /> + android:title="@string/label_force_v3_signature"/> </PreferenceCategory> </PreferenceScreen> |