aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2016-02-11 21:20:51 +0100
committersteckbrief <steckbrief@chefmail.de>2016-02-11 21:20:51 +0100
commit73084c9cd30dacb6228a0851efa928aaeabcb229 (patch)
tree894754dbba9d3a7339fbaf8032422c13b08b30eb /src/main/res/values
parentf7abd4237f0b8441fcba45459e26b8a0ea1d36de (diff)
Fixed XML errors after merge
Diffstat (limited to 'src/main/res/values')
-rw-r--r--src/main/res/values/colors.xml1
-rw-r--r--src/main/res/values/strings.xml2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index 3ecc2225..2d744395 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -26,4 +26,5 @@
<color name="red800">#ffc62828</color>
<color name="orange500">#ffff9800</color>
<color name="green500">#ff259b24</color>
+ <color name="green700">#ff0a7e07</color>
</resources> \ No newline at end of file
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index a7ded490..9fe8e28a 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -117,6 +117,8 @@
<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">Conference notifications</string>
+ <string name="pref_conference_notifications_summary">Always notify when a new conference message arrives 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>