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

Merge branch 'master' into pu/msgbox

Browse Source 
Conflicts:
 	src/gui/followscreenings.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2e8c700dd2
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-15 (Tue, 15 Nov 2016)

Origin message was:
------------------
Merge branch 'master' into pu/msgbox

Conflicts:
  	src/gui/followscreenings.cpp


------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2016-11-15 19:49:27 +01:00
parent 4d952e9f00 715af20490
commit 4aa0dca60b
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,

2
src/system/locals_intern.h
View File

@@ -1457,6 +1457,7 @@ const char * locale_real_names[] =
"menu.hint_sw_update",
"menu.hint_theme",
"menu.hint_timeouts",
"menu.hint_timer_followscreenings",
"menu.hint_timers",
"menu.hint_timezone",
"menu.hint_tmdb_api_key",
@@ -2409,6 +2410,7 @@ const char * locale_real_names[] =
"timerlist.weekdays",
"timerlist.weekdays.hint_1",
"timerlist.weekdays.hint_2",
"timersettings.followscreenings",
"timersettings.record_safety_time_after",
"timersettings.record_safety_time_after.hint_1",
"timersettings.record_safety_time_after.hint_2",

1
src/system/settings.h
View File

@@ -460,6 +460,7 @@ struct SNeutrinoSettings
int recording_startstop_msg;
int shutdown_timer_record_type;
std::vector<timer_remotebox_item> timer_remotebox_ip;
int timer_followscreenings;
std::string recording_filename_template;
int recording_already_found_check;