fix tvmoviewdb search

8 files changed, 855 insertions, 461 deletions

diff --git a/vdrmanager/app/app-release.apk b/vdrmanager/app/app-release.apk
index 072db46..9a382a9 100644
--- a/vdrmanager/app/app-release.apk
+++ b/vdrmanager/app/app-release.apk
diff --git a/vdrmanager/app/build.gradle b/vdrmanager/app/build.gradle
index e645308..acc2bdd 100644
--- a/vdrmanager/app/build.gradle
+++ b/vdrmanager/app/build.gradle
@@ -1,6 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
+    lintOptions {
+        checkReleaseBuilds false
+        // Or, if you prefer, you can continue to check for errors in release builds,
+        // but continue the build even when errors are found:
+        abortOnError false
+    }
     signingConfigs {
         config {
             keyAlias 'vdrmanager'
diff --git a/vdrmanager/app/src/main/AndroidManifest.xml b/vdrmanager/app/src/main/AndroidManifest.xml
index d47cb2b..bc0ebdb 100644
--- a/vdrmanager/app/src/main/AndroidManifest.xml
+++ b/vdrmanager/app/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="de.bjusystems.vdrmanager"
-    android:versionCode="12300"
-    android:versionName="12.30" >
+    android:versionCode="12400"
+    android:versionName="12.40" >
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
diff --git a/vdrmanager/app/src/main/java/de/bjusystems/vdrmanager/gui/EpgDetailsActivity.java b/vdrmanager/app/src/main/java/de/bjusystems/vdrmanager/gui/EpgDetailsActivity.java
index 1086c40..bd6a8bf 100644
--- a/vdrmanager/app/src/main/java/de/bjusystems/vdrmanager/gui/EpgDetailsActivity.java
+++ b/vdrmanager/app/src/main/java/de/bjusystems/vdrmanager/gui/EpgDetailsActivity.java
@@ -73,7 +73,7 @@ public class EpgDetailsActivity extends ActionBarActivity implements
 
     private static final String TMDB_URL_ENCODING = "UTF-8";
 
-    public static String TMDB_URL = "http://www.themoviedb.org/search?search=%s";
+    public static String TMDB_URL = "http://www.themoviedb.org/search?query=%s";
 
     private String highlight = null;
 
diff --git a/vdrmanager/app/src/main/res/values-de/strings.xml b/vdrmanager/app/src/main/res/values-de/strings.xml
index e73d96a..83e4867 100644
--- a/vdrmanager/app/src/main/res/values-de/strings.xml
+++ b/vdrmanager/app/src/main/res/values-de/strings.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
-<resources>
+<!--Generated by crowdin.com-->
+<resources xmlns:tools="http://schemas.android.com/tools">
   <string name="action_menu_channels">Kanäle</string>
   <string name="action_menu_timers">Timers</string>
   <string name="action_menu_recordings">Aufnahmen</string>
   <string name="action_menu_epg">EPG Liste</string>
   <string name="action_menu_search">EPG Suche</string>
   <string name="action_menu_wakeup">Aufwecken</string>
+  <string name="action_menu_remote">Remote</string>
   <string name="app_name">VDR-Manager</string>
   <string name="channel_item_menu_epg">Zeige EPG</string>
   <string name="channel_item_menu_stream">Livestream</string>
@@ -54,18 +55,20 @@ herrlado&lt;herrlado@gmail.com&gt;</string>
   <string name="epg_item_menu_timer_modify">Bearbeite Timer</string>
   <string name="epg_item_menu_timer_enable">Aktiviere Timer</string>
   <string name="epg_item_menu_timer_disable">Deaktiviere Timer</string>
-  <string name="epg_no_items">Nichts gefunden…</string>
-  <string name="epg_client_errors">Ein Fehler ist aufgetreten, prüfe Log…</string>
+  <string name="epg_no_items">Nichts gefunden&#8230;</string>
+  <string name="epg_client_errors">Ein Fehler ist aufgetreten, prüfe Log&#8230;</string>
   <string name="navigae_at_the_end">Ende</string>
   <string name="navigae_at_the_start">Anfang</string>
   <string name="epg_search_times_add">Zeit hinzufügen</string>
   <string name="epg_search_times_window">Selbstdefinierte Zeiten</string>
+  <!-- What's on display -->
   <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">freie Zeitwahl</string>
   <string name="epg_list_channel_spinner">Kanal</string>
   <string name="epg_list_search_label">Suchergebnisse</string>
+  <!-- create timer -->
   <string name="epg_event_share_text">Share</string>
   <string name="epg_event_imdb_text">IMDb Suche</string>
   <string name="epg_event_omdb_text">OMDB Suche</string>
@@ -73,6 +76,7 @@ herrlado&lt;herrlado@gmail.com&gt;</string>
   <string name="epg_eent_livetv_text">Stream</string>
   <string name="epg_event_create_timer_text">Timer hinzufügen</string>
   <string name="epg_event_modify_timer_text">Timer modifizieren</string>
+  <!-- search -->
   <string name="epg_search_button">Suchen</string>
   <string name="epg_duration_template">%1$s min</string>
   <string name="epg_duration_template_live">%1$s/%2$s min</string>
@@ -94,6 +98,12 @@ herrlado&lt;herrlado@gmail.com&gt;</string>
   <string name="settings_livetv_port">Stream-Port</string>
   <string name="settings_livetv_port_summary">Default 3000. Der Zugriff muss in der Datei
 		streamdevhosts.conf aktiviert sein.</string>
+  <string-array name="livetv_streamformat">
+    <item>TS</item>
+    <item>PES</item>
+    <item>ES</item>
+    <item>PS</item>
+  </string-array>
   <string name="key_remux_enable">remux_enable</string>
   <string name="key_remux_command">remux_command</string>
   <string name="key_remux_parameter">remux_parameter</string>
@@ -112,11 +122,12 @@ herrlado&lt;herrlado@gmail.com&gt;</string>
   <string name="main_menu_info">Infomationen</string>
   <string name="main_menu_exit">Beenden</string>
   <string name="main_menu_goto">Gerät umstellen</string>
-  <string name="main_menu_goto_title">Umstellen auf…</string>
+  <string name="main_menu_goto_title">Umstellen auf&#8230;</string>
   <string name="main_menu_goto_no_vdr">Das gewählte Gerät kann nicht geladen werden :(</string>
   <string name="main_menu_switched_to">Umgestellt auf %1$s</string>
   <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">VDR Hostrechner</string>
@@ -125,12 +136,14 @@ herrlado&lt;herrlado@gmail.com&gt;</string>
   <string name="vdr_password_title">VDR Plugin Passwort</string>
   <string name="vdr_password_summary">Passwort für das VDR Plugin</string>
   <string name="vdr_ssl_title">Sichere Verbindung</string>
-  <string name="vdr_ssl_summary">Verwende SSL für Verbindungen</string>
+  <string name="vdr_ssl_summary">Verwende SSL für Verbindungen (aktuell nicht implementiert)</string>
+  <!-- channel filter preferences -->
   <string name="channel_filter_preferences">Kanaleinstellungen</string>
   <string name="channel_filter_filter_title">Begrenze Kanäle</string>
   <string name="channel_filter_filter_summary">Nur ausgewählte Kanäle verwenden</string>
   <string name="channel_filter_last_title">Kanalfilter</string>
   <string name="channel_filter_last_summary">Kommagetrennte Kanalnummern oder Bereiche (\'-\'). z.B. 1,2,4-10</string>
+  <!-- wakeup -->
   <string name="wakeup_preferences">Ferngesteueren VDR Rechner wecken</string>
   <string name="wakeup_enabled_title">VDR kann geweckt werden</string>
   <string name="wakeup_enabled_summary">Aktiviert das Wecken des ferngesteuerten VDR Rechners</string>
@@ -142,10 +155,15 @@ herrlado&lt;herrlado@gmail.com&gt;</string>
   <string name="wakeup_password_summary">Passwort für Remote-Wecken</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 name="wakeup_wol_custom_boradcast_title">Ziel IP-Adresse</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_mac_title">MAC-Adresse</string>
   <string name="wakeup_wol_mac_summary">MAC-Adresse des VDR Rechners. Verwende \':\' , \'-\' oder ein Leerzeichen als Trennzeichen.</string>
+  <!-- timer -->
   <string name="timer_preferences">Voreinstellungen für Timer</string>
   <string name="timer_pre_start_buffer_title">Vorlaufzeit</string>
   <string name="timer_pre_start_buffer_summary">Minuten der Aufzeichnung vor dem Beginn der Sendung</string>
@@ -157,6 +175,9 @@ herrlado&lt;herrlado@gmail.com&gt;</string>
   <string name="timer_default_primary_limit_summary">Standardmässig verwendetes Primärlimit</string>
   <string name="timer_default_lifetime_title">Lebenszeit</string>
   <string name="timer_default_lifetime_summary">Standardmässig verwendete Lebenszeit</string>
+  <string name="timer_already_exists">Timer already defined.</string>
+  <string name="timer_created">Timer created</string>
+  <!-- GUI -->
   <string name="gui_preferences">Einstellungen der Benutzeroberfläche</string>
   <string name="gui_enable_24h_format_title">Verwende 24-h Format</string>
   <string name="gui_enable_24h_format_summary_on">13:00</string>
@@ -179,6 +200,29 @@ herrlado&lt;herrlado@gmail.com&gt;</string>
   <string name="qui_show_tmdb_button_summary_off">TMDb Button wird nicht angezeigt</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>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">
+    <!-- <item>Default language</item> -->
+    <item>Englisch</item>
+    <item>Deutsch</item>
+    <item>Französisch</item>
+    <item>Italienisch</item>
+    <item>Polnisch</item>
+    <item>Ukrainian</item>
+  </string-array>
+  <string-array name="remux_entries">
+    <item>EXT</item>
+    <item>EXTERN (veraltet)</item>
+  </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>
@@ -203,43 +247,69 @@ herrlado&lt;herrlado@gmail.com&gt;</string>
   <string name="recstream">Streaming von Aufzeichnungen</string>
   <string name="recstream_enable_title">Streaming von Aufzeichnungen</string>
   <string name="recstream_enable_summary">Streaming von Aufzeichnungen aktivieren</string>
+  <string-array name="recstream_entries">
+    <item>Live-plugin</item>
+    <item>VDR streamdev plugin</item>
+    <item>Smarttvweb plugin</item>
+  </string-array>
+  <string-array name="recstream_smarttvweb_entries">
+    <item>Progressive</item>
+    <item>MPEG-DASH</item>
+    <item>Apple HLS</item>
+  </string-array>
   <string name="recstream_method_title">Streamingmethode</string>
   <string name="recstream_method_summary">Momentan wird Streaming über VDR live oder das streamdev-plugin unterstützt</string>
   <string name="settings_live_port">VDR Live-Plugin Port</string>
   <string name="settings_live_port_summary">VDR Live-Plugin hat standardmäßig den Port 8008.</string>
-  <string name="progress_connect">Verbinde…</string>
+  <!-- progress -->
+  <string name="progress_connect">Verbinde&#8230;</string>
   <string name="progress_connect_error">Verbindung fehlgeschlagen!</string>
   <string name="progress_connect_timeout">Zeitüberschreitung beim Verbindungsaufbau!</string>
   <string name="progress_login">Anmelden.</string>
   <string name="progress_login_error">Anmelden fehlgeschlagen.</string>
-  <string name="progress_whatson_loading">Lade EPG…</string>
-  <string name="progress_timers_loading">Lade Timer…</string>
-  <string name="progress_recordings_loading">Lade Aufnahmen…</string>
-  <string name="progress_switching">Umschalten…</string>
-  <string name="progress_channels_loading">Lade Kanäle…</string>
-  <string name="progress_loading">Lade…</string>
-  <string name="progress_disconnect">Trenne…</string>
-  <string name="progress_wakeup_sending">Initalisiere aufwecken…</string>
+  <string name="progress_whatson_loading">Lade EPG&#8230;</string>
+  <string name="progress_timers_loading">Lade Timer&#8230;</string>
+  <string name="progress_recordings_loading">Lade Aufnahmen&#8230;</string>
+  <string name="progress_switching">Umschalten&#8230;</string>
+  <string name="progress_channels_loading">Lade Kanäle&#8230;</string>
+  <string name="progress_loading">Lade&#8230;</string>
+  <string name="progress_disconnect">Trenne&#8230;</string>
+  <string name="progress_wakeup_sending">Initalisiere aufwecken&#8230;</string>
   <string name="progress_wakeup_sent">Aufforderung zum Wecken gesendet</string>
   <string name="progress_wakeup_error">Fehler beim Senden der Aufforderung zum Wecken: %1$s</string>
-  <string name="progress_timer_save">Speichere Timer…</string>
-  <string name="progress_timer_delete">Lösche Timer…</string>
-  <string name="progress_recording_delete">Lösche Aufnahme…</string>
-  <string name="progress_timer_enable">Aktiviere Timer…</string>
-  <string name="progress_timer_modify">Modifiziere Timer…</string>
-  <string name="progress_timer_disable">Deaktiviere Timer…</string>
+  <string name="progress_timer_save">Speichere Timer&#8230;</string>
+  <string name="progress_timer_delete">Lösche Timer&#8230;</string>
+  <string name="progress_recording_delete">Lösche Aufnahme&#8230;</string>
+  <string name="progress_timer_enable">Aktiviere Timer&#8230;</string>
+  <string name="progress_timer_modify">Modifiziere Timer&#8230;</string>
+  <string name="progress_timer_disable">Deaktiviere Timer&#8230;</string>
   <string name="progress_connect_finished_abnormal">Verbindung unnormal beeendet…</string>
   <string name="progress_connect_finished_abnormal_arg">Verbindung unnormal beeendet: %1$s</string>
   <string name="progress_cache_hit">Lade aus Cache.</string>
   <string name="recording_item_menu_delete">Löschen</string>
   <string name="recording_item_menu_stream">Stream</string>
   <string name="recent_channels">Letzte Kanäle</string>
-  <string name="recent_channels_no_history">Keine aktuellen Kanäle gefunden…</string>
+  <string name="recent_channels_no_history">Keine aktuellen Kanäle gefunden&#8230;</string>
   <string name="gui_max_recent_channels_title">Maximale Kanalhistory</string>
   <string name="gui_max_recent_channels_summary">Wie viele Kanäle sollen in der Kanalhistory verbleiben?</string>
   <string name="timer_detail_day_title">Tag</string>
+  <!--
+         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
+    -->
   <string name="every_day">Jeden Tag</string>
+  <!--
+         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
+    -->
   <string name="never">Nie</string>
+  <!--
+         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"
+    -->
   <string name="day_concat">", "</string>
   <string name="timer_detail_repeat_title">Wiederholung</string>
   <string name="timer_detail_use_vps">Verwende VPS:</string>
@@ -260,57 +330,7 @@ herrlado&lt;herrlado@gmail.com&gt;</string>
   <string name="sortby_channellist">Kanalliste</string>
   <string name="main_menu_clear_search">Lösche Such-History</string>
   <string name="vdr_host_not_defined">VDR-Server nicht definiert</string>
-  <string name="processing">Ausführen…</string>
-  <string name="gui_recent_channels_order_summary">Sortiere nach zuletzt genutzt oder am häufigsten genutzt</string>
-  <string name="gui_recent_channels_order_title">Sortierung der aktuellen Kanäle</string>
-  <string name="filter">Filter</string>
-  <string name="audio_tracks_template">Audio Spuren: %1$s</string>
-  <string name="audio_track_dolby">D</string>
-  <string name="vdr_timezone_summary">Die Zeitzone des Servers. Das ist wichtig, falls sie verreisen und Timer von einer anderen Zeitzone aus bearbeiten.</string>
-  <string name="vdr_timezone_title">Zeitzone des Servers wählen</string>
-  <string name="zone_list_menu_sort_alphabetically">Sortiere alphabetisch</string>
-  <string name="zone_list_menu_sort_by_timezone">Sortiere nach Zeitzone</string>
-  <string name="probing">Prüfe %1$s …</string>
-  <string name="no_results">Keine Ergebnisse…</string>
-  <string name="recording_started">Aufzeichnung gestartet</string>
-  <string name="set_time">Zeit setzen</string>
-  <string-array name="livetv_streamformat">
-    <item>TS</item>
-    <item>PES</item>
-    <item>ES</item>
-    <item>PS</item>
-  </string-array>
-  <string-array name="wakeup_methods">
-    <item>Rufe ein URL auf</item>
-    <item>WOL</item>
-  </string-array>
-  <string-array name="imdb_urls">
-    <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">
-    <item>Englisch</item>
-    <item>Deutsch</item>
-    <item>Französisch</item>
-    <item>Italienisch</item>
-    <item>Polnisch</item>
-    <item>Ukrainisch</item>
-  </string-array>
-  <string-array name="remux_entries">
-    <item>EXT</item>
-    <item>EXTERN (veraltet)</item>
-  </string-array>
-  <string-array name="recstream_entries">
-    <item>VDR live plugin</item>
-    <item>VDR streamdev plugin</item>
-    <item>VDR smattvweb plugin</item>
-  </string-array>
+  <string name="processing">Ausführen&#8230;</string>
   <string-array name="recent_channels_order_entries">
     <item>Am meisten genutzt</item>
     <item>Zuletzt genutzt</item>
@@ -319,6 +339,11 @@ herrlado&lt;herrlado@gmail.com&gt;</string>
     <item>Zeit</item>
     <item>Alphabet</item>
   </string-array>
+  <string-array name="epg_sort_by_time_alpha_channel">
+    <item>Time</item>
+    <item>Alphabet</item>
+    <item>Channel</item>
+  </string-array>
   <string-array name="epg_sort_by_channels_alpha">
     <item>Kanäle</item>
     <item>Alphabet</item>
@@ -327,6 +352,8 @@ herrlado&lt;herrlado@gmail.com&gt;</string>
     <item>Nach Zeit</item>
     <item>Alphabetisch</item>
   </string-array>
+  <string name="gui_recent_channels_order_summary">Sortiere nach zuletzt genutzt oder am häufigsten genutzt</string>
+  <string name="gui_recent_channels_order_title">Sortierung der aktuellen Kanäle</string>
   <string-array name="channels_group_by">
     <item>Gruppe</item>
     <item>Anbieter</item>
@@ -339,114 +366,142 @@ herrlado&lt;herrlado@gmail.com&gt;</string>
     <item>EPG nach Kanal</item>
     <item>Aufzeichnungen</item>
     <item>Timer</item>
+    <item>Remote</item>
   </string-array>
-
-    <!--
-       SSL related messages
-   -->
-
-  <string name="certificate_problem_message_title">Zertifikat-Warnung</string>
-  <string name="certificate_problem_message_text" formatted="false">
-Das Zertifikat des Servers wurde nicht akzeptiert:\n\n
+  <string name="filter">Filter</string>
+  <string name="audio_tracks_template">Audio Spuren: %1$s</string>
+  <string name="audio_track_dolby">D</string>
+  <string name="vdr_timezone_summary">Die Zeitzone des Servers. Das ist wichtig, falls sie verreisen und Timer von einer anderen Zeitzone aus bearbeiten.</string>
+  <string name="vdr_timezone_title">Zeitzone des Servers wählen</string>
+  <string name="zone_list_menu_sort_alphabetically">Sortiere alphabetisch</string>
+  <string name="zone_list_menu_sort_by_timezone">Sortiere nach Zeitzone</string>
+  <string name="probing">Prüfe %1$s &#8230;</string>
+  <string name="no_results">Keine Ergebnisse&#8230;</string>
+  <string name="recording_started">Aufzeichnung gestartet</string>
+  <string name="set_time">Zeit setzen</string>
+  <!-- … -->
+  <!-- 	     SSL related messages -->
+  <string name="certificate_problem_message_title">Zertifikatswarnung</string>
+  <string name="certificate_problem_message_text">
+Das Serverzertifikat wurde nicht akzeptiert:\n\n
 Hostname:\n
- %s\n
-Gültig ab:\n
- %s\n
+ %1$s\n
+Gültig von:\n
+ %2$s\n
 Gültig bis:\n
- %s\n\n
-Was wollen Sie tun?
-  </string>
-  <string name="certificate_accept_once">Einmal akzeptieren</string>
+ %3$s\n\n
+Wie soll verfahren werden?</string>
+  <string name="certificate_accept_once">Einmalig akzeptieren</string>
   <string name="certificate_accepted_forever">Immer akzeptieren</string>
-  <string name="certificate_not_accepted">Nicht akzeptieren</string>
-
-
-
-<!-- EPG Content -->
-
-
-<string name="Content$Show__Game_Show">Show/Spielshow</string>
-<string name="Content$Athletics">Athletik</string>
-<string name="Content$Musical__Opera">Musical/Oper</string>
-<string name="Content$Tourism__Travel">Tourismus/Reisen</string>
-<string name="Content$Languages">Sprachen</string>
-<string name="Content$Documentary">Dokumentation</string>
-<string name="Content$Further_Education">Weiterbildung</string>
-<string name="Content$Martial_Sports">Kampfsport</string>
-<string name="Content$Equestrian">Reitsport</string>
-<string name="Content$Fine_Arts">Bildende Künste</string>
-<string name="Content$Folk__Tradional_Music">Volks/Traditionelle Musik</string>
-<string name="Content$Original_Language">Originalsprache</string>
-<string name="Content$Economics__Social_Advisory">Wirtschafts/Gesellschaftsberatung</string>
-<string name="Content$News_Magazine">Nachrichtenmagazin</string>
-<string name="Content$Arts__Culture_Magazine">Kunst/Kulturmagazin</string>
-<string name="Content$Movie__Drama">Film/Drama</string>
-<string name="Content$Preschool_Childrens_Programme">Programm für Vorschulkinder</string>
-<string name="Content$Fitness_and_Health">Fitness &amp; Gesundheit</string>
-<string name="Content$Film__Cinema">Film/Kino</string>
-<string name="Content$Cooking">Kochen</string>
-<string name="Content$News__Current_Affairs">Aktuelle Angelegenheiten</string>
-<string name="Content$Entertainment_Programme_for_6_to_14">Unterhaltungsprogramm für 6 bis 14</string>
-<string name="Content$Music__Ballet__Dance">Musik/Ballett/Tanz</string>
-<string name="Content$New_Media">Neue Medien</string>
-<string name="Content$Black_and_White">Schwarz-weiß</string>
-<string name="Content$Informational__Educational__School_Programme">Informations/Lehr/Schul-Programm</string>
-<string name="Content$Handicraft">Handwerk</string>
-<string name="Content$Remarkable_People">Bemerkenswerte Leute</string>
-<string name="Content$Adventure__Western__War">Abenteuer/Western/Krieg</string>
-<string name="Content$Science_Fiction__Fantasy__Horror">Science-Fiction/Fantasy/Horror</string>
-<string name="Content$Water_Sport">Wassersport</string>
-<string name="Content$Football__Soccer">Football/Fußball</string>
-<string name="Content$Foreign_Countries__Expeditions">Ausland/Expeditionen</string>
-<string name="Content$Variety_Show">Variete-Show</string>
-<string name="Content$Education__Science__Factual">Ausbildung/Wissenschaft/Sachlich</string>
-<string name="Content$Jazz">Jazz</string>
-<string name="Content$Adult_Movie__Drama">Erwachsenen-Film/Drama</string>
-<string name="Content$Comedy">Komödie</string>
-<string name="Content$Unpublished">Unveröffentlicht</string>
-<string name="Content$Social__Political__Economics">Gesellschaft/Politik/Wirtschaft</string>
-<string name="Content$Entertainment_Programme_for_10_to_16">Unterhaltungsprogramm für 10 bis 16</string>
-<string name="Content$Popular_Culture__Traditional_Arts">Pop-Kultur/Traditionelle Künste</string>
-<string name="Content$Leisure__Hobbies">Freizeit/Hobbies</string>
-<string name="Content$Detective__Thriller">Detektiv/Thriller</string>
-<string name="Content$Serious__Classical_Music">Ernste/Klassische Musik</string>
-<string name="Content$Discussion__Inverview__Debate">Diskussion/Interview/Debatte</string>
-<string name="Content$Social__Spiritual_Sciences">Sozial/Geisteswissenschaften</string>
-<string name="Content$Soap__Melodrama__Folkloric">Seife/Melodram/Folklore</string>
-<string name="Content$Ballet">Ballett</string>
-<string name="Content$Fashion">Mode</string>
-<string name="Content$Winter_Sports">Wintersport</string>
-<string name="Content$Cartoons__Puppets">Zeichentrick/Puppen</string>
-<string name="Content$Sports">Sport</string>
-<string name="Content$Technology__Natural_Sciences">Technik/Naturwissenschaften</string>
-<string name="Content$Literature">Literatur</string>
-<string name="Content$Motor_Sport">Motorsport</string>
-<string name="Content$Sport_Magazine">Sportmagazin</string>
-<string name="Content$Romance">Romanze</string>
-<string name="Content$Arts__Culture">Kunst/Kultur</string>
-<string name="Content$Serious__Classical__Religious__Historical_Movie__Drama">Ernst/Klassik/Religion/Historischer Film/Drama</string>
-<string name="Content$News__Weather_Report">Wetterbericht</string>
-<string name="Content$Special_Event">Besonderes Ereignis</string>
-<string name="Content$Childrens__Youth_Programme">Kinder/Jugendprogramm</string>
-<string name="Content$Gardening">Gartenbau</string>
-<string name="Content$Rock__Pop">Rock/Pop</string>
-<string name="Content$Religion">Religion</string>
-<string name="Content$Nature__Animals__Environment">Natur/Tiere/Umwelt</string>
-<string name="Content$Broadcasting__Press">Rundfunk/Presse</string>
-<string name="Content$Talk_Show">Talkshow</string>
-<string name="Content$Live_Broadcast">Live-Sendung</string>
-<string name="Content$Advertisement__Shopping">Werbung/Einkaufen</string>
-<string name="Content$Performing_Arts">Darstellende Künste</string>
-<string name="Content$Experimental_Film__Video">Experimentalfilm/Video</string>
-<string name="Content$Magazine__Report__Documentary">Magazin/Bericht/Dokumentation</string>
-<string name="Content$Tennis__Squash">Tennis/Squash</string>
-<string name="Content$Game_Show__Quiz__Contest">Spielshow/Quiz/Wettbewerb</string>
-<string name="Content$Medicine__Physiology__Psychology">Medizin/Physiologie/Psychologie</string>
-<string name="Content$Motoring">Autofahren</string>
-<string name="Content$Team_Sports">Mannschaftssport</string>
-<string name="search">Suchen</string>
-
-<!--  EPG Content END -->
-
-
+  <string name="certificate_not_accepted">Abbruch</string>
+  <!-- EPG Content -->
+  <string name="Content$Movie__Drama">Film/Drama</string>
+  <string name="Content$Detective__Thriller">Detektiv/Thriller</string>
+  <string name="Content$Adventure__Western__War">Abenteuer/Western/Krieg</string>
+  <string name="Content$Science_Fiction__Fantasy__Horror">Science-Fiction/Fantasy/Horror</string>
+  <string name="Content$Comedy">Komödie</string>
+  <string name="Content$Soap__Melodrama__Folkloric">Seife/Melodram/Folklore</string>
+  <string name="Content$Romance">Romanze</string>
+  <string name="Content$Serious__Classical__Religious__Historical_Movie__Drama">Ernst/Klassik/Religion/Historischer Film/Drama</string>
+  <string name="Content$Adult_Movie__Drama">Erwachsenen-Film/Drama</string>
+  <string name="Content$News__Current_Affairs">Aktuelle Angelegenheiten</string>
+  <string name="Content$News__Weather_Report">Wetterbericht</string>
+  <string name="Content$News_Magazine">Nachrichtenmagazin</string>
+  <string name="Content$Documentary">Dokumentation</string>
+  <string name="Content$Discussion__Inverview__Debate">Diskussion/Interview/Debatte</string>
+  <string name="Content$Show__Game_Show">Show/Spielshow</string>
+  <string name="Content$Game_Show__Quiz__Contest">Spielshow/Quiz/Wettbewerb</string>
+  <string name="Content$Variety_Show">Variete-Show</string>
+  <string name="Content$Talk_Show">Talkshow</string>
+  <string name="Content$Sports">Sport</string>
+  <string name="Content$Special_Event">Besonderes Ereignis</string>
+  <string name="Content$Sport_Magazine">Sportmagazin</string>
+  <string name="Content$Football__Soccer">Football/Fußball</string>
+  <string name="Content$Tennis__Squash">Tennis/Squash</string>
+  <string name="Content$Team_Sports">Mannschaftssport</string>
+  <string name="Content$Athletics">Athletik</string>
+  <string name="Content$Motor_Sport">Motorsport</string>
+  <string name="Content$Water_Sport">Wassersport</string>
+  <string name="Content$Winter_Sports">Wintersport</string>
+  <string name="Content$Equestrian">Kampfsport</string>
+  <string name="Content$Martial_Sports">Kampfsport</string>
+  <string name="Content$Childrens__Youth_Programme">Kinder/Jugendprogramm</string>
+  <string name="Content$Preschool_Childrens_Programme">Programm für Vorschulkinder</string>
+  <string name="Content$Entertainment_Programme_for_6_to_14">Unterhaltungsprogramm für 6 bis 14</string>
+  <string name="Content$Entertainment_Programme_for_10_to_16">Unterhaltungsprogramm für 10 bis 16</string>
+  <string name="Content$Informational__Educational__School_Programme">Informations/Lehr/Schul-Programm</string>
+  <string name="Content$Cartoons__Puppets">Zeichentrick/Puppen</string>
+  <string name="Content$Music__Ballet__Dance">Musik/Ballett/Tanz</string>
+  <string name="Content$Rock__Pop">Rock/Pop</string>
+  <string name="Content$Serious__Classical_Music">Ernste/Klassische Musik</string>
+  <string name="Content$Folk__Tradional_Music">Volks/Traditionelle Musik</string>
+  <string name="Content$Jazz">Jazz</string>
+  <string name="Content$Musical__Opera">Musical/Oper</string>
+  <string name="Content$Ballet">Ballett</string>
+  <string name="Content$Arts__Culture">Kunst/Kultur</string>
+  <string name="Content$Performing_Arts">Bildende Künste</string>
+  <string name="Content$Fine_Arts">Bildende Künste</string>
+  <string name="Content$Religion">Religion</string>
+  <string name="Content$Popular_Culture__Traditional_Arts">Pop-Kultur/Traditionelle Künste</string>
+  <string name="Content$Literature">Literatur</string>
+  <string name="Content$Film__Cinema">Film/Kino</string>
+  <string name="Content$Experimental_Film__Video">Experimentalfilm/Video</string>
+  <string name="Content$Broadcasting__Press">Rundfunk/Presse</string>
+  <string name="Content$New_Media">Neue Medien</string>
+  <string name="Content$Arts__Culture_Magazine">Kunst/Kulturmagazin</string>
+  <string name="Content$Fashion">Mode</string>
+  <string name="Content$Social__Political__Economics">Gesellschaft/Politik/Wirtschaft</string>
+  <string name="Content$Magazine__Report__Documentary">Magazin/Bericht/Dokumentation</string>
+  <string name="Content$Economics__Social_Advisory">Wirtschafts/Gesellschaftsberatung</string>
+  <string name="Content$Remarkable_People">Bemerkenswerte Leute</string>
+  <string name="Content$Education__Science__Factual">Ausbildung/Wissenschaft/Sachlich</string>
+  <string name="Content$Nature__Animals__Environment">Natur/Tiere/Umwelt</string>
+  <string name="Content$Technology__Natural_Sciences">Technik/Naturwissenschaften</string>
+  <string name="Content$Medicine__Physiology__Psychology">Medizin/Physiologie/Psychologie</string>
+  <string name="Content$Foreign_Countries__Expeditions">Ausland/Expeditionen</string>
+  <string name="Content$Social__Spiritual_Sciences">Sozial/Geisteswissenschaften</string>
+  <string name="Content$Further_Education">Weiterbildung</string>
+  <string name="Content$Languages">Sprachen</string>
+  <string name="Content$Leisure__Hobbies">Freizeit/Hobbies</string>
+  <string name="Content$Tourism__Travel">Tourismus/Reisen</string>
+  <string name="Content$Handicraft">Handwerk</string>
+  <string name="Content$Motoring">Autofahren</string>
+  <string name="Content$Fitness_and_Health">Fitness &amp; Gesundheit</string>
+  <string name="Content$Cooking">Kochen</string>
+  <string name="Content$Advertisement__Shopping">Werbung/Einkaufen</string>
+  <string name="Content$Gardening">Gartenbau</string>
+  <string name="Content$Original_Language">Originalsprache</string>
+  <string name="Content$Black_and_White">Schwarz-weiß</string>
+  <string name="Content$Unpublished">Unveröffentlicht</string>
+  <string name="Content$Live_Broadcast">Live Broadcast</string>
+  <!-- EPG Content END -->
+  <string name="type_to_filter">Tippen um zu filtern</string>
+  <string name="drive_info">Frei %1$s GB von %2$s GB (%3$s%%)</string>
+  <string name="drive_img">Drive</string>
+  <string name="sad_img">Traurig</string>
+  <string name="search">Search</string>
+  <string name="clear_term_after_search_title">Clear Term after Search</string>
+  <string name="clear_term_after_search_summary_off">Search term remains after peforming search</string>
+  <string name="clear_term_after_search_summary_on">Term gets cleared after performing search</string>
+  <string name="drawer_open">Open navigation drawer</string>
+  <string name="drawer_close">Close navigation drawer</string>
+  <string name="action_websearch">Web-Suche</string>
+  <string name="settings_smarttvweb_port_summary">VDR smarttvweb plugin has default port 8000</string>
+  <string name="settings_smarttvweb_port">Smarttvweb port</string>
+  <string name="recstream_smarttvweb_method_title">Smarttvweb Stream Type</string>
+  <string name="recstream_smarttvweb_method_summary">Supported methods: \'Progressive\', \'MPEG-DASH \/ OIPF HAS\', \'Apple HLS\'</string>
+  <string name="remote">Remote Control</string>
+  <string name="remote_enable_summary">Shows the remote control view if enabled</string>
+  <string name="remote_enable_title">Enable VDR remote control</string>
+  <string name="svdrp_port_title">SVDRP Port</string>
+  <string name="svdrp_port_summary">Default is 6419</string>
+  <string name="label">Label</string>
+  <string name="hitkcommand">HITK Command</string>
+  <string name="menu_reset">Reset</string>
+  <string name="menu_exprt">Export</string>
+  <string name="menu_imprt">Import</string>
+  <string name="menu_remapback">\'Back\' is \'Back\' HITK</string>
+  <string name="remapback_hint">Longpress on Back Button to leave the remote.</string>
+  <string name="not_yet_implemented">Not Yet Implemented</string>
+  <string name="timer_error">Can not create timer: %1$s</string>
 </resources>
diff --git a/vdrmanager/app/src/main/res/values-fr/strings.xml b/vdrmanager/app/src/main/res/values-fr/strings.xml
index dd0422e..362f233 100644
--- a/vdrmanager/app/src/main/res/values-fr/strings.xml
+++ b/vdrmanager/app/src/main/res/values-fr/strings.xml
@@ -7,6 +7,7 @@
   <string name="action_menu_epg">Liste EPG</string>
   <string name="action_menu_search">Recherche EPG</string>
   <string name="action_menu_wakeup">Réveil</string>
+  <string name="action_menu_remote">Remote</string>
   <string name="app_name">VDR-Manager</string>
   <string name="channel_item_menu_epg">Afficher EPG</string>
   <string name="channel_item_menu_stream">Direct en streaming</string>
@@ -61,12 +62,14 @@
   <string name="navigae_at_the_start">Début</string>
   <string name="epg_search_times_add">Ajouter du temps</string>
   <string name="epg_search_times_window">Temps personnalisé</string>
+  <!-- What's on display -->
   <string name="epg_list_time_label">Qu\'y a-t-il maintenant</string>
   <string name="epg_list_time_now">Maintenant</string>
   <string name="epg_list_time_next">Après</string>
   <string name="epg_list_time_adhoc">Ad Hoc</string>
   <string name="epg_list_channel_spinner">Chaîne</string>
   <string name="epg_list_search_label">Résultats de la recherche</string>
+  <!-- create timer -->
   <string name="epg_event_share_text">Partager</string>
   <string name="epg_event_imdb_text">Recherche sur IMDb</string>
   <string name="epg_event_omdb_text">Recherche sur OMDB</string>
@@ -74,6 +77,7 @@
   <string name="epg_eent_livetv_text">Diffusion en stream</string>
   <string name="epg_event_create_timer_text">Ajouter une programmation</string>
   <string name="epg_event_modify_timer_text">Modifier une programmation</string>
+  <!-- search -->
   <string name="epg_search_button">Rechercher</string>
   <string name="epg_duration_template">%1$s min</string>
   <string name="epg_duration_template_live">%1$s/%2$s min</string>
@@ -124,6 +128,7 @@ streamdevhosts.conf.</string>
   <string name="main_menu_switched_to">Basculer vers %1$s</string>
   <string name="vdr_devices_summary">Définir un ou plusieurs équipements VDR.</string>
   <string name="vdr_devices">Équipement VDR</string>
+  <!-- VDR plugin preferences -->
   <string name="vdr_preferences">Paramètres réseau</string>
   <string name="vdr_host_title">Hôte VDR</string>
   <string name="vdr_host_summary">Hôte VDR en fonctionnement</string>
@@ -133,11 +138,13 @@ streamdevhosts.conf.</string>
   <string name="vdr_password_summary">Mot de passe pour le plugin VDR</string>
   <string name="vdr_ssl_title">Connexion sécurisée</string>
   <string name="vdr_ssl_summary">Utiliser SSL pour les connexions</string>
+  <!-- channel filter preferences -->
   <string name="channel_filter_preferences">Paramètres des chaînes</string>
   <string name="channel_filter_filter_title">Limitation pour les chaînes</string>
   <string name="channel_filter_filter_summary">Utiliser uniquement les chaines données</string>
   <string name="channel_filter_last_title">Filtrer chaîne</string>
   <string name="channel_filter_last_summary">Séparer par une virgule les numéros de chaîne ou les intervalles (séparateur \'-\'). Ex: 1,2,4-10</string>
+  <!-- wakeup -->
   <string name="wakeup_preferences">Réveiller VDR à distance</string>
   <string name="wakeup_enabled_title">Pouvoir réveiller à distance VDR</string>
   <string name="wakeup_enabled_summary">Permettre de réveiller VDR à distance</string>
@@ -157,6 +164,7 @@ streamdevhosts.conf.</string>
   <string name="wakeup_wol_custom_boradcast_summary">À moins que vous n\'ayez une table ARP statique vous devriez utiliser une adresse de broadcast.</string>
   <string name="wakeup_wol_mac_title">Adresse MAC</string>
   <string name="wakeup_wol_mac_summary">Adresse MAC du hôte VDR. Utiliser \':\' ou \'-\' ou espace comme séparateur.</string>
+  <!-- timer -->
   <string name="timer_preferences">Programmation par défaut</string>
   <string name="timer_pre_start_buffer_title">Marge de début</string>
   <string name="timer_pre_start_buffer_summary">Minutes enregistrées avant le commencement de l\'émission</string>
@@ -168,6 +176,9 @@ streamdevhosts.conf.</string>
   <string name="timer_default_primary_limit_summary">Limite principale par défaut</string>
   <string name="timer_default_lifetime_title">Durée de vie par défaut</string>
   <string name="timer_default_lifetime_summary">Durée de vie par défaut</string>
+  <string name="timer_already_exists">Timer already defined.</string>
+  <string name="timer_created">Timer created</string>
+  <!-- GUI -->
   <string name="gui_preferences">Paramètres GUI</string>
   <string name="gui_enable_24h_format_title">Utiliser le format 24h</string>
   <string name="gui_enable_24h_format_summary_on">13:00</string>
@@ -201,6 +212,7 @@ streamdevhosts.conf.</string>
     <item>imdb.pt</item>
   </string-array>
   <string-array name="lang">
+    <!-- <item>Default language</item> -->
     <item>Anglais</item>
     <item>Allemand</item>
     <item>Français</item>
@@ -250,6 +262,7 @@ streamdevhosts.conf.</string>
   <string name="recstream_method_summary">Actuellement le Streaming par VDR live et ou le plugin streamdev est supporté</string>
   <string name="settings_live_port">Port pour le plugin VDR live</string>
   <string name="settings_live_port_summary">Le port par défaut pour le plugin VDR live est 8008.</string>
+  <!-- progress -->
   <string name="progress_connect">Connexion&#8230;</string>
   <string name="progress_connect_error">Échec de connexion !</string>
   <string name="progress_connect_timeout">Connexion expirée !</string>
@@ -281,8 +294,23 @@ streamdevhosts.conf.</string>
   <string name="gui_max_recent_channels_title">Chaînes récentes Max</string>
   <string name="gui_max_recent_channels_summary">Combien de chaines voulez-vous garder dans les chaînes récentes ?</string>
   <string name="timer_detail_day_title">Jour</string>
+  <!--
+         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
+    -->
   <string name="every_day">Tous les jours</string>
+  <!--
+         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
+    -->
   <string name="never">Jamais</string>
+  <!--
+         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"
+    -->
   <string name="day_concat">","</string>
   <string name="timer_detail_repeat_title">Répéter</string>
   <string name="timer_detail_use_vps">Utiliser VPS :</string>
@@ -339,6 +367,7 @@ streamdevhosts.conf.</string>
     <item>EPG par Chaîne</item>
     <item>Enregistrements</item>
     <item>Enregistrements</item>
+    <item>Remote</item>
   </string-array>
   <string name="filter">Filtre</string>
   <string name="audio_tracks_template">Pistes audio : %1$s</string>
@@ -351,6 +380,8 @@ streamdevhosts.conf.</string>
   <string name="no_results">Pas de résultat&#8230;</string>
   <string name="recording_started">L\'enregistrement a commencé</string>
   <string name="set_time">Définir l\'heure</string>
+  <!-- … -->
+  <!-- 	     SSL related messages -->
   <string name="certificate_problem_message_title">Avertissement du certificat</string>
   <string name="certificate_problem_message_text">Le certificat n\'a pas été accepté:\n\n
 Nom d\'hôte:\n
@@ -363,6 +394,7 @@ Que voulez-vous faire?</string>
   <string name="certificate_accept_once">Accepter une fois</string>
   <string name="certificate_accepted_forever">Toujours accepter</string>
   <string name="certificate_not_accepted">Abandonner</string>
+  <!-- EPG Content -->
   <string name="Content$Movie__Drama">Film/Dramatique</string>
   <string name="Content$Detective__Thriller">Détectives/Polar</string>
   <string name="Content$Adventure__Western__War">Aventure/Western/Guerre</string>
@@ -441,7 +473,8 @@ Que voulez-vous faire?</string>
   <string name="Content$Original_Language">Version originale</string>
   <string name="Content$Black_and_White">Noir &amp; Blanc</string>
   <string name="Content$Unpublished">Inédit</string>
-  <string name="Content$Live_Broadcast">Direct</string>
+  <string name="Content$Live_Broadcast">Live Broadcast</string>
+  <!-- EPG Content END -->
   <string name="type_to_filter">Type de filtre</string>
   <string name="drive_info">Libre %1$s Go of %2$s Go (%3$s%%)</string>
   <string name="drive_img">Disque</string>
@@ -462,4 +495,13 @@ Que voulez-vous faire?</string>
   <string name="remote_enable_title">Activer la télécommande de VDR</string>
   <string name="svdrp_port_title">Port DVDRP</string>
   <string name="svdrp_port_summary">Par défaut le 6419</string>
+  <string name="label">Label</string>
+  <string name="hitkcommand">HITK Command</string>
+  <string name="menu_reset">Reset</string>
+  <string name="menu_exprt">Export</string>
+  <string name="menu_imprt">Import</string>
+  <string name="menu_remapback">\'Back\' is \'Back\' HITK</string>
+  <string name="remapback_hint">Longpress on Back Button to leave the remote.</string>
+  <string name="not_yet_implemented">Not Yet Implemented</string>
+  <string name="timer_error">Can not create timer: %1$s</string>
 </resources>
diff --git a/vdrmanager/app/src/main/res/values-it/strings.xml b/vdrmanager/app/src/main/res/values-it/strings.xml
index 1582519..e3e555a 100644
--- a/vdrmanager/app/src/main/res/values-it/strings.xml
+++ b/vdrmanager/app/src/main/res/values-it/strings.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
-<resources>
+<!--Generated by crowdin.com-->
+<resources xmlns:tools="http://schemas.android.com/tools">
   <string name="action_menu_channels">Canali</string>
   <string name="action_menu_timers">Timer</string>
   <string name="action_menu_recordings">Registrazioni</string>
   <string name="action_menu_epg">Elenco EPG</string>
   <string name="action_menu_search">Ricerca EPG</string>
   <string name="action_menu_wakeup">Accensione</string>
+  <string name="action_menu_remote">Remote</string>
   <string name="app_name">Gestore VDR</string>
   <string name="channel_item_menu_epg">Mostra EPG</string>
-  <string name="channel_item_menu_stream">Mostra trasmissione</string>
+  <string name="channel_item_menu_stream">Flusso dal vivo</string>
   <string name="channel_item_menu_hide">Nascondi</string>
   <string name="channel_item_menu_hide_permanent">Nascondi sempre</string>
   <string name="channel_group_menu_hide">Nascondi</string>
@@ -18,6 +19,9 @@
   <string name="groupby_group">Gruppo</string>
   <string name="groupby_provider">Emittente</string>
   <string name="groupby_name">Nome</string>
+  <string name="groupby_source">Sorgente</string>
+  <string name="groupby_channel">Per canale</string>
+  <string name="groupby_date">Per data</string>
   <string name="groupby_name_all_channels_group">Tutti i canali</string>
   <string name="groupby_window_title_templte">Ordina per %1$s</string>
   <string name="common_delete">Elimina</string>
@@ -30,26 +34,24 @@
   <string name="refresh">Aggiorna</string>
   <string name="done">Completato</string>
   <string name="share">Condividi</string>
+  <string name="addtocal">Aggiungi al calendario</string>
   <string name="search_reapt">Riesegui</string>
   <string name="share_chooser">Condividi valore EPG</string>
-  <string name="about_text">
-        Info sul programma \"Gestore VDR\" per Android\n
-		Questa è la versione %1$s\n
-        Se a casa disponi di una VDR raggiungibile
-         da Internet e possiedi un telefono cellulare che usa Android allora forse hai trovato l\'applicazione che fa per te.
-         Per maggiori dettagli visita http://projects.vdr-developer.org/projects/vdr-manager/wiki.
-         Autore:\n
-          bju&lt;herrlado@gmail.com&gt;
-          herrlado&lt;herrlado@gmail.com&gt;
-         Traduzione italiana:\n
-	  	  Diego Pierotto
-    </string>
+  <string name="about_text">Info sul software \"VDR-Manager\" per Android\n
+Questa è la versione %1$s\n
+Se a casa possiedi una VDR raggiungibile
+da Internet e disponi di un proprio dispositivo Android allora questa applicazione potrebbe esserti utile.
+Per ulteriori dettagli visita http://projects.vdr-developer.org/projects/vdr-manager/wiki.
+Autore:\n
+bju&lt;herrlado@gmail.com&gt;
+herrlado&lt;herrlado@gmail.com&gt;</string>
   <string name="about_title">Info</string>
   <string name="no_internet_connection">Nessuna connessione dati</string>
   <string name="update_will_start_in">L\'aggiornamento si avvierà tra qualche secondo</string>
   <string name="epg_menu_search">Ricerca EPG</string>
   <string name="epg_menu_times">Numero ricerche</string>
   <string name="epg_item_menu_timer_add">Crea timer</string>
+  <string name="epg_item_menu_timer_record">Registra</string>
   <string name="epg_item_menu_timer_delete">Elimina timer</string>
   <string name="epg_item_menu_timer_modify">Modifica timer</string>
   <string name="epg_item_menu_timer_enable">Abilita timer</string>
@@ -60,12 +62,14 @@
   <string name="navigae_at_the_start">Inizio</string>
   <string name="epg_search_times_add">Aggiungi numero</string>
   <string name="epg_search_times_window">Numero personalizzato</string>
+  <!-- What's on display -->
   <string name="epg_list_time_label">In programmazione alle</string>
   <string name="epg_list_time_now">In onda</string>
   <string name="epg_list_time_next">Successivo</string>
   <string name="epg_list_time_adhoc">Alle</string>
   <string name="epg_list_channel_spinner">Canale</string>
   <string name="epg_list_search_label">Ricerca risultati</string>
+  <!-- create timer -->
   <string name="epg_event_share_text">Condividi</string>
   <string name="epg_event_imdb_text">Ricerca IMDb</string>
   <string name="epg_event_omdb_text">Ricerca OMDB</string>
@@ -73,10 +77,11 @@
   <string name="epg_eent_livetv_text">Trasmissione</string>
   <string name="epg_event_create_timer_text">Aggiungi timer</string>
   <string name="epg_event_modify_timer_text">Modifica timer</string>
+  <!-- search -->
   <string name="epg_search_button">Cerca</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 -&gt; %1$s,  %2$s/%3$s</string>
+  <string name="epg_of_a_channel">%1$s,  %2$s/%3$s</string>
   <string name="epg_by_channel">EPG per canale</string>
   <string name="epg_by_search">Ricerca EPG</string>
   <string name="epg_by_search_param">Ricerca EPG: \'%1$s\'</string>
@@ -93,10 +98,17 @@
   <string name="settings_livetv_streamformat">Formato trasmissione</string>
   <string name="settings_livetv_port">Porta trasmissione</string>
   <string name="settings_livetv_port_summary">Predefinita 3000. L\'accesso deve essere abilitato in \"streamdevhosts.conf\".</string>
+  <string-array name="livetv_streamformat">
+    <item>TS</item>
+    <item>PES</item>
+    <item>ES</item>
+    <item>PS</item>
+  </string-array>
   <string name="key_remux_enable">remux_enable</string>
   <string name="key_remux_command">remux_command</string>
   <string name="key_remux_parameter">remux_parameter</string>
   <string name="stream_via_as">Trasmissione</string>
+  <string name="stream_choose_audio">Scegli traccia audio</string>
   <string name="stream_via">tramite %s</string>
   <string name="stream_as">come %s</string>
   <string name="remux_title">Remux</string>
@@ -115,21 +127,23 @@
   <string name="main_menu_switched_to">Passato a %1$s</string>
   <string name="vdr_devices_summary">Definisci uno o più dispositivi VDR (in arrivo)</string>
   <string name="vdr_devices">Dispositivi VDR</string>
+  <!-- VDR plugin preferences -->
   <string name="vdr_preferences">Impostazioni rete</string>
   <string name="vdr_host_title">Nome sistema/IP</string>
   <string name="vdr_host_summary">Nome sistema o indirizzo IP della VDR in esecuzione</string>
   <string name="vdr_port_title">Porta plugin VDR</string>
   <string name="vdr_port_summary">Porta per connessioni al plugin di VDR</string>
-  <string name="vdr_port_default">6420</string>
   <string name="vdr_password_title">Password plugin VDR</string>
   <string name="vdr_password_summary">Password per il plugin di VDR</string>
   <string name="vdr_ssl_title">Connessione sicura</string>
-  <string name="vdr_ssl_summary">Usa SSL per le connessioni</string>
+  <string name="vdr_ssl_summary">Usa SSL per le connessioni (al momento non supportato)</string>
+  <!-- channel filter preferences -->
   <string name="channel_filter_preferences">Impostazioni canale</string>
   <string name="channel_filter_filter_title">Limita canali</string>
   <string name="channel_filter_filter_summary">Usa solo determinati canali</string>
   <string name="channel_filter_last_title">Filtro canale</string>
   <string name="channel_filter_last_summary">Numero di canali o sequenze separate da virgole (separatore \'-\'). Es. 1,2,4-10</string>
+  <!-- wakeup -->
   <string name="wakeup_preferences">Accensione VDR da remoto</string>
   <string name="wakeup_enabled_title">Può accendere VDR da remoto</string>
   <string name="wakeup_enabled_summary">Abilita accensione VDR da remoto</string>
@@ -141,10 +155,15 @@
   <string name="wakeup_password_summary">Password per accensione remota</string>
   <string name="wakeup_method_title">Metodo accensione</string>
   <string name="wakeup_method_summary">Scegli un metodo per accendere VDR</string>
+  <string-array name="wakeup_methods">
+    <item>Chiama URL</item>
+    <item>WOL</item>
+  </string-array>
   <string name="wakeup_wol_custom_boradcast_title">Indirizzo IP destinazione</string>
   <string name="wakeup_wol_custom_boradcast_summary">A meno di non avere delle tabelle ARP statiche dovresti usare un indirizzo di broadcast.</string>
   <string name="wakeup_wol_mac_title">Indirizzo MAC</string>
   <string name="wakeup_wol_mac_summary">Indirizzo MAC di VDR. Usa \':\' o \'-\' o uno spazio come separatore.</string>
+  <!-- timer -->
   <string name="timer_preferences">Valori predefiniti timer</string>
   <string name="timer_pre_start_buffer_title">Margine inizio</string>
   <string name="timer_pre_start_buffer_summary">Minuti di avvio registrazione prima dell\'inizio
@@ -158,6 +177,9 @@
   <string name="timer_default_primary_limit_summary">Limite primario predefinito</string>
   <string name="timer_default_lifetime_title">Durata predefinita</string>
   <string name="timer_default_lifetime_summary">Durata predefinita</string>
+  <string name="timer_already_exists">Timer already defined.</string>
+  <string name="timer_created">Timer created</string>
+  <!-- GUI -->
   <string name="gui_preferences">Impostazioni GUI</string>
   <string name="gui_enable_24h_format_title">Usa formato 24 ore</string>
   <string name="gui_enable_24h_format_summary_on">13:00</string>
@@ -180,6 +202,28 @@
   <string name="qui_show_tmdb_button_summary_off">Tasto TMDb non visibile</string>
   <string name="gui_custom_locale_title">Lingua</string>
   <string name="gui_custom_locale_sum">Seleziona una lingua</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="lang">
+       <item>Inglese</item>
+        <item>Tedesco</item>
+      <item>Francese</item>
+    <item>Italiano</item>
+      <item>Polacco</item>
+      <item>Ucraino</item>
+  </string-array>
+  <string-array name="remux_entries">
+    <item>EXT</item>
+    <item>EXTERN (deprecato)</item>
+  </string-array>
   <string name="vdr_advanced_preferences">Avanzate</string>
   <string name="vdr_advanced_preferences_summary">Impostazioni avanzate</string>
   <string name="vdr_conntimeout_title">Durata connessione</string>
@@ -204,10 +248,21 @@
   <string name="recstream">Trasmissione registrazioni</string>
   <string name="recstream_enable_title">Trasmissione registrazioni</string>
   <string name="recstream_enable_summary">Abilita trasmissione registrazioni</string>
+  <string-array name="recstream_entries">
+    <item>Plugin Live</item>
+    <item>Plugin VDR streamdev</item>
+    <item>Plugin Smarttvweb</item>
+  </string-array>
+  <string-array name="recstream_smarttvweb_entries">
+    <item>Progressivo</item>
+    <item>MPEG-DASH</item>
+    <item>Apple HLS</item>
+  </string-array>
   <string name="recstream_method_title">Metodo trasmissione</string>
-  <string name="recstream_method_summary">La trasmissione tramite il plugin VDR Live è attualmente supportata</string>
+  <string name="recstream_method_summary">Attualmente è supportata la trasmissione con i plugin VDR Live o Streamdev</string>
   <string name="settings_live_port">Porta plugin VDR Live</string>
   <string name="settings_live_port_summary">Il plugin VDR Live usa la porta 8008 come predefinita.</string>
+  <!-- progress -->
   <string name="progress_connect">Connessione...</string>
   <string name="progress_connect_error">Connessione fallita!</string>
   <string name="progress_connect_timeout">Connessione scaduta!</string>
@@ -216,7 +271,9 @@
   <string name="progress_whatson_loading">Caricamento EPG...</string>
   <string name="progress_timers_loading">Caricamento timer...</string>
   <string name="progress_recordings_loading">Caricamento registrazioni...</string>
+  <string name="progress_switching">Cambio...</string>
   <string name="progress_channels_loading">Caricamento canali...</string>
+  <string name="progress_loading">Caricamento...</string>
   <string name="progress_disconnect">Disconnessione...</string>
   <string name="progress_wakeup_sending">Inizio richiesta accensione...</string>
   <string name="progress_wakeup_sent">Richiesta accensione inviata</string>
@@ -236,129 +293,215 @@
   <string name="recent_channels_no_history">Nessuna cronologia...</string>
   <string name="gui_max_recent_channels_title">Numero massimo canali recenti</string>
   <string name="gui_max_recent_channels_summary">Quanti canali vuoi conservare tra quelli recenti?</string>
-  <string-array name="livetv_streamformat">
-    <item>TS</item>
-    <item>PES</item>
-    <item>ES</item>
-    <item>PS</item>
+  <string name="timer_detail_day_title">Giorno</string>
+  <!--
+         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
+    -->
+  <string name="every_day">Ogni giorno</string>
+  <!--
+         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
+    -->
+  <string name="never">Mai</string>
+  <!--
+         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"
+    -->
+  <string name="day_concat">", "</string>
+  <string name="timer_detail_repeat_title">Replica</string>
+  <string name="timer_detail_use_vps">Usa VPS:</string>
+  <string name="timer_detail_priority">Priorità:</string>
+  <string name="timer_detail_lifetime">Durata:</string>
+  <string name="timer_detail_lifetime_hint">es. 99</string>
+  <string name="timer_detail_priority_hint">es. 50</string>
+  <string name="timer_detail_title_vps">%1$s (VPS)</string>
+  <string name="channel_item_menu_switch">Cambia a</string>
+  <string name="switching_success">Cambiato a %s</string>
+  <string name="switching_failed">Cambio a %1$s fallito: %2$s</string>
+  <string name="switch_to_channel">Cambia a</string>
+  <string name="sort">Ordina</string>
+  <string name="sortby">Ordina per</string>
+  <string name="sortby_time">Ora</string>
+  <string name="sortby_channel">Canale</string>
+  <string name="sortby_alphabet">Alfabetico</string>
+  <string name="sortby_channellist">Lista canali</string>
+  <string name="main_menu_clear_search">Pulisci cronologia ricerca</string>
+  <string name="vdr_host_not_defined">Nome sistema VDR non impostato</string>
+  <string name="processing">Elaborazione...</string>
+  <string-array name="recent_channels_order_entries">
+    <item>Più usati</item>
+    <item>Ultimo usato</item>
   </string-array>
-  <string-array name="wakeup_methods">
-    <item>Chiama URL</item>
-    <item>WOL</item>
+  <string-array name="epg_sort_by_time_alpha">
+    <item>Ora</item>
+    <item>Alfabetico</item>
   </string-array>
-  <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 name="epg_sort_by_time_alpha_channel">
+    <item>Ora</item>
+    <item>Alphabet</item>
+    <item>Channel</item>
   </string-array>
-
-  <string-array name="lang">
-    <item>Inglese</item>
-    <item>Tedesco</item>
-      <item>Francese</item>
-    <item>Italiano</item>
-      <item>Polacco</item>
-      <item>Ucraino</item>
+  <string-array name="epg_sort_by_channels_alpha">
+    <item>Canali</item>
+    <item>Alfabetico</item>
   </string-array>
-  <string-array name="remux_entries">
-    <item>EXT</item>
-    <item>EXTERN (deprecato)</item>
+  <string-array name="recordings_group_by">
+    <item>Per ora</item>
+    <item>Per alfabeto</item>
   </string-array>
-  <string-array name="recstream_entries">
-    <item>Plugin VDR Live</item>
-    <item>Plugin VDR Streamdev</item>
-    <item>Plugin VDR Smattvweb</item>
+  <string name="gui_recent_channels_order_summary">Ordina per ultimo usato o più usato</string>
+  <string name="gui_recent_channels_order_title">Ordinamento canali recente</string>
+  <string-array name="channels_group_by">
+    <item>Gruppo</item>
+    <item>Provider</item>
+    <item>Sorgente</item>
+    <item>Nome</item>
+  </string-array>
+  <string-array name="navigation_array">
+    <item>Canali</item>
+    <item>EPG per ora</item>
+    <item>EPG per canale</item>
+    <item>Registrazioni</item>
+    <item>Timer</item>
+    <item>Remote</item>
   </string-array>
-
-
+  <string name="filter">Filtro</string>
+  <string name="audio_tracks_template">Tracce audio: %1$s</string>
+  <string name="audio_track_dolby">D</string>
+  <string name="vdr_timezone_summary">Il fuso orario utilizzato dal server. E\' importante se viaggiate e modificate i timer da un altro fuso orario.</string>
+  <string name="vdr_timezone_title">Seleziona fuso orario del server</string>
+  <string name="zone_list_menu_sort_alphabetically">Ordina alfabeticamente</string>
+  <string name="zone_list_menu_sort_by_timezone">Ordina per fuso orario</string>
+  <string name="probing">Impostando %1$s &#8230;</string>
+  <string name="no_results">Nessun risultato...</string>
+  <string name="recording_started">Registrazione avviata</string>
+  <string name="set_time">Imposta orario</string>
+  <!-- … -->
+  <!-- 	     SSL related messages -->
+  <string name="certificate_problem_message_title">Certificate warning</string>
+  <string name="certificate_problem_message_text">The server certificate was not accepted:\n\n
+Hostname:\n
+ %1$s\n
+Valid from:\n
+ %2$s\n
+Valid until:\n
+ %3$s\n\n
+What do you want to do?</string>
+  <string name="certificate_accept_once">Accept once</string>
+  <string name="certificate_accepted_forever">Accept forever</string>
+  <string name="certificate_not_accepted">Abort</string>
   <!-- EPG Content -->
-
-<string name="Content$Show__Game_Show">Spettacolo/Gioco a premi</string>
-<string name="Content$Athletics">Atletica</string>
-<string name="Content$Musical__Opera">Musical/Opera</string>
-<string name="Content$Tourism__Travel">Turismo/Viaggi</string>
-<string name="Content$Languages">Lingue</string>
-<string name="Content$Documentary">Documentario</string>
-<string name="Content$Further_Education">Altra educazione</string>
-<string name="Content$Martial_Sports">Arti marziali</string>
-<string name="Content$Equestrian">Equitazione</string>
-<string name="Content$Fine_Arts">Arti fine</string>
-<string name="Content$Folk__Tradional_Music">Musica Tradizionale/Folclore</string>
-<string name="Content$Original_Language">Lingua madre</string>
-<string name="Content$Economics__Social_Advisory">Economia/Consulenza sociale</string>
-<string name="Content$News_Magazine">Settimanale di attualità</string>
-<string name="Content$Arts__Culture_Magazine">Arte/Settimanale di cultura</string>
-<string name="Content$Movie__Drama">Film/Dramma</string>
-<string name="Content$Preschool_Childrens_Programme">Programmi per ragazzi prescolastici</string>
-<string name="Content$Fitness_and_Health">Culturismo &amp; Salute</string>
-<string name="Content$Film__Cinema">Film/Cinema</string>
-<string name="Content$Cooking">Cucina</string>
-<string name="Content$News__Current_Affairs">Notizie/Ultima ora</string>
-<string name="Content$Entertainment_Programme_for_6_to_14">Programmi di intrattenimento da 6 a 14</string>
-<string name="Content$Music__Ballet__Dance">Musica/Balletto/Danza</string>
-<string name="Content$New_Media">Nuovo programma</string>
-<string name="Content$Black_and_White">Bianco &amp; Nero</string>
-<string name="Content$Informational__Educational__School_Programme">Informativo/Educativo/Programma scolastico</string>
-<string name="Content$Handicraft">Artigianato</string>
-<string name="Content$Remarkable_People">Personaggi importanti</string>
-<string name="Content$Adventure__Western__War">Avventura/Western/Guerra</string>
-<string name="Content$Science_Fiction__Fantasy__Horror">Finzione/Fantasia/Horror</string>
-<string name="Content$Water_Sport">Sport acquatici</string>
-<string name="Content$Football__Soccer">Calcio</string>
-<string name="Content$Foreign_Countries__Expeditions">Paesi esteri/Spedizioni</string>
-<string name="Content$Variety_Show">Spettacolo di varietà</string>
-<string name="Content$Education__Science__Factual">Educazione/Scienza/Fatti</string>
-<string name="Content$Jazz">Jazz</string>
-<string name="Content$Adult_Movie__Drama">Film per adulti/Dramma</string>
-<string name="Content$Comedy">Commedia</string>
-<string name="Content$Unpublished">Non pubblicato</string>
-<string name="Content$Social__Political__Economics">Società/Politica/Economia</string>
-<string name="Content$Entertainment_Programme_for_10_to_16">Programmi di intrattenimento da 10 a 16</string>
-<string name="Content$Popular_Culture__Traditional_Arts">Cultura popolare/Arti tradizionali</string>
-<string name="Content$Leisure__Hobbies">Tempo libero/Hobby</string>
-<string name="Content$Detective__Thriller">Investigativo/Giallo</string>
-<string name="Content$Serious__Classical_Music">Musica Classica/Seria</string>
-<string name="Content$Discussion__Inverview__Debate">Discussione/Intervista/Dibattito</string>
-<string name="Content$Social__Spiritual_Sciences">Società/Scienze spirituali</string>
-<string name="Content$Soap__Melodrama__Folkloric">Telenovella/Melodramma/Folcloristico</string>
-<string name="Content$Ballet">Balletto</string>
-<string name="Content$Fashion">Moda</string>
-<string name="Content$Winter_Sports">Sport invernali</string>
-<string name="Content$Cartoons__Puppets">Cartoni/Pupazzi</string>
-<string name="Content$Sports">Sport</string>
-<string name="Content$Technology__Natural_Sciences">Tecnologia/Scienze naturali</string>
-<string name="Content$Literature">Letteratura</string>
-<string name="Content$Motor_Sport">Sport motoristici</string>
-<string name="Content$Sport_Magazine">Settimanale di sport</string>
-<string name="Content$Romance">Romanzo</string>
-<string name="Content$Arts__Culture">Arte/Cultura</string>
-<string name="Content$Serious__Classical__Religious__Historical_Movie__Drama">Serio/Classico/Religioso/Film storico/Dramma</string>
-<string name="Content$News__Weather_Report">Notizie/Previsioni meteo</string>
-<string name="Content$Special_Event">Evento speciale</string>
-<string name="Content$Childrens__Youth_Programme">Programmi per ragazzi/giovani</string>
-<string name="Content$Gardening">Giardinaggio</string>
-<string name="Content$Rock__Pop">Rock/Pop</string>
-<string name="Content$Religion">Religione</string>
-<string name="Content$Nature__Animals__Environment">Natura/Animali/Ambiente</string>
-<string name="Content$Broadcasting__Press">Trasmissione/Stampa</string>
-<string name="Content$Talk_Show">Talk Show</string>
-<string name="Content$Live_Broadcast">Trasmissione dal vivo</string>
-<string name="Content$Advertisement__Shopping">Pubblicità/Acquisti</string>
-<string name="Content$Performing_Arts">Arti di rendimento</string>
-<string name="Content$Experimental_Film__Video">Film sperimentale/Video</string>
-<string name="Content$Magazine__Report__Documentary">Settimanale/Reportage/Documentario</string>
-<string name="Content$Tennis__Squash">Tennis/Squash</string>
-<string name="Content$Game_Show__Quiz__Contest">Gioco a premi/Quiz/Gara</string>
-<string name="Content$Medicine__Physiology__Psychology">Medicina/Filosofia/Psicologia</string>
-<string name="Content$Motoring">Motori</string>
-<string name="Content$Team_Sports">Sport di squadra</string>
-
-<!-- EPG Content END -->
-
-
+  <string name="Content$Movie__Drama">Movie/Drama</string>
+  <string name="Content$Detective__Thriller">Detective/Thriller</string>
+  <string name="Content$Adventure__Western__War">Adventure/Western/War</string>
+  <string name="Content$Science_Fiction__Fantasy__Horror">Science Fiction/Fantasy/Horror</string>
+  <string name="Content$Comedy">Comedy</string>
+  <string name="Content$Soap__Melodrama__Folkloric">Soap/Melodrama/Folkloric</string>
+  <string name="Content$Romance">Romance</string>
+  <string name="Content$Serious__Classical__Religious__Historical_Movie__Drama">Serious/Classical/Religious/Historical Movie/Drama</string>
+  <string name="Content$Adult_Movie__Drama">Adult Movie/Drama</string>
+  <string name="Content$News__Current_Affairs">News/Current Affairs</string>
+  <string name="Content$News__Weather_Report">News/Weather Report</string>
+  <string name="Content$News_Magazine">News Magazine</string>
+  <string name="Content$Documentary">Documentary</string>
+  <string name="Content$Discussion__Inverview__Debate">Discussion/Inverview/Debate</string>
+  <string name="Content$Show__Game_Show">Show/Game Show</string>
+  <string name="Content$Game_Show__Quiz__Contest">Game Show/Quiz/Contest</string>
+  <string name="Content$Variety_Show">Variety Show</string>
+  <string name="Content$Talk_Show">Talk Show</string>
+  <string name="Content$Sports">Sports</string>
+  <string name="Content$Special_Event">Special Event</string>
+  <string name="Content$Sport_Magazine">Sport Magazine</string>
+  <string name="Content$Football__Soccer">Football/Soccer</string>
+  <string name="Content$Tennis__Squash">Tennis/Squash</string>
+  <string name="Content$Team_Sports">Team Sports</string>
+  <string name="Content$Athletics">Athletics</string>
+  <string name="Content$Motor_Sport">Motor Sport</string>
+  <string name="Content$Water_Sport">Water Sport</string>
+  <string name="Content$Winter_Sports">Winter Sports</string>
+  <string name="Content$Equestrian">Equestrian</string>
+  <string name="Content$Martial_Sports">Martial Sports</string>
+  <string name="Content$Childrens__Youth_Programme">Children\'s/Youth Programme</string>
+  <string name="Content$Preschool_Childrens_Programme">Pre-school Children\'s Programme</string>
+  <string name="Content$Entertainment_Programme_for_6_to_14">Entertainment Programme for 6 to 14</string>
+  <string name="Content$Entertainment_Programme_for_10_to_16">Entertainment Programme for 10 to 16</string>
+  <string name="Content$Informational__Educational__School_Programme">Informational/Educational/School Programme</string>
+  <string name="Content$Cartoons__Puppets">Cartoons/Puppets</string>
+  <string name="Content$Music__Ballet__Dance">Music/Ballet/Dance</string>
+  <string name="Content$Rock__Pop">Rock/Pop</string>
+  <string name="Content$Serious__Classical_Music">Serious/Classical Music</string>
+  <string name="Content$Folk__Tradional_Music">Folk/Tradional Music</string>
+  <string name="Content$Jazz">Jazz</string>
+  <string name="Content$Musical__Opera">Musical/Opera</string>
+  <string name="Content$Ballet">Ballet</string>
+  <string name="Content$Arts__Culture">Arts/Culture</string>
+  <string name="Content$Performing_Arts">Performing Arts</string>
+  <string name="Content$Fine_Arts">Fine Arts</string>
+  <string name="Content$Religion">Religion</string>
+  <string name="Content$Popular_Culture__Traditional_Arts">Popular Culture/Traditional Arts</string>
+  <string name="Content$Literature">Literature</string>
+  <string name="Content$Film__Cinema">Film/Cinema</string>
+  <string name="Content$Experimental_Film__Video">Experimental Film/Video</string>
+  <string name="Content$Broadcasting__Press">Broadcasting/Press</string>
+  <string name="Content$New_Media">New Media</string>
+  <string name="Content$Arts__Culture_Magazine">Arts/Culture Magazine</string>
+  <string name="Content$Fashion">Fashion</string>
+  <string name="Content$Social__Political__Economics">Social/Political/Economics</string>
+  <string name="Content$Magazine__Report__Documentary">Magazine/Report/Documentary</string>
+  <string name="Content$Economics__Social_Advisory">Economics/Social Advisory</string>
+  <string name="Content$Remarkable_People">Remarkable People</string>
+  <string name="Content$Education__Science__Factual">Education/Science/Factual</string>
+  <string name="Content$Nature__Animals__Environment">Nature/Animals/Environment</string>
+  <string name="Content$Technology__Natural_Sciences">Technology/Natural Sciences</string>
+  <string name="Content$Medicine__Physiology__Psychology">Medicine/Physiology/Psychology</string>
+  <string name="Content$Foreign_Countries__Expeditions">Foreign Countries/Expeditions</string>
+  <string name="Content$Social__Spiritual_Sciences">Social/Spiritual Sciences</string>
+  <string name="Content$Further_Education">Further Education</string>
+  <string name="Content$Languages">Languages</string>
+  <string name="Content$Leisure__Hobbies">Leisure/Hobbies</string>
+  <string name="Content$Tourism__Travel">Tourism/Travel</string>
+  <string name="Content$Handicraft">Handicraft</string>
+  <string name="Content$Motoring">Motoring</string>
+  <string name="Content$Fitness_and_Health">Fitness &amp; Health</string>
+  <string name="Content$Cooking">Cooking</string>
+  <string name="Content$Advertisement__Shopping">Advertisement/Shopping</string>
+  <string name="Content$Gardening">Gardening</string>
+  <string name="Content$Original_Language">Original Language</string>
+  <string name="Content$Black_and_White">Black &amp; White</string>
+  <string name="Content$Unpublished">Unpublished</string>
+  <string name="Content$Live_Broadcast">Live Broadcast</string>
+  <!-- EPG Content END -->
+  <string name="type_to_filter">type to filter</string>
+  <string name="drive_info">Free %1$s GB of %2$s GB (%3$s%%)</string>
+  <string name="drive_img">Drive</string>
+  <string name="sad_img">Sad</string>
+  <string name="search">Search</string>
+  <string name="clear_term_after_search_title">Clear Term after Search</string>
+  <string name="clear_term_after_search_summary_off">Search term remains after peforming search</string>
+  <string name="clear_term_after_search_summary_on">Term gets cleared after performing search</string>
+  <string name="drawer_open">Open navigation drawer</string>
+  <string name="drawer_close">Close navigation drawer</string>
+  <string name="action_websearch">Web search</string>
+  <string name="settings_smarttvweb_port_summary">VDR smarttvweb plugin has default port 8000</string>
+  <string name="settings_smarttvweb_port">Smarttvweb port</string>
+  <string name="recstream_smarttvweb_method_title">Smarttvweb Stream Type</string>
+  <string name="recstream_smarttvweb_method_summary">Supported methods: \'Progressive\', \'MPEG-DASH \/ OIPF HAS\', \'Apple HLS\'</string>
+  <string name="remote">Remote Control</string>
+  <string name="remote_enable_summary">Shows the remote control view if enabled</string>
+  <string name="remote_enable_title">Enable VDR remote control</string>
+  <string name="svdrp_port_title">SVDRP Port</string>
+  <string name="svdrp_port_summary">Default is 6419</string>
+  <string name="label">Label</string>
+  <string name="hitkcommand">HITK Command</string>
+  <string name="menu_reset">Reset</string>
+  <string name="menu_exprt">Export</string>
+  <string name="menu_imprt">Import</string>
+  <string name="menu_remapback">\'Back\' is \'Back\' HITK</string>
+  <string name="remapback_hint">Longpress on Back Button to leave the remote.</string>
+  <string name="not_yet_implemented">Not Yet Implemented</string>
+  <string name="timer_error">Can not create timer: %1$s</string>
 </resources>
diff --git a/vdrmanager/app/src/main/res/values-uk/strings.xml b/vdrmanager/app/src/main/res/values-uk/strings.xml
index 37cc960..56f65ad 100644
--- a/vdrmanager/app/src/main/res/values-uk/strings.xml
+++ b/vdrmanager/app/src/main/res/values-uk/strings.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
-<resources>
+<!--Generated by crowdin.com-->
+<resources xmlns:tools="http://schemas.android.com/tools">
   <string name="action_menu_channels">Канали</string>
   <string name="action_menu_timers">Таймери</string>
   <string name="action_menu_recordings">Записи</string>
   <string name="action_menu_epg">Список EPG</string>
   <string name="action_menu_search">Пошук EPG</string>
   <string name="action_menu_wakeup">Пробудження</string>
+  <string name="action_menu_remote">Remote</string>
   <string name="app_name">VDR-менеджер</string>
   <string name="channel_item_menu_epg">Показати EPG</string>
-  <string name="channel_item_menu_stream">Показати живий ефір</string>
+  <string name="channel_item_menu_stream">Живий ефір</string>
   <string name="channel_item_menu_hide">Сховати</string>
   <string name="channel_item_menu_hide_permanent">Ховати постійно</string>
   <string name="channel_group_menu_hide">Сховати</string>
@@ -18,6 +19,9 @@
   <string name="groupby_group">Група</string>
   <string name="groupby_provider">Постачальник</string>
   <string name="groupby_name">Назва</string>
+  <string name="groupby_source">Джерело</string>
+  <string name="groupby_channel">За каналом</string>
+  <string name="groupby_date">За датою</string>
   <string name="groupby_name_all_channels_group">Всі канали</string>
   <string name="groupby_window_title_templte">Групувати за %1$s</string>
   <string name="common_delete">Вилучити</string>
@@ -30,39 +34,42 @@
   <string name="refresh">Оновити</string>
   <string name="done">Виконано</string>
   <string name="share">Поділитися</string>
+  <string name="addtocal">Додати до календаря</string>
   <string name="search_reapt">Перезапустити</string>
   <string name="share_chooser">Поділитися текстом EPG</string>
-  <string name="about_text">Про програму \"VDR-менеджер\" для Android\n
-Це версія %1$s\n
-Якщо Ви маєте пристрій VDR, до якого є доступ
-через інтернет і є мобільний телефон з ОС Android, тоді Ви оцінити можливості цієї прогорами.
-Для більше інформації відвідайте сторінку http://projects.vdr-developer.org/projects/vdr-manager/wiki.
-Автор:\n
-bju&lt;herrlado@gmail.com&gt;
-herrlado&lt;herrlado@gmail.com&gt;
-    </string>
+  <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&gt;
+          herrlado&lt;herrlado@gmail.com&gt;</string>
   <string name="about_title">Про програму</string>
   <string name="no_internet_connection">Немає даних з’єднання</string>
   <string name="update_will_start_in">Оновлення розпочнеться протягом однієї секунди</string>
   <string name="epg_menu_search">Пошук EPG</string>
   <string name="epg_menu_times">Пошук часів</string>
   <string name="epg_item_menu_timer_add">Створити таймер</string>
+  <string name="epg_item_menu_timer_record">Запис</string>
   <string name="epg_item_menu_timer_delete">Вилучити таймер</string>
   <string name="epg_item_menu_timer_modify">Змінити таймер</string>
   <string name="epg_item_menu_timer_enable">Увімкнути таймер</string>
   <string name="epg_item_menu_timer_disable">Вимкнути таймер</string>
-  <string name="epg_no_items">Нічого не знайдено…</string>
-  <string name="epg_client_errors">Сталася помилка, перевірте журнали…</string>
+  <string name="epg_no_items">Нічого не знайдено&#8230;</string>
+  <string name="epg_client_errors">Сталася помилка, перевірте журнали&#8230;</string>
   <string name="navigae_at_the_end">Кінець</string>
   <string name="navigae_at_the_start">Початок</string>
   <string name="epg_search_times_add">Додати час</string>
   <string name="epg_search_times_window">Час користувача</string>
+  <!-- What's on display -->
   <string name="epg_list_time_label">А що зараз на</string>
   <string name="epg_list_time_now">Зараз</string>
   <string name="epg_list_time_next">Наступний</string>
   <string name="epg_list_time_adhoc">Без точки доступу</string>
   <string name="epg_list_channel_spinner">Канал</string>
   <string name="epg_list_search_label">Результати пошуку</string>
+  <!-- create timer -->
   <string name="epg_event_share_text">Поділитися</string>
   <string name="epg_event_imdb_text">Пошук IMDb</string>
   <string name="epg_event_omdb_text">Пошук OMDB</string>
@@ -70,10 +77,11 @@ herrlado&lt;herrlado@gmail.com&gt;
   <string name="epg_eent_livetv_text">Потік</string>
   <string name="epg_event_create_timer_text">Додати таймер</string>
   <string name="epg_event_modify_timer_text">Змінити таймер</string>
+  <!-- search -->
   <string name="epg_search_button">Пошук</string>
   <string name="epg_duration_template">%1$s хв</string>
   <string name="epg_duration_template_live">%1$s/%2$s хв</string>
-  <string name="epg_of_a_channel">EPG -&gt; %1$s,  %2$s/%3$s</string>
+  <string name="epg_of_a_channel">%1$s,  %2$s/%3$s</string>
   <string name="epg_by_channel">EPG по каналу</string>
   <string name="epg_by_search">Пошук EPG</string>
   <string name="epg_by_search_param">Пошук EPG: \'%1$s\'</string>
@@ -90,10 +98,17 @@ herrlado&lt;herrlado@gmail.com&gt;
   <string name="settings_livetv_streamformat">Формат потоку</string>
   <string name="settings_livetv_port">Порт трансляції потоку</string>
   <string name="settings_livetv_port_summary">Типово 3000. Доступ повинен бути включений в streamdevhosts.conf.</string>
+  <string-array name="livetv_streamformat">
+    <item>TS</item>
+    <item>PES</item>
+    <item>ES</item>
+    <item>PS</item>
+  </string-array>
   <string name="key_remux_enable">remux_enable</string>
   <string name="key_remux_command">remux_command</string>
   <string name="key_remux_parameter">remux_parameter</string>
   <string name="stream_via_as">Потік</string>
+  <string name="stream_choose_audio">Вибір звукової доріжки</string>
   <string name="stream_via">через %s</string>
   <string name="stream_as">як %s</string>
   <string name="remux_title">Remux</string>
@@ -112,6 +127,7 @@ herrlado&lt;herrlado@gmail.com&gt;
   <string name="main_menu_switched_to">Перейшли до %1$s</string>
   <string name="vdr_devices_summary">Визначити один або кілька пристроїв VDR.</string>
   <string name="vdr_devices">Пристрої VDR</string>
+  <!-- VDR plugin preferences -->
   <string name="vdr_preferences">Параметри мережі</string>
   <string name="vdr_host_title">Вузол VDR</string>
   <string name="vdr_host_summary">Вузол з запущеним VDR</string>
@@ -120,27 +136,34 @@ herrlado&lt;herrlado@gmail.com&gt;
   <string name="vdr_password_title">Пароль додатку VDR</string>
   <string name="vdr_password_summary">Пароль для додатка VDR</string>
   <string name="vdr_ssl_title">Безпечне підключення</string>
-  <string name="vdr_ssl_summary">Використовувати SSL для підключень</string>
+  <string name="vdr_ssl_summary">Використовувати SSL для підключень (в даний час не підтримується)</string>
+  <!-- channel filter preferences -->
   <string name="channel_filter_preferences">Налаштування каналу</string>
   <string name="channel_filter_filter_title">Обмеження на канали</string>
   <string name="channel_filter_filter_summary">Вокористовувати тільки дані канали</string>
   <string name="channel_filter_last_title">Фільтр каналів</string>
   <string name="channel_filter_last_summary">Розділені комами номери каналів або діапазони (роздільник \"-\"). Наприклад 1,2,4-10</string>
+  <!-- wakeup -->
   <string name="wakeup_preferences">Пробудження віддаленого VDR</string>
   <string name="wakeup_enabled_title">Може пробудити віддалений вузол VDR</string>
   <string name="wakeup_enabled_summary">Дозволяє пробудити віддалений вузол VDR</string>
   <string name="wakeup_url_title">URL-адреса для віддаленого пробудження</string>
   <string name="wakeup_url_summary">URL-адреса для запиту пробудження</string>
   <string name="wakeup_user_title">Користувач пробудження</string>
-  <string name="wakeup_user_summary">Користувач віддаленого пробудження</string>
+  <string name="wakeup_user_summary">Користувач для віддаленого пробудження</string>
   <string name="wakeup_password_title">Пароль пробудження</string>
   <string name="wakeup_password_summary">Пароль для віддаленого пробудження</string>
   <string name="wakeup_method_title">Метод пробудження</string>
   <string name="wakeup_method_summary">Виберіть метод пробудження вузла VDR</string>
+  <string-array name="wakeup_methods">
+    <item>Виклик URL</item>
+    <item>WOL (пробудження через інтернет)</item>
+  </string-array>
   <string name="wakeup_wol_custom_boradcast_title">IP-адреса призначення</string>
   <string name="wakeup_wol_custom_boradcast_summary">Якщо у Вас немає статичних таблиці ARP, Вам потрібно використовувати якусь широкомовну адресу.</string>
   <string name="wakeup_wol_mac_title">MAC-адреса</string>
   <string name="wakeup_wol_mac_summary">MAC-адреса вузла VDR. Використайте \':\' або \'-\' або пропуск як роздільник.</string>
+  <!-- timer -->
   <string name="timer_preferences">Типовий таймер</string>
   <string name="timer_pre_start_buffer_title">Зміщення при початку</string>
   <string name="timer_pre_start_buffer_summary">Хвилини запису перед початком трансляції</string>
@@ -152,6 +175,9 @@ herrlado&lt;herrlado@gmail.com&gt;
   <string name="timer_default_primary_limit_summary">Типове основне обмеження</string>
   <string name="timer_default_lifetime_title">Типова тривалість</string>
   <string name="timer_default_lifetime_summary">Типова тривалість</string>
+  <string name="timer_already_exists">Timer already defined.</string>
+  <string name="timer_created">Timer created</string>
+  <!-- GUI -->
   <string name="gui_preferences">Налаштування графічного інтерфейсу</string>
   <string name="gui_enable_24h_format_title">Використання 24-годинного формату</string>
   <string name="gui_enable_24h_format_summary_on">13:00</string>
@@ -174,6 +200,28 @@ herrlado&lt;herrlado@gmail.com&gt;
   <string name="qui_show_tmdb_button_summary_off">Кнопка TMDb не відображається</string>
   <string name="gui_custom_locale_title">Мова</string>
   <string name="gui_custom_locale_sum">Встановити мову.</string>
+  <string-array name="imdb_urls">
+    <item>Міжнародний</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">
+    <item>Англійська</item>
+    <item>Німецька</item>
+    <item>французька</item>
+    <item>Італійська</item>
+    <item>Польська</item>
+    <item>українська</item>
+  </string-array>
+  <string-array name="remux_entries">
+    <item>EXT</item>
+    <item>EXTERN (не рекомендується)</item>
+  </string-array>
   <string name="vdr_advanced_preferences">Додатково</string>
   <string name="vdr_advanced_preferences_summary">Додаткові параметри</string>
   <string name="vdr_conntimeout_title">Затримка з\'єднання</string>
@@ -198,21 +246,34 @@ herrlado&lt;herrlado@gmail.com&gt;
   <string name="recstream">Потокове передавання записів</string>
   <string name="recstream_enable_title">Потокове передавання записів</string>
   <string name="recstream_enable_summary">Увімкнення потокового передавання записів</string>
+  <string-array name="recstream_entries">
+    <item>додаток live</item>
+    <item>додаток streamdev</item>
+    <item>додаток smarttvweb</item>
+  </string-array>
+  <string-array name="recstream_smarttvweb_entries">
+    <item>Прогресивне</item>
+    <item>MPEG-DASH</item>
+    <item>Apple HLS</item>
+  </string-array>
   <string name="recstream_method_title">Метод передачі потоку</string>
-  <string name="recstream_method_summary">На даний час потоковий ефір через додаток VDR live підтримується</string>
+  <string name="recstream_method_summary">На даний час підтримується потокова трансляція за допомогою додатку VDR live і/або додатку streamdev</string>
   <string name="settings_live_port">Порт додатка VDR live</string>
   <string name="settings_live_port_summary">Додаток VDR live має стандартний порт 8008.</string>
+  <!-- progress -->
   <string name="progress_connect">Підключення...</string>
   <string name="progress_connect_error">Невдале з’єднання!</string>
   <string name="progress_connect_timeout">Затримка з\'єднання!</string>
   <string name="progress_login">Логін.</string>
   <string name="progress_login_error">Увійти не вдалося.</string>
-  <string name="progress_whatson_loading">Завантаження EPG…</string>
-  <string name="progress_timers_loading">Завантаження таймерів…</string>
-  <string name="progress_recordings_loading">Завантаження записів…</string>
-  <string name="progress_channels_loading">Завантаження каналів…</string>
-  <string name="progress_disconnect">Відключення…</string>
-  <string name="progress_wakeup_sending">Ініціювання запиту пробудження…</string>
+  <string name="progress_whatson_loading">Завантаження EPG&#8230;</string>
+  <string name="progress_timers_loading">Завантаження таймерів&#8230;</string>
+  <string name="progress_recordings_loading">Завантаження записів&#8230;</string>
+  <string name="progress_switching">Перемикання&#8230;</string>
+  <string name="progress_channels_loading">Завантаження каналів&#8230;</string>
+  <string name="progress_loading">Завантаження&#8230;</string>
+  <string name="progress_disconnect">Відключення&#8230;</string>
+  <string name="progress_wakeup_sending">Ініціювання запиту пробудження&#8230;</string>
   <string name="progress_wakeup_sent">Запит пробудження надісланий</string>
   <string name="progress_wakeup_error">Помилка при відправці запиту пробудження: %1$s</string>
   <string name="progress_timer_save">Збереження таймера...</string>
@@ -230,128 +291,215 @@ herrlado&lt;herrlado@gmail.com&gt;
   <string name="recent_channels_no_history">Немає історії...</string>
   <string name="gui_max_recent_channels_title">Макс. к-сть недавніх каналів</string>
   <string name="gui_max_recent_channels_summary">Скільки каналів повинно зберігатися в недавніх каналах?</string>
-  <string-array name="livetv_streamformat">
-    <item>TS</item>
-    <item>PES</item>
-    <item>ES</item>
-    <item>PS</item>
+  <string name="timer_detail_day_title">День</string>
+  <!--
+         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
+    -->
+  <string name="every_day">Щодня</string>
+  <!--
+         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
+    -->
+  <string name="never">Ніколи</string>
+  <!--
+         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"
+    -->
+  <string name="day_concat">", "</string>
+  <string name="timer_detail_repeat_title">Повторити</string>
+  <string name="timer_detail_use_vps">Використовувати VPS:</string>
+  <string name="timer_detail_priority">Пріоритет:</string>
+  <string name="timer_detail_lifetime">Термін служби:</string>
+  <string name="timer_detail_lifetime_hint">наприклад, 99</string>
+  <string name="timer_detail_priority_hint">наприклад, 50</string>
+  <string name="timer_detail_title_vps">%1$s (VPS)</string>
+  <string name="channel_item_menu_switch">Перейти до</string>
+  <string name="switching_success">Перейдено до %s</string>
+  <string name="switching_failed">Перехід до %1$s не вдався: %2$s</string>
+  <string name="switch_to_channel">Перейти до</string>
+  <string name="sort">Сортування</string>
+  <string name="sortby">Сортувати за</string>
+  <string name="sortby_time">Час</string>
+  <string name="sortby_channel">Канал</string>
+  <string name="sortby_alphabet">Абетка</string>
+  <string name="sortby_channellist">Список каналів</string>
+  <string name="main_menu_clear_search">Очищення історії пошуку</string>
+  <string name="vdr_host_not_defined">Сервер VDR не визначено</string>
+  <string name="processing">Обробка&#8230;</string>
+  <string-array name="recent_channels_order_entries">
+    <item>В основному використовується</item>
+    <item>Останнє використання</item>
   </string-array>
-
-  <string-array name="wakeup_methods">
-    <item>Виклик URL</item>
-    <item>WOL (пробудження через інтернет)</item>
+  <string-array name="epg_sort_by_time_alpha">
+    <item>Час</item>
+    <item>Абетка</item>
   </string-array>
-  <string-array name="imdb_urls">
-    <item>Міжнародний</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 name="epg_sort_by_time_alpha_channel">
+    <item>Час</item>
+    <item>Alphabet</item>
+    <item>Channel</item>
   </string-array>
-  <string-array name="lang">
-    <item>Англійська</item>
-    <item>Німецька</item>
-    <item>французька</item>
-    <item>Італійська</item>
-    <item>Польська</item>
-    <item>українська</item>
-    <item></item>
+  <string-array name="epg_sort_by_channels_alpha">
+    <item>Channels</item>
+    <item>Alphabet</item>
   </string-array>
-  <string-array name="remux_entries">
-    <item>EXT</item>
-    <item>EXTERN (не рекомендується)</item>
+  <string-array name="recordings_group_by">
+    <item>By Time</item>
+    <item>By Alphabet</item>
   </string-array>
-  <string-array name="recstream_entries">
-    <item>Додаток VDR live</item>
-      <item>Додаток VDR streamdev</item>
-        <item>Додаток VDR smattvweb</item>
+  <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>
+  <string-array name="navigation_array">
+    <item>Channels</item>
+    <item>EPG by Time</item>
+    <item>EPG by Channel</item>
+    <item>Recordings</item>
+    <item>Timers</item>
+    <item>Remote</item>
   </string-array>
-
+  <string name="filter">Filter</string>
+  <string name="audio_tracks_template">Audio Tracks: %1$s</string>
+  <string name="audio_track_dolby">D</string>
+  <string name="vdr_timezone_summary">The time zone used on the server. It is important if you travel and modify timers from another time zone.</string>
+  <string name="vdr_timezone_title">Select server time zone</string>
+  <string name="zone_list_menu_sort_alphabetically">Sort alphabetically</string>
+  <string name="zone_list_menu_sort_by_timezone">Sort by time zone</string>
+  <string name="probing">Probing %1$s &#8230;</string>
+  <string name="no_results">No results&#8230;</string>
+  <string name="recording_started">Recording started</string>
+  <string name="set_time">Set time</string>
+  <!-- … -->
+  <!-- 	     SSL related messages -->
+  <string name="certificate_problem_message_title">Certificate warning</string>
+  <string name="certificate_problem_message_text">The server certificate was not accepted:\n\n
+Hostname:\n
+ %1$s\n
+Valid from:\n
+ %2$s\n
+Valid until:\n
+ %3$s\n\n
+What do you want to do?</string>
+  <string name="certificate_accept_once">Accept once</string>
+  <string name="certificate_accepted_forever">Accept forever</string>
+  <string name="certificate_not_accepted">Abort</string>
   <!-- EPG Content -->
-
-
-<string name="Content$Show__Game_Show">Шоу//Ігри</string>
-<string name="Content$Athletics">Атлетика</string>
-<string name="Content$Musical__Opera">Мюзикл/Опера</string>
-<string name="Content$Tourism__Travel">Туризм/Подорожі</string>
-<string name="Content$Languages">Мови</string>
-<string name="Content$Documentary">Документальне</string>
-<string name="Content$Further_Education">Дальше навчання</string>
-<string name="Content$Martial_Sports">Військовий спорт</string>
-<string name="Content$Equestrian">Кінний спорт</string>
-<string name="Content$Fine_Arts">Образотворче мистецтво</string>
-<string name="Content$Folk__Tradional_Music">Фльк/Традиційна музика</string>
-<string name="Content$Original_Language">Оригінальна мова</string>
-<string name="Content$Economics__Social_Advisory">Економіка/Соціальний порадник</string>
-<string name="Content$News_Magazine">Журнал новин</string>
-<string name="Content$Arts__Culture_Magazine">Мистецтво/Культурний журнал</string>
-<string name="Content$Movie__Drama">Фільм/Драма</string>
-<string name="Content$Preschool_Childrens_Programme">Дошкільні дитячі програми</string>
-<string name="Content$Fitness_and_Health">Фітнес і здоров’я</string>
-<string name="Content$Film__Cinema">Кінофільм</string>
-<string name="Content$Cooking">Готування їжі</string>
-<string name="Content$News__Current_Affairs">Новини/Поточні події</string>
-<string name="Content$Entertainment_Programme_for_6_to_14">Програми для дітей від 6 до 14 років</string>
-<string name="Content$Music__Ballet__Dance">Музика/Балет/Танці</string>
-<string name="Content$New_Media">Нові медія</string>
-<string name="Content$Black_and_White">Чорне і біле</string>
-<string name="Content$Informational__Educational__School_Programme">Інформаційні/Навчальні/Шкільна програма</string>
-<string name="Content$Handicraft">Ремісниче</string>
-<string name="Content$Remarkable_People">Незвичайні люди</string>
-<string name="Content$Adventure__Western__War">Пригоди/Вестерн/Війна</string>
-<string name="Content$Science_Fiction__Fantasy__Horror">Наукова фантастика/Фантастика/Жахи</string>
-<string name="Content$Water_Sport">Водний спорт</string>
-<string name="Content$Football__Soccer">Футбол</string>
-<string name="Content$Foreign_Countries__Expeditions">Зарубіжні країни/Експедиції</string>
-<string name="Content$Variety_Show">Вар’єте</string>
-<string name="Content$Education__Science__Factual">Навчання/Наука/Факти</string>
-<string name="Content$Jazz">Джаз</string>
-<string name="Content$Adult_Movie__Drama">Кіно для дорослих/Драма</string>
-<string name="Content$Comedy">Комедія</string>
-<string name="Content$Unpublished">Неопубліковане</string>
-<string name="Content$Social__Political__Economics">Соцільне/Політичне/Економічне</string>
-<string name="Content$Entertainment_Programme_for_10_to_16">Програми для дітей від 10 до 16 років</string>
-<string name="Content$Popular_Culture__Traditional_Arts">Популярна культура/Традиційне мистецтво</string>
-<string name="Content$Leisure__Hobbies">Відпочинок/Хоббі</string>
-<string name="Content$Detective__Thriller">Детектив/Тріллер</string>
-<string name="Content$Serious__Classical_Music">Серйозна/Класична музика</string>
-<string name="Content$Discussion__Inverview__Debate">Дискусія/Інтерв’ю/Дебати</string>
-<string name="Content$Social__Spiritual_Sciences">Соціальна/Духовна наука</string>
-<string name="Content$Soap__Melodrama__Folkloric">Мильна опера/Мелодрама/Фольклор</string>
-<string name="Content$Ballet">Балет</string>
-<string name="Content$Fashion">Мода</string>
-<string name="Content$Winter_Sports">Зимовий спорт</string>
-<string name="Content$Cartoons__Puppets">Мультфільми</string>
-<string name="Content$Sports">Спорт</string>
-<string name="Content$Technology__Natural_Sciences">Технологія/Природничі науки</string>
-<string name="Content$Literature">Література</string>
-<string name="Content$Motor_Sport">Моторний спорт</string>
-<string name="Content$Sport_Magazine">Спортивний журнал</string>
-<string name="Content$Romance">Романс</string>
-<string name="Content$Arts__Culture">Мистецтво/Культура</string>
-<string name="Content$Serious__Classical__Religious__Historical_Movie__Drama">Серйозне/Класика/Релігія/Історія/Драма</string>
-<string name="Content$News__Weather_Report">Новини/Спорт</string>
-<string name="Content$Special_Event">Спеціальні події</string>
-<string name="Content$Childrens__Youth_Programme">Дитяче/Молодіжні програми</string>
-<string name="Content$Gardening">Сад/Город</string>
-<string name="Content$Rock__Pop">Рок/Поп</string>
-<string name="Content$Religion">Релігія</string>
-<string name="Content$Nature__Animals__Environment">Природа/Тварини/Навколишнє оточення</string>
-<string name="Content$Broadcasting__Press">Трансляція/Преса</string>
-<string name="Content$Talk_Show">Ток шоу</string>
-<string name="Content$Live_Broadcast">Трансляція</string>
-<string name="Content$Advertisement__Shopping">Реклама/Закупи</string>
-<string name="Content$Performing_Arts">Дресирування</string>
-<string name="Content$Experimental_Film__Video">Експериментальний фільм/Відео</string>
-<string name="Content$Magazine__Report__Documentary">Журнал/Рапорт/Документальне</string>
-<string name="Content$Tennis__Squash">Теніс/Сквош</string>
-<string name="Content$Game_Show__Quiz__Contest">Ігрове шоу/Тести</string>
-<string name="Content$Medicine__Physiology__Psychology">Медицина/Фізіологія/Психологія</string>
-<string name="Content$Motoring">Автомобільна справа</string>
-<string name="Content$Team_Sports">Спортивні команди</string>
-
-  <!--  EPG Content END -->
+  <string name="Content$Movie__Drama">Movie/Drama</string>
+  <string name="Content$Detective__Thriller">Detective/Thriller</string>
+  <string name="Content$Adventure__Western__War">Adventure/Western/War</string>
+  <string name="Content$Science_Fiction__Fantasy__Horror">Science Fiction/Fantasy/Horror</string>
+  <string name="Content$Comedy">Comedy</string>
+  <string name="Content$Soap__Melodrama__Folkloric">Soap/Melodrama/Folkloric</string>
+  <string name="Content$Romance">Romance</string>
+  <string name="Content$Serious__Classical__Religious__Historical_Movie__Drama">Serious/Classical/Religious/Historical Movie/Drama</string>
+  <string name="Content$Adult_Movie__Drama">Adult Movie/Drama</string>
+  <string name="Content$News__Current_Affairs">News/Current Affairs</string>
+  <string name="Content$News__Weather_Report">News/Weather Report</string>
+  <string name="Content$News_Magazine">News Magazine</string>
+  <string name="Content$Documentary">Documentary</string>
+  <string name="Content$Discussion__Inverview__Debate">Discussion/Inverview/Debate</string>
+  <string name="Content$Show__Game_Show">Show/Game Show</string>
+  <string name="Content$Game_Show__Quiz__Contest">Game Show/Quiz/Contest</string>
+  <string name="Content$Variety_Show">Вар\'єте</string>
+  <string name="Content$Talk_Show">Ток-шоу</string>
+  <string name="Content$Sports">Спорт</string>
+  <string name="Content$Special_Event">Спеціальна подія</string>
+  <string name="Content$Sport_Magazine">Спортивний журнал</string>
+  <string name="Content$Football__Soccer">Футбол</string>
+  <string name="Content$Tennis__Squash">Теніс/сквош</string>
+  <string name="Content$Team_Sports">Командні види спорту</string>
+  <string name="Content$Athletics">Легка атлетика</string>
+  <string name="Content$Motor_Sport">Автоспорт</string>
+  <string name="Content$Water_Sport">Водний спорт</string>
+  <string name="Content$Winter_Sports">Зимові види спорту</string>
+  <string name="Content$Equestrian">Кінний спорт</string>
+  <string name="Content$Martial_Sports">Бойові мистецтва</string>
+  <string name="Content$Childrens__Youth_Programme">Дитяча/молодіжна програма</string>
+  <string name="Content$Preschool_Childrens_Programme">Програма для дітей дошкільного віку</string>
+  <string name="Content$Entertainment_Programme_for_6_to_14">Розважальна програма для 6-14 років</string>
+  <string name="Content$Entertainment_Programme_for_10_to_16">Розважальна програма для 10-16 років</string>
+  <string name="Content$Informational__Educational__School_Programme">Інформаційна/освітня/шкільна програма</string>
+  <string name="Content$Cartoons__Puppets">Мультфільми/маріонетки</string>
+  <string name="Content$Music__Ballet__Dance">Music/Ballet/Dance</string>
+  <string name="Content$Rock__Pop">Rock/Pop</string>
+  <string name="Content$Serious__Classical_Music">Serious/Classical Music</string>
+  <string name="Content$Folk__Tradional_Music">Folk/Tradional Music</string>
+  <string name="Content$Jazz">Jazz</string>
+  <string name="Content$Musical__Opera">Musical/Opera</string>
+  <string name="Content$Ballet">Ballet</string>
+  <string name="Content$Arts__Culture">Arts/Culture</string>
+  <string name="Content$Performing_Arts">Performing Arts</string>
+  <string name="Content$Fine_Arts">Fine Arts</string>
+  <string name="Content$Religion">Religion</string>
+  <string name="Content$Popular_Culture__Traditional_Arts">Popular Culture/Traditional Arts</string>
+  <string name="Content$Literature">Literature</string>
+  <string name="Content$Film__Cinema">Film/Cinema</string>
+  <string name="Content$Experimental_Film__Video">Experimental Film/Video</string>
+  <string name="Content$Broadcasting__Press">Broadcasting/Press</string>
+  <string name="Content$New_Media">New Media</string>
+  <string name="Content$Arts__Culture_Magazine">Arts/Culture Magazine</string>
+  <string name="Content$Fashion">Fashion</string>
+  <string name="Content$Social__Political__Economics">Social/Political/Economics</string>
+  <string name="Content$Magazine__Report__Documentary">Magazine/Report/Documentary</string>
+  <string name="Content$Economics__Social_Advisory">Economics/Social Advisory</string>
+  <string name="Content$Remarkable_People">Remarkable People</string>
+  <string name="Content$Education__Science__Factual">Education/Science/Factual</string>
+  <string name="Content$Nature__Animals__Environment">Nature/Animals/Environment</string>
+  <string name="Content$Technology__Natural_Sciences">Technology/Natural Sciences</string>
+  <string name="Content$Medicine__Physiology__Psychology">Medicine/Physiology/Psychology</string>
+  <string name="Content$Foreign_Countries__Expeditions">Foreign Countries/Expeditions</string>
+  <string name="Content$Social__Spiritual_Sciences">Social/Spiritual Sciences</string>
+  <string name="Content$Further_Education">Further Education</string>
+  <string name="Content$Languages">Languages</string>
+  <string name="Content$Leisure__Hobbies">Leisure/Hobbies</string>
+  <string name="Content$Tourism__Travel">Tourism/Travel</string>
+  <string name="Content$Handicraft">Handicraft</string>
+  <string name="Content$Motoring">Motoring</string>
+  <string name="Content$Fitness_and_Health">Fitness &amp; Health</string>
+  <string name="Content$Cooking">Cooking</string>
+  <string name="Content$Advertisement__Shopping">Advertisement/Shopping</string>
+  <string name="Content$Gardening">Gardening</string>
+  <string name="Content$Original_Language">Original Language</string>
+  <string name="Content$Black_and_White">Black &amp; White</string>
+  <string name="Content$Unpublished">Unpublished</string>
+  <string name="Content$Live_Broadcast">Live Broadcast</string>
+  <!-- EPG Content END -->
+  <string name="type_to_filter">type to filter</string>
+  <string name="drive_info">Free %1$s GB of %2$s GB (%3$s%%)</string>
+  <string name="drive_img">Drive</string>
+  <string name="sad_img">Sad</string>
+  <string name="search">Search</string>
+  <string name="clear_term_after_search_title">Clear Term after Search</string>
+  <string name="clear_term_after_search_summary_off">Search term remains after peforming search</string>
+  <string name="clear_term_after_search_summary_on">Term gets cleared after performing search</string>
+  <string name="drawer_open">Open navigation drawer</string>
+  <string name="drawer_close">Close navigation drawer</string>
+  <string name="action_websearch">Web search</string>
+  <string name="settings_smarttvweb_port_summary">VDR smarttvweb plugin has default port 8000</string>
+  <string name="settings_smarttvweb_port">Smarttvweb port</string>
+  <string name="recstream_smarttvweb_method_title">Smarttvweb Stream Type</string>
+  <string name="recstream_smarttvweb_method_summary">Supported methods: \'Progressive\', \'MPEG-DASH \/ OIPF HAS\', \'Apple HLS\'</string>
+  <string name="remote">Remote Control</string>
+  <string name="remote_enable_summary">Shows the remote control view if enabled</string>
+  <string name="remote_enable_title">Enable VDR remote control</string>
+  <string name="svdrp_port_title">SVDRP Port</string>
+  <string name="svdrp_port_summary">Default is 6419</string>
+  <string name="label">Label</string>
+  <string name="hitkcommand">HITK Command</string>
+  <string name="menu_reset">Reset</string>
+  <string name="menu_exprt">Export</string>
+  <string name="menu_imprt">Import</string>
+  <string name="menu_remapback">\'Back\' is \'Back\' HITK</string>
+  <string name="remapback_hint">Longpress on Back Button to leave the remote.</string>
+  <string name="not_yet_implemented">Not Yet Implemented</string>
+  <string name="timer_error">Can not create timer: %1$s</string>
 </resources>