[Pkg-isocodes-devel] [iso-codes] 01/03: Include the previous msgid in .po files

[Tobias Quathamer]

This is an automated email from the git hooks/post-receive script.

toddy pushed a commit to branch master
in repository iso-codes.

commit 8f9fc4508e9df9380ceba91cc55717c14991e0f2
Author: Dr. Tobias Quathamer <toddy at debian.org>
Date:   Sun Mar 6 19:44:42 2016 +0100

    Include the previous msgid in .po files
---
 common.mk | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/common.mk b/common.mk
index 0c9f44a..fa4c426 100644
--- a/common.mk
+++ b/common.mk
@@ -34,7 +34,8 @@ check-local:
 
 # This target merges all po files with the current pot file,
 # removes obsolete msgids and substitutes the Project-Id-Version
-# header with the correct value
+# header with the PROJECT only, removing the VERSION part.
+# This is done to keep the diff between releases small.
 #
 # NOTE:
 # Removing obsolete msgids is not the recommended way to go.
@@ -43,10 +44,13 @@ check-local:
 # with one (sometimes two or three) words, the fuzzy matching performed
 # with obsolete msgids will not ease the translator's work, but
 # will lead to confusing entries.
+#
+# However, if there is only a small change, we include the fuzzy
+# entry with the previous msgid to hopefully save some work.
 .PHONY: update-po
 update-po:
 	for pofile in $(pofiles); do \
-		$(MSGMERGE) --no-fuzzy-matching $$pofile $(DOMAIN).pot > tmpfile; \
+		$(MSGMERGE) --previous $$pofile $(DOMAIN).pot > tmpfile; \
 		$(MSGATTRIB) --no-obsolete tmpfile > $$pofile; \
 		sed -i -e 's/^\"Project-Id-Version: iso.*/\"Project-Id-Version: $(DOMAIN)\\n\"/' $$pofile; \
 	done

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-isocodes/iso-codes.git