summaryrefslogtreecommitdiff
path: root/androvdr/res
diff options
context:
space:
mode:
authorbju <bju@maxi.fritz.box>2011-03-20 00:45:32 +0100
committerbju <bju@maxi.fritz.box>2011-03-20 00:45:32 +0100
commitd1843c8b6310533a32c10c08e3aeb511a5f8be08 (patch)
tree13157509bd5f210ad3b8e4ad145624e0dc92a640 /androvdr/res
parent4702ecb836a85bfe3dbc19d8e6716e16756f0569 (diff)
downloadvdr-manager-d1843c8b6310533a32c10c08e3aeb511a5f8be08.tar.gz
vdr-manager-d1843c8b6310533a32c10c08e3aeb511a5f8be08.tar.bz2
Removed unneded settings
Diffstat (limited to 'androvdr/res')
-rw-r--r--androvdr/res/values/preferences.xml4
-rw-r--r--androvdr/res/values/preferences_keys.xml2
-rw-r--r--androvdr/res/xml/preferences.xml5
3 files changed, 3 insertions, 8 deletions
diff --git a/androvdr/res/values/preferences.xml b/androvdr/res/values/preferences.xml
index a354345..36a5e1a 100644
--- a/androvdr/res/values/preferences.xml
+++ b/androvdr/res/values/preferences.xml
@@ -14,7 +14,7 @@
<string name="vdr_ssl_summary">Use SSL for connections</string>
<!-- channel filter preferences -->
- <string name="channel_filter_preferences">Limit channels</string>
+ <string name="channel_filter_preferences">Channel settings</string>
<string name="channel_filter_filter_title">Limit channels</string>
<string name="channel_filter_filter_summary">Use only given channels</string>
<string name="channel_filter_last_title">Channels</string>
@@ -24,8 +24,6 @@
<string name="wakeup_preferences">Remote VDR host wakeup</string>
<string name="wakeup_enabled_title">Can remote wakeup VDR</string>
<string name="wakeup_enabled_summary">Enables to remote wakeup the VDR host</string>
- <string name="wakeup_svdrphelper_title">Use HTTP request for wakeup</string>
- <string name="wakeup_svdrphelper_summary">Wakeup by HTTP request and not using SvdrpHelper</string>
<string name="wakeup_url_title">URL for remote wakeup</string>
<string name="wakeup_url_summary">URL for a request doing the wakeup</string>
<string name="wakeup_user_title">Wakeup user</string>
diff --git a/androvdr/res/values/preferences_keys.xml b/androvdr/res/values/preferences_keys.xml
index d60b323..36fee64 100644
--- a/androvdr/res/values/preferences_keys.xml
+++ b/androvdr/res/values/preferences_keys.xml
@@ -13,7 +13,7 @@
<string name="channel_filter_last_key">last_channel</string>
<string name="wakeup_enabled_key">wakeup_enabled</string>
- <string name="wakeup_svdrphelper_key">wakeup_http</string>
+
<string name="wakeup_url_key">wakeup_url</string>
<string name="wakeup_user_key">wakeup_user</string>
<string name="wakeup_password_key">wakeup_password</string>
diff --git a/androvdr/res/xml/preferences.xml b/androvdr/res/xml/preferences.xml
index 6d69051..8a84449 100644
--- a/androvdr/res/xml/preferences.xml
+++ b/androvdr/res/xml/preferences.xml
@@ -50,10 +50,7 @@
android:title="@string/wakeup_enabled_title"
android:summary="@string/wakeup_enabled_summary"/>
- <CheckBoxPreference
- android:key="@string/wakeup_svdrphelper_key"
- android:title="@string/wakeup_svdrphelper_title"
- android:summary="@string/wakeup_svdrphelper_summary"/>
+
<EditTextPreference
android:key="@string/wakeup_url_key"