diff options
Diffstat (limited to 'OpenKeychain/src/main/res')
4 files changed, 15 insertions, 10 deletions
diff --git a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml index 56647ec65..ab1bf3d4a 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml @@ -40,6 +40,7 @@ <org.sufficientlysecure.keychain.ui.widget.EncryptKeyCompletionView android:id="@+id/recipient_list" android:layout_width="match_parent" + android:hint="@string/label_to" android:minHeight="56dip" android:paddingLeft="8dp" android:paddingRight="8dp" diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 075d5377c..81f0f2be4 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -150,7 +150,7 @@ <string name="label_write_version_header_summary">"Writes 'OpenKeychain v2.7' to OpenPGP signatures, ciphertext, and exported keys"</string> <string name="label_use_num_keypad_for_yubikey_pin">Use number keypad for YubiKey PIN</string> <string name="label_asymmetric_from">"Sign with:"</string> - <string name="label_to">"Encrypt to:"</string> + <string name="label_to">"Encrypt to"</string> <string name="label_delete_after_encryption">"Delete files after encryption"</string> <string name="label_delete_after_decryption">"Delete after decryption"</string> <string name="label_encryption_algorithm">"Encryption algorithm"</string> @@ -193,6 +193,8 @@ <string name="pref_keyserver_summary">"Search keys on selected OpenPGP keyservers (HKP protocol)"</string> <string name="pref_keybase">"keybase.io"</string> <string name="pref_keybase_summary">"Search keys on keybase.io"</string> + <string name="pref_facebook">"Facebook"</string> + <string name="pref_facebook_summary">"Search keys on Facebook by username"</string> <string name="label_sync_settings_keyserver_title">"Automatic key updates"</string> <string name="label_sync_settings_keyserver_summary_on">"Every three days, keys are updated from the preferred keyserver"</string> @@ -1294,6 +1296,7 @@ <string name="msg_import_fetch_error_keyserver">"Could not retrieve key from keyservers: %s"</string> <string name="msg_import_fetch_error_keyserver_secret">"Cannot import secret key from keyserver!"</string> <string name="msg_import_fetch_keybase">"Retrieving from keybase.io: %s"</string> + <string name="msg_import_fetch_facebook">"Retrieving from Facebook: %s"</string> <string name="msg_import_fetch_keyserver">"Retrieving from keyserver: %s"</string> <string name="msg_import_fetch_keyserver_ok">"Key retrieval successful"</string> <string name="msg_import_keyserver">"Using keyserver %s"</string> diff --git a/OpenKeychain/src/main/res/xml/experimental_preferences.xml b/OpenKeychain/src/main/res/xml/experimental_preferences.xml index ff1fa5a95..9312997b0 100644 --- a/OpenKeychain/src/main/res/xml/experimental_preferences.xml +++ b/OpenKeychain/src/main/res/xml/experimental_preferences.xml @@ -1,37 +1,38 @@ <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> <Preference - android:persistent="false" + android:persistent="true" android:selectable="false" - android:title="@string/label_experimental_settings_desc_title" - android:summary="@string/label_experimental_settings_desc_summary" /> + android:summary="@string/label_experimental_settings_desc_summary" + android:title="@string/label_experimental_settings_desc_title" /> <SwitchPreference android:defaultValue="false" android:key="experimentalEnableWordConfirm" - android:persistent="false" + android:persistent="true" android:summary="@string/label_experimental_settings_word_confirm_summary" android:title="@string/label_experimental_settings_word_confirm_title" /> <SwitchPreference android:defaultValue="false" android:key="experimentalEnableLinkedIdentities" - android:persistent="false" + android:persistent="true" android:summary="@string/label_experimental_settings_linked_identities_summary" android:title="@string/label_experimental_settings_linked_identities_title" /> <SwitchPreference android:defaultValue="false" android:key="experimentalEnableKeybase" - android:persistent="false" + android:persistent="true" android:summary="@string/label_experimental_settings_keybase_summary" android:title="@string/label_experimental_settings_keybase_title" /> <ListPreference + android:defaultValue="light" android:dialogTitle="@string/label_theme" android:entries="@array/theme_entries" android:entryValues="@array/theme_values" android:key="theme" - android:persistent="false" + android:persistent="true" android:title="@string/label_theme" /> </PreferenceScreen> diff --git a/OpenKeychain/src/main/res/xml/passphrase_preferences.xml b/OpenKeychain/src/main/res/xml/passphrase_preferences.xml index 86de8a4b7..75f293c43 100644 --- a/OpenKeychain/src/main/res/xml/passphrase_preferences.xml +++ b/OpenKeychain/src/main/res/xml/passphrase_preferences.xml @@ -7,11 +7,11 @@ android:title="@string/label_passphrase_cache_ttl" /> <CheckBoxPreference android:key="passphraseCacheSubs" - android:persistent="false" + android:persistent="true" android:title="@string/label_passphrase_cache_subs" /> <CheckBoxPreference android:defaultValue="false" android:key="useNumKeypadForYubikeyPin" - android:persistent="false" + android:persistent="true" android:title="@string/label_use_num_keypad_for_yubikey_pin" /> </PreferenceScreen> |