Merge pull request #1417 from luzpaz/misc-typos

Typo fixes

.travis.yml

@@ -91,7 +91,7 @@ install:
 
 script:
   # NOTE(sblaisot): 2018-01-02 removing gdb wrapper on linux due to a bug in
-  # return code in order to avoid having a sucessful build when a test fail.
+  # return code in order to avoid having a successful build when a test fail.
   # https://bugs.launchpad.net/mixxx/+bug/1699689
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./mixxx-test ; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then lldb ./mixxx-test --batch -o run -o quit -k 'thread backtrace all' -k quit ; fi

build/appveyor/build_mixxx.bat

@@ -105,7 +105,7 @@ echo Could not find Qt %QT_VERSION% at "%QT_DIR%".
 exit /b 1
 )
 
-REM Everyting prepared. Setup the compiler.
+REM Everything prepared. Setup the compiler.
 if %MACHINE_X86% (
 call "%BUILDTOOLS_PATH%\%BUILDTOOLS_SCRIPT%" %COMPILER_X86%
 ) else (

build/depends.py

@@ -561,7 +561,7 @@ def configure(self, build, conf):
                 "Could not find libtag or its development headers.")
 
         # Karmic seems to have an issue with mp4tag.h where they don't include
-        # the files correctly. Adding this folder ot the include path should fix
+        # the files correctly. Adding this folder to the include path should fix
         # it, though might cause issues. This is safe to remove once we
         # deprecate Karmic support. rryan 2/2011
         build.env.Append(CPPPATH='/usr/include/taglib/')
@@ -599,7 +599,7 @@ class FpClassify(Dependence):
     def enabled(self, build):
         return build.toolchain_is_gnu
 
-    # This is a wrapper arround the fpclassify function that pevents inlining
+    # This is a wrapper around the fpclassify function that prevents inlining
     # It is compiled without optimization and allows to use these function
     # from -ffast-math optimized objects
     def sources(self, build):

build/features.py

@@ -1131,7 +1131,7 @@ def configure(self, build, conf):
                 optimize_level = Optimize.LEVEL_PORTABLE
 
             # Common flags to all optimizations.
-            # -ffast-math will pevent a performance penalty by denormals
+            # -ffast-math will prevent a performance penalty by denormals
             # (floating point values almost Zero are treated as Zero)
             # unfortunately that work only on 64 bit CPUs or with sse2 enabled
 
@@ -1185,7 +1185,7 @@ def configure(self, build, conf):
                 # http://en.chys.info/2010/04/what-exactly-marchnative-means/
                 # Note: requires gcc >= 4.2.0
                 # macros like __SSE2_MATH__ __SSE_MATH__ __SSE2__ __SSE__
-                # are set automaticaly
+                # are set automatically
                 if build.architecture_is_x86 and not build.machine_is_64bit:
                     # For 32 bit builds using gcc < 5.0, the mfpmath=sse is
                     # not set by default (not supported on arm builds)

build/osx/OSConsX.py

@@ -207,7 +207,7 @@ def embed_lib(abs):
 
     def relative(emb):
         "compute the path of the given embedded binary relative to the binary, i.e. @executable_path/../+..."
-        # assume that we start in X.app/Contents/, since we know neccessarily that @executable_path/../ gives us that
+        # assume that we start in X.app/Contents/, since we know necessarily that @executable_path/../ gives us that
         # so then we only need
         base = os.path.abspath(str(installed_bin))
         emb = os.path.abspath(emb) #XXX is abspath really necessary?
@@ -233,7 +233,7 @@ def patch_lib(embedded):
 
 
 
-    #Workarounds for a bug/feature in SCons such that it doesn't neccessarily run the source builders before the target builders (wtf scons??)
+    #Workarounds for a bug/feature in SCons such that it doesn't necessarily run the source builders before the target builders (wtf scons??)
     Execute(Mkdir(contents))
     Execute(Mkdir(MacOS))
     Execute(Mkdir(frameworks))
@@ -250,7 +250,7 @@ def patch_lib(embedded):
         locals[ref] = (path, embed_lib(path))
 
     plugins_l = [] #XXX bad name #list of tuples (source, embed) of plugins to stick under the plugins/ dir
-    for p in env['PLUGINS']: #build any neccessary dirs for plugins (siiiigh)
+    for p in env['PLUGINS']: #build any necessary dirs for plugins (siiiigh)
         embedded_p = os.path.join(str(plugins), os.path.basename(str(p)))
         plugins_l.append(  (str(p), embedded_p)  )
 

build/osx/otool.py

@@ -165,7 +165,7 @@ def embed_dependencies(binary,
 
 		#sometimes the todo list will have redundant items placed on it; in the case that the items are named the same that could be avoided by relying on set() semantics
 		#however there are many equivalent ways to name files in Unix, so we have to check here after getting abspath
-		#proof that this makes the algorithm terminate: we record the absolute path to the file; even if there are multiple abspaths to one file (as can happen with symlinks sometimes) each differnt path means a different symlink file, of which there are only a finite number (since it's a finite disk)
+		#proof that this makes the algorithm terminate: we record the absolute path to the file; even if there are multiple abspaths to one file (as can happen with symlinks sometimes) each different path means a different symlink file, of which there are only a finite number (since it's a finite disk)
 		if p not in done and not any(p.startswith(P) for P in SYSTEM):
 			done.append(p)
 			orig.append(e)

build/unused/create_mixxx_dmg.sh

@@ -133,7 +133,7 @@ strip *.dylib #Strip the imageformat plugins
 cd ..
 cd iconengines
 
-for lib in libqsvg.dylib;  #Yeah, theres a libqsvg.dylib iconengine and a libqsvg.dylib imageformat (and they're different)...
+for lib in libqsvg.dylib;  #Yeah, there's a libqsvg.dylib iconengine and a libqsvg.dylib imageformat (and they're different)...
 do
     cp $QT4_PATH/plugins/iconengines/$lib .
 

build/unused/mixxx_dmg.sh

@@ -257,7 +257,7 @@ bundle_QT4_plugin() {
 
 
 bundle_QT4_plugin "imageformats" "qgif qjpeg qsvg"; #Left out libqmng and libqtiff to save space.
-bundle_QT4_plugin "iconengines" "qsvg"; #Yeah, theres a libqsvg.dylib iconengine and a libqsvg.dylib imageformat (and they're different)...
+bundle_QT4_plugin "iconengines" "qsvg"; #Yeah, there's a libqsvg.dylib iconengine and a libqsvg.dylib imageformat (and they're different)...
 
 
 cd $WRKDIR

build/wix/README.md

@@ -22,10 +22,10 @@ Bootstrapper (bundle) command line options
 -q, -quiet, -s, -silent = silent install
 -passive = progress bar only install
 -norestart = suppress any restarts
--forcerestart = restart no matter what (I don't know why this is still  around)
+-forcerestart = restart no matter what (I don't know why this is still around)
 -promptrestart = prompt if a restart is required (default)
--layout = create a local image of the bootstrapper (i.e. download files so  they can be burned to DVD)
--l, -log = log to a specific file (default is controled by bundle developer)
+-layout = create a local image of the bootstrapper (i.e. download files so they can be burned to DVD)
+-l, -log = log to a specific file (default is controlled by bundle developer)
 -uninstall = uninstall
 -repair = repair (or install if not installed)
 -package,-update = install (default if no -uninstall or -repair)

build/wix/WiSubStg.vbs

@@ -24,7 +24,7 @@ Const TristateTrue = -1
 Dim argCount:argCount = Wscript.Arguments.Count
 If argCount > 0 Then If InStr(1, Wscript.Arguments(0), "?", vbTextCompare) > 0 Then argCount = 0
 If (argCount = 0) Then
-	Wscript.Echo "Windows Installer database substorage managment utility" &_
+	Wscript.Echo "Windows Installer database substorage management utility" &_
 		vbNewLine & " 1st argument is the path to MSI database (installer package)" &_
 		vbNewLine & " 2nd argument is the path to a transform or database to import" &_
 		vbNewLine & " If the 2nd argument is missing, substorages will be listed" &_

build/wix/mixxx.wxs

@@ -350,7 +350,7 @@
         </Directory>
       </Directory>
 
-      <!-- The windows programm menu folder for our main shortcut -->
+      <!-- The windows program menu folder for our main shortcut -->
       <Directory Id="ProgramMenuFolder" Name="Programs" />
 
       <!-- The desktop folder, for desktop shortcut -->

res/controllers/American-Audio-VMS2-scripts.js

@@ -61,7 +61,7 @@ VMS2.init = function (id) {    // called when the MIDI device is opened & set up
 
     // Enable soft-takeover for all direct hardware controls
     //  (Many of these are mapped in the XML directly so these have no effect.
-    //  Here for completeness incase any eventually move to script.)
+    //  Here for completeness in case any eventually move to script.)
     //    engine.softTakeover("[Channel1]","rate",true);
     //    engine.softTakeover("[Channel1]","volume",true);
     //    engine.softTakeover("[Channel1]","pregain",true);

res/controllers/American-Audio-VMS4-scripts.js

@@ -54,7 +54,7 @@ VMS4.init = function (id) {    // called when the MIDI device is opened & set up
 
     // Enable soft-takeover for all direct hardware controls
     //  (Many of these are mapped in the XML directly so these have no effect.
-    //  Here for completeness incase any eventually move to script.)
+    //  Here for completeness in case any eventually move to script.)
     engine.softTakeover("[Master]","crossfader",true);
     engine.softTakeover("[Channel1]","rate",true);
     engine.softTakeover("[Channel1]","volume",true);

res/controllers/Behringer-CMDStudio4a-scripts.js

@@ -135,7 +135,7 @@ BehringerCMDStudio4a.scratch = function (channel, control, value, status, group)
     midi.sendShortMsg(status, control, BehringerCMDStudio4a.scratchButtonState[channel] ? 0x01 : 0x00);
 }
 
-// Function to deal with the FX Assign buttons, (becasue they also act as "shift" buttons).
+// Function to deal with the FX Assign buttons, (because they also act as "shift" buttons).
 BehringerCMDStudio4a.fxAssign = function (channel, control, value, status, group) {
     // FX Assign buttons start at 0x52.
     var fxAssignButton = (control - 0x52) & 1;  // Either 0 or 1 depending on button (1 or 2).
@@ -156,7 +156,7 @@ BehringerCMDStudio4a.fxAssign = function (channel, control, value, status, group
     }
 }
 
-// Function to deal with the browse left/right buttons, (becasue they have an "FX Assign mode" behaviour).
+// Function to deal with the browse left/right buttons, (because they have an "FX Assign mode" behaviour).
 BehringerCMDStudio4a.browseLR = function (channel, control, value, status, group) {
     if (BehringerCMDStudio4a.fxAssignPushed) {
         BehringerCMDStudio4a.fxAssignShiftUsed = true;

res/controllers/DJ-Tech-CDJ-101-scripts.js

@@ -229,7 +229,7 @@ DJTechCDJ101.jogouter = function(channel, control, value, status, group)
 
 //
 // track playing: top of jog scratches
-// track not playing: seek thru track (using same scratch ticks and gives more postive response) or seek faster through track when push button held down
+// track not playing: seek thru track (using same scratch ticks and gives more positive response) or seek faster through track when push button held down
 //
 
 DJTechCDJ101.jogtop = function(channel, control, value, status, group) 

res/controllers/Denon-MC4000-scripts.js

@@ -111,7 +111,7 @@ MC4000.Deck = function (channel) {
     };
 
 
-    // The jog wheel periodically sends the number of "ticks" it has been rotated by since the last mesage
+    // The jog wheel periodically sends the number of "ticks" it has been rotated by since the last message
     // For scratching, we just tell this directly to the scratch engine, which rotates the record by specified amount.
     // Jogging works differently: the "jog" engine samples the jog value at a rate of 1/(sound_card_latency),
     // adds this jog value to an internal 25 sample buffer, and then sets the jog value to zero.

res/controllers/Gemini-CDMP-7000-scripts.js

@@ -15,10 +15,10 @@
 // slip mode doesn't work unless you manually turn it off (disable needs to be called on wheel hand lift)
 // no flashing play buttons, they turn off after first use (need to turn back on after track stop)
 // auto cue button doesn't do anything, easy fix
-// back button does't toggle directory mode
+// back button doesn't toggle directory mode
 // Set Master Tempo to Keylock, not sure what it is now 
 // many more bug fixes where found
-// every once in a while scratch mode ignores vinyl button, hard to respoduce it's intermitent
+// every once in a while scratch mode ignores vinyl button, hard to reproduce it's intermitent
 
 
 // Todo:

res/controllers/Hercules DJ Control MP3 e2-scripts.js

@@ -10,7 +10,7 @@ function HerculesMP3e2() {}
 
 // Control schema: http://blog.ebruni.it/blog/wp-content/uploads/2010/01/Hercules-mp3e2-schema-comandi.jpg
 // Image: http://www.hablarcom.com.br/Imagens/arquivos/jptech/DJ_control_MP3_2_frente.jpg
-// Explaination: http://www.mixxx.org/wiki/doku.php/hercules_dj_control_mp3_e2
+// Explanation: http://www.mixxx.org/wiki/doku.php/hercules_dj_control_mp3_e2
 
 // Number of the standard RPM value. Lower values increase de sensitivity as the really records.
 var standardRpm = 33.33;
@@ -465,7 +465,7 @@ HerculesMP3e2.keyButton = function(midino, control, value, status, group) {
 
 HerculesMP3e2.pitch = function(midino, control, value, status, group) {
     // Simple: pitch slider
-    // Shifted: Headphone volume and pre/main (this are 4-deck independant)
+    // Shifted: Headphone volume and pre/main (these are 4-deck independent)
     // Supershifted: QuickEffect Filter knob
 
     var sign;
@@ -568,7 +568,7 @@ HerculesMP3e2.pitchbend = function(midino, control, value, status, group) {
 HerculesMP3e2.cue = function(channel, control, value, status, group) {
     var deck = HerculesMP3e2.switchDeck(group);
 
-    // Don't set Cue accidentaly at the end of the song
+    // Don't set Cue accidentally at the end of the song
     if (engine.getValue(deck, "playposition") <= 0.97) {
         engine.setValue(deck, "cue_default", value ? 1 : 0);
     } else {
@@ -604,7 +604,7 @@ HerculesMP3e2.scratch = function(midino, control, value, status, group) {
         // Normal scratch function
         if (value) {
             if (scratchMode === 0) {
-                // Enable the scratch mode on the corrisponding deck and start the timer
+                // Enable the scratch mode on the corresponding deck and start the timer
                 scratchMode = 1;
                 scratchTimer = engine.beginTimer(scratchResetTime, "HerculesMP3e2.wheelOnOff()");
                 midi.sendShortMsg(0x90, 45, 0x7F); // Switch-on the Scratch led
@@ -613,7 +613,7 @@ HerculesMP3e2.scratch = function(midino, control, value, status, group) {
                 engine.setValue("[Channel3]", "keylock", 0);
                 engine.setValue("[Channel4]", "keylock", 0);
             } else {
-                // Disable the scratch mode on the corrisponding deck and stop the timer
+                // Disable the scratch mode on the corresponding deck and stop the timer
                 scratchMode = 0;
                 engine.stopTimer(scratchTimer);
                 midi.sendShortMsg(0x90, 45, 0x00); // Switch-off the Scratch led

res/controllers/Hercules-DJ-Console-4-Mx-scripts.js

@@ -68,7 +68,7 @@ Hercules4Mx.userSettings = {
     'autoHeadMix': false,
     // Enable automatically the headphone cue select (PFL) of the deck when a song is loaded. (Like in virtual-dj)
     'autoHeadcueOnLoad': true,
-    // Flashing at the rythm of the beat on the led. Use the Leds map above.
+    // Flashing at the rhythm of the beat on the led. Use the Leds map above.
     // Note: if using sync button, then the button will not show sync master state.
     'beatFlashLed': Hercules4Mx.Leds.none,
     // Simulate vuMeters using the kill and source buttons. If enabled, shows master vus, or deck vu depending if prefader listen button is enabled or not.

res/controllers/Hercules-DJ-Console-Mk4-scripts.js

@@ -280,7 +280,7 @@ HerculesMk4.toglePitchSensivity=function (group,sensivity) {
 }
 
 HerculesMk4.cue = function (midino, control, value, status, group) {
-	// Don't set Cue accidentaly at the end of the song
+	// Don't set Cue accidentally at the end of the song
 
 	if(engine.getValue(group, "playposition") <= 0.97) {
 		engine.setValue(group, "cue_default", value ? 1 : 0);

res/controllers/Hercules-DJ-Control-AIR-scripts.js

@@ -51,7 +51,7 @@ HerculesAir.init = function(id) {
 	engine.connectControl("[Channel2]", "beat_active", "HerculesAir.beatProgressDeckB")
 	engine.connectControl("[Channel2]", "play", "HerculesAir.playDeckB")
 
-    print ("Hercules DJ Controll AIR: "+id+" initialized.");
+    print ("Hercules DJ Control AIR: "+id+" initialized.");
 }
 
 HerculesAir.shutdown = function() {

res/controllers/Hercules-DJ-Control-Instinct-scripts.js

@@ -158,7 +158,7 @@ HCInstinct.pitch = function (midino, control, value, status, group) {
 			engine.setValue(group, "rate_temp_up"+speed, state); 
 			break;
 	};	
-        // when buttons + and - pressed simultanously
+        // when buttons + and - pressed simultaneously
         if (HCInstinct.pitchSwitches["A"][0] && HCInstinct.pitchSwitches["A"][1]) {
 		// reset pitch to 0
 		engine.setValue(group, "rate", 0); 

res/controllers/Midi_for_light-scripts.js

@@ -3,7 +3,7 @@ function midi_for_light() {}
 /*
     midi_for_light
 
-    Sending informations on midi for using in a light software.
+    Sending information on midi for using in a light software.
     Extend the light show and make it sync to the current deck.
     - beat
     - bpm

res/controllers/MixVibes U-Mix Control Pro 2.midi.xml

@@ -67,7 +67,7 @@
                     <Script-Binding/>
                 </options>
             </control>
-        <!-- Main Controlls -->
+        <!-- Main Controls -->
             <control>
                 <group>[Master]</group>
                 <key>crossfader</key>
@@ -313,7 +313,7 @@
                     <normal/>
                 </options>
             </control>
-	<!-- Standard Controlls -->
+	<!-- Standard Controls -->
 	<control>
                 <group>[Channel1]</group>
                 <key>cue_default</key>
@@ -603,7 +603,7 @@
                     <normal/>
                 </options>
             </control>
-	<!-- End of Controlls -->
+	<!-- End of Controls -->
             </controls>
         <outputs>
   	<!-- LED Lighting -->

res/controllers/Nintendo-Wiimote.js

@@ -545,7 +545,7 @@ Wiimote.coreaccel_ext8_Callbacks = function(packetname) {
 
 // Register callbacks for buttons + accelerometer output report
 // with 8 bytes from extension module
-// NOTE - this code does not acually work, it freezes my wiimote
+// NOTE - this code does not actually work, it freezes my wiimote
 Wiimote.coreaccel_ir12_Callbacks = function(packetname) {
     HIDDebug("Activating core buttons + accelerometer / 12 bytes IR mode");
     var controller = Wiimote.controller;

res/controllers/Numark DJ2Go.midi.xml

@@ -114,7 +114,7 @@
 					</options>
 				</control>
 
-<!-- Original pich bend control
+<!-- Original pitch bend control
 				<control>
 					<group>[Channel1]</group>
 					<key>NumarkDJ2Go.pitchBendPlus</key>