The branch, frodo has been updated
via a281585118f2e273eb1c8bb279e07a37e04eb3be (commit)
from c98c89ae889b25744c976f1a272eb61b4fcb3fd7 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=a281585118f2e273eb1c8bb279e07a37e04eb3be
commit a281585118f2e273eb1c8bb279e07a37e04eb3be
Author: beenje <bee...@xbmc.org>
Date: Thu Jan 23 21:36:34 2014 +0100
[plugin.video.entertain] updated to version 0.1.1
diff --git a/plugin.video.entertain/addon.py b/plugin.video.entertain/addon.py
index 96282a9..ad02817 100644
--- a/plugin.video.entertain/addon.py
+++ b/plugin.video.entertain/addon.py
@@ -14,6 +14,8 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
+# Source: http://grinch.itg-em.de/entertain/faq/allgemein/multicastadressliste/
+#
import sys
import xbmc, xbmcplugin, xbmcgui, xbmcaddon
@@ -26,6 +28,7 @@ FANART = xbmcaddon.Addon(id=ADDON_ID).getAddonInfo('path') +
'/fanart.jpg'
settings = xbmcaddon.Addon(id=ADDON_ID)
quality = 1 + int(settings.getSetting("quality"))
channelimage = int(settings.getSetting("channelimage"))
+categories = 1 + int(settings.getSetting("categories"))
# -- I18n ---------------------------------------------------
language = xbmcaddon.Addon(id=ADDON_ID).getLocalizedString
@@ -49,22 +52,23 @@ def getFanartUrl(filename=False):
def getResourceUrl(reskind, filename=False):
if (not filename):
- filename = 'default.png'
+ filename = 'default.jpg'
retUrl = xbmcaddon.Addon(id=ADDON_ID).getAddonInfo('path') +
'/resources/' + reskind + '/' + filename
return xbmc.translatePath(retUrl)
-def
addEntertainChannel(url,name,all=False,icon=False,thumbnail=False,poster=False,fanart=False,
plot='', genre=language(30010),year='2014',duration='90',hdurl=False):
- if (not hdurl):
-
addChannel(url,name,all,icon,thumbnail,poster,fanart,plot,genre,year,duration)
- else:
- if (quality & 1):
+def
addEntertainChannel(url,name,all=False,icon=False,thumbnail=False,poster=False,fanart=False,plot='',genre=language(30090),year='2014',duration='90',hdurl=False,chancat=1):
+ if (chancat & categories):
+ if (not hdurl):
addChannel(url,name,all,icon,thumbnail,poster,fanart,plot,genre,year,duration)
- if (quality & 2):
- addChannel(hdurl,name + "
HD",all,icon,thumbnail,poster,fanart,plot,genre,year,duration)
+ else:
+ if (quality & 1):
+
addChannel(url,name,all,icon,thumbnail,poster,fanart,plot,genre,year,duration)
+ if (quality & 2):
+ addChannel(hdurl,name + "
HD",all,icon,thumbnail,poster,fanart,plot,genre,year,duration)
-def
addChannel(url,name,all=False,icon=False,thumbnail=False,poster=False,fanart=False,
plot='', genre=language(30010),year='2014',duration='90'):
+def
addChannel(url,name,all=False,icon=False,thumbnail=False,poster=False,fanart=False,
plot='', genre=language(30090),year='2014',duration='90'):
iconUrl = getIconUrl(icon if (icon) else all)
thumbnailUrl = getThumbnailUrl(thumbnail if (thumbnail) else all)
posterUrl = getPosterUrl(poster if (poster) else all)
@@ -96,59 +100,80 @@ def
addChannel(url,name,all=False,icon=False,thumbnail=False,poster=False,fanart
xbmcplugin.setPluginFanart(int(sys.argv[1]), FANART)
xbmcplugin.setContent(int(sys.argv[1]), 'movies')
-# -- Vollprogramm
-addEntertainChannel ('rtp://@239.35.10.4:10000', 'Das Erste', year='1954',
plot=language(30101), all='das-erste.png', hdurl='rtp://@239.35.10.1:10000')
-addEntertainChannel ('rtp://@239.35.10.5:10000', 'ZDF', year='1963',
plot=language(30102), all='zdf.png', hdurl='rtp://@239.35.10.2:10000')
-
-# -- Dritte
-addEntertainChannel ('rtp://@239.35.10.13:10000', 'BR Nord', year='1949',
genre=language(30011), plot=language(30103))
-addEntertainChannel ('rtp://@239.35.10.7:10000', 'BR Süd', year='1949',
genre=language(30011), plot=language(30103), hdurl='rtp://@239.35.10.49:10000')
-addEntertainChannel ('rtp://@239.35.10.8:10000', 'hr-fernsehen',
genre=language(30011), plot=language(30124))
-addEntertainChannel ('rtp://@239.35.10.9:10000', 'MDR Sachsen', year='1992',
genre=language(30011), plot=language(30104))
-addEntertainChannel ('rtp://@239.35.10.29:10000', 'MDR Sachsen-Anhalt',
year='1992', genre=language(30011), plot=language(30104))
-addEntertainChannel ('rtp://@239.35.10.30:10000', 'MDR Thüringen',
year='1992', genre=language(30011), plot=language(30104))
-addEntertainChannel ('rtp://@239.35.10.10:10000', 'NDR Niedersachsen',
year='1954', genre=language(30011), plot=language(30105))
-addEntertainChannel ('rtp://@239.35.10.50:10000', 'NDR Niedersachsen HD',
year='1954', genre=language(30011), plot=language(30105))
-addEntertainChannel ('rtp://@239.35.10.31:10000', 'NDR Hamburg', year='1954',
genre=language(30011), plot=language(30105))
-addEntertainChannel ('rtp://@239.35.10.32:10000', 'NDR
Mecklenburg-Vorpommern', year='1954', genre=language(30011),
plot=language(30105))
-addEntertainChannel ('rtp://@239.35.10.33:10000', 'NDR Schleswig-Holstein',
year='1954', genre=language(30011), plot=language(30105))
-addEntertainChannel ('rtp://@239.35.10.12:10000', 'Radio Bremen TV',
year='1945', genre=language(30011), plot=language(30106))
-addEntertainChannel ('rtp://@239.35.10.14:10000', 'rbb Berlin', year='2003',
genre=language(30011), plot=language(30107))
-addEntertainChannel ('rtp://@239.35.10.34:10000', 'rbb Brandenburg',
year='2003', genre=language(30011), plot=language(30107))
-addEntertainChannel ('rtp://@239.35.10.15:10000', 'SR Fernsehen', year='1957',
genre=language(30011), plot=language(30108))
-addEntertainChannel ('rtp://@239.35.10.16:10000', 'SWR Baden-Würtenberg',
year='1998', genre=language(30011), plot=language(30109),
hdurl='rtp://@239.35.10.51:10000')
-addEntertainChannel ('rtp://@239.35.10.17:10000', 'SWR Rheinland-Pfalz',
year='1998', genre=language(30011), plot=language(30109),
hdurl='rtp://@239.35.10.52:10000')
-addEntertainChannel ('rtp://@239.35.10.18:10000', 'WDR Köln', year='1956',
genre=language(30011), plot=language(30110), hdurl='rtp://@239.35.10.53:10000')
-addEntertainChannel ('rtp://@239.35.10.35:10000', 'WDR Aachen', year='1956',
genre=language(30011), plot=language(30110))
-addEntertainChannel ('rtp://@239.35.10.36:10000', 'WDR Bielefeld',
year='1956', genre=language(30011), plot=language(30110))
-addEntertainChannel ('rtp://@239.35.10.37:10000', 'WDR Bonn', year='1956',
genre=language(30011), plot=language(30110))
-addEntertainChannel ('rtp://@239.35.10.38:10000', 'WDR Dortmund', year='1956',
genre=language(30011), plot=language(30110))
-addEntertainChannel ('rtp://@239.35.10.39:10000', 'WDR Duisburg', year='1956',
genre=language(30011), plot=language(30110))
-addEntertainChannel ('rtp://@239.35.10.40:10000', 'WDR Düsseldorf',
year='1956', genre=language(30011), plot=language(30110))
-addEntertainChannel ('rtp://@239.35.10.41:10000', 'WDR Essen', year='1956',
genre=language(30011), plot=language(30110))
-addEntertainChannel ('rtp://@239.35.10.42:10000', 'WDR Münster', year='1956',
genre=language(30011), plot=language(30110))
-addEntertainChannel ('rtp://@239.35.10.43:10000', 'WDR Siegen', year='1956',
genre=language(30011), plot=language(30110))
-addEntertainChannel ('rtp://@239.35.10.44:10000', 'WDR Wuppertal',
year='1956', genre=language(30011), plot=language(30110))
-
-# -- Kultur
-addEntertainChannel ('rtp://@239.35.10.6:10000', '3sat', year='1984',
genre=language(30012), plot=language(30111), hdurl='rtp://@239.35.10.47:10000')
-addEntertainChannel ('rtp://@239.35.10.20:10000', 'ARTE', year='1991',
genre=language(30012), plot=language(30112), all='arte.png',
hdurl='rtp://@239.35.10.3:10000')
-addEntertainChannel ('rtp://@239.35.10.21:10000', 'Einsfestival', year='1997',
genre=language(30012), plot=language(30113))
-addEntertainChannel ('rtp://@239.35.10.23:10000', 'zdf.kultur', year='2011',
genre=language(30012), plot=language(30114), hdurl='rtp://@239.35.10.54:10000')
-
+# -- General Channels
+if (settings.getSetting("cat_general") == "true"):
+ # -- Public Channels
+ addEntertainChannel ('rtp://@239.35.10.4:10000', 'Das Erste',
year='1954', plot=language(30101), all='das-erste.jpg',
hdurl='rtp://@239.35.10.1:10000')
+ addEntertainChannel ('rtp://@239.35.10.5:10000', 'ZDF', year='1963',
plot=language(30102), all='zdf.jpg', hdurl='rtp://@239.35.10.2:10000')
+ # -- RTL Group
+ addEntertainChannel ('rtp://@239.35.20.10:10000', 'RTL', year='1984',
genre=language(30090), plot=language(30130), chancat=2)
+ addEntertainChannel ('rtp://@239.35.20.11:10000', 'VOX', year='1993',
genre=language(30090), plot=language(30131), chancat=2)
+ addEntertainChannel ('rtp://@239.35.20.22:10000', 'RTL II',
year='1993', genre=language(30090), plot=language(30132), chancat=2)
+
+# -- Regional Channels
+if (settings.getSetting("cat_regional") == "true"):
+ # -- Public Channels
+ addEntertainChannel ('rtp://@239.35.10.13:10000', 'BR Nord',
year='1949', genre=language(30091), plot=language(30103), all='BR.jpg')
+ addEntertainChannel ('rtp://@239.35.10.7:10000', 'BR Süd',
year='1949', genre=language(30091), plot=language(30103), all='BR.jpg',
hdurl='rtp://@239.35.10.49:10000')
+ addEntertainChannel ('rtp://@239.35.10.8:10000', 'hr-fernsehen',
genre=language(30091), plot=language(30124), all='hr.jpg',
hdurl='rtp://@239.35.10.60:10000')
+ addEntertainChannel ('rtp://@239.35.10.9:10000', 'MDR Sachsen',
year='1992', genre=language(30091), plot=language(30104), all='mdr.jpg',
hdurl='rtp://@239.35.10.61:10000')
+ addEntertainChannel ('rtp://@239.35.10.29:10000', 'MDR Sachsen-Anhalt',
year='1992', genre=language(30091), plot=language(30104), all='mdr.jpg')
+ addEntertainChannel ('rtp://@239.35.10.30:10000', 'MDR Thüringen',
year='1992', genre=language(30091), plot=language(30104), all='mdr.jpg')
+ addEntertainChannel ('rtp://@239.35.10.10:10000', 'NDR Niedersachsen',
year='1954', genre=language(30091), plot=language(30105),
hdurl='rtp://@239.35.10.50:10000')
+ addEntertainChannel ('rtp://@239.35.10.31:10000', 'NDR Hamburg',
year='1954', genre=language(30091), plot=language(30105))
+ addEntertainChannel ('rtp://@239.35.10.32:10000', 'NDR
Mecklenburg-Vorpommern', year='1954', genre=language(30091),
plot=language(30105))
+ addEntertainChannel ('rtp://@239.35.10.33:10000', 'NDR
Schleswig-Holstein', year='1954', genre=language(30091), plot=language(30105))
+ addEntertainChannel ('rtp://@239.35.10.12:10000', 'Radio Bremen TV',
year='1945', genre=language(30091), plot=language(30106))
+ addEntertainChannel ('rtp://@239.35.10.14:10000', 'rbb Berlin',
year='2003', genre=language(30091), plot=language(30107),
hdurl='rtp://@239.35.10.62:10000')
+ addEntertainChannel ('rtp://@239.35.10.34:10000', 'rbb Brandenburg',
year='2003', genre=language(30091), plot=language(30107))
+ addEntertainChannel ('rtp://@239.35.10.15:10000', 'SR Fernsehen',
year='1957', genre=language(30091), plot=language(30108))
+ addEntertainChannel ('rtp://@239.35.10.16:10000', 'SWR
Baden-Würtenberg', year='1998', genre=language(30091), plot=language(30109),
hdurl='rtp://@239.35.10.51:10000')
+ addEntertainChannel ('rtp://@239.35.10.17:10000', 'SWR
Rheinland-Pfalz', year='1998', genre=language(30091), plot=language(30109),
hdurl='rtp://@239.35.10.52:10000')
+ addEntertainChannel ('rtp://@239.35.10.18:10000', 'WDR Köln',
year='1956', genre=language(30091), plot=language(30110),
hdurl='rtp://@239.35.10.53:10000')
+ addEntertainChannel ('rtp://@239.35.10.35:10000', 'WDR Aachen',
year='1956', genre=language(30091), plot=language(30110))
+ addEntertainChannel ('rtp://@239.35.10.36:10000', 'WDR Bielefeld',
year='1956', genre=language(30091), plot=language(30110))
+ addEntertainChannel ('rtp://@239.35.10.37:10000', 'WDR Bonn',
year='1956', genre=language(30091), plot=language(30110))
+ addEntertainChannel ('rtp://@239.35.10.38:10000', 'WDR Dortmund',
year='1956', genre=language(30091), plot=language(30110))
+ addEntertainChannel ('rtp://@239.35.10.39:10000', 'WDR Duisburg',
year='1956', genre=language(30091), plot=language(30110))
+ addEntertainChannel ('rtp://@239.35.10.40:10000', 'WDR Düsseldorf',
year='1956', genre=language(30091), plot=language(30110))
+ addEntertainChannel ('rtp://@239.35.10.41:10000', 'WDR Essen',
year='1956', genre=language(30091), plot=language(30110))
+ addEntertainChannel ('rtp://@239.35.10.42:10000', 'WDR Münster',
year='1956', genre=language(30091), plot=language(30110))
+ addEntertainChannel ('rtp://@239.35.10.43:10000', 'WDR Siegen',
year='1956', genre=language(30091), plot=language(30110))
+ addEntertainChannel ('rtp://@239.35.10.44:10000', 'WDR Wuppertal',
year='1956', genre=language(30091), plot=language(30110))
+ # -- RTL Group
+ addEntertainChannel ('rtp://@239.35.20.5:10000', 'RTL NRW',
year='1984', genre=language(30091), plot=language(30130), chancat=2)
+ addEntertainChannel ('rtp://@239.35.20.6:10000', 'RTL HB NDS',
year='1984', genre=language(30091), plot=language(30130), chancat=2)
+ addEntertainChannel ('rtp://@239.35.20.63:10000', 'RTL HH SH',
year='1984', genre=language(30091), plot=language(30130), chancat=2)
+ addEntertainChannel ('rtp://@239.35.20.64:10000', 'RTL Hessen',
year='1984', genre=language(30091), plot=language(30130), chancat=2)
+
+# -- Cultural Channels
+if (settings.getSetting("cat_cultural") == "true"):
+ # -- Public Channels
+ addEntertainChannel ('rtp://@239.35.10.6:10000', '3sat', year='1984',
genre=language(30092), plot=language(30111), all='3sat.jpg',
hdurl='rtp://@239.35.10.47:10000')
+ addEntertainChannel ('rtp://@239.35.10.20:10000', 'ARTE', year='1991',
genre=language(30092), plot=language(30112), all='arte.jpg',
hdurl='rtp://@239.35.10.3:10000')
+ addEntertainChannel ('rtp://@239.35.10.21:10000', 'Einsfestival',
year='1997', genre=language(30092), plot=language(30113),
hdurl='rtp://@239.35.10.58:10000')
+ addEntertainChannel ('rtp://@239.35.10.23:10000', 'zdf.kultur',
year='2011', genre=language(30092), plot=language(30114),
hdurl='rtp://@239.35.10.54:10000')
# -- Special Interest
-addEntertainChannel ('rtp://@239.35.10.19:10000', 'KiKa', year='1997',
genre=language(30013), plot=language(30115), hdurl='rtp://@239.35.10.11:10000')
-addEntertainChannel ('rtp://@239.35.10.22:10000', 'PHOENIX', year='1997',
genre=language(30013), plot=language(30116), hdurl='rtp://@239.35.10.48:10000')
-addEntertainChannel ('rtp://@239.35.10.24:10000', 'BR-alpha', year='1998',
genre=language(30013), plot=language(30117))
-addEntertainChannel ('rtp://@239.35.10.26:10000', 'EinsPlus', year='1997',
genre=language(30013), plot=language(30118))
-
-# -- Nachrichten
-addEntertainChannel ('rtp://@239.35.20.44:10000', 'Deutsche Welle',
year='1992', genre=language(30014), plot=language(30120))
-addEntertainChannel ('rtp://@239.35.10.25:10000', 'tagesschau24', year='1997',
genre=language(30014), plot=language(30121))
-addEntertainChannel ('rtp://@239.35.10.28:10000', 'ZDFinfo', year='1997',
genre=language(30014), plot=language(30122), hdurl='rtp://@239.35.10.56:10000')
-addEntertainChannel ('rtp://@239.35.10.27:10000', 'ZDFneo', year='2009',
genre=language(30014), plot=language(30123))
-
+if (settings.getSetting("cat_special") == "true"):
+ # -- Public Channels
+ addEntertainChannel ('rtp://@239.35.10.19:10000', 'KiKa', year='1997',
genre=language(30093), plot=language(30115), hdurl='rtp://@239.35.10.11:10000')
+ addEntertainChannel ('rtp://@239.35.10.22:10000', 'PHOENIX',
year='1997', genre=language(30093), plot=language(30116),
hdurl='rtp://@239.35.10.48:10000')
+ addEntertainChannel ('rtp://@239.35.10.24:10000', 'BR-alpha',
year='1998', genre=language(30093), plot=language(30117))
+ addEntertainChannel ('rtp://@239.35.10.26:10000', 'EinsPlus',
year='1997', genre=language(30093), plot=language(30118),
hdurl='rtp://@239.35.10.59:10000')
+ # -- RTL Group
+ addEntertainChannel ('rtp://@239.35.20.39:10000', 'Super RTL',
year='1995', genre=language(30093), plot=language(30133), chancat=2)
+ addEntertainChannel ('rtp://@239.35.20.59:10000', 'RTLNITRO',
year='2012', genre=language(30093), plot=language(30135), chancat=2)
+
+# -- News Channels
+if (settings.getSetting("cat_news") == "true"):
+ # -- Public Channels
+ addEntertainChannel ('rtp://@239.35.20.44:10000', 'Deutsche Welle',
year='1992', genre=language(30094), plot=language(30120))
+ addEntertainChannel ('rtp://@239.35.10.25:10000', 'tagesschau24',
year='1997', genre=language(30094), plot=language(30121),
hdurl='rtp://@239.35.10.63:10000')
+ addEntertainChannel ('rtp://@239.35.10.28:10000', 'ZDFinfo',
year='1997', genre=language(30094), plot=language(30122),
hdurl='rtp://@239.35.10.56:10000')
+ addEntertainChannel ('rtp://@239.35.10.27:10000', 'ZDFneo',
year='2009', genre=language(30094), plot=language(30123),
hdurl='rtp://@239.35.10.55:10000')
+ # -- RTL Group
+ addEntertainChannel ('rtp://@239.35.20.47:10000', 'n-tv', year='1992',
genre=language(30094), plot=language(30134), chancat=2)
xbmcplugin.endOfDirectory(int(sys.argv[1]))
diff --git a/plugin.video.entertain/addon.xml b/plugin.video.entertain/addon.xml
index 71bfa0b..6614f5f 100644
--- a/plugin.video.entertain/addon.xml
+++ b/plugin.video.entertain/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.entertain"
name="Telekom Entertain"
- version="0.0.3"
+ version="0.1.1"
provider-name="Leo Moll">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
@@ -12,12 +12,14 @@
<extension point="xbmc.addon.metadata">
<summary lang="de">Telekom Entertain</summary>
<summary lang="en">Telekom Entertain</summary>
+ <summary lang="it">Telekom Entertain</summary>
<description lang="de">Zugriff auf alle öffentlich rechtlichen
Sender über Entertain Anschlüsse der Deutschen Telekom.</description>
<description lang="en">Access to all public TV channels
available on Deutsche Telekom's triple play connections.</description>
+ <description lang="it">Accesso a tutti i canali IPTV pubblici
disponibili su linie DSL/VDSL della Deutsche Telekom con contratto
Entertain</description>
<platform>all</platform>
- <language>en de</language>
+ <language>de</language>
<license>GNU GENERAL PUBLIC LICENSE. Version 2, June
1991</license>
- <forum></forum>
+ <forum>http://forum.xbmc.org/showthread.php?tid=183456</forum>
<website></website>
<source>https://github.com/tuxpoldo/entertain-xbmc.git</source>
<email></email>
diff --git a/plugin.video.entertain/changelog.txt
b/plugin.video.entertain/changelog.txt
index 055fe54..7e83fb4 100644
--- a/plugin.video.entertain/changelog.txt
+++ b/plugin.video.entertain/changelog.txt
@@ -1,3 +1,21 @@
+0.1.1
+- Fixed malformed ampersands in XML files
+
+0.1.0
+- Added channels from RTL group
+- Added several HD channels
+- Added settings for filtering channels
+
+0.0.5
+- Fixed wrong language tag (Closes #6)
+- Added 3sat, HR and MDR channel art
+
+0.0.4
+- Added BR channel art
+- Reduced size by changing art format to jpg
+- Made all strings localizable
+- Added support for italian language
+
0.0.3
- Added more channel logos
- Added support for posters as channel logos (Closes #5)
diff --git a/plugin.video.entertain/resources/language/English/strings.xml
b/plugin.video.entertain/resources/language/English/strings.xml
index 01a1659..0c8adde 100644
--- a/plugin.video.entertain/resources/language/English/strings.xml
+++ b/plugin.video.entertain/resources/language/English/strings.xml
@@ -1,12 +1,29 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<strings>
- <string id="30001">Preferred Quality</string>
- <string id="30002">Preferred Channel Image</string>
- <string id="30010">General Channel</string>
- <string id="30011">Regional Channel</string>
- <string id="30012">Cultural Channel</string>
- <string id="30013">Special Interest Channel</string>
- <string id="30014">News Channel</string>
+ <string id="30001">General</string>
+ <string id="30002">Channel Genres</string>
+ <string id="30010">Preferred Quality</string>
+ <string id="30011">Prefer SD</string>
+ <string id="30012">Prefer HD</string>
+ <string id="30013">Show SD & HD</string>
+ <string id="30020">Preferred Channel Image</string>
+ <string id="30021">Poster</string>
+ <string id="30022">Thumbnail</string>
+ <string id="30030">Network Categories</string>
+ <string id="30031">Only Public Networks</string>
+ <string id="30032">Only Commercial Networks</string>
+ <string id="30033">All</string>
+ <string id="30040">Hierarchical Menu</string>
+ <string id="30080">General Channels</string>
+ <string id="30081">Regional Channels</string>
+ <string id="30082">Cultural Channels</string>
+ <string id="30083">Special Interest Channels</string>
+ <string id="30084">News Channels</string>
+ <string id="30090">General Channel</string>
+ <string id="30091">Regional Channel</string>
+ <string id="30092">Cultural Channel</string>
+ <string id="30093">Special Interest Channel</string>
+ <string id="30094">News Channel</string>
<string id="30101">Das Erste ("The First"), rarely also called Erstes
Deutsches Fernsehen ("First German Television"), is the principal publicly
owned television channel in Germany. It is a joint production of Germany's
regional public broadcasters acting through, and coordinated by the ARD
consortium.</string>
<string id="30102">Zweites Deutsches Fernsehen (English: "Second German
Television"), ZDF, is a public-service German television broadcaster based in
Mainz (Rheinland-Pfalz). It is run as an independent non-profit institution,
which was founded by all federal states of Germany (Bundesländer). ZDF is
financed by television licence fees and advertising revenues.</string>
<string id="30103">Bayerischer Rundfunk (Bavarian Broadcasting, BR) is
public-service radio and television broadcaster, based in Munich, capital city
of the Free State of Bavaria in Germany. BR is a member organization of the ARD
consortium of public broadcasters in Germany.</string>
@@ -36,11 +53,11 @@
<string id="30127"> </string>
<string id="30128"> </string>
<string id="30129"> </string>
- <string id="30130"> </string>
- <string id="30131"> </string>
- <string id="30132"> </string>
- <string id="30133"> </string>
- <string id="30134"> </string>
+ <string id="30130">RTL Television (formerly RTL plus), or simply RTL,
is a German commercial television station distributed via cable and satellite,
as well as via digital terrestrial (DVB-T) in more highly populated areas. It
is owned by the RTL Group and is, in terms of market share, Germany's largest
private free-to-air broadcaster.</string>
+ <string id="30131">VOX or Vox is a German television channel,
headquartered in Cologne and part of the RTL Group, Europe's second largest TV,
radio, and production company. The channel officially launched at 5:00pm on
January 25, 1993. Prior to that, test transmissions had been made using the
informal name Westschienenkanal (West slot channel, a reference to
Nordschienenkanal and Südschienenkanal, the informal names used in the 1980s
for the other two German private channels RTL Television and Sat.1). The
channel mainly broadcasts documentaries and U.S. series and movies.</string>
+ <string id="30132">RTL II is a commercial, privately owned,
general-interest German television channel. In 2012 the channel had a market
share of 4% among viewers aged over three.</string>
+ <string id="30133">Super RTL is a Cologne-based German television
network operated by RTL Disney Fernsehen GmbH & Co. KG. It was the second
German television channel aimed mostly at children (the first was Nickelodeon
and Cartoon Network). It was launched in 1995 as a joint venture between RTL
Group predecessor company Compagnie Luxembourgeoise de Télédiffusion and The
Walt Disney Company.</string>
+ <string id="30134">n-tv is a German television news channel owned by
the Bertelsmann AG Media's RTL Group and an affiliate network of CNN since the
networks creation in 1992. n-tv screens news bulletins on the hour and half
hour; in between, it broadcasts informational programmes and
advertising.</string>
<string id="30135"> </string>
<string id="30136"> </string>
<string id="30137"> </string>
diff --git a/plugin.video.entertain/resources/language/German/strings.xml
b/plugin.video.entertain/resources/language/German/strings.xml
index e144213..c04299d 100644
--- a/plugin.video.entertain/resources/language/German/strings.xml
+++ b/plugin.video.entertain/resources/language/German/strings.xml
@@ -1,12 +1,29 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<strings>
- <string id="30001">Bevorzugte Qualität</string>
- <string id="30002">Senderlogo Format</string>
- <string id="30010">Vollprogramm</string>
- <string id="30011">Regionalprogramm</string>
- <string id="30012">Kulturprogramm</string>
- <string id="30013">Spartenprogramm</string>
- <string id="30014">Nachrichten</string>
+ <string id="30001">Allgemein</string>
+ <string id="30002">Sendersparten</string>
+ <string id="30010">Bevorzugte Qualität</string>
+ <string id="30011">SD bevorzugen</string>
+ <string id="30012">HD bevorzugen</string>
+ <string id="30013">SD & HD anzeigen</string>
+ <string id="30020">Senderlogo Format</string>
+ <string id="30021">Poster</string>
+ <string id="30022">Thumbnail</string>
+ <string id="30030">Angezeigte Senderkategorie</string>
+ <string id="30031">Nur öffentlich rechtliche</string>
+ <string id="30032">Nur private</string>
+ <string id="30033">Alle</string>
+ <string id="30040">Hierarchische Sendermenü</string>
+ <string id="30080">Vollprogramme</string>
+ <string id="30081">Regionalprogramme</string>
+ <string id="30082">Kulturprogramme</string>
+ <string id="30083">Spartenprogramme</string>
+ <string id="30084">Nachrichtenprogramme</string>
+ <string id="30090">Vollprogramm</string>
+ <string id="30091">Regionalprogramm</string>
+ <string id="30092">Kulturprogramm</string>
+ <string id="30093">Spartenprogramm</string>
+ <string id="30094">Nachrichten</string>
<string id="30101">Das Erste ist das erste öffentlich-rechtliche
nationale Fernsehprogramm Deutschlands. Das deutschlandweite Fernsehprogramm
ist eine Gemeinschaftsproduktion aller angeschlossenen Rundfunkanstalten der
ARD auÃer der Deutschen Welle. Der Sender startete nach zweijähriger
Testphase offiziell am 25. Dezember 1952 als NWDR-Fernsehen und wurde zunächst
unter der Federführung des damaligen NWDRs betrieben. Ab dem 1. November 1954
wurde der Sender schlieÃlich als Gemeinschaftsprogramm der
Landesrundfunkanstalten unter dem Namen Deutsches Fernsehen betrieben. Seit
1996 lautet die offizielle Kurzform âDas Ersteâ, der vollständige Name
lautet weiterhin âErstes Deutsches Fernsehenâ. Umgangssprachlich wird der
Sender auch Erstes Programm oder metonymisch ARD genannt. </string>
<string id="30102">Das Zweite Deutsche Fernsehen (ZDF) ist eine der
gröÃten öffentlich-rechtlichen Sendeanstalten Europas mit Sitz in der
rheinland-pfälzischen Landeshauptstadt Mainz. Gemeinsam mit den in der ARD
zusammengeschlossenen Landesrundfunkanstalten und dem Deutschlandradio bildet
das ZDF den öffentlich-rechtlichen Rundfunk in Deutschland. Das ZDF startete
mit ca. 2200 fest angestellten Mitarbeitern und beschäftigt heute ca. 3600
Mitarbeiter.</string>
<string id="30103">Der Bayerische Rundfunk (BR) ist eine Anstalt des
öffentlichen Rechts. Er sendet als Landesrundfunkanstalt für den Freistaat
Bayern mit Sitz in München Hörfunk und Fernsehen. Der BR ist Mitglied der
ARD.</string>
@@ -36,11 +53,11 @@
<string id="30127"> </string>
<string id="30128"> </string>
<string id="30129"> </string>
- <string id="30130"> </string>
- <string id="30131"> </string>
- <string id="30132"> </string>
- <string id="30133"> </string>
- <string id="30134"> </string>
+ <string id="30130">RTL Television (ursprünglich auf Sendung gegangen
unter dem Namen RTL plus), kurz RTL, ist ein deutschsprachiger Privatsender der
RTL Group mit Sitz in Köln. Entstanden ist RTL als Ableger des
deutschsprachigen Radioprogramms Radio Luxemburg. Aus diesem Grunde gab es in
den ersten Jahren noch den Senderzusatz plus. RTL Television gilt in
Deutschland als Vollprogramm nach dem 2. Rundfunkstaatsvertrag und beschäftigt
heute nach Auslagerung der Nachrichten und der Technik ca. 500 fest angestellte
Mitarbeiter (Stand: 8/2010).</string>
+ <string id="30131">VOX ist ein deutschsprachiger Privatsender der RTL
Group mit Sitz in Köln, der aus dem Westschienenkanal Film- und Fernseh-GmbH
& Co. KG hervorging. Diesem wurde am 20. November 1991 nach dem
Satellitenstaatsvertrag (SatStV) eine Teillizenz zur Veranstaltung eines
Fernsehvollprogramms gemeinsam mit der DCTP (Development Company for Television
Program) erteilt. Seit dem 1. Januar 2011 hält VOX die Sendelizenz alleine.
VOX gehört seit 1999 dem deutschen Senderverbund der Mediengruppe RTL
Deutschland an. IP Deutschland ist das Vermarktungsunternehmen von VOX. Es
verkauft unter anderem die Werbezeiten.</string>
+ <string id="30132">RTL II ist ein deutschsprachiger Fernsehsender, der
von der RTL2 Fernsehen GmbH & Co. KG betrieben wird. RTL II ist gemäà dem
Rundfunkstaatsvertrag ein privater Fernsehsender mit Vollprogramm. Für
Ãsterreich und die Schweiz werden Varianten des Hauptprogramms mit national
eingefügten Werbeinseln produziert; diese Varianten sind über die Kabelnetze
in diesen beiden Ländern sowie über Digitalsatellit zu empfangen. RTL II ist
in Deutschland der zweite Ableger der RTL Group.</string>
+ <string id="30133">Super RTL ist ein Spartensender der RTL Group, der
sich hauptsächlich an Kinder und Jugendliche richtet. Super RTL sieht sich
selbst als Familiensender. Seit Februar 1998 ist Super RTL Marktführer bei den
3- bis 13-Jährigen und hat in dieser Zielgruppe einen Marktanteil von 24
Prozent.</string>
+ <string id="30134">n-tv ist ein von der n-tv Nachrichtenfernsehen GmbH
betriebener Nachrichtensender, der zur RTL Group gehört. Am 30. November 1992
startete n-tv in Berlin nach DW-TV als zweiter deutscher TV-Nachrichtensender.
Seit der Jahrtausendwende hat der Anteil der Nachrichten kontinuierlich
zugunsten von Infotainment und Dokumentationen abgenommen.</string>
<string id="30135"> </string>
<string id="30136"> </string>
<string id="30137"> </string>
diff --git a/plugin.video.entertain/resources/settings.xml
b/plugin.video.entertain/resources/settings.xml
index 44fe109..d2d4992 100644
--- a/plugin.video.entertain/resources/settings.xml
+++ b/plugin.video.entertain/resources/settings.xml
@@ -1,5 +1,15 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<settings>
- <setting id="quality" type="enum" label="30001" values="SD|HD|SD &
HD" default="2" />
- <setting id="channelimage" type="enum" label="30002"
values="Poster|Thumbnails" default="0" />
+ <category label="30001">
+ <setting id="quality" type="enum" label="30010"
lvalues="30011|30012|30013" default="2" />
+ <setting id="channelimage" type="enum" label="30020"
lvalues="30021|30022" default="0" />
+ <setting id="categories" type="enum" label="30030"
lvalues="30031|30032|30033" default="2" />
+ </category>
+ <category label="30002">
+ <setting id="cat_general" type="bool" label="30080"
default="true" />
+ <setting id="cat_regional" type="bool" label="30081"
default="true" />
+ <setting id="cat_cultural" type="bool" label="30082"
default="true" />
+ <setting id="cat_special" type="bool" label="30083"
default="true" />
+ <setting id="cat_news" type="bool" label="30084"
default="true" />
+ </category>
</settings>
-----------------------------------------------------------------------
Summary of changes:
plugin.video.entertain/addon.py | 145 ++++++++++++--------
plugin.video.entertain/addon.xml | 8 +-
plugin.video.entertain/changelog.txt | 18 +++
plugin.video.entertain/resources/fanart/3sat.jpg | Bin 0 -> 106134 bytes
plugin.video.entertain/resources/fanart/arte.jpg | Bin 0 -> 99537 bytes
plugin.video.entertain/resources/fanart/arte.png | Bin 1236791 -> 0 bytes
plugin.video.entertain/resources/fanart/br.jpg | Bin 0 -> 953956 bytes
.../resources/fanart/das-erste.jpg | Bin 0 -> 111085 bytes
.../resources/fanart/das-erste.png | Bin 387269 -> 0 bytes
.../resources/fanart/default.jpg | Bin 0 -> 143888 bytes
.../resources/fanart/default.png | Bin 1295896 -> 0 bytes
plugin.video.entertain/resources/fanart/hr.jpg | Bin 0 -> 396349 bytes
plugin.video.entertain/resources/fanart/mdr.jpg | Bin 0 -> 498329 bytes
plugin.video.entertain/resources/fanart/zdf.jpg | Bin 0 -> 65022 bytes
plugin.video.entertain/resources/fanart/zdf.png | Bin 185564 -> 0 bytes
plugin.video.entertain/resources/icons/3sat.jpg | Bin 0 -> 6592 bytes
plugin.video.entertain/resources/icons/arte.jpg | Bin 0 -> 4901 bytes
plugin.video.entertain/resources/icons/arte.png | Bin 20516 -> 0 bytes
plugin.video.entertain/resources/icons/br.jpg | Bin 0 -> 6357 bytes
.../resources/icons/das-erste.jpg | Bin 0 -> 8925 bytes
.../resources/icons/das-erste.png | Bin 20597 -> 0 bytes
plugin.video.entertain/resources/icons/default.jpg | Bin 0 -> 10722 bytes
plugin.video.entertain/resources/icons/default.png | Bin 74269 -> 0 bytes
plugin.video.entertain/resources/icons/hr.jpg | Bin 0 -> 5541 bytes
plugin.video.entertain/resources/icons/mdr.jpg | Bin 0 -> 9206 bytes
plugin.video.entertain/resources/icons/zdf.jpg | Bin 0 -> 5782 bytes
plugin.video.entertain/resources/icons/zdf.png | Bin 5730 -> 0 bytes
.../resources/language/English/strings.xml | 41 ++++--
.../resources/language/German/strings.xml | 41 ++++--
.../resources/language/Italian/strings.xml | 66 +++++++++
plugin.video.entertain/resources/poster/3sat.jpg | Bin 0 -> 14435 bytes
plugin.video.entertain/resources/poster/arte.jpg | Bin 0 -> 8569 bytes
plugin.video.entertain/resources/poster/arte.png | Bin 29284 -> 0 bytes
plugin.video.entertain/resources/poster/br.jpg | Bin 0 -> 19322 bytes
.../resources/poster/das-erste.jpg | Bin 0 -> 26032 bytes
.../resources/poster/das-erste.png | Bin 31937 -> 0 bytes
.../resources/poster/default.jpg | Bin 0 -> 28452 bytes
.../resources/poster/default.png | Bin 181338 -> 0 bytes
plugin.video.entertain/resources/poster/hr.jpg | Bin 0 -> 16704 bytes
plugin.video.entertain/resources/poster/mdr.jpg | Bin 0 -> 101103 bytes
plugin.video.entertain/resources/poster/zdf.jpg | Bin 0 -> 10257 bytes
plugin.video.entertain/resources/poster/zdf.png | Bin 21559 -> 0 bytes
plugin.video.entertain/resources/settings.xml | 14 ++-
.../resources/thumbnails/3sat.jpg | Bin 0 -> 12714 bytes
.../resources/thumbnails/arte.jpg | Bin 0 -> 13885 bytes
.../resources/thumbnails/arte.png | Bin 104789 -> 0 bytes
plugin.video.entertain/resources/thumbnails/br.jpg | Bin 0 -> 18987 bytes
.../resources/thumbnails/das-erste.jpg | Bin 0 -> 13108 bytes
.../resources/thumbnails/das-erste.png | Bin 62797 -> 0 bytes
.../resources/thumbnails/default.jpg | Bin 0 -> 54670 bytes
.../resources/thumbnails/default.png | Bin 320016 -> 0 bytes
plugin.video.entertain/resources/thumbnails/hr.jpg | Bin 0 -> 17837 bytes
.../resources/thumbnails/mdr.jpg | Bin 0 -> 18839 bytes
.../resources/thumbnails/zdf.jpg | Bin 0 -> 15401 bytes
.../resources/thumbnails/zdf.png | Bin 15383 -> 0 bytes
55 files changed, 244 insertions(+), 89 deletions(-)
create mode 100644 plugin.video.entertain/resources/fanart/3sat.jpg
create mode 100644 plugin.video.entertain/resources/fanart/arte.jpg
delete mode 100644 plugin.video.entertain/resources/fanart/arte.png
create mode 100644 plugin.video.entertain/resources/fanart/br.jpg
create mode 100644 plugin.video.entertain/resources/fanart/das-erste.jpg
delete mode 100644 plugin.video.entertain/resources/fanart/das-erste.png
create mode 100644 plugin.video.entertain/resources/fanart/default.jpg
delete mode 100644 plugin.video.entertain/resources/fanart/default.png
create mode 100644 plugin.video.entertain/resources/fanart/hr.jpg
create mode 100644 plugin.video.entertain/resources/fanart/mdr.jpg
create mode 100644 plugin.video.entertain/resources/fanart/zdf.jpg
delete mode 100644 plugin.video.entertain/resources/fanart/zdf.png
create mode 100644 plugin.video.entertain/resources/icons/3sat.jpg
create mode 100644 plugin.video.entertain/resources/icons/arte.jpg
delete mode 100644 plugin.video.entertain/resources/icons/arte.png
create mode 100644 plugin.video.entertain/resources/icons/br.jpg
create mode 100644 plugin.video.entertain/resources/icons/das-erste.jpg
delete mode 100644 plugin.video.entertain/resources/icons/das-erste.png
create mode 100644 plugin.video.entertain/resources/icons/default.jpg
delete mode 100644 plugin.video.entertain/resources/icons/default.png
create mode 100644 plugin.video.entertain/resources/icons/hr.jpg
create mode 100644 plugin.video.entertain/resources/icons/mdr.jpg
create mode 100644 plugin.video.entertain/resources/icons/zdf.jpg
delete mode 100644 plugin.video.entertain/resources/icons/zdf.png
create mode 100644
plugin.video.entertain/resources/language/Italian/strings.xml
create mode 100644 plugin.video.entertain/resources/poster/3sat.jpg
create mode 100644 plugin.video.entertain/resources/poster/arte.jpg
delete mode 100644 plugin.video.entertain/resources/poster/arte.png
create mode 100644 plugin.video.entertain/resources/poster/br.jpg
create mode 100644 plugin.video.entertain/resources/poster/das-erste.jpg
delete mode 100644 plugin.video.entertain/resources/poster/das-erste.png
create mode 100644 plugin.video.entertain/resources/poster/default.jpg
delete mode 100644 plugin.video.entertain/resources/poster/default.png
create mode 100644 plugin.video.entertain/resources/poster/hr.jpg
create mode 100644 plugin.video.entertain/resources/poster/mdr.jpg
create mode 100644 plugin.video.entertain/resources/poster/zdf.jpg
delete mode 100644 plugin.video.entertain/resources/poster/zdf.png
create mode 100644 plugin.video.entertain/resources/thumbnails/3sat.jpg
create mode 100644 plugin.video.entertain/resources/thumbnails/arte.jpg
delete mode 100644 plugin.video.entertain/resources/thumbnails/arte.png
create mode 100644 plugin.video.entertain/resources/thumbnails/br.jpg
create mode 100644 plugin.video.entertain/resources/thumbnails/das-erste.jpg
delete mode 100644 plugin.video.entertain/resources/thumbnails/das-erste.png
create mode 100644 plugin.video.entertain/resources/thumbnails/default.jpg
delete mode 100644 plugin.video.entertain/resources/thumbnails/default.png
create mode 100644 plugin.video.entertain/resources/thumbnails/hr.jpg
create mode 100644 plugin.video.entertain/resources/thumbnails/mdr.jpg
create mode 100644 plugin.video.entertain/resources/thumbnails/zdf.jpg
delete mode 100644 plugin.video.entertain/resources/thumbnails/zdf.png
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
CenturyLink Cloud: The Leader in Enterprise Cloud Services.
Learn Why More Businesses Are Choosing CenturyLink Cloud For
Critical Workloads, Development Environments & Everything In Between.
Get a Quote or Start a Free Trial Today.
http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk
_______________________________________________
Xbmc-addons mailing list
Xbmc-addons@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
