diff options
| author | Christian S <christian@pix-art.de> | 2016-02-20 15:28:01 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-02-20 15:28:01 +0100 |
| commit | fe52f30c5bbd6f4403b1fe97964488611a3c7276 (patch) | |
| tree | 562388d395f2547b85c49d8979dbab6193d08199 /src/main/res/xml | |
| parent | 2879ddadca409d05eb71ca0863980ed0ec6b1023 (diff) | |
| parent | 3bde4dbedb80a8e1de89c09f58d842d7382598e8 (diff) | |
Merge branch 'siacs/master' into development
Diffstat (limited to 'src/main/res/xml')
| -rw-r--r-- | src/main/res/xml/preferences.xml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index 83d019fc7..ca8847cba 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -151,7 +151,7 @@ android:summary="@string/pref_show_dynamic_tags_summary" android:title="@string/pref_show_dynamic_tags"/> </PreferenceCategory> - <PreferenceCategory android:title="@string/pref_encryption_settings"> + <PreferenceCategory android:title="@string/pref_security_settings"> <CheckBoxPreference android:defaultValue="false" android:key="dont_save_encrypted" @@ -166,6 +166,11 @@ android:key="remove_trusted_certificates" android:summary="@string/pref_remove_trusted_certificates_summary" android:title="@string/pref_remove_trusted_certificates_title"/> + <CheckBoxPreference + android:defaultValue="true" + android:key="allow_message_correction" + android:title="@string/pref_allow_message_correction" + android:summary="@string/pref_allow_message_correction_summary"/> </PreferenceCategory> <PreferenceCategory android:key="connection_options" |