Supply some missing translation in Macros dialogs...

... The "Set" prompt for checkboxes;

Strings in Choice controls, which had been declared translatable with XO, but
the translations not yet used.

This can be tested in Ukrainian locale now, for editing parameters of
commands like Select or Drag, but be aware that even uk.po is not up to date
for all recent changes in the Manage Macros dialog itself.

src/Internat.h

@@ -167,4 +167,19 @@ private:
 #define UTF8CTOWX(X) wxString((X), wxConvUTF8)
 #define LAT1CTOWX(X) wxString((X), wxConvISO8859_1)
 
+inline wxArrayString LocalizedStrings(const wxString strings[], size_t nStrings)
+{
+   wxArrayString results;
+   std::transform( strings, strings + nStrings, std::back_inserter(results),
+                   GetCustomTranslation );
+   return results;
+}
+
+inline wxArrayString LocalizedStrings(const wxArrayString &strings)
+{
+   if (strings.empty())
+      return {};
+   return LocalizedStrings( &strings[0], strings.size() );
+}
+
 #endif

src/ShuttleGui.cpp

@@ -2077,7 +2077,8 @@ ShuttleGui & ShuttleGui::Id(int id )
 }
 
 ShuttleGui & ShuttleGui::Optional( bool &bVar ){
- TieCheckBox( "Set", bVar );
+   /* i18n-hint verb, imperative */
+ TieCheckBox( _("Set"), bVar );
  return *this;
 };
 

src/commands/DragCommand.cpp

@@ -61,7 +61,7 @@ bool DragCommand::DefineParams( ShuttleParams & S ){
 
 void DragCommand::PopulateOrExchange(ShuttleGui & S)
 {
-   wxArrayString coords( nCoordTypes, kCoordTypeStrings );
+   auto coords = LocalizedStrings( kCoordTypeStrings, nCoordTypes );
 
    S.AddSpace(0, 5);
 

src/commands/GetInfoCommand.cpp

@@ -94,8 +94,8 @@ bool GetInfoCommand::DefineParams( ShuttleParams & S ){
 
 void GetInfoCommand::PopulateOrExchange(ShuttleGui & S)
 {
-   wxArrayString types( nTypes, kTypes );
+   auto types = LocalizedStrings( kTypes, nTypes );
-   wxArrayString formats( nFormats, kFormats );
+   auto formats = LocalizedStrings( kFormats, nFormats );
    S.AddSpace(0, 5);
 
    S.StartMultiColumn(2, wxALIGN_CENTER);

src/commands/GetTrackInfoCommand.cpp

@@ -48,7 +48,7 @@ bool GetTrackInfoCommand::DefineParams( ShuttleParams & S ){
 
 void GetTrackInfoCommand::PopulateOrExchange(ShuttleGui & S)
 {
-   wxArrayString types( nTypes, kTypes );
+   auto types = LocalizedStrings( kTypes, nTypes );
    S.AddSpace(0, 5);
 
    S.StartMultiColumn(2, wxALIGN_CENTER);

src/commands/ScreenshotCommand.cpp

@@ -148,8 +148,8 @@ bool ScreenshotCommand::DefineParams( ShuttleParams & S ){
 
 void ScreenshotCommand::PopulateOrExchange(ShuttleGui & S)
 {
-   wxArrayString whats(nCaptureWhats, kCaptureWhatStrings);
+   auto whats = LocalizedStrings(kCaptureWhatStrings, nCaptureWhats);
-   wxArrayString backs(nBackgrounds, kBackgroundStrings);
+   auto backs = LocalizedStrings(kBackgroundStrings, nBackgrounds);
    S.AddSpace(0, 5);
 
    S.StartMultiColumn(2, wxALIGN_CENTER);

src/commands/SelectCommand.cpp

@@ -107,6 +107,7 @@ bool SelectFrequenciesCommand::Apply(const CommandContext & context){
 const int nModes =3;
 static const wxString kModes[nModes] =
 {
+   /* i18n-hint verb, imperative */
    XO("Set"),
    XO("Add"),
    XO("Remove")
@@ -123,7 +124,7 @@ bool SelectTracksCommand::DefineParams( ShuttleParams & S ){
 
 void SelectTracksCommand::PopulateOrExchange(ShuttleGui & S)
 {
-   wxArrayString modes( nModes, kModes );
+   auto modes = LocalizedStrings( kModes, nModes );
    S.AddSpace(0, 5);
 
    S.StartMultiColumn(3, wxALIGN_CENTER);

src/commands/SetClipCommand.cpp

@@ -61,7 +61,7 @@ bool SetClipCommand::DefineParams( ShuttleParams & S ){
 
 void SetClipCommand::PopulateOrExchange(ShuttleGui & S)
 {
-   wxArrayString colours( nColours, kColourStrings );
+   auto colours = LocalizedStrings( kColourStrings, nColours );
 
    S.AddSpace(0, 5);
 

src/commands/SetTrackInfoCommand.cpp

@@ -123,10 +123,10 @@ bool SetTrackCommand::DefineParams( ShuttleParams & S ){
 
 void SetTrackCommand::PopulateOrExchange(ShuttleGui & S)
 {
-   wxArrayString colours(  nColours,      kColourStrings );
+   auto colours = LocalizedStrings(  kColourStrings, nColours );
-   wxArrayString displays( nDisplayTypes, kDisplayTypeStrings );
+   auto displays = LocalizedStrings( kDisplayTypeStrings, nDisplayTypes );
-   wxArrayString scales(   nScaleTypes,   kScaleTypeStrings );
+   auto scales = LocalizedStrings( kScaleTypeStrings, nScaleTypes );
-   wxArrayString vzooms(   nZoomTypes,    kZoomTypeStrings );
+   auto vzooms = LocalizedStrings( kZoomTypeStrings, nZoomTypes );
 
    S.AddSpace(0, 5);
 

src/effects/nyquist/Nyquist.cpp

@@ -94,15 +94,6 @@ enum
 static const wxChar *KEY_Version = wxT("Version");
 static const wxChar *KEY_Command = wxT("Command");
 
-wxArrayString NyqControl::GetTranslatedChoices() const
-{
-   wxArrayString results;
-   std::transform(
-      choices.begin(), choices.end(), std::back_inserter(results),
-                  GetCustomTranslation);
-   return results;
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 //
 // NyquistEffect
@@ -2405,7 +2396,7 @@ void NyquistEffect::BuildEffectWindow(ShuttleGui & S)
             {
                S.AddSpace(10, 10);
 
-               const wxArrayString &choices = ctrl.GetTranslatedChoices();
+               auto choices = LocalizedStrings(ctrl.choices);
                S.Id(ID_Choice + i).AddChoice( {}, wxT(""), &choices);
             }
             else

src/effects/nyquist/Nyquist.h

@@ -53,8 +53,6 @@ public:
    //NyqControl( NyqControl && ) = default;
    //NyqControl &operator = ( NyqControl && ) = default;
 
-   wxArrayString GetTranslatedChoices() const;
-
    int type;
    wxString var;
    wxString name;