aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-02-16 12:52:31 +0100
committerDaniel Gultsch <daniel@gultsch.de>2016-02-16 12:52:31 +0100
commit349dd8291df78c33d6570d7f7937362ac08e4d66 (patch)
tree278ef1f7db6be0d53009076d9498a51beaa7e1a1 /src/main/res
parentc39008983e1b7ca59c28ef59797434cbaad9fcde (diff)
made clear that archiving preferences are server side
Diffstat (limited to '')
-rw-r--r--src/main/res/values/strings.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index da29bfe6..acaaf156 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
-
<string name="app_name" translatable="false">Conversations</string>
<string name="action_settings">Settings</string>
<string name="action_add">New conversation</string>
@@ -541,9 +540,10 @@
<string name="action_add_account_with_certificate">Add account with certificate</string>
<string name="unable_to_parse_certificate">Unable to parse certificate</string>
<string name="authenticate_with_certificate">Leave empty to authenticate w/ certificate</string>
- <string name="mam_prefs">Archiving settting</string>
- <string name="fetching_mam_prefs">Fetching archiving settings. Please wait…</string>
- <string name="unable_to_fetch_mam_prefs">Unable to fetch archiving setting</string>
+ <string name="mam_prefs">Archiving preferences</string>
+ <string name="server_side_mam_prefs">Server-side archiving preferences</string>
+ <string name="fetching_mam_prefs">Fetching archiving preferences. Please wait…</string>
+ <string name="unable_to_fetch_mam_prefs">Unable to fetch archiving preferences</string>
<string name="captcha_ocr">Captcha text</string>
<string name="captcha_required">Captcha required</string>
<string name="captcha_hint">enter the text from the image</string>