1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-11-21 08:27:13 +01:00

Change XO to XXO in many more places, with no effects at all...

... because the two macros have the same expansion, and are both checked for
in the --keyword arguments passed to msgfmt by locale/update_po_files.sh.

This commit makes ONLY such changes, and comments in Internat.h.  It is big
but quite harmless.

The intention is to introduce a type distinction in a later release, by defining
XXO differently.  XXO is used where & characters in strings (for hotkeys of menu
items or control prompts) are permitted, XO where not.
This commit is contained in:
Paul Licameli
2020-05-11 11:28:14 -04:00
parent 1b2d4e26ba
commit 4d09705a73
137 changed files with 788 additions and 782 deletions

View File

@@ -168,7 +168,7 @@ void QuickFixDialog::AddStuck(
if( !bBool)
return;
S.AddFixedText( Prompt );
S.Id(FixButtonID + mItem).AddButton( XO("Fix") )->SetClientObject(
S.Id(FixButtonID + mItem).AddButton( XXO("Fix") )->SetClientObject(
safenew wxStringClientData(Pref));
{
@@ -494,7 +494,7 @@ BaseItemSharedPtr HelpMenu()
{
static BaseItemSharedPtr menu{
( FinderScope{ findCommandHandler },
Menu( wxT("Help"), XO("&Help"),
Menu( wxT("Help"), XXO("&Help"),
Section( "Basic",
// QuickFix menu item not in Audacity 2.3.1 whilst we discuss further.
#ifdef EXPERIMENTAL_DA
@@ -522,7 +522,7 @@ BaseItemSharedPtr HelpMenu()
Section
#endif
( "Other",
Menu( wxT("Diagnostics"), XO("&Diagnostics"),
Menu( wxT("Diagnostics"), XXO("&Diagnostics"),
Command( wxT("DeviceInfo"), XXO("Au&dio Device Info..."),
FN(OnAudioDeviceInfo),
AudioIONotBusyFlag() ),