Merge remote-tracking branch 'uncool/cst-next'

Origin commit data
------------------
Branch: ni/coolstream
Commit: 880115fa98
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-25 (Fri, 25 Dec 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2015-12-25 16:28:39 +01:00
31 changed files with 1636 additions and 375 deletions

View File

@@ -639,6 +639,8 @@ typedef enum
LOCALE_FLASHUPDATE_GETUPDATEFILEERROR,
LOCALE_FLASHUPDATE_GLOBALPROGRESS,
LOCALE_FLASHUPDATE_HEAD,
LOCALE_FLASHUPDATE_INSTALL_IMAGE,
LOCALE_FLASHUPDATE_INSTALL_PACKAGE,
LOCALE_FLASHUPDATE_MD5CHECK,
LOCALE_FLASHUPDATE_MD5SUMERROR,
LOCALE_FLASHUPDATE_MENU_APPLY_KERNEL,

View File

@@ -639,6 +639,8 @@ const char * locale_real_names[] =
"flashupdate.getupdatefileerror",
"flashupdate.globalprogress",
"flashupdate.head",
"flashupdate.install_image",
"flashupdate.install_package",
"flashupdate.md5check",
"flashupdate.md5sumerror",
"flashupdate.menu_apply_kernel",