From 349dd8291df78c33d6570d7f7937362ac08e4d66 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch 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 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 @@ - Conversations Settings New conversation @@ -541,9 +540,10 @@ Add account with certificate Unable to parse certificate Leave empty to authenticate w/ certificate - Archiving settting - Fetching archiving settings. Please wait… - Unable to fetch archiving setting + Archiving preferences + Server-side archiving preferences + Fetching archiving preferences. Please wait… + Unable to fetch archiving preferences Captcha text Captcha required enter the text from the image