From 4539643f27ce38e7de121655effcae4070e25385 Mon Sep 17 00:00:00 2001
From: hlad <hladma@gmail.com>
Date: Fri, 14 Aug 2015 22:24:05 +0200
Subject: show HTTP upload availability on Edit account screen

---
 src/main/res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/main/res/values')

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index aa5bbec56..0e396491d 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -191,6 +191,7 @@
 	<string name="server_info_roster_version">XEP-0237: Roster Versioning</string>
 	<string name="server_info_stream_management">XEP-0198: Stream Management</string>
 	<string name="server_info_pep">XEP-0163: PEP (Avatars)</string>
+	<string name="server_info_http_upload">XEP-xxxx: HTTP File Upload</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>
-- 
cgit v1.2.3


From 45d68c200e8573abf43a6584d045baf4fcafd196 Mon Sep 17 00:00:00 2001
From: Andreas Straub <andy@strb.org>
Date: Sat, 15 Aug 2015 18:52:47 +0200
Subject: Display error message if all contact keys purged

---
 src/main/res/values/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/main/res/values')

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 0e396491d..417c1a443 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -397,6 +397,8 @@
 	<string name="purge_key">Purge key</string>
 	<string name="purge_key_desc_part1">Are you sure you want to purge this key?</string>
 	<string name="purge_key_desc_part2">It will irreversibly be considered compromised, and you can never build a session with it again.</string>
+	<string name="error_no_keys_to_trust">There are no usable keys available for this contact. If you have purged any of their keys, they need to generate new ones.</string>
+	<string name="error_trustkeys_title">Error</string>
 	<string name="fetching_history_from_server">Fetching history from server</string>
 	<string name="no_more_history_on_server">No more history on server</string>
 	<string name="updating">Updating…</string>
-- 
cgit v1.2.3


From 6aec49f06d3d6be9695a4f4f958f201880d09abc Mon Sep 17 00:00:00 2001
From: Andreas Straub <andy@strb.org>
Date: Sat, 15 Aug 2015 19:07:55 +0200
Subject: Update license string with libraries

---
 src/main/res/values/strings.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/main/res/values')

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 417c1a443..2a03847df 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -306,6 +306,10 @@
 			\n\nhttps://github.com/zxing/zxing\n(Apache License, Version 2.0)
 			\n\nhttps://github.com/google/material-design-icons\n(CC BY 4.0)
 			\n\nhttps://github.com/timroes/EnhancedListView\n(Apache License, Version 2.0)
+			\n\nhttps://github.com/leolin310148/ShortcutBadger\n(Apache License, Version 2.0)
+			\n\nhttps://github.com/kyleduo/SwitchButton\n(Apache License, Version 2.0)
+			\n\nhttps://github.com/WhisperSystems/libaxolotl-java\n(GPLv3)
+			\n\nhttps://github.com/vinc3m1/RoundedImageView\n(Apache License, Version 2.0)
 	</string>
 	<string name="title_pref_quiet_hours">Quiet Hours</string>
 	<string name="title_pref_quiet_hours_start_time">Start time</string>
-- 
cgit v1.2.3