diff -Nru kodi-pvr-vdr-vnsi-2.6.9/debian/changelog kodi-pvr-vdr-vnsi-2.6.17/debian/changelog
--- kodi-pvr-vdr-vnsi-2.6.9/debian/changelog	2016-11-27 14:37:59.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/debian/changelog	2017-01-19 16:31:38.000000000 +0000
@@ -1,4 +1,4 @@
-kodi-pvr-vdr-vnsi (2.6.9-1~xenial) xenial; urgency=low
+kodi-pvr-vdr-vnsi (2.6.17-3~xenial) xenial; urgency=low
 
   [ xbmc ]
   * autogenerated dummy changelog
@@ -6,4 +6,4 @@
   [ wsnipex ]
   * no upstream changelog available
 
- -- wsnipex <wsnipex@a1.net>  Sun, 27 Nov 2016 15:37:59 +0100
+ -- wsnipex <wsnipex@a1.net>  Thu, 19 Jan 2017 17:31:38 +0100
diff -Nru kodi-pvr-vdr-vnsi-2.6.9/debian/changelog.tmp kodi-pvr-vdr-vnsi-2.6.17/debian/changelog.tmp
--- kodi-pvr-vdr-vnsi-2.6.9/debian/changelog.tmp	2016-11-27 14:37:36.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/debian/changelog.tmp	2017-01-19 16:31:16.000000000 +0000
@@ -1,4 +1,4 @@
-kodi-pvr-vdr-vnsi (2.6.9-1~#DIST#) #DIST#; urgency=low
+kodi-pvr-vdr-vnsi (2.6.17-3~#DIST#) #DIST#; urgency=low
 
   [ xbmc ]
   * autogenerated dummy changelog
diff -Nru kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/addon.xml.in kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/addon.xml.in
--- kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/addon.xml.in	2016-11-26 13:27:01.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/addon.xml.in	2017-01-14 14:03:27.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.vdr.vnsi"
-  version="2.6.9"
+  version="2.6.17"
   name="VDR VNSI Client"
   provider-name="FernetMenta, Team Kodi">
   <requires>
@@ -29,7 +29,8 @@
     <summary lang="en_US">PVR client to connect VDR to Kodi over the VNSI interface</summary>
     <summary lang="es_AR">Cliente PVR para conectar VDR a Kodi sobre la interfaz VNSI</summary>
     <summary lang="es_ES">Cliente PVR para conectar VDR a Kodi sobre la interfaz VNSI</summary>
-    <summary lang="fi_FI">PVR-asiakas, joka kytkee VDR:n Kodi:iin VNSI:n avulla</summary>
+    <summary lang="es_MX">Cliente PVR para conectar VDR a Kodi a través de la interfaz VNSI</summary>
+    <summary lang="fi_FI">Kodin VDR (VNSI) -asiakasohjelma</summary>
     <summary lang="fr_CA">Client de numériscope pour connecter VDR à Kodi par une interface VNSI.</summary>
     <summary lang="fr_FR">Client enregistreur vidéo (PVR) connectant un enregistreur de disque vidéo à Kodi via l'interface d'enregistrement de flux réseau vidéo</summary>
     <summary lang="gl_ES">Cliente PVR que conecta VDR ao Kodi mediante a interface VNSI</summary>
@@ -58,15 +59,16 @@
     <summary lang="sr_RS">PVR клијент за повезивање VDR са Kodi преко VNSI интерфејса</summary>
     <summary lang="sr_RS@latin">PVR klijent za povezivanje VDR sa Kodi preko VNSI interfejsa</summary>
     <summary lang="sv_SE">PVR-klient för att ansluta VDR till Kodi över VNSI-gränsnittet</summary>
+    <summary lang="szl">Klijynt telewizyje do skuplowaniŏ VDR bez interfejs VNSI</summary>
     <summary lang="tr_TR">Kayıt Sunucusu VDR'ye Kodi'yle VNSI Arayüzü Üzerinden Bağlanır</summary>
     <summary lang="uk_UA">Клієнт PVR для зв’язку VDR з Kodi через інтерфейс VNSI</summary>
     <summary lang="vi_VN">Trình PVR để kết nối VDR với Kodi qua giao tiếp VNSI</summary>
     <summary lang="zh_CN">让 Kodi 通过 VNSI 界面与 VDR 连接的 PVR 客户端</summary>
-    <summary lang="zh_TW">PVR用戶端經由VNSI介面接口連接VDR到Kodi</summary>
+    <summary lang="zh_TW">經由VNSI界接VDR到Kodi的PVR用戶端</summary>
     <description lang="af_ZA">VDR voorprogram; ondersteun stroom van Lewendige TV &amp; Opnames, EPG, Tydhouers oor die VNSI byvoegsel</description>
     <description lang="be_BY">VDR frontend; supporting streaming of Live TV &amp; Recordings, EPG, Timers over the VNSI plugin</description>
     <description lang="bg_BG">VDR клиент. Поддържа поточна телевизия и записване, електронен програмен справочник, броячи чрез VNSI приставка.</description>
-    <description lang="ca_ES">Frontal VDR; suportant fluxos de TV en directe i enregistraments, EPG, temporitzadors sobre el connector VNSI</description>
+    <description lang="ca_ES">Frontal de VDR; és compatible amb les transmissions en línia de TV en directe i enregistraments, guia electrònica de programació (EPG), temporitzadors sobre el connector VNSI</description>
     <description lang="cs_CZ">Rozhraní VDR. Podporuje proudové vysílání živého vysílání a nahrávek, poslech kanálů rádia, EPG, a časovače skrze modul VNSI</description>
     <description lang="cy_GB">Blaen VDR; cynnal ffrydio Teledu Byw, Recordio, Amserlenni, Amseryddion dros ategyn VNSI</description>
     <description lang="da_DK">VDR frontend; understøtter streaming af TV og Optagelser, EPG og Timere over VNSI-addon</description>
@@ -78,7 +80,8 @@
     <description lang="en_US">VDR frontend; supporting streaming of Live TV &amp; Recordings, EPG, Timers over the VNSI plugin</description>
     <description lang="es_AR">Front-end VDR, soporte de streaming de televisión en vivo y grabaciones, GEP, temporizador con el plugin VNSI</description>
     <description lang="es_ES">Front-end VDR, soporte de streaming de televisión en vivo y grabaciones, EPG, temporizador con el plugin VNSI</description>
-    <description lang="fi_FI">VDR-frontend; tukee livelähetyksiä sekä tallenteita, ohjelmaopasta, ajastuksia ja VNSI-lisäosia</description>
+    <description lang="es_MX">Interfaz VDR; Soportando streaming de TV en directo y Grabaciones, EPG, Timers sobre el plugin VNSI</description>
+    <description lang="fi_FI">VDR-asiakasohjelma. Tukee suorien tv-lähetysten ja tallennusten katsomista, ohjelmaopasta ja ohjelmien ajastamista.</description>
     <description lang="fr_CA">Frontal VDR, prenant en charge la diffusion en continu des télés en direct &amp; les enregistrements, le GÉP et les minuteries avec le plugiciel VNSI.</description>
     <description lang="fr_FR">Interface logicielle pour enregistreur de disque vidéo (VDR). Il gère la lecture et l'enregistrement en continu des flux de TV en direct, le guide électronique des programmes TV et les programmations via les routines d'enregistrement de flux réseau vidéo.</description>
     <description lang="gl_ES">Interface VDR; soporta a transmisión de TV en directo e gravacións, Guía de programación e temporizadores mediante o engadido de VNSI</description>
@@ -96,7 +99,7 @@
     <description lang="ms_MY">Bahagian hadapan VDR; menyokong penstirman  TV Langsung &amp; Rakaman, EPG, Pemasa menerusi pemalam VNSI</description>
     <description lang="nb_NO">VDR frontend; støtte for visning av direkte TV og opptak, EPG og tidtakere over VNSI-tillegget</description>
     <description lang="nl_NL">VDR frontend: ondersteunt streaming van Live TV &amp; Recordings, EPG, Timers over de VNSI plugin</description>
-    <description lang="pl_PL">Klient telewizyjny dla VDR obsługuje strumieniowanie kanałów radiowych i telewizyjnych, nagrywanie i harmonogram nagrań oraz funkcje przewodnika telewizyjnego przy wykorzystaniu wtyczki VNSI dla VDR</description>
+    <description lang="pl_PL">Klient telewizji dla VDR obsługuje transmisję kanałów radiowych i telewizyjnych, nagrywanie i harmonogram nagrań oraz funkcje przewodnika telewizyjnego przy wykorzystaniu wtyczki VNSI dla VDR</description>
     <description lang="pt_BR">Frontend VDR; suporta streaming de TV ao vivo e gravações, EPG, agendamentos sobre o plugin VNSI</description>
     <description lang="pt_PT">Frontend VDR; suporta transmissão de Live TV e Gravações, EPG e Temporizadores através do plugin VNSI</description>
     <description lang="ro_RO">Frontend VDR; suportă streaming de TV Live &amp; Înregistrări, EPG, Cronometre folosind pluginul VNSI</description>
@@ -107,11 +110,12 @@
     <description lang="sr_RS">VDR интерфејс; подржава стримовање ТВ Уживо &amp; Снимака, EPG, Тајмере преко VNSI</description>
     <description lang="sr_RS@latin">VDR interfejs; podržava strimovanje TV Uživo &amp; Snimaka, EPG, Tajmere preko VNSI</description>
     <description lang="sv_SE">VDR frontend; stödjer strömning av direktsänd TV &amp; inspelningar, EPG, timers över VNSI-tillägget</description>
+    <description lang="szl">Klijynt telewizyjny dlŏ VDR podpiyrŏ szpricowanie kanałōw radyjowych i telewizyjnych, nagrowanie i harmōnogram nagrań i funkcyje EPG przi wyużyciu sztekra VNSI dlŏ VDR</description>
     <description lang="tr_TR">VDR ön ucu; Canlı TV akışı ve kayıt yapabilme, EPG, VNSI eklentisi üzerinden zamanlayıcıları destekler.</description>
     <description lang="uk_UA">Надстройка над VDR; підтримує потік TV і записів,  EPG, таймерів через додаток VNSI</description>
     <description lang="vi_VN">Giao tiếp cho VDR; hỗ trợ truyền phát và thu chương trình Live TV, hẹn giờ và hiển thị lịch trình chiếu (EPG) thông qua plugin VNSI</description>
     <description lang="zh_CN">VDR 前端，通过 VNSI 插件支持直播电视和录像流媒体、电子节目单、定时器</description>
-    <description lang="zh_TW">VDR前端，在VNSI外掛插件上支援的串流媒體包括有：電視直播和錄影，電子節目表，定時器。</description>
+    <description lang="zh_TW">VDR前端，在VNSI插件上支援的串流媒體包括有：電視直播和錄影，電子節目表，定時器。</description>
     <disclaimer lang="af_ZA">Hierdie is onstabiele sagteware! Die outeurs is op geen manier verantwoordelik vir gefaalde opnames, inkorrekte tydhouers, gemorsde ure, of enige ander ongewensde effekte.</disclaimer>
     <disclaimer lang="be_BY">This is unstable software! The authors are in no way responsible for failed recordings, incorrect timers, wasted hours, or any other undesirable effects..</disclaimer>
     <disclaimer lang="bg_BG">Тази програма е нестабилна! Авторите не носят отговорност за неуспешно записване, некоректни броячи, пропиляно време и други нежелани ефекти.</disclaimer>
@@ -129,7 +133,7 @@
     <disclaimer lang="es_ES">¡Este software es aún inestable! Los autores no son responsables en forma alguna por grabaciones fallidas, temporizaciones incorrectas, tiempo perdido o ningún otro efecto no deseado.</disclaimer>
     <disclaimer lang="es_MX">¡Esto es software inestable! Los autores no son de ninguna manera responsables por grabaciones fallidas, temporizadores incorrectos, horas perdidas o cualquier otro efecto no deseado...</disclaimer>
     <disclaimer lang="et_EE">See on ebastabiilne tarkvara! Autorid ei ole kuidagi moodi vastutavad nurjunud salvestiste, ebaõige aegrelee, raisatud tundide ega muude soovimatute asjade eest.</disclaimer>
-    <disclaimer lang="fi_FI">Tämä on epävakaa ohjelmisto! Ohjelmiston tekijät eivät ole millään muotoa vastuussa epäonnistuneista tallennuksista, virheellisistä ajastuksista, haaskatusta ajasta, verenpaineen noususta eikä mistään muusta epäsuotuisasta vaikutuksesta.</disclaimer>
+    <disclaimer lang="fi_FI">Tämä on epävakaa ohjelma! Sen tekijät eivät ole millään muotoa vastuussa epäonnistuneista tallennuksista, virheellisistä ajastuksista, haaskatusta ajasta, verenpaineen noususta tai mistään muusta epäsuotuisasta vaikutuksesta.</disclaimer>
     <disclaimer lang="fr_CA">Ce logiciel est instable! Les auteurs ne sont aucunement responsables des enregistrements défaillants, des minuteries erronées, des heures perdues ou tout autre effet indésirable.</disclaimer>
     <disclaimer lang="fr_FR">Logiciel en cours d'élaboration ! Les auteurs ne sont en aucun cas responsables de l'échec des enregistrements, programmations défectueuses, temps perdu ou autres effets indésirables.</disclaimer>
     <disclaimer lang="gl_ES">Software non estable, os autores non se fan responsábeis dos erros na gravacións, temporizadores incorrectos, e outros efectos non desexados.</disclaimer>
diff -Nru kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/language/resource.language.af_za/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.af_za/strings.po
--- kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/language/resource.language.af_za/strings.po	2016-11-26 13:27:01.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.af_za/strings.po	2017-01-14 14:03:27.000000000 +0000
@@ -272,6 +272,26 @@
 msgid "Provider Unknown"
 msgstr "Verskaffer onbekend"
 
+msgctxt "#30200"
+msgid "Single"
+msgstr "Enkel"
+
 msgctxt "#30201"
 msgid "Repeating"
 msgstr "Herhaal"
+
+msgctxt "#30202"
+msgid "EGP"
+msgstr "EGP"
+
+msgctxt "#30203"
+msgid "VPS"
+msgstr "VPS"
+
+msgctxt "#30204"
+msgid "Search EPG"
+msgstr "Deursoek EPG"
+
+msgctxt "#30205"
+msgid "Repeating Child"
+msgstr "Herhalend Kind"
diff -Nru kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/language/resource.language.ca_es/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.ca_es/strings.po
--- kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/language/resource.language.ca_es/strings.po	2016-11-26 13:27:01.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.ca_es/strings.po	2017-01-14 14:03:27.000000000 +0000
@@ -18,7 +18,7 @@
 
 msgctxt "#30000"
 msgid "VDR Hostname or IP"
-msgstr "Nom de màquina o IP del VDR"
+msgstr "Nom d'amfitrió o IP de VDR"
 
 msgctxt "#30001"
 msgid "VNSI Port"
@@ -34,7 +34,7 @@
 
 msgctxt "#30004"
 msgid "Connect timeout (s)"
-msgstr "Temps d'espera de connexió (s)"
+msgstr "Temps d'expiració de la connexió (s)"
 
 msgctxt "#30006"
 msgid "Read recordings from directory"
@@ -58,7 +58,7 @@
 
 msgctxt "#30011"
 msgid "Source Type"
-msgstr "Tipus de font"
+msgstr "Tipus d'origen"
 
 msgctxt "#30012"
 msgid "TV channels"
@@ -66,7 +66,7 @@
 
 msgctxt "#30013"
 msgid "Radio channels"
-msgstr "Canals de ràdio"
+msgstr "Emissores de ràdio"
 
 msgctxt "#30014"
 msgid "FTA channels"
@@ -114,7 +114,7 @@
 
 msgctxt "#30025"
 msgid "Channel search - running... %i %%"
-msgstr "Cerca de canals - executant... %i %%"
+msgstr "Cerca de canals - En execució... %i %%"
 
 msgctxt "#30026"
 msgid "Type:"
@@ -126,7 +126,7 @@
 
 msgctxt "#30028"
 msgid "Scan: %i"
-msgstr "Escaneig: %i"
+msgstr "Exploració: %i"
 
 msgctxt "#30029"
 msgid "Signal: %i %%"
@@ -170,7 +170,7 @@
 
 msgctxt "#30039"
 msgid "Running"
-msgstr "S'està executant"
+msgstr "En execució"
 
 msgctxt "#30040"
 msgid "Stopped"
@@ -202,7 +202,7 @@
 
 msgctxt "#30047"
 msgid "Request Timeshift"
-msgstr "Sol·licitar TimeShift"
+msgstr "Sol·licita els salts en el temps"
 
 msgctxt "#30048"
 msgid "Path to channel icons"
@@ -214,7 +214,7 @@
 
 msgctxt "#30100"
 msgid "VDR OSD"
-msgstr "VDR OSD"
+msgstr "OSD de VDR"
 
 msgctxt "#30101"
 msgid "Setup"
@@ -222,23 +222,23 @@
 
 msgctxt "#30102"
 msgid "Controlling OSD - press info to exit"
-msgstr "Controlant OSD - prem info per sortir"
+msgstr "Control d'OSD - premeu info per a sortir"
 
 msgctxt "#30103"
 msgid "Select to control OSD"
-msgstr "Seleccionar per controlar OSD"
+msgstr "Selecciona per controlar OSD"
 
 msgctxt "#30104"
 msgid "Timeshift Mode"
-msgstr "Mode Timeshift"
+msgstr "Mode dels salts en el temps"
 
 msgctxt "#30105"
 msgid "Timeshift Buffer (RAM) x100 MB"
-msgstr "Timeshift Buffer (RAM) x100 MB"
+msgstr "Memòria intermèdia dels salts en el temps (RAM) x100 MB"
 
 msgctxt "#30106"
 msgid "Timeshift Buffer (File) x1 GB"
-msgstr "Buffer Timeshift Buffer (Arxiu) x1 GB"
+msgstr "Memòria intermèdia dels salts en el temps (fitxer) x1 GB"
 
 msgctxt "#30107"
 msgid "VDR Admin"
@@ -258,11 +258,11 @@
 
 msgctxt "#30111"
 msgid "Channel filters"
-msgstr "Filtre de canals"
+msgstr "Filtres dels canals"
 
 msgctxt "#30112"
 msgid "Radio Channels"
-msgstr "Canals de ràdio"
+msgstr "Emissores de ràdio"
 
 msgctxt "#30113"
 msgid "Save filters"
@@ -270,8 +270,24 @@
 
 msgctxt "#30114"
 msgid "Provider Unknown"
-msgstr "Proveïdor Desconegut"
+msgstr "Proveïdor desconegut"
+
+msgctxt "#30200"
+msgid "Single"
+msgstr "Individual"
 
 msgctxt "#30201"
 msgid "Repeating"
-msgstr "Més d'un cop"
+msgstr "Repetició"
+
+msgctxt "#30202"
+msgid "EGP"
+msgstr "EGP"
+
+msgctxt "#30203"
+msgid "VPS"
+msgstr "VPS"
+
+msgctxt "#30204"
+msgid "Search EPG"
+msgstr "Cerca l'EPG"
diff -Nru kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/language/resource.language.da_dk/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.da_dk/strings.po
--- kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/language/resource.language.da_dk/strings.po	2016-11-26 13:27:01.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.da_dk/strings.po	2017-01-14 14:03:27.000000000 +0000
@@ -18,11 +18,11 @@
 
 msgctxt "#30000"
 msgid "VDR Hostname or IP"
-msgstr "VDR værtsnavn eller IP-adresse"
+msgstr "VDR-værtsnavn eller IP-adresse"
 
 msgctxt "#30001"
 msgid "VNSI Port"
-msgstr "VNSI port"
+msgstr "VNSI-port"
 
 msgctxt "#30002"
 msgid "Priority"
@@ -30,7 +30,7 @@
 
 msgctxt "#30003"
 msgid "Character Set Conversion"
-msgstr "Tegnsæt konvertering"
+msgstr "Tegnsætkonvertering"
 
 msgctxt "#30004"
 msgid "Connect timeout (s)"
@@ -42,7 +42,7 @@
 
 msgctxt "#30007"
 msgid "VDR recordings directory"
-msgstr "VDR optagelsesmappen"
+msgstr "VDR-optagelsesmappen"
 
 msgctxt "#30008"
 msgid "Channel search"
@@ -54,7 +54,7 @@
 
 msgctxt "#30010"
 msgid "Start Channel search"
-msgstr "Start Kanalsøgning"
+msgstr "Start kanalsøgning"
 
 msgctxt "#30011"
 msgid "Source Type"
@@ -106,7 +106,7 @@
 
 msgctxt "#30023"
 msgid "ATSC Type"
-msgstr "ATSC Type"
+msgstr "ATSC-type"
 
 msgctxt "#30024"
 msgid "Back"
@@ -142,11 +142,11 @@
 
 msgctxt "#30032"
 msgid "Analog TV"
-msgstr "Analog TV"
+msgstr "Analogt tv"
 
 msgctxt "#30033"
 msgid "Analog Radio"
-msgstr "Analog Radio"
+msgstr "Analog radio"
 
 msgctxt "#30034"
 msgid "Transponder:"
@@ -272,6 +272,22 @@
 msgid "Provider Unknown"
 msgstr "Udbyder Ukendt"
 
+msgctxt "#30200"
+msgid "Single"
+msgstr "Enlig"
+
 msgctxt "#30201"
 msgid "Repeating"
 msgstr "Gentagende"
+
+msgctxt "#30202"
+msgid "EGP"
+msgstr "GP"
+
+msgctxt "#30203"
+msgid "VPS"
+msgstr "VPS"
+
+msgctxt "#30204"
+msgid "Search EPG"
+msgstr "Søg EPG"
diff -Nru kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/language/resource.language.en_gb/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.en_gb/strings.po
--- kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/language/resource.language.en_gb/strings.po	2016-11-26 13:27:01.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.en_gb/strings.po	2017-01-14 14:03:27.000000000 +0000
@@ -299,3 +299,7 @@
 msgctxt "#30204"
 msgid "Search EPG"
 msgstr ""
+
+msgctxt "#30205"
+msgid "Repeating Child"
+msgstr ""
diff -Nru kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/language/resource.language.en_nz/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.en_nz/strings.po
--- kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/language/resource.language.en_nz/strings.po	2016-11-26 13:27:01.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.en_nz/strings.po	2017-01-14 14:03:27.000000000 +0000
@@ -272,6 +272,22 @@
 msgid "Provider Unknown"
 msgstr "Provider Unknown"
 
+msgctxt "#30200"
+msgid "Single"
+msgstr "Single"
+
 msgctxt "#30201"
 msgid "Repeating"
 msgstr "Repeating"
+
+msgctxt "#30203"
+msgid "VPS"
+msgstr "VPS"
+
+msgctxt "#30204"
+msgid "Search EPG"
+msgstr "Search EPG"
+
+msgctxt "#30205"
+msgid "Repeating Child"
+msgstr "Repeating Child"
diff -Nru kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/language/resource.language.en_us/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.en_us/strings.po
--- kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/language/resource.language.en_us/strings.po	2016-11-26 13:27:01.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.en_us/strings.po	2017-01-14 14:03:27.000000000 +0000
@@ -272,6 +272,22 @@
 msgid "Provider Unknown"
 msgstr "Provider Unknown"
 
+msgctxt "#30200"
+msgid "Single"
+msgstr "Single"
+
 msgctxt "#30201"
 msgid "Repeating"
 msgstr "Repeating"
+
+msgctxt "#30202"
+msgid "EGP"
+msgstr "EGP"
+
+msgctxt "#30203"
+msgid "VPS"
+msgstr "VPS"
+
+msgctxt "#30204"
+msgid "Search EPG"
+msgstr "Search EPG"
diff -Nru kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/language/resource.language.es_ar/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.es_ar/strings.po
--- kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/language/resource.language.es_ar/strings.po	2016-11-26 13:27:01.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.es_ar/strings.po	2017-01-14 14:03:27.000000000 +0000
@@ -272,6 +272,14 @@
 msgid "Provider Unknown"
 msgstr "Proveedor desconocido"
 
+msgctxt "#30200"
+msgid "Single"
+msgstr "Individual"
+
 msgctxt "#30201"
 msgid "Repeating"
 msgstr "Con repeticiones"
+
+msgctxt "#30204"
+msgid "Search EPG"
+msgstr "Buscar GEP"
diff -Nru kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/language/resource.language.es_es/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.es_es/strings.po
--- kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/language/resource.language.es_es/strings.po	2016-11-26 13:27:01.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.es_es/strings.po	2017-01-14 14:03:27.000000000 +0000
@@ -238,7 +238,7 @@
 
 msgctxt "#30106"
 msgid "Timeshift Buffer (File) x1 GB"
-msgstr "Buffer Timeshift Buffer (Archivo) x1 GB"
+msgstr "Buffer Timeshift (Archivo) x1 GB"
 
 msgctxt "#30107"
 msgid "VDR Admin"
diff -Nru kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/language/resource.language.es_mx/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.es_mx/strings.po
--- kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/language/resource.language.es_mx/strings.po	2016-11-26 13:27:01.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.es_mx/strings.po	2017-01-14 14:03:27.000000000 +0000
@@ -16,10 +16,50 @@
 "Language: es_MX\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+msgctxt "#30000"
+msgid "VDR Hostname or IP"
+msgstr "Nombre de host o IP de VDR"
+
+msgctxt "#30001"
+msgid "VNSI Port"
+msgstr "Puerto VNSI"
+
+msgctxt "#30002"
+msgid "Priority"
+msgstr "Prioridad"
+
+msgctxt "#30003"
+msgid "Character Set Conversion"
+msgstr "Conversión de conjunto de caracteres"
+
 msgctxt "#30004"
 msgid "Connect timeout (s)"
 msgstr "Tiempo para conectar agotado (s)"
 
+msgctxt "#30006"
+msgid "Read recordings from directory"
+msgstr "Leer las grabaciones del directorio"
+
+msgctxt "#30007"
+msgid "VDR recordings directory"
+msgstr "Directorio de grabaciones VDR"
+
+msgctxt "#30008"
+msgid "Channel search"
+msgstr "Búsqueda de canales"
+
+msgctxt "#30009"
+msgid "Channel search - Settings"
+msgstr "Búsqueda de canales - Configuración"
+
+msgctxt "#30010"
+msgid "Start Channel search"
+msgstr "Iniciar búsqueda de canales"
+
+msgctxt "#30011"
+msgid "Source Type"
+msgstr "Tipo de fuente"
+
 msgctxt "#30012"
 msgid "TV channels"
 msgstr "Canales TV"
@@ -28,26 +68,226 @@
 msgid "Radio channels"
 msgstr "Canales Radio"
 
+msgctxt "#30014"
+msgid "FTA channels"
+msgstr "Canales FTA"
+
+msgctxt "#30015"
+msgid "Scrambled channels"
+msgstr "Canales codificados"
+
+msgctxt "#30016"
+msgid "HD channels"
+msgstr "Canales HD"
+
 msgctxt "#30017"
 msgid "Country"
 msgstr "País"
 
+msgctxt "#30018"
+msgid "Cable Inversion"
+msgstr "Cable Inversion"
+
+msgctxt "#30019"
+msgid "Cable Symbolrate"
+msgstr "Cable Symbolrate"
+
+msgctxt "#30020"
+msgid "Cable modulation"
+msgstr "Modulación por cable"
+
+msgctxt "#30021"
+msgid "Terr Inversion"
+msgstr "Terr Inversión"
+
+msgctxt "#30022"
+msgid "Satellite"
+msgstr "Satélite"
+
+msgctxt "#30023"
+msgid "ATSC Type"
+msgstr "Tipo ATSC"
+
 msgctxt "#30024"
 msgid "Back"
 msgstr "Regresar"
 
+msgctxt "#30025"
+msgid "Channel search - running... %i %%"
+msgstr "Búsqueda de canales: en ejecución ... %i %%"
+
 msgctxt "#30026"
 msgid "Type:"
 msgstr "Tipo:"
 
+msgctxt "#30027"
+msgid "Device:"
+msgstr "Dispositivo:"
+
+msgctxt "#30028"
+msgid "Scan: %i"
+msgstr "Escanear: %i"
+
+msgctxt "#30029"
+msgid "Signal: %i %%"
+msgstr "Señal: %i %%"
+
+msgctxt "#30030"
+msgid "New channels: %i"
+msgstr "Nuevos canales: %i"
+
+msgctxt "#30031"
+msgid "All channels: %i"
+msgstr "Todos los canales: %i"
+
+msgctxt "#30032"
+msgid "Analog TV"
+msgstr "TV analógica"
+
+msgctxt "#30033"
+msgid "Analog Radio"
+msgstr "Radio analógica"
+
+msgctxt "#30034"
+msgid "Transponder:"
+msgstr "Transpondedor:"
+
+msgctxt "#30035"
+msgid "New channels"
+msgstr "Nuevos canales"
+
+msgctxt "#30036"
+msgid "Channel search - Finished"
+msgstr "Búsqueda de canales - Terminado"
+
+msgctxt "#30037"
+msgid "No device available - exiting"
+msgstr "Ningún dispositivo disponible - saliendo"
+
+msgctxt "#30038"
+msgid "No DVB-S2 device available - trying fallback to DVB-S"
+msgstr "No hay dispositivo DVB-S2 disponible - probando fallback a DVB-S"
+
 msgctxt "#30039"
 msgid "Running"
 msgstr "Ejecutando"
 
+msgctxt "#30040"
+msgid "Stopped"
+msgstr "Detenido"
+
+msgctxt "#30041"
+msgid "Finished"
+msgstr "Finalizado"
+
+msgctxt "#30042"
+msgid "Channel search - Canceled"
+msgstr "Búsqueda de canales - Cancelado"
+
+msgctxt "#30043"
+msgid "Channel search - Error"
+msgstr "Búsqueda de canales - Error"
+
+msgctxt "#30044"
+msgid "Lost connection to VDR Server"
+msgstr "Conexión perdida con el servidor VDR"
+
+msgctxt "#30045"
+msgid "Connection to VDR Server restored"
+msgstr "Restaurado la conexión con el servidor VDR"
+
+msgctxt "#30046"
+msgid "Create channel groups automatically on the server"
+msgstr "Crear grupos de canales automáticamente en el servidor"
+
+msgctxt "#30047"
+msgid "Request Timeshift"
+msgstr "Solicitar Timeshift"
+
+msgctxt "#30048"
+msgid "Path to channel icons"
+msgstr "Ruta a los iconos de canal"
+
+msgctxt "#30049"
+msgid "VDR Server MAC for Wake-on-LAN"
+msgstr "VDR Server MAC para Wake-on-LAN"
+
+msgctxt "#30100"
+msgid "VDR OSD"
+msgstr "VDR OSD"
+
 msgctxt "#30101"
 msgid "Setup"
 msgstr "Configuración"
 
+msgctxt "#30102"
+msgid "Controlling OSD - press info to exit"
+msgstr "Control de OSD - presione información para salir"
+
+msgctxt "#30103"
+msgid "Select to control OSD"
+msgstr "Seleccionar para controlar OSD"
+
+msgctxt "#30104"
+msgid "Timeshift Mode"
+msgstr "Modo Timeshift"
+
+msgctxt "#30105"
+msgid "Timeshift Buffer (RAM) x100 MB"
+msgstr "Buffer Timeshift (RAM) x100 MB"
+
+msgctxt "#30106"
+msgid "Timeshift Buffer (File) x1 GB"
+msgstr "Buffer Timeshift (Archivo) x1 GB"
+
+msgctxt "#30107"
+msgid "VDR Admin"
+msgstr "VDR Admin"
+
 msgctxt "#30108"
 msgid "Channels"
 msgstr "Canales"
+
+msgctxt "#30109"
+msgid "Provider whitelist"
+msgstr "Lista blanca de proveedores"
+
+msgctxt "#30110"
+msgid "Channel blacklist"
+msgstr "Lista negra de canales"
+
+msgctxt "#30111"
+msgid "Channel filters"
+msgstr "Filtro de canales"
+
+msgctxt "#30112"
+msgid "Radio Channels"
+msgstr "Canales de radio"
+
+msgctxt "#30113"
+msgid "Save filters"
+msgstr "Grabar filtros"
+
+msgctxt "#30114"
+msgid "Provider Unknown"
+msgstr "Proveedor desconocido"
+
+msgctxt "#30200"
+msgid "Single"
+msgstr "Simple"
+
+msgctxt "#30201"
+msgid "Repeating"
+msgstr "Repitiendo"
+
+msgctxt "#30202"
+msgid "EGP"
+msgstr "EGP"
+
+msgctxt "#30203"
+msgid "VPS"
+msgstr "VPS"
+
+msgctxt "#30204"
+msgid "Search EPG"
+msgstr "Buscar EPG"
diff -Nru kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/language/resource.language.eu_es/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.eu_es/strings.po
--- kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/language/resource.language.eu_es/strings.po	2016-11-26 13:27:01.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.eu_es/strings.po	2017-01-14 14:03:27.000000000 +0000
@@ -36,6 +36,10 @@
 msgid "Country"
 msgstr "Herrialdea"
 
+msgctxt "#30024"
+msgid "Back"
+msgstr "Atzera"
+
 msgctxt "#30026"
 msgid "Type:"
 msgstr "Mota:"
diff -Nru kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/language/resource.language.fi_fi/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.fi_fi/strings.po
--- kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/language/resource.language.fi_fi/strings.po	2016-11-26 13:27:01.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.fi_fi/strings.po	2017-01-14 14:03:27.000000000 +0000
@@ -18,7 +18,7 @@
 
 msgctxt "#30000"
 msgid "VDR Hostname or IP"
-msgstr "VDR-palvelimen nimi tai IP-osoite"
+msgstr "VDR-palvelimen isäntänimi tai IP-osoite"
 
 msgctxt "#30001"
 msgid "VNSI Port"
@@ -38,11 +38,11 @@
 
 msgctxt "#30006"
 msgid "Read recordings from directory"
-msgstr "Lue nauhoitukset kansiosta"
+msgstr "Lue tallennukset kansiosta"
 
 msgctxt "#30007"
 msgid "VDR recordings directory"
-msgstr "VDR-tallennuksien kansio"
+msgstr "VDR:n tallennuskansio"
 
 msgctxt "#30008"
 msgid "Channel search"
@@ -70,7 +70,7 @@
 
 msgctxt "#30014"
 msgid "FTA channels"
-msgstr "Ilmaiskanavat"
+msgstr "Salaamattomat kanavat"
 
 msgctxt "#30015"
 msgid "Scrambled channels"
@@ -106,7 +106,7 @@
 
 msgctxt "#30023"
 msgid "ATSC Type"
-msgstr "ATSC tyyppi"
+msgstr "ATSC-tyyppi"
 
 msgctxt "#30024"
 msgid "Back"
@@ -150,7 +150,7 @@
 
 msgctxt "#30034"
 msgid "Transponder:"
-msgstr "Transponder:"
+msgstr "Transponderi:"
 
 msgctxt "#30035"
 msgid "New channels"
@@ -166,7 +166,7 @@
 
 msgctxt "#30038"
 msgid "No DVB-S2 device available - trying fallback to DVB-S"
-msgstr "Ei DVB-S2 laitetta saatavilla - kokeillaan DVB-S"
+msgstr "Ei DVB-S2-laitetta saatavilla - kokeillaan DVB-S"
 
 msgctxt "#30039"
 msgid "Running"
@@ -186,7 +186,7 @@
 
 msgctxt "#30043"
 msgid "Channel search - Error"
-msgstr "Kanavahaku virhe"
+msgstr "Virhe kanavahaussa"
 
 msgctxt "#30044"
 msgid "Lost connection to VDR Server"
@@ -202,15 +202,15 @@
 
 msgctxt "#30047"
 msgid "Request Timeshift"
-msgstr "Ajansiirto toiminto"
+msgstr "Ajansiirtotoiminto"
 
 msgctxt "#30048"
 msgid "Path to channel icons"
-msgstr "Kanavakuvakkeiden hakemistopolku"
+msgstr "Kanavalogojen polku"
 
 msgctxt "#30049"
 msgid "VDR Server MAC for Wake-on-LAN"
-msgstr "VDR palvelimen MAC (Wake-on-LAN:ia varten)"
+msgstr "VDR-palvelimen MAC-osoite herätystä varten"
 
 msgctxt "#30100"
 msgid "VDR OSD"
@@ -234,11 +234,11 @@
 
 msgctxt "#30105"
 msgid "Timeshift Buffer (RAM) x100 MB"
-msgstr "Ajansiirto puskuri (RAM) x100 MB"
+msgstr "Ajansiirtopuskuri (RAM) x100 MB"
 
 msgctxt "#30106"
 msgid "Timeshift Buffer (File) x1 GB"
-msgstr "Ajansiirto puskuri (Tiedosto) x1 GB"
+msgstr "Ajansiirtopuskuri (tiedosto) x1 GB"
 
 msgctxt "#30107"
 msgid "VDR Admin"
@@ -250,11 +250,11 @@
 
 msgctxt "#30109"
 msgid "Provider whitelist"
-msgstr "Tarjoaja valkoinenlista"
+msgstr "Tarjoajien valkoinen lista"
 
 msgctxt "#30110"
 msgid "Channel blacklist"
-msgstr "Kanava mustalista"
+msgstr "Kanavien musta lista"
 
 msgctxt "#30111"
 msgid "Channel filters"
@@ -291,3 +291,7 @@
 msgctxt "#30204"
 msgid "Search EPG"
 msgstr "Etsi ohjelmaoppaasta"
+
+msgctxt "#30205"
+msgid "Repeating Child"
+msgstr "Toistuva (lapsi)"
diff -Nru kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/language/resource.language.fr_ca/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.fr_ca/strings.po
--- kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/language/resource.language.fr_ca/strings.po	2016-11-26 13:27:01.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.fr_ca/strings.po	2017-01-14 14:03:27.000000000 +0000
@@ -126,7 +126,7 @@
 
 msgctxt "#30028"
 msgid "Scan: %i"
-msgstr "Balayage : %i"
+msgstr "Analyse : %i"
 
 msgctxt "#30029"
 msgid "Signal: %i %%"
@@ -291,3 +291,7 @@
 msgctxt "#30204"
 msgid "Search EPG"
 msgstr "Rechercher dans le GÉP"
+
+msgctxt "#30205"
+msgid "Repeating Child"
+msgstr "Répétition de l'enfant"
diff -Nru kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/language/resource.language.fr_fr/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.fr_fr/strings.po
--- kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/language/resource.language.fr_fr/strings.po	2016-11-26 13:27:01.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.fr_fr/strings.po	2017-01-14 14:03:27.000000000 +0000
@@ -122,7 +122,7 @@
 
 msgctxt "#30027"
 msgid "Device:"
-msgstr "Périphérique :"
+msgstr "Dispositif :"
 
 msgctxt "#30028"
 msgid "Scan: %i"
@@ -162,11 +162,11 @@
 
 msgctxt "#30037"
 msgid "No device available - exiting"
-msgstr "Pas de périphérique disponible, abandon"
+msgstr "Aucun dispositif disponible, abandon"
 
 msgctxt "#30038"
 msgid "No DVB-S2 device available - trying fallback to DVB-S"
-msgstr "Aucun périphérique DVB-S2 disponible, tentative en DVB-S"
+msgstr "Aucun dispositif DVB-S2 disponible, tentative en DVB-S"
 
 msgctxt "#30039"
 msgid "Running"
@@ -198,7 +198,7 @@
 
 msgctxt "#30046"
 msgid "Create channel groups automatically on the server"
-msgstr "Créer automatiquement les groupes de chaîne sur le serveur"
+msgstr "Créer automatiquement les groupes de chaînes sur le serveur"
 
 msgctxt "#30047"
 msgid "Request Timeshift"
@@ -291,3 +291,7 @@
 msgctxt "#30204"
 msgid "Search EPG"
 msgstr "Rechercher dans le guide"
+
+msgctxt "#30205"
+msgid "Repeating Child"
+msgstr "Répétition de l'enfant"
diff -Nru kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/language/resource.language.it_it/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.it_it/strings.po
--- kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/language/resource.language.it_it/strings.po	2016-11-26 13:27:01.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.it_it/strings.po	2017-01-14 14:03:27.000000000 +0000
@@ -291,3 +291,7 @@
 msgctxt "#30204"
 msgid "Search EPG"
 msgstr "Cerca EPG"
+
+msgctxt "#30205"
+msgid "Repeating Child"
+msgstr "Ripetizione Bambini"
diff -Nru kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/language/resource.language.lt_lt/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.lt_lt/strings.po
--- kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/language/resource.language.lt_lt/strings.po	2016-11-26 13:27:01.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.lt_lt/strings.po	2017-01-14 14:03:27.000000000 +0000
@@ -291,3 +291,7 @@
 msgctxt "#30204"
 msgid "Search EPG"
 msgstr "Ieškoti EPG"
+
+msgctxt "#30205"
+msgid "Repeating Child"
+msgstr "Pasikartojantis vaikas"
diff -Nru kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/language/resource.language.nb_no/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.nb_no/strings.po
--- kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/language/resource.language.nb_no/strings.po	2016-11-26 13:27:01.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.nb_no/strings.po	2017-01-14 14:03:27.000000000 +0000
@@ -291,3 +291,7 @@
 msgctxt "#30204"
 msgid "Search EPG"
 msgstr "Søk EPG"
+
+msgctxt "#30205"
+msgid "Repeating Child"
+msgstr "Gjentagende Underelement"
diff -Nru kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/language/resource.language.pl_pl/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.pl_pl/strings.po
--- kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/language/resource.language.pl_pl/strings.po	2016-11-26 13:27:01.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.pl_pl/strings.po	2017-01-14 14:03:27.000000000 +0000
@@ -291,3 +291,7 @@
 msgctxt "#30204"
 msgid "Search EPG"
 msgstr "Wyszukaj w przewodniku"
+
+msgctxt "#30205"
+msgid "Repeating Child"
+msgstr "Cyklicznie potomka"
diff -Nru kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/language/resource.language.pt_br/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.pt_br/strings.po
--- kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/language/resource.language.pt_br/strings.po	2016-11-26 13:27:01.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.pt_br/strings.po	2017-01-14 14:03:27.000000000 +0000
@@ -291,3 +291,7 @@
 msgctxt "#30204"
 msgid "Search EPG"
 msgstr "Procurar EPG"
+
+msgctxt "#30205"
+msgid "Repeating Child"
+msgstr "Repetindo Criança"
diff -Nru kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/language/resource.language.ro_ro/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.ro_ro/strings.po
--- kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/language/resource.language.ro_ro/strings.po	2016-11-26 13:27:01.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.ro_ro/strings.po	2017-01-14 14:03:27.000000000 +0000
@@ -34,7 +34,7 @@
 
 msgctxt "#30004"
 msgid "Connect timeout (s)"
-msgstr "Conexiune timeout (s)"
+msgstr "Expirare timp conexiune (s)"
 
 msgctxt "#30006"
 msgid "Read recordings from directory"
@@ -158,7 +158,7 @@
 
 msgctxt "#30036"
 msgid "Channel search - Finished"
-msgstr "Căutare canale - Finalizat"
+msgstr "Căutare canale - Finalizată"
 
 msgctxt "#30037"
 msgid "No device available - exiting"
@@ -190,15 +190,15 @@
 
 msgctxt "#30044"
 msgid "Lost connection to VDR Server"
-msgstr "S-a pierdut conexiunea la serverul VDR"
+msgstr "S-a pierdut conexiunea la servitrorul VDR"
 
 msgctxt "#30045"
 msgid "Connection to VDR Server restored"
-msgstr "Conexiunea la serverul VDR restaurată"
+msgstr "Conexiunea la servitorul VDR restaurată"
 
 msgctxt "#30046"
 msgid "Create channel groups automatically on the server"
-msgstr "Creează automat grupuri de canale pe server"
+msgstr "Creează automat grupuri de canale pe servitor"
 
 msgctxt "#30047"
 msgid "Request Timeshift"
@@ -210,7 +210,7 @@
 
 msgctxt "#30049"
 msgid "VDR Server MAC for Wake-on-LAN"
-msgstr "MAC serverVDR pentru deșteptare în rețea (Wake-on-LAN)"
+msgstr "MAC servitor VDR pentru deșteptare în rețea (Wake-on-LAN)"
 
 msgctxt "#30100"
 msgid "VDR OSD"
@@ -272,6 +272,22 @@
 msgid "Provider Unknown"
 msgstr "Furnizor necunoscut"
 
+msgctxt "#30200"
+msgid "Single"
+msgstr "Singular"
+
 msgctxt "#30201"
 msgid "Repeating"
 msgstr "În mod repetat"
+
+msgctxt "#30202"
+msgid "EGP"
+msgstr "EPG"
+
+msgctxt "#30203"
+msgid "VPS"
+msgstr "SPV (servitor privat virtual)"
+
+msgctxt "#30204"
+msgid "Search EPG"
+msgstr "Căutare în GPE (ghidul de programe elctronic)"
diff -Nru kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/language/resource.language.sk_sk/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.sk_sk/strings.po
--- kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/language/resource.language.sk_sk/strings.po	2016-11-26 13:27:01.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.sk_sk/strings.po	2017-01-14 14:03:27.000000000 +0000
@@ -291,3 +291,7 @@
 msgctxt "#30204"
 msgid "Search EPG"
 msgstr "Hľadať EPG"
+
+msgctxt "#30205"
+msgid "Repeating Child"
+msgstr "Opakovacie dieťa"
diff -Nru kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/language/resource.language.sv_se/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.sv_se/strings.po
--- kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/language/resource.language.sv_se/strings.po	2016-11-26 13:27:01.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.sv_se/strings.po	2017-01-14 14:03:27.000000000 +0000
@@ -272,6 +272,26 @@
 msgid "Provider Unknown"
 msgstr "Okänd leverantör"
 
+msgctxt "#30200"
+msgid "Single"
+msgstr "Enkel"
+
 msgctxt "#30201"
 msgid "Repeating"
-msgstr "Upprepat"
+msgstr "Repeterande"
+
+msgctxt "#30202"
+msgid "EGP"
+msgstr "EGP"
+
+msgctxt "#30203"
+msgid "VPS"
+msgstr "VPS"
+
+msgctxt "#30204"
+msgid "Search EPG"
+msgstr "Sök EPG"
+
+msgctxt "#30205"
+msgid "Repeating Child"
+msgstr "Repeterande Barn"
diff -Nru kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/language/resource.language.szl/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.szl/strings.po
--- kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/language/resource.language.szl/strings.po	2016-11-26 13:27:01.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.szl/strings.po	2017-01-14 14:03:27.000000000 +0000
@@ -16,6 +16,50 @@
 "Language: szl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+msgctxt "#30000"
+msgid "VDR Hostname or IP"
+msgstr "Miano lebo adresa ôd serwera"
+
+msgctxt "#30001"
+msgid "VNSI Port"
+msgstr "Port VNSI"
+
+msgctxt "#30002"
+msgid "Priority"
+msgstr "Priorytet"
+
+msgctxt "#30003"
+msgid "Character Set Conversion"
+msgstr "Kōnwersyjŏ kodowaniŏ znŏkōw"
+
+msgctxt "#30004"
+msgid "Connect timeout (s)"
+msgstr "Limit czŏsu skuplowaniŏ (sekundy)"
+
+msgctxt "#30006"
+msgid "Read recordings from directory"
+msgstr "Wgrowej nagrania z folderu"
+
+msgctxt "#30007"
+msgid "VDR recordings directory"
+msgstr "Folder nagrań"
+
+msgctxt "#30008"
+msgid "Channel search"
+msgstr "Zeszukowanie kanałōw"
+
+msgctxt "#30009"
+msgid "Channel search - Settings"
+msgstr "Zeszukowanie kanałōw - Sztelōnki"
+
+msgctxt "#30010"
+msgid "Start Channel search"
+msgstr "Napocznij zeszukowanie kanałōw"
+
+msgctxt "#30011"
+msgid "Source Type"
+msgstr "Zorta źrōdła"
+
 msgctxt "#30012"
 msgid "TV channels"
 msgstr "Kanały TV"
@@ -24,18 +68,226 @@
 msgid "Radio channels"
 msgstr "Kanały radiowe"
 
+msgctxt "#30014"
+msgid "FTA channels"
+msgstr "Kanały niykodowane"
+
+msgctxt "#30015"
+msgid "Scrambled channels"
+msgstr "Kanały kodowane"
+
+msgctxt "#30016"
+msgid "HD channels"
+msgstr "Kanały HD"
+
 msgctxt "#30017"
 msgid "Country"
 msgstr "Krej"
 
+msgctxt "#30018"
+msgid "Cable Inversion"
+msgstr "Inwersyjŏ kablowyj telewizyje"
+
+msgctxt "#30019"
+msgid "Cable Symbolrate"
+msgstr "Gibkość transmisyje kablowyj telewizyje"
+
+msgctxt "#30020"
+msgid "Cable modulation"
+msgstr "Modulacyjŏ kablowyj telewizyje"
+
+msgctxt "#30021"
+msgid "Terr Inversion"
+msgstr "Inwersyjŏ naziymnyj telewizyje"
+
+msgctxt "#30022"
+msgid "Satellite"
+msgstr "Satelita"
+
+msgctxt "#30023"
+msgid "ATSC Type"
+msgstr "Zorta naziymnyj telewizyje ATSC"
+
+msgctxt "#30024"
+msgid "Back"
+msgstr "Cofnij"
+
+msgctxt "#30025"
+msgid "Channel search - running... %i %%"
+msgstr "Zeszukowanie kanałōw - robi... %i %%"
+
 msgctxt "#30026"
 msgid "Type:"
 msgstr "Zorta:"
 
+msgctxt "#30027"
+msgid "Device:"
+msgstr "Maszina:"
+
+msgctxt "#30028"
+msgid "Scan: %i"
+msgstr "Skanowanie: %i"
+
+msgctxt "#30029"
+msgid "Signal: %i %%"
+msgstr "Sygnoł: %i %%"
+
+msgctxt "#30030"
+msgid "New channels: %i"
+msgstr "Nowych kanałōw: %i"
+
+msgctxt "#30031"
+msgid "All channels: %i"
+msgstr "Wszyjskich kanałōw: %i"
+
+msgctxt "#30032"
+msgid "Analog TV"
+msgstr "Analogowŏ telewizyjŏ"
+
+msgctxt "#30033"
+msgid "Analog Radio"
+msgstr "Analogowe radyjŏ"
+
+msgctxt "#30034"
+msgid "Transponder:"
+msgstr "Transpōnder:"
+
+msgctxt "#30035"
+msgid "New channels"
+msgstr "Nowe kanały"
+
+msgctxt "#30036"
+msgid "Channel search - Finished"
+msgstr "Zeszukowanie kanałōw - skōńczōne"
+
+msgctxt "#30037"
+msgid "No device available - exiting"
+msgstr "Niy ma dostympnych maszin - zawiyranie"
+
+msgctxt "#30038"
+msgid "No DVB-S2 device available - trying fallback to DVB-S"
+msgstr "Niy ma dostympnych maszin DVB-S2 - awaryjne przeszaltrowanie do DVB-S"
+
 msgctxt "#30039"
 msgid "Running"
 msgstr "Włōnczōny"
 
+msgctxt "#30040"
+msgid "Stopped"
+msgstr "Zastawiōne"
+
+msgctxt "#30041"
+msgid "Finished"
+msgstr "Skōńczōne"
+
+msgctxt "#30042"
+msgid "Channel search - Canceled"
+msgstr "Zeszukowanie kanałōw - Pociepniynte"
+
+msgctxt "#30043"
+msgid "Channel search - Error"
+msgstr "Zeszukowanie kanałōw - Feler"
+
+msgctxt "#30044"
+msgid "Lost connection to VDR Server"
+msgstr "Serwane skuplowanie ze serwerym VDR"
+
+msgctxt "#30045"
+msgid "Connection to VDR Server restored"
+msgstr "Wrōcōno było skuplowanie ze serwerym VDR"
+
+msgctxt "#30046"
+msgid "Create channel groups automatically on the server"
+msgstr "Wytwōrz skupiny kanałōw autōmatycznie na serwerze"
+
+msgctxt "#30047"
+msgid "Request Timeshift"
+msgstr "Spytej ô timeshift"
+
+msgctxt "#30048"
+msgid "Path to channel icons"
+msgstr "Cesta do folderu z ikōnami kanałōw"
+
+msgctxt "#30049"
+msgid "VDR Server MAC for Wake-on-LAN"
+msgstr "Adresa MAC ôd serwera VDR dlŏ zdŏlnygo cucyniŏ"
+
+msgctxt "#30100"
+msgid "VDR OSD"
+msgstr "Ekranowe myni VDR"
+
+msgctxt "#30101"
+msgid "Setup"
+msgstr "Sztelōnki"
+
+msgctxt "#30102"
+msgid "Controlling OSD - press info to exit"
+msgstr "Reskyrowanie ekranowym myni - naciś Info, coby wylyźć"
+
+msgctxt "#30103"
+msgid "Select to control OSD"
+msgstr "Ôznŏcz, coby kōntrolować ekranowe myni"
+
+msgctxt "#30104"
+msgid "Timeshift Mode"
+msgstr "Tryb timeshiftu"
+
+msgctxt "#30105"
+msgid "Timeshift Buffer (RAM) x100 MB"
+msgstr "Miara bufōra timeshiftu (RAM) x100 MB "
+
+msgctxt "#30106"
+msgid "Timeshift Buffer (File) x1 GB"
+msgstr "Miara bufōra timeshiftu (Zbiōr) x1 GB"
+
+msgctxt "#30107"
+msgid "VDR Admin"
+msgstr "Administracyjŏ VDR"
+
 msgctxt "#30108"
 msgid "Channels"
 msgstr "Kanały"
+
+msgctxt "#30109"
+msgid "Provider whitelist"
+msgstr "Zadufanie liferanty "
+
+msgctxt "#30110"
+msgid "Channel blacklist"
+msgstr "Kanały ôbszperowane"
+
+msgctxt "#30111"
+msgid "Channel filters"
+msgstr "Filtry kanałōw"
+
+msgctxt "#30112"
+msgid "Radio Channels"
+msgstr "Kanały radyjowe"
+
+msgctxt "#30113"
+msgid "Save filters"
+msgstr "Spamiyntej filtry"
+
+msgctxt "#30114"
+msgid "Provider Unknown"
+msgstr "Liferant niyznōmy"
+
+msgctxt "#30200"
+msgid "Single"
+msgstr "Jednorazowo"
+
+msgctxt "#30201"
+msgid "Repeating"
+msgstr "Wiela razy"
+
+msgctxt "#30202"
+msgid "EGP"
+msgstr "EGP"
+
+msgctxt "#30203"
+msgid "VPS"
+msgstr "VPS"
+
+msgctxt "#30204"
+msgid "Search EPG"
+msgstr "Zeszukej w EPG"
diff -Nru kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/language/resource.language.tr_tr/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.tr_tr/strings.po
--- kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/language/resource.language.tr_tr/strings.po	2016-11-26 13:27:01.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.tr_tr/strings.po	2017-01-14 14:03:27.000000000 +0000
@@ -272,6 +272,22 @@
 msgid "Provider Unknown"
 msgstr "Bilinmeyen Sağlayıcı"
 
+msgctxt "#30200"
+msgid "Single"
+msgstr "Tekil"
+
 msgctxt "#30201"
 msgid "Repeating"
 msgstr "Yinelenen"
+
+msgctxt "#30202"
+msgid "EGP"
+msgstr "EGP"
+
+msgctxt "#30203"
+msgid "VPS"
+msgstr "VPS"
+
+msgctxt "#30204"
+msgid "Search EPG"
+msgstr "EPG'de Ara"
diff -Nru kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/language/resource.language.zh_cn/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.zh_cn/strings.po
--- kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/language/resource.language.zh_cn/strings.po	2016-11-26 13:27:01.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.zh_cn/strings.po	2017-01-14 14:03:27.000000000 +0000
@@ -272,6 +272,22 @@
 msgid "Provider Unknown"
 msgstr "未知来源"
 
+msgctxt "#30200"
+msgid "Single"
+msgstr "单次"
+
 msgctxt "#30201"
 msgid "Repeating"
 msgstr "重复"
+
+msgctxt "#30202"
+msgid "EGP"
+msgstr "EGP"
+
+msgctxt "#30203"
+msgid "VPS"
+msgstr "VPS"
+
+msgctxt "#30204"
+msgid "Search EPG"
+msgstr "搜索电子节目单"
diff -Nru kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/language/resource.language.zh_tw/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.zh_tw/strings.po
--- kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/language/resource.language.zh_tw/strings.po	2016-11-26 13:27:01.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.zh_tw/strings.po	2017-01-14 14:03:27.000000000 +0000
@@ -22,7 +22,7 @@
 
 msgctxt "#30001"
 msgid "VNSI Port"
-msgstr "VNSI端口"
+msgstr "VNSI連接埠"
 
 msgctxt "#30002"
 msgid "Priority"
@@ -34,7 +34,7 @@
 
 msgctxt "#30004"
 msgid "Connect timeout (s)"
-msgstr "連接超時(秒)"
+msgstr "連接逾時 (秒)"
 
 msgctxt "#30006"
 msgid "Read recordings from directory"
@@ -42,7 +42,7 @@
 
 msgctxt "#30007"
 msgid "VDR recordings directory"
-msgstr "VDR錄影目錄"
+msgstr "VDR錄影檔目錄"
 
 msgctxt "#30008"
 msgid "Channel search"
@@ -66,7 +66,7 @@
 
 msgctxt "#30013"
 msgid "Radio channels"
-msgstr "無線電廣播頻道"
+msgstr "廣播電台頻道"
 
 msgctxt "#30014"
 msgid "FTA channels"
@@ -204,6 +204,14 @@
 msgid "Request Timeshift"
 msgstr "請求時間平移"
 
+msgctxt "#30048"
+msgid "Path to channel icons"
+msgstr "頻道圖示路徑"
+
+msgctxt "#30049"
+msgid "VDR Server MAC for Wake-on-LAN"
+msgstr "給遠端喚醒使用的VDR伺服器MAC位址"
+
 msgctxt "#30100"
 msgid "VDR OSD"
 msgstr "VDR OSD選單"
@@ -240,6 +248,46 @@
 msgid "Channels"
 msgstr "頻道"
 
+msgctxt "#30109"
+msgid "Provider whitelist"
+msgstr "提供者白名單"
+
+msgctxt "#30110"
+msgid "Channel blacklist"
+msgstr "頻道黑名單"
+
+msgctxt "#30111"
+msgid "Channel filters"
+msgstr "頻道篩選器"
+
+msgctxt "#30112"
+msgid "Radio Channels"
+msgstr "廣播頻道"
+
+msgctxt "#30113"
+msgid "Save filters"
+msgstr "儲存篩選器"
+
+msgctxt "#30114"
+msgid "Provider Unknown"
+msgstr "未知的提供者"
+
+msgctxt "#30200"
+msgid "Single"
+msgstr "單集"
+
 msgctxt "#30201"
 msgid "Repeating"
-msgstr "重播"
+msgstr "重複"
+
+msgctxt "#30202"
+msgid "EGP"
+msgstr "電子節目表"
+
+msgctxt "#30203"
+msgid "VPS"
+msgstr "VPS"
+
+msgctxt "#30204"
+msgid "Search EPG"
+msgstr "搜尋電子節目表"
diff -Nru kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/skins/skin.estuary/1080i/Admin.xml kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/skins/skin.estuary/1080i/Admin.xml
--- kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/skins/skin.estuary/1080i/Admin.xml	2016-11-26 13:27:01.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/skins/skin.estuary/1080i/Admin.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,292 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<window>
-  <defaultcontrol always="true">10</defaultcontrol>
-  <backgroundcolor>background</backgroundcolor>
-  <allowoverlay>no</allowoverlay>
-  <views>36</views>
-  <controls>
-    <include>DefaultBackground</include>
-    <control type="group">
-      <left>110</left>
-      <top>0</top>
-      <control type="group">
-        <include>OpenClose_Left</include>
-        <control type="image">
-          <description>Menu Panel</description>
-          <left>-20</left>
-          <top>138</top>
-          <width>440</width>
-          <height>792</height>
-          <texture border="22">dialogs/dialog-bg.png</texture>
-        </control>
-        <control type="list" id="10">
-          <description>button area</description>
-          <left>0</left>
-          <top>160</top>
-          <width>400</width>
-          <height>700</height>
-          <onleft>10</onleft>
-          <onright>11</onright>
-          <onup>10</onup>
-          <ondown>10</ondown>
-          <include content="DefaultSimpleListLayout">
-            <param name="align" value="center" />
-            <param name="width" value="400" />
-            <param name="height" value="120" />
-            <param name="list_id" value="10" />
-          </include>
-          <content>
-            <item id="1">
-              <label>$ADDON[pvr.vdr.vnsi 30100]</label>
-              <onclick>noop</onclick>
-            </item>
-            <item id="2">
-              <label>$ADDON[pvr.vdr.vnsi 30101]</label>
-              <onclick>noop</onclick>
-            </item>
-            <item id="3">
-              <label>$ADDON[pvr.vdr.vnsi 30108]</label>
-              <onclick>noop</onclick>
-            </item>
-          </content>
-        </control>
-      </control>
-      <control type="group" id="11">
-        <include>OpenClose_Right</include>
-        <control type="image">
-          <left>420</left>
-          <top>138</top>
-          <width>1300</width>
-          <height>792</height>
-          <texture border="22">dialogs/dialog-bg.png</texture>
-        </control>
-        <control type="group" id="12">
-          <visible>Container(10).HasFocus(1)</visible>
-          <control type="button" id="13">
-            <left>472</left>
-            <top>172</top>
-            <width>1216</width>
-            <height>686</height>
-            <aligny>top</aligny>
-            <align>center</align>
-            <textoffsety>690</textoffsety>
-            <texturenofocus>-</texturenofocus>
-            <texturefocus border="8" colordiffuse="button_focus">buttons/thumbnail_focused.png</texturefocus>
-          </control>
-          <control type="renderaddon" id="9">
-            <left>480</left>
-            <top>180</top>
-            <width>1200</width>
-            <height>670</height>
-          </control>
-        </control>
-        <control type="grouplist" id="20">
-          <left>442</left>
-          <top>160</top>
-          <width>1256</width>
-          <height>610</height>
-          <visible>Container(10).HasFocus(2)</visible>
-          <onleft>10</onleft>
-          <control type="spincontrolex" id="21">
-            <label>$ADDON[pvr.vdr.vnsi 30104]</label>
-            <width>1256</width>
-            <include>DefaultSettingButton</include>
-          </control>
-          <control type="spincontrolex" id="22">
-            <label>$ADDON[pvr.vdr.vnsi 30105]</label>
-            <width>1256</width>
-            <include>DefaultSettingButton</include>
-          </control>
-          <control type="spincontrolex" id="23">
-            <label>$ADDON[pvr.vdr.vnsi 30106]</label>
-            <width>1256</width>
-            <include>DefaultSettingButton</include>
-          </control>
-        </control>
-        <control type="group" id="30">
-          <visible>Container(10).HasFocus(3)</visible>
-          <defaultcontrol always="true">33</defaultcontrol>
-          <control type="label" id="31">
-            <description>Channels label</description>
-            <left>480</left>
-            <top>165</top>
-            <width>1000</width>
-            <height>60</height>
-            <font>font30_title</font>
-            <label>$ADDON[pvr.vdr.vnsi 30111]</label>
-            <align>left</align>
-            <aligny>center</aligny>
-            <textcolor>white</textcolor>
-            <shadowcolor>black</shadowcolor>
-          </control>
-          <control type="image">
-            <left>1550</left>
-            <top>180</top>
-            <width>40</width>
-            <height>40</height>
-            <colordiffuse>FFCC0000</colordiffuse>
-            <texture>overlays/circle.png</texture>
-            <visible>StringCompare(Window.Property(IsDirty),1)</visible>
-          </control>
-          <control type="image">
-            <left>1550</left>
-            <top>180</top>
-            <width>40</width>
-            <height>40</height>
-            <colordiffuse>FF00FF00</colordiffuse>
-            <texture>overlays/circle.png</texture>
-            <visible>!StringCompare(Window.Property(IsDirty),1)</visible>
-          </control>
-          <control type="grouplist" id="200">
-            <left>442</left>
-            <top>230</top>
-            <width>520</width>
-            <height>610</height>
-            <onleft>10</onleft>
-            <onright>36</onright>
-            <control type="radiobutton" id="32">
-              <description>Is Radio</description>
-              <width>520</width>
-              <include>DefaultSettingButton</include>
-              <label>$ADDON[pvr.vdr.vnsi 30112]</label>
-            </control>
-            <control type="button" id="33">
-              <description>providers</description>
-              <width>520</width>
-              <label>$ADDON[pvr.vdr.vnsi 30109]</label>
-              <include>DefaultSettingButton</include>
-              <onfocus>Select</onfocus>
-            </control>
-            <control type="button" id="34">
-              <description>channels</description>
-              <width>520</width>
-              <label>$ADDON[pvr.vdr.vnsi 30110]</label>
-              <include>DefaultSettingButton</include>
-              <onfocus>Select</onfocus>
-            </control>
-            <control type="button" id="35">
-              <description>save</description>
-              <width>520</width>
-              <label>$ADDON[pvr.vdr.vnsi 30113]</label>
-              <include>DefaultSettingButton</include>
-            </control>
-          </control>
-          <control type="image">
-            <left>980</left>
-            <top>230</top>
-            <width>640</width>
-            <height>640</height>
-            <texture border="40">buttons/dialogbutton-nofo.png</texture>
-          </control>
-          <control type="list" id="36">
-            <left>1000</left>
-            <top>250</top>
-            <width>600</width>
-            <height>600</height>
-            <onup>36</onup>
-            <onleft>35</onleft>
-            <onright>37</onright>
-            <ondown>36</ondown>
-            <pagecontrol>37</pagecontrol>
-            <scrolltime>200</scrolltime>
-            <itemlayout height="40" width="600">
-              <control type="image">
-                <left>0</left>
-                <top>0</top>
-                <width>6000</width>
-                <height>40</height>
-                <texture border="5">lists/separator.png</texture>
-              </control>
-              <control type="label">
-                <left>40</left>
-                <top>0</top>
-                <width>6000</width>
-                <height>40</height>
-                <align>left</align>
-                <info>ListItem.Label</info>
-              </control>
-              <control type="image">
-                <left>2</left>
-                <top>2</top>
-                <width>36</width>
-                <height>36</height>
-                <aspectratio>stretch</aspectratio>
-                <colordiffuse>7790EE90</colordiffuse>
-                <texture>overlays/arrowright.png</texture>
-                <visible>ListItem.Property(IsWhitelist)</visible>
-              </control>
-              <control type="image">
-                <left>2</left>
-                <top>2</top>
-                <width>36</width>
-                <height>36</height>
-                <aspectratio>stretch</aspectratio>
-                <colordiffuse>77FF0000</colordiffuse>
-                <texture>overlays/arrowright.png</texture>
-                <visible>ListItem.Property(IsBlacklist)</visible>
-              </control>
-            </itemlayout>
-            <focusedlayout height="40" width="600">
-              <control type="image">
-                <left>0</left>
-                <top>0</top>
-                <width>600</width>
-                <height>40</height>
-                <texture border="5">lists/separator.png</texture>
-              </control>
-              <control type="image">
-                <left>0</left>
-                <top>0</top>
-                <width>600</width>
-                <height>40</height>
-                <texture>lists/focus.png</texture>
-              </control>
-              <control type="label">
-                <left>40</left>
-                <top>0</top>
-                <width>600</width>
-                <height>40</height>
-                <align>left</align>
-                <info>ListItem.Label</info>
-              </control>
-              <control type="image">
-                <left>2</left>
-                <top>2</top>
-                <width>36</width>
-                <height>36</height>
-                <aspectratio>stretch</aspectratio>
-                <colordiffuse>7790EE90</colordiffuse>
-                <texture>overlays/arrowright.png</texture>
-                <visible>ListItem.Property(IsWhitelist)</visible>
-              </control>
-              <control type="image">
-                <left>2</left>
-                <top>2</top>
-                <width>36</width>
-                <height>36</height>
-                <aspectratio>stretch</aspectratio>
-                <colordiffuse>77FF0000</colordiffuse>
-                <texture>overlays/arrowright.png</texture>
-                <visible>ListItem.Property(IsBlacklist)</visible>
-              </control>
-            </focusedlayout>
-          </control>
-          <control type="scrollbar" id="37">
-            <left>1620</left>
-            <top>250</top>
-            <width>13</width>
-            <height>600</height>
-            <onleft>36</onleft>
-            <showonepage>false</showonepage>
-            <orientation>vertical</orientation>
-          </control>
-        </control>
-      </control>
-    </control>
-    <include content="TopBar">
-      <param name="breadcrumbs_label" value="$LOCALIZE[5] / VDR VNSI Client" />
-      <param name="breadcrumbs_icon" value="icons/settings/skin.png" />
-    </include>
-    <include>BottomBar</include>
-  </controls>
-</window>
diff -Nru kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/skins/skin.estuary/xml/Admin.xml kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/skins/skin.estuary/xml/Admin.xml
--- kodi-pvr-vdr-vnsi-2.6.9/pvr.vdr.vnsi/resources/skins/skin.estuary/xml/Admin.xml	1970-01-01 00:00:00.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/skins/skin.estuary/xml/Admin.xml	2017-01-14 14:03:27.000000000 +0000
@@ -0,0 +1,292 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<window>
+  <defaultcontrol always="true">10</defaultcontrol>
+  <backgroundcolor>background</backgroundcolor>
+  <allowoverlay>no</allowoverlay>
+  <views>36</views>
+  <controls>
+    <include>DefaultBackground</include>
+    <control type="group">
+      <left>110</left>
+      <top>0</top>
+      <control type="group">
+        <include>OpenClose_Left</include>
+        <control type="image">
+          <description>Menu Panel</description>
+          <left>-20</left>
+          <top>138</top>
+          <width>440</width>
+          <height>792</height>
+          <texture border="22">dialogs/dialog-bg.png</texture>
+        </control>
+        <control type="list" id="10">
+          <description>button area</description>
+          <left>0</left>
+          <top>160</top>
+          <width>400</width>
+          <height>700</height>
+          <onleft>10</onleft>
+          <onright>11</onright>
+          <onup>10</onup>
+          <ondown>10</ondown>
+          <include content="DefaultSimpleListLayout">
+            <param name="align" value="center" />
+            <param name="width" value="400" />
+            <param name="height" value="120" />
+            <param name="list_id" value="10" />
+          </include>
+          <content>
+            <item id="1">
+              <label>$ADDON[pvr.vdr.vnsi 30100]</label>
+              <onclick>noop</onclick>
+            </item>
+            <item id="2">
+              <label>$ADDON[pvr.vdr.vnsi 30101]</label>
+              <onclick>noop</onclick>
+            </item>
+            <item id="3">
+              <label>$ADDON[pvr.vdr.vnsi 30108]</label>
+              <onclick>noop</onclick>
+            </item>
+          </content>
+        </control>
+      </control>
+      <control type="group" id="11">
+        <include>OpenClose_Right</include>
+        <control type="image">
+          <left>420</left>
+          <top>138</top>
+          <width>1300</width>
+          <height>792</height>
+          <texture border="22">dialogs/dialog-bg.png</texture>
+        </control>
+        <control type="group" id="12">
+          <visible>Container(10).HasFocus(1)</visible>
+          <control type="button" id="13">
+            <left>472</left>
+            <top>172</top>
+            <width>1216</width>
+            <height>686</height>
+            <aligny>top</aligny>
+            <align>center</align>
+            <textoffsety>690</textoffsety>
+            <texturenofocus>-</texturenofocus>
+            <texturefocus border="8" colordiffuse="button_focus">buttons/thumbnail_focused.png</texturefocus>
+          </control>
+          <control type="renderaddon" id="9">
+            <left>480</left>
+            <top>180</top>
+            <width>1200</width>
+            <height>670</height>
+          </control>
+        </control>
+        <control type="grouplist" id="20">
+          <left>442</left>
+          <top>160</top>
+          <width>1256</width>
+          <height>610</height>
+          <visible>Container(10).HasFocus(2)</visible>
+          <onleft>10</onleft>
+          <control type="spincontrolex" id="21">
+            <label>$ADDON[pvr.vdr.vnsi 30104]</label>
+            <width>1256</width>
+            <include>DefaultSettingButton</include>
+          </control>
+          <control type="spincontrolex" id="22">
+            <label>$ADDON[pvr.vdr.vnsi 30105]</label>
+            <width>1256</width>
+            <include>DefaultSettingButton</include>
+          </control>
+          <control type="spincontrolex" id="23">
+            <label>$ADDON[pvr.vdr.vnsi 30106]</label>
+            <width>1256</width>
+            <include>DefaultSettingButton</include>
+          </control>
+        </control>
+        <control type="group" id="30">
+          <visible>Container(10).HasFocus(3)</visible>
+          <defaultcontrol always="true">33</defaultcontrol>
+          <control type="label" id="31">
+            <description>Channels label</description>
+            <left>480</left>
+            <top>165</top>
+            <width>1000</width>
+            <height>60</height>
+            <font>font30_title</font>
+            <label>$ADDON[pvr.vdr.vnsi 30111]</label>
+            <align>left</align>
+            <aligny>center</aligny>
+            <textcolor>white</textcolor>
+            <shadowcolor>black</shadowcolor>
+          </control>
+          <control type="image">
+            <left>1550</left>
+            <top>180</top>
+            <width>40</width>
+            <height>40</height>
+            <colordiffuse>FFCC0000</colordiffuse>
+            <texture>overlays/circle.png</texture>
+            <visible>StringCompare(Window.Property(IsDirty),1)</visible>
+          </control>
+          <control type="image">
+            <left>1550</left>
+            <top>180</top>
+            <width>40</width>
+            <height>40</height>
+            <colordiffuse>FF00FF00</colordiffuse>
+            <texture>overlays/circle.png</texture>
+            <visible>!StringCompare(Window.Property(IsDirty),1)</visible>
+          </control>
+          <control type="grouplist" id="200">
+            <left>442</left>
+            <top>230</top>
+            <width>520</width>
+            <height>610</height>
+            <onleft>10</onleft>
+            <onright>36</onright>
+            <control type="radiobutton" id="32">
+              <description>Is Radio</description>
+              <width>520</width>
+              <include>DefaultSettingButton</include>
+              <label>$ADDON[pvr.vdr.vnsi 30112]</label>
+            </control>
+            <control type="button" id="33">
+              <description>providers</description>
+              <width>520</width>
+              <label>$ADDON[pvr.vdr.vnsi 30109]</label>
+              <include>DefaultSettingButton</include>
+              <onfocus>Select</onfocus>
+            </control>
+            <control type="button" id="34">
+              <description>channels</description>
+              <width>520</width>
+              <label>$ADDON[pvr.vdr.vnsi 30110]</label>
+              <include>DefaultSettingButton</include>
+              <onfocus>Select</onfocus>
+            </control>
+            <control type="button" id="35">
+              <description>save</description>
+              <width>520</width>
+              <label>$ADDON[pvr.vdr.vnsi 30113]</label>
+              <include>DefaultSettingButton</include>
+            </control>
+          </control>
+          <control type="image">
+            <left>980</left>
+            <top>230</top>
+            <width>640</width>
+            <height>640</height>
+            <texture border="40">buttons/dialogbutton-nofo.png</texture>
+          </control>
+          <control type="list" id="36">
+            <left>1000</left>
+            <top>250</top>
+            <width>600</width>
+            <height>600</height>
+            <onup>36</onup>
+            <onleft>35</onleft>
+            <onright>37</onright>
+            <ondown>36</ondown>
+            <pagecontrol>37</pagecontrol>
+            <scrolltime>200</scrolltime>
+            <itemlayout height="40" width="600">
+              <control type="image">
+                <left>0</left>
+                <top>0</top>
+                <width>6000</width>
+                <height>40</height>
+                <texture border="5">lists/separator.png</texture>
+              </control>
+              <control type="label">
+                <left>40</left>
+                <top>0</top>
+                <width>6000</width>
+                <height>40</height>
+                <align>left</align>
+                <info>ListItem.Label</info>
+              </control>
+              <control type="image">
+                <left>2</left>
+                <top>2</top>
+                <width>36</width>
+                <height>36</height>
+                <aspectratio>stretch</aspectratio>
+                <colordiffuse>7790EE90</colordiffuse>
+                <texture>overlays/arrowright.png</texture>
+                <visible>ListItem.Property(IsWhitelist)</visible>
+              </control>
+              <control type="image">
+                <left>2</left>
+                <top>2</top>
+                <width>36</width>
+                <height>36</height>
+                <aspectratio>stretch</aspectratio>
+                <colordiffuse>77FF0000</colordiffuse>
+                <texture>overlays/arrowright.png</texture>
+                <visible>ListItem.Property(IsBlacklist)</visible>
+              </control>
+            </itemlayout>
+            <focusedlayout height="40" width="600">
+              <control type="image">
+                <left>0</left>
+                <top>0</top>
+                <width>600</width>
+                <height>40</height>
+                <texture border="5">lists/separator.png</texture>
+              </control>
+              <control type="image">
+                <left>0</left>
+                <top>0</top>
+                <width>600</width>
+                <height>40</height>
+                <texture>lists/focus.png</texture>
+              </control>
+              <control type="label">
+                <left>40</left>
+                <top>0</top>
+                <width>600</width>
+                <height>40</height>
+                <align>left</align>
+                <info>ListItem.Label</info>
+              </control>
+              <control type="image">
+                <left>2</left>
+                <top>2</top>
+                <width>36</width>
+                <height>36</height>
+                <aspectratio>stretch</aspectratio>
+                <colordiffuse>7790EE90</colordiffuse>
+                <texture>overlays/arrowright.png</texture>
+                <visible>ListItem.Property(IsWhitelist)</visible>
+              </control>
+              <control type="image">
+                <left>2</left>
+                <top>2</top>
+                <width>36</width>
+                <height>36</height>
+                <aspectratio>stretch</aspectratio>
+                <colordiffuse>77FF0000</colordiffuse>
+                <texture>overlays/arrowright.png</texture>
+                <visible>ListItem.Property(IsBlacklist)</visible>
+              </control>
+            </focusedlayout>
+          </control>
+          <control type="scrollbar" id="37">
+            <left>1620</left>
+            <top>250</top>
+            <width>13</width>
+            <height>600</height>
+            <onleft>36</onleft>
+            <showonepage>false</showonepage>
+            <orientation>vertical</orientation>
+          </control>
+        </control>
+      </control>
+    </control>
+    <include content="TopBar">
+      <param name="breadcrumbs_label" value="$LOCALIZE[5] / VDR VNSI Client" />
+      <param name="breadcrumbs_icon" value="icons/settings/skin.png" />
+    </include>
+    <include>BottomBar</include>
+  </controls>
+</window>
diff -Nru kodi-pvr-vdr-vnsi-2.6.9/src/vnsicommand.h kodi-pvr-vdr-vnsi-2.6.17/src/vnsicommand.h
--- kodi-pvr-vdr-vnsi-2.6.9/src/vnsicommand.h	2016-11-26 13:27:01.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/src/vnsicommand.h	2017-01-14 14:03:27.000000000 +0000
@@ -23,7 +23,7 @@
 #define VNSI_COMMAND_H
 
 /** Current VNSI Protocol Version number */
-#define VNSI_PROTOCOLVERSION 9
+#define VNSI_PROTOCOLVERSION 10
 
 /** Start of RDS support protocol Version */
 #define VNSI_RDS_PROTOCOLVERSION 8
@@ -165,6 +165,7 @@
 #define VNSI_TIMER_TYPE_EPG          3
 #define VNSI_TIMER_TYPE_VPS          4
 #define VNSI_TIMER_TYPE_EPG_SEARCH   5
+#define VNSI_TIMER_TYPE_MAN_REPEAT_CHILD 6
 
 /** Packet return codes */
 #define VNSI_RET_OK              0
diff -Nru kodi-pvr-vdr-vnsi-2.6.9/src/VNSIData.cpp kodi-pvr-vdr-vnsi-2.6.17/src/VNSIData.cpp
--- kodi-pvr-vdr-vnsi-2.6.9/src/VNSIData.cpp	2016-11-26 13:27:01.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/src/VNSIData.cpp	2017-01-14 14:03:27.000000000 +0000
@@ -24,6 +24,43 @@
 #include "requestpacket.h"
 #include "vnsicommand.h"
 #include "p8-platform/util/StdString.h"
+#include <algorithm>
+#include <string.h>
+#include <time.h>
+
+// helper functions (taken from VDR)
+
+time_t IncDay(time_t t, int days)
+{
+  struct tm tm = *localtime(&t);
+  tm.tm_mday += days;
+  int h = tm.tm_hour;
+  tm.tm_isdst = -1;
+  t = mktime(&tm);
+  tm.tm_hour = h;
+  return mktime(&tm);
+}
+
+int GetWDay(time_t t)
+{
+  int weekday = localtime(&t)->tm_wday;
+  return weekday == 0 ? 6 : weekday - 1; // we start with Monday==0!
+}
+
+bool DayMatches(time_t t, unsigned int weekdays)
+{
+  return (weekdays & (1 << GetWDay(t))) != 0;
+}
+
+time_t SetTime(time_t t, int secondsFromMidnight)
+{
+  struct tm tm = *localtime(&t);
+  tm.tm_hour = secondsFromMidnight / 3600;
+  tm.tm_min = (secondsFromMidnight % 3600) / 60;
+  tm.tm_sec =  secondsFromMidnight % 60;
+  tm.tm_isdst = -1; // makes sure mktime() will determine the correct DST setting
+  return mktime(&tm);
+}
 
 using namespace ADDON;
 using namespace P8PLATFORM;
@@ -44,8 +81,7 @@
   return vresp;
 }
 
-void
-cVNSIData::Queue::Set(std::unique_ptr<cResponsePacket> &&vresp)
+void cVNSIData::Queue::Set(std::unique_ptr<cResponsePacket> &&vresp)
 {
   CLockObject lock(m_mutex);
   SMessages::iterator it = m_queue.find(vresp->getRequestID());
@@ -396,6 +432,14 @@
   {
     char *epgSearch = vresp->extract_String();
     strncpy(tag.strEpgSearchString, epgSearch, sizeof(tag.strEpgSearchString) - 1);
+
+    if (tag.iTimerType == VNSI_TIMER_TYPE_MAN && tag.iWeekdays)
+      tag.iTimerType = VNSI_TIMER_TYPE_MAN_REPEAT;
+  }
+
+  if (GetProtocol() >= 10)
+  {
+    tag.iParentClientIndex = vresp->extract_U32();
   }
 
   return PVR_ERROR_NO_ERROR;
@@ -453,29 +497,81 @@
       {
         char *epgSearch = vresp->extract_String();
         strncpy(tag.strEpgSearchString, epgSearch, sizeof(tag.strEpgSearchString) - 1);
+
+        if (tag.iTimerType == VNSI_TIMER_TYPE_MAN && tag.iWeekdays)
+          tag.iTimerType = VNSI_TIMER_TYPE_MAN_REPEAT;
+      }
+
+      if (GetProtocol() >= 10)
+      {
+        tag.iParentClientIndex = vresp->extract_U32();
       }
 
       if (tag.startTime == 0)
-	tag.bStartAnyTime = true;
+        tag.bStartAnyTime = true;
       if (tag.endTime == 0)
-	tag.bEndAnyTime = true;
+        tag.bEndAnyTime = true;
 
       PVR->TransferTimerEntry(handle, &tag);
+
+      if (tag.iTimerType == VNSI_TIMER_TYPE_MAN_REPEAT &&
+          tag.state != PVR_TIMER_STATE_DISABLED)
+      {
+        GenTimerChildren(tag, handle);
+      }
     }
   }
   return true;
 }
 
-PVR_ERROR cVNSIData::AddTimer(const PVR_TIMER &timerinfo)
+bool cVNSIData::GenTimerChildren(const PVR_TIMER &timer, ADDON_HANDLE handle)
 {
-  cRequestPacket vrp;
-  vrp.init(VNSI_TIMER_ADD);
+  time_t now = time(nullptr);
+  time_t firstDay = timer.firstDay;
+
+  struct tm *loctime = localtime(&timer.startTime);
+  int startSec = loctime->tm_hour * 3600 + loctime->tm_min * 60;
+  loctime = localtime(&timer.endTime);
+  int stopSec = loctime->tm_hour * 3600 + loctime->tm_min * 60;
+  int length = stopSec - startSec;
+  if (length < 0)
+    length += 3600 * 24;
+
+  for (int n = 0; n < 2; ++n)
+  {
+    for (int i = -1; i <= 7; i++)
+    {
+      time_t t0 = IncDay(firstDay ? std::max(firstDay, now) : now, i);
+      if (DayMatches(t0, timer.iWeekdays))
+      {
+        time_t start = SetTime(t0, startSec);
+        time_t stop = start + length;
+        if ((!firstDay || start >= firstDay) && now < stop)
+        {
+          PVR_TIMER child = timer;
+          child.iClientIndex = timer.iClientIndex + n | 0xF000;
+          child.iParentClientIndex = timer.iClientIndex;
+          child.iTimerType = VNSI_TIMER_TYPE_MAN_REPEAT_CHILD;
+          child.startTime = start;
+          child.endTime = stop;
+          child.iWeekdays = 0;
+          PVR->TransferTimerEntry(handle, &child);
+          firstDay = start + length + 300;
+          break;
+        }
+      }
+    }
+  }
+  return true;
+}
 
+std::string cVNSIData::GenTimerFolder(std::string directory, std::string title)
+{
   // add directory in front of the title
   std::string path;
-  if (strlen(timerinfo.strDirectory) > 0)
+  if (strlen(directory.c_str()) > 0)
   {
-    path += timerinfo.strDirectory;
+    path += directory;
     if (path == "/")
     {
       path.clear();
@@ -503,9 +599,9 @@
     }
   }
 
-  if (strlen(timerinfo.strTitle) > 0)
+  if (strlen(title.c_str()) > 0)
   {
-    path += timerinfo.strTitle;
+    path += title;
   }
 
   // replace colons
@@ -517,6 +613,16 @@
     }
   }
 
+  return path;
+}
+
+PVR_ERROR cVNSIData::AddTimer(const PVR_TIMER &timerinfo)
+{
+  cRequestPacket vrp;
+  vrp.init(VNSI_TIMER_ADD);
+
+  // add directory in front of the title
+  std::string path = GenTimerFolder(timerinfo.strDirectory, timerinfo.strTitle);
   if (path.empty())
   {
     XBMC->Log(LOG_ERROR, "%s - Empty filename !", __FUNCTION__);
@@ -548,6 +654,12 @@
     vrp.add_String(timerinfo.strEpgSearchString);
   }
 
+  if (GetProtocol() >= 10)
+  {
+    vrp.add_U32(timerinfo.iMarginStart*60);
+    vrp.add_U32(timerinfo.iMarginEnd*60);
+  }
+
   auto vresp = ReadResult(&vrp);
   if (vresp == NULL || vresp->noResponse())
   {
@@ -608,6 +720,14 @@
   uint32_t starttime = timerinfo.startTime - timerinfo.iMarginStart*60;
   uint32_t endtime = timerinfo.endTime + timerinfo.iMarginEnd*60;
 
+  // add directory in front of the title
+  std::string path = GenTimerFolder(timerinfo.strDirectory, timerinfo.strTitle);
+  if (path.empty())
+  {
+    XBMC->Log(LOG_ERROR, "%s - Empty filename !", __FUNCTION__);
+    return PVR_ERROR_UNKNOWN;
+  }
+
   cRequestPacket vrp;
   vrp.init(VNSI_TIMER_UPDATE);
 
@@ -624,7 +744,7 @@
   vrp.add_U32(endtime);
   vrp.add_U32(timerinfo.iWeekdays != PVR_WEEKDAY_NONE ? timerinfo.firstDay : 0);
   vrp.add_U32(timerinfo.iWeekdays);
-  vrp.add_String("");
+  vrp.add_String(path.c_str());
   vrp.add_String(timerinfo.strTitle);
 
   if (GetProtocol() >= 9)
@@ -683,6 +803,20 @@
                              PVR_TIMER_TYPE_SUPPORTS_RECORDING_FOLDERS;
   (*size)++;
 
+  // Repeating manual
+  memset(&types[*size], 0, sizeof(types[*size]));
+  types[*size].iId = VNSI_TIMER_TYPE_MAN_REPEAT_CHILD;
+  strncpy(types[*size].strDescription, XBMC->GetLocalizedString(30205), 64);
+  types[*size].iAttributes = PVR_TIMER_TYPE_IS_MANUAL               |
+                             PVR_TIMER_TYPE_IS_READONLY             |
+                             PVR_TIMER_TYPE_SUPPORTS_CHANNELS       |
+                             PVR_TIMER_TYPE_SUPPORTS_START_TIME     |
+                             PVR_TIMER_TYPE_SUPPORTS_END_TIME       |
+                             PVR_TIMER_TYPE_SUPPORTS_PRIORITY       |
+                             PVR_TIMER_TYPE_SUPPORTS_LIFETIME       |
+                             PVR_TIMER_TYPE_SUPPORTS_RECORDING_FOLDERS;
+  (*size)++;
+
   // One-shot epg-based
   memset(&types[*size], 0, sizeof(types[*size]));
   types[*size].iId = VNSI_TIMER_TYPE_EPG;
@@ -807,8 +941,8 @@
     char *strTitle = vresp->extract_String();
     strncpy(tag.strTitle, strTitle, sizeof(tag.strTitle) - 1);
 
-    char *strPlotOutline = vresp->extract_String();
-    strncpy(tag.strPlotOutline, strPlotOutline, sizeof(tag.strPlotOutline) - 1);
+    char *strEpisodeName = vresp->extract_String();
+    strncpy(tag.strEpisodeName, strEpisodeName, sizeof(tag.strEpisodeName) - 1);
 
     char *strPlot = vresp->extract_String();
     strncpy(tag.strPlot, strPlot, sizeof(tag.strPlot) - 1);
@@ -959,8 +1093,8 @@
     char *strTitle = vresp->extract_String();
     strncpy(tag.strTitle, strTitle, sizeof(tag.strTitle) - 1);
 
-    char *strPlotOutline = vresp->extract_String();
-    strncpy(tag.strPlotOutline, strPlotOutline, sizeof(tag.strPlotOutline) - 1);
+    char *strEpisodeName = vresp->extract_String();
+    strncpy(tag.strEpisodeName, strEpisodeName, sizeof(tag.strEpisodeName) - 1);
 
     char *strPlot = vresp->extract_String();
     strncpy(tag.strPlot, strPlot, sizeof(tag.strPlot) - 1);
diff -Nru kodi-pvr-vdr-vnsi-2.6.9/src/VNSIData.h kodi-pvr-vdr-vnsi-2.6.17/src/VNSIData.h
--- kodi-pvr-vdr-vnsi-2.6.9/src/VNSIData.h	2016-11-26 13:27:01.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/src/VNSIData.h	2017-01-14 14:03:27.000000000 +0000
@@ -58,6 +58,8 @@
   PVR_ERROR   RenameTimer(const PVR_TIMER &timerinfo, const char *newname);
   PVR_ERROR   UpdateTimer(const PVR_TIMER &timerinfo);
   PVR_ERROR GetTimerTypes(PVR_TIMER_TYPE types[], int *size);
+  bool GenTimerChildren(const PVR_TIMER &timer, ADDON_HANDLE handle);
+  std::string GenTimerFolder(std::string directory, std::string title);
 
   int         GetRecordingsCount();
   PVR_ERROR   GetRecordingsList(ADDON_HANDLE handle);
diff -Nru kodi-pvr-vdr-vnsi-2.6.9/src/xbmc_codec_descriptor.hpp kodi-pvr-vdr-vnsi-2.6.17/src/xbmc_codec_descriptor.hpp
--- kodi-pvr-vdr-vnsi-2.6.9/src/xbmc_codec_descriptor.hpp	2016-11-26 13:27:01.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/src/xbmc_codec_descriptor.hpp	2017-01-14 14:03:27.000000000 +0000
@@ -20,7 +20,7 @@
 #ifndef XBMC_CODEC_DESCRIPTOR_HPP
 #define	XBMC_CODEC_DESCRIPTOR_HPP
 
-#include "kodi/libXBMC_codec.h"
+#include "libXBMC_codec.h"
 
 /**
  * Adapter which converts codec names used by tvheadend and VDR into their 
diff -Nru kodi-pvr-vdr-vnsi-2.6.9/.travis.yml kodi-pvr-vdr-vnsi-2.6.17/.travis.yml
--- kodi-pvr-vdr-vnsi-2.6.9/.travis.yml	2016-11-26 13:27:01.000000000 +0000
+++ kodi-pvr-vdr-vnsi-2.6.17/.travis.yml	2017-01-14 14:03:27.000000000 +0000
@@ -36,7 +36,7 @@
 #
 before_script:
   - cd $TRAVIS_BUILD_DIR/..
-  - git clone --depth=1 https://github.com/xbmc/xbmc.git
+  - git clone -b Krypton --depth=1 https://github.com/xbmc/xbmc.git
   - cd pvr.vdr.vnsi && mkdir build && cd build
   - cmake -DADDONS_TO_BUILD=pvr.vdr.vnsi -DADDON_SRC_PREFIX=$TRAVIS_BUILD_DIR/.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$TRAVIS_BUILD_DIR/../xbmc/addons -DPACKAGE_ZIP=1 $TRAVIS_BUILD_DIR/../xbmc/project/cmake/addons