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
------------------
Commit: 6f8ef9ec46
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-06-02 (Sun, 02 Jun 2013)
This commit is contained in:
[CST] Focus
2013-06-02 10:46:42 +04:00
parent 24393838b7 8efd5b483b
commit 499d23e6a6
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_intern.h
View File

@@ -125,6 +125,7 @@ const char * locale_real_names[] =
"GENRE.UNKNOWN",
"apidselector.head",
"audio.srs_algo",
"audio.srs_algo_heavy",
"audio.srs_algo_light",
"audio.srs_algo_normal",
"audio.srs_iq",
@@ -883,6 +884,7 @@ const char * locale_real_names[] =
"menu.hint_key_mpplugin",
"menu.hint_key_mprewind",
"menu.hint_key_mpstop",
"menu.hint_key_mpsubtitle",
"menu.hint_key_mptime",
"menu.hint_key_mptimeshift",
"menu.hint_key_pagedown",
@@ -1146,6 +1148,7 @@ const char * locale_real_names[] =
"menu.hint_volume",
"menu.hint_volume_digits",
"menu.hint_volume_pos",
"menu.hint_ytplay",
"menu.hint_zap_cycle",
"menu.next",
"messagebox.back",
@@ -1379,6 +1382,22 @@ const char * locale_real_names[] =
"moviebrowser.use_dir",
"moviebrowser.use_movie_dir",
"moviebrowser.use_rec_dir",
"moviebrowser.yt_error",
"moviebrowser.yt_max_results",
"moviebrowser.yt_most_discussed",
"moviebrowser.yt_most_popular",
"moviebrowser.yt_most_resent",
"moviebrowser.yt_most_responded",
"moviebrowser.yt_most_shared",
"moviebrowser.yt_next_results",
"moviebrowser.yt_on_the_web",
"moviebrowser.yt_prev_results",
"moviebrowser.yt_recently_featured",
"moviebrowser.yt_region",
"moviebrowser.yt_related",
"moviebrowser.yt_search",
"moviebrowser.yt_top_favorites",
"moviebrowser.yt_top_rated",
"movieplayer.bookmark",
"movieplayer.bookmarkname",
"movieplayer.bookmarkname_hint1",
@@ -1400,6 +1419,7 @@ const char * locale_real_names[] =
"movieplayer.tshelp8",
"movieplayer.tshelp9",
"movieplayer.tsplayback",
"movieplayer.ytplayback",
"mpkey.audio",
"mpkey.bookmark",
"mpkey.forward",
@@ -1408,6 +1428,7 @@ const char * locale_real_names[] =
"mpkey.plugin",
"mpkey.rewind",
"mpkey.stop",
"mpkey.subtitle",
"mpkey.time",
"networkmenu.apply_settings",
"networkmenu.apply_settings_now",