From 27d31d906d2f5287332f2b7f6efc584be00ff41a Mon Sep 17 00:00:00 2001
From: Panagiotis Vasilopoulos <hello@alwayslivid.com>
Date: Mon, 4 Oct 2021 06:31:39 +0200
Subject: [PATCH] Remove useless imported strings, import i18n comment

We don't need many of these imported strings, because we don't have
crash reports or updates.

Commit imported from d20cf012556a819e68515d86bb66a2c047007539

Co-authored-by: Paul Licameli <paul.licameli@audacityteam.org>
Signed-off-by: Panagiotis Vasilopoulos <hello@alwayslivid.com>
---
 libraries/lib-strings/FutureStrings.h | 34 ---------------------------
 src/prefs/DevicePrefs.cpp             |  4 ++--
 src/prefs/RecordingPrefs.cpp          |  3 ++-
 src/prefs/RecordingPrefs.h            |  3 ++-
 4 files changed, 6 insertions(+), 38 deletions(-)

diff --git a/libraries/lib-strings/FutureStrings.h b/libraries/lib-strings/FutureStrings.h
index 0e355330c..a0b3ec70f 100644
--- a/libraries/lib-strings/FutureStrings.h
+++ b/libraries/lib-strings/FutureStrings.h
@@ -97,24 +97,6 @@ Some example strings are also given first, to document the syntax.
 #endif
 
 
-// Crash & error report window
-
-XO("Problem Report for Audacity"),
-XO("Click \"Send\" to submit the report to Audacity. This information is collected anonymously."),
-XO("Problem details"),
-XO("Comments"),
-XC("&Send",       "crash reporter button"),
-XC("&Don't send", "crash reporter button"),
-// i18n-hint C++ programming exception
-XO("Exception code 0x%x"),
-// i18n-hint C++ programming exception
-XO("Unknown exception"),
-// i18n-hint C++ programming assertion
-XO("Unknown assertion"),
-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
@@ -126,22 +108,6 @@ 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"),
-XC("&Install update", "update dialog"),
-XC("Changelog", "update dialog"),
-XC("Read more on GitHub", "update dialog"),
-XC("Error checking for update", "update dialog"),
-XC("Unable to connect to Audacity update server.", "update dialog"),
-XC("Update data was corrupted.", "update dialog"),
-XC("Error downloading update.", "update dialog"),
-XC("Can't open the Audacity download link.", "update dialog"),
-// i18n-hint Substitution of version number for %s.
-XC("Audacity %s is available!", "update dialog"),
-
-// For after 3.0.3
-
 // See three occurrences of this XC in comments elsewhere;
 // to be uncommented, replacing an XO; and the i18n-hint comment to be moved
 // to one of them (one is enough)
diff --git a/src/prefs/DevicePrefs.cpp b/src/prefs/DevicePrefs.cpp
index 6586c0906..b6fb3dab2 100644
--- a/src/prefs/DevicePrefs.cpp
+++ b/src/prefs/DevicePrefs.cpp
@@ -162,8 +162,8 @@ void DevicePrefs::PopulateOrExchange(ShuttleGui & S)
    }
    S.EndStatic();
 
-   // XC("Recording", "preference")
-   S.StartStatic(XO("Recording"));
+   // i18n-hint: modifier as in "Recording preferences", not progressive verb
+   S.StartStatic(XC("Recording", "preference"));
    {
       S.StartMultiColumn(2);
       {
diff --git a/src/prefs/RecordingPrefs.cpp b/src/prefs/RecordingPrefs.cpp
index 4bf013daa..09762a92d 100644
--- a/src/prefs/RecordingPrefs.cpp
+++ b/src/prefs/RecordingPrefs.cpp
@@ -41,7 +41,8 @@ BEGIN_EVENT_TABLE(RecordingPrefs, PrefsPanel)
 END_EVENT_TABLE()
 
 RecordingPrefs::RecordingPrefs(wxWindow * parent, wxWindowID winid)
-:  PrefsPanel(parent, winid, XO("Recording")) // XC("Recording", "preference")
+// i18n-hint: modifier as in "Recording preferences", not progressive verb
+:  PrefsPanel(parent, winid, XC("Recording", "preference"))
 {
    gPrefs->Read(wxT("/GUI/TrackNames/RecordingNameCustom"), &mUseCustomTrackName, false);
    mOldNameChoice = mUseCustomTrackName;
diff --git a/src/prefs/RecordingPrefs.h b/src/prefs/RecordingPrefs.h
index 64ee09e89..5ae33a50c 100644
--- a/src/prefs/RecordingPrefs.h
+++ b/src/prefs/RecordingPrefs.h
@@ -21,7 +21,8 @@ class ShuttleGui;
 
 #define RECORDING_PREFS_PLUGIN_SYMBOL ComponentInterfaceSymbol{ \
    L"Recording", \
-   XO("Recording")  /* XC("Recording", "preference") */ \
+   /* i18n-hint: modifier as in "Recording preferences", not progressive verb */ \
+   XC("Recording", "preference") \
 }
 
 #define AUDIO_PRE_ROLL_KEY (wxT("/AudioIO/PreRoll"))