search for: xgettext_args

Hi, here there are few patches to improve the extraction of translatable messages, and the usage of messages with plural forms. Pino Toscano (3): po: fix broken message extraction po: fix dependencies for libguestfs.pot extraction fish: improve the command error messages generator/fish.ml | 20 ++++++++++++++++---- po/Makefile.am | 24 +++++++----------------- 2 files changed, 23

...es, joining the new messages to the existing (or not) pot file. --- po/Makefile.am | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/po/Makefile.am b/po/Makefile.am index e2bfe45..b0a8038 100644 --- a/po/Makefile.am +++ b/po/Makefile.am @@ -66,24 +66,14 @@ XGETTEXT_ARGS = \ --directory=$(top_srcdir) $(DOMAIN).pot: Makefile $(POTFILES) $(POTFILES-pl) $(POTFILES-ml) - rm -f $@-t $@-pl $@-ml - $(XGETTEXT) -o $@-t $(XGETTEXT_ARGS) \ - --files-from=$(abs_srcdir)/POTFILES - $(XGETTEXT) -o $@-pl $(XGETTEXT_ARGS) --language=Perl \ - --files-from=$(abs_srcdir)/POT...

...(or not) pot file. > --- > po/Makefile.am | 22 ++++++---------------- > 1 file changed, 6 insertions(+), 16 deletions(-) > > diff --git a/po/Makefile.am b/po/Makefile.am > index e2bfe45..b0a8038 100644 > --- a/po/Makefile.am > +++ b/po/Makefile.am > @@ -66,24 +66,14 @@ XGETTEXT_ARGS = \ > --directory=$(top_srcdir) > > $(DOMAIN).pot: Makefile $(POTFILES) $(POTFILES-pl) $(POTFILES-ml) > - rm -f $@-t $@-pl $@-ml > - $(XGETTEXT) -o $@-t $(XGETTEXT_ARGS) \ > - --files-from=$(abs_srcdir)/POTFILES > - $(XGETTEXT) -o $@-pl $(XGETTEXT_ARGS) --language=Perl \...

...depend also > on the POTFILES themselves. > --- > po/Makefile.am | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/po/Makefile.am b/po/Makefile.am > index b0a8038..a8343ec 100644 > --- a/po/Makefile.am > +++ b/po/Makefile.am > @@ -65,7 +65,7 @@ XGETTEXT_ARGS = \ > --msgid-bugs-address="$(MSGID_BUGS_ADDRESS)" \ > --directory=$(top_srcdir) > > -$(DOMAIN).pot: Makefile $(POTFILES) $(POTFILES-pl) $(POTFILES-ml) > +$(DOMAIN).pot: Makefile POTFILES $(POTFILES) POTFILES-pl $(POTFILES_PL) POTFILES-ml $(POTFILES_ML) > rm -f $...

...e.am | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > diff --git a/po/Makefile.am b/po/Makefile.am > > > index b0a8038..a8343ec 100644 > > > --- a/po/Makefile.am > > > +++ b/po/Makefile.am > > > @@ -65,7 +65,7 @@ XGETTEXT_ARGS = \ > > > > > > --msgid-bugs-address="$(MSGID_BUGS_ADDRESS)" \ > > > --directory=$(top_srcdir) > > > > > > -$(DOMAIN).pot: Makefile $(POTFILES) $(POTFILES-pl) $(POTFILES-ml) > > > +$(DOMAIN).pot: Makefile POTFILES $(POTFILES) POT...

--- po-docs/ja/Makefile.am | 16 ++++++++-------- po-docs/uk/Makefile.am | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/po-docs/ja/Makefile.am b/po-docs/ja/Makefile.am index 820f91a..e954f04 100644 --- a/po-docs/ja/Makefile.am +++ b/po-docs/ja/Makefile.am @@ -92,9 +92,9 @@ guestfs.3: guestfs.pod guestfs-actions.pod guestfs-availability.pod guestfs-stru

...e variables holding the contents of the POTFILES, depend also on the POTFILES themselves. --- po/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/Makefile.am b/po/Makefile.am index b0a8038..a8343ec 100644 --- a/po/Makefile.am +++ b/po/Makefile.am @@ -65,7 +65,7 @@ XGETTEXT_ARGS = \ --msgid-bugs-address="$(MSGID_BUGS_ADDRESS)" \ --directory=$(top_srcdir) -$(DOMAIN).pot: Makefile $(POTFILES) $(POTFILES-pl) $(POTFILES-ml) +$(DOMAIN).pot: Makefile POTFILES $(POTFILES) POTFILES-pl $(POTFILES_PL) POTFILES-ml $(POTFILES_ML) rm -f $@-t if HAVE_OCAML_GETTEXT $...

...-- > > > > po/Makefile.am | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/po/Makefile.am b/po/Makefile.am > > index b0a8038..a8343ec 100644 > > --- a/po/Makefile.am > > +++ b/po/Makefile.am > > @@ -65,7 +65,7 @@ XGETTEXT_ARGS = \ > > > > --msgid-bugs-address="$(MSGID_BUGS_ADDRESS)" \ > > --directory=$(top_srcdir) > > > > -$(DOMAIN).pot: Makefile $(POTFILES) $(POTFILES-pl) $(POTFILES-ml) > > +$(DOMAIN).pot: Makefile POTFILES $(POTFILES) POTFILES-pl > > $(POTFILES_...

...t" for reading: No such file or directory which I observed with xgettext (GNU gettext-tools) 0.18.3 --- po/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/po/Makefile.am b/po/Makefile.am index a8343ec..fd69441 100644 --- a/po/Makefile.am +++ b/po/Makefile.am @@ -67,6 +67,7 @@ XGETTEXT_ARGS = \ $(DOMAIN).pot: Makefile POTFILES $(POTFILES) POTFILES-pl $(POTFILES_PL) POTFILES-ml $(POTFILES_ML) rm -f $@-t + touch $@-t if HAVE_OCAML_GETTEXT $(OCAML_GETTEXT) --action extract --extract-pot $@-t $(POTFILES_ML) endif -- 1.8.5.1

We are migrating to Weblate (the Fedora instance, in particular) for translations instead of Zanata. Adapt our tooling a bit to the different workflow: - Weblate takes care of updating the po files whenever a new translation catalog is available, so stop doing that on our own: this meant also tweaking the po4a usage for POD documentations, resulting in simpler rules (IMHO) - ensure that the

We are migrating to Weblate (the Fedora instance, in particular) for translations instead of Zanata. Adapt our tooling a bit to the different workflow: - Weblate takes care of updating the po files whenever a new translation catalog is available, so stop doing that on our own: this meant also tweaking the po4a usage for POD documentations, resulting in simpler rules (IMHO) - ensure that the