From 25211f13b37ecef64d6fa9a382a2c30d212452ae Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 2 Jun 2016 00:24:37 +0200
Subject: make grace period configurable

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

(limited to 'src/main/res/values/strings.xml')

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 2decae45..51c658ab 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -117,8 +117,8 @@
 	<string name="pref_led_summary">Blink notification light when a new message arrives</string>
 	<string name="pref_sound">Ringtone</string>
 	<string name="pref_sound_summary">Play sound when a new message arrives</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_notification_grace_period">Grace Period</string>
+	<string name="pref_notification_grace_period_summary">The length of time Conversations keeps quite after seeing activity on another device</string>
 	<string name="pref_advanced_options">Advanced</string>
 	<string name="pref_never_send_crash">Never send crash reports</string>
 	<string name="pref_never_send_crash_summary">By sending in stack traces you are helping the ongoing development of Conversations</string>
@@ -649,4 +649,7 @@
 	<string name="choose_participants">Choose participants</string>
 	<string name="creating_conference">Creating conference…</string>
 	<string name="invite_again">Invite again</string>
+	<string name="gp_short">Short</string>
+	<string name="gp_medium">Medium</string>
+	<string name="gp_long">Long</string>
 </resources>
-- 
cgit v1.2.3