From c1dc702a9932f22cbe62f88bba10c86a25fa782d Mon Sep 17 00:00:00 2001 From: lasers Date: Sun, 4 Dec 2016 08:47:45 -0600 Subject: [PATCH 1/2] Merge "Name,Status" (Core Information) --- menu/menu_displaylist.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 859e377584..eda543edc0 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -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); From 8f52e5b33ced12fd6e580ca052899874f6cd36b9 Mon Sep 17 00:00:00 2001 From: lasers Date: Sun, 4 Dec 2016 09:01:34 -0600 Subject: [PATCH 2/2] Add (s) for Firmware (Core Information) --- intl/msg_hash_de.h | 2 +- intl/msg_hash_eo.h | 2 +- intl/msg_hash_es.c | 2 +- intl/msg_hash_fr.h | 2 +- intl/msg_hash_it.c | 2 +- intl/msg_hash_nl.h | 2 +- intl/msg_hash_pl.c | 2 +- intl/msg_hash_pt.c | 2 +- intl/msg_hash_ru.h | 2 +- intl/msg_hash_us.h | 2 +- intl/msg_hash_vn.c | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/intl/msg_hash_de.h b/intl/msg_hash_de.h index 82849646be..9baaad2e1e 100644 --- a/intl/msg_hash_de.h +++ b/intl/msg_hash_de.h @@ -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, diff --git a/intl/msg_hash_eo.h b/intl/msg_hash_eo.h index aa14cd1b6b..de5ceefca9 100644 --- a/intl/msg_hash_eo.h +++ b/intl/msg_hash_eo.h @@ -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, diff --git a/intl/msg_hash_es.c b/intl/msg_hash_es.c index 68b3d4d914..3f9c76ef86 100644 --- a/intl/msg_hash_es.c +++ b/intl/msg_hash_es.c @@ -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: diff --git a/intl/msg_hash_fr.h b/intl/msg_hash_fr.h index f52af2c7b4..5b37dbd5aa 100644 --- a/intl/msg_hash_fr.h +++ b/intl/msg_hash_fr.h @@ -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, diff --git a/intl/msg_hash_it.c b/intl/msg_hash_it.c index 9ebe0c6e37..f5cdf4d8ae 100644 --- a/intl/msg_hash_it.c +++ b/intl/msg_hash_it.c @@ -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: diff --git a/intl/msg_hash_nl.h b/intl/msg_hash_nl.h index dd7cd74e55..e06c0a66ea 100644 --- a/intl/msg_hash_nl.h +++ b/intl/msg_hash_nl.h @@ -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, diff --git a/intl/msg_hash_pl.c b/intl/msg_hash_pl.c index c087613b45..238a3f0bcc 100644 --- a/intl/msg_hash_pl.c +++ b/intl/msg_hash_pl.c @@ -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: diff --git a/intl/msg_hash_pt.c b/intl/msg_hash_pt.c index 0674f633aa..628db9f130 100644 --- a/intl/msg_hash_pt.c +++ b/intl/msg_hash_pt.c @@ -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: diff --git a/intl/msg_hash_ru.h b/intl/msg_hash_ru.h index 0537b97c42..0183835bdf 100644 --- a/intl/msg_hash_ru.h +++ b/intl/msg_hash_ru.h @@ -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, diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index ca0c21ecd0..8a8d15de9b 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -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, diff --git a/intl/msg_hash_vn.c b/intl/msg_hash_vn.c index 86a564e825..c86613c256 100644 --- a/intl/msg_hash_vn.c +++ b/intl/msg_hash_vn.c @@ -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: