Merge pull request #4157 from lasers/clean-up-info2

Improve Core Information
This commit is contained in:
Twinaphex 2016-12-04 17:23:57 +01:00 committed by GitHub
commit b6d1c62933
12 changed files with 17 additions and 22 deletions

View File

@ -107,7 +107,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_CORE_LABEL,
MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_CORE_NAME,
"Core-Name")
MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_FIRMWARE,
"Firmware")
"Firmware(s)")
MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_LICENSES,
"Lizenz(en)")
MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_PERMISSIONS,

View File

@ -437,7 +437,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_CORE_LABEL,
MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_CORE_NAME,
"Core name")
MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_FIRMWARE,
"Firmware")
"Firmware(s)")
MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_LICENSES,
"License(s)")
MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_PERMISSIONS,

View File

@ -1616,7 +1616,7 @@ const char *msg_hash_to_str_es(enum msg_hash_enums msg)
case MENU_ENUM_LABEL_VALUE_CORE_INFO_CORE_NAME:
return "Nombre del núcleo";
case MENU_ENUM_LABEL_VALUE_CORE_INFO_FIRMWARE:
return "Firmware";
return "Firmware(s)";
case MENU_ENUM_LABEL_VALUE_CORE_INFO_LICENSES:
return "Licencia(s)";
case MENU_ENUM_LABEL_VALUE_CORE_INFO_PERMISSIONS:

View File

@ -433,7 +433,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_CORE_LABEL,
MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_CORE_NAME,
"Nom")
MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_FIRMWARE,
"Firmware")
"Firmware(s)")
MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_LICENSES,
"Licence(s)")
MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_PERMISSIONS,

View File

@ -1875,7 +1875,7 @@ const char *msg_hash_to_str_it(enum msg_hash_enums msg)
case MENU_ENUM_LABEL_VALUE_CORE_INFO_SUPPORTED_EXTENSIONS:
return "Estensioni supportate";
case MENU_ENUM_LABEL_VALUE_CORE_INFO_FIRMWARE:
return "Firmware";
return "Firmware(s)";
case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_BUILD_DATE:
return "Data della build";
case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_GIT_VERSION:

View File

@ -437,7 +437,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_CORE_LABEL,
MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_CORE_NAME,
"Core naam")
MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_FIRMWARE,
"Firmware")
"Firmware(s)")
MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_LICENSES,
"Licentie(s)")
MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_PERMISSIONS,

View File

@ -137,7 +137,7 @@ const char *msg_hash_to_str_pl(enum msg_hash_enums msg)
case MENU_ENUM_LABEL_VALUE_CORE_INFO_CORE_NAME:
return "Nazwa rdzenia";
case MENU_ENUM_LABEL_VALUE_CORE_INFO_FIRMWARE:
return "Firmware";
return "Firmware(s)";
case MENU_ENUM_LABEL_VALUE_CORE_INFO_LICENSES:
return "Licencja(-e)";
case MENU_ENUM_LABEL_VALUE_CORE_INFO_PERMISSIONS:

View File

@ -1075,7 +1075,7 @@ const char *msg_hash_to_str_pt(enum msg_hash_enums msg)
case MENU_ENUM_LABEL_VALUE_CORE_INFO_CORE_NAME:
return "Nome do core";
case MENU_ENUM_LABEL_VALUE_CORE_INFO_FIRMWARE:
return "Firmware";
return "Firmware(s)";
case MENU_ENUM_LABEL_VALUE_CORE_INFO_LICENSES:
return "Licença(s)";
case MENU_ENUM_LABEL_VALUE_CORE_INFO_PERMISSIONS:

View File

@ -437,7 +437,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_CORE_LABEL,
MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_CORE_NAME,
"Core name")
MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_FIRMWARE,
"Firmware")
"Firmware(s)")
MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_LICENSES,
"License(s)")
MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_PERMISSIONS,

View File

@ -441,7 +441,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_CORE_LABEL,
MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_CORE_NAME,
"Core name")
MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_FIRMWARE,
"Firmware")
"Firmware(s)")
MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_LICENSES,
"License(s)")
MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_PERMISSIONS,

View File

@ -2111,7 +2111,7 @@ const char *msg_hash_to_str_vn(enum msg_hash_enums msg)
case MENU_ENUM_LABEL_VALUE_CORE_INFO_CORE_NAME:
return "Core name";
case MENU_ENUM_LABEL_VALUE_CORE_INFO_FIRMWARE:
return "Firmware";
return "Firmware(s)";
case MENU_ENUM_LABEL_VALUE_CORE_INFO_LICENSES:
return "License(s)";
case MENU_ENUM_LABEL_VALUE_CORE_INFO_PERMISSIONS:

View File

@ -381,23 +381,18 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info)
{
if (core_info->firmware[i].desc)
{
snprintf(tmp, sizeof(tmp), "(!) %s: %s",
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_RDB_ENTRY_NAME),
core_info->firmware[i].desc ?
core_info->firmware[i].desc : "");
menu_entries_append_enum(info->list, tmp, "",
MENU_ENUM_LABEL_CORE_INFO_ENTRY,
MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
snprintf(tmp, sizeof(tmp), "(!) %s: %s, %s",
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_STATUS),
snprintf(tmp, sizeof(tmp), "(!) %s, %s: %s",
core_info->firmware[i].missing ?
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_MISSING) :
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PRESENT),
core_info->firmware[i].optional ?
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_OPTIONAL) :
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_REQUIRED)
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_REQUIRED),
core_info->firmware[i].desc ?
core_info->firmware[i].desc :
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_RDB_ENTRY_NAME)
);
menu_entries_append_enum(info->list, tmp, "",
MENU_ENUM_LABEL_CORE_INFO_ENTRY,
MENU_SETTINGS_CORE_INFO_NONE, 0, 0);