diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-04-18 15:07:15 +0200 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-04-18 15:07:15 +0200 |
| commit | 2e063d8696b7a5e798a4a4d614ee522fbed12124 (patch) | |
| tree | 9864421b807a0fef8dd5a2bb77a2504b83a7245f /src/main/res/values/strings.xml | |
| parent | 073813d192067a2b91c50d2108a0cb98fc865ab4 (diff) | |
Related to FS#199: fixed merge hickups (message correction setting removed, key for other expert settings readded)
Diffstat (limited to 'src/main/res/values/strings.xml')
| -rw-r--r-- | src/main/res/values/strings.xml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 8ead4363..b6aa8899 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -295,8 +295,6 @@ <string name="pref_security_settings">Security</string> <string name="pref_force_encryption">Force end-to-end encryption</string> <string name="pref_force_encryption_summary">Always send messages encrypted (except for conferences)</string> - <string name="pref_allow_message_correction">Allow message correction</string> - <string name="pref_allow_message_correction_summary">Allow your contacts to retroactively edit their messages</string> <string name="pref_dont_save_encrypted">Don’t save encrypted messages</string> <string name="pref_dont_save_encrypted_summary">Warning: This could lead to message loss</string> <string name="pref_expert_options">Expert settings</string> |