sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

made clear that archiving preferences are server side

This commit is contained in:
Daniel Gultsch 2016-02-16 12:52:31 +01:00
parent c39008983e
commit 349dd8291d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
View File

@ -918,7 +918,7 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
mFetchingMamPrefsToast.cancel(); mFetchingMamPrefsToast.cancel();
} }
AlertDialog.Builder builder = new Builder(EditAccountActivity.this); 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"); String defaultAttr = prefs.getAttribute("default");
final List<String> defaults = Arrays.asList("never", "roster", "always"); final List<String> defaults = Arrays.asList("never", "roster", "always");
final AtomicInteger choice = new AtomicInteger(Math.max(0,defaults.indexOf(defaultAttr))); final AtomicInteger choice = new AtomicInteger(Math.max(0,defaults.indexOf(defaultAttr)));

8
src/main/res/values/strings.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="app_name" translatable="false">Conversations</string> <string name="app_name" translatable="false">Conversations</string>
<string name="action_settings">Settings</string> <string name="action_settings">Settings</string>
<string name="action_add">New conversation</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="action_add_account_with_certificate">Add account with certificate</string>
<string name="unable_to_parse_certificate">Unable to parse 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="authenticate_with_certificate">Leave empty to authenticate w/ certificate</string>
<string name="mam_prefs">Archiving settting</string> <string name="mam_prefs">Archiving preferences</string>
<string name="fetching_mam_prefs">Fetching archiving settings. Please wait…</string> <string name="server_side_mam_prefs">Server-side archiving preferences</string>
<string name="unable_to_fetch_mam_prefs">Unable to fetch archiving setting</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_ocr">Captcha text</string>
<string name="captcha_required">Captcha required</string> <string name="captcha_required">Captcha required</string>
<string name="captcha_hint">enter the text from the image</string> <string name="captcha_hint">enter the text from the image</string>