Update of /cvsroot/audacity/audacity-src/src/prefs
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv6692
Modified Files:
DevicePrefs.cpp DirectoriesPrefs.cpp GUIPrefs.cpp
ImportExportPrefs.cpp LibraryPrefs.cpp PlaybackPrefs.cpp
ProjectsPrefs.cpp QualityPrefs.cpp RecordingPrefs.cpp
SpectrumPrefs.cpp TracksPrefs.cpp
Log Message:
Add mising accelerator keys and remove conflicts with OK and Cancel on Linux
Index: RecordingPrefs.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/prefs/RecordingPrefs.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- RecordingPrefs.cpp 28 Aug 2009 14:44:28 -0000 1.7
+++ RecordingPrefs.cpp 18 Oct 2009 08:02:15 -0000 1.8
@@ -70,7 +70,7 @@
wxT("/AudioIO/Playthrough"),
false);
#endif
- S.TieCheckBox(_("&Software Playthrough: Play new track while recording
or monitoring"),
+ S.TieCheckBox(_("&Software Playthrough: Listen while recording or
monitoring new track"),
wxT("/AudioIO/SWPlaythrough"),
false);
#if !defined(__WXMAC__)
@@ -85,14 +85,14 @@
{
// only show the following controls if we use Portaudio v19, because
// for Portaudio v18 we always use default buffer sizes
- w = S.TieTextBox(_("Audio to buffer:"),
+ w = S.TieTextBox(_("Audio to &buffer:"),
wxT("/AudioIO/LatencyDuration"),
DEFAULT_LATENCY_DURATION,
9);
S.AddUnits(_("milliseconds (higher = more latency)"));
w->SetName(w->GetName() + wxT(" ") + _("milliseconds (higher = more
latency)"));
- w = S.TieTextBox(_("Latency correction:"),
+ w = S.TieTextBox(_("L&atency correction:"),
wxT("/AudioIO/LatencyCorrection"),
DEFAULT_LATENCY_CORRECTION,
9);
@@ -105,7 +105,7 @@
S.StartStatic(_("Sound Activated Recording"));
{
- S.TieCheckBox(_("Sound Activated Recording"),
+ S.TieCheckBox(_("Sound Activated &Recording"),
wxT("/AudioIO/SoundActivatedRecord"),
false);
@@ -114,7 +114,7 @@
S.SetStretchyCol(1);
int dBRange = gPrefs->Read(wxT("/GUI/EnvdBRange"), ENV_DB_RANGE);
- S.TieSlider(_("Sound Activation Level (dB):"),
+ S.TieSlider(_("Sound Activation Le&vel (dB):"),
wxT("/AudioIO/SilenceLevel"),
-50,
0,
Index: TracksPrefs.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/prefs/TracksPrefs.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- TracksPrefs.cpp 15 Oct 2009 20:09:05 -0000 1.4
+++ TracksPrefs.cpp 18 Oct 2009 08:02:15 -0000 1.5
@@ -87,7 +87,7 @@
S.StartMultiColumn(2);
{
- S.TieChoice(_("Default View Mode:"),
+ S.TieChoice(_("Default &View Mode:"),
wxT("/GUI/DefaultViewMode"),
0,
mViewChoices,
@@ -103,7 +103,7 @@
S.TieCheckBox(_("&Select all audio in project, if none selected"),
wxT("/GUI/SelectAllOnNone"),
true);
- S.TieCheckBox(_("Enable cut &lines"),
+ S.TieCheckBox(_("Enable cu&t lines"),
wxT("/GUI/EnableCutLines"),
false);
S.TieCheckBox(_("Enable &dragging of left and right selection edges"),
@@ -112,7 +112,7 @@
S.TieCheckBox(_("\"Move track focus\" c&ycles repeatedly through
tracks"),
wxT("/GUI/CircularTrackNavigation"),
false);
- S.TieCheckBox(_("Editing a &clip can move other clips"),
+ S.TieCheckBox(_("Editing a clip can &move other clips"),
wxT("/GUI/EditClipCanMove"),
true);
@@ -120,7 +120,7 @@
S.StartMultiColumn(2);
{
- S.TieChoice(_("Solo Button:"),
+ S.TieChoice(_("Solo &Button:"),
wxT("/GUI/Solo"),
wxT("Standard"),
mSoloChoices,
Index: DirectoriesPrefs.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/prefs/DirectoriesPrefs.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- DirectoriesPrefs.cpp 4 Apr 2009 18:03:55 -0000 1.42
+++ DirectoriesPrefs.cpp 18 Oct 2009 08:02:15 -0000 1.43
@@ -86,12 +86,12 @@
S.SetStretchyCol(1);
S.Id(TempDirID);
- mTempDir = S.TieTextBox(_("Location:"),
+ mTempDir = S.TieTextBox(_("&Location:"),
wxT("/Directories/TempDir"),
wxT(""),
30);
S.Id(ChooseButtonID);
- S.AddButton(_("Choose..."));
+ S.AddButton(_("C&hoose..."));
S.AddFixedText(_("Free Space:"));
mFreeSpace = S.AddVariableText(wxT(""));
@@ -102,13 +102,13 @@
S.StartStatic(_("Audio cache"));
{
- S.TieCheckBox(_("Play and/or record using RAM (useful for slow drives)"),
+ S.TieCheckBox(_("Play and/or record using &RAM (useful for slow
drives)"),
wxT("/Directories/CacheBlockFiles"),
false);
S.StartTwoColumn();
{
- S.TieTextBox(_("Minimum Free Memory (MB):"),
+ S.TieTextBox(_("Mi&nimum Free Memory (MB):"),
wxT("/Directories/CacheLowMem"),
16,
9);
Index: GUIPrefs.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/prefs/GUIPrefs.cpp,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- GUIPrefs.cpp 27 Jul 2009 15:36:36 -0000 1.83
+++ GUIPrefs.cpp 18 Oct 2009 08:02:15 -0000 1.84
@@ -13,7 +13,7 @@
*******************************************************************//**
\class GUIPrefs
-\brief A PrefsPanel for general GUI prefernces.
+\brief A PrefsPanel for general GUI preferences.
*//*******************************************************************/
@@ -93,10 +93,10 @@
S.StartStatic(_("Display"));
{
- S.TieCheckBox(_("Er&gonomic order of audio I/O buttons"),
+ S.TieCheckBox(_("&Ergonomic order of audio I/O buttons"),
wxT("/GUI/ErgonomicTransportButtons"),
true);
- S.TieCheckBox(_("Show '&How to get Help' message at program start up"),
+ S.TieCheckBox(_("S&how 'How to get Help' message at program start up"),
wxT("/GUI/ShowSplashScreen"),
true);
@@ -104,21 +104,21 @@
S.StartMultiColumn(2);
{
- S.TieChoice(_("Meter/Waveform dB range:"),
+ S.TieChoice(_("Meter/Waveform dB &range:"),
wxT("/GUI/EnvdBRange"),
wxT("60"),
mRangeChoices,
mRangeCodes);
S.SetSizeHints(mRangeChoices);
- S.TieChoice(_("Language:"),
+ S.TieChoice(_("&Language:"),
wxT("/Locale/Language"),
wxT("en"),
mLangNames,
mLangCodes);
S.SetSizeHints(mLangNames);
- S.TieChoice(_("Location of Manual:"),
+ S.TieChoice(_("Location of &Manual:"),
wxT("/GUI/Help"),
wxT("Local"),
mHtmlHelpChoices,
@@ -131,7 +131,7 @@
S.StartStatic(_("Behaviors"));
{
- S.TieCheckBox(_("Cl&osing last window quits Audacity"),
+ S.TieCheckBox(_("Closing last window &quits Audacity"),
wxT("/GUI/QuitOnClose"),
bQuitOnCloseDefault);
S.TieCheckBox(_("&Beep on completion of longer activities"),
@@ -142,7 +142,7 @@
S.StartStatic(_("Modes"));
{
- S.TieCheckBox(_("Cl&eanSpeech Mode (Customized GUI)"),
+ S.TieCheckBox(_("Clea&nSpeech Mode (Customized GUI)"),
wxT("/Batch/CleanSpeechMode"),
false);
#ifdef __WXDEBUG__
Index: SpectrumPrefs.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/prefs/SpectrumPrefs.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- SpectrumPrefs.cpp 9 Jul 2009 02:43:21 -0000 1.32
+++ SpectrumPrefs.cpp 18 Oct 2009 08:02:15 -0000 1.33
@@ -83,14 +83,14 @@
{
S.StartMultiColumn(2);
{
- S.TieChoice(_("Window size") + wxString(wxT(":")),
+ S.TieChoice(_("Window &size") + wxString(wxT(":")),
wxT("/Spectrum/FFTSize"),
256,
mSizeChoices,
mSizeCodes);
S.SetSizeHints(mSizeChoices);
- S.TieChoice(_("Window type") + wxString(wxT(":")),
+ S.TieChoice(_("Window &type") + wxString(wxT(":")),
wxT("/Spectrum/WindowType"),
3,
mTypeChoices,
@@ -131,38 +131,38 @@
S.StartTwoColumn();
{
mMinFreq =
- S.TieTextBox(_("Minimum Frequency (Hz):"),
+ S.TieTextBox(_("Mi&nimum Frequency (Hz):"),
wxT("/Spectrum/MinFreq"),
0,
12);
mMaxFreq =
- S.TieTextBox(_("Maximum Frequency (Hz):"),
+ S.TieTextBox(_("Ma&ximum Frequency (Hz):"),
wxT("/Spectrum/MaxFreq"),
8000,
12);
mGain =
- S.TieTextBox(_("Gain (dB):"),
+ S.TieTextBox(_("&Gain (dB):"),
wxT("/Spectrum/Gain"),
20,
8);
mRange =
- S.TieTextBox(_("Range (dB):"),
+ S.TieTextBox(_("&Range (dB):"),
wxT("/Spectrum/Range"),
80,
8);
mFrequencyGain =
- S.TieTextBox(_("Frequency gain: (dB/dec)"),
+ S.TieTextBox(_("Frequency g&ain (dB/dec):"),
wxT("/Spectrum/FrequencyGain"),
0,
4);
}
S.EndTwoColumn();
- S.TieCheckBox(_("Show the spectrum using &grayscale colors"),
+ S.TieCheckBox(_("S&how the spectrum using grayscale colors"),
wxT("/Spectrum/Grayscale"),
false);
Index: LibraryPrefs.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/prefs/LibraryPrefs.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- LibraryPrefs.cpp 22 May 2009 05:46:00 -0000 1.1
+++ LibraryPrefs.cpp 18 Oct 2009 08:02:15 -0000 1.2
@@ -121,13 +121,13 @@
true,
wxALL | wxALIGN_RIGHT | wxALIGN_CENTRE_VERTICAL);
S.Id(ID_FFMPEG_FIND_BUTTON);
- wxButton *bfnd = S.AddButton(_("&Locate..."),
+ wxButton *bfnd = S.AddButton(_("Loca&te..."),
wxALL | wxALIGN_LEFT |
wxALIGN_CENTRE_VERTICAL);
S.AddVariableText(_("FFmpeg Library:"),
true,
wxALL | wxALIGN_RIGHT | wxALIGN_CENTRE_VERTICAL);
S.Id(ID_FFMPEG_DOWN_BUTTON);
- wxButton *bdwn = S.AddButton(_("&Download"),
+ wxButton *bdwn = S.AddButton(_("&Dow&nload"),
wxALL | wxALIGN_LEFT |
wxALIGN_CENTRE_VERTICAL);
#if !defined(USE_FFMPEG)
bdwn->Enable(FALSE);
Index: ImportExportPrefs.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/prefs/ImportExportPrefs.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ImportExportPrefs.cpp 11 Jun 2009 06:03:16 -0000 1.2
+++ ImportExportPrefs.cpp 18 Oct 2009 08:02:15 -0000 1.3
@@ -71,7 +71,7 @@
{
S.StartRadioButtonGroup(wxT("/FileFormats/ExportDownMix"), true);
{
- S.TieRadioButton(_("A&lways mix all tracks down to Stereo or Mono
channel(s)."),
+ S.TieRadioButton(_("&Always mix all tracks down to Stereo or Mono
channel(s)"),
true);
S.TieRadioButton(_("&Use custom mix (for example to export a 5.1
multichannel file)"),
false);
Index: QualityPrefs.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/prefs/QualityPrefs.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- QualityPrefs.cpp 22 May 2009 05:46:00 -0000 1.33
+++ QualityPrefs.cpp 18 Oct 2009 08:02:15 -0000 1.34
@@ -126,7 +126,7 @@
{
S.StartMultiColumn(2);
{
- S.AddPrompt(_("Default Sample Rate:"));
+ S.AddPrompt(_("Default Sample &Rate:"));
S.StartMultiColumn(2);
{
@@ -151,7 +151,7 @@
}
S.EndHorizontalLay();
- S.TieChoice(_("Default Sample Format:"),
+ S.TieChoice(_("Default Sample &Format:"),
wxT("/SamplingRate/DefaultProjectSampleFormat"),
floatSample,
mSampleFormatNames,
@@ -168,14 +168,14 @@
{
S.SetStretchyCol(2);
- S.TieChoice(_("Sample Rate Converter:"),
+ S.TieChoice(_("Sample Rate Con&verter:"),
Resample::GetFastMethodKey(),
Resample::GetFastMethodDefault(),
mConverterNames,
mConverterLabels),
S.SetSizeHints(mConverterNames);
- S.TieChoice(_("Dither"),
+ S.TieChoice(_("&Dither:"),
wxT("/Quality/DitherAlgorithm"),
Dither::none,
mDitherNames,
@@ -190,14 +190,14 @@
{
S.StartMultiColumn(2);
{
- S.TieChoice(_("Sample Rate Converter:"),
+ S.TieChoice(_("Sample Rate Conver&ter:"),
Resample::GetBestMethodKey(),
Resample::GetBestMethodDefault(),
mConverterNames,
mConverterLabels),
S.SetSizeHints(mConverterNames);
- S.TieChoice(_("Dither"),
+ S.TieChoice(_("Dit&her:"),
wxT("/Quality/HQDitherAlgorithm"),
Dither::shaped,
mDitherNames,
Index: PlaybackPrefs.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/prefs/PlaybackPrefs.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- PlaybackPrefs.cpp 7 Jun 2009 11:14:50 -0000 1.3
+++ PlaybackPrefs.cpp 18 Oct 2009 08:02:15 -0000 1.4
@@ -58,7 +58,7 @@
{
S.StartThreeColumn();
{
- w = S.TieTextBox(_("Length of preview:"),
+ w = S.TieTextBox(_("&Length of preview:"),
wxT("/AudioIO/EffectsPreviewLen"),
3.0,
9);
@@ -73,14 +73,14 @@
{
S.StartThreeColumn();
{
- w = S.TieTextBox(_("Preview before cut region:"),
+ w = S.TieTextBox(_("Preview &before cut region:"),
wxT("/AudioIO/CutPreviewBeforeLen"),
1.0,
9);
S.AddUnits(_("seconds"));
w->SetName(w->GetName() + wxT(" ") + _("seconds"));
- w = S.TieTextBox(_("Preview after cut region:"),
+ w = S.TieTextBox(_("Preview &after cut region:"),
wxT("/AudioIO/CutPreviewAfterLen"),
1.0,
9);
@@ -95,14 +95,14 @@
{
S.StartThreeColumn();
{
- w = S.TieTextBox(_("Short period:"),
+ w = S.TieTextBox(_("&Short period:"),
wxT("/AudioIO/SeekShortPeriod"),
1.0,
9);
S.AddUnits(_("seconds"));
w->SetName(w->GetName() + wxT(" ") + _("seconds"));
- w = S.TieTextBox(_("Long period:"),
+ w = S.TieTextBox(_("Lo&ng period:"),
wxT("/AudioIO/SeekLongPeriod"),
15.0,
9);
Index: ProjectsPrefs.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/prefs/ProjectsPrefs.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ProjectsPrefs.cpp 7 Jun 2009 11:14:50 -0000 1.3
+++ ProjectsPrefs.cpp 18 Oct 2009 08:02:15 -0000 1.4
@@ -60,11 +60,11 @@
{
S.StartRadioButtonGroup(wxT("/FileFormats/SaveProjectWithDependencies"),
wxT("ask"));
{
- S.TieRadioButton(_("Always © all audio into project (safest)"),
+ S.TieRadioButton(_("&Always copy all audio into project (safest)"),
wxT("copy"));
- S.TieRadioButton(_("&Do not copy any audio"),
+ S.TieRadioButton(_("Do ¬ copy any audio"),
wxT("never"));
- S.TieRadioButton(_("&Ask user"),
+ S.TieRadioButton(_("As&k user"),
wxT("ask"));
}
S.EndRadioButtonGroup();
@@ -73,13 +73,13 @@
S.StartStatic(_("Auto save"));
{
- S.TieCheckBox(_("Auto save a copy of the project in a separate folder"),
+ S.TieCheckBox(_("Auto &save a copy of the project in a separate folder"),
wxT("/Directories/AutoSaveEnabled"),
true);
S.StartThreeColumn();
{
- w = S.TieTextBox(_("Auto save interval:"),
+ w = S.TieTextBox(_("Auto save in&terval:"),
wxT("/Directories/AutoSaveMinutes"),
2.0,
9);
Index: DevicePrefs.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/prefs/DevicePrefs.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- DevicePrefs.cpp 12 Sep 2009 10:52:32 -0000 1.7
+++ DevicePrefs.cpp 18 Oct 2009 08:02:15 -0000 1.8
@@ -110,7 +110,7 @@
S.StartMultiColumn(2);
{
S.Id(HostID);
- mHost = S.TieChoice(_("Host") + wxString(wxT(":")),
+ mHost = S.TieChoice(_("&Host") + wxString(wxT(":")),
wxT("/AudioIO/Host"),
wxT(""),
mHostNames,
@@ -129,7 +129,7 @@
S.StartMultiColumn(2);
{
S.Id(PlayID);
- mPlay = S.AddChoice(_("Device") + wxString(wxT(":")),
+ mPlay = S.AddChoice(_("&Device") + wxString(wxT(":")),
wxEmptyString,
&empty);
}
@@ -142,12 +142,12 @@
S.StartMultiColumn(2);
{
S.Id(RecordID);
- mRecord = S.AddChoice(_("Device") + wxString(wxT(":")),
+ mRecord = S.AddChoice(_("De&vice") + wxString(wxT(":")),
wxEmptyString,
&empty);
S.Id(ChannelsID);
- mChannels = S.AddChoice(_("Channels") + wxString(wxT(":")),
+ mChannels = S.AddChoice(_("Cha&nnels") + wxString(wxT(":")),
wxEmptyString,
&empty);
}
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
