Merge branch 'master' into pu/fb-setmode

This commit is contained in:
M. Liebmann
2017-03-02 23:38:19 +01:00
33 changed files with 254 additions and 204 deletions

View File

@@ -708,6 +708,15 @@ typedef enum
LOCALE_FLASHUPDATE_SETTINGS,
LOCALE_FLASHUPDATE_TITLEREADFLASH,
LOCALE_FLASHUPDATE_TITLEWRITEFLASH,
LOCALE_FLASHUPDATE_TYPE_ADDON,
LOCALE_FLASHUPDATE_TYPE_BETA,
LOCALE_FLASHUPDATE_TYPE_INTERNAL,
LOCALE_FLASHUPDATE_TYPE_LOCALE,
LOCALE_FLASHUPDATE_TYPE_RELEASE,
LOCALE_FLASHUPDATE_TYPE_SETTINGS,
LOCALE_FLASHUPDATE_TYPE_TEXT,
LOCALE_FLASHUPDATE_TYPE_UNKNOWN,
LOCALE_FLASHUPDATE_TYPE_UPDATE,
LOCALE_FLASHUPDATE_UPDATE_WITH_SETTINGS_DEL_SKIPPED,
LOCALE_FLASHUPDATE_UPDATE_WITH_SETTINGS_ERROR,
LOCALE_FLASHUPDATE_UPDATE_WITH_SETTINGS_PROCESSED,