Merge branch 'check/next-cc'

it compiles, but is not really tested...

Conflicts:
	src/driver/netfile.cpp
	src/driver/volume.cpp
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bookmarkmanager.cpp
	src/gui/bouquetlist.cpp
	src/gui/eventlist.cpp
	src/gui/movieplayer.cpp
	src/gui/pictureviewer.cpp
	src/gui/scan.cpp
	src/gui/test_menu.h
	src/gui/timerlist.cpp
	src/gui/update.cpp
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/system/flashtool.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/femanager.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: d5d5a60261
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-16 (Sun, 16 Jun 2013)



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

data/locale/Makefile.am

@@ -1,6 +1,7 @@
 installdir = $(DATADIR)/neutrino/locale
 
 locale = \
+	nederlands.locale \
 	deutsch.locale \
 	english.locale
 
@@ -12,7 +13,6 @@ locale_unmaintained = \
 	unmaintained/czech.locale \
 	unmaintained/francais.locale \
 	unmaintained/italiano.locale \
-	unmaintained/nederlands.locale \
 	unmaintained/polski.locale \
 	unmaintained/portugues.locale \
 	unmaintained/russkij.locale \