Merge branch 'master' into pu/msgbox

This commit is contained in:
2016-10-26 09:56:49 +02:00
8 changed files with 47 additions and 18 deletions

View File

@@ -730,6 +730,7 @@ typedef enum
LOCALE_FONTMENU_HEAD,
LOCALE_FONTMENU_INFOBAR,
LOCALE_FONTMENU_MENU,
LOCALE_FONTMENU_MOVIEBROWSER,
LOCALE_FONTMENU_OTHER,
LOCALE_FONTMENU_SCALING,
LOCALE_FONTMENU_SCALING_X,
@@ -762,6 +763,9 @@ typedef enum
LOCALE_FONTSIZE_MENU_HINT,
LOCALE_FONTSIZE_MENU_INFO,
LOCALE_FONTSIZE_MENU_TITLE,
LOCALE_FONTSIZE_MOVIEBROWSER_HEAD,
LOCALE_FONTSIZE_MOVIEBROWSER_INFO,
LOCALE_FONTSIZE_MOVIEBROWSER_LIST,
LOCALE_FONTSIZE_SUBTITLES,
LOCALE_FSK_ALL,
LOCALE_FSK_FROM_12,
@@ -1215,6 +1219,7 @@ typedef enum
LOCALE_MENU_HINT_MISC_ONLINESERVICES,
LOCALE_MENU_HINT_MISC_ZAPIT,
LOCALE_MENU_HINT_MOVIE,
LOCALE_MENU_HINT_MOVIEBROWSER_FONTS,
LOCALE_MENU_HINT_MOVIEBROWSER_SETUP,
LOCALE_MENU_HINT_MOVIEPLAYER_PLUGIN,
LOCALE_MENU_HINT_NET_BROADCAST,

View File

@@ -730,6 +730,7 @@ const char * locale_real_names[] =
"fontmenu.head",
"fontmenu.infobar",
"fontmenu.menu",
"fontmenu.moviebrowser",
"fontmenu.other",
"fontmenu.scaling",
"fontmenu.scaling_x",
@@ -762,6 +763,9 @@ const char * locale_real_names[] =
"fontsize.menu_hint",
"fontsize.menu_info",
"fontsize.menu_title",
"fontsize.moviebrowser_head",
"fontsize.moviebrowser_info",
"fontsize.moviebrowser_list",
"fontsize.subtitles",
"fsk.all",
"fsk.from_12",
@@ -1215,6 +1219,7 @@ const char * locale_real_names[] =
"menu.hint_misc_onlineservices",
"menu.hint_misc_zapit",
"menu.hint_movie",
"menu.hint_moviebrowser_fonts",
"menu.hint_moviebrowser_setup",
"menu.hint_movieplayer_plugin",
"menu.hint_net_broadcast",

View File

@@ -669,6 +669,9 @@ struct SNeutrinoSettings
FONT_TYPE_INFOBAR_SMALL,
FONT_TYPE_FILEBROWSER_ITEM,
FONT_TYPE_MENU_HINT,
FONT_TYPE_MOVIEBROWSER_HEAD,
FONT_TYPE_MOVIEBROWSER_LIST,
FONT_TYPE_MOVIEBROWSER_INFO,
FONT_TYPE_SUBTITLES,
FONT_TYPE_COUNT
};