From nobody Mon Apr 29 01:03:00 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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=1591613960; cv=none; d=zohomail.com; s=zohoarc; b=Nq7sKjK9ZIR/DSi5uAXNUsQMM0GvCizQVy6zCfKqWAGLoPcrpJ8+nycoSnIpdX4oxob/weSTGMG1iuhfL8fcwXd3oWc0ABH5fNK4vsnRMjCidRaWzNi6bIDzaly45JNo1PTkCSHhMLKrUYGbk60lDSmYGQVigPBubN6wc1aMDNI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591613960; 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=vozoQREQDINDY2iYCdKKFSYMaZeiJF2gGhHgK5dRbR4=; b=d4q1gT3M6s5UaFnJHIDwEi5yb1pEr4dy5qjx+dMQz3Lytz2hQsXq+pSHzlFeNb5Mq1hkDTDMrbih+qZgsbfrBq5Lhn0+6bv04wvKDyi5evMfGv6GgGQkw5yF30TZHtG5REGM1Ucukl5FmUscRDeSl36svg5mZV8q2j7U8FwkQdU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1591613960369735.7251282796772; Mon, 8 Jun 2020 03:59:20 -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-140-nkVpS_dPOwWfGoA2VnEYQQ-1; Mon, 08 Jun 2020 06:59:02 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 946DC835B41; Mon, 8 Jun 2020 10:58:56 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 723342B4DE; Mon, 8 Jun 2020 10:58:56 +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 24B90941CE; Mon, 8 Jun 2020 10:58:56 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 058Awkqm005189 for ; Mon, 8 Jun 2020 06:58:46 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8EF067F4ED; Mon, 8 Jun 2020 10:58:46 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.36.110.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id 921B87A1E1; Mon, 8 Jun 2020 10:58:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591613959; 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=vozoQREQDINDY2iYCdKKFSYMaZeiJF2gGhHgK5dRbR4=; b=JyQMAHAkMRkD7HzuhCU7wf+6vhyN5tktJqqIf0sNHvmoxRMt+Xx3dAknDWx5v90hhrdpGg pFahQfUzxkeKgkOEuphNLheB956b3I3hPl62qmKKPMzgg6PKj7rX2NGUtbeBd3JEvOCV+k ldgx8CybVXsFBCYIcXfKZxVhizHFQJw= X-MC-Unique: nkVpS_dPOwWfGoA2VnEYQQ-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 1/4] po: update docs to refer to Weblate instead of Zanata Date: Mon, 8 Jun 2020 11:58:37 +0100 Message-Id: <20200608105840.3319776-2-berrange@redhat.com> In-Reply-To: <20200608105840.3319776-1-berrange@redhat.com> References: <20200608105840.3319776-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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.84 on 10.5.11.23 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) The old information about managing PO files was outdated, as we're managing files in a different way with Weblate. This also introduces a badge showing the translation progress across languages. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Pavel Hrdina --- README.rst | 3 ++ docs/contribute.html.in | 4 +- docs/hacking.rst | 10 ++-- po/README.rst | 111 +++++++++++----------------------------- 4 files changed, 41 insertions(+), 87 deletions(-) diff --git a/README.rst b/README.rst index 5d6ca5577a..ac6a4cd3e9 100644 --- a/README.rst +++ b/README.rst @@ -7,6 +7,9 @@ .. image:: https://bestpractices.coreinfrastructure.org/projects/355/badge :target: https://bestpractices.coreinfrastructure.org/projects/355 :alt: CII Best Practices +.. image:: https://translate.fedoraproject.org/widgets/libvirt/-/libvirt/s= vg-badge.svg + :target: https://translate.fedoraproject.org/engage/libvirt/ + :alt: Translation status =20 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D Libvirt API for virtualization diff --git a/docs/contribute.html.in b/docs/contribute.html.in index 42a1b2fe60..81efa2bce3 100644 --- a/docs/contribute.html.in +++ b/docs/contribute.html.in @@ -42,8 +42,8 @@
  • Translation. All the libvirt modules aim to sup= port translations where appropriate. All translation is handling outside of the normal libvirt review process, - using the Fedora - instance of the Zanata tool. Thus people wishing + using the Fedora + instance of the Weblate tool. Thus people wishing to contribute to translation should join the Fedora translation team
  • Documentation. There are docbook guides on vari= ous diff --git a/docs/hacking.rst b/docs/hacking.rst index 51ff862e8f..ccc94010b3 100644 --- a/docs/hacking.rst +++ b/docs/hacking.rst @@ -13,11 +13,11 @@ The official upstream repository is kept in git along with other libvirt-related repositories (e.g. libvirt-python) `online `__. =20 -Patches to translations are maintained via the `zanata -project `__. If you want to fix a -translation in a .po file, join the appropriate language team. -The libvirt release process automatically pulls the latest -version of each translation file from zanata. +Patches to translations are maintained via the `Fedora Weblate +service `__. +If you want to contirbute to translations of libvirt, join the appropriate +language team in Weblate. Translation updates to libvirt will be merged +during the feature freeze window. =20 Preparing patches =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D diff --git a/po/README.rst b/po/README.rst index 2e234547ca..8d566cd967 100644 --- a/po/README.rst +++ b/po/README.rst @@ -2,89 +2,40 @@ Libvirt Message Translation =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D =20 -Libvirt translatable messages are maintained using the GNU Gettext tools a= nd -file formats, in combination with the Zanata web service. +.. image:: https://translate.fedoraproject.org/widgets/libvirt/-/libvirt/m= ulti-auto.svg + :target: https://translate.fedoraproject.org/engage/libvirt/ + :alt: Translation status =20 -python-zanata-client is required in order to use make to pull/push transla= tions -from/to Zanata server. +Libvirt translatable messages are maintained using the GNU Gettext tools a= nd +file formats, in combination with the Fedora Weblate web service. =20 +https://translate.fedoraproject.org/projects/libvirt/libvirt/ =20 Source repository =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 -The libvirt GIT repository does NOT store the master "libvirt.pot" file, n= or -does it store full "po" files for translations. The master "libvirt.pot" f= ile -can be generated at any time using - -:: - - $ make libvirt.pot - -The translations are kept in minimized files that are the same file format -as normal po files but with all redundant information stripped and messages -re-ordered. The key differences between the ".mini.po" files in GIT and the -full ".po" files are - -* msgids with no current translation are omitted -* msgids are sorted in alphabetical order not source file order -* msgids with a msgstr marked "fuzzy" are discarded -* source file locations are omitted - -The full po files can be created at any time using - -:: - - $ make update-po - -This merges the "libvirt.pot" with the "$LANG.mini.po" for each language, = to -create the "$LANG.po" files. These are included in the release archives cr= eated -by "make dist". - -When a full po file is updated, changes can be propagated back into the -minimized po files using - -:: - - $ make update-mini-po - -Note, however, that this is generally not something that should be run by -developers normally, as it is triggered by 'make pull-po' when refreshing -content from Zanata. - - -Zanata web service -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - -The translation of libvirt messages has been outsourced to the Fedora -translation team using the Zanata web service: - -https://fedora.zanata.org/project/view/libvirt - -As such, changes to translations will generally NOT be accepted as patches -directly to libvirt GIT. Any changes made to "$LANG.mini.po" files in libv= irt -GIT will be overwritten and lost the next time content is imported from Za= nata. - -The master "libvirt.pot" file is periodically pushed to Zanata to provide = the -translation team with content changes, using - -:: - - $ make push-pot - -New translated text is then periodically pulled down from Zanata to update= the -minimized po files, using - -:: - - $ make pull-po - -Sometimes the translators make mistakes, most commonly with handling printf -format specifiers. The "pull-po" command re-generates the .gmo files to tr= y to -identify such mistakes. If a mistake is made, the broken msgstr should be -deleted in the local "$LANG.mini.po" file, and the Zanata web interface us= ed -to reject the translation so that the broken msgstr isn't pulled down next= time. - -After pulling down new content the diff should be examined to look for any -obvious mistakes that are not caught automatically. There have been bugs in -Zanata tools which caused messges to go missing, so pay particular attenti= on to -diffs showing deletions where the msgid still exists in libvirt.pot +The libvirt GIT repository stores the master "libvirt.pot" file, which is = to be +refreshed at time of feature freeze. + +The "po" files stored in GIT have source locations removed in order to cut= down +on storage size, by eliminating information already present in the "pot" f= ile. +All files are stored with strings sorted in alphabetical order rather than +source location order, to minimize movement of strings when source locatio= ns +change. + +The "po" files are to be EXCLUSIVELY UPDATED by merge requests sent from t= he +Fedora Weblate service. Other contributors MUST NEVER send changes which t= ouch +the "po" file content, as that will create merge conflicts for Weblate. IO= W any +bug fixes to translations should be made via the Weblate application UI. + +After the "pot" file in libvirt GIT, Weblate will automatically run "msgme= rge" +to update the "po" files itself and send back a merge request with the cha= nges. + +Translation updates made in the Weblate Web UI will be committed to its fo= rk of +the GIT repo once a day. These commits will be submitted back to the maste= r GIT +repo via merge requests. If a merge request from Weblate is already open, +commits will be added to this existing merge request. Weblate will take ca= re of +rebasing whenever changes happen in Git master. In order to avoid having t= o do +translations merges 30 times a month, merge requests from Weblate will usu= ally +be left open until feature freeze arrives. During the freeze period, they = will +be accepted more promptly to ensure they make it into the new release. --=20 2.26.2 From nobody Mon Apr 29 01:03:00 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.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 207.211.31.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=1591613944; cv=none; d=zohomail.com; s=zohoarc; b=Z1dCx37CRXN363o9cVe9qOTNa7hqi9N720JNa/QU5sB/13q8peHC/U9rVRVw0l2HzgCh5plgIwb8wZyXRP07b+Zs+hNyJjGCrJ0FD5m9BGTaOfl3LUVYOpd3w0FUajVABYMpa1l7UuNkcshmYoXYfLh7OvPkVKLDGtw2HzCfw0k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591613944; 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=/iMXD6xkA8lM99vqknyTcBJIf3f4CpvlKZWNZNyt8No=; b=YdMwwN8ozlG90ZJutww8cSKUuUmC3taplrDW+OfjCHP/PbhcT+7JAOsEXjNvUZqcp6mG+EVsz0ajKzxhjr1e5oXjzxg8SK8L8D4t65DHwS0+gjoKhwO72aRpWQT03ahKk1TWNsEhQudqf4CY3S7XdRfbfHQc5yXj/t0JX6MviqE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.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 [207.211.31.120]) by mx.zohomail.com with SMTPS id 15916139441881012.2667620500426; Mon, 8 Jun 2020 03:59:04 -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-151-x-P2WzrvMla21ps0PGWGBA-1; Mon, 08 Jun 2020 06:58:54 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 78BCA8015CE; Mon, 8 Jun 2020 10:58:49 +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 5D31D768D5; Mon, 8 Jun 2020 10:58:49 +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 18AAB1809554; Mon, 8 Jun 2020 10:58:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 058Awmg3005199 for ; Mon, 8 Jun 2020 06:58:48 -0400 Received: by smtp.corp.redhat.com (Postfix) id 04DAE7F4F5; Mon, 8 Jun 2020 10:58:48 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.36.110.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id E525B7A1E1; Mon, 8 Jun 2020 10:58:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591613942; 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=/iMXD6xkA8lM99vqknyTcBJIf3f4CpvlKZWNZNyt8No=; b=YE+LjG9vxPWj/McBE5zBPHXTBcMhkd47yxln1+ucUP9vqswzZWwsihgp3+H+ref70aDnuj 5hOVg3KDnmKyECd6I8p3JZMQDGVlJX4Vykap1yX2VmzDjtdrYUlcoWCPmZ69MhBxtnle5Q 3yyJ7w44RJY5el9+HtXnwAJBIm7FLyU= X-MC-Unique: x-P2WzrvMla21ps0PGWGBA-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 2/4] po: remove obsolete zanata push/pull rules Date: Mon, 8 Jun 2020 11:58:38 +0100 Message-Id: <20200608105840.3319776-3-berrange@redhat.com> In-Reply-To: <20200608105840.3319776-1-berrange@redhat.com> References: <20200608105840.3319776-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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.15 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) We're no longer using Zanata, so remove the old push/pull rules. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Pavel Hrdina --- po/Makefile.am | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/po/Makefile.am b/po/Makefile.am index e4d444dad6..97e05a32f6 100644 --- a/po/Makefile.am +++ b/po/Makefile.am @@ -52,22 +52,6 @@ update-po: $(POTFILE) mv $$lang.po-t $$lang.po done =20 -push-pot: $(POTFILE) - zanata push \ - --project-config $(srcdir)/zanata.xml \ - --push-type=3Dsource \ - --transdir $(builddir) \ - --srcdir $(srcdir) - -pull-po: $(POTFILE) - zanata pull \ - --project-config $(srcdir)/zanata.xml \ - --create-skeletons \ - --transdir $(builddir) \ - --srcdir $(srcdir) - $(MAKE) update-po - $(MAKE) update-gmo - $(POTFILE): POTFILES $(XGETTEXT) -o $@-t $(XGETTEXT_ARGS) \ --files-from=3D$(abs_builddir)/POTFILES --=20 2.26.2 From nobody Mon Apr 29 01:03:00 2024 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=1591614005; cv=none; d=zohomail.com; s=zohoarc; b=lQX4HoAiWmwOhnG8A9g6ygNHU7fuccDGpGKQ35yL4bhdi+e8t8J0IQNIHI9lDtARN9tLIK+cY0yzPw2Ngm/cexIrPHxpvXeBFchvXvROWgLs3CiOfWmgC9lBVtBvixV7ZywbqPQfaynL/OdCM0ir3ugQruOW5X3eOiifcwSBnjI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591614005; 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=ey+7quNbP4liIyYAe4bPOVN0soYwxa6KI/Ouz6hBWHA=; b=X8apfHowrzGK1vlnMFouo4/o74kLX42Z4popbmLY1D+Wu8mOlW+0++s6Q4M9I0sEO9P4ayhc1IVGEEEXg+PhDQ7QLCc+3vv1DGYiPk9hJ/ntOO8Jd33Ps8JWMoegwmum6v/T0MhOQ1SEpEkgQNdbvtTBsVfXx1KvPx3rLceCwBs= 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 1591614005026472.0443683100574; Mon, 8 Jun 2020 04:00:05 -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-501-QIouXgsFPFOAVaHoHUBOsQ-1; Mon, 08 Jun 2020 06:59:01 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0FE32107ACCD; Mon, 8 Jun 2020 10:58:56 +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 E053F1002395; Mon, 8 Jun 2020 10:58:55 +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 A915F1800433; Mon, 8 Jun 2020 10:58:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 058AwnEd005210 for ; Mon, 8 Jun 2020 06:58:49 -0400 Received: by smtp.corp.redhat.com (Postfix) id 589E37F4F5; Mon, 8 Jun 2020 10:58:49 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.36.110.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7F22B7A1E1; Mon, 8 Jun 2020 10:58:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591614003; 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=ey+7quNbP4liIyYAe4bPOVN0soYwxa6KI/Ouz6hBWHA=; b=EdtUIpq1CeV8GV7xKMGHt26aGL65rhPwIxPncq4ihj1mWZhb+v6vs9l9F1rZkPuuxTqFej WtJSVX8ti3X1BEYk8Y9fx9Vbm15FFEo342+IkR4JzjHHekOeSDxQxcrbDkw9oSEYhhLiSG JBv1KzBw2q/zYC4ZCrqjjGuy9w1d6PY= X-MC-Unique: QIouXgsFPFOAVaHoHUBOsQ-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 3/4] po: remove obsolete zanata config file Date: Mon, 8 Jun 2020 11:58:39 +0100 Message-Id: <20200608105840.3319776-4-berrange@redhat.com> In-Reply-To: <20200608105840.3319776-1-berrange@redhat.com> References: <20200608105840.3319776-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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.84 on 10.5.11.22 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) Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Pavel Hrdina --- po/zanata.xml | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 po/zanata.xml diff --git a/po/zanata.xml b/po/zanata.xml deleted file mode 100644 index 421980a3e3..0000000000 --- a/po/zanata.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - https://fedora.zanata.org/ - libvirt - master - gettext - --=20 2.26.2 From nobody Mon Apr 29 01:03:00 2024 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=1591613978; cv=none; d=zohomail.com; s=zohoarc; b=SWCgHcexvVo5oQumCtea3vO+eA638EbyMV26jBhhcJMpYiGRH0UapqZPHXlJ4V6TeP9s6bqVOkbw2LOcKMwREHdzJsi0eW3M456w5K2yItQIVOCGz49PYkMrt7Qq7P62fZx6m5pSLQRy7s8Cn8T06sDbW53xa8cLuGOnroQb5IQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591613978; 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=J7QSUtEPMsEOiAEpyr2nMAhMbX6CBTQFuirzCk5tVCw=; b=PYXBfeB85t5qnftne7aqPoVCGxMJDX1DJsqYQ2vG2YaC/Grig/JJ33c5TletrkE8Ha/Oct4RI1MVUgq5Mu8+Yq49xKhtyFAQQzLup5CS8QXr44OMB/hL+ZPUG46pmYIU3y2ggybdwutel5D9tZXccsedU3DguftZUMWcfvl066E= 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 1591613978392672.7836370844246; Mon, 8 Jun 2020 03:59:38 -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-348-ZmQOu_93Npar67nd0E_Ixw-1; Mon, 08 Jun 2020 06:59:04 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 98A821902EAD; Mon, 8 Jun 2020 10:58:58 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 792E55C660; Mon, 8 Jun 2020 10:58:58 +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 165BB97019; Mon, 8 Jun 2020 10:58:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 058AwoS9005221 for ; Mon, 8 Jun 2020 06:58:50 -0400 Received: by smtp.corp.redhat.com (Postfix) id 995437A8AC; Mon, 8 Jun 2020 10:58:50 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.36.110.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id D4E487A1E1; Mon, 8 Jun 2020 10:58:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591613977; 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=J7QSUtEPMsEOiAEpyr2nMAhMbX6CBTQFuirzCk5tVCw=; b=eglQW1srbFm6okPBFXQ80rDhAcvyXTIzAPFCKj0Uw3+4Z+Z2gq7Ue27NEFP7EzZ/xEdyP0 NWybifGsJ3zbj0IPBLAt0lLm33pTrfP9r9zyntE85ItdzdBdYWNo9A6H3kmrUH3tYiW39A EIe4AatMhVaQftntBoMfYkk7iMaUaS4= X-MC-Unique: ZmQOu_93Npar67nd0E_Ixw-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 4/4] po: fix update-po target to take account of libvirt.pot in srcdir Date: Mon, 8 Jun 2020 11:58:40 +0100 Message-Id: <20200608105840.3319776-5-berrange@redhat.com> In-Reply-To: <20200608105840.3319776-1-berrange@redhat.com> References: <20200608105840.3319776-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Now that we're storing libvirt.pot in git, it will be in srcdir instead of builddir. Weblate is responsible for running msgmerge when the .pot file changes, so add a warning that this target is not for general usage. Reviewed-by: Pavel Hrdina --- po/Makefile.am | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/po/Makefile.am b/po/Makefile.am index 97e05a32f6..95294aa12e 100644 --- a/po/Makefile.am +++ b/po/Makefile.am @@ -43,13 +43,16 @@ SED_PO_FIXUP_ARGS =3D \ =20 update-gmo: $(GMOFILES) =20 +# The results of this target should not be committed to Git. The Weblate +# service is responsible for updating .po files when the .pot is changed. update-po: $(POTFILE) + cd $(srcdir) && \ 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) > $(srcdir)/$$lang.po-t && \ - mv $$lang.po-t $$lang.po + $(SED) $(SED_PO_FIXUP_ARGS) > $$lang.po-t && \ + mv $$lang.po-t $$lang.po ; \ done =20 $(POTFILE): POTFILES --=20 2.26.2