From 349dd8291df78c33d6570d7f7937362ac08e4d66 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 16 Feb 2016 12:52:31 +0100
Subject: [PATCH] made clear that archiving preferences are server side

---
 .../eu/siacs/conversations/ui/EditAccountActivity.java    | 2 +-
 src/main/res/values/strings.xml                           | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
index 2656966bb..53fa9ff72 100644
--- a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
@@ -918,7 +918,7 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 					mFetchingMamPrefsToast.cancel();
 				}
 				AlertDialog.Builder builder = new Builder(EditAccountActivity.this);
-				builder.setTitle(R.string.mam_prefs);
+				builder.setTitle(R.string.server_side_mam_prefs);
 				String defaultAttr = prefs.getAttribute("default");
 				final List<String> defaults = Arrays.asList("never", "roster", "always");
 				final AtomicInteger choice = new AtomicInteger(Math.max(0,defaults.indexOf(defaultAttr)));
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index da29bfe69..acaaf1562 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>