summaryrefslogtreecommitdiff
path: root/vdrmanager/res
diff options
context:
space:
mode:
authorlado <herrlado@gmail.com>2013-03-20 10:55:58 +0100
committerlado <herrlado@gmail.com>2013-03-20 10:55:58 +0100
commitf467c0600198c2bfba4be0eecd4709b58b4211b3 (patch)
tree958bd845415a19aee06f204fd32d1bd8efeeb4a2 /vdrmanager/res
parentcae390b45e2977def1d593009e76854ed76e281a (diff)
downloadvdr-manager-f467c0600198c2bfba4be0eecd4709b58b4211b3.tar.gz
vdr-manager-f467c0600198c2bfba4be0eecd4709b58b4211b3.tar.bz2
Feature #1304
Diffstat (limited to 'vdrmanager/res')
-rw-r--r--vdrmanager/res/layout/fetch_preference.xml (renamed from vdrmanager/res/layout/mac_fetch_preference.xml)0
-rw-r--r--vdrmanager/res/values/strings.xml4
-rw-r--r--vdrmanager/res/xml/vdr_prefs.xml4
3 files changed, 5 insertions, 3 deletions
diff --git a/vdrmanager/res/layout/mac_fetch_preference.xml b/vdrmanager/res/layout/fetch_preference.xml
index d276625..d276625 100644
--- a/vdrmanager/res/layout/mac_fetch_preference.xml
+++ b/vdrmanager/res/layout/fetch_preference.xml
diff --git a/vdrmanager/res/values/strings.xml b/vdrmanager/res/values/strings.xml
index 7ca5e39..e11d792 100644
--- a/vdrmanager/res/values/strings.xml
+++ b/vdrmanager/res/values/strings.xml
@@ -391,5 +391,7 @@
<string name="vdr_timezone_title">Select server time zone</string>
<string name="zone_list_menu_sort_alphabetically">Sort alphabetically</string>
<string name="zone_list_menu_sort_by_timezone">Sort by time zone</string>
-
+ <string name="probing">Probing %1$s …</string>
+ <string name="no_results">No results…</string>
+ <!-- … -->
</resources> \ No newline at end of file
diff --git a/vdrmanager/res/xml/vdr_prefs.xml b/vdrmanager/res/xml/vdr_prefs.xml
index feee1e9..3720db4 100644
--- a/vdrmanager/res/xml/vdr_prefs.xml
+++ b/vdrmanager/res/xml/vdr_prefs.xml
@@ -11,7 +11,7 @@
<PreferenceCategory
android:key="vdr_preferences"
android:title="@string/vdr_preferences" >
- <EditTextPreference
+ <de.bjusystems.vdrmanager.data.FetchEditTextPreference
android:inputType="textNoSuggestions"
android:key="@string/vdr_host_key"
android:summary="@string/vdr_host_summary"
@@ -80,7 +80,7 @@
android:summary="@string/wakeup_password_summary"
android:title="@string/wakeup_password_title" />
- <de.bjusystems.vdrmanager.data.MacFetchEditTextPreference
+ <de.bjusystems.vdrmanager.data.FetchEditTextPreference
android:dependency="@string/wakeup_enabled_key"
android:key="@string/wakeup_wol_mac_key"
android:summary="@string/wakeup_wol_mac_summary"