Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/2.4' into main
# Conflicts: # .tx/config # source/locale/ca/LC_MESSAGES/glossary.po # source/locale/de/LC_MESSAGES/chapters/introduction.po # source/locale/de/LC_MESSAGES/index.po # source/locale/fr/LC_MESSAGES/chapters/advanced_topics.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/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/user_interface.po # source/locale/fr/LC_MESSAGES/glossary.po # source/locale/it/LC_MESSAGES/chapters/advanced_topics.po # source/locale/pot/404.pot # source/locale/pot/chapters/advanced_topics.pot # source/locale/pot/chapters/appendix.pot # source/locale/pot/chapters/appendix/additional_resources.pot # source/locale/pot/chapters/appendix/application_shortcuts.pot # source/locale/pot/chapters/appendix/changelog.pot # source/locale/pot/chapters/appendix/commandline_dev_tools.pot # source/locale/pot/chapters/appendix/keyboard_mapping_table.pot # source/locale/pot/chapters/appendix/mixxx_controls.pot # source/locale/pot/chapters/appendix/settings_directory.pot # source/locale/pot/chapters/controlling_mixxx.pot # source/locale/pot/chapters/djing_with_mixxx.pot # source/locale/pot/chapters/effects.pot # source/locale/pot/chapters/example_setups.pot # source/locale/pot/chapters/getting_involved.pot # source/locale/pot/chapters/getting_started.pot # source/locale/pot/chapters/hardware.pot # source/locale/pot/chapters/introduction.pot # source/locale/pot/chapters/library.pot # source/locale/pot/chapters/livebroadcasting.pot # source/locale/pot/chapters/microphones.pot # source/locale/pot/chapters/preferences.pot # source/locale/pot/chapters/preferences/beat_detection.pot # source/locale/pot/chapters/preferences/colors.pot # source/locale/pot/chapters/preferences/equalizers.pot # source/locale/pot/chapters/preferences/key_detection.pot # source/locale/pot/chapters/preferences/library.pot # source/locale/pot/chapters/preferences/sound_hardware.pot # source/locale/pot/chapters/user_interface.pot # source/locale/pot/chapters/vinyl_control.pot # source/locale/pot/glossary.pot # source/locale/pot/hardware/controllers/akai_lpd8.pot # source/locale/pot/hardware/controllers/akai_mpd24.pot # source/locale/pot/hardware/controllers/allen_heath_xone_k2_k1.pot # source/locale/pot/hardware/controllers/american_audio_radius_2000.pot # source/locale/pot/hardware/controllers/american_audio_vms2.pot # source/locale/pot/hardware/controllers/american_audio_vms4.pot # source/locale/pot/hardware/controllers/behringer_bcd2000.pot # source/locale/pot/hardware/controllers/behringer_bcd3000.pot # source/locale/pot/hardware/controllers/behringer_bcr2000.pot # source/locale/pot/hardware/controllers/behringer_cmd_micro.pot # source/locale/pot/hardware/controllers/behringer_cmd_mm_1.pot # source/locale/pot/hardware/controllers/behringer_cmd_studio_4a.pot # source/locale/pot/hardware/controllers/behringer_ddm4000.pot # source/locale/pot/hardware/controllers/denon_dn_hs5500.pot # source/locale/pot/hardware/controllers/denon_dn_sc2000.pot # source/locale/pot/hardware/controllers/denon_mc3000.pot # source/locale/pot/hardware/controllers/denon_mc4000.pot # source/locale/pot/hardware/controllers/denon_mc6000mk2.pot # source/locale/pot/hardware/controllers/denon_mc7000.pot # source/locale/pot/hardware/controllers/dj_tech_cdj_101.pot # source/locale/pot/hardware/controllers/dj_tech_djm_101.pot # source/locale/pot/hardware/controllers/dj_tech_imix_reload.pot # source/locale/pot/hardware/controllers/dj_tech_kontrol_one.pot # source/locale/pot/hardware/controllers/dj_tech_mix_101.pot # source/locale/pot/hardware/controllers/dj_tech_mixer_one.pot # source/locale/pot/hardware/controllers/dj_techtools_midi_figher_classic.pot # source/locale/pot/hardware/controllers/dj_techtools_midi_figher_twister.pot # source/locale/pot/hardware/controllers/eks_otus.pot # source/locale/pot/hardware/controllers/electrix_tweaker.pot # source/locale/pot/hardware/controllers/evolution_x_session.pot # source/locale/pot/hardware/controllers/faderfox_dj2.pot # source/locale/pot/hardware/controllers/gemini_cdmp_7000.pot # source/locale/pot/hardware/controllers/gemini_firstmix.pot # source/locale/pot/hardware/controllers/hercules_dj_console_4_mx.pot # source/locale/pot/hardware/controllers/hercules_dj_console_mac_edition.pot # source/locale/pot/hardware/controllers/hercules_dj_console_mk1.pot # source/locale/pot/hardware/controllers/hercules_dj_console_mk2.pot # source/locale/pot/hardware/controllers/hercules_dj_console_mk4.pot # source/locale/pot/hardware/controllers/hercules_dj_console_rmx.pot # source/locale/pot/hardware/controllers/hercules_dj_console_rmx2.pot # source/locale/pot/hardware/controllers/hercules_djcontrol_MIX.pot # source/locale/pot/hardware/controllers/hercules_djcontrol_air.pot # source/locale/pot/hardware/controllers/hercules_djcontrol_compact.pot # source/locale/pot/hardware/controllers/hercules_djcontrol_inpulse_200.pot # source/locale/pot/hardware/controllers/hercules_djcontrol_inpulse_300.pot # source/locale/pot/hardware/controllers/hercules_djcontrol_instinct.pot # source/locale/pot/hardware/controllers/hercules_djcontrol_jogvision.pot # source/locale/pot/hardware/controllers/hercules_djcontrol_mp3.pot # source/locale/pot/hardware/controllers/hercules_djcontrol_mp3_e2.pot # source/locale/pot/hardware/controllers/hercules_djcontrol_starlight.pot # source/locale/pot/hardware/controllers/hercules_p32_dj.pot # source/locale/pot/hardware/controllers/ion_discover_dj.pot # source/locale/pot/hardware/controllers/ion_discover_dj_pro.pot # source/locale/pot/hardware/controllers/keith_mcmillen_quneo.pot # source/locale/pot/hardware/controllers/kontrol_dj_kdj500.pot # source/locale/pot/hardware/controllers/korg_kaoss_dj.pot # source/locale/pot/hardware/controllers/korg_nanokontrol.pot # source/locale/pot/hardware/controllers/korg_nanokontrol2.pot # source/locale/pot/hardware/controllers/korg_nanopad2.pot # source/locale/pot/hardware/controllers/m_audio_x_session_pro.pot # source/locale/pot/hardware/controllers/m_audio_xponent.pot # source/locale/pot/hardware/controllers/miditech_midicontrol.pot # source/locale/pot/hardware/controllers/mixman_dm2.pot # source/locale/pot/hardware/controllers/mixvibes_u_mix_control_2.pot # source/locale/pot/hardware/controllers/native_instruments_traktor_kontrol_f1.pot # source/locale/pot/hardware/controllers/native_instruments_traktor_kontrol_s2_mk1.pot # source/locale/pot/hardware/controllers/native_instruments_traktor_kontrol_s2_mk2.pot # source/locale/pot/hardware/controllers/native_instruments_traktor_kontrol_s2_mk3.pot # source/locale/pot/hardware/controllers/native_instruments_traktor_kontrol_s3.pot # source/locale/pot/hardware/controllers/native_instruments_traktor_kontrol_s4_mk2.pot # source/locale/pot/hardware/controllers/native_instruments_traktor_kontrol_s4_mk3.pot # source/locale/pot/hardware/controllers/native_instruments_traktor_kontrol_x1.pot # source/locale/pot/hardware/controllers/native_instruments_traktor_kontrol_z1.pot # source/locale/pot/hardware/controllers/nintendo_wiimote.pot # source/locale/pot/hardware/controllers/novation_dicer.pot # source/locale/pot/hardware/controllers/novation_launchpad_mini.pot # source/locale/pot/hardware/controllers/novation_launchpad_mk1.pot # source/locale/pot/hardware/controllers/novation_launchpad_mk2.pot # source/locale/pot/hardware/controllers/novation_twitch.pot # source/locale/pot/hardware/controllers/numark_dj2go.pot # source/locale/pot/hardware/controllers/numark_dj2go2_touch.pot # source/locale/pot/hardware/controllers/numark_idj_live_ii.pot # source/locale/pot/hardware/controllers/numark_mixtrack.pot # source/locale/pot/hardware/controllers/numark_mixtrack_platinum.pot # source/locale/pot/hardware/controllers/numark_mixtrack_pro.pot # source/locale/pot/hardware/controllers/numark_mixtrack_pro_3.pot # source/locale/pot/hardware/controllers/numark_mixtrack_pro_fx.pot # source/locale/pot/hardware/controllers/numark_mixtrack_pro_ii.pot # source/locale/pot/hardware/controllers/numark_n4.pot # source/locale/pot/hardware/controllers/numark_ns7.pot # source/locale/pot/hardware/controllers/numark_omni_control.pot # source/locale/pot/hardware/controllers/numark_party_mix.pot # source/locale/pot/hardware/controllers/numark_total_control.pot # source/locale/pot/hardware/controllers/numark_v7.pot # source/locale/pot/hardware/controllers/pioneer_cdj_2000.pot # source/locale/pot/hardware/controllers/pioneer_cdj_350.pot # source/locale/pot/hardware/controllers/pioneer_cdj_850.pot # source/locale/pot/hardware/controllers/pioneer_ddj_200.pot # source/locale/pot/hardware/controllers/pioneer_ddj_400.pot # source/locale/pot/hardware/controllers/pioneer_ddj_flx4.pot # source/locale/pot/hardware/controllers/pioneer_ddj_sb.pot # source/locale/pot/hardware/controllers/pioneer_ddj_sb2.pot # source/locale/pot/hardware/controllers/pioneer_ddj_sb3.pot # source/locale/pot/hardware/controllers/pioneer_ddj_sx.pot # source/locale/pot/hardware/controllers/reloop_beatmix_2.pot # source/locale/pot/hardware/controllers/reloop_beatmix_4.pot # source/locale/pot/hardware/controllers/reloop_beatpad.pot # source/locale/pot/hardware/controllers/reloop_digital_jockey_2_controller_edition.pot # source/locale/pot/hardware/controllers/reloop_digital_jockey_2_master_edition.pot # source/locale/pot/hardware/controllers/reloop_jockey_3_master_edition.pot # source/locale/pot/hardware/controllers/reloop_terminal_mix_series.pot # source/locale/pot/hardware/controllers/roland_dj_505.pot # source/locale/pot/hardware/controllers/sony_sixxaxis.pot # source/locale/pot/hardware/controllers/soundless_studio_joymidi.pot # source/locale/pot/hardware/controllers/stanton_djc_4.pot # source/locale/pot/hardware/controllers/stanton_scs1d.pot # source/locale/pot/hardware/controllers/stanton_scs1m.pot # source/locale/pot/hardware/controllers/stanton_scs3d.pot # source/locale/pot/hardware/controllers/stanton_scs3m.pot # source/locale/pot/hardware/controllers/tascam_us_428.pot # source/locale/pot/hardware/controllers/trakprodj.pot # source/locale/pot/hardware/controllers/vestax_sphin.pot # source/locale/pot/hardware/controllers/vestax_typhoon.pot # source/locale/pot/hardware/controllers/vestax_vci_100_mixvibes_3dex_edition.pot # source/locale/pot/hardware/controllers/vestax_vci_100mki.pot # source/locale/pot/hardware/controllers/vestax_vci_100mkii.pot # source/locale/pot/hardware/controllers/vestax_vci_300.pot # source/locale/pot/hardware/controllers/vestax_vci_400.pot # source/locale/pot/hardware/controllers/yaeltex_minimixxx.pot # source/locale/pot/hardware/manuals.pot # source/locale/pot/index.pot # source/locale/pot/sphinx.pot
- Loading branch information
