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

Merge branch 'master' into pu/msgbox

Browse Source 
Conflicts:
    	src/gui/followscreenings.cpp
This commit is contained in:
Thilo Graf
2016-11-15 19:49:27 +01:00
parent c8ad32b1e4 d6cb1d206f
commit 2e8c700dd2
8 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/system/locals.h
View File

@@ -1457,6 +1457,7 @@ typedef enum
LOCALE_MENU_HINT_SW_UPDATE,
LOCALE_MENU_HINT_THEME,
LOCALE_MENU_HINT_TIMEOUTS,
LOCALE_MENU_HINT_TIMER_FOLLOWSCREENINGS,
LOCALE_MENU_HINT_TIMERS,
LOCALE_MENU_HINT_TIMEZONE,
LOCALE_MENU_HINT_TMDB_API_KEY,
@@ -2409,6 +2410,7 @@ typedef enum
LOCALE_TIMERLIST_WEEKDAYS,
LOCALE_TIMERLIST_WEEKDAYS_HINT_1,
LOCALE_TIMERLIST_WEEKDAYS_HINT_2,
LOCALE_TIMERSETTINGS_FOLLOWSCREENINGS,
LOCALE_TIMERSETTINGS_RECORD_SAFETY_TIME_AFTER,
LOCALE_TIMERSETTINGS_RECORD_SAFETY_TIME_AFTER_HINT_1,
LOCALE_TIMERSETTINGS_RECORD_SAFETY_TIME_AFTER_HINT_2,