vanhofen bee773c61a Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox ...

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4e868c860a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-16 (Sat, 16 Sep 2017)



------------------
This commit was generated by Migit

2017-09-16 13:01:20 +02:00

..

fonts

fonts: add ubuntumono-r-webfont.ttf

2017-06-07 14:07:08 +02:00

icons

icons: rename slider icons to more logical names

2017-09-15 20:18:26 +02:00

inetradio

radio-favorites.xml: add new sample entry

2017-06-27 23:45:57 +02:00

initial

…

iso-codes

…

lcd

…

license

…

locale

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

2017-09-16 13:01:20 +02:00

neutrino-scripts

…

pictures

icons: move NI icons into categorized subdirectories

2016-12-07 11:14:14 +01:00

scripts

NI-code: Rename hardware defined macros for coolstream stb

2017-02-12 21:57:06 +01:00

themes

themes: add new shadow-color to our material themes

2017-08-12 13:51:00 +02:00

webtv

webtv: update filmon.xml

2017-08-31 15:12:58 +02:00

y-web

yWeb: align cifs-mounts to new automount-syntax

2017-09-14 12:14:41 +02:00

bad_package_pattern.list.sample

…

cables.xml

cables.xml: update Antennengemeinschaft "Goeltzschtalbruecke"

2017-05-17 17:23:22 +02:00

encoding.conf

…

epglanguages.conf

…

epgmap.xml

…

Makefile.am

add webtv-scripts/sources to neutrino-repo; will be auto-loaded at start

2017-08-31 08:59:06 +02:00

mk_terrestrial_xml.pl

…

providermap.xml

…

satellites.xml

…

settingsupdate.conf

…

terrestrial.xml

…

tobackup.conf

…

webtv_usr.xml

…