diff options
| author | lookshe <github@lookshe.org> | 2016-02-16 11:41:54 +0100 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-02-16 11:41:54 +0100 |
| commit | 1e40764b20a08170f8e4bfe1f1ae1559111f2961 (patch) | |
| tree | 1791a3870361f37c3c34c299d075f56ed4a6e2c2 /src/main/res/values | |
| parent | a049aff638f27b68f08c753d42ef0fc2847b96cb (diff) | |
| parent | d58d822215708cc0d9c841872abab448bf290e4c (diff) | |
Merge tag '1.9.4' into trz/merge_1.9.4trz/merge_1.9.4
Conflicts:
build.gradle
src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java
src/main/java/eu/siacs/conversations/parser/PresenceParser.java
src/main/java/eu/siacs/conversations/services/MessageArchiveService.java
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
src/main/res/values/arrays.xml
Diffstat (limited to 'src/main/res/values')
| -rw-r--r-- | src/main/res/values/arrays.xml | 6 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml index 24f8790c..f8028ea3 100644 --- a/src/main/res/values/arrays.xml +++ b/src/main/res/values/arrays.xml @@ -79,4 +79,10 @@ <item>ALWAYS</item> <item>NEVER</item> </string-array> + + <string-array name="mam_prefs"> + <item>@string/never</item> + <item>@string/contacts</item> + <item>@string/always</item> + </string-array> </resources> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 4caf0572..66fcb264 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -599,6 +599,9 @@ <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 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> @@ -621,6 +624,7 @@ <item quantity="one">%d message</item> <item quantity="other">%d messages</item> </plurals> + <string name="load_more_messages">Load more messages</string> <string name="shared_file_with_x">Shared file with %s</string> <string name="shared_image_with_x">Shared image with %s</string> <string name="no_storage_permission">Conversations need access to external storage</string> |