Merge remote-tracking branch 'origin/master' into dvbsi++

This commit is contained in:
[CST] Focus
2012-02-19 13:20:19 +04:00
46 changed files with 392 additions and 150 deletions

View File

@@ -360,6 +360,7 @@ const char * locale_real_names[] =
"extra.fec_s2_qpsk_7_8",
"extra.fec_s2_qpsk_8_9",
"extra.fec_s2_qpsk_9_10",
"extra.key_current_transponder",
"extra.key_list_end",
"extra.key_list_start",
"extra.key_plugin",
@@ -920,10 +921,8 @@ const char * locale_real_names[] =
"movieplayer.bookmarkname_hint1",
"movieplayer.bookmarkname_hint2",
"movieplayer.defplugin",
"movieplayer.dvdplayback",
"movieplayer.fileplayback",
"movieplayer.head",
"movieplayer.pesplayback",
"movieplayer.toomanybookmarks",
"movieplayer.tshelp1",
"movieplayer.tshelp10",
@@ -938,7 +937,6 @@ const char * locale_real_names[] =
"movieplayer.tshelp8",
"movieplayer.tshelp9",
"movieplayer.tsplayback",
"movieplayer.vcdplayback",
"mpkey.audio",
"mpkey.bookmark",
"mpkey.forward",
@@ -1052,6 +1050,7 @@ const char * locale_real_names[] =
"personalize.notprotected",
"personalize.notvisible",
"personalize.pin",
"personalize.pin_in_use",
"personalize.pincode",
"personalize.pinhint",
"personalize.pinprotect",
@@ -1230,7 +1229,15 @@ const char * locale_real_names[] =
"screensetup.lowerright",
"screensetup.upperleft",
"screenshot.count",
"screenshot.cover",
"screenshot.defdir",
"screenshot.format",
"screenshot.info",
"screenshot.menu",
"screenshot.osd",
"screenshot.scale",
"screenshot.tv",
"screenshot.video",
"servicemenu.getplugins",
"servicemenu.getplugins_hint",
"servicemenu.head",