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

Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next

Browse Source 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/epgview.cpp
	src/neutrino.cpp
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4d898949e3
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-06 (Sat, 06 Aug 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-08-06 23:06:36 +02:00
parent 54155f4a28 8cd6181b9c
commit b679fea30f
13 changed files with 116 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/system/locals_intern.h
View File

@@ -1348,6 +1348,7 @@ const char * locale_real_names[] =
"menu.hint_misc_epg",
"menu.hint_misc_filebrowser",
"menu.hint_misc_general",
"menu.hint_misc_onlineservices",
"menu.hint_misc_zapit",
"menu.hint_movie",
"menu.hint_moviebrowser_fonts",
@@ -1576,6 +1577,7 @@ const char * locale_real_names[] =
"menu.hint_service",
"menu.hint_service_scan",
"menu.hint_settings",
"menu.hint_shoutcast_dev_id",
"menu.hint_show_mute_icon",
"menu.hint_shutdown",
"menu.hint_shutdown_count",
@@ -1603,6 +1605,7 @@ const char * locale_real_names[] =
"menu.hint_timeouts",
"menu.hint_timers",
"menu.hint_timezone",
"menu.hint_tmdb_api_key",
"menu.hint_tools",
"menu.hint_tvmode",
"menu.hint_tvradio_switch",
@@ -1641,6 +1644,7 @@ const char * locale_real_names[] =
"menu.hint_webtv_setup",
"menu.hint_webtv_xml_auto",
"menu.hint_window_size",
"menu.hint_youtube_dev_id",
"menu.hint_ytplay",
"menu.hint_ytplay_setup",
"menu.hint_zap_cycle",
@@ -1721,6 +1725,7 @@ const char * locale_real_names[] =
"miscsettings.infobar_show_sysfs_hdd",
"miscsettings.infobar_show_tuner",
"miscsettings.infoclock",
"miscsettings.onlineservices",
"miscsettings.progressbar",
"miscsettings.progressbar_color",
"miscsettings.progressbar_design",
@@ -2504,6 +2509,7 @@ const char * locale_real_names[] =
"settings.teams.help_text",
"settings.teams.restore",
"settings.teams.restore_warn",
"shoutcast.dev_id",
"shutdown.recording_query",
"shutdowntimer.announce",
"sleeptimerbox.announce",
@@ -2623,6 +2629,7 @@ const char * locale_real_names[] =
"timing.menu",
"timing.numericzap",
"timing.volumebar",
"tmdb.api_key",
"tmdb.info",
"tmdb.read_data",
"unicable.lnb",
@@ -2732,6 +2739,7 @@ const char * locale_real_names[] =
"wizard.welcome_text",
"word.from",
"word.in",
"youtube.dev_id",
"zapit.scantype",
"zapit.scantype.all",
"zapit.scantype.radio",