diff --git a/intl/msg_hash_chs.c b/intl/msg_hash_chs.c index f5af3b9715..c1c769ce02 100644 --- a/intl/msg_hash_chs.c +++ b/intl/msg_hash_chs.c @@ -565,10 +565,6 @@ int menu_hash_get_help_chs_enum(enum msg_hash_enums msg, char *s, size_t len) "Amount of seconds to wait until proceeding \n" "to the next bind."); break; - case MENU_ENUM_LABEL_KEYBOARD_OVERLAY_PRESET: - snprintf(s, len, - "Path to onscreen keyboard overlay."); - break; case MENU_ENUM_LABEL_OVERLAY_SCALE: snprintf(s, len, "Overlay scale."); @@ -944,6 +940,11 @@ int menu_hash_get_help_chs_enum(enum msg_hash_enums msg, char *s, size_t len) "shaders." ); break; + case MENU_ENUM_LABEL_CONFIGURATION_SETTINGS: + snprintf(s, len, + "Determines how configuration files are \n" + "loaded and prioritized."); + break; case MENU_ENUM_LABEL_CONFIG_SAVE_ON_EXIT: snprintf(s, len, "Saves config to disk on exit.\n" @@ -966,9 +967,6 @@ int menu_hash_get_help_chs_enum(enum msg_hash_enums msg, char *s, size_t len) #endif ); break; - case MENU_ENUM_LABEL_CONFIRM_ON_EXIT: - snprintf(s, len, "你确定要退出吗？"); - break; case MENU_ENUM_LABEL_SHOW_HIDDEN_FILES: snprintf(s, len, "显示隐藏文件和文件夹。"); break; @@ -1586,6 +1584,10 @@ int menu_hash_get_help_chs_enum(enum msg_hash_enums msg, char *s, size_t len) snprintf(s, len, "Setting related to Netplay."); break; + case MENU_ENUM_LABEL_NETPLAY_LAN_SCAN_SETTINGS: + snprintf(s, len, + "Search for and connect to netplay hosts on the local network."); + break; case MENU_ENUM_LABEL_DYNAMIC_WALLPAPER: snprintf(s, len, "Dynamically load a new wallpaper \n" @@ -2406,8 +2408,6 @@ const char *msg_hash_to_str_chs(enum msg_hash_enums msg) return "输入设备自动配置目录"; case MENU_ENUM_LABEL_VALUE_JOYPAD_DRIVER: return "手柄驱动"; - case MENU_ENUM_LABEL_VALUE_KEYBOARD_OVERLAY_PRESET: - return "键盘覆层预设"; case MENU_ENUM_LABEL_VALUE_LAKKA_SERVICES: return "Lakka 服务"; case MENU_ENUM_LABEL_VALUE_LANG_CHINESE_SIMPLIFIED: @@ -3242,6 +3242,10 @@ const char *msg_hash_to_str_chs(enum msg_hash_enums msg) return "启用或者禁止蓝牙。"; case MENU_ENUM_SUBLABEL_CONFIG_SAVE_ON_EXIT: return "程序将在退出时保存修改到配置文件。"; + case MENU_ENUM_SUBLABEL_CONFIGURATION_SETTINGS: + return "Change default settings for configuration files."; + case MENU_ENUM_SUBLABEL_CONFIGURATIONS_LIST: + return "Manage and create configuration files."; case MENU_ENUM_SUBLABEL_CPU_CORES: return "CPU拥有的核心总数。"; case MENU_ENUM_SUBLABEL_FPS_SHOW: diff --git a/intl/msg_hash_de.h b/intl/msg_hash_de.h index 9baaad2e1e..728733dddd 100644 --- a/intl/msg_hash_de.h +++ b/intl/msg_hash_de.h @@ -78,8 +78,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS, "Konfigurations-Einstellungen") MSG_HASH(MENU_ENUM_LABEL_VALUE_CONFIG_SAVE_ON_EXIT, "Speichere Konfiguration beim Beenden") -MSG_HASH(MENU_ENUM_LABEL_VALUE_CONFIRM_ON_EXIT, - "Zum Beenden Nachfragen") MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_COLLECTION_LIST, "Lade Content (Sammlung)") /* FIXME/TODO - rewrite */ MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_DATABASE_DIRECTORY, @@ -244,8 +242,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_JOYPAD_AUTOCONFIG_DIR, "Eingabegerät-Autoconfig-Verzeichnis") MSG_HASH(MENU_ENUM_LABEL_VALUE_JOYPAD_DRIVER, "Joypad-Treiber") -MSG_HASH(MENU_ENUM_LABEL_VALUE_KEYBOARD_OVERLAY_PRESET, - "Tastatur-Overlay-Voreinstellung") MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_CHINESE_SIMPLIFIED, "Chinesisch (Vereinfacht)") MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_CHINESE_TRADITIONAL, diff --git a/intl/msg_hash_eo.h b/intl/msg_hash_eo.h index 11445b470c..498f3e07ac 100644 --- a/intl/msg_hash_eo.h +++ b/intl/msg_hash_eo.h @@ -393,11 +393,7 @@ MSG_HASH( ) MSG_HASH( MENU_ENUM_LABEL_VALUE_CONFIG_SAVE_ON_EXIT, - "Save Configuration On Exit" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_CONFIRM_ON_EXIT, - "Ask For Confirmation On Exit" + "Save Configuration on Exit" ) MSG_HASH( MENU_ENUM_LABEL_VALUE_CONTENT_COLLECTION_LIST, @@ -543,7 +539,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_FRAME_THROTTLE_SETTINGS, MSG_HASH(MENU_ENUM_LABEL_VALUE_FRONTEND_COUNTERS, "Frontend Counters") MSG_HASH(MENU_ENUM_LABEL_VALUE_GAME_SPECIFIC_OPTIONS, - "Load Content-specific core options automatically") + "Load Content-Specific Core Options Automatically") MSG_HASH(MENU_ENUM_LABEL_VALUE_GAME_SPECIFIC_OPTIONS_CREATE, "Create game-options file") MSG_HASH(MENU_ENUM_LABEL_VALUE_GAME_SPECIFIC_OPTIONS_IN_USE, @@ -774,8 +770,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_JOYPAD_AUTOCONFIG_DIR, "Input Autoconfig") MSG_HASH(MENU_ENUM_LABEL_VALUE_JOYPAD_DRIVER, "Joypad Driver") -MSG_HASH(MENU_ENUM_LABEL_VALUE_KEYBOARD_OVERLAY_PRESET, - "Keyboard Overlay Preset") MSG_HASH(MENU_ENUM_LABEL_VALUE_LAKKA_SERVICES, "Services") MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_CHINESE_SIMPLIFIED, @@ -1637,7 +1631,7 @@ MSG_HASH(MENU_ENUM_SUBLABEL_LOGGING_SETTINGS, MSG_HASH(MENU_ENUM_SUBLABEL_USER_INTERFACE_SETTINGS, "Change settings for the user interface.") MSG_HASH(MENU_ENUM_SUBLABEL_USER_SETTINGS, - "Accounts, Username, Language.") + "Change accounts, username, and language.") MSG_HASH(MENU_ENUM_SUBLABEL_PRIVACY_SETTINGS, "Change your privacy settings.") MSG_HASH(MENU_ENUM_SUBLABEL_DIRECTORY_SETTINGS, @@ -1654,6 +1648,10 @@ MSG_HASH(MENU_ENUM_SUBLABEL_BLUETOOTH_ENABLE, "Enable or disable bluetooth.") MSG_HASH(MENU_ENUM_SUBLABEL_CONFIG_SAVE_ON_EXIT, "Saves changes to configuration file on exit.") +MSG_HASH(MENU_ENUM_SUBLABEL_CONFIGURATION_SETTINGS, + "Change default settings for configuration files.") +MSG_HASH(MENU_ENUM_SUBLABEL_CONFIGURATIONS_LIST, + "Manage and create configuration files.") MSG_HASH(MENU_ENUM_SUBLABEL_CPU_CORES, "Amount of cores that the CPU has.") MSG_HASH(MENU_ENUM_SUBLABEL_FPS_SHOW, diff --git a/intl/msg_hash_es.c b/intl/msg_hash_es.c index 3f9c76ef86..6b9d709e88 100644 --- a/intl/msg_hash_es.c +++ b/intl/msg_hash_es.c @@ -1758,8 +1758,6 @@ const char *msg_hash_to_str_es(enum msg_hash_enums msg) return "Carpeta de autoconfiguración de dispositivo de entrada"; case MENU_ENUM_LABEL_VALUE_JOYPAD_DRIVER: return "Controlador de joypad"; - case MENU_ENUM_LABEL_VALUE_KEYBOARD_OVERLAY_PRESET: - return "Preajuste de teclado superpuesto"; case MENU_ENUM_LABEL_VALUE_LANG_CHINESE_SIMPLIFIED: return "Chino (Simplificado)"; case MENU_ENUM_LABEL_VALUE_LANG_CHINESE_TRADITIONAL: diff --git a/intl/msg_hash_fr.h b/intl/msg_hash_fr.h index f5e18da1e1..3d0851ae3e 100644 --- a/intl/msg_hash_fr.h +++ b/intl/msg_hash_fr.h @@ -141,7 +141,7 @@ MSG_HASH( ) MSG_HASH( MENU_ENUM_LABEL_VALUE_ASSETS_DIRECTORY, - "Dossier des assets" + "Dossier des assets" ) MSG_HASH( MENU_ENUM_LABEL_VALUE_AUDIO_BLOCK_FRAMES, @@ -153,7 +153,7 @@ MSG_HASH( ) MSG_HASH( MENU_ENUM_LABEL_VALUE_AUDIO_DRIVER, - "Pilote audio" + "Pilote audio" ) MSG_HASH( MENU_ENUM_LABEL_VALUE_AUDIO_DSP_PLUGIN, @@ -165,7 +165,7 @@ MSG_HASH( ) MSG_HASH( MENU_ENUM_LABEL_VALUE_AUDIO_FILTER_DIR, - "Dossier des filtres audio" + "Dossier des filtres audio" ) MSG_HASH( MENU_ENUM_LABEL_VALUE_TURBO_DEADZONE_LIST, @@ -177,11 +177,11 @@ MSG_HASH( ) MSG_HASH( MENU_ENUM_LABEL_VALUE_AUDIO_MAX_TIMING_SKEW, - "Limite max de l'ajustement" + "Limite max de l'ajustement" ) MSG_HASH( MENU_ENUM_LABEL_VALUE_AUDIO_MUTE, - "Muet" + "Muet" ) MSG_HASH( MENU_ENUM_LABEL_VALUE_AUDIO_OUTPUT_RATE, @@ -189,11 +189,11 @@ MSG_HASH( ) MSG_HASH( MENU_ENUM_LABEL_VALUE_AUDIO_RATE_CONTROL_DELTA, - "Delta du taux de contrôle" + "Delta du taux de contrôle" ) MSG_HASH( MENU_ENUM_LABEL_VALUE_AUDIO_RESAMPLER_DRIVER, - "Pilote de ré-échantillonage audio" + "Pilote de ré-échantillonage audio" ) MSG_HASH( MENU_ENUM_LABEL_VALUE_AUDIO_SETTINGS, @@ -205,7 +205,7 @@ MSG_HASH( ) MSG_HASH( MENU_ENUM_LABEL_VALUE_AUDIO_VOLUME, - "Volume sonnore (dB)" + "Volume sonnore (dB)" ) MSG_HASH( MENU_ENUM_LABEL_VALUE_AUTOSAVE_INTERVAL, @@ -213,11 +213,11 @@ MSG_HASH( ) MSG_HASH( MENU_ENUM_LABEL_VALUE_AUTO_OVERRIDES_ENABLE, - "Charger les fichiers d'override automatiquement" + "Charger les fichiers d'override automatiquement" ) MSG_HASH( MENU_ENUM_LABEL_VALUE_AUTO_REMAPS_ENABLE, - "Charger les fichiers remaps automatiquement" + "Charger les fichiers remaps automatiquement" ) MSG_HASH( MENU_ENUM_LABEL_VALUE_AUTO_SHADERS_ENABLE, @@ -301,7 +301,7 @@ MSG_HASH( ) MSG_HASH( MENU_ENUM_LABEL_VALUE_BUILDBOT_ASSETS_URL, - "URL du buildbot des assets" + "URL du buildbot des assets" ) MSG_HASH( MENU_ENUM_LABEL_VALUE_CACHE_DIRECTORY, @@ -317,7 +317,7 @@ MSG_HASH( ) MSG_HASH( MENU_ENUM_LABEL_VALUE_CHEAT, - "Triche" + "Triche" ) MSG_HASH( MENU_ENUM_LABEL_VALUE_CHEAT_APPLY_CHANGES, @@ -395,10 +395,6 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_CONFIG_SAVE_ON_EXIT, "Sauver la config en quittant" ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_CONFIRM_ON_EXIT, - "Ask For Confirmation On Exit" - ) MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_COLLECTION_LIST, "Collections") MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_DATABASE_DIRECTORY, @@ -770,8 +766,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_JOYPAD_AUTOCONFIG_DIR, "Dossier des autoconfigs d'entrées") MSG_HASH(MENU_ENUM_LABEL_VALUE_JOYPAD_DRIVER, "Pilote des manettes") -MSG_HASH(MENU_ENUM_LABEL_VALUE_KEYBOARD_OVERLAY_PRESET, - "Préréglages d'overlay clavier") MSG_HASH(MENU_ENUM_LABEL_VALUE_LAKKA_SERVICES, "Services") MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_CHINESE_SIMPLIFIED, @@ -1605,7 +1599,7 @@ MSG_HASH(MENU_ENUM_SUBLABEL_LOGGING_SETTINGS, MSG_HASH(MENU_ENUM_SUBLABEL_USER_INTERFACE_SETTINGS, "Change settings for the user interface.") MSG_HASH(MENU_ENUM_SUBLABEL_USER_SETTINGS, - "Accounts, Username, Language.") + "Change accounts, username, and language.") MSG_HASH(MENU_ENUM_SUBLABEL_PRIVACY_SETTINGS, "Change your privacy settings.") MSG_HASH(MENU_ENUM_SUBLABEL_DIRECTORY_SETTINGS, @@ -1622,6 +1616,10 @@ MSG_HASH(MENU_ENUM_SUBLABEL_BLUETOOTH_ENABLE, "Enable or disable bluetooth.") MSG_HASH(MENU_ENUM_SUBLABEL_CONFIG_SAVE_ON_EXIT, "Saves changes to configuration file on exit.") +MSG_HASH(MENU_ENUM_SUBLABEL_CONFIGURATION_SETTINGS, + "Change default settings for configuration files.") +MSG_HASH(MENU_ENUM_SUBLABEL_CONFIGURATIONS_LIST, + "Manage and create configuration files.") MSG_HASH(MENU_ENUM_SUBLABEL_CPU_CORES, "Amount of cores that the CPU has.") MSG_HASH(MENU_ENUM_SUBLABEL_FPS_SHOW, diff --git a/intl/msg_hash_it.c b/intl/msg_hash_it.c index f5cdf4d8ae..c9155879cc 100644 --- a/intl/msg_hash_it.c +++ b/intl/msg_hash_it.c @@ -1518,8 +1518,6 @@ const char *msg_hash_to_str_it(enum msg_hash_enums msg) return "Carica file di override automaticamente"; case MENU_ENUM_LABEL_VALUE_CONFIG_SAVE_ON_EXIT: return "Salva configurazione all'uscita"; - case MENU_ENUM_LABEL_VALUE_CONFIRM_ON_EXIT: - return "Chiedi conferma all'uscita"; case MENU_ENUM_LABEL_VALUE_SHOW_HIDDEN_FILES: return "Mostra files e cartelle nascoste"; case MENU_ENUM_LABEL_VALUE_VIDEO_SMOOTH: @@ -1808,8 +1806,6 @@ const char *msg_hash_to_str_it(enum msg_hash_enums msg) return "Latenza audio (ms)"; case MENU_ENUM_LABEL_VALUE_AUDIO_DEVICE: return "Dispositivo audio"; - case MENU_ENUM_LABEL_VALUE_KEYBOARD_OVERLAY_PRESET: - return "Preimpostato Overlay Tastiera"; case MENU_ENUM_LABEL_VALUE_OVERLAY_OPACITY: return "Opacità Overlay"; case MENU_ENUM_LABEL_VALUE_MENU_WALLPAPER: diff --git a/intl/msg_hash_ja.c b/intl/msg_hash_ja.c index c837e53cbd..d96e50916b 100644 --- a/intl/msg_hash_ja.c +++ b/intl/msg_hash_ja.c @@ -584,10 +584,6 @@ int menu_hash_get_help_jp_enum(enum msg_hash_enums msg, char *s, size_t len) "Amount of seconds to wait until proceeding \n" "to the next bind."); break; - case MENU_ENUM_LABEL_KEYBOARD_OVERLAY_PRESET: - snprintf(s, len, - "Path to onscreen keyboard overlay."); - break; case MENU_ENUM_LABEL_OVERLAY_SCALE: snprintf(s, len, "Overlay scale."); @@ -970,6 +966,11 @@ int menu_hash_get_help_jp_enum(enum msg_hash_enums msg, char *s, size_t len) "shaders." ); break; + case MENU_ENUM_LABEL_CONFIGURATION_SETTINGS: + snprintf(s, len, + "Determines how configuration files are \n" + "loaded and prioritized."); + break; case MENU_ENUM_LABEL_CONFIG_SAVE_ON_EXIT: snprintf(s, len, "Saves config to disk on exit.\n" @@ -1614,6 +1615,10 @@ int menu_hash_get_help_jp_enum(enum msg_hash_enums msg, char *s, size_t len) snprintf(s, len, "Setting related to Netplay."); break; + case MENU_ENUM_LABEL_NETPLAY_LAN_SCAN_SETTINGS: + snprintf(s, len, + "Search for and connect to netplay hosts on the local network."); + break; case MENU_ENUM_LABEL_DYNAMIC_WALLPAPER: snprintf(s, len, "Dynamically load a new wallpaper \n" diff --git a/intl/msg_hash_ja.h b/intl/msg_hash_ja.h index 87fe5be3bc..456ee24b37 100644 --- a/intl/msg_hash_ja.h +++ b/intl/msg_hash_ja.h @@ -269,7 +269,7 @@ MSG_HASH( ) MSG_HASH( MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_INFO, - "情報" + "情報" ) MSG_HASH( MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_QUIT, @@ -395,10 +395,6 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_CONFIG_SAVE_ON_EXIT, "終了前に設定を自動保存" ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_CONFIRM_ON_EXIT, - "終了前に確認" - ) MSG_HASH( MENU_ENUM_LABEL_VALUE_CONTENT_COLLECTION_LIST, "コレクション" @@ -782,8 +778,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_JOYPAD_AUTOCONFIG_DIR, "入力デバイスの自動設定") MSG_HASH(MENU_ENUM_LABEL_VALUE_JOYPAD_DRIVER, "ジョイパッドのドライバ") -MSG_HASH(MENU_ENUM_LABEL_VALUE_KEYBOARD_OVERLAY_PRESET, - "キーボードのオーバーレイプリセット") MSG_HASH(MENU_ENUM_LABEL_VALUE_LAKKA_SERVICES, "Lakkaのサービス") MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_CHINESE_SIMPLIFIED, @@ -1658,6 +1652,10 @@ MSG_HASH(MENU_ENUM_SUBLABEL_BLUETOOTH_ENABLE, "Bluetoothを有効する。") MSG_HASH(MENU_ENUM_SUBLABEL_CONFIG_SAVE_ON_EXIT, "終了時に設定を自動的に保存する。") +MSG_HASH(MENU_ENUM_SUBLABEL_CONFIGURATION_SETTINGS, + "Change default settings for configuration files.") +MSG_HASH(MENU_ENUM_SUBLABEL_CONFIGURATIONS_LIST, + "Manage and create configuration files.") MSG_HASH(MENU_ENUM_SUBLABEL_CPU_CORES, "CPUのコア数") MSG_HASH(MENU_ENUM_SUBLABEL_FPS_SHOW, diff --git a/intl/msg_hash_lbl.h b/intl/msg_hash_lbl.h index faed9a4d15..8e9547099c 100644 --- a/intl/msg_hash_lbl.h +++ b/intl/msg_hash_lbl.h @@ -149,7 +149,8 @@ MSG_HASH(MENU_ENUM_LABEL_COLLECTION, MSG_HASH(MENU_ENUM_LABEL_CONFIGURATIONS, "configurations") MSG_HASH(MENU_ENUM_LABEL_CONFIGURATION_SETTINGS, - "configuration_settings") + "Determines how configuration files \n" + "are loaded and prioritized.") MSG_HASH(MENU_ENUM_LABEL_CONFIG_SAVE_ON_EXIT, "config_save_on_exit") MSG_HASH(MENU_ENUM_LABEL_CONNECT_WIFI, @@ -592,6 +593,8 @@ MSG_HASH(MENU_ENUM_LABEL_NETPLAY_SPECTATOR_MODE_ENABLE, "netplay_spectator_mode_enable") MSG_HASH(MENU_ENUM_LABEL_NETPLAY_TCP_UDP_PORT, "netplay_tcp_udp_port") +MSG_HASH(MENU_ENUM_LABEL_NETPLAY_LAN_SCAN_SETTINGS, + "Search for and connect to netplay hosts on the local network.") MSG_HASH(MENU_ENUM_LABEL_NETWORK_CMD_ENABLE, "network_cmd_enable") MSG_HASH(MENU_ENUM_LABEL_NETWORK_CMD_PORT, diff --git a/intl/msg_hash_nl.h b/intl/msg_hash_nl.h index c2291ea437..a47d01ed18 100644 --- a/intl/msg_hash_nl.h +++ b/intl/msg_hash_nl.h @@ -395,10 +395,6 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_CONFIG_SAVE_ON_EXIT, "Configuratie Opslaan Tijdens Afsluiten" ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_CONFIRM_ON_EXIT, - "Ask For Confirmation On Exit" - ) MSG_HASH( MENU_ENUM_LABEL_VALUE_CONTENT_COLLECTION_LIST, "Collecties" @@ -543,7 +539,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_FRAME_THROTTLE_SETTINGS, MSG_HASH(MENU_ENUM_LABEL_VALUE_FRONTEND_COUNTERS, "Frontend Prestatie Tellers") MSG_HASH(MENU_ENUM_LABEL_VALUE_GAME_SPECIFIC_OPTIONS, - "Load Content-specific core options automatically") + "Load Content-Specific Core Options Automatically") MSG_HASH(MENU_ENUM_LABEL_VALUE_GAME_SPECIFIC_OPTIONS_CREATE, "Create game-options file") MSG_HASH(MENU_ENUM_LABEL_VALUE_GAME_SPECIFIC_OPTIONS_IN_USE, @@ -774,8 +770,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_JOYPAD_AUTOCONFIG_DIR, "Invoerapparaten Autoconfiguratie") MSG_HASH(MENU_ENUM_LABEL_VALUE_JOYPAD_DRIVER, "Joypad Driver") -MSG_HASH(MENU_ENUM_LABEL_VALUE_KEYBOARD_OVERLAY_PRESET, - "Toetsenbord Overlay Preset") MSG_HASH(MENU_ENUM_LABEL_VALUE_LAKKA_SERVICES, "Services") MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_CHINESE_SIMPLIFIED, @@ -1637,7 +1631,7 @@ MSG_HASH(MENU_ENUM_SUBLABEL_LOGGING_SETTINGS, MSG_HASH(MENU_ENUM_SUBLABEL_USER_INTERFACE_SETTINGS, "Change settings for the user interface.") MSG_HASH(MENU_ENUM_SUBLABEL_USER_SETTINGS, - "Accounts, Username, Language.") + "Change accounts, username, and language.") MSG_HASH(MENU_ENUM_SUBLABEL_PRIVACY_SETTINGS, "Change your privacy settings.") MSG_HASH(MENU_ENUM_SUBLABEL_DIRECTORY_SETTINGS, @@ -1654,6 +1648,10 @@ MSG_HASH(MENU_ENUM_SUBLABEL_BLUETOOTH_ENABLE, "Enable or disable bluetooth.") MSG_HASH(MENU_ENUM_SUBLABEL_CONFIG_SAVE_ON_EXIT, "Saves changes to configuration file on exit.") +MSG_HASH(MENU_ENUM_SUBLABEL_CONFIGURATION_SETTINGS, + "Change default settings for configuration files.") +MSG_HASH(MENU_ENUM_SUBLABEL_CONFIGURATIONS_LIST, + "Manage and create configuration files.") MSG_HASH(MENU_ENUM_SUBLABEL_CPU_CORES, "Amount of cores that the CPU has.") MSG_HASH(MENU_ENUM_SUBLABEL_FPS_SHOW, diff --git a/intl/msg_hash_pl.c b/intl/msg_hash_pl.c index 238a3f0bcc..c32a710bd4 100644 --- a/intl/msg_hash_pl.c +++ b/intl/msg_hash_pl.c @@ -274,8 +274,6 @@ const char *msg_hash_to_str_pl(enum msg_hash_enums msg) return "Katalog autokonfiguracji kontrolerów gier"; case MENU_ENUM_LABEL_VALUE_JOYPAD_DRIVER: return "Kontroler gamepadów"; - case MENU_ENUM_LABEL_VALUE_KEYBOARD_OVERLAY_PRESET: - return "Preset klawiatury ekranowej"; case MENU_ENUM_LABEL_VALUE_LANG_CHINESE_SIMPLIFIED: return "chińśki (Uproszczony)"; case MENU_ENUM_LABEL_VALUE_LANG_CHINESE_TRADITIONAL: diff --git a/intl/msg_hash_pt.c b/intl/msg_hash_pt.c index 628db9f130..dcf67ab273 100644 --- a/intl/msg_hash_pt.c +++ b/intl/msg_hash_pt.c @@ -1208,8 +1208,6 @@ const char *msg_hash_to_str_pt(enum msg_hash_enums msg) return "Autoconfigurações de Dispositivos de Entrada"; case MENU_ENUM_LABEL_VALUE_JOYPAD_DRIVER: return "Driver de Joypad"; - case MENU_ENUM_LABEL_VALUE_KEYBOARD_OVERLAY_PRESET: - return "Predefinições de Overlay de Teclado"; case MENU_ENUM_LABEL_VALUE_LANG_CHINESE_SIMPLIFIED: return "Chinês (Simplificado)"; case MENU_ENUM_LABEL_VALUE_LANG_CHINESE_TRADITIONAL: diff --git a/intl/msg_hash_ru.h b/intl/msg_hash_ru.h index 6f04d7df9b..1825bcf810 100644 --- a/intl/msg_hash_ru.h +++ b/intl/msg_hash_ru.h @@ -393,11 +393,7 @@ MSG_HASH( ) MSG_HASH( MENU_ENUM_LABEL_VALUE_CONFIG_SAVE_ON_EXIT, - "Save Configuration On Exit" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_CONFIRM_ON_EXIT, - "Ask For Confirmation On Exit" + "Save Configuration on Exit" ) MSG_HASH( MENU_ENUM_LABEL_VALUE_CONTENT_COLLECTION_LIST, @@ -543,7 +539,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_FRAME_THROTTLE_SETTINGS, MSG_HASH(MENU_ENUM_LABEL_VALUE_FRONTEND_COUNTERS, "Frontend Counters") MSG_HASH(MENU_ENUM_LABEL_VALUE_GAME_SPECIFIC_OPTIONS, - "Load Content-specific core options automatically") + "Load Content-Specific Core Options Automatically") MSG_HASH(MENU_ENUM_LABEL_VALUE_GAME_SPECIFIC_OPTIONS_CREATE, "Create game-options file") MSG_HASH(MENU_ENUM_LABEL_VALUE_GAME_SPECIFIC_OPTIONS_IN_USE, @@ -774,8 +770,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_JOYPAD_AUTOCONFIG_DIR, "Input Autoconfig") MSG_HASH(MENU_ENUM_LABEL_VALUE_JOYPAD_DRIVER, "Joypad Driver") -MSG_HASH(MENU_ENUM_LABEL_VALUE_KEYBOARD_OVERLAY_PRESET, - "Keyboard Overlay Preset") MSG_HASH(MENU_ENUM_LABEL_VALUE_LAKKA_SERVICES, "Services") MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_CHINESE_SIMPLIFIED, @@ -1633,7 +1627,7 @@ MSG_HASH(MENU_ENUM_SUBLABEL_LOGGING_SETTINGS, MSG_HASH(MENU_ENUM_SUBLABEL_USER_INTERFACE_SETTINGS, "Change settings for the user interface.") MSG_HASH(MENU_ENUM_SUBLABEL_USER_SETTINGS, - "Accounts, Username, Language.") + "Change accounts, username, and language.") MSG_HASH(MENU_ENUM_SUBLABEL_PRIVACY_SETTINGS, "Change your privacy settings.") MSG_HASH(MENU_ENUM_SUBLABEL_DIRECTORY_SETTINGS, @@ -1650,6 +1644,10 @@ MSG_HASH(MENU_ENUM_SUBLABEL_BLUETOOTH_ENABLE, "Enable or disable bluetooth.") MSG_HASH(MENU_ENUM_SUBLABEL_CONFIG_SAVE_ON_EXIT, "Saves changes to configuration file on exit.") +MSG_HASH(MENU_ENUM_SUBLABEL_CONFIGURATION_SETTINGS, + "Change default settings for configuration files.") +MSG_HASH(MENU_ENUM_SUBLABEL_CONFIGURATIONS_LIST, + "Manage and create configuration files.") MSG_HASH(MENU_ENUM_SUBLABEL_CPU_CORES, "Amount of cores that the CPU has.") MSG_HASH(MENU_ENUM_SUBLABEL_FPS_SHOW, diff --git a/intl/msg_hash_us.c b/intl/msg_hash_us.c index 9f2433b3d5..d1b472a695 100644 --- a/intl/msg_hash_us.c +++ b/intl/msg_hash_us.c @@ -592,10 +592,6 @@ int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len) "Amount of seconds to wait until proceeding \n" "to the next bind."); break; - case MENU_ENUM_LABEL_KEYBOARD_OVERLAY_PRESET: - snprintf(s, len, - "Path to onscreen keyboard overlay."); - break; case MENU_ENUM_LABEL_OVERLAY_SCALE: snprintf(s, len, "Overlay scale."); @@ -962,6 +958,11 @@ int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len) "shaders." ); break; + case MENU_ENUM_LABEL_CONFIGURATION_SETTINGS: + snprintf(s, len, + "Determines how configuration files are \n" + "loaded and prioritized."); + break; case MENU_ENUM_LABEL_CONFIG_SAVE_ON_EXIT: snprintf(s, len, "Saves config to disk on exit.\n" @@ -1616,6 +1617,10 @@ int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len) snprintf(s, len, "Disconnects an active Netplay connection."); break; + case MENU_ENUM_LABEL_NETPLAY_LAN_SCAN_SETTINGS: + snprintf(s, len, + "Search for and connect to netplay hosts on the local network."); + break; case MENU_ENUM_LABEL_NETPLAY_SETTINGS: snprintf(s, len, "Setting related to Netplay."); diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index 64d9e2ecb2..fa26cfa99a 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -397,11 +397,7 @@ MSG_HASH( ) MSG_HASH( MENU_ENUM_LABEL_VALUE_CONFIG_SAVE_ON_EXIT, - "Save Configuration On Exit" - ) -MSG_HASH( - MENU_ENUM_LABEL_VALUE_CONFIRM_ON_EXIT, - "Ask For Confirmation On Exit" + "Save Configuration on Exit" ) MSG_HASH( MENU_ENUM_LABEL_VALUE_CONTENT_COLLECTION_LIST, @@ -549,7 +545,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_FRAME_THROTTLE_SETTINGS, MSG_HASH(MENU_ENUM_LABEL_VALUE_FRONTEND_COUNTERS, "Frontend Counters") MSG_HASH(MENU_ENUM_LABEL_VALUE_GAME_SPECIFIC_OPTIONS, - "Load Content-specific core options automatically") + "Load Content-Specific Core Options Automatically") MSG_HASH(MENU_ENUM_LABEL_VALUE_GAME_SPECIFIC_OPTIONS_CREATE, "Create game-options file") MSG_HASH(MENU_ENUM_LABEL_VALUE_GAME_SPECIFIC_OPTIONS_IN_USE, @@ -782,8 +778,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_JOYPAD_AUTOCONFIG_DIR, "Input Autoconfig") MSG_HASH(MENU_ENUM_LABEL_VALUE_JOYPAD_DRIVER, "Joypad Driver") -MSG_HASH(MENU_ENUM_LABEL_VALUE_KEYBOARD_OVERLAY_PRESET, - "Keyboard Overlay Preset") MSG_HASH(MENU_ENUM_LABEL_VALUE_LAKKA_SERVICES, "Services") MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_CHINESE_SIMPLIFIED, @@ -1655,7 +1649,7 @@ MSG_HASH(MENU_ENUM_SUBLABEL_LOGGING_SETTINGS, MSG_HASH(MENU_ENUM_SUBLABEL_USER_INTERFACE_SETTINGS, "Change settings for the user interface.") MSG_HASH(MENU_ENUM_SUBLABEL_USER_SETTINGS, - "Accounts, Username, Language.") + "Change accounts, username, and language.") MSG_HASH(MENU_ENUM_SUBLABEL_PRIVACY_SETTINGS, "Change your privacy settings.") MSG_HASH(MENU_ENUM_SUBLABEL_DIRECTORY_SETTINGS, @@ -1672,6 +1666,10 @@ MSG_HASH(MENU_ENUM_SUBLABEL_BLUETOOTH_ENABLE, "Enable or disable bluetooth.") MSG_HASH(MENU_ENUM_SUBLABEL_CONFIG_SAVE_ON_EXIT, "Saves changes to configuration file on exit.") +MSG_HASH(MENU_ENUM_SUBLABEL_CONFIGURATION_SETTINGS, + "Change default settings for configuration files.") +MSG_HASH(MENU_ENUM_SUBLABEL_CONFIGURATIONS_LIST, + "Manage and create configuration files.") MSG_HASH(MENU_ENUM_SUBLABEL_CPU_CORES, "Amount of cores that the CPU has.") MSG_HASH(MENU_ENUM_SUBLABEL_FPS_SHOW, diff --git a/intl/msg_hash_vn.c b/intl/msg_hash_vn.c index c86613c256..d3b3406c2b 100644 --- a/intl/msg_hash_vn.c +++ b/intl/msg_hash_vn.c @@ -585,10 +585,6 @@ int menu_hash_get_help_vn_enum(enum msg_hash_enums msg, char *s, size_t len) "Amount of seconds to wait until proceeding \n" "to the next bind."); break; - case MENU_ENUM_LABEL_KEYBOARD_OVERLAY_PRESET: - snprintf(s, len, - "Path to onscreen keyboard overlay."); - break; case MENU_ENUM_LABEL_OVERLAY_SCALE: snprintf(s, len, "Overlay scale."); @@ -971,6 +967,11 @@ int menu_hash_get_help_vn_enum(enum msg_hash_enums msg, char *s, size_t len) "shaders." ); break; + case MENU_ENUM_LABEL_CONFIGURATION_SETTINGS: + snprintf(s, len, + "Determines how configuration files are \n" + "loaded and prioritized."); + break; case MENU_ENUM_LABEL_CONFIG_SAVE_ON_EXIT: snprintf(s, len, "Saves config to disk on exit.\n" @@ -1616,6 +1617,10 @@ int menu_hash_get_help_vn_enum(enum msg_hash_enums msg, char *s, size_t len) snprintf(s, len, "Setting related to Netplay."); break; + case MENU_ENUM_LABEL_NETPLAY_LAN_SCAN_SETTINGS: + snprintf(s, len, + "Search for and connect to netplay hosts on the local network."); + break; case MENU_ENUM_LABEL_DYNAMIC_WALLPAPER: snprintf(s, len, "Dynamically tải a new wallpaper \n" @@ -2077,9 +2082,7 @@ const char *msg_hash_to_str_vn(enum msg_hash_enums msg) case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS: return "Configuration"; case MENU_ENUM_LABEL_VALUE_CONFIG_SAVE_ON_EXIT: - return "Save Configuration On Exit"; - case MENU_ENUM_LABEL_VALUE_CONFIRM_ON_EXIT: - return "Ask For Confirmation On Exit"; + return "Save Configuration on Exit"; case MENU_ENUM_LABEL_VALUE_CONTENT_COLLECTION_LIST: return "Collections"; case MENU_ENUM_LABEL_VALUE_CONTENT_DATABASE_DIRECTORY: @@ -2221,7 +2224,7 @@ const char *msg_hash_to_str_vn(enum msg_hash_enums msg) case MENU_ENUM_LABEL_VALUE_FRONTEND_COUNTERS: return "Frontend Counters"; case MENU_ENUM_LABEL_VALUE_GAME_SPECIFIC_OPTIONS: - return "Tải Content-specific core options automatically"; + return "Tải Content-Specific Core Options Automatically"; case MENU_ENUM_LABEL_VALUE_GAME_SPECIFIC_OPTIONS_CREATE: return "Create game-options file"; case MENU_ENUM_LABEL_VALUE_GAME_SPECIFIC_OPTIONS_IN_USE: @@ -2450,8 +2453,6 @@ const char *msg_hash_to_str_vn(enum msg_hash_enums msg) return "Input Device Autoconfig Dir"; case MENU_ENUM_LABEL_VALUE_JOYPAD_DRIVER: return "Joypad Driver"; - case MENU_ENUM_LABEL_VALUE_KEYBOARD_OVERLAY_PRESET: - return "Keyboard Overlay Preset"; case MENU_ENUM_LABEL_VALUE_LAKKA_SERVICES: return "Services"; case MENU_ENUM_LABEL_VALUE_LANG_CHINESE_SIMPLIFIED: @@ -3287,6 +3288,10 @@ const char *msg_hash_to_str_vn(enum msg_hash_enums msg) return "Bật/tắt bluetooth."; case MENU_ENUM_SUBLABEL_CONFIG_SAVE_ON_EXIT: return "Lưu cấu hình khi thoát retroarch."; + case MENU_ENUM_SUBLABEL_CONFIGURATION_SETTINGS: + return "Change default settings for configuration files."; + case MENU_ENUM_SUBLABEL_CONFIGURATIONS_LIST: + return "Manage and create configuration files."; case MENU_ENUM_SUBLABEL_CPU_CORES: return "Số lượng lõi của CPU."; case MENU_ENUM_SUBLABEL_FPS_SHOW: diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index 2ad8fa27cb..3ac217bd68 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -84,6 +84,8 @@ default_sublabel_macro(action_bind_sublabel_video_hard_sync, MENU_ default_sublabel_macro(action_bind_sublabel_video_hard_sync_frames, MENU_ENUM_SUBLABEL_VIDEO_HARD_SYNC_FRAMES) default_sublabel_macro(action_bind_sublabel_video_threaded, MENU_ENUM_SUBLABEL_VIDEO_THREADED) default_sublabel_macro(action_bind_sublabel_config_save_on_exit, MENU_ENUM_SUBLABEL_CONFIG_SAVE_ON_EXIT) +default_sublabel_macro(action_bind_sublabel_configuration_settings_list, MENU_ENUM_SUBLABEL_CONFIGURATION_SETTINGS) +default_sublabel_macro(action_bind_sublabel_configurations_list_list, MENU_ENUM_SUBLABEL_CONFIGURATIONS_LIST) default_sublabel_macro(action_bind_sublabel_video_shared_context, MENU_ENUM_SUBLABEL_VIDEO_SHARED_CONTEXT) default_sublabel_macro(action_bind_sublabel_audio_latency, MENU_ENUM_SUBLABEL_AUDIO_LATENCY) default_sublabel_macro(action_bind_sublabel_audio_rate_control_delta, MENU_ENUM_SUBLABEL_AUDIO_RATE_CONTROL_DELTA) @@ -223,6 +225,12 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs, case MENU_ENUM_LABEL_CONFIG_SAVE_ON_EXIT: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_config_save_on_exit); break; + case MENU_ENUM_LABEL_CONFIGURATION_SETTINGS: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_configuration_settings_list); + break; + case MENU_ENUM_LABEL_CONFIGURATIONS_LIST: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_configurations_list_list); + break; case MENU_ENUM_LABEL_VIDEO_THREADED: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_video_threaded); break; diff --git a/msg_hash.h b/msg_hash.h index 5c468e0fe2..325745b4f6 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -998,7 +998,6 @@ enum msg_hash_enums MENU_LABEL(NETPLAY_MODE), MENU_LABEL(PERFCNT_ENABLE), MENU_LABEL(OVERLAY_SCALE), - MENU_LABEL(KEYBOARD_OVERLAY_PRESET), MENU_LABEL(OVERLAY_PRESET), MENU_LABEL(OVERLAY_OPACITY), @@ -1016,6 +1015,7 @@ enum msg_hash_enums MENU_LABEL(LIBRETRO_LOG_LEVEL), MENU_LABEL(AUTOSAVE_INTERVAL), MENU_LABEL(CONFIG_SAVE_ON_EXIT), + MENU_LABEL(CONFIGURATION_LIST), MENU_LABEL(CONFIRM_ON_EXIT), MENU_LABEL(SHOW_HIDDEN_FILES), @@ -1259,7 +1259,7 @@ enum msg_hash_enums MENU_LABEL(OVERLAY_SETTINGS), MENU_LABEL(REWIND_SETTINGS), - MENU_ENUM_LABEL_ONSCREEN_KEYBOARD_OVERLAY_SETTINGS, + MENU_ENUM_LABEL_ONSCREEN_KEYBOARD_OVERLAY_SETTINGS, MENU_LABEL(MULTIMEDIA_SETTINGS), MENU_LABEL(PLAYLIST_SETTINGS),