summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorUwe Klotz <uklotz@mixxx.org>2020-11-15 11:03:54 +0100
committerUwe Klotz <uklotz@mixxx.org>2020-11-15 11:03:54 +0100
commit4b3c2b457cabed13434ac0febb46d701ed9a416d (patch)
tree9f5966c9acffa444134e2a8de252014e0f98ac45 /res
parent894cb670f6afa18e725bc3fa1d63e10ee59ad903 (diff)
Fix "Mixx" typos in code
- Not in translations which are pulled from Transifex - Disabled pre-commit hooks to avoid mass-reformatting
Diffstat (limited to 'res')
-rw-r--r--res/controllers/Numark-DJ2Go-scripts.js2
-rw-r--r--res/controllers/Roland_DJ-505-scripts.js2
-rw-r--r--res/controllers/mixco/novation_twitch.mixco.js2
-rw-r--r--res/controllers/novation_twitch.mixco.output.js2
-rw-r--r--res/schema.xml2
5 files changed, 5 insertions, 5 deletions
diff --git a/res/controllers/Numark-DJ2Go-scripts.js b/res/controllers/Numark-DJ2Go-scripts.js
index dcd19f5cd3..c1f1bd7e6e 100644
--- a/res/controllers/Numark-DJ2Go-scripts.js
+++ b/res/controllers/Numark-DJ2Go-scripts.js
@@ -138,7 +138,7 @@ NumarkDJ2Go.deck = function(deckNum) {
this.pitchTimer= 0;
//The alternative mode to scratching for the jog wheel.
this.pitchBend = function(forwards) {
- //For some reason the ramping pitchbend option in Mixx menu together with temp_rate_up/down doesn't seem
+ //For some reason the ramping pitchbend option in Mixxx menu together with temp_rate_up/down doesn't seem
//to work for the jog wheel. So this function allows the pitch bend to ramp the faster/more
//revolutions of the wheel.
if (this.pitchTimer !== 0)
diff --git a/res/controllers/Roland_DJ-505-scripts.js b/res/controllers/Roland_DJ-505-scripts.js
index 6303d86ed1..b892b8dbf3 100644
--- a/res/controllers/Roland_DJ-505-scripts.js
+++ b/res/controllers/Roland_DJ-505-scripts.js
@@ -467,7 +467,7 @@ DJ505.Deck = function(deckNumbers, offset) {
*
* TODO: Add proper bar support for the LED indicators
*
- * Mixx currently does not support bar detection, so we don't know which
+ * Mixxx currently does not support bar detection, so we don't know which
* of the 4 beats in a we are on. This has been worked around by counting
* beats manually, but this is error prone and does not support moving
* backwards in a track, has problems with loops, does not detect hotcue
diff --git a/res/controllers/mixco/novation_twitch.mixco.js b/res/controllers/mixco/novation_twitch.mixco.js
index b7a9298f80..ca671d3b45 100644
--- a/res/controllers/mixco/novation_twitch.mixco.js
+++ b/res/controllers/mixco/novation_twitch.mixco.js
@@ -5,7 +5,7 @@
// > - **View me [on a static web](http://sinusoid.es/mixco/script/novation_twitch.mixco.html)**
// > - **View me [on GitHub](https://github.com/arximboldi/mixco/blob/master/script/novation_twitch.mixco.litcoffee)**
//
-// Mixx script file for the **Novation Twitch** controller.
+// Mixxx script file for the **Novation Twitch** controller.
//
// This script serves as **tutorial** for creating scripts using the
// *Mixco* framework, but programming directly in JavaScript. Still,
diff --git a/res/controllers/novation_twitch.mixco.output.js b/res/controllers/novation_twitch.mixco.output.js
index e9bb0fdc70..5a72bbad01 100644
--- a/res/controllers/novation_twitch.mixco.output.js
+++ b/res/controllers/novation_twitch.mixco.output.js
@@ -5860,7 +5860,7 @@ string.js - Copyright (C) 2012-2014, JP Richardson <jprichardson@gmail.com>
// > - **View me [on a static web](http://sinusoid.es/mixco/script/novation_twitch.mixco.html)**
// > - **View me [on GitHub](https://github.com/arximboldi/mixco/blob/master/script/novation_twitch.mixco.litcoffee)**
//
-// Mixx script file for the **Novation Twitch** controller.
+// Mixxx script file for the **Novation Twitch** controller.
//
// This script serves as **tutorial** for creating scripts using the
// *Mixco* framework, but programming directly in JavaScript. Still,
diff --git a/res/schema.xml b/res/schema.xml
index 5f332d0484..b9e53f0973 100644
--- a/res/schema.xml
+++ b/res/schema.xml
@@ -472,7 +472,7 @@ METADATA
<sql>
<!-- No Color becomes Orange (not in default palette) -->
UPDATE cues SET color=0xFF8C00 WHERE color=0;
- <!-- Mixx Hotcue Color Palette (also defined in src/util/color/colorpalette.h) -->
+ <!-- Mixxx Hotcue Color Palette (also defined in src/util/color/colorpalette.h) -->
<!-- Red -->
UPDATE cues SET color=0xC50A08 WHERE color=1;
<!-- Green -->