diff --git a/src/prefs/DevicePrefs.cpp b/src/prefs/DevicePrefs.cpp index ae2f44e8f..8136d32c0 100644 --- a/src/prefs/DevicePrefs.cpp +++ b/src/prefs/DevicePrefs.cpp @@ -172,19 +172,19 @@ void DevicePrefs::PopulateOrExchange(ShuttleGui & S) wxTextCtrl *w; // only show the following controls if we use Portaudio v19, because // for Portaudio v18 we always use default buffer sizes - w = S.TieNumericTextBox(_("Audio to &buffer:"), + w = S.TieNumericTextBox(_("&Buffer length:"), wxT("/AudioIO/LatencyDuration"), DEFAULT_LATENCY_DURATION, 9); - S.AddUnits(_("milliseconds (higher = more latency)")); - w->SetName(w->GetName() + wxT(" ") + _("milliseconds (higher = more latency)")); + S.AddUnits(_("milliseconds")); + w->SetName(w->GetName() + wxT(" ") + _("milliseconds")); - w = S.TieNumericTextBox(_("L&atency correction:"), + w = S.TieNumericTextBox(_("Track &shift after record:"), wxT("/AudioIO/LatencyCorrection"), DEFAULT_LATENCY_CORRECTION, 9); - S.AddUnits(_("milliseconds (negative = backwards)")); - w->SetName(w->GetName() + wxT(" ") + _("milliseconds (negative = backwards)")); + S.AddUnits(_("milliseconds")); + w->SetName(w->GetName() + wxT(" ") + _("milliseconds")); } S.EndThreeColumn(); } diff --git a/src/prefs/EffectsPrefs.cpp b/src/prefs/EffectsPrefs.cpp index 7c421cced..c5a6176f9 100644 --- a/src/prefs/EffectsPrefs.cpp +++ b/src/prefs/EffectsPrefs.cpp @@ -116,14 +116,14 @@ void EffectsPrefs::PopulateOrExchange(ShuttleGui & S) prefsgroups.Add(wxT("groupby:publisher")); prefsgroups.Add(wxT("groupby:type")); - wxChoice *c = S.TieChoice(_("Effects in menus are:"), + wxChoice *c = S.TieChoice(_("S&ort or Group:"), wxT("/Effects/GroupBy"), wxT("name"), visualgroups, prefsgroups); c->SetMinSize(c->GetBestSize()); - S.TieNumericTextBox(_("Maximum effects per group (0 to disable):"), + S.TieNumericTextBox(_("&Maximum effects per group (0 to disable):"), wxT("/Effects/MaxPerGroup"), #if defined(__WXGTK__) 15, diff --git a/src/prefs/GUIPrefs.cpp b/src/prefs/GUIPrefs.cpp index f46b66ebe..88a478ff9 100644 --- a/src/prefs/GUIPrefs.cpp +++ b/src/prefs/GUIPrefs.cpp @@ -169,12 +169,12 @@ void GUIPrefs::PopulateOrExchange(ShuttleGui & S) } S.EndStatic(); - S.StartStatic(_("Show / Hide")); + S.StartStatic(_("Show")); { - S.TieCheckBox(_("S&how 'How to Get Help' dialog box at program start up"), + S.TieCheckBox(_("'How to Get &Help' at launch"), wxT("/GUI/ShowSplashScreen"), true); - S.TieCheckBox(_("Show e&xtra menus"), + S.TieCheckBox(_("E&xtra menus"), wxT("/GUI/ShowExtraMenus"), false); #ifdef EXPERIMENTAL_THEME_PREFS @@ -192,7 +192,7 @@ void GUIPrefs::PopulateOrExchange(ShuttleGui & S) S.TieCheckBox(_("&Beep on completion of longer activities"), wxT("/GUI/BeepOnCompletion"), false); - S.TieCheckBox(_("Re&tain labels if selection snaps to a label edge"), + S.TieCheckBox(_("Re&tain labels if selection snaps to a label"), wxT("/GUI/RetainLabels"), false); S.TieCheckBox(_("B&lend system and Audacity theme"), diff --git a/src/prefs/ImportExportPrefs.cpp b/src/prefs/ImportExportPrefs.cpp index 6817573d0..d0ae99048 100644 --- a/src/prefs/ImportExportPrefs.cpp +++ b/src/prefs/ImportExportPrefs.cpp @@ -54,9 +54,9 @@ void ImportExportPrefs::PopulateOrExchange(ShuttleGui & S) { S.StartRadioButtonGroup(wxT("/FileFormats/CopyOrEditUncompressedData"), wxT("copy")); { - S.TieRadioButton(_("&Make a copy of uncompressed audio files before editing (safer)"), + S.TieRadioButton(_("&Copy uncompressed files into the project (safer)"), wxT("copy")); - S.TieRadioButton(_("&Read uncompressed audio files directly from the original (faster)"), + S.TieRadioButton(_("&Read uncompressed files from original location (faster)"), wxT("edit")); } S.EndRadioButtonGroup(); @@ -71,14 +71,14 @@ void ImportExportPrefs::PopulateOrExchange(ShuttleGui & S) { S.StartRadioButtonGroup(wxT("/FileFormats/ExportDownMix"), true); { - S.TieRadioButton(_("&Always mix all tracks down to Stereo or Mono channel(s)"), + S.TieRadioButton(_("&Mix down to Stereo or Mono"), true); - S.TieRadioButton(_("&Use custom mix (for example to export a 5.1 multichannel file)"), + S.TieRadioButton(_("&Use custom mix"), false); } S.EndRadioButtonGroup(); - S.TieCheckBox(_("S&how Metadata Tags editor prior to export step"), + S.TieCheckBox(_("S&how Metadata Tags editor before export"), wxT("/AudioFiles/ShowId3Dialog"), true); // This documentation is unlikely to help somebody who cannot figure it out by discovering the Options button in the dialog. @@ -87,13 +87,13 @@ void ImportExportPrefs::PopulateOrExchange(ShuttleGui & S) } S.EndStatic(); #ifdef USE_MIDI - S.StartStatic(_("When exporting track to an Allegro (.gro) file")); + S.StartStatic(_("Exported Allegro (.gro) files save time as:")); { S.StartRadioButtonGroup(wxT("/FileFormats/AllegroStyle"), true); { - S.TieRadioButton(_("Represent times and durations in &seconds"), + S.TieRadioButton(_("&Seconds"), true); - S.TieRadioButton(_("Represent times and durations in &beats"), + S.TieRadioButton(_("&Beats"), false); } S.EndRadioButtonGroup(); diff --git a/src/prefs/MidiIOPrefs.cpp b/src/prefs/MidiIOPrefs.cpp index 58673ad7b..2455b2575 100644 --- a/src/prefs/MidiIOPrefs.cpp +++ b/src/prefs/MidiIOPrefs.cpp @@ -120,7 +120,7 @@ void MidiIOPrefs::PopulateOrExchange( ShuttleGui & S ) { { S.Id(HostID); /* i18n-hint: (noun) */ - mHost = S.TieChoice(_("Host:"), + mHost = S.TieChoice(_("&Host:"), wxT("/MidiIO/Host"), wxT(""), mHostNames, @@ -138,12 +138,12 @@ void MidiIOPrefs::PopulateOrExchange( ShuttleGui & S ) { S.StartMultiColumn(2); { S.Id(PlayID); - mPlay = S.AddChoice(_("Device:"), + mPlay = S.AddChoice(_("&Device:"), wxEmptyString, &empty); int latency = gPrefs->Read(wxT("/MidiIO/OutputLatency"), DEFAULT_SYNTH_LATENCY); - mLatency = S.TieNumericTextBox(_("MIDI Synthesizer Latency (ms):"), + mLatency = S.TieNumericTextBox(_("MIDI Synth L&atency (ms):"), wxT("/MidiIO/SynthLatency"), latency, 3); } @@ -156,13 +156,13 @@ void MidiIOPrefs::PopulateOrExchange( ShuttleGui & S ) { S.StartMultiColumn(2); { S.Id(RecordID); - mRecord = S.AddChoice(_("Device:"), + mRecord = S.AddChoice(_("De&vice:"), wxEmptyString, &empty); S.Id(ChannelsID); /* - mChannels = S.AddChoice(_("Channels:"), + mChannels = S.AddChoice(_("&Channels:"), wxEmptyString, &empty); */ diff --git a/src/prefs/PlaybackPrefs.cpp b/src/prefs/PlaybackPrefs.cpp index 598bb7d76..c4090d9fb 100644 --- a/src/prefs/PlaybackPrefs.cpp +++ b/src/prefs/PlaybackPrefs.cpp @@ -58,7 +58,7 @@ void PlaybackPrefs::PopulateOrExchange(ShuttleGui & S) { S.StartThreeColumn(); { - w = S.TieNumericTextBox(_("&Length of preview:"), + w = S.TieNumericTextBox(_("&Length:"), wxT("/AudioIO/EffectsPreviewLen"), 6.0, 9); @@ -74,14 +74,14 @@ void PlaybackPrefs::PopulateOrExchange(ShuttleGui & S) { S.StartThreeColumn(); { - w = S.TieNumericTextBox(_("Preview &before cut region:"), + w = S.TieNumericTextBox(_("&Before cut region:"), wxT("/AudioIO/CutPreviewBeforeLen"), 2.0, 9); S.AddUnits(_("seconds")); w->SetName(w->GetName() + wxT(" ") + _("seconds")); - w = S.TieNumericTextBox(_("Preview &after cut region:"), + w = S.TieNumericTextBox(_("&After cut region:"), wxT("/AudioIO/CutPreviewAfterLen"), 1.0, 9); diff --git a/src/prefs/ProjectsPrefs.cpp b/src/prefs/ProjectsPrefs.cpp index 1dc78cae4..7ee396f3d 100644 --- a/src/prefs/ProjectsPrefs.cpp +++ b/src/prefs/ProjectsPrefs.cpp @@ -60,11 +60,11 @@ void ProjectsPrefs::PopulateOrExchange(ShuttleGui & S) { S.StartRadioButtonGroup(wxT("/FileFormats/SaveProjectWithDependencies"), wxT("ask")); { - S.TieRadioButton(_("&Always copy all audio into project (safest)"), + S.TieRadioButton(_("&Copy all audio into project (safest)"), wxT("copy")); S.TieRadioButton(_("Do ¬ copy any audio"), wxT("never")); - S.TieRadioButton(_("As&k user"), + S.TieRadioButton(_("As&k"), wxT("ask")); } S.EndRadioButtonGroup(); diff --git a/src/prefs/RecordingPrefs.cpp b/src/prefs/RecordingPrefs.cpp index 7162ca8e3..ba965dffa 100644 --- a/src/prefs/RecordingPrefs.cpp +++ b/src/prefs/RecordingPrefs.cpp @@ -71,26 +71,26 @@ void RecordingPrefs::PopulateOrExchange(ShuttleGui & S) S.StartStatic(_("Playthrough")); { - S.TieCheckBox(_("Overdub: &Play other tracks while recording new one"), + S.TieCheckBox(_("&Other tracks while recording"), wxT("/AudioIO/Duplex"), true); #if defined(__WXMAC__) - S.TieCheckBox(_("&Hardware Playthrough: Listen to input while recording or monitoring"), + S.TieCheckBox(_("&Hardware Playthrough of input"), wxT("/AudioIO/Playthrough"), false); #endif - S.TieCheckBox(_("&Software Playthrough: Listen to input while recording or monitoring"), + S.TieCheckBox(_("&Software Playthrough of input"), wxT("/AudioIO/SWPlaythrough"), false); #if !defined(__WXMAC__) - S.AddUnits(wxString(wxT(" ")) + _("(uncheck when recording computer playback)")); + //S.AddUnits(wxString(wxT(" ")) + _("(uncheck when recording computer playback)")); #endif } S.EndStatic(); S.StartStatic(_("Sound Activated Recording")); { - S.TieCheckBox(_("Sound Activated &Recording"), + S.TieCheckBox(_("&Enable"), wxT("/AudioIO/SoundActivatedRecord"), false); @@ -99,7 +99,7 @@ void RecordingPrefs::PopulateOrExchange(ShuttleGui & S) S.SetStretchyCol(1); int dBRange = gPrefs->Read(ENV_DB_KEY, ENV_DB_RANGE); - S.TieSlider(_("Sound Activation Le&vel (dB):"), + S.TieSlider(_("Le&vel (dB):"), wxT("/AudioIO/SilenceLevel"), -50, 0, diff --git a/src/prefs/TracksBehaviorsPrefs.cpp b/src/prefs/TracksBehaviorsPrefs.cpp index 293e0e162..20a88d322 100644 --- a/src/prefs/TracksBehaviorsPrefs.cpp +++ b/src/prefs/TracksBehaviorsPrefs.cpp @@ -60,22 +60,22 @@ void TracksBehaviorsPrefs::PopulateOrExchange(ShuttleGui & S) S.StartStatic(_("Behaviors")); { - S.TieCheckBox(_("&Select then act on entire project, if no audio selected"), + S.TieCheckBox(_("A&uto-select audio for editing"), wxT("/GUI/SelectAllOnNone"), true); - /* i18n-hint: cut-lines are a lines indicating where to cut.*/ + /* i18n-hint: Cut-lines are lines that can expand to show the cut audio.*/ S.TieCheckBox(_("Enable cut &lines"), wxT("/GUI/EnableCutLines"), false); - S.TieCheckBox(_("Enable &dragging of left and right selection edges"), + S.TieCheckBox(_("Enable &dragging selection edges"), wxT("/GUI/AdjustSelectionEdges"), true); + S.TieCheckBox(_("Editing a clip can &move other clips"), + wxT("/GUI/EditClipCanMove"), + true); S.TieCheckBox(_("\"Move track focus\" c&ycles repeatedly through tracks"), wxT("/GUI/CircularTrackNavigation"), false); - S.TieCheckBox(_("Editing a clip can &move other clips"), - wxT("/GUI/EditClipCanMove"), - true); S.TieCheckBox(_("&Type to create a label"), wxT("/GUI/TypeToCreateLabel"), true); diff --git a/src/prefs/TracksPrefs.cpp b/src/prefs/TracksPrefs.cpp index bfdfd8cfa..cbdaeb7c3 100644 --- a/src/prefs/TracksPrefs.cpp +++ b/src/prefs/TracksPrefs.cpp @@ -100,10 +100,10 @@ void TracksPrefs::PopulateOrExchange(ShuttleGui & S) S.TieCheckBox(_("&Pinned Recording/Playback head"), PinnedHeadPreferenceKey(), PinnedHeadPreferenceDefault()); - S.TieCheckBox(_("&Update display when Recording/Playback head unpinned"), + S.TieCheckBox(_("A&uto-scroll if head unpinned"), wxT("/GUI/AutoScroll"), true); - S.TieCheckBox(_("Automatically &fit tracks vertically zoomed"), + S.TieCheckBox(_("Auto-&fit track height"), wxT("/GUI/TracksFitVerticallyZoomed"), false); diff --git a/src/prefs/WarningsPrefs.cpp b/src/prefs/WarningsPrefs.cpp index 6a0268652..df5bb1e86 100644 --- a/src/prefs/WarningsPrefs.cpp +++ b/src/prefs/WarningsPrefs.cpp @@ -60,7 +60,7 @@ void WarningsPrefs::PopulateOrExchange(ShuttleGui & S) S.TieCheckBox(_("Saving &empty project"), wxT("/GUI/EmptyCanBeDirty"), true); - S.TieCheckBox(_("&Low disk space at program start up"), + S.TieCheckBox(_("&Low disk space at launch or new project"), wxT("/Warnings/DiskSpaceWarning"), true); S.TieCheckBox(_("Mixing down to &mono during export"),