Show the program name verbatim throughout AboutDialog.cpp

src/AboutDialog.cpp

@@ -74,6 +74,11 @@ hold information about one contributor to Audacity.
 #define REV_IDENT (XO("No revision identifier was provided").Translation())
 #endif
 
+// To substitute into many other translatable strings
+static const auto ProgramName =
+   //XO("Audacity");
+   Verbatim("Audacity");
+
 extern wxString FormatHtmlText( const wxString & Text );
 
 void AboutDialog::CreateCreditsList()
@@ -278,7 +283,8 @@ AboutDialog *AboutDialog::ActiveIntance()
 }
 
 AboutDialog::AboutDialog(wxWindow * parent)
-   :  wxDialogWrapper(parent, -1, XO("About Audacity"),
+   /* i18n-hint: information about the program */
+   :  wxDialogWrapper(parent, -1, XO("About %s").Format( ProgramName ),
                wxDefaultPosition, wxDefaultSize,
                wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
 {
@@ -322,13 +328,16 @@ Audacity is [[https://www.audacityteam.org/download|available]] for Windows, Mac
 /* Do the i18n of a string with markup carefully with hints.
  (Remember languages with cases.) */
       XO(
-/* i18n-hint: First %s will be "volunteers", second "available" */
+/* i18n-hint: First and third %s will be the program's name,
-"Audacity is a free program written by a worldwide team of %s. \
+  second %s will be "volunteers", fourth "available" */
-Audacity is %s for Windows, Mac, and GNU/Linux (and other Unix-like systems).")
+"%s is a free program written by a worldwide team of %s. \
+%s is %s for Windows, Mac, and GNU/Linux (and other Unix-like systems).")
          .Format(
+            ProgramName,
             Verbatim("[[https://www.audacityteam.org/about/credits|%s]]")
                /* i18n-hint: substitutes into "a worldwide team of %s" */
                .Format( XO("volunteers") ),
+            ProgramName,
             Verbatim("[[https://www.audacityteam.org/download|%s]]")
                /* i18n-hint: substitutes into "Audacity is %s" */
                .Format( XO("available") ) )
@@ -388,11 +397,13 @@ visit our %s.")
 
 #else
       << XO("<h3>")
-      << XO("Audacity")
+      << ProgramName
       << wxT(" ")
       << wxString(AUDACITY_VERSION_STRING)
       << wxT("</center></h3>")
-      << XO("Audacity the free, open source, cross-platform software for recording and editing sounds.")
+      /* i18n-hint: The program's name substitutes for %s */
+      << XO("%s the free, open source, cross-platform software for recording and editing sounds.")
+            .Format(ProgramName)
 #endif
 
       // << wxT("<p><br>")
@@ -413,14 +424,17 @@ visit our %s.")
 #endif
 
       << wxT("<p><b>")
-      << XO("Audacity Team Members")
+      /* i18n-hint: The program's name substitutes for %s */
+      << XO("%s Team Members").Format( ProgramName )
       << wxT("</b><br>")
       << GetCreditsByRole(roleTeamMember)
 
       << wxT("<p><b> ")
       << XO("Emeritus:")
       << wxT("</b><br>")
-      << XO("Distinguished Audacity Team members, not currently active")
+      /* i18n-hint: The program's name substitutes for %s */
+      << XO("Distinguished %s Team members, not currently active")
+         .Format( ProgramName )
       << wxT("<br><br>")
       << GetCreditsByRole(roleEmeritusTeam)
 
@@ -446,7 +460,8 @@ visit our %s.")
       << wxT("<p><b>")
       << XO("Libraries")
       << wxT("</b><br>")
-      << XO("Audacity includes code from the following projects:")
+      /* i18n-hint: The program's name substitutes for %s */
+      << XO("%s includes code from the following projects:").Format( ProgramName )
       << wxT("<br><br>")
       << GetCreditsByRole(roleLibrary)
 
@@ -456,7 +471,8 @@ visit our %s.")
       << GetCreditsByRole(roleThanks)
 
       << wxT("<p><br>")
-      << XO("Audacity website: ")
+      /* i18n-hint: The program's name substitutes for %s */
+      << XO("%s website: ").Format( ProgramName )
       << wxT("[[https://www.audacityteam.org/|https://www.audacityteam.org/]]")
 
 // DA: Link for DA url too
@@ -464,24 +480,26 @@ visit our %s.")
       << wxT("<br>DarkAudacity website: [[http://www.darkaudacity.com/|https://www.darkaudacity.com/]]")
 #else
       << wxT("<p><br>&nbsp; &nbsp; ")
-      /* i18n-hint Audacity's name substitutes for first %s */
+      /* i18n-hint Audacity's name substitutes for first and third %s,
-      << XO("%s software is copyright %s 1999-2018 Audacity Team.")
+       and a "copyright" symbol for the second */
+      << XO("%s software is copyright %s 1999-2018 %s Team.")
          .Format(
-            Verbatim("<b>%s<sup>&reg;</sup></b>").Format( XO("Audacity") ),
+            Verbatim("<b>%s<sup>&reg;</sup></b>").Format( ProgramName ),
-            wxT("&copy;") )
+            wxT("&copy;"),
+            ProgramName )
       << wxT("<br>")
 
       << wxT("&nbsp; &nbsp; ")
       /* i18n-hint Audacity's name substitutes for %s */
       << XO("The name %s is a registered trademark of Dominic Mazzoni.")
-         .Format( Verbatim("<b>%s</b>").Format( XO("Audacity") ) )
+         .Format( Verbatim("<b>%s</b>").Format( ProgramName ) )
       << wxT("<br><br>")
 #endif
 
       << wxT("</center>")
    ;
 
-   auto pPage = S.StartNotebookPage( XO("Audacity") );
+   auto pPage = S.StartNotebookPage( ProgramName );
    S.StartVerticalLay(1);
    {
       //v For now, change to AudacityLogoWithName via old-fashioned way, not Theme.