texinfo update (Sun Jan 15 18:22:01 EST 2006)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.557
retrieving revision 1.558
diff -c -r1.557 -r1.558
*** ChangeLog   15 Jan 2006 21:00:06 -0000      1.557
--- ChangeLog   15 Jan 2006 23:20:10 -0000      1.558
***************
*** 1,5 ****
--- 1,10 ----
  2006-01-15  Karl Berry  <address@hidden>
  
+       * info/infodoc.c (info_internal_help_text): combine messages
+       which are single sentences into one string.
+       Report from Clytie Siddall, via
+       
http://sourceforge.net/tracker/index.php?func=detail&aid=1406541&group_id=40033&atid=426818.
+ 
        * po/POTFILES.in: add missing makeinfo/xref.c, makeinfo/float.c.
        Report from Torsten.
  
Index: info/infodoc.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/infodoc.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -c -r1.9 -r1.10
*** info/infodoc.c      15 May 2005 00:00:07 -0000      1.9
--- info/infodoc.c      15 Jan 2006 23:20:11 -0000      1.10
***************
*** 1,7 ****
  /* infodoc.c -- functions which build documentation nodes.
!    $Id: infodoc.c,v 1.9 2005/05/15 00:00:07 karl Exp $
  
!    Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003, 2004 Free Software
     Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
--- 1,7 ----
  /* infodoc.c -- functions which build documentation nodes.
!    $Id: infodoc.c,v 1.10 2006/01/15 23:20:11 karl Exp $
  
!    Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2006 Free 
Software
     Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
***************
*** 126,137 ****
  ---------------\n"),
    N_("  %-10s  Pick first ... ninth item in node's menu.\n"),
    N_("  %-10s  Pick last item in node's menu.\n"),
!   N_("  %-10s  Search for a specified string in the index entries of this 
Info\n"),
!   N_("              file, and select the node referenced by the first entry 
found.\n"),
    N_("  %-10s  Move to node specified by name.\n"),
    N_("              You may include a filename as well, as in 
(FILENAME)NODENAME.\n"),
!   N_("  %-10s  Search forward for a specified string,\n"),
!   N_("              and select the node in which the next occurrence is 
found.\n"),
    N_("  %-10s  Search backward for a specified string\n"),
    N_("              and select the node in which the next occurrence is 
found.\n"),
    NULL
--- 126,139 ----
  ---------------\n"),
    N_("  %-10s  Pick first ... ninth item in node's menu.\n"),
    N_("  %-10s  Pick last item in node's menu.\n"),
!   /* This string and the one below are one sentence, so they need to be
!      kept as one string for the translators.  */
!   N_("  %-10s  Search for a specified string in the index entries of this 
Info\n\
!               file, and select the node referenced by the first entry 
found.\n"),
    N_("  %-10s  Move to node specified by name.\n"),
    N_("              You may include a filename as well, as in 
(FILENAME)NODENAME.\n"),
!   N_("  %-10s  Search forward for a specified string,\n\
!               and select the node in which the next occurrence is found.\n"),
    N_("  %-10s  Search backward for a specified string\n"),
    N_("              and select the node in which the next occurrence is 
found.\n"),
    NULL
P ChangeLog
P info/infodoc.c