aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values/strings.xml
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-01-08 21:30:46 +0100
committerDaniel Gultsch <daniel@gultsch.de>2016-01-08 21:30:46 +0100
commita3e136b5504641f9782b9d94e35311dad19fbc1d (patch)
treefa38ed8d6050ad3b9f643dc32b897f8795bcae4e /src/main/res/values/strings.xml
parent0bb3ae37f0762ad264a4b98b3ebc4753017441af (diff)
show per conference notification settings in details activity
Diffstat (limited to 'src/main/res/values/strings.xml')
-rw-r--r--src/main/res/values/strings.xml6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 3e4d2c68..b0d630a9 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>