diff --git a/locale/POTFILES.in b/locale/POTFILES.in
index ee840ea45..8951600c2 100644
--- a/locale/POTFILES.in
+++ b/locale/POTFILES.in
@@ -14,6 +14,8 @@ lib-src/FileDialog/mac/FileDialogPrivate.h
 lib-src/FileDialog/mac/FileDialogPrivate.mm
 lib-src/FileDialog/win/FileDialogPrivate.cpp
 lib-src/FileDialog/win/FileDialogPrivate.h
+lib-src/lib-widget-extra/NonGuiThread.cpp
+lib-src/lib-widget-extra/NonGuiThread.h
 lib-src/mod-null/ModNullCallback.cpp
 lib-src/mod-null/ModNullCallback.h
 lib-src/mod-nyq-bench/NyqBench.cpp
@@ -21,692 +23,690 @@ lib-src/mod-nyq-bench/NyqBench.h
 lib-src/mod-script-pipe/PipeServer.cpp
 lib-src/mod-script-pipe/ScripterCallback.cpp
 lib-src/mod-script-pipe/ScripterCallback.h
-lib-src/lib-widget-extra/NonGuiThread.cpp
-lib-src/lib-widget-extra/NonGuiThread.h
-src/AboutDialog.cpp
 src/AColor.cpp
-src/AudacityApp.cpp
-src/AudacityException.cpp
-src/AudacityHeaders.cpp
-src/AudacityLogger.cpp
-src/AudioIO.cpp
-src/AutoRecovery.cpp
-src/BatchCommandDialog.cpp
-src/BatchCommands.cpp
-src/BatchProcessDialog.cpp
-src/Benchmark.cpp
-src/BlockFile.cpp
-src/CrossFade.cpp
-src/Dependencies.cpp
-src/DeviceChange.cpp
-src/DeviceManager.cpp
-src/Diags.cpp
-src/DirManager.cpp
-src/Dither.cpp
-src/Envelope.cpp
-src/FFmpeg.cpp
-src/FFT.cpp
-src/FileException.cpp
-src/FileFormats.cpp
-src/FileIO.cpp
-src/FileNames.cpp
-src/FreqWindow.cpp
-src/HelpText.cpp
-src/HistoryWindow.cpp
-src/ImageManipulation.cpp
-src/InconsistencyException.cpp
-src/Internat.cpp
-src/InterpolateAudio.cpp
-src/LabelDialog.cpp
-src/LabelTrack.cpp
-src/LangChoice.cpp
-src/Languages.cpp
-src/Legacy.cpp
-src/LoadModules.cpp
-src/Lyrics.cpp
-src/LyricsWindow.cpp
-src/Matrix.cpp
-src/Menus.cpp
-src/MenusMac.cpp
-src/Mix.cpp
-src/MixerBoard.cpp
-src/ModuleManager.cpp
-src/NoteTrack.cpp
-src/PitchName.cpp
-src/PlatformCompatibility.cpp
-src/PluginManager.cpp
-src/Prefs.cpp
-src/Printing.cpp
-src/Profiler.cpp
-src/Project.cpp
-src/RealFFTf.cpp
-src/RealFFTf48x.cpp
-src/Resample.cpp
-src/RingBuffer.cpp
-src/SampleFormat.cpp
-src/Screenshot.cpp
-src/SelectedRegion.cpp
-src/SelectionState.cpp
-src/Sequence.cpp
-src/Shuttle.cpp
-src/ShuttleGui.cpp
-src/ShuttlePrefs.cpp
-src/Snap.cpp
-src/SoundActivatedRecord.cpp
-src/Spectrum.cpp
-src/SplashDialog.cpp
-src/SseMathFuncs.cpp
-src/Tags.cpp
-src/Theme.cpp
-src/TimeDialog.cpp
-src/TimerRecordDialog.cpp
-src/TimeTrack.cpp
-src/Track.cpp
-src/TrackArtist.cpp
-src/TrackPanel.cpp
-src/TrackPanelAx.cpp
-src/TrackPanelResizeHandle.cpp
-src/TrackPanelResizerCell.cpp
-src/UIHandle.cpp
-src/UndoManager.cpp
-src/UserException.cpp
-src/ViewInfo.cpp
-src/VoiceKey.cpp
-src/WaveClip.cpp
-src/WaveTrack.cpp
-src/WrappedType.cpp
-src/AboutDialog.h
 src/AColor.h
+src/AboutDialog.cpp
+src/AboutDialog.h
 src/AllThemeResources.h
 src/Audacity.h
+src/AudacityApp.cpp
 src/AudacityApp.h
+src/AudacityException.cpp
 src/AudacityException.h
+src/AudacityHeaders.cpp
 src/AudacityHeaders.h
+src/AudacityLogger.cpp
 src/AudacityLogger.h
+src/AudioIO.cpp
 src/AudioIO.h
 src/AudioIOListener.h
+src/AutoRecovery.cpp
 src/AutoRecovery.h
+src/BatchCommandDialog.cpp
 src/BatchCommandDialog.h
+src/BatchCommands.cpp
 src/BatchCommands.h
+src/BatchProcessDialog.cpp
 src/BatchProcessDialog.h
+src/Benchmark.cpp
 src/Benchmark.h
+src/BlockFile.cpp
 src/BlockFile.h
 src/ClassicThemeAsCeeCode.h
-src/configtemplate.h
+src/CrossFade.cpp
 src/CrossFade.h
 src/DarkThemeAsCeeCode.h
+src/Dependencies.cpp
 src/Dependencies.h
+src/DeviceChange.cpp
 src/DeviceChange.h
+src/DeviceManager.cpp
 src/DeviceManager.h
+src/Diags.cpp
 src/Diags.h
+src/DirManager.cpp
 src/DirManager.h
+src/Dither.cpp
 src/Dither.h
+src/Envelope.cpp
 src/Envelope.h
 src/Experimental.h
-src/FFmpeg.h
+src/FFT.cpp
 src/FFT.h
+src/FFmpeg.cpp
+src/FFmpeg.h
+src/FileException.cpp
 src/FileException.h
+src/FileFormats.cpp
 src/FileFormats.h
+src/FileIO.cpp
 src/FileIO.h
+src/FileNames.cpp
 src/FileNames.h
-src/float_cast.h
+src/FreqWindow.cpp
 src/FreqWindow.h
+src/HelpText.cpp
 src/HelpText.h
 src/HiContrastThemeAsCeeCode.h
+src/HistoryWindow.cpp
 src/HistoryWindow.h
 src/HitTestResult.h
+src/ImageManipulation.cpp
 src/ImageManipulation.h
+src/InconsistencyException.cpp
 src/InconsistencyException.h
+src/Internat.cpp
 src/Internat.h
+src/InterpolateAudio.cpp
 src/InterpolateAudio.h
+src/LabelDialog.cpp
 src/LabelDialog.h
+src/LabelTrack.cpp
 src/LabelTrack.h
+src/LangChoice.cpp
 src/LangChoice.h
+src/Languages.cpp
 src/Languages.h
+src/Legacy.cpp
 src/Legacy.h
 src/LightThemeAsCeeCode.h
+src/LoadModules.cpp
 src/LoadModules.h
+src/Lyrics.cpp
 src/Lyrics.h
+src/LyricsWindow.cpp
 src/LyricsWindow.h
 src/MacroMagic.h
+src/Matrix.cpp
 src/Matrix.h
 src/MemoryX.h
+src/Menus.cpp
 src/Menus.h
+src/MenusMac.cpp
+src/Mix.cpp
 src/Mix.h
+src/MixerBoard.cpp
 src/MixerBoard.h
+src/ModuleManager.cpp
 src/ModuleManager.h
+src/NoteTrack.cpp
 src/NoteTrack.h
 src/NumberScale.h
+src/PitchName.cpp
 src/PitchName.h
+src/PlatformCompatibility.cpp
 src/PlatformCompatibility.h
+src/PluginManager.cpp
 src/PluginManager.h
+src/Prefs.cpp
 src/Prefs.h
+src/Printing.cpp
 src/Printing.h
+src/Profiler.cpp
 src/Profiler.h
+src/Project.cpp
 src/Project.h
+src/RealFFTf.cpp
 src/RealFFTf.h
+src/RealFFTf48x.cpp
 src/RealFFTf48x.h
 src/RefreshCode.h
+src/Resample.cpp
 src/Resample.h
 src/RevisionIdent.h
+src/RingBuffer.cpp
 src/RingBuffer.h
+src/SampleFormat.cpp
 src/SampleFormat.h
+src/Screenshot.cpp
 src/Screenshot.h
+src/SelectedRegion.cpp
 src/SelectedRegion.h
+src/SelectionState.cpp
 src/SelectionState.h
+src/Sequence.cpp
 src/Sequence.h
+src/Shuttle.cpp
 src/Shuttle.h
+src/ShuttleGui.cpp
 src/ShuttleGui.h
+src/ShuttlePrefs.cpp
 src/ShuttlePrefs.h
+src/Snap.cpp
 src/Snap.h
+src/SoundActivatedRecord.cpp
 src/SoundActivatedRecord.h
+src/Spectrum.cpp
 src/Spectrum.h
+src/SplashDialog.cpp
 src/SplashDialog.h
+src/SseMathFuncs.cpp
 src/SseMathFuncs.h
+src/Tags.cpp
 src/Tags.h
+src/Theme.cpp
 src/Theme.h
 src/ThemeAsCeeCode.h
+src/TimeDialog.cpp
 src/TimeDialog.h
-src/TimerRecordDialog.h
+src/TimeTrack.cpp
 src/TimeTrack.h
+src/TimerRecordDialog.cpp
+src/TimerRecordDialog.h
+src/Track.cpp
 src/Track.h
+src/TrackArtist.cpp
 src/TrackArtist.h
+src/TrackPanel.cpp
 src/TrackPanel.h
+src/TrackPanelAx.cpp
 src/TrackPanelAx.h
 src/TrackPanelCell.h
 src/TrackPanelCellIterator.h
 src/TrackPanelDrawingContext.h
 src/TrackPanelListener.h
 src/TrackPanelMouseEvent.h
+src/TrackPanelResizeHandle.cpp
 src/TrackPanelResizeHandle.h
+src/TrackPanelResizerCell.cpp
 src/TrackPanelResizerCell.h
 src/TranslatableStringArray.h
+src/UIHandle.cpp
 src/UIHandle.h
+src/UndoManager.cpp
 src/UndoManager.h
+src/UserException.cpp
 src/UserException.h
+src/ViewInfo.cpp
 src/ViewInfo.h
+src/VoiceKey.cpp
 src/VoiceKey.h
+src/WaveClip.cpp
 src/WaveClip.h
+src/WaveTrack.cpp
 src/WaveTrack.h
 src/WaveTrackLocation.h
+src/WrappedType.cpp
 src/WrappedType.h
-src/wxFileNameWrapper.h
 src/blockfile/LegacyAliasBlockFile.cpp
-src/blockfile/LegacyBlockFile.cpp
-src/blockfile/NotYetAvailableException.cpp
-src/blockfile/ODDecodeBlockFile.cpp
-src/blockfile/ODPCMAliasBlockFile.cpp
-src/blockfile/PCMAliasBlockFile.cpp
-src/blockfile/SilentBlockFile.cpp
-src/blockfile/SimpleBlockFile.cpp
 src/blockfile/LegacyAliasBlockFile.h
+src/blockfile/LegacyBlockFile.cpp
 src/blockfile/LegacyBlockFile.h
+src/blockfile/NotYetAvailableException.cpp
 src/blockfile/NotYetAvailableException.h
+src/blockfile/ODDecodeBlockFile.cpp
 src/blockfile/ODDecodeBlockFile.h
+src/blockfile/ODPCMAliasBlockFile.cpp
 src/blockfile/ODPCMAliasBlockFile.h
+src/blockfile/PCMAliasBlockFile.cpp
 src/blockfile/PCMAliasBlockFile.h
+src/blockfile/SilentBlockFile.cpp
 src/blockfile/SilentBlockFile.h
+src/blockfile/SimpleBlockFile.cpp
 src/blockfile/SimpleBlockFile.h
 src/commands/AppCommandEvent.cpp
-src/commands/AutomationCommands.cpp
-src/commands/BatchEvalCommand.cpp
-src/commands/Command.cpp
-src/commands/CommandBuilder.cpp
-src/commands/CommandDirectory.cpp
-src/commands/CommandHandler.cpp
-src/commands/CommandManager.cpp
-src/commands/CommandSignature.cpp
-src/commands/CommandType.cpp
-src/commands/CompareAudioCommand.cpp
-src/commands/ExecMenuCommand.cpp
-src/commands/GetProjectInfoCommand.cpp
-src/commands/GetTrackInfoCommand.cpp
-src/commands/HelpCommand.cpp
-src/commands/ImportExportCommands.cpp
-src/commands/Keyboard.cpp
-src/commands/MessageCommand.cpp
-src/commands/OpenSaveCommands.cpp
-src/commands/PreferenceCommands.cpp
-src/commands/ResponseQueue.cpp
-src/commands/ScreenshotCommand.cpp
-src/commands/ScriptCommandRelay.cpp
-src/commands/SelectCommand.cpp
-src/commands/SetProjectInfoCommand.cpp
-src/commands/SetTrackInfoCommand.cpp
 src/commands/AppCommandEvent.h
+src/commands/AutomationCommands.cpp
 src/commands/AutomationCommands.h
+src/commands/BatchEvalCommand.cpp
 src/commands/BatchEvalCommand.h
+src/commands/Command.cpp
 src/commands/Command.h
+src/commands/CommandBuilder.cpp
 src/commands/CommandBuilder.h
+src/commands/CommandDirectory.cpp
 src/commands/CommandDirectory.h
 src/commands/CommandFlag.h
 src/commands/CommandFunctors.h
+src/commands/CommandHandler.cpp
 src/commands/CommandHandler.h
+src/commands/CommandManager.cpp
 src/commands/CommandManager.h
 src/commands/CommandMisc.h
+src/commands/CommandSignature.cpp
 src/commands/CommandSignature.h
 src/commands/CommandTargets.h
+src/commands/CommandType.cpp
 src/commands/CommandType.h
+src/commands/CompareAudioCommand.cpp
 src/commands/CompareAudioCommand.h
+src/commands/ExecMenuCommand.cpp
 src/commands/ExecMenuCommand.h
+src/commands/GetProjectInfoCommand.cpp
 src/commands/GetProjectInfoCommand.h
+src/commands/GetTrackInfoCommand.cpp
 src/commands/GetTrackInfoCommand.h
+src/commands/HelpCommand.cpp
 src/commands/HelpCommand.h
+src/commands/ImportExportCommands.cpp
 src/commands/ImportExportCommands.h
+src/commands/Keyboard.cpp
 src/commands/Keyboard.h
+src/commands/MessageCommand.cpp
 src/commands/MessageCommand.h
+src/commands/OpenSaveCommands.cpp
 src/commands/OpenSaveCommands.h
+src/commands/PreferenceCommands.cpp
 src/commands/PreferenceCommands.h
+src/commands/ResponseQueue.cpp
 src/commands/ResponseQueue.h
+src/commands/ScreenshotCommand.cpp
 src/commands/ScreenshotCommand.h
+src/commands/ScriptCommandRelay.cpp
 src/commands/ScriptCommandRelay.h
+src/commands/SelectCommand.cpp
 src/commands/SelectCommand.h
+src/commands/SetProjectInfoCommand.cpp
 src/commands/SetProjectInfoCommand.h
+src/commands/SetTrackInfoCommand.cpp
 src/commands/SetTrackInfoCommand.h
 src/commands/Validators.h
+src/configtemplate.h
 src/effects/Amplify.cpp
-src/effects/AutoDuck.cpp
-src/effects/BassTreble.cpp
-src/effects/Biquad.cpp
-src/effects/ChangePitch.cpp
-src/effects/ChangeSpeed.cpp
-src/effects/ChangeTempo.cpp
-src/effects/ClickRemoval.cpp
-src/effects/Compressor.cpp
-src/effects/Contrast.cpp
-src/effects/Distortion.cpp
-src/effects/DtmfGen.cpp
-src/effects/Echo.cpp
-src/effects/Effect.cpp
-src/effects/EffectManager.cpp
-src/effects/EffectRack.cpp
-src/effects/Equalization.cpp
-src/effects/Equalization48x.cpp
-src/effects/Fade.cpp
-src/effects/FindClipping.cpp
-src/effects/Generator.cpp
-src/effects/Invert.cpp
-src/effects/Leveller.cpp
-src/effects/LoadEffects.cpp
-src/effects/Noise.cpp
-src/effects/NoiseReduction.cpp
-src/effects/NoiseRemoval.cpp
-src/effects/Normalize.cpp
-src/effects/Paulstretch.cpp
-src/effects/Phaser.cpp
-src/effects/Repair.cpp
-src/effects/Repeat.cpp
-src/effects/Reverb.cpp
-src/effects/Reverse.cpp
-src/effects/SBSMSEffect.cpp
-src/effects/ScienFilter.cpp
-src/effects/ScoreAlignDialog.cpp
-src/effects/Silence.cpp
-src/effects/SimpleMono.cpp
-src/effects/SoundTouchEffect.cpp
-src/effects/StereoToMono.cpp
-src/effects/TimeScale.cpp
-src/effects/TimeWarper.cpp
-src/effects/ToneGen.cpp
-src/effects/TruncSilence.cpp
-src/effects/TwoPassSimpleMono.cpp
-src/effects/Wahwah.cpp
 src/effects/Amplify.h
+src/effects/AutoDuck.cpp
 src/effects/AutoDuck.h
+src/effects/BassTreble.cpp
 src/effects/BassTreble.h
+src/effects/Biquad.cpp
 src/effects/Biquad.h
+src/effects/ChangePitch.cpp
 src/effects/ChangePitch.h
+src/effects/ChangeSpeed.cpp
 src/effects/ChangeSpeed.h
+src/effects/ChangeTempo.cpp
 src/effects/ChangeTempo.h
+src/effects/ClickRemoval.cpp
 src/effects/ClickRemoval.h
+src/effects/Compressor.cpp
 src/effects/Compressor.h
+src/effects/Contrast.cpp
 src/effects/Contrast.h
+src/effects/Distortion.cpp
 src/effects/Distortion.h
+src/effects/DtmfGen.cpp
 src/effects/DtmfGen.h
+src/effects/Echo.cpp
 src/effects/Echo.h
+src/effects/Effect.cpp
 src/effects/Effect.h
+src/effects/EffectManager.cpp
 src/effects/EffectManager.h
+src/effects/EffectRack.cpp
 src/effects/EffectRack.h
+src/effects/Equalization.cpp
 src/effects/Equalization.h
+src/effects/Equalization48x.cpp
 src/effects/Equalization48x.h
+src/effects/Fade.cpp
 src/effects/Fade.h
+src/effects/FindClipping.cpp
 src/effects/FindClipping.h
+src/effects/Generator.cpp
 src/effects/Generator.h
+src/effects/Invert.cpp
 src/effects/Invert.h
+src/effects/Leveller.cpp
 src/effects/Leveller.h
+src/effects/LoadEffects.cpp
 src/effects/LoadEffects.h
+src/effects/Noise.cpp
 src/effects/Noise.h
+src/effects/NoiseReduction.cpp
 src/effects/NoiseReduction.h
+src/effects/NoiseRemoval.cpp
 src/effects/NoiseRemoval.h
+src/effects/Normalize.cpp
 src/effects/Normalize.h
+src/effects/Paulstretch.cpp
 src/effects/Paulstretch.h
+src/effects/Phaser.cpp
 src/effects/Phaser.h
+src/effects/Repair.cpp
 src/effects/Repair.h
+src/effects/Repeat.cpp
 src/effects/Repeat.h
+src/effects/Reverb.cpp
 src/effects/Reverb.h
 src/effects/Reverb_libSoX.h
+src/effects/Reverse.cpp
 src/effects/Reverse.h
+src/effects/SBSMSEffect.cpp
 src/effects/SBSMSEffect.h
+src/effects/ScienFilter.cpp
 src/effects/ScienFilter.h
+src/effects/ScoreAlignDialog.cpp
 src/effects/ScoreAlignDialog.h
+src/effects/Silence.cpp
 src/effects/Silence.h
+src/effects/SimpleMono.cpp
 src/effects/SimpleMono.h
+src/effects/SoundTouchEffect.cpp
 src/effects/SoundTouchEffect.h
+src/effects/StereoToMono.cpp
 src/effects/StereoToMono.h
+src/effects/TimeScale.cpp
 src/effects/TimeScale.h
+src/effects/TimeWarper.cpp
 src/effects/TimeWarper.h
+src/effects/ToneGen.cpp
 src/effects/ToneGen.h
+src/effects/TruncSilence.cpp
 src/effects/TruncSilence.h
+src/effects/TwoPassSimpleMono.cpp
 src/effects/TwoPassSimpleMono.h
-src/effects/Wahwah.h
-src/effects/audiounits/AudioUnitEffect.cpp
-src/effects/audiounits/AUControl.h
-src/effects/audiounits/AudioUnitEffect.h
-src/effects/audiounits/AUControl.mm
-src/effects/ladspa/LadspaEffect.cpp
-src/effects/ladspa/ladspa.h
-src/effects/ladspa/LadspaEffect.h
-src/effects/lv2/LoadLV2.cpp
-src/effects/lv2/LV2Effect.cpp
-src/effects/lv2/LoadLV2.h
-src/effects/lv2/LV2Effect.h
-src/effects/lv2/win_gtk.h
-src/effects/nyquist/LoadNyquist.cpp
-src/effects/nyquist/Nyquist.cpp
-src/effects/nyquist/LoadNyquist.h
-src/effects/nyquist/Nyquist.h
-src/effects/vamp/LoadVamp.cpp
-src/effects/vamp/VampEffect.cpp
-src/effects/vamp/LoadVamp.h
-src/effects/vamp/VampEffect.h
-src/effects/VST/VSTControlGTK.cpp
-src/effects/VST/VSTControlMSW.cpp
-src/effects/VST/VSTEffect.cpp
-src/effects/VST/aeffectx.h
 src/effects/VST/VSTControl.h
+src/effects/VST/VSTControlGTK.cpp
 src/effects/VST/VSTControlGTK.h
+src/effects/VST/VSTControlMSW.cpp
 src/effects/VST/VSTControlMSW.h
 src/effects/VST/VSTControlOSX.h
-src/effects/VST/VSTEffect.h
 src/effects/VST/VSTControlOSX.mm
+src/effects/VST/VSTEffect.cpp
+src/effects/VST/VSTEffect.h
+src/effects/VST/aeffectx.h
+src/effects/Wahwah.cpp
+src/effects/Wahwah.h
+src/effects/audiounits/AUControl.h
+src/effects/audiounits/AUControl.mm
+src/effects/audiounits/AudioUnitEffect.cpp
+src/effects/audiounits/AudioUnitEffect.h
+src/effects/ladspa/LadspaEffect.cpp
+src/effects/ladspa/LadspaEffect.h
+src/effects/ladspa/ladspa.h
+src/effects/lv2/LV2Effect.cpp
+src/effects/lv2/LV2Effect.h
+src/effects/lv2/LoadLV2.cpp
+src/effects/lv2/LoadLV2.h
+src/effects/lv2/win_gtk.h
+src/effects/nyquist/LoadNyquist.cpp
+src/effects/nyquist/LoadNyquist.h
+src/effects/nyquist/Nyquist.cpp
+src/effects/nyquist/Nyquist.h
+src/effects/vamp/LoadVamp.cpp
+src/effects/vamp/LoadVamp.h
+src/effects/vamp/VampEffect.cpp
+src/effects/vamp/VampEffect.h
 src/export/Export.cpp
-src/export/ExportCL.cpp
-src/export/ExportFFmpeg.cpp
-src/export/ExportFFmpegDialogs.cpp
-src/export/ExportFLAC.cpp
-src/export/ExportMP2.cpp
-src/export/ExportMP3.cpp
-src/export/ExportMultiple.cpp
-src/export/ExportOGG.cpp
-src/export/ExportPCM.cpp
 src/export/Export.h
+src/export/ExportCL.cpp
 src/export/ExportCL.h
+src/export/ExportFFmpeg.cpp
 src/export/ExportFFmpeg.h
+src/export/ExportFFmpegDialogs.cpp
 src/export/ExportFFmpegDialogs.h
+src/export/ExportFLAC.cpp
 src/export/ExportFLAC.h
+src/export/ExportMP2.cpp
 src/export/ExportMP2.h
+src/export/ExportMP3.cpp
 src/export/ExportMP3.h
+src/export/ExportMultiple.cpp
 src/export/ExportMultiple.h
+src/export/ExportOGG.cpp
 src/export/ExportOGG.h
+src/export/ExportPCM.cpp
 src/export/ExportPCM.h
+src/float_cast.h
 src/import/FormatClassifier.cpp
-src/import/Import.cpp
-src/import/ImportFFmpeg.cpp
-src/import/ImportFLAC.cpp
-src/import/ImportGStreamer.cpp
-src/import/ImportLOF.cpp
-src/import/ImportMIDI.cpp
-src/import/ImportMP3.cpp
-src/import/ImportOGG.cpp
-src/import/ImportPCM.cpp
-src/import/ImportQT.cpp
-src/import/ImportRaw.cpp
-src/import/MultiFormatReader.cpp
-src/import/RawAudioGuess.cpp
-src/import/SpecPowerMeter.cpp
 src/import/FormatClassifier.h
+src/import/Import.cpp
 src/import/Import.h
+src/import/ImportFFmpeg.cpp
 src/import/ImportFFmpeg.h
+src/import/ImportFLAC.cpp
 src/import/ImportFLAC.h
 src/import/ImportForwards.h
+src/import/ImportGStreamer.cpp
 src/import/ImportGStreamer.h
+src/import/ImportLOF.cpp
 src/import/ImportLOF.h
+src/import/ImportMIDI.cpp
 src/import/ImportMIDI.h
+src/import/ImportMP3.cpp
 src/import/ImportMP3.h
+src/import/ImportOGG.cpp
 src/import/ImportOGG.h
+src/import/ImportPCM.cpp
 src/import/ImportPCM.h
 src/import/ImportPlugin.h
+src/import/ImportQT.cpp
 src/import/ImportQT.h
+src/import/ImportRaw.cpp
 src/import/ImportRaw.h
+src/import/MultiFormatReader.cpp
 src/import/MultiFormatReader.h
+src/import/RawAudioGuess.cpp
 src/import/RawAudioGuess.h
+src/import/SpecPowerMeter.cpp
 src/import/SpecPowerMeter.h
 src/ondemand/ODComputeSummaryTask.cpp
-src/ondemand/ODDecodeFFmpegTask.cpp
-src/ondemand/ODDecodeFlacTask.cpp
-src/ondemand/ODDecodeTask.cpp
-src/ondemand/ODManager.cpp
-src/ondemand/ODTask.cpp
-src/ondemand/ODTaskThread.cpp
-src/ondemand/ODWaveTrackTaskQueue.cpp
 src/ondemand/ODComputeSummaryTask.h
+src/ondemand/ODDecodeFFmpegTask.cpp
 src/ondemand/ODDecodeFFmpegTask.h
+src/ondemand/ODDecodeFlacTask.cpp
 src/ondemand/ODDecodeFlacTask.h
+src/ondemand/ODDecodeTask.cpp
 src/ondemand/ODDecodeTask.h
+src/ondemand/ODManager.cpp
 src/ondemand/ODManager.h
+src/ondemand/ODTask.cpp
 src/ondemand/ODTask.h
+src/ondemand/ODTaskThread.cpp
 src/ondemand/ODTaskThread.h
+src/ondemand/ODWaveTrackTaskQueue.cpp
 src/ondemand/ODWaveTrackTaskQueue.h
 src/prefs/BatchPrefs.cpp
-src/prefs/DevicePrefs.cpp
-src/prefs/DirectoriesPrefs.cpp
-src/prefs/EffectsPrefs.cpp
-src/prefs/ExtImportPrefs.cpp
-src/prefs/GUIPrefs.cpp
-src/prefs/ImportExportPrefs.cpp
-src/prefs/KeyConfigPrefs.cpp
-src/prefs/LibraryPrefs.cpp
-src/prefs/MidiIOPrefs.cpp
-src/prefs/ModulePrefs.cpp
-src/prefs/MousePrefs.cpp
-src/prefs/PlaybackPrefs.cpp
-src/prefs/PrefsDialog.cpp
-src/prefs/ProjectsPrefs.cpp
-src/prefs/QualityPrefs.cpp
-src/prefs/RecordingPrefs.cpp
-src/prefs/SpectrogramSettings.cpp
-src/prefs/SpectrumPrefs.cpp
-src/prefs/ThemePrefs.cpp
-src/prefs/TracksBehaviorsPrefs.cpp
-src/prefs/TracksPrefs.cpp
-src/prefs/WarningsPrefs.cpp
-src/prefs/WaveformPrefs.cpp
-src/prefs/WaveformSettings.cpp
 src/prefs/BatchPrefs.h
+src/prefs/DevicePrefs.cpp
 src/prefs/DevicePrefs.h
+src/prefs/DirectoriesPrefs.cpp
 src/prefs/DirectoriesPrefs.h
+src/prefs/EffectsPrefs.cpp
 src/prefs/EffectsPrefs.h
+src/prefs/ExtImportPrefs.cpp
 src/prefs/ExtImportPrefs.h
+src/prefs/GUIPrefs.cpp
 src/prefs/GUIPrefs.h
 src/prefs/GUISettings.h
+src/prefs/ImportExportPrefs.cpp
 src/prefs/ImportExportPrefs.h
+src/prefs/KeyConfigPrefs.cpp
 src/prefs/KeyConfigPrefs.h
+src/prefs/LibraryPrefs.cpp
 src/prefs/LibraryPrefs.h
+src/prefs/MidiIOPrefs.cpp
 src/prefs/MidiIOPrefs.h
+src/prefs/ModulePrefs.cpp
 src/prefs/ModulePrefs.h
+src/prefs/MousePrefs.cpp
 src/prefs/MousePrefs.h
+src/prefs/PlaybackPrefs.cpp
 src/prefs/PlaybackPrefs.h
+src/prefs/PrefsDialog.cpp
 src/prefs/PrefsDialog.h
 src/prefs/PrefsPanel.h
+src/prefs/ProjectsPrefs.cpp
 src/prefs/ProjectsPrefs.h
+src/prefs/QualityPrefs.cpp
 src/prefs/QualityPrefs.h
+src/prefs/RecordingPrefs.cpp
 src/prefs/RecordingPrefs.h
+src/prefs/SpectrogramSettings.cpp
 src/prefs/SpectrogramSettings.h
+src/prefs/SpectrumPrefs.cpp
 src/prefs/SpectrumPrefs.h
+src/prefs/ThemePrefs.cpp
 src/prefs/ThemePrefs.h
+src/prefs/TracksBehaviorsPrefs.cpp
 src/prefs/TracksBehaviorsPrefs.h
+src/prefs/TracksPrefs.cpp
 src/prefs/TracksPrefs.h
+src/prefs/WarningsPrefs.cpp
 src/prefs/WarningsPrefs.h
+src/prefs/WaveformPrefs.cpp
 src/prefs/WaveformPrefs.h
+src/prefs/WaveformSettings.cpp
 src/prefs/WaveformSettings.h
 src/toolbars/ControlToolBar.cpp
-src/toolbars/DeviceToolBar.cpp
-src/toolbars/EditToolBar.cpp
-src/toolbars/MeterToolBar.cpp
-src/toolbars/MixerToolBar.cpp
-src/toolbars/ScrubbingToolBar.cpp
-src/toolbars/SelectionBar.cpp
-src/toolbars/SpectralSelectionBar.cpp
-src/toolbars/ToolBar.cpp
-src/toolbars/ToolDock.cpp
-src/toolbars/ToolManager.cpp
-src/toolbars/ToolsToolBar.cpp
-src/toolbars/TranscriptionToolBar.cpp
 src/toolbars/ControlToolBar.h
+src/toolbars/DeviceToolBar.cpp
 src/toolbars/DeviceToolBar.h
+src/toolbars/EditToolBar.cpp
 src/toolbars/EditToolBar.h
+src/toolbars/MeterToolBar.cpp
 src/toolbars/MeterToolBar.h
+src/toolbars/MixerToolBar.cpp
 src/toolbars/MixerToolBar.h
+src/toolbars/ScrubbingToolBar.cpp
 src/toolbars/ScrubbingToolBar.h
+src/toolbars/SelectionBar.cpp
 src/toolbars/SelectionBar.h
 src/toolbars/SelectionBarListener.h
+src/toolbars/SpectralSelectionBar.cpp
 src/toolbars/SpectralSelectionBar.h
 src/toolbars/SpectralSelectionBarListener.h
+src/toolbars/ToolBar.cpp
 src/toolbars/ToolBar.h
+src/toolbars/ToolDock.cpp
 src/toolbars/ToolDock.h
+src/toolbars/ToolManager.cpp
 src/toolbars/ToolManager.h
+src/toolbars/ToolsToolBar.cpp
 src/toolbars/ToolsToolBar.h
+src/toolbars/TranscriptionToolBar.cpp
 src/toolbars/TranscriptionToolBar.h
 src/tracks/labeltrack/ui/LabelDefaultClickHandle.cpp
+src/tracks/labeltrack/ui/LabelDefaultClickHandle.h
 src/tracks/labeltrack/ui/LabelGlyphHandle.cpp
+src/tracks/labeltrack/ui/LabelGlyphHandle.h
 src/tracks/labeltrack/ui/LabelTextHandle.cpp
+src/tracks/labeltrack/ui/LabelTextHandle.h
 src/tracks/labeltrack/ui/LabelTrackControls.cpp
+src/tracks/labeltrack/ui/LabelTrackControls.h
 src/tracks/labeltrack/ui/LabelTrackUI.cpp
 src/tracks/labeltrack/ui/LabelTrackVRulerControls.cpp
-src/tracks/labeltrack/ui/LabelDefaultClickHandle.h
-src/tracks/labeltrack/ui/LabelGlyphHandle.h
-src/tracks/labeltrack/ui/LabelTextHandle.h
-src/tracks/labeltrack/ui/LabelTrackControls.h
 src/tracks/labeltrack/ui/LabelTrackVRulerControls.h
 src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.cpp
+src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.h
 src/tracks/playabletrack/notetrack/ui/NoteTrackControls.cpp
+src/tracks/playabletrack/notetrack/ui/NoteTrackControls.h
 src/tracks/playabletrack/notetrack/ui/NoteTrackSliderHandles.cpp
+src/tracks/playabletrack/notetrack/ui/NoteTrackSliderHandles.h
 src/tracks/playabletrack/notetrack/ui/NoteTrackUI.cpp
 src/tracks/playabletrack/notetrack/ui/NoteTrackVRulerControls.cpp
-src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp
-src/tracks/playabletrack/notetrack/ui/StretchHandle.cpp
-src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.h
-src/tracks/playabletrack/notetrack/ui/NoteTrackControls.h
-src/tracks/playabletrack/notetrack/ui/NoteTrackSliderHandles.h
 src/tracks/playabletrack/notetrack/ui/NoteTrackVRulerControls.h
+src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp
 src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.h
+src/tracks/playabletrack/notetrack/ui/StretchHandle.cpp
 src/tracks/playabletrack/notetrack/ui/StretchHandle.h
 src/tracks/playabletrack/ui/PlayableTrackButtonHandles.cpp
 src/tracks/playabletrack/ui/PlayableTrackButtonHandles.h
 src/tracks/playabletrack/wavetrack/ui/CutlineHandle.cpp
+src/tracks/playabletrack/wavetrack/ui/CutlineHandle.h
 src/tracks/playabletrack/wavetrack/ui/SampleHandle.cpp
+src/tracks/playabletrack/wavetrack/ui/SampleHandle.h
 src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp
+src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.h
 src/tracks/playabletrack/wavetrack/ui/WaveTrackSliderHandles.cpp
+src/tracks/playabletrack/wavetrack/ui/WaveTrackSliderHandles.h
 src/tracks/playabletrack/wavetrack/ui/WaveTrackUI.cpp
 src/tracks/playabletrack/wavetrack/ui/WaveTrackVRulerControls.cpp
-src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.cpp
-src/tracks/playabletrack/wavetrack/ui/CutlineHandle.h
-src/tracks/playabletrack/wavetrack/ui/SampleHandle.h
-src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.h
-src/tracks/playabletrack/wavetrack/ui/WaveTrackSliderHandles.h
 src/tracks/playabletrack/wavetrack/ui/WaveTrackVRulerControls.h
+src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.cpp
 src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.h
 src/tracks/timetrack/ui/TimeTrackControls.cpp
+src/tracks/timetrack/ui/TimeTrackControls.h
 src/tracks/timetrack/ui/TimeTrackUI.cpp
 src/tracks/timetrack/ui/TimeTrackVRulerControls.cpp
-src/tracks/timetrack/ui/TimeTrackControls.h
 src/tracks/timetrack/ui/TimeTrackVRulerControls.h
 src/tracks/ui/BackgroundCell.cpp
+src/tracks/ui/BackgroundCell.h
 src/tracks/ui/ButtonHandle.cpp
+src/tracks/ui/ButtonHandle.h
 src/tracks/ui/CommonTrackPanelCell.cpp
+src/tracks/ui/CommonTrackPanelCell.h
 src/tracks/ui/EditCursorOverlay.cpp
+src/tracks/ui/EditCursorOverlay.h
 src/tracks/ui/EnvelopeHandle.cpp
+src/tracks/ui/EnvelopeHandle.h
 src/tracks/ui/PlayIndicatorOverlay.cpp
+src/tracks/ui/PlayIndicatorOverlay.h
 src/tracks/ui/Scrubbing.cpp
+src/tracks/ui/Scrubbing.h
 src/tracks/ui/SelectHandle.cpp
+src/tracks/ui/SelectHandle.h
 src/tracks/ui/SliderHandle.cpp
+src/tracks/ui/SliderHandle.h
 src/tracks/ui/TimeShiftHandle.cpp
+src/tracks/ui/TimeShiftHandle.h
 src/tracks/ui/TrackButtonHandles.cpp
+src/tracks/ui/TrackButtonHandles.h
 src/tracks/ui/TrackControls.cpp
+src/tracks/ui/TrackControls.h
 src/tracks/ui/TrackSelectHandle.cpp
+src/tracks/ui/TrackSelectHandle.h
 src/tracks/ui/TrackUI.cpp
 src/tracks/ui/TrackVRulerControls.cpp
-src/tracks/ui/ZoomHandle.cpp
-src/tracks/ui/BackgroundCell.h
-src/tracks/ui/ButtonHandle.h
-src/tracks/ui/CommonTrackPanelCell.h
-src/tracks/ui/EditCursorOverlay.h
-src/tracks/ui/EnvelopeHandle.h
-src/tracks/ui/PlayIndicatorOverlay.h
-src/tracks/ui/Scrubbing.h
-src/tracks/ui/SelectHandle.h
-src/tracks/ui/SliderHandle.h
-src/tracks/ui/TimeShiftHandle.h
-src/tracks/ui/TrackButtonHandles.h
-src/tracks/ui/TrackControls.h
-src/tracks/ui/TrackSelectHandle.h
 src/tracks/ui/TrackVRulerControls.h
+src/tracks/ui/ZoomHandle.cpp
 src/tracks/ui/ZoomHandle.h
 src/widgets/AButton.cpp
-src/widgets/ASlider.cpp
-src/widgets/AttachableScrollBar.cpp
-src/widgets/BackedPanel.cpp
-src/widgets/ErrorDialog.cpp
-src/widgets/ExpandingToolBar.cpp
-src/widgets/FileHistory.cpp
-src/widgets/Grabber.cpp
-src/widgets/Grid.cpp
-src/widgets/HelpSystem.cpp
-src/widgets/HtmlWindow.cpp
-src/widgets/ImageRoll.cpp
-src/widgets/KeyView.cpp
-src/widgets/LinkingHtmlWindow.cpp
-src/widgets/Meter.cpp
-src/widgets/MultiDialog.cpp
-src/widgets/NumericTextCtrl.cpp
-src/widgets/numformatter.cpp
-src/widgets/Overlay.cpp
-src/widgets/OverlayPanel.cpp
-src/widgets/PopupMenuTable.cpp
-src/widgets/ProgressDialog.cpp
-src/widgets/Ruler.cpp
-src/widgets/valnum.cpp
-src/widgets/Warning.cpp
-src/widgets/wxPanelWrapper.cpp
 src/widgets/AButton.h
+src/widgets/ASlider.cpp
 src/widgets/ASlider.h
+src/widgets/AttachableScrollBar.cpp
 src/widgets/AttachableScrollBar.h
+src/widgets/BackedPanel.cpp
 src/widgets/BackedPanel.h
+src/widgets/ErrorDialog.cpp
 src/widgets/ErrorDialog.h
+src/widgets/ExpandingToolBar.cpp
 src/widgets/ExpandingToolBar.h
+src/widgets/FileHistory.cpp
 src/widgets/FileHistory.h
+src/widgets/Grabber.cpp
 src/widgets/Grabber.h
+src/widgets/Grid.cpp
 src/widgets/Grid.h
+src/widgets/HelpSystem.cpp
 src/widgets/HelpSystem.h
+src/widgets/HtmlWindow.cpp
 src/widgets/HtmlWindow.h
+src/widgets/ImageRoll.cpp
 src/widgets/ImageRoll.h
+src/widgets/KeyView.cpp
 src/widgets/KeyView.h
+src/widgets/LinkingHtmlWindow.cpp
 src/widgets/LinkingHtmlWindow.h
+src/widgets/Meter.cpp
 src/widgets/Meter.h
+src/widgets/MultiDialog.cpp
 src/widgets/MultiDialog.h
+src/widgets/NumericTextCtrl.cpp
 src/widgets/NumericTextCtrl.h
-src/widgets/numformatter.h
+src/widgets/Overlay.cpp
 src/widgets/Overlay.h
+src/widgets/OverlayPanel.cpp
 src/widgets/OverlayPanel.h
+src/widgets/PopupMenuTable.cpp
 src/widgets/PopupMenuTable.h
+src/widgets/ProgressDialog.cpp
 src/widgets/ProgressDialog.h
+src/widgets/Ruler.cpp
 src/widgets/Ruler.h
-src/widgets/valnum.h
+src/widgets/Warning.cpp
 src/widgets/Warning.h
+src/widgets/numformatter.cpp
+src/widgets/numformatter.h
+src/widgets/valnum.cpp
+src/widgets/valnum.h
+src/widgets/wxPanelWrapper.cpp
 src/widgets/wxPanelWrapper.h
+src/wxFileNameWrapper.h
 src/xml/XMLFileReader.cpp
-src/xml/XMLTagHandler.cpp
-src/xml/XMLWriter.cpp
 src/xml/XMLFileReader.h
+src/xml/XMLTagHandler.cpp
 src/xml/XMLTagHandler.h
+src/xml/XMLWriter.cpp
 src/xml/XMLWriter.h