diff options
101 files changed, 2130 insertions, 2080 deletions
diff --git a/res/translations/mixxx_ar.ts b/res/translations/mixxx_ar.ts index d4899df49d..ab4d6584ab 100644 --- a/res/translations/mixxx_ar.ts +++ b/res/translations/mixxx_ar.ts @@ -2973,12 +2973,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 "%1" is not working properly.</source> + <source>The mapping for your controller "%1" is not working properly.</source> <translation type="unfinished"/> </message> <message> @@ -4480,16 +4480,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><b>%1</b> already exists in user preset folder.<br>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"/> @@ -4545,6 +4535,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><b>%1</b> already exists in user mapping folder.<br>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"/> @@ -8047,7 +8047,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> diff --git a/res/translations/mixxx_ast.ts b/res/translations/mixxx_ast.ts index e5f65f7c8e..5c8952611b 100644 --- a/res/translations/mixxx_ast.ts +++ b/res/translations/mixxx_ast.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 "%1" is not working properly.</source> + <source>The mapping for your controller "%1" 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><b>%1</b> already exists in user preset folder.<br>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><b>%1</b> already exists in user mapping folder.<br>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> diff --git a/res/translations/mixxx_bg.ts b/res/translations/mixxx_bg.ts index 233e52eff7..984c2cf029 100644 --- a/res/translations/mixxx_bg.ts +++ b/res/translations/mixxx_bg.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 "%1" is not working properly.</source> + <source>The mapping for your controller "%1" 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><b>%1</b> already exists in user preset folder.<br>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><b>%1</b> already exists in user mapping folder.<br>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> diff --git a/res/translations/mixxx_bs.ts b/res/translations/mixxx_bs.ts index 3eb23a6d4f..713c260db9 100644 --- a/res/translations/mixxx_bs.ts +++ b/res/translations/mixxx_bs.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 "%1" is not working properly.</source> + <source>The mapping for your controller "%1" 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><b>%1</b> already exists in user preset folder.<br>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><b>%1</b> already exists in user mapping folder.<br>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> diff --git a/res/translations/mixxx_ca-ES.qm b/res/translations/mixxx_ca-ES.qm Binary files differindex f9ce01adeb..e9e4a3147f 100644 --- a/res/translations/mixxx_ca-ES.qm +++ b/res/translations/mixxx_ca-ES.qm diff --git a/res/translations/mixxx_ca-ES.ts b/res/translations/mixxx_ca-ES.ts index 830f914d09..7d9cf4362d 100644 --- a/res/translations/mixxx_ca-ES.ts +++ b/res/translations/mixxx_ca-ES.ts @@ -302,7 +302,7 @@ |