From a3e136b5504641f9782b9d94e35311dad19fbc1d Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 8 Jan 2016 21:30:46 +0100
Subject: show per conference notification settings in details activity

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

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

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 3e4d2c68c..b0d630a96 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -111,8 +111,6 @@
 	<string name="pref_vibrate_summary">Also vibrate when a new message arrives</string>
 	<string name="pref_sound">Sound</string>
 	<string name="pref_sound_summary">Play ringtone with notification</string>
-	<string name="pref_conference_notifications">Notifications in Public Conferences</string>
-	<string name="pref_conference_notifications_summary">Always notify when a message arrives in a public conference instead of only when highlighted</string>
 	<string name="pref_notification_grace_period">Notification grace period</string>
 	<string name="pref_notification_grace_period_summary">Disable notifications for a short time after a carbon copy was received</string>
 	<string name="pref_advanced_options">Advanced Options</string>
@@ -570,4 +568,8 @@
 	<string name="certificate_sha1">SHA1</string>
 	<string name="certicate_info_not_available">(Not available)</string>
 	<string name="certificate_not_found">No certificate found</string>
+	<string name="notify_on_all_messages">Notify on all messages</string>
+	<string name="notify_only_when_highlighted">Notify only when highlighted</string>
+	<string name="notify_never">Notifications disabled</string>
+	<string name="notify_paused">Notifications paused</string>
 </resources>
-- 
cgit v1.2.3