diff -Nru kodi-pvr-vdr-vnsi-1.11.17/CMakeLists.txt kodi-pvr-vdr-vnsi-2.6.17/CMakeLists.txt --- kodi-pvr-vdr-vnsi-1.11.17/CMakeLists.txt 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/CMakeLists.txt 2017-01-14 14:03:27.000000000 +0000 @@ -6,9 +6,9 @@ enable_language(CXX) -find_package(kodi REQUIRED) +find_package(Kodi REQUIRED) find_package(kodiplatform REQUIRED) -find_package(platform REQUIRED) +find_package(p8-platform REQUIRED) add_definitions(-DUSE_DEMUX) @@ -38,15 +38,7 @@ endif() endif() else() - find_package(D3DX9) - if(D3DX9_FOUND) - set(INCLUDES ${D3DX9_INCLUDE_DIR}) - set(DEPLIBS ${D3DX9_LIBRARIES}) - add_definitions(-DHAS_DX) - message(STATUS "VDR OSD support enabled via DirectX") - else() - message(STATUS " VDR OSD support disabled because DirectX wasn't found") - endif() + message(STATUS " VDR OSD support disabled because it is not migrated to DX11 yet") endif() list(APPEND VDR_SOURCES src/client.cpp @@ -61,14 +53,14 @@ src/VNSIRecording.cpp src/VNSISession.cpp) -list(APPEND DEPLIBS ${platform_LIBRARIES}) +list(APPEND DEPLIBS ${p8-platform_LIBRARIES}) if(WIN32) list(APPEND DEPLIBS ws2_32) endif() include_directories(${INCLUDES} ${kodiplatform_INCLUDE_DIRS} - ${platform_INCLUDE_DIRS} + ${p8-platform_INCLUDE_DIRS} ${KODI_INCLUDE_DIR}) build_addon(pvr.vdr.vnsi VDR DEPLIBS) diff -Nru kodi-pvr-vdr-vnsi-1.11.17/debian/changelog kodi-pvr-vdr-vnsi-2.6.17/debian/changelog --- kodi-pvr-vdr-vnsi-1.11.17/debian/changelog 2016-04-27 11:26:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/debian/changelog 2017-01-19 16:32:17.000000000 +0000 @@ -1,4 +1,4 @@ -kodi-pvr-vdr-vnsi (1.11.17-1~trusty) trusty; urgency=low +kodi-pvr-vdr-vnsi (2.6.17-3~trusty) trusty; urgency=low [ xbmc ] * autogenerated dummy changelog @@ -6,4 +6,4 @@ [ wsnipex ] * no upstream changelog available - -- wsnipex Wed, 27 Apr 2016 13:26:03 +0200 + -- wsnipex Thu, 19 Jan 2017 17:32:17 +0100 diff -Nru kodi-pvr-vdr-vnsi-1.11.17/debian/changelog.tmp kodi-pvr-vdr-vnsi-2.6.17/debian/changelog.tmp --- kodi-pvr-vdr-vnsi-1.11.17/debian/changelog.tmp 2016-04-27 11:24:35.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 (1.11.17-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-1.11.17/debian/kodi-pvr-vdr-vnsi.install kodi-pvr-vdr-vnsi-2.6.17/debian/kodi-pvr-vdr-vnsi.install --- kodi-pvr-vdr-vnsi-1.11.17/debian/kodi-pvr-vdr-vnsi.install 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/debian/kodi-pvr-vdr-vnsi.install 2017-01-19 16:31:16.000000000 +0000 @@ -1,2 +1,2 @@ -usr/lib/*/addons/pvr.vdr.vnsi/pvr.vdr.vnsi.so* /usr/lib/kodi/addons/pvr.vdr.vnsi -usr/share/kodi/addons/pvr.vdr.vnsi +usr/lib +usr/share diff -Nru kodi-pvr-vdr-vnsi-1.11.17/FindD3DX9.cmake kodi-pvr-vdr-vnsi-2.6.17/FindD3DX9.cmake --- kodi-pvr-vdr-vnsi-1.11.17/FindD3DX9.cmake 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/FindD3DX9.cmake 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -# - Find Direct3D 9 Extensions -# Find the Direct3D9 Extensions includes and libraries -# -# D3DX9_INCLUDE_DIR - where to find d3d9x.h -# D3DX9_LIBRARIES - List of libraries when using D3DX9. -# D3DX9_FOUND - True if D3DX9 found. - -if(D3DX9_INCLUDE_DIR) - # Already in cache, be silent - set(D3DX9_FIND_QUIETLY TRUE) -endif(D3DX9_INCLUDE_DIR) - -find_path(D3DX9_INCLUDE_DIR d3dx9.h -HINTS "$ENV{DXSDK_DIR}/Include" -) - -find_library(D3DX9_LIBRARY -NAMES d3dx9 -HINTS "$ENV{DXSDK_DIR}/Lib/$ENV{PROCESSOR_ARCHITECTURE}" -HINTS "$ENV{DXSDK_DIR}/lib" -) - -# Handle the QUIETLY and REQUIRED arguments and set D3D9X_FOUND to TRUE if -# all listed variables are TRUE. -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(D3DX9 DEFAULT_MSG -D3DX9_INCLUDE_DIR D3DX9_LIBRARY) -mark_as_advanced(D3DX9_INCLUDE_DIR D3DX9_LIBRARY) diff -Nru kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/addon.xml.in kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/addon.xml.in --- kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/addon.xml.in 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/addon.xml.in 2017-01-14 14:03:27.000000000 +0000 @@ -1,12 +1,12 @@ - + @@ -29,7 +29,8 @@ PVR client to connect VDR to Kodi over the VNSI interface Cliente PVR para conectar VDR a Kodi sobre la interfaz VNSI Cliente PVR para conectar VDR a Kodi sobre la interfaz VNSI - PVR-asiakas, joka kytkee VDR:n Kodi:iin VNSI:n avulla + Cliente PVR para conectar VDR a Kodi a través de la interfaz VNSI + Kodin VDR (VNSI) -asiakasohjelma Client de numériscope pour connecter VDR à Kodi par une interface VNSI. Client enregistreur vidéo (PVR) connectant un enregistreur de disque vidéo à Kodi via l'interface d'enregistrement de flux réseau vidéo Cliente PVR que conecta VDR ao Kodi mediante a interface VNSI @@ -58,15 +59,16 @@ PVR клијент за повезивање VDR са Kodi преко VNSI интерфејса PVR klijent za povezivanje VDR sa Kodi preko VNSI interfejsa PVR-klient för att ansluta VDR till Kodi över VNSI-gränsnittet + Klijynt telewizyje do skuplowaniŏ VDR bez interfejs VNSI Kayıt Sunucusu VDR'ye Kodi'yle VNSI Arayüzü Üzerinden Bağlanır Клієнт PVR для зв’язку VDR з Kodi через інтерфейс VNSI Trình PVR để kết nối VDR với Kodi qua giao tiếp VNSI 让 Kodi 通过 VNSI 界面与 VDR 连接的 PVR 客户端 - PVR用戶端經由VNSI介面接口連接VDR到Kodi + 經由VNSI界接VDR到Kodi的PVR用戶端 VDR voorprogram; ondersteun stroom van Lewendige TV & Opnames, EPG, Tydhouers oor die VNSI byvoegsel VDR frontend; supporting streaming of Live TV & Recordings, EPG, Timers over the VNSI plugin VDR клиент. Поддържа поточна телевизия и записване, електронен програмен справочник, броячи чрез VNSI приставка. - Frontal VDR; suportant fluxos de TV en directe i enregistraments, EPG, temporitzadors sobre el connector VNSI + 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 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 Blaen VDR; cynnal ffrydio Teledu Byw, Recordio, Amserlenni, Amseryddion dros ategyn VNSI VDR frontend; understøtter streaming af TV og Optagelser, EPG og Timere over VNSI-addon @@ -78,7 +80,8 @@ VDR frontend; supporting streaming of Live TV & Recordings, EPG, Timers over the VNSI plugin Front-end VDR, soporte de streaming de televisión en vivo y grabaciones, GEP, temporizador con el plugin VNSI Front-end VDR, soporte de streaming de televisión en vivo y grabaciones, EPG, temporizador con el plugin VNSI - VDR-frontend; tukee livelähetyksiä sekä tallenteita, ohjelmaopasta, ajastuksia ja VNSI-lisäosia + Interfaz VDR; Soportando streaming de TV en directo y Grabaciones, EPG, Timers sobre el plugin VNSI + VDR-asiakasohjelma. Tukee suorien tv-lähetysten ja tallennusten katsomista, ohjelmaopasta ja ohjelmien ajastamista. Frontal VDR, prenant en charge la diffusion en continu des télés en direct & les enregistrements, le GÉP et les minuteries avec le plugiciel VNSI. 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. 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 @@ -96,7 +99,7 @@ Bahagian hadapan VDR; menyokong penstirman TV Langsung & Rakaman, EPG, Pemasa menerusi pemalam VNSI VDR frontend; støtte for visning av direkte TV og opptak, EPG og tidtakere over VNSI-tillegget VDR frontend: ondersteunt streaming van Live TV & Recordings, EPG, Timers over de VNSI plugin - 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 + 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 Frontend VDR; suporta streaming de TV ao vivo e gravações, EPG, agendamentos sobre o plugin VNSI Frontend VDR; suporta transmissão de Live TV e Gravações, EPG e Temporizadores através do plugin VNSI Frontend VDR; suportă streaming de TV Live & Înregistrări, EPG, Cronometre folosind pluginul VNSI @@ -107,15 +110,16 @@ VDR интерфејс; подржава стримовање ТВ Уживо & Снимака, EPG, Тајмере преко VNSI VDR interfejs; podržava strimovanje TV Uživo & Snimaka, EPG, Tajmere preko VNSI VDR frontend; stödjer strömning av direktsänd TV & inspelningar, EPG, timers över VNSI-tillägget + 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 VDR ön ucu; Canlı TV akışı ve kayıt yapabilme, EPG, VNSI eklentisi üzerinden zamanlayıcıları destekler. Надстройка над VDR; підтримує потік TV і записів, EPG, таймерів через додаток VNSI 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 VDR 前端，通过 VNSI 插件支持直播电视和录像流媒体、电子节目单、定时器 - VDR前端，在VNSI外掛插件上支援的串流媒體包括有：電視直播和錄影，電子節目表，定時器。 + VDR前端，在VNSI插件上支援的串流媒體包括有：電視直播和錄影，電子節目表，定時器。 Hierdie is onstabiele sagteware! Die outeurs is op geen manier verantwoordelik vir gefaalde opnames, inkorrekte tydhouers, gemorsde ure, of enige ander ongewensde effekte. This is unstable software! The authors are in no way responsible for failed recordings, incorrect timers, wasted hours, or any other undesirable effects.. Тази програма е нестабилна! Авторите не носят отговорност за неуспешно записване, некоректни броячи, пропиляно време и други нежелани ефекти. - Això és programari inestable! Els autors no són de cap manera responsables dels enregistraments que han fallat, temporitzadors incorrectes, hores perdudes, o qualsevols altres efectes indesitjables.. + Això és programari inestable! Els autors no són de cap manera responsables dels enregistraments que han fallat, temporitzadors incorrectes, hores perdudes, o qualsevol altre efecte indesitjat.. Tento software není stabilní. Autoři nejsou žádným způsobem zodpovědní za selhání při nahrávání, neplatné časovače, ztracený čas, či jakékoliv jiné nežádoucí události... Mae hwn yn feddalwedd ansad! Nid yw'r awduron yn gyfrifol mewn unrhyw ffordd am fethu recordio, amseru gwallus, oriau wedi eu gwastraffu nac effeithiau anymunol eraill. Dette er ustabil software! Ophavsmændene er på ingen måde ansvarlige for mislykkede optagelser, ukorrekte timere, spildte timer, eller andre uønskede konsekvenser.. @@ -129,7 +133,7 @@ ¡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. ¡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... See on ebastabiilne tarkvara! Autorid ei ole kuidagi moodi vastutavad nurjunud salvestiste, ebaõige aegrelee, raisatud tundide ega muude soovimatute asjade eest. - 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. + 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. 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. 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. Software non estable, os autores non se fan responsábeis dos erros na gravacións, temporizadores incorrectos, e outros efectos non desexados. @@ -152,7 +156,7 @@ Dit is instabiele software! De auteurs zijn op geen enkele wijze verantwoordelijk voor mislukte opnames, onjuiste timers, verspilde uren, of andere ongewenste effecten .. Oprogramowanie nadal jest w fazie rozwoju i jest niestabilne! Autorzy w żaden sposób nie są odpowiedzialni za nieudane nagrania, błędy w harmonogramie nagrań, zmarnowany czas ani jakiekolwiek inne niepożądane efekty. Este é um software instável! Os autores não são responsáveis por gravações com falhas, agendamentos incorretos, tempo desperdiçado, ou quaisquer outros efeitos indesejáveis... - Este software é instável! Os autores não são responsáveis por falhas na gravação, temporizadores incorrectos, horas perdidas ou outro qualquer efeito não desejado... + Este software é instável! Os autores não são responsáveis por falhas na gravação, temporizadores incorretos, horas perdidas ou outro qualquer efeito não desejado... Acesta nu este o aplicație definitivă! Autorii nu sunt în nici un fel responsabili pentru înregistrări eșuate, cronometre incorecte, ore pierdute, sau orice alte efecte nedorite... Это тестовая программа! Авторы не несут никакой ответственности за испорченные записи, неверные таймеры, потраченное время и прочие нежелательные эффекты.. මෙය අස්ථිර මෘදුකාංගයකි! මෙහි සිදුවන පටිගත කිරීම් අසාර්ථක වීම්, සාවද්‍ය මුහුර්තක, නාස්ති වූ කාලයන්, හෝ වෙනත් යමිකිසි නුසුදුසු බලපෑම් සඳහා කතෘ වග කියනු නොලැබේ. diff -Nru kodi-pvr-vdr-vnsi-1.11.17/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-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.af_za/strings.po 2016-04-25 07:36:03.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 @@ -36,10 +36,6 @@ msgid "Connect timeout (s)" msgstr "Konnekteer tydverstreke(s)" -msgctxt "#30005" -msgid "Allow VDR Messages" -msgstr "Laat VDR Boodskappe toe" - msgctxt "#30006" msgid "Read recordings from directory" msgstr "Lees opnames vanaf vouer" @@ -275,3 +271,27 @@ msgctxt "#30114" 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-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.az_az/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.az_az/strings.po --- kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.az_az/strings.po 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.az_az/strings.po 2017-01-14 14:03:27.000000000 +0000 @@ -23,3 +23,7 @@ msgctxt "#30026" msgid "Type:" msgstr "Növ:" + +msgctxt "#30108" +msgid "Channels" +msgstr "Kanallar" diff -Nru kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.be_by/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.be_by/strings.po --- kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.be_by/strings.po 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.be_by/strings.po 2017-01-14 14:03:27.000000000 +0000 @@ -36,10 +36,6 @@ msgid "Connect timeout (s)" msgstr "Connect timeout (s)" -msgctxt "#30005" -msgid "Allow VDR Messages" -msgstr "Allow VDR Messages" - msgctxt "#30006" msgid "Read recordings from directory" msgstr "Read recordings from directory" diff -Nru kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.bg_bg/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.bg_bg/strings.po --- kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.bg_bg/strings.po 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.bg_bg/strings.po 2017-01-14 14:03:27.000000000 +0000 @@ -36,10 +36,6 @@ msgid "Connect timeout (s)" msgstr "Време на изчакване при свързване (с)" -msgctxt "#30005" -msgid "Allow VDR Messages" -msgstr "Включи VDR съобщенията" - msgctxt "#30006" msgid "Read recordings from directory" msgstr "Чети записите от папката" diff -Nru kodi-pvr-vdr-vnsi-1.11.17/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-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.ca_es/strings.po 2016-04-25 07:36:03.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,11 +34,7 @@ msgctxt "#30004" msgid "Connect timeout (s)" -msgstr "Temps d'espera de connexió (s)" - -msgctxt "#30005" -msgid "Allow VDR Messages" -msgstr "Permet missatges VDR" +msgstr "Temps d'expiració de la connexió (s)" msgctxt "#30006" msgid "Read recordings from directory" @@ -54,7 +50,7 @@ msgctxt "#30009" msgid "Channel search - Settings" -msgstr "Cerca de canals - Configuració" +msgstr "Cerca de canals - Ajusts" msgctxt "#30010" msgid "Start Channel search" @@ -62,7 +58,7 @@ msgctxt "#30011" msgid "Source Type" -msgstr "Tipus de font" +msgstr "Tipus d'origen" msgctxt "#30012" msgid "TV channels" @@ -70,7 +66,7 @@ msgctxt "#30013" msgid "Radio channels" -msgstr "Canals de ràdio" +msgstr "Emissores de ràdio" msgctxt "#30014" msgid "FTA channels" @@ -118,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:" @@ -130,7 +126,7 @@ msgctxt "#30028" msgid "Scan: %i" -msgstr "Escaneig: %i" +msgstr "Exploració: %i" msgctxt "#30029" msgid "Signal: %i %%" @@ -174,7 +170,7 @@ msgctxt "#30039" msgid "Running" -msgstr "S'està executant" +msgstr "En execució" msgctxt "#30040" msgid "Stopped" @@ -206,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" @@ -218,7 +214,7 @@ msgctxt "#30100" msgid "VDR OSD" -msgstr "VDR OSD" +msgstr "OSD de VDR" msgctxt "#30101" msgid "Setup" @@ -226,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" @@ -262,11 +258,11 @@ msgctxt "#30111" msgid "Channel filters" -msgstr "Filtre de canals" +msgstr "Filtres dels canals" msgctxt "#30112" msgid "Radio Channels" -msgstr "Canales de ràdio" +msgstr "Emissores de ràdio" msgctxt "#30113" msgid "Save filters" @@ -274,4 +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 "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-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.cs_cz/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.cs_cz/strings.po --- kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.cs_cz/strings.po 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.cs_cz/strings.po 2017-01-14 14:03:27.000000000 +0000 @@ -36,10 +36,6 @@ msgid "Connect timeout (s)" msgstr "Časový limit spojení" -msgctxt "#30005" -msgid "Allow VDR Messages" -msgstr "Povolit zprávy VDR" - msgctxt "#30006" msgid "Read recordings from directory" msgstr "Načíst nahrávky z adresáře" @@ -275,3 +271,11 @@ msgctxt "#30114" msgid "Provider Unknown" msgstr "Neznámy poskytovatel" + +msgctxt "#30201" +msgid "Repeating" +msgstr "Opakující se" + +msgctxt "#30202" +msgid "EGP" +msgstr "EGP" diff -Nru kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.cy_gb/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.cy_gb/strings.po --- kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.cy_gb/strings.po 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.cy_gb/strings.po 2017-01-14 14:03:27.000000000 +0000 @@ -36,10 +36,6 @@ msgid "Connect timeout (s)" msgstr "Amser allan cysylltu (e)" -msgctxt "#30005" -msgid "Allow VDR Messages" -msgstr "Caniatáu Negeseuon VDR" - msgctxt "#30006" msgid "Read recordings from directory" msgstr "Darllen recordiadau o gyferiadur" diff -Nru kodi-pvr-vdr-vnsi-1.11.17/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-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.da_dk/strings.po 2016-04-25 07:36:03.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,23 +30,19 @@ msgctxt "#30003" msgid "Character Set Conversion" -msgstr "Tegnsæt konvertering" +msgstr "Tegnsætkonvertering" msgctxt "#30004" msgid "Connect timeout (s)" msgstr "Tidsfrist for forbindelse (s)" -msgctxt "#30005" -msgid "Allow VDR Messages" -msgstr "Tillad VDR meddelser" - msgctxt "#30006" msgid "Read recordings from directory" msgstr "Indlæs optagelser fra mappen" msgctxt "#30007" msgid "VDR recordings directory" -msgstr "VDR optagelsesmappen" +msgstr "VDR-optagelsesmappen" msgctxt "#30008" msgid "Channel search" @@ -58,7 +54,7 @@ msgctxt "#30010" msgid "Start Channel search" -msgstr "Start Kanalsøgning" +msgstr "Start kanalsøgning" msgctxt "#30011" msgid "Source Type" @@ -110,7 +106,7 @@ msgctxt "#30023" msgid "ATSC Type" -msgstr "ATSC Type" +msgstr "ATSC-type" msgctxt "#30024" msgid "Back" @@ -146,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:" @@ -275,3 +271,23 @@ msgctxt "#30114" 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-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.de_de/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.de_de/strings.po --- kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.de_de/strings.po 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.de_de/strings.po 2017-01-14 14:03:27.000000000 +0000 @@ -36,10 +36,6 @@ msgid "Connect timeout (s)" msgstr "Verbindungszeitüberschreitung (s)" -msgctxt "#30005" -msgid "Allow VDR Messages" -msgstr "VDR Nachrichten erlauben" - msgctxt "#30006" msgid "Read recordings from directory" msgstr "Aufnahmen aus Ordner lesen" @@ -275,3 +271,23 @@ msgctxt "#30114" msgid "Provider Unknown" msgstr "Anbieter unbekannt" + +msgctxt "#30200" +msgid "Single" +msgstr "Einzeln" + +msgctxt "#30201" +msgid "Repeating" +msgstr "Mehrmalig" + +msgctxt "#30202" +msgid "EGP" +msgstr "EPG" + +msgctxt "#30203" +msgid "VPS" +msgstr "VPS" + +msgctxt "#30204" +msgid "Search EPG" +msgstr "EPG durchsuchen" diff -Nru kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.el_gr/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.el_gr/strings.po --- kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.el_gr/strings.po 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.el_gr/strings.po 2017-01-14 14:03:27.000000000 +0000 @@ -36,10 +36,6 @@ msgid "Connect timeout (s)" msgstr "Χρονικό όριο σύνδεσης (s)" -msgctxt "#30005" -msgid "Allow VDR Messages" -msgstr "Να επιτρέπονται Μηνύματα VDR" - msgctxt "#30006" msgid "Read recordings from directory" msgstr "Ανάγνωση εγγραφών από φάκελο" @@ -174,7 +170,7 @@ msgctxt "#30039" msgid "Running" -msgstr "Εκτελείται" +msgstr "Σε εκτέλεση" msgctxt "#30040" msgid "Stopped" @@ -275,3 +271,7 @@ msgctxt "#30114" msgid "Provider Unknown" msgstr "Άγνωστος Πάροχος" + +msgctxt "#30201" +msgid "Repeating" +msgstr "Επανάληψη" diff -Nru kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.en_au/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.en_au/strings.po --- kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.en_au/strings.po 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.en_au/strings.po 2017-01-14 14:03:27.000000000 +0000 @@ -36,10 +36,6 @@ msgid "Connect timeout (s)" msgstr "Connect timeout (s)" -msgctxt "#30005" -msgid "Allow VDR Messages" -msgstr "Allow VDR Messages" - msgctxt "#30006" msgid "Read recordings from directory" msgstr "Read recordings from directory" diff -Nru kodi-pvr-vdr-vnsi-1.11.17/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-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.en_gb/strings.po 2016-04-25 07:36:03.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 @@ -38,9 +38,7 @@ msgid "Connect timeout (s)" msgstr "" -msgctxt "#30005" -msgid "Allow VDR Messages" -msgstr "" +#empty string with id 30005 msgctxt "#30006" msgid "Read recordings from directory" @@ -279,3 +277,29 @@ msgctxt "#30114" msgid "Provider Unknown" msgstr "" + +#empty strings from id 30115 to 30199 + +msgctxt "#30200" +msgid "Single" +msgstr "" + +msgctxt "#30201" +msgid "Repeating" +msgstr "" + +msgctxt "#30202" +msgid "EGP" +msgstr "" + +msgctxt "#30203" +msgid "VPS" +msgstr "" + +msgctxt "#30204" +msgid "Search EPG" +msgstr "" + +msgctxt "#30205" +msgid "Repeating Child" +msgstr "" diff -Nru kodi-pvr-vdr-vnsi-1.11.17/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-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.en_nz/strings.po 2016-04-25 07:36:03.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 @@ -36,10 +36,6 @@ msgid "Connect timeout (s)" msgstr "Connect timeout (s)" -msgctxt "#30005" -msgid "Allow VDR Messages" -msgstr "Allow VDR Messages" - msgctxt "#30006" msgid "Read recordings from directory" msgstr "Read recordings from directory" @@ -275,3 +271,23 @@ msgctxt "#30114" 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-1.11.17/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-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.en_us/strings.po 2016-04-25 07:36:03.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 @@ -36,10 +36,6 @@ msgid "Connect timeout (s)" msgstr "Connect timeout (s)" -msgctxt "#30005" -msgid "Allow VDR Messages" -msgstr "Allow VDR Messages" - msgctxt "#30006" msgid "Read recordings from directory" msgstr "Read recordings from directory" @@ -275,3 +271,23 @@ msgctxt "#30114" 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-1.11.17/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-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.es_ar/strings.po 2016-04-25 07:36:03.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 @@ -36,10 +36,6 @@ msgid "Connect timeout (s)" msgstr "Tiempo para conectar excedido" -msgctxt "#30005" -msgid "Allow VDR Messages" -msgstr "Permitir mensajes VDR" - msgctxt "#30006" msgid "Read recordings from directory" msgstr "Leer grabaciones en carpeta" @@ -275,3 +271,15 @@ msgctxt "#30114" 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-1.11.17/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-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.es_es/strings.po 2016-04-25 07:36:03.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 @@ -36,10 +36,6 @@ msgid "Connect timeout (s)" msgstr "Tiempo de espera de conexión (s)" -msgctxt "#30005" -msgid "Allow VDR Messages" -msgstr "Permitir mensajes VDR" - msgctxt "#30006" msgid "Read recordings from directory" msgstr "Leer grabaciones en carpeta" @@ -242,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" @@ -275,3 +271,23 @@ msgctxt "#30114" msgid "Provider Unknown" msgstr "Proveedor Desconocido" + +msgctxt "#30200" +msgid "Single" +msgstr "Individual" + +msgctxt "#30201" +msgid "Repeating" +msgstr "Repitiendo" + +msgctxt "#30202" +msgid "EGP" +msgstr "EPG" + +msgctxt "#30203" +msgid "VPS" +msgstr "VPS" + +msgctxt "#30204" +msgid "Search EPG" +msgstr "Buscar en EPG" diff -Nru kodi-pvr-vdr-vnsi-1.11.17/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-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.es_mx/strings.po 2016-04-25 07:36:03.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-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.et_ee/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.et_ee/strings.po --- kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.et_ee/strings.po 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.et_ee/strings.po 2017-01-14 14:03:27.000000000 +0000 @@ -36,10 +36,6 @@ msgid "Connect timeout (s)" msgstr "Ühenduse aegumine (s)" -msgctxt "#30005" -msgid "Allow VDR Messages" -msgstr "Luba VDR teated" - msgctxt "#30008" msgid "Channel search" msgstr "Kanaliotsing" diff -Nru kodi-pvr-vdr-vnsi-1.11.17/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-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.eu_es/strings.po 2016-04-25 07:36:03.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 @@ -16,6 +16,10 @@ "Language: eu_ES\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +msgctxt "#30002" +msgid "Priority" +msgstr "Lehentasuna" + msgctxt "#30004" msgid "Connect timeout (s)" msgstr "Konexioa denboraz kanpo" @@ -32,6 +36,10 @@ msgid "Country" msgstr "Herrialdea" +msgctxt "#30024" +msgid "Back" +msgstr "Atzera" + msgctxt "#30026" msgid "Type:" msgstr "Mota:" @@ -47,3 +55,7 @@ msgctxt "#30108" msgid "Channels" msgstr "Kateak" + +msgctxt "#30201" +msgid "Repeating" +msgstr "Errepikapena" diff -Nru kodi-pvr-vdr-vnsi-1.11.17/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-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.fi_fi/strings.po 2016-04-25 07:36:03.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" @@ -36,17 +36,13 @@ msgid "Connect timeout (s)" msgstr "Yhteyden aikakatkaisu (s)" -msgctxt "#30005" -msgid "Allow VDR Messages" -msgstr "Salli VDR-palvelimen viestit" - 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" @@ -66,7 +62,7 @@ msgctxt "#30012" msgid "TV channels" -msgstr "TV-kanavat" +msgstr "Tv-kanavat" msgctxt "#30013" msgid "Radio channels" @@ -74,7 +70,7 @@ msgctxt "#30014" msgid "FTA channels" -msgstr "Ilmaiskanavat" +msgstr "Salaamattomat kanavat" msgctxt "#30015" msgid "Scrambled channels" @@ -110,7 +106,7 @@ msgctxt "#30023" msgid "ATSC Type" -msgstr "ATSC tyyppi" +msgstr "ATSC-tyyppi" msgctxt "#30024" msgid "Back" @@ -146,7 +142,7 @@ msgctxt "#30032" msgid "Analog TV" -msgstr "Analoginen TV" +msgstr "Analoginen tv" msgctxt "#30033" msgid "Analog Radio" @@ -154,7 +150,7 @@ msgctxt "#30034" msgid "Transponder:" -msgstr "Transponder:" +msgstr "Transponderi:" msgctxt "#30035" msgid "New channels" @@ -170,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" @@ -190,7 +186,7 @@ msgctxt "#30043" msgid "Channel search - Error" -msgstr "Kanavahaku virhe" +msgstr "Virhe kanavahaussa" msgctxt "#30044" msgid "Lost connection to VDR Server" @@ -206,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" @@ -238,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" @@ -254,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" @@ -275,3 +271,27 @@ msgctxt "#30114" msgid "Provider Unknown" msgstr "Tarjoaja tuntematon" + +msgctxt "#30200" +msgid "Single" +msgstr "Yksittäinen" + +msgctxt "#30201" +msgid "Repeating" +msgstr "Toistuva" + +msgctxt "#30202" +msgid "EGP" +msgstr "EGP" + +msgctxt "#30203" +msgid "VPS" +msgstr "VPS" + +msgctxt "#30204" +msgid "Search EPG" +msgstr "Etsi ohjelmaoppaasta" + +msgctxt "#30205" +msgid "Repeating Child" +msgstr "Toistuva (lapsi)" diff -Nru kodi-pvr-vdr-vnsi-1.11.17/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-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.fr_ca/strings.po 2016-04-25 07:36:03.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 @@ -36,10 +36,6 @@ msgid "Connect timeout (s)" msgstr "Temporisation de connexion (s)" -msgctxt "#30005" -msgid "Allow VDR Messages" -msgstr "Permettre les messages de VDR" - msgctxt "#30006" msgid "Read recordings from directory" msgstr "Lire les enregistrements du répertoire" @@ -130,7 +126,7 @@ msgctxt "#30028" msgid "Scan: %i" -msgstr "Balayage : %i" +msgstr "Analyse : %i" msgctxt "#30029" msgid "Signal: %i %%" @@ -275,3 +271,27 @@ msgctxt "#30114" msgid "Provider Unknown" msgstr "Fournisseur inconnu" + +msgctxt "#30200" +msgid "Single" +msgstr "Simple" + +msgctxt "#30201" +msgid "Repeating" +msgstr "Répétition" + +msgctxt "#30202" +msgid "EGP" +msgstr "GÉP" + +msgctxt "#30203" +msgid "VPS" +msgstr "SDV" + +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-1.11.17/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-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.fr_fr/strings.po 2016-04-25 07:36:03.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 @@ -36,10 +36,6 @@ msgid "Connect timeout (s)" msgstr "Temporisation de connexion (s)" -msgctxt "#30005" -msgid "Allow VDR Messages" -msgstr "Autoriser les messages VDR" - msgctxt "#30006" msgid "Read recordings from directory" msgstr "Lecture des enregistrements depuis un dossier" @@ -126,7 +122,7 @@ msgctxt "#30027" msgid "Device:" -msgstr "Périphérique :" +msgstr "Dispositif :" msgctxt "#30028" msgid "Scan: %i" @@ -166,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" @@ -202,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" @@ -275,3 +271,27 @@ msgctxt "#30114" msgid "Provider Unknown" msgstr "Fournisseur inconnu" + +msgctxt "#30200" +msgid "Single" +msgstr "Unique" + +msgctxt "#30201" +msgid "Repeating" +msgstr "Répétition" + +msgctxt "#30202" +msgid "EGP" +msgstr "Guide" + +msgctxt "#30203" +msgid "VPS" +msgstr "VPS" + +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-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.gl_es/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.gl_es/strings.po --- kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.gl_es/strings.po 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.gl_es/strings.po 2017-01-14 14:03:27.000000000 +0000 @@ -36,10 +36,6 @@ msgid "Connect timeout (s)" msgstr "Tempo de espera para conectar (s)" -msgctxt "#30005" -msgid "Allow VDR Messages" -msgstr "Permitir mensaxes do VDR" - msgctxt "#30006" msgid "Read recordings from directory" msgstr "Ler gravacións do cartafol" @@ -275,3 +271,19 @@ msgctxt "#30114" msgid "Provider Unknown" msgstr "Provedor Descoñecido" + +msgctxt "#30201" +msgid "Repeating" +msgstr "Repetición" + +msgctxt "#30202" +msgid "EGP" +msgstr "GUÍA" + +msgctxt "#30203" +msgid "VPS" +msgstr "VPS" + +msgctxt "#30204" +msgid "Search EPG" +msgstr "Buscar na Guía" diff -Nru kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.he_il/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.he_il/strings.po --- kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.he_il/strings.po 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.he_il/strings.po 2017-01-14 14:03:27.000000000 +0000 @@ -36,10 +36,6 @@ msgid "Connect timeout (s)" msgstr "זמן מירבי לניסיון חיבור (שנ')" -msgctxt "#30005" -msgid "Allow VDR Messages" -msgstr "אפשר הודעות VDR" - msgctxt "#30006" msgid "Read recordings from directory" msgstr "קרא הקלטות מתיקיה" @@ -275,3 +271,7 @@ msgctxt "#30114" msgid "Provider Unknown" msgstr "ספק לא מוכר" + +msgctxt "#30201" +msgid "Repeating" +msgstr "חוזר" diff -Nru kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.hr_hr/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.hr_hr/strings.po --- kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.hr_hr/strings.po 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.hr_hr/strings.po 2017-01-14 14:03:27.000000000 +0000 @@ -36,10 +36,6 @@ msgid "Connect timeout (s)" msgstr "Istek vremena povezivanja (sek)" -msgctxt "#30005" -msgid "Allow VDR Messages" -msgstr "Dopusti VDR poruke" - msgctxt "#30006" msgid "Read recordings from directory" msgstr "Čitaj snimanja iz direktorija" @@ -275,3 +271,23 @@ msgctxt "#30114" msgid "Provider Unknown" msgstr "Nepoznat pružatelj usluge" + +msgctxt "#30200" +msgid "Single" +msgstr "Jednostruk" + +msgctxt "#30201" +msgid "Repeating" +msgstr "Ponavljajuće" + +msgctxt "#30202" +msgid "EGP" +msgstr "EGP vodič" + +msgctxt "#30203" +msgid "VPS" +msgstr "VPS" + +msgctxt "#30204" +msgid "Search EPG" +msgstr "Pretraživanje EPG vodiča" diff -Nru kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.hu_hu/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.hu_hu/strings.po --- kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.hu_hu/strings.po 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.hu_hu/strings.po 2017-01-14 14:03:27.000000000 +0000 @@ -36,10 +36,6 @@ msgid "Connect timeout (s)" msgstr "A kapcsolat időtúllépési értéke (mp.)" -msgctxt "#30005" -msgid "Allow VDR Messages" -msgstr "VDR rendszerüzenetek engedélyezése" - msgctxt "#30006" msgid "Read recordings from directory" msgstr "Felvételek olvasása könyvtárból" @@ -275,3 +271,23 @@ msgctxt "#30114" msgid "Provider Unknown" msgstr "Szolgáltató ismeretlen" + +msgctxt "#30200" +msgid "Single" +msgstr "Kislemez" + +msgctxt "#30201" +msgid "Repeating" +msgstr "Ismétlődő" + +msgctxt "#30202" +msgid "EGP" +msgstr "EGP" + +msgctxt "#30203" +msgid "VPS" +msgstr "VPS" + +msgctxt "#30204" +msgid "Search EPG" +msgstr "EPG keresése" diff -Nru kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.id_id/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.id_id/strings.po --- kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.id_id/strings.po 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.id_id/strings.po 2017-01-14 14:03:27.000000000 +0000 @@ -36,10 +36,6 @@ msgid "Connect timeout (s)" msgstr "Timeout koneksi (s)" -msgctxt "#30005" -msgid "Allow VDR Messages" -msgstr "Perbolehkan pesan VDR" - msgctxt "#30006" msgid "Read recordings from directory" msgstr "Baca rekaman dari direktori" @@ -275,3 +271,7 @@ msgctxt "#30114" msgid "Provider Unknown" msgstr "Penyedia tidak dikenal" + +msgctxt "#30201" +msgid "Repeating" +msgstr "Sedang Mengulang" diff -Nru kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.is_is/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.is_is/strings.po --- kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.is_is/strings.po 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.is_is/strings.po 2017-01-14 14:03:27.000000000 +0000 @@ -36,10 +36,6 @@ msgid "Connect timeout (s)" msgstr "Tengitími útrennur (ms)" -msgctxt "#30005" -msgid "Allow VDR Messages" -msgstr "Leyfa VDR skilaboð" - msgctxt "#30006" msgid "Read recordings from directory" msgstr "Lesa upptökur frá skráasafni" @@ -275,3 +271,7 @@ msgctxt "#30114" msgid "Provider Unknown" msgstr "Veita Óþekkt" + +msgctxt "#30201" +msgid "Repeating" +msgstr "Endurtekið" diff -Nru kodi-pvr-vdr-vnsi-1.11.17/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-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.it_it/strings.po 2016-04-25 07:36:03.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 @@ -36,10 +36,6 @@ msgid "Connect timeout (s)" msgstr "Timeout per la connessione (s)" -msgctxt "#30005" -msgid "Allow VDR Messages" -msgstr "Consenti messaggi VDR" - msgctxt "#30006" msgid "Read recordings from directory" msgstr "Leggi le registrazioni dalla cartella" @@ -275,3 +271,27 @@ msgctxt "#30114" msgid "Provider Unknown" msgstr "Provider sconosciuti" + +msgctxt "#30200" +msgid "Single" +msgstr "Singolo" + +msgctxt "#30201" +msgid "Repeating" +msgstr "Ripetizione" + +msgctxt "#30202" +msgid "EGP" +msgstr "EPG" + +msgctxt "#30203" +msgid "VPS" +msgstr "VPS" + +msgctxt "#30204" +msgid "Search EPG" +msgstr "Cerca EPG" + +msgctxt "#30205" +msgid "Repeating Child" +msgstr "Ripetizione Bambini" diff -Nru kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.ja_jp/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.ja_jp/strings.po --- kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.ja_jp/strings.po 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.ja_jp/strings.po 2017-01-14 14:03:27.000000000 +0000 @@ -36,10 +36,6 @@ msgid "Connect timeout (s)" msgstr "接続タイムアウト (秒)" -msgctxt "#30005" -msgid "Allow VDR Messages" -msgstr "VDRのメッセージを許可する" - msgctxt "#30006" msgid "Read recordings from directory" msgstr "ディレクトリから録画を読む" @@ -243,3 +239,7 @@ msgctxt "#30113" msgid "Save filters" msgstr "絞り込みの保存" + +msgctxt "#30201" +msgid "Repeating" +msgstr "くり返し" diff -Nru kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.ko_kr/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.ko_kr/strings.po --- kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.ko_kr/strings.po 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.ko_kr/strings.po 2017-01-14 14:03:27.000000000 +0000 @@ -36,10 +36,6 @@ msgid "Connect timeout (s)" msgstr "연결시간 제한 (초)" -msgctxt "#30005" -msgid "Allow VDR Messages" -msgstr "VDR 메시지 허용" - msgctxt "#30006" msgid "Read recordings from directory" msgstr "디렉터리에서 녹화 읽기" @@ -275,3 +271,23 @@ msgctxt "#30114" 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 "EPG 검색" diff -Nru kodi-pvr-vdr-vnsi-1.11.17/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-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.lt_lt/strings.po 2016-04-25 07:36:03.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 @@ -36,10 +36,6 @@ msgid "Connect timeout (s)" msgstr "Prisijungimui skirtas laikas (s)" -msgctxt "#30005" -msgid "Allow VDR Messages" -msgstr "Leisti VDR pranešimus" - msgctxt "#30006" msgid "Read recordings from directory" msgstr "Skaityti įrašus iš katalogo" @@ -275,3 +271,27 @@ msgctxt "#30114" msgid "Provider Unknown" msgstr "Tiekėjas nežinomas" + +msgctxt "#30200" +msgid "Single" +msgstr "Vienas" + +msgctxt "#30201" +msgid "Repeating" +msgstr "Pasikartojantis" + +msgctxt "#30202" +msgid "EGP" +msgstr "EPG" + +msgctxt "#30203" +msgid "VPS" +msgstr "VPS" + +msgctxt "#30204" +msgid "Search EPG" +msgstr "Ieškoti EPG" + +msgctxt "#30205" +msgid "Repeating Child" +msgstr "Pasikartojantis vaikas" diff -Nru kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.lv_lv/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.lv_lv/strings.po --- kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.lv_lv/strings.po 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.lv_lv/strings.po 2017-01-14 14:03:27.000000000 +0000 @@ -36,10 +36,6 @@ msgid "Connect timeout (s)" msgstr "Savienojuma noilgums" -msgctxt "#30005" -msgid "Allow VDR Messages" -msgstr "Atļaut VDR ziņojumus" - msgctxt "#30006" msgid "Read recordings from directory" msgstr "Lasīt ierakstus no direktorijas" diff -Nru kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.mk_mk/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.mk_mk/strings.po --- kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.mk_mk/strings.po 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.mk_mk/strings.po 2017-01-14 14:03:27.000000000 +0000 @@ -36,10 +36,6 @@ msgid "Connect timeout (s)" msgstr "Истече времето за поврзување (s)" -msgctxt "#30005" -msgid "Allow VDR Messages" -msgstr "Дозволи VDR пораки" - msgctxt "#30006" msgid "Read recordings from directory" msgstr "Читај снимки од локација" diff -Nru kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.mn_mn/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.mn_mn/strings.po --- kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.mn_mn/strings.po 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.mn_mn/strings.po 2017-01-14 14:03:27.000000000 +0000 @@ -28,6 +28,22 @@ msgid "Priority" msgstr "Эрэмбэ" +msgctxt "#30003" +msgid "Character Set Conversion" +msgstr "Тэмдэгт хөрвүүлэлт" + +msgctxt "#30004" +msgid "Connect timeout (s)" +msgstr "Холболтын хугцаа хэтэрсэн" + +msgctxt "#30006" +msgid "Read recordings from directory" +msgstr "Бичлэгүүдийг хавтаснаас унших" + +msgctxt "#30007" +msgid "VDR recordings directory" +msgstr "VDR бичлэгийн хавтас" + msgctxt "#30008" msgid "Channel search" msgstr "Суваг хайх" @@ -40,6 +56,10 @@ msgid "Start Channel search" msgstr "Суваг хайж эхлэх" +msgctxt "#30011" +msgid "Source Type" +msgstr "Эх сурвалжийн төрөл" + msgctxt "#30012" msgid "TV channels" msgstr "ТВ сувгууд" @@ -88,6 +108,10 @@ msgid "Device:" msgstr "Төхөөрөмж:" +msgctxt "#30028" +msgid "Scan: %i" +msgstr "Хайлт: %i" + msgctxt "#30029" msgid "Signal: %i %%" msgstr "Дохио: %i %%" @@ -144,6 +168,18 @@ msgid "Lost connection to VDR Server" msgstr "VDR сервер уруух холболт алдагдсан" +msgctxt "#30046" +msgid "Create channel groups automatically on the server" +msgstr "Энэ серверт сувгийн группыг автоматаар үүсгэ" + +msgctxt "#30048" +msgid "Path to channel icons" +msgstr "Сувгийн таних тэмдэгийн зам" + +msgctxt "#30101" +msgid "Setup" +msgstr "Тохиргоо" + msgctxt "#30107" msgid "VDR Admin" msgstr "VDR админ" @@ -152,6 +188,10 @@ msgid "Channels" msgstr "Сувгууд" +msgctxt "#30109" +msgid "Provider whitelist" +msgstr "Нийлүүлэгчийн цагаан жагсаалт" + msgctxt "#30110" msgid "Channel blacklist" msgstr "Сувгийн хар жагсаалт" @@ -167,3 +207,7 @@ msgctxt "#30113" msgid "Save filters" msgstr "Шүүлт хадгалах" + +msgctxt "#30114" +msgid "Provider Unknown" +msgstr "Үл мэдэгдэх нийлүүлэгч" diff -Nru kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.ms_my/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.ms_my/strings.po --- kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.ms_my/strings.po 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.ms_my/strings.po 2017-01-14 14:03:27.000000000 +0000 @@ -36,10 +36,6 @@ msgid "Connect timeout (s)" msgstr "Had masa tamat sambung" -msgctxt "#30005" -msgid "Allow VDR Messages" -msgstr "Benarkan Mesej VDR" - msgctxt "#30006" msgid "Read recordings from directory" msgstr "Baca rakaman dari direktori" @@ -275,3 +271,23 @@ msgctxt "#30114" msgid "Provider Unknown" msgstr "Penyedia tidak diketahui" + +msgctxt "#30200" +msgid "Single" +msgstr "Tunggal" + +msgctxt "#30201" +msgid "Repeating" +msgstr "Pengulangan" + +msgctxt "#30202" +msgid "EGP" +msgstr "EGP" + +msgctxt "#30203" +msgid "VPS" +msgstr "VPS" + +msgctxt "#30204" +msgid "Search EPG" +msgstr "Gelintar EPG" diff -Nru kodi-pvr-vdr-vnsi-1.11.17/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-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.nb_no/strings.po 2016-04-25 07:36:03.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 @@ -36,10 +36,6 @@ msgid "Connect timeout (s)" msgstr "Tidsavbrudd ved tilkobling (i s)" -msgctxt "#30005" -msgid "Allow VDR Messages" -msgstr "Tillat VDR meldinger" - msgctxt "#30006" msgid "Read recordings from directory" msgstr "Les opptak fra mappe" @@ -275,3 +271,27 @@ msgctxt "#30114" msgid "Provider Unknown" msgstr "Leverandør Ukjent" + +msgctxt "#30200" +msgid "Single" +msgstr "Singel" + +msgctxt "#30201" +msgid "Repeating" +msgstr "Gjentagende" + +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 "Gjentagende Underelement" diff -Nru kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.nl_nl/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.nl_nl/strings.po --- kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.nl_nl/strings.po 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.nl_nl/strings.po 2017-01-14 14:03:27.000000000 +0000 @@ -36,10 +36,6 @@ msgid "Connect timeout (s)" msgstr "Connectietimeout (s)" -msgctxt "#30005" -msgid "Allow VDR Messages" -msgstr "VDR-berichten toestaan" - msgctxt "#30006" msgid "Read recordings from directory" msgstr "Lees opnames van directory" @@ -275,3 +271,23 @@ msgctxt "#30114" msgid "Provider Unknown" msgstr "Provider onbekend" + +msgctxt "#30200" +msgid "Single" +msgstr "Single" + +msgctxt "#30201" +msgid "Repeating" +msgstr "Herhalen" + +msgctxt "#30202" +msgid "EGP" +msgstr "EGP" + +msgctxt "#30203" +msgid "VPS" +msgstr "VPS" + +msgctxt "#30204" +msgid "Search EPG" +msgstr "Zoek EPG" diff -Nru kodi-pvr-vdr-vnsi-1.11.17/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-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.pl_pl/strings.po 2016-04-25 07:36:03.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 @@ -36,10 +36,6 @@ msgid "Connect timeout (s)" msgstr "Limit czasu połączenia (sekundy)" -msgctxt "#30005" -msgid "Allow VDR Messages" -msgstr "Zezwalaj na wiadomości VDR" - msgctxt "#30006" msgid "Read recordings from directory" msgstr "Wczytuj nagrania z folderu" @@ -174,11 +170,11 @@ msgctxt "#30039" msgid "Running" -msgstr "Uruchomiony" +msgstr "Uruchomiono" msgctxt "#30040" msgid "Stopped" -msgstr "Zatrzymany" +msgstr "Zatrzymano" msgctxt "#30041" msgid "Finished" @@ -226,7 +222,7 @@ msgctxt "#30102" msgid "Controlling OSD - press info to exit" -msgstr "Sterowanie menu ekranowym - naciśnij Info aby wyjść" +msgstr "Sterowanie menu ekranowym - naciśnij Info, aby wyjść" msgctxt "#30103" msgid "Select to control OSD" @@ -258,11 +254,11 @@ msgctxt "#30110" msgid "Channel blacklist" -msgstr "Czarna lista kanałów " +msgstr "Kanały zablokowane" msgctxt "#30111" msgid "Channel filters" -msgstr "Filtry kanałów " +msgstr "Filtry kanałów" msgctxt "#30112" msgid "Radio Channels" @@ -275,3 +271,27 @@ msgctxt "#30114" msgid "Provider Unknown" msgstr "Dostawca nieznany" + +msgctxt "#30200" +msgid "Single" +msgstr "Jednorazowo" + +msgctxt "#30201" +msgid "Repeating" +msgstr "Cyklicznie" + +msgctxt "#30202" +msgid "EGP" +msgstr "Według przewodnika" + +msgctxt "#30203" +msgid "VPS" +msgstr "Według systemu VPS" + +msgctxt "#30204" +msgid "Search EPG" +msgstr "Wyszukaj w przewodniku" + +msgctxt "#30205" +msgid "Repeating Child" +msgstr "Cyklicznie potomka" diff -Nru kodi-pvr-vdr-vnsi-1.11.17/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-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.pt_br/strings.po 2016-04-25 07:36:03.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 @@ -36,10 +36,6 @@ msgid "Connect timeout (s)" msgstr "Tempo limite para conexão (s)" -msgctxt "#30005" -msgid "Allow VDR Messages" -msgstr "Permitir mensagens VDR" - msgctxt "#30006" msgid "Read recordings from directory" msgstr "Ler gravações do diretório" @@ -275,3 +271,27 @@ msgctxt "#30114" msgid "Provider Unknown" msgstr "Provedor desconhecido" + +msgctxt "#30200" +msgid "Single" +msgstr "Único" + +msgctxt "#30201" +msgid "Repeating" +msgstr "Recorrente" + +msgctxt "#30202" +msgid "EGP" +msgstr "EGP" + +msgctxt "#30203" +msgid "VPS" +msgstr "VPS" + +msgctxt "#30204" +msgid "Search EPG" +msgstr "Procurar EPG" + +msgctxt "#30205" +msgid "Repeating Child" +msgstr "Repetindo Criança" diff -Nru kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.pt_pt/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.pt_pt/strings.po --- kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.pt_pt/strings.po 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.pt_pt/strings.po 2017-01-14 14:03:27.000000000 +0000 @@ -18,11 +18,11 @@ msgctxt "#30000" msgid "VDR Hostname or IP" -msgstr "Nome do servidor ou IP VDR" +msgstr "Nome ou IP do servidor VDR" msgctxt "#30001" msgid "VNSI Port" -msgstr "Porta VNSI" +msgstr "Porto do VNSI" msgctxt "#30002" msgid "Priority" @@ -30,23 +30,19 @@ msgctxt "#30003" msgid "Character Set Conversion" -msgstr "Conversão do conjunto de caracteres" +msgstr "Conversão do Conjunto de Caracteres" msgctxt "#30004" msgid "Connect timeout (s)" -msgstr "Tempo limite de ligação (seg)" - -msgctxt "#30005" -msgid "Allow VDR Messages" -msgstr "Permitir mensagens VDR" +msgstr "Tempo-limite da ligação (s)" msgctxt "#30006" msgid "Read recordings from directory" -msgstr "Ler gravações a partir da pasta" +msgstr "Ler as gravações a partir da pasta" msgctxt "#30007" msgid "VDR recordings directory" -msgstr "Directório de gravações VDR" +msgstr "Pasta das gravações VDR" msgctxt "#30008" msgid "Channel search" @@ -54,15 +50,15 @@ msgctxt "#30009" msgid "Channel search - Settings" -msgstr "Pesquisa de canais - Definições " +msgstr "Pesquisa de canais - Configuração" msgctxt "#30010" msgid "Start Channel search" -msgstr "Iniciar pesquisa de canais" +msgstr "Iniciar a pesquisa de canais" msgctxt "#30011" msgid "Source Type" -msgstr "Tipo de fonte" +msgstr "Tipo de Fonte" msgctxt "#30012" msgid "TV channels" @@ -90,11 +86,11 @@ msgctxt "#30018" msgid "Cable Inversion" -msgstr "Inversão de cabo" +msgstr "Inversão de Cabo" msgctxt "#30019" msgid "Cable Symbolrate" -msgstr "Symbolrate do Cabo" +msgstr "Taxa de Símbolos do Cabo" msgctxt "#30020" msgid "Cable modulation" @@ -114,11 +110,11 @@ msgctxt "#30024" msgid "Back" -msgstr "Retroceder" +msgstr "Recuar" msgctxt "#30025" msgid "Channel search - running... %i %%" -msgstr "Efectuando a procura de canais... %i %%" +msgstr "Efetuando a procura de canais... %i %%" msgctxt "#30026" msgid "Type:" @@ -130,7 +126,7 @@ msgctxt "#30028" msgid "Scan: %i" -msgstr "Procurar: %i" +msgstr "Sintonia: %i" msgctxt "#30029" msgid "Signal: %i %%" @@ -146,11 +142,11 @@ msgctxt "#30032" msgid "Analog TV" -msgstr "TV analógica " +msgstr "TV Analógica" msgctxt "#30033" msgid "Analog Radio" -msgstr "Rádio analógico " +msgstr "Rádio Analógico" msgctxt "#30034" msgid "Transponder:" @@ -158,7 +154,7 @@ msgctxt "#30035" msgid "New channels" -msgstr "Novos Canais" +msgstr "Novos canais" msgctxt "#30036" msgid "Channel search - Finished" @@ -174,7 +170,7 @@ msgctxt "#30039" msgid "Running" -msgstr "Reproduzindo" +msgstr "Em execução" msgctxt "#30040" msgid "Stopped" @@ -210,7 +206,7 @@ msgctxt "#30048" msgid "Path to channel icons" -msgstr "Caminho para os ícones de canais" +msgstr "Localização dos ícones de canais" msgctxt "#30049" msgid "VDR Server MAC for Wake-on-LAN" @@ -275,3 +271,23 @@ msgctxt "#30114" msgid "Provider Unknown" msgstr "Fornecedor Desconhecido" + +msgctxt "#30200" +msgid "Single" +msgstr "Único" + +msgctxt "#30201" +msgid "Repeating" +msgstr "Repetição" + +msgctxt "#30202" +msgid "EGP" +msgstr "EGP" + +msgctxt "#30203" +msgid "VPS" +msgstr "VPS" + +msgctxt "#30204" +msgid "Search EPG" +msgstr "Pesquisa no EPG" diff -Nru kodi-pvr-vdr-vnsi-1.11.17/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-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.ro_ro/strings.po 2016-04-25 07:36:03.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,11 +34,7 @@ msgctxt "#30004" msgid "Connect timeout (s)" -msgstr "Conexiune timeout (s)" - -msgctxt "#30005" -msgid "Allow VDR Messages" -msgstr "Permite mesaje VDR" +msgstr "Expirare timp conexiune (s)" msgctxt "#30006" msgid "Read recordings from directory" @@ -162,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" @@ -194,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" @@ -214,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" @@ -275,3 +271,23 @@ msgctxt "#30114" 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-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.ru_ru/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.ru_ru/strings.po --- kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.ru_ru/strings.po 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.ru_ru/strings.po 2017-01-14 14:03:27.000000000 +0000 @@ -36,10 +36,6 @@ msgid "Connect timeout (s)" msgstr "Тайм-аут(ы) соединения" -msgctxt "#30005" -msgid "Allow VDR Messages" -msgstr "Включить VDR сообщения" - msgctxt "#30006" msgid "Read recordings from directory" msgstr "Читать записи из папки" @@ -275,3 +271,7 @@ msgctxt "#30114" msgid "Provider Unknown" msgstr "Неизвестный провайдер" + +msgctxt "#30201" +msgid "Repeating" +msgstr "Повторение" diff -Nru kodi-pvr-vdr-vnsi-1.11.17/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-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.sk_sk/strings.po 2016-04-25 07:36:03.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 @@ -36,10 +36,6 @@ msgid "Connect timeout (s)" msgstr "Časový limit pre spojenie" -msgctxt "#30005" -msgid "Allow VDR Messages" -msgstr "Povoliť zobrazenie správ z VDR" - msgctxt "#30006" msgid "Read recordings from directory" msgstr "Čítať nahrávky z adresára" @@ -275,3 +271,27 @@ msgctxt "#30114" msgid "Provider Unknown" msgstr "Neznámy poskytovateľ" + +msgctxt "#30200" +msgid "Single" +msgstr "Jeden" + +msgctxt "#30201" +msgid "Repeating" +msgstr "Opakovanie" + +msgctxt "#30202" +msgid "EGP" +msgstr "EPG" + +msgctxt "#30203" +msgid "VPS" +msgstr "VPS" + +msgctxt "#30204" +msgid "Search EPG" +msgstr "Hľadať EPG" + +msgctxt "#30205" +msgid "Repeating Child" +msgstr "Opakovacie dieťa" diff -Nru kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.sl_si/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.sl_si/strings.po --- kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.sl_si/strings.po 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.sl_si/strings.po 2017-01-14 14:03:27.000000000 +0000 @@ -36,10 +36,6 @@ msgid "Connect timeout (s)" msgstr "Časovni pretek povezave (s)" -msgctxt "#30005" -msgid "Allow VDR Messages" -msgstr "Dovoli sporočila VDR" - msgctxt "#30006" msgid "Read recordings from directory" msgstr "Preberi posnetke v mapi" diff -Nru kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.sq_al/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.sq_al/strings.po --- kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.sq_al/strings.po 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.sq_al/strings.po 2017-01-14 14:03:27.000000000 +0000 @@ -36,10 +36,6 @@ msgid "Connect timeout (s)" msgstr "Timeout i lidhjes (s)" -msgctxt "#30005" -msgid "Allow VDR Messages" -msgstr "Lejo Mesazhet Nga VDR" - msgctxt "#30006" msgid "Read recordings from directory" msgstr "Lexo regjistrimiet nga regjistri" diff -Nru kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.sr_rs/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.sr_rs/strings.po --- kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.sr_rs/strings.po 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.sr_rs/strings.po 2017-01-14 14:03:27.000000000 +0000 @@ -36,10 +36,6 @@ msgid "Connect timeout (s)" msgstr "Истек времена за повезивање (s)" -msgctxt "#30005" -msgid "Allow VDR Messages" -msgstr "Дозволи VDR Поруке" - msgctxt "#30006" msgid "Read recordings from directory" msgstr "Читај снимке из фасцикле" @@ -275,3 +271,7 @@ msgctxt "#30114" msgid "Provider Unknown" msgstr "Непознат Провајдер" + +msgctxt "#30201" +msgid "Repeating" +msgstr "Понављајући" diff -Nru kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.sr_rs@latin/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.sr_rs@latin/strings.po --- kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.sr_rs@latin/strings.po 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.sr_rs@latin/strings.po 2017-01-14 14:03:27.000000000 +0000 @@ -36,10 +36,6 @@ msgid "Connect timeout (s)" msgstr "Истек времена за повезивање (с)" -msgctxt "#30005" -msgid "Allow VDR Messages" -msgstr "Dozvoli VDR Poruke" - msgctxt "#30006" msgid "Read recordings from directory" msgstr "Čitaj snimke iz fascikle" @@ -275,3 +271,7 @@ msgctxt "#30114" msgid "Provider Unknown" msgstr "Nepoznat Provajder" + +msgctxt "#30201" +msgid "Repeating" +msgstr "Ponavljajući" diff -Nru kodi-pvr-vdr-vnsi-1.11.17/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-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.sv_se/strings.po 2016-04-25 07:36:03.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 @@ -36,10 +36,6 @@ msgid "Connect timeout (s)" msgstr "Anslutningstimeout (s)" -msgctxt "#30005" -msgid "Allow VDR Messages" -msgstr "Tillåt VDR Meddelanden" - msgctxt "#30006" msgid "Read recordings from directory" msgstr "Läs inspelningar från katalog" @@ -275,3 +271,27 @@ msgctxt "#30114" msgid "Provider Unknown" msgstr "Okänd leverantör" + +msgctxt "#30200" +msgid "Single" +msgstr "Enkel" + +msgctxt "#30201" +msgid "Repeating" +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-1.11.17/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-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.szl/strings.po 2016-04-25 07:36:03.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-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.th_th/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.th_th/strings.po --- kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.th_th/strings.po 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.th_th/strings.po 2017-01-14 14:03:27.000000000 +0000 @@ -24,10 +24,6 @@ msgid "Connect timeout (s)" msgstr "ระยะเวลาหยุดการเชื่อมต่อ (วิ)" -msgctxt "#30005" -msgid "Allow VDR Messages" -msgstr "อนุญาตข้อความ VDR" - msgctxt "#30006" msgid "Read recordings from directory" msgstr "อ่านบันทึกจากไดเร็กทอรี่" @@ -175,3 +171,7 @@ msgctxt "#30114" msgid "Provider Unknown" msgstr "ไม่ทราบผู้จัดหา" + +msgctxt "#30201" +msgid "Repeating" +msgstr "การเล่นซ้ำ" diff -Nru kodi-pvr-vdr-vnsi-1.11.17/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-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.tr_tr/strings.po 2016-04-25 07:36:03.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 @@ -36,10 +36,6 @@ msgid "Connect timeout (s)" msgstr "Bağlantı süresi doldu (s)" -msgctxt "#30005" -msgid "Allow VDR Messages" -msgstr "VDR İletilerine İzin Ver" - msgctxt "#30006" msgid "Read recordings from directory" msgstr "Kayıtları dizinden oku" @@ -275,3 +271,23 @@ msgctxt "#30114" 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-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.uk_ua/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.uk_ua/strings.po --- kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.uk_ua/strings.po 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.uk_ua/strings.po 2017-01-14 14:03:27.000000000 +0000 @@ -36,10 +36,6 @@ msgid "Connect timeout (s)" msgstr "Затримка зв’язку (с) " -msgctxt "#30005" -msgid "Allow VDR Messages" -msgstr "Дозволити повідомлення VDR" - msgctxt "#30006" msgid "Read recordings from directory" msgstr "Читати записи з теки" @@ -223,3 +219,7 @@ msgctxt "#30108" msgid "Channels" msgstr "Канали" + +msgctxt "#30201" +msgid "Repeating" +msgstr "Повторювати" diff -Nru kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.vi_vn/strings.po kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.vi_vn/strings.po --- kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.vi_vn/strings.po 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/language/resource.language.vi_vn/strings.po 2017-01-14 14:03:27.000000000 +0000 @@ -36,10 +36,6 @@ msgid "Connect timeout (s)" msgstr "Thời gian chờ kết nối (s)" -msgctxt "#30005" -msgid "Allow VDR Messages" -msgstr "Cho phép các thông điệp VDR" - msgctxt "#30006" msgid "Read recordings from directory" msgstr "Đọc các bản thu từ thư mục" diff -Nru kodi-pvr-vdr-vnsi-1.11.17/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-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.zh_cn/strings.po 2016-04-25 07:36:03.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 @@ -36,10 +36,6 @@ msgid "Connect timeout (s)" msgstr "连接超时（秒）" -msgctxt "#30005" -msgid "Allow VDR Messages" -msgstr "允许 VDR 信息" - msgctxt "#30006" msgid "Read recordings from directory" msgstr "读取录像于目录" @@ -275,3 +271,23 @@ msgctxt "#30114" 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-1.11.17/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-1.11.17/pvr.vdr.vnsi/resources/language/resource.language.zh_tw/strings.po 2016-04-25 07:36:03.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,11 +34,7 @@ msgctxt "#30004" msgid "Connect timeout (s)" -msgstr "連接超時(秒)" - -msgctxt "#30005" -msgid "Allow VDR Messages" -msgstr "允許VDR訊息" +msgstr "連接逾時 (秒)" msgctxt "#30006" msgid "Read recordings from directory" @@ -46,7 +42,7 @@ msgctxt "#30007" msgid "VDR recordings directory" -msgstr "VDR錄影目錄" +msgstr "VDR錄影檔目錄" msgctxt "#30008" msgid "Channel search" @@ -70,7 +66,7 @@ msgctxt "#30013" msgid "Radio channels" -msgstr "無線電廣播頻道" +msgstr "廣播電台頻道" msgctxt "#30014" msgid "FTA channels" @@ -208,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選單" @@ -243,3 +247,47 @@ msgctxt "#30108" 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 "重複" + +msgctxt "#30202" +msgid "EGP" +msgstr "電子節目表" + +msgctxt "#30203" +msgid "VPS" +msgstr "VPS" + +msgctxt "#30204" +msgid "Search EPG" +msgstr "搜尋電子節目表" diff -Nru kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/settings.xml kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/settings.xml --- kodi-pvr-vdr-vnsi-1.11.17/pvr.vdr.vnsi/resources/settings.xml 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/pvr.vdr.vnsi/resources/settings.xml 2017-01-14 14:03:27.000000000 +0000 @@ -1,12 +1,11 @@ - - + + - diff -Nru kodi-pvr-vdr-vnsi-1.11.17/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-1.11.17/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 @@ + + + 10 + background + no + 36 + + DefaultBackground + + 110 + 0 + + OpenClose_Left + + Menu Panel + -20 + 138 + 440 + 792 + dialogs/dialog-bg.png + + + button area + 0 + 160 + 400 + 700 + 10 + 11 + 10 + 10 + + + + + + + + + + noop + + + + noop + + + + noop + + + + + + OpenClose_Right + + 420 + 138 + 1300 + 792 + dialogs/dialog-bg.png + + + Container(10).HasFocus(1) + + 472 + 172 + 1216 + 686 + top + center + 690 + - + buttons/thumbnail_focused.png + + + 480 + 180 + 1200 + 670 + + + + 442 + 160 + 1256 + 610 + Container(10).HasFocus(2) + 10 + + + 1256 + DefaultSettingButton + + + + 1256 + DefaultSettingButton + + + + 1256 + DefaultSettingButton + + + + Container(10).HasFocus(3) + 33 + + Channels label + 480 + 165 + 1000 + 60 + font30_title + + left + center + white + black + + + 1550 + 180 + 40 + 40 + FFCC0000 + overlays/circle.png + StringCompare(Window.Property(IsDirty),1) + + + 1550 + 180 + 40 + 40 + FF00FF00 + overlays/circle.png + !StringCompare(Window.Property(IsDirty),1) + + + 442 + 230 + 520 + 610 + 10 + 36 + + Is Radio + 520 + DefaultSettingButton + + + + providers + 520 + + DefaultSettingButton + Select + + + channels + 520 + + DefaultSettingButton + Select + + + save + 520 + + DefaultSettingButton + + + + 980 + 230 + 640 + 640 + buttons/dialogbutton-nofo.png + + + 1000 + 250 + 600 + 600 + 36 + 35 + 37 + 36 + 37 + 200 + + + 0 + 0 + 6000 + 40 + lists/separator.png + + + 40 + 0 + 6000 + 40 + left + ListItem.Label + + + 2 + 2 + 36 + 36 + stretch + 7790EE90 + overlays/arrowright.png + ListItem.Property(IsWhitelist) + + + 2 + 2 + 36 + 36 + stretch + 77FF0000 + overlays/arrowright.png + ListItem.Property(IsBlacklist) + + + + + 0 + 0 + 600 + 40 + lists/separator.png + + + 0 + 0 + 600 + 40 + lists/focus.png + + + 40 + 0 + 600 + 40 + left + ListItem.Label + + + 2 + 2 + 36 + 36 + stretch + 7790EE90 + overlays/arrowright.png + ListItem.Property(IsWhitelist) + + + 2 + 2 + 36 + 36 + stretch + 77FF0000 + overlays/arrowright.png + ListItem.Property(IsBlacklist) + + + + + 1620 + 250 + 13 + 600 + 36 + false + vertical + + + + + + + + + BottomBar + + diff -Nru kodi-pvr-vdr-vnsi-1.11.17/README.md kodi-pvr-vdr-vnsi-2.6.17/README.md --- kodi-pvr-vdr-vnsi-1.11.17/README.md 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/README.md 2017-01-14 14:03:27.000000000 +0000 @@ -1,4 +1,4 @@ -[![Build Status](https://travis-ci.org/kodi-pvr/pvr.vdr.vnsi.svg?branch=Jarvis)](https://travis-ci.org/kodi-pvr/pvr.vdr.vnsi) +[![Build Status](https://travis-ci.org/kodi-pvr/pvr.vdr.vnsi.svg?branch=master)](https://travis-ci.org/kodi-pvr/pvr.vdr.vnsi) [![Coverity Scan Build Status](https://scan.coverity.com/projects/5120/badge.svg)](https://scan.coverity.com/projects/5120) # VDR VNSI PVR diff -Nru kodi-pvr-vdr-vnsi-1.11.17/src/client.cpp kodi-pvr-vdr-vnsi-2.6.17/src/client.cpp --- kodi-pvr-vdr-vnsi-1.11.17/src/client.cpp 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/src/client.cpp 2017-01-14 14:03:27.000000000 +0000 @@ -20,13 +20,14 @@ */ #include "client.h" -#include "kodi/xbmc_pvr_dll.h" +#include "xbmc_pvr_dll.h" #include "VNSIDemux.h" #include "VNSIRecording.h" #include "VNSIData.h" #include "VNSIChannelScan.h" #include "VNSIAdmin.h" -#include "platform/util/util.h" +#include "vnsicommand.h" +#include "p8-platform/util/util.h" #include #include @@ -34,9 +35,9 @@ using namespace std; using namespace ADDON; -using namespace PLATFORM; +using namespace P8PLATFORM; -ADDON_STATUS m_CurStatus = ADDON_STATUS_UNKNOWN; +ADDON_STATUS m_CurStatus = ADDON_STATUS_UNKNOWN; /* User adjustable settings are saved here. * Default values are defined inside client.h @@ -46,27 +47,28 @@ std::string g_szWolMac = ""; int g_iPort = DEFAULT_PORT; bool g_bCharsetConv = DEFAULT_CHARCONV; ///< Convert VDR's incoming strings to UTF8 character set -bool g_bHandleMessages = DEFAULT_HANDLE_MSG; ///< Send VDR's OSD status messages to XBMC OSD int g_iConnectTimeout = DEFAULT_TIMEOUT; ///< The Socket connection timeout int g_iPriority = DEFAULT_PRIORITY; ///< The Priority this client have in response to other clients bool g_bAutoChannelGroups = DEFAULT_AUTOGROUPS; int g_iTimeshift = 1; std::string g_szIconPath = ""; -CHelper_libXBMC_addon *XBMC = NULL; -CHelper_libXBMC_codec *CODEC = NULL; -CHelper_libKODI_guilib *GUI = NULL; -CHelper_libXBMC_pvr *PVR = NULL; - -cVNSIDemux *VNSIDemuxer = NULL; -cVNSIData *VNSIData = NULL; -cVNSIRecording *VNSIRecording = NULL; +int prioVals[] = {0,5,10,15,20,25,30,35,40,45,50,55,60,65,70,75,80,85,90,95,99,100}; + +CHelper_libXBMC_addon *XBMC = nullptr; +CHelper_libXBMC_codec *CODEC = nullptr; +CHelper_libKODI_guilib *GUI = nullptr; +CHelper_libXBMC_pvr *PVR = nullptr; + +cVNSIDemux *VNSIDemuxer = nullptr; +cVNSIData *VNSIData = nullptr; +cVNSIRecording *VNSIRecording = nullptr; bool IsTimeshift; time_t TimeshiftStartTime; time_t TimeshiftEndTime; time_t TimeshiftPlayTime; -PLATFORM::CMutex TimeshiftMutex; +P8PLATFORM::CMutex TimeshiftMutex; extern "C" { @@ -161,7 +163,6 @@ XBMC->Log(LOG_ERROR, "Couldn't get 'priority' setting, falling back to %i as default", -1); prio = DEFAULT_PRIORITY; } - int prioVals[] = {-99,-1,0,5,10,15,20,25,30,35,40,45,50,55,60,65,70,75,80,85,90,95,99,100}; g_iPriority = prioVals[prio]; /* Read setting "timeshift" from settings.xml */ @@ -188,14 +189,6 @@ g_iConnectTimeout = DEFAULT_TIMEOUT; } - /* Read setting "handlemessages" from settings.xml */ - if (!XBMC->GetSetting("handlemessages", &g_bHandleMessages)) - { - /* If setting is unknown fallback to defaults */ - XBMC->Log(LOG_ERROR, "Couldn't get 'handlemessages' setting, falling back to 'true' as default"); - g_bHandleMessages = DEFAULT_HANDLE_MSG; - } - /* Read setting "autochannelgroups" from settings.xml */ if (!XBMC->GetSetting("autochannelgroups", &g_bAutoChannelGroups)) { @@ -218,29 +211,19 @@ } free(buffer); - try { + try + { VNSIData = new cVNSIData; - if (!VNSIData->Open(g_szHostname, g_iPort, NULL, g_szWolMac)) - { - ADDON_Destroy(); - m_CurStatus = ADDON_STATUS_LOST_CONNECTION; - return m_CurStatus; - } - - if (!VNSIData->Login()) - { - ADDON_Destroy(); - m_CurStatus = ADDON_STATUS_LOST_CONNECTION; - return m_CurStatus; - } - - if (!VNSIData->EnableStatusInterface(g_bHandleMessages)) + m_CurStatus = ADDON_STATUS_OK; + if (!VNSIData->Start(g_szHostname, g_iPort, nullptr, g_szWolMac)) { ADDON_Destroy(); - m_CurStatus = ADDON_STATUS_LOST_CONNECTION; + m_CurStatus = ADDON_STATUS_PERMANENT_FAILURE; return m_CurStatus; } - } catch (std::exception e) { + } + catch (std::exception e) + { XBMC->Log(LOG_ERROR, "%s - %s", __FUNCTION__, e.what()); ADDON_Destroy(); m_CurStatus = ADDON_STATUS_LOST_CONNECTION; @@ -253,7 +236,6 @@ hook.iLocalizedStringId = 30107; PVR->AddMenuHook(&hook); - m_CurStatus = ADDON_STATUS_OK; return m_CurStatus; } @@ -321,17 +303,18 @@ } else if (str == "port") { - XBMC->Log(LOG_INFO, "Changed Setting 'port' from %u to %u", g_iPort, *(int*) settingValue); - if (g_iPort != *(int*) settingValue) + XBMC->Log(LOG_INFO, "Changed Setting 'port' from %u to %u", g_iPort, *(int*)settingValue); + if (g_iPort != *(int*)settingValue) { - g_iPort = *(int*) settingValue; + g_iPort = *(int*)settingValue; return ADDON_STATUS_NEED_RESTART; } } else if (str == "priority") { - XBMC->Log(LOG_INFO, "Changed Setting 'priority' from %u to %u", g_iPriority, *(int*) settingValue); - g_iPriority = *(int*) settingValue; + int newPrio = prioVals[*(int*)settingValue]; + XBMC->Log(LOG_INFO, "Changed Setting 'priority' from %u to %u", g_iPriority, newPrio); + g_iPriority = newPrio; } else if (str == "timeshift") { @@ -348,12 +331,6 @@ XBMC->Log(LOG_INFO, "Changed Setting 'timeout' from %u to %u", g_iConnectTimeout, *(int*) settingValue); g_iConnectTimeout = *(int*) settingValue; } - else if (str == "handlemessages") - { - XBMC->Log(LOG_INFO, "Changed Setting 'handlemessages' from %u to %u", g_bHandleMessages, *(bool*) settingValue); - g_bHandleMessages = *(bool*) settingValue; - if (VNSIData) VNSIData->EnableStatusInterface(g_bHandleMessages); - } else if (str == "autochannelgroups") { XBMC->Log(LOG_INFO, "Changed Setting 'autochannelgroups' from %u to %u", g_bAutoChannelGroups, *(bool*) settingValue); @@ -376,14 +353,30 @@ } -void ADDON_Announce(const char *flag, const char *sender, const char *message, const void *data) -{ -} - /*********************************************************** * PVR Client AddOn specific public library functions ***********************************************************/ +void OnSystemSleep() +{ +} + +void OnSystemWake() +{ + if (XBMC && !g_szWolMac.empty()) + { + XBMC->WakeOnLan(g_szWolMac.c_str()); + } +} + +void OnPowerSavingActivated() +{ +} + +void OnPowerSavingDeactivated() +{ +} + const char* GetPVRAPIVersion(void) { static const char *strApiVersion = XBMC_PVR_API_VERSION; @@ -530,7 +523,6 @@ } } - /*******************************************/ /** PVR Channelgroups Functions **/ @@ -576,26 +568,39 @@ } } - /*******************************************/ /** PVR Timer Functions **/ + PVR_ERROR GetTimerTypes(PVR_TIMER_TYPE types[], int *size) { - /* TODO: Implement this to get support for the timer features introduced with PVR API 1.9.7 */ - return PVR_ERROR_NOT_IMPLEMENTED; + if (!VNSIData) + return PVR_ERROR_SERVER_ERROR; + + try + { + return VNSIData->GetTimerTypes(types, size); + } + catch (std::exception e) + { + XBMC->Log(LOG_ERROR, "%s - %s", __FUNCTION__, e.what()); + return PVR_ERROR_SERVER_ERROR; + } } int GetTimersAmount(void) { if (!VNSIData) - return 0; + return PVR_ERROR_SERVER_ERROR; - try { + try + { return VNSIData->GetTimersCount(); - } catch (std::exception e) { + } + catch (std::exception e) + { XBMC->Log(LOG_ERROR, "%s - %s", __FUNCTION__, e.what()); - return 0; + return PVR_ERROR_SERVER_ERROR; } } @@ -604,10 +609,12 @@ if (!VNSIData) return PVR_ERROR_SERVER_ERROR; - try { - /* TODO: Change implementation to get support for the timer features introduced with PVR API 1.9.7 */ + try + { return (VNSIData->GetTimersList(handle) ? PVR_ERROR_NO_ERROR : PVR_ERROR_SERVER_ERROR); - } catch (std::exception e) { + } + catch (std::exception e) + { XBMC->Log(LOG_ERROR, "%s - %s", __FUNCTION__, e.what()); return PVR_ERROR_SERVER_ERROR; } @@ -618,9 +625,12 @@ if (!VNSIData) return PVR_ERROR_SERVER_ERROR; - try { + try + { return VNSIData->AddTimer(timer); - } catch (std::exception e) { + } + catch (std::exception e) + { XBMC->Log(LOG_ERROR, "%s - %s", __FUNCTION__, e.what()); return PVR_ERROR_SERVER_ERROR; } @@ -631,9 +641,12 @@ if (!VNSIData) return PVR_ERROR_SERVER_ERROR; - try { + try + { return VNSIData->DeleteTimer(timer, bForce); - } catch (std::exception e) { + } + catch (std::exception e) + { XBMC->Log(LOG_ERROR, "%s - %s", __FUNCTION__, e.what()); return PVR_ERROR_SERVER_ERROR; } @@ -644,9 +657,12 @@ if (!VNSIData) return PVR_ERROR_SERVER_ERROR; - try { + try + { return VNSIData->UpdateTimer(timer); - } catch (std::exception e) { + } + catch (std::exception e) + { XBMC->Log(LOG_ERROR, "%s - %s", __FUNCTION__, e.what()); return PVR_ERROR_SERVER_ERROR; } @@ -747,10 +763,16 @@ { CloseLiveStream(); - try { + try + { VNSIDemuxer = new cVNSIDemux; + TimeshiftStartTime = 0; + TimeshiftEndTime = 0; + TimeshiftPlayTime = 0; return VNSIDemuxer->OpenChannel(channel); - } catch (std::exception e) { + } + catch (std::exception e) + { XBMC->Log(LOG_ERROR, "%s - %s", __FUNCTION__, e.what()); delete VNSIDemuxer; VNSIDemuxer = NULL; @@ -779,7 +801,8 @@ void DemuxAbort(void) { - if (VNSIDemuxer) VNSIDemuxer->Abort(); + if (VNSIDemuxer) + VNSIDemuxer->Abort(); } DemuxPacket* DemuxRead(void) @@ -803,14 +826,6 @@ return pkt; } -int GetCurrentClientChannel(void) -{ - if (VNSIDemuxer) - return VNSIDemuxer->CurrentChannel(); - - return -1; -} - bool SwitchChannel(const PVR_CHANNEL &channel) { try { @@ -852,10 +867,24 @@ return ret; } -bool SeekTime(int time, bool backwards, double *startpts) +bool IsRealTimeStream() +{ + if (VNSIDemuxer) + { + const CLockObject lock(TimeshiftMutex); + if (!IsTimeshift) + return true; + if (TimeshiftEndTime - TimeshiftPlayTime < 10) + return true; + } + return false; +} + +bool SeekTime(double time, bool backwards, double *startpts) { bool ret = false; - try { + try + { if (VNSIDemuxer) ret = VNSIDemuxer->SeekTime(time, backwards, startpts); } catch (std::exception e) { @@ -870,7 +899,7 @@ if (VNSIDemuxer) { const CLockObject lock(TimeshiftMutex); - time = TimeshiftPlayTime; + time = TimeshiftPlayTime; } return time; } @@ -881,7 +910,7 @@ if (VNSIDemuxer) { const CLockObject lock(TimeshiftMutex); - time = TimeshiftStartTime; + time = TimeshiftStartTime; } return time; } @@ -892,7 +921,7 @@ if (VNSIDemuxer) { const CLockObject lock(TimeshiftMutex); - time = TimeshiftEndTime; + time = TimeshiftEndTime; } return time; } @@ -922,14 +951,17 @@ CloseRecordedStream(); VNSIRecording = new cVNSIRecording; - try { + try + { return VNSIRecording->OpenRecording(recording); - } catch (std::exception e) { + } + catch (std::exception e) + { XBMC->Log(LOG_ERROR, "%s - %s", __FUNCTION__, e.what()); VNSIRecording->Close(); delete VNSIRecording; VNSIRecording = NULL; - return NULL; + return false; } } @@ -1033,4 +1065,5 @@ PVR_ERROR SetRecordingLastPlayedPosition(const PVR_RECORDING &recording, int lastplayedposition) { return PVR_ERROR_NOT_IMPLEMENTED; } int GetRecordingLastPlayedPosition(const PVR_RECORDING &recording) { return -1; } unsigned int GetChannelSwitchDelay(void) { return 0; } +PVR_ERROR SetEPGTimeFrame(int) { return PVR_ERROR_NOT_IMPLEMENTED; } } diff -Nru kodi-pvr-vdr-vnsi-1.11.17/src/client.h kodi-pvr-vdr-vnsi-2.6.17/src/client.h --- kodi-pvr-vdr-vnsi-1.11.17/src/client.h 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/src/client.h 2017-01-14 14:03:27.000000000 +0000 @@ -20,10 +20,10 @@ * */ -#include "kodi/libXBMC_addon.h" -#include "kodi/libXBMC_codec.h" -#include "kodi/libXBMC_pvr.h" -#include "kodi/libKODI_guilib.h" +#include "libXBMC_addon.h" +#include "libXBMC_codec.h" +#include "libXBMC_pvr.h" +#include "libKODI_guilib.h" #define DEFAULT_HOST "127.0.0.1" #define DEFAULT_PORT 34890 @@ -39,7 +39,6 @@ extern int g_iConnectTimeout; ///< Network connection / read timeout in seconds extern int g_iPriority; ///< The Priority this client have in response to other clients extern bool g_bCharsetConv; ///< Convert VDR's incoming strings to UTF8 character set -extern bool g_bHandleMessages; ///< Send VDR's OSD status messages to XBMC OSD extern int g_iTimeshift; extern std::string g_szIconPath; ///< path to channel icons diff -Nru kodi-pvr-vdr-vnsi-1.11.17/src/requestpacket.cpp kodi-pvr-vdr-vnsi-2.6.17/src/requestpacket.cpp --- kodi-pvr-vdr-vnsi-1.11.17/src/requestpacket.cpp 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/src/requestpacket.cpp 2017-01-14 14:03:27.000000000 +0000 @@ -22,7 +22,7 @@ #include "requestpacket.h" #include "vnsicommand.h" #include "tools.h" -#include "platform/sockets/tcp.h" +#include "p8-platform/sockets/tcp.h" #include #include diff -Nru kodi-pvr-vdr-vnsi-1.11.17/src/responsepacket.cpp kodi-pvr-vdr-vnsi-2.6.17/src/responsepacket.cpp --- kodi-pvr-vdr-vnsi-1.11.17/src/responsepacket.cpp 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/src/responsepacket.cpp 2017-01-14 14:03:27.000000000 +0000 @@ -22,7 +22,7 @@ #include "responsepacket.h" #include "vnsicommand.h" #include "tools.h" -#include "platform/sockets/tcp.h" +#include "p8-platform/sockets/tcp.h" #include #include diff -Nru kodi-pvr-vdr-vnsi-1.11.17/src/tools.h kodi-pvr-vdr-vnsi-2.6.17/src/tools.h --- kodi-pvr-vdr-vnsi-1.11.17/src/tools.h 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/src/tools.h 2017-01-14 14:03:27.000000000 +0000 @@ -34,5 +34,5 @@ #endif #endif -#include "kodi/libXBMC_codec.h" +#include "libXBMC_codec.h" #include "xbmc_codec_descriptor.hpp" diff -Nru kodi-pvr-vdr-vnsi-1.11.17/src/VNSIAdmin.cpp kodi-pvr-vdr-vnsi-2.6.17/src/VNSIAdmin.cpp --- kodi-pvr-vdr-vnsi-1.11.17/src/VNSIAdmin.cpp 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/src/VNSIAdmin.cpp 2017-01-14 14:03:27.000000000 +0000 @@ -135,7 +135,7 @@ using namespace ADDON; -using namespace PLATFORM; +using namespace P8PLATFORM; class cOSDTexture @@ -840,6 +840,10 @@ return false; } + m_abort = false; + m_connectionLost = false; + CreateThread(); + if (!ConnectOSD()) return false; @@ -1149,21 +1153,6 @@ return true; } - if (actionId == ACTION_SELECT_ITEM) - { - if (m_window->GetFocusId() == CONTROL_MENU) - { - const char *tmp = m_window->GetProperty("menu"); - //if (strncmp(m_window->GetProperty("menu"), "osd", 3) == 0) - if (strncmp(tmp, "osd", 3) == 0) - { -#if defined(KODI_GUILIB_API_VERSION) - m_window->MarkDirtyRegion(); -#endif - } - } - } - return false; } @@ -1348,7 +1337,6 @@ m_osdRender->DisposeTexture(wnd); m_bIsOsdDirty = true; } - m_window->SetFocusId(CONTROL_MENU); } else if (resp->getOpCodeID() == VNSI_OSD_MOVEWINDOW) { diff -Nru kodi-pvr-vdr-vnsi-1.11.17/src/VNSIAdmin.h kodi-pvr-vdr-vnsi-2.6.17/src/VNSIAdmin.h --- kodi-pvr-vdr-vnsi-1.11.17/src/VNSIAdmin.h 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/src/VNSIAdmin.h 2017-01-14 14:03:27.000000000 +0000 @@ -89,5 +89,5 @@ int m_width, m_height; int m_osdWidth, m_osdHeight; cOSDRender *m_osdRender; - PLATFORM::CMutex m_osdMutex; + P8PLATFORM::CMutex m_osdMutex; }; diff -Nru kodi-pvr-vdr-vnsi-1.11.17/src/vnsicommand.h kodi-pvr-vdr-vnsi-2.6.17/src/vnsicommand.h --- kodi-pvr-vdr-vnsi-1.11.17/src/vnsicommand.h 2016-04-25 07:36:03.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 8 +#define VNSI_PROTOCOLVERSION 10 /** Start of RDS support protocol Version */ #define VNSI_RDS_PROTOCOLVERSION 8 @@ -91,6 +91,7 @@ #define VNSI_TIMER_ADD 83 #define VNSI_TIMER_DELETE 84 #define VNSI_TIMER_UPDATE 85 +#define VNSI_TIMER_GETTYPES 86 /* OPCODE 100 - 119: VNSI network functions for recording access */ #define VNSI_RECORDINGS_DISKSIZE 100 @@ -158,6 +159,14 @@ #define VNSI_STATUS_RECORDINGSCHANGE 5 #define VNSI_STATUS_EPGCHANGE 6 +/** Timer */ +#define VNSI_TIMER_TYPE_MAN 1 +#define VNSI_TIMER_TYPE_MAN_REPEAT 2 +#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 #define VNSI_RET_RECRUNNING 1 diff -Nru kodi-pvr-vdr-vnsi-1.11.17/src/VNSIData.cpp kodi-pvr-vdr-vnsi-2.6.17/src/VNSIData.cpp --- kodi-pvr-vdr-vnsi-1.11.17/src/VNSIData.cpp 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/src/VNSIData.cpp 2017-01-14 14:03:27.000000000 +0000 @@ -23,10 +23,47 @@ #include "responsepacket.h" #include "requestpacket.h" #include "vnsicommand.h" -#include "platform/util/StdString.h" +#include "p8-platform/util/StdString.h" +#include +#include +#include + +// 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 PLATFORM; +using namespace P8PLATFORM; cVNSIData::SMessage & cVNSIData::Queue::Enqueue(uint32_t serial) @@ -44,8 +81,7 @@ return vresp; } -void -cVNSIData::Queue::Set(std::unique_ptr &&vresp) +void cVNSIData::Queue::Set(std::unique_ptr &&vresp) { CLockObject lock(m_mutex); SMessages::iterator it = m_queue.find(vresp->getRequestID()); @@ -61,14 +97,22 @@ cVNSIData::~cVNSIData() { - StopThread(); + m_abort = true; + StopThread(0); Close(); } -bool cVNSIData::Open(const std::string& hostname, int port, const char* name, const std::string& mac) +bool cVNSIData::Start(const std::string& hostname, int port, const char* name, const std::string& mac) { - /* First wake up the VDR server in case a MAC-Address is specified */ - if (!mac.empty()) { + m_hostname = hostname; + m_port = port; + + if (name != nullptr) + m_name = name; + + // First wake up the VDR server in case a MAC-Address is specified + if (!mac.empty()) + { const char* temp_mac; temp_mac = mac.c_str(); @@ -78,32 +122,25 @@ } } - if(!cVNSISession::Open(hostname, port, name)) - return false; - - return true; -} - -bool cVNSIData::Login() -{ - if(!cVNSISession::Login()) - return false; + PVR->ConnectionStateChange("VNSI started", PVR_CONNECTION_STATE_CONNECTING, "VNSI started"); + m_abort = false; + m_connectionLost = true; CreateThread(); + return true; } void cVNSIData::OnDisconnect() { - XBMC->QueueNotification(QUEUE_ERROR, XBMC->GetLocalizedString(30044)); - PVR->TriggerTimerUpdate(); + PVR->ConnectionStateChange("vnsi connection lost", PVR_CONNECTION_STATE_DISCONNECTED, XBMC->GetLocalizedString(30044)); } void cVNSIData::OnReconnect() { - XBMC->QueueNotification(QUEUE_INFO, XBMC->GetLocalizedString(30045)); + EnableStatusInterface(true, false); - EnableStatusInterface(g_bHandleMessages); + PVR->ConnectionStateChange("vnsi connection established", PVR_CONNECTION_STATE_CONNECTED, XBMC->GetLocalizedString(30045)); PVR->TriggerChannelUpdate(); PVR->TriggerTimerUpdate(); @@ -187,12 +224,18 @@ return false; } -bool cVNSIData::EnableStatusInterface(bool onOff) +bool cVNSIData::EnableStatusInterface(bool onOff, bool wait) { cRequestPacket vrp; vrp.init(VNSI_ENABLESTATUSINTERFACE); vrp.add_U8(onOff); + if (!wait) + { + cVNSISession::TransmitMessage(&vrp); + return true; + } + auto vresp = ReadResult(&vrp); if (!vresp) { @@ -359,8 +402,10 @@ return PVR_ERROR_SERVER_ERROR; } - /* TODO: Implement own timer types to get support for the timer features introduced with PVR API 1.9.7 */ - tag.iTimerType = PVR_TIMER_TYPE_NONE; + if (GetProtocol() >= 9) + { + tag.iTimerType = vresp->extract_U32(); + } tag.iClientIndex = vresp->extract_U32(); int iActive = vresp->extract_U32(); @@ -371,7 +416,7 @@ else if (iPending || iActive) tag.state = PVR_TIMER_STATE_SCHEDULED; else - tag.state = PVR_TIMER_STATE_CANCELLED; + tag.state = PVR_TIMER_STATE_DISABLED; tag.iPriority = vresp->extract_U32(); tag.iLifetime = vresp->extract_U32(); vresp->extract_U32(); // channel number - unused @@ -383,6 +428,20 @@ char *strTitle = vresp->extract_String(); strncpy(tag.strTitle, strTitle, sizeof(tag.strTitle) - 1); + if (GetProtocol() >= 9) + { + 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; } @@ -406,8 +465,10 @@ PVR_TIMER tag; memset(&tag, 0, sizeof(tag)); - /* TODO: Implement own timer types to get support for the timer features introduced with PVR API 1.9.7 */ - tag.iTimerType = PVR_TIMER_TYPE_NONE; + if (GetProtocol() >= 9) + { + tag.iTimerType = vresp->extract_U32(); + } tag.iClientIndex = vresp->extract_U32(); int iActive = vresp->extract_U32(); @@ -418,7 +479,7 @@ else if (iPending || iActive) tag.state = PVR_TIMER_STATE_SCHEDULED; else - tag.state = PVR_TIMER_STATE_CANCELLED; + tag.state = PVR_TIMER_STATE_DISABLED; tag.iPriority = vresp->extract_U32(); tag.iLifetime = vresp->extract_U32(); vresp->extract_U32(); // channel number - unused @@ -432,22 +493,85 @@ tag.iMarginStart = 0; tag.iMarginEnd = 0; + if (GetProtocol() >= 9) + { + 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; + if (tag.endTime == 0) + 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(); @@ -475,9 +599,9 @@ } } - if (strlen(timerinfo.strTitle) > 0) + if (strlen(title.c_str()) > 0) { - path += timerinfo.strTitle; + path += title; } // replace colons @@ -489,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__); @@ -499,6 +633,11 @@ uint32_t starttime = timerinfo.startTime - timerinfo.iMarginStart*60; uint32_t endtime = timerinfo.endTime + timerinfo.iMarginEnd*60; + if (GetProtocol() >= 9) + { + vrp.add_U32(timerinfo.iTimerType); + } + vrp.add_U32(timerinfo.state == PVR_TIMER_STATE_SCHEDULED); vrp.add_U32(timerinfo.iPriority); vrp.add_U32(timerinfo.iLifetime); @@ -508,7 +647,18 @@ vrp.add_U32(timerinfo.iWeekdays != PVR_WEEKDAY_NONE ? timerinfo.firstDay : 0); vrp.add_U32(timerinfo.iWeekdays); vrp.add_String(path.c_str()); - vrp.add_String(""); + vrp.add_String(timerinfo.strTitle); + + if (GetProtocol() >= 9) + { + 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()) @@ -570,9 +720,22 @@ 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); + vrp.add_U32(timerinfo.iClientIndex); + if (GetProtocol() >= 9) + { + vrp.add_U32(timerinfo.iTimerType); + } vrp.add_U32(timerinfo.state == PVR_TIMER_STATE_SCHEDULED); vrp.add_U32(timerinfo.iPriority); vrp.add_U32(timerinfo.iLifetime); @@ -581,8 +744,13 @@ vrp.add_U32(endtime); vrp.add_U32(timerinfo.iWeekdays != PVR_WEEKDAY_NONE ? timerinfo.firstDay : 0); vrp.add_U32(timerinfo.iWeekdays); + vrp.add_String(path.c_str()); vrp.add_String(timerinfo.strTitle); - vrp.add_String(""); + + if (GetProtocol() >= 9) + { + vrp.add_String(timerinfo.strEpgSearchString); + } auto vresp = ReadResult(&vrp); if (vresp == NULL || vresp->noResponse()) @@ -600,6 +768,115 @@ return PVR_ERROR_NO_ERROR; } +PVR_ERROR cVNSIData::GetTimerTypes(PVR_TIMER_TYPE types[], int *size) +{ + *size = 0; + // One-shot manual + memset(&types[*size], 0, sizeof(types[*size])); + types[*size].iId = VNSI_TIMER_TYPE_MAN; + strncpy(types[*size].strDescription, XBMC->GetLocalizedString(30200), 64); + types[*size].iAttributes = PVR_TIMER_TYPE_IS_MANUAL | + PVR_TIMER_TYPE_SUPPORTS_ENABLE_DISABLE | + 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)++; + + // Repeating manual + memset(&types[*size], 0, sizeof(types[*size])); + types[*size].iId = VNSI_TIMER_TYPE_MAN_REPEAT; + strncpy(types[*size].strDescription, XBMC->GetLocalizedString(30201), 64); + types[*size].iAttributes = PVR_TIMER_TYPE_IS_MANUAL | + PVR_TIMER_TYPE_IS_REPEATING | + PVR_TIMER_TYPE_SUPPORTS_ENABLE_DISABLE | + 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_FIRST_DAY | + PVR_TIMER_TYPE_SUPPORTS_WEEKDAYS | + 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; + strncpy(types[*size].strDescription, XBMC->GetLocalizedString(30202), 64); + types[*size].iAttributes = PVR_TIMER_TYPE_SUPPORTS_ENABLE_DISABLE | + PVR_TIMER_TYPE_REQUIRES_EPG_TAG_ON_CREATE | + 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)++; + + // addition timer supported by backend + if (GetProtocol() >= 9) + { + cRequestPacket vrp; + vrp.init(VNSI_TIMER_GETTYPES); + auto vresp = ReadResult(&vrp); + if (!vresp) + { + XBMC->Log(LOG_ERROR, "%s - Can't get response packed", __FUNCTION__); + return PVR_ERROR_NO_ERROR; + } + uint32_t vnsitimers = vresp->extract_U32(); + + if (vnsitimers & VNSI_TIMER_TYPE_EPG_SEARCH) + { + // EPG search timer + memset(&types[*size], 0, sizeof(types[*size])); + types[*size].iId = VNSI_TIMER_TYPE_EPG_SEARCH; + strncpy(types[*size].strDescription, XBMC->GetLocalizedString(30204), 64); + types[*size].iAttributes = PVR_TIMER_TYPE_IS_REPEATING | + PVR_TIMER_TYPE_SUPPORTS_ENABLE_DISABLE | + PVR_TIMER_TYPE_SUPPORTS_CHANNELS | + PVR_TIMER_TYPE_SUPPORTS_TITLE_EPG_MATCH | + PVR_TIMER_TYPE_SUPPORTS_PRIORITY | + PVR_TIMER_TYPE_SUPPORTS_LIFETIME; + (*size)++; + } + + // VPS Timer + memset(&types[*size], 0, sizeof(types[*size])); + types[*size].iId = VNSI_TIMER_TYPE_VPS; + strncpy(types[*size].strDescription, XBMC->GetLocalizedString(30203), 64); + types[*size].iAttributes = PVR_TIMER_TYPE_IS_MANUAL | + PVR_TIMER_TYPE_SUPPORTS_ENABLE_DISABLE | + 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)++; + } + + return PVR_ERROR_NO_ERROR; +} + int cVNSIData::GetRecordingsCount() { cRequestPacket vrp; @@ -641,12 +918,31 @@ char *strChannelName = vresp->extract_String(); strncpy(tag.strChannelName, strChannelName, sizeof(tag.strChannelName) - 1); + if (GetProtocol() >= 9) + { + tag.iChannelUid = -1; + uint32_t uuid = vresp->extract_U32(); + if (uuid > 0) + tag.iChannelUid = uuid; + uint8_t type = vresp->extract_U8(); + if (type == 1) + tag.iChannelUid = PVR_RECORDING_CHANNEL_TYPE_TV; + else if (type == 2) + tag.iChannelUid = PVR_RECORDING_CHANNEL_TYPE_RADIO; + else + tag.channelType = PVR_RECORDING_CHANNEL_TYPE_UNKNOWN; + } + else + { + tag.iChannelUid = PVR_CHANNEL_INVALID_UID; + tag.channelType = PVR_RECORDING_CHANNEL_TYPE_UNKNOWN; + } 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); @@ -787,12 +1083,18 @@ char *strChannelName = vresp->extract_String(); strncpy(tag.strChannelName, strChannelName, sizeof(tag.strChannelName) - 1); + if (GetProtocol() >= 9) + { + tag.iChannelUid = vresp->extract_S32(); + } + else + tag.iChannelUid = PVR_CHANNEL_INVALID_UID; 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); @@ -882,10 +1184,20 @@ while (!IsStopped()) { // try to reconnect - if(ConnectionLost() && !TryReconnect()) + if (m_connectionLost) { - Sleep(1000); - continue; + cVNSISession::eCONNECTIONSTATE state = TryReconnect(); + if (state != cVNSISession::CONN_ESABLISHED) + { + if (state == cVNSISession::CONN_HOST_NOT_REACHABLE) + { + PVR->ConnectionStateChange("vnsi server not reacheable", + PVR_CONNECTION_STATE_SERVER_UNREACHABLE, nullptr); + } + + Sleep(1000); + continue; + } } // if there's anything in the buffer, read it diff -Nru kodi-pvr-vdr-vnsi-1.11.17/src/VNSIData.h kodi-pvr-vdr-vnsi-2.6.17/src/VNSIData.h --- kodi-pvr-vdr-vnsi-1.11.17/src/VNSIData.h 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/src/VNSIData.h 2017-01-14 14:03:27.000000000 +0000 @@ -29,19 +29,17 @@ class cResponsePacket; class cRequestPacket; -class cVNSIData : public cVNSISession, public PLATFORM::CThread +class cVNSIData : public cVNSISession, public P8PLATFORM::CThread { public: cVNSIData(); virtual ~cVNSIData(); - bool Open(const std::string& hostname, int port, const char* name = NULL, const std::string& mac = ""); - bool Login() override; - + bool Start(const std::string& hostname, int port, const char* name = NULL, const std::string& mac = ""); bool SupportChannelScan(); bool SupportRecordingsUndelete(); - bool EnableStatusInterface(bool onOff); + bool EnableStatusInterface(bool onOff, bool wait = true); bool GetDriveSpace(long long *total, long long *used); int GetChannelsCount(); @@ -59,6 +57,9 @@ PVR_ERROR DeleteTimer(const PVR_TIMER &timerinfo, bool force = false); 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); @@ -75,7 +76,7 @@ protected: - virtual void *Process(void); + virtual void *Process(void) override; virtual bool OnResponsePacket(cResponsePacket *pkt); void OnDisconnect() override; @@ -85,14 +86,14 @@ struct SMessage { - PLATFORM::CEvent event; + P8PLATFORM::CEvent event; std::unique_ptr pkt; }; class Queue { typedef std::map SMessages; SMessages m_queue; - PLATFORM::CMutex m_mutex; + P8PLATFORM::CMutex m_mutex; public: SMessage &Enqueue(uint32_t serial); diff -Nru kodi-pvr-vdr-vnsi-1.11.17/src/VNSIDemux.cpp kodi-pvr-vdr-vnsi-2.6.17/src/VNSIDemux.cpp --- kodi-pvr-vdr-vnsi-1.11.17/src/VNSIDemux.cpp 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/src/VNSIDemux.cpp 2017-01-14 14:03:27.000000000 +0000 @@ -38,6 +38,29 @@ { } +void cVNSIDemux::Close() +{ + if (IsOpen() && GetProtocol() >= 9) + { + XBMC->Log(LOG_DEBUG, "closing demuxer"); + + cRequestPacket vrp; + vrp.init(VNSI_CHANNELSTREAM_CLOSE); + + try { + auto resp = ReadResult(&vrp); + if (!resp) + { + XBMC->Log(LOG_ERROR, "%s - failed to close streaming", __FUNCTION__); + } + } catch (std::exception e) { + XBMC->Log(LOG_ERROR, "%s - %s", __FUNCTION__, e.what()); + } + } + + cVNSISession::Close(); +} + bool cVNSIDemux::OpenChannel(const PVR_CHANNEL &channelinfo) { m_channelinfo = channelinfo; @@ -52,17 +75,23 @@ bool cVNSIDemux::GetStreamProperties(PVR_STREAM_PROPERTIES* props) { - return m_streams.GetProperties(props); + for (int i=0; istream[i], &m_streams.stream[i], sizeof(PVR_STREAM_PROPERTIES::PVR_STREAM)); + } + + props->iStreamCount = m_streams.iStreamCount; + return true; } void cVNSIDemux::Abort() { - m_streams.Clear(); + m_streams.iStreamCount = 0; } DemuxPacket* cVNSIDemux::Read() { - if(ConnectionLost()) + if (m_connectionLost) { return NULL; } @@ -106,22 +135,26 @@ { // figure out the stream id for this packet int pid = resp->getStreamID(); - int iStreamId = m_streams.GetStreamId(pid); // stream found ? - if(iStreamId != -1 && resp->getMuxSerial() == m_MuxPacketSerial) + if(pid >= 0 && resp->getMuxSerial() == m_MuxPacketSerial) { DemuxPacket* p = (DemuxPacket*)resp->stealUserData(); - p->iSize = resp->getUserDataLength(); - p->duration = (double)resp->getDuration() * DVD_TIME_BASE / 1000000; - p->dts = (double)resp->getDTS() * DVD_TIME_BASE / 1000000; - p->pts = (double)resp->getPTS() * DVD_TIME_BASE / 1000000; - p->iStreamId = iStreamId; + p->iSize = resp->getUserDataLength(); + p->duration = (double)resp->getDuration() * DVD_TIME_BASE / 1000000; + p->dts = (double)resp->getDTS() * DVD_TIME_BASE / 1000000; + p->pts = (double)resp->getPTS() * DVD_TIME_BASE / 1000000; + p->iStreamId = pid; - XbmcPvrStream *stream = m_streams.GetStreamById(pid); + int idx = -1; + for (int i=0; iiCodecType; + if (idx >= 0) + type = m_streams.stream[idx].iCodecType; if (type == XBMC_CODEC_TYPE_VIDEO || type == XBMC_CODEC_TYPE_AUDIO) { if (p->dts != DVD_NOPTS_VALUE) @@ -131,10 +164,9 @@ } return p; } - else if (iStreamId != -1 && resp->getMuxSerial() != m_MuxPacketSerial) + else if (pid >= 0 && resp->getMuxSerial() != m_MuxPacketSerial) { // ignore silently, may happen after a seek - XBMC->Log(LOG_DEBUG, "-------------------- serial: %d", resp->getMuxSerial()); } else { @@ -215,7 +247,7 @@ } m_channelinfo = channelinfo; - m_streams.Clear(); + m_streams.iStreamCount = 0; m_MuxPacketSerial = 0; m_ReferenceTime = 0; m_BufferTimeStart = 0; @@ -235,9 +267,6 @@ qualityinfo.iSNR = (uint16_t)m_Quality.fe_snr; qualityinfo.iBER = (uint32_t)m_Quality.fe_ber; qualityinfo.iUNC = (uint32_t)m_Quality.fe_unc; - qualityinfo.dVideoBitrate = 0; - qualityinfo.dAudioBitrate = 0; - qualityinfo.dDolbyBitrate = 0; return true; } @@ -262,22 +291,22 @@ void cVNSIDemux::StreamChange(cResponsePacket *resp) { - std::vector newStreams; + int count = 0; + m_streams.iStreamCount = 0; while (resp->getRemainingLength() >= 4 + 1) { uint32_t pid = resp->extract_U32(); const char* type = resp->extract_String(); - XbmcPvrStream newStream; - m_streams.GetStreamData(pid, &newStream); + memset(&m_streams.stream[count], 0, sizeof(PVR_STREAM_PROPERTIES::PVR_STREAM)); CodecDescriptor codecId = CodecDescriptor::GetCodecByName(type); if (codecId.Codec().codec_type != XBMC_CODEC_TYPE_UNKNOWN) { - newStream.iPhysicalId = pid; - newStream.iCodecType = codecId.Codec().codec_type; - newStream.iCodecId = codecId.Codec().codec_id; + m_streams.stream[count].iPID = pid; + m_streams.stream[count].iCodecType = codecId.Codec().codec_type; + m_streams.stream[count].iCodecId = codecId.Codec().codec_id; } else { @@ -288,67 +317,56 @@ { const char *language = resp->extract_String(); - newStream.iChannels = resp->extract_U32(); - newStream.iSampleRate = resp->extract_U32(); - newStream.iBlockAlign = resp->extract_U32(); - newStream.iBitRate = resp->extract_U32(); - newStream.iBitsPerSample = resp->extract_U32(); - newStream.strLanguage[0] = language[0]; - newStream.strLanguage[1] = language[1]; - newStream.strLanguage[2] = language[2]; - newStream.strLanguage[3] = 0; - newStream.iIdentifier = -1; - - newStreams.push_back(newStream); + m_streams.stream[count].iChannels = resp->extract_U32(); + m_streams.stream[count].iSampleRate = resp->extract_U32(); + m_streams.stream[count].iBlockAlign = resp->extract_U32(); + m_streams.stream[count].iBitRate = resp->extract_U32(); + m_streams.stream[count].iBitsPerSample = resp->extract_U32(); + m_streams.stream[count].strLanguage[0] = language[0]; + m_streams.stream[count].strLanguage[1] = language[1]; + m_streams.stream[count].strLanguage[2] = language[2]; + m_streams.stream[count].strLanguage[3] = 0; } else if (codecId.Codec().codec_type == XBMC_CODEC_TYPE_VIDEO) { - newStream.iFPSScale = resp->extract_U32(); - newStream.iFPSRate = resp->extract_U32(); - newStream.iHeight = resp->extract_U32(); - newStream.iWidth = resp->extract_U32(); - newStream.fAspect = (float)resp->extract_Double(); - newStream.strLanguage[0] = 0; - newStream.strLanguage[1] = 0; - newStream.strLanguage[2] = 0; - newStream.strLanguage[3] = 0; - newStream.iIdentifier = -1; - - newStreams.push_back(newStream); + m_streams.stream[count].iFPSScale = resp->extract_U32(); + m_streams.stream[count].iFPSRate = resp->extract_U32(); + m_streams.stream[count].iHeight = resp->extract_U32(); + m_streams.stream[count].iWidth = resp->extract_U32(); + m_streams.stream[count].fAspect = (float)resp->extract_Double(); + m_streams.stream[count].strLanguage[0] = 0; + m_streams.stream[count].strLanguage[1] = 0; + m_streams.stream[count].strLanguage[2] = 0; + m_streams.stream[count].strLanguage[3] = 0; } else if (codecId.Codec().codec_type == XBMC_CODEC_TYPE_SUBTITLE) { - const char *language = resp->extract_String(); + const char *language = resp->extract_String(); uint32_t composition_id = resp->extract_U32(); - uint32_t ancillary_id = resp->extract_U32(); - newStream.strLanguage[0] = language[0]; - newStream.strLanguage[1] = language[1]; - newStream.strLanguage[2] = language[2]; - newStream.strLanguage[3] = 0; - newStream.iIdentifier = (composition_id & 0xffff) | ((ancillary_id & 0xffff) << 16); - - newStreams.push_back(newStream); + uint32_t ancillary_id = resp->extract_U32(); + m_streams.stream[count].strLanguage[0] = language[0]; + m_streams.stream[count].strLanguage[1] = language[1]; + m_streams.stream[count].strLanguage[2] = language[2]; + m_streams.stream[count].strLanguage[3] = 0; + m_streams.stream[count].iSubtitleInfo = (composition_id & 0xffff) | ((ancillary_id & 0xffff) << 16); } else if (codecId.Codec().codec_type == XBMC_CODEC_TYPE_RDS) { - const char *language = resp->extract_String(); + const char *language = resp->extract_String(); uint32_t rel_channel_pid = resp->extract_U32(); - newStream.strLanguage[0] = language[0]; - newStream.strLanguage[1] = language[1]; - newStream.strLanguage[2] = language[2]; - newStream.strLanguage[3] = 0; - newStream.iIdentifier = -1; - - newStreams.push_back(newStream); + m_streams.stream[count].strLanguage[0] = language[0]; + m_streams.stream[count].strLanguage[1] = language[1]; + m_streams.stream[count].strLanguage[2] = language[2]; + m_streams.stream[count].strLanguage[3] = 0; } else { - m_streams.Clear(); + m_streams.iStreamCount = 0; return; } + count++; } - - m_streams.UpdateStreams(newStreams); + m_streams.iStreamCount = count; } void cVNSIDemux::StreamStatus(cResponsePacket *resp) @@ -376,42 +394,50 @@ bool cVNSIDemux::StreamContentInfo(cResponsePacket *resp) { - ADDON::XbmcStreamProperties streams = m_streams; while (resp->getRemainingLength() >= 4) { uint32_t pid = resp->extract_U32(); - PVR_STREAM_PROPERTIES::PVR_STREAM* props = streams.GetStreamById(pid); + + PVR_STREAM_PROPERTIES::PVR_STREAM* props = nullptr; + for (int i=0; iiCodecType == XBMC_CODEC_TYPE_AUDIO) { const char *language = resp->extract_String(); - props->iChannels = resp->extract_U32(); - props->iSampleRate = resp->extract_U32(); - props->iBlockAlign = resp->extract_U32(); - props->iBitRate = resp->extract_U32(); - props->iBitsPerSample = resp->extract_U32(); - props->strLanguage[0] = language[0]; - props->strLanguage[1] = language[1]; - props->strLanguage[2] = language[2]; - props->strLanguage[3] = 0; + props->iChannels = resp->extract_U32(); + props->iSampleRate = resp->extract_U32(); + props->iBlockAlign = resp->extract_U32(); + props->iBitRate = resp->extract_U32(); + props->iBitsPerSample = resp->extract_U32(); + props->strLanguage[0] = language[0]; + props->strLanguage[1] = language[1]; + props->strLanguage[2] = language[2]; + props->strLanguage[3] = 0; } else if (props->iCodecType == XBMC_CODEC_TYPE_VIDEO) { - props->iFPSScale = resp->extract_U32(); - props->iFPSRate = resp->extract_U32(); - props->iHeight = resp->extract_U32(); - props->iWidth = resp->extract_U32(); - props->fAspect = (float)resp->extract_Double(); + props->iFPSScale = resp->extract_U32(); + props->iFPSRate = resp->extract_U32(); + props->iHeight = resp->extract_U32(); + props->iWidth = resp->extract_U32(); + props->fAspect = (float)resp->extract_Double(); } else if (props->iCodecType == XBMC_CODEC_TYPE_SUBTITLE) { - const char *language = resp->extract_String(); + const char *language = resp->extract_String(); uint32_t composition_id = resp->extract_U32(); - uint32_t ancillary_id = resp->extract_U32(); + uint32_t ancillary_id = resp->extract_U32(); - props->iIdentifier = (composition_id & 0xffff) | ((ancillary_id & 0xffff) << 16); + props->iSubtitleInfo = (composition_id & 0xffff) | ((ancillary_id & 0xffff) << 16); props->strLanguage[0] = language[0]; props->strLanguage[1] = language[1]; props->strLanguage[2] = language[2]; @@ -424,6 +450,5 @@ break; } } - m_streams = streams; return true; } diff -Nru kodi-pvr-vdr-vnsi-1.11.17/src/VNSIDemux.h kodi-pvr-vdr-vnsi-2.6.17/src/VNSIDemux.h --- kodi-pvr-vdr-vnsi-1.11.17/src/VNSIDemux.h 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/src/VNSIDemux.h 2017-01-14 14:03:27.000000000 +0000 @@ -24,7 +24,7 @@ #include "client.h" #include #include -#include "kodi/xbmc_stream_utils.hpp" +#include "xbmc_pvr_types.h" class cResponsePacket; @@ -45,6 +45,7 @@ cVNSIDemux(); ~cVNSIDemux(); + void Close(); bool OpenChannel(const PVR_CHANNEL &channelinfo); void Abort(); bool GetStreamProperties(PVR_STREAM_PROPERTIES* props); @@ -67,14 +68,14 @@ private: - ADDON::XbmcStreamProperties m_streams; - PVR_CHANNEL m_channelinfo; - SQuality m_Quality; - bool m_bTimeshift; - uint32_t m_MuxPacketSerial; - time_t m_ReferenceTime; - double m_ReferenceDTS; - double m_CurrentDTS; - time_t m_BufferTimeStart; - time_t m_BufferTimeEnd; + PVR_STREAM_PROPERTIES m_streams; + PVR_CHANNEL m_channelinfo; + SQuality m_Quality; + bool m_bTimeshift; + uint32_t m_MuxPacketSerial; + time_t m_ReferenceTime; + double m_ReferenceDTS; + double m_CurrentDTS; + time_t m_BufferTimeStart; + time_t m_BufferTimeEnd; }; diff -Nru kodi-pvr-vdr-vnsi-1.11.17/src/VNSIRecording.cpp kodi-pvr-vdr-vnsi-2.6.17/src/VNSIRecording.cpp --- kodi-pvr-vdr-vnsi-1.11.17/src/VNSIRecording.cpp 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/src/VNSIRecording.cpp 2017-01-14 14:03:27.000000000 +0000 @@ -71,18 +71,23 @@ void cVNSIRecording::Close() { - if(!IsOpen()) - return; + if(IsOpen()) + { + try { + cRequestPacket vrp; + vrp.init(VNSI_RECSTREAM_CLOSE); + ReadSuccess(&vrp); + } catch (std::exception e) { + XBMC->Log(LOG_ERROR, "%s - %s", __FUNCTION__, e.what()); + } + } - cRequestPacket vrp; - vrp.init(VNSI_RECSTREAM_CLOSE); - ReadSuccess(&vrp); cVNSISession::Close(); } int cVNSIRecording::Read(unsigned char* buf, uint32_t buf_size) { - if (ConnectionLost() && !TryReconnect()) + if (m_connectionLost && TryReconnect() != cVNSISession::CONN_ESABLISHED) { *buf = 0; SleepMs(100); diff -Nru kodi-pvr-vdr-vnsi-1.11.17/src/VNSISession.cpp kodi-pvr-vdr-vnsi-2.6.17/src/VNSISession.cpp --- kodi-pvr-vdr-vnsi-1.11.17/src/VNSISession.cpp 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/src/VNSISession.cpp 2017-01-14 14:03:27.000000000 +0000 @@ -31,8 +31,8 @@ #include "requestpacket.h" #include "vnsicommand.h" #include "tools.h" -#include "platform/sockets/tcp.h" -#include "platform/util/timeutils.h" +#include "p8-platform/sockets/tcp.h" +#include "p8-platform/util/timeutils.h" /* Needed on Mac OS/X */ @@ -41,13 +41,14 @@ #endif using namespace ADDON; -using namespace PLATFORM; +using namespace P8PLATFORM; cVNSISession::cVNSISession() : m_protocol(0) , m_socket(NULL) , m_connectionLost(false) { + m_abort = false; } cVNSISession::~cVNSISession() @@ -57,7 +58,7 @@ void cVNSISession::Close() { - if(IsOpen()) + if (IsOpen()) { m_socket->Close(); } @@ -74,16 +75,16 @@ uint64_t iTarget = iNow + g_iConnectTimeout * 1000; if (!m_socket) m_socket = new CTcpConnection(hostname.c_str(), port); - while (!m_socket->IsOpen() && iNow < iTarget) + while (!m_socket->IsOpen() && iNow < iTarget && !m_abort) { if (!m_socket->Open(iTarget - iNow)) CEvent::Sleep(100); iNow = GetTimeMs(); } - if (!m_socket->IsOpen()) + if (!m_socket->IsOpen() && !m_abort) { - XBMC->Log(LOG_ERROR, "%s - failed to connect to the backend (%s)", __FUNCTION__, m_socket->GetError().c_str()); + XBMC->Log(LOG_DEBUG, "%s - failed to connect to the backend (%s)", __FUNCTION__, m_socket->GetError().c_str()); return false; } @@ -91,7 +92,7 @@ m_hostname = hostname; m_port = port; - if(name != NULL) + if (name != nullptr) m_name = name; return true; @@ -334,25 +335,28 @@ return true; } -void cVNSISession::OnReconnect() { +void cVNSISession::OnReconnect() +{ } -void cVNSISession::OnDisconnect() { +void cVNSISession::OnDisconnect() +{ } -bool cVNSISession::TryReconnect() { - if(!Open(m_hostname, m_port)) - return false; +cVNSISession::eCONNECTIONSTATE cVNSISession::TryReconnect() +{ + if (!Open(m_hostname, m_port)) + return CONN_HOST_NOT_REACHABLE; - if(!Login()) - return false; + if (!Login()) + return CONN_LOGIN_FAILED; XBMC->Log(LOG_DEBUG, "%s - reconnected", __FUNCTION__); m_connectionLost = false; OnReconnect(); - return true; + return CONN_ESABLISHED; } bool cVNSISession::IsOpen() diff -Nru kodi-pvr-vdr-vnsi-1.11.17/src/VNSISession.h kodi-pvr-vdr-vnsi-2.6.17/src/VNSISession.h --- kodi-pvr-vdr-vnsi-1.11.17/src/VNSISession.h 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/src/VNSISession.h 2017-01-14 14:03:27.000000000 +0000 @@ -22,14 +22,15 @@ #include #include -#include "platform/threads/threads.h" +#include +#include "p8-platform/threads/threads.h" #include class cResponsePacket; class cRequestPacket; -namespace PLATFORM +namespace P8PLATFORM { class CTcpConnection; } @@ -54,32 +55,40 @@ const std::string& GetServerName() const { return m_server; } const std::string& GetVersion() const { return m_version; } + enum eCONNECTIONSTATE + { + CONN_ESABLISHED = 0, + CONN_HOST_NOT_REACHABLE, + CONN_LOGIN_FAILED, + CONN_UNKNOWN + }; + protected: void SleepMs(int ms); - bool TryReconnect(); + eCONNECTIONSTATE TryReconnect(); bool IsOpen(); virtual void OnDisconnect(); virtual void OnReconnect(); virtual void SignalConnectionLost(); - bool ConnectionLost() const { return m_connectionLost; } std::string m_hostname; int m_port; std::string m_name; - PLATFORM::CMutex m_mutex; + P8PLATFORM::CMutex m_mutex; int m_protocol; std::string m_server; std::string m_version; + bool m_connectionLost; + std::atomic_bool m_abort; private: bool readData(uint8_t* buffer, int totalBytes, int timeout); - PLATFORM::CTcpConnection *m_socket; - PLATFORM::CMutex m_readMutex; - bool m_connectionLost; + P8PLATFORM::CTcpConnection *m_socket; + P8PLATFORM::CMutex m_readMutex; }; diff -Nru kodi-pvr-vdr-vnsi-1.11.17/src/xbmc_codec_descriptor.hpp kodi-pvr-vdr-vnsi-2.6.17/src/xbmc_codec_descriptor.hpp --- kodi-pvr-vdr-vnsi-1.11.17/src/xbmc_codec_descriptor.hpp 2016-04-25 07:36:03.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-1.11.17/.travis.yml kodi-pvr-vdr-vnsi-2.6.17/.travis.yml --- kodi-pvr-vdr-vnsi-1.11.17/.travis.yml 2016-04-25 07:36:03.000000000 +0000 +++ kodi-pvr-vdr-vnsi-2.6.17/.travis.yml 2017-01-14 14:03:27.000000000 +0000 @@ -36,8 +36,8 @@ # before_script: - cd $TRAVIS_BUILD_DIR/.. - - git clone -b Jarvis --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=../.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../../xbmc/addons -DPACKAGE_ZIP=1 ../../xbmc/project/cmake/addons + - 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 script: make