Skip to content

Commit c66ac0f

Browse files
committed
Merge remote-tracking branch 'upstream/2.5' into tx_precommit
2 parents 44cba30 + 01b6a9b commit c66ac0f

750 files changed

Lines changed: 126779 additions & 80408 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-24.04
1616
if: github.event_name == 'push' || github.event_name == 'repository_dispatch'
1717
steps:
18-
- uses: actions/checkout@v6
18+
- uses: actions/checkout@v7
1919
with:
2020
ref: main
2121
fetch-depth: 0
@@ -43,7 +43,7 @@ jobs:
4343
name: PDF
4444
runs-on: ubuntu-latest
4545
steps:
46-
- uses: actions/checkout@v6
46+
- uses: actions/checkout@v7
4747
- name: Setup PDF Build Dependencies
4848
run: >
4949
sudo apt-get update && sudo apt-get install -y

.github/workflows/changelog.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Event Information
2222
run: echo "Event '${{ github.event.action }}' received from '${{ github.event.client_payload.repository }}'"
2323
- name: Check out repository
24-
uses: actions/checkout@v6
24+
uses: actions/checkout@v7
2525
with:
2626
ref: ${{ github.event.client_payload.branch }}
2727
- name: Set up Python

.github/workflows/pre-commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: "Check out repository"
12-
uses: actions/checkout@v6
12+
uses: actions/checkout@v7
1313
with:
1414
# Fetch the previous commit to be able to check for changes
1515
fetch-depth: 2

.github/workflows/sphinx.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Clone repository
13-
uses: actions/checkout@v6
13+
uses: actions/checkout@v7
1414
- name: Set up Python
1515
uses: actions/setup-python@v6
1616
with:
@@ -27,7 +27,7 @@ jobs:
2727
runs-on: ubuntu-latest
2828
steps:
2929
- name: Clone repository
30-
uses: actions/checkout@v6
30+
uses: actions/checkout@v7
3131
- name: Set up Graphviz
3232
run: sudo apt update && sudo apt install -y graphviz
3333
- name: Set up Python

.tx/config

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,15 @@ resource_name = chapters--preferences--library
271271
replace_edited_strings = false
272272
keep_translations = false
273273

274+
[o:mixxx-dj-software:p:mixxx-dj-manual-25:r:chapters--preferences--mixer]
275+
file_filter = source/locale/<lang>/LC_MESSAGES/chapters/preferences/mixer.po
276+
source_file = source/locale/pot/chapters/preferences/mixer.pot
277+
type = PO
278+
minimum_perc = 0
279+
resource_name = chapters--preferences--mixer
280+
replace_edited_strings = false
281+
keep_translations = false
282+
274283
[o:mixxx-dj-software:p:mixxx-dj-manual-25:r:chapters--preferences--sound_hardware]
275284
file_filter = source/locale/<lang>/LC_MESSAGES/chapters/preferences/sound_hardware.po
276285
source_file = source/locale/pot/chapters/preferences/sound_hardware.pot
@@ -873,6 +882,15 @@ resource_name = hardware--controllers--icon_p1_nano
873882
replace_edited_strings = false
874883
keep_translations = false
875884

885+
[o:mixxx-dj-software:p:mixxx-dj-manual-25:r:hardware--controllers--intech_TEK2]
886+
file_filter = source/locale/<lang>/LC_MESSAGES/hardware/controllers/intech_TEK2.po
887+
source_file = source/locale/pot/hardware/controllers/intech_TEK2.pot
888+
type = PO
889+
minimum_perc = 0
890+
resource_name = hardware--controllers--intech_TEK2
891+
replace_edited_strings = false
892+
keep_translations = false
893+
876894
[o:mixxx-dj-software:p:mixxx-dj-manual-25:r:hardware--controllers--ion_discover_dj]
877895
file_filter = source/locale/<lang>/LC_MESSAGES/hardware/controllers/ion_discover_dj.po
878896
source_file = source/locale/pot/hardware/controllers/ion_discover_dj.pot
@@ -1741,3 +1759,4 @@ minimum_perc = 0
17411759
resource_name = sphinx
17421760
replace_edited_strings = false
17431761
keep_translations = false
1762+
-63 KB
Binary file not shown.
133 KB
Loading
-63.5 KB
Loading
165 KB
Loading

source/_templates/keyboard_mapping_sheet.svg

Lines changed: 2 additions & 2 deletions
Loading

0 commit comments

Comments
 (0)