diff options
| author | Beriain <beriain@bitmessage.ch> | 2014-05-13 16:46:03 +0200 |
|---|---|---|
| committer | Beriain <beriain@bitmessage.ch> | 2014-05-13 16:46:03 +0200 |
| commit | 8d27d0c44a4c35ce4606628eb5a280df4b1a8c5b (patch) | |
| tree | d5d45d67e14e707446fd0a427cc8f00fc58e8685 /res/xml/preferences.xml | |
| parent | 1150f47addba09889fd64fd6d59d98c115ea71cf (diff) | |
| parent | 7e667319607aa5ed9fd2a2aa1573c40ffae3a613 (diff) | |
Merge https://github.com/siacs/Conversations into development
Diffstat (limited to 'res/xml/preferences.xml')
| -rw-r--r-- | res/xml/preferences.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index b1b560c6..bad2574b 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -4,8 +4,8 @@ android:title="General"> <CheckBoxPreference android:key="grant_new_contacts" - android:title="Grant presence updates" - android:summary="Preemptively grant and ask for presence subscription for contacts you created" + android:title="@string/pref_grant_presence_updates" + android:summary="@string/pref_grant_presence_updates_summary" android:defaultValue="true" /> <ListPreference |