Add i18n-hint comment; clean up FutureStrings.h

libraries/lib-strings/FutureStrings.h

@@ -95,25 +95,3 @@ Some example strings are also given first, to document the syntax.
 
 // //////////////////////////////////////////////// End examples
 #endif
-
-// 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)
-// i18n-hint: modifier as in "Recording preferences", not progressive verb
-XC("Recording", "preference"),

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);
       {

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;

src/prefs/RecordingPrefs.h

@@ -30,7 +30,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"))

src/update/UpdateNoticeDialog.cpp

@@ -88,6 +88,7 @@ UpdateNoticeDialog::UpdateNoticeDialog(wxWindow* parent)
             AccessibleLinksFormatter preferencesMessage(thirdParagraph);
             
             preferencesMessage.FormatLink(
+               // i18n-hint: a page in the Preferences dialog; use same name
                wxT("%s"), XO("Preferences > Application"), [this]() {
                   GlobalPrefsDialog dialog(this /* parent */, nullptr);