[no subject]

[Patrice Dumas]

branch: master
commit ee092215131e713bafba4c165688b6e78993613b
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Jan 27 20:10:23 2024 +0100

    * tp/texi2any.pl: avoid \n in translated strings, split each option in
    a translatable string.  Report from Benno Schulenberg.
---
 ChangeLog      |  5 +++++
 tp/texi2any.pl | 32 +++++++++++++++-----------------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b9f981d3c7..24ba500a12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2024-01-27  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/texi2any.pl: avoid \n in translated strings, split each option in
+       a translatable string.  Report from Benno Schulenberg.
+
 2024-01-27  Patrice Dumas  <pertusus@free.fr>
 
        * tp/t/init/redefine_need.init (my_need_formatting): get PACKAGE
diff --git a/tp/texi2any.pl b/tp/texi2any.pl
index 2e07676843..4115fb9bf6 100755
--- a/tp/texi2any.pl
+++ b/tp/texi2any.pl
@@ -778,23 +778,21 @@ Info files suitable for reading online with Emacs or 
standalone GNU Info.
 This program is commonly installed as both `makeinfo' and `texi2any';
 the behavior is identical, and does not depend on the installed name.\n")
 ."\n";
-  # TODO: avoid \n in translated strings, split each option in a translatable
-  # string.  Report from Benno Schulenberg
-  $makeinfo_help .= sprintf(__("General options:
-      --document-language=STR locale to use in translating Texinfo keywords
-                                for the output document (default C).
-      --error-limit=NUM       quit after NUM errors (default %d).
-      --force                 preserve output even if errors.
-      --help                  display this help and exit.
-      --no-validate           suppress node cross-reference validation.
-      --no-warn               suppress warnings (but not errors).
-      --conf-dir=DIR          search also for initialization files in DIR.
-      --init-file=FILE        load FILE to modify the default behavior.
-  -c, --set-customization-variable VAR=VAL  set customization variable VAR 
-                                to value VAL.
-  -v, --verbose               explain what is being done.
-      --version               display version information and exit.\n"),
-    get_conf('ERROR_LIMIT'))
+  $makeinfo_help .= __("General options:")."\n"
+.__("      --document-language=STR locale to use in translating Texinfo 
keywords
+                                for the output document (default C).")."\n"
+.sprintf(__("      --error-limit=NUM       quit after NUM errors (default 
%d)."),
+         get_conf('ERROR_LIMIT'))."\n"
+.__("      --force                 preserve output even if errors.")."\n"
+.__("      --help                  display this help and exit.")."\n"
+.__("      --no-validate           suppress node cross-reference 
validation.")."\n"
+.__("      --no-warn               suppress warnings (but not errors).")."\n"
+.__("      --conf-dir=DIR          search also for initialization files in 
DIR.")."\n"
+.__("      --init-file=FILE        load FILE to modify the default 
behavior.")."\n"
+.__("  -c, --set-customization-variable VAR=VAL  set customization variable VAR
+                                to value VAL.")."\n"
+.__("  -v, --verbose               explain what is being done.")."\n"
+.__("      --version               display version information and exit.")."\n"
 ."\n";
   $makeinfo_help .= __("Output format selection (default is to produce 
Info):")."\n"
 .__("      --docbook               output Docbook XML.")."\n"