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 @@ const char * locale_real_names[] =
"flashupdate.settings",
"flashupdate.titlereadflash",
"flashupdate.titlewriteflash",
"flashupdate.type_addon",
"flashupdate.type_beta",
"flashupdate.type_internal",
"flashupdate.type_locale",
"flashupdate.type_release",
"flashupdate.type_settings",
"flashupdate.type_text",
"flashupdate.type_unknown",
"flashupdate.type_update",
"flashupdate.update_with_settings_del_skipped",
"flashupdate.update_with_settings_error",
"flashupdate.update_with_settings_processed",