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
8 changed files with 107 additions and 73 deletions

View File

@@ -542,28 +542,26 @@ const char *CFlashVersionInfo::getReleaseCycle(void) const
const char *CFlashVersionInfo::getType(void) const
{
// TODO: localize it
switch (snapshot)
{
case '0':
return "Release";
return g_Locale->getText(LOCALE_FLASHUPDATE_TYPE_RELEASE);
case '1':
return "Beta";
return g_Locale->getText(LOCALE_FLASHUPDATE_TYPE_BETA);
case '2':
return "Internal";
return g_Locale->getText(LOCALE_FLASHUPDATE_TYPE_INTERNAL);
case 'L':
return "Locale";
return g_Locale->getText(LOCALE_FLASHUPDATE_TYPE_LOCALE);
case 'S':
return "Settings";
return g_Locale->getText(LOCALE_FLASHUPDATE_TYPE_SETTINGS);
case 'A':
return "Addon";
return g_Locale->getText(LOCALE_FLASHUPDATE_TYPE_ADDON);
case 'U':
return "Update";
return g_Locale->getText(LOCALE_FLASHUPDATE_TYPE_UPDATE);
case 'T':
return "Text";
return g_Locale->getText(LOCALE_FLASHUPDATE_TYPE_TEXT);
default:
return "Unknown";
return g_Locale->getText(LOCALE_FLASHUPDATE_TYPE_UNKNOWN);
}
}