texinfo update (Fri Nov 23 17:23:01 EST 2007)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.778
retrieving revision 1.779
diff -u -r1.778 -r1.779
--- ChangeLog   22 Nov 2007 22:52:03 -0000      1.778
+++ ChangeLog   23 Nov 2007 22:16:21 -0000      1.779
@@ -1,3 +1,7 @@
+2007-11-23  Benno Schulenberg <address@hidden>
+
+       * info/infodoc.c: keep help strings together for translation.
+
 2007-11-22  Ralf Wildenhues  <address@hidden>
 
        * util/texi2dvi: Fix quoting for white space in file names.
Index: info/infodoc.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/infodoc.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- info/infodoc.c      26 Aug 2007 12:58:56 -0000      1.14
+++ info/infodoc.c      23 Nov 2007 22:16:21 -0000      1.15
@@ -1,5 +1,5 @@
 /* infodoc.c -- functions which build documentation nodes.
-   $Id: infodoc.c,v 1.14 2007/08/26 12:58:56 karl Exp $
+   $Id: infodoc.c,v 1.15 2007/11/23 22:16:21 karl Exp $
 
    Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2006, 2007
    Free Software Foundation, Inc.
@@ -106,8 +106,8 @@
   N_("  %-10s  Move to the `next' node of this node.\n"),
   N_("  %-10s  Move to the `previous' node of this node.\n"),
   N_("  %-10s  Move `up' from this node.\n"),
-  N_("  %-10s  Pick menu item specified by name.\n"),
-  N_("              Picking a menu item causes another node to be 
selected.\n"),
+  N_("  %-10s  Pick menu item specified by name.\n\
+              Picking a menu item causes another node to be selected.\n"),
   N_("  %-10s  Follow a cross reference.  Reads name of reference.\n"),
   N_("  %-10s  Move to the last node seen in this window.\n"),
   N_("  %-10s  Skip to next hypertext link within this node.\n"),
@@ -126,18 +126,18 @@
   "\n",
   N_("Other commands:\n\
 ---------------\n"),
-  N_("  %-10s  Pick first ... ninth item in node's menu.\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
+  /* The next four strings are each a unity, so they each 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  Move to node specified by name.\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"),
+  N_("  %-10s  Search backward for a specified string,\n\
+              and select the node in which the next occurrence is found.\n"),
   NULL
 };
 
P ChangeLog
P info/infodoc.c