follow menu wording conventions and improve help text

hunterk · hunterk · commit c32eac45bb03 · 2026-05-01T21:32:00.000-05:00
diff --git a/config.def.h b/config.def.h
@@ -1440,10 +1440,10 @@
  * It is measured in seconds. A value of 0 disables automatic savestate saving. */
 #if defined(__i386__) || defined(__i486__) || defined(__i686__) || defined(__x86_64__) || defined(_M_X64) || defined(_WIN32) || defined(OSX) || defined(ANDROID) || defined(IOS) || defined(DINGUX)
 /* Disabled by default but can be enabled by user */
-#define DEFAULT_AUTOMATIC_SAVESTATE_INTERVAL 0
+#define DEFAULT_SAVESTATE_AUTOMATIC_INTERVAL 0
 #else
 /* Default to disabled on I/O-constrained platforms */
-#define DEFAULT_AUTOMATIC_SAVESTATE_INTERVAL 0
+#define DEFAULT_SAVESTATE_AUTOMATIC_INTERVAL 0
 #endif
 
 /* Take screenshots for save states */
diff --git a/configuration.c b/configuration.c
@@ -2461,7 +2461,7 @@ static struct config_uint_setting *populate_settings_uint(
    SETTING_UINT("memory_update_interval",        &settings->uints.memory_update_interval, true, DEFAULT_MEMORY_UPDATE_INTERVAL, false);
    SETTING_UINT("core_updater_auto_backup_history_size", &settings->uints.core_updater_auto_backup_history_size, true, DEFAULT_CORE_UPDATER_AUTO_BACKUP_HISTORY_SIZE, false);
    SETTING_UINT("autosave_interval",             &settings->uints.autosave_interval,  true, DEFAULT_AUTOSAVE_INTERVAL, false);
-   SETTING_UINT("automatic_savestate_interval",  &settings->uints.automatic_savestate_interval, true, DEFAULT_AUTOMATIC_SAVESTATE_INTERVAL, false);
+   SETTING_UINT("savestate_automatic_interval",  &settings->uints.savestate_automatic_interval, true, DEFAULT_SAVESTATE_AUTOMATIC_INTERVAL, false);
    SETTING_UINT("rewind_granularity",            &settings->uints.rewind_granularity, true, DEFAULT_REWIND_GRANULARITY, false);
    SETTING_UINT("rewind_buffer_size_step",       &settings->uints.rewind_buffer_size_step, true, DEFAULT_REWIND_BUFFER_SIZE_STEP, false);
    SETTING_UINT("run_ahead_frames",              &settings->uints.run_ahead_frames, true, 1,  false);
diff --git a/configuration.h b/configuration.h
@@ -242,7 +242,7 @@ typedef struct settings
       unsigned rewind_granularity;
       unsigned rewind_buffer_size_step;
       unsigned autosave_interval;
-      unsigned automatic_savestate_interval;
+      unsigned savestate_automatic_interval;
       unsigned replay_checkpoint_interval;
       unsigned replay_max_keep;
       unsigned savestate_max_keep;
diff --git a/intl/msg_hash_lbl.h b/intl/msg_hash_lbl.h
@@ -393,8 +393,8 @@ MSG_HASH(
    MENU_ENUM_LABEL_AUTOSAVE_INTERVAL_STR
    )
 MSG_HASH(
-   MENU_ENUM_LABEL_AUTOMATIC_SAVESTATE_INTERVAL,
-   MENU_ENUM_LABEL_AUTOMATIC_SAVESTATE_INTERVAL_STR
+   MENU_ENUM_LABEL_SAVESTATE_AUTOMATIC_INTERVAL,
+   MENU_ENUM_LABEL_SAVESTATE_AUTOMATIC_INTERVAL_STR
    )
 MSG_HASH(
    MENU_ENUM_LABEL_REPLAY_CHECKPOINT_INTERVAL,
diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h
@@ -4780,16 +4780,16 @@ MSG_HASH(
    "Autosaves the non-volatile SRAM at a regular interval. This is disabled by default unless set otherwise. The interval is measured in seconds. A value of 0 disables autosave."
    )
 MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_AUTOMATIC_SAVESTATE_INTERVAL,
-   "Automatic Savestate Interval"
+   MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTOMATIC_INTERVAL,
+   "Save State: Automatic Interval"
    )
 MSG_HASH(
-   MENU_ENUM_SUBLABEL_AUTOMATIC_SAVESTATE_INTERVAL,
-   "Automatically save a savestate at a regular interval (in seconds). Set to 0 to disable."
+   MENU_ENUM_SUBLABEL_SAVESTATE_AUTOMATIC_INTERVAL,
+   "Automatically save a state at a regular interval (in seconds). Set to 0 to disable."
    )
 MSG_HASH(
-   MENU_ENUM_LABEL_HELP_AUTOMATIC_SAVESTATE_INTERVAL,
-   "Automatically saves a savestate at regular intervals. This is useful for creating periodic backups of your game progress. The interval is measured in seconds. A value of 0 disables automatic savestate saving."
+   MENU_ENUM_LABEL_HELP_SAVESTATE_AUTOMATIC_INTERVAL,
+   "Automatically saves a state at a regular interval, measured in seconds. This is useful for creating periodic backups of your game progress, especially on devices that may close unexpectedly due to battery or other issues. A value of 0 disables this feature."
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_REPLAY_CHECKPOINT_INTERVAL,
diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c
@@ -825,7 +825,7 @@ DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_save_file_compression,         MENU_
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_savestate_file_compression,    MENU_ENUM_SUBLABEL_SAVESTATE_FILE_COMPRESSION)
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_savestate_max_keep,            MENU_ENUM_SUBLABEL_SAVESTATE_MAX_KEEP)
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_autosave_interval,             MENU_ENUM_SUBLABEL_AUTOSAVE_INTERVAL)
-DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_automatic_savestate_interval,  MENU_ENUM_SUBLABEL_AUTOMATIC_SAVESTATE_INTERVAL)
+DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_savestate_automatic_interval,  MENU_ENUM_SUBLABEL_SAVESTATE_AUTOMATIC_INTERVAL)
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_replay_max_keep,               MENU_ENUM_SUBLABEL_REPLAY_MAX_KEEP)
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_replay_checkpoint_interval,    MENU_ENUM_SUBLABEL_REPLAY_CHECKPOINT_INTERVAL)
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_replay_checkpoint_deserialize, MENU_ENUM_SUBLABEL_REPLAY_CHECKPOINT_DESERIALIZE)
@@ -4108,8 +4108,8 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
          case MENU_ENUM_LABEL_AUTOSAVE_INTERVAL:
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_autosave_interval);
             break;
-         case MENU_ENUM_LABEL_AUTOMATIC_SAVESTATE_INTERVAL:
-            BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_automatic_savestate_interval);
+         case MENU_ENUM_LABEL_SAVESTATE_AUTOMATIC_INTERVAL:
+            BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_savestate_automatic_interval);
             break;
          case MENU_ENUM_LABEL_REPLAY_CHECKPOINT_INTERVAL:
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_replay_checkpoint_interval);
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
@@ -11138,7 +11138,7 @@ unsigned menu_displaylist_build_list(
                {MENU_ENUM_LABEL_SORT_SAVEFILES_BY_CONTENT_ENABLE,   PARSE_ONLY_BOOL, true},
                {MENU_ENUM_LABEL_SAVEFILES_IN_CONTENT_DIR_ENABLE,    PARSE_ONLY_BOOL, true},
                {MENU_ENUM_LABEL_AUTOSAVE_INTERVAL,                  PARSE_ONLY_UINT, true},
-               {MENU_ENUM_LABEL_AUTOMATIC_SAVESTATE_INTERVAL,      PARSE_ONLY_UINT, true},
+               {MENU_ENUM_LABEL_SAVESTATE_AUTOMATIC_INTERVAL,      PARSE_ONLY_UINT, true},
                {MENU_ENUM_LABEL_BLOCK_SRAM_OVERWRITE,               PARSE_ONLY_BOOL, true},
 #if defined(HAVE_ZLIB)
                {MENU_ENUM_LABEL_SAVE_FILE_COMPRESSION,              PARSE_ONLY_BOOL, true},
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
@@ -12010,10 +12010,10 @@ static bool setting_append_list(
 #ifdef HAVE_THREADS
             CONFIG_UINT(
                   list, list_info,
-                  &settings->uints.automatic_savestate_interval,
-                  MENU_ENUM_LABEL_AUTOMATIC_SAVESTATE_INTERVAL,
-                  MENU_ENUM_LABEL_VALUE_AUTOMATIC_SAVESTATE_INTERVAL,
-                  DEFAULT_AUTOMATIC_SAVESTATE_INTERVAL,
+                  &settings->uints.savestate_automatic_interval,
+                  MENU_ENUM_LABEL_SAVESTATE_AUTOMATIC_INTERVAL,
+                  MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTOMATIC_INTERVAL,
+                  DEFAULT_SAVESTATE_AUTOMATIC_INTERVAL,
                   &group_info,
                   &subgroup_info,
                   parent_group,
diff --git a/msg_hash.h b/msg_hash.h
@@ -2546,7 +2546,7 @@ enum msg_hash_enums
    MENU_LABEL(FRONTEND_LOG_LEVEL),
    MENU_LBL_H(LIBRETRO_LOG_LEVEL),
    MENU_LBL_H(AUTOSAVE_INTERVAL),
-   MENU_LBL_H(AUTOMATIC_SAVESTATE_INTERVAL),
+   MENU_LBL_H(SAVESTATE_AUTOMATIC_INTERVAL),
    MENU_LBL_H(REPLAY_CHECKPOINT_INTERVAL),
    MENU_LBL_H(REPLAY_CHECKPOINT_DESERIALIZE),
    MENU_LBL_H(CONFIG_SAVE_ON_EXIT),
diff --git a/msg_hash_lbl_str.h b/msg_hash_lbl_str.h
@@ -107,7 +107,7 @@
 #define MENU_ENUM_LABEL_MICROPHONE_WASAPI_SH_BUFFER_LENGTH_STR "microphone_wasapi_sh_buffer_length"
 #define MENU_ENUM_LABEL_MICROPHONE_RESAMPLER_QUALITY_STR "microphone_resampler_quality"
 #define MENU_ENUM_LABEL_AUTOSAVE_INTERVAL_STR "autosave_interval"
-#define MENU_ENUM_LABEL_AUTOMATIC_SAVESTATE_INTERVAL_STR "automatic_savestate_interval"
+#define MENU_ENUM_LABEL_SAVESTATE_AUTOMATIC_INTERVAL_STR "savestate_automatic_interval"
 #define MENU_ENUM_LABEL_REPLAY_CHECKPOINT_INTERVAL_STR "replay_checkpoint_interval"
 #define MENU_ENUM_LABEL_REPLAY_CHECKPOINT_DESERIALIZE_STR "replay_checkpoint_deserialize"
 #define MENU_ENUM_LABEL_AUTO_OVERRIDES_ENABLE_STR "auto_overrides_enable"
diff --git a/tasks/task_save.c b/tasks/task_save.c
@@ -136,7 +136,7 @@ static bool save_state_in_background       = false;
 static bool save_state_disable_undo        = false;
 
 /* Time tracking for automatic savestate interval */
-static time_t last_automatic_savestate_time = 0;
+static time_t last_savestate_automatic_time = 0;
 
 typedef struct rastate_size_info
 {
@@ -1891,19 +1891,19 @@ bool content_save_state_automatic(void)
    time_t current_time;
    char savestate_path[PATH_MAX_LENGTH];
    settings_t *settings = config_get_ptr();
-   unsigned automatic_savestate_interval = 
-      settings->uints.automatic_savestate_interval;
+   unsigned savestate_automatic_interval = 
+      settings->uints.savestate_automatic_interval;
    
    /* Return early if automatic savestate is disabled,
-      safety checks already happen in content_save_state() */
-   if (automatic_savestate_interval == 0)
+      safety checks already happen in content_auto_save_state() */
+   if (savestate_automatic_interval == 0)
       return false;
    
    current_time = time(NULL);
    
    /* Check how long since last autosavestate */
-   if ((current_time - last_automatic_savestate_time) < 
-       (time_t)automatic_savestate_interval)
+   if ((current_time - last_savestate_automatic_time) < 
+       (time_t)savestate_automatic_interval)
       return false;
    
    /* Generate the savestate path */
@@ -1921,7 +1921,7 @@ bool content_save_state_automatic(void)
          savestate_path);
    
    /* Update the last savestate time, rinse/repeat */
-   last_automatic_savestate_time = current_time;
+   last_savestate_automatic_time = current_time;
    
    return content_auto_save_state(savestate_path);
 }

Original file line number	Diff line number	Diff line change
`@@ -393,8 +393,8 @@ MSG_HASH(`
`393`	`393`	`MENU_ENUM_LABEL_AUTOSAVE_INTERVAL_STR`
`394`	`394`	`)`
`395`	`395`	`MSG_HASH(`
`396`		`- MENU_ENUM_LABEL_AUTOMATIC_SAVESTATE_INTERVAL,`
`397`		`- MENU_ENUM_LABEL_AUTOMATIC_SAVESTATE_INTERVAL_STR`
	`396`	`+ MENU_ENUM_LABEL_SAVESTATE_AUTOMATIC_INTERVAL,`
	`397`	`+ MENU_ENUM_LABEL_SAVESTATE_AUTOMATIC_INTERVAL_STR`
`398`	`398`	`)`
`399`	`399`	`MSG_HASH(`
`400`	`400`	`MENU_ENUM_LABEL_REPLAY_CHECKPOINT_INTERVAL,`
Original file line number	Diff line number	Diff line change
`@@ -4780,16 +4780,16 @@ MSG_HASH(`
`4780`	`4780`	`"Autosaves the non-volatile SRAM at a regular interval. This is disabled by default unless set otherwise. The interval is measured in seconds. A value of 0 disables autosave."`
`4781`	`4781`	`)`
`4782`	`4782`	`MSG_HASH(`
`4783`		`- MENU_ENUM_LABEL_VALUE_AUTOMATIC_SAVESTATE_INTERVAL,`
`4784`		`- "Automatic Savestate Interval"`
	`4783`	`+ MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTOMATIC_INTERVAL,`
	`4784`	`+ "Save State: Automatic Interval"`
`4785`	`4785`	`)`
`4786`	`4786`	`MSG_HASH(`
`4787`		`- MENU_ENUM_SUBLABEL_AUTOMATIC_SAVESTATE_INTERVAL,`
`4788`		`- "Automatically save a savestate at a regular interval (in seconds). Set to 0 to disable."`
	`4787`	`+ MENU_ENUM_SUBLABEL_SAVESTATE_AUTOMATIC_INTERVAL,`
	`4788`	`+ "Automatically save a state at a regular interval (in seconds). Set to 0 to disable."`
`4789`	`4789`	`)`
`4790`	`4790`	`MSG_HASH(`
`4791`		`- MENU_ENUM_LABEL_HELP_AUTOMATIC_SAVESTATE_INTERVAL,`
`4792`		`- "Automatically saves a savestate at regular intervals. This is useful for creating periodic backups of your game progress. The interval is measured in seconds. A value of 0 disables automatic savestate saving."`
	`4791`	`+ MENU_ENUM_LABEL_HELP_SAVESTATE_AUTOMATIC_INTERVAL,`
	`4792`	`+ "Automatically saves a state at a regular interval, measured in seconds. This is useful for creating periodic backups of your game progress, especially on devices that may close unexpectedly due to battery or other issues. A value of 0 disables this feature."`
`4793`	`4793`	`)`
`4794`	`4794`	`MSG_HASH(`
`4795`	`4795`	`MENU_ENUM_LABEL_VALUE_REPLAY_CHECKPOINT_INTERVAL,`