diff options
| author | Christian Schneppe <christian@pix-art.de> | 2016-06-02 20:39:59 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-06-02 20:39:59 +0200 |
| commit | b082f919d73291c0bd832154af9b7b68f7d9f8e0 (patch) | |
| tree | aea71ca6d12519135b5cff04fcbff004e9c567b5 /src/main/res | |
| parent | 41d3b019d1618a00f4fe40371b0f339d8cc193d6 (diff) | |
| parent | 25211f13b37ecef64d6fa9a382a2c30d212452ae (diff) | |
Merge remote-tracking branch 'refs/remotes/siacs/master'
Diffstat (limited to 'src/main/res')
| -rw-r--r-- | src/main/res/values/arrays.xml | 12 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 5 |
2 files changed, 17 insertions, 0 deletions
diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml index f437a20b7..c30be285b 100644 --- a/src/main/res/values/arrays.xml +++ b/src/main/res/values/arrays.xml @@ -83,4 +83,16 @@ <item>@string/presence_xa</item> <item>@string/presence_dnd</item> </string-array> + + <string-array name="grace_periods"> + <item>@string/gp_short</item> + <item>@string/gp_medium</item> + <item>@string/gp_long</item> + </string-array> + + <string-array name="grace_periods_values"> + <item>144</item> + <item>610</item> + <item>2584</item> + </string-array> </resources> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index cbebb77c7..cdbcccd78 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -114,6 +114,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">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_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> @@ -650,4 +652,7 @@ <string name="invite_again">Invite again</string> <string name="inviteUser_Subject">has invited you via</string> <string name="InviteText">Hello,\n\nthe user %s has invited you to Pix-Art Messenger. If you are using Android, give it a try and click the following link to start over...</string> + <string name="gp_short">Short</string> + <string name="gp_medium">Medium</string> + <string name="gp_long">Long</string> </resources> |