[Scummvm-git-logs] scummvm master -> b70011853a574b54ac1c4721d38c8e8fa2bb6f1f

[criezy]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
b70011853a I18N: Use --previous option for msgmerg


Commit: b70011853a574b54ac1c4721d38c8e8fa2bb6f1f
    https://github.com/scummvm/scummvm/commit/b70011853a574b54ac1c4721d38c8e8fa2bb6f1f
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2023-12-15T09:37:58Z

Commit Message:
I18N: Use --previous option for msgmerg

When a message is change, this includes the previous version of the
message in the po files. This is used by Weblate to show a diff, which
helps the translators see what has change and update their translations,
When weblate updates the po file itself, it already uses this option.
So this brings the `make po/*.po` command, that we can use to update
the files manually, inline with what Weblate does.

Changed paths:
    po/module.mk


diff --git a/po/module.mk b/po/module.mk
index 87105f10a8f..42fb60a789f 100644
--- a/po/module.mk
+++ b/po/module.mk
@@ -28,7 +28,7 @@ updatepot:
 	fi;
 
 %.po: $(POTFILE)
-	msgmerge $@ $(POTFILE) -o $@.new
+	msgmerge $@ $(POTFILE) --previous -o $@.new
 	if cmp $@ $@.new >/dev/null 2>&1; then \
 		rm -f $@.new; \
 	else \