mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 10:21:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/gui/update.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: cd96638c45
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-03-01 18:18:07 +01:00
parent c498527390 9af8ad3e8a
commit 6fb38c77a5
8 changed files with 107 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/system/locals_intern.h
View File

@@ -749,6 +749,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",