aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values/strings.xml
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-06-08 20:10:21 +0200
committerDaniel Gultsch <daniel@gultsch.de>2016-06-08 20:10:21 +0200
commit112a4d389eae89a29d7abfe71d26066a66cae3c2 (patch)
treed268d139d9de4dd24a29c19eabf3b7b9b6aea553 /src/main/res/values/strings.xml
parentb88128241eb7deb6599e946dc009fdc5dfd32974 (diff)
parent7932244c51e7c5e6e5775d282e91ec223fe2a9bf (diff)
Merge branch 'Wanztwurst-darkTheme' fixes #529
Diffstat (limited to 'src/main/res/values/strings.xml')
-rw-r--r--src/main/res/values/strings.xml8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index dee7502f..6d03b20f 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -412,7 +412,7 @@
<string name="enable_notifications">Enable notifications</string>
<string name="conference_with">Create conference with…</string>
<string name="no_conference_server_found">No conference server found</string>
- <string name="conference_creation_failed">Conference creation failed!</string>s
+ <string name="conference_creation_failed">Conference creation failed!</string>
<string name="secret_accepted">Secret accepted!</string>
<string name="reset">Reset</string>
<string name="account_image_description">Account avatar</string>
@@ -656,4 +656,10 @@
<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>
+ <string name="pref_theme_options">Theme</string>
+ <string name="pref_theme_options_summary">Select the color palette</string>
+ <string name="pref_theme_light">Light theme</string>
+ <string name="pref_theme_dark">Dark theme</string>
+ <string name="pref_use_green_background">Green Background</string>
+ <string name="pref_use_green_background_summary">Use green background for received messages</string>
</resources>