From 45aede14bd7d384e8adbcd6697ba39b1dcbf77b4 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Mon, 22 Sep 2014 13:23:35 +0200
Subject: fixed #452

---
 res/values/strings.xml  | 4 +++-
 res/xml/preferences.xml | 5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'res')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index be76c140..8d976dce 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -259,5 +259,7 @@
     <string name="pref_use_indicate_received_summary">Received masseges will be marked with a green tick. Be aware that this might no work in every case.</string>
     <string name="pref_use_send_button_to_indicate_status_summary">Colorize send button to indicate contact status</string>
     <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>
 
-</resources>
+</resources>
\ No newline at end of file
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 3dab0959..024335f1 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -63,6 +63,11 @@
             android:title="@string/pref_notification_grace_period" />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/pref_ui_options" >
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="use_subject"
+            android:summary="@string/pref_conference_name_summary"
+            android:title="@string/pref_conference_name" />
         <CheckBoxPreference
             android:defaultValue="false"
             android:key="use_larger_font"
-- 
cgit v1.2.3