no keys in traslated

6 files changed, 111 insertions, 69 deletions

diff --git a/vdrmanager/res/values/arrays.xml b/vdrmanager/res/values/arrays.xml
index 158ccb1..304cfad 100644
--- a/vdrmanager/res/values/arrays.xml
+++ b/vdrmanager/res/values/arrays.xml
@@ -5,16 +5,25 @@
         <item>url</item>
         <item>wol</item>
     </string-array>
-    
     <string-array name="lang_values">
         <item>en</item>
         <item>de</item>
         <item>it</item>
     </string-array>
-    
     <string-array name="remux_entry_values">
         <item>EXT</item>
         <item>EXTERN</item>
     </string-array>
+    
+    <string-array name="imdb_urls_values">
+        <item>akas.imdb.com</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>
 
 </resources>
\ No newline at end of file
diff --git a/vdrmanager/res/values/livetv.xml b/vdrmanager/res/values/livetv.xml
index c39d228..48a7cb1 100644
--- a/vdrmanager/res/values/livetv.xml
+++ b/vdrmanager/res/values/livetv.xml
@@ -31,9 +31,9 @@
 	<string name="remux_enable_summary">Enable streaming via remux (e.g. externremux.sh)</string>
 	
 	<string name="remux_command_title">Command</string>
-	<string name="remux_command_summary">Typically EXT or Extern e.g. http://vdr:3000/Extern/1</string>
+	<string name="remux_command_summary">Typically EXT or Extern e.g. http://vdr:3000/EXT/1</string>
 	
 	<string name="remux_parameter_title">Parameter</string>
-	<string name="remux_parameter_summary">Control Streaming quality. E.g. http://vdr:3000/Extern;DSL1000/1</string>
+	<string name="remux_parameter_summary">Control Streaming quality. E.g. http://vdr:3000/EXT;DSL1000/1</string>
 	
 </resources>
diff --git a/vdrmanager/res/values/main_menu.xml b/vdrmanager/res/values/main_menu.xml
index 8656f0c..d61addf 100644
--- a/vdrmanager/res/values/main_menu.xml
+++ b/vdrmanager/res/values/main_menu.xml
@@ -4,5 +4,8 @@
   <string name="main_menu_preferences">Preferences</string>
   <string name="main_menu_info">Info</string>
   <string name="main_menu_exit">Exit</string>   
-  
+  <string name="main_menu_goto">Switch Device</string>
+  <string name="main_menu_goto_title">Switch to…</string>
+  <string name="main_menu_goto_no_vdr">Can not load selected device :(</string>
+  <string name="main_menu_switched_to">Switched to %1$s</string>
 </resources>
diff --git a/vdrmanager/res/values/preferences.xml b/vdrmanager/res/values/preferences.xml
index d7a2eff..25bc675 100644
--- a/vdrmanager/res/values/preferences.xml
+++ b/vdrmanager/res/values/preferences.xml
@@ -1,7 +1,7 @@
 <?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_summary">Define one or more VDR Devices.</string>
     <string name="vdr_devices">VDR Devices</string>
 
     <!-- VDR plugin preferences -->
@@ -33,7 +33,6 @@
     <string name="wakeup_user_summary">User for remote wakeup</string>
     <string name="wakeup_password_title">Wakeup password</string>
     <string name="wakeup_password_summary">Password for remote wakeup</string>
-    <string name="wakeup_method_key">key_wakeup_method</string>
     <string name="wakeup_method_title">Wakeup method</string>
     <string name="wakeup_method_summary">Choose a method to wakeup the vdr host</string>
 
@@ -41,16 +40,13 @@
         <item>Call a URL</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">Destination IP address</string>
     <string name="wakeup_wol_custom_boradcast_summary">Unless you have static ARP tables you should use some kind of broadcast address.</string>
-    <string name="wakeup_wol_mac_key">key_wakeup_wol_mac</string>
+  
     <string name="wakeup_wol_mac_title">MAC-Address</string>
     <string name="wakeup_wol_mac_summary">MAC-Address of the VDR host. Use \':\' or \'-\' or a space as separator.</string>
 
@@ -71,39 +67,29 @@
 
     <!-- GUI -->
     <string name="gui_preferences">GUI Settings</string>
-    <string name="gui_enable_24h_format_key">key_enable_24h</string>
+
     <string name="gui_enable_24h_format_title">Use 24-hour 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">Show channel numbers</string>
     <string name="gui_channels_show_channel_numbers_summary">Show channel numbers in the channel list.</string>
-    <string name="qui_quit_on_back_key">key_gui_quit_on_back</string>
+  
     <string name="gui_quit_on_back_title">Quit on back button</string>
     <string name="gui_quit_on_back_summary_on">Back button quits the VDR-Manager</string>
     <string name="gui_quit_on_back_summary_off">Back button does not quit VDR-Manager</string>
-    <string name="qui_show_imdb_button_key">key_qui_show_imdb_button</string>
+  
     <string name="qui_show_imdb_button_title">Show IMDB Button</string>
     <string name="qui_show_imdb_button_summary_on">IMDB Button is shown</string>
     <string name="qui_show_imdb_button_summary_off">IMDB Button is not shown</string>
-    <string name="qui_imdb_url_key">key_qui_imdb_url</string>
+  
     <string name="qui_imdb_url_title">IMDb Site</string>
     <string name="qui_imdb_url_summary">Which IMDb site to search.</string>
-    <string name="gui_custom_locale_key">key_gui_custom_locale</string>
+ 
 	<string name="gui_custom_locale_title">Custom language</string>
 	<string name="gui_custom_locale_sum">Set a custom language.</string>
-        
+
     <string-array name="imdb_urls">
-        <item>akas.imdb.com</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="imdb_urls_values">
         <item>International</item>
         <item>imdb.com</item>
         <item>uk.imdb.com</item>
@@ -113,11 +99,7 @@
         <item>imdb.it</item>
         <item>imdb.pt</item>
     </string-array>
-    <string-array name="lang_values">
-        <item>en</item>
-        <item>de</item>
-        <item>it</item>
-    </string-array>
+
     <string-array name="lang">
         <!-- 
         <item>Default language</item>
@@ -127,28 +109,41 @@
         <item>Italian</item>
     </string-array>
 
+    <string-array name="remux_entries">
+        <item>EXT</item>
+        <item>EXTERN (deprecated)</item>
+    </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>
     <string name="vdr_conntimeout_sum">How long (in seconds) to wait before the connection is established?</string>
-    <string name="vdr_readtimeout_key">key_vdr_readtimeout</string>
+
     <string name="vdr_readtimeout_title">Read Timeout</string>
     <string name="vdr_readtimeout_sum">How long (in seconds) to wait for every read line operation?</string>
-    <string name="vdr_timeout_key">key_vdr_timeout</string>
+
     <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>
+  
 
     <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>
+    
+    
+    <string name="new_vdr">New VDR</string>
+    <string name="no_vdr">No VDR Devices</string>
+    <string name="vdr_devices_category">VDR devices</string>
+    <string name="vdr_prefs_category">Device</string>
+    
+    <string name="vdr_name_title">Name</string>
+    <string name="vdr_name_summary">A name for this device</string>
+    <string name="vdr_device_delete_qeustion">Delete this device?</string>
 </resources>
diff --git a/vdrmanager/res/values/preferences_keys.xml b/vdrmanager/res/values/preferences_keys.xml
index 7eb0c6d..be02025 100644
--- a/vdrmanager/res/values/preferences_keys.xml
+++ b/vdrmanager/res/values/preferences_keys.xml
@@ -1,31 +1,53 @@
 <?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>
-  
+	<string name="vdr_host_key">vdr_host</string>
+	<string name="vdr_name_key">vdr_name</string>
+	<string name="vdr_port_key">vdr_port </string>
+	<string name="vdr_password_key">vdr_password</string>
+	<string name="vdr_ssl_key">vdr_secure</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="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>
+	<string name="current_vdr_id_key">key_current_vdr_id</string>
+
+
+	<string name="streaming_password_key">key_streaming_password</string>
+	<string name="streaming_username_key">key_streaming_username</string>
+	<string name="vdr_encoding_key">key_vdr_encoding</string>
+	
+	<string name="wakeup_enabled_key">key_wakeup_enabled</string>
+	<string name="wakeup_url_key">key_wakeup_url</string>
+	<string name="wakeup_user_key">key_wakeup_user</string>
+	<string name="wakeup_password_key">key_wakeup_password</string>
+	<string name="wakeup_method_key">key_wakeup_method</string>
+	<string name="wakeup_wol_custom_broadcast_key">key_wol_custom_broadcast</string>
+	<string name="wakeup_wol_mac_key">key_wakeup_wol_mac</string>
+	
+	
+	<string name="gui_enable_24h_format_key">key_enable_24h</string>
+	<string name="gui_channels_show_channel_numbers_key">key_channels_show_channel_numbers</string>
+	<string name="qui_quit_on_back_key">key_gui_quit_on_back</string>
+	<string name="qui_show_imdb_button_key">key_qui_show_imdb_button</string>
+	<string name="qui_imdb_url_key">key_qui_imdb_url</string>
+	<string name="gui_custom_locale_key">key_gui_custom_locale</string>
+	
+	
+	<string name="vdr_conntimeout_key">key_conntimeout_key</string>
+	<string name="vdr_readtimeout_key">key_vdr_readtimeout</string>
+	<string name="vdr_timeout_key">key_vdr_timeout</string>
 </resources>
diff --git a/vdrmanager/res/values/styles.xml b/vdrmanager/res/values/styles.xml
index dcedbb0..180c299 100644
--- a/vdrmanager/res/values/styles.xml
+++ b/vdrmanager/res/values/styles.xml
@@ -45,4 +45,17 @@
         <item name="titlePadding">@dimen/default_title_indicator_title_padding</item>
         <item name="topPadding">@dimen/default_title_indicator_top_padding</item>
     </style>
+    
+    
+    <style name="MinusButton">
+        <item name="android:background">@drawable/btn_circle</item>
+        <item name="android:src">@drawable/ic_btn_round_minus</item>
+    </style>
+
+    <style name="PlusButton">
+        <item name="android:background">@drawable/btn_circle</item>
+        <item name="android:src">@drawable/ic_btn_round_plus</item>
+    </style>
+    
+    
 </resources>