diff options
| author | Christian Schneppe <christian@pix-art.de> | 2016-06-06 21:23:49 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-06-06 21:23:49 +0200 |
| commit | 1e5c64a1f569ebe8a893cdff9a4d8957849220b3 (patch) | |
| tree | 75bbcb3a1d8d40895903fb38b2a3bee008367dc7 /src/main/res/values | |
| parent | 6582ac6e72a1f9bf55f2f6d8457114a6426c1062 (diff) | |
| parent | b88128241eb7deb6599e946dc009fdc5dfd32974 (diff) | |
Merge remote-tracking branch 'refs/remotes/siacs/master'
Diffstat (limited to 'src/main/res/values')
| -rw-r--r-- | src/main/res/values/strings.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 09d77ed3d..2ca2cc503 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -656,4 +656,7 @@ <string name="gp_short">Short</string> <string name="gp_medium">Medium</string> <string name="gp_long">Long</string> + <string name="pref_broadcast_last_activity">Broadcast Last User Interaction</string> + <string name="pref_broadcast_last_activity_summary">Let all your contacts know when use Conversations</string> + <string name="pref_privacy">Privacy</string> </resources> |