diff --git a/Core/Config.cpp b/Core/Config.cpp
index 6760262f36..480e69c29a 100644
--- a/Core/Config.cpp
+++ b/Core/Config.cpp
@@ -268,6 +268,7 @@ static const ConfigSetting generalSettings[] = {
 	ConfigSetting("StateUndoLastSaveGame", SETTING(g_Config, sStateUndoLastSaveGame), "NA", CfgFlag::DEFAULT),
 	ConfigSetting("StateUndoLastSaveSlot", SETTING(g_Config, iStateUndoLastSaveSlot), -5, CfgFlag::DEFAULT), // Start with an "invalid" value
 	ConfigSetting("RewindSnapshotInterval", SETTING(g_Config, iRewindSnapshotInterval), 0, CfgFlag::PER_GAME),
+	ConfigSetting("SaveStateSlotCount", SETTING(g_Config, iSaveStateSlotCount), 5, CfgFlag::DEFAULT),
 
 	ConfigSetting("ShowRegionOnGameIcon", SETTING(g_Config, bShowRegionOnGameIcon), false, CfgFlag::DEFAULT),
 	ConfigSetting("ShowIDOnGameIcon", SETTING(g_Config, bShowIDOnGameIcon), false, CfgFlag::DEFAULT),
@@ -1536,6 +1537,9 @@ void Config::PostLoadCleanup() {
 	} else if (g_Config.iScreenRotation == ROTATION_LOCKED_VERTICAL180) {
 		g_Config.iScreenRotation = ROTATION_LOCKED_VERTICAL;
 	}
+
+	// Clamp save state slot count to somewhat sane limits.
+	g_Config.iSaveStateSlotCount = std::clamp(g_Config.iSaveStateSlotCount, 1, 100);
 }
 
 void Config::PreSaveCleanup() {
diff --git a/Core/Config.h b/Core/Config.h
index be7b92e6ee..8c1b143367 100644
--- a/Core/Config.h
+++ b/Core/Config.h
@@ -151,9 +151,6 @@ public:
 
 	size_t Size() const override { return sizeof(Config); }
 
-	// TODO: Make a config setting.
-	static constexpr int iSaveStateSlotCount = 5;
-
 	// Whether to save the config on close.
 	bool bSaveSettings;
 	bool bFirstRun;
@@ -329,7 +326,8 @@ public:
 	std::string sStateLoadUndoGame;
 	std::string sStateUndoLastSaveGame;
 	int iStateUndoLastSaveSlot;
-	int iAutoLoadSaveState; // 0 = off, 1 = oldest, 2 = newest, >2 = slot number + 3
+	int iAutoLoadSaveState; // 0 = off, 1 = oldest (deprecated), 2 = newest, >2 = slot number + 3 (up to 5)
+	int iSaveStateSlotCount;
 	bool bEnableCheats;
 	bool bReloadCheats;
 	bool bEnablePlugins;
diff --git a/Core/SaveState.cpp b/Core/SaveState.cpp
index 1d45144399..ae65c58816 100644
--- a/Core/SaveState.cpp
+++ b/Core/SaveState.cpp
@@ -356,11 +356,11 @@ enum class OperationType {
 	}
 
 	void PrevSlot() {
-		g_Config.iCurrentStateSlot = (g_Config.iCurrentStateSlot - 1 + Config::iSaveStateSlotCount) % Config::iSaveStateSlotCount;
+		g_Config.iCurrentStateSlot = (g_Config.iCurrentStateSlot - 1 + g_Config.iSaveStateSlotCount) % g_Config.iSaveStateSlotCount;
 	}
 
 	void NextSlot() {
-		g_Config.iCurrentStateSlot = (g_Config.iCurrentStateSlot + 1) % Config::iSaveStateSlotCount;
+		g_Config.iCurrentStateSlot = (g_Config.iCurrentStateSlot + 1) % g_Config.iSaveStateSlotCount;
 	}
 
 	static void DeleteIfExists(const Path &fn) {
@@ -627,7 +627,7 @@ enum class OperationType {
 	int GetNewestSlot(std::string_view gamePrefix) {
 		int newestSlot = -1;
 		int64_t newestTime = 0;
-		for (int i = 0; i < Config::iSaveStateSlotCount; i++) {
+		for (int i = 0; i < g_Config.iSaveStateSlotCount; i++) {
 			auto iter = g_files.find(GenerateSaveSlotFilename(gamePrefix, i, STATE_EXTENSION));
 			if (iter != g_files.end()) {
 				int64_t mod = iter->second;
@@ -643,7 +643,7 @@ enum class OperationType {
 	int GetOldestSlot(std::string_view gamePrefix) {
 		int oldestSlot = -1;
 		int64_t oldestTime = INT64_MAX;
-		for (int i = 0; i < Config::iSaveStateSlotCount; i++) {
+		for (int i = 0; i < g_Config.iSaveStateSlotCount; i++) {
 			auto iter = g_files.find(GenerateSaveSlotFilename(gamePrefix, i, STATE_EXTENSION));
 			if (iter != g_files.end()) {
 				int64_t mod = iter->second;
diff --git a/Qt/mainwindow.cpp b/Qt/mainwindow.cpp
index 948d797304..d2ccd5820c 100644
--- a/Qt/mainwindow.cpp
+++ b/Qt/mainwindow.cpp
@@ -534,7 +534,7 @@ void MainWindow::createMenus()
 
 	QStringList slotNames;
 	QList<int> slotIndices;
-	for (int i = 0; i < Config::iSaveStateSlotCount; ++i) {
+	for (int i = 0; i < g_Config.iSaveStateSlotCount; ++i) {
 		slotNames << QString::number(i + 1);
 		slotIndices << i;
 	}
diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp
index bfe9f02934..f32a656ce4 100644
--- a/UI/GameSettingsScreen.cpp
+++ b/UI/GameSettingsScreen.cpp
@@ -1346,6 +1346,25 @@ void GameSettingsScreen::CreateSystemSettings(UI::ViewGroup *systemSettings) {
 		enableReportsCheckbox_->SetEnabled(Reporting::IsSupported());
 	});
 	lockedMhz->SetZeroLabel(sy->T("Auto"));
+
+	auto sa = GetI18NCategory(I18NCat::SAVEDATA);
+
+	systemSettings->Add(new ItemHeader(sa->T("Save states")));  // Borrow this string from the savedata manager
+
+	systemSettings->Add(new CheckBox(&g_Config.bEnableStateUndo, sy->T("Savestate slot backups")));
+
+	PopupSliderChoice* savestateSlotCount = systemSettings->Add(new PopupSliderChoice(&g_Config.iSaveStateSlotCount, 1, 30, 5, sy->T("Savestate slot count"), screenManager()));
+	savestateSlotCount->OnChange.Add([](UI::EventParams &e) {
+		System_Notify(SystemNotification::UI);
+	});
+
+	// NOTE: We will soon support more states, but we'll keep this niche feature limited to the first five.
+	static const char *autoLoadSaveStateChoices[] = {"Off", "Oldest Save", "Newest Save", "Slot 1", "Slot 2", "Slot 3", "Slot 4", "Slot 5"};
+	PopupMultiChoice *autoloadSaveState = systemSettings->Add(new PopupMultiChoice(&g_Config.iAutoLoadSaveState, sy->T("Auto load savestate"), autoLoadSaveStateChoices, 0, ARRAY_SIZE(autoLoadSaveStateChoices), I18NCat::SYSTEM, screenManager()));
+	if (g_Config.iAutoLoadSaveState != 1) {
+		autoloadSaveState->HideChoice(1);  // Hide "Oldest Save" if not using that mode. It doesn't make sense.
+	}
+
 	PopupSliderChoice *rewindInterval = systemSettings->Add(new PopupSliderChoice(&g_Config.iRewindSnapshotInterval, 0, 60, 0, sy->T("Rewind Snapshot Interval"), screenManager(), di->T("seconds, 0:off")));
 	rewindInterval->SetFormat(di->T("%d seconds"));
 	rewindInterval->SetZeroLabel(sy->T("Off"));
@@ -1366,9 +1385,7 @@ void GameSettingsScreen::CreateSystemSettings(UI::ViewGroup *systemSettings) {
 	}
 
 	systemSettings->Add(new Choice(sy->T("Restore Default Settings")))->OnClick.Handle(this, &GameSettingsScreen::OnRestoreDefaultSettings);
-	systemSettings->Add(new CheckBox(&g_Config.bEnableStateUndo, sy->T("Savestate slot backups")));
-	static const char *autoLoadSaveStateChoices[] = { "Off", "Oldest Save", "Newest Save", "Slot 1", "Slot 2", "Slot 3", "Slot 4", "Slot 5" };
-	systemSettings->Add(new PopupMultiChoice(&g_Config.iAutoLoadSaveState, sy->T("Auto Load Savestate"), autoLoadSaveStateChoices, 0, ARRAY_SIZE(autoLoadSaveStateChoices), I18NCat::SYSTEM, screenManager()));
+
 	if (System_GetPropertyBool(SYSPROP_HAS_KEYBOARD))
 		systemSettings->Add(new CheckBox(&g_Config.bBypassOSKWithKeyboard, sy->T("Use system native keyboard")));
 
diff --git a/UI/PauseScreen.cpp b/UI/PauseScreen.cpp
index d618f34dbb..764b810f2c 100644
--- a/UI/PauseScreen.cpp
+++ b/UI/PauseScreen.cpp
@@ -377,7 +377,7 @@ void GamePauseScreen::CreateSavestateControls(UI::LinearLayout *leftColumnItems)
 	using namespace UI;
 
 	leftColumnItems->SetSpacing(10.0);
-	for (int i = 0; i < Config::iSaveStateSlotCount; i++) {
+	for (int i = 0; i < g_Config.iSaveStateSlotCount; i++) {
 		SaveSlotView *slot = leftColumnItems->Add(new SaveSlotView(saveStatePrefix_, i, new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT, Gravity::G_HCENTER, Margins(0,0,0,0))));
 		slot->OnStateLoaded.Handle(this, &GamePauseScreen::OnState);
 		slot->OnStateSaved.Handle(this, &GamePauseScreen::OnState);
diff --git a/UI/SavedataScreen.cpp b/UI/SavedataScreen.cpp
index 05d211fc7a..98a9a0988b 100644
--- a/UI/SavedataScreen.cpp
+++ b/UI/SavedataScreen.cpp
@@ -663,11 +663,11 @@ void SavedataScreen::CreateTabs() {
 	using namespace UI;
 	auto sa = GetI18NCategory(I18NCat::SAVEDATA);
 
-	AddTab("SavedataBrowser", sa->T("Save Data"), [this](UI::LinearLayout *parent) {
+	AddTab("SavedataBrowser", sa->T("Save data"), [this](UI::LinearLayout *parent) {
 		CreateSavedataTab(parent);
 	});
 
-	AddTab("SavedataStatesBrowser", sa->T("Save States"), [this](UI::LinearLayout *parent) {
+	AddTab("SavedataStatesBrowser", sa->T("Save states"), [this](UI::LinearLayout *parent) {
 		CreateSavestateTab(parent);
 	});
 }
diff --git a/Windows/MainWindowMenu.cpp b/Windows/MainWindowMenu.cpp
index 4a50cb104d..3cd5b6859e 100644
--- a/Windows/MainWindowMenu.cpp
+++ b/Windows/MainWindowMenu.cpp
@@ -326,6 +326,15 @@ namespace MainWindow {
 		TranslateMenuItem(menu, ID_HELP_GITHUB);
 		TranslateMenuItem(menu, ID_HELP_DISCORD);
 		TranslateMenuItem(menu, ID_HELP_ABOUT);
+	}
+
+	void TranslateMenus(HWND hWnd, HMENU menu) {
+
+		const std::string curLanguageID = g_i18nrepo.LanguageID();
+		if (curLanguageID != menuLanguageID || KeyMap::HasChanged(menuKeymapGeneration)) {
+			DoTranslateMenus(hWnd, menu);
+			menuLanguageID = curLanguageID;
+		}
 
 		// Dynamically create the save state slot selector menu.
 		// TODO: In the future, maybe change it to separate save and load submenus?
@@ -337,7 +346,7 @@ namespace MainWindow {
 
 		auto di = GetI18NCategory(I18NCat::DIALOG);
 		// Add new items
-		for (int i = 0; i < Config::iSaveStateSlotCount; ++i) {
+		for (int i = 0; i < g_Config.iSaveStateSlotCount; ++i) {
 			std::string number = StringFromFormat("%d", i + 1);
 			if (i < 10) {
 				// Add an accelerator for the first 10 slots.
@@ -351,21 +360,8 @@ namespace MainWindow {
 				ConvertUTF8ToWString(label).c_str()
 			);
 		}
-	}
 
-	void TranslateMenus(HWND hWnd, HMENU menu) {
-		bool changed = false;
-
-		const std::string curLanguageID = g_i18nrepo.LanguageID();
-		if (curLanguageID != menuLanguageID || KeyMap::HasChanged(menuKeymapGeneration)) {
-			DoTranslateMenus(hWnd, menu);
-			menuLanguageID = curLanguageID;
-			changed = true;
-		}
-
-		if (changed) {
-			DrawMenuBar(hWnd);
-		}
+		DrawMenuBar(hWnd);
 	}
 
 	void BrowseAndBootDone(std::string filename);
@@ -1231,10 +1227,10 @@ namespace MainWindow {
 		if (g_Config.iCurrentStateSlot < 0)
 			g_Config.iCurrentStateSlot = 0;
 
-		else if (g_Config.iCurrentStateSlot >= Config::iSaveStateSlotCount)
-			g_Config.iCurrentStateSlot = Config::iSaveStateSlotCount - 1;
+		else if (g_Config.iCurrentStateSlot >= g_Config.iSaveStateSlotCount)
+			g_Config.iCurrentStateSlot = g_Config.iSaveStateSlotCount - 1;
 
-		for (int i = 0; i < Config::iSaveStateSlotCount; i++) {
+		for (int i = 0; i < g_Config.iSaveStateSlotCount; i++) {
 			CheckMenuItem(menu, ID_FILE_SAVESTATE_SLOT_BASE + i, MF_BYCOMMAND | ((i == g_Config.iCurrentStateSlot) ? MF_CHECKED : MF_UNCHECKED));
 		}
 
diff --git a/assets/lang/ar_AE.ini b/assets/lang/ar_AE.ini
index 1dfe99bcd0..85986a12bc 100644
--- a/assets/lang/ar_AE.ini
+++ b/assets/lang/ar_AE.ini
@@ -1217,8 +1217,8 @@ Filename = إسم الملف
 No screenshot = ‎لا تصور الشاشة
 None yet. Things will appear here after you save. = ‎ليس بعد. الأشياء سوف تظهر هنا بعد الحفظ.
 Nothing matching '%1' was found. = Nothing matching '%1' was found.
-Save Data = ‎حفظ البيانات
-Save States = ‎حفظ الحالة
+Save data = ‎حفظ البيانات
+Save states = ‎حفظ الحالة
 Savedata Manager = ‎مدير حفظ الحالة
 Showing matches for '%1'. = Showing matches for '%1'.
 Size = الحجم
@@ -1351,7 +1351,7 @@ Vulkan Features = Vulkan features
 App switching mode = App switching mode
 Ask for exit confirmation after seconds = Ask for exit confirmation after seconds
 Auto = ‎تلقائي
-Auto Load Savestate = Auto load savestate
+Auto load savestate = Auto load savestate
 AVI Dump started. = AVI dump started
 AVI Dump stopped. = AVI dump stopped
 Bouncing icon = Bouncing icon
@@ -1441,6 +1441,7 @@ RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = ‎ترجيع تردد اللقطة (يأكل الذاكرة)
 Savestate Slot = ‎منطقة حفظ الحالة
 Savestate slot backups = Savestate slot backups
+Savestate slot count = عدد فتحات حفظ الحالة
 Screenshot mode = Screenshot mode
 Screenshots as PNG = ‎PNG إحفظ لقطة الشاشة في صيغة
 Set Memory Stick folder = Set Memory Stick folder
diff --git a/assets/lang/az_AZ.ini b/assets/lang/az_AZ.ini
index 41725e1d98..eff813f3ea 100644
--- a/assets/lang/az_AZ.ini
+++ b/assets/lang/az_AZ.ini
@@ -1212,8 +1212,8 @@ Filename = Fayl adı
 No screenshot = Ekran çəkilişi yoxdur
 None yet. Things will appear here after you save. = Hələlik heç nə. Qoruduqdan sonra burada nəsnələr oluşacaq.
 Nothing matching '%1' was found. = '%1' ilə uyğun heç nə tapılmadı.
-Save Data = Veriləni qoru
-Save States = Qorunuş durumları
+Save data = Veriləni qoru
+Save states = Qorunuş durumları
 Savedata Manager = Verilən qorunuşu yönəldəni
 Showing matches for '%1'. = '%1' ilə uyğunluqlar göstərilir.
 Size = Ölçü
@@ -1346,7 +1346,7 @@ Vulkan Features = Vulkan özəllikləri
 App switching mode = Uyğulama dəyişimi modu
 Ask for exit confirmation after seconds = Saniyə sonra çıxış onayını istə
 Auto = Özbaşına
-Auto Load Savestate = Özbaşına durum qorunuşu yüklənişi
+Auto load savestate = Özbaşına durum qorunuşu yüklənişi
 AVI Dump started. = AVI boşalım başladı
 AVI Dump stopped. = AVI boşalımı dayandı
 Bouncing icon = Tullanan simgə
@@ -1436,6 +1436,7 @@ RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Anlıq görüntü aralığını geri çək (yad. donuzu)
 Savestate Slot = Durum qorunuşu yuvası
 Savestate slot backups = Durum qorunuşu yuvası yedəkləri
+Savestate slot count = Saxlama vəziyyət slotu sayı
 Screenshot mode = Ekran çəkimi modu
 Screenshots as PNG = Ekran çəkimlərini PNG biçimində qoru
 Set Memory Stick folder = Yaddaş Çubuğu qovluğunu qur
diff --git a/assets/lang/be_BY.ini b/assets/lang/be_BY.ini
index 5b232c2c15..c58cbbb11e 100644
--- a/assets/lang/be_BY.ini
+++ b/assets/lang/be_BY.ini
@@ -1209,8 +1209,8 @@ Filename = Імя файла
 No screenshot = Няма скрыншота
 None yet. Things will appear here after you save. = None yet. Things will appear here after you save.
 Nothing matching '%1' was found. = Nothing matching '%1' was found.
-Save Data = Save data
-Save States = Save states
+Save data = Save data
+Save states = Save states
 Savedata Manager = Savedata manager
 Showing matches for '%1'. = Showing matches for '%1'.
 Size = Памер
@@ -1335,7 +1335,7 @@ Display Color Formats = Паказаць фарматы колеру
 App switching mode = Рэжым пераключэння праграм
 Ask for exit confirmation after seconds = Запыт пацверджання выхаду
 Auto = Аўта
-Auto Load Savestate = Auto load savestate
+Auto load savestate = Auto load savestate
 AVI Dump started. = AVI dump started
 AVI Dump stopped. = AVI dump stopped
 Bouncing icon = Адскокваючы значок
@@ -1423,6 +1423,7 @@ RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Rewind Snapshot Interval (mem hog)
 Savestate Slot = Слот Savestate
 Savestate slot backups = Рэзервовыя копіі слотаў Savestate
+Savestate slot count = Колькасць слотаў для захавання стану
 Screenshot mode = Рэжым скрыншота
 Screenshots as PNG = Захоўваць скрыншоты ў фармаце PNG
 Set Memory Stick folder = Усталяваць тэчку Memory Stick
diff --git a/assets/lang/bg_BG.ini b/assets/lang/bg_BG.ini
index 8ded18d764..8f501c14e9 100644
--- a/assets/lang/bg_BG.ini
+++ b/assets/lang/bg_BG.ini
@@ -1209,8 +1209,8 @@ Filename = Filename
 No screenshot = No screenshot
 None yet. Things will appear here after you save. = None yet. Things will appear here after you save.
 Nothing matching '%1' was found. = Nothing matching '%1' was found.
-Save Data = Save data
-Save States = Save states
+Save data = Save data
+Save states = Save states
 Savedata Manager = Savedata manager
 Showing matches for '%1'. = Showing matches for '%1'.
 Size = Size
@@ -1343,7 +1343,7 @@ Vulkan Features = Vulkan features
 App switching mode = App switching mode
 Ask for exit confirmation after seconds = Ask for exit confirmation after seconds
 Auto = Auto
-Auto Load Savestate = Auto load savestate
+Auto load savestate = Auto load savestate
 AVI Dump started. = AVI dump started
 AVI Dump stopped. = AVI dump stopped
 Bouncing icon = Bouncing icon
@@ -1433,6 +1433,7 @@ RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Rewind snapshot честота („яде“ памет)
 Savestate Slot = слот за запазено състояние
 Savestate slot backups = Savestate slot backups
+Savestate slot count = Брой слотове за запазване на състоянието
 Screenshot mode = Screenshot mode
 Screenshots as PNG = Запази снимка в PNG формат
 Set Memory Stick folder = Set Memory Stick folder
diff --git a/assets/lang/ca_ES.ini b/assets/lang/ca_ES.ini
index 68d599e0ca..40975763b0 100644
--- a/assets/lang/ca_ES.ini
+++ b/assets/lang/ca_ES.ini
@@ -1209,8 +1209,8 @@ Filename = Nom del fitxer
 No screenshot = Sense captura de pantalla
 None yet. Things will appear here after you save. = No hi ha dades. Un cop guardis partida apareixeran aquí.
 Nothing matching '%1' was found. = No s'han trobat coincidències amb '%1'
-Save Data = Dades
-Save States = Estats
+Save data = Dades
+Save states = Estats
 Savedata Manager = Administrador de partides desades
 Showing matches for '%1'. = Mostrant coincidències per a '%1'.
 Size = Mida
@@ -1343,7 +1343,7 @@ Vulkan Features = Vulkan features
 App switching mode = App switching mode
 Ask for exit confirmation after seconds = Ask for exit confirmation after seconds
 Auto = Auto
-Auto Load Savestate = Auto load savestate
+Auto load savestate = Auto load savestate
 AVI Dump started. = AVI dump started
 AVI Dump stopped. = AVI dump stopped
 Bouncing icon = Bouncing icon
@@ -1433,6 +1433,7 @@ RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Rewind Snapshot Interval (mem hog)
 Savestate Slot = Savestate slot
 Savestate slot backups = Savestate slot backups
+Savestate slot count = Nombre de slots de guardat
 Screenshot mode = Screenshot mode
 Screenshots as PNG = Save screenshots in PNG format
 Set Memory Stick folder = Set Memory Stick folder
diff --git a/assets/lang/cz_CZ.ini b/assets/lang/cz_CZ.ini
index 4a6dc255af..7c1f7cc5fd 100644
--- a/assets/lang/cz_CZ.ini
+++ b/assets/lang/cz_CZ.ini
@@ -1209,8 +1209,8 @@ Filename = Filename
 No screenshot = Žádný snímek obazovky
 None yet. Things will appear here after you save. = Zatím žádné. Položky zde budou zobrazeny, až uložíte hru.
 Nothing matching '%1' was found. = Nothing matching '%1' was found.
-Save Data = Data uložených her
-Save States = Uložené stavy
+Save data = Data uložených her
+Save states = Uložené stavy
 Savedata Manager = Správa uložených dat
 Showing matches for '%1'. = Showing matches for '%1'.
 Size = Size
@@ -1343,7 +1343,7 @@ Vulkan Features = Vulkan features
 App switching mode = App switching mode
 Ask for exit confirmation after seconds = Ask for exit confirmation after seconds
 Auto = Auto
-Auto Load Savestate = Auto load savestate
+Auto load savestate = Auto load savestate
 AVI Dump started. = AVI dump started
 AVI Dump stopped. = AVI dump stopped
 Bouncing icon = Bouncing icon
@@ -1433,6 +1433,7 @@ RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Četnost snímků přetočení (žrout paměti)
 Savestate Slot = Pozice uložené hry
 Savestate slot backups = Savestate slot backups
+Savestate slot count = Počet slotů pro uložení stavu
 Screenshot mode = Screenshot mode
 Screenshots as PNG = Ukládat snímky obrazovky ve formátu PNG
 Set Memory Stick folder = Set Memory Stick folder
diff --git a/assets/lang/da_DK.ini b/assets/lang/da_DK.ini
index d0b30a249d..48a591afe2 100644
--- a/assets/lang/da_DK.ini
+++ b/assets/lang/da_DK.ini
@@ -1209,8 +1209,8 @@ Filename = Filename
 No screenshot = No screenshot
 None yet. Things will appear here after you save. = None yet. Things will appear here after you save.
 Nothing matching '%1' was found. = Nothing matching '%1' was found.
-Save Data = Save data
-Save States = Save states
+Save data = Save data
+Save states = Save states
 Savedata Manager = Savedata manager
 Showing matches for '%1'. = Showing matches for '%1'.
 Size = Size
@@ -1343,7 +1343,7 @@ Vulkan Features = Vulkan features
 App switching mode = App switching mode
 Ask for exit confirmation after seconds = Ask for exit confirmation after seconds
 Auto = Auto
-Auto Load Savestate = Auto load savestate
+Auto load savestate = Auto load savestate
 AVI Dump started. = AVI Dump startet.
 AVI Dump stopped. = AVI Dump stoppet.
 Bouncing icon = Bouncing icon
@@ -1433,6 +1433,7 @@ RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Tilbagespol snapshot frekvens (mem hog)
 Savestate Slot = Lagerplads for spil-status
 Savestate slot backups = Savestate slot backups
+Savestate slot count = Antal slots til gemt tilstand
 Screenshot mode = Screenshot mode
 Screenshots as PNG = Gem skærmdumps i PNG format
 Set Memory Stick folder = Set Memory Stick folder
diff --git a/assets/lang/de_DE.ini b/assets/lang/de_DE.ini
index 1e8c0b92ed..ce7f11847a 100644
--- a/assets/lang/de_DE.ini
+++ b/assets/lang/de_DE.ini
@@ -1198,8 +1198,8 @@ Filename = Dateiname
 No screenshot = Kein Bildschirmfoto
 None yet. Things will appear here after you save. = Noch keine. Dinge werden hier erscheinen, nachdem du gespeichert hast.
 Nothing matching '%1' was found. = Nichts gefunden, das mit „%1“ übereinstimmt
-Save Data = Speicherdaten
-Save States = Speicherstände
+Save data = Speicherdaten
+Save states = Speicherstände
 Savedata Manager = Speicherdatenverwaltung
 Showing matches for '%1'. = Zeigt Übereinstimmungen für „%1“
 Size = Größe
@@ -1331,7 +1331,7 @@ Vulkan Features = Vulkan-Funktionen
 App switching mode = App-Umschaltmodus
 Ask for exit confirmation after seconds = Nach Sekunden um eine Verlassenbestätigung fragen
 Auto = Autom.
-Auto Load Savestate = Spielstand automatisch laden
+Auto load savestate = Spielstand automatisch laden
 AVI Dump started. = AVI Dump gestartet.
 AVI Dump stopped. = AVI Dump gestoppt.
 Bouncing icon = Hüpfendes Symbol
@@ -1420,6 +1420,7 @@ RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Schnappschussintervall zurückspulen (Speicherfresser)
 Savestate Slot = Speicherstand-Slot
 Savestate slot backups = Backups für Speicherstände
+Savestate slot count = Anzahl der Speicherplatz-Slots
 Screenshot mode = Bildschirmfotomodus
 Screenshots as PNG = Bildschirmfotos im PNG-Format speichern
 Set Memory Stick folder = Memory-Stick-Ordner festlegen
diff --git a/assets/lang/dr_ID.ini b/assets/lang/dr_ID.ini
index dad3ed8d3c..def1740ffe 100644
--- a/assets/lang/dr_ID.ini
+++ b/assets/lang/dr_ID.ini
@@ -1209,8 +1209,8 @@ Filename = Filename
 No screenshot = No screenshot
 None yet. Things will appear here after you save. = None yet. Things will appear here after you save.
 Nothing matching '%1' was found. = Nothing matching '%1' was found.
-Save Data = Save data
-Save States = Save states
+Save data = Save data
+Save states = Save states
 Savedata Manager = Savedata manager
 Showing matches for '%1'. = Showing matches for '%1'.
 Size = Size
@@ -1343,7 +1343,7 @@ Vulkan Features = Vulkan features
 App switching mode = App switching mode
 Ask for exit confirmation after seconds = Ask for exit confirmation after seconds
 Auto = Auto
-Auto Load Savestate = Auto load savestate
+Auto load savestate = Auto load savestate
 AVI Dump started. = AVI dump started
 AVI Dump stopped. = AVI dump stopped
 Bouncing icon = Bouncing icon
@@ -1433,6 +1433,7 @@ RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Rewind Snapshot Interval (mem hog)
 Savestate Slot = Savestate slot
 Savestate slot backups = Savestate slot backups
+Savestate slot count = Jumlah slot simpan keadaan
 Screenshot mode = Screenshot mode
 Screenshots as PNG = Alai gambara'na PNG
 Set Memory Stick folder = Set Memory Stick folder
diff --git a/assets/lang/en_US.ini b/assets/lang/en_US.ini
index 97e4976851..febc7ca1fa 100644
--- a/assets/lang/en_US.ini
+++ b/assets/lang/en_US.ini
@@ -1233,8 +1233,8 @@ Filename = Filename
 No screenshot = No screenshot
 None yet. Things will appear here after you save. = None yet. Things will appear here after you save.
 Nothing matching '%1' was found. = Nothing matching '%1' was found.
-Save Data = Save data
-Save States = Save states
+Save data = Save data
+Save states = Save states
 Savedata Manager = Savedata manager
 Showing matches for '%1'. = Showing matches for '%1'.
 Size = Size
@@ -1359,7 +1359,7 @@ Display Color Formats = Display Color Formats
 App switching mode = App switching mode
 Ask for exit confirmation after seconds = Ask for exit confirmation after seconds
 Auto = Auto
-Auto Load Savestate = Auto load savestate
+Auto load savestate = Auto load savestate
 AVI Dump started. = AVI dump started
 AVI Dump stopped. = AVI dump stopped
 Bouncing icon = Bouncing icon
@@ -1447,6 +1447,7 @@ RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Rewind Snapshot Interval (mem hog)
 Savestate Slot = Savestate slot
 Savestate slot backups = Savestate slot backups
+Savestate slot count = Savestate slot count
 Screenshot mode = Screenshot mode
 Screenshots as PNG = Save screenshots in PNG format
 Set Memory Stick folder = Set Memory Stick folder
diff --git a/assets/lang/es_ES.ini b/assets/lang/es_ES.ini
index 703779cbb0..69c7c2bf50 100644
--- a/assets/lang/es_ES.ini
+++ b/assets/lang/es_ES.ini
@@ -1210,8 +1210,8 @@ Filename = Nombre de archivo
 No screenshot = Sin captura de pantalla
 None yet. Things will appear here after you save. = Ninguna todavía. Las cosas aparecerán aquí después de guardar.
 Nothing matching '%1' was found. = No se encontró nada que coincida con '%1'.
-Save Data = Guardar datos
-Save States = Guardar estados
+Save data = Guardar datos
+Save states = Guardar estados
 Savedata Manager = Administrador de partidas guardadas
 Showing matches for '%1'. = Mostrando coincidencias para '%1'.
 Size = Tamaño
@@ -1344,7 +1344,7 @@ Vulkan Features = Funciones Vulkan
 App switching mode = Modo de cambio de aplicación
 Ask for exit confirmation after seconds = Solicitar confirmación de salida después de unos segundos
 Auto = Automático
-Auto Load Savestate = Carga automática de estados de guardado
+Auto load savestate = Carga automática de estados de guardado
 AVI Dump started. = Grabación iniciada
 AVI Dump stopped. = Grabación detenida
 Bouncing icon = Icono rebotando
@@ -1434,6 +1434,7 @@ RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Intervalo de rebobinado de instantáneas (consumo excesivo de memoria)
 Savestate Slot = Ranura para guardado de estado
 Savestate slot backups = Ranura para copias de seguridad de estado
+Savestate slot count = Número de ranuras de estado guardado
 Screenshot mode = Modo de captura de pantalla
 Screenshots as PNG = Capturas de pantalla en PNG
 Set Memory Stick folder = Establecer carpeta de Memory Stick
diff --git a/assets/lang/es_LA.ini b/assets/lang/es_LA.ini
index b6ffdb7c3f..79db168cc7 100644
--- a/assets/lang/es_LA.ini
+++ b/assets/lang/es_LA.ini
@@ -1211,8 +1211,8 @@ Filename = Nombre de archivo
 No screenshot = No hay capturas de pantalla.
 None yet. Things will appear here after you save. = No hay datos. Una vez que guardes partida aparecerán aquí.
 Nothing matching '%1' was found. = No se encuentra la coincidencia con '%1'.
-Save Data = Datos
-Save States = Estados
+Save data = Datos
+Save states = Estados
 Savedata Manager = Administrador de partidas guardadas
 Showing matches for '%1'. = Mostrando coincidencias para '%1'.
 Size = Tamaño
@@ -1345,7 +1345,7 @@ Vulkan Features = Funciones Vulkan
 App switching mode = App switching mode
 Ask for exit confirmation after seconds = Ask for exit confirmation after seconds
 Auto = Automático
-Auto Load Savestate = Carga automática de estados de guardado
+Auto load savestate = Carga automática de estados de guardado
 AVI Dump started. = Grabación iniciada.
 AVI Dump stopped. = Grabación detenida.
 Bouncing icon = Bouncing icon
@@ -1435,6 +1435,7 @@ RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Frecuencia de rebobinado\n(consume memoria)
 Savestate Slot = Ranura de estado guardado
 Savestate slot backups = Copias de seguridad de estado guardado
+Savestate slot count = Cantidad de ranuras de guardado
 Screenshot mode = Screenshot mode
 Screenshots as PNG = Capturas en PNG
 Set Memory Stick folder = Establecer carpeta de Memory Stick
diff --git a/assets/lang/fa_IR.ini b/assets/lang/fa_IR.ini
index 3c844a6621..d2d719d1d3 100644
--- a/assets/lang/fa_IR.ini
+++ b/assets/lang/fa_IR.ini
@@ -1209,8 +1209,8 @@ Filename = نام فایل
 No screenshot = بدون نماگرفت
 None yet. Things will appear here after you save. = None yet. Things will appear here after you save.
 Nothing matching '%1' was found. = Nothing matching '%1' was found.
-Save Data = Save data
-Save States = Save states
+Save data = Save data
+Save states = Save states
 Savedata Manager = Savedata manager
 Showing matches for '%1'. = Showing matches for '%1'.
 Size = Size
@@ -1343,7 +1343,7 @@ Vulkan Features = Vulkan features
 App switching mode = App switching mode
 Ask for exit confirmation after seconds = Ask for exit confirmation after seconds
 Auto = ‎خودکار
-Auto Load Savestate = Auto load savestate
+Auto load savestate = Auto load savestate
 AVI Dump started. = AVI dump started
 AVI Dump stopped. = AVI dump stopped
 Bouncing icon = Bouncing icon
@@ -1433,6 +1433,7 @@ RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = ‎تعداد فریم ذخیره شده برای به عقب رفتن (مصرف زیاد رم)
 Savestate Slot = Savestate slot
 Savestate slot backups = پشتیبان گیری از داده
+Savestate slot count = تعداد اسلات های ذخیره سازی وضعیت
 Screenshot mode = Screenshot mode
 Screenshots as PNG = ‎باشد PNG اسکرین شات با فرمت
 Set Memory Stick folder = Set Memory Stick folder
diff --git a/assets/lang/fi_FI.ini b/assets/lang/fi_FI.ini
index 5b882e266d..55ffac0812 100644
--- a/assets/lang/fi_FI.ini
+++ b/assets/lang/fi_FI.ini
@@ -1209,8 +1209,8 @@ Filename = Tiedostonimi
 No screenshot = Ei kuvakaappausta
 None yet. Things will appear here after you save. = Ei vielä. Tähän ilmestyy asioita tallentamisen jälkeen.
 Nothing matching '%1' was found. = Ei tuloksia haulla '%1'.
-Save Data = Tallennustiedosto
-Save States = Tilatallennukset
+Save data = Tallennustiedosto
+Save states = Tilatallennukset
 Savedata Manager = Tallennustiedoston hallinta
 Showing matches for '%1'. = Näytetään tulokset haulle '%1'.
 Size = Koko
@@ -1343,7 +1343,7 @@ Vulkan Features = Vulkan features
 App switching mode = App switching mode
 Ask for exit confirmation after seconds = Ask for exit confirmation after seconds
 Auto = Automaattinen
-Auto Load Savestate = Lataa tilatallennus automaattisesti
+Auto load savestate = Lataa tilatallennus automaattisesti
 AVI Dump started. = AVI-tallennus aloitettu.
 AVI Dump stopped. = AVI-tallennus lopetettu.
 Bouncing icon = Bouncing icon
@@ -1433,6 +1433,7 @@ RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Pikakelaa tilannevedosten välit (muistisyöppö)
 Savestate Slot = Tilatallennuksen lohko
 Savestate slot backups = Tallennustilan lohkon varmuuskopiot
+Savestate slot count = Tallennustilan slotin määrä
 Screenshot mode = Screenshot mode
 Screenshots as PNG = Tallenna kuvankaappaukset PNG-muodossa
 Set Memory Stick folder = Aseta muistikortin kansio
diff --git a/assets/lang/fr_FR.ini b/assets/lang/fr_FR.ini
index 0c6874c6d5..2cea0760c3 100644
--- a/assets/lang/fr_FR.ini
+++ b/assets/lang/fr_FR.ini
@@ -1200,8 +1200,8 @@ Filename = Nom de fichier
 No screenshot = Pas de capture d'écran
 None yet. Things will appear here after you save. = Rien à afficher pour le moment.\nDes choses apparaîtront ici lorsque vous sauvegarderez.
 Nothing matching '%1' was found. = Nothing matching '%1' was found.
-Save Data = Sauvegardes
-Save States = États
+Save data = Sauvegardes
+Save states = États
 Savedata Manager = Gestionnaire de sauvegardes
 Showing matches for '%1'. = Showing matches for '%1'.
 Size = Taille
@@ -1334,7 +1334,7 @@ Vulkan Features = Fonctionnalités Vulkan
 App switching mode = App switching mode
 Ask for exit confirmation after seconds = Ask for exit confirmation after seconds
 Auto = Automatique
-Auto Load Savestate = Charger un état automatiquement
+Auto load savestate = Charger un état automatiquement
 AVI Dump started. = Dump AVI démarré
 AVI Dump stopped. = Dump AVI stoppé
 Bouncing icon = Bouncing icon
@@ -1424,6 +1424,7 @@ RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Fréquence instantanés rembobinage (+ de mémoire)
 Savestate Slot = Emplacement d'état
 Savestate slot backups = Emplacement d'état de secours
+Savestate slot count = Nombre de slots de sauvegarde
 Screenshot mode = Screenshot mode
 Screenshots as PNG = Enregistrer les captures d'écran au format .png
 Set Memory Stick folder = Set Memory Stick folder
diff --git a/assets/lang/gl_ES.ini b/assets/lang/gl_ES.ini
index 8d3384776a..11e96b2756 100644
--- a/assets/lang/gl_ES.ini
+++ b/assets/lang/gl_ES.ini
@@ -1209,8 +1209,8 @@ Filename = Filename
 No screenshot = No screenshot
 None yet. Things will appear here after you save. = None yet. Things will appear here after you save.
 Nothing matching '%1' was found. = Nothing matching '%1' was found.
-Save Data = Save data
-Save States = Save states
+Save data = Save data
+Save states = Save states
 Savedata Manager = Savedata manager
 Showing matches for '%1'. = Showing matches for '%1'.
 Size = Size
@@ -1343,7 +1343,7 @@ Vulkan Features = Vulkan features
 App switching mode = App switching mode
 Ask for exit confirmation after seconds = Ask for exit confirmation after seconds
 Auto = Auto
-Auto Load Savestate = Auto load savestate
+Auto load savestate = Auto load savestate
 AVI Dump started. = AVI dump started
 AVI Dump stopped. = AVI dump stopped
 Bouncing icon = Bouncing icon
@@ -1433,6 +1433,7 @@ RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Frecuencia de rebobinado de instantánea (mem hog)
 Savestate Slot = Ranura de estado gardado
 Savestate slot backups = Savestate slot backups
+Savestate slot count = Número de ranuras de gardado
 Screenshot mode = Screenshot mode
 Screenshots as PNG = Capturas en PNG
 Set Memory Stick folder = Set Memory Stick folder
diff --git a/assets/lang/gr_EL.ini b/assets/lang/gr_EL.ini
index 04af5f4e3f..d7d482083c 100644
--- a/assets/lang/gr_EL.ini
+++ b/assets/lang/gr_EL.ini
@@ -1209,8 +1209,8 @@ Filename = Ονομα αρχείου
 No screenshot = Χωρίς στιγμιότυπο οθόνης
 None yet. Things will appear here after you save. = Τίποτα προς το παρόν. Θα εμφανιστούν στοιχεία αφότου πραγματοποιήσετε αποθήκευση.
 Nothing matching '%1' was found. = Nothing matching '%1' was found.
-Save Data = Δεδομένα αποθήκευσης
-Save States = Σημεία Αποθήκευσης
+Save data = Δεδομένα αποθήκευσης
+Save states = Σημεία Αποθήκευσης
 Savedata Manager = Διαχειριστής δεδομένων αποθήκευσης
 Showing matches for '%1'. = Showing matches for '%1'.
 Size = Μέγεθος
@@ -1343,7 +1343,7 @@ Vulkan Features = Δυνατότητες Vulkan
 App switching mode = App switching mode
 Ask for exit confirmation after seconds = Ask for exit confirmation after seconds
 Auto = Auto
-Auto Load Savestate = Auto load savestate
+Auto load savestate = Auto load savestate
 AVI Dump started. = Καταγραφή AVI ξεκίνησε.
 AVI Dump stopped. = Καταγραφή AVI σταμάτησε.
 Bouncing icon = Bouncing icon
@@ -1433,6 +1433,7 @@ RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Συχνότητα Αντιστροφής Στιγμιότυπου (mem hog)
 Savestate Slot = Slot Σημείου Αποθήκευσης
 Savestate slot backups = Αντίγραφα ασφαλείας slot σημείων αποθήκευσης
+Savestate slot count = Αριθμός υποδοχών αποθήκευσης κατάστασης
 Screenshot mode = Screenshot mode
 Screenshots as PNG = Αποθήκευση Στιγμιοτύπων ως PNG
 Set Memory Stick folder = Set Memory Stick folder
diff --git a/assets/lang/he_IL.ini b/assets/lang/he_IL.ini
index 6edfca342f..9d3cacc191 100644
--- a/assets/lang/he_IL.ini
+++ b/assets/lang/he_IL.ini
@@ -1209,8 +1209,8 @@ Filename = Filename
 No screenshot = No screenshot
 None yet. Things will appear here after you save. = None yet. Things will appear here after you save.
 Nothing matching '%1' was found. = Nothing matching '%1' was found.
-Save Data = Save data
-Save States = Save states
+Save data = Save data
+Save states = Save states
 Savedata Manager = Savedata manager
 Showing matches for '%1'. = Showing matches for '%1'.
 Size = Size
@@ -1343,7 +1343,7 @@ Vulkan Features = Vulkan features
 App switching mode = App switching mode
 Ask for exit confirmation after seconds = Ask for exit confirmation after seconds
 Auto = Auto
-Auto Load Savestate = Auto load savestate
+Auto load savestate = Auto load savestate
 AVI Dump started. = AVI dump started
 AVI Dump stopped. = AVI dump stopped
 Bouncing icon = Bouncing icon
@@ -1433,6 +1433,7 @@ RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Rewind Snapshot Interval (mem hog)
 Savestate Slot = Savestate slot
 Savestate slot backups = Savestate slot backups
+Savestate slot count = מספר ש slots שמירת מצב
 Screenshot mode = Screenshot mode
 Screenshots as PNG = שמור צילום מסך כ PNG
 Set Memory Stick folder = Set Memory Stick folder
diff --git a/assets/lang/he_IL_invert.ini b/assets/lang/he_IL_invert.ini
index c27d0343e6..44c0b33de1 100644
--- a/assets/lang/he_IL_invert.ini
+++ b/assets/lang/he_IL_invert.ini
@@ -1206,8 +1206,8 @@ Filename = Filename
 No screenshot = No screenshot
 None yet. Things will appear here after you save. = None yet. Things will appear here after you save.
 Nothing matching '%1' was found. = Nothing matching '%1' was found.
-Save Data = Save data
-Save States = Save states
+Save data = Save data
+Save states = Save states
 Savedata Manager = Savedata manager
 Showing matches for '%1'. = Showing matches for '%1'.
 Size = Size
@@ -1340,7 +1340,7 @@ Vulkan Features = Vulkan features
 App switching mode = App switching mode
 Ask for exit confirmation after seconds = Ask for exit confirmation after seconds
 Auto = Auto
-Auto Load Savestate = Auto load savestate
+Auto load savestate = Auto load savestate
 AVI Dump started. = AVI dump started
 AVI Dump stopped. = AVI dump stopped
 Bouncing icon = Bouncing icon
@@ -1430,6 +1430,7 @@ RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Rewind Snapshot Interval (mem hog)
 Savestate Slot = Savestate slot
 Savestate slot backups = Savestate slot backups
+Savestate slot count = מצב שמירת slots של מספר
 Screenshot mode = Screenshot mode
 Screenshots as PNG = PNG כ ךסמ םוליצ רומש
 Set Memory Stick folder = Set Memory Stick folder
diff --git a/assets/lang/hr_HR.ini b/assets/lang/hr_HR.ini
index 59770cde62..41bfccf87b 100644
--- a/assets/lang/hr_HR.ini
+++ b/assets/lang/hr_HR.ini
@@ -1209,8 +1209,8 @@ Filename = Ime datoteke
 No screenshot = Nema snimke zaslona
 None yet. Things will appear here after you save. = Još ništa. Stvari će se ovdje pojaviti nakon što nešto spremiš.
 Nothing matching '%1' was found. = Nothing matching '%1' was found.
-Save Data = Save data
-Save States = Save states
+Save data = Save data
+Save states = Save states
 Savedata Manager = Izbornik savedate
 Showing matches for '%1'. = Showing matches for '%1'.
 Size = Veličina
@@ -1343,7 +1343,7 @@ Vulkan Features = Vulkan svojstva
 App switching mode = App switching mode
 Ask for exit confirmation after seconds = Ask for exit confirmation after seconds
 Auto = Auto
-Auto Load Savestate = Auto učitaj savestate
+Auto load savestate = Auto učitaj savestate
 AVI Dump started. = AVI dump započelo
 AVI Dump stopped. = AVI dump zaustavljeno
 Bouncing icon = Bouncing icon
@@ -1433,6 +1433,7 @@ RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Vrati snapshot frekvenciju (mem hog)
 Savestate Slot = Savestate mjesto
 Savestate slot backups = Savestate mjesto backup-ovi
+Savestate slot count = Broj slotova za pohranu stanja
 Screenshot mode = Screenshot mode
 Screenshots as PNG = Spremi snimak zaslona u PNG formatu
 Set Memory Stick folder = Set Memory Stick folder
diff --git a/assets/lang/hu_HU.ini b/assets/lang/hu_HU.ini
index 713e229e9f..c4ead4830e 100644
--- a/assets/lang/hu_HU.ini
+++ b/assets/lang/hu_HU.ini
@@ -1209,8 +1209,8 @@ Filename = Fájlnév
 No screenshot = Nincs kép
 None yet. Things will appear here after you save. = Itt jelennek majd meg a mentések. Még nincs semmi.
 Nothing matching '%1' was found. = Nothing matching '%1' was found.
-Save Data = Mentés adatok
-Save States = Állapotmentések
+Save data = Mentés adatok
+Save states = Állapotmentések
 Savedata Manager = Mentések kezelése
 Showing matches for '%1'. = Találatok erre: '%1'.
 Size = Méret
@@ -1343,7 +1343,7 @@ Vulkan Features = Vulkan funkciók
 App switching mode = Alkalmazásváltás módja
 Ask for exit confirmation after seconds = Ask for exit confirmation after seconds
 Auto = Auto
-Auto Load Savestate = Állapotmentés automatikus betöltése
+Auto load savestate = Állapotmentés automatikus betöltése
 AVI Dump started. = AVI írás elindítva
 AVI Dump stopped. = AVI írás leállítva
 Bouncing icon = Bouncing icon
@@ -1433,6 +1433,7 @@ RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Visszatekerési állapotmentések gyakorisága (lefogja a memóriát)
 Savestate Slot = Állapotmentés sorszáma
 Savestate slot backups = Állapotmentések sorszámonkénti biztonsági másolata
+Savestate slot count = Állapotmentési slotok száma
 Screenshot mode = Screenshot mode
 Screenshots as PNG = Képek mentése PNG formátumban
 Set Memory Stick folder = Memóriakártya mappájának beállítása
diff --git a/assets/lang/id_ID.ini b/assets/lang/id_ID.ini
index 684e9923b8..63b3d99e3c 100644
--- a/assets/lang/id_ID.ini
+++ b/assets/lang/id_ID.ini
@@ -1209,8 +1209,8 @@ Filename = Nama berkas
 No screenshot = Tidak ada tangkapan layar
 None yet. Things will appear here after you save. = Belum ada. Sesuatu akan muncul di sini setelah anda menyimpan.
 Nothing matching '%1' was found. = Tidak ditemukan yang cocok dengan '%1'.
-Save Data = Simpan data
-Save States = Save State
+Save data = Simpan data
+Save states = Save State
 Savedata Manager = Pengatur simpanan data
 Showing matches for '%1'. = Menampilkan kecocokan untuk '%1'.
 Size = Ukuran
@@ -1343,7 +1343,7 @@ Vulkan Features = Fitur-fitur Vulkan
 App switching mode = Mode peralihan aplikasi
 Ask for exit confirmation after seconds = Minta konfirmasi keluar setelah beberapa detik
 Auto = Otomatis
-Auto Load Savestate = Muat otomatis savestate
+Auto load savestate = Muat otomatis savestate
 AVI Dump started. = Pembuangan AVI dimulai.
 AVI Dump stopped. = Pembuangan AVI berhenti
 Bouncing icon = Bouncing icon
@@ -1433,6 +1433,7 @@ RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Putar ulang Interval Snapshot (memakan memori)
 Savestate Slot = Slot Savestate
 Savestate slot backups = Slot cadangan savestate
+Savestate slot count = Jumlah slot untuk menyimpan keadaan
 Screenshot mode = Mode tankap layar
 Screenshots as PNG = Simpan tangkapan layar dalam format PNG
 Set Memory Stick folder = Atur folder Memory Stick
diff --git a/assets/lang/it_IT.ini b/assets/lang/it_IT.ini
index 292dcca520..ee7cbb8ed4 100644
--- a/assets/lang/it_IT.ini
+++ b/assets/lang/it_IT.ini
@@ -1212,8 +1212,8 @@ Filename = Nome del file
 No screenshot = Nessuno screenshot
 None yet. Things will appear here after you save. = Ancora niente. Si inizierà a vedere qualcosa dopo il salvataggio.
 Nothing matching '%1' was found. = Non è stata trovata nessuna corrispondenza su: '%1'.
-Save Data = Salvataggi
-Save States = Salvataggio stati
+Save data = Salvataggi
+Save states = Salvataggio stati
 Savedata Manager = Gestione dei Salvataggi
 Showing matches for '%1'. = Corrispondenze  per: '%1'.
 Size = Dimensioni
@@ -1346,7 +1346,7 @@ Vulkan Features = Funzionalità Vulkan
 App switching mode = Modalità di commutazione delle app
 Ask for exit confirmation after seconds = Richiedi conferma di uscita dopo secondi
 Auto = Automatico
-Auto Load Savestate = Carica automaticamente uno stato
+Auto load savestate = Carica automaticamente uno stato
 AVI Dump started. = Dump AVI avviato
 AVI Dump stopped. = Dump AVI interrotto
 Bouncing icon = Icona lampeggiante
@@ -1408,6 +1408,7 @@ Raw game image = Immagine grezza del gioco
 Recent games = Giochi recenti
 Recording = Registrazione
 RetroAchievements = RetroAchievements
+Savestate slot count = Numero di slot di salvataggio
 Screenshot mode = Modalità Screenshot
 Set Memory Stick folder = Imposta la cartella della Memory Stick
 Show Memory Stick folder = Mostra cartella Memory Stick
diff --git a/assets/lang/ja_JP.ini b/assets/lang/ja_JP.ini
index 2042675d96..61d79fb231 100644
--- a/assets/lang/ja_JP.ini
+++ b/assets/lang/ja_JP.ini
@@ -1209,8 +1209,8 @@ Filename = ファイル名
 No screenshot = スクリーンショットなし
 None yet. Things will appear here after you save. = まだありません。セーブ後に項目が表示されます。
 Nothing matching '%1' was found. = '%1'と一致するものは見つかりませんでした。
-Save Data = セーブデータ
-Save States = セーブステート
+Save data = セーブデータ
+Save states = セーブステート
 Savedata Manager = セーブデータを管理する
 Showing matches for '%1'. = '%1'で見つかったものを表示します。
 Size = サイズ
@@ -1343,7 +1343,7 @@ Vulkan Features = Vulkanの機能
 App switching mode = アプリ切り替えモード
 Ask for exit confirmation after seconds = 設定秒数以上プレイ時に終了確認を表示する (0→無効)
 Auto = 自動
-Auto Load Savestate = 自動的にセーブステートをロードする
+Auto load savestate = 自動的にセーブステートをロードする
 AVI Dump started. = AVIダンプを開始しました
 AVI Dump stopped. = AVIダンプを停止しました
 Bouncing icon = バウンドするPPSSPPアイコン
@@ -1433,6 +1433,7 @@ RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = スナップショットの巻き戻し頻度 (メモリを消費)
 Savestate Slot = セーブステートのスロット
 Savestate slot backups = セーブステートのスロットをバックアップする
+Savestate slot count = セーブステートスロット数
 Screenshot mode = スクリーンショットの動作設定
 Screenshots as PNG = スクリーンショットをPNG形式で保存する
 Set Memory Stick folder = メモリースティックフォルダーの設定
diff --git a/assets/lang/jv_ID.ini b/assets/lang/jv_ID.ini
index 48c484ba17..109d619ce3 100644
--- a/assets/lang/jv_ID.ini
+++ b/assets/lang/jv_ID.ini
@@ -1209,8 +1209,8 @@ Filename = Filename
 No screenshot = Ora ana tangkapan layar
 None yet. Things will appear here after you save. = None yet. Things will appear here after you save.
 Nothing matching '%1' was found. = Nothing matching '%1' was found.
-Save Data = Simpen data
-Save States = Simpen states
+Save data = Simpen data
+Save states = Simpen states
 Savedata Manager = SimpenData Manager
 Showing matches for '%1'. = Showing matches for '%1'.
 Size = Size
@@ -1343,7 +1343,7 @@ Vulkan Features = Vulkan features
 App switching mode = App switching mode
 Ask for exit confirmation after seconds = Ask for exit confirmation after seconds
 Auto = Otomatis
-Auto Load Savestate = Auto load savestate
+Auto load savestate = Auto load savestate
 AVI Dump started. = AVI dump started
 AVI Dump stopped. = AVI dump stopped
 Bouncing icon = Bouncing icon
@@ -1433,6 +1433,7 @@ RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Frekuensi gambar asli seko mundur (mem hog)
 Savestate Slot = Savestate slot
 Savestate slot backups = Savestate slot backups
+Savestate slot count = Jumlah slot simpanan keadaan
 Screenshot mode = Screenshot mode
 Screenshots as PNG = Gambar minangka PNG
 Set Memory Stick folder = Set Memory Stick folder
diff --git a/assets/lang/ko_KR.ini b/assets/lang/ko_KR.ini
index 5a7efc523a..ca5aee6652 100644
--- a/assets/lang/ko_KR.ini
+++ b/assets/lang/ko_KR.ini
@@ -1209,8 +1209,8 @@ Filename = 파일이름
 No screenshot = 스크린샷 없음
 None yet. Things will appear here after you save. = 아직 없습니다. 저장하면 여기에 항목이 표시됩니다.
 Nothing matching '%1' was found. = '%1'과(와) 일치하는 항목이 없습니다.
-Save Data = 저장 데이터
-Save States = 상태 저장
+Save data = 저장 데이터
+Save states = 상태 저장
 Savedata Manager = 저장데이터 관리자
 Showing matches for '%1'. = '%1'에 대한 일치 항목을 표시합니다.
 Size = 크기
@@ -1335,7 +1335,7 @@ Display Color Formats = 디스플레이 색상 형식
 App switching mode = 앱 전환 모드
 Ask for exit confirmation after seconds = 몇 초 후에 종료 확인 요청
 Auto = 자동
-Auto Load Savestate = 상태 저장 자동 불러오기
+Auto load savestate = 상태 저장 자동 불러오기
 AVI Dump started. = AVI 덤프가 시작됨
 AVI Dump stopped. = AVI 덤프가 중지됨
 Bouncing icon = 튀는 아이콘
@@ -1423,6 +1423,7 @@ RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = 되감기 스냅샷 빈도 (메모리 호그)
 Savestate Slot = 저장 상태 슬롯
 Savestate slot backups = 저장 상태 슬롯 백업
+Savestate slot count = 세이브 스테이트 슬롯 수
 Screenshot mode = 스크린샷 모드e
 Screenshots as PNG = 스크린샷을 PNG 형식으로 저장
 Set Memory Stick folder = 메모리 스틱 폴더 설정
diff --git a/assets/lang/ku_SO.ini b/assets/lang/ku_SO.ini
index abb66e0d75..63b349361c 100644
--- a/assets/lang/ku_SO.ini
+++ b/assets/lang/ku_SO.ini
@@ -1223,8 +1223,8 @@ Filename = Filename
 No screenshot = No screenshot
 None yet. Things will appear here after you save. = None yet. Things will appear here after you save.
 Nothing matching '%1' was found. = Nothing matching '%1' was found.
-Save Data = Save data
-Save States = Save states
+Save data = Save data
+Save states = Save states
 Savedata Manager = Savedata manager
 Showing matches for '%1'. = Showing matches for '%1'.
 Size = Size
@@ -1349,7 +1349,7 @@ Display Color Formats = Display Color Formats
 App switching mode = App switching mode
 Ask for exit confirmation after seconds = Ask for exit confirmation after seconds
 Auto = Auto
-Auto Load Savestate = Auto load savestate
+Auto load savestate = Auto load savestate
 AVI Dump started. = AVI dump started
 AVI Dump stopped. = AVI dump stopped
 Bouncing icon = Bouncing icon
@@ -1437,6 +1437,7 @@ RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Rewind Snapshot Interval (mem hog)
 Savestate Slot = Savestate slot
 Savestate slot backups = Savestate slot backups
+Savestate slot count = Hejmara slotên xebatê
 Screenshot mode = Screenshot mode
 Screenshots as PNG = PNG خەزن کردنی سکریین شۆت بە شیوەی
 Set Memory Stick folder = Set Memory Stick folder
diff --git a/assets/lang/lo_LA.ini b/assets/lang/lo_LA.ini
index 97503a7475..a7b2b175b0 100644
--- a/assets/lang/lo_LA.ini
+++ b/assets/lang/lo_LA.ini
@@ -1209,8 +1209,8 @@ Filename = Filename
 No screenshot = ບໍ່ມີການຈັບພາບໜ້າຈໍ
 None yet. Things will appear here after you save. = ຍັງບໍ່ມີຂໍ້ມູນເທື່ອ. ຈະມີກໍຕໍ່ເມື່ອເຈົ້າໄດ້ກົດບັນທຶກເອົາໄວ້.
 Nothing matching '%1' was found. = Nothing matching '%1' was found.
-Save Data = ຂໍ້ມູນເຊບ
-Save States = ໄຟລ໌ບັນທຶກ
+Save data = ຂໍ້ມູນເຊບ
+Save states = ໄຟລ໌ບັນທຶກ
 Savedata Manager = ຈັດການຂໍ້ມູນເຊບ
 Showing matches for '%1'. = Showing matches for '%1'.
 Size = Size
@@ -1343,7 +1343,7 @@ Vulkan Features = Vulkan features
 App switching mode = App switching mode
 Ask for exit confirmation after seconds = Ask for exit confirmation after seconds
 Auto = ອັດຕະໂນມັດ
-Auto Load Savestate = Auto load savestate
+Auto load savestate = Auto load savestate
 AVI Dump started. = ເລີ່ມຖ່າຍໂອນຂໍ້ມູນ AVI ແລ້ວ.
 AVI Dump stopped. = ຢຸດຖ່າຍໂອນຂໍ້ມູນ AVI ແລ້ວ.
 Bouncing icon = Bouncing icon
@@ -1433,6 +1433,7 @@ RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Rewind Snapshot Interval (mem hog)
 Savestate Slot = ຊ່ອງເກັບເຊບ
 Savestate slot backups = Savestate slot backups
+Savestate slot count = ຈຳນວນໃບປູ່ລົງຄະແນນ
 Screenshot mode = Screenshot mode
 Screenshots as PNG = ຈັບພາບໜ້າຈໍເປັນ PNG
 Set Memory Stick folder = Set Memory Stick folder
diff --git a/assets/lang/lt-LT.ini b/assets/lang/lt-LT.ini
index a61648cc9b..b9f80dd9a8 100644
--- a/assets/lang/lt-LT.ini
+++ b/assets/lang/lt-LT.ini
@@ -1209,8 +1209,8 @@ Filename = Filename
 No screenshot = No screenshot
 None yet. Things will appear here after you save. = None yet. Things will appear here after you save.
 Nothing matching '%1' was found. = Nothing matching '%1' was found.
-Save Data = Save data
-Save States = Save states
+Save data = Save data
+Save states = Save states
 Savedata Manager = Savedata manager
 Showing matches for '%1'. = Showing matches for '%1'.
 Size = Size
@@ -1343,7 +1343,7 @@ Vulkan Features = Vulkan features
 App switching mode = App switching mode
 Ask for exit confirmation after seconds = Ask for exit confirmation after seconds
 Auto = Auto
-Auto Load Savestate = Auto load savestate
+Auto load savestate = Auto load savestate
 AVI Dump started. = AVI dump started
 AVI Dump stopped. = AVI dump stopped
 Bouncing icon = Bouncing icon
@@ -1433,6 +1433,7 @@ RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = "Vėjinti" momentinės nuotraukos dažnį (atminties "rijikas")
 Savestate Slot = Išsaugojimo statuso vieta
 Savestate slot backups = Savestate slot backups
+Savestate slot count = Išsaugojimo slotų skaičius
 Screenshot mode = Screenshot mode
 Screenshots as PNG = Išsaugoti nuotraukas PNG formatu
 Set Memory Stick folder = Set Memory Stick folder
diff --git a/assets/lang/ms_MY.ini b/assets/lang/ms_MY.ini
index 6141705a98..bcc4ec9103 100644
--- a/assets/lang/ms_MY.ini
+++ b/assets/lang/ms_MY.ini
@@ -1209,8 +1209,8 @@ Filename = Filename
 No screenshot = No screenshot
 None yet. Things will appear here after you save. = None yet. Things will appear here after you save.
 Nothing matching '%1' was found. = Nothing matching '%1' was found.
-Save Data = Save data
-Save States = Save states
+Save data = Save data
+Save states = Save states
 Savedata Manager = Savedata manager
 Showing matches for '%1'. = Showing matches for '%1'.
 Size = Size
@@ -1343,7 +1343,7 @@ Vulkan Features = Vulkan features
 App switching mode = App switching mode
 Ask for exit confirmation after seconds = Ask for exit confirmation after seconds
 Auto = Auto
-Auto Load Savestate = Auto load savestate
+Auto load savestate = Auto load savestate
 AVI Dump started. = AVI dump started
 AVI Dump stopped. = AVI dump stopped
 Bouncing icon = Bouncing icon
@@ -1433,6 +1433,7 @@ RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Kekerapan pusingan gambar skrin (mem hog)
 Savestate Slot = Slot Savestate
 Savestate slot backups = Savestate slot backups
+Savestate slot count = Kiraan slot simpanan
 Screenshot mode = Screenshot mode
 Screenshots as PNG = Simpan pembidik skrin sebagai format PNG
 Set Memory Stick folder = Set Memory Stick folder
diff --git a/assets/lang/nl_NL.ini b/assets/lang/nl_NL.ini
index 40bedd57bb..79a674a460 100644
--- a/assets/lang/nl_NL.ini
+++ b/assets/lang/nl_NL.ini
@@ -1209,8 +1209,8 @@ Filename = Filename
 No screenshot = Geen screenshot
 None yet. Things will appear here after you save. = Nog niets. Er zullen hier dingen verschijnen zodra u iets opslaat.
 Nothing matching '%1' was found. = Nothing matching '%1' was found.
-Save Data = Savedata
-Save States = Savestates
+Save data = Savedata
+Save states = Savestates
 Savedata Manager = Beheerder voor savedata
 Showing matches for '%1'. = Showing matches for '%1'.
 Size = Size
@@ -1343,7 +1343,7 @@ Vulkan Features = Vulkan-functies
 App switching mode = App switching mode
 Ask for exit confirmation after seconds = Ask for exit confirmation after seconds
 Auto = Auto
-Auto Load Savestate = Auto load savestate
+Auto load savestate = Auto load savestate
 AVI Dump started. = AVI-dump gestart
 AVI Dump stopped. = AVI-dump gestopt
 Bouncing icon = Bouncing icon
@@ -1433,6 +1433,7 @@ RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Terugspoelfrequentie (kost geheugen)
 Savestate Slot = Savestatesleuf
 Savestate slot backups = Savestate slot backups
+Savestate slot count = Aantal opslagslots
 Screenshot mode = Screenshot mode
 Screenshots as PNG = Screenshots opslaan in PNG-formaat
 Set Memory Stick folder = Set Memory Stick folder
diff --git a/assets/lang/no_NO.ini b/assets/lang/no_NO.ini
index ce87de6d90..86c76742f0 100644
--- a/assets/lang/no_NO.ini
+++ b/assets/lang/no_NO.ini
@@ -1209,8 +1209,8 @@ Filename = Filnavn
 No screenshot = Ingen skjermklipp
 None yet. Things will appear here after you save. = None yet. Things will appear here after you save.
 Nothing matching '%1' was found. = Nothing matching '%1' was found.
-Save Data = Save data
-Save States = Save states
+Save data = Save data
+Save states = Save states
 Savedata Manager = Savedata manager
 Showing matches for '%1'. = Showing matches for '%1'.
 Size = Størrelse
@@ -1343,7 +1343,7 @@ Vulkan Features = Vulkan-funksjoner
 App switching mode = App switching mode
 Ask for exit confirmation after seconds = Ask for exit confirmation after seconds
 Auto = Auto
-Auto Load Savestate = Auto load savestate
+Auto load savestate = Auto load savestate
 AVI Dump started. = AVI dump started
 AVI Dump stopped. = AVI dump stopped
 Bouncing icon = Bouncing icon
@@ -1433,6 +1433,7 @@ RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Rewind Snapshot Interval (mem hog)
 Savestate Slot = Savestate slot
 Savestate slot backups = Savestate slot backups
+Savestate slot count = Antall lagringsplasser
 Screenshot mode = Skjermklippmodus
 Screenshots as PNG = Lagre skjermklipp i PNG-format
 Set Memory Stick folder = Set Memory Stick folder
diff --git a/assets/lang/pl_PL.ini b/assets/lang/pl_PL.ini
index fa48b479d7..0c8309f1fc 100644
--- a/assets/lang/pl_PL.ini
+++ b/assets/lang/pl_PL.ini
@@ -1206,8 +1206,8 @@ Filename = Nazwa pliku
 No screenshot = Brak obrazka
 None yet. Things will appear here after you save. = Na razie nic tu nie ma. Wpisy pojawią się, gdy zapiszesz grę.
 Nothing matching '%1' was found. = Nie znaleziono niczego, co pasowałoby do '%1'.
-Save Data = Zapisy gier
-Save States = Pliki zapisów stanów
+Save data = Zapisy gier
+Save states = Pliki zapisów stanów
 Savedata Manager = Zarządzanie zapisami gier
 Showing matches for '%1'. = Wyświetlanie dopasowań dla '%1'.
 Size = Rozmiar
@@ -1340,7 +1340,7 @@ Vulkan Features = Funkcje Vulkan
 App switching mode = Tryb przełączania aplikacji
 Ask for exit confirmation after seconds = Poproś o potwierdzenie wyjścia po kilku sekundach
 Auto = Automatyczny
-Auto Load Savestate = Automatyczne wczytywanie stanów zapisu
+Auto load savestate = Automatyczne wczytywanie stanów zapisu
 AVI Dump started. = Rozpoczęto zrzut do AVI
 AVI Dump stopped. = Zatrzymano zrzut do AVI
 Bouncing icon = Odbijająca się ikona
@@ -1430,6 +1430,7 @@ RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Częstotl. zapisu stanów przewijania (wymaga pamięci)
 Savestate Slot = Slot zapisu stanu
 Savestate slot backups = Kopie zapasowe slota zapisu stanu
+Savestate slot count = Liczba slotów do zapisu stanu
 Screenshot mode = Tryb zrzutu ekranu
 Screenshots as PNG = Zapisuj zrzuty ekranu jako PNG
 Set Memory Stick folder = Ustaw folder Karty Pamięci
diff --git a/assets/lang/pt_BR.ini b/assets/lang/pt_BR.ini
index 0402d8a17d..8567c924c5 100644
--- a/assets/lang/pt_BR.ini
+++ b/assets/lang/pt_BR.ini
@@ -1232,8 +1232,8 @@ Filename = Nome do arquivo
 No screenshot = Sem screenshot
 None yet. Things will appear here after you save. = Nada ainda. As coisas aparecerão aqui após você salvar.
 Nothing matching '%1' was found. = Nada combinando com o '%1' foi achado.
-Save Data = Dados salvos
-Save States = States salvos
+Save data = Dados salvos
+Save states = States salvos
 Savedata Manager = Gerenciador dos dados dos saves
 Showing matches for '%1'. = Mostrando as combinações do '%1'.
 Size = Tamanho
@@ -1358,7 +1358,7 @@ Display Color Formats = Exibir Formatos das Cores
 App switching mode = Modo de troca do App
 Ask for exit confirmation after seconds = Pedir confirmação da saída após alguns segundos
 Auto = Auto
-Auto Load Savestate = Auto-carregar o state salvo
+Auto load savestate = Auto-carregar o state salvo
 AVI Dump started. = Dump do AVI iniciado
 AVI Dump stopped. = Dump do AVI parado
 Bouncing icon = Bouncing icon
@@ -1446,6 +1446,7 @@ RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Frequência dos snapshots para retroceder (consome muita memória)
 Savestate Slot = Slot do state salvo
 Savestate slot backups = Backups dos slots dos states salvos
+Savestate slot count = Número de slots de salvamento
 Screenshot mode = Modo screenshot
 Screenshots as PNG = Salvar as screenshots no formato PNG
 Set Memory Stick folder = Definir a pasta do cartão de memória
diff --git a/assets/lang/pt_PT.ini b/assets/lang/pt_PT.ini
index f8496872ad..8d6763063e 100644
--- a/assets/lang/pt_PT.ini
+++ b/assets/lang/pt_PT.ini
@@ -1235,8 +1235,8 @@ Filename = Nome do ficheiro
 No screenshot = Sem Captura de tela
 None yet. Things will appear here after you save. = Nada ainda. As coisas vão aparecer aqui após salvares.
 Nothing matching '%1' was found. = Nada que combinasse com %1' foi encontrado.
-Save Data = Dados salvos
-Save States = Estados salvos
+Save data = Dados salvos
+Save states = Estados salvos
 Savedata Manager = Gerenciador dos Dados Salvos
 Showing matches for '%1'. = A mostrar combinações com '%1'.
 Size = Tamanho
@@ -1361,7 +1361,7 @@ Display Color Formats = Mostrar Formatos das Cores
 App switching mode = App switching mode
 Ask for exit confirmation after seconds = Ask for exit confirmation after seconds
 Auto = Automático
-Auto Load Savestate = Carregar automaticamente o Estado salvo
+Auto load savestate = Carregar automaticamente o Estado salvo
 AVI Dump started. = Dump do AVI iniciado
 AVI Dump stopped. = Dump do AVI parado
 Bouncing icon = Bouncing icon
@@ -1449,6 +1449,7 @@ RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Rebobinar a frequência dos snapshots (consome memória)
 Savestate Slot = Espaço do estado salvo
 Savestate slot backups = Backups dos espaços dos estados salvos
+Savestate slot count = Número de slots de salvamento
 Screenshot mode = Screenshot mode
 Screenshots as PNG = Salvar as Capturas de Tela em formato .png
 Set Memory Stick folder = Definir a pasta do cartão de memória
diff --git a/assets/lang/ro_RO.ini b/assets/lang/ro_RO.ini
index df3764c72a..0f8621c60f 100644
--- a/assets/lang/ro_RO.ini
+++ b/assets/lang/ro_RO.ini
@@ -1210,8 +1210,8 @@ Filename = Filename
 No screenshot = No screenshot
 None yet. Things will appear here after you save. = None yet. Things will appear here after you save.
 Nothing matching '%1' was found. = Nothing matching '%1' was found.
-Save Data = Save data
-Save States = Save states
+Save data = Save data
+Save states = Save states
 Savedata Manager = Savedata manager
 Showing matches for '%1'. = Showing matches for '%1'.
 Size = Size
@@ -1344,7 +1344,7 @@ Vulkan Features = Vulkan features
 App switching mode = App switching mode
 Ask for exit confirmation after seconds = Ask for exit confirmation after seconds
 Auto = Auto
-Auto Load Savestate = Auto load savestate
+Auto load savestate = Auto load savestate
 AVI Dump started. = AVI dump started
 AVI Dump stopped. = AVI dump stopped
 Bouncing icon = Bouncing icon
@@ -1434,6 +1434,7 @@ RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Rewind Snapshot Interval (mem hog)
 Savestate Slot = Slot salvare
 Savestate slot backups = Savestate slot backups
+Savestate slot count = Numărul de sloturi de salvare
 Screenshot mode = Screenshot mode
 Screenshots as PNG = Salvează instantanee în format PNG
 Set Memory Stick folder = Set Memory Stick folder
diff --git a/assets/lang/ru_RU.ini b/assets/lang/ru_RU.ini
index 668c6127e4..371ff86f22 100644
--- a/assets/lang/ru_RU.ini
+++ b/assets/lang/ru_RU.ini
@@ -1209,8 +1209,8 @@ Filename = Имя файла
 No screenshot = Нет скриншота
 None yet. Things will appear here after you save. = Здесь ничего нет. Появится после сохранения.
 Nothing matching '%1' was found. = Ничего подходящего под '%1' не было найдено.
-Save Data = Сохранения
-Save States = Состояния
+Save data = Сохранения
+Save states = Состояния
 Savedata Manager = Управление сохранениями
 Showing matches for '%1'. = Показываем поиск по запросу '%1'.
 Size = Размер
@@ -1343,7 +1343,7 @@ Vulkan Features = Возможности Vulkan
 App switching mode = Режим переключения приложений
 Ask for exit confirmation after seconds = Запрос подтверждения выхода
 Auto = Авто
-Auto Load Savestate = Автозагрузка состояния
+Auto load savestate = Автозагрузка состояния
 AVI Dump started. = Дамп AVI запущен
 AVI Dump stopped. = Дамп AVI остановлен
 Bouncing icon = Отскакивающий значок
@@ -1433,6 +1433,7 @@ RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Частота сохранения состояний
 Savestate Slot = Слот состояния
 Savestate slot backups = Резервные копии слота состояния
+Savestate slot count = Количество слотов для сохранения состояния
 Screenshot mode = Режим скриншота
 Screenshots as PNG = Сохранять скриншоты в PNG
 Set Memory Stick folder = Задать папку карты памяти
diff --git a/assets/lang/sv_SE.ini b/assets/lang/sv_SE.ini
index 217ca5f5f4..ab4c0aca93 100644
--- a/assets/lang/sv_SE.ini
+++ b/assets/lang/sv_SE.ini
@@ -1210,8 +1210,8 @@ Filename = Filnamn
 No screenshot = Ingen skärmdump
 None yet. Things will appear here after you save. = Inget här än. Saker kommer att dyka upp här efter att du har sparat.
 Nothing matching '%1' was found. = Ingenting som matchar '%1' hittades.
-Save Data = Sparad data
-Save States = Sparade states
+Save data = Sparad data
+Save states = Sparade states
 Savedata Manager = Hanterare för sparad data
 Showing matches for '%1'. = Visar matchande rader för '%1'.
 Size = Storlek
@@ -1344,7 +1344,7 @@ Vulkan Features = Vulkan-finesser
 App switching mode = Appväxlingsläge
 Ask for exit confirmation after seconds = Be om utgångsbekräftelse efter sekunder
 Auto = Automatiskt
-Auto Load Savestate = Ladda savestate automatiskt
+Auto load savestate = Ladda savestate automatiskt
 AVI Dump started. = AVI-dump startad
 AVI Dump stopped. = AVI-dump stoppad
 Bouncing icon = Studsande ikon
@@ -1434,6 +1434,7 @@ RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Rewind Snapshot Interval (mem hog)
 Savestate Slot = Savestate-plats
 Savestate slot backups = Backup av savestate-platser
+Savestate slot count = Antal slots för sparade tillstånd
 Screenshot mode = Skärmbildsläge
 Screenshots as PNG = Skärmdumpar som PNG
 Set Memory Stick folder = Byt memstick-mapp
diff --git a/assets/lang/tg_PH.ini b/assets/lang/tg_PH.ini
index 65a4c7a00b..131df7fd50 100644
--- a/assets/lang/tg_PH.ini
+++ b/assets/lang/tg_PH.ini
@@ -1210,8 +1210,8 @@ Filename = Pangalan ng file
 No screenshot = Walang Screenshot
 None yet. Things will appear here after you save. = Wala pa. Makikita mo dito kapag may na i-savestate ka na
 Nothing matching '%1' was found. = Walang nakitang tumutugma sa '%1'.
-Save Data = I-Save ang Datos
-Save States = Save States
+Save data = I-Save ang Datos
+Save states = Save states
 Savedata Manager = Savedata Manager
 Showing matches for '%1'. = Ipinapakita ang mga tugma para sa '%1'.
 Size = Laki
@@ -1346,7 +1346,7 @@ Vulkan Features = Mga Features ni Vulkan
 App switching mode = App switching mode
 Ask for exit confirmation after seconds = Ask for exit confirmation after seconds
 Auto = Awto
-Auto Load Savestate = Awtomatik na pag load sa savestate
+Auto load savestate = Awtomatik na pag load sa savestate
 AVI Dump started. = Nasimula na ang AVI dump
 AVI Dump stopped. = Nahinto ang AVI dump
 Bouncing icon = Bouncing icon
@@ -1436,6 +1436,7 @@ RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Rewind Snapshot Interval (mem hog)
 Savestate Slot = Savestate Slot
 Savestate slot backups = Pag-backup ng save state slot
+Savestate slot count = Шумораи слотҳои захира
 Screenshot mode = Screenshot mode
 Screenshots as PNG = I-save ang Screenshot sa PNG na pormat
 Set Memory Stick folder = Set Memory Stick folder
diff --git a/assets/lang/th_TH.ini b/assets/lang/th_TH.ini
index 8b1a10b6d2..5b0470f12c 100644
--- a/assets/lang/th_TH.ini
+++ b/assets/lang/th_TH.ini
@@ -1228,8 +1228,8 @@ Filename = ตามชื่อ
 No screenshot = ไม่มีภาพประกอบ
 None yet. Things will appear here after you save. = ยังไม่มีข้อมูล จะมีก็ต่อเมื่อหลังจากที่คุณได้กดบันทึกเอาไว้
 Nothing matching '%1' was found. = ไม่พบข้อมูล '%1' ที่ตรงกัน
-Save Data = เซฟดาต้า
-Save States = เซฟสเตท
+Save data = เซฟดาต้า
+Save states = เซฟสเตท
 Savedata Manager = การจัดการข้อมูลเซฟ
 Showing matches for '%1'. = กำลังแสดงข้อมูลของ '%1'
 Size = ตามขนาด
@@ -1378,7 +1378,7 @@ Warning = คำเตือน
 App switching mode = โหมดการสลับแอพ
 Ask for exit confirmation after seconds = แจ้งเตือนยืนยันการออกเกมหลังจากไม่กี่วินาที
 Auto = อัตโนมัติ
-Auto Load Savestate = โหลดเซฟสเตทให้อัตโนมัติ
+Auto load savestate = โหลดเซฟสเตทให้อัตโนมัติ
 AVI Dump started. = เริ่มการอัดบันทึกวีดีโอ
 AVI Dump stopped. = หยุดการอัดบันทึกวีดีโอ
 Bouncing icon = ไอคอนเด้งไปมา
@@ -1468,6 +1468,7 @@ RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = เซฟสเตทพื้นหลังแบบอัตโนมัติ (สูบแรม)
 Savestate Slot = ช่องเก็บเซฟสเตทเกม
 Savestate slot backups = สำรองข้อมูลเซฟสเตท
+Savestate slot count = จำนวนช่องบันทึกสถานะ
 Screenshot mode = โหมดการจับภาพหน้าจอ
 Screenshots as PNG = จับภาพหน้าจอเป็นไฟล์ PNG
 Set Memory Stick folder = เซ็ตที่อยู่โฟลเดอร์เม็มโมรี่สติ๊ก
diff --git a/assets/lang/tr_TR.ini b/assets/lang/tr_TR.ini
index 2aa20d5971..a95925c68e 100644
--- a/assets/lang/tr_TR.ini
+++ b/assets/lang/tr_TR.ini
@@ -1210,8 +1210,8 @@ Filename = Dosya Adı
 No screenshot = Ekran Görüntüsü Yok
 None yet. Things will appear here after you save. = Henüz bir şey yok. Kayıt aldığında kayıtların burada görünecek.
 Nothing matching '%1' was found. = '%1' ile eşleşen hiçbir şey bulunamadı.
-Save Data = Oyun Kayıtları
-Save States = Durum Kayıtları
+Save data = Oyun Kayıtları
+Save states = Durum Kayıtları
 Savedata Manager = Kayıtlı Veri Yöneticisi
 Showing matches for '%1'. = '%1' ile eşleşen sonuçlar gösteriliyor.
 Size = Boyut
@@ -1344,7 +1344,7 @@ Vulkan Features = Vulkan Özellikleri
 App switching mode = Uygulama değiştirme modu
 Ask for exit confirmation after seconds = Saniyeden sonra çıkış onayı iste
 Auto = Otomatik
-Auto Load Savestate = Durum Kaydını Otomatik Yükle
+Auto load savestate = Durum Kaydını Otomatik Yükle
 AVI Dump started. = AVI kaydı başladı.
 AVI Dump stopped. = AVI kaydı bitti.
 Bouncing icon = Zıplayan simge
@@ -1434,6 +1434,7 @@ RetroAchievements = RetroBaşarımlar
 Rewind Snapshot Interval = Anlık Görüntü Aralığını Geri Sar
 Savestate Slot = Durum Kayıt Yuvası
 Savestate slot backups = Durum Kayıt Yuvası Yedekleri
+Savestate slot count = Kaydetme slot sayısı
 Screenshot mode = Ekran Görüntüsü Modu
 Screenshots as PNG = Ekran Görüntülerini PNG Olarak Kaydet
 Set Memory Stick folder = Hafıza Kartı Klasörünü Seç
diff --git a/assets/lang/uk_UA.ini b/assets/lang/uk_UA.ini
index f481ca781c..9db1978eb9 100644
--- a/assets/lang/uk_UA.ini
+++ b/assets/lang/uk_UA.ini
@@ -1209,8 +1209,8 @@ Filename = Ім'я файлу
 No screenshot = Немає скріншоту
 None yet. Things will appear here after you save. = Тут поки що нічого немає. З'явиться після вашого збереження.
 Nothing matching '%1' was found. = Nothing matching '%1' was found.
-Save Data = Збереження
-Save States = Стан збереження
+Save data = Збереження
+Save states = Стан збереження
 Savedata Manager = Управління збереженими даними
 Showing matches for '%1'. = Showing matches for '%1'.
 Size = Розмір
@@ -1343,7 +1343,7 @@ Vulkan Features = Особливості Vulkan
 App switching mode = Режим перемикання застосунків
 Ask for exit confirmation after seconds = Запит на підтвердження виходу
 Auto = Авто
-Auto Load Savestate = Автоматичне завантаження збережень
+Auto load savestate = Автоматичне завантаження збережень
 AVI Dump started. = Дамп AVI запущено
 AVI Dump stopped. = Дамп AVI зупинено
 Bouncing icon = Значок, що відскакує
@@ -1433,6 +1433,7 @@ RetroAchievements = РетроВідзнаки
 Rewind Snapshot Interval = Змінити частоту кадрів (багато пам'яті)
 Savestate Slot = Слот пам'яті
 Savestate slot backups = Резервні копії слота стану
+Savestate slot count = Кількість слотів для збереження
 Screenshot mode = Режим скріншоту
 Screenshots as PNG = Скріншот в PNG
 Set Memory Stick folder = Встановити папку Memory Stick
diff --git a/assets/lang/vi_VN.ini b/assets/lang/vi_VN.ini
index 7deddf3151..f6b50da4d7 100644
--- a/assets/lang/vi_VN.ini
+++ b/assets/lang/vi_VN.ini
@@ -1209,8 +1209,8 @@ Filename = Tên file
 No screenshot = Không có screenshot
 None yet. Things will appear here after you save. = Không có gì ở đây. Mọi thứ sẽ xuất hiện ở đây sau khi bạn lưu.
 Nothing matching '%1' was found. = Nothing matching '%1' was found.
-Save Data = Lưu dữ liệu
-Save States = Lưu game
+Save data = Lưu dữ liệu
+Save states = Lưu game
 Savedata Manager = Quản lý lưu dữ liệu
 Showing matches for '%1'. = Showing matches for '%1'.
 Size = Kích cỡ
@@ -1343,7 +1343,7 @@ Vulkan Features = Tính năng Vulkan
 App switching mode = App switching mode
 Ask for exit confirmation after seconds = Ask for exit confirmation after seconds
 Auto = Tự động
-Auto Load Savestate = Auto load savestate
+Auto load savestate = Auto load savestate
 AVI Dump started. = Đưa AVI vào bắt đầu
 AVI Dump stopped. = Đưa AVI vào dừng lại
 Bouncing icon = Bouncing icon
@@ -1433,6 +1433,7 @@ RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = Tần số Rewind snapshot
 Savestate Slot = Ô save
 Savestate slot backups = Savestate slot backups
+Savestate slot count = Số lượng khe lưu trạng thái
 Screenshot mode = Screenshot mode
 Screenshots as PNG = Chụp ảnh màn hình bằng định dạng PNG
 Set Memory Stick folder = Set Memory Stick folder
diff --git a/assets/lang/zh_CN.ini b/assets/lang/zh_CN.ini
index 4a5edf8bde..a381aab0cc 100644
--- a/assets/lang/zh_CN.ini
+++ b/assets/lang/zh_CN.ini
@@ -1210,8 +1210,8 @@ Filename = 文件名
 No screenshot = 没有截图
 None yet. Things will appear here after you save. = 暂无内容，游戏保存数据之后再回来吧。
 Nothing matching '%1' was found. = 没有找到名为“%1”的游戏存档。
-Save Data = 保存的存档
-Save States = 即时存档
+Save data = 保存的存档
+Save states = 即时存档
 Savedata Manager = 存档管理器
 Showing matches for '%1'. = 搜索到名称为“%1”的游戏存档。
 Size = 大小
@@ -1336,7 +1336,7 @@ No GPU driver bugs detected = GPU驱动运行良好
 App switching mode = App 切换模式
 Ask for exit confirmation after seconds = 退出确认时间（秒）
 Auto = 自动
-Auto Load Savestate = 自动载入即时存档
+Auto load savestate = 自动载入即时存档
 AVI Dump started. = AVI转储开始
 AVI Dump stopped. = AVI转储停止
 Bouncing icon = Bouncing icon
@@ -1427,6 +1427,7 @@ Restore Default Settings = 恢复默认PPSSPP设置
 Rewind Snapshot Interval = 倒带快照频率
 Savestate Slot = 即时存档插槽
 Savestate slot backups = 即时存档备份
+Savestate slot count = 保存状态插槽数量
 Screenshot mode = 截图模式
 Screenshots as PNG = 将截图保存为PNG格式
 Set Memory Stick folder = 设置记忆棒文件夹
diff --git a/assets/lang/zh_TW.ini b/assets/lang/zh_TW.ini
index 8dac4bc973..017ffe6e5c 100644
--- a/assets/lang/zh_TW.ini
+++ b/assets/lang/zh_TW.ini
@@ -1209,8 +1209,8 @@ Filename = 檔案名稱
 No screenshot = 沒有螢幕截圖
 None yet. Things will appear here after you save. = 尚無，將在存檔後出現新項目
 Nothing matching '%1' was found. = 找不到與「%1」相符的項目
-Save Data = 儲存資料
-Save States = 存檔
+Save data = 儲存資料
+Save states = 存檔
 Savedata Manager = 儲存資料管理員
 Showing matches for '%1'. = 顯示與「%1」相符的項目
 Size = 大小
@@ -1335,7 +1335,7 @@ Display Color Formats = 顯示器色彩格式
 App switching mode = App 切換模式
 Ask for exit confirmation after seconds = 退出確認時間（秒）
 Auto = 自動
-Auto Load Savestate = 自動載入存檔
+Auto load savestate = 自動載入存檔
 AVI Dump started. = AVI 傾印已啟動
 AVI Dump stopped. = AVI 傾印已停止
 Bouncing icon = 彈跳圖示
@@ -1423,6 +1423,7 @@ RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = 倒轉快照間隔
 Savestate Slot = 存檔插槽
 Savestate slot backups = 存檔插槽備份
+Savestate slot count = 儲存狀態插槽數量
 Screenshot mode = 截圖模式
 Screenshots as PNG = 以 PNG 格式儲存螢幕截圖
 Set Memory Stick folder = 設定記憶棒資料夾