Translation updates, some messages tweaked.

src/bin/pg_controldata/po/de.po

 # German message translation file for pg_controldata
 # Peter Eisentraut <peter_e@gmx.net>, 2002.
 #
-# $Header: /cvsroot/pgsql/src/bin/pg_controldata/po/de.po,v 1.1 2002/08/21 22:24:34 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_controldata/po/de.po,v 1.2 2002/09/22 20:57:20 petere Exp $
 #
 # Use these quotes: %s
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.3\n"
-"POT-Creation-Date: 2002-08-22 00:15+0200\n"
-"PO-Revision-Date: 2002-08-22 00:14+0200\n"
+"POT-Creation-Date: 2002-09-22 13:15+0200\n"
+"PO-Revision-Date: 2002-09-22 13:16+0200\n"
 "Last-Translator: Peter Eisentraut <peter_e@gmx.net>\n"
 "Language-Team: German <peter_e@gmx.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pg_controldata.c:29
+#: pg_controldata.c:28
 #, c-format
 msgid "%s displays PostgreSQL database cluster control information.\n"
 msgstr "%s zeigt Kontrollinformationen ber PostgreSQL-Datenbankcluster an.\n"
 
-#: pg_controldata.c:30
+#: pg_controldata.c:29
 #, c-format
 msgid ""
 "Usage:\n"
@@ -32,7 +32,7 @@ msgstr ""
 "  %s [DATENVERZEICHNIS]\n"
 "\n"
 
-#: pg_controldata.c:31
+#: pg_controldata.c:30
 msgid ""
 "If not data directory is specified, the environment variable PGDATA\n"
 "is used.\n"
@@ -42,30 +42,50 @@ msgstr ""
 "PGDATA verwendent.\n"
 "\n"
 
-#: pg_controldata.c:32
+#: pg_controldata.c:31
 msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr "Berichten Sie Fehler an <pgsql-bugs@postgresql.org>.\n"
 
-#: pg_controldata.c:52
+#: pg_controldata.c:41
+msgid "starting up"
+msgstr "startet"
+
+#: pg_controldata.c:43
+msgid "shut down"
+msgstr "heruntergefahren"
+
+#: pg_controldata.c:45
+msgid "shutting down"
+msgstr "fhrt herunter"
+
+#: pg_controldata.c:47
+msgid "in recovery"
+msgstr "bei der Wiederherstellung"
+
+#: pg_controldata.c:49
+msgid "in production"
+msgstr "im Produktionsmodus"
+
+#: pg_controldata.c:51
 msgid "unrecognized status code"
 msgstr "unerkannter Statuscode"
 
-#: pg_controldata.c:100
+#: pg_controldata.c:99
 #, c-format
 msgid "%s: no data directory specified\n"
 msgstr "%s: kein Datenverzeichnis angegeben\n"
 
-#: pg_controldata.c:108
+#: pg_controldata.c:107
 #, c-format
 msgid "%s: could not open file \"%s\" for reading (%s)\n"
 msgstr "%s: konnte Datei %s nicht zum Lesen ffnen (%s)\n"
 
-#: pg_controldata.c:115
+#: pg_controldata.c:114
 #, c-format
 msgid "%s: could not read file \"%s\" (%s)\n"
 msgstr "%s: konnte Datei %s nicht zum Lesen ffnen (%s)\n"
 
-#: pg_controldata.c:129
+#: pg_controldata.c:128
 msgid ""
 "WARNING: Calculated CRC checksum does not match value stored in file.\n"
 "Either the file is corrupt, or it has a different layout than this program\n"
@@ -78,120 +98,120 @@ msgstr ""
 "verlsslich.\n"
 "\n"
 
-#: pg_controldata.c:142
+#: pg_controldata.c:141
 #, c-format
 msgid "pg_control version number:            %u\n"
 msgstr "pg_control-Versionsnummer:            %u\n"
 
-#: pg_controldata.c:143
+#: pg_controldata.c:142
 #, c-format
 msgid "Catalog version number:               %u\n"
 msgstr "Katalog-Versionsnummer:               %u\n"
 
-#: pg_controldata.c:144
+#: pg_controldata.c:143
 #, c-format
 msgid "Database cluster state:               %s\n"
 msgstr "Datenbank-Cluster-Status:             %s\n"
 
-#: pg_controldata.c:145
+#: pg_controldata.c:144
 #, c-format
 msgid "pg_control last modified:             %s\n"
 msgstr "pg_control zuletzt gendert:          %s\n"
 
-#: pg_controldata.c:146
+#: pg_controldata.c:145
 #, c-format
 msgid "Current log file ID:                  %u\n"
 msgstr "Aktuelle Logdatei-ID:                 %u\n"
 
-#: pg_controldata.c:147
+#: pg_controldata.c:146
 #, c-format
 msgid "Next log file segment:                %u\n"
 msgstr "Nchstes Logdatei-Segment:            %u\n"
 
-#: pg_controldata.c:148
+#: pg_controldata.c:147
 #, c-format
 msgid "Latest checkpoint location:           %X/%X\n"
 msgstr "Letzter Checkpoint-Ort:               %X/%X\n"
 
-#: pg_controldata.c:150
+#: pg_controldata.c:149
 #, c-format
 msgid "Prior checkpoint location:            %X/%X\n"
 msgstr "Voriger Checkpoint-Ort:               %X/%X\n"
 
-#: pg_controldata.c:152
+#: pg_controldata.c:151
 #, c-format
 msgid "Latest checkpoint's REDO location:    %X/%X\n"
 msgstr "REDO-Ort vom letzten Checkpoint:      %X/%X\n"
 
-#: pg_controldata.c:154
+#: pg_controldata.c:153
 #, c-format
 msgid "Latest checkpoint's UNDO location:    %X/%X\n"
 msgstr "UNDO-Ort vom letzten Checkpoint:      %X/%X\n"
 
-#: pg_controldata.c:156
+#: pg_controldata.c:155
 #, c-format
 msgid "Latest checkpoint's StartUpID:        %u\n"
 msgstr "StartUpID vom letzten Checkpoint:     %u\n"
 
-#: pg_controldata.c:157
+#: pg_controldata.c:156
 #, c-format
 msgid "Latest checkpoint's NextXID:          %u\n"
 msgstr "NextXID vom letzten Checkpoint:       %u\n"
 
-#: pg_controldata.c:158
+#: pg_controldata.c:157
 #, c-format
 msgid "Latest checkpoint's NextOID:          %u\n"
 msgstr "NextOID vom letzten Checkpoint:       %u\n"
 
-#: pg_controldata.c:159
+#: pg_controldata.c:158
 #, c-format
 msgid "Time of latest checkpoint:            %s\n"
 msgstr "Zeit vom letzten Checkpoint:          %s\n"
 
-#: pg_controldata.c:160
+#: pg_controldata.c:159
 #, c-format
 msgid "Database block size:                  %u\n"
 msgstr "Datenbank-Blockgre:                 %u\n"
 
-#: pg_controldata.c:161
+#: pg_controldata.c:160
 #, c-format
 msgid "Blocks per segment of large relation: %u\n"
 msgstr "Blcke pro Segment:                   %u\n"
 
-#: pg_controldata.c:162
+#: pg_controldata.c:161
 #, c-format
 msgid "Maximum length of identifiers:        %u\n"
 msgstr "Hchstlnge von Namen:                %u\n"
 
-#: pg_controldata.c:163
+#: pg_controldata.c:162
 #, c-format
 msgid "Maximum number of function arguments: %u\n"
 msgstr "Maximale Funktionsargumente:          %u\n"
 
-#: pg_controldata.c:164
+#: pg_controldata.c:163
 #, c-format
 msgid "Date/time type storage:               %s\n"
 msgstr "Speicherung von Datum/Zeit-Typen:     %s\n"
 
-#: pg_controldata.c:165
+#: pg_controldata.c:164
 msgid "64-bit integers"
 msgstr "64-Bit Ganzzahlen"
 
-#: pg_controldata.c:165
+#: pg_controldata.c:164
 msgid "Floating point"
 msgstr "Fliekommazahlen"
 
-#: pg_controldata.c:166
+#: pg_controldata.c:165
 #, c-format
 msgid "Maximum length of locale name:        %u\n"
 msgstr "Maximallnge eines Locale-Namens:     %u\n"
 
-#: pg_controldata.c:167
+#: pg_controldata.c:166
 #, c-format
 msgid "LC_COLLATE:                           %s\n"
 msgstr "LC_COLLATE:                           %s\n"
 
-#: pg_controldata.c:168
+#: pg_controldata.c:167
 #, c-format
 msgid "LC_CTYPE:                             %s\n"
 msgstr "LC_CTYPE:                             %s\n"

src/bin/pg_dump/pg_dump.c

@@ -22,7 +22,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.299 2002/09/18 21:35:23 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.300 2002/09/22 20:57:20 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -521,7 +521,7 @@ main(int argc, char **argv)
 			break;
 
 		default:
-			write_msg(NULL, "invalid output format '%s' specified\n", format);
+			write_msg(NULL, "invalid output format \"%s\" specified\n", format);
 			exit(1);
 	}
 
@@ -575,7 +575,7 @@ main(int argc, char **argv)
 		else
 			g_last_builtin_oid = findLastBuiltinOid_V70();
 		if (g_verbose)
-			write_msg(NULL, "last built-in oid is %u\n", g_last_builtin_oid);
+			write_msg(NULL, "last built-in OID is %u\n", g_last_builtin_oid);
 	}
 
 	/* Dump the database definition */
@@ -803,7 +803,7 @@ dumpClasses_nodumpData(Archive *fout, char *oid, void *dctxv)
 	const char *column_list;
 
 	if (g_verbose)
-		write_msg(NULL, "dumping out the contents of table %s\n", classname);
+		write_msg(NULL, "dumping contents of table %s\n", classname);
 
 	/*
 	 * Make sure we are in proper schema.  We will qualify the table name
@@ -1497,7 +1497,7 @@ findNamespace(const char *nsoid, const char *objoid)
 			if (strcmp(nsoid, nsinfo->oid) == 0)
 				return nsinfo;
 		}
-		write_msg(NULL, "Failed to find namespace with OID %s.\n", nsoid);
+		write_msg(NULL, "could not find namespace with OID %s\n", nsoid);
 		exit_nicely();
 	}
 	else
@@ -1768,7 +1768,7 @@ getOpclasses(int *numOpclasses)
 	if (!res ||
 		PQresultStatus(res) != PGRES_TUPLES_OK)
 	{
-		write_msg(NULL, "query to obtain list of opclasses failed: %s", PQerrorMessage(g_conn));
+		write_msg(NULL, "query to obtain list of operator classes failed: %s", PQerrorMessage(g_conn));
 		exit_nicely();
 	}
 
@@ -1793,7 +1793,7 @@ getOpclasses(int *numOpclasses)
 		if (g_fout->remoteVersion >= 70300)
 		{
 			if (strlen(opcinfo[i].usename) == 0)
-				write_msg(NULL, "WARNING: owner of opclass \"%s\" appears to be invalid\n",
+				write_msg(NULL, "WARNING: owner of operator class \"%s\" appears to be invalid\n",
 						  opcinfo[i].opcname);
 		}
 	}
@@ -2389,7 +2389,7 @@ getTableAttrs(TableInfo *tblinfo, int numTables)
 		 * pg_attribute_relid_attnum_index.
 		 */
 		if (g_verbose)
-			write_msg(NULL, "finding the columns and types for table %s\n",
+			write_msg(NULL, "finding the columns and types of table %s\n",
 					  tbinfo->relname);
 
 		resetPQExpBuffer(q);
@@ -2491,7 +2491,7 @@ getTableAttrs(TableInfo *tblinfo, int numTables)
 			int			numDefaults;
 
 			if (g_verbose)
-				write_msg(NULL, "finding DEFAULT expressions for table %s\n",
+				write_msg(NULL, "finding DEFAULT expressions of table %s\n",
 						  tbinfo->relname);
 
 			resetPQExpBuffer(q);
@@ -2534,7 +2534,7 @@ getTableAttrs(TableInfo *tblinfo, int numTables)
 
 				if (adnum <= 0 || adnum > ntups)
 				{
-					write_msg(NULL, "bogus adnum value %d for table %s\n",
+					write_msg(NULL, "invalid adnum value %d for table %s\n",
 							  adnum, tbinfo->relname);
 					exit_nicely();
 				}
@@ -2987,7 +2987,7 @@ dumpOneBaseType(Archive *fout, TypeInfo *tinfo,
 	if (!res ||
 		PQresultStatus(res) != PGRES_TUPLES_OK)
 	{
-		write_msg(NULL, "query to obtain type information for %s failed: %s",
+		write_msg(NULL, "query to obtain information on type %s failed: %s",
 				  tinfo->typname, PQerrorMessage(g_conn));
 		exit_nicely();
 	}
@@ -3663,7 +3663,7 @@ dumpOneFunc(Archive *fout, FuncInfo *finfo)
 	if (!res ||
 		PQresultStatus(res) != PGRES_TUPLES_OK)
 	{
-		write_msg(NULL, "query to obtain function information for %s failed: %s",
+		write_msg(NULL, "query to obtain information on function %s failed: %s",
 				  finfo->proname, PQerrorMessage(g_conn));
 		exit_nicely();
 	}
@@ -4320,7 +4320,7 @@ dumpOneOpclass(Archive *fout, OpclassInfo *opcinfo)
 	if (!res ||
 		PQresultStatus(res) != PGRES_TUPLES_OK)
 	{
-		write_msg(NULL, "query to obtain opclass details failed: %s", PQerrorMessage(g_conn));
+		write_msg(NULL, "query to obtain operator class details failed: %s", PQerrorMessage(g_conn));
 		exit_nicely();
 	}
 
@@ -4390,7 +4390,7 @@ dumpOneOpclass(Archive *fout, OpclassInfo *opcinfo)
 	if (!res ||
 		PQresultStatus(res) != PGRES_TUPLES_OK)
 	{
-		write_msg(NULL, "query to obtain opclass operators failed: %s", PQerrorMessage(g_conn));
+		write_msg(NULL, "query to obtain operator class operators failed: %s", PQerrorMessage(g_conn));
 		exit_nicely();
 	}
 
@@ -4435,7 +4435,7 @@ dumpOneOpclass(Archive *fout, OpclassInfo *opcinfo)
 	if (!res ||
 		PQresultStatus(res) != PGRES_TUPLES_OK)
 	{
-		write_msg(NULL, "query to obtain opclass functions failed: %s", PQerrorMessage(g_conn));
+		write_msg(NULL, "query to obtain operator class functions failed: %s", PQerrorMessage(g_conn));
 		exit_nicely();
 	}
 
@@ -4886,8 +4886,8 @@ dumpACL(Archive *fout, const char *type, const char *name,
 		eqpos = strchr(tok, '=');
 		if (!eqpos)
 		{
-			write_msg(NULL, "could not parse ACL list ('%s') for %s %s\n",
-					  acls, type, name);
+			write_msg(NULL, "could not parse ACL list (%s) for object %s (%s)\n",
+					  acls, name, type);
 			exit_nicely();
 		}
 		*eqpos = '\0';			/* it's ok to clobber aclbuf */
@@ -6566,7 +6566,7 @@ getFormattedTypeName(const char *oid, OidOptions opts)
 	if (!res ||
 		PQresultStatus(res) != PGRES_TUPLES_OK)
 	{
-		write_msg(NULL, "query to obtain type name for %s failed: %s",
+		write_msg(NULL, "query to obtain name of type %s failed: %s",
 				  oid, PQerrorMessage(g_conn));
 		exit_nicely();
 	}

src/bin/pg_dump/pg_dumpall.c

@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
- * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.7 2002/09/07 16:14:33 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.8 2002/09/22 20:57:20 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -690,7 +690,7 @@ executeQuery(PGconn *conn, const char *query)
 		PQresultStatus(res) != PGRES_TUPLES_OK)
 	{
 		fprintf(stderr, _("%s: query failed: %s"), progname, PQerrorMessage(conn));
-		fprintf(stderr, _("%s: query was: %s"), progname, query);
+		fprintf(stderr, _("%s: query was: %s\n"), progname, query);
 		PQfinish(conn);
 		exit(1);
 	}

src/bin/pg_dump/pg_restore.c

@@ -34,7 +34,7 @@
  *
  *
  * IDENTIFICATION
- *		$Header: /cvsroot/pgsql/src/bin/pg_dump/pg_restore.c,v 1.41 2002/09/04 20:31:35 momjian Exp $
+ *		$Header: /cvsroot/pgsql/src/bin/pg_dump/pg_restore.c,v 1.42 2002/09/22 20:57:20 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -396,7 +396,8 @@ usage(const char *progname)
 	printf(_("  -O, --no-owner           do not reconnect to database to match\n"
 			 "                           object owner\n"));
 	printf(_("  -p, --port=PORT          database server port number\n"));
-	printf(_("  -P, --function=NAME(args)restore named function\n"));
+	printf(_("  -P, --function=NAME(args)\n"
+			 "                           restore named function\n"));
 	printf(_("  -r, --rearrange          rearrange output to put indexes etc. at end\n"));
 	printf(_("  -R, --no-reconnect       disallow ALL reconnections to the database\n"));
 	printf(_("  -s, --schema-only        restore only the schema, no data\n"));

src/bin/pg_resetxlog/nls.mk

-# $Header: /cvsroot/pgsql/src/bin/pg_resetxlog/nls.mk,v 1.2 2002/09/14 13:46:24 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_resetxlog/nls.mk,v 1.3 2002/09/22 20:57:21 petere Exp $
 CATALOG_NAME	:= pg_resetxlog
-AVAIL_LANGUAGES	:= ru
+AVAIL_LANGUAGES	:= de ru
 GETTEXT_FILES	:= pg_resetxlog.c
 GETTEXT_TRIGGERS:= _

src/bin/pg_resetxlog/po/de.po

+# German message translation file for pg_resetxlog
+# Peter Eisentraut <peter_e@gmx.net>, 2002.
+#
+# $Header: /cvsroot/pgsql/src/bin/pg_resetxlog/po/de.po,v 1.1 2002/09/22 20:57:21 petere Exp $
+#
+# Use these quotes: %s
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 7.3\n"
+"POT-Creation-Date: 2002-09-22 17:17+0200\n"
+"PO-Revision-Date: 2002-09-22 22:38+0200\n"
+"Last-Translator: Peter Eisentraut <peter_e@gmx.net>\n"
+"Language-Team: German <peter_e@gmx.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: pg_resetxlog.c:141
+#, c-format
+msgid "%s: transaction ID (-x) must not be 0\n"
+msgstr "%s: Transaktions-ID (-x) darf nicht 0 sein\n"
+
+#: pg_resetxlog.c:149
+#, c-format
+msgid "%s: invalid argument for -l option\n"
+msgstr "%s: ungltiges Argument fr Option -l\n"
+
+#: pg_resetxlog.c:150 pg_resetxlog.c:156 pg_resetxlog.c:164
+#, c-format
+msgid "Try '%s --help' for more information.\n"
+msgstr "Versuchen sie %s --help fr weitere Informationen.\n"
+
+#: pg_resetxlog.c:163
+#, c-format
+msgid "%s: no data directory specified\n"
+msgstr "%s: kein Datenverzeichnis angegeben\n"
+
+#: pg_resetxlog.c:183 pg_resetxlog.c:273
+#, c-format
+msgid "%s: could not open %s for reading: %s\n"
+msgstr "%s: konnte %s nicht zum Lesen ffnen: %s\n"
+
+#: pg_resetxlog.c:189
+#, c-format
+msgid ""
+"%s: lock file %s exists\n"
+"Is a server running? If not, delete the lock file and try again.\n"
+msgstr ""
+"%s: Sperrdatei %s besteht\n"
+"Luft der Server? Wenn nicht, dann Sperrdatei lschen und nochmal versuchen.\n"
+
+#: pg_resetxlog.c:210
+msgid ""
+"\n"
+"If these values seem acceptable, use -f to force reset.\n"
+msgstr ""
+"\n"
+"Wenn diese Werte akzeptabel scheinen, dann benutzen Sie -f um das\n"
+"Zurcksetzen zu erzwingen.\n"
+
+#: pg_resetxlog.c:222
+msgid ""
+"The database server was not shut down cleanly.\n"
+"Resetting the transaction log may cause data to be lost.\n"
+"If you want to proceed anyway, use -f to force reset.\n"
+msgstr ""
+"Der Datenbankserver wurde nicht sauber heruntergefahren.\n"
+"Beim Zurcksetzen des Transaktionslogs knnen Daten verloren gehen.\n"
+"Wenn Sie trotzdem weiter machen wollen, benutzen Sie -f um das\n"
+"Zurcksetzen zu erzwingen.\n"
+
+#: pg_resetxlog.c:247
+msgid "Transaction log reset\n"
+msgstr "Transaktionslog wurde zurck gesetzt\n"
+
+#: pg_resetxlog.c:276
+#, c-format
+msgid ""
+"If you are sure the data directory path is correct, do\n"
+"  touch %s\n"
+"and try again.\n"
+msgstr ""
+"Wenn Sie sicher sind dass das Datenverzeichnis korrekt ist, machen Sie\n"
+"  touch %s\n"
+"und versuchen Sie es erneut.\n"
+
+#: pg_resetxlog.c:289
+#, c-format
+msgid "%s: could not read %s: %s\n"
+msgstr "%s: konnte %s nicht lesen: %s\n"
+
+#: pg_resetxlog.c:312
+#, c-format
+msgid "%s: pg_control exists but has invalid CRC; proceed with caution\n"
+msgstr "%s: pg_control existiert aber mit ungltiger CRC; mit Vorsicht fortfahren\n"
+
+#: pg_resetxlog.c:321
+#, c-format
+msgid "%s: pg_control exists but is broken or unknown version; ignoring it\n"
+msgstr "%s: pg_control ist kaputt oder hat unbekannte Version; wird ignoriert\n"
+
+#: pg_resetxlog.c:363
+#, c-format
+msgid "%s: invalid LC_COLLATE setting\n"
+msgstr "%s: ungltige LC_COLLATE-Einstellung\n"
+
+#: pg_resetxlog.c:370
+#, c-format
+msgid "%s: invalid LC_CTYPE setting\n"
+msgstr "%s: ungltige LC_CTYPE-Einstellung\n"
+
+#: pg_resetxlog.c:392
+msgid ""
+"Guessed pg_control values:\n"
+"\n"
+msgstr "Geschtzte pg_control-Werte:\n\n"
+
+#: pg_resetxlog.c:394
+msgid ""
+"pg_control values:\n"
+"\n"
+msgstr "pg_control-Werte:\n\n"
+
+#: pg_resetxlog.c:396
+#, c-format
+msgid "pg_control version number:            %u\n"
+msgstr "pg_control-Versionsnummer:            %u\n"
+
+#: pg_resetxlog.c:397
+#, c-format
+msgid "Catalog version number:               %u\n"
+msgstr "Katalog-Versionsnummer:               %u\n"
+
+#: pg_resetxlog.c:398
+#, c-format
+msgid "Current log file ID:                  %u\n"
+msgstr "Aktuelle Logdatei-ID:                 %u\n"
+
+#: pg_resetxlog.c:399
+#, c-format
+msgid "Next log file segment:                %u\n"
+msgstr "Nchstes Logdatei-Segment:            %u\n"
+
+#: pg_resetxlog.c:400
+#, c-format
+msgid "Latest checkpoint's StartUpID:        %u\n"
+msgstr "StartUpID vom letzten Checkpoint:     %u\n"
+
+#: pg_resetxlog.c:401
+#, c-format
+msgid "Latest checkpoint's NextXID:          %u\n"
+msgstr "NextXID vom letzten Checkpoint:       %u\n"
+
+#: pg_resetxlog.c:402
+#, c-format
+msgid "Latest checkpoint's NextOID:          %u\n"
+msgstr "NextOID vom letzten Checkpoint:       %u\n"
+
+#: pg_resetxlog.c:403
+#, c-format
+msgid "Database block size:                  %u\n"
+msgstr "Datenbank-Blockgre:                 %u\n"
+
+#: pg_resetxlog.c:404
+#, c-format
+msgid "Blocks per segment of large relation: %u\n"
+msgstr "Blcke pro Segment:                   %u\n"
+
+#: pg_resetxlog.c:405
+#, c-format
+msgid "LC_COLLATE:                           %s\n"
+msgstr "LC_COLLATE:                           %s\n"
+
+#: pg_resetxlog.c:406
+#, c-format
+msgid "LC_CTYPE:                             %s\n"
+msgstr "LC_CTYPE:                             %s\n"
+
+#: pg_resetxlog.c:459
+#, c-format
+msgid ""
+"%s: internal error -- sizeof(ControlFileData) is too large ... fix xlog.c\n"
+msgstr "%s: interner Fehler -- sizeof(ControlFileData) is zu gro ... xlog.c reparieren\n"
+
+#: pg_resetxlog.c:472
+#, c-format
+msgid "%s: could not create pg_control file: %s\n"
+msgstr "%s: konnte pg_control Datei nicht erstellen: %s\n"
+
+#: pg_resetxlog.c:483
+#, c-format
+msgid "%s: could not write pg_control file: %s\n"
+msgstr "%sL konnte pg_control Datei nicht schreiben: %s\n"
+
+#: pg_resetxlog.c:490 pg_resetxlog.c:631
+#, c-format
+msgid "%s: fsync error: %s\n"
+msgstr "%s: fsync-Fehler: %s\n"
+
+#: pg_resetxlog.c:511
+#, c-format
+msgid "%s: could not open directory %s: %s\n"
+msgstr "%s: konnte Verzeichnis %s nicht ffnen: %s\n"
+
+#: pg_resetxlog.c:525
+#, c-format
+msgid "%s: could not delete file %s: %s\n"
+msgstr "%s: konnte Datei %s nicht lschen: %s\n"
+
+#: pg_resetxlog.c:535
+#, c-format
+msgid "%s: could not read from directory %s: %s\n"
+msgstr "%s: konnte aus dem Verzeichnis %s nicht lesen: %s\n"
+
+#: pg_resetxlog.c:598
+#, c-format
+msgid "%s: could not open %s: %s\n"
+msgstr "%s: konnte %s nicht ffnen: %s\n"
+
+#: pg_resetxlog.c:609 pg_resetxlog.c:623
+#, c-format
+msgid "%s: could not write %s: %s\n"
+msgstr "%s: konnte nicht nach %s schreiben: %s\n"
+
+#: pg_resetxlog.c:642
+#, c-format
+msgid ""
+"%s resets the PostgreSQL transaction log.\n"
+"\n"
+msgstr "%s setzt den PostgreSQL-Transaktionslog zurck.\n\n"
+
+#: pg_resetxlog.c:643
+#, c-format
+msgid ""
+"Usage:\n"
+"  %s [OPTIONS] DATADIR\n"
+"\n"
+msgstr ""
+"Benutzung:\n"
+"  %s [OPTIONEN] DATENVERZEICHNIS\n"
+"\n"
+
+#: pg_resetxlog.c:644
+msgid "Options:\n"
+msgstr "Optionen:\n"
+
+#: pg_resetxlog.c:645
+msgid "  -f                force update to be done\n"
+msgstr "  -f                nderung erzwingen\n"
+
+#: pg_resetxlog.c:646
+msgid ""
+"  -l FILEID,SEG     force minimum WAL starting location for new transaction "
+"log\n"
+msgstr "  -l DATEIID,SEG    minimale WAL-Startposition fr neuen Log erzwingen\n"
+
+#: pg_resetxlog.c:647
+msgid ""
+"  -n                no update, just show extracted control values (for "
+"testing)\n"
+msgstr "  -n                keine nderung, nur Kontrolldaten anzeigen (zum Testen)\n"
+
+#: pg_resetxlog.c:648
+msgid "  -x XID            set next transaction ID\n"
+msgstr "  -x XID            nchste Transaktions-ID setzen\n"
+
+#: pg_resetxlog.c:649
+msgid ""
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr "\nBerichten Sie Fehler an <pgsql-bugs@postgresql.org>.\n"

src/bin/psql/command.c

@@ -3,7 +3,7 @@
  *
  * Copyright 2000-2002 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.80 2002/09/04 20:31:35 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.81 2002/09/22 20:57:21 petere Exp $
  */
 #include "postgres_fe.h"
 #include "command.h"
@@ -455,7 +455,7 @@ exec_command(const char *cmd,
 		{
 			/* set encoding */
 			if (PQsetClientEncoding(pset.db, encoding) == -1)
-				psql_error("%s: invalid encoding name or conversion proc not found\n", encoding);
+				psql_error("%s: invalid encoding name or conversion procedure not found\n", encoding);
 
 			else
 			{

src/bin/psql/copy.c

@@ -3,7 +3,7 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/copy.c,v 1.24 2002/09/04 20:31:35 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/copy.c,v 1.25 2002/09/22 20:57:21 petere Exp $
  */
 #include "postgres_fe.h"
 #include "copy.h"
@@ -316,7 +316,7 @@ do_copy(const char *args)
 	if (S_ISDIR(st.st_mode))
 	{
 		fclose(copystream);
-		psql_error("%s: cannot COPY TO/FROM a directory\n",
+		psql_error("%s: cannot copy from/to a directory\n",
 				   options->file);
 		free_copy_options(options);
 		return false;

src/bin/psql/help.c

@@ -3,7 +3,7 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/help.c,v 1.56 2002/09/04 20:31:35 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/help.c,v 1.57 2002/09/22 20:57:21 petere Exp $
  */
 #include "postgres_fe.h"
 #include "print.h"
@@ -80,10 +80,10 @@ usage(void)
 	}
 
 /* If this " is the start of the string then it ought to end there to fit in 80 columns >> " */
-	printf(_("This is psql %s, the PostgreSQL interactive terminal.\n"),
+	printf(_("This is psql %s, the PostgreSQL interactive terminal.\n\n"),
 		   PG_VERSION);
 	puts(_("Usage:"));
-	puts(_("  psql [options] [dbname [username]]\n"));
+	puts(_("  psql [OPTIONS] [DBNAME [USERNAME]]\n"));
 	puts(_("Options:"));
 	puts(_("  -a              Echo all input from script"));
 	puts(_("  -A              Unaligned table output mode (-P format=unaligned)"));
@@ -210,23 +210,23 @@ slashUsage(bool pager)
 	 */
 	fprintf(output, _(" \\a             toggle between unaligned and aligned output mode\n"));
 	fprintf(output, _(" \\c[onnect] [DBNAME|- [USER]]\n"
-		 "                connect to new database (currently \"%s\")\n"),
+					  "                connect to new database (currently \"%s\")\n"),
 			PQdb(pset.db));
 	fprintf(output, _(" \\C [STRING]    set table title, or unset if none\n"));
 	fprintf(output, _(" \\cd [DIR]      change the current working directory\n"));
 	fprintf(output, _(" \\copy ...      perform SQL COPY with data stream to the client host\n"));
 	fprintf(output, _(" \\copyright     show PostgreSQL usage and distribution terms\n"));
 	fprintf(output, _(" \\d [NAME]      describe table, index, sequence, or view\n"));
-	fprintf(output, _(" \\d{t|i|s|v|S} [PATTERN] (add '+' for more detail)\n"));
-	fprintf(output, _("                list tables/indexes/sequences/views/system tables\n"));
+	fprintf(output, _(" \\d{t|i|s|v|S} [PATTERN] (add \"+\" for more detail)\n"
+					  "                list tables/indexes/sequences/views/system tables\n"));
 	fprintf(output, _(" \\da [PATTERN]  list aggregate functions\n"));
 	fprintf(output, _(" \\dd [PATTERN]  show comment for object\n"));
 	fprintf(output, _(" \\dD [PATTERN]  list domains\n"));
-	fprintf(output, _(" \\df [PATTERN]  list functions (add '+' for more detail)\n"));
+	fprintf(output, _(" \\df [PATTERN]  list functions (add \"+\" for more detail)\n"));
 	fprintf(output, _(" \\do [NAME]     list operators\n"));
-	fprintf(output, _(" \\dl            list large objects, same as lo_list\n"));
+	fprintf(output, _(" \\dl            list large objects, same as \\lo_list\n"));
 	fprintf(output, _(" \\dp [PATTERN]  list table access privileges\n"));
-	fprintf(output, _(" \\dT [PATTERN]  list data types (add '+' for more detail)\n"));
+	fprintf(output, _(" \\dT [PATTERN]  list data types (add \"+\" for more detail)\n"));
 	fprintf(output, _(" \\du [PATTERN]  list users\n"));
 	fprintf(output, _(" \\e [FILE]      edit the query buffer (or file) with external editor\n"));
 	fprintf(output, _(" \\echo [STRING] write string to standard output\n"));
@@ -242,8 +242,9 @@ slashUsage(bool pager)
 					  "                large object operations\n"));
 	fprintf(output, _(" \\o FILE        send all query results to file or |pipe\n"));
 	fprintf(output, _(" \\p             show the contents of the query buffer\n"));
-	fprintf(output, _(" \\pset NAME [VALUE]  set table output option (NAME := {format|border|expanded|\n"
-					  "                fieldsep|null|recordsep|tuples_only|title|tableattr|pager})\n"));
+	fprintf(output, _(" \\pset NAME [VALUE]  set table output option\n"
+					  "                (NAME := {format|border|expanded|fieldsep|null|recordsep|\n"
+					  "                tuples_only|title|tableattr|pager})\n"));
 	fprintf(output, _(" \\q             quit psql\n"));
 	fprintf(output, _(" \\qecho [STRING]  write string to query output stream (see \\o)\n"));
 	fprintf(output, _(" \\r             reset (clear) the query buffer\n"));
@@ -251,8 +252,8 @@ slashUsage(bool pager)
 	fprintf(output, _(" \\set [NAME [VALUE]]  set internal variable, or list all if no parameters\n"));
 	fprintf(output, _(" \\t             show only rows (currently %s)\n"),
 			ON(pset.popt.topt.tuples_only));
-	fprintf(output, _(" \\T [STRING]    set HTML <table>-tag attributes, or unset if none\n"));
-	fprintf(output, _(" \\timing        toggle timing of queries (currently %s)\n"),
+	fprintf(output, _(" \\T [STRING]    set HTML <table> tag attributes, or unset if none\n"));
+	fprintf(output, _(" \\timing        toggle timing of commands (currently %s)\n"),
 			ON(pset.timing));
 	fprintf(output, _(" \\unset NAME    unset (delete) internal variable\n"));
 	fprintf(output, _(" \\w [FILE]      write query buffer to file\n"));

src/bin/psql/startup.c

@@ -3,7 +3,7 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.66 2002/09/06 02:33:47 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.67 2002/09/22 20:57:21 petere Exp $
  */
 #include "postgres_fe.h"
 
@@ -638,7 +638,7 @@ showVersion(void)
 	puts("psql (PostgreSQL) " PG_VERSION);
 
 #if defined(USE_READLINE)
-	puts(gettext("contains support for readline"));
+	puts(gettext("contains support for command-line editing"));
 #endif
 
 	puts(gettext("Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group\n"

src/interfaces/libpq/fe-connect.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.204 2002/09/06 02:33:47 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.205 2002/09/22 20:57:21 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -2950,7 +2950,7 @@ PasswordFromFile(char *hostname, char *port, char *dbname, char *username)
 	if (stat_buf.st_mode & (S_IRWXG | S_IRWXO))
 	{
 		fprintf(stderr,
-				libpq_gettext("WARNING: Password file %s has world or group read access; permission should be u=rw (0600)"),
+				libpq_gettext("WARNING: Password file %s has world or group read access; permission should be u=rw (0600)\n"),
 				pgpassfile);
 		free(pgpassfile);
 		return NULL;

src/interfaces/libpq/fe-secure.c

@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-secure.c,v 1.12 2002/09/05 18:27:13 petere Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-secure.c,v 1.13 2002/09/22 20:57:21 petere Exp $
  *
  * NOTES
  *	  The client *requires* a valid server certificate.  Since
@@ -394,7 +394,7 @@ verify_peer(PGconn *conn)
 	if ((h = gethostbyname(conn->peer_cn)) == NULL)
 	{
 		printfPQExpBuffer(&conn->errorMessage,
-		libpq_gettext("error getting information about host (%s): %s\n"),
+		libpq_gettext("could not get information about host (%s): %s\n"),
 						  conn->peer_cn, hstrerror(h_errno));
 		return -1;
 	}
@@ -413,7 +413,7 @@ verify_peer(PGconn *conn)
 
 		default:
 			printfPQExpBuffer(&conn->errorMessage,
-			  libpq_gettext("sorry, this protocol not yet supported\n"));
+			  libpq_gettext("unsupported protocol\n"));
 			return -1;
 	}
 
@@ -435,14 +435,14 @@ verify_peer(PGconn *conn)
 			l = ntohl(sin->sin_addr.s_addr);
 			printfPQExpBuffer(&conn->errorMessage,
 							  libpq_gettext(
-											"server common name '%s' does not resolve to %ld.%ld.%ld.%ld\n"),
+											"server common name \"%s\" does not resolve to %ld.%ld.%ld.%ld\n"),
 					 conn->peer_cn, (l >> 24) % 0x100, (l >> 16) % 0x100,
 							  (l >> 8) % 0x100, l % 0x100);
 			break;
 		default:
 			printfPQExpBuffer(&conn->errorMessage,
 							  libpq_gettext(
-			"server common name '%s' does not resolve to peer address\n"),
+			"server common name \"%s\" does not resolve to peer address\n"),
 							  conn->peer_cn);
 	}
 
@@ -610,7 +610,7 @@ client_cert_cb(SSL *ssl, X509 **x509, EVP_PKEY **pkey)
 	if ((pwd = getpwuid(getuid())) == NULL)
 	{
 		printfPQExpBuffer(&conn->errorMessage,
-					  libpq_gettext("unable to get user information\n"));
+					  libpq_gettext("could not get user information\n"));
 		return -1;
 	}
 
@@ -622,14 +622,14 @@ client_cert_cb(SSL *ssl, X509 **x509, EVP_PKEY **pkey)
 	if ((fp = fopen(fnbuf, "r")) == NULL)
 	{
 		printfPQExpBuffer(&conn->errorMessage,
-				  libpq_gettext("unable to open certificate (%s): %s\n"),
+				  libpq_gettext("could not open certificate (%s): %s\n"),
 						  fnbuf, strerror(errno));
 		return -1;
 	}
 	if (PEM_read_X509(fp, x509, NULL, NULL) == NULL)
 	{
 		printfPQExpBuffer(&conn->errorMessage,
-				  libpq_gettext("unable to read certificate (%s): %s\n"),
+				  libpq_gettext("could not read certificate (%s): %s\n"),
 						  fnbuf, SSLerrmessage());
 		fclose(fp);
 		return -1;
@@ -651,14 +651,14 @@ client_cert_cb(SSL *ssl, X509 **x509, EVP_PKEY **pkey)
 		buf.st_uid != getuid())
 	{
 		printfPQExpBuffer(&conn->errorMessage,
-		 libpq_gettext("private key has bad permissions (%s)\n"), fnbuf);
+						  libpq_gettext("private key (%s) has wrong permissions\n"), fnbuf);
 		X509_free(*x509);
 		return -1;
 	}
 	if ((fp = fopen(fnbuf, "r")) == NULL)
 	{
 		printfPQExpBuffer(&conn->errorMessage,
-			 libpq_gettext("unable to open private key file (%s): %s\n"),
+			 libpq_gettext("could not open private key file (%s): %s\n"),
 						  fnbuf, strerror(errno));
 		X509_free(*x509);
 		return -1;
@@ -667,14 +667,14 @@ client_cert_cb(SSL *ssl, X509 **x509, EVP_PKEY **pkey)
 		buf.st_dev != buf2.st_dev || buf.st_ino != buf2.st_ino)
 	{
 		printfPQExpBuffer(&conn->errorMessage,
-			libpq_gettext("private key changed under us (%s)\n"), fnbuf);
+			libpq_gettext("private key (%s) changed during execution\n"), fnbuf);
 		X509_free(*x509);
 		return -1;
 	}
 	if (PEM_read_PrivateKey(fp, pkey, cb, NULL) == NULL)
 	{
 		printfPQExpBuffer(&conn->errorMessage,
-				  libpq_gettext("unable to read private key (%s): %s\n"),
+				  libpq_gettext("could not read private key (%s): %s\n"),
 						  fnbuf, SSLerrmessage());
 		X509_free(*x509);
 		fclose(fp);
@@ -727,14 +727,14 @@ initialize_SSL(PGconn *conn)
 		if (stat(fnbuf, &buf) == -1)
 		{
 			printfPQExpBuffer(&conn->errorMessage,
-				 libpq_gettext("could not read  root cert list(%s): %s"),
+				 libpq_gettext("could not read root certificate list (%s): %s\n"),
 							  fnbuf, strerror(errno));
 			return -1;
 		}
 		if (!SSL_CTX_load_verify_locations(SSL_context, fnbuf, 0))
 		{
 			printfPQExpBuffer(&conn->errorMessage,
-				 libpq_gettext("could not read root cert list (%s): %s"),
+				 libpq_gettext("could not read root certificate list (%s): %s\n"),
 							  fnbuf, SSLerrmessage());
 			return -1;
 		}

src/interfaces/libpq/nls.mk

-# $Header: /cvsroot/pgsql/src/interfaces/libpq/nls.mk,v 1.7 2002/09/02 22:22:12 petere Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/libpq/nls.mk,v 1.8 2002/09/22 20:57:21 petere Exp $
 CATALOG_NAME	:= libpq
 AVAIL_LANGUAGES	:= cs de es fr pt_BR ru sv zh_CN zh_TW
-GETTEXT_FILES	:= fe-auth.c fe-connect.c fe-exec.c fe-lobj.c fe-misc.c
+GETTEXT_FILES	:= fe-auth.c fe-connect.c fe-exec.c fe-lobj.c fe-misc.c fe-secure.c
 GETTEXT_TRIGGERS:= libpq_gettext