From nobody Sun Feb 8 07:25:28 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1589882139; cv=none; d=zohomail.com; s=zohoarc; b=bi3cg68wsy94m85aRyWNgdKrFXEp1F2uQpuWmMd+Hp41UMSolKeWaWTswIJYWtrgJp4n8UVSP0d0qHsnHGWvm6oSANdT5cji/7nvZIumeiJ4QvgxwZ/NKnvdUDM0uY0CHbpWHukaS6j54GD6L/FiMu4hDy1+jiEVeSka07JRScY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589882139; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/k48iCJfhpxFC0B3ZqbeftdXP94KTO/ILPeQMrjC5aI=; b=gqe0sFtSs+cB7q6bqRzPXZv2RYSBFPZ9gXdJF/E2iPHjZ0vjVQCkK37dmZOUOJyXafpFrCqkaxoh7/VPJuMYx6hVGTR1/HHk65vsyIVDChPx5ihYrDl40Ws5DoQmsLeoqd1AV/umjLuJmaypegqWO7PztvxC1WB8KJGFAJftiu0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1589882139961127.14196780531563; Tue, 19 May 2020 02:55:39 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-398-8_dOYonwNLiu6PR_qTkzjA-1; Tue, 19 May 2020 05:55:35 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A40A81009447; Tue, 19 May 2020 09:55:30 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 825D860C81; Tue, 19 May 2020 09:55:30 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 4FE601809543; Tue, 19 May 2020 09:55:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 04J9tSS7007908 for ; Tue, 19 May 2020 05:55:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id AE3C562A10; Tue, 19 May 2020 09:55:28 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.36.110.54]) by smtp.corp.redhat.com (Postfix) with ESMTP id C96BC1944E; Tue, 19 May 2020 09:55:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589882138; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=/k48iCJfhpxFC0B3ZqbeftdXP94KTO/ILPeQMrjC5aI=; b=Ltz6JNg51e1KTedPYdrZQQne7QAkBs13LLHXAiKlCwV3qI/NIMmaQcOIxaA/++sF8K5GDh m3cwuW+iP6o1G9o7m0SrBHX7RE6y9K9Y8kNjsBtarj65TyGIQ7NCNAZscfeeuYYvK7voeQ 7IW5Ow80kRY4PgrMY0FssX8eZP/cvNg= X-MC-Unique: 8_dOYonwNLiu6PR_qTkzjA-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 4/7] po: rename the .mini.po files to have just a .po suffix Date: Tue, 19 May 2020 10:55:06 +0100 Message-Id: <20200519095509.2006166-5-berrange@redhat.com> In-Reply-To: <20200519095509.2006166-1-berrange@redhat.com> References: <20200519095509.2006166-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) A .mini.po file is exactly the same format as a .po file. We just used the alternative extension as we wanted to be able to store both full and minimized forms in the same directory. This complicates integration with some translation tools, however, which only really expect to see $LANG.po as a filename. With this change we drop the rules for creating non-minimized po files, and thus the po/*.po are always minimized. A useful side effect is that we no longer run msgmerge during creation of the gmo files, and thus don't need to have a date override to get reproducible builds. Signed-off-by: Daniel P. Berrang=C3=A9 --- po/Makefile.am | 29 +++++++--------------------- po/{as.mini.po =3D> as.po} | 0 po/{bg.mini.po =3D> bg.po} | 0 po/{bn_IN.mini.po =3D> bn_IN.po} | 0 po/{bs.mini.po =3D> bs.po} | 0 po/{ca.mini.po =3D> ca.po} | 0 po/{cs.mini.po =3D> cs.po} | 0 po/{da.mini.po =3D> da.po} | 0 po/{de.mini.po =3D> de.po} | 0 po/{el.mini.po =3D> el.po} | 0 po/{en_GB.mini.po =3D> en_GB.po} | 0 po/{es.mini.po =3D> es.po} | 0 po/{fi.mini.po =3D> fi.po} | 0 po/{fr.mini.po =3D> fr.po} | 0 po/{gu.mini.po =3D> gu.po} | 0 po/{hi.mini.po =3D> hi.po} | 0 po/{hu.mini.po =3D> hu.po} | 0 po/{id.mini.po =3D> id.po} | 0 po/{it.mini.po =3D> it.po} | 0 po/{ja.mini.po =3D> ja.po} | 0 po/{kn.mini.po =3D> kn.po} | 0 po/{ko.mini.po =3D> ko.po} | 0 po/{mk.mini.po =3D> mk.po} | 0 po/{ml.mini.po =3D> ml.po} | 0 po/{mr.mini.po =3D> mr.po} | 0 po/{ms.mini.po =3D> ms.po} | 0 po/{nb.mini.po =3D> nb.po} | 0 po/{nl.mini.po =3D> nl.po} | 0 po/{or.mini.po =3D> or.po} | 0 po/{pa.mini.po =3D> pa.po} | 0 po/{pl.mini.po =3D> pl.po} | 0 po/{pt.mini.po =3D> pt.po} | 0 po/{pt_BR.mini.po =3D> pt_BR.po} | 0 po/{ru.mini.po =3D> ru.po} | 0 po/{sr.mini.po =3D> sr.po} | 0 po/{sr@latin.mini.po =3D> sr@latin.po} | 0 po/{sv.mini.po =3D> sv.po} | 0 po/{ta.mini.po =3D> ta.po} | 0 po/{te.mini.po =3D> te.po} | 0 po/{uk.mini.po =3D> uk.po} | 0 po/{vi.mini.po =3D> vi.po} | 0 po/{zh_CN.mini.po =3D> zh_CN.po} | 0 po/{zh_TW.mini.po =3D> zh_TW.po} | 0 43 files changed, 7 insertions(+), 22 deletions(-) rename po/{as.mini.po =3D> as.po} (100%) rename po/{bg.mini.po =3D> bg.po} (100%) rename po/{bn_IN.mini.po =3D> bn_IN.po} (100%) rename po/{bs.mini.po =3D> bs.po} (100%) rename po/{ca.mini.po =3D> ca.po} (100%) rename po/{cs.mini.po =3D> cs.po} (100%) rename po/{da.mini.po =3D> da.po} (100%) rename po/{de.mini.po =3D> de.po} (100%) rename po/{el.mini.po =3D> el.po} (100%) rename po/{en_GB.mini.po =3D> en_GB.po} (100%) rename po/{es.mini.po =3D> es.po} (100%) rename po/{fi.mini.po =3D> fi.po} (100%) rename po/{fr.mini.po =3D> fr.po} (100%) rename po/{gu.mini.po =3D> gu.po} (100%) rename po/{hi.mini.po =3D> hi.po} (100%) rename po/{hu.mini.po =3D> hu.po} (100%) rename po/{id.mini.po =3D> id.po} (100%) rename po/{it.mini.po =3D> it.po} (100%) rename po/{ja.mini.po =3D> ja.po} (100%) rename po/{kn.mini.po =3D> kn.po} (100%) rename po/{ko.mini.po =3D> ko.po} (100%) rename po/{mk.mini.po =3D> mk.po} (100%) rename po/{ml.mini.po =3D> ml.po} (100%) rename po/{mr.mini.po =3D> mr.po} (100%) rename po/{ms.mini.po =3D> ms.po} (100%) rename po/{nb.mini.po =3D> nb.po} (100%) rename po/{nl.mini.po =3D> nl.po} (100%) rename po/{or.mini.po =3D> or.po} (100%) rename po/{pa.mini.po =3D> pa.po} (100%) rename po/{pl.mini.po =3D> pl.po} (100%) rename po/{pt.mini.po =3D> pt.po} (100%) rename po/{pt_BR.mini.po =3D> pt_BR.po} (100%) rename po/{ru.mini.po =3D> ru.po} (100%) rename po/{sr.mini.po =3D> sr.po} (100%) rename po/{sr@latin.mini.po =3D> sr@latin.po} (100%) rename po/{sv.mini.po =3D> sv.po} (100%) rename po/{ta.mini.po =3D> ta.po} (100%) rename po/{te.mini.po =3D> te.po} (100%) rename po/{uk.mini.po =3D> uk.po} (100%) rename po/{vi.mini.po =3D> vi.po} (100%) rename po/{zh_CN.mini.po =3D> zh_CN.po} (100%) rename po/{zh_TW.mini.po =3D> zh_TW.po} (100%) diff --git a/po/Makefile.am b/po/Makefile.am index ce9338aa94..224f16e993 100644 --- a/po/Makefile.am +++ b/po/Makefile.am @@ -11,16 +11,15 @@ POTFILES: $(POTFILES_IN) $(SED) 's|[@]BUILDDIR[@]|$(top_builddir)|' > $@ POTFILE_DEPS =3D $(shell cat POTFILES) POTFILE :=3D $(DOMAIN).pot -POMINIFILES :=3D $(LANGS:%=3D%.mini.po) POFILES :=3D $(LANGS:%=3D%.po) GMOFILES :=3D $(LANGS:%=3D%.gmo) =20 -CLEANFILES =3D $(POTFILE) $(POFILES) $(GMOFILES) POTFILES +CLEANFILES =3D $(POTFILE) $(GMOFILES) POTFILES =20 EXTRA_DIST =3D \ LINGUAS \ $(POTFILES_IN) \ - $(POMINIFILES) + $(POFILES) =20 if HAVE_GNU_GETTEXT_TOOLS =20 @@ -35,33 +34,23 @@ XGETTEXT_ARGS =3D \ --msgid-bugs-address=3D"$(MSGID_BUGS_ADDRESS)" \ $(NULL) =20 -POT_CREATION_DATE =3D $(shell \ - if test -n "$$SOURCE_DATE_EPOCH"; \ - then \ - date --date=3D"@$$SOURCE_DATE_EPOCH" +"%F %R%z"; \ - else \ - date +'%F %R%z'; \ - fi) - SED_PO_FIXUP_ARGS =3D \ -e "s|text/plain; charset=3DCHARSET|text/plain; charset=3DUTF-8|g" \ -e "s|SOME DESCRIPTIVE TITLE|Libvirt package strings|g" \ -e "s|Copyright (C) YEAR|Copyright (C) $$(date +'%Y')|" \ - -e "s|POT-Creation-Date:[^\]*|POT-Creation-Date: $(POT_CREATION_DATE)|" \ $(NULL) =20 -update-po: $(POFILES) - update-gmo: $(GMOFILES) =20 -update-mini-po: $(POTFILE) +update-po: $(POTFILE) for lang in $(LANGS); do \ echo "Minimizing $$lang content" && \ $(MSGMERGE) --no-location --no-fuzzy-matching --sort-output \ $$lang.po $(POTFILE) | \ $(SED) $(SED_PO_FIXUP_ARGS) | \ $(RUNUTF8) $(PYTHON) $(top_srcdir)/scripts/minimize-po.py > \ - $(srcdir)/$$lang.mini.po ; \ + $(srcdir)/$$lang.po-t && \ + mv $$lang.po-t $$lang.po done =20 push-pot: $(POTFILE) @@ -77,7 +66,7 @@ pull-po: $(POTFILE) --create-skeletons \ --transdir $(builddir) \ --srcdir $(srcdir) - $(MAKE) update-mini-po + $(MAKE) update-po $(MAKE) update-gmo =20 $(POTFILE): POTFILES $(POTFILE_DEPS) @@ -86,16 +75,12 @@ $(POTFILE): POTFILES $(POTFILE_DEPS) $(SED) $(SED_PO_FIXUP_ARGS) < $@-t > $@ rm -f $@-t =20 -%.po: %.mini.po $(POTFILE) - $(MSGMERGE) --no-fuzzy-matching $< $(POTFILE) | \ - $(SED) $(SED_PO_FIXUP_ARGS) > $@ - %.gmo: %.po rm -f $@ $@-t $(MSGFMT) -c -o $@-t $< mv $@-t $@ =20 -.PRECIOUS: $(POTFILE) $(POFILES) +.PRECIOUS: $(POTFILE) =20 endif HAVE_GNU_GETTEXT_TOOLS =20 diff --git a/po/as.mini.po b/po/as.po similarity index 100% rename from po/as.mini.po rename to po/as.po diff --git a/po/bg.mini.po b/po/bg.po similarity index 100% rename from po/bg.mini.po rename to po/bg.po diff --git a/po/bn_IN.mini.po b/po/bn_IN.po similarity index 100% rename from po/bn_IN.mini.po rename to po/bn_IN.po diff --git a/po/bs.mini.po b/po/bs.po similarity index 100% rename from po/bs.mini.po rename to po/bs.po diff --git a/po/ca.mini.po b/po/ca.po similarity index 100% rename from po/ca.mini.po rename to po/ca.po diff --git a/po/cs.mini.po b/po/cs.po similarity index 100% rename from po/cs.mini.po rename to po/cs.po diff --git a/po/da.mini.po b/po/da.po similarity index 100% rename from po/da.mini.po rename to po/da.po diff --git a/po/de.mini.po b/po/de.po similarity index 100% rename from po/de.mini.po rename to po/de.po diff --git a/po/el.mini.po b/po/el.po similarity index 100% rename from po/el.mini.po rename to po/el.po diff --git a/po/en_GB.mini.po b/po/en_GB.po similarity index 100% rename from po/en_GB.mini.po rename to po/en_GB.po diff --git a/po/es.mini.po b/po/es.po similarity index 100% rename from po/es.mini.po rename to po/es.po diff --git a/po/fi.mini.po b/po/fi.po similarity index 100% rename from po/fi.mini.po rename to po/fi.po diff --git a/po/fr.mini.po b/po/fr.po similarity index 100% rename from po/fr.mini.po rename to po/fr.po diff --git a/po/gu.mini.po b/po/gu.po similarity index 100% rename from po/gu.mini.po rename to po/gu.po diff --git a/po/hi.mini.po b/po/hi.po similarity index 100% rename from po/hi.mini.po rename to po/hi.po diff --git a/po/hu.mini.po b/po/hu.po similarity index 100% rename from po/hu.mini.po rename to po/hu.po diff --git a/po/id.mini.po b/po/id.po similarity index 100% rename from po/id.mini.po rename to po/id.po diff --git a/po/it.mini.po b/po/it.po similarity index 100% rename from po/it.mini.po rename to po/it.po diff --git a/po/ja.mini.po b/po/ja.po similarity index 100% rename from po/ja.mini.po rename to po/ja.po diff --git a/po/kn.mini.po b/po/kn.po similarity index 100% rename from po/kn.mini.po rename to po/kn.po diff --git a/po/ko.mini.po b/po/ko.po similarity index 100% rename from po/ko.mini.po rename to po/ko.po diff --git a/po/mk.mini.po b/po/mk.po similarity index 100% rename from po/mk.mini.po rename to po/mk.po diff --git a/po/ml.mini.po b/po/ml.po similarity index 100% rename from po/ml.mini.po rename to po/ml.po diff --git a/po/mr.mini.po b/po/mr.po similarity index 100% rename from po/mr.mini.po rename to po/mr.po diff --git a/po/ms.mini.po b/po/ms.po similarity index 100% rename from po/ms.mini.po rename to po/ms.po diff --git a/po/nb.mini.po b/po/nb.po similarity index 100% rename from po/nb.mini.po rename to po/nb.po diff --git a/po/nl.mini.po b/po/nl.po similarity index 100% rename from po/nl.mini.po rename to po/nl.po diff --git a/po/or.mini.po b/po/or.po similarity index 100% rename from po/or.mini.po rename to po/or.po diff --git a/po/pa.mini.po b/po/pa.po similarity index 100% rename from po/pa.mini.po rename to po/pa.po diff --git a/po/pl.mini.po b/po/pl.po similarity index 100% rename from po/pl.mini.po rename to po/pl.po diff --git a/po/pt.mini.po b/po/pt.po similarity index 100% rename from po/pt.mini.po rename to po/pt.po diff --git a/po/pt_BR.mini.po b/po/pt_BR.po similarity index 100% rename from po/pt_BR.mini.po rename to po/pt_BR.po diff --git a/po/ru.mini.po b/po/ru.po similarity index 100% rename from po/ru.mini.po rename to po/ru.po diff --git a/po/sr.mini.po b/po/sr.po similarity index 100% rename from po/sr.mini.po rename to po/sr.po diff --git a/po/sr@latin.mini.po b/po/sr@latin.po similarity index 100% rename from po/sr@latin.mini.po rename to po/sr@latin.po diff --git a/po/sv.mini.po b/po/sv.po similarity index 100% rename from po/sv.mini.po rename to po/sv.po diff --git a/po/ta.mini.po b/po/ta.po similarity index 100% rename from po/ta.mini.po rename to po/ta.po diff --git a/po/te.mini.po b/po/te.po similarity index 100% rename from po/te.mini.po rename to po/te.po diff --git a/po/uk.mini.po b/po/uk.po similarity index 100% rename from po/uk.mini.po rename to po/uk.po diff --git a/po/vi.mini.po b/po/vi.po similarity index 100% rename from po/vi.mini.po rename to po/vi.po diff --git a/po/zh_CN.mini.po b/po/zh_CN.po similarity index 100% rename from po/zh_CN.mini.po rename to po/zh_CN.po diff --git a/po/zh_TW.mini.po b/po/zh_TW.po similarity index 100% rename from po/zh_TW.mini.po rename to po/zh_TW.po --=20 2.26.2