[6293] manually xgettext strings from ti.twjr with --language=awk

[karl]

Revision: 6293
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6293
Author:   karl
Date:     2015-05-31 21:18:30 +0000 (Sun, 31 May 2015)
Log Message:
-----------
manually xgettext strings from ti.twjr with --language=awk

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/po/Makefile.in.in
    trunk/po/POTFILES.in
    trunk/util/srclist.txt

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-05-31 18:57:15 UTC (rev 6292)
+++ trunk/ChangeLog     2015-05-31 21:18:30 UTC (rev 6293)
@@ -1,9 +1,21 @@
 2015-05-31  Karl Berry  <address@hidden>
 
+       * po/Makefile.in.in ($(DOMAIN).pot-update): invoke xgettext a
+       second time with --join-existing --language=awk texindex/ti.twjr,
+       since there is apparently no other way to get ti.twjr's strings
+       into texinfo.pot.
+       * util/srclist.txt: must manually merge po/Makefile.in.in
+       instead of just copying until xgettext knows about .twjr.
+       * po/POTFILES.in: remove texindex/ti.twjr.
+
+2015-05-31  Karl Berry  <address@hidden>
+
        * po/Makevars (PACKAGE_GNU, MSGINIT_OPTIONS, PO_DEPENDS_ON_POT,
        DIST_DEPENDS_ON_UPDATE_PO): new variables to sync with
        Makevars.template from gettext-0.19.4 (and earlier.)
 
+2015-05-31  Karl Berry  <address@hidden>
+
        * tp/tests/run_parser_all.sh,
        * tp/maintain/regenerate_cmd_tests.sh: use grep >/dev/null
        instead of -qs; Solaris 5.10 grep does not support -q.

Modified: trunk/po/Makefile.in.in
===================================================================
--- trunk/po/Makefile.in.in     2015-05-31 18:57:15 UTC (rev 6292)
+++ trunk/po/Makefile.in.in     2015-05-31 21:18:30 UTC (rev 6293)
@@ -1,5 +1,5 @@
 # Makefile for PO directory in any package using GNU gettext.
-# Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper 
<address@hidden>
+# Copyright (C) 1995-1997, 2000-2007, 2009-2010, 2015 by Ulrich Drepper 
<address@hidden>
 #
 # This file can be copied and used freely without restrictions.  It can
 # be used in projects which are not available under the GNU General Public
@@ -194,6 +194,13 @@
              --package-name="address@hidden@" \
              --package-version='@VERSION@' \
              --msgid-bugs-address="$$msgid_bugs_address" \
+           ; $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) 
@XGETTEXT_EXTRA_OPTIONS@ \
+             --copyright-holder='$(COPYRIGHT_HOLDER)' \
+             --package-name="address@hidden@" \
+             --package-version='@VERSION@' \
+             --msgid-bugs-address="$$msgid_bugs_address" \
+             --join-existing --language=awk texindex/ti.twjr \
            ;; \
        esac
        test ! -f $(DOMAIN).po || { \

Modified: trunk/po/POTFILES.in
===================================================================
--- trunk/po/POTFILES.in        2015-05-31 18:57:15 UTC (rev 6292)
+++ trunk/po/POTFILES.in        2015-05-31 21:18:30 UTC (rev 6293)
@@ -32,7 +32,6 @@
 info/variables.c
 info/window.c
 install-info/install-info.c
-texindex/ti.twjr
 tp/DebugTexinfo/DebugTree.pm
 tp/Texinfo/Common.pm
 tp/Texinfo/Convert/Converter.pm

Modified: trunk/util/srclist.txt
===================================================================
--- trunk/util/srclist.txt      2015-05-31 18:57:15 UTC (rev 6292)
+++ trunk/util/srclist.txt      2015-05-31 21:18:30 UTC (rev 6293)
@@ -26,7 +26,8 @@
 $GETTEXT/gettext-runtime/ABOUT-NLS             .
 #
 $GETTEXT/gettext-tools/po/Makefile.in.in       po_document
-$GETTEXT/gettext-tools/po/Makefile.in.in       po
+# must merge by hand, not just copy, until .twjr is supported by gettext.
+#$GETTEXT/gettext-tools/po/Makefile.in.in      po
 $GETTEXT/gettext-tools/po/Makevars.template    po
 $GETTEXT/gettext-tools/po/Rules-quot           po
 $GETTEXT/gettext-tools/po/boldquot.sed         po