diff options
| author | Bruce Momjian | 2007-02-01 19:10:30 +0000 |
|---|---|---|
| committer | Bruce Momjian | 2007-02-01 19:10:30 +0000 |
| commit | 8b4ff8b6a14096a28910fbff3d485f30dcb9a637 (patch) | |
| tree | c250f17f4a8e3bfee442970a0666431ed8310650 /src/bin/initdb | |
| parent | baaec74c5a953032049015883802660edd821cac (diff) | |
Wording cleanup for error messages. Also change can't -> cannot.
Standard English uses "may", "can", and "might" in different ways:
may - permission, "You may borrow my rake."
can - ability, "I can lift that log."
might - possibility, "It might rain today."
Unfortunately, in conversational English, their use is often mixed, as
in, "You may use this variable to do X", when in fact, "can" is a better
choice. Similarly, "It may crash" is better stated, "It might crash".
Diffstat (limited to 'src/bin/initdb')
| -rw-r--r-- | src/bin/initdb/initdb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c index d374c9c14ae..ea7b949aa00 100644 --- a/src/bin/initdb/initdb.c +++ b/src/bin/initdb/initdb.c @@ -42,7 +42,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * Portions taken from FreeBSD. * - * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.130 2007/01/31 18:52:49 tgl Exp $ + * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.131 2007/02/01 19:10:28 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -876,7 +876,7 @@ check_encodings_match(int pg_enc, const char *ctype) _("%s: warning: encoding mismatch\n"), progname); fprintf(stderr, _("The encoding you selected (%s) and the encoding that the selected\n" - "locale uses (%s) are not known to match. This may lead to\n" + "locale uses (%s) are not known to match. This might lead to\n" "misbehavior in various character string processing functions. To fix\n" "this situation, rerun %s and either do not specify an encoding\n" "explicitly, or choose a matching combination.\n"), @@ -1052,7 +1052,7 @@ check_input(char *path) else fprintf(stderr, _("%s: could not access file \"%s\": %s\n" - "This may mean you have a corrupted installation or identified\n" + "This might mean you have a corrupted installation or identified\n" "the wrong directory with the invocation option -L.\n"), progname, path, strerror(errno)); exit(1); @@ -2580,7 +2580,7 @@ main(int argc, char *argv[]) if (pwprompt && pwfilename) { - fprintf(stderr, _("%s: password prompt and password file may not be specified together\n"), progname); + fprintf(stderr, _("%s: password prompt and password file cannot be specified together\n"), progname); exit(1); } |