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

Merge branch 'next' into next-cc

Browse Source 
Conflicts:
	data/locale/english.locale
	src/driver/framebuffer.cpp
	src/gui/channellist.cpp
	src/gui/eventlist.cpp
	src/gui/moviebrowser.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6f8ef9ec46
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-06-02 (Sun, 02 Jun 2013)



------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2013-06-02 10:46:42 +04:00
parent a27bcc6d3b 279a60341d
commit 93eb0c1679
35 changed files with 1525 additions and 811 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/system/locals.h
View File

@@ -125,6 +125,7 @@ typedef enum
LOCALE_GENRE_UNKNOWN,
LOCALE_APIDSELECTOR_HEAD,
LOCALE_AUDIO_SRS_ALGO,
LOCALE_AUDIO_SRS_ALGO_HEAVY,
LOCALE_AUDIO_SRS_ALGO_LIGHT,
LOCALE_AUDIO_SRS_ALGO_NORMAL,
LOCALE_AUDIO_SRS_IQ,
@@ -883,6 +884,7 @@ typedef enum
LOCALE_MENU_HINT_KEY_MPPLUGIN,
LOCALE_MENU_HINT_KEY_MPREWIND,
LOCALE_MENU_HINT_KEY_MPSTOP,
LOCALE_MENU_HINT_KEY_MPSUBTITLE,
LOCALE_MENU_HINT_KEY_MPTIME,
LOCALE_MENU_HINT_KEY_MPTIMESHIFT,
LOCALE_MENU_HINT_KEY_PAGEDOWN,
@@ -1146,6 +1148,7 @@ typedef enum
LOCALE_MENU_HINT_VOLUME,
LOCALE_MENU_HINT_VOLUME_DIGITS,
LOCALE_MENU_HINT_VOLUME_POS,
LOCALE_MENU_HINT_YTPLAY,
LOCALE_MENU_HINT_ZAP_CYCLE,
LOCALE_MENU_NEXT,
LOCALE_MESSAGEBOX_BACK,
@@ -1379,6 +1382,22 @@ typedef enum
LOCALE_MOVIEBROWSER_USE_DIR,
LOCALE_MOVIEBROWSER_USE_MOVIE_DIR,
LOCALE_MOVIEBROWSER_USE_REC_DIR,
LOCALE_MOVIEBROWSER_YT_ERROR,
LOCALE_MOVIEBROWSER_YT_MAX_RESULTS,
LOCALE_MOVIEBROWSER_YT_MOST_DISCUSSED,
LOCALE_MOVIEBROWSER_YT_MOST_POPULAR,
LOCALE_MOVIEBROWSER_YT_MOST_RESENT,
LOCALE_MOVIEBROWSER_YT_MOST_RESPONDED,
LOCALE_MOVIEBROWSER_YT_MOST_SHARED,
LOCALE_MOVIEBROWSER_YT_NEXT_RESULTS,
LOCALE_MOVIEBROWSER_YT_ON_THE_WEB,
LOCALE_MOVIEBROWSER_YT_PREV_RESULTS,
LOCALE_MOVIEBROWSER_YT_RECENTLY_FEATURED,
LOCALE_MOVIEBROWSER_YT_REGION,
LOCALE_MOVIEBROWSER_YT_RELATED,
LOCALE_MOVIEBROWSER_YT_SEARCH,
LOCALE_MOVIEBROWSER_YT_TOP_FAVORITES,
LOCALE_MOVIEBROWSER_YT_TOP_RATED,
LOCALE_MOVIEPLAYER_BOOKMARK,
LOCALE_MOVIEPLAYER_BOOKMARKNAME,
LOCALE_MOVIEPLAYER_BOOKMARKNAME_HINT1,
@@ -1400,6 +1419,7 @@ typedef enum
LOCALE_MOVIEPLAYER_TSHELP8,
LOCALE_MOVIEPLAYER_TSHELP9,
LOCALE_MOVIEPLAYER_TSPLAYBACK,
LOCALE_MOVIEPLAYER_YTPLAYBACK,
LOCALE_MPKEY_AUDIO,
LOCALE_MPKEY_BOOKMARK,
LOCALE_MPKEY_FORWARD,
@@ -1408,6 +1428,7 @@ typedef enum
LOCALE_MPKEY_PLUGIN,
LOCALE_MPKEY_REWIND,
LOCALE_MPKEY_STOP,
LOCALE_MPKEY_SUBTITLE,
LOCALE_MPKEY_TIME,
LOCALE_NETWORKMENU_APPLY_SETTINGS,
LOCALE_NETWORKMENU_APPLY_SETTINGS_NOW,