summaryrefslogtreecommitdiffstats
path: root/res/translations/mixxx_en_GB.ts
diff options
context:
space:
mode:
authors.brandt <s.brandt@mixxx.org>2021-02-17 14:18:48 +0100
committers.brandt <s.brandt@mixxx.org>2021-02-17 14:18:48 +0100
commitb07c00a172ebf994cfd2a81700011dbddcdb359b (patch)
treeaa1e23022f63711e41900cff263bd75ae35b6611 /res/translations/mixxx_en_GB.ts
parent53ffe30d195e82056110e269072beb1672ddf2d8 (diff)
Pull latest translations from https://www.transifex.com/mixxx-dj-software/mixxxdj/mixxx2-3/. Compile QM files out of TS files that are used by the localized app
Diffstat (limited to 'res/translations/mixxx_en_GB.ts')
-rw-r--r--res/translations/mixxx_en_GB.ts32
1 files changed, 16 insertions, 16 deletions
diff --git a/res/translations/mixxx_en_GB.ts b/res/translations/mixxx_en_GB.ts
index a49f6ce75b..75cd96055a 100644
--- a/res/translations/mixxx_en_GB.ts
+++ b/res/translations/mixxx_en_GB.ts
@@ -2973,13 +2973,13 @@
</message>
<message>
<location filename="../../src/controllers/controllerengine.cpp" line="610"/>
- <source>Controller Preset Error</source>
- <translation>Controller Preset Error</translation>
+ <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>
- <translation>The preset for your controller &quot;%1&quot; is not working properly.</translation>
+ <source>The mapping for your controller &quot;%1&quot; is not working properly.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../../src/controllers/controllerengine.cpp" line="615"/>
@@ -4515,16 +4515,6 @@ Apply settings and continue?</translation>
<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"/>
@@ -4580,6 +4570,16 @@ Apply settings and continue?</translation>
<translation>Do you want to save the changes?</translation>
</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>Troubleshooting</translation>
@@ -8113,8 +8113,8 @@ Do you really want to overwrite it?</translation>
</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>
- <translation>One or more MixxxControls specified in the outputs section of the loaded preset were invalid.</translation>
+ <source>One or more MixxxControls specified in the outputs section of the loaded mapping were invalid.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../../src/controllers/midi/midicontroller.cpp" line="129"/>