Clarify some strings

diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index 6530677..ef6f5d9 100644 (file)
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2004, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.133 2004/11/06 17:56:40 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.134 2004/11/09 14:39:43 petere Exp $
  */
 #include "postgres_fe.h"
 #include "command.h"
@@ -1145,7 +1145,7 @@ do_edit(const char *filename_arg, PQExpBuffer query_buf)
                ret = GetTempPath(MAXPGPATH, tmpdir);
                if (ret == 0 || ret > MAXPGPATH)
                {
-                       psql_error("Can not locate temporary directory: %s",
+                       psql_error("cannot locate temporary directory: %s",
                                                !ret ? strerror(errno) : "");
                        return false;
                }

diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
index 21ae52b..e5b28e9 100644 (file)
--- a/src/bin/psql/describe.c
+++ b/src/bin/psql/describe.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2004, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.109 2004/11/05 19:16:21 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.110 2004/11/09 14:39:43 petere Exp $
  */
 #include "postgres_fe.h"
 #include "describe.h"
@@ -1149,9 +1149,9 @@ describeOneTableDetails(const char *schemaname,
                                /* Label as primary key or unique (but not both) */
                                appendPQExpBuffer(&buf,
                                                          strcmp(PQgetvalue(result1, i, 1), "t") == 0
-                                                                 ? _(" PRIMARY KEY,") :
+                                                                 ? " PRIMARY KEY," :
                                                         (strcmp(PQgetvalue(result1, i, 2), "t") == 0
-                                                         ? _(" UNIQUE,")
+                                                         ? " UNIQUE,"
                                                          : ""));
                                /* Everything after "USING" is echoed verbatim */
                                indexdef = PQgetvalue(result1, i, 4);
@@ -1162,7 +1162,7 @@ describeOneTableDetails(const char *schemaname,
                                appendPQExpBuffer(&buf, " %s", indexdef);
 
                                if (strcmp(PQgetvalue(result1, i, 3), "t") == 0)
-                                       appendPQExpBuffer(&buf, _(" CLUSTER"));
+                                       appendPQExpBuffer(&buf, " CLUSTER");
 
                                footers[count_footers++] = pg_strdup(buf.data);
                        }
@@ -1388,7 +1388,7 @@ describeUsers(const char *pattern)
                return false;
 
        myopt.nullPrint = NULL;
-       myopt.title = _("List of database users");
+       myopt.title = _("List of users");
 
        printQuery(res, &myopt, pset.queryFout);
 
@@ -1428,7 +1428,7 @@ describeGroups(const char *pattern)
                return false;
 
        myopt.nullPrint = NULL;
-       myopt.title = _("List of database groups");
+       myopt.title = _("List of groups");
 
        printQuery(res, &myopt, pset.queryFout);
 

diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
index f366050..d9e426d 100644 (file)
--- a/src/bin/psql/help.c
+++ b/src/bin/psql/help.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2004, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/help.c,v 1.95 2004/10/12 21:54:44 petere Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/help.c,v 1.96 2004/11/09 14:39:44 petere Exp $
  */
 #include "postgres_fe.h"
 #include "common.h"
@@ -250,7 +250,7 @@ slashUsage(unsigned short int pager)
        fprintf(output, _("Copy, Large Object\n"));
        fprintf(output, _("  \\copy ...      perform SQL COPY with data stream to the client host\n"));
        fprintf(output, _("  \\lo_export LOBOID FILE\n"
-                                         "  \\lo_import FILE [COMMENT] \n"
+                                         "  \\lo_import FILE [COMMENT]\n"
                                          "  \\lo_list\n"
                                   "  \\lo_unlink LOBOID    large object operations\n"));