mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-31 09:21:18 +02:00
Merge remote-tracking branch 'origin/master' into dvbsi++
This commit is contained in:
@@ -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",
|
||||
|
Reference in New Issue
Block a user