diff --git a/intl/msg_hash_chs.c b/intl/msg_hash_chs.c index a7db7e4570..b709742a9e 100644 --- a/intl/msg_hash_chs.c +++ b/intl/msg_hash_chs.c @@ -3184,8 +3184,8 @@ const char *msg_hash_to_str_chs(enum msg_hash_enums msg) return "FlatUI"; case MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME: return "Monochrome"; - case MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME_JAGGED: - return "Monochrome Jagged"; + case MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_SYSTEMATIC: + return "Systematic"; case MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_PIXEL: return "Pixel"; case MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_RETROACTIVE: diff --git a/intl/msg_hash_eo.h b/intl/msg_hash_eo.h index 498f3e07ac..e86586261f 100644 --- a/intl/msg_hash_eo.h +++ b/intl/msg_hash_eo.h @@ -1558,8 +1558,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_FLATUI, "FlatUI") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME, "Monochrome") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME_JAGGED, - "Monochrome Jagged") +MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_SYSTEMATIC, + "Systematic") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_NEOACTIVE, "NeoActive") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_PIXEL, diff --git a/intl/msg_hash_fr.h b/intl/msg_hash_fr.h index 3d0851ae3e..38962c15b2 100644 --- a/intl/msg_hash_fr.h +++ b/intl/msg_hash_fr.h @@ -1526,8 +1526,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_FLATUI, "FlatUI") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME, "Monochrome") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME_JAGGED, - "Monochrome Jagged") +MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_SYSTEMATIC, + "Systematic") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_NEOACTIVE, "NeoActive") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_PIXEL, diff --git a/intl/msg_hash_ja.h b/intl/msg_hash_ja.h index 456ee24b37..5c46f9bd3a 100644 --- a/intl/msg_hash_ja.h +++ b/intl/msg_hash_ja.h @@ -1562,7 +1562,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_FLATUI, "フラットUI") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME, "モノクローム") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME_JAGGED, +MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_SYSTEMATIC, "モノクロームぎざぎざ") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_NEOACTIVE, "ネオアクティブ") diff --git a/intl/msg_hash_nl.h b/intl/msg_hash_nl.h index a47d01ed18..1baec04110 100644 --- a/intl/msg_hash_nl.h +++ b/intl/msg_hash_nl.h @@ -1558,8 +1558,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_FLATUI, "FlatUI") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME, "Monochrome") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME_JAGGED, - "Monochrome Jagged") +MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_SYSTEMATIC, + "Systematic") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_NEOACTIVE, "NeoActive") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_PIXEL, diff --git a/intl/msg_hash_ru.h b/intl/msg_hash_ru.h index 1825bcf810..5a71937ddf 100644 --- a/intl/msg_hash_ru.h +++ b/intl/msg_hash_ru.h @@ -1554,8 +1554,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_FLATUI, "FlatUI") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME, "Monochrome") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME_JAGGED, - "Monochrome Jagged") +MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_SYSTEMATIC, + "Systematic") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_NEOACTIVE, "NeoActive") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_PIXEL, diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index fa26cfa99a..b45e239f8b 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -1576,8 +1576,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_FLATUI, "FlatUI") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME, "Monochrome") -MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME_JAGGED, - "Monochrome Jagged") +MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_SYSTEMATIC, + "Systematic") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_NEOACTIVE, "NeoActive") MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_PIXEL, diff --git a/intl/msg_hash_vn.c b/intl/msg_hash_vn.c index ba461e132e..70d9e7cdfb 100644 --- a/intl/msg_hash_vn.c +++ b/intl/msg_hash_vn.c @@ -3230,8 +3230,8 @@ const char *msg_hash_to_str_vn(enum msg_hash_enums msg) return "FlatUI"; case MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME: return "Monochrome"; - case MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME_JAGGED: - return "Monochrome Jagged"; + case MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_SYSTEMATIC: + return "Systematic"; case MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_PIXEL: return "Pixel"; case MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_RETROACTIVE: diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c index cf0828fee7..eb56c8eb51 100644 --- a/menu/cbs/menu_cbs_get_value.c +++ b/menu/cbs/menu_cbs_get_value.c @@ -757,9 +757,9 @@ static void menu_action_setting_disp_set_label_xmb_theme( strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_NEOACTIVE), len); break; - case XMB_ICON_THEME_MONOCHROME_JAGGED: + case XMB_ICON_THEME_SYSTEMATIC: strlcpy(s, - msg_hash_to_str(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME_JAGGED), len); + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_SYSTEMATIC), len); break; case XMB_ICON_THEME_CUSTOM: strlcpy(s, diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index d507a94c38..e9305ab51c 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -375,8 +375,8 @@ const char *xmb_theme_ident(void) return "pixel"; case XMB_ICON_THEME_NEOACTIVE: return "neoactive"; - case XMB_ICON_THEME_MONOCHROME_JAGGED: - return "monochrome-jagged"; + case XMB_ICON_THEME_SYSTEMATIC: + return "systematic"; case XMB_ICON_THEME_CUSTOM: return "custom"; case XMB_ICON_THEME_MONOCHROME: @@ -892,7 +892,7 @@ static void xmb_update_thumbnail_path(void *data, unsigned i) * Replace these characters in the entry name with underscores */ tmp = strdup(entry.path); - + while((scrub_char_pointer = strpbrk(tmp, "&*/:`<>?\\|"))) *scrub_char_pointer = '_'; @@ -2097,7 +2097,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, msg_hash_to_str(MENU_ENUM_LABEL_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]) @@ -2105,7 +2105,7 @@ static void xmb_draw_items(xmb_handle_t *xmb, else do_draw_text = true; } - else if (string_is_equal(entry_value, msg_hash_to_str(MENU_ENUM_LABEL_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/menu/menu_display.h b/menu/menu_display.h index ebac1015f8..2db2997c84 100644 --- a/menu/menu_display.h +++ b/menu/menu_display.h @@ -65,7 +65,7 @@ enum xmb_icon_theme XMB_ICON_THEME_RETROACTIVE, XMB_ICON_THEME_PIXEL, XMB_ICON_THEME_NEOACTIVE, - XMB_ICON_THEME_MONOCHROME_JAGGED, + XMB_ICON_THEME_SYSTEMATIC, XMB_ICON_THEME_CUSTOM }; diff --git a/msg_hash.h b/msg_hash.h index 325745b4f6..6ae539ffcb 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -373,7 +373,7 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_RETROACTIVE, MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_PIXEL, MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_NEOACTIVE, - MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME_JAGGED, + MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_SYSTEMATIC, MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_CUSTOM, MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_LEGACY_RED,