From 1176b61953d3cfd34290bf87d3987ef582066ed3 Mon Sep 17 00:00:00 2001 From: James Crook Date: Fri, 10 Jan 2020 17:02:31 +0000 Subject: [PATCH] Wording changes, per wiki: https://wiki.audacityteam.org/wiki/Wording --- src/commands/ScreenshotCommand.cpp | 2 +- src/commands/SetClipCommand.cpp | 2 +- src/commands/SetTrackInfoCommand.cpp | 2 +- src/effects/Equalization.cpp | 4 ++-- src/effects/Equalization.h | 2 +- src/prefs/TracksPrefs.cpp | 2 +- src/toolbars/ToolsToolBar.cpp | 4 ++-- src/tracks/labeltrack/ui/LabelTrackView.cpp | 6 +++--- src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/commands/ScreenshotCommand.cpp b/src/commands/ScreenshotCommand.cpp index 75b92f371..5ea5cca0c 100644 --- a/src/commands/ScreenshotCommand.cpp +++ b/src/commands/ScreenshotCommand.cpp @@ -509,7 +509,7 @@ void ScreenshotCommand::CaptureEffects( "Distortion...", "Echo...", //"Equalization...", - "Filter Curve...", + "Filter Curve EQ...", "Graphic EQ...", //"Fade In", //"Fade Out", diff --git a/src/commands/SetClipCommand.cpp b/src/commands/SetClipCommand.cpp index d149b4895..0209b41d0 100644 --- a/src/commands/SetClipCommand.cpp +++ b/src/commands/SetClipCommand.cpp @@ -62,7 +62,7 @@ void SetClipCommand::PopulateOrExchange(ShuttleGui & S) S.StartMultiColumn(3, wxALIGN_CENTER); { S.Optional( bHasContainsTime).TieNumericTextBox( XO("At:"), mContainsTime ); - S.Optional( bHasColour ).TieChoice( XO("Colour:"), mColour, + S.Optional( bHasColour ).TieChoice( XO("Color:"), mColour, Msgids( kColourStrings, nColours ) ); S.Optional( bHasT0 ).TieNumericTextBox( XO("Start:"), mT0 ); } diff --git a/src/commands/SetTrackInfoCommand.cpp b/src/commands/SetTrackInfoCommand.cpp index fd83c57eb..3f2b2b973 100644 --- a/src/commands/SetTrackInfoCommand.cpp +++ b/src/commands/SetTrackInfoCommand.cpp @@ -316,7 +316,7 @@ void SetTrackVisualsCommand::PopulateOrExchange(ShuttleGui & S) { S.SetStretchyCol( 2 ); S.Optional( bHasHeight ).TieNumericTextBox( XO("Height:"), mHeight ); - S.Optional( bHasColour ).TieChoice( XO("Colour:"), mColour, + S.Optional( bHasColour ).TieChoice( XO("Color:"), mColour, Msgids( kColourStrings, nColours ) ); S.Optional( bHasDisplayType ).TieChoice( XO("Display:"), mDisplayType, Msgids( kDisplayTypeStrings, nDisplayTypes ) ); diff --git a/src/effects/Equalization.cpp b/src/effects/Equalization.cpp index f877d417a..834e1f545 100644 --- a/src/effects/Equalization.cpp +++ b/src/effects/Equalization.cpp @@ -320,7 +320,7 @@ wxString EffectEqualization::ManualPage() if( mOptions == kEqOptionGraphic ) return wxT("Graphic EQ"); if( mOptions == kEqOptionCurve ) - return wxT("Filter Curve"); + return wxT("Filter Curve EQ"); return wxT("Equalization"); } @@ -507,7 +507,7 @@ bool EffectEqualization::ValidateUI() Effect::MessageBox( XO("To use this filter curve in a macro, please choose a new name for it.\nChoose the 'Save/Manage Curves...' button and rename the 'unnamed' curve, then use that one."), wxOK | wxCENTRE, - XO("Filter Curve needs a different name") ); + XO("Filter Curve EQ needs a different name") ); return false; } diff --git a/src/effects/Equalization.h b/src/effects/Equalization.h index 677454ea1..d8f9273df 100644 --- a/src/effects/Equalization.h +++ b/src/effects/Equalization.h @@ -27,7 +27,7 @@ ComponentInterfaceSymbol{ XO("Equalization") } #define GRAPHIC_EQ_PLUGIN_SYMBOL \ ComponentInterfaceSymbol{ wxT("Graphic EQ"), XO("Graphic EQ") } #define FILTER_CURVE_PLUGIN_SYMBOL \ -ComponentInterfaceSymbol{ wxT("Filter Curve"), XO("Filter Curve") } +ComponentInterfaceSymbol{ wxT("Filter Curve EQ"), XO("Filter Curve EQ") } // Flags to specialise the UI const int kEqOptionGraphic =1; diff --git a/src/prefs/TracksPrefs.cpp b/src/prefs/TracksPrefs.cpp index 0df951828..ae373cc05 100644 --- a/src/prefs/TracksPrefs.cpp +++ b/src/prefs/TracksPrefs.cpp @@ -270,7 +270,7 @@ void TracksPrefs::PopulateOrExchange(ShuttleGui & S) S.TieCheckBox(XO("Auto-&fit track height"), {wxT("/GUI/TracksFitVerticallyZoomed"), false}); - S.TieCheckBox(XO("Sho&w audio track name as overlay"), + S.TieCheckBox(XO("Sho&w track name as overlay"), {wxT("/GUI/ShowTrackNameInWaveform"), false}); #ifdef EXPERIMENTAL_HALF_WAVE diff --git a/src/toolbars/ToolsToolBar.cpp b/src/toolbars/ToolsToolBar.cpp index a674e8d6b..54a1ef746 100644 --- a/src/toolbars/ToolsToolBar.cpp +++ b/src/toolbars/ToolsToolBar.cpp @@ -149,7 +149,7 @@ void ToolsToolBar::RegenerateTooltips() { slideTool, wxT("TimeShiftTool"), XO("Time Shift Tool") }, { zoomTool, wxT("ZoomTool"), XO("Zoom Tool") }, { drawTool, wxT("DrawTool"), XO("Draw Tool") }, - { multiTool, wxT("MultiTool"), XO("Multi Tool") }, + { multiTool, wxT("MultiTool"), XO("Multi-Tool") }, }; for (const auto &entry : table) { @@ -203,7 +203,7 @@ void ToolsToolBar::Populate() mTool[ drawTool ] = MakeTool( this, bmpDraw, drawTool, XO("Draw Tool") ); mTool[ zoomTool ] = MakeTool( this, bmpZoom, zoomTool, XO("Zoom Tool") ); mTool[ slideTool ] = MakeTool( this, bmpTimeShift, slideTool, XO("Slide Tool") ); - mTool[ multiTool ] = MakeTool( this, bmpMulti, multiTool, XO("Multi Tool") ); + mTool[ multiTool ] = MakeTool( this, bmpMulti, multiTool, XO("Multi-Tool") ); mTool[mCurrentTool]->PushDown(); diff --git a/src/tracks/labeltrack/ui/LabelTrackView.cpp b/src/tracks/labeltrack/ui/LabelTrackView.cpp index ef1c206be..bfd242f89 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")); - menu.Append(OnCopySelectedTextID, _("&Copy")); + 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...")); + menu.Append(OnEditSelectedLabelID, _("&Edit label...")); menu.Enable(OnCutSelectedTextID, IsTextSelected( project )); menu.Enable(OnCopySelectedTextID, IsTextSelected( project )); diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp b/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp index 8e5b62e62..71d6b0498 100644 --- a/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp +++ b/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp @@ -720,7 +720,7 @@ BEGIN_POPUP_MENU(WaveTrackMenuTable) POPUP_MENU_SEPARATOR() - POPUP_MENU_CHECK_ITEM(OnMultiViewID, XO("&Multi View"), OnMultiView) + POPUP_MENU_CHECK_ITEM(OnMultiViewID, XO("&Multi-view"), OnMultiView) if ( view.GetMultiView() ) { POPUP_MENU_CHECK_ITEM(OnWaveformID, XO("Wa&veform"), OnSetDisplay)