Help translators include translation team's web or email address.

* src/system.h (emit_bug_reporting_address): New function.
* src/base64.c: Use it rather than a literal printf.
* src/basename.c, src/cat.c, src/chgrp.c, src/chmod.c:
* src/chown.c, src/chroot.c, src/cksum.c, src/comm.c, src/cp.c:
* src/csplit.c, src/cut.c, src/date.c, src/dd.c, src/df.c:
* src/dircolors.c, src/dirname.c, src/du.c, src/echo.c, src/env.c:
* src/expand.c, src/expr.c, src/factor.c, src/fmt.c, src/fold.c:
* src/head.c, src/hostid.c, src/hostname.c, src/id.c, src/install.c:
* src/join.c, src/kill.c, src/link.c, src/ln.c, src/logname.c:
* src/ls.c, src/md5sum.c, src/mkdir.c, src/mkfifo.c, src/mknod.c:
* src/mv.c, src/nice.c, src/nl.c, src/nohup.c, src/od.c:
* src/paste.c, src/pathchk.c, src/pinky.c, src/pr.c, src/printenv.c:
* src/printf.c, src/ptx.c, src/pwd.c, src/readlink.c, src/rm.c:
* src/rmdir.c, src/seq.c, src/setuidgid.c, src/shred.c, src/shuf.c:
* src/sleep.c, src/sort.c, src/split.c, src/stat.c, src/stty.c:
* src/su.c, src/sum.c, src/sync.c, src/system.h, src/tac.c:
* src/tail.c, src/tee.c, src/test.c, src/touch.c, src/tr.c:
* src/true.c, src/tsort.c, src/tty.c, src/uname.c, src/unexpand.c:
* src/uniq.c, src/unlink.c, src/uptime.c, src/users.c, src/wc.c:
* src/who.c, src/whoami.c, src/yes.c: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 650cde78abcee73d3604e64a29ae850c17c3f7d5..0baafe7c833b6da29119a18bb565f75db8c5cb00 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,27 @@
 2007-03-28  Jim Meyering  <jim@meyering.net>
 
+       Help translators include translation team's web or email address.
+       * src/system.h (emit_bug_reporting_address): New function.
+       * src/base64.c: Use it rather than a literal printf.
+       * src/basename.c, src/cat.c, src/chgrp.c, src/chmod.c:
+       * src/chown.c, src/chroot.c, src/cksum.c, src/comm.c, src/cp.c:
+       * src/csplit.c, src/cut.c, src/date.c, src/dd.c, src/df.c:
+       * src/dircolors.c, src/dirname.c, src/du.c, src/echo.c, src/env.c:
+       * src/expand.c, src/expr.c, src/factor.c, src/fmt.c, src/fold.c:
+       * src/head.c, src/hostid.c, src/hostname.c, src/id.c, src/install.c:
+       * src/join.c, src/kill.c, src/link.c, src/ln.c, src/logname.c:
+       * src/ls.c, src/md5sum.c, src/mkdir.c, src/mkfifo.c, src/mknod.c:
+       * src/mv.c, src/nice.c, src/nl.c, src/nohup.c, src/od.c:
+       * src/paste.c, src/pathchk.c, src/pinky.c, src/pr.c, src/printenv.c:
+       * src/printf.c, src/ptx.c, src/pwd.c, src/readlink.c, src/rm.c:
+       * src/rmdir.c, src/seq.c, src/setuidgid.c, src/shred.c, src/shuf.c:
+       * src/sleep.c, src/sort.c, src/split.c, src/stat.c, src/stty.c:
+       * src/su.c, src/sum.c, src/sync.c, src/system.h, src/tac.c:
+       * src/tail.c, src/tee.c, src/test.c, src/touch.c, src/tr.c:
+       * src/true.c, src/tsort.c, src/tty.c, src/uname.c, src/unexpand.c:
+       * src/uniq.c, src/unlink.c, src/uptime.c, src/users.c, src/wc.c:
+       * src/who.c, src/whoami.c, src/yes.c: Likewise.
+
        * src/stty.c: Don't include "vasprintf.h", now that its
        declarations are guaranteed to be in gnulib's stdio.h.
        * src/who.c: Likewise.

diff --git a/src/base64.c b/src/base64.c
index 9f8ff417ceb9f64b9e07e2610f42749925fc6c05..4a278278e6295d2bf640b22dee931729ef50c3fb 100644 (file)
--- a/src/base64.c
+++ b/src/base64.c
@@ -87,7 +87,7 @@ When decoding, the input may contain newlines in addition to the bytes of\n\
 the formal base64 alphabet.  Use --ignore-garbage to attempt to recover\n\
 from any other non-alphabet bytes in the encoded stream.\n"),
             stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
 
   exit (status);

diff --git a/src/basename.c b/src/basename.c
index f2617b1ea3bc8e312e4d160ce4f4a77ae8c8f062..22f76fc3be777aa904605a3926c2673e216cb17e 100644 (file)
--- a/src/basename.c
+++ b/src/basename.c
@@ -70,7 +70,7 @@ Examples:\n\
   %s include/stdio.h .h  Output \"stdio\".\n\
 "),
              program_name, program_name);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/cat.c b/src/cat.c
index 90a73c21bac1594c9426429ff467ff6615ff8ad4..e100a1483299deee6f2d41657e543657bae3a652 100644 (file)
--- a/src/cat.c
+++ b/src/cat.c
@@ -125,7 +125,7 @@ Examples:\n\
   %s        Copy standard input to standard output.\n\
 "),
              program_name, program_name);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/chgrp.c b/src/chgrp.c
index faf58d36b53084d8cd1f202fd9477f66f908ed6c..1778a8d69aea6cdc8abe4f4e9499649431a56e6b 100644 (file)
--- a/src/chgrp.c
+++ b/src/chgrp.c
@@ -160,7 +160,7 @@ Examples:\n\
   %s -hR staff /u  Change the group of /u and subfiles to \"staff\".\n\
 "),
              program_name, program_name);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/chmod.c b/src/chmod.c
index 028c882d01f9b1c7c1df9e96977867ec63b7a1d2..707b415615b1d9f46d5c5871867953d01b0e3246 100644 (file)
--- a/src/chmod.c
+++ b/src/chmod.c
@@ -369,7 +369,7 @@ Change the mode of each FILE to MODE.\n\
 \n\
 Each MODE is of the form `[ugoa]*([-+=]([rwxXst]*|[ugo]))+'.\n\
 "), stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/chown.c b/src/chown.c
index 63a32f5bffc44d4d5dfb17d5c500994ab9bbb28a..29b75a251954cfe622fa6bc9d48aa79c9d9d6a68 100644 (file)
--- a/src/chown.c
+++ b/src/chown.c
@@ -155,7 +155,7 @@ Examples:\n\
   %s -hR root /u    Change the owner of /u and subfiles to \"root\".\n\
 "),
              program_name, program_name, program_name);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/chroot.c b/src/chroot.c
index d2ae0e5802cb63ac31fb5380ae9760e73edd12a9..31af1817c4ebde0f338a1115e4d2ec255755122e 100644 (file)
--- a/src/chroot.c
+++ b/src/chroot.c
@@ -57,7 +57,7 @@ Run COMMAND with root directory set to NEWROOT.\n\
 \n\
 If no command is given, run ``${SHELL} -i'' (default: /bin/sh).\n\
 "), stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/cksum.c b/src/cksum.c
index d93877fa50262b11825f1954e357cd7c29460697..7b65c730d30bdb768dbee222f14c0b956b79c121 100644 (file)
--- a/src/cksum.c
+++ b/src/cksum.c
@@ -273,7 +273,7 @@ Print CRC checksum and byte counts of each FILE.\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/comm.c b/src/comm.c
index 9b7e03f1f93f391261cb8c5156f5ee21ded2db2a..6ab4938b3201684d220f5c713a09dfcc3e0efa45 100644 (file)
--- a/src/comm.c
+++ b/src/comm.c
@@ -91,7 +91,7 @@ and column three contains lines common to both files.\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/cp.c b/src/cp.c
index 5759e0d07f2fd9278ce25d6b3a19662581b73b95..1fffbd794e68837db618d751fee14c244d8c69c4 100644 (file)
--- a/src/cp.c
+++ b/src/cp.c
@@ -249,7 +249,7 @@ As a special case, cp makes a backup of SOURCE when the force and backup\n\
 options are given and SOURCE and DEST are the same name for an existing,\n\
 regular file.\n\
 "), stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/csplit.c b/src/csplit.c
index c2105bc07682aede1ad942a9594cc9b6094ef946..75a5718d10b30a51ac5d79cd1780bf161117e01e 100644 (file)
--- a/src/csplit.c
+++ b/src/csplit.c
@@ -1509,7 +1509,7 @@ Read standard input if FILE is -.  Each PATTERN may be:\n\
 \n\
 A line OFFSET is a required `+' or `-' followed by a positive integer.\n\
 "), stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/cut.c b/src/cut.c
index c9b83595aa731cb6021f7fc1b92a5670ee9c1a67..bf468fee433f21f0db3355a301602b7fc78f0d7b 100644 (file)
--- a/src/cut.c
+++ b/src/cut.c
@@ -234,7 +234,7 @@ Each range is one of:\n\
 \n\
 With no FILE, or when FILE is -, read standard input.\n\
 "), stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/date.c b/src/date.c
index c64ab1c0407bd4ea79a4ed89f3603e46f1972258..8102e9921f6796e9a901cc16c8073664fa60f121 100644 (file)
--- a/src/date.c
+++ b/src/date.c
@@ -245,7 +245,7 @@ then an optional modifier, which is either\n\
 E to use the locale's alternate representations if available, or\n\
 O to use the locale's alternate numeric symbols if available.\n\
 "), stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/dd.c b/src/dd.c
index 27a4a08c4523b64b17c85db99e3ec421abec5f07..61143c9a351715895a6ccad869222f87545831d5 100644 (file)
--- a/src/dd.c
+++ b/src/dd.c
@@ -507,7 +507,7 @@ Options are:\n\
 
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/df.c b/src/df.c
index 609787eea227436a451903a31c3f892a1a96ba40..f5e0f1a19c26d7065c3ffad262e00fb5dc54dd14 100644 (file)
--- a/src/df.c
+++ b/src/df.c
@@ -772,7 +772,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\
 SIZE may be (or may be an integer optionally followed by) one of following:\n\
 kB 1000, K 1024, MB 1000*1000, M 1024*1024, and so on for G, T, P, E, Z, Y.\n\
 "), stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/dircolors.c b/src/dircolors.c
index 82eb1e088ff80119f3f0327dbd294ed46b44a5cc..51f036d7fbbc29a75a0ea7e99792d45a91cd4b30 100644 (file)
--- a/src/dircolors.c
+++ b/src/dircolors.c
@@ -116,7 +116,7 @@ If FILE is specified, read it to determine which colors to use for which\n\
 file types and extensions.  Otherwise, a precompiled database is used.\n\
 For details on the format of these files, run `dircolors --print-database'.\n\
 "), stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
 
   exit (status);

diff --git a/src/dirname.c b/src/dirname.c
index 2253391cea3fc906ca35468ddaf65794f96c4231..bc2b0f362b27b71663580c339596e4f27404f81d 100644 (file)
--- a/src/dirname.c
+++ b/src/dirname.c
@@ -64,7 +64,7 @@ Examples:\n\
   %s stdio.h        Output \".\".\n\
 "),
              program_name, program_name);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/du.c b/src/du.c
index 206d31842bdf84e694935d71147097e6b5c17be1..3fc2c900be8c1368f5cf2f13b9da007eab6ba5ad 100644 (file)
--- a/src/du.c
+++ b/src/du.c
@@ -344,7 +344,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\
 SIZE may be (or may be an integer optionally followed by) one of following:\n\
 kB 1000, K 1024, MB 1000*1000, M 1024*1024, and so on for G, T, P, E, Z, Y.\n\
 "), stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/echo.c b/src/echo.c
index 5f8582cc0fe14c964d569e0bdca8fdd3b085892d..fe55cddff1a2f54fe7f2255d88c745b538b76d6c 100644 (file)
--- a/src/echo.c
+++ b/src/echo.c
@@ -95,7 +95,7 @@ If -e is in effect, the following sequences are recognized:\n\
   \\v     vertical tab\n\
 "), stdout);
       printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/env.c b/src/env.c
index d95ebfd7e71c73e93187238aabfcbdb65f1c9bd1..355589804245d7fb1476d252ab6777fa0bc27232 100644 (file)
--- a/src/env.c
+++ b/src/env.c
@@ -130,7 +130,7 @@ Set each NAME to VALUE in the environment and run COMMAND.\n\
 \n\
 A mere - implies -i.  If no COMMAND, print the resulting environment.\n\
 "), stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/expand.c b/src/expand.c
index 564520376319c86e1416bd8cc54a31e4e57f1e64..42739bd65af20005916215cd7675558f6443c72d 100644 (file)
--- a/src/expand.c
+++ b/src/expand.c
@@ -129,7 +129,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/expr.c b/src/expr.c
index 352c80cc68bae558c290ce50dfe49e02151930f5..57c2591449f0eb70e264cc10773d65f3f86e1a06 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -163,7 +163,7 @@ Pattern matches return the string matched between \\( and \\) or null; if\n\
 Exit status is 0 if EXPRESSION is neither null nor 0, 1 if EXPRESSION is null\n\
 or 0, 2 if EXPRESSION is syntactically invalid, and 3 if an error occurred.\n\
 "), stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/factor.c b/src/factor.c
index dc8f1cc87605ed03c0ef062f9c843b8b3d7e8ee1..5ebe15484ab1a10665fc03689c19a520984d0ed7 100644 (file)
--- a/src/factor.c
+++ b/src/factor.c
@@ -87,7 +87,7 @@ Print the prime factors of each NUMBER.\n\
 Print the prime factors of all specified integer NUMBERs.  If no arguments\n\
 are specified on the command line, they are read from standard input.\n\
 "), stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/fmt.c b/src/fmt.c
index 5ccc8c44ad5f94885492ca0a83b954d844b66d84..63dac8854e5024005d02fcc7d0554b600c3d0dbe 100644 (file)
--- a/src/fmt.c
+++ b/src/fmt.c
@@ -297,7 +297,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\
 \n\
 With no FILE, or when FILE is -, read standard input.\n"),
             stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/fold.c b/src/fold.c
index 0d4ea586086fb1e00b56351ceaecf6294248c082..84b6eac7f53798914b4489a3bb3d7da5c0ff3ea9 100644 (file)
--- a/src/fold.c
+++ b/src/fold.c
@@ -86,7 +86,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/head.c b/src/head.c
index 4038722b0ddc7ce42f36633964eb06f0c5e7c284..9d830644ce9da192023df3caf1450920ce29e570 100644 (file)
--- a/src/head.c
+++ b/src/head.c
@@ -137,7 +137,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\
 \n\
 N may have a multiplier suffix: b 512, k 1024, m 1024*1024.\n\
 "), stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/hostid.c b/src/hostid.c
index 090b8a04c6903e7498f25f8ec1043f28751e19a5..edd9e3ddc6790be6ddc25a3a9a2c62fbfc3a841f 100644 (file)
--- a/src/hostid.c
+++ b/src/hostid.c
@@ -54,7 +54,7 @@ Print the numeric identifier (in hexadecimal) for the current host.\n\
              program_name, program_name);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/hostname.c b/src/hostname.c
index f6748a66d829b8dbb2c475c1142804796b13666a..a2666bad5d03ae63da31d5623c2f1c25eef4f22f 100644 (file)
--- a/src/hostname.c
+++ b/src/hostname.c
@@ -71,7 +71,7 @@ Print or set the hostname of the current system.\n\
              program_name, program_name);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/id.c b/src/id.c
index 7abb3e50ca7b295c645d16e5811fbd1005aa7a9a..7ed7167eeaf7a973a0d2471092157d0c2f1cb31c 100644 (file)
--- a/src/id.c
+++ b/src/id.c
@@ -92,7 +92,7 @@ Print information for USERNAME, or the current user.\n\
 \n\
 Without any OPTION, print some useful set of identified information.\n\
 "), stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/install.c b/src/install.c
index 04577518ceb133b305ad0214e85e7471b008222f..6f85a24f4ae3d611e9811161688d75a99c1ae9a8 100644 (file)
--- a/src/install.c
+++ b/src/install.c
@@ -702,7 +702,7 @@ the VERSION_CONTROL environment variable.  Here are the values:\n\
   existing, nil   numbered if numbered backups exist, simple otherwise\n\
   simple, never   always make simple backups\n\
 "), stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/join.c b/src/join.c
index b113c543b1727aedc7159482fba7ef61d1096a97..c06213c4f0f27763421c6a4d84eae8cfd61ac05c 100644 (file)
--- a/src/join.c
+++ b/src/join.c
@@ -169,7 +169,7 @@ separated by CHAR.\n\
 Important: FILE1 and FILE2 must be sorted on the join fields.\n\
 E.g., use `sort -k 1b,1' if `join' has no options.\n\
 "), stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/kill.c b/src/kill.c
index c59025fa0402ca0a85f065639fde5d42fe58ed89..0c7ac12421286f3f6fe955ea13d88b422e90c377 100644 (file)
--- a/src/kill.c
+++ b/src/kill.c
@@ -114,7 +114,7 @@ or an exit status of a process terminated by a signal.\n\
 PID is an integer; if negative it identifies a process group.\n\
 "), stdout);
       printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/link.c b/src/link.c
index 277cf23524cd39e3d9114f079512799588d2938d..9e1f33970f354860c4abcd42d204beae6b3461d4 100644 (file)
--- a/src/link.c
+++ b/src/link.c
@@ -55,7 +55,7 @@ Usage: %s FILE1 FILE2\n\
             stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/ln.c b/src/ln.c
index fae370807b340f21d025aac7493a2d36912d1e3b..2e9bfcf40fc4d6cd42e2e780c2d5fc6b28721967 100644 (file)
--- a/src/ln.c
+++ b/src/ln.c
@@ -375,7 +375,7 @@ the VERSION_CONTROL environment variable.  Here are the values:\n\
   existing, nil   numbered if numbered backups exist, simple otherwise\n\
   simple, never   always make simple backups\n\
 "), stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/logname.c b/src/logname.c
index dc82967164ced1ad2d1bf0dc24c5fc7bfdb8a4b7..422bc657c9a6d906ed7c181ca7dd7d6996f21434 100644 (file)
--- a/src/logname.c
+++ b/src/logname.c
@@ -48,7 +48,7 @@ Print the name of the current user.\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/ls.c b/src/ls.c
index 3d489008038c54ae0c451da7e12a4ef7761a6549..77abf67be4fbf4da665afd826a1b026b7bcb0976 100644 (file)
--- a/src/ls.c
+++ b/src/ls.c
@@ -4424,7 +4424,7 @@ colors, and can be set easily by the dircolors command.\n\
 \n\
 Exit status is 0 if OK, 1 if minor problems, 2 if serious trouble.\n\
 "), stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/md5sum.c b/src/md5sum.c
index a8ce1cf272ee169cde0d7c12cf72e106ccea5a10..f637bae392bc16586b3e660912dadf8c67cb9ad4 100644 (file)
--- a/src/md5sum.c
+++ b/src/md5sum.c
@@ -191,7 +191,7 @@ should be a former output of this program.  The default mode is to print\n\
 a line with checksum, a character indicating type (`*' for binary, ` ' for\n\
 text), and name for each FILE.\n"),
              DIGEST_REFERENCE);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
 
   exit (status);

diff --git a/src/mkdir.c b/src/mkdir.c
index 6fa0ac21d1cdb1fda4c4ccca8f529aacb07f683a..0db72415ea969fe78176fa44d4767df115277171 100644 (file)
--- a/src/mkdir.c
+++ b/src/mkdir.c
@@ -71,7 +71,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/mkfifo.c b/src/mkfifo.c
index d329b79b8bad61137b23d99d2eaf8d1d5d0e088c..bd006c441d893805eff950c4a78b216d1b6128ef 100644 (file)
--- a/src/mkfifo.c
+++ b/src/mkfifo.c
@@ -64,7 +64,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/mknod.c b/src/mknod.c
index 43a1b9dcc79290ba6291acd2b96e73355f94794c..955f345074e5b579954521cb279d890124af811b 100644 (file)
--- a/src/mknod.c
+++ b/src/mknod.c
@@ -79,7 +79,7 @@ otherwise, as decimal.  TYPE may be:\n\
   c, u   create a character (unbuffered) special file\n\
   p      create a FIFO\n\
 "), stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/mv.c b/src/mv.c
index 1d1dddab89c6c8ec2d206ca95c7b888ba29814e0..2ca60d08e36e1a2407950fe39182ade7a3ac70c9 100644 (file)
--- a/src/mv.c
+++ b/src/mv.c
@@ -328,7 +328,7 @@ the VERSION_CONTROL environment variable.  Here are the values:\n\
   existing, nil   numbered if numbered backups exist, simple otherwise\n\
   simple, never   always make simple backups\n\
 "), stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/nice.c b/src/nice.c
index 19b38bc3423ae2313fa1b4b5050772adac2298f0..8b6f4d814c414e27c20a99cc5d2be685c71f6a46 100644 (file)
--- a/src/nice.c
+++ b/src/nice.c
@@ -85,7 +85,7 @@ With no COMMAND, print the current niceness.  Nicenesses range from\n\
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
       printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/nl.c b/src/nl.c
index 04c81183a2dd9e431ca32161ec00b705f85fe214..39f27b841cb783813cc0b45f2bfadb2829db3e10 100644 (file)
--- a/src/nl.c
+++ b/src/nl.c
@@ -226,7 +226,7 @@ FORMAT is one of:\n\
   rz   right justified, leading zeros\n\
 \n\
 "), stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/nohup.c b/src/nohup.c
index 1f8e62bc4f0c69bff0df03d63f9262393df68077..dd64410b319ed3404efa08c6c67b60504d74a0a6 100644 (file)
--- a/src/nohup.c
+++ b/src/nohup.c
@@ -67,7 +67,7 @@ Run COMMAND, ignoring hangup signals.\n\
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
       printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/od.c b/src/od.c
index 706a46925eda3555f4d4e9a2a3ff77a476c2e45e..1ae783420155f29b7ed746208ae7eadc61652a94 100644 (file)
--- a/src/od.c
+++ b/src/od.c
@@ -392,7 +392,7 @@ of output.  \
 --string without a number implies 3.  --width without a number\n\
 implies 32.  By default, od uses -A o -t d2 -w16.\n\
 "), stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/paste.c b/src/paste.c
index 414fb8830322444f7e9a6f21c021565ba66c68c7..808744818299579d02d4f7dee2df44908d6fa922 100644 (file)
--- a/src/paste.c
+++ b/src/paste.c
@@ -434,7 +434,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
       /* FIXME: add a couple of examples.  */
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/pathchk.c b/src/pathchk.c
index 748ae64328161dd2163e7bb729a86be891f7f1c1..5e98d5a85959af170ccbfae52867f7218b537f58 100644 (file)
--- a/src/pathchk.c
+++ b/src/pathchk.c
@@ -105,7 +105,7 @@ Diagnose unportable constructs in NAME.\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/pinky.c b/src/pinky.c
index 885012b3dd447f067febaf53d5f5f6753ec8a5e6..ccc5d72e8cef0622c50ebfc9a5e00479d155014c 100644 (file)
--- a/src/pinky.c
+++ b/src/pinky.c
@@ -530,7 +530,7 @@ usage (int status)
 A lightweight `finger' program;  print user information.\n\
 The utmp file will be %s.\n\
 "), UTMP_FILE);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/pr.c b/src/pr.c
index e0aea224e493dc90769408824d4c09a7f6172fb0..0b1aa460660bb7471ac1bcc877ef9830ef08f062 100644 (file)
--- a/src/pr.c
+++ b/src/pr.c
@@ -2872,7 +2872,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\
 -T implied by -l nn when nn <= 10 or <= 3 with -F. With no FILE, or when\n\
 FILE is -, read standard input.\n\
 "), stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/printenv.c b/src/printenv.c
index e06b704e2a34cb31f6d50993ad73e34ee270f453..3412f45f5170f2c05188a57e0400dd3238954244 100644 (file)
--- a/src/printenv.c
+++ b/src/printenv.c
@@ -68,7 +68,7 @@ If no environment VARIABLE specified, print them all.\n\
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
       printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/printf.c b/src/printf.c
index 6205153bd02ddb40dcfc4a88b1de76ce1724cfaf..61c22bf9c811e7d5e137c7572502bdcb081c3953 100644 (file)
--- a/src/printf.c
+++ b/src/printf.c
@@ -135,7 +135,7 @@ and all C format specifications ending with one of diouxXfeEgGcs, with\n\
 ARGUMENTs converted to proper type first.  Variable widths are handled.\n\
 "), stdout);
       printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/ptx.c b/src/ptx.c
index 9c35596fc05160fc717a7e1abea0860268318c50..ecf126cc6566dc8eafad06fcac6aed99be397099 100644 (file)
--- a/src/ptx.c
+++ b/src/ptx.c
@@ -1922,7 +1922,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\
 \n\
 With no FILE or if FILE is -, read Standard Input.  `-F /' by default.\n\
 "), stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/pwd.c b/src/pwd.c
index 4f16b738e25f3b08c7da9865cd57c19be4cbfe97..73ee66e19c1147cf0358a9c6b2de175024ab7499 100644 (file)
--- a/src/pwd.c
+++ b/src/pwd.c
@@ -59,7 +59,7 @@ Print the full filename of the current working directory.\n\
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
       printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/readlink.c b/src/readlink.c
index 121c7ffcf4e6ba36821c64fcad257ffb9aff4090..0961d235c2f08c53bbf7c4763cac5806db95c3ac 100644 (file)
--- a/src/readlink.c
+++ b/src/readlink.c
@@ -86,7 +86,7 @@ usage (int status)
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/rm.c b/src/rm.c
index 81f81ec7fced8038f83ab125598593588f5b62be..77ffbefcb8f14713de4946f660cb0d7a6fa6be3f 100644 (file)
--- a/src/rm.c
+++ b/src/rm.c
@@ -204,7 +204,7 @@ Note that if you use rm to remove a file, it is usually possible to recover\n\
 the contents of that file.  If you want more assurance that the contents are\n\
 truly unrecoverable, consider using shred.\n\
 "), stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/rmdir.c b/src/rmdir.c
index 39063b4c738887ca78ad8e91361366f05d17bf58..5dd5a35a6ea1bc024285b568bb02b28b6154df98 100644 (file)
--- a/src/rmdir.c
+++ b/src/rmdir.c
@@ -152,7 +152,7 @@ Remove the DIRECTORY(ies), if they are empty.\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/seq.c b/src/seq.c
index 59dd318d4e735eab848c24962b0a007175854508..c59c6b527afff86a41e925fff6d66394b0660cbe 100644 (file)
--- a/src/seq.c
+++ b/src/seq.c
@@ -98,7 +98,7 @@ FORMAT must be suitable for printing one argument of type `double';\n\
 it defaults to %.PRECf if FIRST, INCREMENT, and LAST are all fixed point\n\
 decimal numbers with maximum precision PREC, and to %g otherwise.\n\
 "), stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/setuidgid.c b/src/setuidgid.c
index 3a51225dc0d5573afd98d2e6115fdd6182c8a79a..27c4c7991ac74137d58c0842ce26f48c7496a575 100644 (file)
--- a/src/setuidgid.c
+++ b/src/setuidgid.c
@@ -64,7 +64,7 @@ This program is useful only when run by root (user ID zero).\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/shred.c b/src/shred.c
index 23a4944b0dd28489ca7cc8d3eea5267e403da60a..fc6ad67f12f88d0fa01d9668a2c9a47e9871a59e 100644 (file)
--- a/src/shred.c
+++ b/src/shred.c
@@ -236,7 +236,7 @@ In addition, file system backups and remote mirrors may contain copies\n\
 of the file that cannot be removed, and that will allow a shredded file\n\
 to be recovered later.\n\
 "), stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/shuf.c b/src/shuf.c
index bfc9f30a27678bfbcd0f4715d170cc641ae03553..a40c88dd76434317424471e06f8e12cd9cfa07e1 100644 (file)
--- a/src/shuf.c
+++ b/src/shuf.c
@@ -75,7 +75,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\
 \n\
 With no FILE, or when FILE is -, read standard input.\n\
 "), stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
 
   exit (status);

diff --git a/src/sleep.c b/src/sleep.c
index 730b19d1713e4fd1d8b51131967e824501cdeb4a..53bad02234b9fe09975eba7178b52aedddcd7b81 100644 (file)
--- a/src/sleep.c
+++ b/src/sleep.c
@@ -57,7 +57,7 @@ specified by the sum of their values.\n\
              program_name, program_name);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/sort.c b/src/sort.c
index 58ca66a2e3c3374bdcddb83ba47a13aba44d5c03..ff021aa9210c2e0b9c284036d4daf28efcc39cc8 100644 (file)
--- a/src/sort.c
+++ b/src/sort.c
@@ -380,7 +380,7 @@ The locale specified by the environment affects sort order.\n\
 Set LC_ALL=C to get the traditional sort order that uses\n\
 native byte values.\n\
 "), stdout );
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
 
   exit (status);

diff --git a/src/split.c b/src/split.c
index 1f0f3d7270bca0ab7cb122c20e3f820cdd27606a..2fc6ecfcfe124c76c0675eb4176e4dbc3ce964ac 100644 (file)
--- a/src/split.c
+++ b/src/split.c
@@ -133,7 +133,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\
 \n\
 SIZE may have a multiplier suffix: b for 512, k for 1K, m for 1 Meg.\n\
 "), stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/stat.c b/src/stat.c
index ca84236775855f94b872d8dc9996df6494e28152..29a222ac5ba6db57ded4118454383ef38d4dcc0a 100644 (file)
--- a/src/stat.c
+++ b/src/stat.c
@@ -903,7 +903,7 @@ Valid format sequences for file systems:\n\
   %T   Type in human readable form\n\
 "), stdout);
       printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/stty.c b/src/stty.c
index 86a4bab457d50fafda3424362cc6497398e837ee..ce0cb0caef82e114fbbd6e7d53cb254fcc6ea994 100644 (file)
--- a/src/stty.c
+++ b/src/stty.c
@@ -720,7 +720,7 @@ prints baud rate, line discipline, and deviations from stty sane.  In\n\
 settings, CHAR is taken literally, or coded as in ^c, 0x37, 0177 or\n\
 127; special values ^- or undef used to disable special characters.\n\
 "), stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/su.c b/src/su.c
index 70828b8fd8603a4f9c950a28fb164b98d80ac08d..532361608832c2108b3f86159ddffde2bc39a4cf 100644 (file)
--- a/src/su.c
+++ b/src/su.c
@@ -399,7 +399,7 @@ Change the effective user id and group id to that of USER.\n\
 \n\
 A mere - implies -l.   If USER not given, assume root.\n\
 "), stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/sum.c b/src/sum.c
index 92e41268818576a00ceadc06f60a2c02b722a1d0..90bc50172c470e687b60bc9aabdd739016ca8af3 100644 (file)
--- a/src/sum.c
+++ b/src/sum.c
@@ -72,7 +72,7 @@ Print checksum and block counts for each FILE.\n\
 \n\
 With no FILE, or when FILE is -, read standard input.\n\
 "), stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/sync.c b/src/sync.c
index 5e94afbdd8673a8ebe017b37368915ee9491cece..ce3fc05318b8f1380aa95cd84e2bf369b3012f61 100644 (file)
--- a/src/sync.c
+++ b/src/sync.c
@@ -49,7 +49,7 @@ Force changed blocks to disk, update the super block.\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/system.h b/src/system.h
index 763909bac09210436ca9a0e889c602559c49d8cf..e72e4811bd185a6990677e4b9465173366710aa5 100644 (file)
--- a/src/system.h
+++ b/src/system.h
@@ -581,3 +581,13 @@ ptr_align (void const *ptr, size_t alignment)
      || (Type) ((Accum) * 10 + (Digit_val)) < (Accum))                 \
     ? false : (((Accum) = (Accum) * 10 + (Digit_val)), true))          \
   )
+
+static inline void
+emit_bug_reporting_address (void)
+{
+  /* TRANSLATORS: The placeholder indicates the bug-reporting address
+     for this package.  Please add _another line_ saying
+     "Report translation bugs to <...>\n" with the address for translation
+     bugs (typically your translation team's web or email address).  */
+  printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+}

diff --git a/src/tac.c b/src/tac.c
index dc166aaa3dfb64765a4b49e2d10e27d22932d725..e03ac6bc14b158e84657534705ae0c500c034996 100644 (file)
--- a/src/tac.c
+++ b/src/tac.c
@@ -149,7 +149,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/tail.c b/src/tail.c
index 2582b9d694b50af890d832eb7797c41faaedc36b..210a681785809bbeeeceb9660f88127035df36b4 100644 (file)
--- a/src/tail.c
+++ b/src/tail.c
@@ -282,7 +282,7 @@ rotation).  Use --follow=name in that case.  That causes tail to track the\n\
 named file by reopening it periodically to see if it has been removed and\n\
 recreated by some other program.\n\
 "), stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/tee.c b/src/tee.c
index d21edbc04f4b16f5e2e0fbe3c5a8d59d98690c9b..7e423b21c998cf067eb27b6e819370f072b7f675 100644 (file)
--- a/src/tee.c
+++ b/src/tee.c
@@ -72,7 +72,7 @@ Copy standard input to each FILE, and also to standard output.\n\
 \n\
 If a FILE is -, copy again to standard output.\n\
 "), stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/test.c b/src/test.c
index b25436b1f15f073e4260b4e607e83fd45be6a241..fcb68ef3740e910b2c253c66d0616d3fcbfcfc27 100644 (file)
--- a/src/test.c
+++ b/src/test.c
@@ -774,7 +774,7 @@ Beware that parentheses need to be escaped (e.g., by backslashes) for shells.\n\
 INTEGER may also be -l STRING, which evaluates to the length of STRING.\n\
 "), stdout);
       printf (USAGE_BUILTIN_WARNING, _("test and/or ["));
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/touch.c b/src/touch.c
index a79c26d97ec71c2e5cee35139ac7dad39fe9ae4c..cb54f4828f24ece98d0a66bd19380a091408cbbc 100644 (file)
--- a/src/touch.c
+++ b/src/touch.c
@@ -260,7 +260,7 @@ Note that the -d and -t options accept different time-date formats.\n\
 \n\
 If a FILE is -, touch standard output.\n\
 "), stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/tr.c b/src/tr.c
index 214eb2bc97cde6f28f49933979109ce388842c37..d4453f4daea300af3795e9c12a42d22fef9f41e4 100644 (file)
--- a/src/tr.c
+++ b/src/tr.c
@@ -356,7 +356,7 @@ only be used in pairs to specify case conversion.  \
 translating nor deleting; else squeezing uses SET2 and occurs after\n\
 translation or deletion.\n\
 "), stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/true.c b/src/true.c
index 55490f90eaccb5b425100ccd196b443ce2da1bcb..be20ed6d0bce082d3feab26a6e40d0fb6afe0473 100644 (file)
--- a/src/true.c
+++ b/src/true.c
@@ -51,7 +51,7 @@ Usage: %s [ignored command line arguments]\n\
   fputs (HELP_OPTION_DESCRIPTION, stdout);
   fputs (VERSION_OPTION_DESCRIPTION, stdout);
   printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME);
-  printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+  emit_bug_reporting_address ();
   exit (status);
 }
 

diff --git a/src/tsort.c b/src/tsort.c
index 9393232139dabdc3c3ede930254608fce5678a40..cfb12acb642075b0f18590e004de6e0f5007cbc9 100644 (file)
--- a/src/tsort.c
+++ b/src/tsort.c
@@ -91,7 +91,7 @@ With no FILE, or when FILE is -, read standard input.\n\
 "), program_name);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
 
   exit (status);

diff --git a/src/tty.c b/src/tty.c
index 5228e7aaead24bc9e59b1d2438114f27707ad3d7..c1c8761328676951e3506a38175a5d05bc7059ae 100644 (file)
--- a/src/tty.c
+++ b/src/tty.c
@@ -74,7 +74,7 @@ Print the file name of the terminal connected to standard input.\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/uname.c b/src/uname.c
index 0715e07cd62e4379256dd306f24736141ada2b9d..7389d422ec419d0013a11077b196d746904c3645 100644 (file)
--- a/src/uname.c
+++ b/src/uname.c
@@ -133,7 +133,7 @@ Print certain system information.  With no OPTION, same as -s.\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/unexpand.c b/src/unexpand.c
index cbceca0f4ad049ca33bf01bb12d6b9193c7fb5ef..051fe72e48b092421503b609fec0e118ad3113ce 100644 (file)
--- a/src/unexpand.c
+++ b/src/unexpand.c
@@ -138,7 +138,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/uniq.c b/src/uniq.c
index 6c38ed807737e4f56e49e8391a1e76d2119fb49c..ac0840b03a56c55fb5447a1d3d69ea759c77c885 100644 (file)
--- a/src/uniq.c
+++ b/src/uniq.c
@@ -167,7 +167,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\
 A field is a run of whitespace, then non-whitespace characters.\n\
 Fields are skipped before chars.\n\
 "), stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/unlink.c b/src/unlink.c
index 72550764935075e22b10fb133f3d8258abd7f7e4..beef5a5a91a81eb69fc7c12ddba7c33a72c083b0 100644 (file)
--- a/src/unlink.c
+++ b/src/unlink.c
@@ -54,7 +54,7 @@ Usage: %s FILE\n\
             stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/uptime.c b/src/uptime.c
index 6b2a7240a4efb079356e3f0cf727298d9e26a01d..c7bd7a4533bf60851270da2f5d88b73ea4366be2 100644 (file)
--- a/src/uptime.c
+++ b/src/uptime.c
@@ -205,7 +205,7 @@ If FILE is not specified, use %s.  %s as FILE is common.\n\
              UTMP_FILE, WTMP_FILE);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/users.c b/src/users.c
index dba47011376fe3359af82346e4de4e6b043ffb7d..8071acd921af4a321b94225342ad91aff0576534 100644 (file)
--- a/src/users.c
+++ b/src/users.c
@@ -114,7 +114,7 @@ If FILE is not specified, use %s.  %s as FILE is common.\n\
              UTMP_FILE, WTMP_FILE);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/wc.c b/src/wc.c
index 332f32dc4a57327fbbc69c63ef340df44c5e5079..85f7d33a97faae8c69c8c5cc50efbf02f60996bb 100644 (file)
--- a/src/wc.c
+++ b/src/wc.c
@@ -126,7 +126,7 @@ read standard input.\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/who.c b/src/who.c
index a99a8cd68349e1a780501d2d39aa1838be25b0fc..b08c623188f0542c817fd4270e4ac7bfc7c0397f 100644 (file)
--- a/src/who.c
+++ b/src/who.c
@@ -664,7 +664,7 @@ usage (int status)
 If FILE is not specified, use %s.  %s as FILE is common.\n\
 If ARG1 ARG2 given, -m presumed: `am i' or `mom likes' are usual.\n\
 "), UTMP_FILE, WTMP_FILE);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/whoami.c b/src/whoami.c
index c4a2b5e82a635c1cb3434c04e5037751a0a4b743..d1167164b3ff0dc1cd4472cae10915ab0e3aa935 100644 (file)
--- a/src/whoami.c
+++ b/src/whoami.c
@@ -55,7 +55,7 @@ Same as id -un.\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }

diff --git a/src/yes.c b/src/yes.c
index 4f09f68f9ef46add72ee0eb7ea99ed78381bcdde..f81fd8339ea0e794582920ff2412a228da039863 100644 (file)
--- a/src/yes.c
+++ b/src/yes.c
@@ -55,7 +55,7 @@ Repeatedly output a line with all specified STRING(s), or `y'.\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      emit_bug_reporting_address ();
     }
   exit (status);
 }