Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-12-08 17:46:25 +01:00
Code Issues Releases Wiki Activity

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

Browse Source 
... 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
Download Patch File Download Diff File Expand all files Collapse all files

6
src/import/ImportPCM.cpp
View File

@@ -350,13 +350,13 @@ static wxString AskCopyOrEdit()
S.SetBorder(0);
copyRadio = S.AddRadioButton(
XO("Make a &copy of the files before editing (safer)") );
XXO("Make a &copy of the files before editing (safer)") );
aliasRadio = S.AddRadioButtonToGroup(
XO("Read the files &directly from the original (faster)") );
XXO("Read the files &directly from the original (faster)") );
dontAskNextTimeBox = S.AddCheckBox(
XO("Don't &warn again and always use my choice above"),
XXO("Don't &warn again and always use my choice above"),
wxT("false"));
}
S.EndStatic();

12
src/import/ImportRaw.cpp
View File

@@ -391,13 +391,13 @@ ImportRawDialog::ImportRawDialog(wxWindow * parent,
S.SetBorder(5);
S.StartTwoColumn();
{
mEncodingChoice = S.Id(ChoiceID).AddChoice(XO("Encoding:"),
mEncodingChoice = S.Id(ChoiceID).AddChoice(XXO("Encoding:"),
encodings,
selection);
mEndianChoice = S.Id(ChoiceID).AddChoice(XO("Byte order:"),
mEndianChoice = S.Id(ChoiceID).AddChoice(XXO("Byte order:"),
endians,
endian);
mChannelChoice = S.Id(ChoiceID).AddChoice(XO("Channels:"),
mChannelChoice = S.Id(ChoiceID).AddChoice(XXO("Channels:"),
chans,
mChannels - 1);
}
@@ -408,20 +408,20 @@ ImportRawDialog::ImportRawDialog(wxWindow * parent,
{
// Offset text
/* i18n-hint: (noun)*/
mOffsetText = S.AddTextBox(XO("Start offset:"),
mOffsetText = S.AddTextBox(XXO("Start offset:"),
wxString::Format(wxT("%d"), mOffset),
12);
S.AddUnits(XO("bytes"));
// Percent text
mPercentText = S.AddTextBox(XO("Amount to import:"),
mPercentText = S.AddTextBox(XXO("Amount to import:"),
wxT("100"),
12);
S.AddUnits(XO("%"));
// Rate text
/* i18n-hint: (noun)*/
mRateText = S.AddTextBox(XO("Sample rate:"),
mRateText = S.AddTextBox(XXO("Sample rate:"),
wxString::Format(wxT("%d"), (int)mRate),
12);
/* i18n-hint: This is the abbreviation for "Hertz", or