From 894b5892a977c6b7ac52f07e00f452a44bdc1168 Mon Sep 17 00:00:00 2001
From: fiaxh <github@lightrise.org>
Date: Tue, 23 Feb 2016 15:30:41 +0100
Subject: Retry decryption from message menu

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

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

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 48c3de6c7..8e3629ca2 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -97,7 +97,6 @@
 	<string name="contact_has_no_pgp_key">Conversations is unable to encrypt your messages because your contact is not announcing his or hers public key.\n\n<small>Please ask your contact to setup OpenPGP.</small></string>
 	<string name="no_pgp_keys">No OpenPGP Keys found</string>
 	<string name="contacts_have_no_pgp_keys">Conversations is unable to encrypt your messages because your contacts are not announcing their public key.\n\n<small>Please ask your contacts to setup OpenPGP.</small></string>
-	<string name="encrypted_message_received"><i>Encrypted message received. Touch to decrypt.</i></string>
 	<string name="pref_general">General</string>
 	<string name="pref_xmpp_resource">XMPP resource</string>
 	<string name="pref_xmpp_resource_summary">The name this client identifies itself with</string>
-- 
cgit v1.2.3


From bbede8bbeb8728aac35856cc41eabea899056d74 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Wed, 24 Feb 2016 16:53:19 +0100
Subject: optionally lock conference domains as well and hide known domains in
 ui

---
 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 8e3629ca2..a25c1a849 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -522,6 +522,8 @@
 	<string name="username">Username</string>
 	<string name="username_hint">Username</string>
 	<string name="invalid_username">This is not a valid username</string>
+	<string name="conference_name">Conference name</string>
+	<string name="invalid_conference_name">This is not a valid conference name</string>
 	<string name="download_failed_server_not_found">Download failed: Server not found</string>
 	<string name="download_failed_file_not_found">Download failed: File not found</string>
 	<string name="download_failed_could_not_connect">Download failed: Could not connect to host</string>
-- 
cgit v1.2.3