diff options
| author | Uwe Klotz <uklotz@mixxx.org> | 2020-12-15 17:55:08 +0100 |
|---|---|---|
| committer | Uwe Klotz <uklotz@mixxx.org> | 2020-12-15 17:55:08 +0100 |
| commit | a2f15439cfc482a0ea372e03ce907f0d4d997d6c (patch) | |
| tree | 8b68b414e50a5ba0881af19f9ff0fc4619a15cb0 | |
| parent | 95a5716a54b6bc0f937ea08755bdfc4cd01ee351 (diff) | |
| parent | c301fdf5a05150332663c56b2a46a4cab3daa5f5 (diff) | |
Merge branch '2.3' of git@github.com:mixxxdj/mixxx.git into main
Excluding all .ts/.qm files from the merge.
# Conflicts:
# .tx/config
| -rw-r--r-- | .gitattributes | 4 | ||||
| -rw-r--r-- | .tx/config | 7 |
2 files changed, 0 insertions, 11 deletions
diff --git a/.gitattributes b/.gitattributes index ae4a396de8..ea70d3db2c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -21,9 +21,5 @@ /res/translations/*.ts merge=ours /res/translations/*.qm merge=ours -# Exclude WiX translations from merging -/build/wix/Localization/po/*.po merge=ours -/build/wix/Localization/po/*.wxl merge=ours - # Treat serato test data as binary *.octet-stream binary diff --git a/.tx/config b/.tx/config index f6d9451caa..147f3123c5 100644 --- a/.tx/config +++ b/.tx/config @@ -8,10 +8,3 @@ source_file = res/translations/mixxx.ts source_lang = en minimum_perc = 0 type = QT - -[mixxxdj-windows-installer.mixxxpot] -file_filter = build/wix/Localization/po/<lang>.po -source_file = build/wix/Localization/po/mixxx.pot -source_lang = en_US -minimum_perc = 0 -type = PO |