Merge branch '2.3' of [email protected]:mixxxdj/mixxx.git into main

Excluding all .ts/.qm files from the merge. # Conflicts: # .tx/config
Holzhaus · Dec 15, 2020 · a2f1543 · a2f1543
2 parents 95a5716 + c301fdf
commit a2f1543
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 11 deletions.
diff --git 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
@@ -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