diff -Nru kodi-pvr-iptvsimple-1.12.10/debian/changelog kodi-pvr-iptvsimple-1.12.12/debian/changelog
--- kodi-pvr-iptvsimple-1.12.10/debian/changelog	2016-02-20 20:56:16.000000000 +0000
+++ kodi-pvr-iptvsimple-1.12.12/debian/changelog	2016-04-27 11:45:40.000000000 +0000
@@ -1,39 +1,40 @@
-kodi-pvr-iptvsimple (1.12.10-1~trusty) trusty; urgency=low
+kodi-pvr-iptvsimple (1.12.12-1~trusty) trusty; urgency=low
 
   [ kodi ]
   * autogenerated dummy changelog
 
   [ wsnipex ]
-  * v1.12.10 - Fix: Don't ignore channels logo if base logo path setting
-    is empty. - Fix: Don't apply base logo path to channels logo if tvg-
-    logo has a full NET path. v1.12.9 - updated language files from
-    Transifex v1.12.8 - updated language files from Transifex v1.12.7 -
-    updated language files from Transifex v1.12.6 - Updated to PVR API
-    v4.1.0 v1.12.5 - Updated to PVR API v4.0.0 v1.12.4 - Updated to PVR
-    API v3.0.0 (API 1.9.7 compatibility mode) v1.12.3 - Updated to PVR
-    API v2.1.0 - Automatically fill in platform and library name v1.12.2
-    - Debian packaging: fix library install path - Miscellaneous backend
-    fixes v1.12.1 - updated to API v2.0.0 v1.12.0 - updated to API
-    v1.9.7 v1.11.3 - updated language files from Transifex v1.11.2 -
-    updated to use new libplatform-dev v1.11.1 - fixed EPG loading.
-    v1.11.0 - updated to API v1.9.6 - new feature: channel logos from
-    xmltv - new feature: map xmltv genre to Kodi genre via genres.xml -
-    now possible to define full logo path in m3u if logos path is empty
-    in setting - a lot of code improvements. v1.10.2 - updated to API
-    v1.9.5 v1.10.1 - language files from Transifex - minor changes to
-    conform with C++11 - Updated to API v1.9.4 v1.9.12 - added
-    getBackendHostname function v1.9.10 - change library name to Kodi
-    v1.9.9 - fixed deadlock when activating the addon on some darwin
-    (osx, ios) runtimes v1.9.6 - updated to API v1.9.2 v1.9.3 - added
-    setting to disable cache m3u/epg - added support <icon src=""/> for
-    programme in epg - added possibility to specify logo path as URL -
-    changed tvg-logo should contains full logo filename (with extention)
-    - changed don't try download xmltv if it doesn't load after 3
-    attempt. v1.9.2 - add timeshift buffer functions v1.8.1 - fixed
-    issue with BOM header in EPG XML - fixed issue with update channels
-    if they are changed in m3u - added setting starting number of
-    channels v1.8.0 - Initial version - Supports m3u as Live TV streams
-    source and XMLTV as EPG source - Supports Live TV, Radio channels
-    and EPG
+  * v1.12.12 - updated language files from Transifex v1.12.11 - updated
+    language files from Transifex v1.12.10 - Fix: Don't ignore channels
+    logo if base logo path setting is empty. - Fix: Don't apply base
+    logo path to channels logo if tvg-logo has a full NET path. v1.12.9 -
+    updated language files from Transifex v1.12.8 - updated language
+    files from Transifex v1.12.7 - updated language files from Transifex
+    v1.12.6 - Updated to PVR API v4.1.0 v1.12.5 - Updated to PVR API
+    v4.0.0 v1.12.4 - Updated to PVR API v3.0.0 (API 1.9.7 compatibility
+    mode) v1.12.3 - Updated to PVR API v2.1.0 - Automatically fill in
+    platform and library name v1.12.2 - Debian packaging: fix library
+    install path - Miscellaneous backend fixes v1.12.1 - updated to API
+    v2.0.0 v1.12.0 - updated to API v1.9.7 v1.11.3 - updated language
+    files from Transifex v1.11.2 - updated to use new libplatform-dev
+    v1.11.1 - fixed EPG loading. v1.11.0 - updated to API v1.9.6 - new
+    feature: channel logos from xmltv - new feature: map xmltv genre to
+    Kodi genre via genres.xml - now possible to define full logo path in
+    m3u if logos path is empty in setting - a lot of code improvements.
+    v1.10.2 - updated to API v1.9.5 v1.10.1 - language files from
+    Transifex - minor changes to conform with C++11 - Updated to API
+    v1.9.4 v1.9.12 - added getBackendHostname function v1.9.10 - change
+    library name to Kodi v1.9.9 - fixed deadlock when activating the
+    addon on some darwin (osx, ios) runtimes v1.9.6 - updated to API
+    v1.9.2 v1.9.3 - added setting to disable cache m3u/epg - added
+    support <icon src=""/> for programme in epg - added possibility to
+    specify logo path as URL - changed tvg-logo should contains full
+    logo filename (with extention) - changed don't try download xmltv if
+    it doesn't load after 3 attempt. v1.9.2 - add timeshift buffer
+    functions v1.8.1 - fixed issue with BOM header in EPG XML - fixed
+    issue with update channels if they are changed in m3u - added
+    setting starting number of channels v1.8.0 - Initial version -
+    Supports m3u as Live TV streams source and XMLTV as EPG source -
+    Supports Live TV, Radio channels and EPG
 
- -- wsnipex <wsnipex@a1.net>  Sat, 20 Feb 2016 21:56:16 +0100
+ -- wsnipex <wsnipex@a1.net>  Wed, 27 Apr 2016 13:45:40 +0200
diff -Nru kodi-pvr-iptvsimple-1.12.10/debian/changelog.tmp kodi-pvr-iptvsimple-1.12.12/debian/changelog.tmp
--- kodi-pvr-iptvsimple-1.12.10/debian/changelog.tmp	2016-02-20 20:55:19.000000000 +0000
+++ kodi-pvr-iptvsimple-1.12.12/debian/changelog.tmp	2016-04-27 11:44:44.000000000 +0000
@@ -1,4 +1,4 @@
-kodi-pvr-iptvsimple (1.12.10-1~#DIST#) #DIST#; urgency=low
+kodi-pvr-iptvsimple (1.12.12-1~#DIST#) #DIST#; urgency=low
 
   [ kodi ]
   * autogenerated dummy changelog
diff -Nru kodi-pvr-iptvsimple-1.12.10/pvr.iptvsimple/addon.xml.in kodi-pvr-iptvsimple-1.12.12/pvr.iptvsimple/addon.xml.in
--- kodi-pvr-iptvsimple-1.12.10/pvr.iptvsimple/addon.xml.in	2016-02-18 08:57:30.000000000 +0000
+++ kodi-pvr-iptvsimple-1.12.12/pvr.iptvsimple/addon.xml.in	2016-03-16 20:59:31.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.iptvsimple"
-  version="1.12.10"
+  version="1.12.12"
   name="PVR IPTV Simple Client"
   provider-name="nightik">
   <requires>
@@ -47,7 +47,7 @@
     <summary lang="nl_NL">Kodi PVR add-on voor IPTV ondersteuning. https://github.com/afedchin/Kodi-addon-iptvsimple/wiki/IPTV-Simple-Home</summary>
     <summary lang="pl_PL">Klient telewizyjny dla telewizji internetowej. Więcej informacji o dodatku:  https://github.com/afedchin/Kodi-addon-iptvsimple/wiki/IPTV-Simple-Home</summary>
     <summary lang="pt_BR">Addon de PVR no Kodi com suporte a IPTV. https://github.com/afedchin/Kodi-addon-iptvsimple/wiki/IPTV-Simple-Home</summary>
-    <summary lang="pt_PT">Extra Kodi PVR para suporte a IPTV. https://github.com/afedchin/Kodi-addon-iptvsimple/wiki/IPTV-Simple-Home</summary>
+    <summary lang="pt_PT">Add-on Kodi PVR para suporte a IPTV. https://github.com/afedchin/Kodi-addon-iptvsimple/wiki/IPTV-Simple-Home</summary>
     <summary lang="ro_RO">Supliment PVR Kodi  pentru suport IPTV. https://github.com/afedchin/Kodi-addon-iptvsimple/wiki/IPTV-Simple-Home</summary>
     <summary lang="ru_RU">Kodi PVR аддон для поддержки IPTV.  https://github.com/afedchin/Kodi-addon-iptvsimple/wiki/IPTV-Simple-Home</summary>
     <summary lang="sk_SK">Kodi PVR doplnok umožňujúci IPTV podporu. https://github.com/afedchin/Kodi-addon-iptvsimple/wiki/IPTV-Simple-Home</summary>
@@ -58,6 +58,7 @@
     <summary lang="tr_TR">IPTV desteği için Kodi PVR eklentisi. https://github.com/afedchin/Kodi-addon-iptvsimple/wiki/IPTV-Simple-Home</summary>
     <summary lang="uk_UA">PVR надбудова Kodi для підтримки IPTV. https://github.com/afedchin/Kodi-addon-iptvsimple/wiki/IPTV-Simple-Home</summary>
     <summary lang="zh_CN">Kodi PVR 插件需要 IPTV 支持。https://github.com/afedchin/Kodi-addon-iptvsimple/wiki/IPTV-Simple-Home</summary>
+    <description lang="af_ZA">IPTV Simple PVR kliënt ondersteun M3U speellyste, stroom van lewendige TV vir multisaai / unisaai bronne, luister na radio kanale en EPG.</description>
     <description lang="bg_BG">IPTV обикновен ПВР клиент. Поддържа m3u плейлисти, поточна телевизия за мултикаст/уникаст източници, слушане на радио канали и електронен програмен справочник.</description>
     <description lang="ca_ES">Client senzill per a IPTV PVR amb support per a llistes de reproducció m3u, streaming de TV en viu multicast/unicast, reproducció de canals de ràdio i EPG.</description>
     <description lang="cs_CZ">IPTV Simple PVR Client podporuje m3u playlisty, streemování  TV pro multicast/unicast zdroje, poslouchání Radia a EPG.</description>
@@ -72,7 +73,7 @@
     <description lang="es_AR">Cliente simple PVR IPTV.  Reproduce de TV en Vivo multicast/unicast y listas m3u8&#10; . reproduce tambien canales de radio y GEP</description>
     <description lang="es_ES">El cliente PVR IPTV Simple soporta listas M3U, reproducción de TV en Vivo para origenes multicast/unicast, escucha de canales de radio y EPG</description>
     <description lang="fi_FI">IPTV Simple PVR Client tukee m3u soittolistoja, multicast/unicast LIVE TV toistoa, radiokanavia jaohjelmaopasta.</description>
-    <description lang="fr_CA">Client de numériscope simple pour IPTV, prenant en charge les listes de lecture m3u, la lecture en transit des télés en direct pour les sources de multidiffusion et de monodiffusion, l'écoute de chaînes radio, et le GÉP.</description>
+    <description lang="fr_CA">Client de numériscope simple pour IPTV, prenant en charge les listes de lecture m3u, la diffusion en continu des télés en direct pour les sources de multidiffusion et de monodiffusion, l'écoute de chaînes radio, et le GÉP.</description>
     <description lang="fr_FR">Le client enregistreur vidéo (PVR) IPTV Simple gère les listes de lecture M3U, la diffusion en continu de la TV en direct en mono ou multidiffusion, l'écoute des chaînes radio et le guide électronique des programmes TV.</description>
     <description lang="gl_ES">O cliente PVR simple de IPTV soporta listaxes m3u, transmisión de TV en directo para fontes multicast/unicast, escoita de canles de Radio e Guía.</description>
     <description lang="he_IL">לקוח טלוויזיה חיה IPTV Simple תומך ברשימות m3u, הזרמת שידורים חיים ממקור מרובב/ סטרים בודד, האזנה לתחנות רדיו והצגת לוח שידורים.</description>
diff -Nru kodi-pvr-iptvsimple-1.12.10/pvr.iptvsimple/changelog.txt kodi-pvr-iptvsimple-1.12.12/pvr.iptvsimple/changelog.txt
--- kodi-pvr-iptvsimple-1.12.10/pvr.iptvsimple/changelog.txt	2016-02-18 08:57:30.000000000 +0000
+++ kodi-pvr-iptvsimple-1.12.12/pvr.iptvsimple/changelog.txt	2016-03-16 20:59:31.000000000 +0000
@@ -1,3 +1,9 @@
+v1.12.12
+- updated language files from Transifex
+
+v1.12.11
+- updated language files from Transifex
+
 v1.12.10
 - Fix: Don't ignore channels logo if base logo path setting is empty.
 - Fix: Don't apply base logo path to channels logo if tvg-logo has a full NET path.
diff -Nru kodi-pvr-iptvsimple-1.12.10/pvr.iptvsimple/resources/language/resource.language.af_za/strings.po kodi-pvr-iptvsimple-1.12.12/pvr.iptvsimple/resources/language/resource.language.af_za/strings.po
--- kodi-pvr-iptvsimple-1.12.10/pvr.iptvsimple/resources/language/resource.language.af_za/strings.po	2016-02-18 08:57:30.000000000 +0000
+++ kodi-pvr-iptvsimple-1.12.12/pvr.iptvsimple/resources/language/resource.language.af_za/strings.po	2016-03-16 20:59:31.000000000 +0000
@@ -20,6 +20,10 @@
 msgid "Location"
 msgstr "Ligging"
 
+msgctxt "#30001"
+msgid "Local Path (include Local Network)"
+msgstr "Lokale pad (sluit lokale netwerlk in)"
+
 msgctxt "#30002"
 msgid "Remote Path (Internet address)"
 msgstr "Afgeleë pad (Internet adres)"
@@ -28,6 +32,18 @@
 msgid "General"
 msgstr "Algemeen"
 
+msgctxt "#30011"
+msgid "M3U Play List Path"
+msgstr "M3U speellys pad"
+
+msgctxt "#30012"
+msgid "M3U Play List URL"
+msgstr "M3U speellys URL"
+
+msgctxt "#30013"
+msgid "Numbering channels starts at"
+msgstr "Nommer van kanale begin by"
+
 msgctxt "#30020"
 msgid "EPG Settings"
 msgstr "EPG verstellings"
@@ -40,10 +56,50 @@
 msgid "XMLTV URL"
 msgstr "XMLTV URL"
 
+msgctxt "#30023"
+msgid "Apply Time Shift To All Channels"
+msgstr "Pas tyd skuif toe op alle kanale"
+
 msgctxt "#30024"
 msgid "EPG Time Shift (hours)"
 msgstr "EPG tyd skuif (ure)"
 
+msgctxt "#30025"
+msgid "Cache m3u at local storage"
+msgstr "Kas M3U by lokale stoor"
+
+msgctxt "#30026"
+msgid "Cache XMLTV at local storage"
+msgstr "Kas XMLTV by lokale stoor"
+
+msgctxt "#30030"
+msgid "Channels Logos"
+msgstr "Kanale logos"
+
+msgctxt "#30031"
+msgid "Channels Logos Folder"
+msgstr "Kanale logos gids"
+
+msgctxt "#30032"
+msgid "Channels Logos Base URL"
+msgstr "Kanale logos basis URL"
+
+msgctxt "#30040"
+msgid "XMLTV Logos Options"
+msgstr "XMLTV logos opsies"
+
+msgctxt "#30041"
+msgid "Channels Logos from XMLTV"
+msgstr "Kanale logos vanaf XMLTV"
+
 msgctxt "#30042"
 msgid "Ignore"
 msgstr "Ignoreer"
+
+msgctxt "#30043"
+msgid "Prefer M3U"
+msgstr "Verkies M3U"
+
+msgctxt "#30044"
+msgid "Prefer XMLTV"
+msgstr "Verkies XMLTV"
diff -Nru kodi-pvr-iptvsimple-1.12.10/pvr.iptvsimple/resources/language/resource.language.bg_bg/strings.po kodi-pvr-iptvsimple-1.12.12/pvr.iptvsimple/resources/language/resource.language.bg_bg/strings.po
--- kodi-pvr-iptvsimple-1.12.10/pvr.iptvsimple/resources/language/resource.language.bg_bg/strings.po	2016-02-18 08:57:30.000000000 +0000
+++ kodi-pvr-iptvsimple-1.12.12/pvr.iptvsimple/resources/language/resource.language.bg_bg/strings.po	2016-03-16 20:59:31.000000000 +0000
@@ -87,3 +87,11 @@
 msgctxt "#30042"
 msgid "Ignore"
 msgstr "Игнорирай"
+
+msgctxt "#30043"
+msgid "Prefer M3U"
+msgstr "Предпочитай M3U"
+
+msgctxt "#30044"
+msgid "Prefer XMLTV"
+msgstr "Предпочитай XMLTV"