mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-02 10:21:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pu/cc' into next-cc

Browse Source 
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
This commit is contained in:
[CST] Focus
2013-04-17 13:32:12 +04:00
parent 9f0816bc60 df0a454efe
commit 8bb70d1ab3
86 changed files with 5196 additions and 1514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/system/locals_intern.h
View File

@@ -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",