[6305] string merging for translation

[karl]

Revision: 6305
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6305
Author:   karl
Date:     2015-06-03 22:29:56 +0000 (Wed, 03 Jun 2015)
Log Message:
-----------
string merging for translation

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/Makefile.am
    trunk/README-hacking
    trunk/info/info.c
    trunk/texindex/Makefile.am
    trunk/texindex/texindex.awk
    trunk/texindex/ti.twjr

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-06-03 22:07:44 UTC (rev 6304)
+++ trunk/ChangeLog     2015-06-03 22:29:56 UTC (rev 6305)
@@ -1,3 +1,13 @@
+2015-06-03  Karl Berry  <address@hidden>
+
+       * texindex/ti.twjr (usage, version): combine multi-line strings.
+       Suggested by Benno.
+       * info/info.c (info_short_help): no leading newline on trailing
+       block, to merge string with other occurrences.
+       * Makefile.am (update-po): new convenience target to build both
+       po and po_document strings.
+       * texindex/Makefile.am: doc tweaks.
+
 2015-06-03  Gavin Smith  <address@hidden>
 
        * info/pseudotty.c: Don't get control channel from an already 

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am   2015-06-03 22:07:44 UTC (rev 6304)
+++ trunk/Makefile.am   2015-06-03 22:29:56 UTC (rev 6305)
@@ -93,6 +93,11 @@
        && rm -f address@hidden
 
 # emacs-page
+# just for convenience:
+update-po:
+       cd $(srcdir)/po && $(MAKE) update-po
+       cd $(srcdir)/po_document && $(MAKE) update-po
+
 # From coreutils.  Use when making a release.
 # Verify that all source files using _() are listed in po/POTFILES.in.
 # Run this before making pretests, as well as official releases, so that

Modified: trunk/README-hacking
===================================================================
--- trunk/README-hacking        2015-06-03 22:07:44 UTC (rev 6304)
+++ trunk/README-hacking        2015-06-03 22:29:56 UTC (rev 6305)
@@ -134,7 +134,7 @@
 pod2man Pod-Simple-Texinfo/pod2texi.pl >man/pod2texi.1 # until we fix deps
 make
 make po-check             # update po/POTFILES.in as needed
-make -C po update-po      # but don't commit yet, dist updates po_document
+make update-po            # both po and po_document needed, build a dist first
 make -C doc wwwdoc-build  # and -install for official (and eventual commit)
 make long-checks          # distcheck does not do this
 (export MALLOC_CHECK_=2; make distcheck)  # repeat until clean

Modified: trunk/info/info.c
===================================================================
--- trunk/info/info.c   2015-06-03 22:07:44 UTC (rev 6304)
+++ trunk/info/info.c   2015-06-03 22:29:56 UTC (rev 6305)
@@ -1076,7 +1076,9 @@
   info --subnodes -o out.txt emacs  dump entire manual to out.txt\n\
   info -f ./foo.info         show file ./foo.info, not searching dir"));
 
-  puts (_("\n\
+  puts ("");
+
+  puts (_("\
 Email bug reports to address@hidden,\n\
 general questions and discussion to address@hidden
 Texinfo home page: http://www.gnu.org/software/texinfo/";));

Modified: trunk/texindex/Makefile.am
===================================================================
--- trunk/texindex/Makefile.am  2015-06-03 22:07:44 UTC (rev 6304)
+++ trunk/texindex/Makefile.am  2015-06-03 22:29:56 UTC (rev 6305)
@@ -26,7 +26,7 @@
 # and mention the original sources explicitly.
 EXTRA_DIST = texindex.in ti.twjr
 
-# we'll put the awk script in $(sharedir)/texinfo.
+# let's install the awk script in $(sharedir)/texinfo.
 dist_pkgdata_SCRIPTS = texindex.awk
 
 # since we generate it, have to clean it (at maintainer-clean) explicitly.
@@ -54,7 +54,6 @@
 # build texindex.awk from ti.twjr using jrtangle; that creates
 # texindex.awk (hardwired).  Then we substitute configure-time variables
 # to avoid manual updates of the version number.
-# 
 texindex.awk: ti.twjr
        $(AWK) -f $(srcdir)/jrtangle $(srcdir)/ti.twjr || rm -f texindex.awk
        $(do_subst) <texindex.awk >texindex.awk-tmp
@@ -68,8 +67,7 @@
 ti.html: ti.texi
        makeinfo --no-split --html ti.texi -o ti.html
 
-# unlink jrtangle, jrweave outputs to stdout; and we want the
-# usual UPDATED string.
+# unlike jrtangle, jrweave outputs to stdout; use the usual UPDATED string.
 ti.texi: ti.twjr
        UPDATED=`$(top_srcdir)/build-aux/mdate-sh $(srcdir)/ti.twjr`; \
          $(AWK) -f $(srcdir)/jrweave $(srcdir)/ti.twjr \

Modified: trunk/texindex/texindex.awk
===================================================================
--- trunk/texindex/texindex.awk 2015-06-03 22:07:44 UTC (rev 6304)
+++ trunk/texindex/texindex.awk 2015-06-03 22:29:56 UTC (rev 6305)
@@ -136,9 +136,9 @@
   print _" --version    display version information and exit"
   print _" --           end option processing"
   print ""
-  print _"Email bug reports to address@hidden,"
-  print _"general questions and discussion to address@hidden"
-  print _"Texinfo home page: http://www.gnu.org/software/texinfo/";
+  print _"Email bug reports to address@hidden,\n\
+general questions and discussion to address@hidden
+Texinfo home page: http://www.gnu.org/software/texinfo/";;
 
   exit exit_val
 }
@@ -147,10 +147,10 @@
 {
   print "texindex (GNU texinfo)", Texindex_version
   print ""
-  printf _"Copyright (C) %s Free Software Foundation, Inc.\n", "2015"
-  print _"License GPLv3+: GNU GPL version 3 or later 
<http://gnu.org/licenses/gpl.html>"
-  print _"This is free software: you are free to change and redistribute it."
-  print _"There is NO WARRANTY, to the extent permitted by law."
+  printf _"Copyright (C) %s Free Software Foundation, Inc.\n\
+License GPLv3+: GNU GPL version 3 or later 
<http://gnu.org/licenses/gpl.html>\n\
+This is free software: you are free to change and redistribute it.\n\
+There is NO WARRANTY, to the extent permitted by law.\n", "2015";
 
   exit EXIT_SUCCESS
 }

Modified: trunk/texindex/ti.twjr
===================================================================
--- trunk/texindex/ti.twjr      2015-06-03 22:07:44 UTC (rev 6304)
+++ trunk/texindex/ti.twjr      2015-06-03 22:29:56 UTC (rev 6305)
@@ -1279,9 +1279,9 @@
   print _" --version    display version information and exit"
   print _" --           end option processing"
   print ""
-  print _"Email bug reports to address@hidden,"
-  print _"general questions and discussion to address@hidden"
-  print _"Texinfo home page: http://www.gnu.org/software/texinfo/";
+  print _"Email bug reports to address@hidden,\n\
+general questions and discussion to address@hidden
+Texinfo home page: http://www.gnu.org/software/texinfo/";;
 
   exit exit_val
 }
@@ -1290,10 +1290,10 @@
 {
   print "texindex (GNU texinfo)", Texindex_version
   print ""
-  printf _"Copyright (C) %s Free Software Foundation, Inc.\n", "2015"
-  print _"License GPLv3+: GNU GPL version 3 or later 
<http://gnu.org/licenses/gpl.html>"
-  print _"This is free software: you are free to change and redistribute it."
-  print _"There is NO WARRANTY, to the extent permitted by law."
+  printf _"Copyright (C) %s Free Software Foundation, Inc.\n\
+License GPLv3+: GNU GPL version 3 or later 
<http://gnu.org/licenses/gpl.html>\n\
+This is free software: you are free to change and redistribute it.\n\
+There is NO WARRANTY, to the extent permitted by law.\n", "2015";
 
   exit EXIT_SUCCESS
 }