aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2017-07-04 11:13:47 -0700
committerAllan Wang <me@allanwang.ca>2017-07-04 11:13:47 -0700
commit4cf368be0cd2f179485b05a3d2cd9b7bc236ba8e (patch)
treedec58af06d220ba80920fcf9c816b71413c61108 /app/src/main/res
parent43885c6c063a76738ed7220aba619e47db7c4080 (diff)
parentd6c5bcd56e293eaf281663b6c1e6b0ab7236be9f (diff)
downloadfrost-4cf368be0cd2f179485b05a3d2cd9b7bc236ba8e.tar.gz
frost-4cf368be0cd2f179485b05a3d2cd9b7bc236ba8e.tar.bz2
frost-4cf368be0cd2f179485b05a3d2cd9b7bc236ba8e.zip
Fix merge
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/values/strings_preferences2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/src/main/res/values/strings_preferences b/app/src/main/res/values/strings_preferences
index faaaf96c..34fe5e9b 100644
--- a/app/src/main/res/values/strings_preferences
+++ b/app/src/main/res/values/strings_preferences
@@ -50,6 +50,8 @@
<string name="experimental_desc">Enable early access to potentially unstable features</string>
<string name="experimental_disclaimer">Disclaimer</string>
<string name="experimental_disclaimer_info">Experimental features may be unstable and may never make it to production. Use at your own risk, send feedback, and feel free to disable them if they don\'t work well.</string>
+ <string name="experimental_by_default">Experimental by Default</string>
+ <string name="experimental_by_default_desc">Feeling risky or just want to help with debugging? Checking this will enable future experimental functions be default.</string>
<string name="search_bar">Search Bar</string>
<string name="search_bar_desc">Enable the search bar instead of a search overlay</string>
<string name="verbose_logging">Verbose Logging</string>