From fd3e4068b6ff5b1addcc1bec0f062bb298f05251 Mon Sep 17 00:00:00 2001
From: OpenSauce04 <opensauce04@gmail.com>
Date: Wed, 16 Apr 2025 21:52:18 +0100
Subject: [PATCH] android: Renamed `quicksave_saving` and `quickload_loading`
 strings to simply `saving` and `loading`

This better reflects their use, as they are no longer used exclusively for quicksaves.
---
 .../org/citra/citra_emu/features/hotkeys/HotkeyUtility.kt     | 4 ++--
 .../java/org/citra/citra_emu/fragments/EmulationFragment.kt   | 4 ++--
 src/android/app/src/main/res/values/strings.xml               | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/hotkeys/HotkeyUtility.kt b/src/android/app/src/main/java/org/citra/citra_emu/features/hotkeys/HotkeyUtility.kt
index 9a99937ee..00115809b 100644
--- a/src/android/app/src/main/java/org/citra/citra_emu/features/hotkeys/HotkeyUtility.kt
+++ b/src/android/app/src/main/java/org/citra/citra_emu/features/hotkeys/HotkeyUtility.kt
@@ -29,13 +29,13 @@ class HotkeyUtility(
                 Hotkey.QUICKSAVE.button -> {
                     NativeLibrary.saveState(NativeLibrary.QUICKSAVE_SLOT)
                     Toast.makeText(context,
-                        context.getString(R.string.quicksave_saving),
+                        context.getString(R.string.saving),
                         Toast.LENGTH_SHORT).show()
                 }
                 Hotkey.QUICKLOAD.button -> {
                     val wasLoaded = NativeLibrary.loadStateIfAvailable(NativeLibrary.QUICKSAVE_SLOT)
                     val stringRes = if(wasLoaded) {
-                        R.string.quickload_loading
+                        R.string.loading
                     } else {
                         R.string.quickload_not_found
                     }
diff --git a/src/android/app/src/main/java/org/citra/citra_emu/fragments/EmulationFragment.kt b/src/android/app/src/main/java/org/citra/citra_emu/fragments/EmulationFragment.kt
index a749dcd3e..58e7b95c5 100644
--- a/src/android/app/src/main/java/org/citra/citra_emu/fragments/EmulationFragment.kt
+++ b/src/android/app/src/main/java/org/citra/citra_emu/fragments/EmulationFragment.kt
@@ -558,13 +558,13 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram
                     if(isSaving) {
                         NativeLibrary.saveState(slot)
                         Toast.makeText(context,
-                            getString(R.string.quicksave_saving),
+                            getString(R.string.saving),
                             Toast.LENGTH_SHORT).show()
                     } else {
                         NativeLibrary.loadState(slot)
                         binding.drawerLayout.close()
                         Toast.makeText(context,
-                            getString(R.string.quickload_loading),
+                            getString(R.string.loading),
                             Toast.LENGTH_SHORT).show()
                     }
                     true
diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml
index 23d5829e2..1113b131a 100644
--- a/src/android/app/src/main/res/values/strings.xml
+++ b/src/android/app/src/main/res/values/strings.xml
@@ -317,6 +317,7 @@
     <string name="ini_saved">Saved settings</string>
     <string name="gameid_saved">Saved settings for %1$s</string>
     <string name="error_saving">Error saving %1$s.ini: %2$s</string>
+    <string name="saving">Saving…</string>
     <string name="loading">Loading…</string>
     <string name="next">Next</string>
     <string name="back">Back</string>
@@ -807,8 +808,6 @@
     <string name="emulation_quicksave">Quicksave</string>
     <string name="emulation_quickload">Quickload</string>
     <string name="emulation_occupied_quicksave_slot">Quicksave - %1$tF %1$tR</string>
-    <string name="quicksave_saving">Saving…</string>
-    <string name="quickload_loading">Loading…</string>
     <string name="quickload_not_found">No Quicksave available.</string>
     <string name="miscellaneous">Miscellaneous</string>
     <string name="use_artic_base_controller">Use Artic Controller when connected to Artic Base Server</string>