From c4a1787bb9c3870a9e734a93de25b2c8b75edd9b Mon Sep 17 00:00:00 2001
From: James Crook <james.k.crook@gmail.com>
Date: Thu, 20 Jul 2017 18:21:55 +0100
Subject: [PATCH] Improve source for generation of .pot file.

"clang " is the name of a compiler and should not be translated.
Other changes here from seeing how translation was actually being done.
---
 src/AboutDialog.cpp           |  6 +++---
 src/Menus.cpp                 |  3 ++-
 src/toolbars/SelectionBar.cpp | 15 +++++++++++----
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/AboutDialog.cpp b/src/AboutDialog.cpp
index 876a7233e..536ed3e9d 100644
--- a/src/AboutDialog.cpp
+++ b/src/AboutDialog.cpp
@@ -690,14 +690,14 @@ void AboutDialog::PopulateInformationPage( ShuttleGui & S )
 
 #ifdef __GNUC_PATCHLEVEL__
 #ifdef __MINGW32__
-   AddBuildinfoRow(&informationStr, _("Compiler:"), _("MinGW ") + wxMAKE_VERSION_DOT_STRING_T(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__));
+   AddBuildinfoRow(&informationStr, _("Compiler:"), wxT("MinGW ") wxMAKE_VERSION_DOT_STRING_T(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__));
 #else
-   AddBuildinfoRow(&informationStr, _("Compiler:"), _("GCC ") + wxMAKE_VERSION_DOT_STRING_T(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__));
+   AddBuildinfoRow(&informationStr, _("Compiler:"), wxT("GCC ") wxMAKE_VERSION_DOT_STRING_T(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__));
 #endif
 #endif
 
 #ifdef __clang_version__
-   AddBuildinfoRow(&informationStr, _("Compiler:"), _("clang " __clang_version__));
+   AddBuildinfoRow(&informationStr, _("Compiler:"), wxT("clang ") __clang_version__);
 #endif
 
    // Install prefix
diff --git a/src/Menus.cpp b/src/Menus.cpp
index 8613b261b..9c5fd6319 100644
--- a/src/Menus.cpp
+++ b/src/Menus.cpp
@@ -7290,7 +7290,8 @@ wxString AudacityProject::ClipBoundaryMessage(const std::vector<FoundClipBoundar
    wxString message;
    for (auto& result : results) {
       wxString temp;
-
+      // TODO This section is extremely difficult for translators.
+      // Can it be made easier and can hints be given?
       temp.Printf(wxT("%s %d "), result.clipStart1 ? _("start") : _("end"), result.index1 + 1);
       message += temp;
 
diff --git a/src/toolbars/SelectionBar.cpp b/src/toolbars/SelectionBar.cpp
index 0d6240f0d..2e12272ba 100644
--- a/src/toolbars/SelectionBar.cpp
+++ b/src/toolbars/SelectionBar.cpp
@@ -811,14 +811,20 @@ void SelectionBar::SetSelectionMode(int mode)
 
 #ifdef SEL_RADIO_TITLES
    if( mStartEndProxy == NULL ){
+      // The line breaks are a little funny in order that the i18n hints occur i the right place in 
+      // the .pot file
+      mStartEndRadBtn->SetLabelText(     (id == StartEndRadioID) ?      _("Start - End") : 
       // i18n-hint: S-E is an abbreviation of Start-End
-      mStartEndRadBtn->SetLabelText(     (id == StartEndRadioID) ?      _("Start - End") : _("S-E") );
+         _("S-E") );
+      mStartLengthRadBtn->SetLabelText(  (id == StartLengthRadioID) ?   _("Start - Length") : 
       // i18n-hint: S-L is an abbreviation of Start-Length
-      mStartLengthRadBtn->SetLabelText(  (id == StartLengthRadioID) ?   _("Start - Length") : _("S-L") );
+         _("S-L") );
+      mLengthEndRadBtn->SetLabelText(    (id == LengthEndRadioID) ?     _("Length - End") : 
       // i18n-hint: L-E is an abbreviation of Length-End
-      mLengthEndRadBtn->SetLabelText(    (id == LengthEndRadioID) ?     _("Length - End") : _("L-E") );
+         _("L-E") );
+      mLengthCenterRadBtn->SetLabelText( (id == LengthCenterRadioID) ?  _("Length - Center") : 
       // i18n-hint: L-C is an abbreviation of Length-Center
-      mLengthCenterRadBtn->SetLabelText( (id == LengthCenterRadioID) ?  _("Length - Center") : _("L-C") );
+         _("L-C") );
    }
    else
    {
@@ -840,6 +846,7 @@ void SelectionBar::SetSelectionMode(int mode)
 #endif
 
 #ifdef SEL_BUTTON_TITLES
+   // Not translated.  This is old experiemental code that is probably on the way out.
    wxString CenterNames[] = { "       Start  -  End        ", "       Start  -  Length   ", "   Length  -  End        ", "   Length  -  Center   " };
    mButtonTitles[1]->SetLabel( CenterNames[mode] );
 #endif