(WRITTEN_BY): Rename from AUTHORS.

Begin each WRITTEN_BY string with `Written by ' and end it with `.'.
Mark each WRITTEN_BY string as translatable.

diff --git a/src/basename.c b/src/basename.c
index 805ee25caa24f0aea6d5deeb74ed0c2d9d7782e1..84c52a5a8b87328becd4bceb98dfa3320f4fb178 100644 (file)
--- a/src/basename.c
+++ b/src/basename.c
@@ -37,7 +37,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "basename"
 
-#define AUTHORS "FIXME unknown"
+#define WRITTEN_BY _("Written by FIXME unknown.")
 
 /* The name this program was run with. */
 char *program_name;
@@ -100,7 +100,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-                     AUTHORS, usage);
+                     WRITTEN_BY, usage);
   /* The above handles --help and --version.
      Since there is no other invocation of getopt, handle `--' here.  */
   if (argc > 1 && STREQ (argv[1], "--"))

diff --git a/src/cat.c b/src/cat.c
index cf0a90016a4e3dc8f393b35785edbd21c97c10d0..e8ca98cc63b173264b75b4fbcced5353585402bc 100644 (file)
--- a/src/cat.c
+++ b/src/cat.c
@@ -38,7 +38,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "cat"
 
-#define AUTHORS N_ ("Torbjorn Granlund and Richard M. Stallman")
+#define WRITTEN_BY _("Written by Torbjorn Granlund and Richard M. Stallman.")
 
 /* Undefine, to avoid warning about redefinition on some systems.  */
 #undef max
@@ -650,7 +650,7 @@ main (int argc, char **argv)
 
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
 
        default:
          usage (EXIT_FAILURE);

diff --git a/src/chgrp.c b/src/chgrp.c
index 1bcc85ed314e6a1dc67466d9549bfade4d22d948..e5a1cddeff28d1d7b505f0fe33237d80f83ac4b3 100644 (file)
--- a/src/chgrp.c
+++ b/src/chgrp.c
@@ -34,7 +34,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "chgrp"
 
-#define AUTHORS "David MacKenzie"
+#define WRITTEN_BY _("Written by David MacKenzie.")
 
 /* MAXUID may come from limits.h *or* sys/params.h (via system.h) above. */
 #ifndef MAXUID
@@ -200,7 +200,7 @@ main (int argc, char **argv)
          chopt.verbosity = V_high;
          break;
        case_GETOPT_HELP_CHAR;
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
        default:
          usage (EXIT_FAILURE);
        }

diff --git a/src/chmod.c b/src/chmod.c
index 7059b863e6f915ad4ffff2ba6fc8e66cccfc2eb9..5f7883502cad95c33c0df7bf2cdeea870b5951bc 100644 (file)
--- a/src/chmod.c
+++ b/src/chmod.c
@@ -32,7 +32,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "chmod"
 
-#define AUTHORS "David MacKenzie"
+#define WRITTEN_BY _("Written by David MacKenzie.")
 
 enum Change_status
 {
@@ -339,7 +339,7 @@ main (int argc, char **argv)
          verbosity = V_high;
          break;
        case_GETOPT_HELP_CHAR;
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
        default:
          usage (EXIT_FAILURE);
        }

diff --git a/src/chown.c b/src/chown.c
index 10273bd4212613bdb228ae0c3c8118e55379bdf2..5d22de8126d173ad54dc9e798c46ae7b42f09083 100644 (file)
--- a/src/chown.c
+++ b/src/chown.c
@@ -42,7 +42,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "chown"
 
-#define AUTHORS "David MacKenzie"
+#define WRITTEN_BY _("Written by David MacKenzie.")
 
 #ifndef _POSIX_VERSION
 struct passwd *getpwnam ();
@@ -201,7 +201,7 @@ main (int argc, char **argv)
          chopt.verbosity = V_high;
          break;
        case_GETOPT_HELP_CHAR;
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
        default:
          usage (EXIT_FAILURE);
        }

diff --git a/src/chroot.c b/src/chroot.c
index 78836c8a5a6ff145324014920d7722ff759ac56e..30e070f36c48721416435d0698307f308d55d22a 100644 (file)
--- a/src/chroot.c
+++ b/src/chroot.c
@@ -28,7 +28,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "chroot"
 
-#define AUTHORS "Roland McGrath"
+#define WRITTEN_BY _("Written by Roland McGrath.")
 
 /* The name this program was run with, for error messages. */
 char *program_name;
@@ -72,7 +72,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-                     AUTHORS, usage);
+                     WRITTEN_BY, usage);
   if (argc <= 1)
     {
       error (0, 0, _("too few arguments"));

diff --git a/src/cksum.c b/src/cksum.c
index 4d0fec187d8b984c5a1048d167d1ed2285894262..5d56ba228e3e361af82d25d43a3ffb3ffa493509 100644 (file)
--- a/src/cksum.c
+++ b/src/cksum.c
@@ -45,7 +45,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "cksum"
 
-#define AUTHORS "Q. Frank Xia"
+#define WRITTEN_BY _("Written by Q. Frank Xia.")
 
 #include <stdio.h>
 #include <sys/types.h>
@@ -309,7 +309,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE, VERSION,
-                     AUTHORS, usage);
+                     WRITTEN_BY, usage);
 
   have_read_stdin = 0;
 

diff --git a/src/comm.c b/src/comm.c
index efa5ee4313dbc1e86d2519a87e9b34d0830e704a..0b69e5c3646fc4f46a6377d9425ed830c963ea69 100644 (file)
--- a/src/comm.c
+++ b/src/comm.c
@@ -31,7 +31,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "comm"
 
-#define AUTHORS N_ ("Richard Stallman and David MacKenzie")
+#define WRITTEN_BY _("Written by Richard Stallman and David MacKenzie.")
 
 /* Undefine, to avoid warning about redefinition on some systems.  */
 #undef min
@@ -254,7 +254,7 @@ main (int argc, char **argv)
 
       case_GETOPT_HELP_CHAR;
 
-      case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+      case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
 
       default:
        usage (EXIT_FAILURE);

diff --git a/src/cp.c b/src/cp.c
index a0e59110c9cf514620d80709e4ff7a8120377975..9e5e3d795a7d44901d79a60f9aebd25d780ae8a7 100644 (file)
--- a/src/cp.c
+++ b/src/cp.c
@@ -47,7 +47,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "cp"
 
-#define AUTHORS N_ ("Torbjorn Granlund, David MacKenzie, and Jim Meyering")
+#define WRITTEN_BY _("Written by Torbjorn Granlund, David MacKenzie, and Jim Meyering.")
 
 #ifndef _POSIX_VERSION
 uid_t geteuid ();
@@ -992,7 +992,7 @@ main (int argc, char **argv)
 
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
 
        default:
          usage (EXIT_FAILURE);

diff --git a/src/csplit.c b/src/csplit.c
index e6bdb558c5a37be2a5aac21e47caa1d17cdb0a14..07fd2d321b37f860ed8dfabf0a186c15155268a6 100644 (file)
--- a/src/csplit.c
+++ b/src/csplit.c
@@ -37,7 +37,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "csplit"
 
-#define AUTHORS N_ ("Stuart Kemp and David MacKenzie")
+#define WRITTEN_BY _("Written by Stuart Kemp and David MacKenzie.")
 
 #ifndef TRUE
 # define FALSE 0
@@ -1453,7 +1453,7 @@ main (int argc, char **argv)
 
       case_GETOPT_HELP_CHAR;
 
-      case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+      case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
 
       default:
        usage (EXIT_FAILURE);

diff --git a/src/cut.c b/src/cut.c
index d1af11285303b3a049d04a3df24d702fb0a467b4..d97183e2bf3d20afe6f3a5131f9fc4a4482ffb00 100644 (file)
--- a/src/cut.c
+++ b/src/cut.c
@@ -39,7 +39,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "cut"
 
-#define AUTHORS N_ ("David Ihnat, David MacKenzie, and Jim Meyering")
+#define WRITTEN_BY _("Written by David Ihnat, David MacKenzie, and Jim Meyering.")
 
 #define FATAL_ERROR(Message)                                           \
   do                                                                   \
@@ -800,7 +800,7 @@ main (int argc, char **argv)
 
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
 
        default:
          usage (2);

diff --git a/src/date.c b/src/date.c
index 6d93338330cdac72f56caaa248e380540d90ae72..4948d7d502ce1043050b8397ab10587fa0c082b8 100644 (file)
--- a/src/date.c
+++ b/src/date.c
@@ -40,7 +40,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "date"
 
-#define AUTHORS "David MacKenzie"
+#define WRITTEN_BY _("Written by David MacKenzie.")
 
 int putenv ();
 
@@ -350,7 +350,7 @@ main (int argc, char **argv)
        TZSET;
        break;
       case_GETOPT_HELP_CHAR;
-      case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+      case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
       default:
        usage (EXIT_FAILURE);
       }

diff --git a/src/dd.c b/src/dd.c
index 187764ca9e65a2a73076845e80309509e5aff929..9df05420afbffdb7b1ef7890f7ae495c98caa28e 100644 (file)
--- a/src/dd.c
+++ b/src/dd.c
@@ -39,7 +39,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "dd"
 
-#define AUTHORS N_ ("Paul Rubin, David MacKenzie, and Stuart Kemp")
+#define WRITTEN_BY _("Written by Paul Rubin, David MacKenzie, and Stuart Kemp.")
 
 #ifndef SIGINFO
 # define SIGINFO SIGUSR1
@@ -1161,7 +1161,7 @@ main (int argc, char **argv)
   atexit (close_stdout_wrapper);
 
   parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE, VERSION,
-                     AUTHORS, usage);
+                     WRITTEN_BY, usage);
 
   /* Don't close stdout on exit from here on.  */
   closeout_func = NULL;

diff --git a/src/df.c b/src/df.c
index af8c2bf1d6a6164a79c773e5d521d841e7d5bcf0..d1ae89c639b91f7cbea418418402ddf3ce4bd534 100644 (file)
--- a/src/df.c
+++ b/src/df.c
@@ -41,8 +41,8 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "df"
 
-#define AUTHORS \
-  N_ ("Torbjorn Granlund, David MacKenzie, and Paul Eggert")
+#define WRITTEN_BY \
+  _("Written by Torbjorn Granlund, David MacKenzie, and Paul Eggert.")
 
 /* Name this program was run with. */
 char *program_name;
@@ -854,7 +854,7 @@ main (int argc, char **argv)
          break;
 
        case_GETOPT_HELP_CHAR;
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
 
        default:
          usage (EXIT_FAILURE);

diff --git a/src/dircolors.c b/src/dircolors.c
index 5d18f098cd402193bf9b39348f7c3aeb3def1cbd..64d17f3b9d5791a71a74c41ad0ef890c1da8ae8c 100644 (file)
--- a/src/dircolors.c
+++ b/src/dircolors.c
@@ -36,7 +36,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "dircolors"
 
-#define AUTHORS "H. Peter Anvin"
+#define WRITTEN_BY _("Written by H. Peter Anvin.")
 
 #define obstack_chunk_alloc malloc
 #define obstack_chunk_free free
@@ -443,7 +443,7 @@ main (int argc, char **argv)
 
       case_GETOPT_HELP_CHAR;
 
-      case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+      case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
 
       default:
        usage (EXIT_FAILURE);

diff --git a/src/dirname.c b/src/dirname.c
index ec4e353f791e0d725441d0e82a879dc839b7b5ca..922573d5b3146ac73ee846fe38e5f4bc128b6546 100644 (file)
--- a/src/dirname.c
+++ b/src/dirname.c
@@ -29,7 +29,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "dirname"
 
-#define AUTHORS N_ ("David MacKenzie and Jim Meyering")
+#define WRITTEN_BY _("Written by David MacKenzie and Jim Meyering.")
 
 /* The name this program was run with. */
 char *program_name;
@@ -75,7 +75,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-                     AUTHORS, usage);
+                     WRITTEN_BY, usage);
   /* The above handles --help and --version.
      Since there is no other invocation of getopt, handle `--' here.  */
   if (argc > 1 && STREQ (argv[1], "--"))

diff --git a/src/du.c b/src/du.c
index 890abeda0475b968486646ba8ca707756c7abd72..ddcb13cf4100c9b19821adbb24eb7d2f266e20de 100644 (file)
--- a/src/du.c
+++ b/src/du.c
@@ -45,8 +45,8 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "du"
 
-#define AUTHORS \
-  N_ ("Torbjorn Granlund, David MacKenzie, Paul Eggert, and Jim Meyering")
+#define WRITTEN_BY \
+  _("Written by Torbjorn Granlund, David MacKenzie, Paul Eggert, and Jim Meyering.")
 
 /* Initial size of the hash table.  */
 #define INITIAL_TABLE_SIZE 103
@@ -693,7 +693,7 @@ main (int argc, char **argv)
 
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
 
        default:
          fail = 1;

diff --git a/src/echo.c b/src/echo.c
index e1629a638c98c8815fcffe935d68df46e649f609..dfaf0aa31896eeb653c998c51099e114eac6cfd9 100644 (file)
--- a/src/echo.c
+++ b/src/echo.c
@@ -24,7 +24,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "echo"
 
-#define AUTHORS "FIXME unknown"
+#define WRITTEN_BY _("Written by FIXME unknown.")
 
 /* echo [-neE] [arg ...]
 Output the ARGs.  If -n is specified, the trailing newline is
@@ -127,7 +127,7 @@ main (int argc, char **argv)
   /* Don't recognize --help or --version if POSIXLY_CORRECT is set.  */
   if (getenv ("POSIXLY_CORRECT") == NULL)
     parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-                     AUTHORS, usage);
+                     WRITTEN_BY, usage);
   else
     allow_options = 0;
 

diff --git a/src/env.c b/src/env.c
index 440ec8fb3d235dfd30819a605bc3b7bb212642c4..1f39ff4c96a161c660d7b7562e80ca7775b6df23 100644 (file)
--- a/src/env.c
+++ b/src/env.c
@@ -89,7 +89,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "env"
 
-#define AUTHORS N_ ("Richard Mlynarik and David MacKenzie")
+#define WRITTEN_BY _("Written by Richard Mlynarik and David MacKenzie.")
 
 int putenv ();
 
@@ -161,7 +161,7 @@ main (register int argc, register char **argv, char **envp)
        case 'u':
          break;
        case_GETOPT_HELP_CHAR;
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
        default:
          usage (2);
        }

diff --git a/src/expand.c b/src/expand.c
index 8be52b5631dd0ddf8d0cf52dd1294ace45585116..eaddff27f6410e4d56353060dbcddc951287adf4 100644 (file)
--- a/src/expand.c
+++ b/src/expand.c
@@ -47,7 +47,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "expand"
 
-#define AUTHORS "David MacKenzie"
+#define WRITTEN_BY _("Written by David MacKenzie.")
 
 /* The number of bytes added at a time to the amount of memory
    allocated for the output line. */
@@ -399,7 +399,7 @@ main (int argc, char **argv)
          obsolete_tablist = true;
          break;
        case_GETOPT_HELP_CHAR;
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
        default:
          if (tabval == -1)
            tabval = 0;

diff --git a/src/expr.c b/src/expr.c
index b6132755a3075c4388f67c4c13795a8b4bb60ab8..607abbbd6d61c9b5cc5ede0042f6ac37225a813c 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -43,7 +43,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "expr"
 
-#define AUTHORS "Mike Parker"
+#define WRITTEN_BY _("Written by Mike Parker.")
 
 #undef NEW
 #define NEW(Type) XMALLOC (Type, 1)
@@ -188,7 +188,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-                     AUTHORS, usage);
+                     WRITTEN_BY, usage);
   /* The above handles --help and --version.
      Since there is no other invocation of getopt, handle `--' here.  */
   if (argc > 1 && STREQ (argv[1], "--"))

diff --git a/src/factor.c b/src/factor.c
index f27c1c08db3681b33790d8c75b87165a151ecbed..88b64cc6b21c50104689328a6feb781d60e33885 100644 (file)
--- a/src/factor.c
+++ b/src/factor.c
@@ -35,7 +35,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "factor"
 
-#define AUTHORS "Paul Rubin"
+#define WRITTEN_BY _("Written by Paul Rubin.")
 
 /* Token delimiters when reading from a file.  */
 #define DELIM "\n\t "
@@ -202,7 +202,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-                     AUTHORS, usage);
+                     WRITTEN_BY, usage);
   /* The above handles --help and --version.
      Since there is no other invocation of getopt, handle `--' here.  */
   if (argc > 1 && STREQ (argv[1], "--"))

diff --git a/src/fmt.c b/src/fmt.c
index a931593dcff9117a4559ba364893ade2cf97f73e..d243c4629f3c47aa9dd5050d797ea7388cf344db 100644 (file)
--- a/src/fmt.c
+++ b/src/fmt.c
@@ -34,7 +34,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "fmt"
 
-#define AUTHORS "Ross Paterson"
+#define WRITTEN_BY _("Written by Ross Paterson.")
 
 /* The following parameters represent the program's idea of what is
    "best".  Adjust to taste, subject to the caveats given.  */
@@ -401,7 +401,7 @@ main (register int argc, register char **argv)
 
       case_GETOPT_HELP_CHAR;
 
-      case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+      case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
 
       }
 

diff --git a/src/fold.c b/src/fold.c
index 538dcfdabc14715a9b11c6f65e9607e4b5290834..29376607297ff3ab5518fa85d94a943b48100f7b 100644 (file)
--- a/src/fold.c
+++ b/src/fold.c
@@ -31,7 +31,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "fold"
 
-#define AUTHORS "David MacKenzie"
+#define WRITTEN_BY _("Written by David MacKenzie.")
 
 /* The name this program was run with. */
 char *program_name;
@@ -298,7 +298,7 @@ main (int argc, char **argv)
 
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
 
        default:
          usage (EXIT_FAILURE);

diff --git a/src/head.c b/src/head.c
index cf28bbe940160869d754b443f756b330fde7912f..8646f4877e5cd08d79b35d93f8569831681c463a 100644 (file)
--- a/src/head.c
+++ b/src/head.c
@@ -44,7 +44,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "head"
 
-#define AUTHORS N_("David MacKenzie and Jim Meyering")
+#define WRITTEN_BY _("Written by David MacKenzie and Jim Meyering.")
 
 /* Number of lines/chars/blocks to head. */
 #define DEFAULT_NUMBER 10
@@ -1059,7 +1059,7 @@ main (int argc, char **argv)
 
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
 
        default:
          usage (EXIT_FAILURE);

diff --git a/src/hostid.c b/src/hostid.c
index 3119aadff8023dc5602353b57c93ab8fe39f4689..3fc6b055f5c0f4b74a82b970f2dccf86db728afa 100644 (file)
--- a/src/hostid.c
+++ b/src/hostid.c
@@ -28,7 +28,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "hostid"
 
-#define AUTHORS "Jim Meyering"
+#define WRITTEN_BY _("Written by Jim Meyering.")
 
 /* The name this program was run with, for error messages. */
 char *program_name;
@@ -69,7 +69,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-                     AUTHORS, usage);
+                     WRITTEN_BY, usage);
 
   if (argc > 1)
     {

diff --git a/src/hostname.c b/src/hostname.c
index 8f97a7affaad59ff9b4fe696ceb55e6a06fc9a48..e6250a10d1f8632b7f38fc79f59e99cb09d05779 100644 (file)
--- a/src/hostname.c
+++ b/src/hostname.c
@@ -28,7 +28,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "hostname"
 
-#define AUTHORS "Jim Meyering"
+#define WRITTEN_BY _("Written by Jim Meyering.")
 
 #if !defined(HAVE_SETHOSTNAME) && defined(HAVE_SYSINFO) && \
      defined (HAVE_SYS_SYSTEMINFO_H) && defined(HAVE_LIMITS_H)
@@ -91,7 +91,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-                     AUTHORS, usage);
+                     WRITTEN_BY, usage);
 
 #ifdef HAVE_SETHOSTNAME
   if (argc == 2)

diff --git a/src/id.c b/src/id.c
index 2880928d6f946344bbfc057c3a76acf896e0e6e0..ac348b3464a7b0c4612f803e34bfb77b231df793 100644 (file)
--- a/src/id.c
+++ b/src/id.c
@@ -32,7 +32,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "id"
 
-#define AUTHORS N_ ("Arnold Robbins and David MacKenzie")
+#define WRITTEN_BY _("Written by Arnold Robbins and David MacKenzie.")
 
 #ifndef _POSIX_VERSION
 struct passwd *getpwuid ();
@@ -152,7 +152,7 @@ main (int argc, char **argv)
          just_group_list = 1;
          break;
        case_GETOPT_HELP_CHAR;
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
        default:
          usage (EXIT_FAILURE);
        }

diff --git a/src/install.c b/src/install.c
index 5b32eea78cdd472becc0808e5edf6e9c0f73a153..3cd72c3379de4855209832da0bc588baaf242dac 100644 (file)
--- a/src/install.c
+++ b/src/install.c
@@ -40,7 +40,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "install"
 
-#define AUTHORS "David MacKenzie"
+#define WRITTEN_BY _("Written by David MacKenzie.")
 
 #if HAVE_SYS_WAIT_H
 # include <sys/wait.h>
@@ -255,7 +255,7 @@ main (int argc, char **argv)
          backup_suffix_string = optarg;
          break;
        case_GETOPT_HELP_CHAR;
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
        default:
          usage (EXIT_FAILURE);
        }

diff --git a/src/join.c b/src/join.c
index 554df88fdc2cb7ef5c2c8dfcff013ac8407bde79..e82b66fe2ba8191e4ef2af22f8b66fe7ee9d5db1 100644 (file)
--- a/src/join.c
+++ b/src/join.c
@@ -35,7 +35,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "join"
 
-#define AUTHORS "Mike Haertel"
+#define WRITTEN_BY _("Written by Mike Haertel.")
 
 #define join system_join
 
@@ -838,7 +838,7 @@ main (int argc, char **argv)
 
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
 
        default:
          usage (EXIT_FAILURE);

diff --git a/src/kill.c b/src/kill.c
index 7f3ecb14b6826f9010ccf274def063997c7ae1b3..39dde86c0258f091ec2cfd858075222ff5bde81b 100644 (file)
--- a/src/kill.c
+++ b/src/kill.c
@@ -40,7 +40,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "kill"
 
-#define AUTHORS "Paul Eggert"
+#define WRITTEN_BY _("Written by Paul Eggert.")
 \f
 #if ! (HAVE_DECL_STRTOIMAX || defined strtoimax)
 intmax_t strtoimax ();
@@ -350,7 +350,7 @@ main (int argc, char **argv)
        break;
 
       case_GETOPT_HELP_CHAR;
-      case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+      case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
       default:
        usage (EXIT_FAILURE);
       }

diff --git a/src/link.c b/src/link.c
index 20cf42b5322606b78eccdba4c7d6bc0703100265..4f9b99ac2b13a4eb00add1b0292e63eca82546da 100644 (file)
--- a/src/link.c
+++ b/src/link.c
@@ -35,7 +35,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "link"
 
-#define AUTHORS "Michael Stone"
+#define WRITTEN_BY _("Written by Michael Stone.")
 
 /* Name this program was run with.  */
 char *program_name;
@@ -73,7 +73,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-                     AUTHORS, usage);
+                     WRITTEN_BY, usage);
 
   /* The above handles --help and --version.
      Since there is no other invocation of getopt, handle `--' here.  */

diff --git a/src/ln.c b/src/ln.c
index 35a879033ac70f95a22125d70b88d8308abfa138..77055c70c54bc158f134c7b9ff31ea7065d388b7 100644 (file)
--- a/src/ln.c
+++ b/src/ln.c
@@ -32,7 +32,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "ln"
 
-#define AUTHORS N_ ("Mike Parker and David MacKenzie")
+#define WRITTEN_BY _("Written by Mike Parker and David MacKenzie.")
 
 #ifndef ENABLE_HARD_LINK_TO_SYMLINK_WARNING
 # define ENABLE_HARD_LINK_TO_SYMLINK_WARNING 0
@@ -476,7 +476,7 @@ main (int argc, char **argv)
          backup_suffix_string = optarg;
          break;
        case_GETOPT_HELP_CHAR;
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
        default:
          usage (EXIT_FAILURE);
          break;

diff --git a/src/logname.c b/src/logname.c
index 4ff86392422cefdc194c30d8016ed1f15376962c..ecddb7fee62d5aa53b3d3c5d0a168e585150caae 100644 (file)
--- a/src/logname.c
+++ b/src/logname.c
@@ -27,7 +27,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "logname"
 
-#define AUTHORS "FIXME: unknown"
+#define WRITTEN_BY _("Written by FIXME: unknown.")
 
 /* The name this program was run with. */
 char *program_name;
@@ -72,7 +72,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-                     AUTHORS, usage);
+                     WRITTEN_BY, usage);
 
   while ((c = getopt_long (argc, argv, "", long_options, NULL)) != -1)
     {

diff --git a/src/ls.c b/src/ls.c
index 1570ad0941474a94a264070d898245bb833247ae..fd2e366ad7a08cbcdf091fe238046fdbe3c671da 100644 (file)
--- a/src/ls.c
+++ b/src/ls.c
@@ -119,7 +119,7 @@ int wcwidth ();
                      : (ls_mode == LS_MULTI_COL \
                         ? "dir" : "vdir"))
 
-#define AUTHORS N_ ("Richard Stallman and David MacKenzie")
+#define WRITTEN_BY _("Written by Richard Stallman and David MacKenzie.")
 
 #define obstack_chunk_alloc malloc
 #define obstack_chunk_free free
@@ -1646,7 +1646,7 @@ decode_switches (int argc, char **argv)
 
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
 
        default:
          usage (EXIT_FAILURE);

diff --git a/src/md5sum.c b/src/md5sum.c
index c1685a509b3e1cafb5ec9a0a9cee94387e67cb9e..62d52ef443bb39475ec1b473c2c9a688baea5982 100644 (file)
--- a/src/md5sum.c
+++ b/src/md5sum.c
@@ -34,7 +34,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME (algorithm == ALG_MD5 ? "md5sum" : "shasum")
 
-#define AUTHORS N_ ("Ulrich Drepper and Scott Miller")
+#define WRITTEN_BY _("Written by Ulrich Drepper and Scott Miller.")
 
 /* Most systems do not distinguish between external and internal
    text representations.  */
@@ -602,7 +602,7 @@ main (int argc, char **argv)
        warn = 1;
        break;
       case_GETOPT_HELP_CHAR;
-      case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+      case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
       default:
        usage (EXIT_FAILURE);
       }

diff --git a/src/mkdir.c b/src/mkdir.c
index 3527e107315be0f61d9a5a2a442750b481002b50..b2f0c3e7069be8f05daee294f08790c915ea36cf 100644 (file)
--- a/src/mkdir.c
+++ b/src/mkdir.c
@@ -32,7 +32,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "mkdir"
 
-#define AUTHORS "David MacKenzie"
+#define WRITTEN_BY _("Written by David MacKenzie.")
 
 /* The name this program was run with. */
 char *program_name;
@@ -114,7 +114,7 @@ main (int argc, char **argv)
          verbose_fmt_string = _("created directory %s");
          break;
        case_GETOPT_HELP_CHAR;
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
        default:
          usage (EXIT_FAILURE);
        }

diff --git a/src/mkfifo.c b/src/mkfifo.c
index 0739c36199a216d5aa0f8bdbe34db278f1ba8150..7aa4e62ac5d8287294b56d00bf13c531c1eaa714 100644 (file)
--- a/src/mkfifo.c
+++ b/src/mkfifo.c
@@ -30,7 +30,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "mkfifo"
 
-#define AUTHORS "David MacKenzie"
+#define WRITTEN_BY _("Written by David MacKenzie.")
 
 /* The name this program was run with. */
 char *program_name;
@@ -103,7 +103,7 @@ main (int argc, char **argv)
          specified_mode = optarg;
          break;
        case_GETOPT_HELP_CHAR;
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
        default:
          usage (EXIT_FAILURE);
        }

diff --git a/src/mknod.c b/src/mknod.c
index 1d8278a57f20bc0b2482888794c8a0e122f48bd8..d3af094af9919139350193717b3f2974b9b81e03 100644 (file)
--- a/src/mknod.c
+++ b/src/mknod.c
@@ -31,7 +31,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "mknod"
 
-#define AUTHORS "David MacKenzie"
+#define WRITTEN_BY _("Written by David MacKenzie.")
 
 /* The name this program was run with. */
 char *program_name;
@@ -113,7 +113,7 @@ main (int argc, char **argv)
          specified_mode = optarg;
          break;
        case_GETOPT_HELP_CHAR;
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
        default:
          usage (EXIT_FAILURE);
        }

diff --git a/src/mv.c b/src/mv.c
index 9052a12e45b3d7b233c433e9438200ffac05b78d..edc4ad8194b14d6b7d6e2a913cb072e9ce151984 100644 (file)
--- a/src/mv.c
+++ b/src/mv.c
@@ -37,7 +37,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "mv"
 
-#define AUTHORS N_ ("Mike Parker, David MacKenzie, and Jim Meyering")
+#define WRITTEN_BY _("Written by Mike Parker, David MacKenzie, and Jim Meyering.")
 
 /* Initial number of entries in each hash table entry's table of inodes.  */
 #define INITIAL_HASH_MODULE 100
@@ -436,7 +436,7 @@ main (int argc, char **argv)
          backup_suffix_string = optarg;
          break;
        case_GETOPT_HELP_CHAR;
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
        default:
          usage (EXIT_FAILURE);
        }

diff --git a/src/nice.c b/src/nice.c
index 487fb5510d0fa059aa5b0df04101e0663b47f5b2..b55c0a738ab0802d353d8a4120faaa1cdf84f709 100644 (file)
--- a/src/nice.c
+++ b/src/nice.c
@@ -41,7 +41,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "nice"
 
-#define AUTHORS "David MacKenzie"
+#define WRITTEN_BY _("Written by David MacKenzie.")
 
 #ifdef NICE_PRIORITY
 # define GET_PRIORITY() nice (0)
@@ -99,7 +99,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-                     AUTHORS, usage);
+                     WRITTEN_BY, usage);
 
   for (i = 1; i < argc; /* empty */)
     {

diff --git a/src/nl.c b/src/nl.c
index befbc0e4d1dbab0011222f893ed3d56b3ad7190b..63beb57ead1eae0d30daf7929251c73399b8f769 100644 (file)
--- a/src/nl.c
+++ b/src/nl.c
@@ -36,7 +36,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "nl"
 
-#define AUTHORS N_ ("Scott Bartram and David MacKenzie")
+#define WRITTEN_BY _("Written by Scott Bartram and David MacKenzie.")
 
 #ifndef TRUE
 # define TRUE   1
@@ -598,7 +598,7 @@ main (int argc, char **argv)
          section_del = optarg;
          break;
        case_GETOPT_HELP_CHAR;
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
        default:
          fail = 1;
          break;

diff --git a/src/nohup.c b/src/nohup.c
index 9a7221f8c07a22a4c6a4d12718b51cc1755a5230..f55c510c566026ce2e97da5a93714547d7022352 100644 (file)
--- a/src/nohup.c
+++ b/src/nohup.c
@@ -31,7 +31,7 @@
 
 #define PROGRAM_NAME "nohup"
 
-#define AUTHORS "Jim Meyering"
+#define WRITTEN_BY _("Written by Jim Meyering.")
 
 /* Exit statuses.  */
 enum
@@ -86,7 +86,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-                     AUTHORS, usage);
+                     WRITTEN_BY, usage);
 
   /* The above handles --help and --version.
      Now, handle `--'.  */

diff --git a/src/od.c b/src/od.c
index 710786e0f4a036f5bafa33160e679dce609bc6d4..7bb10528ed52c009361f6d163da7022103efcf5e 100644 (file)
--- a/src/od.c
+++ b/src/od.c
@@ -31,7 +31,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "od"
 
-#define AUTHORS "Jim Meyering"
+#define WRITTEN_BY _("Written by Jim Meyering.")
 
 #if defined(__GNUC__) || defined(STDC_HEADERS)
 # include <float.h>
@@ -1808,7 +1808,7 @@ it must be one character from [doxn]"),
 
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
 
        default:
          usage (EXIT_FAILURE);

diff --git a/src/paste.c b/src/paste.c
index a417093811546d006f95533513cfcb8120d69528..5ddb16f454ba9d5093fb2ef2a70622173b665d42 100644 (file)
--- a/src/paste.c
+++ b/src/paste.c
@@ -46,7 +46,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "paste"
 
-#define AUTHORS N_ ("David M. Ihnat and David MacKenzie")
+#define WRITTEN_BY _("Written by David M. Ihnat and David MacKenzie.")
 
 /* Indicates that no delimiter should be added in the current position. */
 #define EMPTY_DELIM '\0'
@@ -468,7 +468,7 @@ main (int argc, char **argv)
 
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
 
        default:
          usage (EXIT_FAILURE);

diff --git a/src/pathchk.c b/src/pathchk.c
index f296272247a6b7212a737a2d3a5c9ee953b92305..1b79dc1a9deaa4f71d2079e9a3a5b88734c94a0c 100644 (file)
--- a/src/pathchk.c
+++ b/src/pathchk.c
@@ -50,7 +50,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "pathchk"
 
-#define AUTHORS N_ ("David MacKenzie and Jim Meyering")
+#define WRITTEN_BY _("Written by David MacKenzie and Jim Meyering.")
 
 #define NEED_PATHCONF_WRAPPER 0
 #if HAVE_PATHCONF
@@ -166,7 +166,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-                     AUTHORS, usage);
+                     WRITTEN_BY, usage);
 
   while ((optc = getopt_long (argc, argv, "p", longopts, NULL)) != -1)
     {

diff --git a/src/pinky.c b/src/pinky.c
index 77aad7e5faafd6a228156500df2950eb6d1656ec..901c8cb25e9347a96e77de6334cfc2bc318059c8 100644 (file)
--- a/src/pinky.c
+++ b/src/pinky.c
@@ -31,7 +31,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "pinky"
 
-#define AUTHORS N_ ("Joseph Arceneaux, David MacKenzie, and Kaveh Ghazi")
+#define WRITTEN_BY _("Written by Joseph Arceneaux, David MacKenzie, and Kaveh Ghazi.")
 
 #ifndef MAXHOSTNAMELEN
 # define MAXHOSTNAMELEN 64
@@ -560,7 +560,7 @@ main (int argc, char **argv)
 
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
 
        default:
          usage (EXIT_FAILURE);

diff --git a/src/pr.c b/src/pr.c
index e6883bbbe85b5916e3c5f69895a3ea77c64d5991..4b0e0a6b28fc9297068577aebb1c69b0d8ab4bbc 100644 (file)
--- a/src/pr.c
+++ b/src/pr.c
@@ -323,7 +323,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "pr"
 
-#define AUTHORS N_ ("Pete TerMaat and Roland Huebner")
+#define WRITTEN_BY _("Written by Pete TerMaat and Roland Huebner.")
 
 #ifndef TRUE
 # define TRUE  1
@@ -1066,7 +1066,7 @@ main (int argc, char **argv)
            break;
          }
        case_GETOPT_HELP_CHAR;
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
        default:
          usage (2);
          break;

diff --git a/src/printenv.c b/src/printenv.c
index 0ad821b08df24024f154e62d2c4e10a2c6f64e41..faf202e1bd8a9d2b34d6ac2a65bb575d5de640ce 100644 (file)
--- a/src/printenv.c
+++ b/src/printenv.c
@@ -40,7 +40,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "printenv"
 
-#define AUTHORS N_ ("David MacKenzie and Richard Mlynarik")
+#define WRITTEN_BY _("Written by David MacKenzie and Richard Mlynarik.")
 
 /* The name this program was run with. */
 char *program_name;
@@ -94,7 +94,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-                     AUTHORS, usage);
+                     WRITTEN_BY, usage);
 
   while ((c = getopt_long (argc, argv, "", long_options, NULL)) != -1)
     {

diff --git a/src/printf.c b/src/printf.c
index 97b7d97621343f976fb54f0402b0481e7d976d39..bf269f6c90087a44723a2a30f4619e5e2883e295 100644 (file)
--- a/src/printf.c
+++ b/src/printf.c
@@ -59,7 +59,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "printf"
 
-#define AUTHORS "David MacKenzie"
+#define WRITTEN_BY _("Written by David MacKenzie.")
 
 #ifndef STDC_HEADERS
 double strtod ();
@@ -566,7 +566,7 @@ main (int argc, char **argv)
   posixly_correct = (getenv ("POSIXLY_CORRECT") != NULL);
   if (!posixly_correct)
     parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-                       AUTHORS, usage);
+                       WRITTEN_BY, usage);
 
   /* The above handles --help and --version.
      Since there is no other invocation of getopt, handle `--' here.  */

diff --git a/src/ptx.c b/src/ptx.c
index 9b677e89d5755a1862b5e18e20910d2ca701b366..f55dd3ef49d8ca93aeef836bdefa959c917494be 100644 (file)
--- a/src/ptx.c
+++ b/src/ptx.c
@@ -32,7 +32,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "ptx"
 
-#define AUTHORS "François Pinard"
+#define WRITTEN_BY _("Written by François Pinard.")
 
 /* Number of possible characters in a byte.  */
 #define CHAR_SET_SIZE 256
@@ -2084,7 +2084,7 @@ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"),
                                     format_args, format_vals);
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
        }
     }
 

diff --git a/src/pwd.c b/src/pwd.c
index c4be503d886cf0fde3e411d9fe82bd8cba801422..1c0a0376d0719cd20c220bf87e251e3c78ff5fec 100644 (file)
--- a/src/pwd.c
+++ b/src/pwd.c
@@ -29,7 +29,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "pwd"
 
-#define AUTHORS "Jim Meyering"
+#define WRITTEN_BY _("Written by Jim Meyering.")
 
 /* The name this program was run with. */
 char *program_name;
@@ -68,7 +68,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-                     AUTHORS, usage);
+                     WRITTEN_BY, usage);
 
   if (1 < argc)
     error (0, 0, _("ignoring non-option arguments"));

diff --git a/src/readlink.c b/src/readlink.c
index 9af6ae731f937f300fc09a5077a16adddda18890..90bd33d8defe993b93488c42cce225efdd9e541b 100644 (file)
--- a/src/readlink.c
+++ b/src/readlink.c
@@ -32,7 +32,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "readlink"
 
-#define AUTHORS "Dmitry V. Levin"
+#define WRITTEN_BY _("Written by Dmitry V. Levin.")
 
 /* Name this program was run with.  */
 char *program_name;
@@ -117,7 +117,7 @@ main (int argc, char *const argv[])
          verbose = 1;
          break;
        case_GETOPT_HELP_CHAR;
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
        default:
          usage (EXIT_FAILURE);
        }

diff --git a/src/rm.c b/src/rm.c
index a2be56d451ba0b31e873438ac4042d9d865a7519..dcb3a19fefdfc890ef50279f9e708a6fef1280a4 100644 (file)
--- a/src/rm.c
+++ b/src/rm.c
@@ -57,8 +57,8 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "rm"
 
-#define AUTHORS \
-  N_ ("Paul Rubin, David MacKenzie, Richard Stallman, and Jim Meyering")
+#define WRITTEN_BY \
+  _("Written by Paul Rubin, David MacKenzie, Richard Stallman, and Jim Meyering.")
 
 /* Name this program was run with.  */
 char *program_name;
@@ -188,7 +188,7 @@ main (int argc, char **argv)
          x.verbose = 1;
          break;
        case_GETOPT_HELP_CHAR;
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
        default:
          usage (EXIT_FAILURE);
        }

diff --git a/src/rmdir.c b/src/rmdir.c
index f21092ddff6bbeb579b42b534a7ade9e45cffb8c..5d4f6815e9a6b5d0c1f8b2911b8e2a7978066bec 100644 (file)
--- a/src/rmdir.c
+++ b/src/rmdir.c
@@ -35,7 +35,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "rmdir"
 
-#define AUTHORS "David MacKenzie"
+#define WRITTEN_BY _("Written by David MacKenzie.")
 
 #ifndef EEXIST
 # define EEXIST 0
@@ -196,7 +196,7 @@ main (int argc, char **argv)
          verbose = 1;
          break;
        case_GETOPT_HELP_CHAR;
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
        default:
          usage (EXIT_FAILURE);
        }

diff --git a/src/seq.c b/src/seq.c
index d7a306887abd8cfe6afb5a26e61e71da89076ac6..6f1cbc77afa3d555fa4ccc41258ed4278c2a4622 100644 (file)
--- a/src/seq.c
+++ b/src/seq.c
@@ -31,7 +31,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "seq"
 
-#define AUTHORS "Ulrich Drepper"
+#define WRITTEN_BY _("Written by Ulrich Drepper.")
 
 /* If nonzero print all number with equal width.  */
 static int equal_width;
@@ -362,7 +362,7 @@ main (int argc, char **argv)
 
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
 
        default:
          usage (EXIT_FAILURE);

diff --git a/src/setuidgid.c b/src/setuidgid.c
index 9a4354153cc6ce5a724cbc0d214064f2dfbc67da..864946af24fe0945aec66349b6620613c45ba82f 100644 (file)
--- a/src/setuidgid.c
+++ b/src/setuidgid.c
@@ -33,7 +33,7 @@
 
 /* I wrote this program from scratch, based on the description of
    D.J. Bernstein's program: http://cr.yp.to/daemontools/setuidgid.html.  */
-#define AUTHORS "Jim Meyering"
+#define WRITTEN_BY _("Written by Jim Meyering.")
 
 #define FAIL_STATUS 111
 
@@ -83,7 +83,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-                     AUTHORS, usage);
+                     WRITTEN_BY, usage);
 
   /* The above handles --help and --version.
      Since there is no other invocation of getopt, handle `--' here.  */

diff --git a/src/shred.c b/src/shred.c
index 9453cb30cf157040021b18b0cb2ed5cc620ea4de..4c9345b3b69067ea9dc4eb950e401d82b9687343 100644 (file)
--- a/src/shred.c
+++ b/src/shred.c
@@ -89,7 +89,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "shred"
 
-#define AUTHORS "Colin Plumb"
+#define WRITTEN_BY _("Written by Colin Plumb.")
 
 #if HAVE_CONFIG_H
 # include <config.h>
@@ -1586,7 +1586,7 @@ main (int argc, char **argv)
 
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
 
        default:
          usage (EXIT_FAILURE);

diff --git a/src/sleep.c b/src/sleep.c
index 5a4bd3d57319c596ac32f9e0195467be10b28469..2013573ffc2018329c55c63b51022f44470a2e1c 100644 (file)
--- a/src/sleep.c
+++ b/src/sleep.c
@@ -30,7 +30,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "sleep"
 
-#define AUTHORS N_ ("Jim Meyering and Paul Eggert")
+#define WRITTEN_BY _("Written by Jim Meyering and Paul Eggert.")
 
 /* The name by which this program was run. */
 char *program_name;
@@ -120,7 +120,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-                     AUTHORS, usage);
+                     WRITTEN_BY, usage);
 
   while ((c = getopt_long (argc, argv, "", long_options, NULL)) != -1)
     {

diff --git a/src/sort.c b/src/sort.c
index 1b4e4a4008ae8ba42b2558c660e88efccc1005ba..00a82474f876e08b0d41b9c58f4445406402e775 100644 (file)
--- a/src/sort.c
+++ b/src/sort.c
@@ -51,7 +51,7 @@ struct rlimit { size_t rlim_cur; };
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "sort"
 
-#define AUTHORS N_ ("Mike Haertel and Paul Eggert")
+#define WRITTEN_BY _("Written by Mike Haertel and Paul Eggert.")
 
 #if HAVE_LANGINFO_CODESET
 # include <langinfo.h>
@@ -2513,7 +2513,7 @@ main (int argc, char **argv)
 
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
 
        default:
          usage (SORT_FAILURE);

diff --git a/src/split.c b/src/split.c
index 08617c3f8f16efba2ebeac28ed2e961e35bf1ad0..919c299a5642d3e31ca7c951a71d5d43f5c3253e 100644 (file)
--- a/src/split.c
+++ b/src/split.c
@@ -40,7 +40,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "split"
 
-#define AUTHORS N_ ("Torbjorn Granlund and Richard M. Stallman")
+#define WRITTEN_BY _("Written by Torbjorn Granlund and Richard M. Stallman.")
 
 #define DEFAULT_SUFFIX_LENGTH 2
 
@@ -490,7 +490,7 @@ main (int argc, char **argv)
 
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
 
        default:
          usage (EXIT_FAILURE);

diff --git a/src/stat.c b/src/stat.c
index 8b988165393d4046d4147caa3c95229f117f6490..aa75e17d7fbc6e6eb441c6a9f1a33dca888053cb 100644 (file)
--- a/src/stat.c
+++ b/src/stat.c
@@ -87,7 +87,7 @@
 
 #define PROGRAM_NAME "stat"
 
-#define AUTHORS "Michael Meskes"
+#define WRITTEN_BY _("Written by Michael Meskes.")
 
 static struct option const long_options[] = {
   {"link", no_argument, 0, 'l'}, /* deprecated.  FIXME: remove in 2003 */
@@ -807,7 +807,7 @@ main (int argc, char *argv[])
 
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
 
        default:
          usage (EXIT_FAILURE);

diff --git a/src/stty.c b/src/stty.c
index 71e0eb3fa22e8a323370108df5b4ba467a4c7f61..a01cc2b6baeef30b2476524f7da0e46c5381e6b2 100644 (file)
--- a/src/stty.c
+++ b/src/stty.c
@@ -63,7 +63,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "stty"
 
-#define AUTHORS "David MacKenzie"
+#define WRITTEN_BY _("Written by David MacKenzie.")
 
 #ifndef _POSIX_VDISABLE
 # define _POSIX_VDISABLE ((unsigned char) 0)
@@ -750,7 +750,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-                     AUTHORS, usage);
+                     WRITTEN_BY, usage);
 
   output_type = changed;
   verbose_output = 0;

diff --git a/src/su.c b/src/su.c
index 3bcc87abde26a0ee51fc2e4db57da6a98f2500c2..94594b237d350ce867e75e336cab5194a2474d36 100644 (file)
--- a/src/su.c
+++ b/src/su.c
@@ -115,7 +115,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "su"
 
-#define AUTHORS "David MacKenzie"
+#define WRITTEN_BY _("Written by David MacKenzie.")
 
 #if HAVE_PATHS_H
 # include <paths.h>
@@ -508,7 +508,7 @@ main (int argc, char **argv)
 
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
 
        default:
          usage (EXIT_FAILURE);

diff --git a/src/sum.c b/src/sum.c
index 9abd4f3f0ba75d9348c39ff170b718445ea9e60c..ca3dbbb44dbb808538f3635b660f67d0e2737447 100644 (file)
--- a/src/sum.c
+++ b/src/sum.c
@@ -32,7 +32,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "sum"
 
-#define AUTHORS N_ ("Kayvan Aghaiepour and David MacKenzie")
+#define WRITTEN_BY _("Written by Kayvan Aghaiepour and David MacKenzie.")
 
 /* The name this program was run with. */
 char *program_name;
@@ -249,7 +249,7 @@ main (int argc, char **argv)
 
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
 
        default:
          usage (EXIT_FAILURE);

diff --git a/src/sync.c b/src/sync.c
index 1481c4968f8f358b53686f6143bbdf08e2e14ec5..643800b153033eb4623711e6cde8e68115acdc2f 100644 (file)
--- a/src/sync.c
+++ b/src/sync.c
@@ -28,7 +28,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "sync"
 
-#define AUTHORS "Jim Meyering"
+#define WRITTEN_BY _("Written by Jim Meyering.")
 
 /* The name this program was run with. */
 char *program_name;
@@ -65,7 +65,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE, VERSION,
-                     AUTHORS, usage);
+                     WRITTEN_BY, usage);
 
   if (1 < argc)
     error (0, 0, _("ignoring all arguments"));

diff --git a/src/tac.c b/src/tac.c
index 4567e8705d3abd6649ff5de86e16a2be99770d5c..17a9dacdd48f0f5dc3dd0b591dfd52afe6de75d4 100644 (file)
--- a/src/tac.c
+++ b/src/tac.c
@@ -50,7 +50,7 @@ tac -r -s '.\|
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "tac"
 
-#define AUTHORS N_ ("Jay Lepreau and David MacKenzie")
+#define WRITTEN_BY _("Written by Jay Lepreau and David MacKenzie.")
 
 #if defined __MSDOS__ || defined _WIN32
 /* Define this to non-zero on systems for which the regular mechanism
@@ -638,7 +638,7 @@ main (int argc, char **argv)
            error (EXIT_FAILURE, 0, _("separator cannot be empty"));
          break;
        case_GETOPT_HELP_CHAR;
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
        default:
          usage (EXIT_FAILURE);
        }

diff --git a/src/tail.c b/src/tail.c
index 66d848101f006a7e93fafd08330a5fc2fb10ad8c..a9d89fce927efc0fdc940d08404c192f1dd00eee 100644 (file)
--- a/src/tail.c
+++ b/src/tail.c
@@ -45,8 +45,8 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "tail"
 
-#define AUTHORS \
-  N_ ("Paul Rubin, David MacKenzie, Ian Lance Taylor, and Jim Meyering")
+#define WRITTEN_BY \
+  _("Written by Paul Rubin, David MacKenzie, Ian Lance Taylor, and Jim Meyering.")
 
 #ifndef ENOSYS
   /* Some systems don't have ENOSYS -- this should be a big enough
@@ -1623,7 +1623,7 @@ parse_options (int argc, char **argv,
 
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
 
        default:
          usage (EXIT_FAILURE);

diff --git a/src/tee.c b/src/tee.c
index 4ec399b8522cf84c7cf8b15f846c59c576f15669..a1eb4753d0b3aa01e7e0b6497b85d17ddfc84475 100644 (file)
--- a/src/tee.c
+++ b/src/tee.c
@@ -29,7 +29,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "tee"
 
-#define AUTHORS N_ ("Mike Parker, Richard M. Stallman, and David MacKenzie")
+#define WRITTEN_BY _("Written by Mike Parker, Richard M. Stallman, and David MacKenzie.")
 
 static int tee (int nfiles, const char **files);
 
@@ -107,7 +107,7 @@ main (int argc, char **argv)
 
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
 
        default:
          usage (EXIT_FAILURE);

diff --git a/src/test.c b/src/test.c
index fa00a396b4fdb86623cd022602bcc3efbc95e3e9..78666f0813e8cb3f9a285ea4b0ee4c8e1e966087 100644 (file)
--- a/src/test.c
+++ b/src/test.c
@@ -1058,7 +1058,7 @@ INTEGER may also be -l STRING, which evaluates to the length of STRING.\n\
 # define main test_command
 #endif
 
-#define AUTHORS N_ ("Kevin Braunsdorf and Matthew Bradburn")
+#define WRITTEN_BY _("Written by Kevin Braunsdorf and Matthew Bradburn.")
 
 /*
  * [:
@@ -1101,7 +1101,7 @@ main (int margc, char **margv)
       if (margc < 2 || strcmp (margv[margc - 1], "]") != 0)
        {
          parse_long_options (margc, margv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-                             AUTHORS, usage);
+                             WRITTEN_BY, usage);
          test_syntax_error (_("missing `]'\n"), NULL);
        }
 

diff --git a/src/touch.c b/src/touch.c
index 288e6d1615b7f011182cd224f731d583bc287445..1cccc84ca563cc0d0b5a041affdfa70eace1444e 100644 (file)
--- a/src/touch.c
+++ b/src/touch.c
@@ -36,8 +36,8 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "touch"
 
-#define AUTHORS \
-N_ ("Paul Rubin, Arnold Robbins, Jim Kingdon, David MacKenzie, and Randy Smith")
+#define WRITTEN_BY \
+_("Written by Paul Rubin, Arnold Robbins, Jim Kingdon, David MacKenzie, and Randy Smith.")
 
 #ifndef STDC_HEADERS
 time_t time ();
@@ -336,7 +336,7 @@ main (int argc, char **argv)
 
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
 
        default:
          usage (EXIT_FAILURE);

diff --git a/src/tr.c b/src/tr.c
index 5a0a6126a5a60f6680ae9b1c3712db7d08b431b0..417726d68bf4e78e6471db17edd9c745669f6e21 100644 (file)
--- a/src/tr.c
+++ b/src/tr.c
@@ -32,7 +32,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "tr"
 
-#define AUTHORS "Jim Meyering"
+#define WRITTEN_BY _("Written by Jim Meyering.")
 
 #define N_CHARS (UCHAR_MAX + 1)
 
@@ -1819,7 +1819,7 @@ main (int argc, char **argv)
 
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
 
        default:
          usage (2);

diff --git a/src/true.c b/src/true.c
index 65e7f524dcf47f6bd2bd352c7e54e7b018bc3343..e5b1fc03e16fe13c9130a48d0613c3eadeac1f37 100644 (file)
--- a/src/true.c
+++ b/src/true.c
@@ -21,7 +21,7 @@
 #include "system.h"
 
 #define PROGRAM_NAME "true"
-#define AUTHORS "Jim Meyering"
+#define WRITTEN_BY _("Written by Jim Meyering.")
 
 /* The name this program was run with. */
 char *program_name;
@@ -63,7 +63,7 @@ main (int argc, char **argv)
        usage (EXIT_SUCCESS);
 
       if (STREQ (argv[1], "--version"))
-       version_etc (stdout, PROGRAM_NAME, GNU_PACKAGE, VERSION, AUTHORS);
+       version_etc (stdout, PROGRAM_NAME, GNU_PACKAGE, VERSION, WRITTEN_BY);
     }
 
   exit (EXIT_SUCCESS);

diff --git a/src/tsort.c b/src/tsort.c
index a66d37ba42b7d421fc996fd9181eed961342b018..560f63eb6f3f210ebf8cd2c8784d6904caf55375 100644 (file)
--- a/src/tsort.c
+++ b/src/tsort.c
@@ -36,7 +36,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "tsort"
 
-#define AUTHORS "Mark Kettenis"
+#define WRITTEN_BY _("Written by Mark Kettenis.")
 
 /* Token delimiters when reading from a file.  */
 #define DELIM " \t\n"
@@ -560,7 +560,7 @@ main (int argc, char **argv)
   exit_status = 0;
 
   parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE, VERSION,
-                     AUTHORS, usage);
+                     WRITTEN_BY, usage);
 
   while ((opt = getopt_long (argc, argv, "", long_options, NULL)) != -1)
     switch (opt)

diff --git a/src/tty.c b/src/tty.c
index 076ac15d78f005a6cd4f7453ef653d2fbb30aa50..8d1cc42d6e507354cf905aaffd2d073e1126fcc2 100644 (file)
--- a/src/tty.c
+++ b/src/tty.c
@@ -34,7 +34,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "tty"
 
-#define AUTHORS "David MacKenzie"
+#define WRITTEN_BY _("Written by David MacKenzie.")
 
 /* The name under which this program was run. */
 char *program_name;
@@ -102,7 +102,7 @@ main (int argc, char **argv)
 
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
 
        default:
          usage (2);

diff --git a/src/uname.c b/src/uname.c
index 47f9ff45ca5baf49769e436a87d8de5663e1f2ae..87af1a216e0eb227f1a228dad90c9eddb9c7ecca 100644 (file)
--- a/src/uname.c
+++ b/src/uname.c
@@ -50,7 +50,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "uname"
 
-#define AUTHORS "David MacKenzie"
+#define WRITTEN_BY _("Written by David MacKenzie.")
 
 /* Values that are bitwise or'd into `toprint'. */
 /* Kernel name. */
@@ -203,7 +203,7 @@ main (int argc, char **argv)
 
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
 
        default:
          usage (EXIT_FAILURE);

diff --git a/src/unexpand.c b/src/unexpand.c
index 89cac644fc041256a4d0dc764fc9bd98497c5416..8ba563a5230d33df10ba535b2a1f3137e83d670e 100644 (file)
--- a/src/unexpand.c
+++ b/src/unexpand.c
@@ -47,7 +47,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "unexpand"
 
-#define AUTHORS "David MacKenzie"
+#define WRITTEN_BY _("Written by David MacKenzie.")
 
 /* The number of bytes added at a time to the amount of memory
    allocated for the output line. */
@@ -447,7 +447,7 @@ main (int argc, char **argv)
          obsolete_tablist = true;
          break;
        case_GETOPT_HELP_CHAR;
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
        default:
          if (tabval == -1)
            tabval = 0;

diff --git a/src/uniq.c b/src/uniq.c
index 9555d6c86daf5731def28907a81692f01586edf9..8a5e5c9dc688854c6110c01f35d00523498bcccb 100644 (file)
--- a/src/uniq.c
+++ b/src/uniq.c
@@ -36,7 +36,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "uniq"
 
-#define AUTHORS N_ ("Richard Stallman and David MacKenzie")
+#define WRITTEN_BY _("Written by Richard Stallman and David MacKenzie.")
 
 #define SWAP_LINES(A, B)                       \
   do                                           \
@@ -518,7 +518,7 @@ main (int argc, char **argv)
 
        case_GETOPT_HELP_CHAR;
 
-       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+       case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
 
        default:
          usage (EXIT_FAILURE);

diff --git a/src/unlink.c b/src/unlink.c
index f5c3c24d1c9f91b4883ae26ec0073c9eba493f58..ad73e12d12bee9068b9b6c40d7e47124546e7598 100644 (file)
--- a/src/unlink.c
+++ b/src/unlink.c
@@ -35,7 +35,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "unlink"
 
-#define AUTHORS "Michael Stone"
+#define WRITTEN_BY _("Written by Michael Stone.")
 
 /* Name this program was run with.  */
 char *program_name;
@@ -74,7 +74,7 @@ main (int argc, char **argv)
   /* Don't recognize --help or --version if POSIXLY_CORRECT is set.  */
   if (getenv ("POSIXLY_CORRECT") == NULL)
     parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-                       AUTHORS, usage);
+                       WRITTEN_BY, usage);
 
   /* The above handles --help and --version.
      Since there is no other invocation of getopt, handle `--' here.  */

diff --git a/src/uptime.c b/src/uptime.c
index c987a2a32cea96f5d03aab3f08a98bf0e9fabf77..f68726e15b08a7cf2c1d595556f18ed648da7b3e 100644 (file)
--- a/src/uptime.c
+++ b/src/uptime.c
@@ -35,7 +35,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "uptime"
 
-#define AUTHORS N_ ("Joseph Arceneaux, David MacKenzie, and Kaveh Ghazi")
+#define WRITTEN_BY _("Written by Joseph Arceneaux, David MacKenzie, and Kaveh Ghazi.")
 
 int getloadavg ();
 
@@ -216,7 +216,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-                     AUTHORS, usage);
+                     WRITTEN_BY, usage);
 
   while ((optc = getopt_long (argc, argv, "", longopts, &longind)) != -1)
     {

diff --git a/src/users.c b/src/users.c
index 6ef4396c0176f2d7d543da798df7f50666450e91..12bad08bf9d09c245b9bae9f4a86a29dd0cdf3cb 100644 (file)
--- a/src/users.c
+++ b/src/users.c
@@ -31,7 +31,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "users"
 
-#define AUTHORS N_ ("Joseph Arceneaux and David MacKenzie")
+#define WRITTEN_BY _("Written by Joseph Arceneaux and David MacKenzie.")
 
 /* The name this program was run with. */
 char *program_name;
@@ -141,7 +141,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-                     AUTHORS, usage);
+                     WRITTEN_BY, usage);
 
   while ((optc = getopt_long (argc, argv, "", longopts, &longind)) != -1)
     {

diff --git a/src/wc.c b/src/wc.c
index e7a693594029e67a74be8ed631f32191f9dd0186..4bdffc4d813868a18545ba4447d27235987904cc 100644 (file)
--- a/src/wc.c
+++ b/src/wc.c
@@ -71,7 +71,7 @@ extern int wcwidth ();
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "wc"
 
-#define AUTHORS N_ ("Paul Rubin and David MacKenzie")
+#define WRITTEN_BY _("Written by Paul Rubin and David MacKenzie.")
 
 /* Size of atomic reads. */
 #define BUFFER_SIZE (16 * 1024)
@@ -642,7 +642,7 @@ main (int argc, char **argv)
 
       case_GETOPT_HELP_CHAR;
 
-      case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+      case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
 
       default:
        usage (EXIT_FAILURE);

diff --git a/src/who.c b/src/who.c
index 9c6e71435de66eadd5c0e47789577772011506cf..3cf979343665f933b253a427ff43bc1f92018353 100644 (file)
--- a/src/who.c
+++ b/src/who.c
@@ -37,7 +37,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "who"
 
-#define AUTHORS N_ ("Joseph Arceneaux, David MacKenzie, and Michael Stone")
+#define WRITTEN_BY _("Written by Joseph Arceneaux, David MacKenzie, and Michael Stone.")
 
 #ifndef MAXHOSTNAMELEN
 # define MAXHOSTNAMELEN 64
@@ -765,7 +765,7 @@ main (int argc, char **argv)
 
          case_GETOPT_HELP_CHAR;
 
-         case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
+         case_GETOPT_VERSION_CHAR (PROGRAM_NAME, WRITTEN_BY);
 
        default:
          usage (EXIT_FAILURE);

diff --git a/src/whoami.c b/src/whoami.c
index 019379e87aac83de5e0ae8b8337f8682ed320452..be7bc04a651538caa223d170d75cb46d65eb0d3f 100644 (file)
--- a/src/whoami.c
+++ b/src/whoami.c
@@ -30,7 +30,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "whoami"
 
-#define AUTHORS "Richard Mlynarik"
+#define WRITTEN_BY _("Written by Richard Mlynarik.")
 
 /* The name this program was run with. */
 char *program_name;
@@ -77,7 +77,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-                     AUTHORS, usage);
+                     WRITTEN_BY, usage);
 
   while ((c = getopt_long (argc, argv, "", long_options, NULL)) != -1)
     {

diff --git a/src/yes.c b/src/yes.c
index f2e37ce8e9f0d3d75b14f028149ce43db7662fe6..6f62cb7395bb91e3498f1e73bd59aa8a17996172 100644 (file)
--- a/src/yes.c
+++ b/src/yes.c
@@ -30,7 +30,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "yes"
 
-#define AUTHORS "David MacKenzie"
+#define WRITTEN_BY _("Written by David MacKenzie.")
 
 /* How many iterations between ferror checks.  */
 #define UNROLL 10000
@@ -77,7 +77,7 @@ main (int argc, char **argv)
   /* Don't recognize --help or --version if POSIXLY_CORRECT is set.  */
   if (getenv ("POSIXLY_CORRECT") == NULL)
     parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-                       AUTHORS, usage);
+                       WRITTEN_BY, usage);
 
   if (argc == 1)
     {