aboutsummaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2015-03-04 17:49:54 -0800
committerScott Jackson <daneren2005@gmail.com>2015-03-04 17:49:54 -0800
commit63517523d48deeefe35864d8ac71c8d12f40e38a (patch)
treef9417c5652d0dd9191e1cbab304f48d9ed49d789 /res
parent4391e7f6e53226e8434050e9306e655684c761b9 (diff)
parent7eafe80b36030cc9f3df5d14d01190c962f29ec7 (diff)
downloaddsub-63517523d48deeefe35864d8ac71c8d12f40e38a.tar.gz
dsub-63517523d48deeefe35864d8ac71c8d12f40e38a.tar.bz2
dsub-63517523d48deeefe35864d8ac71c8d12f40e38a.zip
Merge branch 'CastProxy'
Diffstat (limited to 'res')
-rw-r--r--res/values/strings.xml3
-rw-r--r--res/xml/settings.xml10
2 files changed, 13 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index eed2f1c7..5940f710 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -441,6 +441,9 @@
<string name="settings.replay_gain_type.track">Track tags</string>
<string name="settings.replay_gain_bump">Replay Gain Pre-amp</string>
<string name="settings.replay_gain_untagged">Songs without Replay Gain</string>
+ <string name="settings.casting">Casting</string>
+ <string name="settings.casting_proxy">Use device proxy</string>
+ <string name="settings.casting_proxy_summary">Stream everything through the device as a proxy. This gets around issues such as using self-signed certificates.</string>
<string name="shuffle.title">Shuffle By</string>
<string name="shuffle.startYear">Start Year:</string>
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index 8b53a6fa..91b9ea1a 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -361,6 +361,16 @@
</PreferenceCategory>
<PreferenceCategory
+ android:title="@string/settings.casting">
+
+ <CheckBoxPreference
+ android:title="@string/settings.casting_proxy"
+ android:summary="@string/settings.casting_proxy_summary"
+ android:key="castProxy"
+ android:defaultValue="false"/>
+ </PreferenceCategory>
+
+ <PreferenceCategory
android:title="@string/settings.replay_gain">
<CheckBoxPreference