From ec23260fd1fc29f6de6705d08d2d1f182fd9891b Mon Sep 17 00:00:00 2001
From: Solomon Peachy <pizza@shaftnet.org>
Date: Tue, 11 Jun 2024 10:11:26 -0400
Subject: mikmod:  Settings names should _NOT_ be i18n'd.

Regression was introduced back in 2019 in 2ebb8da275

Change-Id: I035e295b4e17e1f834059d1c6466562000749e54
---
 apps/plugins/mikmod/mikmod.c       | 16 ++++++++--------
 apps/plugins/text_viewer/tv_menu.c | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/apps/plugins/mikmod/mikmod.c b/apps/plugins/mikmod/mikmod.c
index bb0e2e04ab..30f8c2f079 100644
--- a/apps/plugins/mikmod/mikmod.c
+++ b/apps/plugins/mikmod/mikmod.c
@@ -588,48 +588,48 @@ static int settings_menu(void)
         switch(selection)
         {
         case 0:
-            rb->set_int(rb->str(LANG_PANNING_SEPARATION), "", 1,
+            rb->set_int("Panning Separation", "", 1,
                         &(settings.pansep),
                         NULL, 8, 0, 128, NULL );
             applysettings();
             break;
 
         case 1:
-            rb->set_int(rb->str(LANG_REVERBERATION), "", 1,
+            rb->set_int("Reverberation", "", 1,
                         &(settings.reverb),
                         NULL, 1, 0, 15, NULL );
             applysettings();
             break;
 
         case 2:
-            rb->set_bool(rb->str(LANG_INTERPOLATION), &(settings.interp));
+            rb->set_bool("Interpolation", &(settings.interp));
             applysettings();
             break;
 
         case 3:
-            rb->set_bool(rb->str(LANG_SWAP_CHANNELS), &(settings.reverse));
+            rb->set_bool("Reverse Channels", &(settings.reverse));
             applysettings();
             break;
 
         case 4:
-            rb->set_bool(rb->str(LANG_MIKMOD_SURROUND), &(settings.surround));
+            rb->set_bool("Surround", &(settings.surround));
             applysettings();
             break;
 
         case 5:
-            rb->set_bool(rb->str(LANG_MIKMOD_HQMIXER), &(settings.hqmixer));
+            rb->set_bool("HQ Mixer", &(settings.hqmixer));
             applysettings();
             break;
 
         case 6:
-            rb->set_option(rb->str(LANG_MIKMOD_SAMPLERATE), &(settings.sample_rate), RB_INT, sr_names,
+            rb->set_option("Sample Rate", &(settings.sample_rate), RB_INT, sr_names,
                            HW_NUM_FREQ, NULL);
             applysettings();
             break;
 
 #ifdef HAVE_ADJUSTABLE_CPU_FREQ
         case 7:
-            rb->set_bool(rb->str(LANG_CPU_BOOST), &(settings.boost));
+            rb->set_bool("CPU Boost", &(settings.boost));
             applysettings();
             break;
 #endif
diff --git a/apps/plugins/text_viewer/tv_menu.c b/apps/plugins/text_viewer/tv_menu.c
index 15b684fe08..5b43a910c6 100644
--- a/apps/plugins/text_viewer/tv_menu.c
+++ b/apps/plugins/text_viewer/tv_menu.c
@@ -65,7 +65,7 @@ MAKE_MENU(horizontal_scroll_menu, "Horizontal", NULL, Icon_NOICON, // XXX i18n
 
 static bool tv_vertical_scrollbar_setting(void)
 {
-    return rb->set_bool("Vertical Scrollbar", &new_prefs.vertical_scrollbar); // XXX i18n
+    return rb->set_bool("Vertical Scrollbar", &new_prefs.vertical_scrollbar);
 }
 
 static bool tv_vertical_scroll_mode_setting(void)
@@ -75,18 +75,18 @@ static bool tv_vertical_scroll_mode_setting(void)
         {"Scroll by Line", -1},
     };
 
-    return rb->set_option("Scroll Mode", &new_prefs.vertical_scroll_mode, RB_INT, // XXX i18n
+    return rb->set_option("Scroll Mode", &new_prefs.vertical_scroll_mode, RB_INT,
                           names, 2, NULL);
 }
 
 static bool tv_overlap_page_mode_setting(void)
 {
-    return rb->set_bool("Overlap Pages", &new_prefs.overlap_page_mode); // XXX i18n
+    return rb->set_bool("Overlap Pages", &new_prefs.overlap_page_mode);
 }
 
 static bool tv_autoscroll_speed_setting(void)
 {
-    return rb->set_int("Auto-scroll Speed", "", UNIT_INT, // XXX i18n
+    return rb->set_int("Auto-scroll Speed", "", UNIT_INT,
                        &new_prefs.autoscroll_speed, NULL, 1, 1, 10, NULL);
 }
 
@@ -97,7 +97,7 @@ static bool tv_narrow_mode_setting(void)
         {"Top/Bottom Page",    -1},
     };
 
-    return rb->set_option("Left/Right Key", &new_prefs.narrow_mode, RB_INT, // XXX i18n
+    return rb->set_option("Left/Right Key", &new_prefs.narrow_mode, RB_INT,
                           names, 2, NULL);
 }
 
@@ -165,12 +165,12 @@ static bool tv_line_mode_setting(void)
     };
 
     return rb->set_option("Line Mode", &new_prefs.line_mode, RB_INT, names,
-                          sizeof(names) / sizeof(names[0]), NULL); // XXX i18n
+                          sizeof(names) / sizeof(names[0]), NULL);
 }
 
 static bool tv_windows_setting(void)
 {
-    return rb->set_int("Screens Per Page", "", UNIT_INT, // XXX i18n
+    return rb->set_int("Screens Per Page", "", UNIT_INT,
                        &new_prefs.windows, NULL, 1, 1, 5, NULL);
 }
 
@@ -182,7 +182,7 @@ static bool tv_alignment_setting(void)
     };
 
     return rb->set_option("Alignment", &new_prefs.alignment, RB_INT,
-                          names , 2, NULL); // XXX i18n
+                          names , 2, NULL);
 }
 
 static bool tv_header_setting(void)
-- 
cgit v1.2.3