On Fri, Mar 31, 2023 at 16:26:42 +0100, Daniel P. Berrangé wrote:
On Thu, Mar 30, 2023 at 11:37:55AM +0200, Jiri Denemark wrote:
> On Mon, Mar 27, 2023 at 15:37:34 +0100, Daniel P. Berrangé wrote:
> > On Mon, Mar 27, 2023 at 01:08:09PM +0200, Jiri Denemark wrote:
> > > On Fri, Mar 10, 2023 at 17:14:32 +0000, Daniel P. Berrangé wrote:
> > > > Even if fixed, it might be worth switching the .pot file anyway, but
> > > > this can't be done without us bulk updating the translations,
and
> > > > bulk re-importing them, which will be challenging. We'll almost
> > > > certainly want to try this on a throw-away repo in weblate first,
> > > > not our main repo.
> > >
> > > I was able to come up with steps leading to the desired state:
> > >
> > > 0. lock weblate repository
> > > 1. update libvirt.pot from the most recent potfile job
> > > 2. push to libvirt.git
> > > 2. wait for translations update from Fedora Weblate and merge it
> > > 3. pull from libvirt.git
> > > 4. apply the first 50 patches from this seires (with required changes
> > > to make sure all translation strings are updated)
> > > 5. update all po files with the attached script
> > > 6. update libvirt.pot by running meson compile libvirt-pot
> > > 7. apply patch 51 of this series
> > > 8. push to libvirt.git
> > > 9. wait for translations update from Fedora Weblate and merge it
> > > 10. unlock weblate repository
This looks ok, but I'm wondering if weblate will remember all
our obsolete msgids when we do step 8 ? IOW, will our po files
get the 10,000 current msgids, plus another 5,000 non-position
based msgids marked with '#~ msgid' ?
No, apparently it doesn't do so. Looking at the last commit in
https://gitlab.com/jirkade/libvirt/-/commits/format-strings which is an
update from weblate after all the changes, there's not a single new
"#~ msgid" line added. The overall statistics of the patch is
46 files changed, 28392 insertions(+), 19137 deletions(-)
and it is caused by weblate (or rather msgmerge) wrapping lines as they
got longer when format strings were updated using the script.
So I don't thing we can just use the existing weblate component in
libvirt project.
This basically looks good to me. The only minor thing I see is that
projects/libvirt/libvirt has gained some extra translations that
are not in current git master. For example in cs.po there are about
6 fewer failing c-format checks in weblate that are still in cs.po
That will be taken care of when you re-sync the .po files and rerun
the conversion.
Right.
So I think this looks ok to go ahead with after release.
Great. Thanks for checking. Do you want me to add Reviewed-by lines to
all the ~100 patches with your name or something similar?
Jirka