aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2016-06-04 09:57:04 +0200
committerChristian Schneppe <christian@pix-art.de>2016-06-04 09:57:04 +0200
commitc54d30ac003fec40b5263cf9948c20d3163eda7b (patch)
tree7d4cfbf918bd4812782c2851d6c838a153ab5f5f /src/main/res
parent398eacc0f022aec869cac003e61ced7215c178fa (diff)
parent6639d0f23bb983cae7234d6b15f9875464c67093 (diff)
Merge remote-tracking branch 'refs/remotes/siacs/master'
Diffstat (limited to 'src/main/res')
-rw-r--r--src/main/res/values/strings.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index abb363303..09d77ed3d 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -115,7 +115,7 @@
<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">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_notification_grace_period_summary">The length of time Conversations keeps quiet after seeing activity on another device</string>
<string name="pref_advanced_options">Advanced</string>
<string name="pref_send_crash">Send crash reports</string>
<string name="pref_send_crash_summary">By sending in stack traces you are helping the ongoing development of Pix-Art Messenger</string>