Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/2.3' into 2.4
Browse files Browse the repository at this point in the history
# Conflicts:
#	.tx/config
#	source/locale/ca/LC_MESSAGES/chapters/advanced_topics.po
#	source/locale/ca/LC_MESSAGES/chapters/appendix.po
#	source/locale/ca/LC_MESSAGES/chapters/appendix/mixxx_controls.po
#	source/locale/ca/LC_MESSAGES/chapters/appendix/settings_directory.po
#	source/locale/ca/LC_MESSAGES/chapters/controlling_mixxx.po
#	source/locale/ca/LC_MESSAGES/chapters/djing_with_mixxx.po
#	source/locale/ca/LC_MESSAGES/chapters/effects.po
#	source/locale/ca/LC_MESSAGES/chapters/example_setups.po
#	source/locale/ca/LC_MESSAGES/chapters/getting_involved.po
#	source/locale/ca/LC_MESSAGES/chapters/getting_started.po
#	source/locale/ca/LC_MESSAGES/chapters/hardware.po
#	source/locale/ca/LC_MESSAGES/chapters/introduction.po
#	source/locale/ca/LC_MESSAGES/chapters/library.po
#	source/locale/ca/LC_MESSAGES/chapters/livebroadcasting.po
#	source/locale/ca/LC_MESSAGES/chapters/microphones.po
#	source/locale/ca/LC_MESSAGES/chapters/preferences.po
#	source/locale/ca/LC_MESSAGES/chapters/preferences/beat_detection.po
#	source/locale/ca/LC_MESSAGES/chapters/preferences/sound_hardware.po
#	source/locale/ca/LC_MESSAGES/chapters/quickstart.po
#	source/locale/ca/LC_MESSAGES/chapters/user_interface.po
#	source/locale/ca/LC_MESSAGES/chapters/vinyl_control.po
#	source/locale/ca/LC_MESSAGES/glossary.po
#	source/locale/ca/LC_MESSAGES/hardware/controllers/allen_heath_xone_k2_k1.po
#	source/locale/ca/LC_MESSAGES/index.po
#	source/locale/ca/LC_MESSAGES/sphinx.po
#	source/locale/cs/LC_MESSAGES/404.po
#	source/locale/cs/LC_MESSAGES/chapters/advanced_topics.po
#	source/locale/cs/LC_MESSAGES/chapters/appendix/mixxx_controls.po
#	source/locale/cs/LC_MESSAGES/chapters/appendix/settings_directory.po
#	source/locale/cs/LC_MESSAGES/chapters/effects.po
#	source/locale/cs/LC_MESSAGES/chapters/hardware.po
#	source/locale/cs/LC_MESSAGES/chapters/library.po
#	source/locale/cs/LC_MESSAGES/chapters/livebroadcasting.po
#	source/locale/cs/LC_MESSAGES/chapters/preferences.po
#	source/locale/cs/LC_MESSAGES/chapters/preferences/beat_detection.po
#	source/locale/cs/LC_MESSAGES/chapters/preferences/sound_hardware.po
#	source/locale/cs/LC_MESSAGES/chapters/user_interface.po
#	source/locale/cs/LC_MESSAGES/chapters/vinyl_control.po
#	source/locale/cs/LC_MESSAGES/glossary.po
#	source/locale/cs/LC_MESSAGES/hardware/controllers/allen_heath_xone_k2_k1.po
#	source/locale/cs/LC_MESSAGES/index.po
#	source/locale/de/LC_MESSAGES/404.po
#	source/locale/de/LC_MESSAGES/chapters/advanced_topics.po
#	source/locale/de/LC_MESSAGES/chapters/appendix.po
#	source/locale/de/LC_MESSAGES/chapters/appendix/mixxx_controls.po
#	source/locale/de/LC_MESSAGES/chapters/appendix/settings_directory.po
#	source/locale/de/LC_MESSAGES/chapters/controlling_mixxx.po
#	source/locale/de/LC_MESSAGES/chapters/djing_with_mixxx.po
#	source/locale/de/LC_MESSAGES/chapters/effects.po
#	source/locale/de/LC_MESSAGES/chapters/example_setups.po
#	source/locale/de/LC_MESSAGES/chapters/getting_involved.po
#	source/locale/de/LC_MESSAGES/chapters/getting_started.po
#	source/locale/de/LC_MESSAGES/chapters/hardware.po
#	source/locale/de/LC_MESSAGES/chapters/introduction.po
#	source/locale/de/LC_MESSAGES/chapters/library.po
#	source/locale/de/LC_MESSAGES/chapters/livebroadcasting.po
#	source/locale/de/LC_MESSAGES/chapters/preferences.po
#	source/locale/de/LC_MESSAGES/chapters/preferences/beat_detection.po
#	source/locale/de/LC_MESSAGES/chapters/preferences/sound_hardware.po
#	source/locale/de/LC_MESSAGES/chapters/quickstart.po
#	source/locale/de/LC_MESSAGES/chapters/user_interface.po
#	source/locale/de/LC_MESSAGES/chapters/vinyl_control.po
#	source/locale/de/LC_MESSAGES/glossary.po
#	source/locale/de/LC_MESSAGES/hardware/controllers/allen_heath_xone_k2_k1.po
#	source/locale/de/LC_MESSAGES/index.po
#	source/locale/de/LC_MESSAGES/index_developer.po
#	source/locale/de/LC_MESSAGES/sphinx.po
#	source/locale/el/LC_MESSAGES/chapters/advanced_topics.po
#	source/locale/el/LC_MESSAGES/chapters/appendix/mixxx_controls.po
#	source/locale/el/LC_MESSAGES/chapters/appendix/settings_directory.po
#	source/locale/el/LC_MESSAGES/chapters/preferences/beat_detection.po
#	source/locale/el/LC_MESSAGES/chapters/preferences/sound_hardware.po
#	source/locale/el/LC_MESSAGES/chapters/user_interface.po
#	source/locale/el/LC_MESSAGES/hardware/controllers/allen_heath_xone_k2_k1.po
#	source/locale/en_GB/LC_MESSAGES/chapters/advanced_topics.po
#	source/locale/en_GB/LC_MESSAGES/chapters/appendix/mixxx_controls.po
#	source/locale/en_GB/LC_MESSAGES/chapters/appendix/settings_directory.po
#	source/locale/en_GB/LC_MESSAGES/chapters/djing_with_mixxx.po
#	source/locale/en_GB/LC_MESSAGES/chapters/effects.po
#	source/locale/en_GB/LC_MESSAGES/chapters/hardware.po
#	source/locale/en_GB/LC_MESSAGES/chapters/library.po
#	source/locale/en_GB/LC_MESSAGES/chapters/livebroadcasting.po
#	source/locale/en_GB/LC_MESSAGES/chapters/preferences.po
#	source/locale/en_GB/LC_MESSAGES/chapters/preferences/beat_detection.po
#	source/locale/en_GB/LC_MESSAGES/chapters/preferences/sound_hardware.po
#	source/locale/en_GB/LC_MESSAGES/chapters/user_interface.po
#	source/locale/en_GB/LC_MESSAGES/chapters/vinyl_control.po
#	source/locale/en_GB/LC_MESSAGES/glossary.po
#	source/locale/en_GB/LC_MESSAGES/hardware/controllers/allen_heath_xone_k2_k1.po
#	source/locale/en_GB/LC_MESSAGES/index.po
#	source/locale/es/LC_MESSAGES/chapters/advanced_topics.po
#	source/locale/es/LC_MESSAGES/chapters/appendix.po
#	source/locale/es/LC_MESSAGES/chapters/appendix/mixxx_controls.po
#	source/locale/es/LC_MESSAGES/chapters/appendix/settings_directory.po
#	source/locale/es/LC_MESSAGES/chapters/controlling_mixxx.po
#	source/locale/es/LC_MESSAGES/chapters/djing_with_mixxx.po
#	source/locale/es/LC_MESSAGES/chapters/effects.po
#	source/locale/es/LC_MESSAGES/chapters/hardware.po
#	source/locale/es/LC_MESSAGES/chapters/introduction.po
#	source/locale/es/LC_MESSAGES/chapters/library.po
#	source/locale/es/LC_MESSAGES/chapters/livebroadcasting.po
#	source/locale/es/LC_MESSAGES/chapters/preferences.po
#	source/locale/es/LC_MESSAGES/chapters/preferences/beat_detection.po
#	source/locale/es/LC_MESSAGES/chapters/preferences/sound_hardware.po
#	source/locale/es/LC_MESSAGES/chapters/user_interface.po
#	source/locale/es/LC_MESSAGES/chapters/vinyl_control.po
#	source/locale/es/LC_MESSAGES/glossary.po
#	source/locale/es/LC_MESSAGES/hardware/controllers/allen_heath_xone_k2_k1.po
#	source/locale/es/LC_MESSAGES/index.po
#	source/locale/fi/LC_MESSAGES/chapters/advanced_topics.po
#	source/locale/fi/LC_MESSAGES/chapters/appendix/mixxx_controls.po
#	source/locale/fi/LC_MESSAGES/chapters/appendix/settings_directory.po
#	source/locale/fi/LC_MESSAGES/chapters/effects.po
#	source/locale/fi/LC_MESSAGES/chapters/hardware.po
#	source/locale/fi/LC_MESSAGES/chapters/introduction.po
#	source/locale/fi/LC_MESSAGES/chapters/preferences.po
#	source/locale/fi/LC_MESSAGES/chapters/preferences/beat_detection.po
#	source/locale/fi/LC_MESSAGES/chapters/preferences/sound_hardware.po
#	source/locale/fi/LC_MESSAGES/chapters/quickstart.po
#	source/locale/fi/LC_MESSAGES/chapters/user_interface.po
#	source/locale/fi/LC_MESSAGES/chapters/vinyl_control.po
#	source/locale/fi/LC_MESSAGES/glossary.po
#	source/locale/fi/LC_MESSAGES/hardware/controllers/allen_heath_xone_k2_k1.po
#	source/locale/fr/LC_MESSAGES/chapters/advanced_topics.po
#	source/locale/fr/LC_MESSAGES/chapters/appendix.po
#	source/locale/fr/LC_MESSAGES/chapters/appendix/mixxx_controls.po
#	source/locale/fr/LC_MESSAGES/chapters/appendix/settings_directory.po
#	source/locale/fr/LC_MESSAGES/chapters/controlling_mixxx.po
#	source/locale/fr/LC_MESSAGES/chapters/djing_with_mixxx.po
#	source/locale/fr/LC_MESSAGES/chapters/effects.po
#	source/locale/fr/LC_MESSAGES/chapters/example_setups.po
#	source/locale/fr/LC_MESSAGES/chapters/getting_involved.po
#	source/locale/fr/LC_MESSAGES/chapters/getting_started.po
#	source/locale/fr/LC_MESSAGES/chapters/hardware.po
#	source/locale/fr/LC_MESSAGES/chapters/introduction.po
#	source/locale/fr/LC_MESSAGES/chapters/library.po
#	source/locale/fr/LC_MESSAGES/chapters/livebroadcasting.po
#	source/locale/fr/LC_MESSAGES/chapters/microphones.po
#	source/locale/fr/LC_MESSAGES/chapters/preferences.po
#	source/locale/fr/LC_MESSAGES/chapters/preferences/beat_detection.po
#	source/locale/fr/LC_MESSAGES/chapters/preferences/sound_hardware.po
#	source/locale/fr/LC_MESSAGES/chapters/quickstart.po
#	source/locale/fr/LC_MESSAGES/chapters/user_interface.po
#	source/locale/fr/LC_MESSAGES/chapters/vinyl_control.po
#	source/locale/fr/LC_MESSAGES/glossary.po
#	source/locale/fr/LC_MESSAGES/hardware/controllers/allen_heath_xone_k2_k1.po
#	source/locale/fr/LC_MESSAGES/index.po
#	source/locale/fr/LC_MESSAGES/sphinx.po
#	source/locale/gl/LC_MESSAGES/chapters/advanced_topics.po
#	source/locale/gl/LC_MESSAGES/chapters/appendix/mixxx_controls.po
#	source/locale/gl/LC_MESSAGES/chapters/appendix/settings_directory.po
#	source/locale/gl/LC_MESSAGES/chapters/effects.po
#	source/locale/gl/LC_MESSAGES/chapters/hardware.po
#	source/locale/gl/LC_MESSAGES/chapters/library.po
#	source/locale/gl/LC_MESSAGES/chapters/livebroadcasting.po
#	source/locale/gl/LC_MESSAGES/chapters/preferences.po
#	source/locale/gl/LC_MESSAGES/chapters/preferences/beat_detection.po
#	source/locale/gl/LC_MESSAGES/chapters/preferences/sound_hardware.po
#	source/locale/gl/LC_MESSAGES/chapters/user_interface.po
#	source/locale/gl/LC_MESSAGES/chapters/vinyl_control.po
#	source/locale/gl/LC_MESSAGES/glossary.po
#	source/locale/gl/LC_MESSAGES/hardware/controllers/allen_heath_xone_k2_k1.po
#	source/locale/id/LC_MESSAGES/chapters/advanced_topics.po
#	source/locale/id/LC_MESSAGES/chapters/appendix/mixxx_controls.po
#	source/locale/id/LC_MESSAGES/chapters/appendix/settings_directory.po
#	source/locale/id/LC_MESSAGES/chapters/effects.po
#	source/locale/id/LC_MESSAGES/chapters/preferences/beat_detection.po
#	source/locale/id/LC_MESSAGES/chapters/preferences/sound_hardware.po
#	source/locale/id/LC_MESSAGES/chapters/user_interface.po
#	source/locale/id/LC_MESSAGES/hardware/controllers/allen_heath_xone_k2_k1.po
#	source/locale/it/LC_MESSAGES/chapters/advanced_topics.po
#	source/locale/it/LC_MESSAGES/chapters/appendix/mixxx_controls.po
#	source/locale/it/LC_MESSAGES/chapters/appendix/settings_directory.po
#	source/locale/it/LC_MESSAGES/chapters/controlling_mixxx.po
#	source/locale/it/LC_MESSAGES/chapters/djing_with_mixxx.po
#	source/locale/it/LC_MESSAGES/chapters/effects.po
#	source/locale/it/LC_MESSAGES/chapters/hardware.po
#	source/locale/it/LC_MESSAGES/chapters/introduction.po
#	source/locale/it/LC_MESSAGES/chapters/preferences.po
#	source/locale/it/LC_MESSAGES/chapters/preferences/beat_detection.po
#	source/locale/it/LC_MESSAGES/chapters/preferences/sound_hardware.po
#	source/locale/it/LC_MESSAGES/chapters/quickstart.po
#	source/locale/it/LC_MESSAGES/chapters/user_interface.po
#	source/locale/it/LC_MESSAGES/chapters/vinyl_control.po
#	source/locale/it/LC_MESSAGES/glossary.po
#	source/locale/it/LC_MESSAGES/hardware/controllers/allen_heath_xone_k2_k1.po
#	source/locale/it/LC_MESSAGES/index.po
#	source/locale/it/LC_MESSAGES/sphinx.po
#	source/locale/ja/LC_MESSAGES/chapters/advanced_topics.po
#	source/locale/ja/LC_MESSAGES/chapters/appendix.po
#	source/locale/ja/LC_MESSAGES/chapters/appendix/mixxx_controls.po
#	source/locale/ja/LC_MESSAGES/chapters/appendix/settings_directory.po
#	source/locale/ja/LC_MESSAGES/chapters/controlling_mixxx.po
#	source/locale/ja/LC_MESSAGES/chapters/effects.po
#	source/locale/ja/LC_MESSAGES/chapters/hardware.po
#	source/locale/ja/LC_MESSAGES/chapters/introduction.po
#	source/locale/ja/LC_MESSAGES/chapters/library.po
#	source/locale/ja/LC_MESSAGES/chapters/preferences/beat_detection.po
#	source/locale/ja/LC_MESSAGES/chapters/preferences/sound_hardware.po
#	source/locale/ja/LC_MESSAGES/chapters/user_interface.po
#	source/locale/ja/LC_MESSAGES/chapters/vinyl_control.po
#	source/locale/ja/LC_MESSAGES/glossary.po
#	source/locale/ja/LC_MESSAGES/hardware/controllers/allen_heath_xone_k2_k1.po
#	source/locale/nl/LC_MESSAGES/chapters/advanced_topics.po
#	source/locale/nl/LC_MESSAGES/chapters/appendix.po
#	source/locale/nl/LC_MESSAGES/chapters/appendix/mixxx_controls.po
#	source/locale/nl/LC_MESSAGES/chapters/appendix/settings_directory.po
#	source/locale/nl/LC_MESSAGES/chapters/controlling_mixxx.po
#	source/locale/nl/LC_MESSAGES/chapters/djing_with_mixxx.po
#	source/locale/nl/LC_MESSAGES/chapters/effects.po
#	source/locale/nl/LC_MESSAGES/chapters/example_setups.po
#	source/locale/nl/LC_MESSAGES/chapters/getting_involved.po
#	source/locale/nl/LC_MESSAGES/chapters/getting_started.po
#	source/locale/nl/LC_MESSAGES/chapters/hardware.po
#	source/locale/nl/LC_MESSAGES/chapters/introduction.po
#	source/locale/nl/LC_MESSAGES/chapters/library.po
#	source/locale/nl/LC_MESSAGES/chapters/livebroadcasting.po
#	source/locale/nl/LC_MESSAGES/chapters/microphones.po
#	source/locale/nl/LC_MESSAGES/chapters/preferences.po
#	source/locale/nl/LC_MESSAGES/chapters/preferences/beat_detection.po
#	source/locale/nl/LC_MESSAGES/chapters/preferences/sound_hardware.po
#	source/locale/nl/LC_MESSAGES/chapters/quickstart.po
#	source/locale/nl/LC_MESSAGES/chapters/user_interface.po
#	source/locale/nl/LC_MESSAGES/chapters/vinyl_control.po
#	source/locale/nl/LC_MESSAGES/glossary.po
#	source/locale/nl/LC_MESSAGES/hardware/controllers/allen_heath_xone_k2_k1.po
#	source/locale/nl/LC_MESSAGES/index.po
#	source/locale/nl/LC_MESSAGES/sphinx.po
#	source/locale/pl/LC_MESSAGES/chapters/advanced_topics.po
#	source/locale/pl/LC_MESSAGES/chapters/appendix/mixxx_controls.po
#	source/locale/pl/LC_MESSAGES/chapters/appendix/settings_directory.po
#	source/locale/pl/LC_MESSAGES/chapters/effects.po
#	source/locale/pl/LC_MESSAGES/chapters/hardware.po
#	source/locale/pl/LC_MESSAGES/chapters/library.po
#	source/locale/pl/LC_MESSAGES/chapters/livebroadcasting.po
#	source/locale/pl/LC_MESSAGES/chapters/preferences.po
#	source/locale/pl/LC_MESSAGES/chapters/preferences/beat_detection.po
#	source/locale/pl/LC_MESSAGES/chapters/preferences/sound_hardware.po
#	source/locale/pl/LC_MESSAGES/chapters/user_interface.po
#	source/locale/pl/LC_MESSAGES/chapters/vinyl_control.po
#	source/locale/pl/LC_MESSAGES/glossary.po
#	source/locale/pl/LC_MESSAGES/hardware/controllers/allen_heath_xone_k2_k1.po
#	source/locale/pot/chapters/advanced_topics.pot
#	source/locale/pot/chapters/appendix/mixxx_controls.pot
#	source/locale/pot/chapters/appendix/settings_directory.pot
#	source/locale/pot/chapters/preferences/beat_detection.pot
#	source/locale/pot/chapters/preferences/sound_hardware.pot
#	source/locale/pot/chapters/user_interface.pot
#	source/locale/pot/hardware/controllers/allen_heath_xone_k2_k1.pot
#	source/locale/pt/LC_MESSAGES/chapters/advanced_topics.po
#	source/locale/pt/LC_MESSAGES/chapters/appendix.po
#	source/locale/pt/LC_MESSAGES/chapters/appendix/mixxx_controls.po
#	source/locale/pt/LC_MESSAGES/chapters/appendix/settings_directory.po
#	source/locale/pt/LC_MESSAGES/chapters/controlling_mixxx.po
#	source/locale/pt/LC_MESSAGES/chapters/djing_with_mixxx.po
#	source/locale/pt/LC_MESSAGES/chapters/effects.po
#	source/locale/pt/LC_MESSAGES/chapters/example_setups.po
#	source/locale/pt/LC_MESSAGES/chapters/getting_involved.po
#	source/locale/pt/LC_MESSAGES/chapters/getting_started.po
#	source/locale/pt/LC_MESSAGES/chapters/hardware.po
#	source/locale/pt/LC_MESSAGES/chapters/introduction.po
#	source/locale/pt/LC_MESSAGES/chapters/library.po
#	source/locale/pt/LC_MESSAGES/chapters/livebroadcasting.po
#	source/locale/pt/LC_MESSAGES/chapters/preferences.po
#	source/locale/pt/LC_MESSAGES/chapters/preferences/beat_detection.po
#	source/locale/pt/LC_MESSAGES/chapters/preferences/sound_hardware.po
#	source/locale/pt/LC_MESSAGES/chapters/quickstart.po
#	source/locale/pt/LC_MESSAGES/chapters/user_interface.po
#	source/locale/pt/LC_MESSAGES/chapters/vinyl_control.po
#	source/locale/pt/LC_MESSAGES/glossary.po
#	source/locale/pt/LC_MESSAGES/hardware/controllers/allen_heath_xone_k2_k1.po
#	source/locale/pt/LC_MESSAGES/index.po
#	source/locale/pt/LC_MESSAGES/sphinx.po
#	source/locale/pt_BR/LC_MESSAGES/chapters/advanced_topics.po
#	source/locale/pt_BR/LC_MESSAGES/chapters/appendix.po
#	source/locale/pt_BR/LC_MESSAGES/chapters/appendix/mixxx_controls.po
#	source/locale/pt_BR/LC_MESSAGES/chapters/appendix/settings_directory.po
#	source/locale/pt_BR/LC_MESSAGES/chapters/controlling_mixxx.po
#	source/locale/pt_BR/LC_MESSAGES/chapters/djing_with_mixxx.po
#	source/locale/pt_BR/LC_MESSAGES/chapters/effects.po
#	source/locale/pt_BR/LC_MESSAGES/chapters/example_setups.po
#	source/locale/pt_BR/LC_MESSAGES/chapters/getting_involved.po
#	source/locale/pt_BR/LC_MESSAGES/chapters/getting_started.po
#	source/locale/pt_BR/LC_MESSAGES/chapters/hardware.po
#	source/locale/pt_BR/LC_MESSAGES/chapters/introduction.po
#	source/locale/pt_BR/LC_MESSAGES/chapters/library.po
#	source/locale/pt_BR/LC_MESSAGES/chapters/livebroadcasting.po
#	source/locale/pt_BR/LC_MESSAGES/chapters/preferences.po
#	source/locale/pt_BR/LC_MESSAGES/chapters/preferences/beat_detection.po
#	source/locale/pt_BR/LC_MESSAGES/chapters/preferences/sound_hardware.po
#	source/locale/pt_BR/LC_MESSAGES/chapters/quickstart.po
#	source/locale/pt_BR/LC_MESSAGES/chapters/user_interface.po
#	source/locale/pt_BR/LC_MESSAGES/chapters/vinyl_control.po
#	source/locale/pt_BR/LC_MESSAGES/glossary.po
#	source/locale/pt_BR/LC_MESSAGES/hardware/controllers/allen_heath_xone_k2_k1.po
#	source/locale/pt_BR/LC_MESSAGES/index.po
#	source/locale/ro/LC_MESSAGES/chapters/advanced_topics.po
#	source/locale/ro/LC_MESSAGES/chapters/appendix/mixxx_controls.po
#	source/locale/ro/LC_MESSAGES/chapters/appendix/settings_directory.po
#	source/locale/ro/LC_MESSAGES/chapters/controlling_mixxx.po
#	source/locale/ro/LC_MESSAGES/chapters/effects.po
#	source/locale/ro/LC_MESSAGES/chapters/example_setups.po
#	source/locale/ro/LC_MESSAGES/chapters/getting_involved.po
#	source/locale/ro/LC_MESSAGES/chapters/getting_started.po
#	source/locale/ro/LC_MESSAGES/chapters/hardware.po
#	source/locale/ro/LC_MESSAGES/chapters/introduction.po
#	source/locale/ro/LC_MESSAGES/chapters/library.po
#	source/locale/ro/LC_MESSAGES/chapters/livebroadcasting.po
#	source/locale/ro/LC_MESSAGES/chapters/preferences.po
#	source/locale/ro/LC_MESSAGES/chapters/preferences/beat_detection.po
#	source/locale/ro/LC_MESSAGES/chapters/preferences/sound_hardware.po
#	source/locale/ro/LC_MESSAGES/chapters/quickstart.po
#	source/locale/ro/LC_MESSAGES/chapters/user_interface.po
#	source/locale/ro/LC_MESSAGES/chapters/vinyl_control.po
#	source/locale/ro/LC_MESSAGES/glossary.po
#	source/locale/ro/LC_MESSAGES/hardware/controllers/allen_heath_xone_k2_k1.po
#	source/locale/ro/LC_MESSAGES/index.po
#	source/locale/ru/LC_MESSAGES/404.po
#	source/locale/ru/LC_MESSAGES/chapters/advanced_topics.po
#	source/locale/ru/LC_MESSAGES/chapters/appendix/mixxx_controls.po
#	source/locale/ru/LC_MESSAGES/chapters/appendix/settings_directory.po
#	source/locale/ru/LC_MESSAGES/chapters/djing_with_mixxx.po
#	source/locale/ru/LC_MESSAGES/chapters/effects.po
#	source/locale/ru/LC_MESSAGES/chapters/getting_started.po
#	source/locale/ru/LC_MESSAGES/chapters/hardware.po
#	source/locale/ru/LC_MESSAGES/chapters/introduction.po
#	source/locale/ru/LC_MESSAGES/chapters/library.po
#	source/locale/ru/LC_MESSAGES/chapters/livebroadcasting.po
#	source/locale/ru/LC_MESSAGES/chapters/preferences.po
#	source/locale/ru/LC_MESSAGES/chapters/preferences/beat_detection.po
#	source/locale/ru/LC_MESSAGES/chapters/preferences/sound_hardware.po
#	source/locale/ru/LC_MESSAGES/chapters/user_interface.po
#	source/locale/ru/LC_MESSAGES/chapters/vinyl_control.po
#	source/locale/ru/LC_MESSAGES/glossary.po
#	source/locale/ru/LC_MESSAGES/hardware/controllers/allen_heath_xone_k2_k1.po
#	source/locale/ru/LC_MESSAGES/index.po
#	source/locale/ru/LC_MESSAGES/sphinx.po
#	source/locale/sl/LC_MESSAGES/chapters/advanced_topics.po
#	source/locale/sl/LC_MESSAGES/chapters/appendix.po
#	source/locale/sl/LC_MESSAGES/chapters/appendix/mixxx_controls.po
#	source/locale/sl/LC_MESSAGES/chapters/appendix/settings_directory.po
#	source/locale/sl/LC_MESSAGES/chapters/controlling_mixxx.po
#	source/locale/sl/LC_MESSAGES/chapters/djing_with_mixxx.po
#	source/locale/sl/LC_MESSAGES/chapters/effects.po
#	source/locale/sl/LC_MESSAGES/chapters/example_setups.po
#	source/locale/sl/LC_MESSAGES/chapters/getting_involved.po
#	source/locale/sl/LC_MESSAGES/chapters/getting_started.po
#	source/locale/sl/LC_MESSAGES/chapters/hardware.po
#	source/locale/sl/LC_MESSAGES/chapters/introduction.po
#	source/locale/sl/LC_MESSAGES/chapters/library.po
#	source/locale/sl/LC_MESSAGES/chapters/livebroadcasting.po
#	source/locale/sl/LC_MESSAGES/chapters/microphones.po
#	source/locale/sl/LC_MESSAGES/chapters/preferences.po
#	source/locale/sl/LC_MESSAGES/chapters/preferences/beat_detection.po
#	source/locale/sl/LC_MESSAGES/chapters/preferences/sound_hardware.po
#	source/locale/sl/LC_MESSAGES/chapters/quickstart.po
#	source/locale/sl/LC_MESSAGES/chapters/user_interface.po
#	source/locale/sl/LC_MESSAGES/chapters/vinyl_control.po
#	source/locale/sl/LC_MESSAGES/glossary.po
#	source/locale/sl/LC_MESSAGES/hardware/controllers/allen_heath_xone_k2_k1.po
#	source/locale/sl/LC_MESSAGES/index.po
#	source/locale/sl/LC_MESSAGES/sphinx.po
#	source/locale/sq/LC_MESSAGES/chapters/advanced_topics.po
#	source/locale/sq/LC_MESSAGES/chapters/appendix/mixxx_controls.po
#	source/locale/sq/LC_MESSAGES/chapters/appendix/settings_directory.po
#	source/locale/sq/LC_MESSAGES/chapters/effects.po
#	source/locale/sq/LC_MESSAGES/chapters/preferences/beat_detection.po
#	source/locale/sq/LC_MESSAGES/chapters/preferences/sound_hardware.po
#	source/locale/sq/LC_MESSAGES/chapters/user_interface.po
#	source/locale/sq/LC_MESSAGES/glossary.po
#	source/locale/sq/LC_MESSAGES/hardware/controllers/allen_heath_xone_k2_k1.po
#	source/locale/sq/LC_MESSAGES/sphinx.po
#	source/locale/sr/LC_MESSAGES/chapters/advanced_topics.po
#	source/locale/sr/LC_MESSAGES/chapters/appendix/mixxx_controls.po
#	source/locale/sr/LC_MESSAGES/chapters/appendix/settings_directory.po
#	source/locale/sr/LC_MESSAGES/chapters/effects.po
#	source/locale/sr/LC_MESSAGES/chapters/hardware.po
#	source/locale/sr/LC_MESSAGES/chapters/library.po
#	source/locale/sr/LC_MESSAGES/chapters/livebroadcasting.po
#	source/locale/sr/LC_MESSAGES/chapters/preferences.po
#	source/locale/sr/LC_MESSAGES/chapters/preferences/beat_detection.po
#	source/locale/sr/LC_MESSAGES/chapters/preferences/sound_hardware.po
#	source/locale/sr/LC_MESSAGES/chapters/user_interface.po
#	source/locale/sr/LC_MESSAGES/chapters/vinyl_control.po
#	source/locale/sr/LC_MESSAGES/glossary.po
#	source/locale/sr/LC_MESSAGES/hardware/controllers/allen_heath_xone_k2_k1.po
#	source/locale/sv/LC_MESSAGES/chapters/advanced_topics.po
#	source/locale/sv/LC_MESSAGES/chapters/appendix/mixxx_controls.po
#	source/locale/sv/LC_MESSAGES/chapters/appendix/settings_directory.po
#	source/locale/sv/LC_MESSAGES/chapters/preferences/beat_detection.po
#	source/locale/sv/LC_MESSAGES/chapters/preferences/sound_hardware.po
#	source/locale/sv/LC_MESSAGES/chapters/user_interface.po
#	source/locale/sv/LC_MESSAGES/hardware/controllers/allen_heath_xone_k2_k1.po
#	source/locale/tr/LC_MESSAGES/chapters/advanced_topics.po
#	source/locale/tr/LC_MESSAGES/chapters/appendix/mixxx_controls.po
#	source/locale/tr/LC_MESSAGES/chapters/appendix/settings_directory.po
#	source/locale/tr/LC_MESSAGES/chapters/controlling_mixxx.po
#	source/locale/tr/LC_MESSAGES/chapters/effects.po
#	source/locale/tr/LC_MESSAGES/chapters/hardware.po
#	source/locale/tr/LC_MESSAGES/chapters/preferences.po
#	source/locale/tr/LC_MESSAGES/chapters/preferences/beat_detection.po
#	source/locale/tr/LC_MESSAGES/chapters/preferences/sound_hardware.po
#	source/locale/tr/LC_MESSAGES/chapters/user_interface.po
#	source/locale/tr/LC_MESSAGES/hardware/controllers/allen_heath_xone_k2_k1.po
#	source/locale/tr/LC_MESSAGES/index.po
#	source/locale/zh_CN/LC_MESSAGES/chapters/advanced_topics.po
#	source/locale/zh_CN/LC_MESSAGES/chapters/appendix/mixxx_controls.po
#	source/locale/zh_CN/LC_MESSAGES/chapters/appendix/settings_directory.po
#	source/locale/zh_CN/LC_MESSAGES/chapters/controlling_mixxx.po
#	source/locale/zh_CN/LC_MESSAGES/chapters/effects.po
#	source/locale/zh_CN/LC_MESSAGES/chapters/getting_involved.po
#	source/locale/zh_CN/LC_MESSAGES/chapters/getting_started.po
#	source/locale/zh_CN/LC_MESSAGES/chapters/hardware.po
#	source/locale/zh_CN/LC_MESSAGES/chapters/introduction.po
#	source/locale/zh_CN/LC_MESSAGES/chapters/library.po
#	source/locale/zh_CN/LC_MESSAGES/chapters/livebroadcasting.po
#	source/locale/zh_CN/LC_MESSAGES/chapters/preferences.po
#	source/locale/zh_CN/LC_MESSAGES/chapters/preferences/beat_detection.po
#	source/locale/zh_CN/LC_MESSAGES/chapters/preferences/sound_hardware.po
#	source/locale/zh_CN/LC_MESSAGES/chapters/user_interface.po
#	source/locale/zh_CN/LC_MESSAGES/chapters/vinyl_control.po
#	source/locale/zh_CN/LC_MESSAGES/glossary.po
#	source/locale/zh_CN/LC_MESSAGES/hardware/controllers/allen_heath_xone_k2_k1.po
#	source/locale/zh_TW/LC_MESSAGES/chapters/advanced_topics.po
#	source/locale/zh_TW/LC_MESSAGES/chapters/appendix/mixxx_controls.po
#	source/locale/zh_TW/LC_MESSAGES/chapters/appendix/settings_directory.po
#	source/locale/zh_TW/LC_MESSAGES/chapters/effects.po
#	source/locale/zh_TW/LC_MESSAGES/chapters/hardware.po
#	source/locale/zh_TW/LC_MESSAGES/chapters/library.po
#	source/locale/zh_TW/LC_MESSAGES/chapters/livebroadcasting.po
#	source/locale/zh_TW/LC_MESSAGES/chapters/preferences.po
#	source/locale/zh_TW/LC_MESSAGES/chapters/preferences/beat_detection.po
#	source/locale/zh_TW/LC_MESSAGES/chapters/preferences/sound_hardware.po
#	source/locale/zh_TW/LC_MESSAGES/chapters/user_interface.po
#	source/locale/zh_TW/LC_MESSAGES/chapters/vinyl_control.po
#	source/locale/zh_TW/LC_MESSAGES/glossary.po
#	source/locale/zh_TW/LC_MESSAGES/hardware/controllers/allen_heath_xone_k2_k1.po
  • Loading branch information
daschuer committed Feb 23, 2024
2 parents 2279882 + 92ef4e0 commit 85dbd0c
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Trigger Rebuild
uses: peter-evans/repository-dispatch@v2
uses: peter-evans/repository-dispatch@v3
if: env.GIT_DIRTY != null && env.GIT_DIRTY != '0' && env.MIXXXBOT_TOKEN != null
with:
token: ${{ env.MIXXXBOT_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
- uses: pre-commit/[email protected].0
- uses: pre-commit/[email protected].1
env:
SKIP: rstcheck

Expand Down
52 changes: 36 additions & 16 deletions source/chapters/appendix/mixxx_controls.rst
Original file line number Diff line number Diff line change
Expand Up @@ -538,6 +538,7 @@ Any control listed above for :mixxx:cogroupref:`[ChannelN]` will work for a samp
Its value is set to the sample position of the closest beat of the active beat and is used for updating the beat LEDs.

:range: -1, 0.0, real-valued
:feedback: None

Expand All @@ -546,6 +547,7 @@ Any control listed above for :mixxx:cogroupref:`[ChannelN]` will work for a samp
[SamplerN],beat_distance
Outputs the relative position of the play marker in the section between the the previous and next beat marker.

:range: 0.0 - 1.0, real-valued
:feedback: None

Expand All @@ -554,9 +556,9 @@ Any control listed above for :mixxx:cogroupref:`[ChannelN]` will work for a samp
[PreviewDeckN],beatjump
[SamplerN],beatjump
Jump forward by :mixxx:coref:`beatjump_size <[ChannelN],beatjump_size>` (positive) or backward by :mixxx:coref:`beatjump_size <[ChannelN],beatjump_size>` (negative). If a loop is active, the loop is moved by :mixxx:coref:`beatjump_size <[ChannelN],beatjump_size>`.
Jump forward (positive) or backward (negative) by N beats. If a loop is active, the loop is moved by X beats.

:range: real number, -1, 0, 1
:range: any real number within the range, see :mixxx:coref:`[ChannelN],beatloop_X_activate`
:feedback: Player jumps forward or backward by X beats.

.. versionadded:: 2.0.0
Expand All @@ -566,7 +568,8 @@ Any control listed above for :mixxx:cogroupref:`[ChannelN]` will work for a samp
[PreviewDeckN],beatjump_size
[SamplerN],beatjump_size
Set the number of beats to jump with :mixxx:coref:`beatjump_forward <[ChannelN],beatjump_forward>`/:mixxx:coref:`beatjump_backward <[ChannelN],beatjump_backward>`.
Set the number of beats to jump with :mixxx:coref:`beatjump_forward <[ChannelN],beatjump_forward>`
/:mixxx:coref:`beatjump_backward <[ChannelN],beatjump_backward>`.

:range: positive real number
:feedback: Beatjump size spinbox
Expand Down Expand Up @@ -602,7 +605,8 @@ Any control listed above for :mixxx:cogroupref:`[ChannelN]` will work for a samp
[PreviewDeckN],beatjump_forward
[SamplerN],beatjump_forward
Jump forward by :mixxx:coref:`beatjump_size <[ChannelN],beatjump_size>`. If a loop is active, the loop is moved forward by X beats.
Jump forward by :mixxx:coref:`beatjump_size <[ChannelN],beatjump_size>`.
If a loop is active, the loop is moved forward by X beats.

:range: binary
:feedback: Player jumps forward by :mixxx:coref:`beatjump_size <[ChannelN],beatjump_size>`.
Expand All @@ -614,7 +618,8 @@ Any control listed above for :mixxx:cogroupref:`[ChannelN]` will work for a samp
[PreviewDeckN],beatjump_backward
[SamplerN],beatjump_backward
Jump backward by :mixxx:coref:`beatjump_size <[ChannelN],beatjump_size>`. If a loop is active, the loop is moved backward by X beats.
Jump backward by :mixxx:coref:`beatjump_size <[ChannelN],beatjump_size>`.
If a loop is active, the loop is moved backward by X beats.

:range: binary
:feedback: Player jumps backward by :mixxx:coref:`beatjump_size <[ChannelN],beatjump_size>`.
Expand All @@ -626,7 +631,9 @@ Any control listed above for :mixxx:cogroupref:`[ChannelN]` will work for a samp
[PreviewDeckN],beatjump_X_forward
[SamplerN],beatjump_X_forward
Jump forward by X beats. A control exists for X = 0.03125, 0.0625, 0.125, 0.25, 0.5, 1, 2, 4, 8, 16, 32, 64. If a loop is active, the loop is moved forward by X betas.
Jump forward by X beats. A control exists for
X = 0.03125, 0.0625, 0.125, 0.25, 0.5, 1, 2, 4, 8, 16, 32, 64, 128, 256, 512.
If a loop is active, the loop is moved forward by X beats.

:range: binary
:feedback: Player jumps forward by X beats.
Expand All @@ -638,7 +645,9 @@ Any control listed above for :mixxx:cogroupref:`[ChannelN]` will work for a samp
[PreviewDeckN],beatjump_X_backward
[SamplerN],beatjump_X_backward
Jump backward by X beats. A control exists for X = 0.03125, 0.0625, 0.125, 0.25, 0.5, 1, 2, 4, 8, 16, 32, 64. If a loop is active, the loop is moved backward by X beats.
Jump backward by X beats. A control exists for
X = 0.03125, 0.0625, 0.125, 0.25, 0.5, 1, 2, 4, 8, 16, 32, 64, 128, 256, 512.
If a loop is active, the loop is moved backward by X beats.

:range: binary
:feedback: Player jumps backward by X beats.
Expand All @@ -662,7 +671,8 @@ Any control listed above for :mixxx:cogroupref:`[ChannelN]` will work for a samp
[PreviewDeckN],beatloop_X_activate
[SamplerN],beatloop_X_activate
Activates a loop over X beats. A control exists for X = 0.03125, 0.0625, 0.125, 0.25, 0.5, 1, 2, 4, 8, 16, 32, 64
Activates a loop over X beats. A control exists for
X = 0.03125, 0.0625, 0.125, 0.25, 0.5, 1, 2, 4, 8, 16, 32, 64, 128, 256, 512

:range: binary
:feedback: A loop is shown over X beats.
Expand All @@ -674,8 +684,11 @@ Any control listed above for :mixxx:cogroupref:`[ChannelN]` will work for a samp
[PreviewDeckN],beatloop_size
[SamplerN],beatloop_size
Set the length of the loop in beats that will get set with :mixxx:coref:`beatloop_activate <[ChannelN],beatloop_activate>` and :mixxx:coref:`beatlooproll_activate <[ChannelN],beatlooproll_activate>`.
Changing this will resize an existing loop if the length of the loop matches :mixxx:coref:`beatloop_size <[ChannelN],beatloop_size>`.
Set the length of the loop in beats that will get set with
:mixxx:coref:`beatloop_activate <[ChannelN],beatloop_activate>` and
:mixxx:coref:`beatlooproll_activate <[ChannelN],beatlooproll_activate>`.
Changing this will resize an existing loop if the length of the loop matches
:mixxx:coref:`beatloop_size <[ChannelN],beatloop_size>`.

:range: positive real number
:feedback: Beatloop size spinbox and possibly loop section on waveform
Expand All @@ -687,7 +700,8 @@ Any control listed above for :mixxx:cogroupref:`[ChannelN]` will work for a samp
[PreviewDeckN],beatloop_X_toggle
[SamplerN],beatloop_X_toggle
Toggles a loop over X beats. A control exists for X = 0.03125, 0.0625, 0.125, 0.25, 0.5, 1, 2, 4, 8, 16, 32, 64
Toggles a loop over X beats. A control exists for
X = 0.03125, 0.0625, 0.125, 0.25, 0.5, 1, 2, 4, 8, 16, 32, 64, 128, 256, 512

:range: binary
:feedback: A loop is shown over X beats.
Expand All @@ -711,7 +725,8 @@ Any control listed above for :mixxx:cogroupref:`[ChannelN]` will work for a samp
[PreviewDeckN],beatlooproll_activate
[SamplerN],beatlooproll_activate
Activates a rolling loop over :mixxx:coref:`beatloop_size <[ChannelN],beatloop_size>` beats. Once disabled, playback will resume where the track would have been if it had not entered the loop.
Activates a rolling loop over :mixxx:coref:`beatloop_size <[ChannelN],beatloop_size>` beats.
Once disabled, playback will resume where the track would have been if it had not entered the loop.

:range: binary
:feedback: A loop overlay is shown over :mixxx:coref:`beatloop_size <[ChannelN],beatloop_size>` beats on waveform.
Expand All @@ -723,7 +738,9 @@ Any control listed above for :mixxx:cogroupref:`[ChannelN]` will work for a samp
[PreviewDeckN],beatlooproll_X_activate
[SamplerN],beatlooproll_X_activate
Activates a rolling loop over X beats. Once disabled, playback will resume where the track would have been if it had not entered the loop. A control exists for X = 0.03125, 0.0625, 0.125, 0.25, 0.5, 1, 2, 4, 8, 16, 32, 64
Activates a rolling loop over X beats. Once disabled, playback will resume where the
track would have been if it had not entered the loop. A control exists for
X = 0.03125, 0.0625, 0.125, 0.25, 0.5, 1, 2, 4, 8, 16, 32, 64, 128, 256, 512

:range: binary
:feedback: Beatloop X button in skin is lit. A loop overlay is shown over X beats on waveform.
Expand Down Expand Up @@ -1749,7 +1766,8 @@ Any control listed above for :mixxx:cogroupref:`[ChannelN]` will work for a samp
[PreviewDeckN],loop_move_X_forward
[SamplerN],loop_move_X_forward
Moves the loop in and out points forward by X beats. A control exists for X = 0.03125, 0.0625, 0.125, 0.25, 0.5, 1, 2, 4, 8, 16, 32, 64
Moves the loop in and out points forward by X beats. A control exists for
X = 0.03125, 0.0625, 0.125, 0.25, 0.5, 1, 2, 4, 8, 16, 32, 64, 128, 256, 512

:range: binary
:feedback: Loop moves forward by X beats.
Expand All @@ -1765,7 +1783,8 @@ Any control listed above for :mixxx:cogroupref:`[ChannelN]` will work for a samp
[PreviewDeckN],loop_move_X_backward
[SamplerN],loop_move_X_backward
Loop moves by X beats. A control exists for X = 0.03125, 0.0625, 0.125, 0.25, 0.5, 1, 2, 4, 8, 16, 32, 64
Loop moves by X beats. A control exists for
X = 0.03125, 0.0625, 0.125, 0.25, 0.5, 1, 2, 4, 8, 16, 32, 64, 128, 256, 512

If a saved loop is currently enabled, the modification is saved to the hotcue slot immediately.

Expand All @@ -1781,7 +1800,8 @@ Any control listed above for :mixxx:cogroupref:`[ChannelN]` will work for a samp
[PreviewDeckN],loop_scale
[SamplerN],loop_scale
Scale the loop length by the value scale is set to by moving the end marker. :mixxx:coref:`beatloop_size <[ChannelN],beatloop_size>` is not updated to reflect the change.
Scale the loop length by the value scale is set to by moving the end marker.
:mixxx:coref:`beatloop_size <[ChannelN],beatloop_size>` is not updated to reflect the change.

If a saved loop is currently enabled, the modification is saved to the hotcue slot immediately.

Expand Down

0 comments on commit 85dbd0c

Please sign in to comment.