diff options
| author | Christian S <christian@pix-art.de> | 2016-02-14 17:00:16 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-02-14 17:00:16 +0100 |
| commit | 5e64737d532e493c00ab579ce8bd4695c4a5a5a2 (patch) | |
| tree | b82e1131467da94f4f3f58c51bf99dc26add4fc0 /src/main/res/values/strings.xml | |
| parent | 1a6062cc17c421a66d7dbac0389dc7b3a19e3a5f (diff) | |
| parent | 300326fba3a63fce546d952ac455758ed2cbeca0 (diff) | |
Merge branch 'siacs/master' into development
Diffstat (limited to 'src/main/res/values/strings.xml')
| -rw-r--r-- | src/main/res/values/strings.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 081dc8779..404e7a02a 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -193,6 +193,7 @@ <string name="server_info_stream_management">XEP-0198: Stream Management</string> <string name="server_info_pep">XEP-0163: PEP (Avatars / OMEMO)</string> <string name="server_info_http_upload">XEP-0363: HTTP File Upload</string> + <string name="server_info_push">XEP-0357: Push</string> <string name="server_info_available">available</string> <string name="server_info_unavailable">unavailable</string> <string name="missing_public_keys">Missing public key announcements</string> @@ -552,6 +553,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> |