Merge pull request #1701 from luzpaz/source-typos

Source typos

build/wix/Localization/README-Translations.md

@@ -7,7 +7,7 @@ Adding strings and Updating source pot
 ======================================
 
 * Add strings to mixxx_en-us.wxl
-* Update tranlation source .pot file
+* Update translation source .pot file
 `build/wix/Localization$ /path/to/wxl2pot.py -l Language mixxx_en-us.wxl po/mixxx.pot`
 * push new strings to transifex
 ```

build/wix/WiSubStg.vbs

@@ -29,7 +29,7 @@ If (argCount = 0) Then
 		vbNewLine & " 2nd argument is the path to a transform or database to import" &_
 		vbNewLine & " If the 2nd argument is missing, substorages will be listed" &_
 		vbNewLine & " 3rd argument is optional, the name used for the substorage" &_
-		vbNewLine & " If the 3rd arugment is missing, the file name is used" &_
+		vbNewLine & " If the 3rd argument is missing, the file name is used" &_
 		vbNewLine & " To remove a substorage, use /D or -D as the 2nd argument" &_
 		vbNewLine & " followed by the name of the substorage to remove" &_
 		vbNewLine &_

lib/fidlib/fidrf_jit.h

@@ -241,7 +241,7 @@ static unsigned long int do_hash(unsigned char *, unsigned long int, unsigned lo
 //
 
 static char *r_buf;	// Buffer address
-static char *r_end;	// Curent end of buffer
+static char *r_end;	// Current end of buffer
 static char *r_cp;	// Current write-position
 static char *r_lab;	// Current loop-back label, or 0
 static int r_loop;	// Loop count

plugins/soundsourcem4a/soundsourcem4a.cpp

@@ -42,7 +42,7 @@ const MP4SampleId kSampleBlockIdMin = 1;
 // https://developer.apple.com/library/ios/technotes/tn2258/_index.html
 // "It must also be assumed that without an explicit value, the playback
 // system will trim 2112 samples from the AAC decoder output when starting
-// playback from any point in the bistream."
+// playback from any point in the bitstream."
 const SINT kNumberOfPrefetchFrames = 2112;
 
 // The TrackId is a 1-based index of the tracks in an MP4 file

plugins/soundsourcemediafoundation/soundsourcemediafoundation.cpp

@@ -25,7 +25,7 @@ constexpr SINT kLeftoverSize = 4096; // in CSAMPLE's, this seems to be the size
 // https://developer.apple.com/library/ios/technotes/tn2258/_index.html
 // "It must also be assumed that without an explicit value, the playback
 // system will trim 2112 samples from the AAC decoder output when starting
-// playback from any point in the bistream."
+// playback from any point in the bitstream."
 constexpr SINT kNumberOfPrefetchFrames = 2112;
 
 // Only read the first audio stream

res/controllers/Behringer-CMD-MM1-scripts.js

@@ -396,7 +396,7 @@ CALLBACK.registerCallbacks = function() {
   //VuMeters
   engine.makeConnection("[Master]", "VuMeterL", CALLBACK.vuMeterL);
   engine.makeConnection("[Master]", "VuMeterR", CALLBACK.vuMeterR);
-  //engine.makeConnection("[Master]","maximize_library",CALLBACK.middleButton);// doesnt work, help?
+  //engine.makeConnection("[Master]","maximize_library",CALLBACK.middleButton);// doesn't work, help?
   //cueButtons (pfl)
   for (var i = 1; i <= 4; i++) {
     engine.makeConnection("[Channel" + i + "]", "pfl", CALLBACK.cue);

res/controllers/EKS-Otus.js

@@ -649,7 +649,7 @@ EksOtus.headphones = function (field) {
     }
 }
 
-// Control effects or somethig with XY pad
+// Control effects or something with XY pad
 EksOtus.xypad = function(field) {
     var controller = EksOtus.controller;
     if (controller.activeDeck==undefined)

res/controllers/Numark Omni Control.midi.xml

@@ -2,7 +2,7 @@
     <info>
         <name>Numark Omni Control</name>
         <author>Baxter</author>
-        <description>Addaptation from the work of Smashuu and David Gnedt</description>
+        <description>Adaptation from the work of Smashuu and David Gnedt</description>
     </info>
     <controller id="Numark OMNI CONTROL MIDI">
         <scriptfiles>

res/controllers/Numark-Mixtrack-2-scripts.js

@@ -18,7 +18,7 @@
 // - After activating brake, Play button is not working
 
 // 10/26/2016 - Changed by Shaun O'Neill
-//              Updated the flanger effects rack. Removed depricated XML controls and added new JS functions to modify the FX knobs
+//              Updated the flanger effects rack. Removed deprecated XML controls and added new JS functions to modify the FX knobs
 // 10/10/2017 - Changed by Shaun O'Neill
 //              Added super button control via shift + fx1 knob.
 //              Low frequency filter now doubles as filter effect control via shift key.

res/controllers/Numark-Mixtrack-3-scripts.js

@@ -402,7 +402,7 @@ LED.prototype.flashOnceOff = function(relight) {
 //                      press the button a second time (Value will be
 //                      equal to DOWN), or the Long press is asserted
 //                      (value = DOWN because you are still holding down
-//                      the button or value=UP because you have realeased
+//                      the button or value=UP because you have released
 //                      the button only once before it becomes a long press).
 // doublePressTimeOut : delay in ms above which a second press on the
 //                      button will not be considered as a potential double
@@ -518,7 +518,7 @@ LongShortBtn.prototype.buttonUp = function() {
 //                      press the button a second time (Value will be
 //                      equal to DOWN), or the Long press is asserted
 //                      (value = DOWN because you are still holding down
-//                      the button or value=UP because you have realeased
+//                      the button or value=UP because you have released
 //                      the button only once before it becomes a long press).
 // longPressThreshold : delay in ms above which a first press on the
 //                      button will be considered as a Long press (default = 500ms).

res/controllers/Reloop-Beatpad-scripts.js

@@ -497,7 +497,7 @@ LED.prototype.flashOnceOff = function(relight) {
 //                      press the button a second time (Value will be
 //                      equal to DOWN), or the Long press is asserted
 //                      (value = DOWN because you are still holding down
-//                      the button or value=UP because you have realeased
+//                      the button or value=UP because you have released
 //                      the button only once before it becomes a long press).
 // DoublePressTimeOut : delay in ms above which a second press on the
 //                      button will not be considered as a potential double
@@ -629,7 +629,7 @@ LongShortBtn.prototype.ButtonUp = function() {
 //                      press the button a second time (Value will be
 //                      equal to DOWN), or the Long press is asserted
 //                      (value = DOWN because you are still holding down
-//                      the button or value=UP because you have realeased
+//                      the button or value=UP because you have released
 //                      the button only once before it becomes a long press).
 // LongPressThreshold : delay in ms above which a first press on the
 //                      button will be considered as a Long press (default = 500ms).

res/controllers/Vestax-VCI-400-scripts.js

@@ -143,7 +143,7 @@ VestaxVCI400.Button.prototype.handleEvent = function(value) {
    this.handler(value);
 };
 
-//Calling this method will illuminate the button depening on if value is true or false
+//Calling this method will illuminate the button depending on if value is true or false
 VestaxVCI400.Button.prototype.illuminate = function(value) {
    if(value ==true){
         midi.sendShortMsg(this.statusByte, this.midiNo, VestaxVCI400.ButtonLedState.on);

res/controllers/novation-launchpad/README.MD

@@ -258,7 +258,7 @@ Feedback
 
 #### KEY SHIFTS
 
-Buttons for temporarily chaning pitch, bound left to right, bottom to top. While pressed, they modify the key of
+Buttons for temporarily changing pitch, bound left to right, bottom to top. While pressed, they modify the key of
 the track. When pressing multiple, the one later pressed *steals* the modification.
 
 #### LOAD/EJECT

res/skins/Shade/style.qss

@@ -117,7 +117,7 @@ QTreeView {
   QTableView:focus { /*
     New Library navigation COs only work if TreeView or TableView have focus.
     Clicking on buttons, sliders and visuals elsewhere removes focus from Library.
-    In conjuction with [Library],MoveFocusBackward/..Forward, this helps a lot. */
+    In conjunction with [Library],MoveFocusBackward/..Forward, this helps a lot. */
     border-color: #ff6600;
   }
 

res/skins/Tango (64 Samplers)/skin.xml

@@ -1,5 +1,5 @@
 <!--
-    Tango * a flat nightime skin for mixxx
+    Tango * a flat nighttime skin for mixxx
 
     This skin is supposed to be an extension for your controller, in a way that
     almost all duplicate controls can be removed from screen.
@@ -27,7 +27,7 @@
     <title>Tango</title>
     <author>ronso0</author>
     <version>2.1.0.01</version>
-    <description>A controller-focused nightime skin. Almost all controls can be hidden with skin menu.</description>
+    <description>A controller-focused nighttime skin. Almost all controls can be hidden with skin menu.</description>
     <language>en</language>
     <license>Creative Commons Attribution, Share-Alike 3.0 Unported</license>
 

res/skins/Tango (64 Samplers)/skin_settings.xml

@@ -48,7 +48,7 @@ Description:
               in order to let them grow reasonably on big screens, as well as to
               allow good-looking compression of items on small screens.
               <SizePolicy> is very hard to handle in many places here due to
-              translucent covers and submenus, defining button sizes explicitely helps.
+              translucent covers and submenus, defining button sizes explicitly helps.
 
               Each categroy has a padding: top 2px, bottom 2px
               For every button we need to provide space (13-17px):

res/skins/Tango/fx_flow_focus_separator.xml

@@ -13,7 +13,7 @@ Variables:
   widthRight    : distance between arrow and right border
   FxRack_FxUnit :
   FxTop         : Effect slot above separator
-  FxBottom      : Effect slot belwo seperator
+  FxBottom      : Effect slot below separator
 -->
 <Template>
   <WidgetGroup>

res/skins/Tango/sampler.xml

@@ -245,7 +245,7 @@ Variables:
         <Size>1me,20f</Size>
         <Children>
 
-          <WidgetGroup><!-- Gain knob, expanding to be centerd below Play/Cover -->
+          <WidgetGroup><!-- Gain knob, expanding to be centered below Play/Cover -->
             <ObjectName>AlignHCenter</ObjectName>
             <Layout>horizontal</Layout>
             <MinimumSize>20,20</MinimumSize>

res/skins/Tango/size_detector_stars.xml

@@ -2,7 +2,7 @@
 Description:
   Size-aware container that decides whether Star Rating fits in between
   HotCues and deck controls, to avoid squeezed deck controls and on the
-  other hand let HotCue buttons auto-shrink only if necessesary.
+  other hand let HotCue buttons auto-shrink only if necessary.
   It contains spacers for 4/8 HotCues, each deck control button i.e. separate
   Cue, keylock, quantize etc.
 

res/skins/Tango/skin.xml

@@ -27,7 +27,7 @@
     <title>Tango</title>
     <author>ronso0</author>
     <version>2.1.0.01</version>
-    <description>A controller-focused nightime skin. Almost all controls can be hidden with skin menu.</description>
+    <description>A controller-focused nighttime skin. Almost all controls can be hidden with skin menu.</description>
     <language>en</language>
     <license>Creative Commons Attribution, Share-Alike 3.0 Unported</license>
 

res/skins/Tango/style.qss

@@ -604,7 +604,7 @@ WWidgetGroup {
       image: url(skin:/buttons/btn_vinyl_right_hover.svg) no-repeat top center;
     }
   /* When passthrough is active but Vinyl Controls are hidden,
-    yellow background indicates passthrough, similiar to how
+    yellow background indicates passthrough, similar to how
     the FX expand toggle does */
   #VinylTogglerLeftPassthrough[displayValue="0"] {
     background: #ff8f00;
@@ -1545,7 +1545,7 @@ decks, samplers, mic, aux, fx */
       background-color: #202020;
       selection-background-color: #0f0f0f;
       /* On Linux, this is not applied but font color from WEffectSelector
-      is inherited. On Windows, it must be defined here explicitely: */
+      is inherited. On Windows, it must be defined here explicitly: */
       color: #ccc;
       border: 1px solid #333;
       border-radius: 2px;
@@ -2090,7 +2090,7 @@ QTreeView {
   QTableView:focus { /*
     New Library navigation COs only work if TreeView or TableView have focus.
     Clicking on buttons, sliders and visuals elsewhere removes focus from Library.
-    In conjuction with [Library],MoveFocusBackward/..Forward, some highlight
+    In conjunction with [Library],MoveFocusBackward/..Forward, some highlight
     helps a lot. */
     border-color: #ff6600;
   }

src/analyzer/analyzerwaveform.h

@@ -147,7 +147,7 @@ class AnalyzerWaveform : public Analyzer {
     void finalize(TrackPointer tio) override;
 
   private:
-    void storeCurentStridePower();
+    void storeCurrentStridePower();
     void resetCurrentStride();
 
     void createFilters(int sampleRate);

src/control/controlbehavior.cpp

@@ -125,15 +125,15 @@ double ControlLogPotmeterBehavior::valueToParameter(double dValue) {
     } else if (dValue < m_dMinValue) {
         dValue = m_dMinValue;
     }
-    double linPrameter = (dValue - m_dMinValue) / m_dValueRange;
-    double dbParamter = ratio2db(linPrameter + m_minOffset * (1 - linPrameter));
-    return 1 - (dbParamter / m_minDB);
+    double linParameter = (dValue - m_dMinValue) / m_dValueRange;
+    double dbParameter = ratio2db(linParameter + m_minOffset * (1 - linParameter));
+    return 1 - (dbParameter / m_minDB);
 }
 
 double ControlLogPotmeterBehavior::parameterToValue(double dParam) {
-    double dbParamter = (1 - dParam) * m_minDB;
-    double linPrameter = (db2ratio(dbParamter) - m_minOffset) / (1 - m_minOffset);
-    return m_dMinValue + (linPrameter * m_dValueRange);
+    double dbParameter = (1 - dParam) * m_minDB;
+    double linParameter = (db2ratio(dbParameter) - m_minOffset) / (1 - m_minOffset);
+    return m_dMinValue + (linParameter * m_dValueRange);
 }
 
 ControlLogInvPotmeterBehavior::ControlLogInvPotmeterBehavior(

src/effects/effectchainmanager.h

@@ -61,7 +61,7 @@ class EffectChainManager : public QObject {
     bool saveEffectChains();
     void loadEffectChains();
 
-    // Reloads all effect to the slots to update parameter assignements
+    // Reloads all effect to the slots to update parameter assignments
     void refeshAllRacks();
 
     static const int kNumStandardEffectChains = 4;

src/effects/effectsmanager.h

@@ -97,7 +97,7 @@ class EffectsManager : public QObject {
     // Temporary, but for setting up all the default EffectChains and EffectRacks
     void setup();
 
-    // Reloads all effect to the slots to update parameter assignements
+    // Reloads all effect to the slots to update parameter assignments
     void refeshAllRacks();
 
     // Write an EffectsRequest to the EngineEffectsManager. EffectsManager takes

src/encoder/encodermp3.cpp

@@ -28,7 +28,7 @@
 // of values for the slider.
 // The threshold of bitrate (CBR/ABR) at which the encoder
 // with switch to mono encoding
-const int EncoderMp3::MONO_BITRATE_TRESHOLD = 100;
+const int EncoderMp3::MONO_BITRATE_THRESHOLD = 100;
 // The threshold of quality (VBR) at which the encoder
 // with switch to mono encoding. Values from 0 to 6 encode at 44Khz
 const int EncoderMp3::MONO_VBR_THRESHOLD = 8;
@@ -269,7 +269,7 @@ void EncoderMp3::setEncoderSettings(const EncoderSettings& settings)
     m_encoding_mode = (modeoption==0) ? vbr_off : (modeoption==1) ? vbr_abr : vbr_default;
 
     if (m_encoding_mode == vbr_off) {
-        if (m_bitrate > MONO_BITRATE_TRESHOLD ) {
+        if (m_bitrate > MONO_BITRATE_THRESHOLD ) {
             m_stereo_mode = JOINT_STEREO;
         } else {
             m_stereo_mode = MONO;

src/encoder/encodermp3.h

@@ -19,7 +19,7 @@ class EncoderCallback;
 
 class EncoderMp3 : public Encoder {
   public:
-    static const int MONO_BITRATE_TRESHOLD;
+    static const int MONO_BITRATE_THRESHOLD;
     static const int MONO_VBR_THRESHOLD;
     static const int MONO_VBR_OFFSET;
 

src/encoder/encodervorbis.cpp

@@ -31,7 +31,7 @@ A lot of stuff has been stolen from:
 // of values for the slider.
 // The threshold of bitrate at which the encoder
 // with switch to mono encoding
-const int EncoderVorbis::MONO_BITRATE_TRESHOLD = 70;
+const int EncoderVorbis::MONO_BITRATE_THRESHOLD = 70;
 
 
 EncoderVorbis::EncoderVorbis(EncoderCallback* pCallback)
@@ -65,7 +65,7 @@ void EncoderVorbis::setEncoderSettings(const EncoderSettings& settings)
         case EncoderSettings::ChannelMode::STEREO: m_channels = 2; break;
         case EncoderSettings::ChannelMode::AUTOMATIC: // fallthrough
         default: 
-            if (m_bitrate > MONO_BITRATE_TRESHOLD ) {
+            if (m_bitrate > MONO_BITRATE_THRESHOLD ) {
                 m_channels = 2;
             }
             else {

src/encoder/encodervorbis.h

@@ -21,7 +21,7 @@ class EncoderCallback;
 
 class EncoderVorbis : public Encoder {
   public:
-    static const int MONO_BITRATE_TRESHOLD;
+    static const int MONO_BITRATE_THRESHOLD;
 
     EncoderVorbis(EncoderCallback* pCallback=nullptr);
     virtual ~EncoderVorbis();

src/engine/cachingreader.cpp

@@ -17,7 +17,7 @@ mixxx::Logger kLogger("CachingReader");
 
 // This is the default hint frameCount that is adopted in case of Hint::kFrameCountForward and
 // Hint::kFrameCountBackward count is provided. It matches 23 ms @ 44.1 kHz
-// TODO() Do we suffer chache misses if we use an audio buffer of above 23 ms?
+// TODO() Do we suffer cache misses if we use an audio buffer of above 23 ms?
 const SINT kDefaultHintFrames = 1024;
 
 // currently CachingReaderWorker::kCachingReaderChunkLength is 65536 (0x10000);

src/recording/recordingmanager.cpp

@@ -262,7 +262,7 @@ void RecordingManager::slotBytesRecorded(int bytes)
     if (dfree > MIN_DISK_FREE) {
         m_dfSilence = false;
     } else if (m_dfSilence != true) {
-        // surpress further warnings until the situation has cleared
+        // suppress further warnings until the situation has cleared
         m_dfSilence = true;
         // we run out of diskspace and should warn the user.
         // FIXME(poelzi) temporary display a error message. Replace this with Message Infrastructure when ready