mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 02:11:04 +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
------------------
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 is contained in:
Thilo Graf
2016-11-15 19:49:27 +01:00
parent 3b78068800 66639b877f
commit ffa144101a
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_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",