diff --git a/src/export/ExportMultiple.cpp b/src/export/ExportMultiple.cpp index d1b2865fc..79806599d 100644 --- a/src/export/ExportMultiple.cpp +++ b/src/export/ExportMultiple.cpp @@ -905,7 +905,7 @@ ProgressResult ExportMultipleDialog::ExportMultipleByTrack(bool byName, wxString name; // used to hold file name whilst we mess with it wxString title; // un-messed-with title of file for tagging with - /* Remember which tracks were selected, and set them to unselected */ + /* Remember which tracks were selected, and set them to deselected */ SelectionStateChanger changer{ mSelectionState, *mTracks }; for (auto tr : mTracks->Selected()) tr->SetSelected(false); diff --git a/src/tracks/labeltrack/ui/LabelTrackView.cpp b/src/tracks/labeltrack/ui/LabelTrackView.cpp index bfd242f89..032ccf1a3 100644 --- a/src/tracks/labeltrack/ui/LabelTrackView.cpp +++ b/src/tracks/labeltrack/ui/LabelTrackView.cpp @@ -1687,11 +1687,11 @@ void LabelTrackView::ShowContextMenu( AudacityProject &project ) OnContextMenu( project, event ); } ); - menu.Append(OnCutSelectedTextID, _("Cu&t label text")); - menu.Append(OnCopySelectedTextID, _("&Copy label text")); + menu.Append(OnCutSelectedTextID, _("Cu&t Label text")); + menu.Append(OnCopySelectedTextID, _("&Copy Label text")); menu.Append(OnPasteSelectedTextID, _("&Paste")); menu.Append(OnDeleteSelectedLabelID, _("&Delete Label")); - menu.Append(OnEditSelectedLabelID, _("&Edit label...")); + menu.Append(OnEditSelectedLabelID, _("&Edit Label...")); menu.Enable(OnCutSelectedTextID, IsTextSelected( project )); menu.Enable(OnCopySelectedTextID, IsTextSelected( project )); diff --git a/src/tracks/ui/Scrubbing.cpp b/src/tracks/ui/Scrubbing.cpp index 0797f160b..e33b9c60e 100644 --- a/src/tracks/ui/Scrubbing.cpp +++ b/src/tracks/ui/Scrubbing.cpp @@ -48,7 +48,7 @@ Paul Licameli split from TrackPanel.cpp enum { // PRL: // Mouse must move at least this far to distinguish ctrl-drag to scrub - // from ctrl-click for playback. + // from ctrl+click for playback. SCRUBBING_PIXEL_TOLERANCE = 10, #ifdef EXPERIMENTAL_SCRUBBING_SCROLL_WHEEL diff --git a/src/tracks/ui/TrackButtonHandles.cpp b/src/tracks/ui/TrackButtonHandles.cpp index 3efa0a74c..28aa229cc 100644 --- a/src/tracks/ui/TrackButtonHandles.cpp +++ b/src/tracks/ui/TrackButtonHandles.cpp @@ -114,9 +114,9 @@ TranslatableString SelectButtonHandle::Tip( { auto pTrack = GetTrack(); #if defined(__WXMAC__) - return pTrack->GetSelected() ? XO("Command+Click to Unselect") : XO("Select track"); + return pTrack->GetSelected() ? XO("Command+Click to deselect") : XO("Select track"); #else - return pTrack->GetSelected() ? XO("Ctrl+Click to Unselect") : XO("Select track"); + return pTrack->GetSelected() ? XO("Ctrl+Click to deselect") : XO("Select track"); #endif } diff --git a/src/tracks/ui/TrackSelectHandle.cpp b/src/tracks/ui/TrackSelectHandle.cpp index debcbb0b1..e66cb28fa 100644 --- a/src/tracks/ui/TrackSelectHandle.cpp +++ b/src/tracks/ui/TrackSelectHandle.cpp @@ -28,21 +28,21 @@ Paul Licameli split from TrackPanel.cpp #if defined(__WXMAC__) /* i18n-hint: Command names a modifier key on Macintosh keyboards */ -#define CTRL_CLICK _("Command-Click") +#define CTRL_CLICK _("Command+Click") #else /* i18n-hint: Ctrl names a modifier key on Windows or Linux keyboards */ -#define CTRL_CLICK _("Ctrl-Click") +#define CTRL_CLICK _("Ctrl+Click") #endif namespace { TranslatableString Message(unsigned trackCount) { if (trackCount > 1) - // i18n-hint: %s is replaced by (translation of) 'Ctrl-Click' on windows, 'Command-Click' on Mac + // i18n-hint: %s is replaced by (translation of) 'Ctrl+Click' on windows, 'Command+Click' on Mac return XO( "%s to select or deselect track. Drag up or down to change track order.") .Format( CTRL_CLICK ); else - // i18n-hint: %s is replaced by (translation of) 'Ctrl-Click' on windows, 'Command-Click' on Mac + // i18n-hint: %s is replaced by (translation of) 'Ctrl+Click' on windows, 'Command+Click' on Mac return XO("%s to select or deselect track.") .Format( CTRL_CLICK ); }