From 9a4b48d1ec964bdce2a3c5f8242a01c0fa4a70e0 Mon Sep 17 00:00:00 2001
From: Michael <betheg@bitcloner.org>
Date: Fri, 3 Oct 2014 15:55:06 +0200
Subject: let's own otr-fingerprint copy to clipboard.

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

(limited to 'res/values/strings.xml')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8d976dce..b6e5e15c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -261,5 +261,6 @@
     <string name="pref_expert_options_other">Other</string>
     <string name="pref_conference_name">Conference name</string>
     <string name="pref_conference_name_summary">Use room’s subject instead of JID to identify conferences</string>
+    <string name="toast_message_otr_fingerprint">OTR fingerprint copied to clipboard!</string>
 
-</resources>
\ No newline at end of file
+</resources>
-- 
cgit v1.2.3


From 54e9235bfcbfc22250bd9a14eb8575003856b91d Mon Sep 17 00:00:00 2001
From: Michael <betheg@bitcloner.org>
Date: Sun, 5 Oct 2014 12:31:49 +0200
Subject: MUC: differentiated a few more errors.

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

(limited to 'res/values/strings.xml')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index b6e5e15c..089a678b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -262,5 +262,8 @@
     <string name="pref_conference_name">Conference name</string>
     <string name="pref_conference_name_summary">Use room’s subject instead of JID to identify conferences</string>
     <string name="toast_message_otr_fingerprint">OTR fingerprint copied to clipboard!</string>
+    <string name="conference_banned">You were been banned from the conference room</string>
+    <string name="conference_members_only">The conference room is only for members</string>
+    <string name="conference_kicked">You were been kicked from the conference room</string>
 
 </resources>
-- 
cgit v1.2.3


From 16d5429f803dfa6e76110dd83e8f04377358f839 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Mon, 6 Oct 2014 13:34:19 +0200
Subject: muc options clean up

---
 res/values/strings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'res/values/strings.xml')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 089a678b..58af226b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -262,8 +262,8 @@
     <string name="pref_conference_name">Conference name</string>
     <string name="pref_conference_name_summary">Use room’s subject instead of JID to identify conferences</string>
     <string name="toast_message_otr_fingerprint">OTR fingerprint copied to clipboard!</string>
-    <string name="conference_banned">You were been banned from the conference room</string>
-    <string name="conference_members_only">The conference room is only for members</string>
-    <string name="conference_kicked">You were been kicked from the conference room</string>
+    <string name="conference_banned">You are banned from this conference</string>
+    <string name="conference_members_only">This conference is members only</string>
+    <string name="conference_kicked">You have been kicked from this conference</string>
 
 </resources>
-- 
cgit v1.2.3