From: Daniel P. Berrangé <berrange@redhat.com>
Date: Mon, 18 May 2020 16:46:31 +0000 (+0100)
Subject: po: generate .pot file with strings in alphabetical order
X-Git-Tag: v6.5.0-rc1~254
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=737cadff772c1bdc6ab9f2d695dd5e0cdf65016b;p=thirdparty%2Flibvirt.git

po: generate .pot file with strings in alphabetical order

The .po files are stored with strings in alphabetical order instead of
source file location order, because this minimizes the diffs created
when code moves around within or between files.

By default msgmerge will honour the order of strings in the .pot file
when creating a .po file, so it is useful if we also create the .pot
file with desired ordering.

Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/po/Makefile.am b/po/Makefile.am
index 224f16e993..a31f8ba584 100644
--- a/po/Makefile.am
+++ b/po/Makefile.am
@@ -32,6 +32,7 @@ XGETTEXT_ARGS = \
 	--package-name="$(PACKAGE_NAME)" \
 	--package-version="$(PACKAGE_VERSION)" \
 	--msgid-bugs-address="$(MSGID_BUGS_ADDRESS)" \
+	--sort-output \
 	$(NULL)
 
 SED_PO_FIXUP_ARGS = \