Changes to Spectrogram color scheme user-visible strings because of s…

…tring freeze
audacity · Jun 15, 2021 · 060885c · 060885c
1 parent e9f0590
commit 060885c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 20 deletions.
diff --git a/libraries/lib-strings/FutureStrings.h b/libraries/lib-strings/FutureStrings.h
@@ -111,17 +111,6 @@ XO("Unknown error"),
 XO("Failed to send crash report"),
 
 
-// i18n-hint Scheme refers to a color scheme for spectrogram colors
-XC("Sche&me",            "spectrum prefs"),
-// i18n-hint Choice of spectrogram colors
-XC("Color (default)",   "spectrum prefs"),
-// i18n-hint Choice of spectrogram colors
-XC("Color (classic)",   "spectrum prefs"),
-// i18n-hint Choice of spectrogram colors
-XC("Grayscale",         "spectrum prefs"),
-// i18n-hint Choice of spectrogram colors
-XC("Inverse grayscale", "spectrum prefs"),
-
 // Update version dialog
 XC("Update Audacity", "update dialog"),
 XC("&Skip", "update dialog"),

diff --git a/src/commands/SetTrackInfoCommand.cpp b/src/commands/SetTrackInfoCommand.cpp
@@ -364,7 +364,7 @@ void SetTrackVisualsCommand::PopulateOrExchange(ShuttleGui & S)
    {
       S.SetStretchyCol( 2 );
       auto schemes = SpectrogramSettings::GetColorSchemeNames();
-      S.Optional( bHasSpecColorScheme).TieChoice( XXO("Spectro. Color scheme:"), mSpecColorScheme,
+      S.Optional( bHasSpecColorScheme).TieChoice( XC("Sche&me", "spectrum prefs"), mSpecColorScheme,
          Msgids( schemes.data(), schemes.size() ) );
    }
    S.EndMultiColumn();

diff --git a/src/prefs/SpectrogramSettings.cpp b/src/prefs/SpectrogramSettings.cpp
@@ -161,13 +161,13 @@ const EnumValueSymbols &SpectrogramSettings::GetColorSchemeNames()
    static const EnumValueSymbols result{
       // Keep in correspondence with enum SpectrogramSettings::ColorScheme:
       /* i18n-hint: New color scheme for spectrograms */
-      { wxT("SpecColorNew"), XO("Color (New)") },
-      /* i18n-hint: color scheme from theme for spectrograms */
-      { wxT("SpecColorTheme"), XO("Color (from Theme)") },
-      /* i18n-hint: grayscale color scheme for spectrograms */
-      { wxT("SpecGrayscale"), XO("Grayscale") },
-      /* i18n-hint: inverse grayscale color scheme for spectrograms */
-      { wxT("SpecInvGrayscale"), XO("Inv. Grayscale") },
+      { wxT("SpecColorNew"),     XC("Color (default)",   "spectrum prefs") },
+      /* i18n-hint: Classic color scheme(from theme) for spectrograms */
+      { wxT("SpecColorTheme"),   XC("Color (classic)",   "spectrum prefs") },
+      /* i18n-hint: Grayscale color scheme for spectrograms */
+      { wxT("SpecGrayscale"),    XC("Grayscale",         "spectrum prefs") },
+      /* i18n-hint: Inverse grayscale color scheme for spectrograms */
+      { wxT("SpecInvGrayscale"), XC("Inverse grayscale", "spectrum prefs") },
    };
 
    wxASSERT(csNumColorScheme == result.size());

diff --git a/src/prefs/SpectrumPrefs.cpp b/src/prefs/SpectrumPrefs.cpp
@@ -224,7 +224,8 @@ void SpectrumPrefs::PopulateOrExchange(ShuttleGui & S)
                mTempSettings.frequencyGain,
                8);
 
-            S.Id(ID_COLOR_SCHEME).TieChoice(XXO("Color Sche&me:"),
+            // i18n-hint Scheme refers to a color scheme for spectrogram colors
+            S.Id(ID_COLOR_SCHEME).TieChoice(XC("Sche&me", "spectrum prefs"),
                (int&)mTempSettings.colorScheme,
                Msgids( SpectrogramSettings::GetColorSchemeNames() ) );
          }