diff options
| -rw-r--r-- | vdrmanager/res/values-de/preferences.xml | 7 | ||||
| -rw-r--r-- | vdrmanager/res/values/preferences.xml | 6 | ||||
| -rw-r--r-- | vdrmanager/res/xml/preferences.xml | 31 |
3 files changed, 30 insertions, 14 deletions
diff --git a/vdrmanager/res/values-de/preferences.xml b/vdrmanager/res/values-de/preferences.xml index 26ecf81..0df81ed 100644 --- a/vdrmanager/res/values-de/preferences.xml +++ b/vdrmanager/res/values-de/preferences.xml @@ -95,6 +95,7 @@ </string-array> <string name="vdr_advanced_preferences">Erweitert</string> + <string name="vdr_advanced_preferences_summary">Erweiterte Einstellungen</string> <string name="vdr_conntimeout_title">Anmeldezeitlimit</string> <string name="vdr_conntimeout_sum">Wie lang (in Sekunden) warten bis eine Verbindung hergestellt ist?</string> @@ -107,9 +108,11 @@ <string name="streaming_password_title">Streamdev Passwort</string> - <string name="streaming_password_sum">Streamdev Server Passwort, gesetzt mit der Option "-a \'user:pass\'". wird so aufgerufen: http://user:pass@vdr:3000. In der Regel nicht gesetzt</string> + <string name="streaming_password_sum">Streamdev Server Passwort, gesetzt mit der Option "-a \'user:pass\'". wird so aufgerufen: http://user:pass@vdr:3000. In der Regel nicht gesetzt.</string> <string name="streaming_username_title">Streamdev Benutzername</string> <string name="streaming_username_sum">Streamdev Server Benutzername, gesetzt mit der Option "-a \'user:pass\'". wird so http://user:pass@vdr:3000. In der Regel nicht gesetzt</string> - + + <string name="vdr_encoding_title">Zeichenkodierung</string> + <string name="vdr_encoding_summary">Zeichenkodierung vom VDR Gerät. Vorgabe ist Android Zeichenkodierung (utf-8).</string> </resources> diff --git a/vdrmanager/res/values/preferences.xml b/vdrmanager/res/values/preferences.xml index 3052ac7..9e186cf 100644 --- a/vdrmanager/res/values/preferences.xml +++ b/vdrmanager/res/values/preferences.xml @@ -130,6 +130,7 @@ </string-array> <string name="vdr_advanced_preferences">Advanced</string> + <string name="vdr_advanced_preferences_summary">Advanced settings</string> <string name="vdr_conntimeout_key">key_conntimeout_key</string> <string name="vdr_conntimeout_title">Connection Timeout</string> @@ -148,5 +149,8 @@ <string name="streaming_username_title">Streamdev username</string> <string name="streaming_username_sum">Set your streamdev server username. (a.e. -a \'username:password\')</string> <string name="streaming_username_key">key_streaming_username</string> - + + <string name="vdr_encoding_key">key_vdr_encoding</string> + <string name="vdr_encoding_title">Character encoding</string> + <string name="vdr_encoding_summary">Character encoding of your VDR device. Default is utf-8.</string> </resources> diff --git a/vdrmanager/res/xml/preferences.xml b/vdrmanager/res/xml/preferences.xml index 67d4aa4..3856576 100644 --- a/vdrmanager/res/xml/preferences.xml +++ b/vdrmanager/res/xml/preferences.xml @@ -2,8 +2,9 @@ <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" > <PreferenceScreen + android:enabled="false" android:summary="@string/vdr_devices_summary" - android:title="@string/vdr_devices" android:enabled="false"> + android:title="@string/vdr_devices" > <intent android:action="android.intent.action.MAIN" @@ -22,8 +23,8 @@ <EditTextPreference android:defaultValue="@string/vdr_port_default" - android:key="@string/vdr_port_key" android:inputType="number" + android:key="@string/vdr_port_key" android:summary="@string/vdr_port_summary" android:title="@string/vdr_port_title" /> @@ -34,11 +35,14 @@ android:title="@string/vdr_password_title" /> <CheckBoxPreference + android:enabled="false" android:key="@string/vdr_ssl_key" android:summary="@string/vdr_ssl_summary" - android:title="@string/vdr_ssl_title" android:enabled="false" /> + android:title="@string/vdr_ssl_title" /> - <PreferenceScreen android:title="@string/vdr_advanced_preferences" > + <PreferenceScreen + android:summary="@string/vdr_advanced_preferences_summary" + android:title="@string/vdr_advanced_preferences" > <EditTextPreference android:defaultValue="10" @@ -60,6 +64,12 @@ android:key="@string/vdr_timeout_key" android:summary="@string/vdr_timeout_sum" android:title="@string/vdr_timeout_title" /> + + <EditTextPreference + android:defaultValue="utf-8" + android:key="@string/vdr_encoding_key" + android:summary="@string/vdr_encoding_summary" + android:title="@string/vdr_encoding_title" /> </PreferenceScreen> </PreferenceCategory> @@ -216,18 +226,17 @@ android:key="streamingport" android:summary="@string/settings_livetv_port_summary" android:title="@string/settings_livetv_port" /> - - <EditTextPreference + + <EditTextPreference android:key="@string/streaming_username_key" android:summary="@string/streaming_username_sum" android:title="@string/streaming_username_title" /> - - <EditTextPreference - android:password="true" + + <EditTextPreference android:key="@string/streaming_password_key" + android:password="true" android:summary="@string/streaming_password_sum" android:title="@string/streaming_password_title" /> - <ListPreference android:defaultValue="TS" @@ -256,4 +265,4 @@ android:title="@string/remux_parameter_title" /> </PreferenceCategory> -</PreferenceScreen> +</PreferenceScreen>
\ No newline at end of file |