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

@@ -393,9 +393,9 @@ BaseItemSharedPtr ViewMenu()
static BaseItemSharedPtr menu{
( FinderScope{ findCommandHandler },
Menu( wxT("View"), XO("&View"),
Menu( wxT("View"), XXO("&View"),
Section( "Basic",
Menu( wxT("Zoom"), XO("&Zoom"),
Menu( wxT("Zoom"), XXO("&Zoom"),
Section( "",
Command( wxT("ZoomIn"), XXO("Zoom &In"), FN(OnZoomIn),
ZoomInAvailableFlag(), wxT("Ctrl+1") ),
@@ -415,7 +415,7 @@ BaseItemSharedPtr ViewMenu()
)
),
Menu( wxT("TrackSize"), XO("T&rack Size"),
Menu( wxT("TrackSize"), XXO("T&rack Size"),
Command( wxT("FitInWindow"), XXO("&Fit to Width"), FN(OnZoomFit),
TracksExistFlag(), wxT("Ctrl+F") ),
Command( wxT("FitV"), XXO("Fit to &Height"), FN(OnZoomFitV),
@@ -426,7 +426,7 @@ BaseItemSharedPtr ViewMenu()
FN(OnExpandAllTracks), TracksExistFlag(), wxT("Ctrl+Shift+X") )
),
Menu( wxT("SkipTo"), XO("Sk&ip to"),
Menu( wxT("SkipTo"), XXO("Sk&ip to"),
Command( wxT("SkipSelStart"), XXO("Selection Sta&rt"),
FN(OnGoSelStart), TimeSelectedFlag(),
Options{ wxT("Ctrl+["), XO("Skip to Selection Start") } ),