Merge branch 'pu/cc' into next-cc

Conflicts:
	acinclude.m4
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/volume.cpp
	src/eitd/SIlanguage.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bedit/bouqueteditor_chanselect.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/eventlist.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan.h
	src/gui/test_menu.cpp
	src/gui/timeosd.cpp
	src/gui/widget/progressbar.cpp
	src/gui/widget/progressbar.h
	src/neutrino.cpp
	src/nhttpd/yconfig.h


Origin commit data
------------------
Commit: 8bb70d1ab3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-17 (Wed, 17 Apr 2013)

src/system/locals_intern.h

@@ -348,6 +348,8 @@ const char * locale_real_names[] =
 	"eventfinder.search_within_list",
 	"eventfinder.searching",
 	"eventfinder.start_search",
+	"eventlist.additional",
+	"eventlist.name",
 	"eventlistbar.channelswitch",
 	"eventlistbar.eventsort",
 	"eventlistbar.recordevent",
@@ -562,6 +564,7 @@ const char * locale_real_names[] =
 	"fontsize.epg_info2",
 	"fontsize.epg_title",
 	"fontsize.eventlist_datetime",
+	"fontsize.eventlist_event",
 	"fontsize.eventlist_itemlarge",
 	"fontsize.eventlist_itemsmall",
 	"fontsize.eventlist_title",
@@ -610,6 +613,7 @@ const char * locale_real_names[] =
 	"imageinfo.head",
 	"imageinfo.homepage",
 	"imageinfo.image",
+	"imageinfo.kernel",
 	"imageinfo.license",
 	"imageinfo.version",
 	"inetradio.name",
@@ -797,7 +801,9 @@ const char * locale_real_names[] =
 	"menu.hint_epg_save",
 	"menu.hint_epg_save_standby",
 	"menu.hint_event_textcolor",
+	"menu.hint_eventlist_additional",
 	"menu.hint_eventlist_fonts",
+	"menu.hint_eventlist_setup",
 	"menu.hint_extended",
 	"menu.hint_factory",
 	"menu.hint_fade",