mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 10:21:04 +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.h
View File

@@ -1348,6 +1348,7 @@ typedef enum
LOCALE_MENU_HINT_MISC_EPG,
LOCALE_MENU_HINT_MISC_FILEBROWSER,
LOCALE_MENU_HINT_MISC_GENERAL,
LOCALE_MENU_HINT_MISC_ONLINESERVICES,
LOCALE_MENU_HINT_MISC_ZAPIT,
LOCALE_MENU_HINT_MOVIE,
LOCALE_MENU_HINT_MOVIEBROWSER_FONTS,
@@ -1576,6 +1577,7 @@ typedef enum
LOCALE_MENU_HINT_SERVICE,
LOCALE_MENU_HINT_SERVICE_SCAN,
LOCALE_MENU_HINT_SETTINGS,
LOCALE_MENU_HINT_SHOUTCAST_DEV_ID,
LOCALE_MENU_HINT_SHOW_MUTE_ICON,
LOCALE_MENU_HINT_SHUTDOWN,
LOCALE_MENU_HINT_SHUTDOWN_COUNT,
@@ -1603,6 +1605,7 @@ typedef enum
LOCALE_MENU_HINT_TIMEOUTS,
LOCALE_MENU_HINT_TIMERS,
LOCALE_MENU_HINT_TIMEZONE,
LOCALE_MENU_HINT_TMDB_API_KEY,
LOCALE_MENU_HINT_TOOLS,
LOCALE_MENU_HINT_TVMODE,
LOCALE_MENU_HINT_TVRADIO_SWITCH,
@@ -1641,6 +1644,7 @@ typedef enum
LOCALE_MENU_HINT_WEBTV_SETUP,
LOCALE_MENU_HINT_WEBTV_XML_AUTO,
LOCALE_MENU_HINT_WINDOW_SIZE,
LOCALE_MENU_HINT_YOUTUBE_DEV_ID,
LOCALE_MENU_HINT_YTPLAY,
LOCALE_MENU_HINT_YTPLAY_SETUP,
LOCALE_MENU_HINT_ZAP_CYCLE,
@@ -1721,6 +1725,7 @@ typedef enum
LOCALE_MISCSETTINGS_INFOBAR_SHOW_SYSFS_HDD,
LOCALE_MISCSETTINGS_INFOBAR_SHOW_TUNER,
LOCALE_MISCSETTINGS_INFOCLOCK,
LOCALE_MISCSETTINGS_ONLINESERVICES,
LOCALE_MISCSETTINGS_PROGRESSBAR,
LOCALE_MISCSETTINGS_PROGRESSBAR_COLOR,
LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN,
@@ -2504,6 +2509,7 @@ typedef enum
LOCALE_SETTINGS_TEAMS_HELP_TEXT,
LOCALE_SETTINGS_TEAMS_RESTORE,
LOCALE_SETTINGS_TEAMS_RESTORE_WARN,
LOCALE_SHOUTCAST_DEV_ID,
LOCALE_SHUTDOWN_RECORDING_QUERY,
LOCALE_SHUTDOWNTIMER_ANNOUNCE,
LOCALE_SLEEPTIMERBOX_ANNOUNCE,
@@ -2623,6 +2629,7 @@ typedef enum
LOCALE_TIMING_MENU,
LOCALE_TIMING_NUMERICZAP,
LOCALE_TIMING_VOLUMEBAR,
LOCALE_TMDB_API_KEY,
LOCALE_TMDB_INFO,
LOCALE_TMDB_READ_DATA,
LOCALE_UNICABLE_LNB,
@@ -2732,6 +2739,7 @@ typedef enum
LOCALE_WIZARD_WELCOME_TEXT,
LOCALE_WORD_FROM,
LOCALE_WORD_IN,
LOCALE_YOUTUBE_DEV_ID,
LOCALE_ZAPIT_SCANTYPE,
LOCALE_ZAPIT_SCANTYPE_ALL,
LOCALE_ZAPIT_SCANTYPE_RADIO,