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/moviebrowser/mb.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3efaac5725
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-10 (Thu, 10 Nov 2016)



------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2016-11-10 10:27:22 +01:00
parent 7fe97fde28 c4bbe9d2c2
commit 0018c2b158
22 changed files with 707 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/system/locals.h
View File

@@ -1662,6 +1662,7 @@ typedef enum
LOCALE_MOVIEBROWSER_BOOK_TYPE,
LOCALE_MOVIEBROWSER_BOOK_TYPE_BACKWARD,
LOCALE_MOVIEBROWSER_BOOK_TYPE_FORWARD,
LOCALE_MOVIEBROWSER_BROWSER_ADDITIONAL,
LOCALE_MOVIEBROWSER_BROWSER_FRAME_HIGH,
LOCALE_MOVIEBROWSER_BROWSER_ROW_HEAD,
LOCALE_MOVIEBROWSER_BROWSER_ROW_ITEM,
@@ -1690,6 +1691,7 @@ typedef enum
LOCALE_MOVIEBROWSER_EDIT_BOOK_TYPE_INFO2,
LOCALE_MOVIEBROWSER_EDIT_SERIE,
LOCALE_MOVIEBROWSER_ERROR_NO_MOVIES,
LOCALE_MOVIEBROWSER_FILTER_OFF,
LOCALE_MOVIEBROWSER_FOOT_FILTER,
LOCALE_MOVIEBROWSER_FOOT_FOCUS,
LOCALE_MOVIEBROWSER_FOOT_OPTIONS,

2
src/system/locals_intern.h
View File

@@ -1662,6 +1662,7 @@ const char * locale_real_names[] =
"moviebrowser.book_type",
"moviebrowser.book_type_backward",
"moviebrowser.book_type_forward",
"moviebrowser.browser_additional",
"moviebrowser.browser_frame_high",
"moviebrowser.browser_row_head",
"moviebrowser.browser_row_item",
@@ -1690,6 +1691,7 @@ const char * locale_real_names[] =
"moviebrowser.edit_book_type_info2",
"moviebrowser.edit_serie",
"moviebrowser.error_no_movies",
"moviebrowser.filter_off",
"moviebrowser.foot_filter",
"moviebrowser.foot_focus",
"moviebrowser.foot_options",

2
src/system/settings.h
View File

@@ -903,7 +903,7 @@ const time_settings_struct_t timing_setting[SNeutrinoSettings::TIMING_SETTING_CO
#define OFFSET_INNER_LARGE 20
#define OFFSET_INNER_MID 10
#define OFFSET_INNER_SMALL 5
#define OFFSET_INNER_MIN 2
struct SglobalInfo
{