From e1d4ccd7fd861e6fa28161ad5fcfc0e23bee0b88 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 25 Nov 2016 23:04:00 +0100 Subject: [PATCH] Update intl headers --- intl/msg_hash_fr.h | 10 ++++++++-- intl/msg_hash_ja.h | 10 ++++++++-- intl/msg_hash_lbl.h | 2 ++ intl/msg_hash_nl.h | 10 ++++++++-- intl/msg_hash_ru.h | 10 ++++++++-- intl/msg_hash_us.h | 10 ++++++++-- menu/drivers/materialui.c | 4 ++-- menu/drivers/xmb.c | 4 ++-- msg_hash.h | 3 ++- 9 files changed, 48 insertions(+), 15 deletions(-) diff --git a/intl/msg_hash_fr.h b/intl/msg_hash_fr.h index c25236491d..8f7e926026 100644 --- a/intl/msg_hash_fr.h +++ b/intl/msg_hash_fr.h @@ -494,8 +494,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_DIRECTORY_NOT_FOUND, "Dossier non trouvé.") MSG_HASH(MENU_ENUM_LABEL_VALUE_DIRECTORY_SETTINGS, "Dossiers") -MSG_HASH(MENU_ENUM_LABEL_VALUE_DISABLED, - "Désactivé") MSG_HASH(MENU_ENUM_LABEL_VALUE_DISK_CYCLE_TRAY_STATUS, "État du lecteur de disque") MSG_HASH(MENU_ENUM_LABEL_VALUE_DISK_IMAGE_APPEND, @@ -2156,3 +2154,11 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_DATABASE_CURSOR_LIST_ENTRY_PUBLISHER, "Database - Filter : Publisher" ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_DISABLED, + "Désactivé" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_ENABLED, + "Enabled" + ) diff --git a/intl/msg_hash_ja.h b/intl/msg_hash_ja.h index 3a91618c52..93d57aef04 100644 --- a/intl/msg_hash_ja.h +++ b/intl/msg_hash_ja.h @@ -508,8 +508,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_DIRECTORY_NOT_FOUND, "そのようなフォルダはありません。") MSG_HASH(MENU_ENUM_LABEL_VALUE_DIRECTORY_SETTINGS, "ディレクトリ") -MSG_HASH(MENU_ENUM_LABEL_VALUE_DISABLED, - "無効") MSG_HASH(MENU_ENUM_LABEL_VALUE_DISK_CYCLE_TRAY_STATUS, "Disk Cycle Tray Status") MSG_HASH(MENU_ENUM_LABEL_VALUE_DISK_IMAGE_APPEND, @@ -2182,3 +2180,11 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_DATABASE_CURSOR_LIST_ENTRY_PUBLISHER, "Database - Filter : Publisher" ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_DISABLED, + "無効" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_ENABLED, + "Enabled" + ) diff --git a/intl/msg_hash_lbl.h b/intl/msg_hash_lbl.h index b53ff4307b..69910dcf05 100644 --- a/intl/msg_hash_lbl.h +++ b/intl/msg_hash_lbl.h @@ -1100,3 +1100,5 @@ MSG_HASH(MENU_ENUM_LABEL_DATABASE_CURSOR_LIST_ENTRY_PUBLISHER, "database_cursor_list_entry_publisher") MSG_HASH(MENU_ENUM_LABEL_OFF, "off") MSG_HASH(MENU_ENUM_LABEL_ON, "on") +MSG_HASH(MENU_ENUM_LABEL_DISABLED, "disabled") +MSG_HASH(MENU_ENUM_LABEL_ENABLED, "enabled") diff --git a/intl/msg_hash_nl.h b/intl/msg_hash_nl.h index 5e31587f23..8e57cfc7ce 100644 --- a/intl/msg_hash_nl.h +++ b/intl/msg_hash_nl.h @@ -498,8 +498,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_DIRECTORY_NOT_FOUND, "Directory niet gevonden.") MSG_HASH(MENU_ENUM_LABEL_VALUE_DIRECTORY_SETTINGS, "Directory") -MSG_HASH(MENU_ENUM_LABEL_VALUE_DISABLED, - "Uitgeschakeld") MSG_HASH(MENU_ENUM_LABEL_VALUE_DISK_CYCLE_TRAY_STATUS, "Disk Cycle Tray Status") MSG_HASH(MENU_ENUM_LABEL_VALUE_DISK_IMAGE_APPEND, @@ -2190,3 +2188,11 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_DATABASE_CURSOR_LIST_ENTRY_PUBLISHER, "Database - Filter : Publisher" ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_DISABLED, + "Uitgeschakeld" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_ENABLED, + "Ingeschakeld" + ) diff --git a/intl/msg_hash_ru.h b/intl/msg_hash_ru.h index 3aa055143c..4652924df1 100644 --- a/intl/msg_hash_ru.h +++ b/intl/msg_hash_ru.h @@ -498,8 +498,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_DIRECTORY_NOT_FOUND, "Directory not found.") MSG_HASH(MENU_ENUM_LABEL_VALUE_DIRECTORY_SETTINGS, "Directory") -MSG_HASH(MENU_ENUM_LABEL_VALUE_DISABLED, - "Disabled") MSG_HASH(MENU_ENUM_LABEL_VALUE_DISK_CYCLE_TRAY_STATUS, "Disk Cycle Tray Status") MSG_HASH(MENU_ENUM_LABEL_VALUE_DISK_IMAGE_APPEND, @@ -2184,3 +2182,11 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_DATABASE_CURSOR_LIST_ENTRY_PUBLISHER, "Database - Filter : Publisher" ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_DISABLED, + "Disabled" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_ENABLED, + "Enabled" + ) diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index 7100aba135..24483d57c3 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -498,8 +498,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_DIRECTORY_NOT_FOUND, "Directory not found.") MSG_HASH(MENU_ENUM_LABEL_VALUE_DIRECTORY_SETTINGS, "Directory") -MSG_HASH(MENU_ENUM_LABEL_VALUE_DISABLED, - "Disabled") MSG_HASH(MENU_ENUM_LABEL_VALUE_DISK_CYCLE_TRAY_STATUS, "Disk Cycle Tray Status") MSG_HASH(MENU_ENUM_LABEL_VALUE_DISK_IMAGE_APPEND, @@ -2190,3 +2188,11 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_DATABASE_CURSOR_LIST_ENTRY_PUBLISHER, "Database - Filter : Publisher" ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_DISABLED, + "Disabled" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_ENABLED, + "Enabled" + ) diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c index 7a8b7ed5c1..d53ec3f922 100644 --- a/menu/drivers/materialui.c +++ b/menu/drivers/materialui.c @@ -633,7 +633,7 @@ static void mui_render_label_value(mui_handle_t *mui, y + mui->line_height / 2 + label_offset, width, height, color, TEXT_ALIGN_LEFT, 1.0f, false, 0); - if (string_is_equal(value, "disabled") || + if (string_is_equal(value, msg_hash_to_str(MENU_ENUM_LABEL_DISABLED)) || (string_is_equal(value, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_OFF)))) { if (mui->textures.list[MUI_TEXTURE_SWITCH_OFF]) @@ -644,7 +644,7 @@ static void mui_render_label_value(mui_handle_t *mui, else do_draw_text = true; } - else if (string_is_equal(value, "enabled") || + else if (string_is_equal(value, msg_hash_to_str(MENU_ENUM_LABEL_ENABLED)) || (string_is_equal(value, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ON)))) { if (mui->textures.list[MUI_TEXTURE_SWITCH_ON]) diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index c7aafc3cd5..893657a96c 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -2011,7 +2011,7 @@ static void xmb_draw_items(xmb_handle_t *xmb, menu_entry_get_value(i, list, entry_value, sizeof(entry_value)); - if (string_is_equal(entry_value, "disabled") || + if (string_is_equal(entry_value, msg_hash_to_str(MENU_ENUM_LABEL_DISABLED)) || (string_is_equal(entry_value, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_OFF)))) { if (xmb->textures.list[XMB_TEXTURE_SWITCH_OFF]) @@ -2019,7 +2019,7 @@ static void xmb_draw_items(xmb_handle_t *xmb, else do_draw_text = true; } - else if (string_is_equal(entry_value, "enabled") || + else if (string_is_equal(entry_value, msg_hash_to_str(MENU_ENUM_LABEL_ENABLED)) || (string_is_equal(entry_value, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ON)))) { if (xmb->textures.list[XMB_TEXTURE_SWITCH_ON]) diff --git a/msg_hash.h b/msg_hash.h index 4fad9ec499..58f85a51b8 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -1104,6 +1104,8 @@ enum msg_hash_enums MENU_LABEL(ON), MENU_LABEL(OFF), + MENU_LABEL(DISABLED), + MENU_LABEL(ENABLED), MENU_ENUM_LABEL_VALUE_TRUE, MENU_ENUM_LABEL_VALUE_FALSE, MENU_ENUM_LABEL_VALUE_COMP, @@ -1394,7 +1396,6 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_NO, MENU_ENUM_LABEL_VALUE_YES, - MENU_ENUM_LABEL_VALUE_DISABLED, MENU_ENUM_LABEL_VALUE_PORT, MENU_ENUM_LABEL_VALUE_LEFT_ANALOG,