Feature #785

7 files changed, 59 insertions, 88 deletions

diff --git a/vdrmanager/res/values-de/common.xml b/vdrmanager/res/values-de/common.xml
index 5a5952d..1ab991a 100644
--- a/vdrmanager/res/values-de/common.xml
+++ b/vdrmanager/res/values-de/common.xml
@@ -1,12 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="common_delete">Löschen</string>
-  <string name="prefs_current_value">Aktuell:</string>
-  <string name="prefs_current_value_template">Aktuell: %1$s</string>
-  <string name="no_connection">Keine Verbindung</string>
-  <string name="no_connection_retry">Wiederholen</string>
-  <string name="refresh">Auffrischen</string>
-  <string name="done">Fertig</string>
-  <string name="share">Share</string>
-  <string name="share_chooser">Share EPG Eintrag</string>
+
+    <string name="common_delete">Löschen</string>
+    <string name="prefs_current_value">Aktuell:</string>
+    <string name="prefs_current_value_template">Aktuell: %1$s</string>
+    <string name="prefs_current_value_not_set">&lt;Nicht gesetzt&gt;</string>
+    <string name="no_connection">Keine Verbindung</string>
+    <string name="no_connection_retry">Wiederholen</string>
+    <string name="refresh">Auffrischen</string>
+    <string name="done">Fertig</string>
+    <string name="share">Share</string>
+    <string name="share_chooser">Share EPG Eintrag</string>
+    <string name="about_text">
+        Über "VDR-Manager" Software für Android\n 
+		Das ist Version %1$s\n
+        Wenn Sie Ihren VDR zu Hause über das Internet und ein Handy mit Android
+        erreichen wollen, dann finden sie dieses Programm vielleicht nützlich.
+        Für weitere Informationen besuchen Sie http://projects.vdr-developer.org/projects/vdr-manager/wiki.
+         Autoren:\n
+          bju&lt;herrlado@gmail.com&gt;
+          herrlado&lt;herrlado@gmail.com&gt;
+    </string>
+    <string name="about_title">Über</string>
+
 </resources>
diff --git a/vdrmanager/res/values-de/epg.xml b/vdrmanager/res/values-de/epg.xml
index cd748f3..2a86f09 100644
--- a/vdrmanager/res/values-de/epg.xml
+++ b/vdrmanager/res/values-de/epg.xml
@@ -5,7 +5,7 @@
   <string name="epg_list_time_label">Was kommt</string>
   <string name="epg_list_time_now">jetzt</string>
   <string name="epg_list_time_next">als nächstes</string>
-  <string name="epg_list_time_adhoc">Ad Hoc</string>
+  <string name="epg_list_time_adhoc">freie Zeitwahl</string>
   <string name="epg_list_channel_spinner">Kanal</string>
   <string name="epg_list_search_label">Suchergebnisse</string>
   
diff --git a/vdrmanager/res/values-de/preferences.xml b/vdrmanager/res/values-de/preferences.xml
index 9006964..26ecf81 100644
--- a/vdrmanager/res/values-de/preferences.xml
+++ b/vdrmanager/res/values-de/preferences.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+	<string name="vdr_devices_summary">Definiere ein oder weitere VDR Geräte. (aktuell nicht implementiert)</string>
+	<string name="vdr_devices">VDR Geräte</string>
+
 	<!-- VDR plugin preferences -->
 	<string name="vdr_preferences">Netzwerkeinstellungen</string>
 	<string name="vdr_host_title">VDR Rechner</string>
-	<string name="vdr_host_summary">Host running VDR</string>
-	<string name="vdr_port_title">VDR Plugin port </string>
+	<string name="vdr_host_summary">VDR Hostrechner</string>
+	<string name="vdr_port_title">VDR Plugin Port </string>
 	<string name="vdr_port_summary">Port für Verbindungen zum VDR Plugin</string>
 	<string name="vdr_port_default">6420</string>
 	<string name="vdr_password_title">VDR Plugin Passwort</string>
@@ -33,22 +36,17 @@
 	<string name="wakeup_method_key">key_wakeup_method</string>
 	<string name="wakeup_method_title">Weckmethode</string>
 	<string name="wakeup_method_summary">Wähle eine Methode zum Wecken des VDR Rechners</string>
+
 	<string-array name="wakeup_methods">
 		<item>Rufe ein URL auf</item>
 		<item>WOL</item>
 	</string-array>
-	<string-array name="wakeup_methods_values">
-		<item>url</item>
-		<item>wol</item>
-	</string-array>
-	<string name="default_wakeup_method">url</string>
-	<string name="wakeup_wol_custom_broadcast_key">key_wol_custom_broadcast</string>
+
     <string name="wakeup_wol_custom_boradcast_title">Eigene WOL-Netzwerkadresse</string>
     <string name="wakeup_wol_custom_boradcast_summary">Eine WOL-Netzwerkadresse von 255.255.255.255 abweichend. Zum Beispiel sinnvoll für VPN Verbindungen.</string>
     <string name="wakeup_wol_custom_boradcast_summary_on">Broadcast </string>
 	
 	
-	<string name="wakeup_wol_mac_key">key_wakeup_wol_mac</string>
     <string name="wakeup_wol_mac_title">MAC-Adresse</string>
     <string name="wakeup_wol_mac_summary">MAC-Adresse des VDR Rechners. Verwende \':\' , \'-\' oder ein Leerzeichen als Trennzeichen.</string>
 
@@ -67,50 +65,26 @@
 
 	<!-- GUI -->
 	<string name="gui_preferences">Einstellungen der Benutzeroberfläche</string>
-	<string name="gui_enable_24h_format_key">key_enable_24h</string>
+
 	<string name="gui_enable_24h_format_title">Verwende 24-h Format</string>
 	<string name="gui_enable_24h_format_summary_on">13:00</string>
 	<string name="gui_enable_24h_format_summary_off">1:00 PM</string>
-	<string name="gui_channels_show_channel_numbers_key">key_channels_show_channel_numbers</string>
+
 	<string name="gui_channels_show_channel_numbers_title">Zeige Kanalnummern</string>
     <string name="gui_channels_show_channel_numbers_summary">Zeige Kanalnummern in der Kanalliste.</string>
 	
-	<string name="qui_quit_on_back_key">key_gui_quit_on_back</string>
 	<string name="gui_quit_on_back_title">Beenden mit Zurück Button</string>
 	<string name="gui_quit_on_back_summary_on">Zurück Button schließt den VDR-Manager</string>
 	<string name="gui_quit_on_back_summary_off">Zurück Button beendet den VDR-Manager nicht</string>	
 	
-	<string name="qui_show_imdb_button_key">key_qui_show_imdb_button</string>
 	<string name="qui_show_imdb_button_title">Zeige IMDB Button</string>
 	<string name="qui_show_imdb_button_summary_on">IMDB Button anzeigen</string>
 	<string name="qui_show_imdb_button_summary_off">IMDB Button nicht anzeigen</string>	
 	
-	<string name="qui_imdb_url_key">key_qui_imdb_url</string>
 	<string name="qui_imdb_url_title">IMDb Seite</string>
 	<string name="qui_imdb_url_summary">Welche IMDb Seite für die Suche verwenden.</string>
 	<string name="gui_custom_locale_title">Andere Sprache</string>
 	<string name="gui_custom_locale_sum">Eine andere Sprache aktivieren.</string>
-	
-	<string-array name="imdb_urls">
-		<item>imdb.com</item>
-		<item>uk.imdb.com</item>
-		<item>imdb.de</item>
-		<item>imdb.es</item>
-		<item>imdb.fr</item>
-		<item>imdb.it</item>
-		<item>imdb.pt</item>
-	</string-array>
-
-	<string-array name="imdb_urls_values">
-        <item>International</item>
-        <item>imdb.com</item>
-        <item>uk.imdb.com</item>
-        <item>imdb.de</item>
-        <item>imdb.es</item>
-        <item>imdb.fr</item>
-        <item>imdb.it</item>
-        <item>imdb.pt</item>
-     </string-array>
 
     <string-array name="lang">
         <!-- 
@@ -119,12 +93,23 @@
         <item>Englisch</item>
         <item>Deutsch</item>
     </string-array>
-    
+
+    <string name="vdr_advanced_preferences">Erweitert</string>
+
+    <string name="vdr_conntimeout_title">Anmeldezeitlimit</string>
+    <string name="vdr_conntimeout_sum">Wie lang (in Sekunden) warten bis eine Verbindung hergestellt ist?</string>
+
+    <string name="vdr_readtimeout_title">Lese-Zeitlimit</string>
+    <string name="vdr_readtimeout_sum">Wie lang (in Sekunden) warten bis eine Zeile gelesen wurde?</string>
+
+    <string name="vdr_timeout_title">Gesamt-Zeitlimit</string>
+    <string name="vdr_timeout_sum">Wie lang maximal (in Sekunden) warten bis eine Datenübertragung entgültig abgebrochen wird?</string>
+        
                 
     <string name="streaming_password_title">Streamdev Passwort</string>
-    <string name="streaming_password_sum">Streamdev Server Passwort, gesetz 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, gesetz mit der Option "-a \'user:pass\'". wird so http://user:pass@vdr:3000. In der Regel nicht gesetzt</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>
 	    
 </resources>
diff --git a/vdrmanager/res/values-de/preferences_keys.xml b/vdrmanager/res/values-de/preferences_keys.xml
deleted file mode 100644
index 7eb0c6d..0000000
--- a/vdrmanager/res/values-de/preferences_keys.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-  <string name="vdr_host_key">svdrp_host</string>
-  <string name="vdr_port_key">svdrp_port </string>
-  <string name="vdr_password_key">svdrp_password</string>
-  <string name="vdr_ssl_key">svdrp_ssl</string>
-  <string name="vdr_stream_format">stream_format</string>
-  <string name="vdr_stream_port">stream_port</string>
-  
-  <string name="alive_check_enabled_key">alive_check_enabled</string>
-  <string name="alive_check_interval_key">alive_check_interval</string>
-  
-  <string name="channel_filter_filter_key">limit_channels</string>
-  <string name="channel_filter_last_key">last_channel</string>
-  
-  <string name="wakeup_enabled_key">wakeup_enabled</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>
-  
-  <string name="timer_pre_start_buffer_key">timer_pre_start_buffer</string>
-  <string name="timer_post_end_buffer_key">timer_post_end_buffer</string>
-  <string name="timer_default_priority_key">timer_default_priority</string>
-  <string name="timer_default_primary_limit_key">timer_default_primary_limit</string>
-  <string name="timer_default_lifetime_key">timer_default_lifetime</string>
-  
-  <string name="epg_search_times_key">epg_search_times</string>
-  
-</resources>
diff --git a/vdrmanager/res/values-de/timers.xml b/vdrmanager/res/values-de/timers.xml
index d2e9a7d..caafee0 100644
--- a/vdrmanager/res/values-de/timers.xml
+++ b/vdrmanager/res/values-de/timers.xml
@@ -10,6 +10,6 @@
   <string name="timer_details_save_title">Speichere Änderungen</string>
   <string name="timer_details_delete_title">Lösche Timer</string>
     
-  <string name="timer_details_add_title">Neuer Timer anlegen</string>
-  <string name="timer_details_modify_title">Einen Timer änern</string>
+  <string name="timer_details_add_title">Neuen Timer anlegen</string>
+  <string name="timer_details_modify_title">Einen Timer ändern</string>
 </resources>
diff --git a/vdrmanager/res/values/preferences.xml b/vdrmanager/res/values/preferences.xml
index a972c53..3052ac7 100644
--- a/vdrmanager/res/values/preferences.xml
+++ b/vdrmanager/res/values/preferences.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+    <string name="vdr_devices_summary">Define one or more VDR Devices. (comming soon)</string>
+    <string name="vdr_devices">VDR Devices</string>
+
     <!-- VDR plugin preferences -->
     <string name="vdr_preferences">Network settings</string>
     <string name="vdr_host_title">VDR host</string>
@@ -126,6 +129,8 @@
         <item>German</item>
     </string-array>
 
+    <string name="vdr_advanced_preferences">Advanced</string>
+        
     <string name="vdr_conntimeout_key">key_conntimeout_key</string>
     <string name="vdr_conntimeout_title">Connection Timeout</string>
     <string name="vdr_conntimeout_sum">How long (in seconds) to wait before the connection is established?</string>
@@ -136,8 +141,6 @@
     <string name="vdr_timeout_title">Total timeout</string>
     <string name="vdr_timeout_sum">How long (in seconds) to wait for a whole I/O operation, before it gets aborted?</string>
     
-        
-        
     <string name="streaming_password_title">Streamdev password</string>
     <string name="streaming_password_sum">Set your streamdev server password. (a.e. -a \'username:password\')</string>
     <string name="streaming_password_key">key_streaming_password</string>
@@ -146,4 +149,4 @@
     <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>
         
-</resources>
\ No newline at end of file
+</resources>
diff --git a/vdrmanager/res/xml/preferences.xml b/vdrmanager/res/xml/preferences.xml
index a24ecaa..369bcb4 100644
--- a/vdrmanager/res/xml/preferences.xml
+++ b/vdrmanager/res/xml/preferences.xml
@@ -2,8 +2,8 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <PreferenceScreen
-        android:summary="Define one or more VDR Devices. (comming soon)"
-        android:title="VDR Devices" android:enabled="false">
+        android:summary="@string/vdr_devices_summary"
+        android:title="@string/vdr_devices" android:enabled="false">
 
         <intent
             android:action="android.intent.action.MAIN"
@@ -37,7 +37,7 @@
             android:summary="@string/vdr_ssl_summary"
             android:title="@string/vdr_ssl_title" android:enabled="false" />
 
-        <PreferenceScreen android:title="Advanced" >
+        <PreferenceScreen android:title="@string/vdr_advanced_preferences" >
 
             <EditTextPreference
                 android:defaultValue="10"
@@ -255,4 +255,4 @@
             android:title="@string/remux_parameter_title" />
     </PreferenceCategory>
 
-</PreferenceScreen>
\ No newline at end of file
+</PreferenceScreen>