This should ensure that python produces the same tools.pot for every user, and thus that the .po will not get useless diffs upon merge.
@@ -7,7 +7,7 @@ LANGS = $(POFILES:%.po=%)
all: update merge
update:
- @cd ../..; python tools/translations/extract.py
+ @cd ../..; python2 tools/translations/extract.py
merge:
@for po in $(POFILES); do \
@@ -31,6 +31,7 @@ for root, dirnames, filenames in os.walk('.'):
if (filename.find("collada") != -1):
continue
matches.append(os.path.join(root, filename))
+matches.sort()
unique_str = []