diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-04-18 19:27:01 +0200 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-04-18 19:27:01 +0200 |
| commit | 52fec558adb2b4d9bb3df314fd919570e7198e26 (patch) | |
| tree | 524f316aaddd19363ef42be2cec660f4a50e56cd /src/main/res/values/strings.xml | |
| parent | 61149411c5141f2f9afe9b050ddce28c9d3df202 (diff) | |
| parent | 7df96caedbbb96a28d4f7e07fa2d159c8ca1373f (diff) | |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
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 63f76a59..6430b6f9 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -296,8 +296,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> |