new entries

2 files changed, 53 insertions, 23 deletions

diff --git a/vdrmanager/res/values/arrays.xml b/vdrmanager/res/values/arrays.xml
index 33e08ac..6fb2fea 100644
--- a/vdrmanager/res/values/arrays.xml
+++ b/vdrmanager/res/values/arrays.xml
@@ -34,5 +34,12 @@
         <item>vdr-streamdev</item>
     </string-array>
 
+  <string-array name="recent_channels_order_entry_values">
+    <item>most</item>
+    <item>last</item>
+  </string-array>
+
+
+
 
 </resources>
\ No newline at end of file
diff --git a/vdrmanager/res/values/strings.xml b/vdrmanager/res/values/strings.xml
index 9812c55..70609f5 100644
--- a/vdrmanager/res/values/strings.xml
+++ b/vdrmanager/res/values/strings.xml
@@ -18,6 +18,7 @@
     <string name="groupby_group">Group</string>
     <string name="groupby_provider">Provider</string>
     <string name="groupby_name">Name</string>
+    <string name="groupby_source">Source</string>
     <string name="groupby_channel">By Channel</string>
     <string name="groupby_date">By Date</string>
     <string name="groupby_name_all_channels_group">All Channels</string>
@@ -35,16 +36,14 @@
     <string name="addtocal">Add to calendar</string>
     <string name="search_reapt">Reruns</string>
     <string name="share_chooser">Share EPG Entry</string>
-    <string name="about_text">
-        About "VDR-Manager" Software for Android\n
+    <string name="about_text">        About "VDR-Manager" Software for Android\n
 		This is Version %1$s\n
         If you have a VDR at home reachable
          over the internet and own a mobile phone running Android then you possibly find this program useful.
          For further details visit http://projects.vdr-developer.org/projects/vdr-manager/wiki.
          Author:\n
           bju&lt;herrlado@gmail.com>
-          herrlado&lt;herrlado@gmail.com>
-    </string>
+          herrlado&lt;herrlado@gmail.com></string>
     <string name="about_title">About</string>
     <string name="no_internet_connection">No data connection</string>
     <string name="update_will_start_in">Update will start in one second</string>
@@ -212,16 +211,12 @@
     <string name="qui_show_imdb_button_summary_off">IMDb Button is not shown</string>
     <string name="qui_imdb_url_title">IMDb Site</string>
     <string name="qui_imdb_url_summary">Which IMDb site to search.</string>
-
     <string name="qui_show_omdb_button_title">Show OMDB Button</string>
     <string name="qui_show_omdb_button_summary_on">OMDB Button is shown</string>
     <string name="qui_show_omdb_button_summary_off">OMDB Button is not shown</string>
-
     <string name="qui_show_tmdb_button_title">Show TMDb Button</string>
     <string name="qui_show_tmdb_button_summary_on">TMDb Button is shown</string>
     <string name="qui_show_tmdb_button_summary_off">TMDb Button is not shown</string>
-
-
     <string name="gui_custom_locale_title">Custom language</string>
     <string name="gui_custom_locale_sum">Set a custom language.</string>
 
@@ -237,7 +232,7 @@
     </string-array>
     <string-array name="lang">
 
-<!--         <item>Default language</item> -->
+        <!-- <item>Default language</item> -->
         <item>English</item>
         <item>German</item>
         <item>Italian</item>
@@ -310,24 +305,30 @@
     <string name="recording_item_menu_delete">Delete</string>
     <string name="recording_item_menu_stream">Stream</string>
     <string name="recent_channels">Recent channels</string>
-	<string name="recent_channels_no_history">No history…</string>
-	<string name="gui_max_recent_channels_title">Max. recent channels</string>
-	<string name="gui_max_recent_channels_summary">How many channels should be kept in the recent channels?</string>
-	<string name="timer_detail_day_title">Day</string>
+    <string name="recent_channels_no_history">No history…</string>
+    <string name="gui_max_recent_channels_title">Max. recent channels</string>
+    <string name="gui_max_recent_channels_summary">How many channels should be kept in the recent channels?</string>
+    <string name="timer_detail_day_title">Day</string>
 
-    <!-- Repeat options that appear under an alarm on main Alarm Clock
+    <!--
+         Repeat options that appear under an alarm on main Alarm Clock
          screen to identify repetition schedule: special case for when
-         the alarm is set to repeat every day -->
+         the alarm is set to repeat every day
+    -->
     <string name="every_day">Every day</string>
 
-    <!-- Repeat options that appear under an alarm on main Alarm Clock
+    <!--
+         Repeat options that appear under an alarm on main Alarm Clock
          screen to identify repetition schedule: special case for when
-         the alarm is set to never repeat -->
+         the alarm is set to never repeat
+    -->
     <string name="never">Never</string>
 
-    <!-- Repeat options that appear under an alarm on main Alarm Clock
+    <!--
+         Repeat options that appear under an alarm on main Alarm Clock
          screen to identify repetition schedule: concatenate days with
-         this character, i.e. "Mon, Tue, Wed" -->
+         this character, i.e. "Mon, Tue, Wed"
+    -->
     <string name="day_concat">", "</string>
     <string name="timer_detail_repeat_title">Repeat</string>
     <string name="timer_detail_use_vps">Use VPS:</string>
@@ -335,20 +336,42 @@
     <string name="timer_detail_lifetime">Lifetime:</string>
     <string name="timer_detail_lifetime_hint">e.g. 99</string>
     <string name="timer_detail_priority_hint">e.g. 50</string>
-
-
     <string name="timer_detail_title_vps">%1$s (VPS)</string>
-
     <string name="channel_item_menu_switch">Switch to</string>
     <string name="switching_success">Switched to %s</string>
     <string name="switching_failed">Switching to %1$s failed: %2$s</string>
     <string name="switch_to_channel">Switch to</string>
     <string name="sort">Sort</string>
     <string name="sortby">Sort by</string>
-  	<string name="sortby_time">Time</string>
+    <string name="sortby_time">Time</string>
+    <string name="sortby_channel">Channel</string>
     <string name="sortby_alphabet">Alphabet</string>
     <string name="sortby_channellist">Chanellist</string>
     <string name="main_menu_clear_search">Clear Search History</string>
     <string name="vdr_host_not_defined">VDR host not defined</string>
     <string name="processing">Processing…</string>
+
+    <string-array name="recent_channels_order_entries">
+        <item>Mostly used</item>
+        <item>Last used</item>
+    </string-array>
+    <string-array name="epg_sort_by_time_alpha">
+        <item>Time</item>
+        <item>Alphabet</item>
+    </string-array>
+    <string-array name="epg_sort_by_channels_alpha">
+        <item>Channels</item>
+        <item>Alphabet</item>
+    </string-array>
+
+    <string name="gui_recent_channels_order_summary">Sort by last used or mostly used</string>
+    <string name="gui_recent_channels_order_title">Recent Channels Sorting</string>
+
+    <string-array name="channels_group_by">
+        <item>Group</item>
+        <item>Provider</item>
+        <item>Source</item>
+        <item>Name</item>
+    </string-array>
+
 </resources>
\ No newline at end of file