summaryrefslogtreecommitdiffstats
path: root/res/translations/mixxx_my.ts
diff options
context:
space:
mode:
Diffstat (limited to 'res/translations/mixxx_my.ts')
-rw-r--r--res/translations/mixxx_my.ts26
1 files changed, 13 insertions, 13 deletions
diff --git a/res/translations/mixxx_my.ts b/res/translations/mixxx_my.ts
index 4c6dddc4c3..386607b74e 100644
--- a/res/translations/mixxx_my.ts
+++ b/res/translations/mixxx_my.ts
@@ -2971,12 +2971,12 @@
</message>
<message>
<location filename="../../src/controllers/controllerengine.cpp" line="610"/>
- <source>Controller Preset Error</source>
+ <source>Controller Mapping Error</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../../src/controllers/controllerengine.cpp" line="611"/>
- <source>The preset for your controller &quot;%1&quot; is not working properly.</source>
+ <source>The mapping for your controller &quot;%1&quot; is not working properly.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -4478,16 +4478,6 @@ Apply settings and continue?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../../src/controllers/dlgprefcontroller.cpp" line="528"/>
- <source>Preset already exists.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../src/controllers/dlgprefcontroller.cpp" line="529"/>
- <source>&lt;b&gt;%1&lt;/b&gt; already exists in user preset folder.&lt;br&gt;Overwrite or save with a new name?</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../../src/controllers/dlgprefcontroller.cpp" line="532"/>
<source>Always overwrite during this session</source>
<translation type="unfinished"/>
@@ -4543,6 +4533,16 @@ Apply settings and continue?</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../../src/controllers/dlgprefcontroller.cpp" line="528"/>
+ <source>Mapping already exists.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../src/controllers/dlgprefcontroller.cpp" line="529"/>
+ <source>&lt;b&gt;%1&lt;/b&gt; already exists in user mapping folder.&lt;br&gt;Overwrite or save with a new name?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../../src/controllers/dlgprefcontroller.cpp" line="671"/>
<source>Troubleshooting</source>
<translation type="unfinished"/>
@@ -8045,7 +8045,7 @@ Do you really want to overwrite it?</source>
</message>
<message>
<location filename="../../src/controllers/midi/midicontroller.cpp" line="127"/>
- <source>One or more MixxxControls specified in the outputs section of the loaded preset were invalid.</source>
+ <source>One or more MixxxControls specified in the outputs section of the loaded mapping were invalid.</source>
<translation type="unfinished"/>
</message>
<message>