aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-09-22 13:23:35 +0200
committeriNPUTmice <daniel@gultsch.de>2014-09-22 13:23:35 +0200
commit45aede14bd7d384e8adbcd6697ba39b1dcbf77b4 (patch)
tree760d017b369aa8648c00234ad979f42f1ee6e9cb /res
parentbb065020ff6145adf8fb2726928f11e0ea7140b6 (diff)
fixed #452
Diffstat (limited to 'res')
-rw-r--r--res/values/strings.xml4
-rw-r--r--res/xml/preferences.xml5
2 files changed, 8 insertions, 1 deletions
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
@@ -64,6 +64,11 @@
</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"
android:summary="@string/pref_use_larger_font_summary"