mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-26 23:13:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ni/mp' into ni/cst-next

Browse Source 
Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/Makefile.am
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libdvbsub/dvbsub.cpp
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/gui/dboxinfo.cpp
	src/gui/movieplayer.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/Makefile.am
	src/system/flashtool.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 161347db29
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-08-26 19:13:47 +02:00
parent 8f2cbeb841 73da438ec4
commit af8fe3ebc6
220 changed files with 7577 additions and 1615 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
data/locale/Makefile.am
View File

@@ -21,7 +21,7 @@ locale_unmaintained = \
unmaintained/svenska.locale
install_DATA = $(locale)
#install_DATA += $(locale_unmaintained)
# install_DATA += $(locale_unmaintained)
if MAINTAINER_MODE
@@ -38,12 +38,12 @@ sort-locals:
work-locals: $(master.locale)
for locale in $(locale); do \
$(top_srcdir)/data/locale/helpers/create-locals-work $${locale}; \
( cd $(top_srcdir)/data/locale; helpers/create-locals-work $${locale}; ); \
done
ordercheck: $(master.locale)
cut -d' ' -f1 $(master.locale) | LC_ALL=C sort | uniq > /tmp/log
cut -d' ' -f1 $(master.locale) | uniq | diff - /tmp/log || \
cut -d' ' -f1 $(top_srcdir)/data/locale/$(master.locale) | LC_ALL=C sort | uniq > /tmp/log
cut -d' ' -f1 $(top_srcdir)/data/locale/$(master.locale) | uniq | diff - /tmp/log || \
(echo "ERROR: $(master.locale) not ordered or contains empty lines" && false)
locals.h: ordercheck
@@ -61,8 +61,8 @@ check: locals.h locals_intern.h
install-locals: $(locale) locals.h locals_intern.h
cp locals.h locals_intern.h $(top_srcdir)/src/system
@echo "Consider committing src/system/[locals.h locals_intern.h]"
cp -f $(locale) $(top_srcdir)/data/locale
@echo "Consider committing data/locale/[$(locale)]"
## ??? cp -f $(locale) $(top_srcdir)/data/locale
## @echo "Consider committing data/locale/[$(locale)]"
locals-clean:
rm -f locals.h locals_intern.h $(locale)