merge public git changes

Origin commit data
------------------
Commit: 6e41c65fad
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-09 (Wed, 09 Jan 2013)
This commit is contained in:
[CST] Focus
2013-01-09 19:30:07 +04:00
57 changed files with 804 additions and 227 deletions

View File

@@ -514,9 +514,11 @@ const char * locale_real_names[] =
"flashupdate.titlereadflash",
"flashupdate.titlewriteflash",
"flashupdate.update_with_settings_del_skipped",
"flashupdate.update_with_settings_error",
"flashupdate.update_with_settings_processed",
"flashupdate.update_with_settings_skipped",
"flashupdate.update_with_settings_successfully",
"flashupdate.update_with_settings_warning",
"flashupdate.updatemode",
"flashupdate.updatemode_internet",
"flashupdate.updatemode_manual",
@@ -1475,9 +1477,6 @@ const char * locale_real_names[] =
"pictureviewer.help18",
"pictureviewer.help19",
"pictureviewer.help2",
"pictureviewer.help20",
"pictureviewer.help21",
"pictureviewer.help22",
"pictureviewer.help3",
"pictureviewer.help30",
"pictureviewer.help31",
@@ -1597,6 +1596,8 @@ const char * locale_real_names[] =
"satsetup.select_sat",
"satsetup.smatvremote",
"satsetup.uncomm_input",
"satsetup.uni_settings",
"satsetup.unicable",
"satsetup.usals_repeat",
"satsetup.use_bat",
"satsetup.use_fta_flag",
@@ -1787,6 +1788,9 @@ const char * locale_real_names[] =
"timing.infobar_radio",
"timing.menu",
"timing.numericzap",
"unicable.lnb",
"unicable.qrg",
"unicable.scr",
"upnpbrowser.head",
"upnpbrowser.noservers",
"upnpbrowser.rescan",