From db8177ec1fa3683fdf9b1c459be57df21edd3fce Mon Sep 17 00:00:00 2001
From: git-vdr <herrlado@gmail.com>
Date: Tue, 4 Oct 2011 01:56:35 +0200
Subject: new icons, layout changes, etc

---
 vdrmanager/res/values/action_menu.xml         |  1 +
 vdrmanager/res/values/channel_list.xml        | 17 +++++++++++++++++
 vdrmanager/res/values/channel_list_menu.xml   |  7 -------
 vdrmanager/res/values/common.xml              |  3 +++
 vdrmanager/res/values/epg.xml                 |  5 ++++-
 vdrmanager/res/values/epg_list_menu.xml       |  1 +
 vdrmanager/res/values/errors.xml              |  2 +-
 vdrmanager/res/values/livetv.xml              | 24 ++++++++++++++++++++++++
 vdrmanager/res/values/progress.xml            |  5 +++++
 vdrmanager/res/values/recording_list_menu.xml |  5 +++++
 10 files changed, 61 insertions(+), 9 deletions(-)
 create mode 100644 vdrmanager/res/values/channel_list.xml
 delete mode 100644 vdrmanager/res/values/channel_list_menu.xml
 create mode 100644 vdrmanager/res/values/livetv.xml
 create mode 100644 vdrmanager/res/values/recording_list_menu.xml

(limited to 'vdrmanager/res/values')

diff --git a/vdrmanager/res/values/action_menu.xml b/vdrmanager/res/values/action_menu.xml
index 68d11a3..1e1e148 100644
--- a/vdrmanager/res/values/action_menu.xml
+++ b/vdrmanager/res/values/action_menu.xml
@@ -3,6 +3,7 @@
 
   <string name="action_menu_channels">Channels</string>   
   <string name="action_menu_timers">Timers</string>
+  <string name="action_menu_recordings">Recordings</string>
   <string name="action_menu_epg">EPG list</string>
   <string name="action_menu_search">EPG search</string>
   <string name="action_menu_wakeup">Wakeup</string>
diff --git a/vdrmanager/res/values/channel_list.xml b/vdrmanager/res/values/channel_list.xml
new file mode 100644
index 0000000..8c3bd89
--- /dev/null
+++ b/vdrmanager/res/values/channel_list.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+  <string name="channel_item_menu_epg">Show EPG</string>
+  <string name="channel_item_menu_stream">Show live stream</string>
+  <string name="channel_item_menu_hide">Hide</string>
+  <string name="channel_item_menu_hide_permanent">Hide permanent</string>
+  
+  <string name="channel_group_menu_hide">Hide</string>
+  <string name="channel_group_menu_hide_permanent">Hide permanent</string>
+  
+  <string name="groupby_group">Group</string>
+  <string name="groupby_provider">Provider</string>
+  <string name="groupby_name">Name</string>
+  <string name="groupby_name_all_channels_group">All Channels</string>
+  <string name="groupby_window_title_templte">Group by %1$s</string>
+</resources>
diff --git a/vdrmanager/res/values/channel_list_menu.xml b/vdrmanager/res/values/channel_list_menu.xml
deleted file mode 100644
index 7d88621..0000000
--- a/vdrmanager/res/values/channel_list_menu.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-  <string name="channel_item_menu_epg">Show EPG</string>
-  <string name="channel_item_menu_stream">Show live stream</string>
-  
-</resources>
diff --git a/vdrmanager/res/values/common.xml b/vdrmanager/res/values/common.xml
index 50c6ffd..8fbde34 100644
--- a/vdrmanager/res/values/common.xml
+++ b/vdrmanager/res/values/common.xml
@@ -3,4 +3,7 @@
   <string name="common_delete">Delete</string>
   <string name="prefs_current_value">Current:</string>
   <string name="prefs_current_value_template">Current: %1$s</string>
+  <string name="no_connection">No connection</string>
+  <string name="no_connection_retry">Retry</string>
+  <string name="refresh">Refresh</string>
 </resources>
diff --git a/vdrmanager/res/values/epg.xml b/vdrmanager/res/values/epg.xml
index a1fd152..ee5ae48 100644
--- a/vdrmanager/res/values/epg.xml
+++ b/vdrmanager/res/values/epg.xml
@@ -14,5 +14,8 @@
   
   <!-- search -->
   <string name="epg_search_button">Search</string>
-  
+  <string name="epg_duration_template">%1$s min</string>
+  <string name="epg_duration_template_live">%1$s/%2$s min</string>
+  <string name="epg_of_a_channel">EPG -> %1$s</string>
+
 </resources>
diff --git a/vdrmanager/res/values/epg_list_menu.xml b/vdrmanager/res/values/epg_list_menu.xml
index bde8085..7176f28 100644
--- a/vdrmanager/res/values/epg_list_menu.xml
+++ b/vdrmanager/res/values/epg_list_menu.xml
@@ -9,5 +9,6 @@
   <string name="epg_item_menu_timer_modify">Modify timer</string>
   <string name="epg_item_menu_timer_enable">Enable timer</string>
   <string name="epg_item_menu_timer_disable">Disable timer</string>
+  <string name="epg_no_items">Nothing there…</string>
   
 </resources>
diff --git a/vdrmanager/res/values/errors.xml b/vdrmanager/res/values/errors.xml
index e954a26..9e0aa78 100644
--- a/vdrmanager/res/values/errors.xml
+++ b/vdrmanager/res/values/errors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-  <string name="vdr_error_text">The communication with VDR has caused some error.</string>
+  <string name="vdr_error_text">The communication with VDR has caused an error: %1$s</string>
   
 </resources>
diff --git a/vdrmanager/res/values/livetv.xml b/vdrmanager/res/values/livetv.xml
new file mode 100644
index 0000000..266f862
--- /dev/null
+++ b/vdrmanager/res/values/livetv.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<string name="livetv">Live TV</string>
+	<string name="settings_livetv_summary">Needs streamdev-server on VDR and an external
+		player such as VPlayer</string>
+	<string name="settings_livetv_streamformat">Streamformat</string>
+	<string name="settings_livetv_port">Streaming Port</string>
+	<string name="settings_livetv_port_summary">Default 3000. The access must be enabled in
+		streamdevhosts.conf.</string>
+	<string-array name="livetv_streamformat">
+		<item>TS</item>
+		<item>PES</item>
+		<item>ES</item>
+		<item>PS</item>
+		<item>External</item>
+	</string-array>
+	<string-array name="livetv_streamformat_values">
+		<item>TS</item>
+		<item>PES</item>
+		<item>ES</item>
+		<item>PS</item>
+		<item>EXT</item>
+	</string-array>
+</resources>
diff --git a/vdrmanager/res/values/progress.xml b/vdrmanager/res/values/progress.xml
index 2fb5580..7c25559 100644
--- a/vdrmanager/res/values/progress.xml
+++ b/vdrmanager/res/values/progress.xml
@@ -3,10 +3,12 @@
   
   <!--  progress -->
   <string name="progress_connect">Connecting …</string>
+  <string name="progress_connect_error">Connection failed</string>
   <string name="progress_login">Login …</string>
   <string name="progress_login_error">Login failed</string>
   <string name="progress_whatson_loading">Loading EPG …</string>
   <string name="progress_timers_loading">Loading timers …</string>
+  <string name="progress_recordings_loading">Loading recordings …</string>
   <string name="progress_channels_loading">Loading channels …</string>
   <string name="progress_disconnect">Disconnecting …</string>
   <string name="progress_wakeup_sending">Initiating wakeup request …</string>
@@ -16,5 +18,8 @@
   <string name="progress_timer_delete">Deleting timer …</string>
   <string name="progress_timer_enable">Enabling timer …</string>
   <string name="progress_timer_disable">Disabling timer …</string>
+  <string name="progress_connect_finished_abnormal">Connection finished abnormal …</string>
+  <string name="progress_connect_finished_abnormal_arg">Connection finished abnormal: %1$s</string>
+  <string name="progress_cache_hit">Loading from cache …</string>
   
 </resources>
diff --git a/vdrmanager/res/values/recording_list_menu.xml b/vdrmanager/res/values/recording_list_menu.xml
new file mode 100644
index 0000000..58ac2d3
--- /dev/null
+++ b/vdrmanager/res/values/recording_list_menu.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="recording_item_menu_delete">Delete</string>
+  <string name="recording_item_menu_stream">Stream</string>
+</resources>
-- 
cgit v1.2.3