summaryrefslogtreecommitdiff
path: root/src/bin
diff options
context:
space:
mode:
Diffstat (limited to 'src/bin')
-rw-r--r--src/bin/initdb/nls.mk2
-rw-r--r--src/bin/initdb/po/de.po305
-rw-r--r--src/bin/initdb/po/fr.po326
-rw-r--r--src/bin/initdb/po/it.po307
-rw-r--r--src/bin/initdb/po/sv.po1037
-rw-r--r--src/bin/initdb/po/zh_CN.po501
-rw-r--r--src/bin/pg_basebackup/nls.mk2
-rw-r--r--src/bin/pg_basebackup/po/cs.po914
-rw-r--r--src/bin/pg_basebackup/po/es.po806
-rw-r--r--src/bin/pg_basebackup/po/it.po249
-rw-r--r--src/bin/pg_basebackup/po/ja.po837
-rw-r--r--src/bin/pg_basebackup/po/zh_CN.po785
-rw-r--r--src/bin/pg_config/po/sv.po97
-rw-r--r--src/bin/pg_controldata/po/fr.po26
-rw-r--r--src/bin/pg_controldata/po/sv.po137
-rw-r--r--src/bin/pg_controldata/po/zh_CN.po176
-rw-r--r--src/bin/pg_ctl/nls.mk2
-rw-r--r--src/bin/pg_ctl/po/fr.po55
-rw-r--r--src/bin/pg_ctl/po/it.po18
-rw-r--r--src/bin/pg_ctl/po/sv.po167
-rw-r--r--src/bin/pg_ctl/po/zh_CN.po406
-rw-r--r--src/bin/pg_ctl/po/zh_TW.po770
-rw-r--r--src/bin/pg_dump/po/fr.po794
-rw-r--r--src/bin/pg_dump/po/it.po20
-rw-r--r--src/bin/pg_dump/po/zh_CN.po1487
-rw-r--r--src/bin/pg_resetxlog/nls.mk2
-rw-r--r--src/bin/pg_resetxlog/po/fr.po237
-rw-r--r--src/bin/pg_resetxlog/po/sv.po550
-rw-r--r--src/bin/pg_resetxlog/po/zh_CN.po330
-rw-r--r--src/bin/psql/po/it.po1204
-rw-r--r--src/bin/psql/po/zh_CN.po2774
-rw-r--r--src/bin/scripts/nls.mk2
-rw-r--r--src/bin/scripts/po/de.po83
-rw-r--r--src/bin/scripts/po/fr.po157
-rw-r--r--src/bin/scripts/po/it.po83
-rw-r--r--src/bin/scripts/po/sv.po1063
-rw-r--r--src/bin/scripts/po/zh_CN.po423
37 files changed, 8646 insertions, 8488 deletions
diff --git a/src/bin/initdb/nls.mk b/src/bin/initdb/nls.mk
index 9fa01994253..4763126703b 100644
--- a/src/bin/initdb/nls.mk
+++ b/src/bin/initdb/nls.mk
@@ -1,5 +1,5 @@
# src/bin/initdb/nls.mk
CATALOG_NAME = initdb
-AVAIL_LANGUAGES = cs de es fr it ja pl pt_BR ru zh_CN
+AVAIL_LANGUAGES = cs de es fr it ja pl pt_BR ru sv zh_CN
GETTEXT_FILES = findtimezone.c initdb.c ../../common/exec.c ../../common/fe_memutils.c ../../common/pgfnames.c ../../common/rmtree.c ../../common/username.c ../../common/wait_error.c ../../port/dirmod.c
GETTEXT_TRIGGERS = simple_prompt
diff --git a/src/bin/initdb/po/de.po b/src/bin/initdb/po/de.po
index 884a8680047..48d47010240 100644
--- a/src/bin/initdb/po/de.po
+++ b/src/bin/initdb/po/de.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: PostgreSQL 9.4\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2014-08-23 03:42+0000\n"
-"PO-Revision-Date: 2014-08-23 00:28-0400\n"
+"POT-Creation-Date: 2014-12-06 19:12+0000\n"
+"PO-Revision-Date: 2014-12-08 20:16-0500\n"
"Last-Translator: Peter Eisentraut <peter_e@gmx.net>\n"
"Language-Team: Peter Eisentraut <peter_e@gmx.net>\n"
"Language: de\n"
@@ -146,112 +146,112 @@ msgstr "konnte Junction für „%s“ nicht erzeugen: %s\n"
msgid "could not get junction for \"%s\": %s\n"
msgstr "konnte Junction für „%s“ nicht ermitteln: %s\n"
-#: initdb.c:335
+#: initdb.c:337
#, c-format
msgid "%s: out of memory\n"
msgstr "%s: Speicher aufgebraucht\n"
-#: initdb.c:445 initdb.c:1602
+#: initdb.c:447 initdb.c:1653
#, c-format
msgid "%s: could not open file \"%s\" for reading: %s\n"
msgstr "%s: konnte Datei „%s“ nicht zum Lesen öffnen: %s\n"
-#: initdb.c:501 initdb.c:1004 initdb.c:1032
+#: initdb.c:503 initdb.c:1055 initdb.c:1083
#, c-format
msgid "%s: could not open file \"%s\" for writing: %s\n"
msgstr "%s: konnte Datei „%s“ nicht zum Schreiben öffnen: %s\n"
-#: initdb.c:509 initdb.c:517 initdb.c:1011 initdb.c:1038
+#: initdb.c:511 initdb.c:519 initdb.c:1062 initdb.c:1089
#, c-format
msgid "%s: could not write file \"%s\": %s\n"
msgstr "%s: konnte Datei „%s“ nicht schreiben: %s\n"
-#: initdb.c:539
+#: initdb.c:541 initdb.c:608
#, c-format
msgid "%s: could not open directory \"%s\": %s\n"
msgstr "%s: konnte Verzeichnis „%s“ nicht öffnen: %s\n"
-#: initdb.c:556
+#: initdb.c:558
#, c-format
msgid "%s: could not stat file \"%s\": %s\n"
msgstr "%s: konnte „stat“ für Datei „%s“ nicht ausführen: %s\n"
-#: initdb.c:569
+#: initdb.c:571 initdb.c:628
#, c-format
msgid "%s: could not read directory \"%s\": %s\n"
msgstr "%s: konnte Verzeichnis „%s“ nicht lesen: %s\n"
-#: initdb.c:576
+#: initdb.c:578 initdb.c:635
#, c-format
msgid "%s: could not close directory \"%s\": %s\n"
msgstr "%s: konnte Verzeichnis „%s“ nicht schließen: %s\n"
-#: initdb.c:611 initdb.c:663
+#: initdb.c:662 initdb.c:714
#, c-format
msgid "%s: could not open file \"%s\": %s\n"
msgstr "%s: konnte Datei „%s“ nicht öffnen: %s\n"
-#: initdb.c:679
+#: initdb.c:730
#, c-format
msgid "%s: could not fsync file \"%s\": %s\n"
msgstr "%s: konnte Datei „%s“ nicht fsyncen: %s\n"
-#: initdb.c:700
+#: initdb.c:751
#, c-format
msgid "%s: could not execute command \"%s\": %s\n"
msgstr "%s: konnte Befehl „%s“ nicht ausführen: %s\n"
-#: initdb.c:716
+#: initdb.c:767
#, c-format
msgid "%s: removing data directory \"%s\"\n"
msgstr "%s: entferne Datenverzeichnis „%s“\n"
-#: initdb.c:719
+#: initdb.c:770
#, c-format
msgid "%s: failed to remove data directory\n"
msgstr "%s: konnte Datenverzeichnis nicht entfernen\n"
-#: initdb.c:725
+#: initdb.c:776
#, c-format
msgid "%s: removing contents of data directory \"%s\"\n"
msgstr "%s: entferne Inhalt des Datenverzeichnisses „%s“\n"
-#: initdb.c:728
+#: initdb.c:779
#, c-format
msgid "%s: failed to remove contents of data directory\n"
msgstr "%s: konnte Inhalt des Datenverzeichnisses nicht entfernen\n"
-#: initdb.c:734
+#: initdb.c:785
#, c-format
msgid "%s: removing transaction log directory \"%s\"\n"
msgstr "%s: entferne Transaktionslogverzeichnis „%s“\n"
-#: initdb.c:737
+#: initdb.c:788
#, c-format
msgid "%s: failed to remove transaction log directory\n"
msgstr "%s: konnte Transaktionslogverzeichnis nicht entfernen\n"
-#: initdb.c:743
+#: initdb.c:794
#, c-format
msgid "%s: removing contents of transaction log directory \"%s\"\n"
msgstr "%s: entferne Inhalt des Transaktionslogverzeichnisses „%s“\n"
-#: initdb.c:746
+#: initdb.c:797
#, c-format
msgid "%s: failed to remove contents of transaction log directory\n"
msgstr "%s: konnte Inhalt des Transaktionslogverzeichnisses nicht entfernen\n"
-#: initdb.c:755
+#: initdb.c:806
#, c-format
msgid "%s: data directory \"%s\" not removed at user's request\n"
msgstr "%s: Datenverzeichnis „%s“ wurde auf Anwenderwunsch nicht entfernt\n"
-#: initdb.c:760
+#: initdb.c:811
#, c-format
msgid "%s: transaction log directory \"%s\" not removed at user's request\n"
msgstr "%s: Transaktionslogverzeichnis „%s“ wurde auf Anwenderwunsch nicht entfernt\n"
-#: initdb.c:781
+#: initdb.c:832
#, c-format
msgid ""
"%s: cannot be run as root\n"
@@ -262,22 +262,22 @@ msgstr ""
"Bitte loggen Sie sich (z.B. mit „su“) als der (unprivilegierte) Benutzer\n"
"ein, der Eigentümer des Serverprozesses sein soll.\n"
-#: initdb.c:817
+#: initdb.c:868
#, c-format
msgid "%s: \"%s\" is not a valid server encoding name\n"
msgstr "%s: „%s“ ist keine gültige Serverkodierung\n"
-#: initdb.c:931 initdb.c:3323
+#: initdb.c:982 initdb.c:3386
#, c-format
msgid "%s: could not create directory \"%s\": %s\n"
msgstr "%s: konnte Verzeichnis „%s“ nicht erzeugen: %s\n"
-#: initdb.c:960
+#: initdb.c:1011
#, c-format
msgid "%s: file \"%s\" does not exist\n"
msgstr "%s: Datei „%s“ existiert nicht\n"
-#: initdb.c:962 initdb.c:971 initdb.c:981
+#: initdb.c:1013 initdb.c:1022 initdb.c:1032
#, c-format
msgid ""
"This might mean you have a corrupted installation or identified\n"
@@ -286,46 +286,46 @@ msgstr ""
"Das könnte bedeuten, dass Ihre Installation fehlerhaft ist oder dass Sie das\n"
"falsche Verzeichnis mit der Kommandozeilenoption -L angegeben haben.\n"
-#: initdb.c:968
+#: initdb.c:1019
#, c-format
msgid "%s: could not access file \"%s\": %s\n"
msgstr "%s: konnte nicht auf Datei „%s“ zugreifen: %s\n"
-#: initdb.c:979
+#: initdb.c:1030
#, c-format
msgid "%s: file \"%s\" is not a regular file\n"
msgstr "%s: Datei „%s“ ist keine normale Datei\n"
-#: initdb.c:1124
+#: initdb.c:1175
#, c-format
msgid "selecting default max_connections ... "
msgstr "wähle Vorgabewert für max_connections ... "
-#: initdb.c:1154
+#: initdb.c:1205
#, c-format
msgid "selecting default shared_buffers ... "
msgstr "wähle Vorgabewert für shared_buffers ... "
-#: initdb.c:1187
+#: initdb.c:1238
#, c-format
msgid "selecting dynamic shared memory implementation ... "
msgstr "wähle Implementierung von dynamischem Shared Memory ... "
-#: initdb.c:1205
+#: initdb.c:1256
msgid "creating configuration files ... "
msgstr "erzeuge Konfigurationsdateien ... "
-#: initdb.c:1296 initdb.c:1316 initdb.c:1400 initdb.c:1416
+#: initdb.c:1347 initdb.c:1367 initdb.c:1451 initdb.c:1467
#, c-format
msgid "%s: could not change permissions of \"%s\": %s\n"
msgstr "%s: konnte Zugriffsrechte von „%s“ nicht ändern: %s\n"
-#: initdb.c:1440
+#: initdb.c:1491
#, c-format
msgid "creating template1 database in %s/base/1 ... "
msgstr "erzeuge Datenbank template1 in %s/base/1 ... "
-#: initdb.c:1456
+#: initdb.c:1507
#, c-format
msgid ""
"%s: input file \"%s\" does not belong to PostgreSQL %s\n"
@@ -335,151 +335,156 @@ msgstr ""
"Prüfen Sie Ihre Installation oder geben Sie den korrekten Pfad mit der\n"
"Option -L an.\n"
-#: initdb.c:1543
+#: initdb.c:1594
msgid "initializing pg_authid ... "
msgstr "initialisiere pg_authid ... "
-#: initdb.c:1577
+#: initdb.c:1628
msgid "Enter new superuser password: "
msgstr "Geben Sie das neue Superuser-Passwort ein: "
-#: initdb.c:1578
+#: initdb.c:1629
msgid "Enter it again: "
msgstr "Geben Sie es noch einmal ein: "
-#: initdb.c:1581
+#: initdb.c:1632
#, c-format
msgid "Passwords didn't match.\n"
msgstr "Passwörter stimmten nicht überein.\n"
-#: initdb.c:1608
+#: initdb.c:1660
#, c-format
msgid "%s: could not read password from file \"%s\": %s\n"
msgstr "%s: konnte Passwort nicht aus Datei „%s“ lesen: %s\n"
-#: initdb.c:1621
+#: initdb.c:1663
+#, c-format
+msgid "%s: password file \"%s\" is empty\n"
+msgstr "%s: Passwortdatei „%s“ ist leer\n"
+
+#: initdb.c:1676
#, c-format
msgid "setting password ... "
msgstr "setze das Passwort ... "
-#: initdb.c:1721
+#: initdb.c:1776
msgid "initializing dependencies ... "
msgstr "initialisiere Abhängigkeiten ... "
-#: initdb.c:1749
+#: initdb.c:1804
msgid "creating system views ... "
msgstr "erzeuge Systemsichten ... "
-#: initdb.c:1785
+#: initdb.c:1840
msgid "loading system objects' descriptions ... "
msgstr "lade Systemobjektbeschreibungen ... "
-#: initdb.c:1891
+#: initdb.c:1946
msgid "creating collations ... "
msgstr "erzeuge Sortierfolgen ... "
-#: initdb.c:1924
+#: initdb.c:1979
#, c-format
msgid "%s: locale name too long, skipped: \"%s\"\n"
msgstr "%s: Locale-Name zu lang, wird ausgelassen: „%s“\n"
-#: initdb.c:1949
+#: initdb.c:2004
#, c-format
msgid "%s: locale name has non-ASCII characters, skipped: \"%s\"\n"
msgstr "%s: Locale-Name hat Nicht-ASCII-Zeichen, wird ausgelassen: „%s“\n"
-#: initdb.c:2018
+#: initdb.c:2073
#, c-format
msgid "No usable system locales were found.\n"
msgstr "Es wurden keine brauchbaren System-Locales gefunden.\n"
-#: initdb.c:2019
+#: initdb.c:2074
#, c-format
msgid "Use the option \"--debug\" to see details.\n"
msgstr "Verwenden Sie die Option „--debug“, um Einzelheiten zu sehen.\n"
-#: initdb.c:2022
+#: initdb.c:2077
#, c-format
msgid "not supported on this platform\n"
msgstr "auf dieser Plattform nicht unterstützt\n"
-#: initdb.c:2037
+#: initdb.c:2092
msgid "creating conversions ... "
msgstr "erzeuge Konversionen ... "
-#: initdb.c:2072
+#: initdb.c:2127
msgid "creating dictionaries ... "
msgstr "erzeuge Wörterbücher ... "
-#: initdb.c:2126
+#: initdb.c:2181
msgid "setting privileges on built-in objects ... "
msgstr "setze Privilegien der eingebauten Objekte ... "
-#: initdb.c:2184
+#: initdb.c:2239
msgid "creating information schema ... "
msgstr "erzeuge Informationsschema ... "
-#: initdb.c:2240
+#: initdb.c:2295
msgid "loading PL/pgSQL server-side language ... "
msgstr "lade Serversprache PL/pgSQL ... "
-#: initdb.c:2265
+#: initdb.c:2320
msgid "vacuuming database template1 ... "
msgstr "führe Vacuum in Datenbank template1 durch ... "
-#: initdb.c:2321
+#: initdb.c:2376
msgid "copying template1 to template0 ... "
msgstr "kopiere template1 nach template0 ... "
-#: initdb.c:2353
+#: initdb.c:2408
msgid "copying template1 to postgres ... "
msgstr "kopiere template1 nach postgres ... "
-#: initdb.c:2379
+#: initdb.c:2435
msgid "syncing data to disk ... "
msgstr "synchronisiere Daten auf Festplatte ... "
-#: initdb.c:2451
+#: initdb.c:2514
#, c-format
msgid "caught signal\n"
msgstr "Signal abgefangen\n"
-#: initdb.c:2457
+#: initdb.c:2520
#, c-format
msgid "could not write to child process: %s\n"
msgstr "konnte nicht an Kindprozess schreiben: %s\n"
-#: initdb.c:2465
+#: initdb.c:2528
#, c-format
msgid "ok\n"
msgstr "ok\n"
-#: initdb.c:2555
+#: initdb.c:2618
#, c-format
msgid "%s: setlocale() failed\n"
msgstr "%s: setlocale() fehlgeschlagen\n"
-#: initdb.c:2573
+#: initdb.c:2636
#, c-format
msgid "%s: failed to restore old locale \"%s\"\n"
msgstr "%s: konnte alte Locale „%s“ nicht wiederherstellen\n"
-#: initdb.c:2583
+#: initdb.c:2646
#, c-format
msgid "%s: invalid locale name \"%s\"\n"
msgstr "%s: ungültiger Locale-Name „%s“\n"
-#: initdb.c:2595
+#: initdb.c:2658
#, c-format
msgid "%s: invalid locale settings; check LANG and LC_* environment variables\n"
msgstr "%s: ungültige Locale-Einstellungen; prüfen Sie die Umgebungsvariablen LANG und LC_*\n"
-#: initdb.c:2623
+#: initdb.c:2686
#, c-format
msgid "%s: encoding mismatch\n"
msgstr "%s: unpassende Kodierungen\n"
-#: initdb.c:2625
+#: initdb.c:2688
#, c-format
msgid ""
"The encoding you selected (%s) and the encoding that the\n"
@@ -494,32 +499,32 @@ msgstr ""
"führen. Starten Sie %s erneut und geben Sie entweder keine\n"
"Kodierung explizit an oder wählen Sie eine passende Kombination.\n"
-#: initdb.c:2730
+#: initdb.c:2793
#, c-format
msgid "%s: WARNING: cannot create restricted tokens on this platform\n"
msgstr "%s: WARNUNG: auf dieser Platform können keine beschränkten Token erzeugt werden\n"
-#: initdb.c:2739
+#: initdb.c:2802
#, c-format
msgid "%s: could not open process token: error code %lu\n"
msgstr "%s: konnte Prozess-Token nicht öffnen: Fehlercode %lu\n"
-#: initdb.c:2752
+#: initdb.c:2815
#, c-format
msgid "%s: could not to allocate SIDs: error code %lu\n"
msgstr "%s: konnte SIDs nicht erzeugen: Fehlercode %lu\n"
-#: initdb.c:2771
+#: initdb.c:2834
#, c-format
msgid "%s: could not create restricted token: error code %lu\n"
msgstr "%s: konnte beschränktes Token nicht erzeugen: Fehlercode %lu\n"
-#: initdb.c:2792
+#: initdb.c:2855
#, c-format
msgid "%s: could not start process for command \"%s\": error code %lu\n"
msgstr "%s: konnte Prozess für Befehl „%s“ nicht starten: Fehlercode %lu\n"
-#: initdb.c:2806
+#: initdb.c:2869
#, c-format
msgid ""
"%s initializes a PostgreSQL database cluster.\n"
@@ -528,17 +533,17 @@ msgstr ""
"%s initialisiert einen PostgreSQL-Datenbankcluster.\n"
"\n"
-#: initdb.c:2807
+#: initdb.c:2870
#, c-format
msgid "Usage:\n"
msgstr "Aufruf:\n"
-#: initdb.c:2808
+#: initdb.c:2871
#, c-format
msgid " %s [OPTION]... [DATADIR]\n"
msgstr " %s [OPTION]... [DATENVERZEICHNIS]\n"
-#: initdb.c:2809
+#: initdb.c:2872
#, c-format
msgid ""
"\n"
@@ -547,41 +552,41 @@ msgstr ""
"\n"
"Optionen:\n"
-#: initdb.c:2810
+#: initdb.c:2873
#, c-format
msgid " -A, --auth=METHOD default authentication method for local connections\n"
msgstr " -A, --auth=METHODE vorgegebene Authentifizierungsmethode für lokale Verbindungen\n"
-#: initdb.c:2811
+#: initdb.c:2874
#, c-format
msgid " --auth-host=METHOD default authentication method for local TCP/IP connections\n"
msgstr ""
" --auth-host=METHODE vorgegebene Authentifizierungsmethode für lokale\n"
" TCP/IP-Verbindungen\n"
-#: initdb.c:2812
+#: initdb.c:2875
#, c-format
msgid " --auth-local=METHOD default authentication method for local-socket connections\n"
msgstr ""
" --auth-local=METHODE vorgegebene Authentifizierungsmethode für Verbindungen\n"
" auf lokalen Sockets\n"
-#: initdb.c:2813
+#: initdb.c:2876
#, c-format
msgid " [-D, --pgdata=]DATADIR location for this database cluster\n"
msgstr " [-D, --pgdata=]DATENVERZ Datenverzeichnis für diesen Datenbankcluster\n"
-#: initdb.c:2814
+#: initdb.c:2877
#, c-format
msgid " -E, --encoding=ENCODING set default encoding for new databases\n"
msgstr " -E, --encoding=KODIERUNG setze Standardkodierung für neue Datenbanken\n"
-#: initdb.c:2815
+#: initdb.c:2878
#, c-format
msgid " --locale=LOCALE set default locale for new databases\n"
msgstr " --locale=LOCALE setze Standardlocale für neue Datenbanken\n"
-#: initdb.c:2816
+#: initdb.c:2879
#, c-format
msgid ""
" --lc-collate=, --lc-ctype=, --lc-messages=LOCALE\n"
@@ -595,17 +600,17 @@ msgstr ""
" für neue Datenbanken (Voreinstellung aus der\n"
" Umgebung entnommen)\n"
-#: initdb.c:2820
+#: initdb.c:2883
#, c-format
msgid " --no-locale equivalent to --locale=C\n"
msgstr " --no-locale entspricht --locale=C\n"
-#: initdb.c:2821
+#: initdb.c:2884
#, c-format
msgid " --pwfile=FILE read password for the new superuser from file\n"
msgstr " --pwfile=DATEI lese Passwort des neuen Superusers aus Datei\n"
-#: initdb.c:2822
+#: initdb.c:2885
#, c-format
msgid ""
" -T, --text-search-config=CFG\n"
@@ -614,22 +619,22 @@ msgstr ""
" -T, --text-search-config=KFG\n"
" Standardtextsuchekonfiguration\n"
-#: initdb.c:2824
+#: initdb.c:2887
#, c-format
msgid " -U, --username=NAME database superuser name\n"
msgstr " -U, --username=NAME Datenbank-Superusername\n"
-#: initdb.c:2825
+#: initdb.c:2888
#, c-format
msgid " -W, --pwprompt prompt for a password for the new superuser\n"
msgstr " -W, --pwprompt frage nach Passwort für neuen Superuser\n"
-#: initdb.c:2826
+#: initdb.c:2889
#, c-format
msgid " -X, --xlogdir=XLOGDIR location for the transaction log directory\n"
msgstr " -X, --xlogdir=XLOGVERZ Verzeichnis für das Transaktionslog\n"
-#: initdb.c:2827
+#: initdb.c:2890
#, c-format
msgid ""
"\n"
@@ -638,44 +643,44 @@ msgstr ""
"\n"
"Weniger häufig verwendete Optionen:\n"
-#: initdb.c:2828
+#: initdb.c:2891
#, c-format
msgid " -d, --debug generate lots of debugging output\n"
msgstr " -d, --debug erzeuge eine Menge Debug-Ausgaben\n"
-#: initdb.c:2829
+#: initdb.c:2892
#, c-format
msgid " -k, --data-checksums use data page checksums\n"
msgstr " -k, --data-checksums Datenseitenprüfsummen verwenden\n"
-#: initdb.c:2830
+#: initdb.c:2893
#, c-format
msgid " -L DIRECTORY where to find the input files\n"
msgstr " -L VERZEICHNIS wo sind die Eingabedateien zu finden\n"
-#: initdb.c:2831
+#: initdb.c:2894
#, c-format
msgid " -n, --noclean do not clean up after errors\n"
msgstr " -n, --noclean nach Fehlern nicht aufräumen\n"
-#: initdb.c:2832
+#: initdb.c:2895
#, c-format
msgid " -N, --nosync do not wait for changes to be written safely to disk\n"
msgstr ""
" -N, --nosync nicht warten, bis Änderungen sicher auf Festplatte\n"
" geschrieben sind\n"
-#: initdb.c:2833
+#: initdb.c:2896
#, c-format
msgid " -s, --show show internal settings\n"
msgstr " -s, --show zeige interne Einstellungen\n"
-#: initdb.c:2834
+#: initdb.c:2897
#, c-format
msgid " -S, --sync-only only sync data directory\n"
msgstr " -S, --sync-only nur Datenverzeichnis synchronisieren\n"
-#: initdb.c:2835
+#: initdb.c:2898
#, c-format
msgid ""
"\n"
@@ -684,17 +689,17 @@ msgstr ""
"\n"
"Weitere Optionen:\n"
-#: initdb.c:2836
+#: initdb.c:2899
#, c-format
msgid " -V, --version output version information, then exit\n"
msgstr " -V, --version Versionsinformationen anzeigen, dann beenden\n"
-#: initdb.c:2837
+#: initdb.c:2900
#, c-format
msgid " -?, --help show this help, then exit\n"
msgstr " -?, --help diese Hilfe anzeigen, dann beenden\n"
-#: initdb.c:2838
+#: initdb.c:2901
#, c-format
msgid ""
"\n"
@@ -705,7 +710,7 @@ msgstr ""
"Wenn kein Datenverzeichnis angegeben ist, dann wird die Umgebungsvariable\n"
"PGDATA verwendet.\n"
-#: initdb.c:2840
+#: initdb.c:2903
#, c-format
msgid ""
"\n"
@@ -714,7 +719,7 @@ msgstr ""
"\n"
"Berichten Sie Fehler an <pgsql-bugs@postgresql.org>.\n"
-#: initdb.c:2848
+#: initdb.c:2911
msgid ""
"\n"
"WARNING: enabling \"trust\" authentication for local connections\n"
@@ -727,27 +732,27 @@ msgstr ""
"nächsten Aufruf von initdb die Option -A, oder --auth-local und\n"
"--auth-host, verwenden.\n"
-#: initdb.c:2870
+#: initdb.c:2933
#, c-format
msgid "%s: invalid authentication method \"%s\" for \"%s\" connections\n"
msgstr "%s: ungültige Authentifizierungsmethode „%s“ für „%s“-Verbindungen\n"
-#: initdb.c:2884
+#: initdb.c:2947
#, c-format
msgid "%s: must specify a password for the superuser to enable %s authentication\n"
msgstr "%s: Superuser-Passwort muss angegeben werden um %s-Authentifizierung einzuschalten\n"
-#: initdb.c:2917
+#: initdb.c:2980
#, c-format
msgid "%s: could not re-execute with restricted token: error code %lu\n"
msgstr "%s: konnte Prozess nicht mit beschränktem Token neu starten: Fehlercode %lu\n"
-#: initdb.c:2932
+#: initdb.c:2995
#, c-format
msgid "%s: could not get exit code from subprocess: error code %lu\n"
msgstr "%s: konnte Statuscode des Subprozesses nicht ermitteln: Fehlercode %lu\n"
-#: initdb.c:2958
+#: initdb.c:3021
#, c-format
msgid ""
"%s: no data directory specified\n"
@@ -760,7 +765,7 @@ msgstr ""
"werden soll. Machen Sie dies entweder mit der Kommandozeilenoption -D\n"
"oder mit der Umgebungsvariable PGDATA.\n"
-#: initdb.c:2996
+#: initdb.c:3059
#, c-format
msgid ""
"The program \"postgres\" is needed by %s but was not found in the\n"
@@ -771,7 +776,7 @@ msgstr ""
"selben Verzeichnis wie „%s“ gefunden.\n"
"Prüfen Sie Ihre Installation.\n"
-#: initdb.c:3003
+#: initdb.c:3066
#, c-format
msgid ""
"The program \"postgres\" was found by \"%s\"\n"
@@ -782,17 +787,17 @@ msgstr ""
"aber es hatte nicht die gleiche Version wie %s.\n"
"Prüfen Sie Ihre Installation.\n"
-#: initdb.c:3022
+#: initdb.c:3085
#, c-format
msgid "%s: input file location must be an absolute path\n"
msgstr "%s: Eingabedatei muss absoluten Pfad haben\n"
-#: initdb.c:3041
+#: initdb.c:3104
#, c-format
msgid "The database cluster will be initialized with locale \"%s\".\n"
msgstr "Der Datenbankcluster wird mit der Locale „%s“ initialisiert werden.\n"
-#: initdb.c:3044
+#: initdb.c:3107
#, c-format
msgid ""
"The database cluster will be initialized with locales\n"
@@ -811,22 +816,22 @@ msgstr ""
" NUMERIC: %s\n"
" TIME: %s\n"
-#: initdb.c:3068
+#: initdb.c:3131
#, c-format
msgid "%s: could not find suitable encoding for locale \"%s\"\n"
msgstr "%s: konnte keine passende Kodierung für Locale „%s“ finden\n"
-#: initdb.c:3070
+#: initdb.c:3133
#, c-format
msgid "Rerun %s with the -E option.\n"
msgstr "Führen Sie %s erneut mit der Option -E aus.\n"
-#: initdb.c:3071 initdb.c:3647 initdb.c:3668
+#: initdb.c:3134 initdb.c:3710 initdb.c:3731
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "Versuchen Sie „%s --help“ für weitere Informationen.\n"
-#: initdb.c:3083
+#: initdb.c:3146
#, c-format
msgid ""
"Encoding \"%s\" implied by locale is not allowed as a server-side encoding.\n"
@@ -835,12 +840,12 @@ msgstr ""
"Die von der Locale gesetzte Kodierung „%s“ ist nicht als serverseitige Kodierung erlaubt.\n"
"Die Standarddatenbankkodierung wird stattdessen auf „%s“ gesetzt.\n"
-#: initdb.c:3091
+#: initdb.c:3154
#, c-format
msgid "%s: locale \"%s\" requires unsupported encoding \"%s\"\n"
msgstr "%s: Locale „%s“ benötigt nicht unterstützte Kodierung „%s“\n"
-#: initdb.c:3094
+#: initdb.c:3157
#, c-format
msgid ""
"Encoding \"%s\" is not allowed as a server-side encoding.\n"
@@ -849,52 +854,52 @@ msgstr ""
"Kodierung „%s“ ist nicht als serverseitige Kodierung erlaubt.\n"
"Starten Sie %s erneut mit einer anderen Locale-Wahl.\n"
-#: initdb.c:3103
+#: initdb.c:3166
#, c-format
msgid "The default database encoding has accordingly been set to \"%s\".\n"
msgstr "Die Standarddatenbankkodierung wurde entsprechend auf „%s“ gesetzt.\n"
-#: initdb.c:3174
+#: initdb.c:3237
#, c-format
msgid "%s: could not find suitable text search configuration for locale \"%s\"\n"
msgstr "%s: konnte keine passende Textsuchekonfiguration für Locale „%s“ finden\n"
-#: initdb.c:3185
+#: initdb.c:3248
#, c-format
msgid "%s: warning: suitable text search configuration for locale \"%s\" is unknown\n"
msgstr "%s: Warnung: passende Textsuchekonfiguration für Locale „%s“ ist unbekannt\n"
-#: initdb.c:3190
+#: initdb.c:3253
#, c-format
msgid "%s: warning: specified text search configuration \"%s\" might not match locale \"%s\"\n"
msgstr "%s: Warnung: angegebene Textsuchekonfiguration „%s“ passt möglicherweise nicht zur Locale „%s“\n"
-#: initdb.c:3195
+#: initdb.c:3258
#, c-format
msgid "The default text search configuration will be set to \"%s\".\n"
msgstr "Die Standardtextsuchekonfiguration wird auf „%s“ gesetzt.\n"
-#: initdb.c:3239 initdb.c:3317
+#: initdb.c:3302 initdb.c:3380
#, c-format
msgid "creating directory %s ... "
msgstr "erzeuge Verzeichnis %s ... "
-#: initdb.c:3253 initdb.c:3335
+#: initdb.c:3316 initdb.c:3398
#, c-format
msgid "fixing permissions on existing directory %s ... "
msgstr "berichtige Zugriffsrechte des bestehenden Verzeichnisses %s ... "
-#: initdb.c:3259 initdb.c:3341
+#: initdb.c:3322 initdb.c:3404
#, c-format
msgid "%s: could not change permissions of directory \"%s\": %s\n"
msgstr "%s: konnte Rechte des Verzeichnisses „%s“ nicht ändern: %s\n"
-#: initdb.c:3274 initdb.c:3356
+#: initdb.c:3337 initdb.c:3419
#, c-format
msgid "%s: directory \"%s\" exists but is not empty\n"
msgstr "%s: Verzeichnis „%s“ existiert aber ist nicht leer\n"
-#: initdb.c:3280
+#: initdb.c:3343
#, c-format
msgid ""
"If you want to create a new database system, either remove or empty\n"
@@ -905,17 +910,17 @@ msgstr ""
"Sie das Verzeichnis „%s“ or führen Sie %s\n"
"mit einem anderen Argument als „%s“ aus.\n"
-#: initdb.c:3288 initdb.c:3369
+#: initdb.c:3351 initdb.c:3432
#, c-format
msgid "%s: could not access directory \"%s\": %s\n"
msgstr "%s: konnte nicht auf Verzeichnis „%s“ zugreifen: %s\n"
-#: initdb.c:3308
+#: initdb.c:3371
#, c-format
msgid "%s: transaction log directory location must be an absolute path\n"
msgstr "%s: Transaktionslogverzeichnis muss absoluten Pfad haben\n"
-#: initdb.c:3362
+#: initdb.c:3425
#, c-format
msgid ""
"If you want to store the transaction log there, either\n"
@@ -924,27 +929,27 @@ msgstr ""
"Wenn Sie dort den Transaktionslog ablegen wollen, entfernen oder leeren\n"
"Sie das Verzeichnis „%s“.\n"
-#: initdb.c:3380
+#: initdb.c:3443
#, c-format
msgid "%s: could not create symbolic link \"%s\": %s\n"
msgstr "%s: konnte symbolische Verknüpfung „%s“ nicht erzeugen: %s\n"
-#: initdb.c:3385
+#: initdb.c:3448
#, c-format
msgid "%s: symlinks are not supported on this platform"
msgstr "%s: symbolische Verknüpfungen werden auf dieser Plattform nicht unterstützt"
-#: initdb.c:3398
+#: initdb.c:3461
#, c-format
msgid "It contains a dot-prefixed/invisible file, perhaps due to it being a mount point.\n"
msgstr "Es enthält eine unsichtbare Datei (beginnt mit Punkt), vielleicht weil es ein Einhängepunkt ist.\n"
-#: initdb.c:3401
+#: initdb.c:3464
#, c-format
msgid "It contains a lost+found directory, perhaps due to it being a mount point.\n"
msgstr "Es enthält ein Verzeichnis „lost+found“, vielleicht weil es ein Einhängepunkt ist.\n"
-#: initdb.c:3404
+#: initdb.c:3467
#, c-format
msgid ""
"Using a mount point directly as the data directory is not recommended.\n"
@@ -953,32 +958,32 @@ msgstr ""
"Einen Einhängepunkt direkt als Datenverzeichnis zu verwenden wird nicht empfohlen.\n"
"Erzeugen Sie ein Unterverzeichnis unter dem Einhängepunkt.\n"
-#: initdb.c:3423
+#: initdb.c:3486
#, c-format
msgid "creating subdirectories ... "
msgstr "erzeuge Unterverzeichnisse ... "
-#: initdb.c:3591
+#: initdb.c:3654
#, c-format
msgid "Running in debug mode.\n"
msgstr "Debug-Modus ist an.\n"
-#: initdb.c:3595
+#: initdb.c:3658
#, c-format
msgid "Running in noclean mode. Mistakes will not be cleaned up.\n"
msgstr "Noclean-Modus ist an. Bei Fehlern wird nicht aufgeräumt.\n"
-#: initdb.c:3666
+#: initdb.c:3729
#, c-format
msgid "%s: too many command-line arguments (first is \"%s\")\n"
msgstr "%s: zu viele Kommandozeilenargumente (das erste ist „%s“)\n"
-#: initdb.c:3683
+#: initdb.c:3746
#, c-format
msgid "%s: password prompt and password file cannot be specified together\n"
msgstr "%s: Passwortprompt und Passwortdatei können nicht zusammen angegeben werden\n"
-#: initdb.c:3705
+#: initdb.c:3768
#, c-format
msgid ""
"The files belonging to this database system will be owned by user \"%s\".\n"
@@ -989,17 +994,17 @@ msgstr ""
"„%s“ gehören. Diesem Benutzer muss auch der Serverprozess gehören.\n"
"\n"
-#: initdb.c:3721
+#: initdb.c:3784
#, c-format
msgid "Data page checksums are enabled.\n"
msgstr "Datenseitenprüfsummen sind eingeschaltet.\n"
-#: initdb.c:3723
+#: initdb.c:3786
#, c-format
msgid "Data page checksums are disabled.\n"
msgstr "Datenseitenprüfsummen sind ausgeschaltet.\n"
-#: initdb.c:3732
+#: initdb.c:3795
#, c-format
msgid ""
"\n"
@@ -1010,7 +1015,7 @@ msgstr ""
"Synchronisation auf Festplatte übersprungen.\n"
"Das Datenverzeichnis könnte verfälscht werden, falls das Betriebssystem abstürzt.\n"
-#: initdb.c:3741
+#: initdb.c:3804
#, c-format
msgid ""
"\n"
diff --git a/src/bin/initdb/po/fr.po b/src/bin/initdb/po/fr.po
index a7849e0d070..d77137ba1b2 100644
--- a/src/bin/initdb/po/fr.po
+++ b/src/bin/initdb/po/fr.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: PostgreSQL 8.4\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2014-05-17 11:12+0000\n"
-"PO-Revision-Date: 2014-05-17 15:24+0100\n"
+"POT-Creation-Date: 2014-12-05 13:12+0000\n"
+"PO-Revision-Date: 2014-12-05 18:36+0100\n"
"Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
"Language-Team: PostgreSQLfr <pgsql-fr-generale@postgresql.org>\n"
"Language: fr\n"
@@ -77,7 +77,6 @@ msgstr "n'a pas pu lire le rpertoire %s : %s\n"
#: ../../common/pgfnames.c:84
#, c-format
-#| msgid "could not open directory \"%s\": %s\n"
msgid "could not close directory \"%s\": %s\n"
msgstr "n'a pas pu fermer le rpertoire %s : %s\n"
@@ -93,6 +92,20 @@ msgstr ""
msgid "could not remove file or directory \"%s\": %s\n"
msgstr "n'a pas pu supprimer le fichier ou rpertoire %s : %s\n"
+#: ../../common/username.c:45
+#, c-format
+msgid "could not look up effective user ID %ld: %s"
+msgstr "n'a pas pu trouver l'identifiant rel %ld de l'utilisateur : %s"
+
+#: ../../common/username.c:47
+msgid "user does not exist"
+msgstr "l'utilisateur n'existe pas"
+
+#: ../../common/username.c:61
+#, c-format
+msgid "user name lookup failure: %s"
+msgstr "chec de la recherche du nom d'utilisateur : %s"
+
#: ../../common/wait_error.c:47
#, c-format
msgid "command not executable"
@@ -138,116 +151,115 @@ msgstr "n'a pas pu configurer la jonction pour %s : %s\n"
msgid "could not get junction for \"%s\": %s\n"
msgstr "n'a pas pu obtenir la jonction pour %s : %s\n"
-#: initdb.c:335
+#: initdb.c:337
#, c-format
msgid "%s: out of memory\n"
msgstr "%s : mmoire puise\n"
-#: initdb.c:445 initdb.c:1602
+#: initdb.c:447 initdb.c:1653
#, c-format
msgid "%s: could not open file \"%s\" for reading: %s\n"
msgstr "%s : n'a pas pu ouvrir le fichier %s en lecture : %s\n"
-#: initdb.c:501 initdb.c:1004 initdb.c:1032
+#: initdb.c:503 initdb.c:1055 initdb.c:1083
#, c-format
msgid "%s: could not open file \"%s\" for writing: %s\n"
msgstr "%s : n'a pas pu ouvrir le fichier %s en criture : %s\n"
-#: initdb.c:509 initdb.c:517 initdb.c:1011 initdb.c:1038
+#: initdb.c:511 initdb.c:519 initdb.c:1062 initdb.c:1089
#, c-format
msgid "%s: could not write file \"%s\": %s\n"
msgstr "%s : n'a pas pu crire le fichier %s : %s\n"
-#: initdb.c:539
+#: initdb.c:541 initdb.c:608
#, c-format
msgid "%s: could not open directory \"%s\": %s\n"
msgstr "%s : n'a pas pu ouvrir le rpertoire %s : %s\n"
-#: initdb.c:556
+#: initdb.c:558
#, c-format
msgid "%s: could not stat file \"%s\": %s\n"
msgstr ""
"%s : n'a pas pu rcuprer les informations sur le fichier %s : %s\n"
-#: initdb.c:569
+#: initdb.c:571 initdb.c:628
#, c-format
msgid "%s: could not read directory \"%s\": %s\n"
msgstr "%s : n'a pas pu lire le rpertoire %s : %s\n"
-#: initdb.c:576
+#: initdb.c:578 initdb.c:635
#, c-format
-#| msgid "%s: could not open directory \"%s\": %s\n"
msgid "%s: could not close directory \"%s\": %s\n"
msgstr "%s : n'a pas pu fermer le rpertoire %s : %s\n"
-#: initdb.c:611 initdb.c:663
+#: initdb.c:662 initdb.c:714
#, c-format
msgid "%s: could not open file \"%s\": %s\n"
msgstr "%s : n'a pas pu ouvrir le fichier %s : %s\n"
-#: initdb.c:679
+#: initdb.c:730
#, c-format
msgid "%s: could not fsync file \"%s\": %s\n"
msgstr "%s : n'a pas pu synchroniser sur disque le fichier %s : %s\n"
-#: initdb.c:700
+#: initdb.c:751
#, c-format
msgid "%s: could not execute command \"%s\": %s\n"
msgstr "%s : n'a pas pu excuter la commande %s : %s\n"
-#: initdb.c:716
+#: initdb.c:767
#, c-format
msgid "%s: removing data directory \"%s\"\n"
msgstr "%s : suppression du rpertoire des donnes %s \n"
-#: initdb.c:719
+#: initdb.c:770
#, c-format
msgid "%s: failed to remove data directory\n"
msgstr "%s : chec de la suppression du rpertoire des donnes\n"
-#: initdb.c:725
+#: initdb.c:776
#, c-format
msgid "%s: removing contents of data directory \"%s\"\n"
msgstr "%s : suppression du contenu du rpertoire des donnes %s \n"
-#: initdb.c:728
+#: initdb.c:779
#, c-format
msgid "%s: failed to remove contents of data directory\n"
msgstr "%s : chec de la suppression du contenu du rpertoire des donnes\n"
-#: initdb.c:734
+#: initdb.c:785
#, c-format
msgid "%s: removing transaction log directory \"%s\"\n"
msgstr "%s : suppression du rpertoire des journaux de transaction %s \n"
-#: initdb.c:737
+#: initdb.c:788
#, c-format
msgid "%s: failed to remove transaction log directory\n"
msgstr ""
"%s : chec de la suppression du rpertoire des journaux de transaction\n"
-#: initdb.c:743
+#: initdb.c:794
#, c-format
msgid "%s: removing contents of transaction log directory \"%s\"\n"
msgstr ""
"%s : suppression du contenu du rpertoire des journaux de transaction %s "
"\n"
-#: initdb.c:746
+#: initdb.c:797
#, c-format
msgid "%s: failed to remove contents of transaction log directory\n"
msgstr ""
"%s : chec de la suppression du contenu du rpertoire des journaux de "
"transaction\n"
-#: initdb.c:755
+#: initdb.c:806
#, c-format
msgid "%s: data directory \"%s\" not removed at user's request\n"
msgstr ""
"%s : rpertoire des donnes %s non supprim la demande de "
"l'utilisateur\n"
-#: initdb.c:760
+#: initdb.c:811
#, c-format
msgid "%s: transaction log directory \"%s\" not removed at user's request\n"
msgstr ""
@@ -255,7 +267,7 @@ msgstr ""
"demande\n"
"de l'utilisateur\n"
-#: initdb.c:781
+#: initdb.c:832
#, c-format
msgid ""
"%s: cannot be run as root\n"
@@ -266,22 +278,22 @@ msgstr ""
"Connectez-vous (par exemple en utilisant su ) sous l'utilisateur (non\n"
" privilgi) qui sera propritaire du processus serveur.\n"
-#: initdb.c:817
+#: initdb.c:868
#, c-format
msgid "%s: \"%s\" is not a valid server encoding name\n"
msgstr "%s : %s n'est pas un nom d'encodage serveur valide\n"
-#: initdb.c:931 initdb.c:3323
+#: initdb.c:982 initdb.c:3386
#, c-format
msgid "%s: could not create directory \"%s\": %s\n"
msgstr "%s : n'a pas pu crer le rpertoire %s : %s\n"
-#: initdb.c:960
+#: initdb.c:1011
#, c-format
msgid "%s: file \"%s\" does not exist\n"
msgstr "%s : le fichier %s n'existe pas\n"
-#: initdb.c:962 initdb.c:971 initdb.c:981
+#: initdb.c:1013 initdb.c:1022 initdb.c:1032
#, c-format
msgid ""
"This might mean you have a corrupted installation or identified\n"
@@ -290,47 +302,46 @@ msgstr ""
"Cela peut signifier que votre installation est corrompue ou que vous avez\n"
"identifi le mauvais rpertoire avec l'option -L.\n"
-#: initdb.c:968
+#: initdb.c:1019
#, c-format
msgid "%s: could not access file \"%s\": %s\n"
msgstr "%s : n'a pas pu accder au fichier %s : %s\n"
-#: initdb.c:979
+#: initdb.c:1030
#, c-format
msgid "%s: file \"%s\" is not a regular file\n"
msgstr "%s : %s n'est pas un fichier\n"
-#: initdb.c:1124
+#: initdb.c:1175
#, c-format
msgid "selecting default max_connections ... "
msgstr "slection de la valeur par dfaut de max_connections... "
-#: initdb.c:1154
+#: initdb.c:1205
#, c-format
msgid "selecting default shared_buffers ... "
msgstr "slection de la valeur par dfaut pour shared_buffers... "
-#: initdb.c:1187
+#: initdb.c:1238
#, c-format
msgid "selecting dynamic shared memory implementation ... "
msgstr "slection de l'implmentation de la mmoire partage dynamique..."
-#: initdb.c:1205
+#: initdb.c:1256
msgid "creating configuration files ... "
msgstr "cration des fichiers de configuration... "
-#: initdb.c:1296 initdb.c:1316 initdb.c:1400 initdb.c:1416
+#: initdb.c:1347 initdb.c:1367 initdb.c:1451 initdb.c:1467
#, c-format
-#| msgid "%s: could not change permissions of directory \"%s\": %s\n"
msgid "%s: could not change permissions of \"%s\": %s\n"
msgstr "%s : n'a pas pu modifier les droits de %s : %s\n"
-#: initdb.c:1440
+#: initdb.c:1491
#, c-format
msgid "creating template1 database in %s/base/1 ... "
msgstr "cration de la base de donnes template1 dans %s/base/1... "
-#: initdb.c:1456
+#: initdb.c:1507
#, c-format
msgid ""
"%s: input file \"%s\" does not belong to PostgreSQL %s\n"
@@ -339,143 +350,148 @@ msgstr ""
"%s : le fichier %s n'appartient pas PostgreSQL %s\n"
"Vrifiez votre installation ou indiquez le bon chemin avec l'option -L.\n"
-#: initdb.c:1543
+#: initdb.c:1594
msgid "initializing pg_authid ... "
msgstr "initialisation de pg_authid... "
-#: initdb.c:1577
+#: initdb.c:1628
msgid "Enter new superuser password: "
msgstr "Saisissez le nouveau mot de passe du super-utilisateur : "
-#: initdb.c:1578
+#: initdb.c:1629
msgid "Enter it again: "
msgstr "Saisissez-le nouveau : "
-#: initdb.c:1581
+#: initdb.c:1632
#, c-format
msgid "Passwords didn't match.\n"
msgstr "Les mots de passe ne sont pas identiques.\n"
-#: initdb.c:1608
+#: initdb.c:1660
#, c-format
msgid "%s: could not read password from file \"%s\": %s\n"
msgstr "%s : n'a pas pu lire le mot de passe partir du fichier %s : %s\n"
-#: initdb.c:1621
+#: initdb.c:1663
+#, c-format
+#| msgid "%s: the PID file \"%s\" is empty\n"
+msgid "%s: password file \"%s\" is empty\n"
+msgstr "%s : le fichier de mots de passe %s est vide\n"
+
+#: initdb.c:1676
#, c-format
msgid "setting password ... "
msgstr "initialisation du mot de passe... "
-#: initdb.c:1721
+#: initdb.c:1776
msgid "initializing dependencies ... "
msgstr "initialisation des dpendances... "
-#: initdb.c:1749
+#: initdb.c:1804
msgid "creating system views ... "
msgstr "cration des vues systme... "
-#: initdb.c:1785
+#: initdb.c:1840
msgid "loading system objects' descriptions ... "
msgstr "chargement de la description des objets systme... "
-#: initdb.c:1891
+#: initdb.c:1946
msgid "creating collations ... "
msgstr "cration des collationnements... "
-#: initdb.c:1924
+#: initdb.c:1979
#, c-format
msgid "%s: locale name too long, skipped: \"%s\"\n"
msgstr "%s : nom de locale trop long, ignor : %s \n"
-#: initdb.c:1949
+#: initdb.c:2004
#, c-format
msgid "%s: locale name has non-ASCII characters, skipped: \"%s\"\n"
msgstr ""
"%s : le nom de la locale contient des caractres non ASCII, ignor : %s \n"
-#: initdb.c:2018
+#: initdb.c:2073
#, c-format
msgid "No usable system locales were found.\n"
msgstr "Aucune locale systme utilisable n'a t trouve.\n"
-#: initdb.c:2019
+#: initdb.c:2074
#, c-format
msgid "Use the option \"--debug\" to see details.\n"
msgstr "Utilisez l'option --debug pour voir le dtail.\n"
-#: initdb.c:2022
+#: initdb.c:2077
#, c-format
msgid "not supported on this platform\n"
msgstr "non support sur cette plateforme\n"
-#: initdb.c:2037
+#: initdb.c:2092
msgid "creating conversions ... "
msgstr "cration des conversions... "
-#: initdb.c:2072
+#: initdb.c:2127
msgid "creating dictionaries ... "
msgstr "cration des dictionnaires... "
-#: initdb.c:2126
+#: initdb.c:2181
msgid "setting privileges on built-in objects ... "
msgstr "initialisation des droits sur les objets internes... "
-#: initdb.c:2184
+#: initdb.c:2239
msgid "creating information schema ... "
msgstr "cration du schma d'informations... "
-#: initdb.c:2240
+#: initdb.c:2295
msgid "loading PL/pgSQL server-side language ... "
msgstr "chargement du langage PL/pgSQL... "
-#: initdb.c:2265
+#: initdb.c:2320
msgid "vacuuming database template1 ... "
msgstr "lancement du vacuum sur la base de donnes template1... "
-#: initdb.c:2321
+#: initdb.c:2376
msgid "copying template1 to template0 ... "
msgstr "copie de template1 vers template0... "
-#: initdb.c:2353
+#: initdb.c:2408
msgid "copying template1 to postgres ... "
msgstr "copie de template1 vers postgres... "
-#: initdb.c:2379
+#: initdb.c:2435
msgid "syncing data to disk ... "
msgstr "synchronisation des donnes sur disque"
-#: initdb.c:2451
+#: initdb.c:2514
#, c-format
msgid "caught signal\n"
msgstr "signal reu\n"
-#: initdb.c:2457
+#: initdb.c:2520
#, c-format
msgid "could not write to child process: %s\n"
msgstr "n'a pas pu crire au processus fils : %s\n"
-#: initdb.c:2465
+#: initdb.c:2528
#, c-format
msgid "ok\n"
msgstr "ok\n"
-#: initdb.c:2555
+#: initdb.c:2618
#, c-format
-#| msgid "%s: select() failed: %s\n"
-msgid "%s: setlocale failed\n"
+msgid "%s: setlocale() failed\n"
msgstr "%s : chec de setlocale\n"
-#: initdb.c:2573
+#: initdb.c:2636
#, c-format
msgid "%s: failed to restore old locale \"%s\"\n"
msgstr "%s : n'a pas pu restaurer l'ancienne locale %s \n"
-#: initdb.c:2583
+#: initdb.c:2646
#, c-format
msgid "%s: invalid locale name \"%s\"\n"
msgstr "%s : nom de locale invalide ( %s )\n"
-#: initdb.c:2595
+#: initdb.c:2658
#, c-format
msgid ""
"%s: invalid locale settings; check LANG and LC_* environment variables\n"
@@ -483,12 +499,12 @@ msgstr ""
"%s : configuration invalide de la locale ; vrifiez les variables "
"d'environnement LANG et LC_*\n"
-#: initdb.c:2623
+#: initdb.c:2686
#, c-format
msgid "%s: encoding mismatch\n"
msgstr "%s : diffrence d'encodage\n"
-#: initdb.c:2625
+#: initdb.c:2688
#, c-format
msgid ""
"The encoding you selected (%s) and the encoding that the\n"
@@ -503,36 +519,36 @@ msgstr ""
"R-excutez %s sans prciser d'encodage, ou en choisissant une combinaison\n"
"compatible.\n"
-#: initdb.c:2730
+#: initdb.c:2793
#, c-format
msgid "%s: WARNING: cannot create restricted tokens on this platform\n"
msgstr ""
"%s : ATTENTION : ne peut pas crr les jetons restreints sur cette "
"plateforme\n"
-#: initdb.c:2739
+#: initdb.c:2802
#, c-format
msgid "%s: could not open process token: error code %lu\n"
msgstr "%s : n'a pas pu ouvrir le jeton du processus : code d'erreur %lu\n"
-#: initdb.c:2752
+#: initdb.c:2815
#, c-format
msgid "%s: could not to allocate SIDs: error code %lu\n"
msgstr "%s : n'a pas pu allouer les SID : code d'erreur %lu\n"
-#: initdb.c:2771
+#: initdb.c:2834
#, c-format
msgid "%s: could not create restricted token: error code %lu\n"
msgstr "%s : n'a pas pu crer le jeton restreint : code d'erreur %lu\n"
-#: initdb.c:2792
+#: initdb.c:2855
#, c-format
msgid "%s: could not start process for command \"%s\": error code %lu\n"
msgstr ""
"%s : n'a pas pu dmarrer le processus pour la commande %s : code "
"d'erreur %lu\n"
-#: initdb.c:2806
+#: initdb.c:2869
#, c-format
msgid ""
"%s initializes a PostgreSQL database cluster.\n"
@@ -541,17 +557,17 @@ msgstr ""
"%s initialise un cluster PostgreSQL.\n"
"\n"
-#: initdb.c:2807
+#: initdb.c:2870
#, c-format
msgid "Usage:\n"
msgstr "Usage :\n"
-#: initdb.c:2808
+#: initdb.c:2871
#, c-format
msgid " %s [OPTION]... [DATADIR]\n"
msgstr " %s [OPTION]... [RP_DONNES]\n"
-#: initdb.c:2809
+#: initdb.c:2872
#, c-format
msgid ""
"\n"
@@ -560,7 +576,7 @@ msgstr ""
"\n"
"Options :\n"
-#: initdb.c:2810
+#: initdb.c:2873
#, c-format
msgid ""
" -A, --auth=METHOD default authentication method for local "
@@ -569,7 +585,7 @@ msgstr ""
" -A, --auth=MTHODE mthode d'authentification par dfaut pour les\n"
" connexions locales\n"
-#: initdb.c:2811
+#: initdb.c:2874
#, c-format
msgid ""
" --auth-host=METHOD default authentication method for local TCP/IP "
@@ -578,7 +594,7 @@ msgstr ""
" --auth-host=MTHODE mthode d'authentification par dfaut pour les\n"
" connexions locales TCP/IP\n"
-#: initdb.c:2812
+#: initdb.c:2875
#, c-format
msgid ""
" --auth-local=METHOD default authentication method for local-socket "
@@ -587,26 +603,26 @@ msgstr ""
" --auth-local=MTHODE mthode d'authentification par dfaut pour les\n"
" connexions locales socket\n"
-#: initdb.c:2813
+#: initdb.c:2876
#, c-format
msgid " [-D, --pgdata=]DATADIR location for this database cluster\n"
msgstr " [-D, --pgdata=]RP_DONNES emplacement du cluster\n"
-#: initdb.c:2814
+#: initdb.c:2877
#, c-format
msgid " -E, --encoding=ENCODING set default encoding for new databases\n"
msgstr ""
" -E, --encoding=ENCODAGE initialise l'encodage par dfaut des nouvelles\n"
" bases de donnes\n"
-#: initdb.c:2815
+#: initdb.c:2878
#, c-format
msgid " --locale=LOCALE set default locale for new databases\n"
msgstr ""
" --locale=LOCALE initialise la locale par dfaut pour les\n"
" nouvelles bases de donnes\n"
-#: initdb.c:2816
+#: initdb.c:2879
#, c-format
msgid ""
" --lc-collate=, --lc-ctype=, --lc-messages=LOCALE\n"
@@ -622,12 +638,12 @@ msgstr ""
" de donnes (les valeurs par dfaut sont prises\n"
" dans l'environnement)\n"
-#: initdb.c:2820
+#: initdb.c:2883
#, c-format
msgid " --no-locale equivalent to --locale=C\n"
msgstr " --no-locale quivalent --locale=C\n"
-#: initdb.c:2821
+#: initdb.c:2884
#, c-format
msgid ""
" --pwfile=FILE read password for the new superuser from file\n"
@@ -635,7 +651,7 @@ msgstr ""
" --pwfile=NOMFICHIER lit le mot de passe du nouveau\n"
" super-utilisateur partir de ce fichier\n"
-#: initdb.c:2822
+#: initdb.c:2885
#, c-format
msgid ""
" -T, --text-search-config=CFG\n"
@@ -645,13 +661,13 @@ msgstr ""
" configuration par dfaut de la recherche plein\n"
" texte\n"
-#: initdb.c:2824
+#: initdb.c:2887
#, c-format
msgid " -U, --username=NAME database superuser name\n"
msgstr ""
" -U, --username=NOM nom du super-utilisateur de la base de donnes\n"
-#: initdb.c:2825
+#: initdb.c:2888
#, c-format
msgid ""
" -W, --pwprompt prompt for a password for the new superuser\n"
@@ -659,14 +675,14 @@ msgstr ""
" -W, --pwprompt demande un mot de passe pour le nouveau\n"
" super-utilisateur\n"
-#: initdb.c:2826
+#: initdb.c:2889
#, c-format
msgid ""
" -X, --xlogdir=XLOGDIR location for the transaction log directory\n"
msgstr ""
" -X, --xlogdir=RP_XLOG emplacement du rpertoire des transactions\n"
-#: initdb.c:2827
+#: initdb.c:2890
#, c-format
msgid ""
"\n"
@@ -675,32 +691,32 @@ msgstr ""
"\n"
"Options moins utilises :\n"
-#: initdb.c:2828
+#: initdb.c:2891
#, c-format
msgid " -d, --debug generate lots of debugging output\n"
msgstr ""
" -d, --debug engendre un grand nombre de traces de dbogage\n"
-#: initdb.c:2829
+#: initdb.c:2892
#, c-format
msgid " -k, --data-checksums use data page checksums\n"
msgstr ""
" -k, --data-checksums utilise les sommes de contrles pour les pages de "
"donnes\n"
-#: initdb.c:2830
+#: initdb.c:2893
#, c-format
msgid " -L DIRECTORY where to find the input files\n"
msgstr ""
" -L RPERTOIRE indique o trouver les fichiers servant la\n"
" cration du cluster\n"
-#: initdb.c:2831
+#: initdb.c:2894
#, c-format
msgid " -n, --noclean do not clean up after errors\n"
msgstr " -n, --noclean ne nettoie pas en cas d'erreur\n"
-#: initdb.c:2832
+#: initdb.c:2895
#, c-format
msgid ""
" -N, --nosync do not wait for changes to be written safely to "
@@ -709,18 +725,18 @@ msgstr ""
" -N, --nosync n'attend pas que les modifications sont proprement "
"crites sur disque\n"
-#: initdb.c:2833
+#: initdb.c:2896
#, c-format
msgid " -s, --show show internal settings\n"
msgstr " -s, --show affiche la configuration interne\n"
-#: initdb.c:2834
+#: initdb.c:2897
#, c-format
msgid " -S, --sync-only only sync data directory\n"
msgstr ""
" -S, --sync-only synchronise uniquement le rpertoire des donnes\n"
-#: initdb.c:2835
+#: initdb.c:2898
#, c-format
msgid ""
"\n"
@@ -729,17 +745,17 @@ msgstr ""
"\n"
"Autres options :\n"
-#: initdb.c:2836
+#: initdb.c:2899
#, c-format
msgid " -V, --version output version information, then exit\n"
msgstr " -V, --version affiche la version puis quitte\n"
-#: initdb.c:2837
+#: initdb.c:2900
#, c-format
msgid " -?, --help show this help, then exit\n"
msgstr " -?, --help affiche cette aide puis quitte\n"
-#: initdb.c:2838
+#: initdb.c:2901
#, c-format
msgid ""
"\n"
@@ -750,7 +766,7 @@ msgstr ""
"Si le rpertoire des donnes n'est pas indiqu, la variable d'environnement\n"
"PGDATA est utilise.\n"
-#: initdb.c:2840
+#: initdb.c:2903
#, c-format
msgid ""
"\n"
@@ -759,7 +775,7 @@ msgstr ""
"\n"
"Rapporter les bogues <pgsql-bugs@postgresql.org>.\n"
-#: initdb.c:2848
+#: initdb.c:2911
msgid ""
"\n"
"WARNING: enabling \"trust\" authentication for local connections\n"
@@ -773,12 +789,12 @@ msgstr ""
"ou en utilisant l'option -A, ou --auth-local et --auth-host au prochain\n"
"lancement d'initdb.\n"
-#: initdb.c:2870
+#: initdb.c:2933
#, c-format
msgid "%s: invalid authentication method \"%s\" for \"%s\" connections\n"
msgstr "%s : mthode d'authentification %s invalide pour %s \n"
-#: initdb.c:2884
+#: initdb.c:2947
#, c-format
msgid ""
"%s: must specify a password for the superuser to enable %s authentication\n"
@@ -786,19 +802,19 @@ msgstr ""
"%s : vous devez indiquer un mot de passe pour le super-utilisateur pour\n"
"activer l'authentification %s\n"
-#: initdb.c:2917
+#: initdb.c:2980
#, c-format
msgid "%s: could not re-execute with restricted token: error code %lu\n"
msgstr "%s : n'a pas pu r-excuter le jeton restreint : code d'erreur %lu\n"
-#: initdb.c:2932
+#: initdb.c:2995
#, c-format
msgid "%s: could not get exit code from subprocess: error code %lu\n"
msgstr ""
"%s : n'a pas pu rcuprer le code de statut du sous-processus : code "
"d'erreur %lu\n"
-#: initdb.c:2958
+#: initdb.c:3021
#, c-format
msgid ""
"%s: no data directory specified\n"
@@ -811,7 +827,7 @@ msgstr ""
"systme de bases de donnes. Faites-le soit avec l'option -D soit en\n"
"initialisant la variable d'environnement PGDATA.\n"
-#: initdb.c:2996
+#: initdb.c:3059
#, c-format
msgid ""
"The program \"postgres\" is needed by %s but was not found in the\n"
@@ -822,7 +838,7 @@ msgstr ""
"le mme rpertoire que %s .\n"
"Vrifiez votre installation.\n"
-#: initdb.c:3003
+#: initdb.c:3066
#, c-format
msgid ""
"The program \"postgres\" was found by \"%s\"\n"
@@ -833,19 +849,19 @@ msgstr ""
"version que %s .\n"
"Vrifiez votre installation.\n"
-#: initdb.c:3022
+#: initdb.c:3085
#, c-format
msgid "%s: input file location must be an absolute path\n"
msgstr ""
"%s : l'emplacement du fichier d'entres doit tre indiqu avec un chemin\n"
"absolu\n"
-#: initdb.c:3041
+#: initdb.c:3104
#, c-format
msgid "The database cluster will be initialized with locale \"%s\".\n"
msgstr "L'instance sera initialise avec la locale %s .\n"
-#: initdb.c:3044
+#: initdb.c:3107
#, c-format
msgid ""
"The database cluster will be initialized with locales\n"
@@ -864,22 +880,22 @@ msgstr ""
" NUMERIC: %s\n"
" TIME: %s\n"
-#: initdb.c:3068
+#: initdb.c:3131
#, c-format
msgid "%s: could not find suitable encoding for locale \"%s\"\n"
msgstr "%s : n'a pas pu trouver un encodage adquat pour la locale %s \n"
-#: initdb.c:3070
+#: initdb.c:3133
#, c-format
msgid "Rerun %s with the -E option.\n"
msgstr "Relancez %s avec l'option -E.\n"
-#: initdb.c:3071 initdb.c:3647 initdb.c:3668
+#: initdb.c:3134 initdb.c:3710 initdb.c:3731
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "Essayer %s --help pour plus d'informations.\n"
-#: initdb.c:3083
+#: initdb.c:3146
#, c-format
msgid ""
"Encoding \"%s\" implied by locale is not allowed as a server-side encoding.\n"
@@ -889,12 +905,12 @@ msgstr ""
"serveur.\n"
"L'encodage par dfaut des bases de donnes sera configur %s .\n"
-#: initdb.c:3091
+#: initdb.c:3154
#, c-format
msgid "%s: locale \"%s\" requires unsupported encoding \"%s\"\n"
msgstr "%s : la locale %s ncessite l'encodage %s non support\n"
-#: initdb.c:3094
+#: initdb.c:3157
#, c-format
msgid ""
"Encoding \"%s\" is not allowed as a server-side encoding.\n"
@@ -903,14 +919,14 @@ msgstr ""
"L'encodage %s n'est pas autoris en tant qu'encodage serveur.\n"
"R-excuter %s avec une locale diffrente.\n"
-#: initdb.c:3103
+#: initdb.c:3166
#, c-format
msgid "The default database encoding has accordingly been set to \"%s\".\n"
msgstr ""
"L'encodage par dfaut des bases de donnes a t configur en consquence\n"
"avec %s .\n"
-#: initdb.c:3174
+#: initdb.c:3237
#, c-format
msgid ""
"%s: could not find suitable text search configuration for locale \"%s\"\n"
@@ -918,7 +934,7 @@ msgstr ""
"%s : n'a pas pu trouver la configuration de la recherche plein texte en\n"
" adquation avec la locale %s \n"
-#: initdb.c:3185
+#: initdb.c:3248
#, c-format
msgid ""
"%s: warning: suitable text search configuration for locale \"%s\" is "
@@ -927,7 +943,7 @@ msgstr ""
"%s : attention : pas de configuration de la recherche plein texte connue\n"
"pour la locale %s \n"
-#: initdb.c:3190
+#: initdb.c:3253
#, c-format
msgid ""
"%s: warning: specified text search configuration \"%s\" might not match "
@@ -936,33 +952,33 @@ msgstr ""
"%s : attention : la configuration indique pour la recherche plein texte,\n"
" %s , pourrait ne pas correspondre la locale %s \n"
-#: initdb.c:3195
+#: initdb.c:3258
#, c-format
msgid "The default text search configuration will be set to \"%s\".\n"
msgstr ""
"La configuration de la recherche plein texte a t initialise %s .\n"
-#: initdb.c:3239 initdb.c:3317
+#: initdb.c:3302 initdb.c:3380
#, c-format
msgid "creating directory %s ... "
msgstr "cration du rpertoire %s... "
-#: initdb.c:3253 initdb.c:3335
+#: initdb.c:3316 initdb.c:3398
#, c-format
msgid "fixing permissions on existing directory %s ... "
msgstr "correction des droits sur le rpertoire existant %s... "
-#: initdb.c:3259 initdb.c:3341
+#: initdb.c:3322 initdb.c:3404
#, c-format
msgid "%s: could not change permissions of directory \"%s\": %s\n"
msgstr "%s : n'a pas pu modifier les droits du rpertoire %s : %s\n"
-#: initdb.c:3274 initdb.c:3356
+#: initdb.c:3337 initdb.c:3419
#, c-format
msgid "%s: directory \"%s\" exists but is not empty\n"
msgstr "%s : le rpertoire %s existe mais n'est pas vide\n"
-#: initdb.c:3280
+#: initdb.c:3343
#, c-format
msgid ""
"If you want to create a new database system, either remove or empty\n"
@@ -973,19 +989,19 @@ msgstr ""
"videz le rpertoire %s .\n"
"Vous pouvez aussi excuter %s avec un argument autre que %s .\n"
-#: initdb.c:3288 initdb.c:3369
+#: initdb.c:3351 initdb.c:3432
#, c-format
msgid "%s: could not access directory \"%s\": %s\n"
msgstr "%s : n'a pas pu accder au rpertoire %s : %s\n"
-#: initdb.c:3308
+#: initdb.c:3371
#, c-format
msgid "%s: transaction log directory location must be an absolute path\n"
msgstr ""
"%s : l'emplacement du rpertoire des journaux de transactions doit tre\n"
"indiqu avec un chemin absolu\n"
-#: initdb.c:3362
+#: initdb.c:3425
#, c-format
msgid ""
"If you want to store the transaction log there, either\n"
@@ -994,17 +1010,17 @@ msgstr ""
"Si vous voulez enregistrer ici le journal des transactions, supprimez ou\n"
"videz le rpertoire %s .\n"
-#: initdb.c:3380
+#: initdb.c:3443
#, c-format
msgid "%s: could not create symbolic link \"%s\": %s\n"
msgstr "%s : n'a pas pu crer le lien symbolique %s : %s\n"
-#: initdb.c:3385
+#: initdb.c:3448
#, c-format
msgid "%s: symlinks are not supported on this platform"
msgstr "%s : les liens symboliques ne sont pas supports sur cette plateforme"
-#: initdb.c:3398
+#: initdb.c:3461
#, c-format
msgid ""
"It contains a dot-prefixed/invisible file, perhaps due to it being a mount "
@@ -1013,7 +1029,7 @@ msgstr ""
"Il contient un fichier invisible, peut-tre parce qu'il s'agit d'un point de "
"montage.\n"
-#: initdb.c:3401
+#: initdb.c:3464
#, c-format
msgid ""
"It contains a lost+found directory, perhaps due to it being a mount point.\n"
@@ -1021,7 +1037,7 @@ msgstr ""
"Il contient un rpertoire lost+found, peut-tre parce qu'il s'agit d'un "
"point de montage.\n"
-#: initdb.c:3404
+#: initdb.c:3467
#, c-format
msgid ""
"Using a mount point directly as the data directory is not recommended.\n"
@@ -1031,35 +1047,35 @@ msgstr ""
"recommand.\n"
"Crez un sous-rpertoire sous le point de montage.\n"
-#: initdb.c:3423
+#: initdb.c:3486
#, c-format
msgid "creating subdirectories ... "
msgstr "cration des sous-rpertoires... "
-#: initdb.c:3591
+#: initdb.c:3654
#, c-format
msgid "Running in debug mode.\n"
msgstr "Lanc en mode dbogage.\n"
-#: initdb.c:3595
+#: initdb.c:3658
#, c-format
msgid "Running in noclean mode. Mistakes will not be cleaned up.\n"
msgstr ""
"Lanc en mode sans nettoyage . Les erreurs ne seront pas supprimes.\n"
-#: initdb.c:3666
+#: initdb.c:3729
#, c-format
msgid "%s: too many command-line arguments (first is \"%s\")\n"
msgstr "%s : trop d'arguments en ligne de commande (le premier tant %s )\n"
-#: initdb.c:3683
+#: initdb.c:3746
#, c-format
msgid "%s: password prompt and password file cannot be specified together\n"
msgstr ""
"%s : les options d'invite du mot de passe et le fichier de mots de passe ne\n"
" peuvent pas tre indiques simultanment\n"
-#: initdb.c:3705
+#: initdb.c:3768
#, c-format
msgid ""
"The files belonging to this database system will be owned by user \"%s\".\n"
@@ -1070,17 +1086,17 @@ msgstr ""
"Le processus serveur doit galement lui appartenir.\n"
"\n"
-#: initdb.c:3721
+#: initdb.c:3784
#, c-format
msgid "Data page checksums are enabled.\n"
msgstr "Les sommes de contrles des pages de donnes sont actives.\n"
-#: initdb.c:3723
+#: initdb.c:3786
#, c-format
msgid "Data page checksums are disabled.\n"
msgstr "Les sommes de contrles des pages de donnes sont dsactives.\n"
-#: initdb.c:3732
+#: initdb.c:3795
#, c-format
msgid ""
"\n"
@@ -1092,7 +1108,7 @@ msgstr ""
"Le rpertoire des donnes pourrait tre corrompu si le systme "
"d'exploitation s'arrtait brutalement.\n"
-#: initdb.c:3741
+#: initdb.c:3804
#, c-format
msgid ""
"\n"
diff --git a/src/bin/initdb/po/it.po b/src/bin/initdb/po/it.po
index dac88bebbad..90ff0abdb8e 100644
--- a/src/bin/initdb/po/it.po
+++ b/src/bin/initdb/po/it.po
@@ -24,8 +24,8 @@ msgid ""
msgstr ""
"Project-Id-Version: initdb (PostgreSQL) 9.4\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2014-08-11 14:42+0000\n"
-"PO-Revision-Date: 2014-08-12 00:07+0100\n"
+"POT-Creation-Date: 2014-12-06 18:12+0000\n"
+"PO-Revision-Date: 2014-12-06 18:31+0100\n"
"Last-Translator: Daniele Varrazzo <daniele.varrazzo@gmail.com>\n"
"Language-Team: Gruppo traduzioni ITPUG <traduzioni@itpug.org>\n"
"Language: it\n"
@@ -165,112 +165,112 @@ msgstr "non è stato possibile impostare la giunzione per \"%s\": %s\n"
msgid "could not get junction for \"%s\": %s\n"
msgstr "non è stato possibile ottenere la giunzione per \"%s\": %s\n"
-#: initdb.c:335
+#: initdb.c:337
#, c-format
msgid "%s: out of memory\n"
msgstr "%s: memoria esaurita\n"
-#: initdb.c:445 initdb.c:1602
+#: initdb.c:447 initdb.c:1653
#, c-format
msgid "%s: could not open file \"%s\" for reading: %s\n"
msgstr "%s: errore nell'apertura del file \"%s\" per la lettura: %s\n"
-#: initdb.c:501 initdb.c:1004 initdb.c:1032
+#: initdb.c:503 initdb.c:1055 initdb.c:1083
#, c-format
msgid "%s: could not open file \"%s\" for writing: %s\n"
msgstr "%s: errore nell'apertura del file \"%s\" per la scrittura: %s\n"
-#: initdb.c:509 initdb.c:517 initdb.c:1011 initdb.c:1038
+#: initdb.c:511 initdb.c:519 initdb.c:1062 initdb.c:1089
#, c-format
msgid "%s: could not write file \"%s\": %s\n"
msgstr "%s: errore nella scrittura del file \"%s\": %s\n"
-#: initdb.c:539
+#: initdb.c:541 initdb.c:608
#, c-format
msgid "%s: could not open directory \"%s\": %s\n"
msgstr "%s: apertura della directory \"%s\" fallita: %s\n"
-#: initdb.c:556
+#: initdb.c:558
#, c-format
msgid "%s: could not stat file \"%s\": %s\n"
msgstr "%s: non è stato possibile ottenere informazioni sul file \"%s\": %s\n"
-#: initdb.c:569
+#: initdb.c:571 initdb.c:628
#, c-format
msgid "%s: could not read directory \"%s\": %s\n"
msgstr "%s: lettura della directory \"%s\" fallita: %s\n"
-#: initdb.c:576
+#: initdb.c:578 initdb.c:635
#, c-format
msgid "%s: could not close directory \"%s\": %s\n"
msgstr "%s: chiusura della directory \"%s\" fallita: %s\n"
-#: initdb.c:611 initdb.c:663
+#: initdb.c:662 initdb.c:714
#, c-format
msgid "%s: could not open file \"%s\": %s\n"
msgstr "%s: apertura del file \"%s\" fallita: %s\n"
-#: initdb.c:679
+#: initdb.c:730
#, c-format
msgid "%s: could not fsync file \"%s\": %s\n"
msgstr "%s: fsync del file \"%s\" fallito: %s\n"
-#: initdb.c:700
+#: initdb.c:751
#, c-format
msgid "%s: could not execute command \"%s\": %s\n"
msgstr "%s: esecuzione del comando \"%s\" fallita: %s\n"
-#: initdb.c:716
+#: initdb.c:767
#, c-format
msgid "%s: removing data directory \"%s\"\n"
msgstr "%s: rimozione della directory dati \"%s\"\n"
-#: initdb.c:719
+#: initdb.c:770
#, c-format
msgid "%s: failed to remove data directory\n"
msgstr "%s: rimozione della directory dati fallita\n"
-#: initdb.c:725
+#: initdb.c:776
#, c-format
msgid "%s: removing contents of data directory \"%s\"\n"
msgstr "%s: rimozione dei contenuti della directory dati \"%s\"\n"
-#: initdb.c:728
+#: initdb.c:779
#, c-format
msgid "%s: failed to remove contents of data directory\n"
msgstr "%s: rimozione dei contenuti dalla directory dati fallita\n"
-#: initdb.c:734
+#: initdb.c:785
#, c-format
msgid "%s: removing transaction log directory \"%s\"\n"
msgstr "%s: rimozione della directory dei log delle transazioni \"%s\"\n"
-#: initdb.c:737
+#: initdb.c:788
#, c-format
msgid "%s: failed to remove transaction log directory\n"
msgstr "%s: rimozione della directory dei log delle transazioni fallita\n"
-#: initdb.c:743
+#: initdb.c:794
#, c-format
msgid "%s: removing contents of transaction log directory \"%s\"\n"
msgstr "%s: rimozione dei contenuti della directory dei log delle transazioni \"%s\"\n"
-#: initdb.c:746
+#: initdb.c:797
#, c-format
msgid "%s: failed to remove contents of transaction log directory\n"
msgstr "%s: rimozione dei contenuti della directory dei log delle transazioni fallita\n"
-#: initdb.c:755
+#: initdb.c:806
#, c-format
msgid "%s: data directory \"%s\" not removed at user's request\n"
msgstr "%s: directory dati \"%s\" non rimossa su richiesta dell'utente\n"
-#: initdb.c:760
+#: initdb.c:811
#, c-format
msgid "%s: transaction log directory \"%s\" not removed at user's request\n"
msgstr "%s: directory dei log delle transazioni \"%s\" non rimossa su richiesta dell'utente\n"
-#: initdb.c:781
+#: initdb.c:832
#, c-format
msgid ""
"%s: cannot be run as root\n"
@@ -281,22 +281,22 @@ msgstr ""
"Effettua il login (usando per esempio \"su\") con l'utente\n"
"(non privilegiato) che controllerà il processo server.\n"
-#: initdb.c:817
+#: initdb.c:868
#, c-format
msgid "%s: \"%s\" is not a valid server encoding name\n"
msgstr "%s: \"%s\" non è un nome di codifica per il server valido\n"
-#: initdb.c:931 initdb.c:3323
+#: initdb.c:982 initdb.c:3386
#, c-format
msgid "%s: could not create directory \"%s\": %s\n"
msgstr "%s: creazione della directory \"%s\" fallita: %s\n"
-#: initdb.c:960
+#: initdb.c:1011
#, c-format
msgid "%s: file \"%s\" does not exist\n"
msgstr "%s: il file \"%s\" non esiste\n"
-#: initdb.c:962 initdb.c:971 initdb.c:981
+#: initdb.c:1013 initdb.c:1022 initdb.c:1032
#, c-format
msgid ""
"This might mean you have a corrupted installation or identified\n"
@@ -305,46 +305,46 @@ msgstr ""
"Questo potrebbe indica una installazione corrotta oppure\n"
"hai indicato la directory errata con l'opzione -L.\n"
-#: initdb.c:968
+#: initdb.c:1019
#, c-format
msgid "%s: could not access file \"%s\": %s\n"
msgstr "%s: accesso al file \"%s\" fallito: %s\n"
-#: initdb.c:979
+#: initdb.c:1030
#, c-format
msgid "%s: file \"%s\" is not a regular file\n"
msgstr "%s: il file \"%s\" non è un file regolare\n"
-#: initdb.c:1124
+#: initdb.c:1175
#, c-format
msgid "selecting default max_connections ... "
msgstr "selezione del parametro max_connections predefinito ... "
-#: initdb.c:1154
+#: initdb.c:1205
#, c-format
msgid "selecting default shared_buffers ... "
msgstr "selezione di shared_buffers predefinito ... "
-#: initdb.c:1187
+#: initdb.c:1238
#, c-format
msgid "selecting dynamic shared memory implementation ... "
msgstr "selezione dell'implementazione della memoria dinamica ... "
-#: initdb.c:1205
+#: initdb.c:1256
msgid "creating configuration files ... "
msgstr "creazione dei file di configurazione ... "
-#: initdb.c:1296 initdb.c:1316 initdb.c:1400 initdb.c:1416
+#: initdb.c:1347 initdb.c:1367 initdb.c:1451 initdb.c:1467
#, c-format
msgid "%s: could not change permissions of \"%s\": %s\n"
msgstr "%s: cambio di permesso di \"%s\" fallito: %s\n"
-#: initdb.c:1440
+#: initdb.c:1491
#, c-format
msgid "creating template1 database in %s/base/1 ... "
msgstr "creazione del database template1 in in %s/base/1 ... "
-#: initdb.c:1456
+#: initdb.c:1507
#, c-format
msgid ""
"%s: input file \"%s\" does not belong to PostgreSQL %s\n"
@@ -354,151 +354,156 @@ msgstr ""
"Controlla la correttezza dell'installazione oppure specifica\n"
"il percorso corretto con l'opzione -L.\n"
-#: initdb.c:1543
+#: initdb.c:1594
msgid "initializing pg_authid ... "
msgstr "inizializzazione di pg_authid ... "
-#: initdb.c:1577
+#: initdb.c:1628
msgid "Enter new superuser password: "
msgstr "Inserisci la nuova password del superutente: "
-#: initdb.c:1578
+#: initdb.c:1629
msgid "Enter it again: "
msgstr "Conferma password: "
-#: initdb.c:1581
+#: initdb.c:1632
#, c-format
msgid "Passwords didn't match.\n"
msgstr "Le password non corrispondono.\n"
-#: initdb.c:1608
+#: initdb.c:1660
#, c-format
msgid "%s: could not read password from file \"%s\": %s\n"
msgstr "%s: lettura del file delle password \"%s\" fallita: %s\n"
-#: initdb.c:1621
+#: initdb.c:1663
+#, c-format
+msgid "%s: password file \"%s\" is empty\n"
+msgstr "%s: il file delle password \"%s\" è vuoto\n"
+
+#: initdb.c:1676
#, c-format
msgid "setting password ... "
msgstr "impostazione password ... "
-#: initdb.c:1721
+#: initdb.c:1776
msgid "initializing dependencies ... "
msgstr "inizializzazione delle dipendenze ... "
-#: initdb.c:1749
+#: initdb.c:1804
msgid "creating system views ... "
msgstr "creazione delle viste di sistema ... "
-#: initdb.c:1785
+#: initdb.c:1840
msgid "loading system objects' descriptions ... "
msgstr "caricamento delle descrizioni degli oggetti di sistema ... "
-#: initdb.c:1891
+#: initdb.c:1946
msgid "creating collations ... "
msgstr "creazione degli ordinamenti alfabetici ... "
-#: initdb.c:1924
+#: initdb.c:1979
#, c-format
msgid "%s: locale name too long, skipped: \"%s\"\n"
msgstr "%s: nome locale troppo lungo, saltato: \"%s\"\n"
-#: initdb.c:1949
+#: initdb.c:2004
#, c-format
msgid "%s: locale name has non-ASCII characters, skipped: \"%s\"\n"
msgstr "%s: nome locale contiene caratteri non ASCII, saltato: \"%s\"\n"
-#: initdb.c:2018
+#: initdb.c:2073
#, c-format
msgid "No usable system locales were found.\n"
msgstr "Nessun locale di sistema trovato.\n"
-#: initdb.c:2019
+#: initdb.c:2074
#, c-format
msgid "Use the option \"--debug\" to see details.\n"
msgstr "Usa l'opzione \"--debug\" per vedere i dettagli.\n"
-#: initdb.c:2022
+#: initdb.c:2077
#, c-format
msgid "not supported on this platform\n"
msgstr "non supportato su questa piattaforma\n"
-#: initdb.c:2037
+#: initdb.c:2092
msgid "creating conversions ... "
msgstr "creazione delle conversioni ... "
-#: initdb.c:2072
+#: initdb.c:2127
msgid "creating dictionaries ... "
msgstr "creazione dizionari ... "
-#: initdb.c:2126
+#: initdb.c:2181
msgid "setting privileges on built-in objects ... "
msgstr "impostazione dei privilegi per gli oggetti predefiniti ... "
-#: initdb.c:2184
+#: initdb.c:2239
msgid "creating information schema ... "
msgstr "creazione dello schema informazioni ... "
-#: initdb.c:2240
+#: initdb.c:2295
msgid "loading PL/pgSQL server-side language ... "
msgstr "caricamento del linguaggio lato server PL/pgSQL ... "
-#: initdb.c:2265
+#: initdb.c:2320
msgid "vacuuming database template1 ... "
msgstr "vacuum del database template1 ... "
-#: initdb.c:2321
+#: initdb.c:2376
msgid "copying template1 to template0 ... "
msgstr "copia di template1 a template0 ... "
-#: initdb.c:2353
+#: initdb.c:2408
msgid "copying template1 to postgres ... "
msgstr "copia di template1 a postgres ... "
-#: initdb.c:2379
+#: initdb.c:2435
msgid "syncing data to disk ... "
msgstr "sincronizzazione dati sul disco ... "
-#: initdb.c:2451
+#: initdb.c:2514
#, c-format
msgid "caught signal\n"
msgstr "intercettato segnale\n"
-#: initdb.c:2457
+#: initdb.c:2520
#, c-format
msgid "could not write to child process: %s\n"
msgstr "scrittura verso il processo figlio fallita: %s\n"
-#: initdb.c:2465
+#: initdb.c:2528
#, c-format
msgid "ok\n"
msgstr "ok\n"
-#: initdb.c:2555
+#: initdb.c:2618
#, c-format
msgid "%s: setlocale() failed\n"
msgstr "%s: setlocale() fallito\n"
-#: initdb.c:2573
+#: initdb.c:2636
#, c-format
msgid "%s: failed to restore old locale \"%s\"\n"
msgstr "%s: ripristino del locale precedente \"%s\" fallito\n"
-#: initdb.c:2583
+#: initdb.c:2646
#, c-format
msgid "%s: invalid locale name \"%s\"\n"
msgstr "%s: nome locale non valido \"%s\"\n"
-#: initdb.c:2595
+#: initdb.c:2658
#, c-format
msgid "%s: invalid locale settings; check LANG and LC_* environment variables\n"
msgstr "%s: impostazione locale non valida; controlla le variabili d'ambiente LANG e LC_*\n"
-#: initdb.c:2623
+#: initdb.c:2686
#, c-format
msgid "%s: encoding mismatch\n"
msgstr "%s: mancata corrispondenza di codifica\n"
-#: initdb.c:2625
+#: initdb.c:2688
#, c-format
msgid ""
"The encoding you selected (%s) and the encoding that the\n"
@@ -513,32 +518,32 @@ msgstr ""
"Esegui di nuovo %s senza specificare una codifica esplicitamente\n"
"oppure seleziona una combinazione corretta.\n"
-#: initdb.c:2730
+#: initdb.c:2793
#, c-format
msgid "%s: WARNING: cannot create restricted tokens on this platform\n"
msgstr "%s: ATTENZIONE: non è possibile creare token ristretti su questa piattaforma\n"
-#: initdb.c:2739
+#: initdb.c:2802
#, c-format
msgid "%s: could not open process token: error code %lu\n"
msgstr "%s: apertura del token di processo fallita: codice errore %lu\n"
-#: initdb.c:2752
+#: initdb.c:2815
#, c-format
msgid "%s: could not to allocate SIDs: error code %lu\n"
msgstr "%s: allocazione dei SID fallita: codice errore %lu\n"
-#: initdb.c:2771
+#: initdb.c:2834
#, c-format
msgid "%s: could not create restricted token: error code %lu\n"
msgstr "%s: creazione del token ristretto fallita: codice errore %lu\n"
-#: initdb.c:2792
+#: initdb.c:2855
#, c-format
msgid "%s: could not start process for command \"%s\": error code %lu\n"
msgstr "%s: errore nell'avvio del processo per il comando \"%s\": codice errore %lu\n"
-#: initdb.c:2806
+#: initdb.c:2869
#, c-format
msgid ""
"%s initializes a PostgreSQL database cluster.\n"
@@ -547,17 +552,17 @@ msgstr ""
"%s inizializza un cluster di database PostgreSQL.\n"
"\n"
-#: initdb.c:2807
+#: initdb.c:2870
#, c-format
msgid "Usage:\n"
msgstr "Utilizzo:\n"
-#: initdb.c:2808
+#: initdb.c:2871
#, c-format
msgid " %s [OPTION]... [DATADIR]\n"
msgstr " %s [OPZIONE]... [DATADIR]\n"
-#: initdb.c:2809
+#: initdb.c:2872
#, c-format
msgid ""
"\n"
@@ -566,47 +571,47 @@ msgstr ""
"\n"
"Opzioni:\n"
-#: initdb.c:2810
+#: initdb.c:2873
#, c-format
msgid " -A, --auth=METHOD default authentication method for local connections\n"
msgstr ""
" -A, --auth=METODO metodo di autenticazione predefinito per le\n"
" connessioni locali\n"
-#: initdb.c:2811
+#: initdb.c:2874
#, c-format
msgid " --auth-host=METHOD default authentication method for local TCP/IP connections\n"
msgstr ""
" --auth-host=METODO metodo di autenticazione predefinito per le\n"
" connessioni TCP/IP\n"
-#: initdb.c:2812
+#: initdb.c:2875
#, c-format
msgid " --auth-local=METHOD default authentication method for local-socket connections\n"
msgstr ""
" --auth-local=METODO metodo di autenticazione predefinito per le\n"
" connessioni locali\n"
-#: initdb.c:2813
+#: initdb.c:2876
#, c-format
msgid " [-D, --pgdata=]DATADIR location for this database cluster\n"
msgstr " [-D, --pgdata=]DATADIR dove creare questo cluster di database\n"
-#: initdb.c:2814
+#: initdb.c:2877
#, c-format
msgid " -E, --encoding=ENCODING set default encoding for new databases\n"
msgstr ""
" -E, --encoding=ENCODING imposta la codifica predefinita per i nuovi\n"
" database\n"
-#: initdb.c:2815
+#: initdb.c:2878
#, c-format
msgid " --locale=LOCALE set default locale for new databases\n"
msgstr ""
" --locale=LOCALE imposta il locale predefinito per i nuovi\n"
" database\n"
-#: initdb.c:2816
+#: initdb.c:2879
#, c-format
msgid ""
" --lc-collate=, --lc-ctype=, --lc-messages=LOCALE\n"
@@ -621,17 +626,17 @@ msgstr ""
" Il valore predefinito viene preso dalle variabili\n"
" d'ambiente\n"
-#: initdb.c:2820
+#: initdb.c:2883
#, c-format
msgid " --no-locale equivalent to --locale=C\n"
msgstr " --no-locale equivalente a --locale=C\n"
-#: initdb.c:2821
+#: initdb.c:2884
#, c-format
msgid " --pwfile=FILE read password for the new superuser from file\n"
msgstr " --pwfile=FILE leggi la password per il nuovo superutente dal file\n"
-#: initdb.c:2822
+#: initdb.c:2885
#, c-format
msgid ""
" -T, --text-search-config=CFG\n"
@@ -640,24 +645,24 @@ msgstr ""
" -T, --text-search-config=CFG\n"
" configurazione predefinita per la ricerca di testo\n"
-#: initdb.c:2824
+#: initdb.c:2887
#, c-format
msgid " -U, --username=NAME database superuser name\n"
msgstr " -U, --username=NOME nome del superutente del database\n"
-#: initdb.c:2825
+#: initdb.c:2888
#, c-format
msgid " -W, --pwprompt prompt for a password for the new superuser\n"
msgstr " -W, --pwprompt richiedi la password per il nuovo superutente\n"
-#: initdb.c:2826
+#: initdb.c:2889
#, c-format
msgid " -X, --xlogdir=XLOGDIR location for the transaction log directory\n"
msgstr ""
" -X, --xlogdir=XLOGDIR posizione della directory contenente i log\n"
" delle transazioni\n"
-#: initdb.c:2827
+#: initdb.c:2890
#, c-format
msgid ""
"\n"
@@ -666,44 +671,44 @@ msgstr ""
"\n"
"Opzioni utilizzate meno frequentemente:\n"
-#: initdb.c:2828
+#: initdb.c:2891
#, c-format
msgid " -d, --debug generate lots of debugging output\n"
msgstr " -d, --debug genera molto output di debug\n"
-#: initdb.c:2829
+#: initdb.c:2892
#, c-format
msgid " -k, --data-checksums use data page checksums\n"
msgstr " -k, --data-checksums usa i checksum delle pagine dati\n"
-#: initdb.c:2830
+#: initdb.c:2893
#, c-format
msgid " -L DIRECTORY where to find the input files\n"
msgstr " -L DIRECTORY dove trovare i file di input\n"
-#: initdb.c:2831
+#: initdb.c:2894
#, c-format
msgid " -n, --noclean do not clean up after errors\n"
msgstr " -n, --noclean non ripulire dopo gli errori\n"
-#: initdb.c:2832
+#: initdb.c:2895
#, c-format
msgid " -N, --nosync do not wait for changes to be written safely to disk\n"
msgstr ""
" -N, --nosync non attendere che i cambiamenti siano stati\n"
" scritti in sicurezza sul disco\n"
-#: initdb.c:2833
+#: initdb.c:2896
#, c-format
msgid " -s, --show show internal settings\n"
msgstr " -s, --show mostra le impostazioni interne\n"
-#: initdb.c:2834
+#: initdb.c:2897
#, c-format
msgid " -S, --sync-only only sync data directory\n"
msgstr " -S, --sync-only sincronizza solo la directory dei dati\n"
-#: initdb.c:2835
+#: initdb.c:2898
#, c-format
msgid ""
"\n"
@@ -712,17 +717,17 @@ msgstr ""
"\n"
"Altre opzioni:\n"
-#: initdb.c:2836
+#: initdb.c:2899
#, c-format
msgid " -V, --version output version information, then exit\n"
msgstr " -V, --version mostra informazioni sulla versione ed esci\n"
-#: initdb.c:2837
+#: initdb.c:2900
#, c-format
msgid " -?, --help show this help, then exit\n"
msgstr " -?, --help mostra questo aiuto ed esci\n"
-#: initdb.c:2838
+#: initdb.c:2901
#, c-format
msgid ""
"\n"
@@ -733,7 +738,7 @@ msgstr ""
"Se la directory dati non è specificata, viene usata la variabile\n"
"d'ambiente PGDATA.\n"
-#: initdb.c:2840
+#: initdb.c:2903
#, c-format
msgid ""
"\n"
@@ -742,7 +747,7 @@ msgstr ""
"\n"
"Puoi segnalare eventuali bug a <pgsql-bugs@postgresql.org>.\n"
-#: initdb.c:2848
+#: initdb.c:2911
msgid ""
"\n"
"WARNING: enabling \"trust\" authentication for local connections\n"
@@ -755,27 +760,27 @@ msgstr ""
"pg_hba.conf o utilizzando l'opzione -A oppure --auth-local and --auth-host\n"
"alla prossima esecuzione di initdb.\n"
-#: initdb.c:2870
+#: initdb.c:2933
#, c-format
msgid "%s: invalid authentication method \"%s\" for \"%s\" connections\n"
msgstr "%s: metodo di autenticazione \"%s\" non valido per connessioni \"%s\"\n"
-#: initdb.c:2884
+#: initdb.c:2947
#, c-format
msgid "%s: must specify a password for the superuser to enable %s authentication\n"
msgstr "%s: occorre specificare una password per il superutente per abilitare l'autenticazione %s\n"
-#: initdb.c:2917
+#: initdb.c:2980
#, c-format
msgid "%s: could not re-execute with restricted token: error code %lu\n"
msgstr "%s: ri-eseguire con token ristretto fallita: codice errore %lu\n"
-#: initdb.c:2932
+#: initdb.c:2995
#, c-format
msgid "%s: could not get exit code from subprocess: error code %lu\n"
msgstr "%s: lettura del codice di uscita del processo figlio fallita: codice errore %lu\n"
-#: initdb.c:2958
+#: initdb.c:3021
#, c-format
msgid ""
"%s: no data directory specified\n"
@@ -788,7 +793,7 @@ msgstr ""
"database. Puoi farlo usando l'opzione -D oppure la variabile globale\n"
"PGDATA.\n"
-#: initdb.c:2996
+#: initdb.c:3059
#, c-format
msgid ""
"The program \"postgres\" is needed by %s but was not found in the\n"
@@ -799,7 +804,7 @@ msgstr ""
"nella stessa directory \"%s\".\n"
"Verifica la correttezza dell'installazione.\n"
-#: initdb.c:3003
+#: initdb.c:3066
#, c-format
msgid ""
"The program \"postgres\" was found by \"%s\"\n"
@@ -810,17 +815,17 @@ msgstr ""
"ma non ha la stessa versione di %s.\n"
"Verifica la correttezza dell'installazione.\n"
-#: initdb.c:3022
+#: initdb.c:3085
#, c-format
msgid "%s: input file location must be an absolute path\n"
msgstr "%s: la posizione del file di input deve essere un percorso assoluto\n"
-#: initdb.c:3041
+#: initdb.c:3104
#, c-format
msgid "The database cluster will be initialized with locale \"%s\".\n"
msgstr "Il cluster di database sarà inizializzato con il locale \"%s\".\n"
-#: initdb.c:3044
+#: initdb.c:3107
#, c-format
msgid ""
"The database cluster will be initialized with locales\n"
@@ -839,22 +844,22 @@ msgstr ""
" NUMERIC: %s\n"
" TIME: %s\n"
-#: initdb.c:3068
+#: initdb.c:3131
#, c-format
msgid "%s: could not find suitable encoding for locale \"%s\"\n"
msgstr "%s: nessuna codifica adeguata trovata per il locale \"%s\"\n"
-#: initdb.c:3070
+#: initdb.c:3133
#, c-format
msgid "Rerun %s with the -E option.\n"
msgstr "Esegui di nuovo %s con l'opzione -E.\n"
-#: initdb.c:3071 initdb.c:3647 initdb.c:3668
+#: initdb.c:3134 initdb.c:3710 initdb.c:3731
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "Prova \"%s --help\" per maggiori informazioni.\n"
-#: initdb.c:3083
+#: initdb.c:3146
#, c-format
msgid ""
"Encoding \"%s\" implied by locale is not allowed as a server-side encoding.\n"
@@ -863,12 +868,12 @@ msgstr ""
"La codifica \"%s\" implicata dal locale non è consentita come codifica lato server.\n"
"La codifica predefinita dei database sarà impostata invece a \"%s\".\n"
-#: initdb.c:3091
+#: initdb.c:3154
#, c-format
msgid "%s: locale \"%s\" requires unsupported encoding \"%s\"\n"
msgstr "%s: il locale \"%s\" richiede la codifica non supportata \"%s\"\n"
-#: initdb.c:3094
+#: initdb.c:3157
#, c-format
msgid ""
"Encoding \"%s\" is not allowed as a server-side encoding.\n"
@@ -877,54 +882,54 @@ msgstr ""
"La codifica \"%s\" non è disponibile come codifica lato server.\n"
"Esegui di nuovo %s con un locale diverso.\n"
-#: initdb.c:3103
+#: initdb.c:3166
#, c-format
msgid "The default database encoding has accordingly been set to \"%s\".\n"
msgstr "La codifica predefinita del database è stata impostata a \"%s\".\n"
-#: initdb.c:3174
+#: initdb.c:3237
#, c-format
msgid "%s: could not find suitable text search configuration for locale \"%s\"\n"
msgstr "%s: nessuna configurazione per la ricerca testo adeguata al locale \"%s\"\n"
-#: initdb.c:3185
+#: initdb.c:3248
#, c-format
msgid "%s: warning: suitable text search configuration for locale \"%s\" is unknown\n"
msgstr "%s: attenzione: non si conosce una configurazione per la ricerca testo adeguata al locale \"%s\"\n"
-#: initdb.c:3190
+#: initdb.c:3253
#, c-format
msgid "%s: warning: specified text search configuration \"%s\" might not match locale \"%s\"\n"
msgstr ""
"%s: attenzione: la configurazione specificata per la ricerca testo \"%s\"\n"
"potrebbe non corrispondere al locale \"%s\"\n"
-#: initdb.c:3195
+#: initdb.c:3258
#, c-format
msgid "The default text search configuration will be set to \"%s\".\n"
msgstr "La configurazione predefinita di ricerca testo sarà impostata a \"%s\".\n"
-#: initdb.c:3239 initdb.c:3317
+#: initdb.c:3302 initdb.c:3380
#, c-format
msgid "creating directory %s ... "
msgstr "creazione della directory %s ... "
-#: initdb.c:3253 initdb.c:3335
+#: initdb.c:3316 initdb.c:3398
#, c-format
msgid "fixing permissions on existing directory %s ... "
msgstr "correzione dei permessi sulla directory esistente %s ... "
-#: initdb.c:3259 initdb.c:3341
+#: initdb.c:3322 initdb.c:3404
#, c-format
msgid "%s: could not change permissions of directory \"%s\": %s\n"
msgstr "%s: modifica dei permessi della directory \"%s\" fallita: %s\n"
-#: initdb.c:3274 initdb.c:3356
+#: initdb.c:3337 initdb.c:3419
#, c-format
msgid "%s: directory \"%s\" exists but is not empty\n"
msgstr "%s: la directory \"%s\" esiste ma non è vuota\n"
-#: initdb.c:3280
+#: initdb.c:3343
#, c-format
msgid ""
"If you want to create a new database system, either remove or empty\n"
@@ -935,17 +940,17 @@ msgstr ""
"la directory \"%s\" oppure esegui %s\n"
"con un argomento diverso da \"%s\".\n"
-#: initdb.c:3288 initdb.c:3369
+#: initdb.c:3351 initdb.c:3432
#, c-format
msgid "%s: could not access directory \"%s\": %s\n"
msgstr "%s: accesso alla directory \"%s\" fallito: %s\n"
-#: initdb.c:3308
+#: initdb.c:3371
#, c-format
msgid "%s: transaction log directory location must be an absolute path\n"
-msgstr "%s: la posizione della directory del log delle transazioni deve essere un percorso assoluto\n"
+msgstr "%s: la directory dei log delle transazioni deve essere un percorso assoluto\n"
-#: initdb.c:3362
+#: initdb.c:3425
#, c-format
msgid ""
"If you want to store the transaction log there, either\n"
@@ -954,27 +959,27 @@ msgstr ""
"Se vuoi salvare lì i log delle transazioni,\n"
"elimina oppure svuota la directory \"%s\".\n"
-#: initdb.c:3380
+#: initdb.c:3443
#, c-format
msgid "%s: could not create symbolic link \"%s\": %s\n"
msgstr "%s: creazione del link simbolico \"%s\" fallita: %s\n"
-#: initdb.c:3385
+#: initdb.c:3448
#, c-format
msgid "%s: symlinks are not supported on this platform"
msgstr "%s: i link simbolici non sono supportati su questa piattaforma"
-#: initdb.c:3398
+#: initdb.c:3461
#, c-format
msgid "It contains a dot-prefixed/invisible file, perhaps due to it being a mount point.\n"
msgstr "Contiene un file prefissato con punto o invisibile, forse perché è un punto di montaggio.\n"
-#: initdb.c:3401
+#: initdb.c:3464
#, c-format
msgid "It contains a lost+found directory, perhaps due to it being a mount point.\n"
msgstr "Contiene una directory lost+found, forse perché è un punto di montaggio.\n"
-#: initdb.c:3404
+#: initdb.c:3467
#, c-format
msgid ""
"Using a mount point directly as the data directory is not recommended.\n"
@@ -983,34 +988,34 @@ msgstr ""
"Usare un punto di montaggio direttamente come directory dati non è\n"
"consigliato. Crea una sottodirectory sotto il punto di montaggio.\n"
-#: initdb.c:3423
+#: initdb.c:3486
#, c-format
msgid "creating subdirectories ... "
msgstr "creazione delle sottodirectory ... "
-#: initdb.c:3591
+#: initdb.c:3654
#, c-format
msgid "Running in debug mode.\n"
msgstr "Esecuzione in modalità debug\n"
-#: initdb.c:3595
+#: initdb.c:3658
#, c-format
msgid "Running in noclean mode. Mistakes will not be cleaned up.\n"
msgstr "Esecuzione in modalità noclean. Gli errori non verranno ripuliti.\n"
-#: initdb.c:3666
+#: initdb.c:3729
#, c-format
msgid "%s: too many command-line arguments (first is \"%s\")\n"
msgstr "%s: troppi argomenti nella riga di comando (il primo è \"%s\")\n"
-#: initdb.c:3683
+#: initdb.c:3746
#, c-format
msgid "%s: password prompt and password file cannot be specified together\n"
msgstr ""
"%s: il prompt della password ed un file contenente la password non\n"
"possono essere specificati contemporaneamente\n"
-#: initdb.c:3705
+#: initdb.c:3768
#, c-format
msgid ""
"The files belonging to this database system will be owned by user \"%s\".\n"
@@ -1021,17 +1026,17 @@ msgstr ""
"Questo utente deve inoltre possedere il processo server.\n"
"\n"
-#: initdb.c:3721
+#: initdb.c:3784
#, c-format
msgid "Data page checksums are enabled.\n"
msgstr "La somma di controllo dei dati delle pagine è abilitata.\n"
-#: initdb.c:3723
+#: initdb.c:3786
#, c-format
msgid "Data page checksums are disabled.\n"
msgstr "La somma di controllo dei dati delle pagine è disabilitata.\n"
-#: initdb.c:3732
+#: initdb.c:3795
#, c-format
msgid ""
"\n"
@@ -1042,7 +1047,7 @@ msgstr ""
"Sync sul disco saltato.\n"
"La directory dei dati potrebbe diventare corrotta in caso di crash del sistema operativo.\n"
-#: initdb.c:3741
+#: initdb.c:3804
#, c-format
msgid ""
"\n"
diff --git a/src/bin/initdb/po/sv.po b/src/bin/initdb/po/sv.po
new file mode 100644
index 00000000000..956341b8669
--- /dev/null
+++ b/src/bin/initdb/po/sv.po
@@ -0,0 +1,1037 @@
+# Swedish message translation file for initdb
+# Dennis Björklund <db@zigo.dhs.org>, 2004, 2005, 2006.
+# Magnus Hagander <magnus@hagander.net>, 2007.
+# Peter Eisentraut <peter_e@gmx.net>, 2009.
+# Mats Erik Andersson <bsd@gisladisker.se>, 2014.
+#
+# Use these quotes: "%s"
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 9.4\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2014-12-06 19:12+0000\n"
+"PO-Revision-Date: 2014-12-09 01:16+0100\n"
+"Last-Translator: Mats Erik Andersson <bsd@gisladisker.se>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../../common/exec.c:127 ../../common/exec.c:241 ../../common/exec.c:284
+#, c-format
+msgid "could not identify current directory: %s"
+msgstr "kunde inte identifiera aktuella katalogen: %s"
+
+#: ../../common/exec.c:146
+#, c-format
+msgid "invalid binary \"%s\""
+msgstr "ogiltig binärfil \"%s\""
+
+#: ../../common/exec.c:195
+#, c-format
+msgid "could not read binary \"%s\""
+msgstr "kunde inte läsa binärfil \"%s\""
+
+#: ../../common/exec.c:202
+#, c-format
+msgid "could not find a \"%s\" to execute"
+msgstr "kunde inte hitta en \"%s\" att köra"
+
+#: ../../common/exec.c:257 ../../common/exec.c:293
+#, c-format
+msgid "could not change directory to \"%s\": %s"
+msgstr "kunde inte byta katalog till \"%s\": %s"
+
+#: ../../common/exec.c:272
+#, c-format
+msgid "could not read symbolic link \"%s\""
+msgstr "kunde inte läsa symbolisk länk \"%s\""
+
+#: ../../common/exec.c:523
+#, c-format
+msgid "pclose failed: %s"
+msgstr "pclose misslyckades: %s"
+
+#: ../../common/fe_memutils.c:33 ../../common/fe_memutils.c:60
+#: ../../common/fe_memutils.c:83
+#, c-format
+msgid "out of memory\n"
+msgstr "slut på minne\n"
+
+#: ../../common/fe_memutils.c:77
+#, c-format
+msgid "cannot duplicate null pointer (internal error)\n"
+msgstr "kan inte duplicera null-pekare (internt fel)\n"
+
+#: ../../common/pgfnames.c:45
+#, c-format
+msgid "could not open directory \"%s\": %s\n"
+msgstr "kunde inte öppna katalogen \"%s\": %s\n"
+
+#: ../../common/pgfnames.c:72
+#, c-format
+msgid "could not read directory \"%s\": %s\n"
+msgstr "kunde inte läsa katalogen \"%s\": %s\n"
+
+#: ../../common/pgfnames.c:84
+#, c-format
+msgid "could not close directory \"%s\": %s\n"
+msgstr "kunde inte stänga katalogen \"%s\": %s\n"
+
+#: ../../common/rmtree.c:77
+#, c-format
+msgid "could not stat file or directory \"%s\": %s\n"
+msgstr "kunde inte ta status på fil eller katalog \"%s\": %s\n"
+
+#: ../../common/rmtree.c:104 ../../common/rmtree.c:121
+#, c-format
+msgid "could not remove file or directory \"%s\": %s\n"
+msgstr "kunde inte ta bort fil eller katalog \"%s\": %s\n"
+
+#: ../../common/username.c:45
+#, c-format
+msgid "could not look up effective user ID %ld: %s"
+msgstr "kunde inte slå upp effektivt användar-id %ld: %s"
+
+#: ../../common/username.c:47
+msgid "user does not exist"
+msgstr "användaren finns inte"
+
+#: ../../common/username.c:61
+#, c-format
+msgid "user name lookup failure: %s"
+msgstr "misslyckad sökning efter användarnamn: %s"
+
+#: ../../common/wait_error.c:47
+#, c-format
+msgid "command not executable"
+msgstr "kommandot är inte utförbart"
+
+#: ../../common/wait_error.c:51
+#, c-format
+msgid "command not found"
+msgstr "kommandot kan ej återfinnas"
+
+#: ../../common/wait_error.c:56
+#, c-format
+msgid "child process exited with exit code %d"
+msgstr "barnprocess avslutade med statuskod %d"
+
+#: ../../common/wait_error.c:63
+#, c-format
+msgid "child process was terminated by exception 0x%X"
+msgstr "barnprocess terminerades av felkod 0x%X"
+
+#: ../../common/wait_error.c:73
+#, c-format
+msgid "child process was terminated by signal %s"
+msgstr "barnprocess terminerades av signal %s"
+
+#: ../../common/wait_error.c:77
+#, c-format
+msgid "child process was terminated by signal %d"
+msgstr "barnprocess terminerades av signal %d"
+
+#: ../../common/wait_error.c:82
+#, c-format
+msgid "child process exited with unrecognized status %d"
+msgstr "barnprocess avslutade med okänd statuskod %d"
+
+#: ../../port/dirmod.c:219
+#, c-format
+msgid "could not set junction for \"%s\": %s\n"
+msgstr "kunde inte sätta en knutpunkt (junction) för \"%s\": %s\n"
+
+#: ../../port/dirmod.c:294
+#, c-format
+msgid "could not get junction for \"%s\": %s\n"
+msgstr "kunde inte få en knutpunkt (junction) för \"%s\": %s\n"
+
+#: initdb.c:337
+#, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: slut på minne\n"
+
+#: initdb.c:447 initdb.c:1653
+#, c-format
+msgid "%s: could not open file \"%s\" for reading: %s\n"
+msgstr "%s: Kunde inte öppna fil \"%s\" för läsning: %s\n"
+
+#: initdb.c:503 initdb.c:1055 initdb.c:1083
+#, c-format
+msgid "%s: could not open file \"%s\" for writing: %s\n"
+msgstr "%s: Kunde inte öppna fil \"%s\" för skrivning: %s\n"
+
+#: initdb.c:511 initdb.c:519 initdb.c:1062 initdb.c:1089
+#, c-format
+msgid "%s: could not write file \"%s\": %s\n"
+msgstr "%s: Kunde inte skriva filen \"%s\": %s\n"
+
+#: initdb.c:541 initdb.c:608
+#, c-format
+msgid "%s: could not open directory \"%s\": %s\n"
+msgstr "%s: Kunde inte öppna katalog \"%s\": %s\n"
+
+#: initdb.c:558
+#, c-format
+msgid "%s: could not stat file \"%s\": %s\n"
+msgstr "%s: kunde ta status på filen \"%s\": %s\n"
+
+#: initdb.c:571 initdb.c:628
+#, c-format
+msgid "%s: could not read directory \"%s\": %s\n"
+msgstr "%s: Kunde inte läsa katalog \"%s\": %s\n"
+
+#: initdb.c:578 initdb.c:635
+#, c-format
+msgid "%s: could not close directory \"%s\": %s\n"
+msgstr "%s: Kunde inte stänga katalog \"%s\": %s\n"
+
+#: initdb.c:662 initdb.c:714
+#, c-format
+msgid "%s: could not open file \"%s\": %s\n"
+msgstr "%s: Kunde inte öppna fil \"%s\": %s\n"
+
+#: initdb.c:730
+#, c-format
+msgid "%s: could not fsync file \"%s\": %s\n"
+msgstr "%s: Kunde inte utföra fsync på filen \"%s\": %s\n"
+
+#: initdb.c:751
+#, c-format
+msgid "%s: could not execute command \"%s\": %s\n"
+msgstr "%s: Kunde inte utföra kommandot \"%s\": %s\n"
+
+#: initdb.c:767
+#, c-format
+msgid "%s: removing data directory \"%s\"\n"
+msgstr "%s: Tar bort datakatalog \"%s\".\n"
+
+#: initdb.c:770
+#, c-format
+msgid "%s: failed to remove data directory\n"
+msgstr "%s: Misslyckades med att ta bort datakatalog.\n"
+
+#: initdb.c:776
+#, c-format
+msgid "%s: removing contents of data directory \"%s\"\n"
+msgstr "%s: Tömmer innehållet i datakatalog \"%s\".\n"
+
+#: initdb.c:779
+#, c-format
+msgid "%s: failed to remove contents of data directory\n"
+msgstr "%s: Misslyckades med att tömma datakatalog.\n"
+
+#: initdb.c:785
+#, c-format
+msgid "%s: removing transaction log directory \"%s\"\n"
+msgstr "%s: Tar bort transaktionsloggskatalog \"%s\".\n"
+
+#: initdb.c:788
+#, c-format
+msgid "%s: failed to remove transaction log directory\n"
+msgstr "%s: Misslyckades med att ta bort katalog för transaktionslogg.\n"
+
+#: initdb.c:794
+#, c-format
+msgid "%s: removing contents of transaction log directory \"%s\"\n"
+msgstr "%s: Tömmer innehållet ur katalogen för transaktionsloggar \"%s\".\n"
+
+#: initdb.c:797
+#, c-format
+msgid "%s: failed to remove contents of transaction log directory\n"
+msgstr "%s: Misslyckades med att tömma katalogen för transaktionsloggar.\n"
+
+#: initdb.c:806
+#, c-format
+msgid "%s: data directory \"%s\" not removed at user's request\n"
+msgstr "%s: Datakatalogen \"%s\" ej borttagen på användares begäran.\n"
+
+#: initdb.c:811
+#, c-format
+msgid "%s: transaction log directory \"%s\" not removed at user's request\n"
+msgstr "%s: Katalogen för transaktionsloggar \"%s\" ej borttagen på användares begäran.\n"
+
+#: initdb.c:832
+#, c-format
+msgid ""
+"%s: cannot be run as root\n"
+"Please log in (using, e.g., \"su\") as the (unprivileged) user that will\n"
+"own the server process.\n"
+msgstr ""
+"%s: Kan inte köras som root.\n"
+"Logga in (dvs. använd \"su\") som den underpriviligerade användare\n"
+"vilken skall äga serverprocessen.\n"
+
+#: initdb.c:868
+#, c-format
+msgid "%s: \"%s\" is not a valid server encoding name\n"
+msgstr "%s: \"%s\" är inte en giltig teckenkodning för servern.\n"
+
+#: initdb.c:982 initdb.c:3386
+#, c-format
+msgid "%s: could not create directory \"%s\": %s\n"
+msgstr "%s: Kunde inte skapa katalogen \"%s\": %s\n"
+
+#: initdb.c:1011
+#, c-format
+msgid "%s: file \"%s\" does not exist\n"
+msgstr "%s: Filen \"%s\" existerar inte.\n"
+
+#: initdb.c:1013 initdb.c:1022 initdb.c:1032
+#, c-format
+msgid ""
+"This might mean you have a corrupted installation or identified\n"
+"the wrong directory with the invocation option -L.\n"
+msgstr ""
+"Detta kan betyda att du har en korrupt installation eller att du har\n"
+"angivit felaktig filkatalog till växeln -L.\n"
+
+#: initdb.c:1019
+#, c-format
+msgid "%s: could not access file \"%s\": %s\n"
+msgstr "%s: Kunde inte komma åt filen \"%s\": %s\n"
+
+#: initdb.c:1030
+#, c-format
+msgid "%s: file \"%s\" is not a regular file\n"
+msgstr "%s: \"%s\" är inte en normal fil.\n"
+
+#: initdb.c:1175
+#, c-format
+msgid "selecting default max_connections ... "
+msgstr "Sätter förvalt värde för max_connections ... "
+
+#: initdb.c:1205
+#, c-format
+msgid "selecting default shared_buffers ... "
+msgstr "Sätter förvalt värde för shared_buffers ... "
+
+#: initdb.c:1238
+#, c-format
+msgid "selecting dynamic shared memory implementation ... "
+msgstr "Väljer mekanism för dynamiskt, delat minne ... "
+
+#: initdb.c:1256
+msgid "creating configuration files ... "
+msgstr "Skapar konfigurationsfiler ... "
+
+#: initdb.c:1347 initdb.c:1367 initdb.c:1451 initdb.c:1467
+#, c-format
+msgid "%s: could not change permissions of \"%s\": %s\n"
+msgstr "%s: Kunde inte ändra rättigheter på \"%s\": %s\n"
+
+#: initdb.c:1491
+#, c-format
+msgid "creating template1 database in %s/base/1 ... "
+msgstr "Skapar databasen template1 i %s/base/1 ... "
+
+# The expected string length of bki_file (for the first "%s")
+# with a standard directory "/usr/local/pgsql", is such that
+# the translated message string produces a reasonable output.
+#
+#: initdb.c:1507
+#, c-format
+msgid ""
+"%s: input file \"%s\" does not belong to PostgreSQL %s\n"
+"Check your installation or specify the correct path using the option -L.\n"
+msgstr ""
+"%s: Indatafilen \"%s\" hör inte\n"
+"till PostgreSQL %s. Kontrollera din installation eller ange\n"
+"korrekt filkatalog med hjälp av växeln -L.\n"
+
+#: initdb.c:1594
+msgid "initializing pg_authid ... "
+msgstr "Initierar pg_authid ... "
+
+#: initdb.c:1628
+msgid "Enter new superuser password: "
+msgstr "Mata in ett nytt lösenord för superanvändaren: "
+
+#: initdb.c:1629
+msgid "Enter it again: "
+msgstr "Mata in det igen: "
+
+#: initdb.c:1632
+#, c-format
+msgid "Passwords didn't match.\n"
+msgstr "Lösenorden stämde inte överens.\n"
+
+#: initdb.c:1660
+#, c-format
+msgid "%s: could not read password from file \"%s\": %s\n"
+msgstr "%s: Kunde inte läsa lösenord i filen \"%s\": %s\n"
+
+#: initdb.c:1663
+#, c-format
+msgid "%s: password file \"%s\" is empty\n"
+msgstr "%s: Lösenordsfilen \"%s\" är tom.\n"
+
+#: initdb.c:1676
+#, c-format
+msgid "setting password ... "
+msgstr "Sparar lösenord ... "
+
+#: initdb.c:1776
+msgid "initializing dependencies ... "
+msgstr "Initierar beroenden ... "
+
+#: initdb.c:1804
+msgid "creating system views ... "
+msgstr "Skapar systemvyer ... "
+
+#: initdb.c:1840
+msgid "loading system objects' descriptions ... "
+msgstr "Laddar systemobjektens beskrivningar ... "
+
+#: initdb.c:1946
+msgid "creating collations ... "
+msgstr "Skapar sorteringsregler ... "
+
+#: initdb.c:1979
+#, c-format
+msgid "%s: locale name too long, skipped: \"%s\"\n"
+msgstr "%s: lokalnamnet är alltför långt, förkastas: \"%s\"\n"
+
+#: initdb.c:2004
+#, c-format
+msgid "%s: locale name has non-ASCII characters, skipped: \"%s\"\n"
+msgstr "%s: lokalnamnet innehåller annat än ASCII, förkastas: \"%s\"\n"
+
+#: initdb.c:2073
+#, c-format
+msgid "No usable system locales were found.\n"
+msgstr "Inga tjänliga lokalnamn kunde uppdagas.\n"
+
+#: initdb.c:2074
+#, c-format
+msgid "Use the option \"--debug\" to see details.\n"
+msgstr "Nyttja växeln \"--debug\" för fler detaljer.\n"
+
+#: initdb.c:2077
+#, c-format
+msgid "not supported on this platform\n"
+msgstr "stöds icke för denna systemplattform\n"
+
+#: initdb.c:2092
+msgid "creating conversions ... "
+msgstr "Skapar konverteringar ... "
+
+#: initdb.c:2127
+msgid "creating dictionaries ... "
+msgstr "Skapar kataloger ... "
+
+#: initdb.c:2181
+msgid "setting privileges on built-in objects ... "
+msgstr "Sätter rättigheter för inbyggda objekt ... "
+
+#: initdb.c:2239
+msgid "creating information schema ... "
+msgstr "Skapar informationsschema ... "
+
+#: initdb.c:2295
+msgid "loading PL/pgSQL server-side language ... "
+msgstr "Aktiverar serverspråket PL/pgSQL ... "
+
+#: initdb.c:2320
+msgid "vacuuming database template1 ... "
+msgstr "Kör vacuum på databasen template1 ... "
+
+#: initdb.c:2376
+msgid "copying template1 to template0 ... "
+msgstr "Kopierar template1 till template0 ... "
+
+#: initdb.c:2408
+msgid "copying template1 to postgres ... "
+msgstr "Kopierar template1 till postgres ... "
+
+#: initdb.c:2435
+msgid "syncing data to disk ... "
+msgstr "Synkar data till lagringsmedium ... "
+
+#: initdb.c:2514
+#, c-format
+msgid "caught signal\n"
+msgstr "mottog signal\n"
+
+#: initdb.c:2520
+#, c-format
+msgid "could not write to child process: %s\n"
+msgstr "kunde inte skriva till barnprocess: %s\n"
+
+#: initdb.c:2528
+#, c-format
+msgid "ok\n"
+msgstr "ok\n"
+
+#: initdb.c:2618
+#, c-format
+msgid "%s: setlocale() failed\n"
+msgstr "%s: setlocale() misslyckades\n"
+
+#: initdb.c:2636
+#, c-format
+msgid "%s: failed to restore old locale \"%s\"\n"
+msgstr "%s: misslyckades att återställa lokalspråk \"%s\"\n"
+
+#: initdb.c:2646
+#, c-format
+msgid "%s: invalid locale name \"%s\"\n"
+msgstr "%s: Okänt lokalnamn \"%s\".\n"
+
+#: initdb.c:2658
+#, c-format
+msgid "%s: invalid locale settings; check LANG and LC_* environment variables\n"
+msgstr "%s: Ogiltigt språkval. Kontrollera miljövariablerna LANG, LC_*.\n"
+
+#: initdb.c:2686
+#, c-format
+msgid "%s: encoding mismatch\n"
+msgstr "%s: Oförenliga teckenkodningar.\n"
+
+#: initdb.c:2688
+#, c-format
+msgid ""
+"The encoding you selected (%s) and the encoding that the\n"
+"selected locale uses (%s) do not match. This would lead to\n"
+"misbehavior in various character string processing functions.\n"
+"Rerun %s and either do not specify an encoding explicitly,\n"
+"or choose a matching combination.\n"
+msgstr ""
+"Teckenkodningen du har valt (%s) och kodningen svarande\n"
+"mot lokalnamnet (%s), de passar inte ihop. Detta kan leda\n"
+"till problem för funktioner som arbetar med strängar. Detta\n"
+"undgås genom att utföra %s igen och då låta bli bli att\n"
+"sätta kodning, eller i annat fall att välja bättre teckensats.\n"
+
+#: initdb.c:2793
+#, c-format
+msgid "%s: WARNING: cannot create restricted tokens on this platform\n"
+msgstr "%s: VARNING: Restriktiva styrmärken (token) stöds inte av plattformen\n"
+
+#: initdb.c:2802
+#, c-format
+msgid "%s: could not open process token: error code %lu\n"
+msgstr "%s: kunde inte skapa processmärke (token): felkod %lu\n"
+
+#: initdb.c:2815
+#, c-format
+msgid "%s: could not to allocate SIDs: error code %lu\n"
+msgstr "%s: kunde inte tilldela SID: felkod %lu\n"
+
+#: initdb.c:2834
+#, c-format
+msgid "%s: could not create restricted token: error code %lu\n"
+msgstr "%s: kunde inte skapa restriktivt styrmärke (token): felkod %lu\n"
+
+#: initdb.c:2855
+#, c-format
+msgid "%s: could not start process for command \"%s\": error code %lu\n"
+msgstr "%s: kunde inte starta process för kommando \"%s\": felkod %lu\n"
+
+#: initdb.c:2869
+#, c-format
+msgid ""
+"%s initializes a PostgreSQL database cluster.\n"
+"\n"
+msgstr ""
+"%s initierar ett databaskluster för PostgreSQL.\n"
+"\n"
+
+#: initdb.c:2870
+#, c-format
+msgid "Usage:\n"
+msgstr "Användning:\n"
+
+#: initdb.c:2871
+#, c-format
+msgid " %s [OPTION]... [DATADIR]\n"
+msgstr " %s [FLAGGA]... [DATAKATALOG]\n"
+
+#: initdb.c:2872
+#, c-format
+msgid ""
+"\n"
+"Options:\n"
+msgstr ""
+"\n"
+"Programväxlar:\n"
+
+#: initdb.c:2873
+#, c-format
+msgid " -A, --auth=METHOD default authentication method for local connections\n"
+msgstr " -A, --auth=METOD förvald autentiseringsmetod för alla förbindelser\n"
+
+#: initdb.c:2874
+#, c-format
+msgid " --auth-host=METHOD default authentication method for local TCP/IP connections\n"
+msgstr " --auth-host=METOD autentiseringsmetod för TCP/IP-förbindelser\n"
+
+#: initdb.c:2875
+#, c-format
+msgid " --auth-local=METHOD default authentication method for local-socket connections\n"
+msgstr " --auth-local=METOD autentiseringsmetod för förbindelser via unix-uttag\n"
+
+#: initdb.c:2876
+#, c-format
+msgid " [-D, --pgdata=]DATADIR location for this database cluster\n"
+msgstr " [-D, --pgdata=]DATAKATALOG läge för detta databaskluster\n"
+
+#: initdb.c:2877
+#, c-format
+msgid " -E, --encoding=ENCODING set default encoding for new databases\n"
+msgstr " -E, --encoding=KODNING sätter teckenkodning för nya databaser\n"
+
+#: initdb.c:2878
+#, c-format
+msgid " --locale=LOCALE set default locale for new databases\n"
+msgstr " --locale=LOKAL sätter standardlokal för nya databaser\n"
+
+#: initdb.c:2879
+#, c-format
+msgid ""
+" --lc-collate=, --lc-ctype=, --lc-messages=LOCALE\n"
+" --lc-monetary=, --lc-numeric=, --lc-time=LOCALE\n"
+" set default locale in the respective category for\n"
+" new databases (default taken from environment)\n"
+msgstr ""
+" --lc-collate=, --lc-ctype=, --lc-messages=LOKAL\n"
+" --lc-monetary=, --lc-numeric=, --lc-time=LOKAL\n"
+" sätter standardlokal i utvald kategori för\n"
+" nya databaser (förval hämtas ur omgivningen)\n"
+
+#: initdb.c:2883
+#, c-format
+msgid " --no-locale equivalent to --locale=C\n"
+msgstr " --no-locale samma som --locale=C\n"
+
+#: initdb.c:2884
+#, c-format
+msgid " --pwfile=FILE read password for the new superuser from file\n"
+msgstr " --pwfile=FIL läser lösenord för superanvändare från fil\n"
+
+#: initdb.c:2885
+#, c-format
+msgid ""
+" -T, --text-search-config=CFG\n"
+" default text search configuration\n"
+msgstr ""
+" -T, --text-search-config=CFG\n"
+" standardkonfiguration för textsökning\n"
+
+#: initdb.c:2887
+#, c-format
+msgid " -U, --username=NAME database superuser name\n"
+msgstr " -U, --username=NAMN namn på databasens superanvändare\n"
+
+#: initdb.c:2888
+#, c-format
+msgid " -W, --pwprompt prompt for a password for the new superuser\n"
+msgstr " -W, --pwprompt efterfråga lösenord för superanvändare\n"
+
+#: initdb.c:2889
+#, c-format
+msgid " -X, --xlogdir=XLOGDIR location for the transaction log directory\n"
+msgstr " -X, --xlogdir=XLOGDIR läge för filkatalog med transaktionsloggar\n"
+
+#: initdb.c:2890
+#, c-format
+msgid ""
+"\n"
+"Less commonly used options:\n"
+msgstr ""
+"\n"
+"Mindre vanliga växlar:\n"
+
+#: initdb.c:2891
+#, c-format
+msgid " -d, --debug generate lots of debugging output\n"
+msgstr " -d, --debug generera massor med debug-utskrifter\n"
+
+#: initdb.c:2892
+#, c-format
+msgid " -k, --data-checksums use data page checksums\n"
+msgstr " -k, --data-checksums använd checksummor på datablock\n"
+
+#: initdb.c:2893
+#, c-format
+msgid " -L DIRECTORY where to find the input files\n"
+msgstr " -L KATALOG filkatalog där indatafiler skall sökas\n"
+
+#: initdb.c:2894
+#, c-format
+msgid " -n, --noclean do not clean up after errors\n"
+msgstr " -n, --noclean städa inte efter felutfall\n"
+
+#: initdb.c:2895
+#, c-format
+msgid " -N, --nosync do not wait for changes to be written safely to disk\n"
+msgstr " -N, --nosync invänta ej skrivning till lagringsmedium\n"
+
+#: initdb.c:2896
+#, c-format
+msgid " -s, --show show internal settings\n"
+msgstr " -s, --show visa interna inställningar\n"
+
+#: initdb.c:2897
+#, c-format
+msgid " -S, --sync-only only sync data directory\n"
+msgstr " -S, --sync-only synkning endast av datakatalog\n"
+
+#: initdb.c:2898
+#, c-format
+msgid ""
+"\n"
+"Other options:\n"
+msgstr ""
+"\n"
+"Andra växlar:\n"
+
+#: initdb.c:2899
+#, c-format
+msgid " -V, --version output version information, then exit\n"
+msgstr " -V, --version visa versionsinformation, avsluta sedan\n"
+
+#: initdb.c:2900
+#, c-format
+msgid " -?, --help show this help, then exit\n"
+msgstr " -?, --help visa denna hjälp, avsluta sedan\n"
+
+#: initdb.c:2901
+#, c-format
+msgid ""
+"\n"
+"If the data directory is not specified, the environment variable PGDATA\n"
+"is used.\n"
+msgstr ""
+"\n"
+"Om datakatalogen inte anges så tas den från omgivningsvariabeln PGDATA.\n"
+
+#: initdb.c:2903
+#, c-format
+msgid ""
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr ""
+"\n"
+"Rapportera fel till <pgsql-bugs@postgresql.org>.\n"
+
+#: initdb.c:2911
+msgid ""
+"\n"
+"WARNING: enabling \"trust\" authentication for local connections\n"
+"You can change this by editing pg_hba.conf or using the option -A, or\n"
+"--auth-local and --auth-host, the next time you run initdb.\n"
+msgstr ""
+"\n"
+"VARNING: Autentiseringsmetod \"trust\" är aktiv för någon uppkoppling.\n"
+"Du kan ändra detta genom att redigera \"pg_hba.conf\" eller genom att sätta\n"
+"växel -A eller --auth-local och --auth-host nästa gång du kör initdb.\n"
+
+#: initdb.c:2933
+#, c-format
+msgid "%s: invalid authentication method \"%s\" for \"%s\" connections\n"
+msgstr "%s: Ogiltig autentiseringsmetod \"%s\" vid förbindelseslag \"%s\".\n"
+
+#: initdb.c:2947
+#, c-format
+msgid "%s: must specify a password for the superuser to enable %s authentication\n"
+msgstr ""
+"%s: Du måste ange ett lösenord för superanvändaren för att\n"
+"kunna slå på autentisering \"%s\".\n"
+
+#: initdb.c:2980
+#, c-format
+msgid "%s: could not re-execute with restricted token: error code %lu\n"
+msgstr "%s: kunde inte upprepa med restriktivt styrmärke (token): felkod %lu\n"
+
+#: initdb.c:2995
+#, c-format
+msgid "%s: could not get exit code from subprocess: error code %lu\n"
+msgstr "%s: kunde inte utvinna statuskod för underprocess: felkod %lu\n"
+
+#: initdb.c:3021
+#, c-format
+msgid ""
+"%s: no data directory specified\n"
+"You must identify the directory where the data for this database system\n"
+"will reside. Do this with either the invocation option -D or the\n"
+"environment variable PGDATA.\n"
+msgstr ""
+"%s: Ingen datakatalog angiven.\n"
+"Du måste uppge den filkatalog där data för detta databassystem\n"
+"skall lagras. Gör det antingen med växeln -D eller genom att\n"
+"sätta omgivningsvariabeln PGDATA.\n"
+
+#: initdb.c:3059
+#, c-format
+msgid ""
+"The program \"postgres\" is needed by %s but was not found in the\n"
+"same directory as \"%s\".\n"
+"Check your installation.\n"
+msgstr ""
+"Programmet \"postgres\" behövs av %s men kunde inte hittas\n"
+"i samma filkatalog som \"%s\".\n"
+"Kontrollera din installation.\n"
+
+#: initdb.c:3066
+#, c-format
+msgid ""
+"The program \"postgres\" was found by \"%s\"\n"
+"but was not the same version as %s.\n"
+"Check your installation.\n"
+msgstr ""
+"Programmet \"postgres\" hittades av \"%s\",\n"
+"men det är inte byggt i samma version som %s.\n"
+"Kontrollera din installation.\n"
+
+#: initdb.c:3085
+#, c-format
+msgid "%s: input file location must be an absolute path\n"
+msgstr "%s: Läget för indatafiler måste vara en absolut sökväg.\n"
+
+#: initdb.c:3104
+#, c-format
+msgid "The database cluster will be initialized with locale \"%s\".\n"
+msgstr "Databasklustret kommer att skapas med lokalnamn \"%s\".\n"
+
+#: initdb.c:3107
+#, c-format
+msgid ""
+"The database cluster will be initialized with locales\n"
+" COLLATE: %s\n"
+" CTYPE: %s\n"
+" MESSAGES: %s\n"
+" MONETARY: %s\n"
+" NUMERIC: %s\n"
+" TIME: %s\n"
+msgstr ""
+"Databasklustret kommer att initieras med lokalkategorier:\n"
+" COLLATE: %s\n"
+" CTYPE: %s\n"
+" MESSAGES: %s\n"
+" MONETARY: %s\n"
+" NUMERIC: %s\n"
+" TIME: %s\n"
+
+#: initdb.c:3131
+#, c-format
+msgid "%s: could not find suitable encoding for locale \"%s\"\n"
+msgstr "%s: Kunde inte välja en lämplig kodning för lokalnamn \"%s\".\n"
+
+#: initdb.c:3133
+#, c-format
+msgid "Rerun %s with the -E option.\n"
+msgstr "Upprepa %s, men nu med växeln -E.\n"
+
+#: initdb.c:3134 initdb.c:3710 initdb.c:3731
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "Försök med \"%s --help\" för mer information.\n"
+
+#: initdb.c:3146
+#, c-format
+msgid ""
+"Encoding \"%s\" implied by locale is not allowed as a server-side encoding.\n"
+"The default database encoding will be set to \"%s\" instead.\n"
+msgstr ""
+"Teckenkodning \"%s\", tagen ur lokalnamnet, är inte godtagbar för servern.\n"
+"I dess ställe sättes databasens förvalda teckenkodning till \"%s\".\n"
+
+#: initdb.c:3154
+#, c-format
+msgid "%s: locale \"%s\" requires unsupported encoding \"%s\"\n"
+msgstr "%s: Lokalnamn \"%s\" kräver otillgänglig teckenkodning \"%s\".\n"
+
+#: initdb.c:3157
+#, c-format
+msgid ""
+"Encoding \"%s\" is not allowed as a server-side encoding.\n"
+"Rerun %s with a different locale selection.\n"
+msgstr ""
+"Teckenkodning \"%s\" är inte godtagbar för servern.\n"
+"Upprepa %s med annat lokalnamn.\n"
+
+#: initdb.c:3166
+#, c-format
+msgid "The default database encoding has accordingly been set to \"%s\".\n"
+msgstr "Förvald teckenkodning för databaser är satt till \"%s\".\n"
+
+#: initdb.c:3237
+#, c-format
+msgid "%s: could not find suitable text search configuration for locale \"%s\"\n"
+msgstr "%s: Kunde inte hitta en lämplig textsökningskonfiguration för lokalnamn \"%s\".\n"
+
+#: initdb.c:3248
+#, c-format
+msgid "%s: warning: suitable text search configuration for locale \"%s\" is unknown\n"
+msgstr "%s: Varning: Ingen lämplig textsökningskonfiguration för lokalnamn \"%s\".\n"
+
+#: initdb.c:3253
+#, c-format
+msgid "%s: warning: specified text search configuration \"%s\" might not match locale \"%s\"\n"
+msgstr ""
+"%s: Varning: Uppgiven textsökningskonfiguration \"%s\" passar\n"
+"kanske inte till lokalnamn \"%s\".\n"
+
+#: initdb.c:3258
+#, c-format
+msgid "The default text search configuration will be set to \"%s\".\n"
+msgstr "Förvald textsökningskonfiguration för databaser är satt till \"%s\".\n"
+
+#: initdb.c:3302 initdb.c:3380
+#, c-format
+msgid "creating directory %s ... "
+msgstr "Skapar filkatalog %s ... "
+
+#: initdb.c:3316 initdb.c:3398
+#, c-format
+msgid "fixing permissions on existing directory %s ... "
+msgstr "Sätter rättigheter på existerande filkatalog %s ... "
+
+#: initdb.c:3322 initdb.c:3404
+#, c-format
+msgid "%s: could not change permissions of directory \"%s\": %s\n"
+msgstr "%s: Kunde inte ändra rättigheter på filkatalog \"%s\": %s\n"
+
+#: initdb.c:3337 initdb.c:3419
+#, c-format
+msgid "%s: directory \"%s\" exists but is not empty\n"
+msgstr "%s: Katalogen \"%s\" existerar men är inte tom.\n"
+
+#: initdb.c:3343
+#, c-format
+msgid ""
+"If you want to create a new database system, either remove or empty\n"
+"the directory \"%s\" or run %s\n"
+"with an argument other than \"%s\".\n"
+msgstr ""
+"Om du vill skapa ett nytt databassystem, tag då antingen bort\n"
+"filkatalogen \"%s\", töm densamma, eller kör %s\n"
+"med annat argument än \"%s\".\n"
+
+#: initdb.c:3351 initdb.c:3432
+#, c-format
+msgid "%s: could not access directory \"%s\": %s\n"
+msgstr "%s: Kunde inte komma åt filkatalog \"%s\": %s\n"
+
+#: initdb.c:3371
+#, c-format
+msgid "%s: transaction log directory location must be an absolute path\n"
+msgstr "%s: Filkatalogen för transaktionsloggar måste vara en absolut sökväg.\n"
+
+#: initdb.c:3425
+#, c-format
+msgid ""
+"If you want to store the transaction log there, either\n"
+"remove or empty the directory \"%s\".\n"
+msgstr ""
+"Om du vill lagra transaktionsloggen där, radera eller töm\n"
+"då filkatalogen \"%s\" först.\n"
+
+#: initdb.c:3443
+#, c-format
+msgid "%s: could not create symbolic link \"%s\": %s\n"
+msgstr "%s: Kunde inte skapa symbolisk länk \"%s\": %s\n"
+
+#: initdb.c:3448
+#, c-format
+msgid "%s: symlinks are not supported on this platform"
+msgstr "%s: symboliska länkar stöds inte på denna plattform"
+
+#: initdb.c:3461
+#, c-format
+msgid "It contains a dot-prefixed/invisible file, perhaps due to it being a mount point.\n"
+msgstr "Den innehåller en gömd fil, med inledande punkt i namnet; kanske är detta en infästningspunkt.\n"
+
+#: initdb.c:3464
+#, c-format
+msgid "It contains a lost+found directory, perhaps due to it being a mount point.\n"
+msgstr "Den innehåller \"lost+found\"; kanske är detta en infästningspunkt.\n"
+
+#: initdb.c:3467
+#, c-format
+msgid ""
+"Using a mount point directly as the data directory is not recommended.\n"
+"Create a subdirectory under the mount point.\n"
+msgstr ""
+"Att nyttja en infästningspunkt som databaskatalog är dumt.\n"
+"Skapa först en underkatalog i fästpunkten.\n"
+
+#: initdb.c:3486
+#, c-format
+msgid "creating subdirectories ... "
+msgstr "Skapar underkataloger ... "
+
+#: initdb.c:3654
+#, c-format
+msgid "Running in debug mode.\n"
+msgstr "Kör i debug-läge.\n"
+
+#: initdb.c:3658
+#, c-format
+msgid "Running in noclean mode. Mistakes will not be cleaned up.\n"
+msgstr "Kör i noclean-läge. Misstag kommer inte städas bort.\n"
+
+#: initdb.c:3729
+#, c-format
+msgid "%s: too many command-line arguments (first is \"%s\")\n"
+msgstr "%s: För många kommandoradsargument. Först kommer \"%s\".\n"
+
+#: initdb.c:3746
+#, c-format
+msgid "%s: password prompt and password file cannot be specified together\n"
+msgstr "%s: Lösenordsfråga och lösenordsfil kan inte anges samtidigt.\n"
+
+#: initdb.c:3768
+#, c-format
+msgid ""
+"The files belonging to this database system will be owned by user \"%s\".\n"
+"This user must also own the server process.\n"
+"\n"
+msgstr ""
+"Filer tillhörande databasen kommer att ägas av användaren \"%s\".\n"
+"Denna användare måste också vara ägare av server-processen.\n"
+"\n"
+
+#: initdb.c:3784
+#, c-format
+msgid "Data page checksums are enabled.\n"
+msgstr "Checksummor för datablock är aktiva.\n"
+
+#: initdb.c:3786
+#, c-format
+msgid "Data page checksums are disabled.\n"
+msgstr "Checksummor för datablock är avstängda.\n"
+
+#: initdb.c:3795
+#, c-format
+msgid ""
+"\n"
+"Sync to disk skipped.\n"
+"The data directory might become corrupt if the operating system crashes.\n"
+msgstr ""
+"\n"
+"Avstod från synkning mot lagringsmedium.\n"
+"Datakatalogen kan komma att fördärvas om operativsystemet störtar.\n"
+
+#: initdb.c:3804
+#, c-format
+msgid ""
+"\n"
+"Success. You can now start the database server using:\n"
+"\n"
+" %s%s%spostgres%s -D %s%s%s\n"
+"or\n"
+" %s%s%spg_ctl%s -D %s%s%s -l logfile start\n"
+"\n"
+msgstr ""
+"\n"
+"Uppdrag fullgjort! Du kan nu starta databasservern med endera av:\n"
+"\n"
+" %s%s%spostgres%s -D %s%s%s\n"
+"eller\n"
+" %s%s%spg_ctl%s -D %s%s%s -l loggfil start\n"
+"\n"
diff --git a/src/bin/initdb/po/zh_CN.po b/src/bin/initdb/po/zh_CN.po
index 391431c30ea..3986eab28fe 100644
--- a/src/bin/initdb/po/zh_CN.po
+++ b/src/bin/initdb/po/zh_CN.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: initdb (PostgreSQL 9.0)\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2013-09-02 00:27+0000\n"
-"PO-Revision-Date: 2013-09-02 10:57+0800\n"
+"POT-Creation-Date: 2014-11-22 21:12+0000\n"
+"PO-Revision-Date: 2014-12-06 13:06+0800\n"
"Last-Translator: Xiong He <iihero@qq.com>\n"
"Language-Team: Chinese (Simplified)\n"
"Language: zh_CN\n"
@@ -16,6 +16,43 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.5.4\n"
+#: ../../common/exec.c:127 ../../common/exec.c:241 ../../common/exec.c:284
+#, c-format
+msgid "could not identify current directory: %s"
+msgstr "无法确认当前目录: %s"
+
+# command.c:122
+#: ../../common/exec.c:146
+#, c-format
+msgid "invalid binary \"%s\""
+msgstr "无效的二进制码 \"%s\""
+
+# command.c:1103
+#: ../../common/exec.c:195
+#, c-format
+msgid "could not read binary \"%s\""
+msgstr "无法读取二进制码 \"%s\""
+
+#: ../../common/exec.c:202
+#, c-format
+msgid "could not find a \"%s\" to execute"
+msgstr "未能找到一个 \"%s\" 来执行"
+
+#: ../../common/exec.c:257 ../../common/exec.c:293
+#, c-format
+msgid "could not change directory to \"%s\": %s"
+msgstr "无法跳转到目录 \"%s\" 中: %s"
+
+#: ../../common/exec.c:272
+#, c-format
+msgid "could not read symbolic link \"%s\""
+msgstr "无法读取符号链结 \"%s\""
+
+#: ../../common/exec.c:523
+#, c-format
+msgid "pclose failed: %s"
+msgstr "pclose调用失败: %s"
+
#: ../../common/fe_memutils.c:33 ../../common/fe_memutils.c:60
#: ../../common/fe_memutils.c:83
#, c-format
@@ -25,218 +62,203 @@ msgstr "内存溢出\n"
# common.c:78
#: ../../common/fe_memutils.c:77
#, c-format
-#| msgid "pg_strdup: cannot duplicate null pointer (internal error)\n"
msgid "cannot duplicate null pointer (internal error)\n"
msgstr "无法复制空指针 (内部错误)\n"
-#: ../../port/dirmod.c:220
-#, c-format
-msgid "could not set junction for \"%s\": %s\n"
-msgstr "无法为 \"%s\"设置连接: %s\n"
-
-#: ../../port/dirmod.c:295
-#, c-format
-msgid "could not get junction for \"%s\": %s\n"
-msgstr "无法为\"%s\"得到连接: %s\n"
-
-#: ../../port/dirmod.c:377
+#: ../../common/pgfnames.c:45
#, c-format
msgid "could not open directory \"%s\": %s\n"
msgstr "无法打开目录 \"%s\": %s\n"
-#: ../../port/dirmod.c:414
+#: ../../common/pgfnames.c:72
#, c-format
msgid "could not read directory \"%s\": %s\n"
msgstr "无法读取目录 \"%s\": %s\n"
-#: ../../port/dirmod.c:497
+#: ../../common/pgfnames.c:84
+#, c-format
+#| msgid "could not open directory \"%s\": %s\n"
+msgid "could not close directory \"%s\": %s\n"
+msgstr "无法关闭目录 \"%s\": %s\n"
+
+#: ../../common/rmtree.c:77
#, c-format
msgid "could not stat file or directory \"%s\": %s\n"
msgstr "无法获取文件或目录 \"%s\"的状态: %s\n"
-#: ../../port/dirmod.c:524 ../../port/dirmod.c:541
+#: ../../common/rmtree.c:104 ../../common/rmtree.c:121
#, c-format
msgid "could not remove file or directory \"%s\": %s\n"
msgstr "无法删除文件或目录 \"%s\": %s\n"
-#: ../../port/exec.c:127 ../../port/exec.c:241 ../../port/exec.c:284
-#, c-format
-msgid "could not identify current directory: %s"
-msgstr "无法确认当前目录: %s"
-
-# command.c:122
-#: ../../port/exec.c:146
+#: ../../common/username.c:45
#, c-format
-msgid "invalid binary \"%s\""
-msgstr "无效的二进制码 \"%s\""
+#| msgid "could not load private key file \"%s\": %s"
+msgid "could not look up effective user ID %ld: %s"
+msgstr "无法找到有效的用户ID %ld: %s"
-# command.c:1103
-#: ../../port/exec.c:195
-#, c-format
-msgid "could not read binary \"%s\""
-msgstr "无法读取二进制码 \"%s\""
-
-#: ../../port/exec.c:202
-#, c-format
-msgid "could not find a \"%s\" to execute"
-msgstr "未能找到一个 \"%s\" 来执行"
-
-#: ../../port/exec.c:257 ../../port/exec.c:293
-#, c-format
-#| msgid "could not change directory to \"%s\": %m"
-msgid "could not change directory to \"%s\": %s"
-msgstr "无法跳转到目录 \"%s\" 中: %s"
-
-#: ../../port/exec.c:272
-#, c-format
-msgid "could not read symbolic link \"%s\""
-msgstr "无法读取符号链结 \"%s\""
+#: ../../common/username.c:47
+#| msgid "server \"%s\" does not exist"
+msgid "user does not exist"
+msgstr "用户不存在"
-#: ../../port/exec.c:523
+#: ../../common/username.c:61
#, c-format
-#| msgid "query failed: %s"
-msgid "pclose failed: %s"
-msgstr "pclose调用失败: %s"
+msgid "user name lookup failure: %s"
+msgstr "用户名查找失败: %s"
-#: ../../port/wait_error.c:47
+#: ../../common/wait_error.c:47
#, c-format
-#| msgid "could not execute plan"
msgid "command not executable"
msgstr "命令无法执行"
-#: ../../port/wait_error.c:51
+#: ../../common/wait_error.c:51
#, c-format
-#| msgid "case not found"
msgid "command not found"
msgstr "命令没有找到"
-#: ../../port/wait_error.c:56
+#: ../../common/wait_error.c:56
#, c-format
msgid "child process exited with exit code %d"
msgstr "子进程已退出, 退出码为 %d"
-#: ../../port/wait_error.c:63
+#: ../../common/wait_error.c:63
#, c-format
msgid "child process was terminated by exception 0x%X"
msgstr "子进程被例外(exception) 0x%X 终止"
-#: ../../port/wait_error.c:73
+#: ../../common/wait_error.c:73
#, c-format
msgid "child process was terminated by signal %s"
msgstr "子进程被信号 %s 终止"
-#: ../../port/wait_error.c:77
+#: ../../common/wait_error.c:77
#, c-format
msgid "child process was terminated by signal %d"
msgstr "子进程被信号 %d 终止"
-#: ../../port/wait_error.c:82
+#: ../../common/wait_error.c:82
#, c-format
msgid "child process exited with unrecognized status %d"
msgstr "子进程已退出, 未知状态 %d"
-#: initdb.c:327
+#: ../../port/dirmod.c:219
+#, c-format
+msgid "could not set junction for \"%s\": %s\n"
+msgstr "无法为 \"%s\"设置连接: %s\n"
+
+#: ../../port/dirmod.c:294
+#, c-format
+msgid "could not get junction for \"%s\": %s\n"
+msgstr "无法为\"%s\"得到连接: %s\n"
+
+#: initdb.c:337
#, c-format
msgid "%s: out of memory\n"
msgstr "%s: 内存溢出\n"
-#: initdb.c:437 initdb.c:1543
+#: initdb.c:447 initdb.c:1653
#, c-format
msgid "%s: could not open file \"%s\" for reading: %s\n"
msgstr "%s: 为了读取, 无法打开文件 \"%s\": %s\n"
-#: initdb.c:493 initdb.c:1036 initdb.c:1065
+#: initdb.c:503 initdb.c:1055 initdb.c:1083
#, c-format
msgid "%s: could not open file \"%s\" for writing: %s\n"
msgstr "%s: 为了写, 无法打开文件 \"%s\": %s\n"
-#: initdb.c:501 initdb.c:509 initdb.c:1043 initdb.c:1071
+#: initdb.c:511 initdb.c:519 initdb.c:1062 initdb.c:1089
#, c-format
msgid "%s: could not write file \"%s\": %s\n"
msgstr "%s: 无法写文件 \"%s\": %s\n"
-#: initdb.c:531
+#: initdb.c:541 initdb.c:608
#, c-format
msgid "%s: could not open directory \"%s\": %s\n"
msgstr "%s: 无法打开目录 \"%s\": %s\n"
-#: initdb.c:548
+#: initdb.c:558
#, c-format
msgid "%s: could not stat file \"%s\": %s\n"
msgstr "%s: 无法统计文件: \"%s\": %s\n"
-#: initdb.c:571
+#: initdb.c:571 initdb.c:628
#, c-format
-#| msgid "%s: could not create directory \"%s\": %s\n"
msgid "%s: could not read directory \"%s\": %s\n"
msgstr "%s: 无法读取目录 \"%s\": %s\n"
-#: initdb.c:608 initdb.c:660
+#: initdb.c:578 initdb.c:635
+#, c-format
+#| msgid "%s: could not open directory \"%s\": %s\n"
+msgid "%s: could not close directory \"%s\": %s\n"
+msgstr "%s: 无法关闭目录 \"%s\": %s\n"
+
+#: initdb.c:662 initdb.c:714
#, c-format
msgid "%s: could not open file \"%s\": %s\n"
msgstr "%s: 无法打开文件 \"%s\": %s\n"
-#: initdb.c:676
+#: initdb.c:730
#, c-format
msgid "%s: could not fsync file \"%s\": %s\n"
msgstr "%s: 无法对文件 \"%s\"进行fsync同步: %s\n"
-#: initdb.c:697
+#: initdb.c:751
#, c-format
msgid "%s: could not execute command \"%s\": %s\n"
msgstr "%s: 无法执行命令 \"%s\": %s\n"
-#: initdb.c:713
+#: initdb.c:767
#, c-format
msgid "%s: removing data directory \"%s\"\n"
msgstr "%s: 删除数据目录 \"%s\"\n"
-#: initdb.c:716
+#: initdb.c:770
#, c-format
msgid "%s: failed to remove data directory\n"
msgstr "%s: 删除数据目录失败\n"
-#: initdb.c:722
+#: initdb.c:776
#, c-format
msgid "%s: removing contents of data directory \"%s\"\n"
msgstr "%s: 删除数据目录 \"%s\" 的内容\n"
-#: initdb.c:725
+#: initdb.c:779
#, c-format
msgid "%s: failed to remove contents of data directory\n"
msgstr "%s: 删除数据目录内容失败\n"
-#: initdb.c:731
+#: initdb.c:785
#, c-format
msgid "%s: removing transaction log directory \"%s\"\n"
msgstr "%s: 正在删除事务日志文件目录 \"%s\"\n"
-#: initdb.c:734
+#: initdb.c:788
#, c-format
msgid "%s: failed to remove transaction log directory\n"
msgstr "%s: 删除数据目录失败\n"
-#: initdb.c:740
+#: initdb.c:794
#, c-format
msgid "%s: removing contents of transaction log directory \"%s\"\n"
msgstr "%s: 删除事务日志目录 \"%s\" 的内容\n"
-#: initdb.c:743
+#: initdb.c:797
#, c-format
msgid "%s: failed to remove contents of transaction log directory\n"
msgstr "%s: 删除事务日志目录的内容失败\n"
-#: initdb.c:752
+#: initdb.c:806
#, c-format
msgid "%s: data directory \"%s\" not removed at user's request\n"
msgstr "%s: 在用户的要求下数据库目录 \"%s\" 不被删除\n"
-#: initdb.c:757
+#: initdb.c:811
#, c-format
msgid "%s: transaction log directory \"%s\" not removed at user's request\n"
msgstr "%s: 在用户的要求下不删除事务日志目录 \"%s\"\n"
-#: initdb.c:779
+#: initdb.c:832
#, c-format
msgid ""
"%s: cannot be run as root\n"
@@ -247,32 +269,22 @@ msgstr ""
"请以服务器进程所有者的用户 (无特权) 身份\n"
"登陆 (使用, e.g., \"su\").\n"
-#: initdb.c:791
-#, c-format
-msgid "%s: could not obtain information about current user: %s\n"
-msgstr "%s: 无法获得当前用户的信息: %s\n"
-
-#: initdb.c:808
-#, c-format
-msgid "%s: could not get current user name: %s\n"
-msgstr "%s: 无法获取当前用户名称: %s\n"
-
-#: initdb.c:839
+#: initdb.c:868
#, c-format
msgid "%s: \"%s\" is not a valid server encoding name\n"
msgstr "%s: \"%s\" 不是一个有效的服务器编码名字\n"
-#: initdb.c:956 initdb.c:3246
+#: initdb.c:982 initdb.c:3382
#, c-format
msgid "%s: could not create directory \"%s\": %s\n"
msgstr "%s: 无法创建目录 \"%s\": %s\n"
-#: initdb.c:986
+#: initdb.c:1011
#, c-format
msgid "%s: file \"%s\" does not exist\n"
msgstr "%s: 文件 \"%s\" 不存在\n"
-#: initdb.c:988 initdb.c:997 initdb.c:1007
+#: initdb.c:1013 initdb.c:1022 initdb.c:1032
#, c-format
msgid ""
"This might mean you have a corrupted installation or identified\n"
@@ -281,36 +293,47 @@ msgstr ""
"这意味着您的安装发生了错误或\n"
"使用 -L 选项指定了错误的路径.\n"
-#: initdb.c:994
+#: initdb.c:1019
#, c-format
msgid "%s: could not access file \"%s\": %s\n"
msgstr "%s: 无法访问文件 \"%s\": %s\n"
-#: initdb.c:1005
+#: initdb.c:1030
#, c-format
msgid "%s: file \"%s\" is not a regular file\n"
msgstr "%s: 文件 \"%s\" 不是常规文件\n"
-#: initdb.c:1113
+#: initdb.c:1175
#, c-format
msgid "selecting default max_connections ... "
msgstr "选择默认最大联接数 (max_connections) ... "
-#: initdb.c:1142
+#: initdb.c:1205
#, c-format
msgid "selecting default shared_buffers ... "
msgstr "选择默认共享缓冲区大小 (shared_buffers) ... "
-#: initdb.c:1186
+#: initdb.c:1238
+#, c-format
+msgid "selecting dynamic shared memory implementation ... "
+msgstr "选择动态共享内存实现 ......"
+
+#: initdb.c:1256
msgid "creating configuration files ... "
msgstr "创建配置文件 ... "
-#: initdb.c:1381
+#: initdb.c:1347 initdb.c:1367 initdb.c:1451 initdb.c:1467
+#, c-format
+#| msgid "%s: could not change permissions of directory \"%s\": %s\n"
+msgid "%s: could not change permissions of \"%s\": %s\n"
+msgstr "%s: 无法改变\"%s\"的权限:%s\n"
+
+#: initdb.c:1491
#, c-format
msgid "creating template1 database in %s/base/1 ... "
msgstr "在 %s/base/1 中创建 template1 数据库 ... "
-#: initdb.c:1397
+#: initdb.c:1507
#, c-format
msgid ""
"%s: input file \"%s\" does not belong to PostgreSQL %s\n"
@@ -319,142 +342,154 @@ msgstr ""
"%s: 输入文件 \"%s\" 不属于 PostgreSQL %s\n"
"检查你的安装或使用 -L 选项指定正确的路径.\n"
-#: initdb.c:1484
+#: initdb.c:1594
msgid "initializing pg_authid ... "
msgstr "初始化 pg_authid ... "
-#: initdb.c:1518
+#: initdb.c:1628
msgid "Enter new superuser password: "
msgstr "输入新的超级用户口令: "
-#: initdb.c:1519
+#: initdb.c:1629
msgid "Enter it again: "
msgstr "再输入一遍: "
-#: initdb.c:1522
+#: initdb.c:1632
#, c-format
msgid "Passwords didn't match.\n"
msgstr "口令不匹配.\n"
-#: initdb.c:1549
+#: initdb.c:1659
#, c-format
msgid "%s: could not read password from file \"%s\": %s\n"
msgstr "%s: 无法从文件 \"%s\" 读取口令: %s\n"
-#: initdb.c:1562
+#: initdb.c:1672
#, c-format
msgid "setting password ... "
msgstr "设置口令 ... "
-#: initdb.c:1662
+#: initdb.c:1772
msgid "initializing dependencies ... "
msgstr "初始化dependencies ... "
-#: initdb.c:1690
+#: initdb.c:1800
msgid "creating system views ... "
msgstr "创建系统视图 ... "
-#: initdb.c:1726
+#: initdb.c:1836
msgid "loading system objects' descriptions ... "
msgstr "正在加载系统对象描述 ..."
-#: initdb.c:1832
+#: initdb.c:1942
msgid "creating collations ... "
msgstr "创建(字符集)校对规则 ... "
-#: initdb.c:1865
+#: initdb.c:1975
#, c-format
msgid "%s: locale name too long, skipped: \"%s\"\n"
msgstr "%s: 本地化名称太长, 跳过: \"%s\"\n"
-#: initdb.c:1890
+#: initdb.c:2000
#, c-format
msgid "%s: locale name has non-ASCII characters, skipped: \"%s\"\n"
msgstr "%s: 本地化名称带有非ASCII字符, 跳过: \"%s\"\n"
# describe.c:1542
-#: initdb.c:1953
+#: initdb.c:2069
#, c-format
msgid "No usable system locales were found.\n"
msgstr "没有找到可用的系统本地化名称.\n"
-#: initdb.c:1954
+#: initdb.c:2070
#, c-format
msgid "Use the option \"--debug\" to see details.\n"
msgstr "使用选项 \"--debug\" 获取细节.\n"
-#: initdb.c:1957
+#: initdb.c:2073
#, c-format
msgid "not supported on this platform\n"
msgstr "在此平台上不支持\n"
-#: initdb.c:1972
+#: initdb.c:2088
msgid "creating conversions ... "
msgstr "创建字符集转换 ... "
-#: initdb.c:2007
+#: initdb.c:2123
msgid "creating dictionaries ... "
msgstr "正在创建字典 ... "
-#: initdb.c:2061
+#: initdb.c:2177
msgid "setting privileges on built-in objects ... "
msgstr "对内建对象设置权限 ... "
-#: initdb.c:2119
+#: initdb.c:2235
msgid "creating information schema ... "
msgstr "创建信息模式 ... "
-#: initdb.c:2175
+#: initdb.c:2291
msgid "loading PL/pgSQL server-side language ... "
msgstr "正在装载PL/pgSQL服务器端编程语言..."
-#: initdb.c:2200
+#: initdb.c:2316
msgid "vacuuming database template1 ... "
msgstr "清理数据库 template1 ... "
-#: initdb.c:2256
+#: initdb.c:2372
msgid "copying template1 to template0 ... "
msgstr "拷贝 template1 到 template0 ... "
-#: initdb.c:2288
+#: initdb.c:2404
msgid "copying template1 to postgres ... "
msgstr "拷贝 template1 到 template0 ... "
-#: initdb.c:2314
+#: initdb.c:2431
msgid "syncing data to disk ... "
msgstr "同步数据到磁盘..."
-#: initdb.c:2386
+#: initdb.c:2510
#, c-format
msgid "caught signal\n"
msgstr "捕获信号\n"
-#: initdb.c:2392
+#: initdb.c:2516
#, c-format
msgid "could not write to child process: %s\n"
msgstr "无法写到子进程: %s\n"
-#: initdb.c:2400
+#: initdb.c:2524
#, c-format
msgid "ok\n"
msgstr "成功\n"
-#: initdb.c:2503
+#: initdb.c:2614
+#, c-format
+#| msgid "%s: select() failed: %s\n"
+msgid "%s: setlocale() failed\n"
+msgstr "%s:setlocale()调用失败\n"
+
+#: initdb.c:2632
#, c-format
msgid "%s: failed to restore old locale \"%s\"\n"
msgstr "%s: 无法恢复旧的本地化文件 \"%s\"\n"
-#: initdb.c:2509
+#: initdb.c:2642
#, c-format
msgid "%s: invalid locale name \"%s\"\n"
msgstr "%s: 无效的 locale 名字 \"%s\"\n"
-#: initdb.c:2536
+#: initdb.c:2654
+#, c-format
+msgid ""
+"%s: invalid locale settings; check LANG and LC_* environment variables\n"
+msgstr "%s:无效的本地化设置; 请检查环境变量LANG和LC_*的值\n"
+
+#: initdb.c:2682
#, c-format
msgid "%s: encoding mismatch\n"
msgstr "%s: 警告: 编码不匹配\n"
-#: initdb.c:2538
+#: initdb.c:2684
#, c-format
msgid ""
"The encoding you selected (%s) and the encoding that the\n"
@@ -469,32 +504,32 @@ msgstr ""
"组合类型.\n"
"\n"
-#: initdb.c:2657
+#: initdb.c:2789
#, c-format
msgid "%s: WARNING: cannot create restricted tokens on this platform\n"
msgstr "%s: WARNING: 无法为该平台创建受限制的令牌\n"
-#: initdb.c:2666
+#: initdb.c:2798
#, c-format
msgid "%s: could not open process token: error code %lu\n"
msgstr "%s:无法打开进程令牌 (token): 错误码 %lu\n"
-#: initdb.c:2679
+#: initdb.c:2811
#, c-format
msgid "%s: could not to allocate SIDs: error code %lu\n"
msgstr "%s: 无法分配SID: 错误码为 %lu\n"
-#: initdb.c:2698
+#: initdb.c:2830
#, c-format
msgid "%s: could not create restricted token: error code %lu\n"
msgstr "%s: 无法创建受限令牌: 错误码为 %lu\n"
-#: initdb.c:2719
+#: initdb.c:2851
#, c-format
msgid "%s: could not start process for command \"%s\": error code %lu\n"
msgstr "%s: 无法为命令 \"%s\"创建进程: 错误码 %lu\n"
-#: initdb.c:2733
+#: initdb.c:2865
#, c-format
msgid ""
"%s initializes a PostgreSQL database cluster.\n"
@@ -503,17 +538,17 @@ msgstr ""
"%s 初始化一个 PostgreSQL 数据库簇.\n"
"\n"
-#: initdb.c:2734
+#: initdb.c:2866
#, c-format
msgid "Usage:\n"
msgstr "使用方法:\n"
-#: initdb.c:2735
+#: initdb.c:2867
#, c-format
msgid " %s [OPTION]... [DATADIR]\n"
msgstr " %s [选项]... [DATADIR]\n"
-#: initdb.c:2736
+#: initdb.c:2868
#, c-format
msgid ""
"\n"
@@ -522,43 +557,43 @@ msgstr ""
"\n"
"选项:\n"
-#: initdb.c:2737
+#: initdb.c:2869
#, c-format
msgid ""
" -A, --auth=METHOD default authentication method for local "
"connections\n"
msgstr " -A, --auth=METHOD 本地连接的默认认证方法\n"
-#: initdb.c:2738
+#: initdb.c:2870
#, c-format
msgid ""
" --auth-host=METHOD default authentication method for local TCP/IP "
"connections\n"
msgstr " --auth-host=METHOD 本地的TCP/IP连接的默认认证方法\n"
-#: initdb.c:2739
+#: initdb.c:2871
#, c-format
msgid ""
" --auth-local=METHOD default authentication method for local-socket "
"connections\n"
msgstr " --auth-local=METHOD 本地socket连接的默认认证方法\n"
-#: initdb.c:2740
+#: initdb.c:2872
#, c-format
msgid " [-D, --pgdata=]DATADIR location for this database cluster\n"
msgstr " -D, --pgdata=DATADIR 当前数据库簇的位置\n"
-#: initdb.c:2741
+#: initdb.c:2873
#, c-format
msgid " -E, --encoding=ENCODING set default encoding for new databases\n"
msgstr " -E, --encoding=ENCODING 为新数据库设置默认编码\n"
-#: initdb.c:2742
+#: initdb.c:2874
#, c-format
msgid " --locale=LOCALE set default locale for new databases\n"
msgstr " --locale=LOCALE 为新数据库设置默认语言环境\n"
-#: initdb.c:2743
+#: initdb.c:2875
#, c-format
msgid ""
" --lc-collate=, --lc-ctype=, --lc-messages=LOCALE\n"
@@ -573,18 +608,18 @@ msgstr ""
" 设定缺省语言环境(默认使用环境变\n"
" 量)\n"
-#: initdb.c:2747
+#: initdb.c:2879
#, c-format
msgid " --no-locale equivalent to --locale=C\n"
msgstr " --no-locale 等同于 --locale=C\n"
-#: initdb.c:2748
+#: initdb.c:2880
#, c-format
msgid ""
" --pwfile=FILE read password for the new superuser from file\n"
msgstr " --pwfile=文件名 对于新的超级用户从文件读取口令\n"
-#: initdb.c:2749
+#: initdb.c:2881
#, c-format
msgid ""
" -T, --text-search-config=CFG\n"
@@ -593,24 +628,24 @@ msgstr ""
" -T, --text-search-config=CFG\n"
" 缺省的文本搜索配置\n"
-#: initdb.c:2751
+#: initdb.c:2883
#, c-format
msgid " -U, --username=NAME database superuser name\n"
msgstr " -U, --username=NAME 数据库超级用户名\n"
-#: initdb.c:2752
+#: initdb.c:2884
#, c-format
msgid ""
" -W, --pwprompt prompt for a password for the new superuser\n"
msgstr " -W, --pwprompt 对于新的超级用户提示输入口令\n"
-#: initdb.c:2753
+#: initdb.c:2885
#, c-format
msgid ""
" -X, --xlogdir=XLOGDIR location for the transaction log directory\n"
msgstr " -X, --xlogdir=XLOGDIR 当前事务日志目录的位置\n"
-#: initdb.c:2754
+#: initdb.c:2886
#, c-format
msgid ""
"\n"
@@ -619,46 +654,44 @@ msgstr ""
"\n"
"非普通使用选项:\n"
-#: initdb.c:2755
+#: initdb.c:2887
#, c-format
msgid " -d, --debug generate lots of debugging output\n"
msgstr " -d, --debug 产生大量的除错信息\n"
-#: initdb.c:2756
+#: initdb.c:2888
#, c-format
msgid " -k, --data-checksums use data page checksums\n"
msgstr " -k, --data-checksums 使用数据页产生效验和\n"
-#: initdb.c:2757
+#: initdb.c:2889
#, c-format
msgid " -L DIRECTORY where to find the input files\n"
msgstr " -L DIRECTORY 输入文件的位置\n"
-#: initdb.c:2758
+#: initdb.c:2890
#, c-format
msgid " -n, --noclean do not clean up after errors\n"
msgstr " -n, --noclean 出错后不清理\n"
-#: initdb.c:2759
+#: initdb.c:2891
#, c-format
-#| msgid " -n, --noclean do not clean up after errors\n"
msgid ""
" -N, --nosync do not wait for changes to be written safely to "
"disk\n"
-msgstr " -n, --nosync 不用等待变化安全写入磁盘\n"
+msgstr " -N, --nosync 不用等待变化安全写入磁盘\n"
-#: initdb.c:2760
+#: initdb.c:2892
#, c-format
msgid " -s, --show show internal settings\n"
msgstr " -s, --show 显示内部设置\n"
-#: initdb.c:2761
+#: initdb.c:2893
#, c-format
-#| msgid " -s, --schema-only dump only the schema, no data\n"
msgid " -S, --sync-only only sync data directory\n"
msgstr " -S, --sync-only 只同步数据目录\n"
-#: initdb.c:2762
+#: initdb.c:2894
#, c-format
msgid ""
"\n"
@@ -667,17 +700,17 @@ msgstr ""
"\n"
"其它选项:\n"
-#: initdb.c:2763
+#: initdb.c:2895
#, c-format
msgid " -V, --version output version information, then exit\n"
msgstr " -V, --version 输出版本信息, 然后退出\n"
-#: initdb.c:2764
+#: initdb.c:2896
#, c-format
msgid " -?, --help show this help, then exit\n"
msgstr " -?, --help 显示此帮助, 然后退出\n"
-#: initdb.c:2765
+#: initdb.c:2897
#, c-format
msgid ""
"\n"
@@ -687,7 +720,7 @@ msgstr ""
"\n"
"如果没有指定数据目录, 将使用环境变量 PGDATA\n"
-#: initdb.c:2767
+#: initdb.c:2899
#, c-format
msgid ""
"\n"
@@ -696,7 +729,7 @@ msgstr ""
"\n"
"报告错误至 <pgql-bugs@postgresql.org>.\n"
-#: initdb.c:2775
+#: initdb.c:2907
msgid ""
"\n"
"WARNING: enabling \"trust\" authentication for local connections\n"
@@ -708,28 +741,28 @@ msgstr ""
"你可以通过编辑 pg_hba.conf 更改或你下次\n"
"行 initdb 时使用 -A或者--auth-local和--auth-host选项.\n"
-#: initdb.c:2797
+#: initdb.c:2929
#, c-format
msgid "%s: invalid authentication method \"%s\" for \"%s\" connections\n"
msgstr "%s: 无效认证方法 \"%s\" 用于 \"%s\" 连接\n"
-#: initdb.c:2811
+#: initdb.c:2943
#, c-format
msgid ""
"%s: must specify a password for the superuser to enable %s authentication\n"
msgstr "%s: 为了启动 %s 认证, 你需要为超级用户指定一个口令\n"
-#: initdb.c:2844
+#: initdb.c:2976
#, c-format
msgid "%s: could not re-execute with restricted token: error code %lu\n"
msgstr "%s: 无法使用受限令牌再次执行: 错误码 %lu\n"
-#: initdb.c:2859
+#: initdb.c:2991
#, c-format
msgid "%s: could not get exit code from subprocess: error code %lu\n"
msgstr "%s: 无法从子进程得到退出码: 错误码 %lu\n"
-#: initdb.c:2885
+#: initdb.c:3017
#, c-format
msgid ""
"%s: no data directory specified\n"
@@ -742,7 +775,7 @@ msgstr ""
"存在. 使用 -D 选项或者\n"
"环境变量 PGDATA.\n"
-#: initdb.c:2924
+#: initdb.c:3055
#, c-format
msgid ""
"The program \"postgres\" is needed by %s but was not found in the\n"
@@ -753,7 +786,7 @@ msgstr ""
"\n"
"检查您的安装.\n"
-#: initdb.c:2931
+#: initdb.c:3062
#, c-format
msgid ""
"The program \"postgres\" was found by \"%s\"\n"
@@ -764,17 +797,17 @@ msgstr ""
"\n"
"检查您的安装.\n"
-#: initdb.c:2950
+#: initdb.c:3081
#, c-format
msgid "%s: input file location must be an absolute path\n"
msgstr "%s: 输入文件位置必须为绝对路径\n"
-#: initdb.c:2969
+#: initdb.c:3100
#, c-format
msgid "The database cluster will be initialized with locale \"%s\".\n"
msgstr "数据库簇将使用本地化语言 \"%s\"进行初始化.\n"
-#: initdb.c:2972
+#: initdb.c:3103
#, c-format
msgid ""
"The database cluster will be initialized with locales\n"
@@ -793,22 +826,22 @@ msgstr ""
" NUMERIC: %s\n"
" TIME: %s\n"
-#: initdb.c:2996
+#: initdb.c:3127
#, c-format
msgid "%s: could not find suitable encoding for locale \"%s\"\n"
msgstr "%s: 无法为locale(本地化语言)\"%s\"找到合适的编码\n"
-#: initdb.c:2998
+#: initdb.c:3129
#, c-format
msgid "Rerun %s with the -E option.\n"
msgstr "带 -E 选项重新运行 %s.\n"
-#: initdb.c:2999 initdb.c:3561 initdb.c:3582
+#: initdb.c:3130 initdb.c:3706 initdb.c:3727
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "请用 \"%s --help\" 获取更多的信息.\n"
-#: initdb.c:3011
+#: initdb.c:3142
#, c-format
msgid ""
"Encoding \"%s\" implied by locale is not allowed as a server-side encoding.\n"
@@ -817,12 +850,12 @@ msgstr ""
"本地化隐含的编码 \"%s\" 不允许作为服务器端的编码.\n"
"默认的数据库编码将采用 \"%s\" 作为代替.\n"
-#: initdb.c:3019
+#: initdb.c:3150
#, c-format
msgid "%s: locale \"%s\" requires unsupported encoding \"%s\"\n"
msgstr "%s: 本地化语言环境 \"%s\"要求使用不支持的编码\"%s\"\n"
-#: initdb.c:3022
+#: initdb.c:3153
#, c-format
msgid ""
"Encoding \"%s\" is not allowed as a server-side encoding.\n"
@@ -831,57 +864,57 @@ msgstr ""
"不允许将编码\"%s\"作为服务器端编码.\n"
"使用一个不同的本地化语言环境重新运行%s.\n"
-#: initdb.c:3031
+#: initdb.c:3162
#, c-format
msgid "The default database encoding has accordingly been set to \"%s\".\n"
msgstr "默认的数据库编码已经相应的设置为 \"%s\".\n"
-#: initdb.c:3102
+#: initdb.c:3233
#, c-format
msgid ""
"%s: could not find suitable text search configuration for locale \"%s\"\n"
msgstr "%s: 无法为本地化语言环境\"%s\"找到合适的文本搜索配置\n"
-#: initdb.c:3113
+#: initdb.c:3244
#, c-format
msgid ""
"%s: warning: suitable text search configuration for locale \"%s\" is "
"unknown\n"
msgstr "%s: 警告: 对于本地化语言环境\"%s\"合适的文本搜索配置未知\n"
-#: initdb.c:3118
+#: initdb.c:3249
#, c-format
msgid ""
"%s: warning: specified text search configuration \"%s\" might not match "
"locale \"%s\"\n"
msgstr "%s: 警告: 所指定的文本搜索配置\"%s\"可能与本地语言环境\"%s\"不匹配\n"
-#: initdb.c:3123
+#: initdb.c:3254
#, c-format
msgid "The default text search configuration will be set to \"%s\".\n"
msgstr "缺省的文本搜索配置将会被设置到\"%s\"\n"
-#: initdb.c:3162 initdb.c:3240
+#: initdb.c:3298 initdb.c:3376
#, c-format
msgid "creating directory %s ... "
msgstr "创建目录 %s ... "
-#: initdb.c:3176 initdb.c:3258
+#: initdb.c:3312 initdb.c:3394
#, c-format
msgid "fixing permissions on existing directory %s ... "
msgstr "修复已存在目录 %s 的权限 ... "
-#: initdb.c:3182 initdb.c:3264
+#: initdb.c:3318 initdb.c:3400
#, c-format
msgid "%s: could not change permissions of directory \"%s\": %s\n"
msgstr "%s: 无法改变目录 \"%s\" 的权限: %s\n"
-#: initdb.c:3197 initdb.c:3279
+#: initdb.c:3333 initdb.c:3415
#, c-format
msgid "%s: directory \"%s\" exists but is not empty\n"
msgstr "%s: 目录\"%s\"已存在,但不是空的\n"
-#: initdb.c:3203
+#: initdb.c:3339
#, c-format
msgid ""
"If you want to create a new database system, either remove or empty\n"
@@ -892,47 +925,47 @@ msgstr ""
"目录 \"%s\" 或者运行带参数的 %s\n"
"而不是 \"%s\".\n"
-#: initdb.c:3211 initdb.c:3292
+#: initdb.c:3347 initdb.c:3428
#, c-format
msgid "%s: could not access directory \"%s\": %s\n"
msgstr "%s: 无法访问目录 \"%s\": %s\n"
-#: initdb.c:3231
+#: initdb.c:3367
#, c-format
msgid "%s: transaction log directory location must be an absolute path\n"
msgstr "%s: 事务日志目录的位置必须为绝对路径\n"
-#: initdb.c:3285
+#: initdb.c:3421
#, c-format
msgid ""
"If you want to store the transaction log there, either\n"
"remove or empty the directory \"%s\".\n"
msgstr "如果您要存储事务日志,需要删除或者清空目录\"%s\".\n"
-#: initdb.c:3304
+#: initdb.c:3439
#, c-format
msgid "%s: could not create symbolic link \"%s\": %s\n"
msgstr "%s: 无法创建符号链接 \"%s\": %s\n"
-#: initdb.c:3309
+#: initdb.c:3444
#, c-format
msgid "%s: symlinks are not supported on this platform"
msgstr "%s: 在这个平台上不支持使用符号链接"
-#: initdb.c:3321
+#: initdb.c:3457
#, c-format
msgid ""
"It contains a dot-prefixed/invisible file, perhaps due to it being a mount "
"point.\n"
msgstr "它包含一个不可见的带固定点的文件,可能因为它是一个装载点。\n"
-#: initdb.c:3324
+#: initdb.c:3460
#, c-format
msgid ""
"It contains a lost+found directory, perhaps due to it being a mount point.\n"
msgstr "它包含名为lost+found的目录,可能因为它是一个加载点.\n"
-#: initdb.c:3327
+#: initdb.c:3463
#, c-format
msgid ""
"Using a mount point directly as the data directory is not recommended.\n"
@@ -941,32 +974,32 @@ msgstr ""
"不推荐将加载点作为数据目录.\n"
"通常在加载点下边创建一个子目录.\n"
-#: initdb.c:3346
+#: initdb.c:3482
#, c-format
msgid "creating subdirectories ... "
msgstr "正在创建子目录 ... "
-#: initdb.c:3505
+#: initdb.c:3650
#, c-format
msgid "Running in debug mode.\n"
msgstr "运行在除错模式中. \n"
-#: initdb.c:3509
+#: initdb.c:3654
#, c-format
msgid "Running in noclean mode. Mistakes will not be cleaned up.\n"
msgstr "运行在 noclean 模式中. 错误将不被清理.\n"
-#: initdb.c:3580
+#: initdb.c:3725
#, c-format
msgid "%s: too many command-line arguments (first is \"%s\")\n"
msgstr "%s: 命令行参数太多 (第一个是 \"%s\")\n"
-#: initdb.c:3597
+#: initdb.c:3742
#, c-format
msgid "%s: password prompt and password file cannot be specified together\n"
msgstr "%s: 口令提示和口令文件不能同时都指定\n"
-#: initdb.c:3619
+#: initdb.c:3764
#, c-format
msgid ""
"The files belonging to this database system will be owned by user \"%s\".\n"
@@ -976,17 +1009,17 @@ msgstr ""
"属于此数据库系统的文件宿主为用户 \"%s\".\n"
"此用户也必须为服务器进程的宿主.\n"
-#: initdb.c:3635
+#: initdb.c:3780
#, c-format
msgid "Data page checksums are enabled.\n"
msgstr "允许生成数据页校验和.\n"
-#: initdb.c:3637
+#: initdb.c:3782
#, c-format
msgid "Data page checksums are disabled.\n"
msgstr "禁止为数据页生成校验和.\n"
-#: initdb.c:3646
+#: initdb.c:3791
#, c-format
msgid ""
"\n"
@@ -997,7 +1030,7 @@ msgstr ""
"跳过同步到磁盘操作.\n"
"如果操作系统宕机,数据目录可能会毁坏.\n"
-#: initdb.c:3655
+#: initdb.c:3800
#, c-format
msgid ""
"\n"
@@ -1016,26 +1049,32 @@ msgstr ""
" %s%s%s%spg_ctl -D %s%s%s -l logfile start\n"
"\n"
-#~ msgid "%s: unrecognized authentication method \"%s\"\n"
-#~ msgstr "%s: 未知认证方法 \"%s\".\n"
+#~ msgid "could not change directory to \"%s\""
+#~ msgstr "无法进入目录 \"%s\""
-#~ msgid ""
-#~ "%s: The password file was not generated. Please report this problem.\n"
-#~ msgstr "%s: 口令文件没有生成. 请报告这个问题.\n"
+#~ msgid "creating directory %s/%s ... "
+#~ msgstr "创建目录 %s/%s ... "
-#~ msgid "%s: could not determine valid short version string\n"
-#~ msgstr "%s: 无法确定有效的短版本字符串\n"
+#~ msgid ""
+#~ " --locale=LOCALE initialize database cluster with given "
+#~ "locale\n"
+#~ msgstr " --locale=LOCALE 初始化数据库簇的 locale\n"
#~ msgid "enabling unlimited row size for system tables ... "
#~ msgstr "启动不限制系统表行大小 ... "
+#~ msgid "%s: could not determine valid short version string\n"
+#~ msgstr "%s: 无法确定有效的短版本字符串\n"
+
#~ msgid ""
-#~ " --locale=LOCALE initialize database cluster with given "
-#~ "locale\n"
-#~ msgstr " --locale=LOCALE 初始化数据库簇的 locale\n"
+#~ "%s: The password file was not generated. Please report this problem.\n"
+#~ msgstr "%s: 口令文件没有生成. 请报告这个问题.\n"
-#~ msgid "creating directory %s/%s ... "
-#~ msgstr "创建目录 %s/%s ... "
+#~ msgid "%s: unrecognized authentication method \"%s\"\n"
+#~ msgstr "%s: 未知认证方法 \"%s\".\n"
-#~ msgid "could not change directory to \"%s\""
-#~ msgstr "无法进入目录 \"%s\""
+#~ msgid "%s: could not get current user name: %s\n"
+#~ msgstr "%s: 无法获取当前用户名称: %s\n"
+
+#~ msgid "%s: could not obtain information about current user: %s\n"
+#~ msgstr "%s: 无法获得当前用户的信息: %s\n"
diff --git a/src/bin/pg_basebackup/nls.mk b/src/bin/pg_basebackup/nls.mk
index 29df4bcdb39..d94868a1a9c 100644
--- a/src/bin/pg_basebackup/nls.mk
+++ b/src/bin/pg_basebackup/nls.mk
@@ -1,4 +1,4 @@
# src/bin/pg_basebackup/nls.mk
CATALOG_NAME = pg_basebackup
-AVAIL_LANGUAGES = cs de es fr it ja pl pt_BR ru zh_CN
+AVAIL_LANGUAGES = de fr it pl pt_BR ru zh_CN
GETTEXT_FILES = pg_basebackup.c pg_receivexlog.c pg_recvlogical.c receivelog.c streamutil.c ../../common/fe_memutils.c
diff --git a/src/bin/pg_basebackup/po/cs.po b/src/bin/pg_basebackup/po/cs.po
deleted file mode 100644
index 3bb6327a0fc..00000000000
--- a/src/bin/pg_basebackup/po/cs.po
+++ /dev/null
@@ -1,914 +0,0 @@
-# Czech message translation file for pg_basebackup
-# Copyright (C) 2012 PostgreSQL Global Development Group
-# This file is distributed under the same license as the PostgreSQL package.
-#
-# Tomas Vondra <tv@fuzzy.cz>, 2012, 2013.
-msgid ""
-msgstr ""
-"Project-Id-Version: pg_basebackup-cs (PostgreSQL 9.3)\n"
-"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2013-09-23 20:18+0000\n"
-"PO-Revision-Date: 2013-12-01 20:46-0500\n"
-"Last-Translator: Tomas Vondra <tv@fuzzy.cz>\n"
-"Language-Team: Czech <info@cspug.cx>\n"
-"Language: cs\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Lokalize 1.5\n"
-
-#: ../../common/fe_memutils.c:33 ../../common/fe_memutils.c:60
-#: ../../common/fe_memutils.c:83
-#, c-format
-msgid "out of memory\n"
-msgstr "nedostatek paměti\n"
-
-#: ../../common/fe_memutils.c:77
-#, c-format
-msgid "cannot duplicate null pointer (internal error)\n"
-msgstr "nelze duplikovat null pointer (interní chyba)\n"
-
-#: pg_basebackup.c:106
-#, c-format
-msgid ""
-"%s takes a base backup of a running PostgreSQL server.\n"
-"\n"
-msgstr ""
-"%s vytvoří base backup běžícího PostgreSQL serveru.\n"
-"\n"
-
-#: pg_basebackup.c:108 pg_receivexlog.c:53
-#, c-format
-msgid "Usage:\n"
-msgstr "Použití:\n"
-
-#: pg_basebackup.c:109 pg_receivexlog.c:54
-#, c-format
-msgid " %s [OPTION]...\n"
-msgstr " %s [VOLBA]...\n"
-
-#: pg_basebackup.c:110
-#, c-format
-msgid ""
-"\n"
-"Options controlling the output:\n"
-msgstr ""
-"\n"
-"Volby ovlivňující výstup:\n"
-
-#: pg_basebackup.c:111
-#, c-format
-msgid " -D, --pgdata=DIRECTORY receive base backup into directory\n"
-msgstr " -D, --pgdata=ADRESÁŘ ulož base backup do adresáře\n"
-
-#: pg_basebackup.c:112
-#, c-format
-msgid " -F, --format=p|t output format (plain (default), tar)\n"
-msgstr " -F, --format=p|t výstupní formát (plain (výchozí), tar)\n"
-
-#: pg_basebackup.c:113
-#, c-format
-msgid ""
-" -R, --write-recovery-conf\n"
-" write recovery.conf after backup\n"
-msgstr ""
-" -R, --write-recovery-conf\n"
-" po zálohování zapíše recovery.conf\n"
-
-#: pg_basebackup.c:115
-#, c-format
-msgid ""
-" -x, --xlog include required WAL files in backup (fetch mode)\n"
-msgstr ""
-" -x, --xlog zahrne potřebné WAL soubory do zálohy (fetch mód)\n"
-
-#: pg_basebackup.c:116
-#, c-format
-msgid ""
-" -X, --xlog-method=fetch|stream\n"
-" include required WAL files with specified method\n"
-msgstr ""
-" -X, --xlog-method=fetch|stream\n"
-" zahrne potřebné WAL soubory do zálohy\n"
-
-#: pg_basebackup.c:118
-#, c-format
-msgid " -z, --gzip compress tar output\n"
-msgstr " -z, --gzip komprimuj výstup taru\n"
-
-#: pg_basebackup.c:119
-#, c-format
-msgid ""
-" -Z, --compress=0-9 compress tar output with given compression level\n"
-msgstr ""
-" -Z, --compress=0-9 komprimuj výstup taru zvolenou úrovní komprese\n"
-
-#: pg_basebackup.c:120
-#, c-format
-msgid ""
-"\n"
-"General options:\n"
-msgstr ""
-"\n"
-"Obecné volby:\n"
-
-#: pg_basebackup.c:121
-#, c-format
-msgid ""
-" -c, --checkpoint=fast|spread\n"
-" set fast or spread checkpointing\n"
-msgstr ""
-" -c, --checkpoint=fast|spread\n"
-" nastavte fast nebo spread checkpointing\n"
-
-#: pg_basebackup.c:123
-#, c-format
-msgid " -l, --label=LABEL set backup label\n"
-msgstr " -l, --label=NÁZEV nastav jmenovku zálohy\n"
-
-#: pg_basebackup.c:124
-#, c-format
-msgid " -P, --progress show progress information\n"
-msgstr " -P, --progress zobrazuj informace o průběhu\n"
-
-#: pg_basebackup.c:125 pg_receivexlog.c:58
-#, c-format
-msgid " -v, --verbose output verbose messages\n"
-msgstr " -v, --verbose zobrazuj podrobnější zprávy\n"
-
-#: pg_basebackup.c:126 pg_receivexlog.c:59
-#, c-format
-msgid " -V, --version output version information, then exit\n"
-msgstr " -V, --version vypiš informace o verzi, potom skonči\n"
-
-#: pg_basebackup.c:127 pg_receivexlog.c:60
-#, c-format
-msgid " -?, --help show this help, then exit\n"
-msgstr " -?, --help ukaž tuto nápovědu, potom skonči\n"
-
-#: pg_basebackup.c:128 pg_receivexlog.c:61
-#, c-format
-msgid ""
-"\n"
-"Connection options:\n"
-msgstr ""
-"\n"
-"Volby spojení:\n"
-
-#: pg_basebackup.c:129 pg_receivexlog.c:62
-#, c-format
-msgid " -d, --dbname=CONNSTR connection string\n"
-msgstr " -d, --dbname=CONNSTR connection string\n"
-
-#: pg_basebackup.c:130 pg_receivexlog.c:63
-#, c-format
-msgid " -h, --host=HOSTNAME database server host or socket directory\n"
-msgstr ""
-" -h, --host=HOSTNAME host databázového serveru nebo adresář se "
-"sockety\n"
-
-#: pg_basebackup.c:131 pg_receivexlog.c:64
-#, c-format
-msgid " -p, --port=PORT database server port number\n"
-msgstr " -p, --port=PORT port databázového serveru\n"
-
-#: pg_basebackup.c:132 pg_receivexlog.c:65
-#, c-format
-msgid ""
-" -s, --status-interval=INTERVAL\n"
-" time between status packets sent to server (in "
-"seconds)\n"
-msgstr ""
-" -s, --status-interval=INTERVAL\n"
-" čas mezi zasíláním packetů se stavem na server (ve "
-"vteřinách)\n"
-
-#: pg_basebackup.c:134 pg_receivexlog.c:67
-#, c-format
-msgid " -U, --username=NAME connect as specified database user\n"
-msgstr ""
-" -U, --username=JMÉNO připoj se jako uvedený databázový uživatel\n"
-
-#: pg_basebackup.c:135 pg_receivexlog.c:68
-#, c-format
-msgid " -w, --no-password never prompt for password\n"
-msgstr " -w, --no-password nikdy se neptej na heslo\n"
-
-#: pg_basebackup.c:136 pg_receivexlog.c:69
-#, c-format
-msgid ""
-" -W, --password force password prompt (should happen "
-"automatically)\n"
-msgstr ""
-" -W, --password vynuť dotaz na heslo (mělo by se dít "
-"automaticky)\n"
-
-#: pg_basebackup.c:137 pg_receivexlog.c:70
-#, c-format
-msgid ""
-"\n"
-"Report bugs to <pgsql-bugs@postgresql.org>.\n"
-msgstr ""
-"\n"
-"Chyby hlaste na adresu <pgsql-bugs@postgresql.org>.\n"
-
-#: pg_basebackup.c:180
-#, c-format
-msgid "%s: could not read from ready pipe: %s\n"
-msgstr "%s: nelze číst z ready roury: %s\n"
-
-#: pg_basebackup.c:188 pg_basebackup.c:280 pg_basebackup.c:1598
-#: pg_receivexlog.c:290
-#, c-format
-msgid "%s: could not parse transaction log location \"%s\"\n"
-msgstr "%s: nelze naparsovat koncovou pozici v transakčním logu \"%s\"\n"
-
-#: pg_basebackup.c:293
-#, c-format
-msgid "%s: could not create pipe for background process: %s\n"
-msgstr "%s: nelze vytvořit roury pro background procesy: %s\n"
-
-#: pg_basebackup.c:326
-#, c-format
-msgid "%s: could not create background process: %s\n"
-msgstr "%s: nelze vytvořit background procesy: %s\n"
-
-#: pg_basebackup.c:338
-#, c-format
-msgid "%s: could not create background thread: %s\n"
-msgstr "%s: nelze vytvořit background vlákno: %s\n"
-
-#: pg_basebackup.c:363 pg_basebackup.c:989
-#, c-format
-msgid "%s: could not create directory \"%s\": %s\n"
-msgstr "%s: nelze vytvořít adresář \"%s\": %s\n"
-
-#: pg_basebackup.c:382
-#, c-format
-msgid "%s: directory \"%s\" exists but is not empty\n"
-msgstr "%s: adresář \"%s\" existuje, ale není prázdný\n"
-
-#: pg_basebackup.c:390
-#, c-format
-msgid "%s: could not access directory \"%s\": %s\n"
-msgstr "%s: nelze přístoupit k adresáři \"%s\": %s\n"
-
-#: pg_basebackup.c:438
-#, c-format
-msgid "%*s/%s kB (100%%), %d/%d tablespace %*s"
-msgid_plural "%*s/%s kB (100%%), %d/%d tablespaces %*s"
-msgstr[0] "%*s/%s kB (100%%), %d/%d tablespace %*s"
-msgstr[1] "%*s/%s kB (100%%), %d/%d tablespacy %*s"
-msgstr[2] "%*s/%s kB (100%%), %d/%d tablespacy %*s"
-
-#: pg_basebackup.c:450
-#, c-format
-msgid "%*s/%s kB (%d%%), %d/%d tablespace (%s%-*.*s)"
-msgid_plural "%*s/%s kB (%d%%), %d/%d tablespaces (%s%-*.*s)"
-msgstr[0] "%*s/%s kB (%d%%), %d/%d tablespace (%s%-*.*s)"
-msgstr[1] "%*s/%s kB (%d%%), %d/%d tablespace (%s%-*.*s)"
-msgstr[2] "%*s/%s kB (%d%%), %d/%d tablespace (%s%-*.*s)"
-
-#: pg_basebackup.c:466
-#, c-format
-msgid "%*s/%s kB (%d%%), %d/%d tablespace"
-msgid_plural "%*s/%s kB (%d%%), %d/%d tablespaces"
-msgstr[0] "%*s/%s kB (%d%%), %d/%d tablespace"
-msgstr[1] "%*s/%s kB (%d%%), %d/%d tablespaces"
-msgstr[2] "%*s/%s kB (%d%%), %d/%d tablespaces"
-
-#: pg_basebackup.c:493
-#, c-format
-msgid "%s: could not write to compressed file \"%s\": %s\n"
-msgstr "%s: nelze zapsat do komprimovaného souboru \"%s\": %s\n"
-
-#: pg_basebackup.c:503 pg_basebackup.c:1071 pg_basebackup.c:1289
-#, c-format
-msgid "%s: could not write to file \"%s\": %s\n"
-msgstr "%s: nelze zapsat do souboru \"%s\": %s\n"
-
-#: pg_basebackup.c:558 pg_basebackup.c:578 pg_basebackup.c:606
-#, c-format
-msgid "%s: could not set compression level %d: %s\n"
-msgstr "%s: nelze nastavit úroveň komprese %d: %s\n"
-
-#: pg_basebackup.c:627
-#, c-format
-msgid "%s: could not create compressed file \"%s\": %s\n"
-msgstr "%s: nelze vytvořit komprimovaný soubor \"%s\": %s\n"
-
-#: pg_basebackup.c:638 pg_basebackup.c:1031 pg_basebackup.c:1282
-#, c-format
-msgid "%s: could not create file \"%s\": %s\n"
-msgstr "%s: nelze vytvořit soubor \"%s\": %s\n"
-
-#: pg_basebackup.c:650 pg_basebackup.c:893
-#, c-format
-msgid "%s: could not get COPY data stream: %s"
-msgstr "%s: nelze získat COPY data stream: %s"
-
-#: pg_basebackup.c:707
-#, c-format
-msgid "%s: could not close compressed file \"%s\": %s\n"
-msgstr "%s: nelze uzavřít komprimovaný soubor \"%s\": %s\n"
-
-#: pg_basebackup.c:720 receivelog.c:161 receivelog.c:352 receivelog.c:724
-#, c-format
-msgid "%s: could not close file \"%s\": %s\n"
-msgstr "%s: nelze uzavřít soubor \"%s\": %s\n"
-
-#: pg_basebackup.c:731 pg_basebackup.c:922 receivelog.c:937
-#, c-format
-msgid "%s: could not read COPY data: %s"
-msgstr "%s: nelze číst COPY data: %s"
-
-#: pg_basebackup.c:936
-#, c-format
-msgid "%s: invalid tar block header size: %d\n"
-msgstr "%s: neplatná velikost hlavičky tar bloku: %d\n"
-
-#: pg_basebackup.c:944
-#, c-format
-msgid "%s: could not parse file size\n"
-msgstr "%s: nelze načíst velikost souboru\n"
-
-#: pg_basebackup.c:952
-#, c-format
-msgid "%s: could not parse file mode\n"
-msgstr "%s: nelze načíst mód souboru\n"
-
-#: pg_basebackup.c:997
-#, c-format
-msgid "%s: could not set permissions on directory \"%s\": %s\n"
-msgstr "%s: nelze nastavit přístupová práva na adresáři \"%s\": %s\n"
-
-#: pg_basebackup.c:1010
-#, c-format
-msgid "%s: could not create symbolic link from \"%s\" to \"%s\": %s\n"
-msgstr "%s: nelze vytvořit symbolický odkaz z \"%s\" na \"%s\": %s\n"
-
-#: pg_basebackup.c:1018
-#, c-format
-msgid "%s: unrecognized link indicator \"%c\"\n"
-msgstr "%s: nerozpoznaný indikátor odkazu \"%c\"\n"
-
-#: pg_basebackup.c:1038
-#, c-format
-msgid "%s: could not set permissions on file \"%s\": %s\n"
-msgstr "%s: nelze nastavit přístupová práva na souboru \"%s\": %s\n"
-
-#: pg_basebackup.c:1097
-#, c-format
-msgid "%s: COPY stream ended before last file was finished\n"
-msgstr "%s: COPY stream skončil před dokončením posledního souboru\n"
-
-#: pg_basebackup.c:1183 pg_basebackup.c:1203 pg_basebackup.c:1210
-#: pg_basebackup.c:1257
-#, c-format
-msgid "%s: out of memory\n"
-msgstr "%s: nedostatek paměti\n"
-
-#: pg_basebackup.c:1333
-#, c-format
-msgid "%s: incompatible server version %s\n"
-msgstr "%s: nekompatibilní verze serveru %s\n"
-
-#: pg_basebackup.c:1360 pg_basebackup.c:1389 pg_receivexlog.c:275
-#: receivelog.c:531 receivelog.c:576 receivelog.c:615
-#, c-format
-msgid "%s: could not send replication command \"%s\": %s"
-msgstr "%s: nelze zaslat replikační příkaz \"%s\": %s"
-
-#: pg_basebackup.c:1367 pg_receivexlog.c:282 receivelog.c:539
-#, c-format
-msgid ""
-"%s: could not identify system: got %d rows and %d fields, expected %d rows "
-"and %d fields\n"
-msgstr ""
-"%s: nelze identifikovat systém, načteno %d řádek a %d položek, očekáváno %d "
-"řádek a %d položek\n"
-
-#: pg_basebackup.c:1400
-#, c-format
-msgid "%s: could not initiate base backup: %s"
-msgstr "%s: nelze inicializovat base backup: %s"
-
-#: pg_basebackup.c:1407
-#, c-format
-msgid ""
-"%s: server returned unexpected response to BASE_BACKUP command; got %d rows "
-"and %d fields, expected %d rows and %d fields\n"
-msgstr ""
-"%s: server vrátil neočekávanou odpověď na BASE_BACKUP příkaz; přišlo %d "
-"řádeka %d položek, ořekáváno %d řádek a %d položek\n"
-
-#: pg_basebackup.c:1427
-#, c-format
-msgid "transaction log start point: %s on timeline %u\n"
-msgstr "transaction log start point: %s v timeline %u\n"
-
-#: pg_basebackup.c:1436
-#, c-format
-msgid "%s: could not get backup header: %s"
-msgstr "%s: nelze získat hlavičku zálohy: %s"
-
-#: pg_basebackup.c:1442
-#, c-format
-msgid "%s: no data returned from server\n"
-msgstr "%s: ze serveru nebyla vrácena žádná data\n"
-
-#: pg_basebackup.c:1471
-#, c-format
-msgid "%s: can only write single tablespace to stdout, database has %d\n"
-msgstr "%s: na stdout lze zapsat jen jeden tablespace, databáze má %d\n"
-
-#: pg_basebackup.c:1483
-#, c-format
-msgid "%s: starting background WAL receiver\n"
-msgstr "%s: starting background WAL receiver\n"
-
-#: pg_basebackup.c:1513
-#, c-format
-msgid "%s: could not get transaction log end position from server: %s"
-msgstr "%s: ze serveru nelze získat koncovou pozici v transakčním logu: %s"
-
-#: pg_basebackup.c:1520
-#, c-format
-msgid "%s: no transaction log end position returned from server\n"
-msgstr ""
-"%s: ze serveru nebyla vrácena žádná koncová pozice v transakčním logu\n"
-
-#: pg_basebackup.c:1532
-#, c-format
-msgid "%s: final receive failed: %s"
-msgstr "%s: závěrečný receive selhal: %s"
-
-#: pg_basebackup.c:1550
-#, c-format
-msgid "%s: waiting for background process to finish streaming ...\n"
-msgstr "%s: čekám na background proces pro ukočení streamování ...\n"
-
-#: pg_basebackup.c:1556
-#, c-format
-msgid "%s: could not send command to background pipe: %s\n"
-msgstr "%s: nelze zaslat příkaz přes background rouru: %s\n"
-
-#: pg_basebackup.c:1565
-#, c-format
-msgid "%s: could not wait for child process: %s\n"
-msgstr "%s: nelze počkat na podřízený (child) proces: %s\n"
-
-#: pg_basebackup.c:1571
-#, c-format
-msgid "%s: child %d died, expected %d\n"
-msgstr "%s: potomek %d zemřel, očekáváno %d\n"
-
-#: pg_basebackup.c:1577
-#, c-format
-msgid "%s: child process did not exit normally\n"
-msgstr "%s: podřízený proces neskončil standardně\n"
-
-#: pg_basebackup.c:1583
-#, c-format
-msgid "%s: child process exited with error %d\n"
-msgstr "%s: podřízený proces skončil s chybou %d\n"
-
-#: pg_basebackup.c:1610
-#, c-format
-msgid "%s: could not wait for child thread: %s\n"
-msgstr "%s: nelze počkat na podřízené (child) vlákno: %s\n"
-
-#: pg_basebackup.c:1617
-#, c-format
-msgid "%s: could not get child thread exit status: %s\n"
-msgstr "%s: nelze získat návratový kód podřízeného vlákna: %s\n"
-
-#: pg_basebackup.c:1623
-#, c-format
-msgid "%s: child thread exited with error %u\n"
-msgstr "%s: podřízené vlákno skončilo s chybou %u\n"
-
-#: pg_basebackup.c:1709
-#, c-format
-msgid "%s: invalid output format \"%s\", must be \"plain\" or \"tar\"\n"
-msgstr "%s: chybný formát výstupu \"%s\", musí být \"plain\" nebo \"tar\"\n"
-
-#: pg_basebackup.c:1721 pg_basebackup.c:1733
-#, c-format
-msgid "%s: cannot specify both --xlog and --xlog-method\n"
-msgstr "%s: volby --xlog a --xlog-method nelze zadat společně\n"
-
-#: pg_basebackup.c:1748
-#, c-format
-msgid ""
-"%s: invalid xlog-method option \"%s\", must be \"fetch\" or \"stream\"\n"
-msgstr "%s: neplatná xlog-metoda \"%s\", musí být \"fetch\" nebo \"stream\"\n"
-
-#: pg_basebackup.c:1767
-#, c-format
-msgid "%s: invalid compression level \"%s\"\n"
-msgstr "%s: chybná úroveň komprese \"%s\"\n"
-
-#: pg_basebackup.c:1779
-#, c-format
-msgid ""
-"%s: invalid checkpoint argument \"%s\", must be \"fast\" or \"spread\"\n"
-msgstr ""
-"%s: chybný checkpoint argument \"%s\", musí být \"fast\" nebo \"spread\"\n"
-
-#: pg_basebackup.c:1806 pg_receivexlog.c:416
-#, c-format
-msgid "%s: invalid status interval \"%s\"\n"
-msgstr "%s: neplatný interval zasílání stavu \"%s\"\n"
-
-#: pg_basebackup.c:1822 pg_basebackup.c:1836 pg_basebackup.c:1847
-#: pg_basebackup.c:1860 pg_basebackup.c:1870 pg_receivexlog.c:432
-#: pg_receivexlog.c:446 pg_receivexlog.c:457
-#, c-format
-msgid "Try \"%s --help\" for more information.\n"
-msgstr "Zkuste \"%s --help\" pro více informací.\n"
-
-#: pg_basebackup.c:1834 pg_receivexlog.c:444
-#, c-format
-msgid "%s: too many command-line arguments (first is \"%s\")\n"
-msgstr "%s: příliš mnoho argumentů v příkazové řádce (první je \"%s\")\n"
-
-#: pg_basebackup.c:1846 pg_receivexlog.c:456
-#, c-format
-msgid "%s: no target directory specified\n"
-msgstr "%s: nebyl zadán cílový adresář\n"
-
-#: pg_basebackup.c:1858
-#, c-format
-msgid "%s: only tar mode backups can be compressed\n"
-msgstr "%s: pouze tar zálohy mohou být komprimované\n"
-
-#: pg_basebackup.c:1868
-#, c-format
-msgid "%s: WAL streaming can only be used in plain mode\n"
-msgstr "%s: WAL streaming lze použít pouze v plain módu\n"
-
-#: pg_basebackup.c:1879
-#, c-format
-msgid "%s: this build does not support compression\n"
-msgstr "%s: tento build nepodporuje kompresi\n"
-
-#: pg_receivexlog.c:51
-#, c-format
-msgid ""
-"%s receives PostgreSQL streaming transaction logs.\n"
-"\n"
-msgstr ""
-"%s přijímá PostgreSQL streamované transakční logy\n"
-"\n"
-
-#: pg_receivexlog.c:55
-#, c-format
-msgid ""
-"\n"
-"Options:\n"
-msgstr ""
-"\n"
-"Obecné volby:\n"
-
-#: pg_receivexlog.c:56
-#, c-format
-msgid ""
-" -D, --directory=DIR receive transaction log files into this directory\n"
-msgstr ""
-" -D, --directory=DIR soubory transakčního logu ukládej do tohoto "
-"adresáře\n"
-
-#: pg_receivexlog.c:57
-#, c-format
-msgid " -n, --no-loop do not loop on connection lost\n"
-msgstr ""
-" -n, --no-loop neopakovat pokus o spojení v případě selhání\n"
-
-#: pg_receivexlog.c:81
-#, c-format
-msgid "%s: finished segment at %X/%X (timeline %u)\n"
-msgstr "%s: dokončen segment na %X/%X (timeline %u)\n"
-
-#: pg_receivexlog.c:94
-#, c-format
-msgid "%s: switched to timeline %u at %X/%X\n"
-msgstr "%s: přepnuto na timeline %u v %X/%X\n"
-
-#: pg_receivexlog.c:103
-#, c-format
-msgid "%s: received interrupt signal, exiting\n"
-msgstr "%s: přijat signál k přerušení, ukončuji.\n"
-
-#: pg_receivexlog.c:129
-#, c-format
-msgid "%s: could not open directory \"%s\": %s\n"
-msgstr "%s: nelze otevřít adresář \"%s\": %s\n"
-
-#: pg_receivexlog.c:170
-#, c-format
-msgid "%s: could not parse transaction log file name \"%s\"\n"
-msgstr "%s: nelze naparsovat jméno souboru transakčního logu \"%s\"\n"
-
-#: pg_receivexlog.c:188
-#, c-format
-msgid "%s: could not stat file \"%s\": %s\n"
-msgstr "%s: nelze načíst stav souboru \"%s\": %s\n"
-
-#: pg_receivexlog.c:196
-#, c-format
-msgid "%s: segment file \"%s\" has incorrect size %d, skipping\n"
-msgstr "%s: segment soubor \"%s\" má neplatnou velikost %d, přeskakuji\n"
-
-#: pg_receivexlog.c:317
-#, c-format
-msgid "%s: starting log streaming at %X/%X (timeline %u)\n"
-msgstr "%s: začínám streamování logu na %X/%X (timeline %u)\n"
-
-#: pg_receivexlog.c:397
-#, c-format
-msgid "%s: invalid port number \"%s\"\n"
-msgstr "%s: neplatné číslo portu \"%s\"\n"
-
-#: pg_receivexlog.c:479
-#, c-format
-msgid "%s: disconnected\n"
-msgstr "%s: odpojeno.\n"
-
-#. translator: check source for value for %d
-#: pg_receivexlog.c:486
-#, c-format
-msgid "%s: disconnected; waiting %d seconds to try again\n"
-msgstr "%s: odpojeno; čekám %d vteřin pro další pokus\n"
-
-#: receivelog.c:69
-#, c-format
-msgid "%s: could not open transaction log file \"%s\": %s\n"
-msgstr "%s: nelze otevřít souboru transakčního logu \"%s\": %s\n"
-
-#: receivelog.c:81
-#, c-format
-msgid "%s: could not stat transaction log file \"%s\": %s\n"
-msgstr "%s: nelze udělat stat souboru transakčního logu \"%s\": %s\n"
-
-#: receivelog.c:95
-#, c-format
-msgid "%s: transaction log file \"%s\" has %d bytes, should be 0 or %d\n"
-msgstr "%s: soubor transakčního logu \"%s\" má %d bytů, měl by mít 0 nebo %d\n"
-
-#: receivelog.c:108
-#, c-format
-msgid "%s: could not pad transaction log file \"%s\": %s\n"
-msgstr "%s: nelze doplnit soubor transakčního logu \"%s\": %s\n"
-
-#: receivelog.c:121
-#, c-format
-msgid "%s: could not seek to beginning of transaction log file \"%s\": %s\n"
-msgstr ""
-"%s: nelze skočit zpět na začátek souboru transakčního logu \"%s\": %s\n"
-
-#: receivelog.c:147
-#, c-format
-msgid "%s: could not determine seek position in file \"%s\": %s\n"
-msgstr "%s: nelze určit pozici pro seek v souboru \"%s\": %s\n"
-
-#: receivelog.c:154 receivelog.c:345
-#, c-format
-msgid "%s: could not fsync file \"%s\": %s\n"
-msgstr "%s: nelze provést fsync souboru \"%s\": %s\n"
-
-#: receivelog.c:180
-#, c-format
-msgid "%s: could not rename file \"%s\": %s\n"
-msgstr "%s: nelze přejmenovat soubor \"%s\": %s\n"
-
-#: receivelog.c:187
-#, c-format
-msgid "%s: not renaming \"%s%s\", segment is not complete\n"
-msgstr "%s: nepřejmenovávám \"%s%s\", segment není kompletní.\n"
-
-#: receivelog.c:276
-#, c-format
-#| msgid "%s: could not open timeline history file \"%s\": %s"
-msgid "%s: could not open timeline history file \"%s\": %s\n"
-msgstr "%s: nelze otevřít soubor s historií timeline \"%s\": %s\n"
-
-#: receivelog.c:303
-#, c-format
-#| msgid "%s: server reported unexpected history file name for timeline %u: %s"
-msgid "%s: server reported unexpected history file name for timeline %u: %s\n"
-msgstr ""
-"%s: server ohlásil neočekávané jméno souboru s historií pro timeline %u: %s\n"
-
-#: receivelog.c:320
-#, c-format
-msgid "%s: could not create timeline history file \"%s\": %s\n"
-msgstr "%s: nelze vytvořit soubor s timeline historií \"%s\": %s\n"
-
-#: receivelog.c:337
-#, c-format
-msgid "%s: could not write timeline history file \"%s\": %s\n"
-msgstr "%s: nelze zapsat do souboru s timeline historií \"%s\": %s\n"
-
-#: receivelog.c:362
-#, c-format
-msgid "%s: could not rename file \"%s\" to \"%s\": %s\n"
-msgstr "%s: nelze přejmenovat soubor \"%s\" na \"%s\": %s\n"
-
-#: receivelog.c:435
-#, c-format
-msgid "%s: could not send feedback packet: %s"
-msgstr "%s: nelze zaslat packet se zpětnou vazbou: %s"
-
-#: receivelog.c:469
-#, c-format
-msgid ""
-"%s: incompatible server version %s; streaming is only supported with server "
-"version %s\n"
-msgstr ""
-"%s: nekompatibilní verze serveru %s; streaming je podporování pouze se "
-"serverem version %s\n"
-
-#: receivelog.c:547
-#, c-format
-msgid ""
-"%s: system identifier does not match between base backup and streaming "
-"connection\n"
-msgstr ""
-"%s: identifikátor systému mezi base backupem a streamovacím spojením "
-"neodpovídá\n"
-
-#: receivelog.c:555
-#, c-format
-msgid "%s: starting timeline %u is not present in the server\n"
-msgstr "%s: počáteční timeline %u není přitomna na serveru\n"
-
-#: receivelog.c:589
-#, c-format
-msgid ""
-"%s: unexpected response to TIMELINE_HISTORY command: got %d rows and %d "
-"fields, expected %d rows and %d fields\n"
-msgstr ""
-"%s: neočekávaná odpověď na TIMELINE_HISTORY příkaz: načteno %d řádek a %d "
-"položek, očekáváno %d řádek a %d položek\n"
-
-#: receivelog.c:662
-#, c-format
-#| msgid "%s: server reported unexpected history file name for timeline %u: %s"
-msgid ""
-"%s: server reported unexpected next timeline %u, following timeline %u\n"
-msgstr ""
-"%s: server ohlásil neočekávanou další timeline %u, následující timeline %u\n"
-
-#: receivelog.c:669
-#, c-format
-msgid ""
-"%s: server stopped streaming timeline %u at %X/%X, but reported next "
-"timeline %u to begin at %X/%X\n"
-msgstr ""
-"%s: server přestal streamovat timeline %u at %X/%X, ale začátek další timeline"
-"oznámil %u na %X/%X\n"
-
-#: receivelog.c:681 receivelog.c:716
-#, c-format
-msgid "%s: unexpected termination of replication stream: %s"
-msgstr "%s: neočekávané ukončení replikačního streamu: %s"
-
-#: receivelog.c:707
-#, c-format
-msgid "%s: replication stream was terminated before stop point\n"
-msgstr "%s: replikační stream byl ukončen před bodem zastavení (stop point)\n"
-
-#: receivelog.c:755
-#, c-format
-#| msgid ""
-#| "%s: unexpected response to TIMELINE_HISTORY command: got %d rows and %d "
-#| "fields, expected %d rows and %d fields\n"
-msgid ""
-"%s: unexpected result set after end-of-timeline: got %d rows and %d fields, "
-"expected %d rows and %d fields\n"
-msgstr ""
-"%s: neočekávaný výsledek po konci timeline: získáno %d řádek a %d položek, "
-"očekáváno %d řádek a %d položek\n"
-
-#: receivelog.c:765
-#, c-format
-#| msgid "%s: could not parse transaction log location \"%s\"\n"
-msgid "%s: could not parse next timeline's starting point \"%s\"\n"
-msgstr "%s: nelze naparsovat počáteční bod další timeline \"%s\"\n"
-
-#: receivelog.c:820 receivelog.c:922 receivelog.c:1087
-#, c-format
-msgid "%s: could not send copy-end packet: %s"
-msgstr "%s: nelze zaslat ukončovací packet: %s"
-
-#: receivelog.c:887
-#, c-format
-msgid "%s: select() failed: %s\n"
-msgstr "%s: select() selhal: %s\n"
-
-#: receivelog.c:895
-#, c-format
-msgid "%s: could not receive data from WAL stream: %s"
-msgstr "%s: nelze získat data z WAL streamu: %s"
-
-#: receivelog.c:959 receivelog.c:994
-#, c-format
-msgid "%s: streaming header too small: %d\n"
-msgstr "%s: hlavička streamu je příliš malá: %d\n"
-
-#: receivelog.c:1013
-#, c-format
-msgid "%s: received transaction log record for offset %u with no file open\n"
-msgstr ""
-"%s: přijat záznam z transakčního logu pro offset %u bez otevřeného souboru\n"
-
-#: receivelog.c:1025
-#, c-format
-msgid "%s: got WAL data offset %08x, expected %08x\n"
-msgstr "%s: získán WAL data offset %08x, očekáván %08x\n"
-
-#: receivelog.c:1062
-#, c-format
-msgid "%s: could not write %u bytes to WAL file \"%s\": %s\n"
-msgstr "%s: nelze zapsat %u bytů do WAL souboru %s: %s\n"
-
-#: receivelog.c:1100
-#, c-format
-msgid "%s: unrecognized streaming header: \"%c\"\n"
-msgstr "%s: nerozpoznaná hlavička streamu: \"%c\"\n"
-
-#: streamutil.c:135
-msgid "Password: "
-msgstr "Heslo: "
-
-#: streamutil.c:148
-#, c-format
-msgid "%s: could not connect to server\n"
-msgstr "%s: nelze se připojit k serveru\n"
-
-#: streamutil.c:164
-#, c-format
-msgid "%s: could not connect to server: %s\n"
-msgstr "%s: nelze se připojit k serveru: %s\n"
-
-#: streamutil.c:188
-#, c-format
-msgid "%s: could not determine server setting for integer_datetimes\n"
-msgstr "%s: nelze zjistit nastavení volby integer_datetimes na serveru\n"
-
-#: streamutil.c:201
-#, c-format
-msgid "%s: integer_datetimes compile flag does not match server\n"
-msgstr "%s: integer_datetimes přepínač kompilace neodpovídá serveru\n"
-
-#~ msgid "%s: no start point returned from server\n"
-#~ msgstr "%s: server nevráti žádný počáteční bod (start point)\n"
-
-#~ msgid ""
-#~ "%s: timeline does not match between base backup and streaming connection\n"
-#~ msgstr ""
-#~ "%s: timeline mezi base backupem a streamovacím spojením neodpovídá\n"
-
-#~ msgid " --help show this help, then exit\n"
-#~ msgstr " --help zobraz tuto nápovědu, poté skonči\n"
-
-#~ msgid " --version output version information, then exit\n"
-#~ msgstr " --version zobraz informaci o verzi, poté skonči\n"
-
-#~ msgid "%s: invalid format of xlog location: %s\n"
-#~ msgstr "%s: neplatný formát xlog pozice: %s\n"
-
-#~ msgid "%s: could not identify system: %s"
-#~ msgstr "%s: nelze identifikovat systém: %s"
-
-#~ msgid "%s: could not send base backup command: %s"
-#~ msgstr "%s: nelze poslat base backup příkaz: %s"
-
-#~ msgid " -v, --verbose output verbose messages\n"
-#~ msgstr " -v, --verbose vypisuj podrobnější zprávy\n"
-
-#~ msgid "%s: could not identify system: %s\n"
-#~ msgstr "%s: nelze identifikovat systém: %s\n"
-
-#~ msgid "%s: could not parse log start position from value \"%s\"\n"
-#~ msgstr "%s: nelze naparsovat počáteční pozici logu z hodnoty \"%s\"\n"
-
-#~ msgid "%s: Could not open WAL segment %s: %s\n"
-#~ msgstr "%s: nelze otevřít WAL segment %s: %s\n"
-
-#~ msgid "%s: could not stat WAL segment %s: %s\n"
-#~ msgstr "%s: nelze načíst stav WAL segmentu %s: %s\n"
-
-#~ msgid "%s: could not pad WAL segment %s: %s\n"
-#~ msgstr "%s: nelze doplnit WAL segment %s: %s\n"
-
-#~ msgid "%s: could not get current position in file %s: %s\n"
-#~ msgstr "%s: nelze získat aktuální pozici v souboru %s: %s\n"
-
-#~ msgid "%s: could not close file %s: %s\n"
-#~ msgstr "%s: nelze zavřít soubor %s: %s\n"
-
-#~ msgid "%s: could not read copy data: %s\n"
-#~ msgstr "%s: nelze načíst copy data: %s\n"
diff --git a/src/bin/pg_basebackup/po/es.po b/src/bin/pg_basebackup/po/es.po
deleted file mode 100644
index 6f02fc29ad3..00000000000
--- a/src/bin/pg_basebackup/po/es.po
+++ /dev/null
@@ -1,806 +0,0 @@
-# Spanish message translation file for pg_basebackup
-#
-# Copyright (C) 2011-2012 PostgreSQL Global Development Group
-# This file is distributed under the same license as the PostgreSQL package.
-#
-# Álvaro Herrera <alvherre@alvh.no-ip.org>, 2011-2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: pg_basebackup (PostgreSQL 9.3)\n"
-"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2013-08-26 19:19+0000\n"
-"PO-Revision-Date: 2013-08-28 13:37-0400\n"
-"Last-Translator: Álvaro Herrera <alvherre@alvh.no-ip.org>\n"
-"Language-Team: Spanish <pgsql-es-ayuda@postgresql.org>\n"
-"Language: es\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ../../common/fe_memutils.c:33 ../../common/fe_memutils.c:60
-#: ../../common/fe_memutils.c:83
-#, c-format
-msgid "out of memory\n"
-msgstr "memoria agotada\n"
-
-#: ../../common/fe_memutils.c:77
-#, c-format
-msgid "cannot duplicate null pointer (internal error)\n"
-msgstr "no se puede duplicar un puntero nulo (error interno)\n"
-
-#: pg_basebackup.c:106
-#, c-format
-msgid ""
-"%s takes a base backup of a running PostgreSQL server.\n"
-"\n"
-msgstr ""
-"%s obtiene un respaldo base a partir de un servidor PostgreSQL en ejecución.\n"
-"\n"
-
-#: pg_basebackup.c:108 pg_receivexlog.c:53
-#, c-format
-msgid "Usage:\n"
-msgstr "Empleo:\n"
-
-#: pg_basebackup.c:109 pg_receivexlog.c:54
-#, c-format
-msgid " %s [OPTION]...\n"
-msgstr " %s [OPCIÓN]...\n"
-
-#: pg_basebackup.c:110
-#, c-format
-msgid ""
-"\n"
-"Options controlling the output:\n"
-msgstr ""
-"\n"
-"Opciones que controlan la salida:\n"
-
-#: pg_basebackup.c:111
-#, c-format
-msgid " -D, --pgdata=DIRECTORY receive base backup into directory\n"
-msgstr " -D, --pgdata=DIRECTORIO recibir el respaldo base en directorio\n"
-
-#: pg_basebackup.c:112
-#, c-format
-msgid " -F, --format=p|t output format (plain (default), tar)\n"
-msgstr " -F, --format=p|t formato de salida (plano (por omisión), tar)\n"
-
-#: pg_basebackup.c:113
-#, c-format
-msgid ""
-" -R, --write-recovery-conf\n"
-" write recovery.conf after backup\n"
-msgstr ""
-" -R, --write-recovery-info\n"
-" escribe recovery.conf después del respaldo\n"
-
-#: pg_basebackup.c:115
-#, c-format
-msgid " -x, --xlog include required WAL files in backup (fetch mode)\n"
-msgstr ""
-" -x, --xlog incluye los archivos WAL necesarios en el respaldo\n"
-" (modo fetch)\n"
-
-#: pg_basebackup.c:116
-#, c-format
-msgid ""
-" -X, --xlog-method=fetch|stream\n"
-" include required WAL files with specified method\n"
-msgstr ""
-" -X, --xlog-method=fetch|stream\n"
-" incluye los archivos WAL necesarios,\n"
-" en el modo especificado\n"
-
-#: pg_basebackup.c:118
-#, c-format
-msgid " -z, --gzip compress tar output\n"
-msgstr " -z, --gzip comprimir la salida de tar\n"
-
-#: pg_basebackup.c:119
-#, c-format
-msgid " -Z, --compress=0-9 compress tar output with given compression level\n"
-msgstr " -Z, --compress=0-9 comprimir salida tar con el nivel de compresión dado\n"
-
-#: pg_basebackup.c:120
-#, c-format
-msgid ""
-"\n"
-"General options:\n"
-msgstr ""
-"\n"
-"Opciones generales:\n"
-
-#: pg_basebackup.c:121
-#, c-format
-msgid ""
-" -c, --checkpoint=fast|spread\n"
-" set fast or spread checkpointing\n"
-msgstr ""
-" -c, --checkpoint=fast|spread\n"
-" utilizar checkpoint rápido o extendido\n"
-
-#: pg_basebackup.c:123
-#, c-format
-msgid " -l, --label=LABEL set backup label\n"
-msgstr " -l, --label=ETIQUETA establecer etiqueta del respaldo\n"
-
-#: pg_basebackup.c:124
-#, c-format
-msgid " -P, --progress show progress information\n"
-msgstr " -P, --progress mostrar información de progreso\n"
-
-#: pg_basebackup.c:125 pg_receivexlog.c:58
-#, c-format
-msgid " -v, --verbose output verbose messages\n"
-msgstr " -v, --verbose desplegar mensajes verbosos\n"
-
-#: pg_basebackup.c:126 pg_receivexlog.c:59
-#, c-format
-msgid " -V, --version output version information, then exit\n"
-msgstr " -V, --version mostrar información de versión, luego salir\n"
-
-#: pg_basebackup.c:127 pg_receivexlog.c:60
-#, c-format
-msgid " -?, --help show this help, then exit\n"
-msgstr " -?, --help mostrar esta ayuda, luego salir\n"
-
-#: pg_basebackup.c:128 pg_receivexlog.c:61
-#, c-format
-msgid ""
-"\n"
-"Connection options:\n"
-msgstr ""
-"\n"
-"Opciones de conexión:\n"
-
-#: pg_basebackup.c:129 pg_receivexlog.c:62
-#, c-format
-msgid " -d, --dbname=CONNSTR connection string\n"
-msgstr " -s, --dbname=CONSTR cadena de conexión\n"
-
-#: pg_basebackup.c:130 pg_receivexlog.c:63
-#, c-format
-msgid " -h, --host=HOSTNAME database server host or socket directory\n"
-msgstr " -h, --host=ANFITRIÓN dirección del servidor o directorio del socket\n"
-
-#: pg_basebackup.c:131 pg_receivexlog.c:64
-#, c-format
-msgid " -p, --port=PORT database server port number\n"
-msgstr " -p, --port=PORT número de port del servidor\n"
-
-#: pg_basebackup.c:132 pg_receivexlog.c:65
-#, c-format
-msgid ""
-" -s, --status-interval=INTERVAL\n"
-" time between status packets sent to server (in seconds)\n"
-msgstr ""
-" -s, --status-interval=INTERVALO (segundos)\n"
-" tiempo entre envíos de paquetes de estado al servidor\n"
-
-#: pg_basebackup.c:134 pg_receivexlog.c:67
-#, c-format
-msgid " -U, --username=NAME connect as specified database user\n"
-msgstr " -U, --username=NOMBRE conectarse con el usuario especificado\n"
-
-#: pg_basebackup.c:135 pg_receivexlog.c:68
-#, c-format
-msgid " -w, --no-password never prompt for password\n"
-msgstr " -w, --no-password nunca pedir contraseña\n"
-
-#: pg_basebackup.c:136 pg_receivexlog.c:69
-#, c-format
-msgid " -W, --password force password prompt (should happen automatically)\n"
-msgstr ""
-" -W, --password forzar un prompt para la contraseña\n"
-" (debería ser automático)\n"
-
-#: pg_basebackup.c:137 pg_receivexlog.c:70
-#, c-format
-msgid ""
-"\n"
-"Report bugs to <pgsql-bugs@postgresql.org>.\n"
-msgstr ""
-"\n"
-"Reporte errores a <pgsql-bugs@postgresql.org>.\n"
-
-#: pg_basebackup.c:180
-#, c-format
-msgid "%s: could not read from ready pipe: %s\n"
-msgstr "%s: no se pudo leer desde la tubería: %s\n"
-
-#: pg_basebackup.c:188 pg_basebackup.c:280 pg_basebackup.c:1598
-#: pg_receivexlog.c:266
-#, c-format
-msgid "%s: could not parse transaction log location \"%s\"\n"
-msgstr "%s: no se pudo interpretar la ubicación del registro de transacciones «%s»\n"
-
-#: pg_basebackup.c:293
-#, c-format
-msgid "%s: could not create pipe for background process: %s\n"
-msgstr "%s: no se pudo crear la tubería para el proceso en segundo plano: %s\n"
-
-#: pg_basebackup.c:326
-#, c-format
-msgid "%s: could not create background process: %s\n"
-msgstr "%s: no se pudo lanzar el proceso en segundo plano: %s\n"
-
-#: pg_basebackup.c:338
-#, c-format
-msgid "%s: could not create background thread: %s\n"
-msgstr "%s: no se pudo lanzar el hilo en segundo plano: %s\n"
-
-#: pg_basebackup.c:363 pg_basebackup.c:989
-#, c-format
-msgid "%s: could not create directory \"%s\": %s\n"
-msgstr "%s: no se pudo crear el directorio «%s»: %s\n"
-
-#: pg_basebackup.c:382
-#, c-format
-msgid "%s: directory \"%s\" exists but is not empty\n"
-msgstr "%s: el directorio «%s» existe pero no está vacío\n"
-
-#: pg_basebackup.c:390
-#, c-format
-msgid "%s: could not access directory \"%s\": %s\n"
-msgstr "%s: no se pudo acceder al directorio «%s»: %s\n"
-
-#: pg_basebackup.c:438
-#, c-format
-msgid "%*s/%s kB (100%%), %d/%d tablespace %*s"
-msgid_plural "%*s/%s kB (100%%), %d/%d tablespaces %*s"
-msgstr[0] "%*s/%s kB (100%%), %d/%d tablespace %*s"
-msgstr[1] "%*s/%s kB (100%%), %d/%d tablespaces %*s"
-
-#: pg_basebackup.c:450
-#, c-format
-msgid "%*s/%s kB (%d%%), %d/%d tablespace (%s%-*.*s)"
-msgid_plural "%*s/%s kB (%d%%), %d/%d tablespaces (%s%-*.*s)"
-msgstr[0] "%*s/%s kB (%d%%), %d/%d tablespace (%s%-*.*s)"
-msgstr[1] "%*s/%s kB (%d%%), %d/%d tablespaces (%s%-*.*s)"
-
-#: pg_basebackup.c:466
-#, c-format
-msgid "%*s/%s kB (%d%%), %d/%d tablespace"
-msgid_plural "%*s/%s kB (%d%%), %d/%d tablespaces"
-msgstr[0] "%*s/%s kB (%d%%), %d/%d tablespace"
-msgstr[1] "%*s/%s kB (%d%%), %d/%d tablespaces"
-
-#: pg_basebackup.c:493
-#, c-format
-msgid "%s: could not write to compressed file \"%s\": %s\n"
-msgstr "%s: no se pudo escribir al archivo comprimido «%s»: %s\n"
-
-#: pg_basebackup.c:503 pg_basebackup.c:1071 pg_basebackup.c:1289
-#, c-format
-msgid "%s: could not write to file \"%s\": %s\n"
-msgstr "%s: no se pudo escribir al archivo «%s»: %s\n"
-
-#: pg_basebackup.c:558 pg_basebackup.c:578 pg_basebackup.c:606
-#, c-format
-msgid "%s: could not set compression level %d: %s\n"
-msgstr "%s: no se pudo definir el nivel de compresión %d: %s\n"
-
-#: pg_basebackup.c:627
-#, c-format
-msgid "%s: could not create compressed file \"%s\": %s\n"
-msgstr "%s: no se pudo crear el archivo comprimido «%s»: %s\n"
-
-#: pg_basebackup.c:638 pg_basebackup.c:1031 pg_basebackup.c:1282
-#, c-format
-msgid "%s: could not create file \"%s\": %s\n"
-msgstr "%s: no se pudo crear el archivo «%s»: %s\n"
-
-#: pg_basebackup.c:650 pg_basebackup.c:893
-#, c-format
-msgid "%s: could not get COPY data stream: %s"
-msgstr "%s: no se pudo obtener un flujo de datos COPY: %s"
-
-#: pg_basebackup.c:707
-#, c-format
-msgid "%s: could not close compressed file \"%s\": %s\n"
-msgstr "%s: no se pudo cerrar el archivo comprimido «%s»: %s\n"
-
-#: pg_basebackup.c:720 receivelog.c:161 receivelog.c:351 receivelog.c:725
-#, c-format
-msgid "%s: could not close file \"%s\": %s\n"
-msgstr "%s: no se pudo cerrar el archivo «%s»: %s\n"
-
-#: pg_basebackup.c:731 pg_basebackup.c:922 receivelog.c:938
-#, c-format
-msgid "%s: could not read COPY data: %s"
-msgstr "%s: no fue posible leer datos COPY: %s"
-
-#: pg_basebackup.c:936
-#, c-format
-msgid "%s: invalid tar block header size: %d\n"
-msgstr "%s: tamaño de bloque de cabecera de tar no válido: %d\n"
-
-#: pg_basebackup.c:944
-#, c-format
-msgid "%s: could not parse file size\n"
-msgstr "%s: no se pudo interpretar el tamaño del archivo\n"
-
-#: pg_basebackup.c:952
-#, c-format
-msgid "%s: could not parse file mode\n"
-msgstr "%s: nose pudo interpretar el modo del archivo\n"
-
-#: pg_basebackup.c:997
-#, c-format
-msgid "%s: could not set permissions on directory \"%s\": %s\n"
-msgstr "%s: no se pudo definir los permisos en el directorio «%s»: %s\n"
-
-#: pg_basebackup.c:1010
-#, c-format
-msgid "%s: could not create symbolic link from \"%s\" to \"%s\": %s\n"
-msgstr "%s: no se pudo crear un enlace simbólico desde «%s» a «%s»: %s\n"
-
-#: pg_basebackup.c:1018
-#, c-format
-msgid "%s: unrecognized link indicator \"%c\"\n"
-msgstr "%s: indicador de enlace «%c» no reconocido\n"
-
-#: pg_basebackup.c:1038
-#, c-format
-msgid "%s: could not set permissions on file \"%s\": %s\n"
-msgstr "%s: no se pudo definir los permisos al archivo «%s»: %s\n"
-
-#: pg_basebackup.c:1097
-#, c-format
-msgid "%s: COPY stream ended before last file was finished\n"
-msgstr "%s: el flujo COPY terminó antes que el último archivo estuviera completo\n"
-
-#: pg_basebackup.c:1183 pg_basebackup.c:1203 pg_basebackup.c:1210
-#: pg_basebackup.c:1257
-#, c-format
-msgid "%s: out of memory\n"
-msgstr "%s: memoria agotada\n"
-
-#: pg_basebackup.c:1333
-#, c-format
-msgid "%s: incompatible server version %s\n"
-msgstr "%s: versión del servidor %s incompatible\n"
-
-#: pg_basebackup.c:1360 pg_basebackup.c:1389 pg_receivexlog.c:251
-#: receivelog.c:532 receivelog.c:577 receivelog.c:616
-#, c-format
-msgid "%s: could not send replication command \"%s\": %s"
-msgstr "%s: no se pudo ejecutar la orden de replicación «%s»: %s"
-
-#: pg_basebackup.c:1367 pg_receivexlog.c:258 receivelog.c:540
-#, c-format
-msgid "%s: could not identify system: got %d rows and %d fields, expected %d rows and %d fields\n"
-msgstr "%s: no se pudo identificar al sistema: se obtuvieron %d filas y %d campos, se esperaban %d filas y %d campos\n"
-
-#: pg_basebackup.c:1400
-#, c-format
-msgid "%s: could not initiate base backup: %s"
-msgstr "%s: no se pudo iniciar el respaldo base: %s"
-
-#: pg_basebackup.c:1407
-#, c-format
-msgid "%s: server returned unexpected response to BASE_BACKUP command; got %d rows and %d fields, expected %d rows and %d fields\n"
-msgstr "%s: el servidor envió una respuesta inesperada a la orden BASE_BACKUP; se obtuvieron %d filas y %d campos, se esperaban %d filas y %d campos\n"
-
-#: pg_basebackup.c:1427
-#, c-format
-msgid "transaction log start point: %s on timeline %u\n"
-msgstr "punto de inicio del log de transacciones: %s en el timeline %u\n"
-
-#: pg_basebackup.c:1436
-#, c-format
-msgid "%s: could not get backup header: %s"
-msgstr "%s: no se pudo obtener la cabecera de respaldo: %s"
-
-#: pg_basebackup.c:1442
-#, c-format
-msgid "%s: no data returned from server\n"
-msgstr "%s: el servidor no retornó datos\n"
-
-#: pg_basebackup.c:1471
-#, c-format
-msgid "%s: can only write single tablespace to stdout, database has %d\n"
-msgstr "%s: sólo se puede escribir un tablespace a stdout, la base de datos tiene %d\n"
-
-#: pg_basebackup.c:1483
-#, c-format
-msgid "%s: starting background WAL receiver\n"
-msgstr "%s: iniciando el receptor de WAL en segundo plano\n"
-
-#: pg_basebackup.c:1513
-#, c-format
-msgid "%s: could not get transaction log end position from server: %s"
-msgstr "%s: no se pudo obtener la posición del final del registro de transacciones del servidor: %s"
-
-#: pg_basebackup.c:1520
-#, c-format
-msgid "%s: no transaction log end position returned from server\n"
-msgstr "%s: el servidor no retornó la posición del final del registro de transacciones\n"
-
-#: pg_basebackup.c:1532
-#, c-format
-msgid "%s: final receive failed: %s"
-msgstr "%s: la recepción final falló: %s"
-
-#: pg_basebackup.c:1550
-#, c-format
-msgid "%s: waiting for background process to finish streaming ...\n"
-msgstr "%s: esperando que el proceso en segundo plano complete el flujo...\n"
-
-#: pg_basebackup.c:1556
-#, c-format
-msgid "%s: could not send command to background pipe: %s\n"
-msgstr "%s: no se pudo enviar una orden a la tubería de segundo plano: %s\n"
-
-#: pg_basebackup.c:1565
-#, c-format
-msgid "%s: could not wait for child process: %s\n"
-msgstr "%s: no se pudo esperar al proceso hijo: %s\n"
-
-#: pg_basebackup.c:1571
-#, c-format
-msgid "%s: child %d died, expected %d\n"
-msgstr "%s: el hijo %d murió, pero se esperaba al %d\n"
-
-#: pg_basebackup.c:1577
-#, c-format
-msgid "%s: child process did not exit normally\n"
-msgstr "%s: el proceso hijo no terminó normalmente\n"
-
-#: pg_basebackup.c:1583
-#, c-format
-msgid "%s: child process exited with error %d\n"
-msgstr "%s: el proceso hijo terminó con código de salida %d\n"
-
-#: pg_basebackup.c:1610
-#, c-format
-msgid "%s: could not wait for child thread: %s\n"
-msgstr "%s: no se pudo esperar el hilo hijo: %s\n"
-
-#: pg_basebackup.c:1617
-#, c-format
-msgid "%s: could not get child thread exit status: %s\n"
-msgstr "%s: no se pudo obtener la cabecera de respaldo: %s\n"
-
-#: pg_basebackup.c:1623
-#, c-format
-msgid "%s: child thread exited with error %u\n"
-msgstr "%s: el hilo hijo terminó con error %u\n"
-
-#: pg_basebackup.c:1709
-#, c-format
-msgid "%s: invalid output format \"%s\", must be \"plain\" or \"tar\"\n"
-msgstr "%s: formato de salida «%s» no válido, debe ser «plain» o «tar»\n"
-
-#: pg_basebackup.c:1721 pg_basebackup.c:1733
-#, c-format
-msgid "%s: cannot specify both --xlog and --xlog-method\n"
-msgstr "%s: no se puede tanto --xlog como --xlog-method\n"
-
-#: pg_basebackup.c:1748
-#, c-format
-msgid "%s: invalid xlog-method option \"%s\", must be \"fetch\" or \"stream\"\n"
-msgstr "%s: opción de xlog-method «%s» no válida, debe ser «fetch» o «stream»\n"
-
-#: pg_basebackup.c:1767
-#, c-format
-msgid "%s: invalid compression level \"%s\"\n"
-msgstr "%s: valor de compresión «%s» no válido\n"
-
-#: pg_basebackup.c:1779
-#, c-format
-msgid "%s: invalid checkpoint argument \"%s\", must be \"fast\" or \"spread\"\n"
-msgstr "%s: argumento de checkpoint «%s» no válido, debe ser «fast» o «spread»\n"
-
-#: pg_basebackup.c:1806 pg_receivexlog.c:392
-#, c-format
-msgid "%s: invalid status interval \"%s\"\n"
-msgstr "%s: intervalo de estado «%s» no válido\n"
-
-#: pg_basebackup.c:1822 pg_basebackup.c:1836 pg_basebackup.c:1847
-#: pg_basebackup.c:1860 pg_basebackup.c:1870 pg_receivexlog.c:408
-#: pg_receivexlog.c:422 pg_receivexlog.c:433
-#, c-format
-msgid "Try \"%s --help\" for more information.\n"
-msgstr "Use «%s --help» para obtener más información.\n"
-
-#: pg_basebackup.c:1834 pg_receivexlog.c:420
-#, c-format
-msgid "%s: too many command-line arguments (first is \"%s\")\n"
-msgstr "%s: demasiados argumentos en la línea de órdenes (el primero es «%s»)\n"
-
-#: pg_basebackup.c:1846 pg_receivexlog.c:432
-#, c-format
-msgid "%s: no target directory specified\n"
-msgstr "%s: no se especificó un directorio de salida\n"
-
-#: pg_basebackup.c:1858
-#, c-format
-msgid "%s: only tar mode backups can be compressed\n"
-msgstr "%s: sólo los respaldos de modo tar pueden ser comprimidos\n"
-
-#: pg_basebackup.c:1868
-#, c-format
-msgid "%s: WAL streaming can only be used in plain mode\n"
-msgstr "%s: el flujo de WAL sólo puede usar en modo «plain»\n"
-
-#: pg_basebackup.c:1879
-#, c-format
-msgid "%s: this build does not support compression\n"
-msgstr "%s: esta instalación no soporta compresión\n"
-
-#: pg_receivexlog.c:51
-#, c-format
-msgid ""
-"%s receives PostgreSQL streaming transaction logs.\n"
-"\n"
-msgstr ""
-"%s recibe flujos de logs de transacción PostgreSQL.\n"
-"\n"
-
-#: pg_receivexlog.c:55
-#, c-format
-msgid ""
-"\n"
-"Options:\n"
-msgstr ""
-"\n"
-"Opciones:\n"
-
-#: pg_receivexlog.c:56
-#, c-format
-msgid " -D, --directory=DIR receive transaction log files into this directory\n"
-msgstr " -D, --directory=DIR recibe los archivos de transacción a este directorio\n"
-
-#: pg_receivexlog.c:57
-#, c-format
-msgid " -n, --no-loop do not loop on connection lost\n"
-msgstr " -n, --no-loop no entrar en bucle al perder la conexión\n"
-
-#: pg_receivexlog.c:81
-#, c-format
-msgid "%s: finished segment at %X/%X (timeline %u)\n"
-msgstr "%s: terminó el segmento en %X/%X (timeline %u)\n"
-
-#: pg_receivexlog.c:94
-#, c-format
-msgid "%s: switched to timeline %u at %X/%X\n"
-msgstr "%s: cambiado al timeline %u en %X/%X\n"
-
-#: pg_receivexlog.c:103
-#, c-format
-msgid "%s: received interrupt signal, exiting\n"
-msgstr "%s: se recibió una señal de interrupción, saliendo\n"
-
-#: pg_receivexlog.c:128
-#, c-format
-msgid "%s: could not open directory \"%s\": %s\n"
-msgstr "%s: no se pudo abrir el directorio «%s»: %s\n"
-
-#: pg_receivexlog.c:157
-#, c-format
-msgid "%s: could not parse transaction log file name \"%s\"\n"
-msgstr "%s: no se pudo interpretar el nombre del archivo de transacción «%s»\n"
-
-#: pg_receivexlog.c:167
-#, c-format
-msgid "%s: could not stat file \"%s\": %s\n"
-msgstr "%s: no se pudo hacer stat del archivo «%s»: %s\n"
-
-#: pg_receivexlog.c:185
-#, c-format
-msgid "%s: segment file \"%s\" has incorrect size %d, skipping\n"
-msgstr "%s: el archivo de segmento «%s» tiene tamaño incorrecto %d, ignorando\n"
-
-#: pg_receivexlog.c:293
-#, c-format
-msgid "%s: starting log streaming at %X/%X (timeline %u)\n"
-msgstr "%s: iniciando el flujo de log en %X/%X (timeline %u)\n"
-
-#: pg_receivexlog.c:373
-#, c-format
-msgid "%s: invalid port number \"%s\"\n"
-msgstr "%s: número de puerto «%s» no válido\n"
-
-#: pg_receivexlog.c:455
-#, c-format
-msgid "%s: disconnected\n"
-msgstr "%s: desconectado\n"
-
-#. translator: check source for value for %d
-#: pg_receivexlog.c:462
-#, c-format
-msgid "%s: disconnected; waiting %d seconds to try again\n"
-msgstr "%s: desconectado; esperando %d segundos para intentar nuevamente\n"
-
-#: receivelog.c:69
-#, c-format
-msgid "%s: could not open transaction log file \"%s\": %s\n"
-msgstr "%s: no se pudo abrir el archivo de transacción «%s»: %s\n"
-
-#: receivelog.c:81
-#, c-format
-msgid "%s: could not stat transaction log file \"%s\": %s\n"
-msgstr "%s: no se pudo hacer stat del archivo de transacción «%s»: %s\n"
-
-#: receivelog.c:95
-#, c-format
-msgid "%s: transaction log file \"%s\" has %d bytes, should be 0 or %d\n"
-msgstr "%s: el archivo de transacción «%s» mide %d bytes, debería ser 0 o %d\n"
-
-#: receivelog.c:108
-#, c-format
-msgid "%s: could not pad transaction log file \"%s\": %s\n"
-msgstr "%s: no se pudo rellenar (pad) el archivo de transacción «%s»: %s\n"
-
-#: receivelog.c:121
-#, c-format
-msgid "%s: could not seek to beginning of transaction log file \"%s\": %s\n"
-msgstr "%s: no se pudo posicionar (seek) hacia el inicio del archivo de transacción «%s»: %s\n"
-
-#: receivelog.c:147
-#, c-format
-msgid "%s: could not determine seek position in file \"%s\": %s\n"
-msgstr "%s: no se pudo determinar la posición (seek) en el archivo «%s»: %s\n"
-
-#: receivelog.c:154 receivelog.c:344
-#, c-format
-msgid "%s: could not fsync file \"%s\": %s\n"
-msgstr "%s: no se pudo sincronizar (fsync) el archivo «%s»: %s\n"
-
-#: receivelog.c:181
-#, c-format
-msgid "%s: could not rename file \"%s\": %s\n"
-msgstr "%s: no se pudo cambiar el nombre al archivo «%s»: %s\n"
-
-#: receivelog.c:188
-#, c-format
-msgid "%s: not renaming \"%s%s\", segment is not complete\n"
-msgstr "%s: no se cambiará el nombre a «%s%s», el segmento no está completo\n"
-
-#: receivelog.c:277
-#, c-format
-msgid "%s: could not open timeline history file \"%s\": %s\n"
-msgstr "%s: no se pudo abrir el archivo de historia de timeline «%s»: %s\n"
-
-#: receivelog.c:304
-#, c-format
-msgid "%s: server reported unexpected history file name for timeline %u: %s\n"
-msgstr "%s: el servidor reportó un nombre inesperado para el archivo de historia de timeline %u: %s\n"
-
-#: receivelog.c:319
-#, c-format
-msgid "%s: could not create timeline history file \"%s\": %s\n"
-msgstr "%s: no se pudo crear el archivo de historia de timeline «%s»: %s\n"
-
-#: receivelog.c:336
-#, c-format
-msgid "%s: could not write timeline history file \"%s\": %s\n"
-msgstr "%s: no se pudo escribir al archivo de historia de timeline «%s»: %s\n"
-
-#: receivelog.c:363
-#, c-format
-msgid "%s: could not rename file \"%s\" to \"%s\": %s\n"
-msgstr "%s: no se pudo cambiar el nombre al archivo «%s» a «%s»: %s\n"
-
-#: receivelog.c:436
-#, c-format
-msgid "%s: could not send feedback packet: %s"
-msgstr "%s: no se pudo enviar el paquete de retroalimentación: %s"
-
-#: receivelog.c:470
-#, c-format
-msgid "%s: incompatible server version %s; streaming is only supported with server version %s\n"
-msgstr "%s: versión de servidor %s incompatible; la transmisión en flujo sólo está soportada desde la versión %s\n"
-
-#: receivelog.c:548
-#, c-format
-msgid "%s: system identifier does not match between base backup and streaming connection\n"
-msgstr "%s: el identificador de sistema no coincide entre el respaldo base y la conexión de flujo\n"
-
-#: receivelog.c:556
-#, c-format
-msgid "%s: starting timeline %u is not present in the server\n"
-msgstr "%s: el timeline de inicio %u no está presente en el servidor\n"
-
-#: receivelog.c:590
-#, c-format
-msgid "%s: unexpected response to TIMELINE_HISTORY command: got %d rows and %d fields, expected %d rows and %d fields\n"
-msgstr "%s: respuesta inesperada a la orden TIMELINE_HISTORY: se obtuvieron %d filas y %d campos, se esperaban %d filas y %d campos\n"
-
-#: receivelog.c:663
-#, c-format
-msgid "%s: server reported unexpected next timeline %u, following timeline %u\n"
-msgstr "%s: el servidor reportó un timeline siguiente %u inesperado, a continuación del timeline %u\n"
-
-#: receivelog.c:670
-#, c-format
-msgid "%s: server stopped streaming timeline %u at %X/%X, but reported next timeline %u to begin at %X/%X\n"
-msgstr "%s: el servidor paró la transmisión del timeline %u en %X/%X, pero reportó que el siguiente timeline %u comienza en %X/%X\n"
-
-#: receivelog.c:682 receivelog.c:717
-#, c-format
-msgid "%s: unexpected termination of replication stream: %s"
-msgstr "%s: término inesperado del flujo de replicación: %s"
-
-#: receivelog.c:708
-#, c-format
-msgid "%s: replication stream was terminated before stop point\n"
-msgstr "%s: el flujo de replicación terminó antes del punto de término\n"
-
-#: receivelog.c:756
-#, c-format
-msgid "%s: unexpected result set after end-of-timeline: got %d rows and %d fields, expected %d rows and %d fields\n"
-msgstr "%s: respuesta inesperada después del fin-de-timeline: se obtuvieron %d filas y %d campos, se esperaban %d filas y %d campos\n"
-
-#: receivelog.c:766
-#, c-format
-msgid "%s: could not parse next timeline's starting point \"%s\"\n"
-msgstr "%s: no se pudo interpretar el punto de inicio del siguiente timeline «%s»\n"
-
-#: receivelog.c:821 receivelog.c:923 receivelog.c:1088
-#, c-format
-msgid "%s: could not send copy-end packet: %s"
-msgstr "%s: no se pudo enviar el paquete copy-end: %s"
-
-#: receivelog.c:888
-#, c-format
-msgid "%s: select() failed: %s\n"
-msgstr "%s: select() falló: %s\n"
-
-#: receivelog.c:896
-#, c-format
-msgid "%s: could not receive data from WAL stream: %s"
-msgstr "%s: no se pudo recibir datos desde el flujo de WAL: %s"
-
-#: receivelog.c:960 receivelog.c:995
-#, c-format
-msgid "%s: streaming header too small: %d\n"
-msgstr "%s: cabecera de flujo demasiado pequeña: %d\n"
-
-#: receivelog.c:1014
-#, c-format
-msgid "%s: received transaction log record for offset %u with no file open\n"
-msgstr "%s: se recibió un registro transaccional para el desplazamiento %u sin ningún archivo abierto\n"
-
-#: receivelog.c:1026
-#, c-format
-msgid "%s: got WAL data offset %08x, expected %08x\n"
-msgstr "%s: se obtuvo desplazamiento de datos WAL %08x, se esperaba %08x\n"
-
-#: receivelog.c:1063
-#, c-format
-msgid "%s: could not write %u bytes to WAL file \"%s\": %s\n"
-msgstr "%s: no se pudo escribir %u bytes al archivo WAL «%s»: %s\n"
-
-#: receivelog.c:1101
-#, c-format
-msgid "%s: unrecognized streaming header: \"%c\"\n"
-msgstr "%s: cabecera de flujo no reconocida: «%c»\n"
-
-#: streamutil.c:135
-msgid "Password: "
-msgstr "Contraseña: "
-
-#: streamutil.c:148
-#, c-format
-msgid "%s: could not connect to server\n"
-msgstr "%s: no se pudo conectar al servidor\n"
-
-#: streamutil.c:164
-#, c-format
-msgid "%s: could not connect to server: %s\n"
-msgstr "%s: no se pudo conectar al servidor: %s\n"
-
-#: streamutil.c:188
-#, c-format
-msgid "%s: could not determine server setting for integer_datetimes\n"
-msgstr "%s: no se pudo determinar la opción integer_datetimes del servidor\n"
-
-#: streamutil.c:201
-#, c-format
-msgid "%s: integer_datetimes compile flag does not match server\n"
-msgstr "%s: la opción de compilación integer_datetimes no coincide con el servidor\n"
diff --git a/src/bin/pg_basebackup/po/it.po b/src/bin/pg_basebackup/po/it.po
index eaa09c1b8d5..1b137df6991 100644
--- a/src/bin/pg_basebackup/po/it.po
+++ b/src/bin/pg_basebackup/po/it.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: pg_basebackup (PostgreSQL) 9.4\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2014-08-23 05:12+0000\n"
-"PO-Revision-Date: 2014-08-17 02:23+0100\n"
+"POT-Creation-Date: 2014-11-12 21:12+0000\n"
+"PO-Revision-Date: 2014-11-13 13:36+0100\n"
"Last-Translator: Daniele Varrazzo <daniele.varrazzo@gmail.com>\n"
"Language-Team: Gruppo traduzioni ITPUG <traduzioni@itpug.org>\n"
"Language: it\n"
@@ -178,22 +178,22 @@ msgstr " -l, --label=LABEL imposta l'etichetta del backup\n"
msgid " -P, --progress show progress information\n"
msgstr " -P, --progress mostra informazioni sull'esecuzione\n"
-#: pg_basebackup.c:251 pg_receivexlog.c:65 pg_recvlogical.c:74
+#: pg_basebackup.c:251 pg_receivexlog.c:68 pg_recvlogical.c:86
#, c-format
msgid " -v, --verbose output verbose messages\n"
msgstr " -v, --verbose messaggi di output più numerosi\n"
-#: pg_basebackup.c:252 pg_receivexlog.c:66 pg_recvlogical.c:75
+#: pg_basebackup.c:252 pg_receivexlog.c:69 pg_recvlogical.c:87
#, c-format
msgid " -V, --version output version information, then exit\n"
msgstr " -V, --version mostra informazioni sulla versione ed esci\n"
-#: pg_basebackup.c:253 pg_receivexlog.c:67 pg_recvlogical.c:76
+#: pg_basebackup.c:253 pg_receivexlog.c:70 pg_recvlogical.c:88
#, c-format
msgid " -?, --help show this help, then exit\n"
msgstr " -?, --help mostra questo aiuto ed esci\n"
-#: pg_basebackup.c:254 pg_receivexlog.c:68 pg_recvlogical.c:77
+#: pg_basebackup.c:254 pg_receivexlog.c:71 pg_recvlogical.c:89
#, c-format
msgid ""
"\n"
@@ -202,22 +202,22 @@ msgstr ""
"\n"
"Opzioni di connessione:\n"
-#: pg_basebackup.c:255 pg_receivexlog.c:69
+#: pg_basebackup.c:255 pg_receivexlog.c:72
#, c-format
msgid " -d, --dbname=CONNSTR connection string\n"
msgstr " -d, --dbname=CONNSTR stringa di connessione\n"
-#: pg_basebackup.c:256 pg_receivexlog.c:70 pg_recvlogical.c:79
+#: pg_basebackup.c:256 pg_receivexlog.c:73 pg_recvlogical.c:91
#, c-format
msgid " -h, --host=HOSTNAME database server host or socket directory\n"
msgstr " -h, --host=HOSTNAME host del server database o directory del socket\n"
-#: pg_basebackup.c:257 pg_receivexlog.c:71 pg_recvlogical.c:80
+#: pg_basebackup.c:257 pg_receivexlog.c:74 pg_recvlogical.c:92
#, c-format
msgid " -p, --port=PORT database server port number\n"
msgstr " -p, --port=PORT numero di porta del server database\n"
-#: pg_basebackup.c:258 pg_receivexlog.c:72
+#: pg_basebackup.c:258
#, c-format
msgid ""
" -s, --status-interval=INTERVAL\n"
@@ -227,24 +227,24 @@ msgstr ""
" intervallo tra i pacchetti di stato inviati al server\n"
" (in secondi)\n"
-#: pg_basebackup.c:260 pg_receivexlog.c:74 pg_recvlogical.c:81
+#: pg_basebackup.c:260 pg_receivexlog.c:75 pg_recvlogical.c:93
#, c-format
msgid " -U, --username=NAME connect as specified database user\n"
msgstr " -U, --username=NAME connettiti al database col nome utente specificato\n"
-#: pg_basebackup.c:261 pg_receivexlog.c:75 pg_recvlogical.c:82
+#: pg_basebackup.c:261 pg_receivexlog.c:76 pg_recvlogical.c:94
#, c-format
msgid " -w, --no-password never prompt for password\n"
msgstr " -w, --no-password non chiedere mai la password\n"
-#: pg_basebackup.c:262 pg_receivexlog.c:76 pg_recvlogical.c:83
+#: pg_basebackup.c:262 pg_receivexlog.c:77 pg_recvlogical.c:95
#, c-format
msgid " -W, --password force password prompt (should happen automatically)\n"
msgstr ""
" -W, --password forza la richiesta della password\n"
" (dovrebbe essere automatico)\n"
-#: pg_basebackup.c:263 pg_receivexlog.c:78 pg_recvlogical.c:97
+#: pg_basebackup.c:263 pg_receivexlog.c:78 pg_recvlogical.c:96
#, c-format
msgid ""
"\n"
@@ -259,7 +259,7 @@ msgid "%s: could not read from ready pipe: %s\n"
msgstr "%s: lettura dalla pipe pronta fallita: %s\n"
#: pg_basebackup.c:314 pg_basebackup.c:406 pg_basebackup.c:1877
-#: pg_receivexlog.c:301 pg_recvlogical.c:938
+#: pg_receivexlog.c:301 pg_recvlogical.c:937
#, c-format
msgid "%s: could not parse transaction log location \"%s\"\n"
msgstr "%s: interpretazione della posizione del log delle transazioni \"%s\" fallita\n"
@@ -380,13 +380,13 @@ msgstr "%s: non è stato possibile ottenere lo stream di dati COPY: %s"
msgid "%s: could not close compressed file \"%s\": %s\n"
msgstr "%s: chiusura del file compresso \"%s\" fallita: %s\n"
-#: pg_basebackup.c:952 pg_recvlogical.c:555 receivelog.c:160 receivelog.c:295
+#: pg_basebackup.c:952 pg_recvlogical.c:554 receivelog.c:160 receivelog.c:295
#: receivelog.c:674
#, c-format
msgid "%s: could not close file \"%s\": %s\n"
msgstr "%s: chiusura del file \"%s\" fallita: %s\n"
-#: pg_basebackup.c:963 pg_basebackup.c:1175 pg_recvlogical.c:421
+#: pg_basebackup.c:963 pg_basebackup.c:1175 pg_recvlogical.c:420
#: receivelog.c:890
#, c-format
msgid "%s: could not read COPY data: %s"
@@ -444,13 +444,13 @@ msgid "%s: incompatible server version %s\n"
msgstr "%s: versione del server incompatibile %s\n"
#: pg_basebackup.c:1630 pg_basebackup.c:1664 pg_receivexlog.c:286
-#: pg_recvlogical.c:256 pg_recvlogical.c:854 pg_recvlogical.c:887
-#: pg_recvlogical.c:922 receivelog.c:470 receivelog.c:521 receivelog.c:561
+#: pg_recvlogical.c:255 pg_recvlogical.c:853 pg_recvlogical.c:886
+#: pg_recvlogical.c:921 receivelog.c:470 receivelog.c:521 receivelog.c:561
#, c-format
msgid "%s: could not send replication command \"%s\": %s"
msgstr "%s: invio del comando di replica \"%s\" fallito: %s"
-#: pg_basebackup.c:1637 pg_receivexlog.c:293 pg_recvlogical.c:862
+#: pg_basebackup.c:1637 pg_receivexlog.c:293 pg_recvlogical.c:861
#: receivelog.c:478
#, c-format
msgid "%s: could not identify system: got %d rows and %d fields, expected %d rows and %d or more fields\n"
@@ -576,7 +576,7 @@ msgstr "%s: livello di compressione non valido \"%s\"\n"
msgid "%s: invalid checkpoint argument \"%s\", must be \"fast\" or \"spread\"\n"
msgstr "%s: argomento di checkpoint \"%s\" non valido, deve essere \"fast\" oppure \"spread\"\n"
-#: pg_basebackup.c:2097 pg_receivexlog.c:428 pg_recvlogical.c:737
+#: pg_basebackup.c:2097 pg_receivexlog.c:428 pg_recvlogical.c:736
#, c-format
msgid "%s: invalid status interval \"%s\"\n"
msgstr "%s: intervallo di status \"%s\" non valido\n"
@@ -584,14 +584,14 @@ msgstr "%s: intervallo di status \"%s\" non valido\n"
#: pg_basebackup.c:2113 pg_basebackup.c:2127 pg_basebackup.c:2138
#: pg_basebackup.c:2151 pg_basebackup.c:2161 pg_basebackup.c:2173
#: pg_basebackup.c:2184 pg_receivexlog.c:447 pg_receivexlog.c:461
-#: pg_receivexlog.c:472 pg_recvlogical.c:761 pg_recvlogical.c:775
-#: pg_recvlogical.c:786 pg_recvlogical.c:794 pg_recvlogical.c:802
-#: pg_recvlogical.c:810 pg_recvlogical.c:818 pg_recvlogical.c:826
+#: pg_receivexlog.c:472 pg_recvlogical.c:760 pg_recvlogical.c:774
+#: pg_recvlogical.c:785 pg_recvlogical.c:793 pg_recvlogical.c:801
+#: pg_recvlogical.c:809 pg_recvlogical.c:817 pg_recvlogical.c:825
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "Prova \"%s --help\" per maggiori informazioni.\n"
-#: pg_basebackup.c:2125 pg_receivexlog.c:459 pg_recvlogical.c:773
+#: pg_basebackup.c:2125 pg_receivexlog.c:459 pg_recvlogical.c:772
#, c-format
msgid "%s: too many command-line arguments (first is \"%s\")\n"
msgstr "%s: troppi argomenti nella riga di comando (il primo è \"%s\")\n"
@@ -645,7 +645,7 @@ msgstr ""
"%s riceve lo stream del log delle transazioni di PostgreSQL.\n"
"\n"
-#: pg_receivexlog.c:62 pg_recvlogical.c:69
+#: pg_receivexlog.c:62 pg_recvlogical.c:73
#, c-format
msgid ""
"\n"
@@ -659,12 +659,22 @@ msgstr ""
msgid " -D, --directory=DIR receive transaction log files into this directory\n"
msgstr " -D, --directory=DIR ricevi i file di log delle transazioni in questa directory\n"
-#: pg_receivexlog.c:64 pg_recvlogical.c:73
+#: pg_receivexlog.c:64 pg_recvlogical.c:78
#, c-format
msgid " -n, --no-loop do not loop on connection lost\n"
msgstr " -n, --no-loop non ri-eseguire se la connessione è persa\n"
-#: pg_receivexlog.c:77
+#: pg_receivexlog.c:65 pg_recvlogical.c:83
+#, c-format
+msgid ""
+" -s, --status-interval=SECS\n"
+" time between status packets sent to server (default: %d)\n"
+msgstr ""
+" -s, --status-interval=SEC\n"
+" tempo tra gli invii dei pacchetti di stato al server\n"
+" (default: %d)\n"
+
+#: pg_receivexlog.c:67
#, c-format
msgid " -S, --slot=SLOTNAME replication slot to use\n"
msgstr " -S, --slot=NOMESLOT slot di replicazione da usare\n"
@@ -714,18 +724,18 @@ msgstr "%s: chiusura della directory \"%s\" fallita: %s\n"
msgid "%s: starting log streaming at %X/%X (timeline %u)\n"
msgstr "%s: avvio dello streaming dei log a %X/%X (timeline %u)\n"
-#: pg_receivexlog.c:409 pg_recvlogical.c:684
+#: pg_receivexlog.c:409 pg_recvlogical.c:683
#, c-format
msgid "%s: invalid port number \"%s\"\n"
msgstr "%s: numero di porta non valido \"%s\"\n"
-#: pg_receivexlog.c:494 pg_recvlogical.c:965
+#: pg_receivexlog.c:494 pg_recvlogical.c:964
#, c-format
msgid "%s: disconnected\n"
msgstr "%s: disconnesso\n"
#. translator: check source for value for %d
-#: pg_receivexlog.c:501 pg_recvlogical.c:972
+#: pg_receivexlog.c:501 pg_recvlogical.c:971
#, c-format
msgid "%s: disconnected; waiting %d seconds to try again\n"
msgstr "%s: disconnesso; aspetterò %d secondi prima di riprovare\n"
@@ -733,219 +743,200 @@ msgstr "%s: disconnesso; aspetterò %d secondi prima di riprovare\n"
#: pg_recvlogical.c:65
#, c-format
msgid ""
-"%s receives PostgreSQL logical change stream.\n"
+"%s receives PostgreSQL logical change streams.\n"
"\n"
msgstr ""
-"%s riceve uno stream di modifiche logiche PostgreSQL.\n"
+"%s riceve stream di modifiche logiche PostgreSQL.\n"
"\n"
-#: pg_recvlogical.c:70
-#, c-format
-msgid " -f, --file=FILE receive log into this file. - for stdout\n"
-msgstr " -f, --file=FILE riceve i log in questo file. - per stdout\n"
-
-#: pg_recvlogical.c:71
-#, c-format
-msgid ""
-" -F --fsync-interval=SECS\n"
-" frequency of syncs to the output file (default: %d)\n"
-msgstr ""
-" -F --fsync-interval=SEC\n"
-" frequenza dei sync al file di output (default: %d)\n"
-
-#: pg_recvlogical.c:78
-#, c-format
-msgid " -d, --dbname=DBNAME database to connect to\n"
-msgstr " -d, --dbname=NOMEDB database a cui connettersi\n"
-
-#: pg_recvlogical.c:84
+#: pg_recvlogical.c:69
#, c-format
msgid ""
"\n"
-"Replication options:\n"
+"Action to be performed:\n"
msgstr ""
"\n"
-"Opzioni di replica:\n"
+"Azioni da effettuare:\n"
-#: pg_recvlogical.c:85
+#: pg_recvlogical.c:70
#, c-format
-msgid " -I, --startpos=PTR where in an existing slot should the streaming start\n"
-msgstr " -I, --startpos=PUNT dove deve partire lo streaming in uno slot esistente\n"
+msgid " --create-slot create a new replication slot (for the slot's name see --slot)\n"
+msgstr " --create-slot crea un nuovo slot di replica (per il nome vedi --slot)\n"
-#: pg_recvlogical.c:86
+#: pg_recvlogical.c:71
#, c-format
-msgid ""
-" -o, --option=NAME[=VALUE]\n"
-" specify option NAME with optional value VALUE, to be passed\n"
-" to the output plugin\n"
-msgstr ""
-" -o, --option=NOME[=VALORE]\n"
-" specifica l'opzione NOME col valore opzionale VALORE,\n"
-" da passare al plugin di output\n"
+msgid " --drop-slot drop the replication slot (for the slot's name see --slot)\n"
+msgstr " --drop-slot elimina lo slot di replica (per il nome vedi --slot)\n"
-#: pg_recvlogical.c:89
+#: pg_recvlogical.c:72
#, c-format
-msgid " -P, --plugin=PLUGIN use output plugin PLUGIN (default: %s)\n"
-msgstr " -P, --plugin=PLUGIN usa il plugin di output PLUGIN (default: %s)\n"
+msgid " --start start streaming in a replication slot (for the slot's name see --slot)\n"
+msgstr " --start avvia lo streaming in uno slot di replica (per il nome vedi --slot)\n"
-#: pg_recvlogical.c:90
+#: pg_recvlogical.c:74
+#, c-format
+msgid " -f, --file=FILE receive log into this file, - for stdout\n"
+msgstr " -f, --file=FILE riceve i log in questo file, - per stdout\n"
+
+#: pg_recvlogical.c:75
#, c-format
msgid ""
-" -s, --status-interval=SECS\n"
-" time between status packets sent to server (default: %d)\n"
+" -F --fsync-interval=SECS\n"
+" time between fsyncs to the output file (default: %d)\n"
msgstr ""
-" -s, --status-interval=SEC\n"
-" tempo tra gli invii dei pacchetti di stato al server\n"
-" (default: %d)\n"
+" -F --fsync-interval=SEC\n"
+" tempo tra i sync del file di output (default: %d)\n"
-#: pg_recvlogical.c:92
+#: pg_recvlogical.c:77
#, c-format
-msgid " -S, --slot=SLOT name of the logical replication slot\n"
-msgstr " -S, --slot=SLOT nome dello slot di replica logica\n"
+msgid " -I, --startpos=LSN where in an existing slot should the streaming start\n"
+msgstr " -I, --startpos=LSN dove deve partire lo streaming in uno slot esistente\n"
-#: pg_recvlogical.c:93
+#: pg_recvlogical.c:79
#, c-format
msgid ""
-"\n"
-"Action to be performed:\n"
+" -o, --option=NAME[=VALUE]\n"
+" pass option NAME with optional value VALUE to the\n"
+" output plugin\n"
msgstr ""
-"\n"
-"Azioni da effettuare:\n"
+" -o, --option=NOME[=VALORE]\n"
+" passa l'opzione NOME col valore opzionale VALORE\n"
+" al plugin di output\n"
-#: pg_recvlogical.c:94
+#: pg_recvlogical.c:82
#, c-format
-msgid " --create create a new replication slot (for the slot's name see --slot)\n"
-msgstr " --create crea un nuovo slot di replica (per il nome vedi --slot)\n"
+msgid " -P, --plugin=PLUGIN use output plugin PLUGIN (default: %s)\n"
+msgstr " -P, --plugin=PLUGIN usa il plugin di output PLUGIN (default: %s)\n"
-#: pg_recvlogical.c:95
+#: pg_recvlogical.c:85
#, c-format
-msgid " --start start streaming in a replication slot (for the slot's name see --slot)\n"
-msgstr " --start avvia lo streaming in uno slot di replica (per il nome vedi --slot)\n"
+msgid " -S, --slot=SLOTNAME name of the logical replication slot\n"
+msgstr " -S, --slot=NOMESLOT nome dello slot di replica logica\n"
-#: pg_recvlogical.c:96
+#: pg_recvlogical.c:90
#, c-format
-msgid " --drop drop the replication slot (for the slot's name see --slot)\n"
-msgstr " --drop elimina lo slot di replica (per il nome vedi --slot)\n"
+msgid " -d, --dbname=DBNAME database to connect to\n"
+msgstr " -d, --dbname=NOMEDB database a cui connettersi\n"
-#: pg_recvlogical.c:124
+#: pg_recvlogical.c:123
#, c-format
msgid "%s: confirming write up to %X/%X, flush to %X/%X (slot %s)\n"
msgstr "%s: scritture confermate fino a %X/%X, flush a %X/%X (slot %s)\n"
-#: pg_recvlogical.c:149 receivelog.c:340
+#: pg_recvlogical.c:148 receivelog.c:340
#, c-format
msgid "%s: could not send feedback packet: %s"
msgstr "%s: invio del pacchetto di feedback fallito: %s"
-#: pg_recvlogical.c:185
+#: pg_recvlogical.c:184
#, c-format
msgid "%s: could not fsync log file \"%s\": %s\n"
msgstr "%s: fsync del file di log \"%s\" fallito: %s\n"
-#: pg_recvlogical.c:224
+#: pg_recvlogical.c:223
#, c-format
msgid "%s: starting log streaming at %X/%X (slot %s)\n"
msgstr "%s: inizio dello streaming dei log a %X/%X (slot %s)\n"
-#: pg_recvlogical.c:266
+#: pg_recvlogical.c:265
#, c-format
msgid "%s: streaming initiated\n"
msgstr "%s: streaming iniziato\n"
-#: pg_recvlogical.c:329
+#: pg_recvlogical.c:328
#, c-format
msgid "%s: could not open log file \"%s\": %s\n"
msgstr "%s: apertura del file di log \"%s\" fallita: %s\n"
-#: pg_recvlogical.c:398 receivelog.c:837
+#: pg_recvlogical.c:397 receivelog.c:837
#, c-format
msgid "%s: select() failed: %s\n"
msgstr "%s: select() fallita: %s\n"
-#: pg_recvlogical.c:407 receivelog.c:845
+#: pg_recvlogical.c:406 receivelog.c:845
#, c-format
msgid "%s: could not receive data from WAL stream: %s"
msgstr "%s: ricezione dati dallo stream WAL fallita: %s"
-#: pg_recvlogical.c:448 pg_recvlogical.c:487 receivelog.c:912 receivelog.c:947
+#: pg_recvlogical.c:447 pg_recvlogical.c:486 receivelog.c:912 receivelog.c:947
#, c-format
msgid "%s: streaming header too small: %d\n"
msgstr "%s: intestazione dello streaming troppo piccola: %d\n"
-#: pg_recvlogical.c:470 receivelog.c:1053
+#: pg_recvlogical.c:469 receivelog.c:1053
#, c-format
msgid "%s: unrecognized streaming header: \"%c\"\n"
msgstr "%s: intestazione dello streaming sconosciuta: \"%c\"\n"
-#: pg_recvlogical.c:516 pg_recvlogical.c:530
+#: pg_recvlogical.c:515 pg_recvlogical.c:529
#, c-format
msgid "%s: could not write %u bytes to log file \"%s\": %s\n"
msgstr "%s: scrittura di %u byte nel file di log \"%s\" fallita: %s\n"
-#: pg_recvlogical.c:541 receivelog.c:627 receivelog.c:665
+#: pg_recvlogical.c:540 receivelog.c:627 receivelog.c:665
#, c-format
msgid "%s: unexpected termination of replication stream: %s"
msgstr "%s: terminazione inaspettata dello stream di replica: %s"
-#: pg_recvlogical.c:663
+#: pg_recvlogical.c:662
#, c-format
msgid "%s: invalid fsync interval \"%s\"\n"
msgstr "%s: intervallo di fsync \"%s\" non valido\n"
-#: pg_recvlogical.c:704
+#: pg_recvlogical.c:703
#, c-format
msgid "%s: could not parse start position \"%s\"\n"
msgstr "%s: interpretazione della posizione di inizio \"%s\" fallita\n"
-#: pg_recvlogical.c:785
+#: pg_recvlogical.c:784
#, c-format
msgid "%s: no slot specified\n"
msgstr "%s: slot non specificato\n"
-#: pg_recvlogical.c:793
+#: pg_recvlogical.c:792
#, c-format
msgid "%s: no target file specified\n"
msgstr "%s: file di destinazione non specificato\n"
-#: pg_recvlogical.c:801
+#: pg_recvlogical.c:800
#, c-format
msgid "%s: no database specified\n"
msgstr "%s: database non specificato\n"
-#: pg_recvlogical.c:809
+#: pg_recvlogical.c:808
#, c-format
msgid "%s: at least one action needs to be specified\n"
msgstr "%s: occorre specificare almeno una azione\n"
-#: pg_recvlogical.c:817
+#: pg_recvlogical.c:816
#, c-format
-msgid "%s: cannot use --create or --start together with --drop\n"
-msgstr "%s: --create o --start non possono essere usate con --drop\n"
+msgid "%s: cannot use --create-slot or --start together with --drop-slot\n"
+msgstr "%s: --create-slot o --start non possono essere usate con --drop-slot\n"
-#: pg_recvlogical.c:825
+#: pg_recvlogical.c:824
#, c-format
-msgid "%s: cannot use --create or --drop together with --startpos\n"
-msgstr "%s: --create o --drop non possono essere usate con --startpos\n"
+msgid "%s: cannot use --create-slot or --drop-slot together with --startpos\n"
+msgstr "%s: --create-slot o --drop-slot non possono essere usate con --startpos\n"
-#: pg_recvlogical.c:879
+#: pg_recvlogical.c:878
#, c-format
-msgid "%s: freeing replication slot \"%s\"\n"
-msgstr "%s: liberazione dello slot di replica \"%s\"\n"
+msgid "%s: dropping replication slot \"%s\"\n"
+msgstr "%s: eliminazione dello slot di replica \"%s\"\n"
-#: pg_recvlogical.c:895
+#: pg_recvlogical.c:894
#, c-format
-msgid "%s: could not stop logical replication: got %d rows and %d fields, expected %d rows and %d fields\n"
-msgstr "%s: arresto della replica logica fallito: ricevute %d righe e %d campi, attese %d righe e %d campi\n"
+msgid "%s: could not drop replication slot \"%s\": got %d rows and %d fields, expected %d rows and %d fields\n"
+msgstr "%s: eliminazione dello slot di replica \"%s\" fallita: ricevute %d righe e %d campi, attesi %d righe e %d campi\n"
-#: pg_recvlogical.c:913
+#: pg_recvlogical.c:912
#, c-format
-msgid "%s: initializing replication slot \"%s\"\n"
-msgstr "%s: inizializzazione dello slot di replica \"%s\"\n"
+msgid "%s: creating replication slot \"%s\"\n"
+msgstr "%s: creazione dello slot di replica \"%s\"\n"
-#: pg_recvlogical.c:930
+#: pg_recvlogical.c:929
#, c-format
-msgid "%s: could not init logical replication: got %d rows and %d fields, expected %d rows and %d fields\n"
-msgstr "%s: inizializzazione della replica logica fallito: ricevute %d righe e %d campi, attese %d righe e %d campi\n"
+msgid "%s: could not create replication slot \"%s\": got %d rows and %d fields, expected %d rows and %d fields\n"
+msgstr "%s: creazione dello slot di replica \"%s\" fallita: ricevute %d righe e %d campi, attesi %d righe e %d campi\n"
#: receivelog.c:68
#, c-format
diff --git a/src/bin/pg_basebackup/po/ja.po b/src/bin/pg_basebackup/po/ja.po
deleted file mode 100644
index d6dab469bc7..00000000000
--- a/src/bin/pg_basebackup/po/ja.po
+++ /dev/null
@@ -1,837 +0,0 @@
-# LANGUAGE message translation file for pg_basebackup
-# Copyright (C) 2011 PostgreSQL Global Development Group
-# This file is distributed under the same license as the PostgreSQL package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PostgreSQL 9.1\n"
-"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2013-08-18 10:50+0900\n"
-"PO-Revision-Date: 2013-08-18 11:17+0900\n"
-"Last-Translator: honda@postgresql.jp\n"
-"Language-Team: Japan Postgresql User Group\n"
-"Language: ja\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../../common/fe_memutils.c:33 ../../common/fe_memutils.c:60
-#: ../../common/fe_memutils.c:83
-#, c-format
-msgid "out of memory\n"
-msgstr "メモリ不足です\n"
-
-#: ../../common/fe_memutils.c:77
-#, c-format
-msgid "cannot duplicate null pointer (internal error)\n"
-msgstr "null ポインタを複製できません(内部エラー)。\n"
-
-#: pg_basebackup.c:106
-#, c-format
-msgid ""
-"%s takes a base backup of a running PostgreSQL server.\n"
-"\n"
-msgstr "%sは実行中のPostgreSQLサーバのベースバックアップを取得します。\n"
-
-#: pg_basebackup.c:108 pg_receivexlog.c:53
-#, c-format
-msgid "Usage:\n"
-msgstr "使用方法:\n"
-
-#: pg_basebackup.c:109 pg_receivexlog.c:54
-#, c-format
-msgid " %s [OPTION]...\n"
-msgstr " %s [OPTION]...\n"
-
-#: pg_basebackup.c:110
-#, c-format
-msgid ""
-"\n"
-"Options controlling the output:\n"
-msgstr ""
-"\n"
-"出力を制御するオプション:\n"
-
-#: pg_basebackup.c:111
-#, c-format
-msgid " -D, --pgdata=DIRECTORY receive base backup into directory\n"
-msgstr " -D, --pgdata=DIRECTORY ディレクトリ内にベースバックアップを格納します\n"
-
-#: pg_basebackup.c:112
-#, c-format
-msgid " -F, --format=p|t output format (plain (default), tar)\n"
-msgstr " -F, --format=p|t 出力フォーマット(プレイン(デフォルト)またはtar)\n"
-
-#: pg_basebackup.c:113
-#, c-format
-#| msgid ""
-#| " -0, --record-separator-zero\n"
-#| " set record separator to zero byte\n"
-msgid ""
-" -R, --write-recovery-conf\n"
-" write recovery.conf after backup\n"
-msgstr ""
-" -R, --record-separator-zero\n"
-" バックアップの後にrecovery.confを書き出す\n"
-
-#: pg_basebackup.c:115
-#, c-format
-msgid " -x, --xlog include required WAL files in backup (fetch mode)\n"
-msgstr " -x, --xlog 必要なWALファイルをバックアップ内に含めます(フェッチモード)\n"
-
-#: pg_basebackup.c:116
-#, c-format
-msgid ""
-" -X, --xlog-method=fetch|stream\n"
-" include required WAL files with specified method\n"
-msgstr ""
-" -x, --xlog-method=fetch|stream\n"
-" 必要なWALファイルを指定した方法で含めます\n"
-
-#: pg_basebackup.c:118
-#, c-format
-msgid " -z, --gzip compress tar output\n"
-msgstr " -z, --gzip 出力を圧縮します\n"
-
-#: pg_basebackup.c:119
-#, c-format
-msgid " -Z, --compress=0-9 compress tar output with given compression level\n"
-msgstr " -Z, --compress=0-9 指定した圧縮レベルでtar出力を圧縮します\n"
-
-#: pg_basebackup.c:120
-#, c-format
-msgid ""
-"\n"
-"General options:\n"
-msgstr ""
-"\n"
-"汎用のオプション:\n"
-
-#: pg_basebackup.c:121
-#, c-format
-msgid ""
-" -c, --checkpoint=fast|spread\n"
-" set fast or spread checkpointing\n"
-msgstr ""
-" -c, --checkpoint=fast|spread\n"
-" 高速チェックポイント処理または分散チェックポイント処理の設定\n"
-
-#: pg_basebackup.c:123
-#, c-format
-msgid " -l, --label=LABEL set backup label\n"
-msgstr " -l, --label=LABEL バックアップラベルの設定\n"
-
-#: pg_basebackup.c:124
-#, c-format
-msgid " -P, --progress show progress information\n"
-msgstr " -P, --progress 進行状況の表示\n"
-
-#: pg_basebackup.c:125 pg_receivexlog.c:58
-#, c-format
-msgid " -v, --verbose output verbose messages\n"
-msgstr " -v, --verbose 冗長メッセージの出力\n"
-
-#: pg_basebackup.c:126 pg_receivexlog.c:59
-#, c-format
-msgid " -V, --version output version information, then exit\n"
-msgstr " -V, --version バージョン情報を表示し、終了します\n"
-
-#: pg_basebackup.c:127 pg_receivexlog.c:60
-#, c-format
-msgid " -?, --help show this help, then exit\n"
-msgstr " -?, --help このヘルプを表示し、終了します\n"
-
-#: pg_basebackup.c:128 pg_receivexlog.c:61
-#, c-format
-msgid ""
-"\n"
-"Connection options:\n"
-msgstr ""
-"\n"
-"接続オプション:\n"
-
-#: pg_basebackup.c:129 pg_receivexlog.c:62
-#, c-format
-#| msgid " -d, --dbname=NAME connect to database name\n"
-msgid " -d, --dbname=CONNSTR connection string\n"
-msgstr " -d, --dbname=CONSTR 接続文字列\n"
-
-#: pg_basebackup.c:130 pg_receivexlog.c:63
-#, c-format
-msgid " -h, --host=HOSTNAME database server host or socket directory\n"
-msgstr " -h, --host=HOSTNAME データベースサーバホストまたはソケットディレクトリ\n"
-
-#: pg_basebackup.c:131 pg_receivexlog.c:64
-#, c-format
-msgid " -p, --port=PORT database server port number\n"
-msgstr " -p, --port=PORT データベースサーバのポート番号\n"
-
-#: pg_basebackup.c:132 pg_receivexlog.c:65
-#, c-format
-msgid ""
-" -s, --status-interval=INTERVAL\n"
-" time between status packets sent to server (in seconds)\n"
-msgstr ""
-" -s, --status-interval=INTERVAL\n"
-" サーバへ状態パケットを送信する間隔(秒単位)\n"
-
-#: pg_basebackup.c:134 pg_receivexlog.c:67
-#, c-format
-msgid " -U, --username=NAME connect as specified database user\n"
-msgstr " -U, --username=NAME 指定したデータベースユーザで接続\n"
-
-#: pg_basebackup.c:135 pg_receivexlog.c:68
-#, c-format
-msgid " -w, --no-password never prompt for password\n"
-msgstr " -w, --no-password パスワード入力を促さない\n"
-
-#: pg_basebackup.c:136 pg_receivexlog.c:69
-#, c-format
-msgid " -W, --password force password prompt (should happen automatically)\n"
-msgstr " -W, --password 強制的にパスワード入力を促す(自動的に行われるはずです)\n"
-
-#: pg_basebackup.c:137 pg_receivexlog.c:70
-#, c-format
-msgid ""
-"\n"
-"Report bugs to <pgsql-bugs@postgresql.org>.\n"
-msgstr ""
-"\n"
-"不具合は<pgsql-bugs@postgresql.org>まで報告ください\n"
-
-#: pg_basebackup.c:180
-#, c-format
-msgid "%s: could not read from ready pipe: %s\n"
-msgstr "%s: 準備されたパイプから読み込めませんでした: %s\n"
-
-#: pg_basebackup.c:188 pg_basebackup.c:280 pg_basebackup.c:1598
-#: pg_receivexlog.c:266
-#, c-format
-msgid "%s: could not parse transaction log location \"%s\"\n"
-msgstr "%s: トランザクションログ位置\"%s\"を解析できませんでした\n"
-
-#: pg_basebackup.c:293
-#, c-format
-msgid "%s: could not create pipe for background process: %s\n"
-msgstr "%s: バックグランドプロセス用のパイプを作成できませんでした: \"%s\"\n"
-
-#: pg_basebackup.c:326
-#, c-format
-msgid "%s: could not create background process: %s\n"
-msgstr "%s: バックグランドプロセスを作成できませんでした: %s\n"
-
-#: pg_basebackup.c:338
-#, c-format
-msgid "%s: could not create background thread: %s\n"
-msgstr "%s: バックグランドスレッドを作成できませんでした: %s\n"
-
-#: pg_basebackup.c:363 pg_basebackup.c:989
-#, c-format
-msgid "%s: could not create directory \"%s\": %s\n"
-msgstr "%s: \"%s\"ディレクトリを作成することができませんでした: %s\n"
-
-#: pg_basebackup.c:382
-#, c-format
-msgid "%s: directory \"%s\" exists but is not empty\n"
-msgstr "%s: \"%s\"ディレクトリは存在しますが空ではありません\n"
-
-#: pg_basebackup.c:390
-#, c-format
-msgid "%s: could not access directory \"%s\": %s\n"
-msgstr "%s: \"%s\"ディレクトリにアクセスできませんでした: %s\n"
-
-#: pg_basebackup.c:438
-#, c-format
-msgid "%*s/%s kB (100%%), %d/%d tablespace %*s"
-msgid_plural "%*s/%s kB (100%%), %d/%d tablespaces %*s"
-msgstr[0] ""
-msgstr[1] ""
-
-#: pg_basebackup.c:450
-#, c-format
-msgid "%*s/%s kB (%d%%), %d/%d tablespace (%s%-*.*s)"
-msgid_plural "%*s/%s kB (%d%%), %d/%d tablespaces (%s%-*.*s)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: pg_basebackup.c:466
-#, c-format
-msgid "%*s/%s kB (%d%%), %d/%d tablespace"
-msgid_plural "%*s/%s kB (%d%%), %d/%d tablespaces"
-msgstr[0] ""
-msgstr[1] ""
-
-#: pg_basebackup.c:493
-#, c-format
-msgid "%s: could not write to compressed file \"%s\": %s\n"
-msgstr "%s: \"%s\"圧縮ファイルに書き出すことができませんでした: %s\n"
-
-#: pg_basebackup.c:503 pg_basebackup.c:1071 pg_basebackup.c:1289
-#, c-format
-msgid "%s: could not write to file \"%s\": %s\n"
-msgstr "%s: \"%s\"ファイルに書き出すことができませんでした: %s\n"
-
-#: pg_basebackup.c:558 pg_basebackup.c:578 pg_basebackup.c:606
-#, c-format
-msgid "%s: could not set compression level %d: %s\n"
-msgstr "%s: 圧縮レベルを%dに設定することができませんでした: %s\n"
-
-#: pg_basebackup.c:627
-#, c-format
-msgid "%s: could not create compressed file \"%s\": %s\n"
-msgstr "%s: \"%s\"圧縮ファイルを作成することができませんでした: %s\n"
-
-#: pg_basebackup.c:638 pg_basebackup.c:1031 pg_basebackup.c:1282
-#, c-format
-msgid "%s: could not create file \"%s\": %s\n"
-msgstr "%s: \"%s\"ファイルを作成することができませんでした: %s\n"
-
-#: pg_basebackup.c:650 pg_basebackup.c:893
-#, c-format
-msgid "%s: could not get COPY data stream: %s"
-msgstr "%s: COPYデータストリームを入手できませんでした: %s"
-
-#: pg_basebackup.c:707
-#, c-format
-msgid "%s: could not close compressed file \"%s\": %s\n"
-msgstr "%s: \"%s\"圧縮ファイルを閉じることができませんでした: %s\n"
-
-#: pg_basebackup.c:720 receivelog.c:161 receivelog.c:351 receivelog.c:725
-#, c-format
-msgid "%s: could not close file \"%s\": %s\n"
-msgstr "%s: ファイル\"%s\"を閉じることができませんでした: %s\n"
-
-#: pg_basebackup.c:731 pg_basebackup.c:922 receivelog.c:938
-#, c-format
-msgid "%s: could not read COPY data: %s"
-msgstr "%s: COPYデータを読み取ることができませんでした: %s"
-
-#: pg_basebackup.c:936
-#, c-format
-msgid "%s: invalid tar block header size: %d\n"
-msgstr "%s: 無効なtarブロックヘッダサイズ: %d\n"
-
-#: pg_basebackup.c:944
-#, c-format
-msgid "%s: could not parse file size\n"
-msgstr "%s: ファイルサイズの解析ができませんでした\n"
-
-#: pg_basebackup.c:952
-#, c-format
-msgid "%s: could not parse file mode\n"
-msgstr "%s: ファイルモードの解析ができませんでした\n"
-
-#: pg_basebackup.c:997
-#, c-format
-msgid "%s: could not set permissions on directory \"%s\": %s\n"
-msgstr "%s: \"%s\"ディレクトリの権限を設定することができませんでした: %s\n"
-
-#: pg_basebackup.c:1010
-#, c-format
-msgid "%s: could not create symbolic link from \"%s\" to \"%s\": %s\n"
-msgstr "%s: \"%s\"から\"%s\"へのシンボリックリンクを作成できませんでした: %s\n"
-
-#: pg_basebackup.c:1018
-#, c-format
-msgid "%s: unrecognized link indicator \"%c\"\n"
-msgstr "%s: 未知のリンク指示子\"%c\"\n"
-
-#: pg_basebackup.c:1038
-#, c-format
-msgid "%s: could not set permissions on file \"%s\": %s\n"
-msgstr "%s: \"%s\"ファイルの権限を設定できませんでした: %s\n"
-
-#: pg_basebackup.c:1097
-#, c-format
-msgid "%s: COPY stream ended before last file was finished\n"
-msgstr "%s: 最後のファイルが終わる前にCOPYストリームが完了しました\n"
-
-#: pg_basebackup.c:1183 pg_basebackup.c:1203 pg_basebackup.c:1210
-#: pg_basebackup.c:1257
-#, c-format
-msgid "%s: out of memory\n"
-msgstr "%s: メモリ不足です\n"
-
-#: pg_basebackup.c:1333
-#, c-format
-#| msgid "%s: could not parse server version \"%s\"\n"
-msgid "%s: incompatible server version %s\n"
-msgstr "%s: 互換性がないサーババージョン\"%s\"\n"
-
-#: pg_basebackup.c:1360 pg_basebackup.c:1389 pg_receivexlog.c:251
-#: receivelog.c:532 receivelog.c:577 receivelog.c:616
-#, c-format
-msgid "%s: could not send replication command \"%s\": %s"
-msgstr "%s: レプリケーションコマンド\"%s\"を送信できませんでした: %s"
-
-#: pg_basebackup.c:1367 pg_receivexlog.c:258 receivelog.c:540
-#, c-format
-msgid "%s: could not identify system: got %d rows and %d fields, expected %d rows and %d fields\n"
-msgstr "%s: システムを識別できませんでした。%d行と%dフィールドを入手しました。想定では%d行と%dフィールドでした\n"
-
-#: pg_basebackup.c:1400
-#, c-format
-msgid "%s: could not initiate base backup: %s"
-msgstr "%s: ベースバックアップを初期化できませんでした: %s"
-
-#: pg_basebackup.c:1407
-#, c-format
-#| msgid "%s: could not identify system: got %d rows and %d fields, expected %d rows and %d fields\n"
-msgid "%s: server returned unexpected response to BASE_BACKUP command; got %d rows and %d fields, expected %d rows and %d fields\n"
-msgstr "%s: サーバはBASE_BACKUPコマンドに想定外の応答を返しました: %d行と%dフィールドを入手しました。想定では%d行と%dフィールドでした\n"
-
-#: pg_basebackup.c:1427
-#, c-format
-#| msgid "%s: starting log streaming at %X/%X (timeline %u)\n"
-msgid "transaction log start point: %s on timeline %u\n"
-msgstr "トランザクションログの開始ポイント: タイムライン%2$u上の%1$s\n"
-
-#: pg_basebackup.c:1436
-#, c-format
-msgid "%s: could not get backup header: %s"
-msgstr "%s: バックアップヘッダを入手できませんでした: %s"
-
-#: pg_basebackup.c:1442
-#, c-format
-msgid "%s: no data returned from server\n"
-msgstr "%s: サーバから返されるデータがありません\n"
-
-#: pg_basebackup.c:1471
-#, c-format
-msgid "%s: can only write single tablespace to stdout, database has %d\n"
-msgstr "%s: データベースには%dありましたが、1つのテーブル空間のみ標準出力に書き出すことができます\n"
-
-#: pg_basebackup.c:1483
-#, c-format
-msgid "%s: starting background WAL receiver\n"
-msgstr "%s: バックグランドWAL受信処理を開始します\n"
-
-#: pg_basebackup.c:1513
-#, c-format
-msgid "%s: could not get transaction log end position from server: %s"
-msgstr "%s: サーバからトランザクションログの終了位置を入手できませんでした: %s"
-
-#: pg_basebackup.c:1520
-#, c-format
-msgid "%s: no transaction log end position returned from server\n"
-msgstr "%s: サーバからトランザクションログの終了位置が返されませんでした\n"
-
-#: pg_basebackup.c:1532
-#, c-format
-msgid "%s: final receive failed: %s"
-msgstr "%s: 最終受信に失敗しました: %s"
-
-#: pg_basebackup.c:1550
-#, c-format
-#| msgid "%s: waiting for background process to finish streaming...\n"
-msgid "%s: waiting for background process to finish streaming ...\n"
-msgstr "%s: ストリーミング処理が終わるまでバックグランドプロセスを待機します ...\n"
-
-#: pg_basebackup.c:1556
-#, c-format
-msgid "%s: could not send command to background pipe: %s\n"
-msgstr "%s: バックグランドパイプにコマンドを送信できませんでした: %s\n"
-
-#: pg_basebackup.c:1565
-#, c-format
-msgid "%s: could not wait for child process: %s\n"
-msgstr "%s: 子プロセスを待機できませんでした: %s\n"
-
-#: pg_basebackup.c:1571
-#, c-format
-msgid "%s: child %d died, expected %d\n"
-msgstr "%s: 子プロセス%d 終了、その期待値は%dです\n"
-
-#: pg_basebackup.c:1577
-#, c-format
-msgid "%s: child process did not exit normally\n"
-msgstr "%s: 子プロセスが正常に終わりませんでした\n"
-
-#: pg_basebackup.c:1583
-#, c-format
-msgid "%s: child process exited with error %d\n"
-msgstr "%s: 子プロセスが終了コード%dで終了しました\n"
-
-#: pg_basebackup.c:1610
-#, c-format
-msgid "%s: could not wait for child thread: %s\n"
-msgstr "%s: 子スレッドを待機できませんでした: %s\n"
-
-#: pg_basebackup.c:1617
-#, c-format
-msgid "%s: could not get child thread exit status: %s\n"
-msgstr "%s: 子スレッドの終了ステータスを入手できませんでした: %s\n"
-
-#: pg_basebackup.c:1623
-#, c-format
-msgid "%s: child thread exited with error %u\n"
-msgstr "%s: 子スレッドがエラー%uで終了しました\n"
-
-#: pg_basebackup.c:1709
-#, c-format
-msgid "%s: invalid output format \"%s\", must be \"plain\" or \"tar\"\n"
-msgstr "%s: \"%s\"出力フォーマットは無効です。\"plain\"か\"tar\"でなければなりません\n"
-
-#: pg_basebackup.c:1721 pg_basebackup.c:1733
-#, c-format
-msgid "%s: cannot specify both --xlog and --xlog-method\n"
-msgstr "%s: --xlogと--xlog-methodは同時には指定できません\n"
-
-#: pg_basebackup.c:1748
-#, c-format
-#| msgid "%s: invalid xlog-method option \"%s\", must be empty, \"fetch\", or \"stream\"\n"
-msgid "%s: invalid xlog-method option \"%s\", must be \"fetch\" or \"stream\"\n"
-msgstr "%s: \"%s\" xlog方式は無効です。\"fetch\"、\"stream\"のいずれかでなければなりません\n"
-
-#: pg_basebackup.c:1767
-#, c-format
-msgid "%s: invalid compression level \"%s\"\n"
-msgstr "%s: \"%s\"圧縮レベルは無効です\n"
-
-#: pg_basebackup.c:1779
-#, c-format
-msgid "%s: invalid checkpoint argument \"%s\", must be \"fast\" or \"spread\"\n"
-msgstr "%s: \"%s\"チェックポイント引数は無効です。\"fast\"または\"spreadでなければなりません\n"
-
-#: pg_basebackup.c:1806 pg_receivexlog.c:392
-#, c-format
-msgid "%s: invalid status interval \"%s\"\n"
-msgstr "%s: \"%s\" 状態間隔は無効です\n"
-
-#: pg_basebackup.c:1822 pg_basebackup.c:1836 pg_basebackup.c:1847
-#: pg_basebackup.c:1860 pg_basebackup.c:1870 pg_receivexlog.c:408
-#: pg_receivexlog.c:422 pg_receivexlog.c:433
-#, c-format
-msgid "Try \"%s --help\" for more information.\n"
-msgstr "詳細については\"%s --help\"を実行してください。\n"
-
-#: pg_basebackup.c:1834 pg_receivexlog.c:420
-#, c-format
-msgid "%s: too many command-line arguments (first is \"%s\")\n"
-msgstr "%s: コマンドライン引数が多過ぎます(最初は\"%s\"です)\n"
-
-#: pg_basebackup.c:1846 pg_receivexlog.c:432
-#, c-format
-msgid "%s: no target directory specified\n"
-msgstr "%s: 対象ディレクトリが指定されていません\n"
-
-#: pg_basebackup.c:1858
-#, c-format
-msgid "%s: only tar mode backups can be compressed\n"
-msgstr "%s: tarモードのバックアップのみ圧縮することができます\n"
-
-#: pg_basebackup.c:1868
-#, c-format
-#| msgid "%s: wal streaming can only be used in plain mode\n"
-msgid "%s: WAL streaming can only be used in plain mode\n"
-msgstr "%s: WALストリーミングはプレインモードでのみ使用することができます。\n"
-
-#: pg_basebackup.c:1879
-#, c-format
-msgid "%s: this build does not support compression\n"
-msgstr "%s: この構築では圧縮をサポートしていません\n"
-
-#: pg_receivexlog.c:51
-#, c-format
-msgid ""
-"%s receives PostgreSQL streaming transaction logs.\n"
-"\n"
-msgstr ""
-"%sはPostgreSQLのトランザクションログストリーミングを受信します。\n"
-"\n"
-
-#: pg_receivexlog.c:55
-#, c-format
-msgid ""
-"\n"
-"Options:\n"
-msgstr ""
-"\n"
-"オプション:\n"
-
-#: pg_receivexlog.c:56
-#, c-format
-msgid " -D, --directory=DIR receive transaction log files into this directory\n"
-msgstr " -D, --xlogdir=XLOGDIR 受信したトランザクションログの格納ディレクトリ\n"
-
-#: pg_receivexlog.c:57
-#, c-format
-msgid " -n, --no-loop do not loop on connection lost\n"
-msgstr " -n, --no-loop 接続がなくなった時に繰り返さない\n"
-
-#: pg_receivexlog.c:81
-#, c-format
-msgid "%s: finished segment at %X/%X (timeline %u)\n"
-msgstr "%s: %X/%X (タイムライン %u)でセグメントが完了\n"
-
-#: pg_receivexlog.c:94
-#, c-format
-msgid "%s: switched to timeline %u at %X/%X\n"
-msgstr "%s: タイムライン%uに%X/%Xで切り替わりました\n"
-
-#: pg_receivexlog.c:103
-#, c-format
-#| msgid "%s: received interrupt signal, exiting.\n"
-msgid "%s: received interrupt signal, exiting\n"
-msgstr "%s: 割り込みシグナルを受け取りました。終了します\n"
-
-#: pg_receivexlog.c:128
-#, c-format
-msgid "%s: could not open directory \"%s\": %s\n"
-msgstr "%s: ディレクトリ\"%s\"をオープンできませんでした: %s\n"
-
-#: pg_receivexlog.c:157
-#, c-format
-msgid "%s: could not parse transaction log file name \"%s\"\n"
-msgstr "%s: トランザクションログファイル名\"%s\"を解析できませんでした\n"
-
-#: pg_receivexlog.c:167
-#, c-format
-msgid "%s: could not stat file \"%s\": %s\n"
-msgstr "%s: \"%s\"ファイルの状態を確認できませんでした: %s\n"
-
-#: pg_receivexlog.c:185
-#, c-format
-msgid "%s: segment file \"%s\" has incorrect size %d, skipping\n"
-msgstr "%s: セグメントファイル\"%s\"のサイズ%dが不正です。飛ばします\n"
-
-#: pg_receivexlog.c:293
-#, c-format
-msgid "%s: starting log streaming at %X/%X (timeline %u)\n"
-msgstr "%s: %X/%X (タイムライン %u)でログストリーミングを始めます\n"
-
-#: pg_receivexlog.c:373
-#, c-format
-msgid "%s: invalid port number \"%s\"\n"
-msgstr "%s: 無効なポート番号です: \"%s\"\n"
-
-#: pg_receivexlog.c:455
-#, c-format
-#| msgid "%s: disconnected.\n"
-msgid "%s: disconnected\n"
-msgstr "%s: 切断しました\n"
-
-#. translator: check source for value for %d
-#: pg_receivexlog.c:462
-#, c-format
-#| msgid "%s: disconnected. Waiting %d seconds to try again\n"
-msgid "%s: disconnected; waiting %d seconds to try again\n"
-msgstr "%s: 切断しました。%d秒待機し再試行します\n"
-
-#: receivelog.c:69
-#, c-format
-msgid "%s: could not open transaction log file \"%s\": %s\n"
-msgstr "%s: トランザクションログファイル \"%s\" をオープンできません: %s\n"
-
-#: receivelog.c:81
-#, c-format
-msgid "%s: could not stat transaction log file \"%s\": %s\n"
-msgstr "%s: トランザクションログファイル \"%s\" の状態を確認できません: %s\n"
-
-#: receivelog.c:95
-#, c-format
-msgid "%s: transaction log file \"%s\" has %d bytes, should be 0 or %d\n"
-msgstr "%s: トランザクションログファイル\"%s\"は%dバイトです。0または%dでなければなりません\n"
-
-#: receivelog.c:108
-#, c-format
-msgid "%s: could not pad transaction log file \"%s\": %s\n"
-msgstr "%s: トランザクションログファイル\"%s\"を埋めることができませんでした: %s\n"
-
-#: receivelog.c:121
-#, c-format
-msgid "%s: could not seek to beginning of transaction log file \"%s\": %s\n"
-msgstr "%s: トランザクションログファイル\"%s\"の先頭にシークできませんでした: %s\n"
-
-#: receivelog.c:147
-#, c-format
-msgid "%s: could not determine seek position in file \"%s\": %s\n"
-msgstr "%s: ファイル\"%s\"のシーク位置を決定できませんでした: %s\n"
-
-#: receivelog.c:154 receivelog.c:344
-#, c-format
-msgid "%s: could not fsync file \"%s\": %s\n"
-msgstr "%s: ファイル\"%s\"をfsyncできませんでした: %s\n"
-
-#: receivelog.c:181
-#, c-format
-msgid "%s: could not rename file \"%s\": %s\n"
-msgstr "%s: \"%s\"ファイルの名前を変更できませんでした: %s\n"
-
-#: receivelog.c:188
-#, c-format
-#| msgid "%s: not renaming \"%s\", segment is not complete.\n"
-msgid "%s: not renaming \"%s%s\", segment is not complete\n"
-msgstr "%s: \"%s%s\"の名前を変更しません。セグメントが完了していません。\n"
-
-#: receivelog.c:277
-#, c-format
-#| msgid "%s: could not open log file \"%s\": %s\n"
-msgid "%s: could not open timeline history file \"%s\": %s\n"
-msgstr "%s: タイムライン履歴ファイル \"%s\" をオープンできません: %s\n"
-
-#: receivelog.c:304
-#, c-format
-msgid "%s: server reported unexpected history file name for timeline %u: %s\n"
-msgstr "%s: サーバはライムライン%u用の履歴ファイルが想定外であることを報告しました: %s\n"
-
-#: receivelog.c:319
-#, c-format
-#| msgid "%s: could not create file \"%s\": %s\n"
-msgid "%s: could not create timeline history file \"%s\": %s\n"
-msgstr "%s: \"%s\"タイムライン履歴ファイルを作成することができませんでした: %s\n"
-
-#: receivelog.c:336
-#, c-format
-#| msgid "%s: could not write to file \"%s\": %s\n"
-msgid "%s: could not write timeline history file \"%s\": %s\n"
-msgstr "%s: \"%s\"タイムライン履歴ファイルに書き出すことができませんでした: %s\n"
-
-#: receivelog.c:363
-#, c-format
-#| msgid "could not rename file \"%s\" to \"%s\": %m"
-msgid "%s: could not rename file \"%s\" to \"%s\": %s\n"
-msgstr "%s: ファイル\"%s\"の名前を\"%s\"に変更できませんでした: %s\n"
-
-#: receivelog.c:436
-#, c-format
-msgid "%s: could not send feedback packet: %s"
-msgstr "%s: フィードバックパケットを送信できませんでした: %s"
-
-#: receivelog.c:470
-#, c-format
-#| msgid "No per-database role settings support in this server version.\n"
-msgid "%s: incompatible server version %s; streaming is only supported with server version %s\n"
-msgstr "%s: 互換性がないサーババージョン%s。ストリーミングはサーババージョン%sでのみサポートされています\n"
-
-#: receivelog.c:548
-#, c-format
-msgid "%s: system identifier does not match between base backup and streaming connection\n"
-msgstr "%s: システム識別子がベースバックアップとストリーミング接続の間で一致しません\n"
-
-#: receivelog.c:556
-#, c-format
-msgid "%s: starting timeline %u is not present in the server\n"
-msgstr "%s: 開始するタイムライン%uがサーバ上に存在しません\n"
-
-#: receivelog.c:590
-#, c-format
-#| msgid "%s: could not identify system: got %d rows and %d fields, expected %d rows and %d fields\n"
-msgid "%s: unexpected response to TIMELINE_HISTORY command: got %d rows and %d fields, expected %d rows and %d fields\n"
-msgstr "%s: TIMELINE_HISTORYコマンドへの想定外の応答: %d行と%dフィールドを入手しました。想定では%d行と%dフィールドでした\n"
-
-#: receivelog.c:663
-#, c-format
-msgid "%s: server reported unexpected next timeline %u, following timeline %u\n"
-msgstr "%1$s: サーバがタイムライン%3$uに続く次のタイムライン%2$uが想定外であることを報告しました\n"
-
-#: receivelog.c:670
-#, c-format
-msgid "%s: server stopped streaming timeline %u at %X/%X, but reported next timeline %u to begin at %X/%X\n"
-msgstr "%s: サーバはストリーミングタイムライン%uを%X%Xで停止しました。しかし次のタイムライン%uが%X%Xで始まりました\n"
-
-#: receivelog.c:682 receivelog.c:717
-#, c-format
-msgid "%s: unexpected termination of replication stream: %s"
-msgstr "%s: レプリケーションストリームの想定外の終了: %s"
-
-#: receivelog.c:708
-#, c-format
-msgid "%s: replication stream was terminated before stop point\n"
-msgstr "%s: レプリケーションストリームがストップポイントの前に終了しました\n"
-
-#: receivelog.c:756
-#, c-format
-#| msgid "%s: could not identify system: got %d rows and %d fields, expected %d rows and %d fields\n"
-msgid "%s: unexpected result set after end-of-timeline: got %d rows and %d fields, expected %d rows and %d fields\n"
-msgstr "%s: タイムラインの終了後の想定外の結果セット: %d行、%dフィールドを入手しましたが、想定していたのは%d行、%dフィールドでした\n"
-
-#: receivelog.c:766
-#, c-format
-#| msgid "%s: could not parse transaction log location \"%s\"\n"
-msgid "%s: could not parse next timeline's starting point \"%s\"\n"
-msgstr "%s: 次のタイムラインの開始ポイント\"%s\"を解析できませんでした\n"
-
-#: receivelog.c:821 receivelog.c:923 receivelog.c:1088
-#, c-format
-#| msgid "%s: could not send feedback packet: %s"
-msgid "%s: could not send copy-end packet: %s"
-msgstr "%s: コピーエンドパケットを送信できませんでした: %s"
-
-#: receivelog.c:888
-#, c-format
-msgid "%s: select() failed: %s\n"
-msgstr "%s: select()が失敗しました: %s\n"
-
-#: receivelog.c:896
-#, c-format
-msgid "%s: could not receive data from WAL stream: %s"
-msgstr "%s: WALストリームからデータを受信できませんでした: %s"
-
-#: receivelog.c:960 receivelog.c:995
-#, c-format
-msgid "%s: streaming header too small: %d\n"
-msgstr "%s: ストリーミングヘッダが小さ過ぎます: %d\n"
-
-#: receivelog.c:1014
-#, c-format
-msgid "%s: received transaction log record for offset %u with no file open\n"
-msgstr "%s: ファイルオープンがないオフセット%uに対するトランザクションログレコードを受信\n"
-
-#: receivelog.c:1026
-#, c-format
-msgid "%s: got WAL data offset %08x, expected %08x\n"
-msgstr "%s: WALデータオフセット%08xを入手。想定値は%08x\n"
-
-#: receivelog.c:1063
-#, c-format
-msgid "%s: could not write %u bytes to WAL file \"%s\": %s\n"
-msgstr "%1$s: WALファイル\"%3$s\"に%2$uバイト書き出すことができませんでした: %4$s\n"
-
-#: receivelog.c:1101
-#, c-format
-msgid "%s: unrecognized streaming header: \"%c\"\n"
-msgstr "%s: ストリーミングヘッダ\"%c\"は不明です\n"
-
-#: streamutil.c:135
-msgid "Password: "
-msgstr "パスワード: "
-
-#: streamutil.c:148
-#, c-format
-msgid "%s: could not connect to server\n"
-msgstr "%s: サーバに接続できませんでした\n"
-
-#: streamutil.c:164
-#, c-format
-msgid "%s: could not connect to server: %s\n"
-msgstr "%s: サーバに接続できませんでした: %s\n"
-
-#: streamutil.c:188
-#, c-format
-msgid "%s: could not determine server setting for integer_datetimes\n"
-msgstr "%s: integer_datetimesのサーバ設定を決定できませんでした\n"
-
-#: streamutil.c:201
-#, c-format
-msgid "%s: integer_datetimes compile flag does not match server\n"
-msgstr "%s: integer_datetimesコンパイルフラグがサーバと一致しません\n"
-
-#~ msgid " --help show this help, then exit\n"
-#~ msgstr " --help このヘルプを表示し終了します\n"
-
-#~ msgid " --version output version information, then exit\n"
-#~ msgstr " --version バージョン情報を出力し終了します\n"
-
-#~ msgid "%s: could not close file %s: %s\n"
-#~ msgstr "%s: ファイル%sを閉じることができませんでした: %s\n"
-
-#~ msgid "%s: no start point returned from server\n"
-#~ msgstr "%s: サーバからスタートポイントが返りませんでした\n"
-
-#~ msgid "%s: keepalive message has incorrect size %d\n"
-#~ msgstr "%s: キープアライブメッセージのサイズ%dが不正です\n"
-
-#~ msgid "%s: timeline does not match between base backup and streaming connection\n"
-#~ msgstr "%s: タイムラインがベースバックアップとストリーミング接続の間で一致しません\n"
diff --git a/src/bin/pg_basebackup/po/zh_CN.po b/src/bin/pg_basebackup/po/zh_CN.po
index 4de00ad88f5..634e5bb89c4 100644
--- a/src/bin/pg_basebackup/po/zh_CN.po
+++ b/src/bin/pg_basebackup/po/zh_CN.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: pg_basebackup (PostgreSQL) 9.2\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2013-09-02 00:26+0000\n"
-"PO-Revision-Date: 2013-10-13 22:00-0400\n"
+"POT-Creation-Date: 2014-11-22 21:12+0000\n"
+"PO-Revision-Date: 2014-12-06 13:10+0800\n"
"Last-Translator: Xiong He <iihero@qq.com>\n"
"Language-Team: Chinese (Simplified)\n"
"Language: zh_CN\n"
@@ -27,11 +27,38 @@ msgstr "内存溢出\n"
# common.c:78
#: ../../common/fe_memutils.c:77
#, c-format
-#| msgid "pg_strdup: cannot duplicate null pointer (internal error)\n"
msgid "cannot duplicate null pointer (internal error)\n"
msgstr "无法复制空指针 (内部错误)\n"
-#: pg_basebackup.c:106
+#: pg_basebackup.c:153
+#, c-format
+#| msgid "directory name too long: \"%s\"\n"
+msgid "%s: directory name too long\n"
+msgstr "字典名: \"%s\"太长\n"
+
+#: pg_basebackup.c:163
+#, c-format
+msgid "%s: multiple \"=\" signs in tablespace mapping\n"
+msgstr "%s: 多个 \"=\" 号出现在表空间的映射中\n"
+
+#: pg_basebackup.c:176
+#, c-format
+#| msgid "%s: invalid output format \"%s\", must be \"plain\" or \"tar\"\n"
+msgid ""
+"%s: invalid tablespace mapping format \"%s\", must be \"OLDDIR=NEWDIR\"\n"
+msgstr "%s: 无效表空间映射表格式: \"%s\", 有效格式必须为: \"OLDDIR=NEWDIR\"\n"
+
+#: pg_basebackup.c:189
+#, c-format
+msgid "%s: old directory is not an absolute path in tablespace mapping: %s\n"
+msgstr "%s:: 在表空间映射表:%s中的旧目录不是一个绝对路径\n"
+
+#: pg_basebackup.c:196
+#, c-format
+msgid "%s: new directory is not an absolute path in tablespace mapping: %s\n"
+msgstr "%s:: 在表空间映射表:%s中的新目录不是一个绝对路径\n"
+
+#: pg_basebackup.c:227
#, c-format
msgid ""
"%s takes a base backup of a running PostgreSQL server.\n"
@@ -40,17 +67,17 @@ msgstr ""
"%s 在运行的PostgreSQL服务器上执行基础备份.\n"
"\n"
-#: pg_basebackup.c:108 pg_receivexlog.c:53
+#: pg_basebackup.c:229 pg_receivexlog.c:60 pg_recvlogical.c:67
#, c-format
msgid "Usage:\n"
msgstr "使用方法:\n"
-#: pg_basebackup.c:109 pg_receivexlog.c:54
+#: pg_basebackup.c:230 pg_receivexlog.c:61 pg_recvlogical.c:68
#, c-format
msgid " %s [OPTION]...\n"
msgstr " %s [选项]...\n"
-#: pg_basebackup.c:110
+#: pg_basebackup.c:231
#, c-format
msgid ""
"\n"
@@ -59,22 +86,28 @@ msgstr ""
"\n"
"控制输出的选项:\n"
-#: pg_basebackup.c:111
+#: pg_basebackup.c:232
#, c-format
msgid " -D, --pgdata=DIRECTORY receive base backup into directory\n"
msgstr " -D, --pgdata=DIRECTORY 接收基础备份到指定目录\n"
-#: pg_basebackup.c:112
+#: pg_basebackup.c:233
#, c-format
msgid " -F, --format=p|t output format (plain (default), tar)\n"
msgstr " -F, --format=p|t 输出格式 (纯文本 (缺省值), tar压缩格式)\n"
+#: pg_basebackup.c:234
+#, c-format
+msgid ""
+" -r, --max-rate=RATE maximum transfer rate to transfer data directory\n"
+" (in kB/s, or use suffix \"k\" or \"M\")\n"
+msgstr ""
+" -r, --max-rate=RATE 传输数据目录的最大传输速率\n"
+" (单位 kB/s, 也可以使用后缀\"k\" 或 \"M\")\n"
+
# help.c:121
-#: pg_basebackup.c:113
+#: pg_basebackup.c:236
#, c-format
-#| msgid ""
-#| " -0, --record-separator-zero\n"
-#| " set record separator to zero byte\n"
msgid ""
" -R, --write-recovery-conf\n"
" write recovery.conf after backup\n"
@@ -82,13 +115,22 @@ msgstr ""
" -R, --write-recovery-conf\n"
" 备份后对文件recovery.conf进行写操作\n"
-#: pg_basebackup.c:115
+#: pg_basebackup.c:238
+#, c-format
+msgid ""
+" -T, --tablespace-mapping=OLDDIR=NEWDIR\n"
+" relocate tablespace in OLDDIR to NEWDIR\n"
+msgstr ""
+" -T, --tablespace-mapping=OLDDIR=NEWDIR\n"
+" 将表空间由 OLDDIR 重定位到 NEWDIR\n"
+
+#: pg_basebackup.c:240
#, c-format
msgid ""
" -x, --xlog include required WAL files in backup (fetch mode)\n"
msgstr " -x, --xlog 在备份中包含必需的WAL文件(fetch 模式)\n"
-#: pg_basebackup.c:116
+#: pg_basebackup.c:241
#, c-format
msgid ""
" -X, --xlog-method=fetch|stream\n"
@@ -97,18 +139,25 @@ msgstr ""
" -X, --xlog-method=fetch|stream\n"
" 按指定的模式包含必需的WAL日志文件\n"
-#: pg_basebackup.c:118
+#: pg_basebackup.c:243
+#, c-format
+#| msgid ""
+#| " -X, --xlogdir=XLOGDIR location for the transaction log directory\n"
+msgid " --xlogdir=XLOGDIR location for the transaction log directory\n"
+msgstr " --xlogdir=XLOGDIR 当前事务日志目录的位置\n"
+
+#: pg_basebackup.c:244
#, c-format
msgid " -z, --gzip compress tar output\n"
msgstr " -z, --gzip 对tar文件进行压缩输出\n"
-#: pg_basebackup.c:119
+#: pg_basebackup.c:245
#, c-format
msgid ""
" -Z, --compress=0-9 compress tar output with given compression level\n"
msgstr " -Z, --compress=0-9 按给定的压缩级别对tar文件进行压缩输出\n"
-#: pg_basebackup.c:120
+#: pg_basebackup.c:246
#, c-format
msgid ""
"\n"
@@ -117,7 +166,7 @@ msgstr ""
"\n"
"一般选项:\n"
-#: pg_basebackup.c:121
+#: pg_basebackup.c:247
#, c-format
msgid ""
" -c, --checkpoint=fast|spread\n"
@@ -126,32 +175,32 @@ msgstr ""
" -c, --checkpoint=fast|spread\n"
" 设置检查点方式(fast或者spread)\n"
-#: pg_basebackup.c:123
+#: pg_basebackup.c:249
#, c-format
msgid " -l, --label=LABEL set backup label\n"
msgstr " -l, --label=LABEL 设置备份标签\n"
-#: pg_basebackup.c:124
+#: pg_basebackup.c:250
#, c-format
msgid " -P, --progress show progress information\n"
msgstr " -P, --progress 显示进度信息\n"
-#: pg_basebackup.c:125 pg_receivexlog.c:58
+#: pg_basebackup.c:251 pg_receivexlog.c:68 pg_recvlogical.c:86
#, c-format
msgid " -v, --verbose output verbose messages\n"
msgstr " -v, --verbose 输出详细的消息\n"
-#: pg_basebackup.c:126 pg_receivexlog.c:59
+#: pg_basebackup.c:252 pg_receivexlog.c:69 pg_recvlogical.c:87
#, c-format
msgid " -V, --version output version information, then exit\n"
msgstr " -V, --version 输出版本信息, 然后退出\n"
-#: pg_basebackup.c:127 pg_receivexlog.c:60
+#: pg_basebackup.c:253 pg_receivexlog.c:70 pg_recvlogical.c:88
#, c-format
msgid " -?, --help show this help, then exit\n"
msgstr " -?, --help 显示帮助, 然后退出\n"
-#: pg_basebackup.c:128 pg_receivexlog.c:61
+#: pg_basebackup.c:254 pg_receivexlog.c:71 pg_recvlogical.c:89
#, c-format
msgid ""
"\n"
@@ -160,23 +209,22 @@ msgstr ""
"\n"
"联接选项:\n"
-#: pg_basebackup.c:129 pg_receivexlog.c:62
+#: pg_basebackup.c:255 pg_receivexlog.c:72
#, c-format
-#| msgid " -d, --dbname=NAME connect to database name\n"
msgid " -d, --dbname=CONNSTR connection string\n"
msgstr " -d, --dbname=CONNSTR 连接串\n"
-#: pg_basebackup.c:130 pg_receivexlog.c:63
+#: pg_basebackup.c:256 pg_receivexlog.c:73 pg_recvlogical.c:91
#, c-format
msgid " -h, --host=HOSTNAME database server host or socket directory\n"
msgstr " -h, --host=HOSTNAME 数据库服务器主机或者是socket目录\n"
-#: pg_basebackup.c:131 pg_receivexlog.c:64
+#: pg_basebackup.c:257 pg_receivexlog.c:74 pg_recvlogical.c:92
#, c-format
msgid " -p, --port=PORT database server port number\n"
msgstr " -p, --port=PORT 数据库服务器端口号\n"
-#: pg_basebackup.c:132 pg_receivexlog.c:65
+#: pg_basebackup.c:258
#, c-format
msgid ""
" -s, --status-interval=INTERVAL\n"
@@ -186,24 +234,24 @@ msgstr ""
" -s, --status-interval=INTERVAL\n"
" 发往服务器的状态包的时间间隔 (以秒计)\n"
-#: pg_basebackup.c:134 pg_receivexlog.c:67
+#: pg_basebackup.c:260 pg_receivexlog.c:75 pg_recvlogical.c:93
#, c-format
msgid " -U, --username=NAME connect as specified database user\n"
msgstr " -U, --username=NAME 指定连接所需的数据库用户名\n"
-#: pg_basebackup.c:135 pg_receivexlog.c:68
+#: pg_basebackup.c:261 pg_receivexlog.c:76 pg_recvlogical.c:94
#, c-format
msgid " -w, --no-password never prompt for password\n"
msgstr " -w, --no-password 禁用输入密码的提示\n"
-#: pg_basebackup.c:136 pg_receivexlog.c:69
+#: pg_basebackup.c:262 pg_receivexlog.c:77 pg_recvlogical.c:95
#, c-format
msgid ""
" -W, --password force password prompt (should happen "
"automatically)\n"
msgstr " -W, --password 强制提示输入密码 (应该自动发生)\n"
-#: pg_basebackup.c:137 pg_receivexlog.c:70
+#: pg_basebackup.c:263 pg_receivexlog.c:78 pg_recvlogical.c:96
#, c-format
msgid ""
"\n"
@@ -212,191 +260,224 @@ msgstr ""
"\n"
"错误报告至 <pgsql-bugs@postgresql.org>.\n"
-#: pg_basebackup.c:180
+#: pg_basebackup.c:306
#, c-format
msgid "%s: could not read from ready pipe: %s\n"
msgstr "%s: 无法从准备就绪的管道: %s读\n"
-#: pg_basebackup.c:188 pg_basebackup.c:280 pg_basebackup.c:1598
-#: pg_receivexlog.c:266
+#: pg_basebackup.c:314 pg_basebackup.c:406 pg_basebackup.c:1877
+#: pg_receivexlog.c:301 pg_recvlogical.c:937
#, c-format
msgid "%s: could not parse transaction log location \"%s\"\n"
msgstr "%s: 无法解析来自 \"%s\"的事务日志\n"
-#: pg_basebackup.c:293
+#: pg_basebackup.c:419
#, c-format
msgid "%s: could not create pipe for background process: %s\n"
msgstr "%s: 无法为后台进程: %s创建管道\n"
-#: pg_basebackup.c:326
+#: pg_basebackup.c:452
#, c-format
msgid "%s: could not create background process: %s\n"
msgstr "%s: 无法创建后台进程: %s\n"
-#: pg_basebackup.c:338
+#: pg_basebackup.c:464
#, c-format
msgid "%s: could not create background thread: %s\n"
msgstr "%s: 无法创建后台线程: %s\n"
-#: pg_basebackup.c:363 pg_basebackup.c:989
+#: pg_basebackup.c:489 pg_basebackup.c:1246
#, c-format
msgid "%s: could not create directory \"%s\": %s\n"
msgstr "%s: 无法创建目录 \"%s\": %s\n"
-#: pg_basebackup.c:382
+#: pg_basebackup.c:508
#, c-format
msgid "%s: directory \"%s\" exists but is not empty\n"
msgstr "%s: 目录\"%s\"已存在,但不是空的\n"
-#: pg_basebackup.c:390
+#: pg_basebackup.c:516
#, c-format
msgid "%s: could not access directory \"%s\": %s\n"
msgstr "%s: 无法访问目录 \"%s\": %s\n"
-#: pg_basebackup.c:438
+#: pg_basebackup.c:578
#, c-format
-#| msgid "%s/%s kB (100%%), %d/%d tablespace %35s"
-#| msgid_plural "%s/%s kB (100%%), %d/%d tablespaces %35s"
msgid "%*s/%s kB (100%%), %d/%d tablespace %*s"
msgid_plural "%*s/%s kB (100%%), %d/%d tablespaces %*s"
msgstr[0] "%*s/%s kB (100%%), %d/%d 表空间 %*s"
-#: pg_basebackup.c:450
+#: pg_basebackup.c:590
#, c-format
-#| msgid "%s/%s kB (%d%%), %d/%d tablespace (%-30.30s)"
-#| msgid_plural "%s/%s kB (%d%%), %d/%d tablespaces (%-30.30s)"
msgid "%*s/%s kB (%d%%), %d/%d tablespace (%s%-*.*s)"
msgid_plural "%*s/%s kB (%d%%), %d/%d tablespaces (%s%-*.*s)"
msgstr[0] "%*s/%s kB (%d%%), %d/%d 表空间 (%s%-*.*s)"
-#: pg_basebackup.c:466
+#: pg_basebackup.c:606
#, c-format
-#| msgid "%s/%s kB (%d%%), %d/%d tablespace"
-#| msgid_plural "%s/%s kB (%d%%), %d/%d tablespaces"
msgid "%*s/%s kB (%d%%), %d/%d tablespace"
msgid_plural "%*s/%s kB (%d%%), %d/%d tablespaces"
msgstr[0] "%*s/%s kB (%d%%), %d/%d 表空间"
-#: pg_basebackup.c:493
+#: pg_basebackup.c:628
+#, c-format
+#| msgid "%s: \"%s\" is not a valid encoding name\n"
+msgid "%s: transfer rate \"%s\" is not a valid value\n"
+msgstr "%s: 传输速率\"%s\"不是一个有效值\n"
+
+#: pg_basebackup.c:635
+#, c-format
+#| msgid "%s: invalid locale name \"%s\"\n"
+msgid "%s: invalid transfer rate \"%s\": %s\n"
+msgstr "%s:无效的传输速率\"%s\": %s\n"
+
+#: pg_basebackup.c:645
+#, c-format
+#| msgid "count must be greater than zero"
+msgid "%s: transfer rate must be greater than zero\n"
+msgstr "%s: 传输速率必须大于0\n"
+
+#: pg_basebackup.c:679
+#, c-format
+#| msgid "%s: invalid argument: \"%s\"\n"
+msgid "%s: invalid --max-rate unit: \"%s\"\n"
+msgstr "%s: 无效的 --max-rate 单位: \"%s\"\n"
+
+#: pg_basebackup.c:688
+#, c-format
+#| msgid "argument of lo_write exceeds integer range\n"
+msgid "%s: transfer rate \"%s\" exceeds integer range\n"
+msgstr "%s:传输速率 \"%s\" 超出了整数范围\n"
+
+#: pg_basebackup.c:700
+#, c-format
+#| msgid "result is out of range"
+msgid "%s: transfer rate \"%s\" is out of range\n"
+msgstr "%s: 传输速率 \"%s\" 超出范围\n"
+
+#: pg_basebackup.c:724
#, c-format
msgid "%s: could not write to compressed file \"%s\": %s\n"
msgstr "%s: 无法往压缩文件里写\"%s\": %s\n"
-#: pg_basebackup.c:503 pg_basebackup.c:1071 pg_basebackup.c:1289
+#: pg_basebackup.c:734 pg_basebackup.c:1340 pg_basebackup.c:1558
#, c-format
msgid "%s: could not write to file \"%s\": %s\n"
msgstr "%s: 无法写文件 \"%s\": %s\n"
-#: pg_basebackup.c:558 pg_basebackup.c:578 pg_basebackup.c:606
+#: pg_basebackup.c:789 pg_basebackup.c:810 pg_basebackup.c:838
#, c-format
msgid "%s: could not set compression level %d: %s\n"
msgstr "%s: 无法设置压缩级别 %d: %s\n"
-#: pg_basebackup.c:627
+#: pg_basebackup.c:859
#, c-format
msgid "%s: could not create compressed file \"%s\": %s\n"
msgstr "%s: 无法创建压缩文件 \"%s\": %s\n"
-#: pg_basebackup.c:638 pg_basebackup.c:1031 pg_basebackup.c:1282
+#: pg_basebackup.c:870 pg_basebackup.c:1300 pg_basebackup.c:1551
#, c-format
msgid "%s: could not create file \"%s\": %s\n"
msgstr "%s: 无法创建文件 \"%s\": %s\n"
-#: pg_basebackup.c:650 pg_basebackup.c:893
+#: pg_basebackup.c:882 pg_basebackup.c:1146
#, c-format
msgid "%s: could not get COPY data stream: %s"
msgstr "%s: 无法得到复制数据流: %s"
-#: pg_basebackup.c:707
+#: pg_basebackup.c:939
#, c-format
msgid "%s: could not close compressed file \"%s\": %s\n"
msgstr "%s: 无法关闭压缩文件 \"%s\": %s\n"
-#: pg_basebackup.c:720 receivelog.c:161 receivelog.c:351 receivelog.c:725
+#: pg_basebackup.c:952 pg_recvlogical.c:554 receivelog.c:160 receivelog.c:295
+#: receivelog.c:674
#, c-format
msgid "%s: could not close file \"%s\": %s\n"
msgstr "%s: 无法关闭文件 \"%s\": %s\n"
-#: pg_basebackup.c:731 pg_basebackup.c:922 receivelog.c:938
+#: pg_basebackup.c:963 pg_basebackup.c:1175 pg_recvlogical.c:420
+#: receivelog.c:890
#, c-format
msgid "%s: could not read COPY data: %s"
msgstr "%s: 无法读取复制数据: %s"
-#: pg_basebackup.c:936
+#: pg_basebackup.c:1189
#, c-format
msgid "%s: invalid tar block header size: %d\n"
msgstr "%s: 无效的tar压缩块头大小: %d\n"
-#: pg_basebackup.c:944
+#: pg_basebackup.c:1197
#, c-format
msgid "%s: could not parse file size\n"
msgstr "%s: 无法解析文件大小\n"
-#: pg_basebackup.c:952
+#: pg_basebackup.c:1205
#, c-format
msgid "%s: could not parse file mode\n"
msgstr "%s: 无法解析文件模式\n"
-#: pg_basebackup.c:997
+#: pg_basebackup.c:1254
#, c-format
msgid "%s: could not set permissions on directory \"%s\": %s\n"
msgstr "%s: 无法设置目录权限 \"%s\": %s\n"
-#: pg_basebackup.c:1010
+#: pg_basebackup.c:1278
#, c-format
msgid "%s: could not create symbolic link from \"%s\" to \"%s\": %s\n"
msgstr "%s: 无法创建从 \"%s\" 到 \"%s\"的符号链接: %s\n"
-#: pg_basebackup.c:1018
+#: pg_basebackup.c:1287
#, c-format
msgid "%s: unrecognized link indicator \"%c\"\n"
msgstr "%s: 无法识别的链接标识符 \"%c\"\n"
-#: pg_basebackup.c:1038
+#: pg_basebackup.c:1307
#, c-format
msgid "%s: could not set permissions on file \"%s\": %s\n"
msgstr "%s: 无法设置文件 \"%s\"的访问权限: %s\n"
-#: pg_basebackup.c:1097
+#: pg_basebackup.c:1366
#, c-format
msgid "%s: COPY stream ended before last file was finished\n"
msgstr "%s: 复制流在最后一个文件结束前终止\n"
-#: pg_basebackup.c:1183 pg_basebackup.c:1203 pg_basebackup.c:1210
-#: pg_basebackup.c:1257
+#: pg_basebackup.c:1452 pg_basebackup.c:1472 pg_basebackup.c:1479
+#: pg_basebackup.c:1526
#, c-format
msgid "%s: out of memory\n"
msgstr "%s: 内存溢出\n"
-#: pg_basebackup.c:1333
+#: pg_basebackup.c:1603
#, c-format
-#| msgid "%s: could not parse server version \"%s\"\n"
msgid "%s: incompatible server version %s\n"
msgstr "%s: 不兼容的服务器版本号 %s\n"
-#: pg_basebackup.c:1360 pg_basebackup.c:1389 pg_receivexlog.c:251
-#: receivelog.c:532 receivelog.c:577 receivelog.c:616
+#: pg_basebackup.c:1630 pg_basebackup.c:1664 pg_receivexlog.c:286
+#: pg_recvlogical.c:255 pg_recvlogical.c:853 pg_recvlogical.c:886
+#: pg_recvlogical.c:921 receivelog.c:470 receivelog.c:521 receivelog.c:561
#, c-format
msgid "%s: could not send replication command \"%s\": %s"
msgstr "%s: 无法发送复制命令 \"%s\": %s"
-#: pg_basebackup.c:1367 pg_receivexlog.c:258 receivelog.c:540
+#: pg_basebackup.c:1637 pg_receivexlog.c:293 pg_recvlogical.c:861
+#: receivelog.c:478
#, c-format
+#| msgid ""
+#| "%s: could not identify system: got %d rows and %d fields, expected %d "
+#| "rows and %d fields\n"
msgid ""
"%s: could not identify system: got %d rows and %d fields, expected %d rows "
-"and %d fields\n"
-msgstr "%s: 无法识别系统: 得到 %d 行和 %d 列, 期望值为: %d 行和 %d 列\n"
+"and %d or more fields\n"
+msgstr "%s: 无法识别系统: 得到%d行和%d列, 期望值为: %d行和%d列或更多列\n"
-#: pg_basebackup.c:1400
+#: pg_basebackup.c:1675
#, c-format
msgid "%s: could not initiate base backup: %s"
msgstr "%s: 无法发起基础备份: %s"
-#: pg_basebackup.c:1407
+#: pg_basebackup.c:1682
#, c-format
-#| msgid ""
-#| "%s: could not identify system: got %d rows and %d fields, expected %d "
-#| "rows and %d fields\n"
msgid ""
"%s: server returned unexpected response to BASE_BACKUP command; got %d rows "
"and %d fields, expected %d rows and %d fields\n"
@@ -404,162 +485,184 @@ msgstr ""
"%s: 服务器对BASE_BACKUP命令返回意外的响应; 得到 %d 行和 %d 列, 期望值为: %d "
"行和 %d 列\n"
-#: pg_basebackup.c:1427
+#: pg_basebackup.c:1702
#, c-format
-#| msgid "%s: starting log streaming at %X/%X (timeline %u)\n"
msgid "transaction log start point: %s on timeline %u\n"
msgstr "事务日志起始于时间点: %s, 基于时间表%u \n"
-#: pg_basebackup.c:1436
+#: pg_basebackup.c:1711
#, c-format
msgid "%s: could not get backup header: %s"
msgstr "%s: 无法得到备份头: %s"
-#: pg_basebackup.c:1442
+#: pg_basebackup.c:1717
#, c-format
msgid "%s: no data returned from server\n"
msgstr "%s: 服务器没有数据返回\n"
# Here, we need to understand what's the content "database has"?
# Is it the stdout fd? or anything else? Please correct me here.
-#: pg_basebackup.c:1471
+#: pg_basebackup.c:1749
#, c-format
msgid "%s: can only write single tablespace to stdout, database has %d\n"
msgstr "%s: 只能把表空间写往标准输出, 数据库拥有标准输出: %d\n"
-#: pg_basebackup.c:1483
+#: pg_basebackup.c:1761
#, c-format
msgid "%s: starting background WAL receiver\n"
msgstr "%s: 启动后台 WAL 接收进程\n"
-#: pg_basebackup.c:1513
+#: pg_basebackup.c:1792
#, c-format
msgid "%s: could not get transaction log end position from server: %s"
msgstr "%s: 无法得到来自服务器的事务日志终止位置: %s"
-#: pg_basebackup.c:1520
+#: pg_basebackup.c:1799
#, c-format
msgid "%s: no transaction log end position returned from server\n"
msgstr "%s: 服务器端没有返回事务日志的终止位置\n"
-#: pg_basebackup.c:1532
+#: pg_basebackup.c:1811
#, c-format
msgid "%s: final receive failed: %s"
msgstr "%s: 最终接收失败: %s"
-#: pg_basebackup.c:1550
+#: pg_basebackup.c:1829
#, c-format
-#| msgid "%s: waiting for background process to finish streaming...\n"
msgid "%s: waiting for background process to finish streaming ...\n"
msgstr "%s: 等待后台进程结束流操作...\n"
-#: pg_basebackup.c:1556
+#: pg_basebackup.c:1835
#, c-format
msgid "%s: could not send command to background pipe: %s\n"
msgstr "%s: 无法发送命令到后台管道: %s\n"
-#: pg_basebackup.c:1565
+#: pg_basebackup.c:1844
#, c-format
msgid "%s: could not wait for child process: %s\n"
msgstr "%s: 无法等待子进程: %s\n"
-#: pg_basebackup.c:1571
+#: pg_basebackup.c:1850
#, c-format
msgid "%s: child %d died, expected %d\n"
msgstr "%s: 子进程 %d 已终止, 期望值为 %d\n"
-#: pg_basebackup.c:1577
+#: pg_basebackup.c:1856
#, c-format
msgid "%s: child process did not exit normally\n"
msgstr "%s: 子进程没有正常退出\n"
-#: pg_basebackup.c:1583
+#: pg_basebackup.c:1862
#, c-format
msgid "%s: child process exited with error %d\n"
msgstr "%s: 子进程退出, 错误码为: %d\n"
-#: pg_basebackup.c:1610
+#: pg_basebackup.c:1889
#, c-format
msgid "%s: could not wait for child thread: %s\n"
msgstr "%s: 无法等待子线程: %s\n"
-#: pg_basebackup.c:1617
+#: pg_basebackup.c:1896
#, c-format
msgid "%s: could not get child thread exit status: %s\n"
msgstr "%s: 无法得到子线程退出状态: %s\n"
-#: pg_basebackup.c:1623
+#: pg_basebackup.c:1902
#, c-format
msgid "%s: child thread exited with error %u\n"
msgstr "%s: 子线程退出, 错误码为: %u\n"
-#: pg_basebackup.c:1709
+#: pg_basebackup.c:1991
#, c-format
msgid "%s: invalid output format \"%s\", must be \"plain\" or \"tar\"\n"
msgstr "%s: 无效输出格式: \"%s\", 有效值为: \"plain\" 或者 \"tar\"\n"
-#: pg_basebackup.c:1721 pg_basebackup.c:1733
+#: pg_basebackup.c:2009 pg_basebackup.c:2021
#, c-format
msgid "%s: cannot specify both --xlog and --xlog-method\n"
msgstr "%s: 不能同时指定两个选项: --xlog and --xlog-method\n"
-#: pg_basebackup.c:1748
+#: pg_basebackup.c:2036
#, c-format
msgid ""
"%s: invalid xlog-method option \"%s\", must be \"fetch\" or \"stream\"\n"
msgstr ""
"%s: 无效的xlog-method 选项: \"%s\", 必须是: \"fetch\" 或者 \"stream\"\n"
-#: pg_basebackup.c:1767
+#: pg_basebackup.c:2058
#, c-format
msgid "%s: invalid compression level \"%s\"\n"
msgstr "%s: 无效的压缩级别值: \"%s\"\n"
-#: pg_basebackup.c:1779
+#: pg_basebackup.c:2070
#, c-format
msgid ""
"%s: invalid checkpoint argument \"%s\", must be \"fast\" or \"spread\"\n"
msgstr "%s: 无效的检查点参数: \"%s\", 必须是: \"fast\" 或 \"spread\"\n"
-#: pg_basebackup.c:1806 pg_receivexlog.c:392
+#: pg_basebackup.c:2097 pg_receivexlog.c:428 pg_recvlogical.c:736
#, c-format
msgid "%s: invalid status interval \"%s\"\n"
msgstr "%s: 无效的状态间隔值: \"%s\"\n"
-#: pg_basebackup.c:1822 pg_basebackup.c:1836 pg_basebackup.c:1847
-#: pg_basebackup.c:1860 pg_basebackup.c:1870 pg_receivexlog.c:408
-#: pg_receivexlog.c:422 pg_receivexlog.c:433
+#: pg_basebackup.c:2113 pg_basebackup.c:2127 pg_basebackup.c:2138
+#: pg_basebackup.c:2151 pg_basebackup.c:2161 pg_basebackup.c:2173
+#: pg_basebackup.c:2184 pg_receivexlog.c:447 pg_receivexlog.c:461
+#: pg_receivexlog.c:472 pg_recvlogical.c:760 pg_recvlogical.c:774
+#: pg_recvlogical.c:785 pg_recvlogical.c:793 pg_recvlogical.c:801
+#: pg_recvlogical.c:809 pg_recvlogical.c:817 pg_recvlogical.c:825
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "请用 \"%s --help\" 获取更多的信息.\n"
-#: pg_basebackup.c:1834 pg_receivexlog.c:420
+#: pg_basebackup.c:2125 pg_receivexlog.c:459 pg_recvlogical.c:772
#, c-format
msgid "%s: too many command-line arguments (first is \"%s\")\n"
msgstr "%s: 命令行参数太多 (第一个是 \"%s\")\n"
-#: pg_basebackup.c:1846 pg_receivexlog.c:432
+#: pg_basebackup.c:2137 pg_receivexlog.c:471
#, c-format
msgid "%s: no target directory specified\n"
msgstr "%s: 没有指定目标目录\n"
-#: pg_basebackup.c:1858
+#: pg_basebackup.c:2149
#, c-format
msgid "%s: only tar mode backups can be compressed\n"
msgstr "%s: 只有tar模式备份才能进行压缩\n"
-#: pg_basebackup.c:1868
+#: pg_basebackup.c:2159
#, c-format
-#| msgid "%s: wal streaming can only be used in plain mode\n"
msgid "%s: WAL streaming can only be used in plain mode\n"
msgstr "%s: WAL 流操作只能在plain模式下使用\n"
-#: pg_basebackup.c:1879
+#: pg_basebackup.c:2171
+#, c-format
+#| msgid "%s: transaction log directory location must be an absolute path\n"
+msgid ""
+"%s: transaction log directory location can only be specified in plain mode\n"
+msgstr "%s: 事务日志目录的位置只能在简单模式里指定\n"
+
+#: pg_basebackup.c:2182
+#, c-format
+msgid "%s: transaction log directory location must be an absolute path\n"
+msgstr "%s: 事务日志目录的位置必须为绝对路径\n"
+
+#: pg_basebackup.c:2194
#, c-format
msgid "%s: this build does not support compression\n"
msgstr "%s: 这个编译版本不支持压缩\n"
-#: pg_receivexlog.c:51
+#: pg_basebackup.c:2221
+#, c-format
+msgid "%s: could not create symbolic link \"%s\": %s\n"
+msgstr "%s: 无法创建符号链接 \"%s\": %s\n"
+
+#: pg_basebackup.c:2226
+#, c-format
+msgid "%s: symlinks are not supported on this platform"
+msgstr "%s: 在这个平台上不支持使用符号链接"
+
+#: pg_receivexlog.c:58
#, c-format
msgid ""
"%s receives PostgreSQL streaming transaction logs.\n"
@@ -568,7 +671,7 @@ msgstr ""
"%s 接收PostgreSQL的流事务日志.\n"
"\n"
-#: pg_receivexlog.c:55
+#: pg_receivexlog.c:62 pg_recvlogical.c:73
#, c-format
msgid ""
"\n"
@@ -577,182 +680,445 @@ msgstr ""
"\n"
"选项:\n"
-#: pg_receivexlog.c:56
+#: pg_receivexlog.c:63
#, c-format
msgid ""
" -D, --directory=DIR receive transaction log files into this directory\n"
msgstr " -D, --directory=DIR 接收事务日志到指定的目录\n"
-#: pg_receivexlog.c:57
+#: pg_receivexlog.c:64 pg_recvlogical.c:78
#, c-format
msgid " -n, --no-loop do not loop on connection lost\n"
msgstr " -n, --no-loop 连接丢失时不进行循环处理\n"
-#: pg_receivexlog.c:81
+#: pg_receivexlog.c:65 pg_recvlogical.c:83
+#, c-format
+#| msgid ""
+#| " -s, --status-interval=INTERVAL\n"
+#| " time between status packets sent to server (in "
+#| "seconds)\n"
+msgid ""
+" -s, --status-interval=SECS\n"
+" time between status packets sent to server "
+"(default: %d)\n"
+msgstr ""
+" -s, --status-interval=SECS\n"
+" 发往服务器的状态包的时间间隔 (默认为: %d)\n"
+
+#: pg_receivexlog.c:67
+#, c-format
+msgid " -S, --slot=SLOTNAME replication slot to use\n"
+msgstr " -S, --slot=SLOTNAME 用于复制的槽名\n"
+
+#: pg_receivexlog.c:89
#, c-format
msgid "%s: finished segment at %X/%X (timeline %u)\n"
msgstr "%s: finished segment at %X/%X (timeline %u)\n"
-#: pg_receivexlog.c:94
+#: pg_receivexlog.c:102
#, c-format
msgid "%s: switched to timeline %u at %X/%X\n"
msgstr "%s: 切换到时间表 %u 在 %X/%X\n"
-#: pg_receivexlog.c:103
+#: pg_receivexlog.c:111
#, c-format
-#| msgid "%s: received interrupt signal, exiting.\n"
msgid "%s: received interrupt signal, exiting\n"
msgstr "%s: 接收到终断信号, 正在退出\n"
-#: pg_receivexlog.c:128
+#: pg_receivexlog.c:137
#, c-format
msgid "%s: could not open directory \"%s\": %s\n"
msgstr "%s: 无法打开目录 \"%s\": %s\n"
-#: pg_receivexlog.c:157
-#, c-format
-msgid "%s: could not parse transaction log file name \"%s\"\n"
-msgstr "%s: 无法解析事务日志文件名: \"%s\"\n"
-
-#: pg_receivexlog.c:167
+#: pg_receivexlog.c:187
#, c-format
msgid "%s: could not stat file \"%s\": %s\n"
msgstr "%s: 无法统计文件: \"%s\": %s\n"
-#: pg_receivexlog.c:185
+#: pg_receivexlog.c:195
#, c-format
msgid "%s: segment file \"%s\" has incorrect size %d, skipping\n"
msgstr "%s: 段文件 \"%s\" 大小值: %d不正确, 跳过\n"
-#: pg_receivexlog.c:293
+#: pg_receivexlog.c:214
+#, c-format
+msgid "%s: could not read directory \"%s\": %s\n"
+msgstr "%s: 无法读取目录 \"%s\": %s\n"
+
+#: pg_receivexlog.c:221
+#, c-format
+#| msgid "%s: could not open directory \"%s\": %s\n"
+msgid "%s: could not close directory \"%s\": %s\n"
+msgstr "%s: 无法关闭目录 \"%s\": %s\n"
+
+#: pg_receivexlog.c:328
#, c-format
msgid "%s: starting log streaming at %X/%X (timeline %u)\n"
msgstr "%s: 在时间点: %X/%X (时间安排%u)启动日志的流操作 \n"
-#: pg_receivexlog.c:373
+#: pg_receivexlog.c:409 pg_recvlogical.c:683
#, c-format
msgid "%s: invalid port number \"%s\"\n"
msgstr "%s: 无效端口号 \"%s\"\n"
-#: pg_receivexlog.c:455
-#, fuzzy, c-format
+#: pg_receivexlog.c:494 pg_recvlogical.c:964
+#, c-format
#| msgid "%s: disconnected.\n"
msgid "%s: disconnected\n"
-msgstr "%s: 连接已断开.\n"
+msgstr "%s: 连接已断开\n"
#. translator: check source for value for %d
-#: pg_receivexlog.c:462
+#: pg_receivexlog.c:501 pg_recvlogical.c:971
#, c-format
-#| msgid "%s: disconnected. Waiting %d seconds to try again.\n"
msgid "%s: disconnected; waiting %d seconds to try again\n"
msgstr "%s: 连接已断开, 将于%d 秒后尝试重连.\n"
-#: receivelog.c:69
+#: pg_recvlogical.c:65
+#, c-format
+#| msgid ""
+#| "%s receives PostgreSQL streaming transaction logs.\n"
+#| "\n"
+msgid ""
+"%s receives PostgreSQL logical change streams.\n"
+"\n"
+msgstr ""
+"%s 接收PostgreSQL的逻辑改变流.\n"
+"\n"
+
+#: pg_recvlogical.c:69
+#, c-format
+msgid ""
+"\n"
+"Action to be performed:\n"
+msgstr ""
+"\n"
+"即将执行的动作:\n"
+
+#: pg_recvlogical.c:70
+#, c-format
+msgid ""
+" --create-slot create a new replication slot (for the slot's name "
+"see --slot)\n"
+msgstr " --create-slot 创建新的复制槽(槽名请参考选项 --slot)\n"
+
+#: pg_recvlogical.c:71
+#, c-format
+msgid ""
+" --drop-slot drop the replication slot (for the slot's name see "
+"--slot)\n"
+msgstr " --drop-slot 删除复制槽 (槽名请参考选项 --slot)\n"
+
+#: pg_recvlogical.c:72
+#, c-format
+msgid ""
+" --start start streaming in a replication slot (for the "
+"slot's name see --slot)\n"
+msgstr " --start 复制槽中启动流复制(槽名请参考选项 --slot)\n"
+
+#: pg_recvlogical.c:74
+#, c-format
+#| msgid " -f, --file=FILENAME output file or directory name\n"
+msgid " -f, --file=FILE receive log into this file, - for stdout\n"
+msgstr " -f, --file=FILE 接收日志到这个文件, - 为标准输出\n"
+
+#: pg_recvlogical.c:75
+#, c-format
+#| msgid ""
+#| " -s, --status-interval=INTERVAL\n"
+#| " time between status packets sent to server (in "
+#| "seconds)\n"
+msgid ""
+" -F --fsync-interval=SECS\n"
+" time between fsyncs to the output file (default: "
+"%d)\n"
+msgstr ""
+" -F --fsync-interval=SECS\n"
+" 写往输出文件的文件同步的时间间隔 (默认值为: %d)\n"
+
+#: pg_recvlogical.c:77
+#, c-format
+msgid ""
+" -I, --startpos=LSN where in an existing slot should the streaming "
+"start\n"
+msgstr " -I, --startpos=LSN 在当前槽中流复制启动的起始位置\n"
+
+#: pg_recvlogical.c:79
+#, c-format
+msgid ""
+" -o, --option=NAME[=VALUE]\n"
+" pass option NAME with optional value VALUE to the\n"
+" output plugin\n"
+msgstr ""
+" -o, --option=NAME[=VALUE]\n"
+" 选项NAME附带可选值VALUE给\n"
+" 输出插件\n"
+
+#: pg_recvlogical.c:82
+#, c-format
+msgid " -P, --plugin=PLUGIN use output plugin PLUGIN (default: %s)\n"
+msgstr " -P, --plugin=PLUGIN 使用输出插件PLUGIN (默认为: %s)\n"
+
+#: pg_recvlogical.c:85
+#, c-format
+msgid " -S, --slot=SLOTNAME name of the logical replication slot\n"
+msgstr " -S, --slot=SLOTNAME 逻辑复制槽的名字\n"
+
+#: pg_recvlogical.c:90
+#, c-format
+#| msgid " -d, --dbname=DBNAME database to cluster\n"
+msgid " -d, --dbname=DBNAME database to connect to\n"
+msgstr " -d, --dbname=DBNAME 要连接的目标数据库\n"
+
+#: pg_recvlogical.c:123
+#, c-format
+msgid "%s: confirming write up to %X/%X, flush to %X/%X (slot %s)\n"
+msgstr "%s: 确认上写至%X/%X, 并刷写回至 %X/%X (槽 %s)\n"
+
+#: pg_recvlogical.c:148 receivelog.c:340
+#, c-format
+msgid "%s: could not send feedback packet: %s"
+msgstr "%s: 无法发送回馈包: %s"
+
+#: pg_recvlogical.c:184
+#, c-format
+#| msgid "%s: could not fsync file \"%s\": %s\n"
+msgid "%s: could not fsync log file \"%s\": %s\n"
+msgstr "%s: 无法fsync同步日志文件\"%s\": %s\n"
+
+#: pg_recvlogical.c:223
+#, c-format
+#| msgid "%s: starting log streaming at %X/%X (timeline %u)\n"
+msgid "%s: starting log streaming at %X/%X (slot %s)\n"
+msgstr "%s:在%X/%X (槽 %s)位置启动日志流\n"
+
+#: pg_recvlogical.c:265
+#, c-format
+#| msgid "%s: streaming header too small: %d\n"
+msgid "%s: streaming initiated\n"
+msgstr "%s: 流已初始化\n"
+
+# command.c:1148
+#: pg_recvlogical.c:328
+#, c-format
+msgid "%s: could not open log file \"%s\": %s\n"
+msgstr "%s:无法开启日志档 \"%s\":%s\n"
+
+#: pg_recvlogical.c:397 receivelog.c:837
+#, c-format
+msgid "%s: select() failed: %s\n"
+msgstr "%s: select() 失败: %s\n"
+
+#: pg_recvlogical.c:406 receivelog.c:845
+#, c-format
+msgid "%s: could not receive data from WAL stream: %s"
+msgstr "%s: 无法接收来自WAL流的数据: %s"
+
+#: pg_recvlogical.c:447 pg_recvlogical.c:486 receivelog.c:912 receivelog.c:966
+#, c-format
+msgid "%s: streaming header too small: %d\n"
+msgstr "%s: 流头大小: %d 值太小\n"
+
+#: pg_recvlogical.c:469 receivelog.c:1072
+#, c-format
+msgid "%s: unrecognized streaming header: \"%c\"\n"
+msgstr "%s: 无法识别的流头: \"%c\"\n"
+
+#: pg_recvlogical.c:515 pg_recvlogical.c:529
+#, c-format
+#| msgid "%s: could not write %u bytes to WAL file \"%s\": %s\n"
+msgid "%s: could not write %u bytes to log file \"%s\": %s\n"
+msgstr "%s: 无法写入 %u 字节到日志文件 \"%s\": %s\n"
+
+#: pg_recvlogical.c:540 receivelog.c:627 receivelog.c:665
+#, c-format
+msgid "%s: unexpected termination of replication stream: %s"
+msgstr "%s: 流复制异常终止: %s"
+
+#: pg_recvlogical.c:662
+#, c-format
+#| msgid "%s: invalid status interval \"%s\"\n"
+msgid "%s: invalid fsync interval \"%s\"\n"
+msgstr "%s: 无效的fsync同步时间间隔值: \"%s\"\n"
+
+#: pg_recvlogical.c:703
+#, c-format
+#| msgid "%s: could not parse version \"%s\"\n"
+msgid "%s: could not parse start position \"%s\"\n"
+msgstr "%s: 无法解析起始位置\"%s\"\n"
+
+#: pg_recvlogical.c:784
+#, c-format
+#| msgid "%s: no operation specified\n"
+msgid "%s: no slot specified\n"
+msgstr "%s: 没有指定槽\n"
+
+#: pg_recvlogical.c:792
+#, c-format
+#| msgid "%s: no target directory specified\n"
+msgid "%s: no target file specified\n"
+msgstr "%s: 没有指定目标文件\n"
+
+#: pg_recvlogical.c:800
+#, c-format
+#| msgid "%s: no data directory specified\n"
+msgid "%s: no database specified\n"
+msgstr "%s: 没有指定数据库\n"
+
+#: pg_recvlogical.c:808
+#, c-format
+#| msgid "%s: no operation specified\n"
+msgid "%s: at least one action needs to be specified\n"
+msgstr "%s: 至少要指定一个操作\n"
+
+#: pg_recvlogical.c:816
+#, c-format
+msgid "%s: cannot use --create-slot or --start together with --drop-slot\n"
+msgstr ""
+"%s: 不能使用 --create-slot 选项或 同时使用--start和--drop-slot两个选项\n"
+
+#: pg_recvlogical.c:824
+#, c-format
+msgid "%s: cannot use --create-slot or --drop-slot together with --startpos\n"
+msgstr ""
+"%s: 不能使用 --create-slot 选项或 同时使用--drop-slot和--startpos两个选项\n"
+
+#: pg_recvlogical.c:878
+#, c-format
+#| msgid "%s: could not send replication command \"%s\": %s"
+msgid "%s: dropping replication slot \"%s\"\n"
+msgstr "%s: 删除复制槽\"%s\"\n"
+
+#: pg_recvlogical.c:894
+#, c-format
+#| msgid ""
+#| "%s: could not identify system: got %d rows and %d fields, expected %d "
+#| "rows and %d fields\n"
+msgid ""
+"%s: could not drop replication slot \"%s\": got %d rows and %d fields, "
+"expected %d rows and %d fields\n"
+msgstr "%s: 无法删除复制槽 \"%s\": 得到%d行%d列, 但期望值为%d行%d列\n"
+
+#: pg_recvlogical.c:912
+#, c-format
+#| msgid "%s: unexpected termination of replication stream: %s"
+msgid "%s: creating replication slot \"%s\"\n"
+msgstr "%s: 创建复制槽 \"%s\"\n"
+
+#: pg_recvlogical.c:929
+#, c-format
+#| msgid ""
+#| "%s: could not identify system: got %d rows and %d fields, expected %d "
+#| "rows and %d fields\n"
+msgid ""
+"%s: could not create replication slot \"%s\": got %d rows and %d fields, "
+"expected %d rows and %d fields\n"
+msgstr "%s: 无法创建复制槽 \"%s\": 得到%d行%d列, 但期望值为%d行%d列\n"
+
+#: receivelog.c:68
#, c-format
msgid "%s: could not open transaction log file \"%s\": %s\n"
msgstr "%s: 无法打开事务日志文件 \"%s\": %s\n"
-#: receivelog.c:81
+#: receivelog.c:80
#, c-format
msgid "%s: could not stat transaction log file \"%s\": %s\n"
msgstr "%s: 无法统计事务日志文件 \"%s\": %s\n"
-#: receivelog.c:95
+#: receivelog.c:94
#, c-format
msgid "%s: transaction log file \"%s\" has %d bytes, should be 0 or %d\n"
msgstr "%s: 事务日志文件 \"%s\" 大小为 %d 字节, 正确值应该是 0 或 %d字节\n"
-#: receivelog.c:108
+#: receivelog.c:107
#, c-format
msgid "%s: could not pad transaction log file \"%s\": %s\n"
msgstr "%s: 无法填充事务日志文件 \"%s\": %s\n"
-#: receivelog.c:121
+#: receivelog.c:120
#, c-format
msgid "%s: could not seek to beginning of transaction log file \"%s\": %s\n"
msgstr "%s: 无法定位事务日志文件 \"%s\"的开始位置: %s\n"
-#: receivelog.c:147
+#: receivelog.c:146
#, c-format
msgid "%s: could not determine seek position in file \"%s\": %s\n"
msgstr "%s: 无法确定文件 \"%s\"的当前位置: %s\n"
-#: receivelog.c:154 receivelog.c:344
+#: receivelog.c:153 receivelog.c:288 receivelog.c:933
#, c-format
msgid "%s: could not fsync file \"%s\": %s\n"
msgstr "%s: 无法对文件 \"%s\"进行fsync同步: %s\n"
-#: receivelog.c:181
+#: receivelog.c:179
#, c-format
msgid "%s: could not rename file \"%s\": %s\n"
msgstr "%s: 无法重命名文件 \"%s\": %s\n"
-#: receivelog.c:188
+#: receivelog.c:186
#, c-format
-#| msgid "%s: not renaming \"%s\", segment is not complete\n"
msgid "%s: not renaming \"%s%s\", segment is not complete\n"
msgstr "%s: 没有重命名 \"%s%s\", 段不完整\n"
# command.c:1148
-#: receivelog.c:277
+#: receivelog.c:219
#, c-format
-#| msgid "%s: could not open log file \"%s\": %s\n"
msgid "%s: could not open timeline history file \"%s\": %s\n"
msgstr "%s:无法打开时间表历史文件\"%s\":%s\n"
-#: receivelog.c:304
+#: receivelog.c:246
#, c-format
msgid "%s: server reported unexpected history file name for timeline %u: %s\n"
msgstr "%s: 服务器为时间表报告生成的意外历史文件名 %u:%s\n"
-#: receivelog.c:319
+#: receivelog.c:263
#, c-format
-#| msgid "%s: could not create file \"%s\": %s\n"
msgid "%s: could not create timeline history file \"%s\": %s\n"
msgstr "%s: 无法创建时间表历史文件 \"%s\": %s\n"
-#: receivelog.c:336
+#: receivelog.c:280
#, c-format
-#| msgid "%s: could not write to file \"%s\": %s\n"
msgid "%s: could not write timeline history file \"%s\": %s\n"
msgstr "%s: 无法写时间表历史文件 \"%s\": %s\n"
-#: receivelog.c:363
+#: receivelog.c:305
#, c-format
-#| msgid "could not rename file \"%s\" to \"%s\": %m"
msgid "%s: could not rename file \"%s\" to \"%s\": %s\n"
msgstr "%s: 无法将文件 \"%s\" 重命名为 \"%s\":%s\n"
-#: receivelog.c:436
+#: receivelog.c:374
#, c-format
-msgid "%s: could not send feedback packet: %s"
-msgstr "%s: 无法发送回馈包: %s"
+#| msgid ""
+#| "%s: incompatible server version %s; streaming is only supported with "
+#| "server version %s\n"
+msgid ""
+"%s: incompatible server version %s; client does not support streaming from "
+"server versions older than %s\n"
+msgstr "%s: 不兼容的服务器版本号 %s; 当服务器版本低于%s时客户端不支持流复制\n"
-#: receivelog.c:470
+#: receivelog.c:384
#, c-format
-#| msgid "No per-database role settings support in this server version.\n"
+#| msgid ""
+#| "%s: incompatible server version %s; streaming is only supported with "
+#| "server version %s\n"
msgid ""
-"%s: incompatible server version %s; streaming is only supported with server "
-"version %s\n"
-msgstr "%s: 不兼容的服备器版本号 %s; 只有在版本为%s的服务器中才支持流操作\n"
+"%s: incompatible server version %s; client does not support streaming from "
+"server versions newer than %s\n"
+msgstr "%s: 不兼容的服务器版本号 %s; 当服务器版本高于%s时客户端不支持流复制\n"
-#: receivelog.c:548
+#: receivelog.c:486
#, c-format
msgid ""
"%s: system identifier does not match between base backup and streaming "
"connection\n"
msgstr "%s: 基础备份和流连接的系统标识符不匹配\n"
-#: receivelog.c:556
+#: receivelog.c:494
#, c-format
msgid "%s: starting timeline %u is not present in the server\n"
msgstr "%s: 服务器上没有起始时间表 %u\n"
-#: receivelog.c:590
+#: receivelog.c:534
#, c-format
-#| msgid ""
-#| "%s: could not identify system: got %d rows and %d fields, expected %d "
-#| "rows and %d fields\n"
msgid ""
"%s: unexpected response to TIMELINE_HISTORY command: got %d rows and %d "
"fields, expected %d rows and %d fields\n"
@@ -760,119 +1126,92 @@ msgstr ""
"%s: 获得命令TIMELINE_HISTORY的意外响应: 得到 %d 行和 %d 列, 期望值为: %d 行"
"和 %d 列\n"
-#: receivelog.c:663
+#: receivelog.c:608
#, c-format
msgid ""
"%s: server reported unexpected next timeline %u, following timeline %u\n"
msgstr "%s: 服务器报出的下次意外时间表 %u, 紧跟时间表 %u之后\n"
-#: receivelog.c:670
+#: receivelog.c:615
#, c-format
msgid ""
"%s: server stopped streaming timeline %u at %X/%X, but reported next "
"timeline %u to begin at %X/%X\n"
msgstr ""
-"%s: 服务器在%X/%X时停止流操作时间表%u, 但是报出将在%X/%X时开始下一个时间"
-"表%u\n"
+"%1$s: 服务器在%3$X/%4$X时停止流操作时间表%2$u, 但是报出将在%6$X/%7$X时开始下"
+"一个时间表%5$u\n"
-#: receivelog.c:682 receivelog.c:717
-#, c-format
-msgid "%s: unexpected termination of replication stream: %s"
-msgstr "%s: 流复制异常终止: %s"
-
-#: receivelog.c:708
+#: receivelog.c:656
#, c-format
msgid "%s: replication stream was terminated before stop point\n"
msgstr "%s: 流复制在停止点之前异常终止\n"
-#: receivelog.c:756
+#: receivelog.c:705
#, c-format
-#| msgid ""
-#| "%s: could not identify system: got %d rows and %d fields, expected %d "
-#| "rows and %d fields\n"
msgid ""
"%s: unexpected result set after end-of-timeline: got %d rows and %d fields, "
"expected %d rows and %d fields\n"
msgstr ""
"%s: 终点时间表的意外结果集: 得到 %d 行和 %d 列, 期望值为: %d 行和 %d 列\n"
-#: receivelog.c:766
+#: receivelog.c:715
#, c-format
-#| msgid "%s: could not parse transaction log location \"%s\"\n"
msgid "%s: could not parse next timeline's starting point \"%s\"\n"
msgstr "%s: 无法解析下次时间表的起始点\"%s\"\n"
-#: receivelog.c:821 receivelog.c:923 receivelog.c:1088
+#: receivelog.c:770 receivelog.c:873 receivelog.c:1059
#, c-format
-#| msgid "%s: could not send feedback packet: %s"
msgid "%s: could not send copy-end packet: %s"
msgstr "%s: 无法发送副本结束包: %s"
-#: receivelog.c:888
-#, c-format
-msgid "%s: select() failed: %s\n"
-msgstr "%s: select() 失败: %s\n"
-
-#: receivelog.c:896
-#, c-format
-msgid "%s: could not receive data from WAL stream: %s"
-msgstr "%s: 无法接收来自WAL流的数据: %s"
-
-#: receivelog.c:960 receivelog.c:995
-#, c-format
-msgid "%s: streaming header too small: %d\n"
-msgstr "%s: 流头大小: %d 值太小\n"
-
-#: receivelog.c:1014
+#: receivelog.c:985
#, c-format
msgid "%s: received transaction log record for offset %u with no file open\n"
msgstr "%s: 偏移位置 %u 处接收到的事务日志记录没有打开文件\n"
-#: receivelog.c:1026
+#: receivelog.c:997
#, c-format
msgid "%s: got WAL data offset %08x, expected %08x\n"
msgstr "%s: 得到WAL数据偏移 %08x, 期望值为 %08x\n"
-#: receivelog.c:1063
+#: receivelog.c:1034
#, c-format
msgid "%s: could not write %u bytes to WAL file \"%s\": %s\n"
msgstr "%s: 无法写入 %u 字节到 WAL 文件 \"%s\": %s\n"
-#: receivelog.c:1101
-#, c-format
-msgid "%s: unrecognized streaming header: \"%c\"\n"
-msgstr "%s: 无法识别的流头: \"%c\"\n"
-
-#: streamutil.c:135
+#: streamutil.c:142
msgid "Password: "
msgstr "口令: "
-#: streamutil.c:148
+#: streamutil.c:166
#, c-format
msgid "%s: could not connect to server\n"
msgstr "%s: 无法连接到服务器\n"
-#: streamutil.c:164
+#: streamutil.c:184
#, c-format
msgid "%s: could not connect to server: %s\n"
msgstr "%s: 无法连接到服务器: %s\n"
-#: streamutil.c:188
+#: streamutil.c:208
#, c-format
msgid "%s: could not determine server setting for integer_datetimes\n"
msgstr "%s: 无法确定服务器上integer_datetimes的配置\n"
-#: streamutil.c:201
+#: streamutil.c:221
#, c-format
msgid "%s: integer_datetimes compile flag does not match server\n"
msgstr "%s: integer_datetimes编译开关与服务器端不匹配\n"
-#~ msgid "%s: keepalive message has incorrect size %d\n"
-#~ msgstr "%s: keepalive(保持活连接)的消息大小 %d 不正确 \n"
+#~ msgid "%s: no start point returned from server\n"
+#~ msgstr "%s: 服务器没有返回起始点\n"
#~ msgid ""
#~ "%s: timeline does not match between base backup and streaming connection\n"
#~ msgstr "%s: 基础备份和流连接的时间安排不匹配\n"
-#~ msgid "%s: no start point returned from server\n"
-#~ msgstr "%s: 服务器没有返回起始点\n"
+#~ msgid "%s: keepalive message has incorrect size %d\n"
+#~ msgstr "%s: keepalive(保持活连接)的消息大小 %d 不正确 \n"
+
+#~ msgid "%s: could not parse transaction log file name \"%s\"\n"
+#~ msgstr "%s: 无法解析事务日志文件名: \"%s\"\n"
diff --git a/src/bin/pg_config/po/sv.po b/src/bin/pg_config/po/sv.po
index 5343b11b31e..f1abcf24eaf 100644
--- a/src/bin/pg_config/po/sv.po
+++ b/src/bin/pg_config/po/sv.po
@@ -1,50 +1,51 @@
# Swedish message translation file for pg_config.
-# Dennis Bjrklund <db@zigo.dhs.org>, 2004, 2005, 2006.
+# Dennis Björklund <db@zigo.dhs.org>, 2004, 2005, 2006.
+# Mats Erik Andersson <bsd@gisladisker.se>, 2014.
#
msgid ""
msgstr ""
-"Project-Id-Version: PostgreSQL 9.3\n"
+"Project-Id-Version: PostgreSQL 9.4\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2013-09-02 00:26+0000\n"
-"PO-Revision-Date: 2013-09-02 01:28-0400\n"
-"Last-Translator: Peter Eisentraut <peter_e@gmx.net>\n"
+"POT-Creation-Date: 2014-11-17 21:11+0000\n"
+"PO-Revision-Date: 2014-11-22 23:54+0100\n"
+"Last-Translator: Mats Erik Andersson <bsd@gisladisker.se>\n"
"Language-Team: Swedish <sv@li.org>\n"
"Language: sv\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../port/exec.c:127 ../../port/exec.c:241 ../../port/exec.c:284
+#: ../../common/exec.c:127 ../../common/exec.c:241 ../../common/exec.c:284
#, c-format
msgid "could not identify current directory: %s"
msgstr "kunde inte identifiera aktuella katalogen: %s"
-#: ../../port/exec.c:146
+#: ../../common/exec.c:146
#, c-format
msgid "invalid binary \"%s\""
-msgstr "ogiltig binr \"%s\""
+msgstr "ogiltig binärfil \"%s\""
-#: ../../port/exec.c:195
+#: ../../common/exec.c:195
#, c-format
msgid "could not read binary \"%s\""
-msgstr "kunde inte lsa binr \"%s\""
+msgstr "kunde inte läsa binärfil \"%s\""
-#: ../../port/exec.c:202
+#: ../../common/exec.c:202
#, c-format
msgid "could not find a \"%s\" to execute"
-msgstr "kunde inte hitta en \"%s\" att kra"
+msgstr "kunde inte hitta en \"%s\" att köra"
-#: ../../port/exec.c:257 ../../port/exec.c:293
+#: ../../common/exec.c:257 ../../common/exec.c:293
#, c-format
msgid "could not change directory to \"%s\": %s"
msgstr "kunde inte byta katalog till \"%s\": %s"
-#: ../../port/exec.c:272
+#: ../../common/exec.c:272
#, c-format
msgid "could not read symbolic link \"%s\""
-msgstr "kunde inte lsa symbolisk lnk \"%s\""
+msgstr "kunde inte läsa symbolisk länk \"%s\""
-#: ../../port/exec.c:523
+#: ../../common/exec.c:523
#, c-format
msgid "pclose failed: %s"
msgstr "pclose misslyckades: %s"
@@ -70,7 +71,7 @@ msgstr ""
#: pg_config.c:429
#, c-format
msgid "Usage:\n"
-msgstr "Anvndning:\n"
+msgstr "Användning:\n"
#: pg_config.c:430
#, c-format
@@ -84,22 +85,22 @@ msgstr ""
#: pg_config.c:431
#, c-format
msgid "Options:\n"
-msgstr "Flaggor:\n"
+msgstr "Programväxlar:\n"
#: pg_config.c:432
#, c-format
msgid " --bindir show location of user executables\n"
-msgstr " --bindir visar platsen fr krbara filer\n"
+msgstr " --bindir visa filkatalog för körbara filer\n"
#: pg_config.c:433
#, c-format
msgid " --docdir show location of documentation files\n"
-msgstr " --docdir visa platsen fr dokumentationsfiler\n"
+msgstr " --docdir visa filkatalog för dokumentationsfiler\n"
#: pg_config.c:434
#, c-format
msgid " --htmldir show location of HTML documentation files\n"
-msgstr " --htmldir visa platsen fr HTML-dokumentationsfiler\n"
+msgstr " --htmldir visa filkatalog för HTML-dokumentationsfiler\n"
#: pg_config.c:435
#, c-format
@@ -107,53 +108,53 @@ msgid ""
" --includedir show location of C header files of the client\n"
" interfaces\n"
msgstr ""
-" --includedir visar platsen fr C-header-filerna till\n"
-" klientinterface\n"
+" --includedir visa filkatalog för C-header-filerna med\n"
+" klientgränssnitt\n"
#: pg_config.c:437
#, c-format
msgid " --pkgincludedir show location of other C header files\n"
-msgstr " --pkgincludedir visa platsen fr C-header-filer\n"
+msgstr " --pkgincludedir visa filkatalog för C-header-filer\n"
#: pg_config.c:438
#, c-format
msgid " --includedir-server show location of C header files for the server\n"
-msgstr " --includedir-server visar platsen fr C-header-filerna till servern\n"
+msgstr " --includedir-server visa filkatalog för C-header-filerna till servern\n"
#: pg_config.c:439
#, c-format
msgid " --libdir show location of object code libraries\n"
-msgstr " --libdir visar platsen fr bibliotekens objektfiler\n"
+msgstr " --libdir visa filkatalog för bibliotekens objektfiler\n"
#: pg_config.c:440
#, c-format
msgid " --pkglibdir show location of dynamically loadable modules\n"
-msgstr " --pkglibdir visar platsen fr dynamiskt laddade moduler\n"
+msgstr " --pkglibdir visa filkatalog för dynamiskt laddade moduler\n"
#: pg_config.c:441
#, c-format
msgid " --localedir show location of locale support files\n"
-msgstr " --localedir visa platsen fr lokalstdfiler\n"
+msgstr " --localedir visa filkatalog för lokalstödsfiler\n"
#: pg_config.c:442
#, c-format
msgid " --mandir show location of manual pages\n"
-msgstr " --mandir visa platsen fr manualsidor\n"
+msgstr " --mandir visa filkatalog för manualsidor\n"
#: pg_config.c:443
#, c-format
msgid " --sharedir show location of architecture-independent support files\n"
-msgstr " --sharedir visa platsen fr arkitekturoberoende filer\n"
+msgstr " --sharedir visa filkatalog för arkitekturoberoende filer\n"
#: pg_config.c:444
#, c-format
msgid " --sysconfdir show location of system-wide configuration files\n"
-msgstr " --sysconfdir visa platsen fr systemkonfigurationsfiler\n"
+msgstr " --sysconfdir visa filkatalog för systemkonfigurationsfiler\n"
#: pg_config.c:445
#, c-format
msgid " --pgxs show location of extension makefile\n"
-msgstr " --pgxs visar platsen fr makefilen till utkningar\n"
+msgstr " --pgxs visa plats för make-filen vid utvidgningar\n"
#: pg_config.c:446
#, c-format
@@ -161,58 +162,58 @@ msgid ""
" --configure show options given to \"configure\" script when\n"
" PostgreSQL was built\n"
msgstr ""
-" --configure dessa flaggor gavs till \"configure\"-skriptet nr\n"
+" --configure dessa flaggor gavs till \"configure\"-skriptet när\n"
" PostgreSQL byggdes\n"
#: pg_config.c:448
#, c-format
msgid " --cc show CC value used when PostgreSQL was built\n"
-msgstr " --cc visa vrdet p CC som anvndes nr PostgreSQL byggdes\n"
+msgstr " --cc visa värde på CC när PostgreSQL byggdes\n"
#: pg_config.c:449
#, c-format
msgid " --cppflags show CPPFLAGS value used when PostgreSQL was built\n"
-msgstr " --cppflags visa vrdet p CPPFLAGS som anvndes nr PostgreSQL byggdes\n"
+msgstr " --cppflags visa värde på CPPFLAGS när PostgreSQL byggdes\n"
#: pg_config.c:450
#, c-format
msgid " --cflags show CFLAGS value used when PostgreSQL was built\n"
-msgstr " --cflags visa vrdet p CFLAGS som anvndes nr PostgreSQL byggdes\n"
+msgstr " --cflags visa värde på CFLAGS när PostgreSQL byggdes\n"
#: pg_config.c:451
#, c-format
msgid " --cflags_sl show CFLAGS_SL value used when PostgreSQL was built\n"
-msgstr " --cflags_sl visa vrdet p CFLAGS_SL som anvndes nr PostgreSQL byggdes\n"
+msgstr " --cflags_sl visa värde på CFLAGS_SL när PostgreSQL byggdes\n"
#: pg_config.c:452
#, c-format
msgid " --ldflags show LDFLAGS value used when PostgreSQL was built\n"
-msgstr " --ldflags visa vrdet p LDFLAGS som anvndes nr PostgreSQL byggdes\n"
+msgstr " --ldflags visa värde på LDFLAGS när PostgreSQL byggdes\n"
#: pg_config.c:453
#, c-format
msgid " --ldflags_ex show LDFLAGS_EX value used when PostgreSQL was built\n"
-msgstr " --ldflags_ex visa vrdet p LDFLAGS_EX som anvndes nr PostgreSQL byggdes\n"
+msgstr " --ldflags_ex visa värde på LDFLAGS_EX när PostgreSQL byggdes\n"
#: pg_config.c:454
#, c-format
msgid " --ldflags_sl show LDFLAGS_SL value used when PostgreSQL was built\n"
-msgstr " --ldflags_sl visa vrdet p LDFLAGS_SL som anvndes nr PostgreSQL byggdes\n"
+msgstr " --ldflags_sl visa värde på LDFLAGS_SL när PostgreSQL byggdes\n"
#: pg_config.c:455
#, c-format
msgid " --libs show LIBS value used when PostgreSQL was built\n"
-msgstr " --libs visa vrdet p LIBS som anvndes nr PostgreSQL byggdes\n"
+msgstr " --libs visa värde på LIBS när PostgreSQL byggdes\n"
#: pg_config.c:456
#, c-format
msgid " --version show the PostgreSQL version\n"
-msgstr " --version visa PostgreSQLs version\n"
+msgstr " --version visa version för PostgreSQL\n"
#: pg_config.c:457
#, c-format
msgid " -?, --help show this help, then exit\n"
-msgstr " -?, --help visa den hr hjlpen, avsluta sedan\n"
+msgstr " -?, --help visa denna hjälp, avsluta sedan\n"
#: pg_config.c:458
#, c-format
@@ -222,7 +223,7 @@ msgid ""
"\n"
msgstr ""
"\n"
-"Utan argument s visas alla knda vrden.\n"
+"Utan argument visas alla kända värden.\n"
"\n"
#: pg_config.c:459
@@ -233,14 +234,14 @@ msgstr "Rapportera fel till <pgsql-bugs@postgresql.org>.\n"
#: pg_config.c:465
#, c-format
msgid "Try \"%s --help\" for more information.\n"
-msgstr "Frsk med \"%s --help\" fr mer information.\n"
+msgstr "Försök med \"%s --help\" för mer information.\n"
#: pg_config.c:504
#, c-format
msgid "%s: could not find own program executable\n"
-msgstr "%s: kunde inte hitta min egen krbara fil\n"
+msgstr "%s: Kunde inte hitta min egen körbara fil.\n"
#: pg_config.c:527
#, c-format
msgid "%s: invalid argument: %s\n"
-msgstr "%s: ogiltigt argument: %s\n"
+msgstr "%s: Ogiltigt argument: %s\n"
diff --git a/src/bin/pg_controldata/po/fr.po b/src/bin/pg_controldata/po/fr.po
index a7989aa92cf..1e9a45e89be 100644
--- a/src/bin/pg_controldata/po/fr.po
+++ b/src/bin/pg_controldata/po/fr.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: PostgreSQL 8.4\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2014-05-17 11:13+0000\n"
-"PO-Revision-Date: 2014-05-17 15:25+0100\n"
+"POT-Creation-Date: 2014-12-04 22:42+0000\n"
+"PO-Revision-Date: 2014-12-05 10:03+0100\n"
"Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
"Language-Team: PostgreSQLfr <pgsql-fr-generale@postgresql.org>\n"
"Language: fr\n"
@@ -327,7 +327,6 @@ msgstr "Paramtrage actuel de wal_level : %s\n"
#: pg_controldata.c:263
#, c-format
-#| msgid "Current wal_level setting: %s\n"
msgid "Current wal_log_hints setting: %s\n"
msgstr "Paramtrage actuel de wal_log_hints : %s\n"
@@ -338,7 +337,6 @@ msgstr "Paramtrage actuel de max_connections : %d\n"
#: pg_controldata.c:267
#, c-format
-#| msgid "Current max_prepared_xacts setting: %d\n"
msgid "Current max_worker_processes setting: %d\n"
msgstr "Paramtrage actuel de max_worker_processes : %d\n"
@@ -394,36 +392,42 @@ msgstr "Longueur maximale d'un morceau TOAST : %u\n"
#: pg_controldata.c:290
#, c-format
+#| msgid "Maximum size of a TOAST chunk: %u\n"
+msgid "Size of a large-object chunk: %u\n"
+msgstr "Taille d'un morceau de Large Object : %u\n"
+
+#: pg_controldata.c:292
+#, c-format
msgid "Date/time type storage: %s\n"
msgstr "Stockage du type date/heure : %s\n"
-#: pg_controldata.c:291
+#: pg_controldata.c:293
msgid "64-bit integers"
msgstr "entiers 64-bits"
-#: pg_controldata.c:291
+#: pg_controldata.c:293
msgid "floating-point numbers"
msgstr "nombres virgule flottante"
-#: pg_controldata.c:292
+#: pg_controldata.c:294
#, c-format
msgid "Float4 argument passing: %s\n"
msgstr "Passage d'argument float4 : %s\n"
-#: pg_controldata.c:293 pg_controldata.c:295
+#: pg_controldata.c:295 pg_controldata.c:297
msgid "by reference"
msgstr "par rfrence"
-#: pg_controldata.c:293 pg_controldata.c:295
+#: pg_controldata.c:295 pg_controldata.c:297
msgid "by value"
msgstr "par valeur"
-#: pg_controldata.c:294
+#: pg_controldata.c:296
#, c-format
msgid "Float8 argument passing: %s\n"
msgstr "Passage d'argument float8 : %s\n"
-#: pg_controldata.c:296
+#: pg_controldata.c:298
#, c-format
msgid "Data page checksum version: %u\n"
msgstr "Version des sommes de contrle des pages de donnes : %u\n"
diff --git a/src/bin/pg_controldata/po/sv.po b/src/bin/pg_controldata/po/sv.po
index 831c6dc0e8d..b5c8fd028ae 100644
--- a/src/bin/pg_controldata/po/sv.po
+++ b/src/bin/pg_controldata/po/sv.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: PostgreSQL 9.4\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2014-08-20 23:12+0000\n"
-"PO-Revision-Date: 2014-09-06 18:36+0200\n"
+"POT-Creation-Date: 2014-11-17 21:12+0000\n"
+"PO-Revision-Date: 2014-11-19 23:46+0100\n"
"Last-Translator: Mats Erik Andersson <bsd@gisladisker.se>\n"
"Language-Team: Swedish <sv@li.org>\n"
"Language: sv\n"
@@ -24,7 +24,7 @@ msgid ""
"%s displays control information of a PostgreSQL database cluster.\n"
"\n"
msgstr ""
-"%s visar kontrollinformation om ett PostgreSQL-databaskluster.\n"
+"%s visar kontrollinformation om ett databaskluster för PostgreSQL.\n"
"\n"
#: pg_controldata.c:35
@@ -44,7 +44,7 @@ msgid ""
"Options:\n"
msgstr ""
"\n"
-"Flaggor:\n"
+"Programväxlar:\n"
#: pg_controldata.c:38
#, c-format
@@ -65,8 +65,8 @@ msgid ""
"\n"
msgstr ""
"\n"
-"Om ingen datakatalog (DATAKATALOG) har angivits så används omgivningsvariabeln\n"
-"PGDATA för detta.\n"
+"Om ingen datakatalog (DATAKATALOG) har angivits så nyttjas omgivningsvariabeln\n"
+"PGDATA för detta syfte.\n"
"\n"
#: pg_controldata.c:42
@@ -80,11 +80,11 @@ msgstr "startar"
#: pg_controldata.c:54
msgid "shut down"
-msgstr "avslutad"
+msgstr "avstängt"
#: pg_controldata.c:56
msgid "shut down in recovery"
-msgstr "avslutad med återställning"
+msgstr "avslutat med återställning"
#: pg_controldata.c:58
msgid "shutting down"
@@ -100,11 +100,11 @@ msgstr "utför arkivåterställning"
#: pg_controldata.c:64
msgid "in production"
-msgstr "produktivt"
+msgstr "i full drift"
#: pg_controldata.c:66
msgid "unrecognized status code"
-msgstr "Ej igenkänd statuskod"
+msgstr "okänd statuskod"
#: pg_controldata.c:83
msgid "unrecognized wal_level"
@@ -113,7 +113,7 @@ msgstr "okänd wal_level"
#: pg_controldata.c:128
#, c-format
msgid "%s: no data directory specified\n"
-msgstr "%s: ingen datakatalog angiven\n"
+msgstr "%s: Ingen datakatalog angiven.\n"
#: pg_controldata.c:129
#, c-format
@@ -138,7 +138,8 @@ msgid ""
"is expecting. The results below are untrustworthy.\n"
"\n"
msgstr ""
-"VARNING: Beräknad CRC-kontrollsumma matchar inte värdet som sparats i filen.\n"
+"VARNING: Beräknad CRC-kontrollsumma matchar inte det värde som har sparats "
+"i filen.\n"
"Antingen är filen trasig, eller så har den en annan uppbyggnad än vad detta\n"
"program förväntade sig. Resultatet nedan är inte helt tillförlitligt.\n"
"\n"
@@ -147,13 +148,12 @@ msgstr ""
# Insert additional spaces in translated strings for the
# purpose of alignment. Of lingustic reasons the separation
# used for English is insufficient for Swedish. New indenting
-# is consistent for all reporting statements: five additional
+# is consistent for all reporting statements: six additional
# space characters.
-
#: pg_controldata.c:192
#, c-format
msgid "pg_control version number: %u\n"
-msgstr "Versionsnummer för pg_control: %u\n"
+msgstr "Versionsnummer för pg_control: %u\n"
#: pg_controldata.c:195
#, c-format
@@ -171,57 +171,57 @@ msgstr ""
#: pg_controldata.c:199
#, c-format
msgid "Catalog version number: %u\n"
-msgstr "Katalogversionsnummer: %u\n"
+msgstr "Katalogversion: %u\n"
#: pg_controldata.c:201
#, c-format
msgid "Database system identifier: %s\n"
-msgstr "Databasens systemidentifierare: %s\n"
+msgstr "Databasens systemidentifierare: %s\n"
#: pg_controldata.c:203
#, c-format
msgid "Database cluster state: %s\n"
-msgstr "Databasklustrets tillstånd: %s\n"
+msgstr "Databasklustrets tillstånd: %s\n"
#: pg_controldata.c:205
#, c-format
msgid "pg_control last modified: %s\n"
-msgstr "pg_control ändrades senast: %s\n"
+msgstr "pg_control ändrades senast: %s\n"
#: pg_controldata.c:207
#, c-format
msgid "Latest checkpoint location: %X/%X\n"
-msgstr "Läge för senaste kontrollpunkt: %X/%X\n"
+msgstr "Läge för senaste kontrollpunkt: %X/%X\n"
#: pg_controldata.c:210
#, c-format
msgid "Prior checkpoint location: %X/%X\n"
-msgstr "Föregående läge för kontrollpunkt: %X/%X\n"
+msgstr "Närmast föregående kontrollpunkt: %X/%X\n"
#: pg_controldata.c:213
#, c-format
msgid "Latest checkpoint's REDO location: %X/%X\n"
-msgstr "Senaste kontrollpunktens REDO-läge: %X/%X\n"
+msgstr "REDO-läge för senaste kontrollpunkt: %X/%X\n"
#: pg_controldata.c:216
#, c-format
msgid "Latest checkpoint's REDO WAL file: %s\n"
-msgstr "Senaste kontrollpunktens REDO-WAL-fil: %s\n"
+msgstr "REDO-WAL-fil vid senaste kontrollpunkt: %s\n"
#: pg_controldata.c:218
#, c-format
msgid "Latest checkpoint's TimeLineID: %u\n"
-msgstr "Senaste kontrollpunktens TimeLineID: %u\n"
+msgstr "TimeLineID vid senaste kontrollpunkt: %u\n"
#: pg_controldata.c:220
#, c-format
msgid "Latest checkpoint's PrevTimeLineID: %u\n"
-msgstr "Senaste kontrollpunktens PrevTimeLineID: %u\n"
+msgstr "PrevTimeLineID vid senaste kontrollpunkt: %u\n"
#: pg_controldata.c:222
#, c-format
msgid "Latest checkpoint's full_page_writes: %s\n"
-msgstr "Senaste kontrollpunktens full_page_writes: %s\n"
+msgstr "Senaste kontrollpunktens full_page_writes: %s\n"
#: pg_controldata.c:223 pg_controldata.c:264
msgid "off"
@@ -234,82 +234,82 @@ msgstr "på"
#: pg_controldata.c:224
#, c-format
msgid "Latest checkpoint's NextXID: %u/%u\n"
-msgstr "Senaste kontrollpunktens NextXID: %u/%u\n"
+msgstr "NextXID vid senaste kontrollpunkt: %u/%u\n"
#: pg_controldata.c:227
#, c-format
msgid "Latest checkpoint's NextOID: %u\n"
-msgstr "Senaste kontrollpunktens NextOID: %u\n"
+msgstr "NextOID vid senaste kontrollpunkt: %u\n"
#: pg_controldata.c:229
#, c-format
msgid "Latest checkpoint's NextMultiXactId: %u\n"
-msgstr "Senaste kontrollpunktens NextMultiXactId: %u\n"
+msgstr "NextMultiXactId vid senaste kontrollpunkt: %u\n"
#: pg_controldata.c:231
#, c-format
msgid "Latest checkpoint's NextMultiOffset: %u\n"
-msgstr "Senaste kontrollpunktens NextMultiOffset: %u\n"
+msgstr "NextMultiOffset vid senaste kontrollpunkt: %u\n"
#: pg_controldata.c:233
#, c-format
msgid "Latest checkpoint's oldestXID: %u\n"
-msgstr "Senaste kontrollpunktens oldestXID: %u\n"
+msgstr "oldestXID vid senaste kontrollpunkt: %u\n"
#: pg_controldata.c:235
#, c-format
msgid "Latest checkpoint's oldestXID's DB: %u\n"
-msgstr "Senaste kontrollpunktens oldestXID:s DB: %u\n"
+msgstr "DB för oldestXID vid senaste kontrollpunkt: %u\n"
#: pg_controldata.c:237
#, c-format
msgid "Latest checkpoint's oldestActiveXID: %u\n"
-msgstr "Senaste kontrollpunktens oldestActiveXID: %u\n"
+msgstr "oldestActiveXID vid senaste kontrollpunkt: %u\n"
#: pg_controldata.c:239
#, c-format
msgid "Latest checkpoint's oldestMultiXid: %u\n"
-msgstr "Senaste kontrollpunktens oldestMultiXid: %u\n"
+msgstr "oldestMultiXid vid senaste kontrollpunkt: %u\n"
#: pg_controldata.c:241
#, c-format
msgid "Latest checkpoint's oldestMulti's DB: %u\n"
-msgstr "Senaste kontrollpunktens oldestMulti:s DB: %u\n"
+msgstr "DB för oldestMulti vid senaste kontrollpkt: %u\n"
#: pg_controldata.c:243
#, c-format
msgid "Time of latest checkpoint: %s\n"
-msgstr "Tidpunkt för senaste kontrollpunkt: %s\n"
+msgstr "Tidpunkt för senaste kontrollpunkt: %s\n"
#: pg_controldata.c:245
#, c-format
msgid "Fake LSN counter for unlogged rels: %X/%X\n"
-msgstr "Beräknat LSN-tal av ologgade relationer: %X/%X\n"
+msgstr "Beräknat LSN-tal av ologgade relationer: %X/%X\n"
#: pg_controldata.c:248
#, c-format
msgid "Minimum recovery ending location: %X/%X\n"
-msgstr "Slutläge för minsta återställning: %X/%X\n"
+msgstr "Slutläge för minsta återställning: %X/%X\n"
#: pg_controldata.c:251
#, c-format
msgid "Min recovery ending loc's timeline: %u\n"
-msgstr "Sluttid för minsta återställning: %u\n"
+msgstr "Sluttid för minsta återställning: %u\n"
#: pg_controldata.c:253
#, c-format
msgid "Backup start location: %X/%X\n"
-msgstr "Startpunkt för backup: %X/%X\n"
+msgstr "Startpunkt för backup: %X/%X\n"
#: pg_controldata.c:256
#, c-format
msgid "Backup end location: %X/%X\n"
-msgstr "Slutpunkt för backup: %X/%X\n"
+msgstr "Slutpunkt för backup: %X/%X\n"
#: pg_controldata.c:259
#, c-format
msgid "End-of-backup record required: %s\n"
-msgstr "Tvingande markering av backupslut: %s\n"
+msgstr "Tvingande markering av backupslut: %s\n"
#: pg_controldata.c:260
msgid "no"
@@ -322,82 +322,82 @@ msgstr "ja"
#: pg_controldata.c:261
#, c-format
msgid "Current wal_level setting: %s\n"
-msgstr "Nuvarande värde för wal_level: %s\n"
+msgstr "Nuvarande värde på wal_level: %s\n"
#: pg_controldata.c:263
#, c-format
msgid "Current wal_log_hints setting: %s\n"
-msgstr "Nuvarande värde för wal_log_hints: %s\n"
+msgstr "Nuvarande värde på wal_log_hints: %s\n"
#: pg_controldata.c:265
#, c-format
msgid "Current max_connections setting: %d\n"
-msgstr "Nuvarande värde för max_connections: %d\n"
+msgstr "Nuvarande värde på max_connections: %d\n"
#: pg_controldata.c:267
#, c-format
msgid "Current max_worker_processes setting: %d\n"
-msgstr "Nuvarande max_worker_processes: %d\n"
+msgstr "Nuvarande max_worker_processes: %d\n"
#: pg_controldata.c:269
#, c-format
msgid "Current max_prepared_xacts setting: %d\n"
-msgstr "Nuvarande max_prepared_xacts: %d\n"
+msgstr "Nuvarande max_prepared_xacts: %d\n"
#: pg_controldata.c:271
#, c-format
msgid "Current max_locks_per_xact setting: %d\n"
-msgstr "Nuvarande max_locks_per_xact: %d\n"
+msgstr "Nuvarande max_locks_per_xact: %d\n"
#: pg_controldata.c:273
#, c-format
msgid "Maximum data alignment: %u\n"
-msgstr "Maximal data-alignment: %u\n"
+msgstr "Maximal jämkning av data (alignment): %u\n"
#: pg_controldata.c:276
#, c-format
msgid "Database block size: %u\n"
-msgstr "Databasens blockstorlek: %u\n"
+msgstr "Databasens blockstorlek: %u\n"
#: pg_controldata.c:278
#, c-format
msgid "Blocks per segment of large relation: %u\n"
-msgstr "Block per segment i en stor relation: %u\n"
+msgstr "Block per segment i en stor relation: %u\n"
#: pg_controldata.c:280
#, c-format
msgid "WAL block size: %u\n"
-msgstr "Blockstorlek i WAL: %u\n"
+msgstr "Blockstorlek i transaktionsloggen: %u\n"
#: pg_controldata.c:282
#, c-format
msgid "Bytes per WAL segment: %u\n"
-msgstr "Storlek för WAL-segment: %u\n"
+msgstr "Segmentstorlek i transaktionsloggen: %u\n"
#: pg_controldata.c:284
#, c-format
msgid "Maximum length of identifiers: %u\n"
-msgstr "Maximal längd för identifierare: %u\n"
+msgstr "Maximal längd för identifierare: %u\n"
#: pg_controldata.c:286
#, c-format
msgid "Maximum columns in an index: %u\n"
-msgstr "Maximalt antal kolonner i index: %u\n"
+msgstr "Maximalt antal kolonner i ett index: %u\n"
#: pg_controldata.c:288
#, c-format
msgid "Maximum size of a TOAST chunk: %u\n"
-msgstr "Maximal storlek för en TOAST-enhet: %u\n"
+msgstr "Maximal storlek för en TOAST-enhet: %u\n"
#: pg_controldata.c:290
#, c-format
msgid "Size of a large-object chunk: %u\n"
-msgstr "Storlek för large-object-stycken: %u\n"
+msgstr "Storlek för large-object-enheter: %u\n"
#: pg_controldata.c:292
#, c-format
msgid "Date/time type storage: %s\n"
-msgstr "Datum/tid-representation: %s\n"
+msgstr "Representation av dag och tid: %s\n"
#: pg_controldata.c:293
msgid "64-bit integers"
@@ -410,7 +410,7 @@ msgstr "flyttal"
#: pg_controldata.c:294
#, c-format
msgid "Float4 argument passing: %s\n"
-msgstr "Åtkomst till float4-argument: %s\n"
+msgstr "Åtkomst till float4-argument: %s\n"
#: pg_controldata.c:295 pg_controldata.c:297
msgid "by reference"
@@ -423,24 +423,9 @@ msgstr "värdeåtkomst"
#: pg_controldata.c:296
#, c-format
msgid "Float8 argument passing: %s\n"
-msgstr "Åtkomst till float8-argument: %s\n"
+msgstr "Åtkomst till float8-argument: %s\n"
#: pg_controldata.c:298
#, c-format
msgid "Data page checksum version: %u\n"
-msgstr "Checksummaversion för datasidor: %u\n"
-
-#~ msgid ""
-#~ "Usage:\n"
-#~ " %s [OPTION] [DATADIR]\n"
-#~ "\n"
-#~ "Options:\n"
-#~ " --help show this help, then exit\n"
-#~ " --version output version information, then exit\n"
-#~ msgstr ""
-#~ "Användning:\n"
-#~ " %s [FLAGGA] [DATAKAT]\n"
-#~ "\n"
-#~ "Flaggor:\n"
-#~ " --help visa denna hjälp, avsluta sedan\n"
-#~ " --version visa versionsinformation, avsluta sedan\n"
+msgstr "Checksummaversion för datasidor: %u\n"
diff --git a/src/bin/pg_controldata/po/zh_CN.po b/src/bin/pg_controldata/po/zh_CN.po
index e33866ecb8b..b1bf3c65879 100644
--- a/src/bin/pg_controldata/po/zh_CN.po
+++ b/src/bin/pg_controldata/po/zh_CN.po
@@ -5,8 +5,8 @@ msgid ""
msgstr ""
"Project-Id-Version: pg_controldata (PostgreSQL 9.0)\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2013-09-02 00:28+0000\n"
-"PO-Revision-Date: 2013-09-02 14:28+0800\n"
+"POT-Creation-Date: 2014-11-22 21:12+0000\n"
+"PO-Revision-Date: 2014-11-24 17:54+0800\n"
"Last-Translator: Xiong He <iihero@qq.com>\n"
"Language-Team: Chinese (Simplified)\n"
"Language: zh_CN\n"
@@ -104,31 +104,31 @@ msgstr "在运行中"
msgid "unrecognized status code"
msgstr "不被认可的状态码"
-#: pg_controldata.c:81
+#: pg_controldata.c:83
msgid "unrecognized wal_level"
msgstr "参数wal_level的值无法识别"
-#: pg_controldata.c:126
+#: pg_controldata.c:128
#, c-format
msgid "%s: no data directory specified\n"
msgstr "%s: 没有指定数据目录\n"
-#: pg_controldata.c:127
+#: pg_controldata.c:129
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "用 \"%s --help\" 显示更多的信息.\n"
-#: pg_controldata.c:135
+#: pg_controldata.c:137
#, c-format
msgid "%s: could not open file \"%s\" for reading: %s\n"
msgstr "%s: 无法打开文件 \"%s\" 读取信息: %s\n"
-#: pg_controldata.c:142
+#: pg_controldata.c:144
#, c-format
msgid "%s: could not read file \"%s\": %s\n"
msgstr "%s: 无法读取文件 \"%s\": %s\n"
-#: pg_controldata.c:156
+#: pg_controldata.c:158
#, c-format
msgid ""
"WARNING: Calculated CRC checksum does not match value stored in file.\n"
@@ -141,12 +141,12 @@ msgstr ""
"下面的结果是不可靠的.\n"
"\n"
-#: pg_controldata.c:190
+#: pg_controldata.c:192
#, c-format
msgid "pg_control version number: %u\n"
msgstr "pg_control 版本: %u\n"
-#: pg_controldata.c:193
+#: pg_controldata.c:195
#, c-format
msgid ""
"WARNING: possible byte ordering mismatch\n"
@@ -160,261 +160,288 @@ msgstr ""
"在那种情况下结果将会是不正确的,并且所安装的PostgreSQL\n"
"将会与这个数据目录不兼容\n"
-#: pg_controldata.c:197
+#: pg_controldata.c:199
#, c-format
msgid "Catalog version number: %u\n"
msgstr "Catalog 版本: %u\n"
-#: pg_controldata.c:199
+#: pg_controldata.c:201
#, c-format
msgid "Database system identifier: %s\n"
msgstr "数据库系统标识符: %s\n"
-#: pg_controldata.c:201
+#: pg_controldata.c:203
#, c-format
msgid "Database cluster state: %s\n"
msgstr "数据库簇状态: %s\n"
-#: pg_controldata.c:203
+#: pg_controldata.c:205
#, c-format
msgid "pg_control last modified: %s\n"
msgstr "pg_control 最后修改: %s\n"
-#: pg_controldata.c:205
+#: pg_controldata.c:207
#, c-format
msgid "Latest checkpoint location: %X/%X\n"
msgstr "最新检查点位置: %X/%X\n"
-#: pg_controldata.c:208
+#: pg_controldata.c:210
#, c-format
msgid "Prior checkpoint location: %X/%X\n"
msgstr "优先检查点位置: %X/%X\n"
-#: pg_controldata.c:211
+#: pg_controldata.c:213
#, c-format
msgid "Latest checkpoint's REDO location: %X/%X\n"
msgstr "最新检查点的 REDO 位置: %X/%X\n"
-#: pg_controldata.c:214
+#: pg_controldata.c:216
#, c-format
-#| msgid "Latest checkpoint's REDO location: %X/%X\n"
msgid "Latest checkpoint's REDO WAL file: %s\n"
msgstr "最新检查点的重做日志文件: %s\n"
-#: pg_controldata.c:216
+#: pg_controldata.c:218
#, c-format
msgid "Latest checkpoint's TimeLineID: %u\n"
msgstr "最新检查点的 TimeLineID: %u\n"
-#: pg_controldata.c:218
+#: pg_controldata.c:220
#, c-format
-#| msgid "Latest checkpoint's TimeLineID: %u\n"
msgid "Latest checkpoint's PrevTimeLineID: %u\n"
msgstr "最新检查点的PrevTimeLineID: %u\n"
-#: pg_controldata.c:220
+#: pg_controldata.c:222
#, c-format
msgid "Latest checkpoint's full_page_writes: %s\n"
msgstr "最新检查点的full_page_writes: %s\n"
# help.c:48
-#: pg_controldata.c:221
+#: pg_controldata.c:223 pg_controldata.c:264
msgid "off"
msgstr "关闭"
# help.c:48
-#: pg_controldata.c:221
+#: pg_controldata.c:223 pg_controldata.c:264
msgid "on"
msgstr "开启"
-#: pg_controldata.c:222
+#: pg_controldata.c:224
#, c-format
msgid "Latest checkpoint's NextXID: %u/%u\n"
msgstr "最新检查点的 NextXID: %u/%u\n"
-#: pg_controldata.c:225
+#: pg_controldata.c:227
#, c-format
msgid "Latest checkpoint's NextOID: %u\n"
msgstr "最新检查点的 NextOID: %u\n"
-#: pg_controldata.c:227
+#: pg_controldata.c:229
#, c-format
msgid "Latest checkpoint's NextMultiXactId: %u\n"
msgstr "最新检查点的NextMultiXactId: %u\n"
-#: pg_controldata.c:229
+#: pg_controldata.c:231
#, c-format
msgid "Latest checkpoint's NextMultiOffset: %u\n"
msgstr "最新检查点的NextMultiOffsetD: %u\n"
-#: pg_controldata.c:231
+#: pg_controldata.c:233
#, c-format
msgid "Latest checkpoint's oldestXID: %u\n"
msgstr "最新检查点的oldestXID: %u\n"
-#: pg_controldata.c:233
+#: pg_controldata.c:235
#, c-format
msgid "Latest checkpoint's oldestXID's DB: %u\n"
msgstr "最新检查点的oldestXID所在的数据库:%u\n"
-#: pg_controldata.c:235
+#: pg_controldata.c:237
#, c-format
msgid "Latest checkpoint's oldestActiveXID: %u\n"
msgstr "最新检查点检查oldestActiveXID: %u\n"
-#: pg_controldata.c:237
+#: pg_controldata.c:239
#, c-format
-#| msgid "Latest checkpoint's oldestActiveXID: %u\n"
msgid "Latest checkpoint's oldestMultiXid: %u\n"
msgstr "最新检查点检查oldestMultiXid: %u\n"
-#: pg_controldata.c:239
+#: pg_controldata.c:241
#, c-format
-#| msgid "Latest checkpoint's oldestXID's DB: %u\n"
msgid "Latest checkpoint's oldestMulti's DB: %u\n"
msgstr "最新检查点的oldestMulti所在的数据库:%u\n"
-#: pg_controldata.c:241
+#: pg_controldata.c:243
#, c-format
msgid "Time of latest checkpoint: %s\n"
msgstr "最新检查点的时间: %s\n"
-#: pg_controldata.c:243
+#: pg_controldata.c:245
#, c-format
msgid "Fake LSN counter for unlogged rels: %X/%X\n"
msgstr "不带日志的关系: %X/%X使用虚假的LSN计数器\n"
-#: pg_controldata.c:246
+#: pg_controldata.c:248
#, c-format
msgid "Minimum recovery ending location: %X/%X\n"
msgstr "最小恢复结束位置: %X/%X\n"
-#: pg_controldata.c:249
+#: pg_controldata.c:251
#, c-format
-#| msgid "Minimum recovery ending location: %X/%X\n"
msgid "Min recovery ending loc's timeline: %u\n"
msgstr "最小恢复结束位置时间表: %u\n"
-#: pg_controldata.c:251
+#: pg_controldata.c:253
#, c-format
msgid "Backup start location: %X/%X\n"
msgstr "开始进行备份的点位置: %X/%X\n"
-#: pg_controldata.c:254
+#: pg_controldata.c:256
#, c-format
msgid "Backup end location: %X/%X\n"
msgstr "备份的最终位置: %X/%X\n"
-#: pg_controldata.c:257
+#: pg_controldata.c:259
#, c-format
msgid "End-of-backup record required: %s\n"
msgstr "需要终止备份的记录: %s\n"
-#: pg_controldata.c:258
+#: pg_controldata.c:260
msgid "no"
msgstr "否"
-#: pg_controldata.c:258
+#: pg_controldata.c:260
msgid "yes"
msgstr "是"
-#: pg_controldata.c:259
+#: pg_controldata.c:261
#, c-format
msgid "Current wal_level setting: %s\n"
msgstr "参数wal_level的当前设置: %s\n"
-#: pg_controldata.c:261
+#: pg_controldata.c:263
+#, c-format
+#| msgid "Current wal_level setting: %s\n"
+msgid "Current wal_log_hints setting: %s\n"
+msgstr "当前的 wal_log_hints 设置: %s\n"
+
+#: pg_controldata.c:265
#, c-format
msgid "Current max_connections setting: %d\n"
msgstr "参数max_connections的当前设置: %d\n"
-#: pg_controldata.c:263
+#: pg_controldata.c:267
+#, c-format
+#| msgid "Current max_prepared_xacts setting: %d\n"
+msgid "Current max_worker_processes setting: %d\n"
+msgstr "参数 max_worker_processes 的当前设置: %d\n"
+
+#: pg_controldata.c:269
#, c-format
msgid "Current max_prepared_xacts setting: %d\n"
msgstr "参数 max_prepared_xacts的当前设置: %d\n"
-#: pg_controldata.c:265
+#: pg_controldata.c:271
#, c-format
msgid "Current max_locks_per_xact setting: %d\n"
msgstr "参数max_locks_per_xact setting的当前设置: %d\n"
-#: pg_controldata.c:267
+#: pg_controldata.c:273
#, c-format
msgid "Maximum data alignment: %u\n"
msgstr "最大数据校准: %u\n"
-#: pg_controldata.c:270
+#: pg_controldata.c:276
#, c-format
msgid "Database block size: %u\n"
msgstr "数据库块大小: %u\n"
-#: pg_controldata.c:272
+#: pg_controldata.c:278
#, c-format
msgid "Blocks per segment of large relation: %u\n"
msgstr "大关系的每段块数: %u\n"
-#: pg_controldata.c:274
+#: pg_controldata.c:280
#, c-format
msgid "WAL block size: %u\n"
msgstr "WAL的块大小: %u\n"
-#: pg_controldata.c:276
+#: pg_controldata.c:282
#, c-format
msgid "Bytes per WAL segment: %u\n"
msgstr "每一个 WAL 段字节数: %u\n"
-#: pg_controldata.c:278
+#: pg_controldata.c:284
#, c-format
msgid "Maximum length of identifiers: %u\n"
msgstr "标识符的最大长度: %u\n"
-#: pg_controldata.c:280
+#: pg_controldata.c:286
#, c-format
msgid "Maximum columns in an index: %u\n"
msgstr "在索引中可允许使用最大的列数: %u\n"
-#: pg_controldata.c:282
+#: pg_controldata.c:288
#, c-format
msgid "Maximum size of a TOAST chunk: %u\n"
msgstr "TOAST区块的最大长度: %u\n"
-#: pg_controldata.c:284
+#: pg_controldata.c:290
+#, c-format
+#| msgid "Maximum size of a TOAST chunk: %u\n"
+msgid "Size of a large-object chunk: %u\n"
+msgstr "大对象区块的大小: %u\n"
+
+#: pg_controldata.c:292
#, c-format
msgid "Date/time type storage: %s\n"
msgstr "日期/时间 类型存储: %s\n"
-#: pg_controldata.c:285
+#: pg_controldata.c:293
msgid "64-bit integers"
msgstr "64位整数"
-#: pg_controldata.c:285
+#: pg_controldata.c:293
msgid "floating-point numbers"
msgstr "浮点数"
-#: pg_controldata.c:286
+#: pg_controldata.c:294
#, c-format
msgid "Float4 argument passing: %s\n"
msgstr "正在传递Flloat4类型的参数: %s\n"
-#: pg_controldata.c:287 pg_controldata.c:289
+#: pg_controldata.c:295 pg_controldata.c:297
msgid "by reference"
msgstr "由引用"
-#: pg_controldata.c:287 pg_controldata.c:289
+#: pg_controldata.c:295 pg_controldata.c:297
msgid "by value"
msgstr "由值"
-#: pg_controldata.c:288
+#: pg_controldata.c:296
#, c-format
msgid "Float8 argument passing: %s\n"
msgstr "正在传递Flloat8类型的参数: %s\n"
-#: pg_controldata.c:290
+#: pg_controldata.c:298
#, c-format
-#| msgid "Catalog version number: %u\n"
msgid "Data page checksum version: %u\n"
msgstr "数据页校验和版本: %u\n"
+#~ msgid "Latest checkpoint's StartUpID: %u\n"
+#~ msgstr "最新检查点的 StartUpID: %u\n"
+
+#~ msgid "LC_CTYPE: %s\n"
+#~ msgstr "LC_CTYPE: %s\n"
+
+#~ msgid "LC_COLLATE: %s\n"
+#~ msgstr "LC_COLLATE: %s\n"
+
+#~ msgid "Maximum number of function arguments: %u\n"
+#~ msgstr "函数参数的最大个数: %u\n"
+
+#~ msgid "Latest checkpoint's UNDO location: %X/%X\n"
+#~ msgstr "最新检查点的 UNDO 位置: %X/%X\n"
+
#~ msgid ""
#~ "Usage:\n"
#~ " %s [OPTION] [DATADIR]\n"
@@ -429,18 +456,3 @@ msgstr "数据页校验和版本: %u\n"
#~ "选项:\n"
#~ " --help 显示此帮助信息, 然后退出\n"
#~ " --version 显示 pg_controldata 的版本, 然后退出\n"
-
-#~ msgid "Latest checkpoint's UNDO location: %X/%X\n"
-#~ msgstr "最新检查点的 UNDO 位置: %X/%X\n"
-
-#~ msgid "Maximum number of function arguments: %u\n"
-#~ msgstr "函数参数的最大个数: %u\n"
-
-#~ msgid "LC_COLLATE: %s\n"
-#~ msgstr "LC_COLLATE: %s\n"
-
-#~ msgid "LC_CTYPE: %s\n"
-#~ msgstr "LC_CTYPE: %s\n"
-
-#~ msgid "Latest checkpoint's StartUpID: %u\n"
-#~ msgstr "最新检查点的 StartUpID: %u\n"
diff --git a/src/bin/pg_ctl/nls.mk b/src/bin/pg_ctl/nls.mk
index badc1b7e6c9..5f78bc61c1e 100644
--- a/src/bin/pg_ctl/nls.mk
+++ b/src/bin/pg_ctl/nls.mk
@@ -1,4 +1,4 @@
# src/bin/pg_ctl/nls.mk
CATALOG_NAME = pg_ctl
-AVAIL_LANGUAGES = cs de es fr it ja pl pt_BR ru sv zh_CN zh_TW
+AVAIL_LANGUAGES = cs de es fr it ja pl pt_BR ru sv zh_CN
GETTEXT_FILES = pg_ctl.c ../../common/exec.c ../../common/fe_memutils.c ../../common/wait_error.c ../../port/path.c
diff --git a/src/bin/pg_ctl/po/fr.po b/src/bin/pg_ctl/po/fr.po
index 5f85f184101..08604085ea1 100644
--- a/src/bin/pg_ctl/po/fr.po
+++ b/src/bin/pg_ctl/po/fr.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: PostgreSQL 8.4\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2014-05-17 11:12+0000\n"
-"PO-Revision-Date: 2014-05-17 15:27+0100\n"
+"POT-Creation-Date: 2014-12-04 22:42+0000\n"
+"PO-Revision-Date: 2014-12-05 10:04+0100\n"
"Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
"Language-Team: PostgreSQLfr <pgsql-fr-generale@postgresql.org>\n"
"Language: fr\n"
@@ -55,7 +55,8 @@ msgid "pclose failed: %s"
msgstr "chec de pclose : %s"
#: ../../common/fe_memutils.c:33 ../../common/fe_memutils.c:60
-#: ../../common/fe_memutils.c:83
+#: ../../common/fe_memutils.c:83 ../../port/path.c:598 ../../port/path.c:636
+#: ../../port/path.c:653
#, c-format
msgid "out of memory\n"
msgstr "mmoire puise\n"
@@ -100,9 +101,14 @@ msgstr "le processus fils a t termin par le signal %d"
msgid "child process exited with unrecognized status %d"
msgstr "le processus fils a quitt avec un statut %d non reconnu"
+#: ../../port/path.c:620
+#, c-format
+#| msgid "could not identify current directory: %s"
+msgid "could not get current working directory: %s\n"
+msgstr "n'a pas pu obtenir le rpertoire de travail : %s\n"
+
#: pg_ctl.c:259
#, c-format
-#| msgid "directory \"%s\" does not exist"
msgid "%s: directory \"%s\" does not exist\n"
msgstr "%s : le rpertoire %s n'existe pas\n"
@@ -113,7 +119,6 @@ msgstr "%s : n'a pas pu accder au rpertoire %s : %s\n"
#: pg_ctl.c:275
#, c-format
-#| msgid "specified data directory \"%s\" is not a directory"
msgid "%s: directory \"%s\" is not a database cluster directory\n"
msgstr "%s : le rpertoire %s n'est pas un rpertoire d'instance\n"
@@ -691,12 +696,15 @@ msgstr " -p CHEMIN_POSTGRES normalement pas ncessaire\n"
#: pg_ctl.c:1899
#, c-format
+#| msgid ""
+#| "\n"
+#| "Options for start or restart:\n"
msgid ""
"\n"
-"Options for stop, restart, or promote:\n"
+"Options for stop or restart:\n"
msgstr ""
"\n"
-"Options pour l'arrt, le redmarrage ou la promotion :\n"
+"Options pour l'arrt ou le redmarrage :\n"
#: pg_ctl.c:1900
#, c-format
@@ -881,11 +889,17 @@ msgstr ""
"%s : aucun rpertoire de bases de donnes indiqu et variable\n"
"d'environnement PGDATA non initialise\n"
-#~ msgid "could not change directory to \"%s\""
-#~ msgstr "n'a pas pu accder au rpertoire %s "
+#~ msgid "%s: could not open process token: %lu\n"
+#~ msgstr "%s : n'a pas pu ouvrir le jeton du processus : %lu\n"
-#~ msgid "%s: out of memory\n"
-#~ msgstr "%s : mmoire puise\n"
+#~ msgid " --help show this help, then exit\n"
+#~ msgstr " --help affiche cette aide et quitte\n"
+
+#~ msgid " --version output version information, then exit\n"
+#~ msgstr " --version affiche la version et quitte\n"
+
+#~ msgid "could not start server\n"
+#~ msgstr "n'a pas pu dmarrer le serveur\n"
#~ msgid ""
#~ "%s is a utility to start, stop, restart, reload configuration files,\n"
@@ -900,14 +914,15 @@ msgstr ""
#~ "ou d'envoyer un signal un processus PostgreSQL\n"
#~ "\n"
-#~ msgid "could not start server\n"
-#~ msgstr "n'a pas pu dmarrer le serveur\n"
-
-#~ msgid " --version output version information, then exit\n"
-#~ msgstr " --version affiche la version et quitte\n"
+#~ msgid "%s: out of memory\n"
+#~ msgstr "%s : mmoire puise\n"
-#~ msgid " --help show this help, then exit\n"
-#~ msgstr " --help affiche cette aide et quitte\n"
+#~ msgid "could not change directory to \"%s\""
+#~ msgstr "n'a pas pu accder au rpertoire %s "
-#~ msgid "%s: could not open process token: %lu\n"
-#~ msgstr "%s : n'a pas pu ouvrir le jeton du processus : %lu\n"
+#~ msgid ""
+#~ "\n"
+#~ "Options for stop, restart, or promote:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Options pour l'arrt, le redmarrage ou la promotion :\n"
diff --git a/src/bin/pg_ctl/po/it.po b/src/bin/pg_ctl/po/it.po
index 434f4d7f059..d211729b693 100644
--- a/src/bin/pg_ctl/po/it.po
+++ b/src/bin/pg_ctl/po/it.po
@@ -19,8 +19,8 @@ msgid ""
msgstr ""
"Project-Id-Version: pg_ctl (PostgreSQL) 9.4\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2014-07-30 04:12+0000\n"
-"PO-Revision-Date: 2014-07-30 22:42+0100\n"
+"POT-Creation-Date: 2014-08-30 02:42+0000\n"
+"PO-Revision-Date: 2014-08-30 12:36+0100\n"
"Last-Translator: Daniele Varrazzo <daniele.varrazzo@gmail.com>\n"
"Language-Team: Gruppo traduzioni ITPUG <traduzioni@itpug.org>\n"
"Language: it\n"
@@ -66,7 +66,8 @@ msgid "pclose failed: %s"
msgstr "pclose fallita: %s"
#: ../../common/fe_memutils.c:33 ../../common/fe_memutils.c:60
-#: ../../common/fe_memutils.c:83
+#: ../../common/fe_memutils.c:83 ../../port/path.c:598 ../../port/path.c:636
+#: ../../port/path.c:653
#, c-format
msgid "out of memory\n"
msgstr "memoria esaurita\n"
@@ -111,6 +112,11 @@ msgstr "processo figlio terminato da segnale %d"
msgid "child process exited with unrecognized status %d"
msgstr "processo figlio uscito con stato non riconosciuto %d"
+#: ../../port/path.c:620
+#, c-format
+msgid "could not get current working directory: %s\n"
+msgstr "determinazione della directory corrente fallita: %s\n"
+
#: pg_ctl.c:259
#, c-format
msgid "%s: directory \"%s\" does not exist\n"
@@ -213,7 +219,7 @@ msgstr "%s: inizializzazione del sistema di database fallita\n"
#: pg_ctl.c:841
#, c-format
msgid "%s: another server might be running; trying to start server anyway\n"
-msgstr "%s: un altro server potrebbe essere in esecuzione: si proverà ad avviare il server comunque\n"
+msgstr "%s: un altro server potrebbe essere in esecuzione; si sta provando ad avviare il server ugualmente\n"
#: pg_ctl.c:878
#, c-format
@@ -662,10 +668,10 @@ msgstr " -p PATH-TO-POSTGRES normalmente non necessario\n"
#, c-format
msgid ""
"\n"
-"Options for stop, restart, or promote:\n"
+"Options for stop or restart:\n"
msgstr ""
"\n"
-"Opzioni per fermare, riavviare o promuovere:\n"
+"Opzioni per l'arresto o il riavvio:\n"
#: pg_ctl.c:1900
#, c-format
diff --git a/src/bin/pg_ctl/po/sv.po b/src/bin/pg_ctl/po/sv.po
index 7abb8c07865..c43a9c80c36 100644
--- a/src/bin/pg_ctl/po/sv.po
+++ b/src/bin/pg_ctl/po/sv.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: PostgreSQL 9.4\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2014-08-20 23:12+0000\n"
-"PO-Revision-Date: 2014-09-04 23:21+0200\n"
+"POT-Creation-Date: 2014-11-17 21:12+0000\n"
+"PO-Revision-Date: 2014-11-24 19:25+0100\n"
"Last-Translator: Mats Erik Andersson <bsd@gisladisker.se>\n"
"Language-Team: Swedish <sv@li.org>\n"
"Language: sv\n"
@@ -26,12 +26,12 @@ msgstr "kunde inte identifiera aktuella katalogen: %s"
#: ../../common/exec.c:146
#, c-format
msgid "invalid binary \"%s\""
-msgstr "ogiltig binär \"%s\""
+msgstr "ogiltig binärfil \"%s\""
#: ../../common/exec.c:195
#, c-format
msgid "could not read binary \"%s\""
-msgstr "kunde inte läsa binär \"%s\""
+msgstr "kunde inte läsa binärfil \"%s\""
#: ../../common/exec.c:202
#, c-format
@@ -54,10 +54,11 @@ msgid "pclose failed: %s"
msgstr "pclose misslyckades: %s"
#: ../../common/fe_memutils.c:33 ../../common/fe_memutils.c:60
-#: ../../common/fe_memutils.c:83
+#: ../../common/fe_memutils.c:83 ../../port/path.c:598 ../../port/path.c:636
+#: ../../port/path.c:653
#, c-format
msgid "out of memory\n"
-msgstr "slut på minnet\n"
+msgstr "slut på minne\n"
#: ../../common/fe_memutils.c:77
#, c-format
@@ -99,6 +100,11 @@ msgstr "barnprocess terminerades av signal %d"
msgid "child process exited with unrecognized status %d"
msgstr "barnprocess avslutade med okänd statuskod %d"
+#: ../../port/path.c:620
+#, c-format
+msgid "could not get current working directory: %s\n"
+msgstr "kunde inte fastställa nuvarande arbetskatalog: %s\n"
+
#: pg_ctl.c:259
#, c-format
msgid "%s: directory \"%s\" does not exist\n"
@@ -112,7 +118,7 @@ msgstr "%s: kunde inte komma åt katalogen \"%s\": %s\n"
#: pg_ctl.c:275
#, c-format
msgid "%s: directory \"%s\" is not a database cluster directory\n"
-msgstr "%s: katalogen \"%s\" innehåller inte något databaskluster\n"
+msgstr "%s: Katalogen \"%s\" innehåller inte något databaskluster.\n"
#: pg_ctl.c:288
#, c-format
@@ -154,12 +160,13 @@ msgid ""
"%s: this data directory appears to be running a pre-existing postmaster\n"
msgstr ""
"\n"
-"%s: denna databaskatalog tycks köras av en redan driftsatt postmaster\n"
+"%s: denna databaskatalog tycks nyttjas av en redan driftsatt postmaster\n"
#: pg_ctl.c:706
#, c-format
msgid "%s: cannot set core file size limit; disallowed by hard limit\n"
-msgstr "%s: kan inte sätta storlek på core-fil. Förbjudes av hård begränsning.\n"
+msgstr ""
+"%s: Kan inte sätta storlek på core-fil. Hindras av hård begränsning.\n"
#: pg_ctl.c:731
#, c-format
@@ -169,7 +176,7 @@ msgstr "%s: kunde inte läsa filen \"%s\"\n"
#: pg_ctl.c:736
#, c-format
msgid "%s: option file \"%s\" must have exactly one line\n"
-msgstr "%s: inställningsfilen \"%s\" måste ha en enda rad\n"
+msgstr "%s: inställningsfilen \"%s\" måste bestå av en enda rad.\n"
#: pg_ctl.c:787
#, c-format
@@ -201,7 +208,7 @@ msgstr "%s: skapande av databaskluster misslyckades\n"
#: pg_ctl.c:841
#, c-format
msgid "%s: another server might be running; trying to start server anyway\n"
-msgstr "%s: en annan server verkar köra; försöker starta servern ändå\n"
+msgstr "%s: en annan server verkar köra; försöker starta servern ändå.\n"
#: pg_ctl.c:878
#, c-format
@@ -210,7 +217,7 @@ msgstr "%s: kunde inte starta servern: avslutningskoden var %d\n"
#: pg_ctl.c:885
msgid "waiting for server to start..."
-msgstr "väntar på att servern skall starta..."
+msgstr "Väntar på att servern skall starta..."
#: pg_ctl.c:890 pg_ctl.c:991 pg_ctl.c:1082
msgid " done\n"
@@ -218,7 +225,7 @@ msgstr " klar\n"
#: pg_ctl.c:891
msgid "server started\n"
-msgstr "servern startad\n"
+msgstr "Servern startad.\n"
#: pg_ctl.c:894 pg_ctl.c:898
msgid " stopped waiting\n"
@@ -226,7 +233,7 @@ msgstr " avslutade väntan\n"
#: pg_ctl.c:895
msgid "server is still starting up\n"
-msgstr "servern är fortfarande i startläge\n"
+msgstr "Servern är fortfarande i startläge.\n"
#: pg_ctl.c:899
#, c-format
@@ -248,7 +255,7 @@ msgstr "%s: kunde inte invänta server på grund av felinställning\n"
#: pg_ctl.c:912
msgid "server starting\n"
-msgstr "servern startar\n"
+msgstr "Servern startar.\n"
#: pg_ctl.c:927 pg_ctl.c:1013 pg_ctl.c:1103 pg_ctl.c:1143
#, c-format
@@ -262,7 +269,7 @@ msgstr "Kör servern?\n"
#: pg_ctl.c:934
#, c-format
msgid "%s: cannot stop server; single-user server is running (PID: %ld)\n"
-msgstr "%s: kan inte stanna servern. En-användar-server kör (PID: %ld).\n"
+msgstr "%s: Kan inte stanna servern. En-användar-server i drift (PID: %ld).\n"
#: pg_ctl.c:942 pg_ctl.c:1037
#, c-format
@@ -271,7 +278,7 @@ msgstr "%s: kunde inte skicka stopp-signal (PID: %ld): %s\n"
#: pg_ctl.c:949
msgid "server shutting down\n"
-msgstr "servern stänger ner\n"
+msgstr "Servern stänger ner.\n"
#: pg_ctl.c:964 pg_ctl.c:1052
msgid ""
@@ -279,18 +286,18 @@ msgid ""
"Shutdown will not complete until pg_stop_backup() is called.\n"
"\n"
msgstr ""
-"VARNING: Läget för backup i drift är i gång.\n"
-"Nedstängning är inte fullständig förr än att pg_stop_backup() har anropats.\n"
+"VARNING: Läget för backup under drift är i gång.\n"
+"Nedstängning är inte fullständig förrän pg_stop_backup() har anropats.\n"
"\n"
#: pg_ctl.c:968 pg_ctl.c:1056
msgid "waiting for server to shut down..."
-msgstr "väntar på att servern skall stänga ner..."
+msgstr "Väntar på att servern skall stänga ner..."
#: pg_ctl.c:985 pg_ctl.c:1075
#, c-format
msgid "%s: server does not shut down\n"
-msgstr "%s: servern stänger inte ner\n"
+msgstr "%s: servern avslutar inte.\n"
#: pg_ctl.c:987 pg_ctl.c:1077
msgid ""
@@ -302,16 +309,16 @@ msgstr ""
#: pg_ctl.c:993 pg_ctl.c:1083
msgid "server stopped\n"
-msgstr "servern stoppad\n"
+msgstr "Servern är nedtagen.\n"
#: pg_ctl.c:1016 pg_ctl.c:1089
msgid "starting server anyway\n"
-msgstr "startar servern ändå\n"
+msgstr "Startar servern ändå.\n"
#: pg_ctl.c:1025
#, c-format
msgid "%s: cannot restart server; single-user server is running (PID: %ld)\n"
-msgstr "%s: kan inte starta om servern. Servern kör (PID: %ld).\n"
+msgstr "%s: Kan inte starta om servern. En-användar-server i drift (PID: %ld).\n"
#: pg_ctl.c:1028 pg_ctl.c:1113
msgid "Please terminate the single-user server and try again.\n"
@@ -325,26 +332,26 @@ msgstr "%s: gamla serverprocessen (PID: %ld) verkar vara borta\n"
#: pg_ctl.c:1110
#, c-format
msgid "%s: cannot reload server; single-user server is running (PID: %ld)\n"
-msgstr "%s: kan inte ladda om servern. En-användar-server kör (PID: %ld)\n"
+msgstr "%s: Kan inte ladda om servern. En-användar-server kör (PID: %ld)\n"
#: pg_ctl.c:1119
#, c-format
msgid "%s: could not send reload signal (PID: %ld): %s\n"
-msgstr "%s: kunde inte skicka \"reload\"-signalen (PID: %ld): %s\n"
+msgstr "%s: kunde inte skicka signalen \"reload\" (PID: %ld): %s\n"
#: pg_ctl.c:1124
msgid "server signaled\n"
-msgstr "servern signalerad\n"
+msgstr "Servern är underrättad medelst signal.\n"
#: pg_ctl.c:1150
#, c-format
msgid "%s: cannot promote server; single-user server is running (PID: %ld)\n"
-msgstr "%s: kan inte uppgradera servern. En-användar-server kör (PID: %ld)\n"
+msgstr "%s: Kan inte uppgradera servern. En-användar-server kör (PID: %ld)\n"
#: pg_ctl.c:1159
#, c-format
msgid "%s: cannot promote server; server is not in standby mode\n"
-msgstr "%s: kan inte uppgradera servern. Servern står ej i beredskapsläge.\n"
+msgstr "%s: Kan inte uppgradera servern. Den står ej i beredskapsläge.\n"
#: pg_ctl.c:1174
#, c-format
@@ -368,22 +375,22 @@ msgstr "%s: kunde inte avlägsna signalfil vid uppgradering \"%s\": %s\n"
#: pg_ctl.c:1196
msgid "server promoting\n"
-msgstr "servern uppgraderar\n"
+msgstr "Servern uppgraderar.\n"
#: pg_ctl.c:1243
#, c-format
msgid "%s: single-user server is running (PID: %ld)\n"
-msgstr "%s: en-användar-server kör (PID: %ld)\n"
+msgstr "%s: En-användar-server kör. (PID: %ld)\n"
#: pg_ctl.c:1256
#, c-format
msgid "%s: server is running (PID: %ld)\n"
-msgstr "%s: servern kör (PID: %ld)\n"
+msgstr "%s: Servern är driftsatt. (PID: %ld)\n"
#: pg_ctl.c:1272
#, c-format
msgid "%s: no server running\n"
-msgstr "%s: ingen server kör\n"
+msgstr "%s: Ingen server i drift.\n"
#: pg_ctl.c:1290
#, c-format
@@ -393,12 +400,12 @@ msgstr "%s: kunde inte skicka signal %d (PID: %ld): %s\n"
#: pg_ctl.c:1347
#, c-format
msgid "%s: could not find own program executable\n"
-msgstr "%s: kunde inte hitta det egna programmets körbara fil\n"
+msgstr "%s: Kunde inte hitta det egna programmets körbara fil.\n"
#: pg_ctl.c:1357
#, c-format
msgid "%s: could not find postgres program executable\n"
-msgstr "%s: kunde inte hitta körbar postgres\n"
+msgstr "%s: Kunde inte hitta körbar postgres.\n"
#: pg_ctl.c:1437 pg_ctl.c:1469
#, c-format
@@ -450,12 +457,13 @@ msgstr "%s: kunde inte starta tjänsten \"%s\": felkod %lu\n"
#: pg_ctl.c:1697
#, c-format
msgid "%s: WARNING: cannot create restricted tokens on this platform\n"
-msgstr "%s: VARNING: restriktiva styrmärken (token) stöds inte av plattformen\n"
+msgstr ""
+"%s: VARNING: Restriktiva styrmärken (token) stöds inte av plattformen.\n"
#: pg_ctl.c:1706
#, c-format
msgid "%s: could not open process token: error code %lu\n"
-msgstr "%s kunde inte skapa processmärke (token): felkod %lu\n"
+msgstr "%s: kunde inte skapa processmärke (token): felkod %lu\n"
#: pg_ctl.c:1719
#, c-format
@@ -470,7 +478,7 @@ msgstr "%s: kunde inte skapa restriktivt styrmärke (token): felkod %lu\n"
#: pg_ctl.c:1771
#, c-format
msgid "%s: WARNING: could not locate all job object functions in system API\n"
-msgstr "%s: VARNING: Kunde inte finna alla styrobjekt i systemets API\n"
+msgstr "%s: VARNING: Kunde inte finna alla styrobjekt i systemets API.\n"
#: pg_ctl.c:1853
#, c-format
@@ -483,7 +491,8 @@ msgid ""
"%s is a utility to initialize, start, stop, or control a PostgreSQL server.\n"
"\n"
msgstr ""
-"%s är ett verktyg för att initiera, starta, stanna och att kontrollera PostgreSQL-tjänsten.\n"
+"%s är ett verktyg för att initiera, starta, stanna och att styra\n"
+"PostgreSQL-tjänsten.\n"
"\n"
#: pg_ctl.c:1862
@@ -494,12 +503,13 @@ msgstr "Användning:\n"
#: pg_ctl.c:1863
#, c-format
msgid " %s init[db] [-D DATADIR] [-s] [-o \"OPTIONS\"]\n"
-msgstr " %s init[db] [-D DATAKAT] [-s] [-o \"FLAGGOR\"]\n"
+msgstr " %s init[db] [-D DATAKAT] [-s] [-o \"FLAGGOR\"]\n"
#: pg_ctl.c:1864
#, c-format
msgid " %s start [-w] [-t SECS] [-D DATADIR] [-s] [-l FILENAME] [-o \"OPTIONS\"]\n"
-msgstr " %s start [-w] [-t SEK] [-D DATAKAT] [-s] [-l FILNAMN] [-o \"FLAGGOR\"]\n"
+msgstr ""
+" %s start [-w] [-t SEK] [-D DATAKAT] [-s] [-l FILNAMN] [-o \"FLAGGOR\"]\n"
#: pg_ctl.c:1865
#, c-format
@@ -556,7 +566,7 @@ msgid ""
"Common options:\n"
msgstr ""
"\n"
-"Generella flaggor:\n"
+"Gemensamma programväxlar:\n"
#: pg_ctl.c:1879
#, c-format
@@ -566,12 +576,14 @@ msgstr " -D, --pgdata=DATAKAT plats för databasens lagringsarea\n"
#: pg_ctl.c:1880
#, c-format
msgid " -s, --silent only print errors, no informational messages\n"
-msgstr " -s, --silent skriv bara ut fel, inga informationsmeddelanden\n"
+msgstr ""
+" -s, --silent skriv bara ut fel, inga informationsmeddelanden\n"
#: pg_ctl.c:1881
#, c-format
msgid " -t, --timeout=SECS seconds to wait when using -w option\n"
-msgstr " -t, --timeout=SEK antal sekunder att vänta när växeln -w används\n"
+msgstr ""
+" -t, --timeout=SEK antal sekunder att vänta när växeln -w används\n"
#: pg_ctl.c:1882
#, c-format
@@ -599,13 +611,14 @@ msgid ""
"(The default is to wait for shutdown, but not for start or restart.)\n"
"\n"
msgstr ""
-"(Standard är att vänta på nedstängning men inte vänta på start eller omstart.)\n"
+"Standard är att vänta på nedstängning, men inte att vänta på start\n"
+"eller omstart.\n"
"\n"
#: pg_ctl.c:1887
#, c-format
msgid "If the -D option is omitted, the environment variable PGDATA is used.\n"
-msgstr "Om flaggan -D inte har angivits så används omgivningsvariabeln PGDATA.\n"
+msgstr "Om växeln -D inte har angivits så inkallas omgivningsvariabeln PGDATA.\n"
#: pg_ctl.c:1889
#, c-format
@@ -614,7 +627,7 @@ msgid ""
"Options for start or restart:\n"
msgstr ""
"\n"
-"Flaggor för start eller omstart:\n"
+"Växlar för start eller omstart:\n"
#: pg_ctl.c:1891
#, c-format
@@ -624,12 +637,13 @@ msgstr " -c, --core-files tillåt postgres att skapa core-filer\n"
#: pg_ctl.c:1893
#, c-format
msgid " -c, --core-files not applicable on this platform\n"
-msgstr " -c, --core-files inte giltigt för denna plattform\n"
+msgstr " -c, --core-files inte giltig för denna plattform\n"
#: pg_ctl.c:1895
#, c-format
msgid " -l, --log=FILENAME write (or append) server log to FILENAME\n"
-msgstr " -l, --log=FILNAMN skriv (eller tillfoga) server-loggen till FILNAMN\n"
+msgstr ""
+" -l, --log=FILNAMN skriv, eller tillfoga, server-loggen till FILNAMN\n"
#: pg_ctl.c:1896
#, c-format
@@ -637,8 +651,10 @@ msgid ""
" -o OPTIONS command line options to pass to postgres\n"
" (PostgreSQL server executable) or initdb\n"
msgstr ""
-" -o FLAGGOR kommandoradsflaggor som skickas vidare till postgres\n"
-" (PostgreSQL-serverns körbara fil) eller till initdb\n"
+" -o FLAGGOR kommandoradsflaggor som skickas vidare till "
+"postgres\n"
+" (PostgreSQL-serverns körbara fil) eller till "
+"initdb\n"
#: pg_ctl.c:1898
#, c-format
@@ -654,12 +670,14 @@ msgid ""
"Options for stop or restart:\n"
msgstr ""
"\n"
-"Flaggor för stopp eller omstart:\n"
+"Växlar för nedtagning eller omstart:\n"
#: pg_ctl.c:1900
#, c-format
msgid " -m, --mode=MODE MODE can be \"smart\", \"fast\", or \"immediate\"\n"
-msgstr " -m, --mode=METOD METOD kan vara \"smart\", \"fast\" eller \"immediate\"\n"
+msgstr ""
+" -m, --mode=METOD METOD kan vara \"smart\", \"fast\" eller \"immediate"
+"\"\n"
#: pg_ctl.c:1902
#, c-format
@@ -673,17 +691,19 @@ msgstr ""
#: pg_ctl.c:1903
#, c-format
msgid " smart quit after all clients have disconnected\n"
-msgstr " smart stäng när alla klienter har kopplat ner\n"
+msgstr " smart stäng när alla klienter har avslutat\n"
#: pg_ctl.c:1904
#, c-format
msgid " fast quit directly, with proper shutdown\n"
-msgstr " fast stäng direkt, en kontrollerad nedstängning\n"
+msgstr " fast stäng omedelbart, med en kontrollerad nedstängning\n"
#: pg_ctl.c:1905
#, c-format
msgid " immediate quit without complete shutdown; will lead to recovery on restart\n"
-msgstr " immediate stäng direkt. Vid omstart kommer återställning att utföras\n"
+msgstr ""
+" immediate stäng omedelbart. Vid nystart kommer en återställning "
+"att utföras.\n"
#: pg_ctl.c:1907
#, c-format
@@ -692,7 +712,7 @@ msgid ""
"Allowed signal names for kill:\n"
msgstr ""
"\n"
-"Tillåtna signalnamn för \"kill\":\n"
+"Tillåtna signalnamn vid kommando \"kill\":\n"
#: pg_ctl.c:1911
#, c-format
@@ -701,7 +721,7 @@ msgid ""
"Options for register and unregister:\n"
msgstr ""
"\n"
-"Flaggor för registrering och avregistrering:\n"
+"Växlar för registrering och avregistrering:\n"
#: pg_ctl.c:1912
#, c-format
@@ -711,17 +731,22 @@ msgstr " -N TJÄNSTENAMN tjänstenamn att registrera PostgreSQL-servern med\n"
#: pg_ctl.c:1913
#, c-format
msgid " -P PASSWORD password of account to register PostgreSQL server\n"
-msgstr " -P LÖSENORD lösenord för konto vid registrering av PostgreSQL-servern\n"
+msgstr ""
+" -P LÖSENORD lösenord för konto vid registrering av PostgreSQL-servern\n"
#: pg_ctl.c:1914
#, c-format
msgid " -U USERNAME user name of account to register PostgreSQL server\n"
-msgstr " -U NAMN användarnamn för konto vid registrering av PostgreSQL-servern\n"
+msgstr ""
+" -U NAMN användarnamn för konto vid registrering av PostgreSQL-"
+"servern\n"
#: pg_ctl.c:1915
#, c-format
msgid " -S START-TYPE service start type to register PostgreSQL server\n"
-msgstr " -S STARTSÄTT sätt för tjänstestart att registrera för PostgreSQL-servern\n"
+msgstr ""
+" -S STARTSÄTT sätt att registrera PostgreSQL-servern vid "
+"tjänstestart\n"
#: pg_ctl.c:1917
#, c-format
@@ -785,36 +810,30 @@ msgstr ""
#: pg_ctl.c:2190
#, c-format
msgid "%s: -S option not supported on this platform\n"
-msgstr "%s: växeln -S stöds inte på denna plattform\n"
+msgstr "%s: Växeln -S stöds inte med denna plattform.\n"
#: pg_ctl.c:2228
#, c-format
msgid "%s: too many command-line arguments (first is \"%s\")\n"
-msgstr "%s: för många kommandoradsargument (det första är \"%s\")\n"
+msgstr "%s: Alltför många kommandoradsargument. Det först överflödiga är \"%s\".\n"
#: pg_ctl.c:2252
#, c-format
msgid "%s: missing arguments for kill mode\n"
-msgstr "%s: saknar argument till \"kill\"-läget\n"
+msgstr "%s: Saknar argument för \"kill\"-kommando.\n"
#: pg_ctl.c:2270
#, c-format
msgid "%s: unrecognized operation mode \"%s\"\n"
-msgstr "%s: ogiltigt operationsläge \"%s\"\n"
+msgstr "%s: Ogiltigt kommandonamn \"%s\".\n"
#: pg_ctl.c:2280
#, c-format
msgid "%s: no operation specified\n"
-msgstr "%s: ingen operation angiven\n"
+msgstr "%s: Intet kommando angivet!\n"
#: pg_ctl.c:2301
#, c-format
msgid "%s: no database directory specified and environment variable PGDATA unset\n"
-msgstr "%s: ingen databaskatalog angiven och omgivningsvariabeln PGDATA är inte satt\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Options for stop, restart, or promote:\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Flaggor för stopp, omstart eller uppgradering:\n"
+msgstr ""
+"%s: Ingen databaskatalog angiven och omgivningsvariabeln PGDATA är tom.\n"
diff --git a/src/bin/pg_ctl/po/zh_CN.po b/src/bin/pg_ctl/po/zh_CN.po
index 1c4a811790e..61e87071ffb 100644
--- a/src/bin/pg_ctl/po/zh_CN.po
+++ b/src/bin/pg_ctl/po/zh_CN.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: pg_ctl (PostgreSQL 9.0)\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2013-09-02 00:26+0000\n"
-"PO-Revision-Date: 2013-09-02 14:39+0800\n"
+"POT-Creation-Date: 2014-11-22 21:12+0000\n"
+"PO-Revision-Date: 2014-12-06 13:11+0800\n"
"Last-Translator: Xiong He <iihero@qq.com>\n"
"Language-Team: Chinese (Simplified)\n"
"Language: zh_CN\n"
@@ -16,112 +16,130 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.5.4\n"
-#: ../../common/fe_memutils.c:33 ../../common/fe_memutils.c:60
-#: ../../common/fe_memutils.c:83
-#, c-format
-msgid "out of memory\n"
-msgstr "内存溢出\n"
-
-# common.c:78
-#: ../../common/fe_memutils.c:77
-#, c-format
-#| msgid "pg_strdup: cannot duplicate null pointer (internal error)\n"
-msgid "cannot duplicate null pointer (internal error)\n"
-msgstr "无法复制空指针 (内部错误)\n"
-
-#: ../../port/exec.c:127 ../../port/exec.c:241 ../../port/exec.c:284
+#: ../../common/exec.c:127 ../../common/exec.c:241 ../../common/exec.c:284
#, c-format
msgid "could not identify current directory: %s"
msgstr "无法确认当前目录: %s"
# command.c:122
-#: ../../port/exec.c:146
+#: ../../common/exec.c:146
#, c-format
msgid "invalid binary \"%s\""
msgstr "无效的二进制码 \"%s\""
# command.c:1103
-#: ../../port/exec.c:195
+#: ../../common/exec.c:195
#, c-format
msgid "could not read binary \"%s\""
msgstr "无法读取二进制码 \"%s\""
-#: ../../port/exec.c:202
+#: ../../common/exec.c:202
#, c-format
msgid "could not find a \"%s\" to execute"
msgstr "未能找到一个 \"%s\" 来执行"
-#: ../../port/exec.c:257 ../../port/exec.c:293
+#: ../../common/exec.c:257 ../../common/exec.c:293
#, c-format
-#| msgid "could not change directory to \"%s\": %m"
msgid "could not change directory to \"%s\": %s"
msgstr "无法跳转到目录 \"%s\" 中: %s"
-#: ../../port/exec.c:272
+#: ../../common/exec.c:272
#, c-format
msgid "could not read symbolic link \"%s\""
msgstr "无法读取符号链结 \"%s\""
-#: ../../port/exec.c:523
+#: ../../common/exec.c:523
#, c-format
-#| msgid "query failed: %s"
msgid "pclose failed: %s"
msgstr "pclose调用失败: %s"
-#: ../../port/wait_error.c:47
+#: ../../common/fe_memutils.c:33 ../../common/fe_memutils.c:60
+#: ../../common/fe_memutils.c:83 ../../port/path.c:598 ../../port/path.c:636
+#: ../../port/path.c:653
+#, c-format
+msgid "out of memory\n"
+msgstr "内存溢出\n"
+
+# common.c:78
+#: ../../common/fe_memutils.c:77
+#, c-format
+msgid "cannot duplicate null pointer (internal error)\n"
+msgstr "无法复制空指针 (内部错误)\n"
+
+#: ../../common/wait_error.c:47
#, c-format
-#| msgid "could not execute plan"
msgid "command not executable"
msgstr "无法执行命令"
-#: ../../port/wait_error.c:51
+#: ../../common/wait_error.c:51
#, c-format
-#| msgid "case not found"
msgid "command not found"
msgstr "没有找到命令"
-#: ../../port/wait_error.c:56
+#: ../../common/wait_error.c:56
#, c-format
msgid "child process exited with exit code %d"
msgstr "子进程已退出, 退出码为 %d"
-#: ../../port/wait_error.c:63
+#: ../../common/wait_error.c:63
#, c-format
msgid "child process was terminated by exception 0x%X"
msgstr "子进程被例外(exception) 0x%X 终止"
-#: ../../port/wait_error.c:73
+#: ../../common/wait_error.c:73
#, c-format
msgid "child process was terminated by signal %s"
msgstr "子进程被信号 %s 终止"
-#: ../../port/wait_error.c:77
+#: ../../common/wait_error.c:77
#, c-format
msgid "child process was terminated by signal %d"
msgstr "子进程被信号 %d 终止"
-#: ../../port/wait_error.c:82
+#: ../../common/wait_error.c:82
#, c-format
msgid "child process exited with unrecognized status %d"
msgstr "子进程已退出, 未知状态 %d"
-#: pg_ctl.c:253
+#: ../../port/path.c:620
+#, c-format
+#| msgid "could not identify current directory: %s"
+msgid "could not get current working directory: %s\n"
+msgstr "无法得到当前工作目录: %s\n"
+
+#: pg_ctl.c:259
+#, c-format
+#| msgid "directory \"%s\" does not exist"
+msgid "%s: directory \"%s\" does not exist\n"
+msgstr "%s: 目录 \"%s\" 不存在\n"
+
+#: pg_ctl.c:262
+#, c-format
+msgid "%s: could not access directory \"%s\": %s\n"
+msgstr "%s: 无法访问目录 \"%s\": %s\n"
+
+#: pg_ctl.c:275
+#, c-format
+#| msgid "specified data directory \"%s\" is not a directory"
+msgid "%s: directory \"%s\" is not a database cluster directory\n"
+msgstr "%s: 目录 \"%s\"不是一个数据库集群目录\n"
+
+#: pg_ctl.c:288
#, c-format
msgid "%s: could not open PID file \"%s\": %s\n"
msgstr "%s: 无法打开 PID 文件 \"%s\": %s\n"
-#: pg_ctl.c:262
+#: pg_ctl.c:297
#, c-format
-#| msgid "%s: PID file \"%s\" does not exist\n"
msgid "%s: the PID file \"%s\" is empty\n"
msgstr "%s: PID 文件 \"%s\" 为空\n"
-#: pg_ctl.c:265
+#: pg_ctl.c:300
#, c-format
msgid "%s: invalid data in PID file \"%s\"\n"
msgstr "%s: PID文件 \"%s\" 中存在无效数据\n"
-#: pg_ctl.c:477
+#: pg_ctl.c:531
#, c-format
msgid ""
"\n"
@@ -130,7 +148,7 @@ msgstr ""
"\n"
"%s: -w 选项不能用于9.1以前版本的服务器启动\n"
-#: pg_ctl.c:547
+#: pg_ctl.c:601
#, c-format
msgid ""
"\n"
@@ -139,7 +157,7 @@ msgstr ""
"\n"
"%s: -w 选项不能用于相对套接字目录\n"
-#: pg_ctl.c:595
+#: pg_ctl.c:656
#, c-format
msgid ""
"\n"
@@ -148,22 +166,22 @@ msgstr ""
"\n"
"%s: 数据目录里可能正在运行着一个已经存在的postmaster进程\n"
-#: pg_ctl.c:645
+#: pg_ctl.c:706
#, c-format
msgid "%s: cannot set core file size limit; disallowed by hard limit\n"
msgstr "%s: 不能设置核心文件大小的限制;磁盘限额不允许\n"
-#: pg_ctl.c:670
+#: pg_ctl.c:731
#, c-format
msgid "%s: could not read file \"%s\"\n"
msgstr "%s: 无法读取文件 \"%s\"\n"
-#: pg_ctl.c:675
+#: pg_ctl.c:736
#, c-format
msgid "%s: option file \"%s\" must have exactly one line\n"
msgstr "%s: 选项文件 \"%s\" 只能有一行\n"
-#: pg_ctl.c:723
+#: pg_ctl.c:787
#, c-format
msgid ""
"The program \"%s\" is needed by %s but was not found in the\n"
@@ -174,7 +192,7 @@ msgstr ""
"\n"
"请检查您的安装.\n"
-#: pg_ctl.c:729
+#: pg_ctl.c:793
#, c-format
msgid ""
"The program \"%s\" was found by \"%s\"\n"
@@ -185,42 +203,42 @@ msgstr ""
"\n"
"检查您的安装.\n"
-#: pg_ctl.c:762
+#: pg_ctl.c:826
#, c-format
msgid "%s: database system initialization failed\n"
msgstr "%s: 数据库系统初始化失败\n"
-#: pg_ctl.c:777
+#: pg_ctl.c:841
#, c-format
msgid "%s: another server might be running; trying to start server anyway\n"
msgstr "%s: 其他服务器进程可能正在运行; 尝试启动服务器进程\n"
-#: pg_ctl.c:814
+#: pg_ctl.c:878
#, c-format
msgid "%s: could not start server: exit code was %d\n"
msgstr "%s: 无法启动服务器进程: 退出码为 %d\n"
-#: pg_ctl.c:821
+#: pg_ctl.c:885
msgid "waiting for server to start..."
msgstr "等待服务器进程启动 ..."
-#: pg_ctl.c:826 pg_ctl.c:927 pg_ctl.c:1018
+#: pg_ctl.c:890 pg_ctl.c:991 pg_ctl.c:1082
msgid " done\n"
msgstr " 完成\n"
-#: pg_ctl.c:827
+#: pg_ctl.c:891
msgid "server started\n"
msgstr "服务器进程已经启动\n"
-#: pg_ctl.c:830 pg_ctl.c:834
+#: pg_ctl.c:894 pg_ctl.c:898
msgid " stopped waiting\n"
msgstr " 已停止等待\n"
-#: pg_ctl.c:831
+#: pg_ctl.c:895
msgid "server is still starting up\n"
msgstr "服务器仍在启动过程中\n"
-#: pg_ctl.c:835
+#: pg_ctl.c:899
#, c-format
msgid ""
"%s: could not start server\n"
@@ -229,43 +247,43 @@ msgstr ""
"%s: 无法启动服务器进程\n"
"检查日志输出.\n"
-#: pg_ctl.c:841 pg_ctl.c:919 pg_ctl.c:1009
+#: pg_ctl.c:905 pg_ctl.c:983 pg_ctl.c:1073
msgid " failed\n"
msgstr " 失败\n"
-#: pg_ctl.c:842
+#: pg_ctl.c:906
#, c-format
msgid "%s: could not wait for server because of misconfiguration\n"
msgstr "%s: 因为配制错误,而无法等待服务器\n"
-#: pg_ctl.c:848
+#: pg_ctl.c:912
msgid "server starting\n"
msgstr "正在启动服务器进程\n"
-#: pg_ctl.c:863 pg_ctl.c:949 pg_ctl.c:1039 pg_ctl.c:1079
+#: pg_ctl.c:927 pg_ctl.c:1013 pg_ctl.c:1103 pg_ctl.c:1143
#, c-format
msgid "%s: PID file \"%s\" does not exist\n"
msgstr "%s: PID 文件 \"%s\" 不存在\n"
-#: pg_ctl.c:864 pg_ctl.c:951 pg_ctl.c:1040 pg_ctl.c:1080
+#: pg_ctl.c:928 pg_ctl.c:1015 pg_ctl.c:1104 pg_ctl.c:1144
msgid "Is server running?\n"
msgstr "服务器进程是否正在运行?\n"
-#: pg_ctl.c:870
+#: pg_ctl.c:934
#, c-format
msgid "%s: cannot stop server; single-user server is running (PID: %ld)\n"
msgstr "%s: 无法停止服务器进程; 正在运行 单用户模式服务器进程(PID: %ld)\n"
-#: pg_ctl.c:878 pg_ctl.c:973
+#: pg_ctl.c:942 pg_ctl.c:1037
#, c-format
msgid "%s: could not send stop signal (PID: %ld): %s\n"
msgstr "%s: 无法发送停止信号 (PID: %ld): %s\n"
-#: pg_ctl.c:885
+#: pg_ctl.c:949
msgid "server shutting down\n"
msgstr "正在关闭服务器进程\n"
-#: pg_ctl.c:900 pg_ctl.c:988
+#: pg_ctl.c:964 pg_ctl.c:1052
msgid ""
"WARNING: online backup mode is active\n"
"Shutdown will not complete until pg_stop_backup() is called.\n"
@@ -274,16 +292,16 @@ msgstr ""
"警告: 在线备份模式处于激活状态\n"
"关闭命令将不会完成,直到调用了pg_stop_backup().\n"
-#: pg_ctl.c:904 pg_ctl.c:992
+#: pg_ctl.c:968 pg_ctl.c:1056
msgid "waiting for server to shut down..."
msgstr "等待服务器进程关闭 ..."
-#: pg_ctl.c:921 pg_ctl.c:1011
+#: pg_ctl.c:985 pg_ctl.c:1075
#, c-format
msgid "%s: server does not shut down\n"
msgstr "%s: server进程没有关闭\n"
-#: pg_ctl.c:923 pg_ctl.c:1013
+#: pg_ctl.c:987 pg_ctl.c:1077
msgid ""
"HINT: The \"-m fast\" option immediately disconnects sessions rather than\n"
"waiting for session-initiated disconnection.\n"
@@ -291,186 +309,186 @@ msgstr ""
"提示: \"-m fast\" 选项可以立即断开会话, 而不用\n"
"等待会话发起的断连.\n"
-#: pg_ctl.c:929 pg_ctl.c:1019
+#: pg_ctl.c:993 pg_ctl.c:1083
msgid "server stopped\n"
msgstr "服务器进程已经关闭\n"
-#: pg_ctl.c:952 pg_ctl.c:1025
+#: pg_ctl.c:1016 pg_ctl.c:1089
msgid "starting server anyway\n"
msgstr "正在启动服务器进程\n"
-#: pg_ctl.c:961
+#: pg_ctl.c:1025
#, c-format
msgid "%s: cannot restart server; single-user server is running (PID: %ld)\n"
msgstr "%s: 无法重启服务器进程; 单用户模式服务器进程正在运行 (PID: %ld)\n"
-#: pg_ctl.c:964 pg_ctl.c:1049
+#: pg_ctl.c:1028 pg_ctl.c:1113
msgid "Please terminate the single-user server and try again.\n"
msgstr "请终止单用户模式服务器进程,然后再重试.\n"
-#: pg_ctl.c:1023
+#: pg_ctl.c:1087
#, c-format
msgid "%s: old server process (PID: %ld) seems to be gone\n"
msgstr "%s: 原有的进程(PID: %ld)可能已经不存在了\n"
-#: pg_ctl.c:1046
+#: pg_ctl.c:1110
#, c-format
msgid "%s: cannot reload server; single-user server is running (PID: %ld)\n"
msgstr ""
"%s: 无法重新加载服务器进程;正在运行单用户模式的服务器进程 (PID: %ld)\n"
-#: pg_ctl.c:1055
+#: pg_ctl.c:1119
#, c-format
msgid "%s: could not send reload signal (PID: %ld): %s\n"
msgstr "%s: 无法发送重载信号 (PID: %ld): %s\n"
-#: pg_ctl.c:1060
+#: pg_ctl.c:1124
msgid "server signaled\n"
msgstr "服务器进程发出信号\n"
-#: pg_ctl.c:1086
+#: pg_ctl.c:1150
#, c-format
msgid "%s: cannot promote server; single-user server is running (PID: %ld)\n"
msgstr ""
"%s: 无法重新加载服务器进程;正在运行单用户模式的服务器进程 (PID: %ld)\n"
-#: pg_ctl.c:1095
+#: pg_ctl.c:1159
#, c-format
msgid "%s: cannot promote server; server is not in standby mode\n"
msgstr "%s: 无法重新加载服务器进程;服务器没有运行在standby模式下\n"
-#: pg_ctl.c:1110
+#: pg_ctl.c:1174
#, c-format
msgid "%s: could not create promote signal file \"%s\": %s\n"
msgstr "%s: 无法创建重新加载信号文件 \"%s\": %s\n"
-#: pg_ctl.c:1116
+#: pg_ctl.c:1180
#, c-format
msgid "%s: could not write promote signal file \"%s\": %s\n"
msgstr "%s: 无法写入重新加载文件 \"%s\": %s\n"
-#: pg_ctl.c:1124
+#: pg_ctl.c:1188
#, c-format
msgid "%s: could not send promote signal (PID: %ld): %s\n"
msgstr "%s: 无法发送重载信号(PID: %ld): %s\n"
-#: pg_ctl.c:1127
+#: pg_ctl.c:1191
#, c-format
msgid "%s: could not remove promote signal file \"%s\": %s\n"
msgstr "%s: 无法移动重新加载信号文件 \"%s\": %s\n"
-#: pg_ctl.c:1132
+#: pg_ctl.c:1196
msgid "server promoting\n"
msgstr "服务器重新加载中\n"
-#: pg_ctl.c:1179
+#: pg_ctl.c:1243
#, c-format
msgid "%s: single-user server is running (PID: %ld)\n"
msgstr "%s: 正在运行单用户模式服务器进程 (PID: %ld)\n"
-#: pg_ctl.c:1191
+#: pg_ctl.c:1256
#, c-format
msgid "%s: server is running (PID: %ld)\n"
msgstr "%s: 正在运行服务器进程(PID: %ld)\n"
-#: pg_ctl.c:1202
+#: pg_ctl.c:1272
#, c-format
msgid "%s: no server running\n"
msgstr "%s:没有服务器进程正在运行\n"
-#: pg_ctl.c:1220
+#: pg_ctl.c:1290
#, c-format
msgid "%s: could not send signal %d (PID: %ld): %s\n"
msgstr "%s: 无法发送信号 %d (PID: %ld): %s\n"
-#: pg_ctl.c:1254
+#: pg_ctl.c:1347
#, c-format
msgid "%s: could not find own program executable\n"
msgstr "%s: 无法找到执行文件\n"
-#: pg_ctl.c:1264
+#: pg_ctl.c:1357
#, c-format
msgid "%s: could not find postgres program executable\n"
msgstr "%s: 无法找到postgres程序的执行文件\n"
-#: pg_ctl.c:1329 pg_ctl.c:1361
+#: pg_ctl.c:1437 pg_ctl.c:1469
#, c-format
msgid "%s: could not open service manager\n"
msgstr "%s: 无法打开服务管理器\n"
-#: pg_ctl.c:1335
+#: pg_ctl.c:1443
#, c-format
msgid "%s: service \"%s\" already registered\n"
msgstr "%s: 服务 \"%s\" 已经注册了\n"
-#: pg_ctl.c:1346
+#: pg_ctl.c:1454
#, c-format
msgid "%s: could not register service \"%s\": error code %lu\n"
msgstr "%s: 无法注册服务 \"%s\": 错误码 %lu\n"
-#: pg_ctl.c:1367
+#: pg_ctl.c:1475
#, c-format
msgid "%s: service \"%s\" not registered\n"
msgstr "%s: 服务 \"%s\" 没有注册\n"
-#: pg_ctl.c:1374
+#: pg_ctl.c:1482
#, c-format
msgid "%s: could not open service \"%s\": error code %lu\n"
msgstr "%s: 无法打开服务 \"%s\": 错误码 %lu\n"
-#: pg_ctl.c:1381
+#: pg_ctl.c:1489
#, c-format
msgid "%s: could not unregister service \"%s\": error code %lu\n"
msgstr "%s: 无法注销服务 \"%s\": 错误码 %lu\n"
-#: pg_ctl.c:1466
+#: pg_ctl.c:1574
msgid "Waiting for server startup...\n"
msgstr "等待服务器进程启动 ...\n"
-#: pg_ctl.c:1469
+#: pg_ctl.c:1577
msgid "Timed out waiting for server startup\n"
msgstr "在等待服务器启动时超时\n"
-#: pg_ctl.c:1473
+#: pg_ctl.c:1581
msgid "Server started and accepting connections\n"
msgstr "服务器进程已启动并且接受连接\n"
-#: pg_ctl.c:1517
+#: pg_ctl.c:1625
#, c-format
msgid "%s: could not start service \"%s\": error code %lu\n"
msgstr "%s: 无法启动服务 \"%s\": 错误码 %lu\n"
-#: pg_ctl.c:1589
+#: pg_ctl.c:1697
#, c-format
msgid "%s: WARNING: cannot create restricted tokens on this platform\n"
msgstr "%s: 警告: 该平台上无法创建受限令牌\n"
-#: pg_ctl.c:1598
+#: pg_ctl.c:1706
#, c-format
msgid "%s: could not open process token: error code %lu\n"
msgstr "%s: 无法打开进程令牌 (token): 错误码 %lu\n"
-#: pg_ctl.c:1611
+#: pg_ctl.c:1719
#, c-format
msgid "%s: could not allocate SIDs: error code %lu\n"
msgstr "%s: 无法分配SID: 错误码 %lu\n"
-#: pg_ctl.c:1630
+#: pg_ctl.c:1738
#, c-format
msgid "%s: could not create restricted token: error code %lu\n"
msgstr "%s: 无法创建继承套接字: 错误码为 %lu\n"
-#: pg_ctl.c:1668
+#: pg_ctl.c:1771
#, c-format
msgid "%s: WARNING: could not locate all job object functions in system API\n"
msgstr "%s: 警告: 系统API中无法定位所有工作对象函数\n"
-#: pg_ctl.c:1754
+#: pg_ctl.c:1853
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "试用 \"%s --help\" 获取更多的信息.\n"
-#: pg_ctl.c:1762
+#: pg_ctl.c:1861
#, c-format
msgid ""
"%s is a utility to initialize, start, stop, or control a PostgreSQL server.\n"
@@ -479,17 +497,17 @@ msgstr ""
"%s 是一个用于初始化、启动、停止或控制PostgreSQL服务器的工具.\n"
"\n"
-#: pg_ctl.c:1763
+#: pg_ctl.c:1862
#, c-format
msgid "Usage:\n"
msgstr "使用方法:\n"
-#: pg_ctl.c:1764
+#: pg_ctl.c:1863
#, c-format
msgid " %s init[db] [-D DATADIR] [-s] [-o \"OPTIONS\"]\n"
msgstr " %s init[db] [-D 数据目录] [-s] [-o \"选项\"]\n"
-#: pg_ctl.c:1765
+#: pg_ctl.c:1864
#, c-format
msgid ""
" %s start [-w] [-t SECS] [-D DATADIR] [-s] [-l FILENAME] [-o \"OPTIONS"
@@ -497,12 +515,12 @@ msgid ""
msgstr ""
" %s start [-w] [-t 秒数] [-D 数据目录] [-s] [-l 文件名] [-o \"选项\"]\n"
-#: pg_ctl.c:1766
+#: pg_ctl.c:1865
#, c-format
msgid " %s stop [-W] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
-msgstr " %s stop [-w] [-t 秒数] [-D 数据目录] [-s] [-m 关闭模式]\n"
+msgstr " %s stop [-W] [-t 秒数] [-D 数据目录] [-s] [-m 关闭模式]\n"
-#: pg_ctl.c:1767
+#: pg_ctl.c:1866
#, c-format
msgid ""
" %s restart [-w] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
@@ -511,27 +529,27 @@ msgstr ""
" %s restart [-w] [-t 秒数] [-D 数据目录] [-s] [-m 关闭模式]\n"
" [-o \"选项\"]\n"
-#: pg_ctl.c:1769
+#: pg_ctl.c:1868
#, c-format
msgid " %s reload [-D DATADIR] [-s]\n"
msgstr " %s reload [-D 数据目录] [-s]\n"
-#: pg_ctl.c:1770
+#: pg_ctl.c:1869
#, c-format
msgid " %s status [-D DATADIR]\n"
msgstr " %s status [-D 数据目录]\n"
-#: pg_ctl.c:1771
+#: pg_ctl.c:1870
#, c-format
msgid " %s promote [-D DATADIR] [-s]\n"
msgstr " %s promote [-D 数据目录] [-s]\n"
-#: pg_ctl.c:1772
+#: pg_ctl.c:1871
#, c-format
msgid " %s kill SIGNALNAME PID\n"
msgstr " %s kill 信号名称 进程号\n"
-#: pg_ctl.c:1774
+#: pg_ctl.c:1873
#, c-format
msgid ""
" %s register [-N SERVICENAME] [-U USERNAME] [-P PASSWORD] [-D DATADIR]\n"
@@ -540,12 +558,12 @@ msgstr ""
" %s register [-N 服务名称] [-U 用户名] [-P 口令] [-D 数据目录]\n"
" [-S 启动类型] [-w] [-t 秒数] [-o \"选项\"]\n"
-#: pg_ctl.c:1776
+#: pg_ctl.c:1875
#, c-format
msgid " %s unregister [-N SERVICENAME]\n"
msgstr " %s unregister [-N 服务名称]\n"
-#: pg_ctl.c:1779
+#: pg_ctl.c:1878
#, c-format
msgid ""
"\n"
@@ -554,42 +572,42 @@ msgstr ""
"\n"
"普通选项:\n"
-#: pg_ctl.c:1780
+#: pg_ctl.c:1879
#, c-format
msgid " -D, --pgdata=DATADIR location of the database storage area\n"
msgstr " -D, --pgdata=数据目录 数据库存储区域的位置\n"
-#: pg_ctl.c:1781
+#: pg_ctl.c:1880
#, c-format
msgid " -s, --silent only print errors, no informational messages\n"
msgstr " -s, --silent 只打印错误信息, 没有其他信息\n"
-#: pg_ctl.c:1782
+#: pg_ctl.c:1881
#, c-format
msgid " -t, --timeout=SECS seconds to wait when using -w option\n"
msgstr " -t, --timeout=SECS 当使用-w 选项时需要等待的秒数\n"
-#: pg_ctl.c:1783
+#: pg_ctl.c:1882
#, c-format
msgid " -V, --version output version information, then exit\n"
msgstr " -V, --version 输出版本信息, 然后退出\n"
-#: pg_ctl.c:1784
+#: pg_ctl.c:1883
#, c-format
msgid " -w wait until operation completes\n"
msgstr " -w 等待直到操作完成\n"
-#: pg_ctl.c:1785
+#: pg_ctl.c:1884
#, c-format
msgid " -W do not wait until operation completes\n"
msgstr " -W 不用等待操作完成\n"
-#: pg_ctl.c:1786
+#: pg_ctl.c:1885
#, c-format
msgid " -?, --help show this help, then exit\n"
msgstr " -?, --help 显示此帮助, 然后退出\n"
-#: pg_ctl.c:1787
+#: pg_ctl.c:1886
#, c-format
msgid ""
"(The default is to wait for shutdown, but not for start or restart.)\n"
@@ -598,12 +616,12 @@ msgstr ""
"(默认为关闭等待, 但不是启动或重启.)\n"
"\n"
-#: pg_ctl.c:1788
+#: pg_ctl.c:1887
#, c-format
msgid "If the -D option is omitted, the environment variable PGDATA is used.\n"
msgstr "如果省略了 -D 选项, 将使用 PGDATA 环境变量.\n"
-#: pg_ctl.c:1790
+#: pg_ctl.c:1889
#, c-format
msgid ""
"\n"
@@ -612,22 +630,22 @@ msgstr ""
"\n"
"启动或重启的选项:\n"
-#: pg_ctl.c:1792
+#: pg_ctl.c:1891
#, c-format
msgid " -c, --core-files allow postgres to produce core files\n"
msgstr " -c, --core-files 允许postgres进程产生核心文件\n"
-#: pg_ctl.c:1794
+#: pg_ctl.c:1893
#, c-format
msgid " -c, --core-files not applicable on this platform\n"
msgstr " -c, --core-files 在这种平台上不可用\n"
-#: pg_ctl.c:1796
+#: pg_ctl.c:1895
#, c-format
msgid " -l, --log=FILENAME write (or append) server log to FILENAME\n"
msgstr " -l, --log=FILENAME 写入 (或追加) 服务器日志到文件FILENAME\n"
-#: pg_ctl.c:1797
+#: pg_ctl.c:1896
#, c-format
msgid ""
" -o OPTIONS command line options to pass to postgres\n"
@@ -636,31 +654,31 @@ msgstr ""
" -o OPTIONS 传递给postgres的命令行选项\n"
" (PostgreSQL 服务器执行文件)或initdb\n"
-#: pg_ctl.c:1799
+#: pg_ctl.c:1898
#, c-format
msgid " -p PATH-TO-POSTGRES normally not necessary\n"
msgstr " -p PATH-TO-POSTMASTER 正常情况不必要\n"
-#: pg_ctl.c:1800
+#: pg_ctl.c:1899
#, c-format
#| msgid ""
#| "\n"
-#| "Options for stop or restart:\n"
+#| "Options for start or restart:\n"
msgid ""
"\n"
-"Options for stop, restart, or promote:\n"
+"Options for stop or restart:\n"
msgstr ""
"\n"
-"停止、重启或者提升的选项:\n"
+"停止或重启的选项:\n"
-#: pg_ctl.c:1801
+#: pg_ctl.c:1900
#, c-format
msgid ""
" -m, --mode=MODE MODE can be \"smart\", \"fast\", or \"immediate\"\n"
msgstr ""
" -m, --mode=MODE 可以是 \"smart\", \"fast\", 或者 \"immediate\"\n"
-#: pg_ctl.c:1803
+#: pg_ctl.c:1902
#, c-format
msgid ""
"\n"
@@ -669,24 +687,24 @@ msgstr ""
"\n"
"关闭模式有如下几种:\n"
-#: pg_ctl.c:1804
+#: pg_ctl.c:1903
#, c-format
msgid " smart quit after all clients have disconnected\n"
msgstr " smart 所有客户端断开连接后退出\n"
-#: pg_ctl.c:1805
+#: pg_ctl.c:1904
#, c-format
msgid " fast quit directly, with proper shutdown\n"
msgstr " fast 直接退出, 正确的关闭\n"
-#: pg_ctl.c:1806
+#: pg_ctl.c:1905
#, c-format
msgid ""
" immediate quit without complete shutdown; will lead to recovery on "
"restart\n"
msgstr " immediate 不完全的关闭退出; 重启后恢复\n"
-#: pg_ctl.c:1808
+#: pg_ctl.c:1907
#, c-format
msgid ""
"\n"
@@ -695,7 +713,7 @@ msgstr ""
"\n"
"允许关闭的信号名称:\n"
-#: pg_ctl.c:1812
+#: pg_ctl.c:1911
#, c-format
msgid ""
"\n"
@@ -704,28 +722,28 @@ msgstr ""
"\n"
"注册或注销的选项:\n"
-#: pg_ctl.c:1813
+#: pg_ctl.c:1912
#, c-format
msgid ""
" -N SERVICENAME service name with which to register PostgreSQL server\n"
msgstr " -N 服务名称 注册到 PostgreSQL 服务器的服务名称\n"
-#: pg_ctl.c:1814
+#: pg_ctl.c:1913
#, c-format
msgid " -P PASSWORD password of account to register PostgreSQL server\n"
msgstr " -P 口令 注册到 PostgreSQL 服务器帐户的口令\n"
-#: pg_ctl.c:1815
+#: pg_ctl.c:1914
#, c-format
msgid " -U USERNAME user name of account to register PostgreSQL server\n"
msgstr " -U 用户名 注册到 PostgreSQL 服务器帐户的用户名\n"
-#: pg_ctl.c:1816
+#: pg_ctl.c:1915
#, c-format
msgid " -S START-TYPE service start type to register PostgreSQL server\n"
msgstr " -S START-TYPE 注册到PostgreSQL服务器的服务启动类型\n"
-#: pg_ctl.c:1818
+#: pg_ctl.c:1917
#, c-format
msgid ""
"\n"
@@ -734,18 +752,18 @@ msgstr ""
"\n"
"启动类型有:\n"
-#: pg_ctl.c:1819
+#: pg_ctl.c:1918
#, c-format
msgid ""
" auto start service automatically during system startup (default)\n"
msgstr " auto 在系统启动时自动启动服务(默认选项)\n"
-#: pg_ctl.c:1820
+#: pg_ctl.c:1919
#, c-format
msgid " demand start service on demand\n"
msgstr " demand 按需启动服务\n"
-#: pg_ctl.c:1823
+#: pg_ctl.c:1922
#, c-format
msgid ""
"\n"
@@ -754,27 +772,27 @@ msgstr ""
"\n"
"臭虫报告至 <pgsql-bugs@postgresql.org>.\n"
-#: pg_ctl.c:1848
+#: pg_ctl.c:1947
#, c-format
msgid "%s: unrecognized shutdown mode \"%s\"\n"
msgstr "%s: 无效的关闭模式 \"%s\"\n"
-#: pg_ctl.c:1880
+#: pg_ctl.c:1979
#, c-format
msgid "%s: unrecognized signal name \"%s\"\n"
msgstr "%s: 无效信号名称 \"%s\"\n"
-#: pg_ctl.c:1897
+#: pg_ctl.c:1996
#, c-format
msgid "%s: unrecognized start type \"%s\"\n"
msgstr "%s: 无法识别的启动类型 \"%s\"\n"
-#: pg_ctl.c:1950
+#: pg_ctl.c:2051
#, c-format
msgid "%s: could not determine the data directory using command \"%s\"\n"
msgstr "%s: 使用命令 \"%s\"无法确定数据目录\n"
-#: pg_ctl.c:2023
+#: pg_ctl.c:2123
#, c-format
msgid ""
"%s: cannot be run as root\n"
@@ -785,85 +803,85 @@ msgstr ""
"请以服务器进程所属用户 (非特权用户) 登录 (或使用 \"su\")\n"
"\n"
-#: pg_ctl.c:2094
+#: pg_ctl.c:2190
#, c-format
msgid "%s: -S option not supported on this platform\n"
msgstr "%s: -S 选项在该平台上不支持\n"
-#: pg_ctl.c:2136
+#: pg_ctl.c:2228
#, c-format
msgid "%s: too many command-line arguments (first is \"%s\")\n"
msgstr "%s: 命令行参数太多 (第一个是 \"%s\")\n"
-#: pg_ctl.c:2160
+#: pg_ctl.c:2252
#, c-format
msgid "%s: missing arguments for kill mode\n"
msgstr "%s: 缺少 kill 模式参数\n"
-#: pg_ctl.c:2178
+#: pg_ctl.c:2270
#, c-format
msgid "%s: unrecognized operation mode \"%s\"\n"
msgstr "%s: 无效的操作模式 \"%s\"\n"
-#: pg_ctl.c:2188
+#: pg_ctl.c:2280
#, c-format
msgid "%s: no operation specified\n"
msgstr "%s: 没有指定操作\n"
-#: pg_ctl.c:2209
+#: pg_ctl.c:2301
#, c-format
msgid ""
"%s: no database directory specified and environment variable PGDATA unset\n"
msgstr "%s: 没有指定数据目录, 并且没有设置 PGDATA 环境变量\n"
-#~ msgid ""
-#~ "%s is a utility to start, stop, restart, reload configuration files,\n"
-#~ "report the status of a PostgreSQL server, or signal a PostgreSQL "
-#~ "process.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "%s 是一个启动, 停止, 重启, 重载配置文件, 报告 PostgreSQL 服务器状态,\n"
-#~ "或者杀掉 PostgreSQL 进程的工具\n"
-#~ "\n"
+#~ msgid "could not change directory to \"%s\""
+#~ msgstr "无法进入目录 \"%s\""
-#~ msgid " --help show this help, then exit\n"
-#~ msgstr " --help 显示此帮助信息, 然后退出\n"
+#~ msgid "%s: out of memory\n"
+#~ msgstr "%s: 内存溢出\n"
-#~ msgid " --version output version information, then exit\n"
-#~ msgstr " --version 显示版本信息, 然后退出\n"
+#~ msgid "%s: invalid option %s\n"
+#~ msgstr "%s: 无效选项 %s\n"
-#~ msgid "could not start server\n"
-#~ msgstr "无法启动服务器进程\n"
+#~ msgid "%s: a standalone backend \"postgres\" is running (PID: %ld)\n"
+#~ msgstr "%s: 一个独立的后端 \"postgres\" 正在运行 (PID: %ld)\n"
+
+#~ msgid "%s: neither postmaster nor postgres running\n"
+#~ msgstr "%s: postmaster 或者 postgres 没有运行\n"
#~ msgid ""
-#~ "The program \"postmaster\" is needed by %s but was not found in the\n"
-#~ "same directory as \"%s\".\n"
+#~ "The program \"postmaster\" was found by \"%s\"\n"
+#~ "but was not the same version as %s.\n"
#~ "Check your installation.\n"
#~ msgstr ""
-#~ "程序 \"postmaster\" 是 %s 需要的, 但没有在同一个目录 \"%s\" 发现.\n"
+#~ "%s 找到程序 \"postmaster\", 但版本和 \"%s\" 不一致.\n"
#~ "\n"
#~ "检查您的安装.\n"
#~ msgid ""
-#~ "The program \"postmaster\" was found by \"%s\"\n"
-#~ "but was not the same version as %s.\n"
+#~ "The program \"postmaster\" is needed by %s but was not found in the\n"
+#~ "same directory as \"%s\".\n"
#~ "Check your installation.\n"
#~ msgstr ""
-#~ "%s 找到程序 \"postmaster\", 但版本和 \"%s\" 不一致.\n"
+#~ "程序 \"postmaster\" 是 %s 需要的, 但没有在同一个目录 \"%s\" 发现.\n"
#~ "\n"
#~ "检查您的安装.\n"
-#~ msgid "%s: neither postmaster nor postgres running\n"
-#~ msgstr "%s: postmaster 或者 postgres 没有运行\n"
-
-#~ msgid "%s: a standalone backend \"postgres\" is running (PID: %ld)\n"
-#~ msgstr "%s: 一个独立的后端 \"postgres\" 正在运行 (PID: %ld)\n"
+#~ msgid "could not start server\n"
+#~ msgstr "无法启动服务器进程\n"
-#~ msgid "%s: invalid option %s\n"
-#~ msgstr "%s: 无效选项 %s\n"
+#~ msgid " --version output version information, then exit\n"
+#~ msgstr " --version 显示版本信息, 然后退出\n"
-#~ msgid "%s: out of memory\n"
-#~ msgstr "%s: 内存溢出\n"
+#~ msgid " --help show this help, then exit\n"
+#~ msgstr " --help 显示此帮助信息, 然后退出\n"
-#~ msgid "could not change directory to \"%s\""
-#~ msgstr "无法进入目录 \"%s\""
+#~ msgid ""
+#~ "%s is a utility to start, stop, restart, reload configuration files,\n"
+#~ "report the status of a PostgreSQL server, or signal a PostgreSQL "
+#~ "process.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "%s 是一个启动, 停止, 重启, 重载配置文件, 报告 PostgreSQL 服务器状态,\n"
+#~ "或者杀掉 PostgreSQL 进程的工具\n"
+#~ "\n"
diff --git a/src/bin/pg_ctl/po/zh_TW.po b/src/bin/pg_ctl/po/zh_TW.po
deleted file mode 100644
index 9a049950030..00000000000
--- a/src/bin/pg_ctl/po/zh_TW.po
+++ /dev/null
@@ -1,770 +0,0 @@
-# Traditional Chinese message translation file for pg_ctl
-# Copyright (C) 2011 PostgreSQL Global Development Group
-# This file is distributed under the same license as the PostgreSQL package.
-# 2004-12-13 Zhenbang Wei <forth@zbwei.net>
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PostgreSQL 9.1\n"
-"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2011-05-11 20:40+0000\n"
-"PO-Revision-Date: 2013-09-03 23:26-0400\n"
-"Last-Translator: Zhenbang Wei <znbang@gmail.com>\n"
-"Language-Team: EnterpriseDB translation team <dev-escalations@enterprisedb.com>\n"
-"Language: zh_TW\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: pg_ctl.c:234 pg_ctl.c:249 pg_ctl.c:1980
-#, c-format
-msgid "%s: out of memory\n"
-msgstr "%s: 記憶體用盡\n"
-
-#: pg_ctl.c:283
-#, c-format
-msgid "%s: could not open PID file \"%s\": %s\n"
-msgstr "%s: 無法開啟 PID 檔 \"%s\": %s\n"
-
-# access/transam/xlog.c:5414 access/transam/xlog.c:5535
-# access/transam/xlog.c:5541 access/transam/xlog.c:5572
-# access/transam/xlog.c:5578
-#: pg_ctl.c:290
-#, c-format
-msgid "%s: invalid data in PID file \"%s\"\n"
-msgstr "%s: PID 檔 \"%s\" 中有無效資料\n"
-
-#: pg_ctl.c:457
-#, c-format
-msgid "%s: -w option is not supported when starting a pre-9.1 server\n"
-msgstr "%s: 啟動 pre-9.1 伺服器時不支援 -w 選項\n"
-
-#: pg_ctl.c:480
-#, c-format
-msgid "%s: this data directory is running a pre-existing postmaster\n"
-msgstr "%s: 這個資料目錄正在執行以前的 postmaster\n"
-
-#: pg_ctl.c:512
-#, c-format
-msgid "%s: -w option cannot use a relative socket directory specification\n"
-msgstr "%s: -w 選項不能和相對 socket 目錄一起使用\n"
-
-#: pg_ctl.c:576
-#, c-format
-msgid "%s: cannot set core file size limit; disallowed by hard limit\n"
-msgstr "%s: 無法設定核心檔案大小限制,因為固定限制不允許\n"
-
-#: pg_ctl.c:601
-#, c-format
-msgid "%s: could not read file \"%s\"\n"
-msgstr "%s: 無法讀取檔案 \"%s\"\n"
-
-#: pg_ctl.c:606
-#, c-format
-msgid "%s: option file \"%s\" must have exactly one line\n"
-msgstr "%s: 選項檔 \"%s\" 只能有一行內容\n"
-
-#: pg_ctl.c:654
-#, c-format
-msgid ""
-"The program \"%s\" is needed by %s but was not found in the\n"
-"same directory as \"%s\".\n"
-"Check your installation.\n"
-msgstr ""
-"%2$s 需要程式 \"%1$s\",但是在與 \"%3$s\" 相同的目錄中找不到。\n"
-"請檢查你的安裝。\n"
-
-#: pg_ctl.c:660
-#, c-format
-msgid ""
-"The program \"%s\" was found by \"%s\"\n"
-"but was not the same version as %s.\n"
-"Check your installation.\n"
-msgstr ""
-"\"%2$s\"已找到程式 \"%1$s\",但是與 %3$s 版本不符。\n"
-"請檢查你的安裝。\n"
-
-#: pg_ctl.c:693
-#, c-format
-msgid "%s: database system initialization failed\n"
-msgstr "%s: 資料庫初始化失敗\n"
-
-#: pg_ctl.c:709
-#, c-format
-msgid "%s: another server might be running; trying to start server anyway\n"
-msgstr "%s: 可能有另一個伺服器正在執行,請嘗試強制啟動此伺服器\n"
-
-#: pg_ctl.c:746
-#, c-format
-msgid "%s: could not start server: exit code was %d\n"
-msgstr "%s: 無法啟動伺服器: 結束碼是 %d\n"
-
-#: pg_ctl.c:757 pg_ctl.c:780
-#, c-format
-msgid ""
-"%s: could not start server\n"
-"Examine the log output.\n"
-msgstr ""
-"%s: 無法啟動伺服器\n"
-"請檢查紀錄輸出。\n"
-
-#: pg_ctl.c:766
-msgid "waiting for server to start..."
-msgstr "等候伺服器啟動..."
-
-#: pg_ctl.c:771 pg_ctl.c:872 pg_ctl.c:963
-msgid " done\n"
-msgstr " 完成\n"
-
-#: pg_ctl.c:772
-msgid "server started\n"
-msgstr "伺服器已啟動\n"
-
-#: pg_ctl.c:775 pg_ctl.c:779
-msgid " stopped waiting\n"
-msgstr " 停止等待\n"
-
-#: pg_ctl.c:776
-msgid "server is still starting up\n"
-msgstr "伺服器仍在啟動中\n"
-
-#: pg_ctl.c:786 pg_ctl.c:864 pg_ctl.c:954
-msgid " failed\n"
-msgstr " 失敗\n"
-
-#: pg_ctl.c:787
-#, c-format
-msgid "%s: could not wait for server because of misconfiguration\n"
-msgstr "%s: 無法等待伺服器,設定錯誤\n"
-
-#: pg_ctl.c:793
-msgid "server starting\n"
-msgstr "伺服器啟動中\n"
-
-#: pg_ctl.c:808 pg_ctl.c:894 pg_ctl.c:987 pg_ctl.c:1045
-#, c-format
-msgid "%s: PID file \"%s\" does not exist\n"
-msgstr "%s: PID檔 \"%s\" 不存在\n"
-
-#: pg_ctl.c:809 pg_ctl.c:896 pg_ctl.c:988 pg_ctl.c:1046
-msgid "Is server running?\n"
-msgstr "伺服器是否正在執行?\n"
-
-#: pg_ctl.c:815
-#, c-format
-msgid "%s: cannot stop server; single-user server is running (PID: %ld)\n"
-msgstr "%s: 無法停止伺服器,單人模式伺服器正在執行 (PID: %ld)\n"
-
-#: pg_ctl.c:823 pg_ctl.c:918
-#, c-format
-msgid "%s: could not send stop signal (PID: %ld): %s\n"
-msgstr "%s: 無法傳送停止信號(PID: %ld): %s\n"
-
-#: pg_ctl.c:830
-msgid "server shutting down\n"
-msgstr "伺服器正在關閉\n"
-
-#: pg_ctl.c:845 pg_ctl.c:933
-msgid ""
-"WARNING: online backup mode is active\n"
-"Shutdown will not complete until pg_stop_backup() is called.\n"
-"\n"
-msgstr ""
-"警告: 線上備份模式作用中\n"
-"必須呼叫 pg_stop_backup(),關閉作業才能完成。\n"
-"\n"
-
-#: pg_ctl.c:849 pg_ctl.c:937
-msgid "waiting for server to shut down..."
-msgstr "正在等候伺服器關閉..."
-
-#: pg_ctl.c:866 pg_ctl.c:956
-#, c-format
-msgid "%s: server does not shut down\n"
-msgstr "%s: 伺服器未關閉\n"
-
-#: pg_ctl.c:868 pg_ctl.c:958
-msgid ""
-"HINT: The \"-m fast\" option immediately disconnects sessions rather than\n"
-"waiting for session-initiated disconnection.\n"
-msgstr "提示: \"-m fast\" 選項會立即中斷 session,不等 session 發動斷線。\n"
-
-#: pg_ctl.c:874 pg_ctl.c:964
-msgid "server stopped\n"
-msgstr "伺服器已停止\n"
-
-#: pg_ctl.c:897 pg_ctl.c:970
-msgid "starting server anyway\n"
-msgstr "正強制啟動伺服器\n"
-
-#: pg_ctl.c:906
-#, c-format
-msgid "%s: cannot restart server; single-user server is running (PID: %ld)\n"
-msgstr "%s: 無法重新啟動伺服器,單人模式伺服器正在執行 (PID:%ld)\n"
-
-#: pg_ctl.c:909 pg_ctl.c:1055
-msgid "Please terminate the single-user server and try again.\n"
-msgstr "請結束單一使用者伺服器,然後再試一次。\n"
-
-#: pg_ctl.c:968
-#, c-format
-msgid "%s: old server process (PID: %ld) seems to be gone\n"
-msgstr "%s: 舊的伺服器程序 (PID: %ld) 似乎遺漏\n"
-
-#: pg_ctl.c:994
-#, c-format
-msgid "%s: cannot promote server; single-user server is running (PID: %ld)\n"
-msgstr "%s: 無法提升伺服器,單人模式伺服器正在執行 (PID:%ld)\n"
-
-#: pg_ctl.c:1003
-#, c-format
-msgid "%s: cannot promote server; server is not in standby mode\n"
-msgstr "%s: 無法提升伺服器,伺服器不在待命模式\n"
-
-# postmaster/postmaster.c:799
-#: pg_ctl.c:1011
-#, c-format
-msgid "%s: could not create promote signal file \"%s\": %s\n"
-msgstr "%s: 無法建立提升信號檔 \"%s\": %s\n"
-
-# postmaster/postmaster.c:799
-#: pg_ctl.c:1017
-#, c-format
-msgid "%s: could not write promote signal file \"%s\": %s\n"
-msgstr "%s: 無法寫入提升信號檔 \"%s\": %s\n"
-
-#: pg_ctl.c:1025
-#, c-format
-msgid "%s: could not send promote signal (PID: %ld): %s\n"
-msgstr "%s: 無法傳送提升信號(PID: %ld): %s\n"
-
-#: pg_ctl.c:1028
-#, c-format
-msgid "%s: could not remove promote signal file \"%s\": %s\n"
-msgstr "%s: 無法刪除提升信號檔 \"%s\": %s\n"
-
-#: pg_ctl.c:1033
-msgid "server promoting\n"
-msgstr "伺服器提升中\n"
-
-#: pg_ctl.c:1052
-#, c-format
-msgid "%s: cannot reload server; single-user server is running (PID: %ld)\n"
-msgstr "%s: 無法重新載入伺服器,單人模式伺服器正在執行 (PID:%ld)\n"
-
-#: pg_ctl.c:1061
-#, c-format
-msgid "%s: could not send reload signal (PID: %ld): %s\n"
-msgstr "%s: 無法傳送重新載入信號(PID: %ld): %s\n"
-
-#: pg_ctl.c:1066
-msgid "server signaled\n"
-msgstr "已通知伺服器\n"
-
-#: pg_ctl.c:1110
-#, c-format
-msgid "%s: single-user server is running (PID: %ld)\n"
-msgstr "%s: 單一使用者伺服器正在執行 (PID:%ld)\n"
-
-#: pg_ctl.c:1122
-#, c-format
-msgid "%s: server is running (PID: %ld)\n"
-msgstr "%s: 伺服器正在執行 (PID:%ld)\n"
-
-#: pg_ctl.c:1133
-#, c-format
-msgid "%s: no server running\n"
-msgstr "%s: 沒有伺服器正在執行\n"
-
-#: pg_ctl.c:1144
-#, c-format
-msgid "%s: could not send signal %d (PID: %ld): %s\n"
-msgstr "%s: 無法傳送信號 %d(PID:%ld):%s\n"
-
-#: pg_ctl.c:1178
-#, c-format
-msgid "%s: could not find own program executable\n"
-msgstr "%s: 找不到程式執行檔\n"
-
-#: pg_ctl.c:1188
-#, c-format
-msgid "%s: could not find postgres program executable\n"
-msgstr "%s: 找不到 postgres 程式的執行檔\n"
-
-#: pg_ctl.c:1250 pg_ctl.c:1282
-#, c-format
-msgid "%s: could not open service manager\n"
-msgstr "%s: 無法開啟服務管理員\n"
-
-#: pg_ctl.c:1256
-#, c-format
-msgid "%s: service \"%s\" already registered\n"
-msgstr "%s: 服務 \"%s\" 已經被註冊\n"
-
-#: pg_ctl.c:1267
-#, c-format
-msgid "%s: could not register service \"%s\": error code %d\n"
-msgstr "%s: 無法註冊服務 \"%s\": 錯誤碼%d\n"
-
-#: pg_ctl.c:1288
-#, c-format
-msgid "%s: service \"%s\" not registered\n"
-msgstr "%s: 未註冊服務 \"%s\"\n"
-
-#: pg_ctl.c:1295
-#, c-format
-msgid "%s: could not open service \"%s\": error code %d\n"
-msgstr "%s: 無法開啟服務 \"%s\": 錯誤碼 %d\n"
-
-#: pg_ctl.c:1302
-#, c-format
-msgid "%s: could not unregister service \"%s\": error code %d\n"
-msgstr "%s: 無法移除服務 \"%s\": 錯誤碼 %d\n"
-
-#: pg_ctl.c:1388
-msgid "Waiting for server startup...\n"
-msgstr "等候伺服器啟動...\n"
-
-#: pg_ctl.c:1391
-msgid "Timed out waiting for server startup\n"
-msgstr "等候伺服器啟動逾時\n"
-
-# utils/init/postinit.c:130
-#: pg_ctl.c:1395
-msgid "Server started and accepting connections\n"
-msgstr "伺服器已啟動並接受連線\n"
-
-#: pg_ctl.c:1445
-#, c-format
-msgid "%s: could not start service \"%s\": error code %d\n"
-msgstr "%s: 無法啟動服務 \"%s\": 錯誤碼 %d\n"
-
-#: pg_ctl.c:1682
-#, c-format
-msgid "Try \"%s --help\" for more information.\n"
-msgstr "執行 \"%s --help\" 顯示更多資訊。\n"
-
-#: pg_ctl.c:1690
-#, c-format
-msgid ""
-"%s is a utility to start, stop, restart, promote, reload configuration "
-"files,\n"
-"report the status of a PostgreSQL server, or signal a PostgreSQL process.\n"
-"\n"
-msgstr ""
-"%s 可以用來啟動、停止、重新啟動、提升、重新載入設定檔、\n"
-"報告 PostgreSQL 伺服器狀態,或送信號給 PostgreSQL 行程。\n"
-"\n"
-
-#: pg_ctl.c:1692
-#, c-format
-msgid "Usage:\n"
-msgstr "使用方法:\n"
-
-#: pg_ctl.c:1693
-#, c-format
-msgid " %s init[db] [-D DATADIR] [-s] [-o \"OPTIONS\"]\n"
-msgstr " %s init[db] [-D 資料目錄] [-s] [-o \"選項\"]\n"
-
-#: pg_ctl.c:1694
-#, c-format
-msgid ""
-" %s start [-w] [-t SECS] [-D DATADIR] [-s] [-l FILENAME] [-o \"OPTIONS"
-"\"]\n"
-msgstr ""
-" %s start [-w] [-t 秒數] [-D 資料目錄] [-s] [-l 檔名] [-o \"選項\"]\n"
-
-#: pg_ctl.c:1695
-#, c-format
-msgid " %s stop [-W] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
-msgstr " %s stop [-W] [-t 秒數] [-D 資料目錄] [-s] [-m 關閉模式]\n"
-
-#: pg_ctl.c:1696
-#, c-format
-msgid ""
-" %s restart [-w] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
-" [-o \"OPTIONS\"]\n"
-msgstr ""
-" %s restart [-w] [-t 秒數] [-D 資料目錄] [-s] [-m 關閉模式]\n"
-" [-o \"選項\"]\n"
-
-#: pg_ctl.c:1698
-#, c-format
-msgid " %s promote [-D DATADIR] [-s]\n"
-msgstr " %s promote [-D 資料目錄] [-s]\n"
-
-#: pg_ctl.c:1699
-#, c-format
-msgid " %s reload [-D DATADIR] [-s]\n"
-msgstr " %s reload [-D 資料目錄] [-s]\n"
-
-#: pg_ctl.c:1700
-#, c-format
-msgid " %s status [-D DATADIR]\n"
-msgstr " %s status [-D 資料目錄]\n"
-
-#: pg_ctl.c:1701
-#, c-format
-msgid " %s kill SIGNALNAME PID\n"
-msgstr " %s kill 信號名稱 PID\n"
-
-#: pg_ctl.c:1703
-#, c-format
-msgid ""
-" %s register [-N SERVICENAME] [-U USERNAME] [-P PASSWORD] [-D DATADIR]\n"
-" [-S START-TYPE] [-w] [-t SECS] [-o \"OPTIONS\"]\n"
-msgstr ""
-" %s register [-N 服務名稱] [-U 使用者名稱] [-P 密碼] [-D 資料目錄]\n"
-" [-S 啟動類型] [-w] [-t 秒數] [-o \"選項\"]\n"
-
-#: pg_ctl.c:1705
-#, c-format
-msgid " %s unregister [-N SERVICENAME]\n"
-msgstr " %s unregister [-N 服務名稱]\n"
-
-#: pg_ctl.c:1708
-#, c-format
-msgid ""
-"\n"
-"Common options:\n"
-msgstr ""
-"\n"
-"一般選項:\n"
-
-#: pg_ctl.c:1709
-#, c-format
-msgid " -D, --pgdata DATADIR location of the database storage area\n"
-msgstr " -D, --pgdata 資料目錄 存放資料庫的目錄\n"
-
-#: pg_ctl.c:1710
-#, c-format
-msgid " -s, --silent only print errors, no informational messages\n"
-msgstr " -s, --silent 只顯示錯誤,不顯示其他訊息\n"
-
-#: pg_ctl.c:1711
-#, c-format
-msgid " -t SECS seconds to wait when using -w option\n"
-msgstr " -t 秒數 使用 -w 選項時的等候秒數\n"
-
-#: pg_ctl.c:1712
-#, c-format
-msgid " -w wait until operation completes\n"
-msgstr " -w 等待操作完成\n"
-
-#: pg_ctl.c:1713
-#, c-format
-msgid " -W do not wait until operation completes\n"
-msgstr " -W 不等待操作完成\n"
-
-#: pg_ctl.c:1714
-#, c-format
-msgid " --help show this help, then exit\n"
-msgstr " --help 顯示這份說明然後結束\n"
-
-#: pg_ctl.c:1715
-#, c-format
-msgid " --version output version information, then exit\n"
-msgstr " --version 顯示版本資訊然後結束\n"
-
-#: pg_ctl.c:1716
-#, c-format
-msgid ""
-"(The default is to wait for shutdown, but not for start or restart.)\n"
-"\n"
-msgstr ""
-"(預設是關閉時而非啟動或重新啟動時等待。)\n"
-"\n"
-
-#: pg_ctl.c:1717
-#, c-format
-msgid "If the -D option is omitted, the environment variable PGDATA is used.\n"
-msgstr "如果沒有使用選項 -D,改用環境變數PGDATA。\n"
-
-#: pg_ctl.c:1719
-#, c-format
-msgid ""
-"\n"
-"Options for start or restart:\n"
-msgstr ""
-"\n"
-"啟動或重新啟動可用選項:\n"
-
-#: pg_ctl.c:1721
-#, c-format
-msgid " -c, --core-files allow postgres to produce core files\n"
-msgstr " -c, --core-files 允許 postgres 產生核心檔\n"
-
-#: pg_ctl.c:1723
-#, c-format
-msgid " -c, --core-files not applicable on this platform\n"
-msgstr " -c, --core-files 此平台不適用\n"
-
-#: pg_ctl.c:1725
-#, c-format
-msgid " -l, --log FILENAME write (or append) server log to FILENAME\n"
-msgstr " -l, --log 檔名 將伺服器log寫入(或附加至)檔案。\n"
-
-#: pg_ctl.c:1726
-#, c-format
-msgid ""
-" -o OPTIONS command line options to pass to postgres\n"
-" (PostgreSQL server executable) or initdb\n"
-msgstr ""
-" -o 選項 要傳給 postgres(PostgreSQL 伺服器執行檔) \n"
-" 或 initdb 的命令列選項\n"
-
-#: pg_ctl.c:1728
-#, c-format
-msgid " -p PATH-TO-POSTGRES normally not necessary\n"
-msgstr " -p PATH-TO-POSTGRES 通常不需要\n"
-
-#: pg_ctl.c:1729
-#, c-format
-msgid ""
-"\n"
-"Options for stop or restart:\n"
-msgstr ""
-"\n"
-"停止或重新啟動選項:\n"
-
-#: pg_ctl.c:1730
-#, c-format
-msgid " -m SHUTDOWN-MODE can be \"smart\", \"fast\", or \"immediate\"\n"
-msgstr " -m 關閉模式 可用 \"smart\"、\"fast\" 或 \"immediate\"\n"
-
-#: pg_ctl.c:1732
-#, c-format
-msgid ""
-"\n"
-"Shutdown modes are:\n"
-msgstr ""
-"\n"
-"可用關閉模式:\n"
-
-#: pg_ctl.c:1733
-#, c-format
-msgid " smart quit after all clients have disconnected\n"
-msgstr " smart 在所有用戶端斷線後關閉\n"
-
-#: pg_ctl.c:1734
-#, c-format
-msgid " fast quit directly, with proper shutdown\n"
-msgstr " fast 直接正常關閉\n"
-
-#: pg_ctl.c:1735
-#, c-format
-msgid ""
-" immediate quit without complete shutdown; will lead to recovery on "
-"restart\n"
-msgstr " immediate 立即結束,會導致下次啟動時需要復原程序\n"
-
-#: pg_ctl.c:1737
-#, c-format
-msgid ""
-"\n"
-"Allowed signal names for kill:\n"
-msgstr ""
-"\n"
-"kill 可以使用的信號名稱:\n"
-
-#: pg_ctl.c:1741
-#, c-format
-msgid ""
-"\n"
-"Options for register and unregister:\n"
-msgstr ""
-"\n"
-"註冊或移除服務選項:\n"
-
-#: pg_ctl.c:1742
-#, c-format
-msgid ""
-" -N SERVICENAME service name with which to register PostgreSQL server\n"
-msgstr " -N 服務名稱 用來註冊 PostgreSQL 伺服器的服務名稱\n"
-
-#: pg_ctl.c:1743
-#, c-format
-msgid " -P PASSWORD password of account to register PostgreSQL server\n"
-msgstr " -P 密碼 用來註冊 PostgreSQL 伺服器的密碼\n"
-
-#: pg_ctl.c:1744
-#, c-format
-msgid " -U USERNAME user name of account to register PostgreSQL server\n"
-msgstr " -U 使用者 用來註冊 PostgreSQL 伺服器的帳號\n"
-
-#: pg_ctl.c:1745
-#, c-format
-msgid " -S START-TYPE service start type to register PostgreSQL server\n"
-msgstr " -S 啟動類型 註冊 PostgreSQL 使用的啟動類型\n"
-
-#: pg_ctl.c:1747
-#, c-format
-msgid ""
-"\n"
-"Start types are:\n"
-msgstr ""
-"\n"
-"啟動類型:\n"
-
-#: pg_ctl.c:1748
-#, c-format
-msgid ""
-" auto start service automatically during system startup (default)\n"
-msgstr " auto 系統啟動時自動啟動服務(預設)\n"
-
-#: pg_ctl.c:1749
-#, c-format
-msgid " demand start service on demand\n"
-msgstr " demand 手動啟動服務\n"
-
-#: pg_ctl.c:1752
-#, c-format
-msgid ""
-"\n"
-"Report bugs to <pgsql-bugs@postgresql.org>.\n"
-msgstr ""
-"\n"
-"回報錯誤至 <pgsql-bugs@postgresql.org>。\n"
-
-#: pg_ctl.c:1777
-#, c-format
-msgid "%s: unrecognized shutdown mode \"%s\"\n"
-msgstr "%s: 無法識別關閉模式 \"%s\"\n"
-
-#: pg_ctl.c:1810
-#, c-format
-msgid "%s: unrecognized signal name \"%s\"\n"
-msgstr "%s: 無法識別信號名稱 \"%s\"\n"
-
-#: pg_ctl.c:1827
-#, c-format
-msgid "%s: unrecognized start type \"%s\"\n"
-msgstr "%s: 無法識別啟動類型 \"%s\"\n"
-
-#: pg_ctl.c:1892
-#, c-format
-msgid ""
-"%s: cannot be run as root\n"
-"Please log in (using, e.g., \"su\") as the (unprivileged) user that will\n"
-"own the server process.\n"
-msgstr ""
-"%s: 無法以 root 身份執行\n"
-"請以將會擁有伺服務行程的(非特權)使用者登入(例如用 \"su\" 命令)。\n"
-
-# commands/tablespace.c:386 commands/tablespace.c:483
-#: pg_ctl.c:1963
-#, c-format
-msgid "%s: -S option not supported on this platform\n"
-msgstr "%s: 此平台不支援 -S 選項\n"
-
-#: pg_ctl.c:2010
-#, c-format
-msgid "%s: too many command-line arguments (first is \"%s\")\n"
-msgstr "%s: 命令列參數過多(第一個是 \"%s\")\n"
-
-#: pg_ctl.c:2034
-#, c-format
-msgid "%s: missing arguments for kill mode\n"
-msgstr "%s: 未指定 kill 模式參數\n"
-
-#: pg_ctl.c:2052
-#, c-format
-msgid "%s: unrecognized operation mode \"%s\"\n"
-msgstr "%s: 無法識別操作模式 \"%s\"\n"
-
-#: pg_ctl.c:2062
-#, c-format
-msgid "%s: no operation specified\n"
-msgstr "%s: 未指定操作方式\n"
-
-#: pg_ctl.c:2078
-#, c-format
-msgid ""
-"%s: no database directory specified and environment variable PGDATA unset\n"
-msgstr "%s: 未指定資料目錄和環境變數 PGDATA\n"
-
-#: ../../port/exec.c:125 ../../port/exec.c:239 ../../port/exec.c:282
-#, c-format
-msgid "could not identify current directory: %s"
-msgstr "無法識別目前的目錄: %s"
-
-# command.c:122
-#: ../../port/exec.c:144
-#, c-format
-msgid "invalid binary \"%s\""
-msgstr "無效的 binary \"%s\""
-
-# command.c:1103
-#: ../../port/exec.c:193
-#, c-format
-msgid "could not read binary \"%s\""
-msgstr "無法讀取 binary \"%s\""
-
-#: ../../port/exec.c:200
-#, c-format
-msgid "could not find a \"%s\" to execute"
-msgstr "找不到 \"%s\" 來執行"
-
-#: ../../port/exec.c:255 ../../port/exec.c:291
-#, c-format
-msgid "could not change directory to \"%s\""
-msgstr "無法切換目錄至 \"%s\""
-
-#: ../../port/exec.c:270
-#, c-format
-msgid "could not read symbolic link \"%s\""
-msgstr "無法讀取符號連結 \"%s\""
-
-#: ../../port/exec.c:517
-#, c-format
-msgid "child process exited with exit code %d"
-msgstr "子行程結束,結束碼 %d"
-
-#: ../../port/exec.c:521
-#, c-format
-msgid "child process was terminated by exception 0x%X"
-msgstr "子行程被例外 0x%X 結束"
-
-#: ../../port/exec.c:530
-#, c-format
-msgid "child process was terminated by signal %s"
-msgstr "子行程被信號 %s 結束"
-
-#: ../../port/exec.c:533
-#, c-format
-msgid "child process was terminated by signal %d"
-msgstr "子行程被信號 %d 結束"
-
-#: ../../port/exec.c:537
-#, c-format
-msgid "child process exited with unrecognized status %d"
-msgstr "子行程結束,不明狀態碼 %d"
-
-#~ msgid "could not start server\n"
-#~ msgstr "無法啟動伺服器\n"
-
-#~ msgid ""
-#~ "The program \"postmaster\" is needed by %s but was not found in the\n"
-#~ "same directory as \"%s\".\n"
-#~ "Check your installation.\n"
-#~ msgstr ""
-#~ "%s 需要\"postmaster\"程式,但是在與\"%s\"相同的目錄中找不到。\n"
-#~ "檢查你的安裝。\n"
-
-#~ msgid ""
-#~ "The program \"postmaster\" was found by \"%s\"\n"
-#~ "but was not the same version as %s.\n"
-#~ "Check your installation.\n"
-#~ msgstr ""
-#~ "\"%s\"已找到程式\"postmaster\",但是與 %s 版本不符。\n"
-#~ "請檢查你的安裝。\n"
-
-#~ msgid "%s: neither postmaster nor postgres running\n"
-#~ msgstr "%s:postmaster或postgres尚未執行\n"
-
-#~ msgid "%s: a standalone backend \"postgres\" is running (PID: %ld)\n"
-#~ msgstr "%s:一個獨立後端\"postgres\"正在執行(PID:%ld)\n"
-
-#~ msgid "%s: invalid option %s\n"
-#~ msgstr "%s:無效的選項 %s\n"
diff --git a/src/bin/pg_dump/po/fr.po b/src/bin/pg_dump/po/fr.po
index 080349db045..283c84decb0 100644
--- a/src/bin/pg_dump/po/fr.po
+++ b/src/bin/pg_dump/po/fr.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: PostgreSQL 8.4\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2014-05-17 11:13+0000\n"
-"PO-Revision-Date: 2014-05-17 15:39+0100\n"
+"POT-Creation-Date: 2014-12-04 22:42+0000\n"
+"PO-Revision-Date: 2014-12-05 10:08+0100\n"
"Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
"Language-Team: PostgreSQLfr <pgsql-fr-generale@postgresql.org>\n"
"Language: fr\n"
@@ -67,6 +67,41 @@ msgstr "mmoire puise\n"
msgid "cannot duplicate null pointer (internal error)\n"
msgstr "ne peut pas dupliquer un pointeur nul (erreur interne)\n"
+#: ../../common/wait_error.c:47
+#, c-format
+msgid "command not executable"
+msgstr "commande non excutable"
+
+#: ../../common/wait_error.c:51
+#, c-format
+msgid "command not found"
+msgstr "commande introuvable"
+
+#: ../../common/wait_error.c:56
+#, c-format
+msgid "child process exited with exit code %d"
+msgstr "le processus fils a quitt avec le code de sortie %d"
+
+#: ../../common/wait_error.c:63
+#, c-format
+msgid "child process was terminated by exception 0x%X"
+msgstr "le processus fils a t termin par l'exception 0x%X"
+
+#: ../../common/wait_error.c:73
+#, c-format
+msgid "child process was terminated by signal %s"
+msgstr "le processus fils a t termin par le signal %s"
+
+#: ../../common/wait_error.c:77
+#, c-format
+msgid "child process was terminated by signal %d"
+msgstr "le processus fils a t termin par le signal %d"
+
+#: ../../common/wait_error.c:82
+#, c-format
+msgid "child process exited with unrecognized status %d"
+msgstr "le processus fils a quitt avec un statut %d non reconnu"
+
#: common.c:105
#, c-format
msgid "reading schemas\n"
@@ -370,37 +405,37 @@ msgstr "termin par l'utilisateur\n"
msgid "error in ListenToWorkers(): %s\n"
msgstr "erreur dans ListenToWorkers(): %s\n"
-#: parallel.c:1336
+#: parallel.c:1341
#, c-format
msgid "pgpipe: could not create socket: error code %d\n"
msgstr "pgpipe: n'a pas pu crer le socket: code d'erreur %d\n"
-#: parallel.c:1347
+#: parallel.c:1352
#, c-format
msgid "pgpipe: could not bind: error code %d\n"
msgstr "pgpipe: n'a pas pu se lier: code d'erreur %d\n"
-#: parallel.c:1354
+#: parallel.c:1359
#, c-format
msgid "pgpipe: could not listen: error code %d\n"
msgstr "pgpipe : n'a pas pu se mettre en coute: code d'erreur %d\n"
-#: parallel.c:1361
+#: parallel.c:1366
#, c-format
msgid "pgpipe: getsockname() failed: error code %d\n"
msgstr "pgpipe: getsocketname() a chou: code d'erreur %d\n"
-#: parallel.c:1368
+#: parallel.c:1377
#, c-format
msgid "pgpipe: could not create second socket: error code %d\n"
msgstr "pgpipe: n'a pas pu crer un deuxime socket: code d'erreur %d\n"
-#: parallel.c:1376
+#: parallel.c:1386
#, c-format
msgid "pgpipe: could not connect socket: error code %d\n"
msgstr "pgpipe: n'a pas pu de se connecter au socket: code d'erreur %d\n"
-#: parallel.c:1383
+#: parallel.c:1393
#, c-format
msgid "pgpipe: could not accept connection: error code %d\n"
msgstr "pgpipe: n'a pas pu accepter de connexion: code d'erreur %d\n"
@@ -410,7 +445,7 @@ msgstr "pgpipe: n'a pas pu accepter de connexion: code d'erreur %d\n"
msgid "archiver"
msgstr "archiveur"
-#: pg_backup_archiver.c:169 pg_backup_archiver.c:1380
+#: pg_backup_archiver.c:169 pg_backup_archiver.c:1401
#, c-format
msgid "could not close output file: %s\n"
msgstr "n'a pas pu fermer le fichier de sortie : %s\n"
@@ -478,52 +513,52 @@ msgstr "a impliqu une restauration des donnes uniquement\n"
msgid "dropping %s %s\n"
msgstr "suppression de %s %s\n"
-#: pg_backup_archiver.c:548
+#: pg_backup_archiver.c:563
#, c-format
msgid "setting owner and privileges for %s %s\n"
msgstr "rglage du propritaire et des droits pour %s %s\n"
-#: pg_backup_archiver.c:614 pg_backup_archiver.c:616
+#: pg_backup_archiver.c:629 pg_backup_archiver.c:631
#, c-format
msgid "warning from original dump file: %s\n"
msgstr "message d'avertissement du fichier de sauvegarde original : %s\n"
-#: pg_backup_archiver.c:623
+#: pg_backup_archiver.c:638
#, c-format
msgid "creating %s %s\n"
msgstr "cration de %s %s\n"
-#: pg_backup_archiver.c:667
+#: pg_backup_archiver.c:682
#, c-format
msgid "connecting to new database \"%s\"\n"
msgstr "connexion la nouvelle base de donnes %s \n"
-#: pg_backup_archiver.c:695
+#: pg_backup_archiver.c:710
#, c-format
msgid "processing %s\n"
msgstr "traitement de %s\n"
-#: pg_backup_archiver.c:709
+#: pg_backup_archiver.c:730
#, c-format
msgid "processing data for table \"%s\"\n"
msgstr "traitement des donnes de la table %s \n"
-#: pg_backup_archiver.c:771
+#: pg_backup_archiver.c:792
#, c-format
msgid "executing %s %s\n"
msgstr "excution de %s %s\n"
-#: pg_backup_archiver.c:808
+#: pg_backup_archiver.c:829
#, c-format
msgid "disabling triggers for %s\n"
msgstr "dsactivation des dclencheurs pour %s\n"
-#: pg_backup_archiver.c:834
+#: pg_backup_archiver.c:855
#, c-format
msgid "enabling triggers for %s\n"
msgstr "activation des triggers pour %s\n"
-#: pg_backup_archiver.c:864
+#: pg_backup_archiver.c:885
#, c-format
msgid ""
"internal error -- WriteData cannot be called outside the context of a "
@@ -532,69 +567,69 @@ msgstr ""
"erreur interne -- WriteData ne peut pas tre appel en dehors du contexte\n"
"de la routine DataDumper\n"
-#: pg_backup_archiver.c:1023
+#: pg_backup_archiver.c:1044
#, c-format
msgid "large-object output not supported in chosen format\n"
msgstr ""
"la sauvegarde des Large Objects n'est pas supporte dans le format "
"choisi\n"
-#: pg_backup_archiver.c:1077
+#: pg_backup_archiver.c:1098
#, c-format
msgid "restored %d large object\n"
msgid_plural "restored %d large objects\n"
msgstr[0] "restauration de %d Large Object \n"
msgstr[1] "restauration de %d Large Objects \n"
-#: pg_backup_archiver.c:1098 pg_backup_tar.c:741
+#: pg_backup_archiver.c:1119 pg_backup_tar.c:741
#, c-format
msgid "restoring large object with OID %u\n"
msgstr "restauration du Large Object d'OID %u\n"
-#: pg_backup_archiver.c:1110
+#: pg_backup_archiver.c:1131
#, c-format
msgid "could not create large object %u: %s"
msgstr "n'a pas pu crer le Large Object %u : %s"
-#: pg_backup_archiver.c:1115 pg_dump.c:2699
+#: pg_backup_archiver.c:1136 pg_dump.c:2732
#, c-format
msgid "could not open large object %u: %s"
msgstr "n'a pas pu ouvrir le Large Object %u : %s"
-#: pg_backup_archiver.c:1172
+#: pg_backup_archiver.c:1193
#, c-format
msgid "could not open TOC file \"%s\": %s\n"
msgstr "n'a pas pu ouvrir le fichier TOC %s : %s\n"
-#: pg_backup_archiver.c:1213
+#: pg_backup_archiver.c:1234
#, c-format
msgid "WARNING: line ignored: %s\n"
msgstr "ATTENTION : ligne ignore : %s\n"
-#: pg_backup_archiver.c:1220
+#: pg_backup_archiver.c:1241
#, c-format
msgid "could not find entry for ID %d\n"
msgstr "n'a pas pu trouver l'entre pour l'ID %d\n"
-#: pg_backup_archiver.c:1241 pg_backup_directory.c:229
+#: pg_backup_archiver.c:1262 pg_backup_directory.c:229
#: pg_backup_directory.c:600
#, c-format
msgid "could not close TOC file: %s\n"
msgstr "n'a pas pu fermer le fichier TOC : %s\n"
-#: pg_backup_archiver.c:1350 pg_backup_custom.c:161 pg_backup_directory.c:340
+#: pg_backup_archiver.c:1371 pg_backup_custom.c:161 pg_backup_directory.c:340
#: pg_backup_directory.c:586 pg_backup_directory.c:644
#: pg_backup_directory.c:664
#, c-format
msgid "could not open output file \"%s\": %s\n"
msgstr "n'a pas pu ouvrir le fichier de sauvegarde %s : %s\n"
-#: pg_backup_archiver.c:1353 pg_backup_custom.c:168
+#: pg_backup_archiver.c:1374 pg_backup_custom.c:168
#, c-format
msgid "could not open output file: %s\n"
msgstr "n'a pas pu ouvrir le fichier de sauvegarde : %s\n"
-#: pg_backup_archiver.c:1457
+#: pg_backup_archiver.c:1478
#, c-format
msgid "wrote %lu byte of large object data (result = %lu)\n"
msgid_plural "wrote %lu bytes of large object data (result = %lu)\n"
@@ -603,63 +638,63 @@ msgstr[0] ""
msgstr[1] ""
"a crit %lu octets de donnes d'un Large Object (rsultat = %lu)\n"
-#: pg_backup_archiver.c:1463
+#: pg_backup_archiver.c:1484
#, c-format
msgid "could not write to large object (result: %lu, expected: %lu)\n"
msgstr ""
"n'a pas pu crire le Large Object (rsultat : %lu, attendu : %lu)\n"
-#: pg_backup_archiver.c:1556
+#: pg_backup_archiver.c:1577
#, c-format
msgid "Error while INITIALIZING:\n"
msgstr "Erreur pendant l'initialisation ( INITIALIZING ) :\n"
-#: pg_backup_archiver.c:1561
+#: pg_backup_archiver.c:1582
#, c-format
msgid "Error while PROCESSING TOC:\n"
msgstr "Erreur pendant le traitement de la TOC ( PROCESSING TOC ) :\n"
-#: pg_backup_archiver.c:1566
+#: pg_backup_archiver.c:1587
#, c-format
msgid "Error while FINALIZING:\n"
msgstr "Erreur pendant la finalisation ( FINALIZING ) :\n"
-#: pg_backup_archiver.c:1571
+#: pg_backup_archiver.c:1592
#, c-format
msgid "Error from TOC entry %d; %u %u %s %s %s\n"
msgstr "Erreur partir de l'entre TOC %d ; %u %u %s %s %s\n"
-#: pg_backup_archiver.c:1644
+#: pg_backup_archiver.c:1665
#, c-format
msgid "bad dumpId\n"
msgstr "mauvais dumpId\n"
-#: pg_backup_archiver.c:1665
+#: pg_backup_archiver.c:1686
#, c-format
msgid "bad table dumpId for TABLE DATA item\n"
msgstr "mauvais dumpId de table pour l'lment TABLE DATA\n"
-#: pg_backup_archiver.c:1757
+#: pg_backup_archiver.c:1778
#, c-format
msgid "unexpected data offset flag %d\n"
msgstr "drapeau de dcalage de donnes inattendu %d\n"
-#: pg_backup_archiver.c:1770
+#: pg_backup_archiver.c:1791
#, c-format
msgid "file offset in dump file is too large\n"
msgstr "le dcalage dans le fichier de sauvegarde est trop important\n"
-#: pg_backup_archiver.c:1883
+#: pg_backup_archiver.c:1904
#, c-format
msgid "attempting to ascertain archive format\n"
msgstr "tentative d'identification du format de l'archive\n"
-#: pg_backup_archiver.c:1909 pg_backup_archiver.c:1919
+#: pg_backup_archiver.c:1930 pg_backup_archiver.c:1940
#, c-format
msgid "directory name too long: \"%s\"\n"
msgstr "nom du rpertoire trop long : %s \n"
-#: pg_backup_archiver.c:1927
+#: pg_backup_archiver.c:1948
#, c-format
msgid ""
"directory \"%s\" does not appear to be a valid archive (\"toc.dat\" does not "
@@ -668,113 +703,113 @@ msgstr ""
"le rpertoire %s ne semble pas tre une archive valide ( toc.dat "
"n'existe pas)\n"
-#: pg_backup_archiver.c:1935 pg_backup_custom.c:180 pg_backup_custom.c:769
+#: pg_backup_archiver.c:1956 pg_backup_custom.c:180 pg_backup_custom.c:769
#: pg_backup_directory.c:213 pg_backup_directory.c:401
#, c-format
msgid "could not open input file \"%s\": %s\n"
msgstr "n'a pas pu ouvrir le fichier en entre %s : %s\n"
-#: pg_backup_archiver.c:1943 pg_backup_custom.c:187
+#: pg_backup_archiver.c:1964 pg_backup_custom.c:187
#, c-format
msgid "could not open input file: %s\n"
msgstr "n'a pas pu ouvrir le fichier en entre : %s\n"
-#: pg_backup_archiver.c:1950
+#: pg_backup_archiver.c:1971
#, c-format
msgid "could not read input file: %s\n"
msgstr "n'a pas pu lire le fichier en entre : %s\n"
-#: pg_backup_archiver.c:1952
+#: pg_backup_archiver.c:1973
#, c-format
msgid "input file is too short (read %lu, expected 5)\n"
msgstr "le fichier en entre est trop petit (%lu lus, 5 attendus)\n"
-#: pg_backup_archiver.c:2035
+#: pg_backup_archiver.c:2056
#, c-format
msgid "input file appears to be a text format dump. Please use psql.\n"
msgstr ""
"Le fichier en entre semble tre une sauvegarde au format texte. Merci "
"d'utiliser psql.\n"
-#: pg_backup_archiver.c:2041
+#: pg_backup_archiver.c:2062
#, c-format
msgid "input file does not appear to be a valid archive (too short?)\n"
msgstr ""
"le fichier en entre ne semble pas tre une archive valide (trop petit ?)\n"
-#: pg_backup_archiver.c:2047
+#: pg_backup_archiver.c:2068
#, c-format
msgid "input file does not appear to be a valid archive\n"
msgstr "le fichier en entre ne semble pas tre une archive valide\n"
-#: pg_backup_archiver.c:2067
+#: pg_backup_archiver.c:2088
#, c-format
msgid "could not close input file: %s\n"
msgstr "n'a pas pu fermer le fichier en entre : %s\n"
-#: pg_backup_archiver.c:2084
+#: pg_backup_archiver.c:2105
#, c-format
msgid "allocating AH for %s, format %d\n"
msgstr "allocation d'AH pour %s, format %d\n"
-#: pg_backup_archiver.c:2189
+#: pg_backup_archiver.c:2210
#, c-format
msgid "unrecognized file format \"%d\"\n"
msgstr "format de fichier %d non reconnu\n"
-#: pg_backup_archiver.c:2339
+#: pg_backup_archiver.c:2360
#, c-format
msgid "entry ID %d out of range -- perhaps a corrupt TOC\n"
msgstr "ID %d de l'entre en dehors de la plage -- peut-tre un TOC corrompu\n"
-#: pg_backup_archiver.c:2455
+#: pg_backup_archiver.c:2476
#, c-format
msgid "read TOC entry %d (ID %d) for %s %s\n"
msgstr "lecture de l'entre %d de la TOC (ID %d) pour %s %s\n"
-#: pg_backup_archiver.c:2489
+#: pg_backup_archiver.c:2510
#, c-format
msgid "unrecognized encoding \"%s\"\n"
msgstr "encodage %s non reconnu\n"
-#: pg_backup_archiver.c:2494
+#: pg_backup_archiver.c:2515
#, c-format
msgid "invalid ENCODING item: %s\n"
msgstr "lment ENCODING invalide : %s\n"
-#: pg_backup_archiver.c:2512
+#: pg_backup_archiver.c:2533
#, c-format
msgid "invalid STDSTRINGS item: %s\n"
msgstr "lment STDSTRINGS invalide : %s\n"
-#: pg_backup_archiver.c:2729
+#: pg_backup_archiver.c:2750
#, c-format
msgid "could not set session user to \"%s\": %s"
msgstr "n'a pas pu initialiser la session utilisateur %s : %s"
-#: pg_backup_archiver.c:2761
+#: pg_backup_archiver.c:2782
#, c-format
msgid "could not set default_with_oids: %s"
msgstr "n'a pas pu configurer default_with_oids : %s"
-#: pg_backup_archiver.c:2899
+#: pg_backup_archiver.c:2920
#, c-format
msgid "could not set search_path to \"%s\": %s"
msgstr "n'a pas pu configurer search_path %s : %s"
-#: pg_backup_archiver.c:2960
+#: pg_backup_archiver.c:2981
#, c-format
msgid "could not set default_tablespace to %s: %s"
msgstr "n'a pas pu configurer default_tablespace %s : %s"
-#: pg_backup_archiver.c:3047 pg_backup_archiver.c:3230
+#: pg_backup_archiver.c:3068 pg_backup_archiver.c:3251
#, c-format
msgid "WARNING: don't know how to set owner for object type %s\n"
msgstr ""
"ATTENTION : ne sait pas comment initialiser le propritaire du type d'objet "
"%s\n"
-#: pg_backup_archiver.c:3283
+#: pg_backup_archiver.c:3304
#, c-format
msgid ""
"WARNING: requested compression not available in this installation -- archive "
@@ -783,22 +818,22 @@ msgstr ""
"ATTENTION : la compression requise n'est pas disponible avec cette\n"
"installation -- l'archive ne sera pas compresse\n"
-#: pg_backup_archiver.c:3322
+#: pg_backup_archiver.c:3343
#, c-format
msgid "did not find magic string in file header\n"
msgstr "n'a pas trouver la chane magique dans le fichier d'en-tte\n"
-#: pg_backup_archiver.c:3335
+#: pg_backup_archiver.c:3356
#, c-format
msgid "unsupported version (%d.%d) in file header\n"
msgstr "version non supporte (%d.%d) dans le fichier d'en-tte\n"
-#: pg_backup_archiver.c:3340
+#: pg_backup_archiver.c:3361
#, c-format
msgid "sanity check on integer size (%lu) failed\n"
msgstr "chec de la vrification sur la taille de l'entier (%lu)\n"
-#: pg_backup_archiver.c:3344
+#: pg_backup_archiver.c:3365
#, c-format
msgid ""
"WARNING: archive was made on a machine with larger integers, some operations "
@@ -807,12 +842,12 @@ msgstr ""
"ATTENTION : l'archive a t cre sur une machine disposant d'entiers plus\n"
"larges, certaines oprations peuvent chouer\n"
-#: pg_backup_archiver.c:3354
+#: pg_backup_archiver.c:3375
#, c-format
msgid "expected format (%d) differs from format found in file (%d)\n"
msgstr "le format attendu (%d) diffre du format du fichier (%d)\n"
-#: pg_backup_archiver.c:3370
+#: pg_backup_archiver.c:3391
#, c-format
msgid ""
"WARNING: archive is compressed, but this installation does not support "
@@ -821,87 +856,87 @@ msgstr ""
"ATTENTION : l'archive est compresse mais cette installation ne supporte\n"
"pas la compression -- aucune donne ne sera disponible\n"
-#: pg_backup_archiver.c:3388
+#: pg_backup_archiver.c:3409
#, c-format
msgid "WARNING: invalid creation date in header\n"
msgstr "ATTENTION : date de cration invalide dans l'en-tte\n"
-#: pg_backup_archiver.c:3476
+#: pg_backup_archiver.c:3497
#, c-format
msgid "entering restore_toc_entries_prefork\n"
msgstr "entre dans restore_toc_entries_prefork\n"
-#: pg_backup_archiver.c:3520
+#: pg_backup_archiver.c:3541
#, c-format
msgid "processing item %d %s %s\n"
msgstr "traitement de l'lment %d %s %s\n"
-#: pg_backup_archiver.c:3572
+#: pg_backup_archiver.c:3593
#, c-format
msgid "entering restore_toc_entries_parallel\n"
msgstr "entre dans restore_toc_entries_parallel\n"
-#: pg_backup_archiver.c:3620
+#: pg_backup_archiver.c:3641
#, c-format
msgid "entering main parallel loop\n"
msgstr "entre dans la boucle parallle principale\n"
-#: pg_backup_archiver.c:3631
+#: pg_backup_archiver.c:3652
#, c-format
msgid "skipping item %d %s %s\n"
msgstr "omission de l'lment %d %s %s\n"
-#: pg_backup_archiver.c:3641
+#: pg_backup_archiver.c:3662
#, c-format
msgid "launching item %d %s %s\n"
msgstr "lment de lancement %d %s %s\n"
-#: pg_backup_archiver.c:3699
+#: pg_backup_archiver.c:3720
#, c-format
msgid "finished main parallel loop\n"
msgstr "fin de la boucle parallle principale\n"
-#: pg_backup_archiver.c:3708
+#: pg_backup_archiver.c:3729
#, c-format
msgid "entering restore_toc_entries_postfork\n"
msgstr "entre dans restore_toc_entries_prefork\n"
-#: pg_backup_archiver.c:3726
+#: pg_backup_archiver.c:3747
#, c-format
msgid "processing missed item %d %s %s\n"
msgstr "traitement de l'lment manquant %d %s %s\n"
-#: pg_backup_archiver.c:3875
+#: pg_backup_archiver.c:3896
#, c-format
msgid "no item ready\n"
msgstr "aucun lment prt\n"
-#: pg_backup_archiver.c:3925
+#: pg_backup_archiver.c:3946
#, c-format
msgid "could not find slot of finished worker\n"
msgstr "n'a pas pu trouver l'emplacement du worker qui vient de terminer\n"
-#: pg_backup_archiver.c:3927
+#: pg_backup_archiver.c:3948
#, c-format
msgid "finished item %d %s %s\n"
msgstr "lment termin %d %s %s\n"
-#: pg_backup_archiver.c:3940
+#: pg_backup_archiver.c:3961
#, c-format
msgid "worker process failed: exit code %d\n"
msgstr "chec du processus de travail : code de sortie %d\n"
-#: pg_backup_archiver.c:4102
+#: pg_backup_archiver.c:4123
#, c-format
msgid "transferring dependency %d -> %d to %d\n"
msgstr "transfert de la dpendance %d -> %d vers %d\n"
-#: pg_backup_archiver.c:4171
+#: pg_backup_archiver.c:4196
#, c-format
msgid "reducing dependencies for %d\n"
msgstr "rduction des dpendances pour %d\n"
-#: pg_backup_archiver.c:4210
+#: pg_backup_archiver.c:4235
#, c-format
msgid "table \"%s\" could not be created, will not restore its data\n"
msgstr ""
@@ -974,6 +1009,7 @@ msgstr ""
"type de bloc de donnes %d non reconnu lors de la restauration de l'archive\n"
#: pg_backup_custom.c:708 pg_backup_custom.c:758 pg_backup_custom.c:907
+#: pg_backup_tar.c:1086
#, c-format
msgid "could not determine seek position in archive file: %s\n"
msgstr ""
@@ -1030,12 +1066,12 @@ msgstr "programme d'archivage (db)"
msgid "could not get server_version from libpq\n"
msgstr "n'a pas pu obtenir server_version de libpq\n"
-#: pg_backup_db.c:54 pg_dumpall.c:1922
+#: pg_backup_db.c:54 pg_dumpall.c:1934
#, c-format
msgid "server version: %s; %s version: %s\n"
msgstr "version du serveur : %s ; %s version : %s\n"
-#: pg_backup_db.c:56 pg_dumpall.c:1924
+#: pg_backup_db.c:56 pg_dumpall.c:1936
#, c-format
msgid "aborting because of server version mismatch\n"
msgstr "annulation cause de la diffrence des versions\n"
@@ -1046,7 +1082,7 @@ msgid "connecting to database \"%s\" as user \"%s\"\n"
msgstr "connexion la base de donnes %s en tant qu'utilisateur %s \n"
#: pg_backup_db.c:132 pg_backup_db.c:184 pg_backup_db.c:231 pg_backup_db.c:277
-#: pg_dumpall.c:1752 pg_dumpall.c:1860
+#: pg_dumpall.c:1764 pg_dumpall.c:1872
msgid "Password: "
msgstr "Mot de passe : "
@@ -1095,30 +1131,30 @@ msgstr "la requte tait : %s\n"
msgid "%s: %s Command was: %s\n"
msgstr "%s: %s La commande tait : %s\n"
-#: pg_backup_db.c:460 pg_backup_db.c:531 pg_backup_db.c:538
+#: pg_backup_db.c:465 pg_backup_db.c:537 pg_backup_db.c:544
msgid "could not execute query"
msgstr "n'a pas pu excuter la requte"
-#: pg_backup_db.c:511
+#: pg_backup_db.c:516
#, c-format
msgid "error returned by PQputCopyData: %s"
msgstr "erreur renvoye par PQputCopyData : %s"
-#: pg_backup_db.c:557
+#: pg_backup_db.c:563
#, c-format
msgid "error returned by PQputCopyEnd: %s"
msgstr "erreur renvoye par PQputCopyEnd : %s"
-#: pg_backup_db.c:563
+#: pg_backup_db.c:569
#, c-format
msgid "COPY failed for table \"%s\": %s"
msgstr "COPY chou pour la table %s : %s"
-#: pg_backup_db.c:574
+#: pg_backup_db.c:580
msgid "could not start database transaction"
msgstr "n'a pas pu dmarrer la transaction de la base de donnes"
-#: pg_backup_db.c:580
+#: pg_backup_db.c:586
msgid "could not commit database transaction"
msgstr "n'a pas pu valider la transaction de la base de donnes"
@@ -1139,7 +1175,6 @@ msgstr "n'a pas pu lire le rpertoire %s : %s\n"
#: pg_backup_directory.c:194
#, c-format
-#| msgid "could not open directory \"%s\": %s\n"
msgid "could not close directory \"%s\": %s\n"
msgstr "n'a pas pu fermer le rpertoire %s : %s\n"
@@ -1259,12 +1294,6 @@ msgstr "syntaxe inattendue de l'instruction COPY : %s \n"
msgid "invalid OID for large object (%u)\n"
msgstr "OID invalide pour le Large Object (%u)\n"
-#: pg_backup_tar.c:1086
-#, c-format
-#| msgid "could not determine seek position in archive file: %s\n"
-msgid "could not determine seek position in file: %s\n"
-msgstr "n'a pas pu dterminer la position de recherche dans le fichier : %s\n"
-
#: pg_backup_tar.c:1095
#, c-format
msgid "archive member too large for tar format\n"
@@ -1385,8 +1414,9 @@ msgstr "(La commande INSERT ne peut pas positionner les OID.)\n"
#: pg_dump.c:585
#, c-format
-msgid "option --if-exists requires -c/--clean option\n"
-msgstr "l'option --if-exists ncessite l'option -s/--clean\n"
+#| msgid "option --if-exists requires -c/--clean option\n"
+msgid "option --if-exists requires option -c/--clean\n"
+msgstr "l'option --if-exists ncessite l'option -c/--clean\n"
#: pg_dump.c:613
#, c-format
@@ -1661,8 +1691,6 @@ msgstr " --exclude-table-data=TABLE ne sauvegarde pas la table indique\n"
#: pg_dump.c:901 pg_dumpall.c:576 pg_restore.c:463
#, c-format
-#| msgid ""
-#| " --if-exists don't report error if user doesn't exist\n"
msgid " --if-exists use IF EXISTS when dropping objects\n"
msgstr ""
" --if-exists utilise IF EXISTS lors de la suppression des "
@@ -1814,7 +1842,7 @@ msgstr ""
"d'environnement PGDATABASE est alors utilise.\n"
"\n"
-#: pg_dump.c:925 pg_dumpall.c:598 pg_restore.c:482
+#: pg_dump.c:925 pg_dumpall.c:598 pg_restore.c:485
#, c-format
msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
msgstr "Rapporter les bogues <pgsql-bugs@postgresql.org>.\n"
@@ -1865,106 +1893,106 @@ msgstr ""
"La sauvegarde du contenu de la table %s a chou : chec de\n"
"PQgetResult().\n"
-#: pg_dump.c:2173
+#: pg_dump.c:2174
#, c-format
msgid "saving database definition\n"
msgstr "sauvegarde de la dfinition de la base de donnes\n"
-#: pg_dump.c:2470
+#: pg_dump.c:2503
#, c-format
msgid "saving encoding = %s\n"
msgstr "encodage de la sauvegarde = %s\n"
-#: pg_dump.c:2497
+#: pg_dump.c:2530
#, c-format
msgid "saving standard_conforming_strings = %s\n"
msgstr "standard_conforming_strings de la sauvegarde = %s\n"
-#: pg_dump.c:2530
+#: pg_dump.c:2563
#, c-format
msgid "reading large objects\n"
msgstr "lecture des Large Objects \n"
-#: pg_dump.c:2662
+#: pg_dump.c:2695
#, c-format
msgid "saving large objects\n"
msgstr "sauvegarde des Large Objects \n"
-#: pg_dump.c:2709
+#: pg_dump.c:2742
#, c-format
msgid "error reading large object %u: %s"
msgstr "erreur lors de la lecture du Large Object %u : %s"
-#: pg_dump.c:2902
+#: pg_dump.c:2935
#, c-format
msgid "could not find parent extension for %s\n"
msgstr "n'a pas pu trouver l'extension parent pour %s\n"
-#: pg_dump.c:3005
+#: pg_dump.c:3038
#, c-format
msgid "WARNING: owner of schema \"%s\" appears to be invalid\n"
msgstr "ATTENTION : le propritaire du schma %s semble tre invalide\n"
-#: pg_dump.c:3048
+#: pg_dump.c:3081
#, c-format
msgid "schema with OID %u does not exist\n"
msgstr "le schma d'OID %u n'existe pas\n"
-#: pg_dump.c:3398
+#: pg_dump.c:3431
#, c-format
msgid "WARNING: owner of data type \"%s\" appears to be invalid\n"
msgstr ""
"ATTENTION : le propritaire du type de donnes %s semble tre invalide\n"
-#: pg_dump.c:3509
+#: pg_dump.c:3542
#, c-format
msgid "WARNING: owner of operator \"%s\" appears to be invalid\n"
msgstr ""
"ATTENTION : le propritaire de l'oprateur %s semble tre invalide\n"
-#: pg_dump.c:3768
+#: pg_dump.c:3801
#, c-format
msgid "WARNING: owner of operator class \"%s\" appears to be invalid\n"
msgstr ""
"ATTENTION : le propritaire de la classe d'oprateur %s semble tre\n"
"invalide\n"
-#: pg_dump.c:3856
+#: pg_dump.c:3889
#, c-format
msgid "WARNING: owner of operator family \"%s\" appears to be invalid\n"
msgstr ""
"ATTENTION : le propritaire de la famille d'oprateur %s semble tre\n"
"invalide\n"
-#: pg_dump.c:4015
+#: pg_dump.c:4048
#, c-format
msgid "WARNING: owner of aggregate function \"%s\" appears to be invalid\n"
msgstr ""
"ATTENTION : le propritaire de la fonction d'aggrgat %s semble tre\n"
"invalide\n"
-#: pg_dump.c:4219
+#: pg_dump.c:4252
#, c-format
msgid "WARNING: owner of function \"%s\" appears to be invalid\n"
msgstr ""
"ATTENTION : le propritaire de la fonction %s semble tre invalide\n"
-#: pg_dump.c:4825
+#: pg_dump.c:4870
#, c-format
msgid "WARNING: owner of table \"%s\" appears to be invalid\n"
msgstr "ATTENTION : le propritaire de la table %s semble tre invalide\n"
-#: pg_dump.c:4977
+#: pg_dump.c:5022
#, c-format
msgid "reading indexes for table \"%s\"\n"
msgstr "lecture des index de la table %s \n"
-#: pg_dump.c:5343
+#: pg_dump.c:5388
#, c-format
msgid "reading foreign key constraints for table \"%s\"\n"
msgstr "lecture des contraintes de cls trangres pour la table %s \n"
-#: pg_dump.c:5588
+#: pg_dump.c:5633
#, c-format
msgid ""
"failed sanity check, parent table OID %u of pg_rewrite entry OID %u not "
@@ -1973,12 +2001,12 @@ msgstr ""
"vrification choue, OID %u de la table parent de l'OID %u de l'entre de\n"
"pg_rewrite introuvable\n"
-#: pg_dump.c:5681
+#: pg_dump.c:5726
#, c-format
msgid "reading triggers for table \"%s\"\n"
msgstr "lecture des triggers pour la table %s \n"
-#: pg_dump.c:5842
+#: pg_dump.c:5887
#, c-format
msgid ""
"query produced null referenced table name for foreign key trigger \"%s\" on "
@@ -1987,32 +2015,32 @@ msgstr ""
"la requte a produit une rference de nom de table null pour le trigger de\n"
"cl trangre %s sur la table %s (OID de la table : %u)\n"
-#: pg_dump.c:6294
+#: pg_dump.c:6339
#, c-format
msgid "finding the columns and types of table \"%s\"\n"
msgstr "recherche des colonnes et types de la table %s \n"
-#: pg_dump.c:6472
+#: pg_dump.c:6517
#, c-format
msgid "invalid column numbering in table \"%s\"\n"
msgstr "numrotation des colonnes invalide pour la table %s \n"
-#: pg_dump.c:6506
+#: pg_dump.c:6551
#, c-format
msgid "finding default expressions of table \"%s\"\n"
msgstr "recherche des expressions par dfaut de la table %s \n"
-#: pg_dump.c:6558
+#: pg_dump.c:6603
#, c-format
msgid "invalid adnum value %d for table \"%s\"\n"
msgstr "valeur adnum %d invalide pour la table %s \n"
-#: pg_dump.c:6630
+#: pg_dump.c:6675
#, c-format
msgid "finding check constraints for table \"%s\"\n"
msgstr "recherche des contraintes de vrification pour la table %s \n"
-#: pg_dump.c:6725
+#: pg_dump.c:6770
#, c-format
msgid "expected %d check constraint on table \"%s\" but found %d\n"
msgid_plural "expected %d check constraints on table \"%s\" but found %d\n"
@@ -2023,66 +2051,66 @@ msgstr[1] ""
"%d contraintes de vrification attendues pour la table %s mais %d\n"
"trouves\n"
-#: pg_dump.c:6729
+#: pg_dump.c:6774
#, c-format
msgid "(The system catalogs might be corrupted.)\n"
msgstr "(Les catalogues systme sont peut-tre corrompus.)\n"
-#: pg_dump.c:8098
+#: pg_dump.c:8143
#, c-format
msgid "WARNING: typtype of data type \"%s\" appears to be invalid\n"
msgstr ""
"ATTENTION : la colonne typtype du type de donnes %s semble tre "
"invalide\n"
-#: pg_dump.c:9546
+#: pg_dump.c:9585
#, c-format
msgid "WARNING: bogus value in proargmodes array\n"
msgstr "ATTENTION : valeur errone dans le tableau proargmodes\n"
-#: pg_dump.c:9874
+#: pg_dump.c:9913
#, c-format
msgid "WARNING: could not parse proallargtypes array\n"
msgstr "ATTENTION : n'a pas pu analyser le tableau proallargtypes\n"
-#: pg_dump.c:9890
+#: pg_dump.c:9929
#, c-format
msgid "WARNING: could not parse proargmodes array\n"
msgstr "ATTENTION : n'a pas pu analyser le tableau proargmodes\n"
-#: pg_dump.c:9904
+#: pg_dump.c:9943
#, c-format
msgid "WARNING: could not parse proargnames array\n"
msgstr "ATTENTION : n'a pas pu analyser le tableau proargnames\n"
-#: pg_dump.c:9915
+#: pg_dump.c:9954
#, c-format
msgid "WARNING: could not parse proconfig array\n"
msgstr "ATTENTION : n'a pas pu analyser le tableau proconfig\n"
-#: pg_dump.c:9970
+#: pg_dump.c:10009
#, c-format
msgid "unrecognized provolatile value for function \"%s\"\n"
msgstr "valeur provolatile non reconnue pour la fonction %s \n"
-#: pg_dump.c:10192
+#: pg_dump.c:10231
#, c-format
msgid "WARNING: bogus value in pg_cast.castfunc or pg_cast.castmethod field\n"
msgstr ""
"ATTENTION : valeur errone dans le champ pg_cast.castfunc ou pg_cast."
"castmethod\n"
-#: pg_dump.c:10195
+#: pg_dump.c:10234
#, c-format
msgid "WARNING: bogus value in pg_cast.castmethod field\n"
msgstr "ATTENTION : valeur errone dans pg_cast.castmethod\n"
-#: pg_dump.c:10583
+#: pg_dump.c:10622
#, c-format
msgid "WARNING: could not find operator with OID %s\n"
msgstr "ATTENTION : n'a pas pu trouver l'oprateur d'OID %s\n"
-#: pg_dump.c:11758
+#: pg_dump.c:11797
#, c-format
msgid ""
"WARNING: aggregate function %s could not be dumped correctly for this "
@@ -2091,29 +2119,29 @@ msgstr ""
"ATTENTION : la fonction d'aggrgat %s n'a pas pu tre sauvegarde\n"
" correctement avec cette version de la base de donnes ; ignore\n"
-#: pg_dump.c:12583
+#: pg_dump.c:12622
#, c-format
msgid "unrecognized object type in default privileges: %d\n"
msgstr "type d'objet inconnu dans les droits par dfaut : %d\n"
-#: pg_dump.c:12598
+#: pg_dump.c:12637
#, c-format
msgid "could not parse default ACL list (%s)\n"
msgstr "n'a pas pu analyser la liste ACL par dfaut (%s)\n"
-#: pg_dump.c:12653
+#: pg_dump.c:12692
#, c-format
msgid "could not parse ACL list (%s) for object \"%s\" (%s)\n"
msgstr "n'a pas pu analyser la liste ACL (%s) de l'objet %s (%s)\n"
-#: pg_dump.c:13070
+#: pg_dump.c:13109
#, c-format
msgid "query to obtain definition of view \"%s\" returned no data\n"
msgstr ""
"la requte permettant d'obtenir la dfinition de la vue %s n'a renvoy\n"
"aucune donne\n"
-#: pg_dump.c:13073
+#: pg_dump.c:13112
#, c-format
msgid ""
"query to obtain definition of view \"%s\" returned more than one definition\n"
@@ -2121,27 +2149,27 @@ msgstr ""
"la requte permettant d'obtenir la dfinition de la vue %s a renvoy\n"
" plusieurs dfinitions\n"
-#: pg_dump.c:13080
+#: pg_dump.c:13119
#, c-format
msgid "definition of view \"%s\" appears to be empty (length zero)\n"
msgstr "la dfinition de la vue %s semble tre vide (longueur nulle)\n"
-#: pg_dump.c:13812
+#: pg_dump.c:13852
#, c-format
msgid "invalid column number %d for table \"%s\"\n"
msgstr "numro de colonne %d invalide pour la table %s \n"
-#: pg_dump.c:13936
+#: pg_dump.c:13976
#, c-format
msgid "missing index for constraint \"%s\"\n"
msgstr "index manquant pour la contrainte %s \n"
-#: pg_dump.c:14123
+#: pg_dump.c:14163
#, c-format
msgid "unrecognized constraint type: %c\n"
msgstr "type de contrainte inconnu : %c\n"
-#: pg_dump.c:14272 pg_dump.c:14436
+#: pg_dump.c:14312 pg_dump.c:14476
#, c-format
msgid "query to get data of sequence \"%s\" returned %d row (expected 1)\n"
msgid_plural ""
@@ -2153,25 +2181,25 @@ msgstr[1] ""
"la requte permettant d'obtenir les donnes de la squence %s a renvoy\n"
"%d lignes (une seule attendue)\n"
-#: pg_dump.c:14283
+#: pg_dump.c:14323
#, c-format
msgid "query to get data of sequence \"%s\" returned name \"%s\"\n"
msgstr ""
"la requte permettant d'obtenir les donnes de la squence %s a renvoy\n"
"le nom %s \n"
-#: pg_dump.c:14531
+#: pg_dump.c:14571
#, c-format
msgid "unexpected tgtype value: %d\n"
msgstr "valeur tgtype inattendue : %d\n"
-#: pg_dump.c:14613
+#: pg_dump.c:14653
#, c-format
msgid "invalid argument string (%s) for trigger \"%s\" on table \"%s\"\n"
msgstr ""
"chane argument invalide (%s) pour le trigger %s sur la table %s \n"
-#: pg_dump.c:14801
+#: pg_dump.c:14841
#, c-format
msgid ""
"query to get rule \"%s\" for table \"%s\" failed: wrong number of rows "
@@ -2180,12 +2208,12 @@ msgstr ""
"la requte permettant d'obtenir la rgle %s associe la table %s \n"
"a chou : mauvais nombre de lignes renvoyes\n"
-#: pg_dump.c:15102
+#: pg_dump.c:15142
#, c-format
msgid "reading dependency data\n"
msgstr "lecture des donnes de dpendance\n"
-#: pg_dump.c:15647
+#: pg_dump.c:15687
#, c-format
msgid "query returned %d row instead of one: %s\n"
msgid_plural "query returned %d rows instead of one: %s\n"
@@ -2197,22 +2225,22 @@ msgstr[1] "la requte a renvoy %d lignes au lieu d'une seule : %s\n"
msgid "sorter"
msgstr "tri"
-#: pg_dump_sort.c:465
+#: pg_dump_sort.c:466
#, c-format
msgid "invalid dumpId %d\n"
msgstr "dumpId %d invalide\n"
-#: pg_dump_sort.c:471
+#: pg_dump_sort.c:472
#, c-format
msgid "invalid dependency %d\n"
msgstr "dpendance invalide %d\n"
-#: pg_dump_sort.c:685
+#: pg_dump_sort.c:705
#, c-format
msgid "could not identify dependency loop\n"
msgstr "n'a pas pu identifier la boucle de dpendance\n"
-#: pg_dump_sort.c:1191
+#: pg_dump_sort.c:1227
#, c-format
msgid ""
"NOTICE: there are circular foreign-key constraints among these table(s):\n"
@@ -2220,12 +2248,12 @@ msgstr ""
"NOTE : il existe des constraintes de cls trangres circulaires parmi ces "
"tables :\n"
-#: pg_dump_sort.c:1193 pg_dump_sort.c:1213
+#: pg_dump_sort.c:1229 pg_dump_sort.c:1249
#, c-format
msgid " %s\n"
msgstr " %s\n"
-#: pg_dump_sort.c:1194
+#: pg_dump_sort.c:1230
#, c-format
msgid ""
"You might not be able to restore the dump without using --disable-triggers "
@@ -2235,7 +2263,7 @@ msgstr ""
"utiliser --disable-triggers ou sans supprimer temporairement les\n"
"constraintes.\n"
-#: pg_dump_sort.c:1195
+#: pg_dump_sort.c:1231
#, c-format
msgid ""
"Consider using a full dump instead of a --data-only dump to avoid this "
@@ -2244,7 +2272,7 @@ msgstr ""
"Considrez l'utilisation d'une sauvegarde complte au lieu d'une sauvegarde\n"
"des donnes seulement pour viter ce problme.\n"
-#: pg_dump_sort.c:1207
+#: pg_dump_sort.c:1243
#, c-format
msgid "WARNING: could not resolve dependency loop among these items:\n"
msgstr ""
@@ -2294,8 +2322,9 @@ msgstr ""
#: pg_dumpall.c:341 pg_restore.c:343
#, c-format
-msgid "%s: option --if-exists requires -c/--clean option\n"
-msgstr "%s : l'option --if-exists ncessite l'option -s/--clean\n"
+#| msgid "%s: option --if-exists requires -c/--clean option\n"
+msgid "%s: option --if-exists requires option -c/--clean\n"
+msgstr "%s : l'option --if-exists ncessite l'option -c/--clean\n"
#: pg_dumpall.c:348
#, c-format
@@ -2307,7 +2336,7 @@ msgstr ""
"peuvent\n"
"pas tre utilises conjointement\n"
-#: pg_dumpall.c:390 pg_dumpall.c:1849
+#: pg_dumpall.c:390 pg_dumpall.c:1861
#, c-format
msgid "%s: could not connect to database \"%s\"\n"
msgstr "%s : n'a pas pu se connecter la base de donnes %s \n"
@@ -2422,64 +2451,64 @@ msgstr ""
"standard.\n"
"\n"
-#: pg_dumpall.c:1100
+#: pg_dumpall.c:1101
#, c-format
msgid "%s: could not parse ACL list (%s) for tablespace \"%s\"\n"
msgstr ""
"%s : n'a pas pu analyser la liste d'ACL (%s) pour le tablespace %s \n"
-#: pg_dumpall.c:1406
+#: pg_dumpall.c:1418
#, c-format
msgid "%s: could not parse ACL list (%s) for database \"%s\"\n"
msgstr ""
"%s : n'a pas pu analyser la liste d'ACL (%s) pour la base de donnes %s \n"
-#: pg_dumpall.c:1616
+#: pg_dumpall.c:1628
#, c-format
msgid "%s: dumping database \"%s\"...\n"
msgstr "%s : sauvegarde de la base de donnes %s ...\n"
-#: pg_dumpall.c:1637
+#: pg_dumpall.c:1649
#, c-format
msgid "%s: pg_dump failed on database \"%s\", exiting\n"
msgstr "%s : chec de pg_dump sur la base de donnes %s , quitte\n"
-#: pg_dumpall.c:1646
+#: pg_dumpall.c:1658
#, c-format
msgid "%s: could not re-open the output file \"%s\": %s\n"
msgstr "%s : n'a pas pu rouvrir le fichier de sortie %s : %s\n"
-#: pg_dumpall.c:1691
+#: pg_dumpall.c:1703
#, c-format
msgid "%s: running \"%s\"\n"
msgstr "%s : excute %s \n"
-#: pg_dumpall.c:1871
+#: pg_dumpall.c:1883
#, c-format
msgid "%s: could not connect to database \"%s\": %s\n"
msgstr "%s : n'a pas pu se connecter la base de donnes %s : %s\n"
-#: pg_dumpall.c:1901
+#: pg_dumpall.c:1913
#, c-format
msgid "%s: could not get server version\n"
msgstr "%s : n'a pas pu obtenir la version du serveur\n"
-#: pg_dumpall.c:1907
+#: pg_dumpall.c:1919
#, c-format
msgid "%s: could not parse server version \"%s\"\n"
msgstr "%s : n'a pas pu analyser la version du serveur %s \n"
-#: pg_dumpall.c:1985 pg_dumpall.c:2011
+#: pg_dumpall.c:1997 pg_dumpall.c:2023
#, c-format
msgid "%s: executing %s\n"
msgstr "%s : excute %s\n"
-#: pg_dumpall.c:1991 pg_dumpall.c:2017
+#: pg_dumpall.c:2003 pg_dumpall.c:2029
#, c-format
msgid "%s: query failed: %s"
msgstr "%s : chec de la requte : %s"
-#: pg_dumpall.c:1993 pg_dumpall.c:2019
+#: pg_dumpall.c:2005 pg_dumpall.c:2031
#, c-format
msgid "%s: query was: %s\n"
msgstr "%s : la requte tait : %s\n"
@@ -2493,8 +2522,6 @@ msgstr ""
#: pg_restore.c:315
#, c-format
-#| msgid ""
-#| "options -s/--schema-only and -a/--data-only cannot be used together\n"
msgid ""
"%s: options -s/--schema-only and -a/--data-only cannot be used together\n"
msgstr ""
@@ -2504,7 +2531,6 @@ msgstr ""
#: pg_restore.c:322
#, c-format
-#| msgid "options -c/--clean and -a/--data-only cannot be used together\n"
msgid "%s: options -c/--clean and -a/--data-only cannot be used together\n"
msgstr ""
"%s : les options -c/--clean et -a/--data-only ne peuvent pas tre\n"
@@ -2621,9 +2647,9 @@ msgstr ""
#: pg_restore.c:449
#, c-format
-#| msgid " -I, --index=NAME restore named index\n"
-msgid " -I, --index=NAME restore named indexes\n"
-msgstr " -I, --index=NOM restaure les index indiqus\n"
+#| msgid " -I, --index=NAME restore named indexes\n"
+msgid " -I, --index=NAME restore named index\n"
+msgstr " -I, --index=NOM restaure l'index indiqu\n"
#: pg_restore.c:450
#, c-format
@@ -2644,17 +2670,17 @@ msgstr ""
#: pg_restore.c:453
#, c-format
-#| msgid " -n, --schema=NAME restore only objects in this schema\n"
-msgid " -n, --schema=NAME restore only objects in these schemas\n"
+#| msgid ""
+#| " -n, --schema=NAME restore only objects in these schemas\n"
+msgid " -n, --schema=NAME restore only objects in this schema\n"
msgstr ""
-" -n, --schema=NOM restaure uniquement les objets de ces "
-"schmas\n"
+" -n, --schema=NOM restaure uniquement les objets de ce schma\n"
#: pg_restore.c:455
#, c-format
-#| msgid " -P, --function=NAME(args) restore named function\n"
-msgid " -P, --function=NAME(args) restore named functions\n"
-msgstr " -P, --function=NOM(args) restaure les fonctions indiques\n"
+#| msgid " -P, --function=NAME(args) restore named functions\n"
+msgid " -P, --function=NAME(args) restore named function\n"
+msgstr " -P, --function=NOM(args) restaure la fonction indique\n"
#: pg_restore.c:456
#, c-format
@@ -2674,15 +2700,15 @@ msgstr ""
#: pg_restore.c:458
#, c-format
-#| msgid " -t, --table=NAME restore named table(s)\n"
-msgid " -t, --table=NAME restore named tables\n"
-msgstr " -t, --table=NOM restaure les tables indiques\n"
+#| msgid " -t, --table=NAME restore named tables\n"
+msgid " -t, --table=NAME restore named table\n"
+msgstr " -t, --table=NOM restaure la table indique\n"
#: pg_restore.c:459
#, c-format
-#| msgid " -T, --trigger=NAME restore named trigger\n"
-msgid " -T, --trigger=NAME restore named triggers\n"
-msgstr " -T, --trigger=NOM restaure les triggers nomms\n"
+#| msgid " -T, --trigger=NAME restore named triggers\n"
+msgid " -T, --trigger=NAME restore named trigger\n"
+msgstr " -T, --trigger=NOM restaure le trigger indiqu\n"
#: pg_restore.c:460
#, c-format
@@ -2725,14 +2751,13 @@ msgstr ""
#: pg_restore.c:468
#, c-format
#| msgid ""
-#| " --section=SECTION restore named section (pre-data, data, or "
+#| " --section=SECTION restore named sections (pre-data, data, or "
#| "post-data)\n"
msgid ""
-" --section=SECTION restore named sections (pre-data, data, or "
+" --section=SECTION restore named section (pre-data, data, or "
"post-data)\n"
msgstr ""
-" --section=SECTION restaure les sections indiques (pre-data, "
-"data\n"
+" --section=SECTION restaure la section indique (pre-data, data\n"
" ou post-data)\n"
#: pg_restore.c:479
@@ -2745,6 +2770,18 @@ msgstr ""
#, c-format
msgid ""
"\n"
+"The options -I, -n, -P, -t, -T, and --section can be combined and specified\n"
+"multiple times to select multiple objects.\n"
+msgstr ""
+"\n"
+"Les options -I, -n, -P, -t, -T et --section peuvent tre combines et "
+"indiques\n"
+"plusieurs fois pour slectionner plusieurs objets.\n"
+
+#: pg_restore.c:484
+#, c-format
+msgid ""
+"\n"
"If no input file name is supplied, then standard input is used.\n"
"\n"
msgstr ""
@@ -2753,126 +2790,128 @@ msgstr ""
"utilise.\n"
"\n"
-#~ msgid "could not change directory to \"%s\""
-#~ msgstr "n'a pas pu accder au rpertoire %s "
-
-#~ msgid "child process exited with exit code %d"
-#~ msgstr "le processus fils a quitt avec le code de sortie %d"
+#~ msgid "could not write to output file: %s\n"
+#~ msgstr "n'a pas pu crire dans le fichier de sauvegarde : %s\n"
-#~ msgid "child process was terminated by exception 0x%X"
-#~ msgstr "le processus fils a t termin par l'exception 0x%X"
+#~ msgid "could not write to custom output routine\n"
+#~ msgstr "n'a pas pu crire vers la routine de sauvegarde personnalise\n"
-#~ msgid "child process was terminated by signal %s"
-#~ msgstr "le processus fils a t termin par le signal %s"
+#~ msgid "unexpected end of file\n"
+#~ msgstr "fin de fichier inattendu\n"
-#~ msgid "child process was terminated by signal %d"
-#~ msgstr "le processus fils a t termin par le signal %d"
+#~ msgid "could not write byte: %s\n"
+#~ msgstr "n'a pas pu crire un octet : %s\n"
-#~ msgid "child process exited with unrecognized status %d"
-#~ msgstr "le processus fils a quitt avec un statut %d non reconnu"
+#~ msgid "could not write byte\n"
+#~ msgstr "n'a pas pu crire l'octet\n"
-#~ msgid "cannot duplicate null pointer\n"
-#~ msgstr "ne peut pas dupliquer un pointeur nul\n"
+#~ msgid "could not write null block at end of tar archive\n"
+#~ msgstr "n'a pas pu crire le bloc nul la fin de l'archive tar\n"
-#~ msgid "worker process crashed: status %d\n"
-#~ msgstr "crash du processus worker : statut %d\n"
+#~ msgid "could not output padding at end of tar member\n"
+#~ msgstr "n'a pas pu remplir la fin du membre de tar\n"
-#~ msgid "parallel_restore should not return\n"
-#~ msgstr "parallel_restore ne devrait pas retourner\n"
+#~ msgid "mismatch in actual vs. predicted file position (%s vs. %s)\n"
+#~ msgstr ""
+#~ "pas de correspondance entre la position relle et celle prvue du "
+#~ "fichier\n"
+#~ "(%s vs. %s)\n"
-#~ msgid "could not create worker thread: %s\n"
-#~ msgstr "n'a pas pu crer le fil de travail: %s\n"
+#~ msgid " --help show this help, then exit\n"
+#~ msgstr " --help affiche cette aide puis quitte\n"
-#~ msgid "could not parse version string \"%s\"\n"
-#~ msgstr "n'a pas pu analyser la chane de version %s \n"
+#~ msgid ""
+#~ " --version output version information, then exit\n"
+#~ msgstr " --version affiche la version puis quitte\n"
-#~ msgid "%s: could not parse version \"%s\"\n"
-#~ msgstr "%s : n'a pas pu analyser la version %s \n"
+#~ msgid "*** aborted because of error\n"
+#~ msgstr "*** interrompu du fait d'erreurs\n"
-#~ msgid "-C and -c are incompatible options\n"
-#~ msgstr "-C et -c sont des options incompatibles\n"
+#~ msgid "missing pg_database entry for database \"%s\"\n"
+#~ msgstr "entre manquante dans pg_database pour la base de donnes %s \n"
-#~ msgid "invalid COPY statement -- could not find \"copy\" in string \"%s\"\n"
+#~ msgid ""
+#~ "query returned more than one (%d) pg_database entry for database \"%s\"\n"
#~ msgstr ""
-#~ "instruction COPY invalide -- n'a pas pu trouver copy dans la chane "
-#~ "%s \n"
+#~ "la requte a renvoy plusieurs (%d) entres pg_database pour la base de\n"
+#~ "donnes %s \n"
+
+#~ msgid "dumpDatabase(): could not find pg_largeobject.relfrozenxid\n"
+#~ msgstr "dumpDatabase() : n'a pas pu trouver pg_largeobject.relfrozenxid\n"
#~ msgid ""
-#~ "invalid COPY statement -- could not find \"from stdin\" in string \"%s\" "
-#~ "starting at position %lu\n"
+#~ "dumpDatabase(): could not find pg_largeobject_metadata.relfrozenxid\n"
#~ msgstr ""
-#~ "instruction COPY invalide -- n'a pas pu trouver from stdin dans la\n"
-#~ "chane %s partir de la position %lu\n"
-
-#~ msgid "requested %d byte, got %d from lookahead and %d from file\n"
-#~ msgid_plural "requested %d bytes, got %d from lookahead and %d from file\n"
-#~ msgstr[0] "%d octet requis, %d obtenu de lookahead et %d du fichier\n"
-#~ msgstr[1] "%d octets requis, %d obtenus de lookahead et %d du fichier\n"
+#~ "dumpDatabase() : n'a pas pu trouver pg_largeobject_metadata.relfrozenxid\n"
-#~ msgid "read %lu byte into lookahead buffer\n"
-#~ msgid_plural "read %lu bytes into lookahead buffer\n"
-#~ msgstr[0] "lecture de %lu octet dans le tampon prvisionnel\n"
-#~ msgstr[1] "lecture de %lu octets dans le tampon prvisionnel\n"
+#~ msgid "query returned %d foreign server entry for foreign table \"%s\"\n"
+#~ msgid_plural ""
+#~ "query returned %d foreign server entries for foreign table \"%s\"\n"
+#~ msgstr[0] ""
+#~ "la requte a renvoy %d entre de serveur distant pour la table distante "
+#~ " %s \n"
+#~ msgstr[1] ""
+#~ "la requte a renvoy %d entres de serveurs distants pour la table "
+#~ "distante %s \n"
-#~ msgid "query returned %d rows instead of one: %s\n"
-#~ msgstr "la requte a renvoy %d lignes au lieu d'une seule : %s\n"
+#~ msgid "missing pg_database entry for this database\n"
+#~ msgstr "entre pg_database manquante pour cette base de donnes\n"
-#~ msgid "no label definitions found for enum ID %u\n"
-#~ msgstr "aucune dfinition de label trouve pour l'ID enum %u\n"
+#~ msgid "found more than one pg_database entry for this database\n"
+#~ msgstr ""
+#~ "a trouv plusieurs entres dans pg_database pour cette base de donnes\n"
-#~ msgid "compression support is disabled in this format\n"
-#~ msgstr "le support de la compression est dsactiv avec ce format\n"
+#~ msgid "could not find entry for pg_indexes in pg_class\n"
+#~ msgstr "n'a pas pu trouver l'entre de pg_indexes dans pg_class\n"
-#~ msgid "could not parse ACL (%s) for large object %u"
-#~ msgstr "n'a pas pu analyser la liste ACL (%s) du Large Object %u"
+#~ msgid "found more than one entry for pg_indexes in pg_class\n"
+#~ msgstr "a trouv plusieurs entres pour pg_indexes dans la table pg_class\n"
-#~ msgid "saving large object properties\n"
-#~ msgstr "sauvegarde des proprits des Large Objects \n"
+#~ msgid "SQL command failed\n"
+#~ msgstr "la commande SQL a chou\n"
-#~ msgid "dumpBlobs(): could not open large object %u: %s"
-#~ msgstr "dumpBlobs() : n'a pas pu ouvrir le Large Object %u : %s"
+#~ msgid "file archiver"
+#~ msgstr "programme d'archivage de fichiers"
#~ msgid ""
-#~ "dumping a specific TOC data block out of order is not supported without "
-#~ "ID on this input stream (fseek required)\n"
+#~ "WARNING:\n"
+#~ " This format is for demonstration purposes; it is not intended for\n"
+#~ " normal use. Files will be written in the current working directory.\n"
#~ msgstr ""
-#~ "la sauvegarde d'un bloc de donnes spcifique du TOC dans le dsordre "
-#~ "n'est\n"
-#~ "pas support sans identifiant sur ce flux d'entre (fseek requis)\n"
+#~ "ATTENTION :\n"
+#~ " Ce format est prsent dans un but de dmonstration ; il n'est pas "
+#~ "prvu\n"
+#~ " pour une utilisation normale. Les fichiers seront crits dans le\n"
+#~ " rpertoire actuel.\n"
-#~ msgid "query returned no rows: %s\n"
-#~ msgstr "la requte n'a renvoy aucune ligne : %s\n"
+#~ msgid "could not close data file after reading\n"
+#~ msgstr "n'a pas pu fermer le fichier de donnes aprs lecture\n"
-#~ msgid "%s: invalid -X option -- %s\n"
-#~ msgstr "%s : option -X invalide -- %s\n"
+#~ msgid "could not open large object TOC for input: %s\n"
+#~ msgstr "n'a pas pu ouvrir la TOC du Large Object en entre : %s\n"
-#~ msgid "cannot reopen non-seekable file\n"
-#~ msgstr "ne peut pas rouvrir le fichier non cherchable\n"
+#~ msgid "could not open large object TOC for output: %s\n"
+#~ msgstr "n'a pas pu ouvrir la TOC du Large Object en sortie : %s\n"
-#~ msgid "cannot reopen stdin\n"
-#~ msgstr "ne peut pas rouvrir stdin\n"
+#~ msgid "could not close large object file\n"
+#~ msgstr "n'a pas pu fermer le fichier du Large Object \n"
-#~ msgid "%s: out of memory\n"
-#~ msgstr "%s : mmoire puise\n"
+#~ msgid "restoring large object OID %u\n"
+#~ msgstr "restauration du Large Object d'OID %u\n"
-#~ msgid ""
-#~ " --use-set-session-authorization\n"
-#~ " use SET SESSION AUTHORIZATION commands instead "
-#~ "of\n"
-#~ " ALTER OWNER commands to set ownership\n"
-#~ msgstr ""
-#~ " --use-set-session-authorization\n"
-#~ " utilise les commandes SET SESSION "
-#~ "AUTHORIZATION\n"
-#~ " au lieu des commandes ALTER OWNER pour "
-#~ "les\n"
-#~ " modifier les propritaires\n"
+#~ msgid " --help show this help, then exit\n"
+#~ msgstr " --help affiche cette aide et quitte\n"
+
+#~ msgid " --version output version information, then exit\n"
+#~ msgstr " --version affiche la version et quitte\n"
#~ msgid ""
-#~ " --disable-triggers disable triggers during data-only restore\n"
+#~ " -c, --clean clean (drop) database objects before "
+#~ "recreating\n"
#~ msgstr ""
-#~ " --disable-triggers dsactiver les dclencheurs lors de la\n"
-#~ " restauration des donnes seules\n"
+#~ " -c, --clean nettoie/supprime les bases de donnes avant "
+#~ "de\n"
+#~ " les crer\n"
#~ msgid " -O, --no-owner skip restoration of object ownership\n"
#~ msgstr ""
@@ -2881,124 +2920,107 @@ msgstr ""
#~ " objets\n"
#~ msgid ""
-#~ " -c, --clean clean (drop) database objects before "
-#~ "recreating\n"
+#~ " --disable-triggers disable triggers during data-only restore\n"
#~ msgstr ""
-#~ " -c, --clean nettoie/supprime les bases de donnes avant "
-#~ "de\n"
-#~ " les crer\n"
-
-#~ msgid " --version output version information, then exit\n"
-#~ msgstr " --version affiche la version et quitte\n"
+#~ " --disable-triggers dsactiver les dclencheurs lors de la\n"
+#~ " restauration des donnes seules\n"
-#~ msgid " --help show this help, then exit\n"
-#~ msgstr " --help affiche cette aide et quitte\n"
+#~ msgid ""
+#~ " --use-set-session-authorization\n"
+#~ " use SET SESSION AUTHORIZATION commands instead "
+#~ "of\n"
+#~ " ALTER OWNER commands to set ownership\n"
+#~ msgstr ""
+#~ " --use-set-session-authorization\n"
+#~ " utilise les commandes SET SESSION "
+#~ "AUTHORIZATION\n"
+#~ " au lieu des commandes ALTER OWNER pour "
+#~ "les\n"
+#~ " modifier les propritaires\n"
-#~ msgid "restoring large object OID %u\n"
-#~ msgstr "restauration du Large Object d'OID %u\n"
+#~ msgid "%s: out of memory\n"
+#~ msgstr "%s : mmoire puise\n"
-#~ msgid "could not close large object file\n"
-#~ msgstr "n'a pas pu fermer le fichier du Large Object \n"
+#~ msgid "cannot reopen stdin\n"
+#~ msgstr "ne peut pas rouvrir stdin\n"
-#~ msgid "could not open large object TOC for output: %s\n"
-#~ msgstr "n'a pas pu ouvrir la TOC du Large Object en sortie : %s\n"
+#~ msgid "cannot reopen non-seekable file\n"
+#~ msgstr "ne peut pas rouvrir le fichier non cherchable\n"
-#~ msgid "could not open large object TOC for input: %s\n"
-#~ msgstr "n'a pas pu ouvrir la TOC du Large Object en entre : %s\n"
+#~ msgid "%s: invalid -X option -- %s\n"
+#~ msgstr "%s : option -X invalide -- %s\n"
-#~ msgid "could not close data file after reading\n"
-#~ msgstr "n'a pas pu fermer le fichier de donnes aprs lecture\n"
+#~ msgid "query returned no rows: %s\n"
+#~ msgstr "la requte n'a renvoy aucune ligne : %s\n"
#~ msgid ""
-#~ "WARNING:\n"
-#~ " This format is for demonstration purposes; it is not intended for\n"
-#~ " normal use. Files will be written in the current working directory.\n"
+#~ "dumping a specific TOC data block out of order is not supported without "
+#~ "ID on this input stream (fseek required)\n"
#~ msgstr ""
-#~ "ATTENTION :\n"
-#~ " Ce format est prsent dans un but de dmonstration ; il n'est pas "
-#~ "prvu\n"
-#~ " pour une utilisation normale. Les fichiers seront crits dans le\n"
-#~ " rpertoire actuel.\n"
-
-#~ msgid "file archiver"
-#~ msgstr "programme d'archivage de fichiers"
+#~ "la sauvegarde d'un bloc de donnes spcifique du TOC dans le dsordre "
+#~ "n'est\n"
+#~ "pas support sans identifiant sur ce flux d'entre (fseek requis)\n"
-#~ msgid "SQL command failed\n"
-#~ msgstr "la commande SQL a chou\n"
+#~ msgid "dumpBlobs(): could not open large object %u: %s"
+#~ msgstr "dumpBlobs() : n'a pas pu ouvrir le Large Object %u : %s"
-#~ msgid "found more than one entry for pg_indexes in pg_class\n"
-#~ msgstr "a trouv plusieurs entres pour pg_indexes dans la table pg_class\n"
+#~ msgid "saving large object properties\n"
+#~ msgstr "sauvegarde des proprits des Large Objects \n"
-#~ msgid "could not find entry for pg_indexes in pg_class\n"
-#~ msgstr "n'a pas pu trouver l'entre de pg_indexes dans pg_class\n"
+#~ msgid "could not parse ACL (%s) for large object %u"
+#~ msgstr "n'a pas pu analyser la liste ACL (%s) du Large Object %u"
-#~ msgid "found more than one pg_database entry for this database\n"
-#~ msgstr ""
-#~ "a trouv plusieurs entres dans pg_database pour cette base de donnes\n"
+#~ msgid "compression support is disabled in this format\n"
+#~ msgstr "le support de la compression est dsactiv avec ce format\n"
-#~ msgid "missing pg_database entry for this database\n"
-#~ msgstr "entre pg_database manquante pour cette base de donnes\n"
+#~ msgid "no label definitions found for enum ID %u\n"
+#~ msgstr "aucune dfinition de label trouve pour l'ID enum %u\n"
-#~ msgid "query returned %d foreign server entry for foreign table \"%s\"\n"
-#~ msgid_plural ""
-#~ "query returned %d foreign server entries for foreign table \"%s\"\n"
-#~ msgstr[0] ""
-#~ "la requte a renvoy %d entre de serveur distant pour la table distante "
-#~ " %s \n"
-#~ msgstr[1] ""
-#~ "la requte a renvoy %d entres de serveurs distants pour la table "
-#~ "distante %s \n"
+#~ msgid "query returned %d rows instead of one: %s\n"
+#~ msgstr "la requte a renvoy %d lignes au lieu d'une seule : %s\n"
-#~ msgid ""
-#~ "dumpDatabase(): could not find pg_largeobject_metadata.relfrozenxid\n"
-#~ msgstr ""
-#~ "dumpDatabase() : n'a pas pu trouver pg_largeobject_metadata.relfrozenxid\n"
+#~ msgid "read %lu byte into lookahead buffer\n"
+#~ msgid_plural "read %lu bytes into lookahead buffer\n"
+#~ msgstr[0] "lecture de %lu octet dans le tampon prvisionnel\n"
+#~ msgstr[1] "lecture de %lu octets dans le tampon prvisionnel\n"
-#~ msgid "dumpDatabase(): could not find pg_largeobject.relfrozenxid\n"
-#~ msgstr "dumpDatabase() : n'a pas pu trouver pg_largeobject.relfrozenxid\n"
+#~ msgid "requested %d byte, got %d from lookahead and %d from file\n"
+#~ msgid_plural "requested %d bytes, got %d from lookahead and %d from file\n"
+#~ msgstr[0] "%d octet requis, %d obtenu de lookahead et %d du fichier\n"
+#~ msgstr[1] "%d octets requis, %d obtenus de lookahead et %d du fichier\n"
#~ msgid ""
-#~ "query returned more than one (%d) pg_database entry for database \"%s\"\n"
+#~ "invalid COPY statement -- could not find \"from stdin\" in string \"%s\" "
+#~ "starting at position %lu\n"
#~ msgstr ""
-#~ "la requte a renvoy plusieurs (%d) entres pg_database pour la base de\n"
-#~ "donnes %s \n"
-
-#~ msgid "missing pg_database entry for database \"%s\"\n"
-#~ msgstr "entre manquante dans pg_database pour la base de donnes %s \n"
-
-#~ msgid "*** aborted because of error\n"
-#~ msgstr "*** interrompu du fait d'erreurs\n"
-
-#~ msgid ""
-#~ " --version output version information, then exit\n"
-#~ msgstr " --version affiche la version puis quitte\n"
-
-#~ msgid " --help show this help, then exit\n"
-#~ msgstr " --help affiche cette aide puis quitte\n"
+#~ "instruction COPY invalide -- n'a pas pu trouver from stdin dans la\n"
+#~ "chane %s partir de la position %lu\n"
-#~ msgid "mismatch in actual vs. predicted file position (%s vs. %s)\n"
+#~ msgid "invalid COPY statement -- could not find \"copy\" in string \"%s\"\n"
#~ msgstr ""
-#~ "pas de correspondance entre la position relle et celle prvue du "
-#~ "fichier\n"
-#~ "(%s vs. %s)\n"
+#~ "instruction COPY invalide -- n'a pas pu trouver copy dans la chane "
+#~ "%s \n"
-#~ msgid "could not output padding at end of tar member\n"
-#~ msgstr "n'a pas pu remplir la fin du membre de tar\n"
+#~ msgid "-C and -c are incompatible options\n"
+#~ msgstr "-C et -c sont des options incompatibles\n"
-#~ msgid "could not write null block at end of tar archive\n"
-#~ msgstr "n'a pas pu crire le bloc nul la fin de l'archive tar\n"
+#~ msgid "%s: could not parse version \"%s\"\n"
+#~ msgstr "%s : n'a pas pu analyser la version %s \n"
-#~ msgid "could not write byte\n"
-#~ msgstr "n'a pas pu crire l'octet\n"
+#~ msgid "could not parse version string \"%s\"\n"
+#~ msgstr "n'a pas pu analyser la chane de version %s \n"
-#~ msgid "could not write byte: %s\n"
-#~ msgstr "n'a pas pu crire un octet : %s\n"
+#~ msgid "could not create worker thread: %s\n"
+#~ msgstr "n'a pas pu crer le fil de travail: %s\n"
-#~ msgid "unexpected end of file\n"
-#~ msgstr "fin de fichier inattendu\n"
+#~ msgid "parallel_restore should not return\n"
+#~ msgstr "parallel_restore ne devrait pas retourner\n"
-#~ msgid "could not write to custom output routine\n"
-#~ msgstr "n'a pas pu crire vers la routine de sauvegarde personnalise\n"
+#~ msgid "worker process crashed: status %d\n"
+#~ msgstr "crash du processus worker : statut %d\n"
-#~ msgid "could not write to output file: %s\n"
-#~ msgstr "n'a pas pu crire dans le fichier de sauvegarde : %s\n"
+#~ msgid "cannot duplicate null pointer\n"
+#~ msgstr "ne peut pas dupliquer un pointeur nul\n"
+
+#~ msgid "could not change directory to \"%s\""
+#~ msgstr "n'a pas pu accder au rpertoire %s "
diff --git a/src/bin/pg_dump/po/it.po b/src/bin/pg_dump/po/it.po
index 1ed4f242304..8837e89bb81 100644
--- a/src/bin/pg_dump/po/it.po
+++ b/src/bin/pg_dump/po/it.po
@@ -25,7 +25,7 @@ msgstr ""
"Project-Id-Version: pg_dump (Postgresql) 9.4\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
"POT-Creation-Date: 2014-08-23 05:12+0000\n"
-"PO-Revision-Date: 2014-08-23 15:12+0100\n"
+"PO-Revision-Date: 2014-08-25 21:16+0100\n"
"Last-Translator: Daniele Varrazzo <daniele.varrazzo@gmail.com>\n"
"Language-Team: Gruppo traduzioni ITPUG <traduzioni@itpug.org>\n"
"Language: it\n"
@@ -1489,12 +1489,12 @@ msgstr " -E, --encoding=CODIFICA scarica i dati nella CODIFICA indicata\n"
#: pg_dump.c:886
#, c-format
msgid " -n, --schema=SCHEMA dump the named schema(s) only\n"
-msgstr " -n, --schema=SCHEMA scarica solo lo schema o gli schemi nominati\n"
+msgstr " -n, --schema=SCHEMA scarica solo lo schema o gli schemi indicati\n"
#: pg_dump.c:887
#, c-format
msgid " -N, --exclude-schema=SCHEMA do NOT dump the named schema(s)\n"
-msgstr " -N, --exclude-schema=SCHEMA non scaricare lo schema o gli schemi nominati\n"
+msgstr " -N, --exclude-schema=SCHEMA non scaricare lo schema o gli schemi indicati\n"
#: pg_dump.c:888 pg_dumpall.c:565
#, c-format
@@ -1525,12 +1525,12 @@ msgstr ""
#: pg_dump.c:893
#, c-format
msgid " -t, --table=TABLE dump the named table(s) only\n"
-msgstr " -t, --table=TABELLA scarica solo la tabella o le tabelle nominate\n"
+msgstr " -t, --table=TABELLA scarica solo la tabella o le tabelle indicate\n"
#: pg_dump.c:894
#, c-format
msgid " -T, --exclude-table=TABLE do NOT dump the named table(s)\n"
-msgstr " -T, --exclude-table=TABELLA NON scaricare la tabella o le tabelle nominate\n"
+msgstr " -T, --exclude-table=TABELLA NON scaricare la tabella o le tabelle indicate\n"
#: pg_dump.c:895 pg_dumpall.c:571
#, c-format
@@ -2366,7 +2366,7 @@ msgstr " -e, --exit-on-error esci in caso di errore, il comportamento
#: pg_restore.c:449
#, c-format
msgid " -I, --index=NAME restore named index\n"
-msgstr " -I, --index=NOME ripristina l'indice nominato\n"
+msgstr " -I, --index=NOME ripristina l'indice indicato\n"
#: pg_restore.c:450
#, c-format
@@ -2390,7 +2390,7 @@ msgstr " -n, --schema=NOME ripristina solo gli oggetti in questo sch
#: pg_restore.c:455
#, c-format
msgid " -P, --function=NAME(args) restore named function\n"
-msgstr " -P, --function=NOME(arg) ripristina la funzione nominata\n"
+msgstr " -P, --function=NOME(arg) ripristina la funzione indicata\n"
#: pg_restore.c:456
#, c-format
@@ -2405,12 +2405,12 @@ msgstr " -S, --superuser=NOME nome del superutente da usare per disabil
#: pg_restore.c:458
#, c-format
msgid " -t, --table=NAME restore named table\n"
-msgstr " -t, --table=NOME ripristina la tabella nominata\n"
+msgstr " -t, --table=NOME ripristina la tabella indicata\n"
#: pg_restore.c:459
#, c-format
msgid " -T, --trigger=NAME restore named trigger\n"
-msgstr " -T, --trigger=NOME ripristina il trigger nominato\n"
+msgstr " -T, --trigger=NOME ripristina il trigger indicato\n"
#: pg_restore.c:460
#, c-format
@@ -2444,7 +2444,7 @@ msgstr " --no-tablespaces non ripristina le assegnazioni dei tables
#: pg_restore.c:468
#, c-format
msgid " --section=SECTION restore named section (pre-data, data, or post-data)\n"
-msgstr " --section=SEZIONE ripristina la sezione nominata (pre-data, data o post-data)\n"
+msgstr " --section=SEZIONE ripristina la sezione indicata (pre-data, data o post-data)\n"
#: pg_restore.c:479
#, c-format
diff --git a/src/bin/pg_dump/po/zh_CN.po b/src/bin/pg_dump/po/zh_CN.po
index f277b35713e..ea3887297d3 100644
--- a/src/bin/pg_dump/po/zh_CN.po
+++ b/src/bin/pg_dump/po/zh_CN.po
@@ -5,8 +5,8 @@ msgid ""
msgstr ""
"Project-Id-Version: pg_dump (PostgreSQL 9.0)\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2013-09-02 00:27+0000\n"
-"PO-Revision-Date: 2013-09-02 15:51+0800\n"
+"POT-Creation-Date: 2014-11-22 21:12+0000\n"
+"PO-Revision-Date: 2014-11-28 14:53+0800\n"
"Last-Translator: Xiong He <iihero@qq.com>\n"
"Language-Team: Chinese (Simplified)\n"
"Language: zh_CN\n"
@@ -16,59 +16,91 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Poedit 1.5.4\n"
-#: ../../common/fe_memutils.c:33 ../../common/fe_memutils.c:60
-#: ../../common/fe_memutils.c:83 pg_backup_db.c:134 pg_backup_db.c:189
-#: pg_backup_db.c:233 pg_backup_db.c:279
-#, c-format
-msgid "out of memory\n"
-msgstr "内存用尽\n"
-
-# common.c:78
-#: ../../common/fe_memutils.c:77
-#, c-format
-#| msgid "pg_strdup: cannot duplicate null pointer (internal error)\n"
-msgid "cannot duplicate null pointer (internal error)\n"
-msgstr "无法复制空指针 (内部错误)\n"
-
-#: ../../port/exec.c:127 ../../port/exec.c:241 ../../port/exec.c:284
+#: ../../common/exec.c:127 ../../common/exec.c:241 ../../common/exec.c:284
#, c-format
msgid "could not identify current directory: %s"
msgstr "无法确认当前目录: %s"
# command.c:122
-#: ../../port/exec.c:146
+#: ../../common/exec.c:146
#, c-format
msgid "invalid binary \"%s\""
msgstr "无效的二进制码 \"%s\""
# command.c:1103
-#: ../../port/exec.c:195
+#: ../../common/exec.c:195
#, c-format
msgid "could not read binary \"%s\""
msgstr "无法读取二进制码 \"%s\""
-#: ../../port/exec.c:202
+#: ../../common/exec.c:202
#, c-format
msgid "could not find a \"%s\" to execute"
msgstr "未能找到一个 \"%s\" 来执行"
-#: ../../port/exec.c:257 ../../port/exec.c:293
+#: ../../common/exec.c:257 ../../common/exec.c:293
#, c-format
-#| msgid "could not change directory to \"%s\": %m"
msgid "could not change directory to \"%s\": %s"
msgstr "无法跳转到目录 \"%s\" 中: %s"
-#: ../../port/exec.c:272
+#: ../../common/exec.c:272
#, c-format
msgid "could not read symbolic link \"%s\""
msgstr "无法读取符号链结 \"%s\""
-#: ../../port/exec.c:523
+#: ../../common/exec.c:523
#, c-format
-#| msgid "query failed: %s"
msgid "pclose failed: %s"
msgstr "pclose调用失败: %s"
+#: ../../common/fe_memutils.c:33 ../../common/fe_memutils.c:60
+#: ../../common/fe_memutils.c:83 pg_backup_db.c:134 pg_backup_db.c:189
+#: pg_backup_db.c:233 pg_backup_db.c:279
+#, c-format
+msgid "out of memory\n"
+msgstr "内存用尽\n"
+
+# common.c:78
+#: ../../common/fe_memutils.c:77
+#, c-format
+msgid "cannot duplicate null pointer (internal error)\n"
+msgstr "无法复制空指针 (内部错误)\n"
+
+#: ../../common/wait_error.c:47
+#, c-format
+msgid "command not executable"
+msgstr "命令无法执行"
+
+#: ../../common/wait_error.c:51
+#, c-format
+msgid "command not found"
+msgstr "命令没有找到"
+
+#: ../../common/wait_error.c:56
+#, c-format
+msgid "child process exited with exit code %d"
+msgstr "子进程已退出, 退出码为 %d"
+
+#: ../../common/wait_error.c:63
+#, c-format
+msgid "child process was terminated by exception 0x%X"
+msgstr "子进程被例外(exception) 0x%X 终止"
+
+#: ../../common/wait_error.c:73
+#, c-format
+msgid "child process was terminated by signal %s"
+msgstr "子进程被信号 %s 终止"
+
+#: ../../common/wait_error.c:77
+#, c-format
+msgid "child process was terminated by signal %d"
+msgstr "子进程被信号 %d 终止"
+
+#: ../../common/wait_error.c:82
+#, c-format
+msgid "child process exited with unrecognized status %d"
+msgstr "子进程已退出, 未知状态 %d"
+
#: common.c:105
#, c-format
msgid "reading schemas\n"
@@ -177,7 +209,6 @@ msgstr "读取表继承信息\n"
#: common.c:206
#, c-format
-#| msgid "reading triggers\n"
msgid "reading event triggers\n"
msgstr "读取事件触发器\n"
@@ -246,46 +277,52 @@ msgstr "压缩IO"
msgid "invalid compression code: %d\n"
msgstr "无效的压缩码: %d\n"
-#: compress_io.c:138 compress_io.c:174 compress_io.c:195 compress_io.c:528
-#: compress_io.c:555
+#: compress_io.c:138 compress_io.c:174 compress_io.c:195 compress_io.c:514
+#: compress_io.c:541
#, c-format
msgid "not built with zlib support\n"
msgstr "没有编译成带有zlib库支持的版本\n"
-#: compress_io.c:243 compress_io.c:352
+#: compress_io.c:245 compress_io.c:347
#, c-format
msgid "could not initialize compression library: %s\n"
msgstr "无法初始化压缩库: %s\n"
-#: compress_io.c:264
+#: compress_io.c:266
#, c-format
msgid "could not close compression stream: %s\n"
msgstr "无法关闭压缩流: %s\n"
-#: compress_io.c:282
+#: compress_io.c:284
#, c-format
msgid "could not compress data: %s\n"
msgstr "无法压缩数据: %s\n"
-#: compress_io.c:303 compress_io.c:440 pg_backup_archiver.c:1437
-#: pg_backup_archiver.c:1460 pg_backup_custom.c:661 pg_backup_directory.c:529
-#: pg_backup_tar.c:598 pg_backup_tar.c:1087 pg_backup_tar.c:1308
-#, c-format
-msgid "could not write to output file: %s\n"
-msgstr "无法写到输出文件: %s\n"
-
-#: compress_io.c:372 compress_io.c:388
+#: compress_io.c:367 compress_io.c:383
#, c-format
msgid "could not uncompress data: %s\n"
msgstr "无法解压缩数据: %s\n"
-#: compress_io.c:396
+#: compress_io.c:391
#, c-format
msgid "could not close compression library: %s\n"
msgstr "无法关闭压缩库: %s\n"
+# input.c:210
+#: compress_io.c:575 compress_io.c:611 pg_backup_custom.c:590
+#: pg_backup_tar.c:563
+#, c-format
+msgid "could not read from input file: %s\n"
+msgstr "无法从输入档案读取:%s\n"
+
+# input.c:210
+#: compress_io.c:614 pg_backup_custom.c:587 pg_backup_directory.c:551
+#: pg_backup_tar.c:799 pg_backup_tar.c:823
+#, c-format
+msgid "could not read from input file: end of file\n"
+msgstr "无法从输入文件中读取:文件的结尾\n"
+
#: parallel.c:77
-#| msgid "tar archiver"
msgid "parallel archiver"
msgstr "并行归档"
@@ -296,29 +333,26 @@ msgstr "%s: WSAStartup 失败: %d\n"
#: parallel.c:343
#, c-format
-#| msgid "server is still starting up\n"
msgid "worker is terminating\n"
msgstr "工作者进程正在终止\n"
#: parallel.c:535
#, c-format
-#| msgid "could not create SSL context: %s\n"
msgid "could not create communication channels: %s\n"
msgstr "无法创建通信通道: %s\n"
# fe-connect.c:891
-#: parallel.c:605
+#: parallel.c:608
#, c-format
msgid "could not create worker process: %s\n"
msgstr "无法创建工作进程: %s\n"
-#: parallel.c:822
+#: parallel.c:825
#, c-format
-#| msgid "could not get junction for \"%s\": %s\n"
msgid "could not get relation name for OID %u: %s\n"
msgstr "无法获取OID值为%u:%s的关系名\n"
-#: parallel.c:839
+#: parallel.c:842
#, c-format
msgid ""
"could not obtain lock on relation \"%s\"\n"
@@ -330,92 +364,79 @@ msgstr ""
"这通常意味着在父进程pg_dump已经得到表的共享访问锁之后,仍有人请求该表的排它访"
"问锁.\n"
-#: parallel.c:923
+#: parallel.c:926
#, c-format
-#| msgid "unrecognized authentication option name: \"%s\""
msgid "unrecognized command on communication channel: %s\n"
msgstr "无法识别通信通上的命令:%s\n"
-#: parallel.c:956
+#: parallel.c:959
#, c-format
-#| msgid "worker process failed: exit code %d\n"
msgid "a worker process died unexpectedly\n"
msgstr "一工作者进程意外退出\n"
# fe-misc.c:515 fe-misc.c:595
-#: parallel.c:983 parallel.c:992
+#: parallel.c:986 parallel.c:995
#, c-format
-#| msgid "could not receive data from server: %s\n"
msgid "invalid message received from worker: %s\n"
msgstr "接收到来自工作者进程的无效消息: %s\n"
-#: parallel.c:989 pg_backup_db.c:336
+#: parallel.c:992 pg_backup_db.c:336
#, c-format
msgid "%s"
msgstr "%s"
-#: parallel.c:1041 parallel.c:1085
+#: parallel.c:1044 parallel.c:1088
#, c-format
msgid "error processing a parallel work item\n"
msgstr "错误处理一个并行工作项\n"
-#: parallel.c:1113 parallel.c:1251
+#: parallel.c:1116 parallel.c:1254
#, c-format
-#| msgid "could not write to output file: %s\n"
msgid "could not write to the communication channel: %s\n"
msgstr "无法写入通信通道: %s\n"
-#: parallel.c:1162
+#: parallel.c:1165
#, c-format
-#| msgid "unterminated quoted string\n"
msgid "terminated by user\n"
msgstr "已被用户终止\n"
-#: parallel.c:1214
+#: parallel.c:1217
#, c-format
-#| msgid "error during file seek: %s\n"
msgid "error in ListenToWorkers(): %s\n"
msgstr "调用ListenToWorkers()时出错: %s\n"
-#: parallel.c:1325
+#: parallel.c:1341
#, c-format
-#| msgid "could not create inherited socket: error code %d\n"
msgid "pgpipe: could not create socket: error code %d\n"
msgstr "pgpipe: 无法创建套接字: 错误码为 %d\n"
-#: parallel.c:1336
+#: parallel.c:1352
#, c-format
-#| msgid "could not initialize LDAP: error code %d"
msgid "pgpipe: could not bind: error code %d\n"
msgstr "pgpipe: 无法绑定: 错误码为%d\n"
-#: parallel.c:1343
+#: parallel.c:1359
#, c-format
-#| msgid "%s: could not allocate SIDs: error code %lu\n"
msgid "pgpipe: could not listen: error code %d\n"
msgstr "pgpipe: 无法监听: 错误码为 %d\n"
-#: parallel.c:1350
+#: parallel.c:1366
#, c-format
-#| msgid "worker process failed: exit code %d\n"
msgid "pgpipe: getsockname() failed: error code %d\n"
msgstr "pgpipe: getsockname()调用失败: 错误码为 %d\n"
-#: parallel.c:1357
+#: parallel.c:1377
#, c-format
-#| msgid "could not create inherited socket: error code %d\n"
msgid "pgpipe: could not create second socket: error code %d\n"
msgstr "pgpipe: 无法创建继承套接字: 错误码为 %d\n"
-#: parallel.c:1365
+#: parallel.c:1386
#, c-format
-#| msgid "could not create inherited socket: error code %d\n"
msgid "pgpipe: could not connect socket: error code %d\n"
msgstr "pgpipe: 无法连接套接字: 错误码为 %d\n"
-#: parallel.c:1372
+#: parallel.c:1393
#, c-format
-#| msgid "could not accept SSL connection: %m"
msgid "pgpipe: could not accept connection: error code %d\n"
msgstr "pgpipe: 无法接受连接: 错误码为 %d\n"
@@ -424,7 +445,7 @@ msgstr "pgpipe: 无法接受连接: 错误码为 %d\n"
msgid "archiver"
msgstr "归档"
-#: pg_backup_archiver.c:169 pg_backup_archiver.c:1300
+#: pg_backup_archiver.c:169 pg_backup_archiver.c:1401
#, c-format
msgid "could not close output file: %s\n"
msgstr "无法关闭输出文件: %s\n"
@@ -473,434 +494,419 @@ msgstr "为恢复数据库与数据库联接\n"
msgid "direct database connections are not supported in pre-1.3 archives\n"
msgstr "1.3 以前的归档里不支持直接数据库联接\n"
-#: pg_backup_archiver.c:339
+#: pg_backup_archiver.c:343
#, c-format
msgid "implied data-only restore\n"
msgstr "隐含的只恢复数据\n"
-#: pg_backup_archiver.c:408
+#: pg_backup_archiver.c:412
#, c-format
msgid "dropping %s %s\n"
msgstr "删除 %s %s\n"
-#: pg_backup_archiver.c:475
+#: pg_backup_archiver.c:563
#, c-format
msgid "setting owner and privileges for %s %s\n"
msgstr "为 %s %s 设置属主和权限\n"
-#: pg_backup_archiver.c:541 pg_backup_archiver.c:543
+#: pg_backup_archiver.c:629 pg_backup_archiver.c:631
#, c-format
msgid "warning from original dump file: %s\n"
msgstr "来自原始转储文件的警告: %s\n"
-#: pg_backup_archiver.c:550
+#: pg_backup_archiver.c:638
#, c-format
msgid "creating %s %s\n"
msgstr "创建 %s %s\n"
-#: pg_backup_archiver.c:594
+#: pg_backup_archiver.c:682
#, c-format
msgid "connecting to new database \"%s\"\n"
msgstr "联接到新数据库 \"%s\"\n"
-#: pg_backup_archiver.c:622
+#: pg_backup_archiver.c:710
#, c-format
-#| msgid "restoring %s\n"
msgid "processing %s\n"
msgstr "正在处理 %s\n"
-#: pg_backup_archiver.c:636
+#: pg_backup_archiver.c:730
#, c-format
-#| msgid "restoring data for table \"%s\"\n"
msgid "processing data for table \"%s\"\n"
msgstr "为表 \"%s\" 处理数据\n"
-#: pg_backup_archiver.c:698
+#: pg_backup_archiver.c:792
#, c-format
msgid "executing %s %s\n"
msgstr "执行 %s %s\n"
-#: pg_backup_archiver.c:735
+#: pg_backup_archiver.c:829
#, c-format
msgid "disabling triggers for %s\n"
msgstr "为%s禁用触发器\n"
-#: pg_backup_archiver.c:761
+#: pg_backup_archiver.c:855
#, c-format
msgid "enabling triggers for %s\n"
msgstr "为%s启用触发器\n"
-#: pg_backup_archiver.c:791
+#: pg_backup_archiver.c:885
#, c-format
msgid ""
"internal error -- WriteData cannot be called outside the context of a "
"DataDumper routine\n"
msgstr "内部错误 -- WriteData 不能在 DataDumper 过程的环境之外调用\n"
-#: pg_backup_archiver.c:948
+#: pg_backup_archiver.c:1044
#, c-format
msgid "large-object output not supported in chosen format\n"
msgstr "选定的格式不支持大对象输出\n"
-#: pg_backup_archiver.c:1002
+#: pg_backup_archiver.c:1098
#, c-format
msgid "restored %d large object\n"
msgid_plural "restored %d large objects\n"
msgstr[0] "恢复%d个大对象\n"
-#: pg_backup_archiver.c:1023 pg_backup_tar.c:731
+#: pg_backup_archiver.c:1119 pg_backup_tar.c:741
#, c-format
msgid "restoring large object with OID %u\n"
msgstr "恢复带有OID %u 的大对象\n"
-#: pg_backup_archiver.c:1035
+#: pg_backup_archiver.c:1131
#, c-format
msgid "could not create large object %u: %s"
msgstr "无法创建大对象%u: %s"
-#: pg_backup_archiver.c:1040 pg_dump.c:2662
+#: pg_backup_archiver.c:1136 pg_dump.c:2732
#, c-format
msgid "could not open large object %u: %s"
msgstr "无法打开大对象%u: %s"
# fe-lobj.c:400 fe-lobj.c:483
-#: pg_backup_archiver.c:1097
+#: pg_backup_archiver.c:1193
#, c-format
msgid "could not open TOC file \"%s\": %s\n"
msgstr "无法打开TOC文件 \"%s\": %s\n"
-#: pg_backup_archiver.c:1138
+#: pg_backup_archiver.c:1234
#, c-format
msgid "WARNING: line ignored: %s\n"
msgstr "警告: 忽略的行: %s\n"
-#: pg_backup_archiver.c:1145
+#: pg_backup_archiver.c:1241
#, c-format
msgid "could not find entry for ID %d\n"
msgstr "无法为 ID %d 找到记录\n"
-#: pg_backup_archiver.c:1166 pg_backup_directory.c:222
-#: pg_backup_directory.c:595
+#: pg_backup_archiver.c:1262 pg_backup_directory.c:229
+#: pg_backup_directory.c:600
#, c-format
msgid "could not close TOC file: %s\n"
msgstr "无法关闭 TOC 文件: %s\n"
-#: pg_backup_archiver.c:1270 pg_backup_custom.c:161 pg_backup_directory.c:333
-#: pg_backup_directory.c:581 pg_backup_directory.c:639
-#: pg_backup_directory.c:659
+#: pg_backup_archiver.c:1371 pg_backup_custom.c:161 pg_backup_directory.c:340
+#: pg_backup_directory.c:586 pg_backup_directory.c:644
+#: pg_backup_directory.c:664
#, c-format
msgid "could not open output file \"%s\": %s\n"
msgstr "无法打开输出文件\"%s\": %s\n"
-#: pg_backup_archiver.c:1273 pg_backup_custom.c:168
+#: pg_backup_archiver.c:1374 pg_backup_custom.c:168
#, c-format
msgid "could not open output file: %s\n"
msgstr "无法打开输出文件: %s\n"
-#: pg_backup_archiver.c:1373
+#: pg_backup_archiver.c:1478
#, c-format
msgid "wrote %lu byte of large object data (result = %lu)\n"
msgid_plural "wrote %lu bytes of large object data (result = %lu)\n"
msgstr[0] "已经写入了大对象的%lu字节(结果 = %lu)\n"
-#: pg_backup_archiver.c:1379
+#: pg_backup_archiver.c:1484
#, c-format
msgid "could not write to large object (result: %lu, expected: %lu)\n"
msgstr "无法写入大对象 (结果: %lu, 预期: %lu)\n"
-#: pg_backup_archiver.c:1445
-#, c-format
-msgid "could not write to custom output routine\n"
-msgstr "无法写出到客户输出过程\n"
-
-#: pg_backup_archiver.c:1483
+#: pg_backup_archiver.c:1577
#, c-format
msgid "Error while INITIALIZING:\n"
msgstr "INITIALIZING 时错误:\n"
-#: pg_backup_archiver.c:1488
+#: pg_backup_archiver.c:1582
#, c-format
msgid "Error while PROCESSING TOC:\n"
msgstr "PROCESSING TOC 时错误:\n"
-#: pg_backup_archiver.c:1493
+#: pg_backup_archiver.c:1587
#, c-format
msgid "Error while FINALIZING:\n"
msgstr "FINALIZING 时错误:\n"
-#: pg_backup_archiver.c:1498
+#: pg_backup_archiver.c:1592
#, c-format
msgid "Error from TOC entry %d; %u %u %s %s %s\n"
msgstr "错误来自 TOC 记录 %d; %u %u %s %s %s\n"
-#: pg_backup_archiver.c:1571
+#: pg_backup_archiver.c:1665
#, c-format
msgid "bad dumpId\n"
msgstr "错误的dumpId号\n"
-#: pg_backup_archiver.c:1592
+#: pg_backup_archiver.c:1686
#, c-format
msgid "bad table dumpId for TABLE DATA item\n"
msgstr "TABLE DATA 项的表dumpId错误\n"
-#: pg_backup_archiver.c:1684
+#: pg_backup_archiver.c:1778
#, c-format
msgid "unexpected data offset flag %d\n"
msgstr "意外的数据偏移标志 %d\n"
-#: pg_backup_archiver.c:1697
+#: pg_backup_archiver.c:1791
#, c-format
msgid "file offset in dump file is too large\n"
msgstr "在转储文件中的文件偏移量太大\n"
-#: pg_backup_archiver.c:1791 pg_backup_archiver.c:3247 pg_backup_custom.c:639
-#: pg_backup_directory.c:509 pg_backup_tar.c:787
-#, c-format
-msgid "unexpected end of file\n"
-msgstr "意外的文件结尾\n"
-
-#: pg_backup_archiver.c:1808
+#: pg_backup_archiver.c:1904
#, c-format
msgid "attempting to ascertain archive format\n"
msgstr "试图确认归档格式\n"
-#: pg_backup_archiver.c:1834 pg_backup_archiver.c:1844
+#: pg_backup_archiver.c:1930 pg_backup_archiver.c:1940
#, c-format
msgid "directory name too long: \"%s\"\n"
msgstr "字典名字太长: \"%s\"\n"
-#: pg_backup_archiver.c:1852
+#: pg_backup_archiver.c:1948
#, c-format
msgid ""
"directory \"%s\" does not appear to be a valid archive (\"toc.dat\" does not "
"exist)\n"
msgstr "目录 \"%s\" 看上去不像一个有效的归档 (\"toc.dat\" 不存在)\n"
-#: pg_backup_archiver.c:1860 pg_backup_custom.c:180 pg_backup_custom.c:771
-#: pg_backup_directory.c:206 pg_backup_directory.c:394
+#: pg_backup_archiver.c:1956 pg_backup_custom.c:180 pg_backup_custom.c:769
+#: pg_backup_directory.c:213 pg_backup_directory.c:401
#, c-format
msgid "could not open input file \"%s\": %s\n"
msgstr "无法打开输入文件 \"%s\": %s\n"
-#: pg_backup_archiver.c:1868 pg_backup_custom.c:187
+#: pg_backup_archiver.c:1964 pg_backup_custom.c:187
#, c-format
msgid "could not open input file: %s\n"
msgstr "无法打开输入文件: %s\n"
-#: pg_backup_archiver.c:1877
+#: pg_backup_archiver.c:1971
#, c-format
msgid "could not read input file: %s\n"
msgstr "无法读取输入文件: %s\n"
-#: pg_backup_archiver.c:1879
+#: pg_backup_archiver.c:1973
#, c-format
msgid "input file is too short (read %lu, expected 5)\n"
msgstr "输入文件太短 (读了 %lu, 预期 5)\n"
-#: pg_backup_archiver.c:1944
+#: pg_backup_archiver.c:2056
#, c-format
msgid "input file appears to be a text format dump. Please use psql.\n"
msgstr "输入文件看起来像是文本格式的dump. 请使用psql.\n"
-#: pg_backup_archiver.c:1948
+#: pg_backup_archiver.c:2062
#, c-format
msgid "input file does not appear to be a valid archive (too short?)\n"
msgstr "输入文件看上去不象有效的归档 (太短?)\n"
-#: pg_backup_archiver.c:1951
+#: pg_backup_archiver.c:2068
#, c-format
msgid "input file does not appear to be a valid archive\n"
msgstr "输入文件看上去不象有效的归档\n"
-#: pg_backup_archiver.c:1971
+#: pg_backup_archiver.c:2088
#, c-format
msgid "could not close input file: %s\n"
msgstr "无法关闭输入文件: %s\n"
-#: pg_backup_archiver.c:1988
+#: pg_backup_archiver.c:2105
#, c-format
msgid "allocating AH for %s, format %d\n"
msgstr "为 %s 分配 AH, 格式 %d\n"
-#: pg_backup_archiver.c:2093
+#: pg_backup_archiver.c:2210
#, c-format
msgid "unrecognized file format \"%d\"\n"
msgstr "不可识别的文件格式 \"%d\"\n"
-#: pg_backup_archiver.c:2243
+#: pg_backup_archiver.c:2360
#, c-format
msgid "entry ID %d out of range -- perhaps a corrupt TOC\n"
msgstr "记录 ID %d 超出范围 - 可能是损坏了的 TOC\n"
-#: pg_backup_archiver.c:2359
+#: pg_backup_archiver.c:2476
#, c-format
msgid "read TOC entry %d (ID %d) for %s %s\n"
msgstr "为 %3$s %4$s 读取 TOC 记录 %1$d (ID %2$d)\n"
-#: pg_backup_archiver.c:2393
+#: pg_backup_archiver.c:2510
#, c-format
msgid "unrecognized encoding \"%s\"\n"
msgstr "未知编码: \"%s\"\n"
-#: pg_backup_archiver.c:2398
+#: pg_backup_archiver.c:2515
#, c-format
msgid "invalid ENCODING item: %s\n"
msgstr "无效的ENCODING成员:%s\n"
-#: pg_backup_archiver.c:2416
+#: pg_backup_archiver.c:2533
#, c-format
msgid "invalid STDSTRINGS item: %s\n"
msgstr "无效的STDSTRINGS成员:%s\n"
-#: pg_backup_archiver.c:2633
+#: pg_backup_archiver.c:2750
#, c-format
msgid "could not set session user to \"%s\": %s"
msgstr "无法设置会话用户为 \"%s\": %s"
-#: pg_backup_archiver.c:2665
+#: pg_backup_archiver.c:2782
#, c-format
msgid "could not set default_with_oids: %s"
msgstr "无法设置 default_with_oids: %s"
-#: pg_backup_archiver.c:2803
+#: pg_backup_archiver.c:2920
#, c-format
msgid "could not set search_path to \"%s\": %s"
msgstr "无法设置search_path值为\"%s\": %s"
-#: pg_backup_archiver.c:2864
+#: pg_backup_archiver.c:2981
#, c-format
msgid "could not set default_tablespace to %s: %s"
msgstr "无法设置default_tablespace为 %s: %s"
-#: pg_backup_archiver.c:2974 pg_backup_archiver.c:3157
+#: pg_backup_archiver.c:3068 pg_backup_archiver.c:3251
#, c-format
msgid "WARNING: don't know how to set owner for object type %s\n"
msgstr "警告: 不知道如何为对象类型%s设置属主\n"
-#: pg_backup_archiver.c:3210
+#: pg_backup_archiver.c:3304
#, c-format
msgid ""
"WARNING: requested compression not available in this installation -- archive "
"will be uncompressed\n"
msgstr "警告: 所要求的压缩无法在本次安装中获取 - 归档将不被压缩\n"
-#: pg_backup_archiver.c:3250
+#: pg_backup_archiver.c:3343
#, c-format
msgid "did not find magic string in file header\n"
msgstr "在文件头中没有找到魔术字串\n"
-#: pg_backup_archiver.c:3263
+#: pg_backup_archiver.c:3356
#, c-format
msgid "unsupported version (%d.%d) in file header\n"
msgstr "在文件头中有不支持的版本 (%d.%d)\n"
-#: pg_backup_archiver.c:3268
+#: pg_backup_archiver.c:3361
#, c-format
msgid "sanity check on integer size (%lu) failed\n"
msgstr "整数尺寸 (%lu) 的健全检查失败\n"
-#: pg_backup_archiver.c:3272
+#: pg_backup_archiver.c:3365
#, c-format
msgid ""
"WARNING: archive was made on a machine with larger integers, some operations "
"might fail\n"
msgstr "警告: 归档不是在支持更大范围整数的主机上产生的, 有些操作可能失败\n"
-#: pg_backup_archiver.c:3282
+#: pg_backup_archiver.c:3375
#, c-format
msgid "expected format (%d) differs from format found in file (%d)\n"
msgstr "预期的格式 (%d) 和在文件里找到的格式 (%d) 不同\n"
-#: pg_backup_archiver.c:3298
+#: pg_backup_archiver.c:3391
#, c-format
msgid ""
"WARNING: archive is compressed, but this installation does not support "
"compression -- no data will be available\n"
msgstr "警告: 归档是压缩过的, 但是当前安装不支持压缩 - 数据将不可使用\n"
-#: pg_backup_archiver.c:3316
+#: pg_backup_archiver.c:3409
#, c-format
msgid "WARNING: invalid creation date in header\n"
msgstr "警告: 在头中的创建日期无效\n"
-#: pg_backup_archiver.c:3405
+#: pg_backup_archiver.c:3497
#, c-format
-#| msgid "entering restore_toc_entries_parallel\n"
msgid "entering restore_toc_entries_prefork\n"
msgstr "正在进入restore_toc_entries_prefork\n"
-#: pg_backup_archiver.c:3449
+#: pg_backup_archiver.c:3541
#, c-format
msgid "processing item %d %s %s\n"
msgstr "正在处理成员%d %s %s\n"
-#: pg_backup_archiver.c:3501
+#: pg_backup_archiver.c:3593
#, c-format
msgid "entering restore_toc_entries_parallel\n"
msgstr "正在进入restore_toc_entries_parallel\n"
-#: pg_backup_archiver.c:3549
+#: pg_backup_archiver.c:3641
#, c-format
msgid "entering main parallel loop\n"
msgstr "正在进入主并行循环\n"
-#: pg_backup_archiver.c:3560
+#: pg_backup_archiver.c:3652
#, c-format
msgid "skipping item %d %s %s\n"
msgstr "忽略成员%d %s %s\n"
-#: pg_backup_archiver.c:3570
+#: pg_backup_archiver.c:3662
#, c-format
msgid "launching item %d %s %s\n"
msgstr "正在启动成员%d %s %s\n"
-#: pg_backup_archiver.c:3628
+#: pg_backup_archiver.c:3720
#, c-format
msgid "finished main parallel loop\n"
msgstr "已完成主并行循环\n"
-#: pg_backup_archiver.c:3637
+#: pg_backup_archiver.c:3729
#, c-format
-#| msgid "entering restore_toc_entries_parallel\n"
msgid "entering restore_toc_entries_postfork\n"
msgstr "正在进入restore_toc_entries_postfork\n"
-#: pg_backup_archiver.c:3655
+#: pg_backup_archiver.c:3747
#, c-format
msgid "processing missed item %d %s %s\n"
msgstr "正在处理丢失的成员%d %s %s\n"
-#: pg_backup_archiver.c:3804
+#: pg_backup_archiver.c:3896
#, c-format
msgid "no item ready\n"
msgstr "没有成员准备好\n"
-#: pg_backup_archiver.c:3854
+#: pg_backup_archiver.c:3946
#, c-format
msgid "could not find slot of finished worker\n"
msgstr "无法找到已完成的工作进程的位置\n"
-#: pg_backup_archiver.c:3856
+#: pg_backup_archiver.c:3948
#, c-format
msgid "finished item %d %s %s\n"
msgstr "已完成的成员%d %s %s\n"
-#: pg_backup_archiver.c:3869
+#: pg_backup_archiver.c:3961
#, c-format
msgid "worker process failed: exit code %d\n"
msgstr "子进程已退出, 退出码为 %d\n"
-#: pg_backup_archiver.c:4031
+#: pg_backup_archiver.c:4123
#, c-format
msgid "transferring dependency %d -> %d to %d\n"
msgstr "传输依赖关系从%d -> %d 到%d\n"
-#: pg_backup_archiver.c:4100
+#: pg_backup_archiver.c:4196
#, c-format
msgid "reducing dependencies for %d\n"
msgstr "为%d减少依赖关系\n"
-#: pg_backup_archiver.c:4139
+#: pg_backup_archiver.c:4235
#, c-format
msgid "table \"%s\" could not be created, will not restore its data\n"
msgstr "无法创建表\"%s\" , 这样无法恢复它的数据\n"
@@ -910,22 +916,22 @@ msgstr "无法创建表\"%s\" , 这样无法恢复它的数据\n"
msgid "custom archiver"
msgstr "客户归档"
-#: pg_backup_custom.c:382 pg_backup_null.c:152
+#: pg_backup_custom.c:383 pg_backup_null.c:151
#, c-format
msgid "invalid OID for large object\n"
msgstr "大对象的无效 OID\n"
-#: pg_backup_custom.c:453
+#: pg_backup_custom.c:454
#, c-format
msgid "unrecognized data block type (%d) while searching archive\n"
msgstr "搜索归档是碰到不识别的数据块类型 (%d)\n"
-#: pg_backup_custom.c:464
+#: pg_backup_custom.c:465
#, c-format
msgid "error during file seek: %s\n"
msgstr "在文件内定位时出错: %s\n"
-#: pg_backup_custom.c:474
+#: pg_backup_custom.c:475
#, c-format
msgid ""
"could not find block ID %d in archive -- possibly due to out-of-order "
@@ -935,7 +941,7 @@ msgstr ""
"在归档中无法找到数据块ID %d -- 这可能是由于不正常的恢复引起的,这种不正常的恢"
"复通常因为在归档中缺少数据偏移量而无法处理\n"
-#: pg_backup_custom.c:479
+#: pg_backup_custom.c:480
#, c-format
msgid ""
"could not find block ID %d in archive -- possibly due to out-of-order "
@@ -944,74 +950,58 @@ msgstr ""
"在归档中无法找到数据块ID %d -- 这可能是由于不正常的恢复引起的,这种不正常的恢"
"复通常因为缺少的输入文件而无法处理\n"
-#: pg_backup_custom.c:484
+#: pg_backup_custom.c:485
#, c-format
msgid "could not find block ID %d in archive -- possibly corrupt archive\n"
msgstr "无法在归档中找到ID为%d的数据块--这可能是因为归档文件损坏\n"
-#: pg_backup_custom.c:491
+#: pg_backup_custom.c:492
#, c-format
msgid "found unexpected block ID (%d) when reading data -- expected %d\n"
msgstr "读取数据时发现意外块 ID (%d) - 预期是 %d\n"
-#: pg_backup_custom.c:505
+#: pg_backup_custom.c:506
#, c-format
msgid "unrecognized data block type %d while restoring archive\n"
msgstr "恢复归档时碰到不识别的数据块类型 %d\n"
-# input.c:210
-#: pg_backup_custom.c:587 pg_backup_custom.c:995
-#, c-format
-msgid "could not read from input file: end of file\n"
-msgstr "无法从输入文件中读取:文件的结尾\n"
-
-# input.c:210
-#: pg_backup_custom.c:590 pg_backup_custom.c:998
+#: pg_backup_custom.c:708 pg_backup_custom.c:758 pg_backup_custom.c:907
+#: pg_backup_tar.c:1086
#, c-format
-msgid "could not read from input file: %s\n"
-msgstr "无法从输入档案读取:%s\n"
-
-#: pg_backup_custom.c:619
-#, c-format
-msgid "could not write byte: %s\n"
-msgstr "无法写字节: %s\n"
+msgid "could not determine seek position in archive file: %s\n"
+msgstr "无法在归档文件中确定查找位置: %s\n"
-#: pg_backup_custom.c:727 pg_backup_custom.c:765
+#: pg_backup_custom.c:726 pg_backup_custom.c:763
#, c-format
msgid "could not close archive file: %s\n"
msgstr "无法关闭归档文件: %s\n"
-#: pg_backup_custom.c:746
+#: pg_backup_custom.c:745
#, c-format
msgid "can only reopen input archives\n"
msgstr "只能重新打开输入归档\n"
-#: pg_backup_custom.c:753
+#: pg_backup_custom.c:752
#, c-format
msgid "parallel restore from standard input is not supported\n"
msgstr "不支持从标准输入进行并行恢复\n"
-#: pg_backup_custom.c:755
+#: pg_backup_custom.c:754
#, c-format
msgid "parallel restore from non-seekable file is not supported\n"
msgstr "不支持从不可随机寻址的文件里并行恢复\n"
-#: pg_backup_custom.c:760
-#, c-format
-msgid "could not determine seek position in archive file: %s\n"
-msgstr "无法在归档文件中确定查找位置: %s\n"
-
-#: pg_backup_custom.c:775
+#: pg_backup_custom.c:773
#, c-format
msgid "could not set seek position in archive file: %s\n"
msgstr "无法在归档文件中设置查找位置: %s\n"
-#: pg_backup_custom.c:793
+#: pg_backup_custom.c:791
#, c-format
msgid "compressor active\n"
msgstr "压缩程序已激活\n"
-#: pg_backup_custom.c:903
+#: pg_backup_custom.c:911
#, c-format
msgid "WARNING: ftell mismatch with expected position -- ftell used\n"
msgstr "警告: ftell 和预期位置不匹配 -- 使用 ftell\n"
@@ -1026,12 +1016,12 @@ msgstr "归档 (db)"
msgid "could not get server_version from libpq\n"
msgstr "无法从 libpq 获取服务器版本\n"
-#: pg_backup_db.c:54 pg_dumpall.c:1896
+#: pg_backup_db.c:54 pg_dumpall.c:1934
#, c-format
msgid "server version: %s; %s version: %s\n"
msgstr "服务器版本: %s; %s 版本: %s\n"
-#: pg_backup_db.c:56 pg_dumpall.c:1898
+#: pg_backup_db.c:56 pg_dumpall.c:1936
#, c-format
msgid "aborting because of server version mismatch\n"
msgstr "因为服务器版本不匹配而终止\n"
@@ -1042,7 +1032,7 @@ msgid "connecting to database \"%s\" as user \"%s\"\n"
msgstr "以用户 \"%2$s\" 的身份联接到数据库 \"%1$s\"\n"
#: pg_backup_db.c:132 pg_backup_db.c:184 pg_backup_db.c:231 pg_backup_db.c:277
-#: pg_dumpall.c:1726 pg_dumpall.c:1834
+#: pg_dumpall.c:1764 pg_dumpall.c:1872
msgid "Password: "
msgstr "口令: "
@@ -1092,31 +1082,31 @@ msgstr "查询是: %s\n"
msgid "%s: %s Command was: %s\n"
msgstr "%s: %s 命令是: %s\n"
-#: pg_backup_db.c:460 pg_backup_db.c:531 pg_backup_db.c:538
+#: pg_backup_db.c:465 pg_backup_db.c:537 pg_backup_db.c:544
msgid "could not execute query"
msgstr "无法执行查询"
-#: pg_backup_db.c:511
+#: pg_backup_db.c:516
#, c-format
msgid "error returned by PQputCopyData: %s"
msgstr "PQputCopyData返回错误: %s"
-#: pg_backup_db.c:557
+#: pg_backup_db.c:563
#, c-format
msgid "error returned by PQputCopyEnd: %s"
msgstr "PQputCopyEnd返回错误: %s"
# describe.c:933
-#: pg_backup_db.c:563
+#: pg_backup_db.c:569
#, c-format
msgid "COPY failed for table \"%s\": %s"
msgstr "复制表 \"%s\"失败: %s"
-#: pg_backup_db.c:574
+#: pg_backup_db.c:580
msgid "could not start database transaction"
msgstr "无法开始数据库事务"
-#: pg_backup_db.c:580
+#: pg_backup_db.c:586
msgid "could not commit database transaction"
msgstr "无法提交数据库事务"
@@ -1130,58 +1120,63 @@ msgstr "目录归档器"
msgid "no output directory specified\n"
msgstr "没有指定输出目录\n"
-#: pg_backup_directory.c:193
+#: pg_backup_directory.c:190
+#, c-format
+msgid "could not read directory \"%s\": %s\n"
+msgstr "无法读取目录 \"%s\": %s\n"
+
+#: pg_backup_directory.c:194
+#, c-format
+#| msgid "could not open directory \"%s\": %s\n"
+msgid "could not close directory \"%s\": %s\n"
+msgstr "无法关闭目录 \"%s\": %s\n"
+
+#: pg_backup_directory.c:200
#, c-format
msgid "could not create directory \"%s\": %s\n"
msgstr "无法创建目录 \"%s\": %s\n"
-#: pg_backup_directory.c:405
+#: pg_backup_directory.c:412
#, c-format
msgid "could not close data file: %s\n"
msgstr "无法关闭数据文件: %s\n"
-#: pg_backup_directory.c:446
+#: pg_backup_directory.c:453
#, c-format
msgid "could not open large object TOC file \"%s\" for input: %s\n"
msgstr "无法为输入: %s打开大对象文件\"%s\"\n"
-#: pg_backup_directory.c:456
+#: pg_backup_directory.c:464
#, c-format
msgid "invalid line in large object TOC file \"%s\": \"%s\"\n"
msgstr "无效行存在于大对象文件\"%s\": \"%s\"\n"
-#: pg_backup_directory.c:465
+#: pg_backup_directory.c:473
#, c-format
msgid "error reading large object TOC file \"%s\"\n"
msgstr "在读取大对象文件\"%s\"时发生错误\n"
-#: pg_backup_directory.c:469
+#: pg_backup_directory.c:477
#, c-format
msgid "could not close large object TOC file \"%s\": %s\n"
msgstr "无法关闭大对象 TOC 文件\"%s\": %s\n"
-#: pg_backup_directory.c:490
-#, c-format
-msgid "could not write byte\n"
-msgstr "无法写字节\n"
-
-#: pg_backup_directory.c:682
+#: pg_backup_directory.c:687
#, c-format
msgid "could not write to blobs TOC file\n"
msgstr "无法写入BLOB到大对象TOC文件\n"
-#: pg_backup_directory.c:714
+#: pg_backup_directory.c:719
#, c-format
msgid "file name too long: \"%s\"\n"
msgstr "文件名超长: \"%s\"\n"
-#: pg_backup_directory.c:800
+#: pg_backup_directory.c:805
#, c-format
-#| msgid "error during file seek: %s\n"
msgid "error during backup\n"
msgstr "在备份过程中出错\n"
-#: pg_backup_null.c:77
+#: pg_backup_null.c:76
#, c-format
msgid "this format cannot be read\n"
msgstr "无法读取这个格式\n"
@@ -1236,68 +1231,58 @@ msgstr "无法打开临时文件\n"
msgid "could not close tar member\n"
msgstr "无法关闭 tar 成员\n"
-#: pg_backup_tar.c:560
+#: pg_backup_tar.c:573
#, c-format
msgid "internal error -- neither th nor fh specified in tarReadRaw()\n"
msgstr "内部错误 -- 在 tarReadRaw() 里既未声明 th 也未声明 fh\n"
-#: pg_backup_tar.c:686
+#: pg_backup_tar.c:696
#, c-format
msgid "unexpected COPY statement syntax: \"%s\"\n"
msgstr "意外的COPY语句语法: \"%s\"\n"
-#: pg_backup_tar.c:889
-#, c-format
-msgid "could not write null block at end of tar archive\n"
-msgstr "无法在 tar 归档末尾写 null 块\n"
-
-#: pg_backup_tar.c:944
+#: pg_backup_tar.c:958
#, c-format
msgid "invalid OID for large object (%u)\n"
msgstr "用于大对象的非法 OID (%u)\n"
-#: pg_backup_tar.c:1078
+#: pg_backup_tar.c:1095
#, c-format
msgid "archive member too large for tar format\n"
msgstr "在 tar 格式中归档成员太大\n"
# command.c:1148
-#: pg_backup_tar.c:1093
+#: pg_backup_tar.c:1109
#, c-format
msgid "could not close temporary file: %s\n"
msgstr "无法关闭临时文件: %s\n"
-#: pg_backup_tar.c:1103
+#: pg_backup_tar.c:1119
#, c-format
msgid "actual file length (%s) does not match expected (%s)\n"
msgstr "实际文件长度 (%s) 不匹配预期的长度 (%s)\n"
-#: pg_backup_tar.c:1111
-#, c-format
-msgid "could not output padding at end of tar member\n"
-msgstr "无法在 tar 成员尾部输出填充内容\n"
-
-#: pg_backup_tar.c:1140
+#: pg_backup_tar.c:1156
#, c-format
msgid "moving from position %s to next member at file position %s\n"
msgstr "从位置 %s 移动到文件位置 %s 的下一个成员\n"
-#: pg_backup_tar.c:1151
+#: pg_backup_tar.c:1167
#, c-format
msgid "now at file position %s\n"
msgstr "现在在文件的位置 %s\n"
-#: pg_backup_tar.c:1160 pg_backup_tar.c:1190
+#: pg_backup_tar.c:1176 pg_backup_tar.c:1206
#, c-format
msgid "could not find header for file \"%s\" in tar archive\n"
msgstr "无法在tar归档中为文件\"%s\"找到标题头\n"
-#: pg_backup_tar.c:1174
+#: pg_backup_tar.c:1190
#, c-format
msgid "skipping tar member %s\n"
msgstr "忽略 tar 成员 %s\n"
-#: pg_backup_tar.c:1178
+#: pg_backup_tar.c:1194
#, c-format
msgid ""
"restoring data out of order is not supported in this archive format: \"%s\" "
@@ -1306,23 +1291,18 @@ msgstr ""
"这个归档格式里不支持不按照顺序转储数据: 要求\"%s\" ,但它在归档文件里位于\"%s"
"\"前面.\n"
-#: pg_backup_tar.c:1224
-#, c-format
-msgid "mismatch in actual vs. predicted file position (%s vs. %s)\n"
-msgstr "实际文件位置和预期文件位置不匹配 (%s 对 %s)\n"
-
-#: pg_backup_tar.c:1239
+#: pg_backup_tar.c:1241
#, c-format
msgid "incomplete tar header found (%lu byte)\n"
msgid_plural "incomplete tar header found (%lu bytes)\n"
msgstr[0] "找到未完成的tar文件头(%lu个字节)\n"
-#: pg_backup_tar.c:1277
+#: pg_backup_tar.c:1279
#, c-format
msgid "TOC Entry %s at %s (length %lu, checksum %d)\n"
msgstr "在 %2$s 的 TOC 记录 %1$s (长度 %3$lu, 校验和 %4$d)\n"
-#: pg_backup_tar.c:1287
+#: pg_backup_tar.c:1289
#, c-format
msgid ""
"corrupt tar header found in %s (expected %d, computed %d) file position %s\n"
@@ -1334,9 +1314,9 @@ msgstr ""
msgid "%s: unrecognized section name: \"%s\"\n"
msgstr "%s: 无法识别的节名称: \"%s\"\n"
-#: pg_backup_utils.c:56 pg_dump.c:540 pg_dump.c:557 pg_dumpall.c:303
-#: pg_dumpall.c:313 pg_dumpall.c:323 pg_dumpall.c:332 pg_dumpall.c:341
-#: pg_dumpall.c:399 pg_restore.c:282 pg_restore.c:298 pg_restore.c:310
+#: pg_backup_utils.c:56 pg_dump.c:539 pg_dump.c:556 pg_dumpall.c:305
+#: pg_dumpall.c:315 pg_dumpall.c:325 pg_dumpall.c:334 pg_dumpall.c:350
+#: pg_dumpall.c:408 pg_restore.c:278 pg_restore.c:294 pg_restore.c:306
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "输入 \"%s --help\" 获取更多的信息.\n"
@@ -1346,7 +1326,7 @@ msgstr "输入 \"%s --help\" 获取更多的信息.\n"
msgid "out of on_exit_nicely slots\n"
msgstr "超出on_exit_nicely槽\n"
-#: pg_dump.c:555 pg_dumpall.c:311 pg_restore.c:296
+#: pg_dump.c:554 pg_dumpall.c:313 pg_restore.c:292
#, c-format
msgid "%s: too many command-line arguments (first is \"%s\")\n"
msgstr "%s: 命令行参数太多 (第一个是 \"%s\")\n"
@@ -1356,41 +1336,44 @@ msgstr "%s: 命令行参数太多 (第一个是 \"%s\")\n"
msgid "options -s/--schema-only and -a/--data-only cannot be used together\n"
msgstr "选项 -s/--schema-only和-a/--data-only 不能同时使用.\n"
-#: pg_dump.c:570
+#: pg_dump.c:573
#, c-format
msgid "options -c/--clean and -a/--data-only cannot be used together\n"
msgstr "选项 -c/--clean和 -a/--data-only不能同时使用.\n"
-#: pg_dump.c:574
+#: pg_dump.c:579
#, c-format
msgid ""
"options --inserts/--column-inserts and -o/--oids cannot be used together\n"
msgstr "选项--inserts/--column-inserts和-o/--oids不能同时使用.\n"
-#: pg_dump.c:575
+#: pg_dump.c:580
#, c-format
msgid "(The INSERT command cannot set OIDs.)\n"
msgstr "(INSERT 命令无法设置对象标识(oid).)\n"
-#: pg_dump.c:605
+#: pg_dump.c:585
+#, c-format
+msgid "option --if-exists requires option -c/--clean\n"
+msgstr "选项 --if-exists 需要选项 -c/ --clean \n"
+
+#: pg_dump.c:613
#, c-format
-#| msgid "%s: invalid port number \"%s\"\n"
msgid "%s: invalid number of parallel jobs\n"
msgstr "%s: 无效的并行工作数\n"
# input.c:213
-#: pg_dump.c:609
+#: pg_dump.c:617
#, c-format
-#| msgid "parallel restore is not supported with this archive file format\n"
msgid "parallel backup only supported by the directory format\n"
msgstr "并行备份只被目录格式支持\n"
-#: pg_dump.c:619
+#: pg_dump.c:627
#, c-format
msgid "could not open output file \"%s\" for writing\n"
msgstr "无法打开输出文件 \"%s\" 用于写出\n"
-#: pg_dump.c:678
+#: pg_dump.c:686
#, c-format
msgid ""
"Synchronized snapshots are not supported by this server version.\n"
@@ -1401,24 +1384,24 @@ msgstr ""
"如果不需要同步快照功能,\n"
"可以带参数 --no-synchronized-snapshots运行.\n"
-#: pg_dump.c:691
+#: pg_dump.c:699
#, c-format
msgid "last built-in OID is %u\n"
msgstr "最后的内置 OID 是 %u\n"
# describe.c:1542
-#: pg_dump.c:700
+#: pg_dump.c:708
#, c-format
msgid "No matching schemas were found\n"
msgstr "没有找到符合的关联。\n"
# describe.c:1542
-#: pg_dump.c:712
+#: pg_dump.c:720
#, c-format
msgid "No matching tables were found\n"
msgstr "没有找到符合的关联。\n"
-#: pg_dump.c:856
+#: pg_dump.c:865
#, c-format
msgid ""
"%s dumps a database as a text file or to other formats.\n"
@@ -1427,17 +1410,17 @@ msgstr ""
"%s 把一个数据库转储为纯文本文件或者是其它格式.\n"
"\n"
-#: pg_dump.c:857 pg_dumpall.c:541 pg_restore.c:414
+#: pg_dump.c:866 pg_dumpall.c:553 pg_restore.c:432
#, c-format
msgid "Usage:\n"
msgstr "用法:\n"
-#: pg_dump.c:858
+#: pg_dump.c:867
#, c-format
msgid " %s [OPTION]... [DBNAME]\n"
msgstr " %s [选项]... [数据库名字]\n"
-#: pg_dump.c:860 pg_dumpall.c:544 pg_restore.c:417
+#: pg_dump.c:869 pg_dumpall.c:556 pg_restore.c:435
#, c-format
msgid ""
"\n"
@@ -1446,12 +1429,12 @@ msgstr ""
"\n"
"一般选项:\n"
-#: pg_dump.c:861
+#: pg_dump.c:870
#, c-format
msgid " -f, --file=FILENAME output file or directory name\n"
msgstr " -f, --file=FILENAME 输出文件或目录名\n"
-#: pg_dump.c:862
+#: pg_dump.c:871
#, c-format
msgid ""
" -F, --format=c|d|t|p output file format (custom, directory, tar,\n"
@@ -1460,41 +1443,39 @@ msgstr ""
" -F, --format=c|d|t|p 输出文件格式 (定制, 目录, tar)\n"
" 明文 (默认值))\n"
-#: pg_dump.c:864
+#: pg_dump.c:873
#, c-format
-#| msgid ""
-#| " -j, --jobs=NUM use this many parallel jobs to restore\n"
msgid " -j, --jobs=NUM use this many parallel jobs to dump\n"
msgstr " -j, --jobs=NUM 执行多个并行任务进行备份转储工作\n"
-#: pg_dump.c:865
+#: pg_dump.c:874
#, c-format
msgid " -v, --verbose verbose mode\n"
msgstr " -v, --verbose 详细模式\n"
-#: pg_dump.c:866 pg_dumpall.c:546
+#: pg_dump.c:875 pg_dumpall.c:558
#, c-format
msgid " -V, --version output version information, then exit\n"
msgstr " -V, --version 输出版本信息,然后退出\n"
-#: pg_dump.c:867
+#: pg_dump.c:876
#, c-format
msgid ""
" -Z, --compress=0-9 compression level for compressed formats\n"
msgstr " -Z, --compress=0-9 被压缩格式的压缩级别\n"
-#: pg_dump.c:868 pg_dumpall.c:547
+#: pg_dump.c:877 pg_dumpall.c:559
#, c-format
msgid ""
" --lock-wait-timeout=TIMEOUT fail after waiting TIMEOUT for a table lock\n"
msgstr " --lock-wait-timeout=TIMEOUT 在等待表锁超时后操作失败\n"
-#: pg_dump.c:869 pg_dumpall.c:548
+#: pg_dump.c:878 pg_dumpall.c:560
#, c-format
msgid " -?, --help show this help, then exit\n"
msgstr " -?, --help 显示此帮助, 然后退出\n"
-#: pg_dump.c:871 pg_dumpall.c:549
+#: pg_dump.c:880 pg_dumpall.c:561
#, c-format
msgid ""
"\n"
@@ -1503,17 +1484,17 @@ msgstr ""
"\n"
"控制输出内容选项:\n"
-#: pg_dump.c:872 pg_dumpall.c:550
+#: pg_dump.c:881 pg_dumpall.c:562
#, c-format
msgid " -a, --data-only dump only the data, not the schema\n"
msgstr " -a, --data-only 只转储数据,不包括模式\n"
-#: pg_dump.c:873
+#: pg_dump.c:882
#, c-format
msgid " -b, --blobs include large objects in dump\n"
msgstr " -b, --blobs 在转储中包括大对象\n"
-#: pg_dump.c:874 pg_restore.c:428
+#: pg_dump.c:883 pg_restore.c:446
#, c-format
msgid ""
" -c, --clean clean (drop) database objects before "
@@ -1521,33 +1502,33 @@ msgid ""
msgstr ""
" -c, --clean 在重新创建之前,先清除(删除)数据库对象\n"
-#: pg_dump.c:875
+#: pg_dump.c:884
#, c-format
msgid ""
" -C, --create include commands to create database in dump\n"
msgstr " -C, --create 在转储中包括命令,以便创建数据库\n"
-#: pg_dump.c:876
+#: pg_dump.c:885
#, c-format
msgid " -E, --encoding=ENCODING dump the data in encoding ENCODING\n"
msgstr " -E, --encoding=ENCODING 转储以ENCODING形式编码的数据\n"
-#: pg_dump.c:877
+#: pg_dump.c:886
#, c-format
msgid " -n, --schema=SCHEMA dump the named schema(s) only\n"
msgstr " -n, --schema=SCHEMA 只转储指定名称的模式\n"
-#: pg_dump.c:878
+#: pg_dump.c:887
#, c-format
msgid " -N, --exclude-schema=SCHEMA do NOT dump the named schema(s)\n"
msgstr " -N, --exclude-schema=SCHEMA 不转储已命名的模式\n"
-#: pg_dump.c:879 pg_dumpall.c:553
+#: pg_dump.c:888 pg_dumpall.c:565
#, c-format
msgid " -o, --oids include OIDs in dump\n"
msgstr " -o, --oids 在转储中包括 OID\n"
-#: pg_dump.c:880
+#: pg_dump.c:889
#, c-format
msgid ""
" -O, --no-owner skip restoration of object ownership in\n"
@@ -1556,46 +1537,46 @@ msgstr ""
" -O, --no-owner 在明文格式中, 忽略恢复对象所属者\n"
"\n"
-#: pg_dump.c:882 pg_dumpall.c:556
+#: pg_dump.c:891 pg_dumpall.c:568
#, c-format
msgid " -s, --schema-only dump only the schema, no data\n"
msgstr " -s, --schema-only 只转储模式, 不包括数据\n"
-#: pg_dump.c:883
+#: pg_dump.c:892
#, c-format
msgid ""
" -S, --superuser=NAME superuser user name to use in plain-text "
"format\n"
msgstr " -S, --superuser=NAME 在明文格式中使用指定的超级用户名\n"
-#: pg_dump.c:884
+#: pg_dump.c:893
#, c-format
msgid " -t, --table=TABLE dump the named table(s) only\n"
msgstr " -t, --table=TABLE 只转储指定名称的表\n"
-#: pg_dump.c:885
+#: pg_dump.c:894
#, c-format
msgid " -T, --exclude-table=TABLE do NOT dump the named table(s)\n"
msgstr " -T, --exclude-table=TABLE 不转储指定名称的表\n"
-#: pg_dump.c:886 pg_dumpall.c:559
+#: pg_dump.c:895 pg_dumpall.c:571
#, c-format
msgid " -x, --no-privileges do not dump privileges (grant/revoke)\n"
msgstr " -x, --no-privileges 不要转储权限 (grant/revoke)\n"
-#: pg_dump.c:887 pg_dumpall.c:560
+#: pg_dump.c:896 pg_dumpall.c:572
#, c-format
msgid " --binary-upgrade for use by upgrade utilities only\n"
msgstr " --binary-upgrade 只能由升级工具使用\n"
-#: pg_dump.c:888 pg_dumpall.c:561
+#: pg_dump.c:897 pg_dumpall.c:573
#, c-format
msgid ""
" --column-inserts dump data as INSERT commands with column "
"names\n"
msgstr " --column-inserts 以带有列名的INSERT命令形式转储数据\n"
-#: pg_dump.c:889 pg_dumpall.c:562
+#: pg_dump.c:898 pg_dumpall.c:574
#, c-format
msgid ""
" --disable-dollar-quoting disable dollar quoting, use SQL standard "
@@ -1603,19 +1584,26 @@ msgid ""
msgstr ""
" --disable-dollar-quoting 取消美元 (符号) 引号, 使用 SQL 标准引号\n"
-#: pg_dump.c:890 pg_dumpall.c:563 pg_restore.c:444
+#: pg_dump.c:899 pg_dumpall.c:575 pg_restore.c:462
#, c-format
msgid ""
" --disable-triggers disable triggers during data-only restore\n"
msgstr " --disable-triggers 在只恢复数据的过程中禁用触发器\n"
-#: pg_dump.c:891
+#: pg_dump.c:900
#, c-format
msgid ""
" --exclude-table-data=TABLE do NOT dump data for the named table(s)\n"
msgstr " --exclude-table-data=TABLE 不转储指定名称的表中的数据\n"
-#: pg_dump.c:892 pg_dumpall.c:564
+#: pg_dump.c:901 pg_dumpall.c:576 pg_restore.c:463
+#, c-format
+#| msgid ""
+#| " --if-exists don't report error if user doesn't exist\n"
+msgid " --if-exists use IF EXISTS when dropping objects\n"
+msgstr " --if-exists 当删除对象时使用IF EXISTS\n"
+
+#: pg_dump.c:902 pg_dumpall.c:577
#, c-format
msgid ""
" --inserts dump data as INSERT commands, rather than "
@@ -1623,35 +1611,35 @@ msgid ""
msgstr ""
" --inserts 以INSERT命令,而不是COPY命令的形式转储数据\n"
-#: pg_dump.c:893 pg_dumpall.c:565
+#: pg_dump.c:903 pg_dumpall.c:578
#, c-format
msgid " --no-security-labels do not dump security label assignments\n"
msgstr " --no-security-labels 不转储安全标签的分配\n"
-#: pg_dump.c:894
+#: pg_dump.c:904
#, c-format
msgid ""
" --no-synchronized-snapshots do not use synchronized snapshots in parallel "
"jobs\n"
msgstr " --no-synchronized-snapshots 在并行工作集中不使用同步快照\n"
-#: pg_dump.c:895 pg_dumpall.c:566
+#: pg_dump.c:905 pg_dumpall.c:579
#, c-format
msgid " --no-tablespaces do not dump tablespace assignments\n"
msgstr " --no-tablespaces 不转储表空间分配信息\n"
-#: pg_dump.c:896 pg_dumpall.c:567
+#: pg_dump.c:906 pg_dumpall.c:580
#, c-format
msgid " --no-unlogged-table-data do not dump unlogged table data\n"
msgstr " --no-unlogged-table-data 不转储没有日志的表数据\n"
-#: pg_dump.c:897 pg_dumpall.c:568
+#: pg_dump.c:907 pg_dumpall.c:581
#, c-format
msgid ""
" --quote-all-identifiers quote all identifiers, even if not key words\n"
msgstr " --quote-all-identifiers 所有标识符加引号,即使不是关键字\n"
-#: pg_dump.c:898
+#: pg_dump.c:908
#, c-format
msgid ""
" --section=SECTION dump named section (pre-data, data, or post-"
@@ -1659,14 +1647,14 @@ msgid ""
msgstr ""
" --section=SECTION 备份命名的节 (数据前, 数据, 及 数据后)\n"
-#: pg_dump.c:899
+#: pg_dump.c:909
#, c-format
msgid ""
" --serializable-deferrable wait until the dump can run without "
"anomalies\n"
msgstr " --serializable-deferrable 等到备份可以无异常运行\n"
-#: pg_dump.c:900 pg_dumpall.c:569 pg_restore.c:450
+#: pg_dump.c:910 pg_dumpall.c:582 pg_restore.c:469
#, c-format
msgid ""
" --use-set-session-authorization\n"
@@ -1678,7 +1666,7 @@ msgstr ""
" 使用 SESSION AUTHORIZATION 命令代替\n"
" ALTER OWNER 命令来设置所有权\n"
-#: pg_dump.c:904 pg_dumpall.c:573 pg_restore.c:454
+#: pg_dump.c:914 pg_dumpall.c:586 pg_restore.c:473
#, c-format
msgid ""
"\n"
@@ -1687,45 +1675,44 @@ msgstr ""
"\n"
"联接选项:\n"
-#: pg_dump.c:905
+#: pg_dump.c:915
#, c-format
-#| msgid " -d, --dbname=DBNAME database to cluster\n"
msgid " -d, --dbname=DBNAME database to dump\n"
msgstr " -d, --dbname=DBNAME 对数据库 DBNAME备份\n"
-#: pg_dump.c:906 pg_dumpall.c:575 pg_restore.c:455
+#: pg_dump.c:916 pg_dumpall.c:588 pg_restore.c:474
#, c-format
msgid " -h, --host=HOSTNAME database server host or socket directory\n"
msgstr " -h, --host=主机名 数据库服务器的主机名或套接字目录\n"
-#: pg_dump.c:907 pg_dumpall.c:577 pg_restore.c:456
+#: pg_dump.c:917 pg_dumpall.c:590 pg_restore.c:475
#, c-format
msgid " -p, --port=PORT database server port number\n"
msgstr " -p, --port=端口号 数据库服务器的端口号\n"
-#: pg_dump.c:908 pg_dumpall.c:578 pg_restore.c:457
+#: pg_dump.c:918 pg_dumpall.c:591 pg_restore.c:476
#, c-format
msgid " -U, --username=NAME connect as specified database user\n"
msgstr " -U, --username=名字 以指定的数据库用户联接\n"
-#: pg_dump.c:909 pg_dumpall.c:579 pg_restore.c:458
+#: pg_dump.c:919 pg_dumpall.c:592 pg_restore.c:477
#, c-format
msgid " -w, --no-password never prompt for password\n"
msgstr " -w, --no-password 永远不提示输入口令\n"
-#: pg_dump.c:910 pg_dumpall.c:580 pg_restore.c:459
+#: pg_dump.c:920 pg_dumpall.c:593 pg_restore.c:478
#, c-format
msgid ""
" -W, --password force password prompt (should happen "
"automatically)\n"
msgstr " -W, --password 强制口令提示 (自动)\n"
-#: pg_dump.c:911 pg_dumpall.c:581
+#: pg_dump.c:921 pg_dumpall.c:594
#, c-format
msgid " --role=ROLENAME do SET ROLE before dump\n"
msgstr " --role=ROLENAME 在转储前运行SET ROLE\n"
-#: pg_dump.c:913
+#: pg_dump.c:923
#, c-format
msgid ""
"\n"
@@ -1738,154 +1725,154 @@ msgstr ""
"的数值.\n"
"\n"
-#: pg_dump.c:915 pg_dumpall.c:585 pg_restore.c:463
+#: pg_dump.c:925 pg_dumpall.c:598 pg_restore.c:485
#, c-format
msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
msgstr "报告错误至 <pgsql-bugs@postgresql.org>.\n"
-#: pg_dump.c:933
+#: pg_dump.c:943
#, c-format
msgid "invalid client encoding \"%s\" specified\n"
msgstr "声明了无效的输出格式 \"%s\"\n"
-#: pg_dump.c:1095
+#: pg_dump.c:1105
#, c-format
msgid "invalid output format \"%s\" specified\n"
msgstr "声明了非法的输出格式 \"%s\"\n"
-#: pg_dump.c:1117
+#: pg_dump.c:1127
#, c-format
msgid "server version must be at least 7.3 to use schema selection switches\n"
msgstr "服务器版本必须至少是7.3才能使用模式选择转换\n"
-#: pg_dump.c:1393
+#: pg_dump.c:1403
#, c-format
msgid "dumping contents of table %s\n"
msgstr "正在转储表 %s 的内容\n"
-#: pg_dump.c:1516
+#: pg_dump.c:1526
#, c-format
msgid "Dumping the contents of table \"%s\" failed: PQgetCopyData() failed.\n"
msgstr "转储表 \"%s\" 的内容的 SQL 命令失败: PQendcopy() 失败.\n"
-#: pg_dump.c:1517 pg_dump.c:1527
+#: pg_dump.c:1527 pg_dump.c:1537
#, c-format
msgid "Error message from server: %s"
msgstr "来自服务器的错误信息: %s"
-#: pg_dump.c:1518 pg_dump.c:1528
+#: pg_dump.c:1528 pg_dump.c:1538
#, c-format
msgid "The command was: %s\n"
msgstr "命令是: %s\n"
-#: pg_dump.c:1526
+#: pg_dump.c:1536
#, c-format
msgid "Dumping the contents of table \"%s\" failed: PQgetResult() failed.\n"
msgstr "转储表 \"%s\" 的内容失败: PQgetResult() 失败.\n"
-#: pg_dump.c:2136
+#: pg_dump.c:2174
#, c-format
msgid "saving database definition\n"
msgstr "保存数据库定义\n"
-#: pg_dump.c:2433
+#: pg_dump.c:2503
#, c-format
msgid "saving encoding = %s\n"
msgstr "正在保存encoding = %s\n"
-#: pg_dump.c:2460
+#: pg_dump.c:2530
#, c-format
msgid "saving standard_conforming_strings = %s\n"
msgstr "正在保存standard_conforming_strings = %s\n"
-#: pg_dump.c:2493
+#: pg_dump.c:2563
#, c-format
msgid "reading large objects\n"
msgstr "正在读取大对象\n"
-#: pg_dump.c:2625
+#: pg_dump.c:2695
#, c-format
msgid "saving large objects\n"
msgstr "保存大对象\n"
-#: pg_dump.c:2672
+#: pg_dump.c:2742
#, c-format
msgid "error reading large object %u: %s"
msgstr "在读取大对象时发生错误%u: %s"
-#: pg_dump.c:2865
+#: pg_dump.c:2935
#, c-format
msgid "could not find parent extension for %s\n"
msgstr "无法找到父扩展%s\n"
-#: pg_dump.c:2968
+#: pg_dump.c:3038
#, c-format
msgid "WARNING: owner of schema \"%s\" appears to be invalid\n"
msgstr "警告: 模式 \"%s\" 的所有者非法\n"
-#: pg_dump.c:3011
+#: pg_dump.c:3081
#, c-format
msgid "schema with OID %u does not exist\n"
msgstr "OID %u 的模式不存在\n"
-#: pg_dump.c:3361
+#: pg_dump.c:3431
#, c-format
msgid "WARNING: owner of data type \"%s\" appears to be invalid\n"
msgstr "警告: 数据类型 \"%s\" 的所有者非法\n"
-#: pg_dump.c:3472
+#: pg_dump.c:3542
#, c-format
msgid "WARNING: owner of operator \"%s\" appears to be invalid\n"
msgstr "警告: 操作符 \"%s\" 的所有者非法\n"
-#: pg_dump.c:3729
+#: pg_dump.c:3801
#, c-format
msgid "WARNING: owner of operator class \"%s\" appears to be invalid\n"
msgstr "警告: 操作符表 \"%s\" 无效\n"
-#: pg_dump.c:3817
+#: pg_dump.c:3889
#, c-format
msgid "WARNING: owner of operator family \"%s\" appears to be invalid\n"
msgstr "警告: 操作符 \"%s\" 的所有者无效\n"
-#: pg_dump.c:3976
+#: pg_dump.c:4048
#, c-format
msgid "WARNING: owner of aggregate function \"%s\" appears to be invalid\n"
msgstr "警告: 聚集函数 \"%s\" 的所有者非法\n"
-#: pg_dump.c:4180
+#: pg_dump.c:4252
#, c-format
msgid "WARNING: owner of function \"%s\" appears to be invalid\n"
msgstr "警告: 函数 \"%s\" 的所有者非法\n"
-#: pg_dump.c:4734
+#: pg_dump.c:4870
#, c-format
msgid "WARNING: owner of table \"%s\" appears to be invalid\n"
msgstr "警告: 数据表 \"%s\" 的所有者非法\n"
-#: pg_dump.c:4885
+#: pg_dump.c:5022
#, c-format
msgid "reading indexes for table \"%s\"\n"
msgstr "为表 \"%s\" 读取索引\n"
-#: pg_dump.c:5218
+#: pg_dump.c:5388
#, c-format
msgid "reading foreign key constraints for table \"%s\"\n"
msgstr "为表 \"%s\" 读取外键约束\n"
-#: pg_dump.c:5463
+#: pg_dump.c:5633
#, c-format
msgid ""
"failed sanity check, parent table OID %u of pg_rewrite entry OID %u not "
"found\n"
msgstr "健全检查失败,pg_rewrite项OID %2$u 的源表 OID%1$u 未找到\n"
-#: pg_dump.c:5556
+#: pg_dump.c:5726
#, c-format
msgid "reading triggers for table \"%s\"\n"
msgstr "为表 \"%s\" 读取触发器\n"
-#: pg_dump.c:5717
+#: pg_dump.c:5887
#, c-format
msgid ""
"query produced null referenced table name for foreign key trigger \"%s\" on "
@@ -1894,181 +1881,181 @@ msgstr ""
"对在表 \"%2$s\" 上的外键触发器 \"%1$s\" 上的查询生成了 NULL 个引用表(表的 "
"OID 是: %3$u)\n"
-#: pg_dump.c:6169
+#: pg_dump.c:6339
#, c-format
msgid "finding the columns and types of table \"%s\"\n"
msgstr "正在查找表 \"%s\" 的字段和类型\n"
-#: pg_dump.c:6347
+#: pg_dump.c:6517
#, c-format
msgid "invalid column numbering in table \"%s\"\n"
msgstr "在表 \"%s\" 中的字段个数是无效的\n"
-#: pg_dump.c:6381
+#: pg_dump.c:6551
#, c-format
msgid "finding default expressions of table \"%s\"\n"
msgstr "正在查找表 \"%s\" 的默认表达式\n"
-#: pg_dump.c:6433
+#: pg_dump.c:6603
#, c-format
msgid "invalid adnum value %d for table \"%s\"\n"
msgstr "表 \"%2$s\" 的无效 adnum 值 %1$d\n"
-#: pg_dump.c:6505
+#: pg_dump.c:6675
#, c-format
msgid "finding check constraints for table \"%s\"\n"
msgstr "正在为表 \"%s\" 查找检查约束\n"
-#: pg_dump.c:6600
+#: pg_dump.c:6770
#, c-format
msgid "expected %d check constraint on table \"%s\" but found %d\n"
msgid_plural "expected %d check constraints on table \"%s\" but found %d\n"
msgstr[0] "在表\"%2$s\"上期望有%1$d个检查约束,但是找到了%3$d个\n"
-#: pg_dump.c:6604
+#: pg_dump.c:6774
#, c-format
msgid "(The system catalogs might be corrupted.)\n"
msgstr "(系统表可能损坏了.)\n"
-#: pg_dump.c:7970
+#: pg_dump.c:8143
#, c-format
msgid "WARNING: typtype of data type \"%s\" appears to be invalid\n"
msgstr "警告: 数据类型 \"%s\" 的所有者看起来无效\n"
-#: pg_dump.c:9419
+#: pg_dump.c:9585
#, c-format
msgid "WARNING: bogus value in proargmodes array\n"
msgstr "警告: 无法分析 proargmodes 数组\n"
-#: pg_dump.c:9747
+#: pg_dump.c:9913
#, c-format
msgid "WARNING: could not parse proallargtypes array\n"
msgstr "警告: 无法分析 proallargtypes 数组\n"
-#: pg_dump.c:9763
+#: pg_dump.c:9929
#, c-format
msgid "WARNING: could not parse proargmodes array\n"
msgstr "警告: 无法分析 proargmodes 数组\n"
-#: pg_dump.c:9777
+#: pg_dump.c:9943
#, c-format
msgid "WARNING: could not parse proargnames array\n"
msgstr "警告: 无法分析 proargnames 数组\n"
-#: pg_dump.c:9788
+#: pg_dump.c:9954
#, c-format
msgid "WARNING: could not parse proconfig array\n"
msgstr "警告: 无法解析 proconfig 数组\n"
-#: pg_dump.c:9845
+#: pg_dump.c:10009
#, c-format
msgid "unrecognized provolatile value for function \"%s\"\n"
msgstr "函数 \"%s\" 的意外正向易失值\n"
-#: pg_dump.c:10065
+#: pg_dump.c:10231
#, c-format
msgid "WARNING: bogus value in pg_cast.castfunc or pg_cast.castmethod field\n"
msgstr "警告: 在pg_cast.castfunc或者pg_cast.castmethod字段中的是假值\n"
-#: pg_dump.c:10068
+#: pg_dump.c:10234
#, c-format
msgid "WARNING: bogus value in pg_cast.castmethod field\n"
msgstr "警告: 在pg_cast.castmethod字段中的是假值\n"
-#: pg_dump.c:10437
+#: pg_dump.c:10622
#, c-format
msgid "WARNING: could not find operator with OID %s\n"
msgstr "警告: 未找到 OID 为 %s 的操作符\n"
-#: pg_dump.c:11499
+#: pg_dump.c:11797
#, c-format
msgid ""
"WARNING: aggregate function %s could not be dumped correctly for this "
"database version; ignored\n"
msgstr "警告: 无法为此版本的数据库正确转储聚集函数 \"%s\"; 忽略\n"
-#: pg_dump.c:12275
+#: pg_dump.c:12622
#, c-format
msgid "unrecognized object type in default privileges: %d\n"
msgstr "缺省权限中存在未知对象类型: %d\n"
-#: pg_dump.c:12290
+#: pg_dump.c:12637
#, c-format
msgid "could not parse default ACL list (%s)\n"
msgstr "无法解析缺省ACL列表(%s)\n"
-#: pg_dump.c:12345
+#: pg_dump.c:12692
#, c-format
msgid "could not parse ACL list (%s) for object \"%s\" (%s)\n"
msgstr "无法为对象 \"%2$s\" 分析 ACL 列表 (%1$s) (%3$s)\n"
-#: pg_dump.c:12764
+#: pg_dump.c:13109
#, c-format
msgid "query to obtain definition of view \"%s\" returned no data\n"
msgstr "获取视图 \"%s\" 定义的查询没有返回数据\n"
-#: pg_dump.c:12767
+#: pg_dump.c:13112
#, c-format
msgid ""
"query to obtain definition of view \"%s\" returned more than one definition\n"
msgstr "获取视图 \"%s\" 定义的查询返回超过一个定义\n"
-#: pg_dump.c:12774
+#: pg_dump.c:13119
#, c-format
msgid "definition of view \"%s\" appears to be empty (length zero)\n"
msgstr "视图 \"%s\" 的定义是空的(零长)\n"
-#: pg_dump.c:13482
+#: pg_dump.c:13852
#, c-format
msgid "invalid column number %d for table \"%s\"\n"
msgstr "对于表 \"%2$s\" 字段个数 %1$d 是无效的\n"
-#: pg_dump.c:13597
+#: pg_dump.c:13976
#, c-format
msgid "missing index for constraint \"%s\"\n"
msgstr "对于约束 \"%s\" 缺少索引\n"
-#: pg_dump.c:13784
+#: pg_dump.c:14163
#, c-format
msgid "unrecognized constraint type: %c\n"
msgstr "未知的约束类型: %c\n"
-#: pg_dump.c:13933 pg_dump.c:14097
+#: pg_dump.c:14312 pg_dump.c:14476
#, c-format
msgid "query to get data of sequence \"%s\" returned %d row (expected 1)\n"
msgid_plural ""
"query to get data of sequence \"%s\" returned %d rows (expected 1)\n"
msgstr[0] "查询得到了序列\"%s\"的数据,返回了%d条记录(期望一条)\n"
-#: pg_dump.c:13944
+#: pg_dump.c:14323
#, c-format
msgid "query to get data of sequence \"%s\" returned name \"%s\"\n"
msgstr "获取序列 \"%s\" 的数据的查询返回了名字 \"%s\"\n"
# fe-exec.c:1371
-#: pg_dump.c:14184
+#: pg_dump.c:14571
#, c-format
msgid "unexpected tgtype value: %d\n"
msgstr "意外的tgtype值: %d\n"
-#: pg_dump.c:14266
+#: pg_dump.c:14653
#, c-format
msgid "invalid argument string (%s) for trigger \"%s\" on table \"%s\"\n"
msgstr "给表 \"%3$s\" 上的触发器 \"%2$s\" 的错误参数 (%1$s)\n"
-#: pg_dump.c:14446
+#: pg_dump.c:14841
#, c-format
msgid ""
"query to get rule \"%s\" for table \"%s\" failed: wrong number of rows "
"returned\n"
msgstr "获取表 \"%2$s\" 的规则 \"%1$s\" 查询失败: 返回了错误的行数\n"
-#: pg_dump.c:14747
+#: pg_dump.c:15142
#, c-format
msgid "reading dependency data\n"
msgstr "读取从属数据\n"
-#: pg_dump.c:15292
+#: pg_dump.c:15687
#, c-format
msgid "query returned %d row instead of one: %s\n"
msgid_plural "query returned %d rows instead of one: %s\n"
@@ -2079,33 +2066,33 @@ msgstr[0] "查询返回了%d条记录,而不是一条记录: %s\n"
msgid "sorter"
msgstr "排序器"
-#: pg_dump_sort.c:465
+#: pg_dump_sort.c:466
#, c-format
msgid "invalid dumpId %d\n"
msgstr "无效的dumpId %d\n"
-#: pg_dump_sort.c:471
+#: pg_dump_sort.c:472
#, c-format
msgid "invalid dependency %d\n"
msgstr "无效的依赖 %d\n"
-#: pg_dump_sort.c:685
+#: pg_dump_sort.c:705
#, c-format
msgid "could not identify dependency loop\n"
msgstr "无法标识循环依赖\n"
-#: pg_dump_sort.c:1135
+#: pg_dump_sort.c:1227
#, c-format
msgid ""
"NOTICE: there are circular foreign-key constraints among these table(s):\n"
msgstr "注意: 这些表之间存在循环外键约束依赖:\n"
-#: pg_dump_sort.c:1137 pg_dump_sort.c:1157
+#: pg_dump_sort.c:1229 pg_dump_sort.c:1249
#, c-format
msgid " %s\n"
msgstr " %s\n"
-#: pg_dump_sort.c:1138
+#: pg_dump_sort.c:1230
#, c-format
msgid ""
"You might not be able to restore the dump without using --disable-triggers "
@@ -2113,19 +2100,19 @@ msgid ""
msgstr ""
"不使用 --disable-triggers 选项或者临时删除约束,你将不能对备份进行恢复 .\n"
-#: pg_dump_sort.c:1139
+#: pg_dump_sort.c:1231
#, c-format
msgid ""
"Consider using a full dump instead of a --data-only dump to avoid this "
"problem.\n"
msgstr "考虑使用完全备份代替 --data-only选项进行备份以避免此问题.\n"
-#: pg_dump_sort.c:1151
+#: pg_dump_sort.c:1243
#, c-format
msgid "WARNING: could not resolve dependency loop among these items:\n"
msgstr "WARNING: 无法解析这些项的循环依赖:\n"
-#: pg_dumpall.c:180
+#: pg_dumpall.c:182
#, c-format
msgid ""
"The program \"pg_dump\" is needed by %s but was not found in the\n"
@@ -2136,7 +2123,7 @@ msgstr ""
"\n"
"检查您的安装.\n"
-#: pg_dumpall.c:187
+#: pg_dumpall.c:189
#, c-format
msgid ""
"The program \"pg_dump\" was found by \"%s\"\n"
@@ -2147,32 +2134,37 @@ msgstr ""
"\n"
"检查您的安装.\n"
-#: pg_dumpall.c:321
+#: pg_dumpall.c:323
#, c-format
msgid ""
"%s: options -g/--globals-only and -r/--roles-only cannot be used together\n"
msgstr "%s: 选项-g/--globals-only和-r/--roles-only不能同时使用.\n"
-#: pg_dumpall.c:330
+#: pg_dumpall.c:332
#, c-format
msgid ""
"%s: options -g/--globals-only and -t/--tablespaces-only cannot be used "
"together\n"
msgstr "%s: 选项 -g/--globals-only和-t/--tablespaces-only不能同时使用.\n"
-#: pg_dumpall.c:339
+#: pg_dumpall.c:341 pg_restore.c:343
+#, c-format
+msgid "%s: option --if-exists requires option -c/--clean\n"
+msgstr "%s: 选项 --if-exists 需要选项 -c/ --clean \n"
+
+#: pg_dumpall.c:348
#, c-format
msgid ""
"%s: options -r/--roles-only and -t/--tablespaces-only cannot be used "
"together\n"
msgstr "%s: 选项 -r/--roles-only和 -t/--tablespaces-only不能同时使用.\n"
-#: pg_dumpall.c:381 pg_dumpall.c:1823
+#: pg_dumpall.c:390 pg_dumpall.c:1861
#, c-format
msgid "%s: could not connect to database \"%s\"\n"
msgstr "%s: 无法与数据库 \"%s\" 联接\n"
-#: pg_dumpall.c:396
+#: pg_dumpall.c:405
#, c-format
msgid ""
"%s: could not connect to databases \"postgres\" or \"template1\"\n"
@@ -2182,12 +2174,12 @@ msgstr ""
"请指定另外一个数据库.\n"
# command.c:1148
-#: pg_dumpall.c:413
+#: pg_dumpall.c:422
#, c-format
msgid "%s: could not open the output file \"%s\": %s\n"
msgstr "%s:无法打开输出文件 \"%s\":%s\n"
-#: pg_dumpall.c:540
+#: pg_dumpall.c:552
#, c-format
msgid ""
"%s extracts a PostgreSQL database cluster into an SQL script file.\n"
@@ -2196,61 +2188,60 @@ msgstr ""
"%s 抽取一个 PostgreSQL 数据库簇进一个 SQL 脚本文件.\n"
"\n"
-#: pg_dumpall.c:542
+#: pg_dumpall.c:554
#, c-format
msgid " %s [OPTION]...\n"
msgstr " %s [选项]...\n"
-#: pg_dumpall.c:545
+#: pg_dumpall.c:557
#, c-format
msgid " -f, --file=FILENAME output file name\n"
msgstr " -f, --file=FILENAME 输出文件名\n"
-#: pg_dumpall.c:551
+#: pg_dumpall.c:563
#, c-format
msgid ""
" -c, --clean clean (drop) databases before recreating\n"
msgstr " -c, --clean 在重新创建数据库前先清除(删除)数据库\n"
-#: pg_dumpall.c:552
+#: pg_dumpall.c:564
#, c-format
msgid " -g, --globals-only dump only global objects, no databases\n"
msgstr " -g, --globals-only 只转储全局对象, 不包括数据库\n"
-#: pg_dumpall.c:554 pg_restore.c:436
+#: pg_dumpall.c:566 pg_restore.c:454
#, c-format
msgid " -O, --no-owner skip restoration of object ownership\n"
msgstr " -O, --no-owner 不恢复对象所属者\n"
-#: pg_dumpall.c:555
+#: pg_dumpall.c:567
#, c-format
msgid ""
" -r, --roles-only dump only roles, no databases or tablespaces\n"
msgstr " -r, --roles-only 只转储角色,不包括数据库或表空间\n"
-#: pg_dumpall.c:557
+#: pg_dumpall.c:569
#, c-format
msgid " -S, --superuser=NAME superuser user name to use in the dump\n"
msgstr " -S, --superuser=NAME 在转储中, 指定的超级用户名\n"
-#: pg_dumpall.c:558
+#: pg_dumpall.c:570
#, c-format
msgid ""
" -t, --tablespaces-only dump only tablespaces, no databases or roles\n"
msgstr " -t, --tablespaces-only 只转储表空间,而不转储数据库或角色\n"
-#: pg_dumpall.c:574
+#: pg_dumpall.c:587
#, c-format
-#| msgid " -d, --dbname=NAME connect to database name\n"
msgid " -d, --dbname=CONNSTR connect using connection string\n"
msgstr " -d, --dbname=CONNSTR 连接数据库使用的连接串\n"
-#: pg_dumpall.c:576
+#: pg_dumpall.c:589
#, c-format
msgid " -l, --database=DBNAME alternative default database\n"
msgstr " -l, --database=DBNAME 另一个缺省数据库\n"
-#: pg_dumpall.c:583
+#: pg_dumpall.c:596
#, c-format
msgid ""
"\n"
@@ -2264,95 +2255,108 @@ msgstr ""
".\n"
"\n"
-#: pg_dumpall.c:1083
+#: pg_dumpall.c:1101
#, c-format
msgid "%s: could not parse ACL list (%s) for tablespace \"%s\"\n"
msgstr "%1$s: 无法为表空间 \"%3$s\" 分析 ACL 列表 (%2$s)\n"
-#: pg_dumpall.c:1387
+#: pg_dumpall.c:1418
#, c-format
msgid "%s: could not parse ACL list (%s) for database \"%s\"\n"
msgstr "%1$s: 无法为数据库 \"%3$s\" 分析 ACL 列表 (%2$s)\n"
-#: pg_dumpall.c:1599
+#: pg_dumpall.c:1628
#, c-format
msgid "%s: dumping database \"%s\"...\n"
msgstr "%s: 正在转储数据库 \"%s\"...\n"
-#: pg_dumpall.c:1609
+#: pg_dumpall.c:1649
#, c-format
msgid "%s: pg_dump failed on database \"%s\", exiting\n"
msgstr "%s: pg_dump 失败在数据库 \"%s\", 正在退出\n"
# command.c:1148
-#: pg_dumpall.c:1618
+#: pg_dumpall.c:1658
#, c-format
msgid "%s: could not re-open the output file \"%s\": %s\n"
msgstr "%s:无法重新打开输出文件 \"%s\":%s\n"
-#: pg_dumpall.c:1665
+#: pg_dumpall.c:1703
#, c-format
msgid "%s: running \"%s\"\n"
msgstr "%s: 正在运行 \"%s\"\n"
-#: pg_dumpall.c:1845
+#: pg_dumpall.c:1883
#, c-format
msgid "%s: could not connect to database \"%s\": %s\n"
msgstr "%s: 无法与数据库 \"%s\" 联接: %s\n"
-#: pg_dumpall.c:1875
+#: pg_dumpall.c:1913
#, c-format
msgid "%s: could not get server version\n"
msgstr "%s: 无法从服务器获取版本\n"
-#: pg_dumpall.c:1881
+#: pg_dumpall.c:1919
#, c-format
msgid "%s: could not parse server version \"%s\"\n"
msgstr "%s: 无法分析版本字串 \"%s\"\n"
-#: pg_dumpall.c:1959 pg_dumpall.c:1985
+#: pg_dumpall.c:1997 pg_dumpall.c:2023
#, c-format
msgid "%s: executing %s\n"
msgstr "%s: 执行 %s\n"
-#: pg_dumpall.c:1965 pg_dumpall.c:1991
+#: pg_dumpall.c:2003 pg_dumpall.c:2029
#, c-format
msgid "%s: query failed: %s"
msgstr "%s: 查询失败: %s"
-#: pg_dumpall.c:1967 pg_dumpall.c:1993
+#: pg_dumpall.c:2005 pg_dumpall.c:2031
#, c-format
msgid "%s: query was: %s\n"
msgstr "%s: 查询是: %s\n"
-#: pg_restore.c:308
+#: pg_restore.c:304
#, c-format
msgid "%s: options -d/--dbname and -f/--file cannot be used together\n"
msgstr "%s: 选项 -d/--dbname和-f/--file不能同时使用.\n"
-#: pg_restore.c:320
+#: pg_restore.c:315
+#, c-format
+#| msgid ""
+#| "options -s/--schema-only and -a/--data-only cannot be used together\n"
+msgid ""
+"%s: options -s/--schema-only and -a/--data-only cannot be used together\n"
+msgstr "%s: 选项 -s/--schema-only和-a/--data-only 不能同时使用\n"
+
+#: pg_restore.c:322
+#, c-format
+#| msgid "options -c/--clean and -a/--data-only cannot be used together\n"
+msgid "%s: options -c/--clean and -a/--data-only cannot be used together\n"
+msgstr "%s: 选项 -c/--clean和 -a/--data-only不能同时使用.\n"
+
+#: pg_restore.c:330
#, c-format
msgid "%s: cannot specify both --single-transaction and multiple jobs\n"
msgstr "%s: 不能同时指定选项--single-transaction和多个任务\n"
-#: pg_restore.c:351
+#: pg_restore.c:369
#, c-format
msgid ""
"unrecognized archive format \"%s\"; please specify \"c\", \"d\", or \"t\"\n"
msgstr "不可识别的归档格式\"%s\"; 请指定 \"c\", \"d\", 或 \"t\"\n"
-#: pg_restore.c:381
+#: pg_restore.c:399
#, c-format
-#| msgid "maximum number of prepared transactions reached"
msgid "%s: maximum number of parallel jobs is %d\n"
msgstr "%s: 已经达到并行工作集的最大数 %d\n"
-#: pg_restore.c:399
+#: pg_restore.c:417
#, c-format
msgid "WARNING: errors ignored on restore: %d\n"
msgstr "警告: 恢复中忽略错误: %d\n"
-#: pg_restore.c:413
+#: pg_restore.c:431
#, c-format
msgid ""
"%s restores a PostgreSQL database from an archive created by pg_dump.\n"
@@ -2361,47 +2365,47 @@ msgstr ""
"%s 从一个归档中恢复一个由 pg_dump 创建的 PostgreSQL 数据库.\n"
"\n"
-#: pg_restore.c:415
+#: pg_restore.c:433
#, c-format
msgid " %s [OPTION]... [FILE]\n"
msgstr " %s [选项]... [文件名]\n"
-#: pg_restore.c:418
+#: pg_restore.c:436
#, c-format
msgid " -d, --dbname=NAME connect to database name\n"
msgstr " -d, --dbname=名字 连接数据库名字\n"
-#: pg_restore.c:419
+#: pg_restore.c:437
#, c-format
msgid " -f, --file=FILENAME output file name\n"
msgstr " -f, --file=文件名 输出文件名\n"
-#: pg_restore.c:420
+#: pg_restore.c:438
#, c-format
msgid " -F, --format=c|d|t backup file format (should be automatic)\n"
msgstr " -F, --format=c|d|t 备份文件格式(应该自动进行)\n"
-#: pg_restore.c:421
+#: pg_restore.c:439
#, c-format
msgid " -l, --list print summarized TOC of the archive\n"
msgstr " -l, --list 打印归档文件的 TOC 概述\n"
-#: pg_restore.c:422
+#: pg_restore.c:440
#, c-format
msgid " -v, --verbose verbose mode\n"
msgstr " -v, --verbose 详细模式\n"
-#: pg_restore.c:423
+#: pg_restore.c:441
#, c-format
msgid " -V, --version output version information, then exit\n"
msgstr " -V, --version 输出版本信息, 然后退出\n"
-#: pg_restore.c:424
+#: pg_restore.c:442
#, c-format
msgid " -?, --help show this help, then exit\n"
msgstr " -?, --help 显示此帮助, 然后退出\n"
-#: pg_restore.c:426
+#: pg_restore.c:444
#, c-format
msgid ""
"\n"
@@ -2410,32 +2414,32 @@ msgstr ""
"\n"
"恢复控制选项:\n"
-#: pg_restore.c:427
+#: pg_restore.c:445
#, c-format
msgid " -a, --data-only restore only the data, no schema\n"
msgstr " -a, --data-only 只恢复数据, 不包括模式\n"
-#: pg_restore.c:429
+#: pg_restore.c:447
#, c-format
msgid " -C, --create create the target database\n"
msgstr " -C, --create 创建目标数据库\n"
-#: pg_restore.c:430
+#: pg_restore.c:448
#, c-format
msgid " -e, --exit-on-error exit on error, default is to continue\n"
msgstr " -e, --exit-on-error 发生错误退出, 默认为继续\n"
-#: pg_restore.c:431
+#: pg_restore.c:449
#, c-format
msgid " -I, --index=NAME restore named index\n"
msgstr " -I, --index=NAME 恢复指定名称的索引\n"
-#: pg_restore.c:432
+#: pg_restore.c:450
#, c-format
msgid " -j, --jobs=NUM use this many parallel jobs to restore\n"
msgstr " -j, --jobs=NUM 执行多个并行任务进行恢复工作\n"
-#: pg_restore.c:433
+#: pg_restore.c:451
#, c-format
msgid ""
" -L, --use-list=FILENAME use table of contents from this file for\n"
@@ -2444,52 +2448,52 @@ msgstr ""
" -L, --use-list=FILENAME 从这个文件中使用指定的内容表排序\n"
" 输出\n"
-#: pg_restore.c:435
+#: pg_restore.c:453
#, c-format
msgid " -n, --schema=NAME restore only objects in this schema\n"
msgstr " -n, --schema=NAME 在这个模式中只恢复对象\n"
-#: pg_restore.c:437
+#: pg_restore.c:455
#, c-format
msgid " -P, --function=NAME(args) restore named function\n"
msgstr " -P, --function=NAME(args) 恢复指定名字的函数\n"
-#: pg_restore.c:438
+#: pg_restore.c:456
#, c-format
msgid " -s, --schema-only restore only the schema, no data\n"
msgstr " -s, --schema-only 只恢复模式, 不包括数据\n"
-#: pg_restore.c:439
+#: pg_restore.c:457
#, c-format
msgid ""
" -S, --superuser=NAME superuser user name to use for disabling "
"triggers\n"
msgstr " -S, --superuser=NAME 使用指定的超级用户来禁用触发器\n"
-#: pg_restore.c:440
-#, fuzzy, c-format
+#: pg_restore.c:458
+#, c-format
#| msgid " -t, --table=NAME restore named table\n"
-msgid " -t, --table=NAME restore named table(s)\n"
-msgstr " -t, --table=NAME 恢复指定名字的表\n"
+msgid " -t, --table=NAME restore named table\n"
+msgstr " -t, --table=NAME 恢复命名表\n"
-#: pg_restore.c:441
+#: pg_restore.c:459
#, c-format
msgid " -T, --trigger=NAME restore named trigger\n"
msgstr " -T, --trigger=NAME 恢复指定名字的触发器\n"
-#: pg_restore.c:442
+#: pg_restore.c:460
#, c-format
msgid ""
" -x, --no-privileges skip restoration of access privileges (grant/"
"revoke)\n"
msgstr " -x, --no-privileges 跳过处理权限的恢复 (grant/revoke)\n"
-#: pg_restore.c:443
+#: pg_restore.c:461
#, c-format
msgid " -1, --single-transaction restore as a single transaction\n"
msgstr " -1, --single-transaction 作为单个事务恢复\n"
-#: pg_restore.c:445
+#: pg_restore.c:464
#, c-format
msgid ""
" --no-data-for-failed-tables do not restore data of tables that could not "
@@ -2499,29 +2503,40 @@ msgstr ""
" --no-data-for-failed-tables 对那些无法创建的表不进行\n"
" 数据恢复\n"
-#: pg_restore.c:447
+#: pg_restore.c:466
#, c-format
msgid " --no-security-labels do not restore security labels\n"
msgstr " --no-security-labels 不恢复安全标签信息\n"
-#: pg_restore.c:448
+#: pg_restore.c:467
#, c-format
msgid " --no-tablespaces do not restore tablespace assignments\n"
msgstr " --no-tablespaces 不恢复表空间的分配信息\n"
-#: pg_restore.c:449
+#: pg_restore.c:468
#, c-format
msgid ""
" --section=SECTION restore named section (pre-data, data, or "
"post-data)\n"
msgstr " --section=SECTION 恢复命名节 (数据前、数据及数据后)\n"
-#: pg_restore.c:460
+#: pg_restore.c:479
#, c-format
msgid " --role=ROLENAME do SET ROLE before restore\n"
msgstr " --role=ROLENAME 在恢复前执行SET ROLE操作\n"
-#: pg_restore.c:462
+#: pg_restore.c:481
+#, c-format
+msgid ""
+"\n"
+"The options -I, -n, -P, -t, -T, and --section can be combined and specified\n"
+"multiple times to select multiple objects.\n"
+msgstr ""
+"\n"
+"选项 -I, -n, -P, -t, -T, 以及 --section 可以组合使用和指定\n"
+"多次用于选择多个对象.\n"
+
+#: pg_restore.c:484
#, c-format
msgid ""
"\n"
@@ -2532,358 +2547,382 @@ msgstr ""
"如果没有提供输入文件名, 则使用标准输入.\n"
"\n"
-#~ msgid "-C and -c are incompatible options\n"
-#~ msgstr "-C 和 -c 是互不兼容的选项\n"
+#~ msgid "could not parse version string \"%s\"\n"
+#~ msgstr "无法分析版本字串 \"%s\"\n"
-#~ msgid ""
-#~ " -O, --no-owner do not output commands to set object "
-#~ "ownership\n"
-#~ msgstr ""
-#~ " -O, --no-owner 设置对象的所属者时不输出\n"
-#~ " 命令\n"
+#~ msgid "%s: could not parse version \"%s\"\n"
+#~ msgstr "%s: 无法解析版本 \"%s\"\n"
-#~ msgid ""
-#~ " -i, --ignore-version proceed even when server version mismatches\n"
-#~ " pg_dumpall version\n"
-#~ msgstr ""
-#~ " -i, --ignore-version 当服务器版本与 pg_dumpall 不匹配时\n"
-#~ " 继续运行\n"
+#~ msgid "%s: invalid -X option -- %s\n"
+#~ msgstr "%s: 无效的 -X 选项 -- %s\n"
+
+#~ msgid " --help show this help, then exit\n"
+#~ msgstr " --help 显示此帮助信息, 然后退出\n"
#~ msgid ""
-#~ " -i, --ignore-version proceed even when server version mismatches\n"
-#~ msgstr " -i, --ignore-version 当服务器版本不匹配时继续运行\n"
+#~ " --version output version information, then exit\n"
+#~ msgstr " --versoin 输出版本信息, 然后退出\n"
-#~ msgid "could not write tar header\n"
-#~ msgstr "无法写 tar 头\n"
+#~ msgid "*** aborted because of error\n"
+#~ msgstr "*** 因为错误退出\n"
-#~ msgid "could not close tar member: %s\n"
-#~ msgstr "无法关闭 tar 成员: %s\n"
+#~ msgid "missing pg_database entry for database \"%s\"\n"
+#~ msgstr "缺少用于 \"%s\" 的 pg_database 记录\n"
-#~ msgid "write error appending to tar archive (wrote %lu, attempted %lu)\n"
-#~ msgstr "向 tar 归档附加时写错误 (写了 %lu, 试图写 %lu)\n"
+#~ msgid ""
+#~ "query returned more than one (%d) pg_database entry for database \"%s\"\n"
+#~ msgstr "查询为数据库 \"%2$s\" 返回了超过一条 (%1$d) pg_database 记录\n"
-#~ msgid "could not write to tar member (wrote %lu, attempted %lu)\n"
-#~ msgstr "无法写入 tar 成员 (写了 %lu, 企图写 %lu)\n"
+#~ msgid "dumpDatabase(): could not find pg_largeobject.relfrozenxid\n"
+#~ msgstr "dumpDatabase(): 无法找到pg_largeobject.relfrozenxid\n"
-#~ msgid "requested %d bytes, got %d from lookahead and %d from file\n"
-#~ msgstr "要求 %d 字节, 从预览中获取 %d, 从文件中获取 %d\n"
+#~ msgid "query returned no rows: %s\n"
+#~ msgstr "查询放弃, 没有记录: %s\n"
-#~ msgid "could not open large object file\n"
-#~ msgstr "无法打开大对象文件\n"
+#~ msgid "missing pg_database entry for this database\n"
+#~ msgstr "缺少此数据库的 pg_database 记录\n"
-#~ msgid "could not open data file for input\n"
-#~ msgstr "无法为输入打开数据文件\n"
+#~ msgid "found more than one pg_database entry for this database\n"
+#~ msgstr "找到此数据库的多于一条的 pg_database 记录\n"
-#~ msgid "could not open data file for output\n"
-#~ msgstr "无法为输出打开数据文件\n"
+#~ msgid "could not find entry for pg_indexes in pg_class\n"
+#~ msgstr "在 pg_class 中无法为 pg_indexes 找到记录\n"
-#~ msgid "could not commit transaction for large object cross-references"
-#~ msgstr "无法为大对象交叉引用提交事务"
+#~ msgid "found more than one entry for pg_indexes in pg_class\n"
+#~ msgstr "在 pg_class 表中找到多条 pg_indexes 的记录\n"
-#~ msgid "could not start transaction for large object cross-references"
-#~ msgstr "无法为大对象交叉引用启动事务"
+#~ msgid "SQL command failed\n"
+#~ msgstr "SQL 命令失败\n"
-#~ msgid "could not create large object cross-reference entry"
-#~ msgstr "无法创建大对象交叉引用记录"
+#~ msgid "cannot reopen stdin\n"
+#~ msgstr "无法重新打开stdin\n"
-#~ msgid "could not create index on large object cross-reference table"
-#~ msgstr "无法在大对象交叉引用表上创建索引"
+#~ msgid "cannot reopen non-seekable file\n"
+#~ msgstr "无法重新打开不可查找的文件\n"
-#~ msgid "creating index for large object cross-references\n"
-#~ msgstr "为大对象交叉引用创建索引\n"
+#~ msgid "file archiver"
+#~ msgstr "文件归档"
-#~ msgid "could not create large object cross-reference table"
-#~ msgstr "无法创建大对象交叉引用表"
+#~ msgid ""
+#~ "WARNING:\n"
+#~ " This format is for demonstration purposes; it is not intended for\n"
+#~ " normal use. Files will be written in the current working directory.\n"
+#~ msgstr ""
+#~ "警告:\n"
+#~ " 这个格式仅用于演示; 并非用于一般用途.\n"
+#~ " 文件将写入当前工作目录.\n"
-#~ msgid "creating table for large object cross-references\n"
-#~ msgstr "为大对象交叉引用创建表\n"
+#~ msgid "could not close data file after reading\n"
+#~ msgstr "读取之后无法关闭数据文件\n"
-#~ msgid "error while updating column \"%s\" of table \"%s\": %s"
-#~ msgstr "更新表 \"%2$s\" 的字段 \"%1$s\" 时出错: %3$s"
+#~ msgid "could not open large object TOC for input: %s\n"
+#~ msgstr "无法打开大对象 TOC 进行输入: %s\n"
-#~ msgid "could not update column \"%s\" of table \"%s\": %s"
-#~ msgstr "无法更新表 \"%2$s\" 的字段 \"%1$s\": %3$s"
+#~ msgid "could not open large object TOC for output: %s\n"
+#~ msgstr "无法打开大对象 TOC 进行输出: %s\n"
-#~ msgid "SQL: %s\n"
-#~ msgstr "SQL: %s\n"
+#~ msgid "could not close large object file\n"
+#~ msgstr "无法关闭大对象文件\n"
-#~ msgid "fixing large object cross-references for %s.%s\n"
-#~ msgstr "为 %s.%s 修补大对象交叉引用\n"
+#~ msgid "invalid COPY statement -- could not find \"copy\" in string \"%s\"\n"
+#~ msgstr "COPY 语句错 -- 无法在字串 \"%s\" 中找到 \"copy\"\n"
-#~ msgid "no OID type columns in table %s\n"
-#~ msgstr "表 %s 中没有 OID 类型字段\n"
+#~ msgid ""
+#~ "invalid COPY statement -- could not find \"from stdin\" in string \"%s\" "
+#~ "starting at position %lu\n"
+#~ msgstr ""
+#~ "COPY 语句错 -- 无法在从 %2$lu 位置开始的字串 \"%1$s\" 里找到 \"from stdin"
+#~ "\" 字样\n"
-#~ msgid "could not find OID columns of table \"%s\": %s"
-#~ msgstr "无法寻找表 \"%s\" 的 OID 字段: %s"
+#~ msgid "restoring large object OID %u\n"
+#~ msgstr "恢复 OID %u 的大对象\n"
-#~ msgid "error returned by PQendcopy\n"
-#~ msgstr "PQendcopy 返回错误\n"
+#~ msgid " --help show this help, then exit\n"
+#~ msgstr " --help 显示此帮助信息, 然后退出\n"
-#~ msgid "COPY command executed in non-primary connection\n"
-#~ msgstr "COPY 命令在没有主联接的环境下执行\n"
+#~ msgid " --version output version information, then exit\n"
+#~ msgstr " --version 输出版本信息, 然后退出\n"
-#~ msgid "%s: no result from server\n"
-#~ msgstr "%s: 没有来自服务器的结果\n"
+#~ msgid ""
+#~ " -c, --clean clean (drop) database objects before "
+#~ "recreating\n"
+#~ msgstr ""
+#~ " -c, --clean 在重新创建数据库对象之前需要清除(删除)数据库"
+#~ "对象\n"
+
+#~ msgid " -O, --no-owner skip restoration of object ownership\n"
+#~ msgstr " -O, --no-owner 忽略恢复对象所属者\n"
#~ msgid ""
-#~ "aborting because of version mismatch (Use the -i option to proceed "
-#~ "anyway.)\n"
-#~ msgstr "因版本差异退出 (用 -i 选项忽略差异继续处理.)\n"
+#~ " --disable-triggers disable triggers during data-only restore\n"
+#~ msgstr " --disable-triggers 在只恢复数据的过程中禁用触发器\n"
-#~ msgid "could not write uncompressed chunk\n"
-#~ msgstr "无法写入未压缩的块\n"
+#~ msgid ""
+#~ " --use-set-session-authorization\n"
+#~ " use SET SESSION AUTHORIZATION commands instead "
+#~ "of\n"
+#~ " ALTER OWNER commands to set ownership\n"
+#~ msgstr ""
+#~ " --use-set-session-authorization\n"
+#~ " 使用 SESSION AUTHORIZATION 命令代替\n"
+#~ " ALTER OWNER命令来设置对象所有权\n"
-#~ msgid "could not write compressed chunk\n"
-#~ msgstr "无法写入压缩的块\n"
+#~ msgid "%s: out of memory\n"
+#~ msgstr "%s: 内存溢出\n"
-#~ msgid "write error in _WriteBuf (%lu != %lu)\n"
-#~ msgstr "在 _WriteBuf 里的写错误 (%lu != %lu)\n"
+#~ msgid "dumpBlobs(): could not open large object: %s"
+#~ msgstr "dumpBlobs(): 无法打开大对象: %s"
-#~ msgid "could not read data block -- expected %lu, got %lu\n"
-#~ msgstr "无法读取数据块 - 预期 %lu, 实际 %lu\n"
+#~ msgid "saving large object comments\n"
+#~ msgstr "正在保存大对象注释\n"
-#~ msgid "large objects cannot be loaded without a database connection\n"
-#~ msgstr "没有数据库联接时无法装载大对象\n"
+#~ msgid "no label definitions found for enum ID %u\n"
+#~ msgstr "对于枚举 ID %u没有找到标签定义\n"
-#~ msgid "could not open archive file \"%s\": %s\n"
-#~ msgstr "无法打开归档文件 \"%s\": %s\n"
+#~ msgid ""
+#~ "dumping a specific TOC data block out of order is not supported without "
+#~ "ID on this input stream (fseek required)\n"
+#~ msgstr ""
+#~ "如果在此输入流中没有ID(标识)(fseek 要求的), 那么是不支持非顺序转储特定TOC"
+#~ "数据块的\n"
-#~ msgid "archive format is %d\n"
-#~ msgstr "归档格式是 %d\n"
+#~ msgid "compression support is disabled in this format\n"
+#~ msgstr "在这个格式里, 压缩支持时被关闭了的\n"
-#~ msgid "could not close the input file after reading header: %s\n"
-#~ msgstr "读取头之后无法关闭输入文件: %s\n"
+#~ msgid "User name: "
+#~ msgstr "用户名: "
-#~ msgid "read %lu bytes into lookahead buffer\n"
-#~ msgstr "读取 %lu 字节到预览缓冲区\n"
+#~ msgid "large-object output not supported for a single table\n"
+#~ msgstr "不支持单个表的大对象输出.\n"
-#~ msgid "could not write to output file (%lu != %lu)\n"
-#~ msgstr "无法写出到输出文件 (%lu != %lu)\n"
+#~ msgid "use a full dump instead\n"
+#~ msgstr "使用完整转储替代.\n"
-#~ msgid "could not write to compressed archive\n"
-#~ msgstr "无法写入压缩的归档\n"
+#~ msgid "large-object output not supported for a single schema\n"
+#~ msgstr "不支持单个模式的大对象输出.\n"
-#~ msgid "could not open TOC file\n"
-#~ msgstr "无法打开 TOC 文件\n"
+#~ msgid "INSERT (-d, -D) and OID (-o) options cannot be used together\n"
+#~ msgstr "INSERT (-d, -D) 和 OID (-o) 选项不能同时使用.\n"
-#~ msgid "wrote remaining %lu bytes of large-object data (result = %lu)\n"
-#~ msgstr "写剩下了 %lu 字节的大对象数据 (结果 = %lu)\n"
+#~ msgid "large-object output is not supported for plain-text dump files\n"
+#~ msgstr "纯文本转储文件不支持输出大对象.\n"
-#~ msgid "restoring large object with OID %u as %u\n"
-#~ msgstr "把 OID 为 %u 的大对象恢复为 %u\n"
+#~ msgid "(Use a different output format.)\n"
+#~ msgstr "(使用不同的输出格式.)\n"
-#~ msgid "starting large-object transactions\n"
-#~ msgstr "开始大对象事务\n"
+#~ msgid ""
+#~ " -i, --ignore-version proceed even when server version mismatches\n"
+#~ " pg_dump version\n"
+#~ msgstr ""
+#~ " -i, --ignore-version 当服务器的版本号与 pg_dump 的版本号不匹配时\n"
+#~ " 仍继续运行\n"
-#~ msgid "cannot restore large objects without a database connection\n"
-#~ msgstr "没有数据库联接时无法恢复大对象\n"
+#~ msgid " -c, --clean clean (drop) schema prior to create\n"
+#~ msgstr " -c, --clean 先清楚(删除)预先的模式,再建立\n"
-#~ msgid "committing large-object transactions\n"
-#~ msgstr "提交大对象事务\n"
+#~ msgid ""
+#~ " -S, --superuser=NAME specify the superuser user name to use in\n"
+#~ " plain text format\n"
+#~ msgstr ""
+#~ " -S, --superuser=NAME 在明文格式中, 使用指定的超级用户\n"
+#~ " 名称\n"
-#~ msgid "fixing up large-object cross-reference for \"%s\"\n"
-#~ msgstr "为 \"%s\" 修复大对象的交叉引用\n"
+#~ msgid "specified schema \"%s\" does not exist\n"
+#~ msgstr "指定的模式 \"%s\" 不存在\n"
-#~ msgid "WARNING: skipping large-object restoration\n"
-#~ msgstr "警告: 忽略大对象的恢复\n"
+#~ msgid "specified table \"%s\" does not exist\n"
+#~ msgstr "指定的表 \"%s\" 不存在\n"
-#~ msgid "could not close output archive file\n"
-#~ msgstr "无法关闭输出归档文件\n"
+#~ msgid "expected %d triggers on table \"%s\" but found %d\n"
+#~ msgstr "预期在表 \"%2$s\" 上有触发器 %1$d , 却发现 %3$d\n"
-#~ msgid "maximum system OID is %u\n"
-#~ msgstr "最大系统 OID 是 %u\n"
+#~ msgid "Got %d rows instead of one from: %s"
+#~ msgstr "已得到 %d 条记录替代来自 %s 的一条"
#~ msgid "inserted invalid OID\n"
#~ msgstr "插入了非法 OID\n"
-#~ msgid "Got %d rows instead of one from: %s"
-#~ msgstr "已得到 %d 条记录替代来自 %s 的一条"
+#~ msgid "maximum system OID is %u\n"
+#~ msgstr "最大系统 OID 是 %u\n"
-#~ msgid "expected %d triggers on table \"%s\" but found %d\n"
-#~ msgstr "预期在表 \"%2$s\" 上有触发器 %1$d , 却发现 %3$d\n"
+#~ msgid "could not close output archive file\n"
+#~ msgstr "无法关闭输出归档文件\n"
-#~ msgid "specified table \"%s\" does not exist\n"
-#~ msgstr "指定的表 \"%s\" 不存在\n"
+#~ msgid "WARNING: skipping large-object restoration\n"
+#~ msgstr "警告: 忽略大对象的恢复\n"
-#~ msgid "specified schema \"%s\" does not exist\n"
-#~ msgstr "指定的模式 \"%s\" 不存在\n"
+#~ msgid "fixing up large-object cross-reference for \"%s\"\n"
+#~ msgstr "为 \"%s\" 修复大对象的交叉引用\n"
-#~ msgid ""
-#~ " -S, --superuser=NAME specify the superuser user name to use in\n"
-#~ " plain text format\n"
-#~ msgstr ""
-#~ " -S, --superuser=NAME 在明文格式中, 使用指定的超级用户\n"
-#~ " 名称\n"
+#~ msgid "committing large-object transactions\n"
+#~ msgstr "提交大对象事务\n"
-#~ msgid " -c, --clean clean (drop) schema prior to create\n"
-#~ msgstr " -c, --clean 先清楚(删除)预先的模式,再建立\n"
+#~ msgid "cannot restore large objects without a database connection\n"
+#~ msgstr "没有数据库联接时无法恢复大对象\n"
-#~ msgid ""
-#~ " -i, --ignore-version proceed even when server version mismatches\n"
-#~ " pg_dump version\n"
-#~ msgstr ""
-#~ " -i, --ignore-version 当服务器的版本号与 pg_dump 的版本号不匹配时\n"
-#~ " 仍继续运行\n"
+#~ msgid "starting large-object transactions\n"
+#~ msgstr "开始大对象事务\n"
-#~ msgid "(Use a different output format.)\n"
-#~ msgstr "(使用不同的输出格式.)\n"
+#~ msgid "restoring large object with OID %u as %u\n"
+#~ msgstr "把 OID 为 %u 的大对象恢复为 %u\n"
-#~ msgid "large-object output is not supported for plain-text dump files\n"
-#~ msgstr "纯文本转储文件不支持输出大对象.\n"
+#~ msgid "wrote remaining %lu bytes of large-object data (result = %lu)\n"
+#~ msgstr "写剩下了 %lu 字节的大对象数据 (结果 = %lu)\n"
-#~ msgid "INSERT (-d, -D) and OID (-o) options cannot be used together\n"
-#~ msgstr "INSERT (-d, -D) 和 OID (-o) 选项不能同时使用.\n"
+#~ msgid "could not open TOC file\n"
+#~ msgstr "无法打开 TOC 文件\n"
-#~ msgid "large-object output not supported for a single schema\n"
-#~ msgstr "不支持单个模式的大对象输出.\n"
+#~ msgid "could not write to compressed archive\n"
+#~ msgstr "无法写入压缩的归档\n"
-#~ msgid "use a full dump instead\n"
-#~ msgstr "使用完整转储替代.\n"
+#~ msgid "could not write to output file (%lu != %lu)\n"
+#~ msgstr "无法写出到输出文件 (%lu != %lu)\n"
-#~ msgid "large-object output not supported for a single table\n"
-#~ msgstr "不支持单个表的大对象输出.\n"
+#~ msgid "read %lu bytes into lookahead buffer\n"
+#~ msgstr "读取 %lu 字节到预览缓冲区\n"
-#~ msgid "User name: "
-#~ msgstr "用户名: "
+#~ msgid "could not close the input file after reading header: %s\n"
+#~ msgstr "读取头之后无法关闭输入文件: %s\n"
-#~ msgid "compression support is disabled in this format\n"
-#~ msgstr "在这个格式里, 压缩支持时被关闭了的\n"
+#~ msgid "archive format is %d\n"
+#~ msgstr "归档格式是 %d\n"
-#~ msgid ""
-#~ "dumping a specific TOC data block out of order is not supported without "
-#~ "ID on this input stream (fseek required)\n"
-#~ msgstr ""
-#~ "如果在此输入流中没有ID(标识)(fseek 要求的), 那么是不支持非顺序转储特定TOC"
-#~ "数据块的\n"
+#~ msgid "could not open archive file \"%s\": %s\n"
+#~ msgstr "无法打开归档文件 \"%s\": %s\n"
-#~ msgid "no label definitions found for enum ID %u\n"
-#~ msgstr "对于枚举 ID %u没有找到标签定义\n"
+#~ msgid "large objects cannot be loaded without a database connection\n"
+#~ msgstr "没有数据库联接时无法装载大对象\n"
-#~ msgid "saving large object comments\n"
-#~ msgstr "正在保存大对象注释\n"
+#~ msgid "could not read data block -- expected %lu, got %lu\n"
+#~ msgstr "无法读取数据块 - 预期 %lu, 实际 %lu\n"
-#~ msgid "dumpBlobs(): could not open large object: %s"
-#~ msgstr "dumpBlobs(): 无法打开大对象: %s"
+#~ msgid "write error in _WriteBuf (%lu != %lu)\n"
+#~ msgstr "在 _WriteBuf 里的写错误 (%lu != %lu)\n"
-#~ msgid "%s: out of memory\n"
-#~ msgstr "%s: 内存溢出\n"
+#~ msgid "could not write compressed chunk\n"
+#~ msgstr "无法写入压缩的块\n"
-#~ msgid ""
-#~ " --use-set-session-authorization\n"
-#~ " use SET SESSION AUTHORIZATION commands instead "
-#~ "of\n"
-#~ " ALTER OWNER commands to set ownership\n"
-#~ msgstr ""
-#~ " --use-set-session-authorization\n"
-#~ " 使用 SESSION AUTHORIZATION 命令代替\n"
-#~ " ALTER OWNER命令来设置对象所有权\n"
+#~ msgid "could not write uncompressed chunk\n"
+#~ msgstr "无法写入未压缩的块\n"
#~ msgid ""
-#~ " --disable-triggers disable triggers during data-only restore\n"
-#~ msgstr " --disable-triggers 在只恢复数据的过程中禁用触发器\n"
+#~ "aborting because of version mismatch (Use the -i option to proceed "
+#~ "anyway.)\n"
+#~ msgstr "因版本差异退出 (用 -i 选项忽略差异继续处理.)\n"
-#~ msgid " -O, --no-owner skip restoration of object ownership\n"
-#~ msgstr " -O, --no-owner 忽略恢复对象所属者\n"
+#~ msgid "%s: no result from server\n"
+#~ msgstr "%s: 没有来自服务器的结果\n"
-#~ msgid ""
-#~ " -c, --clean clean (drop) database objects before "
-#~ "recreating\n"
-#~ msgstr ""
-#~ " -c, --clean 在重新创建数据库对象之前需要清除(删除)数据库"
-#~ "对象\n"
+#~ msgid "COPY command executed in non-primary connection\n"
+#~ msgstr "COPY 命令在没有主联接的环境下执行\n"
-#~ msgid " --version output version information, then exit\n"
-#~ msgstr " --version 输出版本信息, 然后退出\n"
+#~ msgid "error returned by PQendcopy\n"
+#~ msgstr "PQendcopy 返回错误\n"
-#~ msgid " --help show this help, then exit\n"
-#~ msgstr " --help 显示此帮助信息, 然后退出\n"
+#~ msgid "could not find OID columns of table \"%s\": %s"
+#~ msgstr "无法寻找表 \"%s\" 的 OID 字段: %s"
-#~ msgid "restoring large object OID %u\n"
-#~ msgstr "恢复 OID %u 的大对象\n"
+#~ msgid "no OID type columns in table %s\n"
+#~ msgstr "表 %s 中没有 OID 类型字段\n"
-#~ msgid ""
-#~ "invalid COPY statement -- could not find \"from stdin\" in string \"%s\" "
-#~ "starting at position %lu\n"
-#~ msgstr ""
-#~ "COPY 语句错 -- 无法在从 %2$lu 位置开始的字串 \"%1$s\" 里找到 \"from stdin"
-#~ "\" 字样\n"
+#~ msgid "fixing large object cross-references for %s.%s\n"
+#~ msgstr "为 %s.%s 修补大对象交叉引用\n"
-#~ msgid "invalid COPY statement -- could not find \"copy\" in string \"%s\"\n"
-#~ msgstr "COPY 语句错 -- 无法在字串 \"%s\" 中找到 \"copy\"\n"
+#~ msgid "SQL: %s\n"
+#~ msgstr "SQL: %s\n"
-#~ msgid "could not close large object file\n"
-#~ msgstr "无法关闭大对象文件\n"
+#~ msgid "could not update column \"%s\" of table \"%s\": %s"
+#~ msgstr "无法更新表 \"%2$s\" 的字段 \"%1$s\": %3$s"
-#~ msgid "could not open large object TOC for output: %s\n"
-#~ msgstr "无法打开大对象 TOC 进行输出: %s\n"
+#~ msgid "error while updating column \"%s\" of table \"%s\": %s"
+#~ msgstr "更新表 \"%2$s\" 的字段 \"%1$s\" 时出错: %3$s"
-#~ msgid "could not open large object TOC for input: %s\n"
-#~ msgstr "无法打开大对象 TOC 进行输入: %s\n"
+#~ msgid "creating table for large object cross-references\n"
+#~ msgstr "为大对象交叉引用创建表\n"
-#~ msgid "could not close data file after reading\n"
-#~ msgstr "读取之后无法关闭数据文件\n"
+#~ msgid "could not create large object cross-reference table"
+#~ msgstr "无法创建大对象交叉引用表"
-#~ msgid ""
-#~ "WARNING:\n"
-#~ " This format is for demonstration purposes; it is not intended for\n"
-#~ " normal use. Files will be written in the current working directory.\n"
-#~ msgstr ""
-#~ "警告:\n"
-#~ " 这个格式仅用于演示; 并非用于一般用途.\n"
-#~ " 文件将写入当前工作目录.\n"
+#~ msgid "creating index for large object cross-references\n"
+#~ msgstr "为大对象交叉引用创建索引\n"
-#~ msgid "file archiver"
-#~ msgstr "文件归档"
+#~ msgid "could not create index on large object cross-reference table"
+#~ msgstr "无法在大对象交叉引用表上创建索引"
-#~ msgid "cannot reopen non-seekable file\n"
-#~ msgstr "无法重新打开不可查找的文件\n"
+#~ msgid "could not create large object cross-reference entry"
+#~ msgstr "无法创建大对象交叉引用记录"
-#~ msgid "cannot reopen stdin\n"
-#~ msgstr "无法重新打开stdin\n"
+#~ msgid "could not start transaction for large object cross-references"
+#~ msgstr "无法为大对象交叉引用启动事务"
-#~ msgid "SQL command failed\n"
-#~ msgstr "SQL 命令失败\n"
+#~ msgid "could not commit transaction for large object cross-references"
+#~ msgstr "无法为大对象交叉引用提交事务"
-#~ msgid "found more than one entry for pg_indexes in pg_class\n"
-#~ msgstr "在 pg_class 表中找到多条 pg_indexes 的记录\n"
+#~ msgid "could not open data file for output\n"
+#~ msgstr "无法为输出打开数据文件\n"
-#~ msgid "could not find entry for pg_indexes in pg_class\n"
-#~ msgstr "在 pg_class 中无法为 pg_indexes 找到记录\n"
+#~ msgid "could not open data file for input\n"
+#~ msgstr "无法为输入打开数据文件\n"
-#~ msgid "found more than one pg_database entry for this database\n"
-#~ msgstr "找到此数据库的多于一条的 pg_database 记录\n"
+#~ msgid "could not open large object file\n"
+#~ msgstr "无法打开大对象文件\n"
-#~ msgid "missing pg_database entry for this database\n"
-#~ msgstr "缺少此数据库的 pg_database 记录\n"
+#~ msgid "requested %d bytes, got %d from lookahead and %d from file\n"
+#~ msgstr "要求 %d 字节, 从预览中获取 %d, 从文件中获取 %d\n"
-#~ msgid "query returned no rows: %s\n"
-#~ msgstr "查询放弃, 没有记录: %s\n"
+#~ msgid "could not write to tar member (wrote %lu, attempted %lu)\n"
+#~ msgstr "无法写入 tar 成员 (写了 %lu, 企图写 %lu)\n"
-#~ msgid "dumpDatabase(): could not find pg_largeobject.relfrozenxid\n"
-#~ msgstr "dumpDatabase(): 无法找到pg_largeobject.relfrozenxid\n"
+#~ msgid "write error appending to tar archive (wrote %lu, attempted %lu)\n"
+#~ msgstr "向 tar 归档附加时写错误 (写了 %lu, 试图写 %lu)\n"
-#~ msgid ""
-#~ "query returned more than one (%d) pg_database entry for database \"%s\"\n"
-#~ msgstr "查询为数据库 \"%2$s\" 返回了超过一条 (%1$d) pg_database 记录\n"
+#~ msgid "could not close tar member: %s\n"
+#~ msgstr "无法关闭 tar 成员: %s\n"
-#~ msgid "missing pg_database entry for database \"%s\"\n"
-#~ msgstr "缺少用于 \"%s\" 的 pg_database 记录\n"
+#~ msgid "could not write tar header\n"
+#~ msgstr "无法写 tar 头\n"
-#~ msgid "*** aborted because of error\n"
-#~ msgstr "*** 因为错误退出\n"
+#~ msgid ""
+#~ " -i, --ignore-version proceed even when server version mismatches\n"
+#~ msgstr " -i, --ignore-version 当服务器版本不匹配时继续运行\n"
#~ msgid ""
-#~ " --version output version information, then exit\n"
-#~ msgstr " --versoin 输出版本信息, 然后退出\n"
+#~ " -i, --ignore-version proceed even when server version mismatches\n"
+#~ " pg_dumpall version\n"
+#~ msgstr ""
+#~ " -i, --ignore-version 当服务器版本与 pg_dumpall 不匹配时\n"
+#~ " 继续运行\n"
-#~ msgid " --help show this help, then exit\n"
-#~ msgstr " --help 显示此帮助信息, 然后退出\n"
+#~ msgid ""
+#~ " -O, --no-owner do not output commands to set object "
+#~ "ownership\n"
+#~ msgstr ""
+#~ " -O, --no-owner 设置对象的所属者时不输出\n"
+#~ " 命令\n"
-#~ msgid "%s: invalid -X option -- %s\n"
-#~ msgstr "%s: 无效的 -X 选项 -- %s\n"
+#~ msgid "-C and -c are incompatible options\n"
+#~ msgstr "-C 和 -c 是互不兼容的选项\n"
-#~ msgid "%s: could not parse version \"%s\"\n"
-#~ msgstr "%s: 无法解析版本 \"%s\"\n"
+#~ msgid "mismatch in actual vs. predicted file position (%s vs. %s)\n"
+#~ msgstr "实际文件位置和预期文件位置不匹配 (%s 对 %s)\n"
-#~ msgid "could not parse version string \"%s\"\n"
-#~ msgstr "无法分析版本字串 \"%s\"\n"
+#~ msgid "could not output padding at end of tar member\n"
+#~ msgstr "无法在 tar 成员尾部输出填充内容\n"
+
+#~ msgid "could not write null block at end of tar archive\n"
+#~ msgstr "无法在 tar 归档末尾写 null 块\n"
+
+#~ msgid "could not write byte\n"
+#~ msgstr "无法写字节\n"
+
+#~ msgid "could not write byte: %s\n"
+#~ msgstr "无法写字节: %s\n"
+
+#~ msgid "unexpected end of file\n"
+#~ msgstr "意外的文件结尾\n"
+
+#~ msgid "could not write to custom output routine\n"
+#~ msgstr "无法写出到客户输出过程\n"
+
+#~ msgid "could not write to output file: %s\n"
+#~ msgstr "无法写到输出文件: %s\n"
diff --git a/src/bin/pg_resetxlog/nls.mk b/src/bin/pg_resetxlog/nls.mk
index 6817b4dd88d..cf04cb07390 100644
--- a/src/bin/pg_resetxlog/nls.mk
+++ b/src/bin/pg_resetxlog/nls.mk
@@ -1,4 +1,4 @@
# src/bin/pg_resetxlog/nls.mk
CATALOG_NAME = pg_resetxlog
-AVAIL_LANGUAGES = cs de es fr it ja pl pt_BR ru zh_CN
+AVAIL_LANGUAGES = cs de es fr it ja pl pt_BR ru sv zh_CN
GETTEXT_FILES = pg_resetxlog.c
diff --git a/src/bin/pg_resetxlog/po/fr.po b/src/bin/pg_resetxlog/po/fr.po
index 0ba9432e74d..7cc65d4caa1 100644
--- a/src/bin/pg_resetxlog/po/fr.po
+++ b/src/bin/pg_resetxlog/po/fr.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: PostgreSQL 8.4\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2014-05-17 11:12+0000\n"
-"PO-Revision-Date: 2014-05-17 15:41+0100\n"
+"POT-Creation-Date: 2014-12-04 22:42+0000\n"
+"PO-Revision-Date: 2014-12-05 10:10+0100\n"
"Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
"Language-Team: PostgreSQLfr <pgsql-fr-generale@postgresql.org>\n"
"Language: fr\n"
@@ -19,103 +19,103 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.5.4\n"
-#: pg_resetxlog.c:129
+#: pg_resetxlog.c:130
#, c-format
msgid "%s: invalid argument for option -e\n"
msgstr "%s : argument invalide pour l'option -e\n"
-#: pg_resetxlog.c:130 pg_resetxlog.c:145 pg_resetxlog.c:160 pg_resetxlog.c:175
-#: pg_resetxlog.c:183 pg_resetxlog.c:209 pg_resetxlog.c:223 pg_resetxlog.c:230
-#: pg_resetxlog.c:238
+#: pg_resetxlog.c:131 pg_resetxlog.c:146 pg_resetxlog.c:161 pg_resetxlog.c:176
+#: pg_resetxlog.c:184 pg_resetxlog.c:210 pg_resetxlog.c:224 pg_resetxlog.c:231
+#: pg_resetxlog.c:239
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "Essayer %s --help pour plus d'informations.\n"
-#: pg_resetxlog.c:135
+#: pg_resetxlog.c:136
#, c-format
msgid "%s: transaction ID epoch (-e) must not be -1\n"
msgstr ""
"%s : la valeur epoch de l'identifiant de transaction (-e) ne doit pas tre\n"
"-1\n"
-#: pg_resetxlog.c:144
+#: pg_resetxlog.c:145
#, c-format
msgid "%s: invalid argument for option -x\n"
msgstr "%s : argument invalide pour l'option -x\n"
-#: pg_resetxlog.c:150
+#: pg_resetxlog.c:151
#, c-format
msgid "%s: transaction ID (-x) must not be 0\n"
msgstr "%s : l'identifiant de la transaction (-x) ne doit pas tre 0\n"
-#: pg_resetxlog.c:159
+#: pg_resetxlog.c:160
#, c-format
msgid "%s: invalid argument for option -o\n"
msgstr "%s : argument invalide pour l'option -o\n"
-#: pg_resetxlog.c:165
+#: pg_resetxlog.c:166
#, c-format
msgid "%s: OID (-o) must not be 0\n"
msgstr "%s : l'OID (-o) ne doit pas tre 0\n"
-#: pg_resetxlog.c:174 pg_resetxlog.c:182
+#: pg_resetxlog.c:175 pg_resetxlog.c:183
#, c-format
msgid "%s: invalid argument for option -m\n"
msgstr "%s : argument invalide pour l'option -m\n"
-#: pg_resetxlog.c:188
+#: pg_resetxlog.c:189
#, c-format
msgid "%s: multitransaction ID (-m) must not be 0\n"
msgstr "%s : l'identifiant de multi-transaction (-m) ne doit pas tre 0\n"
-#: pg_resetxlog.c:198
+#: pg_resetxlog.c:199
#, c-format
msgid "%s: oldest multitransaction ID (-m) must not be 0\n"
msgstr ""
"%s : l'identifiant de multi-transaction le plus ancien (-m) ne doit pas tre "
"0\n"
-#: pg_resetxlog.c:208
+#: pg_resetxlog.c:209
#, c-format
msgid "%s: invalid argument for option -O\n"
msgstr "%s : argument invalide pour l'option -O\n"
-#: pg_resetxlog.c:214
+#: pg_resetxlog.c:215
#, c-format
msgid "%s: multitransaction offset (-O) must not be -1\n"
msgstr "%s : le dcalage de multi-transaction (-O) ne doit pas tre -1\n"
-#: pg_resetxlog.c:222
+#: pg_resetxlog.c:223
#, c-format
msgid "%s: invalid argument for option -l\n"
msgstr "%s : argument invalide pour l'option -l\n"
-#: pg_resetxlog.c:237
+#: pg_resetxlog.c:238
#, c-format
msgid "%s: no data directory specified\n"
msgstr "%s : aucun rpertoire de donnes indiqu\n"
-#: pg_resetxlog.c:251
+#: pg_resetxlog.c:252
#, c-format
msgid "%s: cannot be executed by \"root\"\n"
msgstr "%s : ne peut pas tre excut par root \n"
-#: pg_resetxlog.c:253
+#: pg_resetxlog.c:254
#, c-format
msgid "You must run %s as the PostgreSQL superuser.\n"
msgstr "Vous devez excuter %s en tant que super-utilisateur PostgreSQL.\n"
-#: pg_resetxlog.c:263
+#: pg_resetxlog.c:264
#, c-format
msgid "%s: could not change directory to \"%s\": %s\n"
msgstr "%s : n'a pas pu accder au rpertoire %s : %s\n"
-#: pg_resetxlog.c:276 pg_resetxlog.c:417
+#: pg_resetxlog.c:277 pg_resetxlog.c:418
#, c-format
msgid "%s: could not open file \"%s\" for reading: %s\n"
msgstr "%s : n'a pas pu ouvrir le fichier %s en lecture : %s\n"
-#: pg_resetxlog.c:283
+#: pg_resetxlog.c:284
#, c-format
msgid ""
"%s: lock file \"%s\" exists\n"
@@ -125,7 +125,7 @@ msgstr ""
"Le serveur est-il dmarr ? Sinon, supprimer le fichier verrou et "
"ressayer.\n"
-#: pg_resetxlog.c:365
+#: pg_resetxlog.c:366
#, c-format
msgid ""
"\n"
@@ -135,7 +135,7 @@ msgstr ""
"Si ces valeurs semblent acceptables, utiliser -f pour forcer la\n"
"rinitialisation.\n"
-#: pg_resetxlog.c:377
+#: pg_resetxlog.c:378
#, c-format
msgid ""
"The database server was not shut down cleanly.\n"
@@ -148,12 +148,12 @@ msgstr ""
"Pour continuer malgr tout, utiliser -f pour forcer la\n"
"rinitialisation.\n"
-#: pg_resetxlog.c:391
+#: pg_resetxlog.c:392
#, c-format
msgid "Transaction log reset\n"
msgstr "Rinitialisation du journal des transactions\n"
-#: pg_resetxlog.c:420
+#: pg_resetxlog.c:421
#, c-format
msgid ""
"If you are sure the data directory path is correct, execute\n"
@@ -164,24 +164,24 @@ msgstr ""
" touch %s\n"
"et ressayer.\n"
-#: pg_resetxlog.c:433
+#: pg_resetxlog.c:434
#, c-format
msgid "%s: could not read file \"%s\": %s\n"
msgstr "%s : n'a pas pu lire le fichier %s : %s\n"
-#: pg_resetxlog.c:456
+#: pg_resetxlog.c:457
#, c-format
msgid "%s: pg_control exists but has invalid CRC; proceed with caution\n"
msgstr ""
"%s : pg_control existe mais son CRC est invalide ; agir avec prcaution\n"
-#: pg_resetxlog.c:465
+#: pg_resetxlog.c:466
#, c-format
msgid "%s: pg_control exists but is broken or unknown version; ignoring it\n"
msgstr ""
"%s : pg_control existe mais est corrompu ou de version inconnue ; ignor\n"
-#: pg_resetxlog.c:565
+#: pg_resetxlog.c:568
#, c-format
msgid ""
"Guessed pg_control values:\n"
@@ -190,11 +190,8 @@ msgstr ""
"Valeurs de pg_control devines :\n"
"\n"
-#: pg_resetxlog.c:567
+#: pg_resetxlog.c:570
#, c-format
-#| msgid ""
-#| "pg_control values:\n"
-#| "\n"
msgid ""
"Current pg_control values:\n"
"\n"
@@ -202,161 +199,167 @@ msgstr ""
"Valeurs actuelles de pg_control :\n"
"\n"
-#: pg_resetxlog.c:576
+#: pg_resetxlog.c:579
#, c-format
msgid "pg_control version number: %u\n"
msgstr "Numro de version de pg_control : %u\n"
-#: pg_resetxlog.c:578
+#: pg_resetxlog.c:581
#, c-format
msgid "Catalog version number: %u\n"
msgstr "Numro de version du catalogue : %u\n"
-#: pg_resetxlog.c:580
+#: pg_resetxlog.c:583
#, c-format
msgid "Database system identifier: %s\n"
msgstr "Identifiant du systme de base de donnes : %s\n"
-#: pg_resetxlog.c:582
+#: pg_resetxlog.c:585
#, c-format
msgid "Latest checkpoint's TimeLineID: %u\n"
msgstr "Dernier TimeLineID du point de contrle : %u\n"
-#: pg_resetxlog.c:584
+#: pg_resetxlog.c:587
#, c-format
msgid "Latest checkpoint's full_page_writes: %s\n"
msgstr "Dernier full_page_writes du point de contrle : %s\n"
-#: pg_resetxlog.c:585
+#: pg_resetxlog.c:588
msgid "off"
msgstr "dsactiv"
-#: pg_resetxlog.c:585
+#: pg_resetxlog.c:588
msgid "on"
msgstr "activ"
-#: pg_resetxlog.c:586
+#: pg_resetxlog.c:589
#, c-format
msgid "Latest checkpoint's NextXID: %u/%u\n"
msgstr "Dernier NextXID du point de contrle : %u/%u\n"
-#: pg_resetxlog.c:589
+#: pg_resetxlog.c:592
#, c-format
msgid "Latest checkpoint's NextOID: %u\n"
msgstr "Dernier NextOID du point de contrle : %u\n"
-#: pg_resetxlog.c:591
+#: pg_resetxlog.c:594
#, c-format
msgid "Latest checkpoint's NextMultiXactId: %u\n"
msgstr "Dernier NextMultiXactId du point de contrle : %u\n"
-#: pg_resetxlog.c:593
+#: pg_resetxlog.c:596
#, c-format
msgid "Latest checkpoint's NextMultiOffset: %u\n"
msgstr "Dernier NextMultiOffset du point de contrle : %u\n"
-#: pg_resetxlog.c:595
+#: pg_resetxlog.c:598
#, c-format
msgid "Latest checkpoint's oldestXID: %u\n"
msgstr "Dernier oldestXID du point de contrle : %u\n"
-#: pg_resetxlog.c:597
+#: pg_resetxlog.c:600
#, c-format
msgid "Latest checkpoint's oldestXID's DB: %u\n"
msgstr "Dernier oldestXID du point de contrle de la base : %u\n"
-#: pg_resetxlog.c:599
+#: pg_resetxlog.c:602
#, c-format
msgid "Latest checkpoint's oldestActiveXID: %u\n"
msgstr "Dernier oldestActiveXID du point de contrle : %u\n"
-#: pg_resetxlog.c:601
+#: pg_resetxlog.c:604
#, c-format
msgid "Latest checkpoint's oldestMultiXid: %u\n"
msgstr "Dernier oldestMultiXID du point de contrle : %u\n"
-#: pg_resetxlog.c:603
+#: pg_resetxlog.c:606
#, c-format
msgid "Latest checkpoint's oldestMulti's DB: %u\n"
msgstr "Dernier oldestMulti du point de contrle de la base : %u\n"
-#: pg_resetxlog.c:605
+#: pg_resetxlog.c:608
#, c-format
msgid "Maximum data alignment: %u\n"
msgstr "Alignement maximal des donnes : %u\n"
-#: pg_resetxlog.c:608
+#: pg_resetxlog.c:611
#, c-format
msgid "Database block size: %u\n"
msgstr "Taille du bloc de la base de donnes : %u\n"
-#: pg_resetxlog.c:610
+#: pg_resetxlog.c:613
#, c-format
msgid "Blocks per segment of large relation: %u\n"
msgstr "Blocs par segment des relations volumineuses : %u\n"
-#: pg_resetxlog.c:612
+#: pg_resetxlog.c:615
#, c-format
msgid "WAL block size: %u\n"
msgstr "Taille de bloc du journal de transaction : %u\n"
-#: pg_resetxlog.c:614
+#: pg_resetxlog.c:617
#, c-format
msgid "Bytes per WAL segment: %u\n"
msgstr "Octets par segment du journal de transaction : %u\n"
-#: pg_resetxlog.c:616
+#: pg_resetxlog.c:619
#, c-format
msgid "Maximum length of identifiers: %u\n"
msgstr "Longueur maximale des identifiants : %u\n"
-#: pg_resetxlog.c:618
+#: pg_resetxlog.c:621
#, c-format
msgid "Maximum columns in an index: %u\n"
msgstr "Nombre maximal de colonnes d'un index: %u\n"
-#: pg_resetxlog.c:620
+#: pg_resetxlog.c:623
#, c-format
msgid "Maximum size of a TOAST chunk: %u\n"
msgstr "Longueur maximale d'un morceau TOAST : %u\n"
-#: pg_resetxlog.c:622
+#: pg_resetxlog.c:625
+#, c-format
+#| msgid "Maximum size of a TOAST chunk: %u\n"
+msgid "Size of a large-object chunk: %u\n"
+msgstr "Taille d'un morceau de Large Object : %u\n"
+
+#: pg_resetxlog.c:627
#, c-format
msgid "Date/time type storage: %s\n"
msgstr "Stockage du type date/heure : %s\n"
-#: pg_resetxlog.c:623
+#: pg_resetxlog.c:628
msgid "64-bit integers"
msgstr "entiers 64-bits"
-#: pg_resetxlog.c:623
+#: pg_resetxlog.c:628
msgid "floating-point numbers"
msgstr "nombres virgule flottante"
-#: pg_resetxlog.c:624
+#: pg_resetxlog.c:629
#, c-format
msgid "Float4 argument passing: %s\n"
msgstr "Passage d'argument float4 : %s\n"
-#: pg_resetxlog.c:625 pg_resetxlog.c:627
+#: pg_resetxlog.c:630 pg_resetxlog.c:632
msgid "by reference"
msgstr "par rfrence"
-#: pg_resetxlog.c:625 pg_resetxlog.c:627
+#: pg_resetxlog.c:630 pg_resetxlog.c:632
msgid "by value"
msgstr "par valeur"
-#: pg_resetxlog.c:626
+#: pg_resetxlog.c:631
#, c-format
msgid "Float8 argument passing: %s\n"
msgstr "Passage d'argument float8 : %s\n"
-#: pg_resetxlog.c:628
+#: pg_resetxlog.c:633
#, c-format
msgid "Data page checksum version: %u\n"
msgstr "Version des sommes de contrle des pages de donnes : %u\n"
-#: pg_resetxlog.c:642
+#: pg_resetxlog.c:647
#, c-format
msgid ""
"\n"
@@ -369,66 +372,58 @@ msgstr ""
"Valeurs changer :\n"
"\n"
-#: pg_resetxlog.c:645
+#: pg_resetxlog.c:650
#, c-format
msgid "First log segment after reset: %s\n"
msgstr "Premier segment du journal aprs rinitialisation : %s\n"
-#: pg_resetxlog.c:649
+#: pg_resetxlog.c:654
#, c-format
-#| msgid "WAL block size: %u\n"
msgid "NextMultiXactId: %u\n"
msgstr "NextMultiXactId: %u\n"
-#: pg_resetxlog.c:651
+#: pg_resetxlog.c:656
#, c-format
-#| msgid "WAL block size: %u\n"
msgid "OldestMultiXid: %u\n"
msgstr "OldestMultiXid: %u\n"
-#: pg_resetxlog.c:653
+#: pg_resetxlog.c:658
#, c-format
-#| msgid "WAL block size: %u\n"
msgid "OldestMulti's DB: %u\n"
msgstr "OldestMulti's DB: %u\n"
-#: pg_resetxlog.c:659
+#: pg_resetxlog.c:664
#, c-format
-#| msgid "WAL block size: %u\n"
msgid "NextMultiOffset: %u\n"
msgstr "NextMultiOffset: %u\n"
-#: pg_resetxlog.c:665
+#: pg_resetxlog.c:670
#, c-format
-#| msgid "WAL block size: %u\n"
msgid "NextOID: %u\n"
msgstr "NextOID: %u\n"
-#: pg_resetxlog.c:671
+#: pg_resetxlog.c:676
#, c-format
-#| msgid "WAL block size: %u\n"
msgid "NextXID: %u\n"
msgstr "NextXID: %u\n"
-#: pg_resetxlog.c:673
+#: pg_resetxlog.c:678
#, c-format
-#| msgid "WAL block size: %u\n"
msgid "OldestXID: %u\n"
msgstr "OldestXID: %u\n"
-#: pg_resetxlog.c:675
+#: pg_resetxlog.c:680
#, c-format
-#| msgid "WAL block size: %u\n"
msgid "OldestXID's DB: %u\n"
msgstr "OldestXID's DB: %u\n"
-#: pg_resetxlog.c:681
+#: pg_resetxlog.c:686
#, c-format
-#| msgid "WAL block size: %u\n"
-msgid "NextXID Epoch: %u\n"
+#| msgid "NextXID Epoch: %u\n"
+msgid "NextXID epoch: %u\n"
msgstr "NextXID Epoch: %u\n"
-#: pg_resetxlog.c:746
+#: pg_resetxlog.c:751
#, c-format
msgid ""
"%s: internal error -- sizeof(ControlFileData) is too large ... fix "
@@ -437,53 +432,52 @@ msgstr ""
"%s : erreur interne -- sizeof(ControlFileData) est trop important...\n"
"corrigez PG_CONTROL_SIZE\n"
-#: pg_resetxlog.c:761
+#: pg_resetxlog.c:766
#, c-format
msgid "%s: could not create pg_control file: %s\n"
msgstr "%s : n'a pas pu crer le fichier pg_control : %s\n"
-#: pg_resetxlog.c:772
+#: pg_resetxlog.c:777
#, c-format
msgid "%s: could not write pg_control file: %s\n"
msgstr "%s : n'a pas pu crire le fichier pg_control : %s\n"
-#: pg_resetxlog.c:779 pg_resetxlog.c:1063
+#: pg_resetxlog.c:784 pg_resetxlog.c:1068
#, c-format
msgid "%s: fsync error: %s\n"
msgstr "%s : erreur fsync : %s\n"
-#: pg_resetxlog.c:819 pg_resetxlog.c:885 pg_resetxlog.c:936
+#: pg_resetxlog.c:824 pg_resetxlog.c:890 pg_resetxlog.c:941
#, c-format
msgid "%s: could not open directory \"%s\": %s\n"
msgstr "%s : n'a pas pu ouvrir le rpertoire %s : %s\n"
-#: pg_resetxlog.c:850 pg_resetxlog.c:907 pg_resetxlog.c:959
+#: pg_resetxlog.c:855 pg_resetxlog.c:912 pg_resetxlog.c:964
#, c-format
msgid "%s: could not read directory \"%s\": %s\n"
msgstr "%s : n'a pas pu lire le rpertoire %s : %s\n"
-#: pg_resetxlog.c:857 pg_resetxlog.c:914 pg_resetxlog.c:966
+#: pg_resetxlog.c:862 pg_resetxlog.c:919 pg_resetxlog.c:971
#, c-format
-#| msgid "%s: could not open directory \"%s\": %s\n"
msgid "%s: could not close directory \"%s\": %s\n"
msgstr "%s : n'a pas pu fermer le rpertoire %s : %s\n"
-#: pg_resetxlog.c:898 pg_resetxlog.c:950
+#: pg_resetxlog.c:903 pg_resetxlog.c:955
#, c-format
msgid "%s: could not delete file \"%s\": %s\n"
msgstr "%s : n'a pas pu supprimer le fichier %s : %s\n"
-#: pg_resetxlog.c:1030
+#: pg_resetxlog.c:1035
#, c-format
msgid "%s: could not open file \"%s\": %s\n"
msgstr "%s : n'a pas pu ouvrir le fichier %s : %s\n"
-#: pg_resetxlog.c:1041 pg_resetxlog.c:1055
+#: pg_resetxlog.c:1046 pg_resetxlog.c:1060
#, c-format
msgid "%s: could not write file \"%s\": %s\n"
msgstr "%s : n'a pas pu crire le fichier %s : %s\n"
-#: pg_resetxlog.c:1074
+#: pg_resetxlog.c:1079
#, c-format
msgid ""
"%s resets the PostgreSQL transaction log.\n"
@@ -492,7 +486,7 @@ msgstr ""
"%s rinitialise le journal des transactions PostgreSQL.\n"
"\n"
-#: pg_resetxlog.c:1075
+#: pg_resetxlog.c:1080
#, c-format
msgid ""
"Usage:\n"
@@ -503,24 +497,24 @@ msgstr ""
" %s [OPTION]... RP_DONNES\n"
"\n"
-#: pg_resetxlog.c:1076
+#: pg_resetxlog.c:1081
#, c-format
msgid "Options:\n"
msgstr "Options :\n"
-#: pg_resetxlog.c:1077
+#: pg_resetxlog.c:1082
#, c-format
msgid " -e XIDEPOCH set next transaction ID epoch\n"
msgstr ""
" -e XIDEPOCH fixe la valeur epoch du prochain identifiant de\n"
" transaction\n"
-#: pg_resetxlog.c:1078
+#: pg_resetxlog.c:1083
#, c-format
msgid " -f force update to be done\n"
msgstr " -f force la mise jour\n"
-#: pg_resetxlog.c:1079
+#: pg_resetxlog.c:1084
#, c-format
msgid ""
" -l XLOGFILE force minimum WAL starting location for new transaction "
@@ -529,48 +523,45 @@ msgstr ""
" -l FICHIERXLOG force l'emplacement minimal de dbut des WAL du nouveau\n"
" journal de transactions\n"
-#: pg_resetxlog.c:1080
+#: pg_resetxlog.c:1085
#, c-format
msgid " -m MXID,MXID set next and oldest multitransaction ID\n"
msgstr " -m MXID,MXID fixe le prochain identifiant multi-transaction\n"
-#: pg_resetxlog.c:1081
+#: pg_resetxlog.c:1086
#, c-format
-#| msgid ""
-#| " -n no update, just show extracted control values (for "
-#| "testing)\n"
msgid ""
" -n no update, just show what would be done (for testing)\n"
msgstr ""
" -n pas de mise jour, affiche simplement ce qui sera fait\n"
" (pour test)\n"
-#: pg_resetxlog.c:1082
+#: pg_resetxlog.c:1087
#, c-format
msgid " -o OID set next OID\n"
msgstr " -o OID fixe le prochain OID\n"
-#: pg_resetxlog.c:1083
+#: pg_resetxlog.c:1088
#, c-format
msgid " -O OFFSET set next multitransaction offset\n"
msgstr " -O DCALAGE fixe le dcalage de la prochaine multi-transaction\n"
-#: pg_resetxlog.c:1084
+#: pg_resetxlog.c:1089
#, c-format
msgid " -V, --version output version information, then exit\n"
msgstr " -V, --version affiche la version et quitte\n"
-#: pg_resetxlog.c:1085
+#: pg_resetxlog.c:1090
#, c-format
msgid " -x XID set next transaction ID\n"
msgstr " -x XID fixe le prochain identifiant de transaction\n"
-#: pg_resetxlog.c:1086
+#: pg_resetxlog.c:1091
#, c-format
msgid " -?, --help show this help, then exit\n"
msgstr " -?, --help affiche cette aide et quitte\n"
-#: pg_resetxlog.c:1087
+#: pg_resetxlog.c:1092
#, c-format
msgid ""
"\n"
@@ -579,14 +570,14 @@ msgstr ""
"\n"
"Rapporter les bogues <pgsql-bugs@postgresql.org>.\n"
-#~ msgid "First log file ID after reset: %u\n"
-#~ msgstr "Premier identifiant du journal aprs rinitialisation : %u\n"
-
-#~ msgid " --version output version information, then exit\n"
-#~ msgstr " --version afficherla version et quitte\n"
+#~ msgid "%s: could not read from directory \"%s\": %s\n"
+#~ msgstr "%s : n'a pas pu lire le rpertoire %s : %s\n"
#~ msgid " --help show this help, then exit\n"
#~ msgstr " --help affiche cette aide et quitte\n"
-#~ msgid "%s: could not read from directory \"%s\": %s\n"
-#~ msgstr "%s : n'a pas pu lire le rpertoire %s : %s\n"
+#~ msgid " --version output version information, then exit\n"
+#~ msgstr " --version afficherla version et quitte\n"
+
+#~ msgid "First log file ID after reset: %u\n"
+#~ msgstr "Premier identifiant du journal aprs rinitialisation : %u\n"
diff --git a/src/bin/pg_resetxlog/po/sv.po b/src/bin/pg_resetxlog/po/sv.po
new file mode 100644
index 00000000000..528531be561
--- /dev/null
+++ b/src/bin/pg_resetxlog/po/sv.po
@@ -0,0 +1,550 @@
+# Swedish message translation file for resetxlog.
+# Dennis Björklund <db@zigo.dhs.org>, 2002, 2003, 2004, 2005, 2006.
+# Peter Eisentraut <peter_e@gmx.net>, 2010.
+# Mats Erik Andersson <bsd@gisladisker.se>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 9.4\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2014-11-25 16:12+0000\n"
+"PO-Revision-Date: 2014-11-29 18:32+0100\n"
+"Last-Translator: Mats Erik Andersson <bsd@gisladisker.se>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: pg_resetxlog.c:130
+#, c-format
+msgid "%s: invalid argument for option -e\n"
+msgstr "%s: Ogiltigt argument för växel -e.\n"
+
+#: pg_resetxlog.c:131 pg_resetxlog.c:146 pg_resetxlog.c:161 pg_resetxlog.c:176
+#: pg_resetxlog.c:184 pg_resetxlog.c:210 pg_resetxlog.c:224 pg_resetxlog.c:231
+#: pg_resetxlog.c:239
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "Försök med \"%s --help\" för mer information.\n"
+
+#: pg_resetxlog.c:136
+#, c-format
+msgid "%s: transaction ID epoch (-e) must not be -1\n"
+msgstr "%s: Epok (-e) för transaktions-ID får inte vara -1.\n"
+
+#: pg_resetxlog.c:145
+#, c-format
+msgid "%s: invalid argument for option -x\n"
+msgstr "%s: Ogiltigt argument för växel -x.\n"
+
+#: pg_resetxlog.c:151
+#, c-format
+msgid "%s: transaction ID (-x) must not be 0\n"
+msgstr "%s: Transaktions-ID (-x) får inte vara 0.\n"
+
+#: pg_resetxlog.c:160
+#, c-format
+msgid "%s: invalid argument for option -o\n"
+msgstr "%s: Ogiltigt argument för växel -o.\n"
+
+#: pg_resetxlog.c:166
+#, c-format
+msgid "%s: OID (-o) must not be 0\n"
+msgstr "%s: OID (-o) får inte vara 0.\n"
+
+#: pg_resetxlog.c:175 pg_resetxlog.c:183
+#, c-format
+msgid "%s: invalid argument for option -m\n"
+msgstr "%s: Ogiltigt argument för växel -m.\n"
+
+#: pg_resetxlog.c:189
+#, c-format
+msgid "%s: multitransaction ID (-m) must not be 0\n"
+msgstr "%s: Multitransaktions-ID (-m) får inte vara 0.\n"
+
+#: pg_resetxlog.c:199
+#, c-format
+msgid "%s: oldest multitransaction ID (-m) must not be 0\n"
+msgstr "%s: Äldsta multitransaktions-ID (-m) får inte vara 0.\n"
+
+#: pg_resetxlog.c:209
+#, c-format
+msgid "%s: invalid argument for option -O\n"
+msgstr "%s: Ogiltigt argument för växel -O.\n"
+
+#: pg_resetxlog.c:215
+#, c-format
+msgid "%s: multitransaction offset (-O) must not be -1\n"
+msgstr "%s: Multitransaktionsoffset (-O) får inte vara -1.\n"
+
+#: pg_resetxlog.c:223
+#, c-format
+msgid "%s: invalid argument for option -l\n"
+msgstr "%s: Ogiltigt argument för växel -l.\n"
+
+#: pg_resetxlog.c:238
+#, c-format
+msgid "%s: no data directory specified\n"
+msgstr "%s: Ingen datakatalog angiven.\n"
+
+#: pg_resetxlog.c:252
+#, c-format
+msgid "%s: cannot be executed by \"root\"\n"
+msgstr "%s: Får inte utföras av \"root\".\n"
+
+#: pg_resetxlog.c:254
+#, c-format
+msgid "You must run %s as the PostgreSQL superuser.\n"
+msgstr "Du måste köra %s som PostgreSQL:s superanvändare.\n"
+
+#: pg_resetxlog.c:264
+#, c-format
+msgid "%s: could not change directory to \"%s\": %s\n"
+msgstr "%s: Kunde inte gå till katalog \"%s\": %s\n"
+
+#: pg_resetxlog.c:277 pg_resetxlog.c:418
+#, c-format
+msgid "%s: could not open file \"%s\" for reading: %s\n"
+msgstr "%s: Kunde inte öppna filen \"%s\" för läsning: %s\n"
+
+#: pg_resetxlog.c:284
+#, 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: En låsfil \"%s\" finns på plats.\n"
+"Kör servern redan? Om inte, radera låsfilen och försök igen.\n"
+
+#: pg_resetxlog.c:366
+#, c-format
+msgid ""
+"\n"
+"If these values seem acceptable, use -f to force reset.\n"
+msgstr ""
+"\n"
+"Om dessa värden verkar godtagbara, använd då -f för att\n"
+"framtvinga återställning.\n"
+
+#: pg_resetxlog.c:378
+#, c-format
+msgid ""
+"The database server was not shut down cleanly.\n"
+"Resetting the transaction log might cause data to be lost.\n"
+"If you want to proceed anyway, use -f to force reset.\n"
+msgstr ""
+"Databasservern stängdes inte av ordentligt. Att återställa\n"
+"transaktionsloggen kan medföra att data förloras. Om du ändå\n"
+"vill fortsätta, använd -f för att framtvinga återställning.\n"
+
+#: pg_resetxlog.c:392
+#, c-format
+msgid "Transaction log reset\n"
+msgstr "Återställning av transaktionslogg.\n"
+
+#: pg_resetxlog.c:421
+#, c-format
+msgid ""
+"If you are sure the data directory path is correct, execute\n"
+" touch %s\n"
+"and try again.\n"
+msgstr ""
+"Om du är säker på att sökvägen till datakatalogen är riktig,\n"
+"utför då \"touch %s\" och försök sedan igen.\n"
+
+#: pg_resetxlog.c:434
+#, c-format
+msgid "%s: could not read file \"%s\": %s\n"
+msgstr "%s: Kunde inte läsa fil \"%s\": %s\n"
+
+#: pg_resetxlog.c:457
+#, c-format
+msgid "%s: pg_control exists but has invalid CRC; proceed with caution\n"
+msgstr "%s: pg_control existerar men har ogiltig CRC. Fortsätt med varsamhet.\n"
+
+#: pg_resetxlog.c:466
+#, c-format
+msgid "%s: pg_control exists but is broken or unknown version; ignoring it\n"
+msgstr "%s: pg_control existerar men är trasig eller har okänd version. Den ignoreras.\n"
+
+#: pg_resetxlog.c:568
+#, c-format
+msgid ""
+"Guessed pg_control values:\n"
+"\n"
+msgstr ""
+"Gissade värden för pg_control:\n"
+"\n"
+
+#: pg_resetxlog.c:570
+#, c-format
+msgid ""
+"Current pg_control values:\n"
+"\n"
+msgstr ""
+"Nuvarande värden för pg_control:\n"
+"\n"
+
+# November 26th, 2014: Insert six additional space characters
+# for best alignment with Swedish translation.
+# Translations should be checked against those of pg_controldata.
+#: pg_resetxlog.c:579
+#, c-format
+msgid "pg_control version number: %u\n"
+msgstr "Versionsnummer för pg_control: %u\n"
+
+#: pg_resetxlog.c:581
+#, c-format
+msgid "Catalog version number: %u\n"
+msgstr "Katalogversion: %u\n"
+
+#: pg_resetxlog.c:583
+#, c-format
+msgid "Database system identifier: %s\n"
+msgstr "Databasens systemidentifierare: %s\n"
+
+#: pg_resetxlog.c:585
+#, c-format
+msgid "Latest checkpoint's TimeLineID: %u\n"
+msgstr "TimeLineID vid senaste kontrollpunkt: %u\n"
+
+#: pg_resetxlog.c:587
+#, c-format
+msgid "Latest checkpoint's full_page_writes: %s\n"
+msgstr "Senaste kontrollpunktens full_page_writes: %s\n"
+
+#: pg_resetxlog.c:588
+msgid "off"
+msgstr "av"
+
+#: pg_resetxlog.c:588
+msgid "on"
+msgstr "på"
+
+#: pg_resetxlog.c:589
+#, c-format
+msgid "Latest checkpoint's NextXID: %u/%u\n"
+msgstr "NextXID vid senaste kontrollpunkt: %u/%u\n"
+
+#: pg_resetxlog.c:592
+#, c-format
+msgid "Latest checkpoint's NextOID: %u\n"
+msgstr "NextOID vid senaste kontrollpunkt: %u\n"
+
+#: pg_resetxlog.c:594
+#, c-format
+msgid "Latest checkpoint's NextMultiXactId: %u\n"
+msgstr "NextMultiXactId vid senaste kontrollpunkt: %u\n"
+
+#: pg_resetxlog.c:596
+#, c-format
+msgid "Latest checkpoint's NextMultiOffset: %u\n"
+msgstr "NextMultiOffset vid senaste kontrollpunkt: %u\n"
+
+#: pg_resetxlog.c:598
+#, c-format
+msgid "Latest checkpoint's oldestXID: %u\n"
+msgstr "oldestXID vid senaste kontrollpunkt: %u\n"
+
+#: pg_resetxlog.c:600
+#, c-format
+msgid "Latest checkpoint's oldestXID's DB: %u\n"
+msgstr "DB för oldestXID vid senaste kontrollpunkt: %u\n"
+
+# FIXME: too wide
+#: pg_resetxlog.c:602
+#, c-format
+msgid "Latest checkpoint's oldestActiveXID: %u\n"
+msgstr "oldestActiveXID vid senaste kontrollpunkt: %u\n"
+
+#: pg_resetxlog.c:604
+#, c-format
+msgid "Latest checkpoint's oldestMultiXid: %u\n"
+msgstr "oldestMultiXid vid senaste kontrollpunkt: %u\n"
+
+#: pg_resetxlog.c:606
+#, c-format
+msgid "Latest checkpoint's oldestMulti's DB: %u\n"
+msgstr "DB för oldestMulti vid senaste kontrollpkt: %u\n"
+
+#: pg_resetxlog.c:608
+#, c-format
+msgid "Maximum data alignment: %u\n"
+msgstr "Maximal jämkning av data (alignment): %u\n"
+
+#: pg_resetxlog.c:611
+#, c-format
+msgid "Database block size: %u\n"
+msgstr "Databasens blockstorlek: %u\n"
+
+#: pg_resetxlog.c:613
+#, c-format
+msgid "Blocks per segment of large relation: %u\n"
+msgstr "Block per segment i en stor relation: %u\n"
+
+#: pg_resetxlog.c:615
+#, c-format
+msgid "WAL block size: %u\n"
+msgstr "Blockstorlek i transaktionsloggen: %u\n"
+
+#: pg_resetxlog.c:617
+#, c-format
+msgid "Bytes per WAL segment: %u\n"
+msgstr "Segmentstorlek i transaktionsloggen: %u\n"
+
+#: pg_resetxlog.c:619
+#, c-format
+msgid "Maximum length of identifiers: %u\n"
+msgstr "Maximal längd för identifierare: %u\n"
+
+#: pg_resetxlog.c:621
+#, c-format
+msgid "Maximum columns in an index: %u\n"
+msgstr "Maximalt antal kolonner i ett index: %u\n"
+
+#: pg_resetxlog.c:623
+#, c-format
+msgid "Maximum size of a TOAST chunk: %u\n"
+msgstr "Maximal storlek för en TOAST-enhet: %u\n"
+
+#: pg_resetxlog.c:625
+#, c-format
+msgid "Size of a large-object chunk: %u\n"
+msgstr "Storlek för large-object-enheter: %u\n"
+
+#: pg_resetxlog.c:627
+#, c-format
+msgid "Date/time type storage: %s\n"
+msgstr "Representation av dag och tid: %s\n"
+
+#: pg_resetxlog.c:628
+msgid "64-bit integers"
+msgstr "64-bitars heltal"
+
+#: pg_resetxlog.c:628
+msgid "floating-point numbers"
+msgstr "flyttal"
+
+#: pg_resetxlog.c:629
+#, c-format
+msgid "Float4 argument passing: %s\n"
+msgstr "Åtkomst till float4-argument: %s\n"
+
+#: pg_resetxlog.c:630 pg_resetxlog.c:632
+msgid "by reference"
+msgstr "referens"
+
+#: pg_resetxlog.c:630 pg_resetxlog.c:632
+msgid "by value"
+msgstr "värdeåtkomst"
+
+#: pg_resetxlog.c:631
+#, c-format
+msgid "Float8 argument passing: %s\n"
+msgstr "Åtkomst till float8-argument: %s\n"
+
+#: pg_resetxlog.c:633
+#, c-format
+msgid "Data page checksum version: %u\n"
+msgstr "Checksummaversion för datasidor: %u\n"
+
+#: pg_resetxlog.c:647
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Values to be changed:\n"
+"\n"
+msgstr ""
+"\n"
+"\n"
+"Värden att förändra:\n"
+"\n"
+
+# November 26th, 2014: Insert additional spacing to fit
+# with the first translated text, which uses most characters.
+#: pg_resetxlog.c:650
+#, c-format
+msgid "First log segment after reset: %s\n"
+msgstr "Första loggsegment efter återställning: %s\n"
+
+#: pg_resetxlog.c:654
+#, c-format
+msgid "NextMultiXactId: %u\n"
+msgstr "NextMultiXactId: %u\n"
+
+#: pg_resetxlog.c:656
+#, c-format
+msgid "OldestMultiXid: %u\n"
+msgstr "OldestMultiXid: %u\n"
+
+#: pg_resetxlog.c:658
+#, c-format
+msgid "OldestMulti's DB: %u\n"
+msgstr "DB för OldestMulti: %u\n"
+
+#: pg_resetxlog.c:664
+#, c-format
+msgid "NextMultiOffset: %u\n"
+msgstr "NextMultiOffset: %u\n"
+
+#: pg_resetxlog.c:670
+#, c-format
+msgid "NextOID: %u\n"
+msgstr "NextOID: %u\n"
+
+#: pg_resetxlog.c:676
+#, c-format
+msgid "NextXID: %u\n"
+msgstr "NextXID: %u\n"
+
+#: pg_resetxlog.c:678
+#, c-format
+msgid "OldestXID: %u\n"
+msgstr "OldestXID: %u\n"
+
+#: pg_resetxlog.c:680
+#, c-format
+msgid "OldestXID's DB: %u\n"
+msgstr "DB för OldestXID: %u\n"
+
+#: pg_resetxlog.c:686
+#, c-format
+msgid "NextXID epoch: %u\n"
+msgstr "Epok för NextXID: %u\n"
+
+
+#: pg_resetxlog.c:751
+#, c-format
+msgid "%s: internal error -- sizeof(ControlFileData) is too large ... fix PG_CONTROL_SIZE\n"
+msgstr "%s: Internt fel: sizeof(ControlFileData) är alltför stor. Rätta till PG_CONTROL_SIZE.\n"
+
+#: pg_resetxlog.c:766
+#, c-format
+msgid "%s: could not create pg_control file: %s\n"
+msgstr "%s: Kunde inte skapa fil för pg_control: %s\n"
+
+#: pg_resetxlog.c:777
+#, c-format
+msgid "%s: could not write pg_control file: %s\n"
+msgstr "%s: Kunde inte skriva fil för pg_control: %s\n"
+
+#: pg_resetxlog.c:784 pg_resetxlog.c:1068
+#, c-format
+msgid "%s: fsync error: %s\n"
+msgstr "%s: Misslyckad fsync: %s\n"
+
+#: pg_resetxlog.c:824 pg_resetxlog.c:890 pg_resetxlog.c:941
+#, c-format
+msgid "%s: could not open directory \"%s\": %s\n"
+msgstr "%s: Kunde inte öppna filkatalog \"%s\": %s\n"
+
+#: pg_resetxlog.c:855 pg_resetxlog.c:912 pg_resetxlog.c:964
+#, c-format
+msgid "%s: could not read directory \"%s\": %s\n"
+msgstr "%s: Kunde inte läsa filkatalog \"%s\": %s\n"
+
+#: pg_resetxlog.c:862 pg_resetxlog.c:919 pg_resetxlog.c:971
+#, c-format
+msgid "%s: could not close directory \"%s\": %s\n"
+msgstr "%s: Kunde inte stänga filkatalog \"%s\": %s\n"
+
+#: pg_resetxlog.c:903 pg_resetxlog.c:955
+#, c-format
+msgid "%s: could not delete file \"%s\": %s\n"
+msgstr "%s: Kunde inte radera fil \"%s\": %s\n"
+
+#: pg_resetxlog.c:1035
+#, c-format
+msgid "%s: could not open file \"%s\": %s\n"
+msgstr "%s: Kunde inte öppna fil \"%s\": %s\n"
+
+#: pg_resetxlog.c:1046 pg_resetxlog.c:1060
+#, c-format
+msgid "%s: could not write file \"%s\": %s\n"
+msgstr "%s: Kunde inte skriva fil \"%s\": %s\n"
+
+#: pg_resetxlog.c:1079
+#, c-format
+msgid ""
+"%s resets the PostgreSQL transaction log.\n"
+"\n"
+msgstr ""
+"%s återställer transaktionslogg för PostgreSQL.\n"
+"\n"
+
+#: pg_resetxlog.c:1080
+#, c-format
+msgid ""
+"Usage:\n"
+" %s [OPTION]... DATADIR\n"
+"\n"
+msgstr ""
+"Användning:\n"
+" %s [FLAGGA]... DATAKATALOG\n"
+"\n"
+
+#: pg_resetxlog.c:1081
+#, c-format
+msgid "Options:\n"
+msgstr "Programväxlar:\n"
+
+#: pg_resetxlog.c:1082
+#, c-format
+msgid " -e XIDEPOCH set next transaction ID epoch\n"
+msgstr " -e XIDEPOCH sätter epok för nästa transaktions-ID\n"
+
+#: pg_resetxlog.c:1083
+#, c-format
+msgid " -f force update to be done\n"
+msgstr " -f framtvinga återställning\n"
+
+#: pg_resetxlog.c:1084
+#, c-format
+msgid " -l XLOGFILE force minimum WAL starting location for new transaction log\n"
+msgstr " -l XLOGFIL ny transaktionslogg måste vara detta namn eller ett senare\n"
+
+#: pg_resetxlog.c:1085
+#, c-format
+msgid " -m MXID,MXID set next and oldest multitransaction ID\n"
+msgstr " -m MXID,MXID sätt nästa och äldsta multitransaktions-ID\n"
+
+#: pg_resetxlog.c:1086
+#, c-format
+msgid " -n no update, just show what would be done (for testing)\n"
+msgstr " -n ingen updatering; visa planerade åtgärder (för testning)\n"
+
+#: pg_resetxlog.c:1087
+#, c-format
+msgid " -o OID set next OID\n"
+msgstr " -o OID sätt nästa OID\n"
+
+#: pg_resetxlog.c:1088
+#, c-format
+msgid " -O OFFSET set next multitransaction offset\n"
+msgstr " -O OFFSET sätt nästa multitransaktionsoffset\n"
+
+#: pg_resetxlog.c:1089
+#, c-format
+msgid " -V, --version output version information, then exit\n"
+msgstr " -V, --version visa versionsinformation, avsluta sedan\n"
+
+#: pg_resetxlog.c:1090
+#, c-format
+msgid " -x XID set next transaction ID\n"
+msgstr " -x XID sätt nästa transaktions-ID\n"
+
+#: pg_resetxlog.c:1091
+#, c-format
+msgid " -?, --help show this help, then exit\n"
+msgstr " -?, --help visa denna hjälp, avsluta sedan\n"
+
+#: pg_resetxlog.c:1092
+#, c-format
+msgid ""
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr ""
+"\n"
+"Reportera fel till <pgsql-bugs@postgresql.org>.\n"
diff --git a/src/bin/pg_resetxlog/po/zh_CN.po b/src/bin/pg_resetxlog/po/zh_CN.po
index 9b236e7b82e..5e1309eec31 100644
--- a/src/bin/pg_resetxlog/po/zh_CN.po
+++ b/src/bin/pg_resetxlog/po/zh_CN.po
@@ -5,8 +5,8 @@ msgid ""
msgstr ""
"Project-Id-Version: pg_resetxlog (PostgreSQL 9.0)\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2013-09-02 00:26+0000\n"
-"PO-Revision-Date: 2013-09-02 16:18+0800\n"
+"POT-Creation-Date: 2014-11-22 21:12+0000\n"
+"PO-Revision-Date: 2014-11-28 15:14+0800\n"
"Last-Translator: Xiong He <iihero@qq.com>\n"
"Language-Team: Chinese (Simplified)\n"
"Language: zh_CN\n"
@@ -15,101 +15,100 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.5.4\n"
-#: pg_resetxlog.c:133
+#: pg_resetxlog.c:130
#, c-format
msgid "%s: invalid argument for option -e\n"
msgstr "%s: 对于选项-e 参数无效\n"
-#: pg_resetxlog.c:134 pg_resetxlog.c:149 pg_resetxlog.c:164 pg_resetxlog.c:179
-#: pg_resetxlog.c:187 pg_resetxlog.c:213 pg_resetxlog.c:227 pg_resetxlog.c:234
-#: pg_resetxlog.c:242
+#: pg_resetxlog.c:131 pg_resetxlog.c:146 pg_resetxlog.c:161 pg_resetxlog.c:176
+#: pg_resetxlog.c:184 pg_resetxlog.c:210 pg_resetxlog.c:224 pg_resetxlog.c:231
+#: pg_resetxlog.c:239
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "输入 \"%s --help\" 获取更多的信息.\n"
-#: pg_resetxlog.c:139
+#: pg_resetxlog.c:136
#, c-format
msgid "%s: transaction ID epoch (-e) must not be -1\n"
msgstr "%s: 事务ID epoch(-e) 不能为 -1\n"
-#: pg_resetxlog.c:148
+#: pg_resetxlog.c:145
#, c-format
msgid "%s: invalid argument for option -x\n"
msgstr "%s: 为 -x 选项的无效参数\n"
-#: pg_resetxlog.c:154
+#: pg_resetxlog.c:151
#, c-format
msgid "%s: transaction ID (-x) must not be 0\n"
msgstr "%s: 事务 ID (-x) 不能为 0\n"
-#: pg_resetxlog.c:163
+#: pg_resetxlog.c:160
#, c-format
msgid "%s: invalid argument for option -o\n"
msgstr "%s: 为 -o 选项的无效参数\n"
-#: pg_resetxlog.c:169
+#: pg_resetxlog.c:166
#, c-format
msgid "%s: OID (-o) must not be 0\n"
msgstr "%s: OID (-o) 不能为 0\n"
-#: pg_resetxlog.c:178 pg_resetxlog.c:186
+#: pg_resetxlog.c:175 pg_resetxlog.c:183
#, c-format
msgid "%s: invalid argument for option -m\n"
msgstr "%s: 对于选项-m 参数无效\n"
-#: pg_resetxlog.c:192
+#: pg_resetxlog.c:189
#, c-format
msgid "%s: multitransaction ID (-m) must not be 0\n"
msgstr "%s: 多事务 ID (-m) 不能为 0\n"
-#: pg_resetxlog.c:202
+#: pg_resetxlog.c:199
#, c-format
-#| msgid "%s: multitransaction ID (-m) must not be 0\n"
msgid "%s: oldest multitransaction ID (-m) must not be 0\n"
msgstr "%s: 最老的多事务 ID (-m) 不能为 0\n"
-#: pg_resetxlog.c:212
+#: pg_resetxlog.c:209
#, c-format
msgid "%s: invalid argument for option -O\n"
msgstr "%s: 对于选项-O 参数无效\n"
-#: pg_resetxlog.c:218
+#: pg_resetxlog.c:215
#, c-format
msgid "%s: multitransaction offset (-O) must not be -1\n"
msgstr "%s: 多事务 偏移 (-O) 不能为-1\n"
-#: pg_resetxlog.c:226
+#: pg_resetxlog.c:223
#, c-format
msgid "%s: invalid argument for option -l\n"
msgstr "%s: 为 -l 选项的无效参数\n"
-#: pg_resetxlog.c:241
+#: pg_resetxlog.c:238
#, c-format
msgid "%s: no data directory specified\n"
msgstr "%s: 没有指定数据目录\n"
-#: pg_resetxlog.c:255
+#: pg_resetxlog.c:252
#, c-format
msgid "%s: cannot be executed by \"root\"\n"
msgstr "%s:不能由\"root\"执行\n"
-#: pg_resetxlog.c:257
+#: pg_resetxlog.c:254
#, c-format
msgid "You must run %s as the PostgreSQL superuser.\n"
msgstr "您现在作为PostgreSQL超级用户运行%s.\n"
# command.c:256
-#: pg_resetxlog.c:267
+#: pg_resetxlog.c:264
#, c-format
msgid "%s: could not change directory to \"%s\": %s\n"
msgstr "%s: 无法切换目录至 \"%s\": %s\n"
-#: pg_resetxlog.c:280 pg_resetxlog.c:414
+#: pg_resetxlog.c:277 pg_resetxlog.c:418
#, c-format
msgid "%s: could not open file \"%s\" for reading: %s\n"
msgstr "%s: 无法打开文件 \"%s\" 读取信息: %s\n"
-#: pg_resetxlog.c:287
+#: pg_resetxlog.c:284
#, c-format
msgid ""
"%s: lock file \"%s\" exists\n"
@@ -118,7 +117,7 @@ msgstr ""
"%s: 锁文件 \"%s\" 已经存在\n"
"是否有一个服务正在运行? 如果没有, 删除那个锁文件然后再试一次.\n"
-#: pg_resetxlog.c:362
+#: pg_resetxlog.c:366
#, c-format
msgid ""
"\n"
@@ -127,7 +126,7 @@ msgstr ""
"\n"
"如果这些值可接受, 用 -f 强制重置.\n"
-#: pg_resetxlog.c:374
+#: pg_resetxlog.c:378
#, c-format
msgid ""
"The database server was not shut down cleanly.\n"
@@ -138,12 +137,12 @@ msgstr ""
"重置事务日志有可能会引起丢失数据.\n"
"如果你仍想继续, 用 -f 强制重置.\n"
-#: pg_resetxlog.c:388
+#: pg_resetxlog.c:392
#, c-format
msgid "Transaction log reset\n"
msgstr "事务日志重置\n"
-#: pg_resetxlog.c:417
+#: pg_resetxlog.c:421
#, c-format
msgid ""
"If you are sure the data directory path is correct, execute\n"
@@ -154,22 +153,22 @@ msgstr ""
" touch %s\n"
"然后再试一次.\n"
-#: pg_resetxlog.c:430
+#: pg_resetxlog.c:434
#, c-format
msgid "%s: could not read file \"%s\": %s\n"
msgstr "%s: 无法读取文件 \"%s\": %s\n"
-#: pg_resetxlog.c:453
+#: pg_resetxlog.c:457
#, c-format
msgid "%s: pg_control exists but has invalid CRC; proceed with caution\n"
msgstr "%s: pg_control 已经存在, 但有无效的CRC; 带有警告的继续运行\n"
-#: pg_resetxlog.c:462
+#: pg_resetxlog.c:466
#, c-format
msgid "%s: pg_control exists but is broken or unknown version; ignoring it\n"
msgstr "%s: pg_control 已经存在, 但已破坏或无效版本; 忽略它\n"
-#: pg_resetxlog.c:561
+#: pg_resetxlog.c:568
#, c-format
msgid ""
"Guessed pg_control values:\n"
@@ -178,228 +177,306 @@ msgstr ""
"猜测的 pg_control 值:\n"
"\n"
-#: pg_resetxlog.c:563
+#: pg_resetxlog.c:570
#, c-format
+#| msgid ""
+#| "pg_control values:\n"
+#| "\n"
msgid ""
-"pg_control values:\n"
+"Current pg_control values:\n"
"\n"
msgstr ""
-"pg_control 值:\n"
+"当前的 pg_control 值:\n"
"\n"
-#: pg_resetxlog.c:574
-#, c-format
-#| msgid "First log file segment after reset: %u\n"
-msgid "First log segment after reset: %s\n"
-msgstr "重置后的第一个日志段: %s\n"
-
-#: pg_resetxlog.c:576
+#: pg_resetxlog.c:579
#, c-format
msgid "pg_control version number: %u\n"
msgstr "pg_control 版本: %u\n"
-#: pg_resetxlog.c:578
+#: pg_resetxlog.c:581
#, c-format
msgid "Catalog version number: %u\n"
msgstr "Catalog 版本: %u\n"
-#: pg_resetxlog.c:580
+#: pg_resetxlog.c:583
#, c-format
msgid "Database system identifier: %s\n"
msgstr "数据库系统标识符: %s\n"
-#: pg_resetxlog.c:582
+#: pg_resetxlog.c:585
#, c-format
msgid "Latest checkpoint's TimeLineID: %u\n"
msgstr "最新检查点的 TimeLineID: %u\n"
-#: pg_resetxlog.c:584
+#: pg_resetxlog.c:587
#, c-format
msgid "Latest checkpoint's full_page_writes: %s\n"
msgstr "最新检查点的full_page_writes: %s\n"
# help.c:48
-#: pg_resetxlog.c:585
+#: pg_resetxlog.c:588
msgid "off"
msgstr "关闭"
# help.c:48
-#: pg_resetxlog.c:585
+#: pg_resetxlog.c:588
msgid "on"
msgstr "开启"
-#: pg_resetxlog.c:586
+#: pg_resetxlog.c:589
#, c-format
msgid "Latest checkpoint's NextXID: %u/%u\n"
msgstr "最新检查点的 NextXID: %u/%u\n"
-#: pg_resetxlog.c:589
+#: pg_resetxlog.c:592
#, c-format
msgid "Latest checkpoint's NextOID: %u\n"
msgstr "最新检查点的 NextOID: %u\n"
-#: pg_resetxlog.c:591
+#: pg_resetxlog.c:594
#, c-format
msgid "Latest checkpoint's NextMultiXactId: %u\n"
msgstr "最新检查点的 NextMultiXactId: %u\n"
-#: pg_resetxlog.c:593
+#: pg_resetxlog.c:596
#, c-format
msgid "Latest checkpoint's NextMultiOffset: %u\n"
msgstr "最新检查点的 NextMultiOffset: %u\n"
-#: pg_resetxlog.c:595
+#: pg_resetxlog.c:598
#, c-format
msgid "Latest checkpoint's oldestXID: %u\n"
msgstr "最新检查点的oldestXID: %u\n"
-#: pg_resetxlog.c:597
+#: pg_resetxlog.c:600
#, c-format
msgid "Latest checkpoint's oldestXID's DB: %u\n"
msgstr "最新检查点的oldestXID所在的数据库: %u\n"
-#: pg_resetxlog.c:599
+#: pg_resetxlog.c:602
#, c-format
msgid "Latest checkpoint's oldestActiveXID: %u\n"
msgstr "最新检查点的oldestActiveXID: %u\n"
-#: pg_resetxlog.c:601
+#: pg_resetxlog.c:604
#, c-format
-#| msgid "Latest checkpoint's oldestActiveXID: %u\n"
msgid "Latest checkpoint's oldestMultiXid: %u\n"
msgstr "最新检查点的oldestMultiXid: %u\n"
-#: pg_resetxlog.c:603
+#: pg_resetxlog.c:606
#, c-format
-#| msgid "Latest checkpoint's oldestXID's DB: %u\n"
msgid "Latest checkpoint's oldestMulti's DB: %u\n"
msgstr "最新检查点的oldestMulti所在的数据库: %u\n"
-#: pg_resetxlog.c:605
+#: pg_resetxlog.c:608
#, c-format
msgid "Maximum data alignment: %u\n"
msgstr "最大的数据校准: %u\n"
-#: pg_resetxlog.c:608
+#: pg_resetxlog.c:611
#, c-format
msgid "Database block size: %u\n"
msgstr "数据库块大小: %u\n"
-#: pg_resetxlog.c:610
+#: pg_resetxlog.c:613
#, c-format
msgid "Blocks per segment of large relation: %u\n"
msgstr "大关系的每段块数: %u\n"
-#: pg_resetxlog.c:612
+#: pg_resetxlog.c:615
#, c-format
msgid "WAL block size: %u\n"
msgstr "WAL块大小: %u\n"
-#: pg_resetxlog.c:614
+#: pg_resetxlog.c:617
#, c-format
msgid "Bytes per WAL segment: %u\n"
msgstr "每一个 WAL 段字节数: %u\n"
-#: pg_resetxlog.c:616
+#: pg_resetxlog.c:619
#, c-format
msgid "Maximum length of identifiers: %u\n"
msgstr "标示符的最大长度: %u\n"
-#: pg_resetxlog.c:618
+#: pg_resetxlog.c:621
#, c-format
msgid "Maximum columns in an index: %u\n"
msgstr "在索引中最多可用的列数: %u\n"
-#: pg_resetxlog.c:620
+#: pg_resetxlog.c:623
#, c-format
msgid "Maximum size of a TOAST chunk: %u\n"
msgstr "一个TOAST区块的最大空间: %u\n"
-#: pg_resetxlog.c:622
+#: pg_resetxlog.c:625
+#, c-format
+#| msgid "Maximum size of a TOAST chunk: %u\n"
+msgid "Size of a large-object chunk: %u\n"
+msgstr "一个大对象区块的大小: %u\n"
+
+#: pg_resetxlog.c:627
#, c-format
msgid "Date/time type storage: %s\n"
msgstr "日期/时间类型存储: %s\n"
-#: pg_resetxlog.c:623
+#: pg_resetxlog.c:628
msgid "64-bit integers"
msgstr "64位整型"
-#: pg_resetxlog.c:623
+#: pg_resetxlog.c:628
msgid "floating-point numbers"
msgstr "浮点数"
-#: pg_resetxlog.c:624
+#: pg_resetxlog.c:629
#, c-format
msgid "Float4 argument passing: %s\n"
msgstr "正在传递Float4类型的参数: %s\n"
-#: pg_resetxlog.c:625 pg_resetxlog.c:627
+#: pg_resetxlog.c:630 pg_resetxlog.c:632
msgid "by reference"
msgstr "由引用"
-#: pg_resetxlog.c:625 pg_resetxlog.c:627
+#: pg_resetxlog.c:630 pg_resetxlog.c:632
msgid "by value"
msgstr "由值"
-#: pg_resetxlog.c:626
+#: pg_resetxlog.c:631
#, c-format
msgid "Float8 argument passing: %s\n"
msgstr "正在传递Float8类型的参数: %s\n"
-#: pg_resetxlog.c:628
+#: pg_resetxlog.c:633
#, c-format
-#| msgid "Catalog version number: %u\n"
msgid "Data page checksum version: %u\n"
msgstr "数据页检验和版本: %u\n"
-#: pg_resetxlog.c:690
+#: pg_resetxlog.c:647
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Values to be changed:\n"
+"\n"
+msgstr ""
+"\n"
+"\n"
+"将被改变的值:\n"
+"\n"
+
+#: pg_resetxlog.c:650
+#, c-format
+msgid "First log segment after reset: %s\n"
+msgstr "重置后的第一个日志段: %s\n"
+
+#: pg_resetxlog.c:654
+#, c-format
+#| msgid "WAL block size: %u\n"
+msgid "NextMultiXactId: %u\n"
+msgstr "下一个MultiXactId值NextMultiXactId: %u\n"
+
+#: pg_resetxlog.c:656
+#, c-format
+#| msgid "WAL block size: %u\n"
+msgid "OldestMultiXid: %u\n"
+msgstr "最老的MultiXid值OldestMultiXid: %u\n"
+
+#: pg_resetxlog.c:658
+#, c-format
+#| msgid "WAL block size: %u\n"
+msgid "OldestMulti's DB: %u\n"
+msgstr "最老的MultiXid对应的DB: %u\n"
+
+#: pg_resetxlog.c:664
+#, c-format
+#| msgid "WAL block size: %u\n"
+msgid "NextMultiOffset: %u\n"
+msgstr "下一个偏移NextMultiOffset: %u\n"
+
+#: pg_resetxlog.c:670
+#, c-format
+#| msgid "LC_CTYPE: %s\n"
+msgid "NextOID: %u\n"
+msgstr "NextOID: %u\n"
+
+#: pg_resetxlog.c:676
+#, c-format
+#| msgid "LC_CTYPE: %s\n"
+msgid "NextXID: %u\n"
+msgstr "NextXID: %u\n"
+
+#: pg_resetxlog.c:678
+#, c-format
+#| msgid "LC_COLLATE: %s\n"
+msgid "OldestXID: %u\n"
+msgstr "OldestXID: %u\n"
+
+#: pg_resetxlog.c:680
+#, c-format
+#| msgid "WAL block size: %u\n"
+msgid "OldestXID's DB: %u\n"
+msgstr "OldestXID's DB: %u\n"
+
+#: pg_resetxlog.c:686
+#, c-format
+#| msgid "WAL block size: %u\n"
+msgid "NextXID epoch: %u\n"
+msgstr "NextXID 末端: %u\n"
+
+#: pg_resetxlog.c:751
#, c-format
msgid ""
"%s: internal error -- sizeof(ControlFileData) is too large ... fix "
"PG_CONTROL_SIZE\n"
msgstr "%s: 内部错误 -- sizeof(ControlFileData) 太大 ... 修复 xlog.c\n"
-#: pg_resetxlog.c:705
+#: pg_resetxlog.c:766
#, c-format
msgid "%s: could not create pg_control file: %s\n"
msgstr "%s: 无法创建 pg_control 文件: %s\n"
-#: pg_resetxlog.c:716
+#: pg_resetxlog.c:777
#, c-format
msgid "%s: could not write pg_control file: %s\n"
msgstr "%s: 无法写 pg_control 文件: %s\n"
-#: pg_resetxlog.c:723 pg_resetxlog.c:1022
+#: pg_resetxlog.c:784 pg_resetxlog.c:1068
#, c-format
msgid "%s: fsync error: %s\n"
msgstr "%s: fsync 错误: %s\n"
-#: pg_resetxlog.c:763 pg_resetxlog.c:834 pg_resetxlog.c:890
+#: pg_resetxlog.c:824 pg_resetxlog.c:890 pg_resetxlog.c:941
#, c-format
msgid "%s: could not open directory \"%s\": %s\n"
msgstr "%s: 无法打开目录 \"%s\": %s\n"
-#: pg_resetxlog.c:805 pg_resetxlog.c:867 pg_resetxlog.c:924
+#: pg_resetxlog.c:855 pg_resetxlog.c:912 pg_resetxlog.c:964
#, c-format
-msgid "%s: could not read from directory \"%s\": %s\n"
-msgstr "%s: 无法从目录 \"%s\" 中读取: %s\n"
+msgid "%s: could not read directory \"%s\": %s\n"
+msgstr "%s: 无法读取目录 \"%s\": %s\n"
-#: pg_resetxlog.c:848 pg_resetxlog.c:905
+#: pg_resetxlog.c:862 pg_resetxlog.c:919 pg_resetxlog.c:971
+#, c-format
+#| msgid "%s: could not open directory \"%s\": %s\n"
+msgid "%s: could not close directory \"%s\": %s\n"
+msgstr "%s: 无法关闭目录 \"%s\": %s\n"
+
+#: pg_resetxlog.c:903 pg_resetxlog.c:955
#, c-format
msgid "%s: could not delete file \"%s\": %s\n"
msgstr "%s: 无法删除文件 \"%s\": %s\n"
-#: pg_resetxlog.c:989
+#: pg_resetxlog.c:1035
#, c-format
msgid "%s: could not open file \"%s\": %s\n"
msgstr "%s: 无法打开文件 \"%s\": %s\n"
-#: pg_resetxlog.c:1000 pg_resetxlog.c:1014
+#: pg_resetxlog.c:1046 pg_resetxlog.c:1060
#, c-format
msgid "%s: could not write file \"%s\": %s\n"
msgstr "%s: 无法写文件 \"%s\": %s\n"
-#: pg_resetxlog.c:1033
+#: pg_resetxlog.c:1079
#, c-format
msgid ""
"%s resets the PostgreSQL transaction log.\n"
@@ -408,7 +485,7 @@ msgstr ""
"%s 重置 PostgreSQL 事务日志.\n"
"\n"
-#: pg_resetxlog.c:1034
+#: pg_resetxlog.c:1080
#, c-format
msgid ""
"Usage:\n"
@@ -419,70 +496,68 @@ msgstr ""
" %s [选项]... 数据目录\n"
"\n"
-#: pg_resetxlog.c:1035
+#: pg_resetxlog.c:1081
#, c-format
msgid "Options:\n"
msgstr "选项:\n"
-#: pg_resetxlog.c:1036
+#: pg_resetxlog.c:1082
#, c-format
msgid " -e XIDEPOCH set next transaction ID epoch\n"
msgstr " -e XIDEPOCH 设置下一个事务ID时间单元(epoch)\n"
-#: pg_resetxlog.c:1037
+#: pg_resetxlog.c:1083
#, c-format
msgid " -f force update to be done\n"
msgstr " -f 强制更新\n"
-#: pg_resetxlog.c:1038
+#: pg_resetxlog.c:1084
#, c-format
-#| msgid ""
-#| " -l TLI,FILE,SEG force minimum WAL starting location for new "
-#| "transaction log\n"
msgid ""
" -l XLOGFILE force minimum WAL starting location for new transaction "
"log\n"
msgstr " -l XLOGFILE 为新的事务日志强制使用最小WAL日志起始位置\n"
-#: pg_resetxlog.c:1039
+#: pg_resetxlog.c:1085
#, c-format
-#| msgid " -m XID set next multitransaction ID\n"
msgid " -m MXID,MXID set next and oldest multitransaction ID\n"
msgstr " -m MXID,MXID  设置下一个事务和最老的事务ID\n"
-#: pg_resetxlog.c:1040
+#: pg_resetxlog.c:1086
#, c-format
+#| msgid ""
+#| " -n no update, just show extracted control values (for "
+#| "testing)\n"
msgid ""
-" -n no update, just show extracted control values (for "
-"testing)\n"
-msgstr " -n 未更新, 只显示抽取的控制值 (测试用途)\n"
+" -n no update, just show what would be done (for testing)\n"
+msgstr " -n 未更新, 只显示将要做什么 (测试用途)\n"
-#: pg_resetxlog.c:1041
+#: pg_resetxlog.c:1087
#, c-format
msgid " -o OID set next OID\n"
msgstr " -o OID 设置下一个 OID\n"
-#: pg_resetxlog.c:1042
+#: pg_resetxlog.c:1088
#, c-format
msgid " -O OFFSET set next multitransaction offset\n"
msgstr " -O OFFSET 设置下一个多事务(multitransaction)偏移\n"
-#: pg_resetxlog.c:1043
+#: pg_resetxlog.c:1089
#, c-format
msgid " -V, --version output version information, then exit\n"
msgstr " -V, --version 输出版本信息,然后退出\n"
-#: pg_resetxlog.c:1044
+#: pg_resetxlog.c:1090
#, c-format
msgid " -x XID set next transaction ID\n"
msgstr " -x XID 设置下一个事务 ID\n"
-#: pg_resetxlog.c:1045
+#: pg_resetxlog.c:1091
#, c-format
msgid " -?, --help show this help, then exit\n"
msgstr " -?, --help 显示帮助信息,然后退出\n"
-#: pg_resetxlog.c:1046
+#: pg_resetxlog.c:1092
#, c-format
msgid ""
"\n"
@@ -491,35 +566,32 @@ msgstr ""
"\n"
"报告错误至 <pgsql-bugs@postgresql.org>.\n"
-#~ msgid " --help show this help, then exit\n"
-#~ msgstr " --help 显示此帮助信息, 然后退出\n"
+#~ msgid "First log file ID after reset: %u\n"
+#~ msgstr "重置后的第一个日志文件ID: %u\n"
-#~ msgid " --version output version information, then exit\n"
-#~ msgstr " --version 输出版本信息, 然后退出\n"
+#~ msgid "%s: invalid argument for -o option\n"
+#~ msgstr "%s: 为 -o 选项的无效参数\n"
-#~ msgid "%s: invalid LC_COLLATE setting\n"
-#~ msgstr "%s: 无效的 LC_COLLATE 设置\n"
+#~ msgid "%s: invalid argument for -x option\n"
+#~ msgstr "%s: 为 -x 选项的无效参数\n"
-#~ msgid "%s: invalid LC_CTYPE setting\n"
-#~ msgstr "%s: 无效的 LC_CTYPE 设置\n"
+#~ msgid "Latest checkpoint's StartUpID: %u\n"
+#~ msgstr "最新检查点的 StartUpID: %u\n"
#~ msgid "Maximum number of function arguments: %u\n"
#~ msgstr "函数参数的最大个数: %u\n"
-#~ msgid "LC_COLLATE: %s\n"
-#~ msgstr "LC_COLLATE: %s\n"
-
-#~ msgid "LC_CTYPE: %s\n"
-#~ msgstr "LC_CTYPE: %s\n"
+#~ msgid "%s: invalid LC_CTYPE setting\n"
+#~ msgstr "%s: 无效的 LC_CTYPE 设置\n"
-#~ msgid "Latest checkpoint's StartUpID: %u\n"
-#~ msgstr "最新检查点的 StartUpID: %u\n"
+#~ msgid "%s: invalid LC_COLLATE setting\n"
+#~ msgstr "%s: 无效的 LC_COLLATE 设置\n"
-#~ msgid "%s: invalid argument for -x option\n"
-#~ msgstr "%s: 为 -x 选项的无效参数\n"
+#~ msgid " --version output version information, then exit\n"
+#~ msgstr " --version 输出版本信息, 然后退出\n"
-#~ msgid "%s: invalid argument for -o option\n"
-#~ msgstr "%s: 为 -o 选项的无效参数\n"
+#~ msgid " --help show this help, then exit\n"
+#~ msgstr " --help 显示此帮助信息, 然后退出\n"
-#~ msgid "First log file ID after reset: %u\n"
-#~ msgstr "重置后的第一个日志文件ID: %u\n"
+#~ msgid "%s: could not read from directory \"%s\": %s\n"
+#~ msgstr "%s: 无法从目录 \"%s\" 中读取: %s\n"
diff --git a/src/bin/psql/po/it.po b/src/bin/psql/po/it.po
index e3fd984926a..642a646be2f 100644
--- a/src/bin/psql/po/it.po
+++ b/src/bin/psql/po/it.po
@@ -24,8 +24,8 @@ msgid ""
msgstr ""
"Project-Id-Version: psql (PostgreSQL) 9.4\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2014-08-23 05:12+0000\n"
-"PO-Revision-Date: 2014-08-12 00:14+0100\n"
+"POT-Creation-Date: 2014-11-19 21:11+0000\n"
+"PO-Revision-Date: 2014-11-13 14:09+0100\n"
"Last-Translator: Daniele Varrazzo <daniele.varrazzo@gmail.com>\n"
"Language-Team: Gruppo traduzioni ITPUG <traduzioni@itpug.org>\n"
"Language: it\n"
@@ -72,8 +72,7 @@ msgid "pclose failed: %s"
msgstr "pclose fallita: %s"
#: ../../common/fe_memutils.c:33 ../../common/fe_memutils.c:60
-#: ../../common/fe_memutils.c:83 command.c:1143 input.c:204 mainloop.c:72
-#: mainloop.c:234 tab-complete.c:3952
+#: ../../common/fe_memutils.c:83 input.c:205 mainloop.c:72 mainloop.c:234
#, c-format
msgid "out of memory\n"
msgstr "memoria esaurita\n"
@@ -88,7 +87,7 @@ msgstr "impossibile duplicare il puntatore nullo (errore interno)\n"
msgid "could not look up effective user ID %ld: %s"
msgstr "ID utente effettivo %ld non trovato: %s"
-#: ../../common/username.c:47 command.c:275
+#: ../../common/username.c:47 command.c:276
msgid "user does not exist"
msgstr "l'utente non esiste"
@@ -132,200 +131,200 @@ msgstr "processo figlio terminato da segnale %d"
msgid "child process exited with unrecognized status %d"
msgstr "processo figlio uscito con stato non riconosciuto %d"
-#: command.c:116
+#: command.c:117
#, c-format
msgid "Invalid command \\%s. Try \\? for help.\n"
msgstr "Comando errato \\%s. Prova \\? per la guida.\n"
-#: command.c:118
+#: command.c:119
#, c-format
msgid "invalid command \\%s\n"
msgstr "comando errato \\%s\n"
-#: command.c:129
+#: command.c:130
#, c-format
msgid "\\%s: extra argument \"%s\" ignored\n"
msgstr "\\%s: parametro in eccesso \"%s\" ignorato\n"
-#: command.c:273
+#: command.c:274
#, c-format
-msgid "could not get home directory for user id %ld: %s\n"
-msgstr "directory home non trovata per l'id utente %ld: %s\n"
+msgid "could not get home directory for user ID %ld: %s\n"
+msgstr "directory home non trovata per l'ID utente %ld: %s\n"
-#: command.c:291
+#: command.c:292
#, c-format
msgid "\\%s: could not change directory to \"%s\": %s\n"
msgstr "\\%s: spostamento della directory a \"%s\" fallito: %s\n"
-#: command.c:307 common.c:446 common.c:886
+#: command.c:308 common.c:446 common.c:886
#, c-format
msgid "You are currently not connected to a database.\n"
msgstr "Al momento non sei connesso ad un database.\n"
-#: command.c:314
+#: command.c:315
#, c-format
msgid "You are connected to database \"%s\" as user \"%s\" via socket in \"%s\" at port \"%s\".\n"
msgstr "Sei collegato al database \"%s\" con nome utente \"%s\" tramite il socket in \"%s\" porta \"%s\".\n"
-#: command.c:317
+#: command.c:318
#, c-format
msgid "You are connected to database \"%s\" as user \"%s\" on host \"%s\" at port \"%s\".\n"
msgstr "Sei collegato al database \"%s\" con nome utente \"%s\" sull'host \"%s\" porta \"%s\".\n"
-#: command.c:516 command.c:586 command.c:1394
+#: command.c:517 command.c:587 command.c:1382
#, c-format
msgid "no query buffer\n"
msgstr "Nessun buffer query\n"
-#: command.c:549 command.c:2906
+#: command.c:550 command.c:2978
#, c-format
msgid "invalid line number: %s\n"
msgstr "numero di riga non valido: \"%s\"\n"
-#: command.c:580
+#: command.c:581
#, c-format
msgid "The server (version %d.%d) does not support editing function source.\n"
msgstr "Il server (versione %d.%d) non supporta la modifica dei sorgenti delle funzioni.\n"
-#: command.c:660
+#: command.c:661
msgid "No changes"
msgstr "Nessuna modifica"
-#: command.c:714
+#: command.c:715
#, c-format
msgid "%s: invalid encoding name or conversion procedure not found\n"
msgstr "%s: nome codifica errato oppure non esiste una procedura di conversione\n"
-#: command.c:811 command.c:861 command.c:875 command.c:892 command.c:999
-#: command.c:1171 command.c:1374 command.c:1405
+#: command.c:812 command.c:862 command.c:876 command.c:893 command.c:1000
+#: command.c:1159 command.c:1362 command.c:1393
#, c-format
msgid "\\%s: missing required argument\n"
msgstr "\\%s: parametro richiesto mancante\n"
-#: command.c:924
+#: command.c:925
msgid "Query buffer is empty."
msgstr "Il buffer query è vuoto."
-#: command.c:934
+#: command.c:935
msgid "Enter new password: "
msgstr "Inserire la nuova password: "
-#: command.c:935
+#: command.c:936
msgid "Enter it again: "
msgstr "Conferma password: "
-#: command.c:939
+#: command.c:940
#, c-format
msgid "Passwords didn't match.\n"
msgstr "Le password non corrispondono.\n"
-#: command.c:957
+#: command.c:958
#, c-format
msgid "Password encryption failed.\n"
msgstr "Criptazione password fallita.\n"
-#: command.c:1028 command.c:1152 command.c:1379
+#: command.c:1029 command.c:1140 command.c:1367
#, c-format
msgid "\\%s: error while setting variable\n"
msgstr "\\%s: errore durante l'assegnamento della variabile\n"
-#: command.c:1082
+#: command.c:1087
msgid "Query buffer reset (cleared)."
msgstr "Buffer query resettato (svuotato)."
-#: command.c:1106
+#: command.c:1099
#, c-format
msgid "Wrote history to file \"%s\".\n"
msgstr "Storia scritta nel file \"%s\".\n"
-#: command.c:1176
+#: command.c:1164
#, c-format
msgid "\\%s: environment variable name must not contain \"=\"\n"
msgstr "\\%s: il nome della variabile d'ambiente non deve contenere \"=\"\n"
-#: command.c:1218
+#: command.c:1206
#, c-format
msgid "The server (version %d.%d) does not support showing function source.\n"
msgstr "Il server (versione %d.%d) non supporta mostrare i sorgenti delle funzioni.\n"
-#: command.c:1224
+#: command.c:1212
#, c-format
msgid "function name is required\n"
msgstr "il nome della funzione è richiesto\n"
-#: command.c:1359
+#: command.c:1347
msgid "Timing is on."
msgstr "Controllo tempo attivato"
-#: command.c:1361
+#: command.c:1349
msgid "Timing is off."
msgstr "Controllo tempo disattivato."
-#: command.c:1422 command.c:1442 command.c:2030 command.c:2033 command.c:2036
-#: command.c:2042 command.c:2044 command.c:2052 command.c:2062 command.c:2071
-#: command.c:2085 command.c:2102 command.c:2161 common.c:74 copy.c:333
+#: command.c:1410 command.c:1430 command.c:2018 command.c:2021 command.c:2024
+#: command.c:2030 command.c:2032 command.c:2040 command.c:2050 command.c:2059
+#: command.c:2073 command.c:2090 command.c:2149 common.c:74 copy.c:333
#: copy.c:393 copy.c:408 psqlscan.l:1677 psqlscan.l:1688 psqlscan.l:1698
#, c-format
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: command.c:1521
+#: command.c:1509
#, c-format
msgid "+ opt(%d) = |%s|\n"
msgstr "+ opt(%d) = |%s|\n"
-#: command.c:1547 startup.c:184
+#: command.c:1535 startup.c:184
msgid "Password: "
msgstr "Password: "
-#: command.c:1552 startup.c:186
+#: command.c:1540 startup.c:186
#, c-format
msgid "Password for user %s: "
msgstr "Inserisci la password per l'utente %s: "
-#: command.c:1597
+#: command.c:1585
#, c-format
msgid "All connection parameters must be supplied because no database connection exists\n"
msgstr "Tutti i parametri di connessione devono essere forniti perché non esiste alcuna connessione di database\n"
-#: command.c:1683 command.c:2940 common.c:120 common.c:413 common.c:478
+#: command.c:1671 command.c:3012 common.c:120 common.c:413 common.c:478
#: common.c:929 common.c:954 common.c:1051 copy.c:492 copy.c:695
#: large_obj.c:158 large_obj.c:193 large_obj.c:255 psqlscan.l:1949
#, c-format
msgid "%s"
msgstr "%s"
-#: command.c:1687
+#: command.c:1675
#, c-format
msgid "Previous connection kept\n"
msgstr "Connessione precedente mantenuta\n"
-#: command.c:1691
+#: command.c:1679
#, c-format
msgid "\\connect: %s"
msgstr "\\connect: %s"
-#: command.c:1724
+#: command.c:1712
#, c-format
msgid "You are now connected to database \"%s\" as user \"%s\" via socket in \"%s\" at port \"%s\".\n"
msgstr "Adesso sei collegato al database \"%s\" con nome utente \"%s\" tramite socket \"%s\" porta \"%s\".\n"
-#: command.c:1727
+#: command.c:1715
#, c-format
msgid "You are now connected to database \"%s\" as user \"%s\" on host \"%s\" at port \"%s\".\n"
msgstr "Adesso sei collegato al database \"%s\" con nome utente \"%s\" sull'host \"%s\" porta \"%s\".\n"
-#: command.c:1731
+#: command.c:1719
#, c-format
msgid "You are now connected to database \"%s\" as user \"%s\".\n"
msgstr "Sei collegato al database \"%s\" con nome utente \"%s\".\n"
-#: command.c:1765
+#: command.c:1753
#, c-format
msgid "%s (%s, server %s)\n"
msgstr "%s (%s, server %s)\n"
-#: command.c:1773
+#: command.c:1761
#, c-format
msgid ""
"WARNING: %s major version %d.%d, server major version %d.%d.\n"
@@ -334,25 +333,25 @@ msgstr ""
"ATTENZIONE: versione maggiore %s %d.%d, versione maggiore server %d.%d.\n"
" Alcune caratteristiche di psql potrebbero non funzionare.\n"
-#: command.c:1803
+#: command.c:1791
#, c-format
msgid "SSL connection (protocol: %s, cipher: %s, bits: %d, compression: %s)\n"
msgstr "Connessione SSL (protocollo: %s, cifrario: %s, bits: %d, compressione: %s)\n"
-#: command.c:1805 help.c:46
+#: command.c:1793 help.c:46
msgid "off"
msgstr "disattivato"
-#: command.c:1805 help.c:46
+#: command.c:1793 help.c:46
msgid "on"
msgstr "attivato"
-#: command.c:1814
+#: command.c:1802
#, c-format
msgid "SSL connection (unknown cipher)\n"
msgstr "connessione SSL (codice sconosciuto)\n"
-#: command.c:1835
+#: command.c:1823
#, c-format
msgid ""
"WARNING: Console code page (%u) differs from Windows code page (%u)\n"
@@ -364,212 +363,202 @@ msgstr ""
" funzionare correttamente. Vedi le pagine di riferimento\n"
" psql \"Note per utenti Windows\" per i dettagli.\n"
-#: command.c:1919
+#: command.c:1907
#, c-format
msgid "environment variable PSQL_EDITOR_LINENUMBER_ARG must be set to specify a line number\n"
msgstr "la variabile di ambiente PSQL_EDITOR_LINENUMBER_ARG deve specificare un numero di riga\n"
-#: command.c:1948
+#: command.c:1936
#, c-format
msgid "could not start editor \"%s\"\n"
msgstr "avvio dell'editor \"%s\" fallito\n"
-#: command.c:1950
+#: command.c:1938
#, c-format
msgid "could not start /bin/sh\n"
msgstr "avvio di /bin/sh fallito\n"
-#: command.c:1988
+#: command.c:1976
#, c-format
msgid "could not locate temporary directory: %s\n"
msgstr "directory temporanea non trovata: %s\n"
-#: command.c:2015
+#: command.c:2003
#, c-format
msgid "could not open temporary file \"%s\": %s\n"
msgstr "apertura del file temporaneo \"%s\" fallita: %s\n"
-#: command.c:2283
+#: command.c:2271
#, c-format
msgid "\\pset: allowed formats are unaligned, aligned, wrapped, html, latex, troff-ms\n"
msgstr "\\pset: i formati disponibili sono unaligned, aligned, wrapped, html, latex, troff-ms\n"
-#: command.c:2302
+#: command.c:2290
#, c-format
msgid "\\pset: allowed line styles are ascii, old-ascii, unicode\n"
msgstr "\\pset: gli stili di linea permessi sono ascii, old-ascii, unicode\n"
-#: command.c:2444 command.c:2606
+#: command.c:2432 command.c:2583
#, c-format
msgid "\\pset: unknown option: %s\n"
msgstr "\\pset: opzione sconosciuta: %s\n"
-#: command.c:2464
-#, c-format
-msgid "Border style (%s) unset.\n"
-msgstr "Lo stile bordo (%s) non è impostato.\n"
-
-#: command.c:2466
+#: command.c:2450
#, c-format
-msgid "Border style (%s) is %d.\n"
-msgstr "Lo stile bordo (%s) è %d.\n"
+msgid "Border style is %d.\n"
+msgstr "Lo stile del bordo è %d.\n"
-#: command.c:2474
+#: command.c:2456
#, c-format
-msgid "Target width (%s) unset.\n"
-msgstr "La lunghezza di destinazione (%s) non è impostata.\n"
+msgid "Target width is unset.\n"
+msgstr "La lunghezza di destinazione non è impostata.\n"
-#: command.c:2476
+#: command.c:2458
#, c-format
-msgid "Target width (%s) is %d.\n"
-msgstr "La larghezza di destinazione (%s) è %d.\n"
+msgid "Target width is %d.\n"
+msgstr "La larghezza di destinazione è %d.\n"
-#: command.c:2484
+#: command.c:2465
#, c-format
-msgid "Expanded display (%s) is on.\n"
-msgstr "La visualizzazione espansa (%s) è attiva.\n"
+msgid "Expanded display is on.\n"
+msgstr "La visualizzazione espansa è attiva.\n"
-#: command.c:2486
+#: command.c:2467
#, c-format
-msgid "Expanded display (%s) is used automatically.\n"
-msgstr "La visualizzazione espansa (%s) è usata automaticamente.\n"
+msgid "Expanded display is used automatically.\n"
+msgstr "La visualizzazione espansa è usata automaticamente.\n"
-#: command.c:2488
+#: command.c:2469
#, c-format
-msgid "Expanded display (%s) is off.\n"
-msgstr "La visualizzazione espansa (%s) è disattivata.\n"
+msgid "Expanded display is off.\n"
+msgstr "La visualizzazione espansa è disattivata.\n"
-#: command.c:2495 command.c:2503
+#: command.c:2476 command.c:2484
#, c-format
-msgid "Field separator (%s) is zero byte.\n"
-msgstr "Il separatore di campo (%s) è il byte zero.\n"
+msgid "Field separator is zero byte.\n"
+msgstr "Il separatore di campo è il byte zero.\n"
-#: command.c:2497
+#: command.c:2478
#, c-format
-msgid "Field separator (%s) is \"%s\".\n"
-msgstr "Il separatore di campo (%s) è \"%s\".\n"
+msgid "Field separator is \"%s\".\n"
+msgstr "Il separatore di campo è \"%s\".\n"
-#: command.c:2510
+#: command.c:2491
#, c-format
-msgid "Default footer (%s) is on.\n"
-msgstr "Il piè di pagina di default (%s) è attivo.\n"
+msgid "Default footer is on.\n"
+msgstr "Il piè di pagina di default è attivo.\n"
-#: command.c:2512
-#, c-format
-msgid "Default footer (%s) is off.\n"
-msgstr "Il piè di pagina di default (%s) è disattivato.\n"
-
-#: command.c:2519
+#: command.c:2493
#, c-format
-msgid "Output format (%s) is aligned.\n"
-msgstr "Il formato di output (%s) è allineato.\n"
+msgid "Default footer is off.\n"
+msgstr "Il piè di pagina di default è disattivato.\n"
-#: command.c:2521
+#: command.c:2499
#, c-format
-msgid "Output format (%s) is %s.\n"
-msgstr "Il formato di output (%s) è %s.\n"
+msgid "Output format is %s.\n"
+msgstr "Il formato di output è %s.\n"
-#: command.c:2528
+#: command.c:2505
#, c-format
-msgid "Line style (%s) is %s.\n"
-msgstr "Lo stile della linea (%s) è %s.\n"
+msgid "Line style is %s.\n"
+msgstr "Lo stile della linea è %s.\n"
-#: command.c:2535
+#: command.c:2512
#, c-format
-msgid "Null display (%s) is \"%s\".\n"
-msgstr "La visualizzazione dei null (%s) è \"%s\".\n"
+msgid "Null display is \"%s\".\n"
+msgstr "La visualizzazione dei null è \"%s\".\n"
-#: command.c:2543
+#: command.c:2520
#, c-format
-msgid "Locale-adjusted numeric output (%s) is on.\n"
-msgstr "La correzione dell'output numerico secondo il locale (%s) è attiva.\n"
+msgid "Locale-adjusted numeric output is on.\n"
+msgstr "La correzione dell'output numerico secondo il locale è attiva.\n"
-#: command.c:2545
+#: command.c:2522
#, c-format
-msgid "Locale-adjusted numeric output (%s) is off.\n"
-msgstr "La correzione dell'output numerico secondo il locale (%s) è disattivata.\n"
+msgid "Locale-adjusted numeric output is off.\n"
+msgstr "La correzione dell'output numerico secondo il locale è disattivata.\n"
-#: command.c:2552
+#: command.c:2529
#, c-format
-msgid "Pager (%s) is used for long output.\n"
-msgstr "Usa la paginazione (%s) per risultati estesi.\n"
+msgid "Pager is used for long output.\n"
+msgstr "Usa la paginazione per risultati estesi.\n"
-#: command.c:2554
+#: command.c:2531
#, c-format
-msgid "Pager (%s) is always used.\n"
-msgstr "Paginazione (%s) sempre attiva.\n"
+msgid "Pager is always used.\n"
+msgstr "Paginazione sempre attiva.\n"
-#: command.c:2556
+#: command.c:2533
#, c-format
-msgid "Pager usage (%s) is off.\n"
-msgstr "Paginazione (%s) disattivata.\n"
+msgid "Pager usage is off.\n"
+msgstr "Paginazione disattivata.\n"
-#: command.c:2563 command.c:2573
+#: command.c:2540 command.c:2550
#, c-format
-msgid "Record separator (%s) is zero byte.\n"
-msgstr "Il separatore di record (%s) è il byte zero.\n"
+msgid "Record separator is zero byte.\n"
+msgstr "Il separatore di record è il byte zero.\n"
-#: command.c:2565
+#: command.c:2542
#, c-format
-msgid "Record separator (%s) is <newline>.\n"
-msgstr "Il separatore di record (%s) è <a capo>.\n"
+msgid "Record separator is <newline>.\n"
+msgstr "Il separatore di record è <a capo>.\n"
-#: command.c:2567
+#: command.c:2544
#, c-format
-msgid "Record separator (%s) is \"%s\".\n"
-msgstr "Il separatore di record (%s) è \"%s\".\n"
+msgid "Record separator is \"%s\".\n"
+msgstr "Il separatore di record è \"%s\".\n"
-#: command.c:2580
+#: command.c:2557
#, c-format
-msgid "Table attributes (%s) are \"%s\".\n"
-msgstr "Gli attributi di tabella (%s) sono \"%s\".\n"
+msgid "Table attributes are \"%s\".\n"
+msgstr "Gli attributi di tabella sono \"%s\".\n"
-#: command.c:2583
+#: command.c:2560
#, c-format
-msgid "Table attributes (%s) unset.\n"
-msgstr "Gli attributi di tabella (%s) non sono specificati.\n"
+msgid "Table attributes unset.\n"
+msgstr "Gli attributi di tabella non sono specificati.\n"
-#: command.c:2590
+#: command.c:2567
#, c-format
-msgid "Title (%s) is \"%s\".\n"
-msgstr "Il titolo (%s) è \"%s\".\n"
+msgid "Title is \"%s\".\n"
+msgstr "Il titolo è \"%s\".\n"
-#: command.c:2592
+#: command.c:2569
#, c-format
-msgid "Title (%s) unset.\n"
-msgstr "Il titolo (%s) non è assegnato.\n"
+msgid "Title is unset.\n"
+msgstr "Il titolo non è assegnato.\n"
-#: command.c:2599
+#: command.c:2576
#, c-format
-msgid "Tuples only (%s) is on.\n"
-msgstr "La visualizzazione dei soli dati (%s) è attiva.\n"
+msgid "Tuples only is on.\n"
+msgstr "La visualizzazione dei soli dati è attiva.\n"
-#: command.c:2601
+#: command.c:2578
#, c-format
-msgid "Tuples only (%s) is off.\n"
-msgstr "La visualizzazione dei soli dati (%s) è disattivata.\n"
+msgid "Tuples only is off.\n"
+msgstr "La visualizzazione dei soli dati è disattivata.\n"
-#: command.c:2657
+#: command.c:2729
#, c-format
msgid "\\!: failed\n"
msgstr "\\!: fallita\n"
-#: command.c:2677 command.c:2736
+#: command.c:2749 command.c:2808
#, c-format
msgid "\\watch cannot be used with an empty query\n"
msgstr "\\watch non può essere usato con una query vuota\n"
-#: command.c:2699
+#: command.c:2771
#, c-format
msgid "Watch every %lds\t%s"
msgstr "Esegui ogni %lds\t%s"
-#: command.c:2743
+#: command.c:2815
#, c-format
msgid "\\watch cannot be used with COPY\n"
msgstr "\\watch non può essere usato con COPY\n"
-#: command.c:2749
+#: command.c:2821
#, c-format
msgid "unexpected result status for \\watch\n"
msgstr "risultato imprevisto per \\watch\n"
@@ -685,8 +674,8 @@ msgstr "esecuzione del comando \"%s\" fallito: %s\n"
#: copy.c:346
#, c-format
-msgid "could not stat file: %s\n"
-msgstr "richiesta informazioni sul file fallita: %s\n"
+msgid "could not stat file \"%s\": %s\n"
+msgstr "richiesta informazioni sul file \"%s\" fallita: %s\n"
#: copy.c:350
#, c-format
@@ -969,7 +958,7 @@ msgstr "Privilegi di accesso di default"
msgid "Object"
msgstr "Oggetto"
-#: describe.c:930 sql_help.c:1601
+#: describe.c:930 sql_help.c:1595
msgid "constraint"
msgstr "vincolo"
@@ -2355,11 +2344,11 @@ msgstr " \\H cambia modalità HTML (attualmente %s)\n"
#: help.c:235
#, c-format
msgid ""
-" \\pset [NAME [VALUE]] set table output option\n"
+" \\pset [NAME [VALUE]] set table output option\n"
" (NAME := {format|border|expanded|fieldsep|fieldsep_zero|footer|null|\n"
" numericlocale|recordsep|recordsep_zero|tuples_only|title|tableattr|pager})\n"
msgstr ""
-" \\pset [NOME [VALORE]] imposta opzioni di output tabella\n"
+" \\pset [NOME [VALORE]] imposta opzioni di output tabella\n"
" (NOME := {format|border|expanded|fieldsep|fieldsep_zero|footer|null|\n"
" numericlocale|recordsep|recordsep_zero|tuples_only|title|tableattr|pager})\n"
@@ -2517,17 +2506,17 @@ msgstr ""
"Nessun aiuto disponibile per \"%s\".\n"
"Prova a digitare \\h senza parametri per vedere gli aiuti disponibili.\n"
-#: input.c:193
+#: input.c:194
#, c-format
msgid "could not read from input file: %s\n"
msgstr "lettura dal file di input fallita: %s\n"
-#: input.c:403
+#: input.c:451 input.c:490
#, c-format
msgid "could not save history to file \"%s\": %s\n"
msgstr "salvataggio della cronologia nel file \"%s\" fallita: %s\n"
-#: input.c:408
+#: input.c:510
#, c-format
msgid "history is not supported by this installation\n"
msgstr "history non è supportata da questa installazione\n"
@@ -2586,27 +2575,27 @@ msgid_plural "(%lu rows)"
msgstr[0] "(%lu riga)"
msgstr[1] "(%lu righe)"
-#: print.c:1175
+#: print.c:1174
#, c-format
msgid "(No rows)\n"
msgstr "(Nessuna riga)\n"
-#: print.c:2239
+#: print.c:2238
#, c-format
msgid "Interrupted\n"
msgstr "Interrotto\n"
-#: print.c:2305
+#: print.c:2304
#, c-format
msgid "Cannot add header to table content: column count of %d exceeded.\n"
msgstr "Non è possibile aggiungere l'intestazione al contenuto della tabella: il numero di colonne %d è stato superato.\n"
-#: print.c:2345
+#: print.c:2344
#, c-format
msgid "Cannot add cell to table content: total cell count of %d exceeded.\n"
msgstr "Non è possibile aggiungere celle al contenuto della tabella: il numero totale di celle %d è stato superato.\n"
-#: print.c:2571
+#: print.c:2570
#, c-format
msgid "invalid output format (internal error): %d"
msgstr "il formato di output non è valido (errore interno): %d"
@@ -2647,42 +2636,42 @@ msgstr "non è possibile effettuare l'escape senza una connessione attiva\n"
#: sql_help.c:678 sql_help.c:681 sql_help.c:711 sql_help.c:717 sql_help.c:719
#: sql_help.c:723 sql_help.c:726 sql_help.c:729 sql_help.c:738 sql_help.c:749
#: sql_help.c:751 sql_help.c:768 sql_help.c:777 sql_help.c:779 sql_help.c:781
-#: sql_help.c:793 sql_help.c:797 sql_help.c:799 sql_help.c:874 sql_help.c:876
-#: sql_help.c:879 sql_help.c:882 sql_help.c:884 sql_help.c:886 sql_help.c:947
-#: sql_help.c:949 sql_help.c:951 sql_help.c:954 sql_help.c:975 sql_help.c:978
-#: sql_help.c:981 sql_help.c:984 sql_help.c:988 sql_help.c:990 sql_help.c:992
-#: sql_help.c:994 sql_help.c:1008 sql_help.c:1011 sql_help.c:1013
-#: sql_help.c:1015 sql_help.c:1025 sql_help.c:1027 sql_help.c:1037
-#: sql_help.c:1039 sql_help.c:1048 sql_help.c:1069 sql_help.c:1071
-#: sql_help.c:1073 sql_help.c:1076 sql_help.c:1078 sql_help.c:1080
-#: sql_help.c:1118 sql_help.c:1124 sql_help.c:1126 sql_help.c:1129
-#: sql_help.c:1131 sql_help.c:1133 sql_help.c:1165 sql_help.c:1168
-#: sql_help.c:1170 sql_help.c:1172 sql_help.c:1174 sql_help.c:1176
-#: sql_help.c:1179 sql_help.c:1224 sql_help.c:1462 sql_help.c:1478
-#: sql_help.c:1491 sql_help.c:1542 sql_help.c:1546 sql_help.c:1556
-#: sql_help.c:1574 sql_help.c:1597 sql_help.c:1615 sql_help.c:1643
-#: sql_help.c:1702 sql_help.c:1744 sql_help.c:1766 sql_help.c:1786
-#: sql_help.c:1787 sql_help.c:1822 sql_help.c:1842 sql_help.c:1864
-#: sql_help.c:1892 sql_help.c:1917 sql_help.c:1953 sql_help.c:2139
-#: sql_help.c:2152 sql_help.c:2169 sql_help.c:2185 sql_help.c:2208
-#: sql_help.c:2259 sql_help.c:2263 sql_help.c:2265 sql_help.c:2271
-#: sql_help.c:2289 sql_help.c:2316 sql_help.c:2356 sql_help.c:2373
-#: sql_help.c:2382 sql_help.c:2432 sql_help.c:2460 sql_help.c:2468
-#: sql_help.c:2476 sql_help.c:2484 sql_help.c:2492 sql_help.c:2500
-#: sql_help.c:2508 sql_help.c:2516 sql_help.c:2525 sql_help.c:2536
-#: sql_help.c:2544 sql_help.c:2552 sql_help.c:2560 sql_help.c:2568
-#: sql_help.c:2578 sql_help.c:2587 sql_help.c:2596 sql_help.c:2604
-#: sql_help.c:2612 sql_help.c:2621 sql_help.c:2629 sql_help.c:2637
-#: sql_help.c:2645 sql_help.c:2653 sql_help.c:2661 sql_help.c:2669
-#: sql_help.c:2677 sql_help.c:2685 sql_help.c:2693 sql_help.c:2702
-#: sql_help.c:2710 sql_help.c:2727 sql_help.c:2742 sql_help.c:2948
-#: sql_help.c:2999 sql_help.c:3027 sql_help.c:3035 sql_help.c:3433
-#: sql_help.c:3481 sql_help.c:3601
+#: sql_help.c:793 sql_help.c:797 sql_help.c:799 sql_help.c:878 sql_help.c:880
+#: sql_help.c:883 sql_help.c:886 sql_help.c:888 sql_help.c:890 sql_help.c:951
+#: sql_help.c:953 sql_help.c:955 sql_help.c:958 sql_help.c:979 sql_help.c:982
+#: sql_help.c:985 sql_help.c:988 sql_help.c:992 sql_help.c:994 sql_help.c:996
+#: sql_help.c:998 sql_help.c:1012 sql_help.c:1015 sql_help.c:1017
+#: sql_help.c:1019 sql_help.c:1029 sql_help.c:1031 sql_help.c:1041
+#: sql_help.c:1043 sql_help.c:1052 sql_help.c:1073 sql_help.c:1075
+#: sql_help.c:1077 sql_help.c:1080 sql_help.c:1082 sql_help.c:1084
+#: sql_help.c:1122 sql_help.c:1128 sql_help.c:1130 sql_help.c:1133
+#: sql_help.c:1135 sql_help.c:1137 sql_help.c:1164 sql_help.c:1167
+#: sql_help.c:1169 sql_help.c:1171 sql_help.c:1173 sql_help.c:1175
+#: sql_help.c:1178 sql_help.c:1218 sql_help.c:1456 sql_help.c:1472
+#: sql_help.c:1485 sql_help.c:1536 sql_help.c:1540 sql_help.c:1550
+#: sql_help.c:1568 sql_help.c:1591 sql_help.c:1609 sql_help.c:1637
+#: sql_help.c:1696 sql_help.c:1738 sql_help.c:1760 sql_help.c:1780
+#: sql_help.c:1781 sql_help.c:1816 sql_help.c:1836 sql_help.c:1858
+#: sql_help.c:1886 sql_help.c:1911 sql_help.c:1947 sql_help.c:2133
+#: sql_help.c:2146 sql_help.c:2163 sql_help.c:2179 sql_help.c:2202
+#: sql_help.c:2253 sql_help.c:2257 sql_help.c:2259 sql_help.c:2265
+#: sql_help.c:2283 sql_help.c:2310 sql_help.c:2345 sql_help.c:2357
+#: sql_help.c:2366 sql_help.c:2416 sql_help.c:2444 sql_help.c:2452
+#: sql_help.c:2460 sql_help.c:2468 sql_help.c:2476 sql_help.c:2484
+#: sql_help.c:2492 sql_help.c:2500 sql_help.c:2509 sql_help.c:2520
+#: sql_help.c:2528 sql_help.c:2536 sql_help.c:2544 sql_help.c:2552
+#: sql_help.c:2562 sql_help.c:2571 sql_help.c:2580 sql_help.c:2588
+#: sql_help.c:2596 sql_help.c:2605 sql_help.c:2613 sql_help.c:2621
+#: sql_help.c:2629 sql_help.c:2637 sql_help.c:2645 sql_help.c:2653
+#: sql_help.c:2661 sql_help.c:2669 sql_help.c:2677 sql_help.c:2686
+#: sql_help.c:2694 sql_help.c:2711 sql_help.c:2726 sql_help.c:2932
+#: sql_help.c:2983 sql_help.c:3011 sql_help.c:3019 sql_help.c:3417
+#: sql_help.c:3465 sql_help.c:3585
msgid "name"
msgstr "nome"
-#: sql_help.c:33 sql_help.c:36 sql_help.c:39 sql_help.c:300 sql_help.c:1285
-#: sql_help.c:2433 sql_help.c:3250
+#: sql_help.c:33 sql_help.c:36 sql_help.c:39 sql_help.c:300 sql_help.c:1279
+#: sql_help.c:2417 sql_help.c:3234
msgid "aggregate_signature"
msgstr "signature_aggregato"
@@ -2690,99 +2679,99 @@ msgstr "signature_aggregato"
#: sql_help.c:246 sql_help.c:362 sql_help.c:402 sql_help.c:469 sql_help.c:502
#: sql_help.c:516 sql_help.c:536 sql_help.c:583 sql_help.c:631 sql_help.c:677
#: sql_help.c:718 sql_help.c:740 sql_help.c:750 sql_help.c:780 sql_help.c:800
-#: sql_help.c:883 sql_help.c:948 sql_help.c:991 sql_help.c:1012
-#: sql_help.c:1026 sql_help.c:1038 sql_help.c:1050 sql_help.c:1077
-#: sql_help.c:1125 sql_help.c:1173
+#: sql_help.c:887 sql_help.c:952 sql_help.c:995 sql_help.c:1016
+#: sql_help.c:1030 sql_help.c:1042 sql_help.c:1054 sql_help.c:1081
+#: sql_help.c:1129 sql_help.c:1172
msgid "new_name"
msgstr "nuovo_nome"
#: sql_help.c:37 sql_help.c:63 sql_help.c:78 sql_help.c:110 sql_help.c:226
#: sql_help.c:244 sql_help.c:360 sql_help.c:431 sql_help.c:474 sql_help.c:538
#: sql_help.c:547 sql_help.c:602 sql_help.c:615 sql_help.c:634 sql_help.c:680
-#: sql_help.c:752 sql_help.c:778 sql_help.c:798 sql_help.c:931 sql_help.c:950
-#: sql_help.c:993 sql_help.c:1014 sql_help.c:1072 sql_help.c:1171
+#: sql_help.c:752 sql_help.c:778 sql_help.c:798 sql_help.c:935 sql_help.c:954
+#: sql_help.c:997 sql_help.c:1018 sql_help.c:1076 sql_help.c:1170
msgid "new_owner"
msgstr "nuovo_proprietario"
#: sql_help.c:40 sql_help.c:65 sql_help.c:80 sql_help.c:230 sql_help.c:293
#: sql_help.c:404 sql_help.c:479 sql_help.c:585 sql_help.c:619 sql_help.c:637
-#: sql_help.c:683 sql_help.c:782 sql_help.c:885 sql_help.c:995 sql_help.c:1016
-#: sql_help.c:1028 sql_help.c:1040 sql_help.c:1079 sql_help.c:1175
+#: sql_help.c:683 sql_help.c:782 sql_help.c:889 sql_help.c:999 sql_help.c:1020
+#: sql_help.c:1032 sql_help.c:1044 sql_help.c:1083 sql_help.c:1174
msgid "new_schema"
msgstr "nuovo_schema"
-#: sql_help.c:41 sql_help.c:1332 sql_help.c:2434 sql_help.c:3269
+#: sql_help.c:41 sql_help.c:1326 sql_help.c:2418 sql_help.c:3253
msgid "where aggregate_signature is:"
msgstr "dove signature_aggregato è:"
#: sql_help.c:42 sql_help.c:45 sql_help.c:48 sql_help.c:310 sql_help.c:333
#: sql_help.c:336 sql_help.c:339 sql_help.c:461 sql_help.c:466 sql_help.c:471
-#: sql_help.c:476 sql_help.c:1301 sql_help.c:1333 sql_help.c:1336
-#: sql_help.c:1339 sql_help.c:1463 sql_help.c:1479 sql_help.c:1482
-#: sql_help.c:1703 sql_help.c:2435 sql_help.c:2438 sql_help.c:2441
-#: sql_help.c:2526 sql_help.c:2886 sql_help.c:3165 sql_help.c:3256
-#: sql_help.c:3270 sql_help.c:3273 sql_help.c:3276
+#: sql_help.c:476 sql_help.c:1295 sql_help.c:1327 sql_help.c:1330
+#: sql_help.c:1333 sql_help.c:1457 sql_help.c:1473 sql_help.c:1476
+#: sql_help.c:1697 sql_help.c:2419 sql_help.c:2422 sql_help.c:2425
+#: sql_help.c:2510 sql_help.c:2870 sql_help.c:3149 sql_help.c:3240
+#: sql_help.c:3254 sql_help.c:3257 sql_help.c:3260
msgid "argmode"
msgstr "modo_arg"
#: sql_help.c:43 sql_help.c:46 sql_help.c:49 sql_help.c:311 sql_help.c:334
#: sql_help.c:337 sql_help.c:340 sql_help.c:462 sql_help.c:467 sql_help.c:472
-#: sql_help.c:477 sql_help.c:1302 sql_help.c:1334 sql_help.c:1337
-#: sql_help.c:1340 sql_help.c:1464 sql_help.c:1480 sql_help.c:1483
-#: sql_help.c:1704 sql_help.c:2436 sql_help.c:2439 sql_help.c:2442
-#: sql_help.c:2527 sql_help.c:3257 sql_help.c:3271 sql_help.c:3274
-#: sql_help.c:3277
+#: sql_help.c:477 sql_help.c:1296 sql_help.c:1328 sql_help.c:1331
+#: sql_help.c:1334 sql_help.c:1458 sql_help.c:1474 sql_help.c:1477
+#: sql_help.c:1698 sql_help.c:2420 sql_help.c:2423 sql_help.c:2426
+#: sql_help.c:2511 sql_help.c:3241 sql_help.c:3255 sql_help.c:3258
+#: sql_help.c:3261
msgid "argname"
msgstr "nome_arg"
#: sql_help.c:44 sql_help.c:47 sql_help.c:50 sql_help.c:312 sql_help.c:335
#: sql_help.c:338 sql_help.c:341 sql_help.c:463 sql_help.c:468 sql_help.c:473
-#: sql_help.c:478 sql_help.c:1303 sql_help.c:1335 sql_help.c:1338
-#: sql_help.c:1341 sql_help.c:1705 sql_help.c:2437 sql_help.c:2440
-#: sql_help.c:2443 sql_help.c:2528 sql_help.c:3258 sql_help.c:3272
-#: sql_help.c:3275 sql_help.c:3278
+#: sql_help.c:478 sql_help.c:1297 sql_help.c:1329 sql_help.c:1332
+#: sql_help.c:1335 sql_help.c:1699 sql_help.c:2421 sql_help.c:2424
+#: sql_help.c:2427 sql_help.c:2512 sql_help.c:3242 sql_help.c:3256
+#: sql_help.c:3259 sql_help.c:3262
msgid "argtype"
msgstr "tipo_arg"
#: sql_help.c:104 sql_help.c:357 sql_help.c:425 sql_help.c:432 sql_help.c:712
-#: sql_help.c:795 sql_help.c:1009 sql_help.c:1119 sql_help.c:1145
-#: sql_help.c:1389 sql_help.c:1395 sql_help.c:1646 sql_help.c:1670
-#: sql_help.c:1675 sql_help.c:1745 sql_help.c:1893 sql_help.c:1974
-#: sql_help.c:2154 sql_help.c:2317 sql_help.c:2339 sql_help.c:2761
+#: sql_help.c:795 sql_help.c:1013 sql_help.c:1123 sql_help.c:1149
+#: sql_help.c:1383 sql_help.c:1389 sql_help.c:1640 sql_help.c:1664
+#: sql_help.c:1669 sql_help.c:1739 sql_help.c:1887 sql_help.c:1968
+#: sql_help.c:2148 sql_help.c:2311 sql_help.c:2333 sql_help.c:2745
msgid "option"
msgstr "opzione"
-#: sql_help.c:105 sql_help.c:713 sql_help.c:1120 sql_help.c:1746
-#: sql_help.c:1894 sql_help.c:2318
+#: sql_help.c:105 sql_help.c:713 sql_help.c:1124 sql_help.c:1740
+#: sql_help.c:1888 sql_help.c:2312
msgid "where option can be:"
msgstr "dove opzione può essere:"
-#: sql_help.c:106 sql_help.c:714 sql_help.c:1121 sql_help.c:1581
-#: sql_help.c:1895 sql_help.c:2319
+#: sql_help.c:106 sql_help.c:714 sql_help.c:1125 sql_help.c:1575
+#: sql_help.c:1889 sql_help.c:2313
msgid "connlimit"
msgstr "limite_conn"
-#: sql_help.c:112 sql_help.c:526 sql_help.c:588 sql_help.c:603 sql_help.c:888
-#: sql_help.c:932
+#: sql_help.c:112 sql_help.c:526 sql_help.c:588 sql_help.c:603 sql_help.c:892
+#: sql_help.c:936
msgid "new_tablespace"
msgstr "nuovo_tablespace"
#: sql_help.c:114 sql_help.c:117 sql_help.c:119 sql_help.c:483 sql_help.c:485
-#: sql_help.c:486 sql_help.c:721 sql_help.c:725 sql_help.c:728 sql_help.c:808
-#: sql_help.c:1127 sql_help.c:1130 sql_help.c:1132 sql_help.c:1713
-#: sql_help.c:3052 sql_help.c:3422
+#: sql_help.c:486 sql_help.c:721 sql_help.c:725 sql_help.c:728 sql_help.c:811
+#: sql_help.c:814 sql_help.c:1131 sql_help.c:1134 sql_help.c:1136
+#: sql_help.c:1707 sql_help.c:3036 sql_help.c:3406
msgid "configuration_parameter"
msgstr "parametro_config"
#: sql_help.c:115 sql_help.c:358 sql_help.c:421 sql_help.c:426 sql_help.c:433
#: sql_help.c:484 sql_help.c:521 sql_help.c:594 sql_help.c:600 sql_help.c:722
-#: sql_help.c:796 sql_help.c:809 sql_help.c:810 sql_help.c:907 sql_help.c:926
-#: sql_help.c:953 sql_help.c:1010 sql_help.c:1128 sql_help.c:1146
-#: sql_help.c:1647 sql_help.c:1671 sql_help.c:1676 sql_help.c:1714
-#: sql_help.c:1715 sql_help.c:1774 sql_help.c:1806 sql_help.c:1975
-#: sql_help.c:2049 sql_help.c:2057 sql_help.c:2089 sql_help.c:2111
-#: sql_help.c:2128 sql_help.c:2155 sql_help.c:2340 sql_help.c:3423
-#: sql_help.c:3424
+#: sql_help.c:796 sql_help.c:812 sql_help.c:813 sql_help.c:911 sql_help.c:930
+#: sql_help.c:957 sql_help.c:1014 sql_help.c:1132 sql_help.c:1150
+#: sql_help.c:1641 sql_help.c:1665 sql_help.c:1670 sql_help.c:1708
+#: sql_help.c:1709 sql_help.c:1768 sql_help.c:1800 sql_help.c:1969
+#: sql_help.c:2043 sql_help.c:2051 sql_help.c:2083 sql_help.c:2105
+#: sql_help.c:2122 sql_help.c:2149 sql_help.c:2334 sql_help.c:3407
+#: sql_help.c:3408
msgid "value"
msgstr "valore"
@@ -2790,9 +2779,9 @@ msgstr "valore"
msgid "target_role"
msgstr "ruolo_destinazione"
-#: sql_help.c:178 sql_help.c:1630 sql_help.c:1935 sql_help.c:1940
-#: sql_help.c:2868 sql_help.c:2875 sql_help.c:2889 sql_help.c:2895
-#: sql_help.c:3147 sql_help.c:3154 sql_help.c:3168 sql_help.c:3174
+#: sql_help.c:178 sql_help.c:1624 sql_help.c:1929 sql_help.c:1934
+#: sql_help.c:2852 sql_help.c:2859 sql_help.c:2873 sql_help.c:2879
+#: sql_help.c:3131 sql_help.c:3138 sql_help.c:3152 sql_help.c:3158
msgid "schema_name"
msgstr "nome_schema"
@@ -2806,29 +2795,29 @@ msgstr "dove grant_o_revoke_abbreviato è uno di:"
#: sql_help.c:181 sql_help.c:182 sql_help.c:183 sql_help.c:184 sql_help.c:185
#: sql_help.c:186 sql_help.c:187 sql_help.c:188 sql_help.c:525 sql_help.c:587
-#: sql_help.c:887 sql_help.c:1749 sql_help.c:1750 sql_help.c:1751
-#: sql_help.c:1752 sql_help.c:1753 sql_help.c:1898 sql_help.c:1899
-#: sql_help.c:1900 sql_help.c:1901 sql_help.c:1902 sql_help.c:2322
-#: sql_help.c:2323 sql_help.c:2324 sql_help.c:2325 sql_help.c:2326
-#: sql_help.c:2869 sql_help.c:2873 sql_help.c:2876 sql_help.c:2878
-#: sql_help.c:2880 sql_help.c:2882 sql_help.c:2884 sql_help.c:2890
-#: sql_help.c:2892 sql_help.c:2894 sql_help.c:2896 sql_help.c:2898
-#: sql_help.c:2900 sql_help.c:2901 sql_help.c:2902 sql_help.c:3148
-#: sql_help.c:3152 sql_help.c:3155 sql_help.c:3157 sql_help.c:3159
-#: sql_help.c:3161 sql_help.c:3163 sql_help.c:3169 sql_help.c:3171
-#: sql_help.c:3173 sql_help.c:3175 sql_help.c:3177 sql_help.c:3179
-#: sql_help.c:3180 sql_help.c:3181 sql_help.c:3443
+#: sql_help.c:891 sql_help.c:1743 sql_help.c:1744 sql_help.c:1745
+#: sql_help.c:1746 sql_help.c:1747 sql_help.c:1892 sql_help.c:1893
+#: sql_help.c:1894 sql_help.c:1895 sql_help.c:1896 sql_help.c:2316
+#: sql_help.c:2317 sql_help.c:2318 sql_help.c:2319 sql_help.c:2320
+#: sql_help.c:2853 sql_help.c:2857 sql_help.c:2860 sql_help.c:2862
+#: sql_help.c:2864 sql_help.c:2866 sql_help.c:2868 sql_help.c:2874
+#: sql_help.c:2876 sql_help.c:2878 sql_help.c:2880 sql_help.c:2882
+#: sql_help.c:2884 sql_help.c:2885 sql_help.c:2886 sql_help.c:3132
+#: sql_help.c:3136 sql_help.c:3139 sql_help.c:3141 sql_help.c:3143
+#: sql_help.c:3145 sql_help.c:3147 sql_help.c:3153 sql_help.c:3155
+#: sql_help.c:3157 sql_help.c:3159 sql_help.c:3161 sql_help.c:3163
+#: sql_help.c:3164 sql_help.c:3165 sql_help.c:3427
msgid "role_name"
msgstr "nome_ruolo"
-#: sql_help.c:214 sql_help.c:414 sql_help.c:898 sql_help.c:900 sql_help.c:1167
-#: sql_help.c:1600 sql_help.c:1604 sql_help.c:1770 sql_help.c:2061
-#: sql_help.c:2071 sql_help.c:2093 sql_help.c:2916 sql_help.c:3319
-#: sql_help.c:3320 sql_help.c:3324 sql_help.c:3329 sql_help.c:3397
-#: sql_help.c:3398 sql_help.c:3403 sql_help.c:3408 sql_help.c:3537
-#: sql_help.c:3538 sql_help.c:3542 sql_help.c:3547 sql_help.c:3627
-#: sql_help.c:3629 sql_help.c:3660 sql_help.c:3706 sql_help.c:3707
-#: sql_help.c:3711 sql_help.c:3716
+#: sql_help.c:214 sql_help.c:414 sql_help.c:902 sql_help.c:904 sql_help.c:1166
+#: sql_help.c:1594 sql_help.c:1598 sql_help.c:1764 sql_help.c:2055
+#: sql_help.c:2065 sql_help.c:2087 sql_help.c:2900 sql_help.c:3303
+#: sql_help.c:3304 sql_help.c:3308 sql_help.c:3313 sql_help.c:3381
+#: sql_help.c:3382 sql_help.c:3387 sql_help.c:3392 sql_help.c:3521
+#: sql_help.c:3522 sql_help.c:3526 sql_help.c:3531 sql_help.c:3611
+#: sql_help.c:3613 sql_help.c:3644 sql_help.c:3690 sql_help.c:3691
+#: sql_help.c:3695 sql_help.c:3700
msgid "expression"
msgstr "espressione"
@@ -2836,13 +2825,13 @@ msgstr "espressione"
msgid "domain_constraint"
msgstr "vincolo_di_dominio"
-#: sql_help.c:219 sql_help.c:221 sql_help.c:224 sql_help.c:880 sql_help.c:913
-#: sql_help.c:914 sql_help.c:915 sql_help.c:935 sql_help.c:1291
-#: sql_help.c:1603 sql_help.c:1678 sql_help.c:2060 sql_help.c:2070
+#: sql_help.c:219 sql_help.c:221 sql_help.c:224 sql_help.c:884 sql_help.c:917
+#: sql_help.c:918 sql_help.c:919 sql_help.c:939 sql_help.c:1285
+#: sql_help.c:1597 sql_help.c:1672 sql_help.c:2054 sql_help.c:2064
msgid "constraint_name"
msgstr "nome_vincolo"
-#: sql_help.c:222 sql_help.c:881
+#: sql_help.c:222 sql_help.c:885
msgid "new_constraint_name"
msgstr "nuovo_nome_vincolo"
@@ -2858,17 +2847,17 @@ msgstr "oggetto_membro"
msgid "where member_object is:"
msgstr "dove oggetto_membro è:"
-#: sql_help.c:299 sql_help.c:1284 sql_help.c:3249
+#: sql_help.c:299 sql_help.c:1278 sql_help.c:3233
msgid "aggregate_name"
msgstr "nome_aggregato"
-#: sql_help.c:301 sql_help.c:1286 sql_help.c:1522 sql_help.c:1526
-#: sql_help.c:1528 sql_help.c:2451
+#: sql_help.c:301 sql_help.c:1280 sql_help.c:1516 sql_help.c:1520
+#: sql_help.c:1522 sql_help.c:2435
msgid "source_type"
msgstr "tipo_sorgente"
-#: sql_help.c:302 sql_help.c:1287 sql_help.c:1523 sql_help.c:1527
-#: sql_help.c:1529 sql_help.c:2452
+#: sql_help.c:302 sql_help.c:1281 sql_help.c:1517 sql_help.c:1521
+#: sql_help.c:1523 sql_help.c:2436
msgid "target_type"
msgstr "tipo_destinazione"
@@ -2876,46 +2865,46 @@ msgstr "tipo_destinazione"
#: sql_help.c:308 sql_help.c:313 sql_help.c:317 sql_help.c:319 sql_help.c:321
#: sql_help.c:322 sql_help.c:323 sql_help.c:324 sql_help.c:325 sql_help.c:326
#: sql_help.c:327 sql_help.c:328 sql_help.c:329 sql_help.c:330 sql_help.c:331
-#: sql_help.c:1288 sql_help.c:1293 sql_help.c:1294 sql_help.c:1295
-#: sql_help.c:1296 sql_help.c:1297 sql_help.c:1298 sql_help.c:1299
-#: sql_help.c:1304 sql_help.c:1306 sql_help.c:1310 sql_help.c:1312
-#: sql_help.c:1314 sql_help.c:1315 sql_help.c:1318 sql_help.c:1319
-#: sql_help.c:1320 sql_help.c:1321 sql_help.c:1322 sql_help.c:1323
-#: sql_help.c:1324 sql_help.c:1325 sql_help.c:1326 sql_help.c:1329
-#: sql_help.c:1330 sql_help.c:3246 sql_help.c:3251 sql_help.c:3252
-#: sql_help.c:3253 sql_help.c:3254 sql_help.c:3260 sql_help.c:3261
-#: sql_help.c:3262 sql_help.c:3263 sql_help.c:3264 sql_help.c:3265
-#: sql_help.c:3266 sql_help.c:3267
+#: sql_help.c:1282 sql_help.c:1287 sql_help.c:1288 sql_help.c:1289
+#: sql_help.c:1290 sql_help.c:1291 sql_help.c:1292 sql_help.c:1293
+#: sql_help.c:1298 sql_help.c:1300 sql_help.c:1304 sql_help.c:1306
+#: sql_help.c:1308 sql_help.c:1309 sql_help.c:1312 sql_help.c:1313
+#: sql_help.c:1314 sql_help.c:1315 sql_help.c:1316 sql_help.c:1317
+#: sql_help.c:1318 sql_help.c:1319 sql_help.c:1320 sql_help.c:1323
+#: sql_help.c:1324 sql_help.c:3230 sql_help.c:3235 sql_help.c:3236
+#: sql_help.c:3237 sql_help.c:3238 sql_help.c:3244 sql_help.c:3245
+#: sql_help.c:3246 sql_help.c:3247 sql_help.c:3248 sql_help.c:3249
+#: sql_help.c:3250 sql_help.c:3251
msgid "object_name"
msgstr "nome_oggetto"
-#: sql_help.c:309 sql_help.c:665 sql_help.c:1300 sql_help.c:1524
-#: sql_help.c:1559 sql_help.c:1618 sql_help.c:1823 sql_help.c:1854
-#: sql_help.c:2213 sql_help.c:2885 sql_help.c:3164 sql_help.c:3255
-#: sql_help.c:3345 sql_help.c:3349 sql_help.c:3353 sql_help.c:3356
-#: sql_help.c:3563 sql_help.c:3567 sql_help.c:3571 sql_help.c:3574
-#: sql_help.c:3732 sql_help.c:3736 sql_help.c:3740 sql_help.c:3743
+#: sql_help.c:309 sql_help.c:665 sql_help.c:1294 sql_help.c:1518
+#: sql_help.c:1553 sql_help.c:1612 sql_help.c:1817 sql_help.c:1848
+#: sql_help.c:2207 sql_help.c:2869 sql_help.c:3148 sql_help.c:3239
+#: sql_help.c:3329 sql_help.c:3333 sql_help.c:3337 sql_help.c:3340
+#: sql_help.c:3547 sql_help.c:3551 sql_help.c:3555 sql_help.c:3558
+#: sql_help.c:3716 sql_help.c:3720 sql_help.c:3724 sql_help.c:3727
msgid "function_name"
msgstr "nome_funzione"
-#: sql_help.c:314 sql_help.c:658 sql_help.c:1307 sql_help.c:1847
+#: sql_help.c:314 sql_help.c:658 sql_help.c:1301 sql_help.c:1841
msgid "operator_name"
msgstr "nome_operatore"
-#: sql_help.c:315 sql_help.c:613 sql_help.c:617 sql_help.c:1308
-#: sql_help.c:1824 sql_help.c:2569
+#: sql_help.c:315 sql_help.c:613 sql_help.c:617 sql_help.c:1302
+#: sql_help.c:1818 sql_help.c:2553
msgid "left_type"
msgstr "tipo_sx"
-#: sql_help.c:316 sql_help.c:614 sql_help.c:618 sql_help.c:1309
-#: sql_help.c:1825 sql_help.c:2570
+#: sql_help.c:316 sql_help.c:614 sql_help.c:618 sql_help.c:1303
+#: sql_help.c:1819 sql_help.c:2554
msgid "right_type"
msgstr "tipo_dx"
#: sql_help.c:318 sql_help.c:320 sql_help.c:630 sql_help.c:633 sql_help.c:636
#: sql_help.c:656 sql_help.c:668 sql_help.c:676 sql_help.c:679 sql_help.c:682
-#: sql_help.c:1311 sql_help.c:1313 sql_help.c:1844 sql_help.c:1865
-#: sql_help.c:2076 sql_help.c:2579 sql_help.c:2588
+#: sql_help.c:1305 sql_help.c:1307 sql_help.c:1838 sql_help.c:1859
+#: sql_help.c:2070 sql_help.c:2563 sql_help.c:2572
msgid "index_method"
msgstr "metodo_indice"
@@ -2923,81 +2912,81 @@ msgstr "metodo_indice"
msgid "and aggregate_signature is:"
msgstr "e signature_aggregato è:"
-#: sql_help.c:355 sql_help.c:1644
+#: sql_help.c:355 sql_help.c:1638
msgid "handler_function"
msgstr "funzione_handler"
-#: sql_help.c:356 sql_help.c:1645
+#: sql_help.c:356 sql_help.c:1639
msgid "validator_function"
msgstr "funzione_validazione"
-#: sql_help.c:397 sql_help.c:464 sql_help.c:578 sql_help.c:875 sql_help.c:1070
-#: sql_help.c:2067 sql_help.c:2068 sql_help.c:2084 sql_help.c:2085
+#: sql_help.c:397 sql_help.c:464 sql_help.c:578 sql_help.c:879 sql_help.c:1074
+#: sql_help.c:2061 sql_help.c:2062 sql_help.c:2078 sql_help.c:2079
msgid "action"
msgstr "azione"
#: sql_help.c:399 sql_help.c:406 sql_help.c:410 sql_help.c:411 sql_help.c:413
#: sql_help.c:415 sql_help.c:416 sql_help.c:417 sql_help.c:419 sql_help.c:422
#: sql_help.c:424 sql_help.c:580 sql_help.c:590 sql_help.c:592 sql_help.c:595
-#: sql_help.c:597 sql_help.c:776 sql_help.c:877 sql_help.c:890 sql_help.c:894
-#: sql_help.c:895 sql_help.c:899 sql_help.c:901 sql_help.c:902 sql_help.c:903
-#: sql_help.c:905 sql_help.c:908 sql_help.c:910 sql_help.c:1166
-#: sql_help.c:1169 sql_help.c:1194 sql_help.c:1290 sql_help.c:1386
-#: sql_help.c:1391 sql_help.c:1405 sql_help.c:1406 sql_help.c:1407
-#: sql_help.c:1668 sql_help.c:1708 sql_help.c:1769 sql_help.c:1804
-#: sql_help.c:1960 sql_help.c:2040 sql_help.c:2053 sql_help.c:2072
-#: sql_help.c:2074 sql_help.c:2081 sql_help.c:2092 sql_help.c:2109
-#: sql_help.c:2216 sql_help.c:2357 sql_help.c:2870 sql_help.c:2871
-#: sql_help.c:2915 sql_help.c:3149 sql_help.c:3150 sql_help.c:3248
-#: sql_help.c:3368 sql_help.c:3586 sql_help.c:3626 sql_help.c:3628
-#: sql_help.c:3645 sql_help.c:3648 sql_help.c:3755
+#: sql_help.c:597 sql_help.c:776 sql_help.c:881 sql_help.c:894 sql_help.c:898
+#: sql_help.c:899 sql_help.c:903 sql_help.c:905 sql_help.c:906 sql_help.c:907
+#: sql_help.c:909 sql_help.c:912 sql_help.c:914 sql_help.c:1165
+#: sql_help.c:1168 sql_help.c:1188 sql_help.c:1284 sql_help.c:1380
+#: sql_help.c:1385 sql_help.c:1399 sql_help.c:1400 sql_help.c:1401
+#: sql_help.c:1662 sql_help.c:1702 sql_help.c:1763 sql_help.c:1798
+#: sql_help.c:1954 sql_help.c:2034 sql_help.c:2047 sql_help.c:2066
+#: sql_help.c:2068 sql_help.c:2075 sql_help.c:2086 sql_help.c:2103
+#: sql_help.c:2210 sql_help.c:2346 sql_help.c:2854 sql_help.c:2855
+#: sql_help.c:2899 sql_help.c:3133 sql_help.c:3134 sql_help.c:3232
+#: sql_help.c:3352 sql_help.c:3570 sql_help.c:3610 sql_help.c:3612
+#: sql_help.c:3629 sql_help.c:3632 sql_help.c:3739
msgid "column_name"
msgstr "nome_colonna"
-#: sql_help.c:400 sql_help.c:581 sql_help.c:878
+#: sql_help.c:400 sql_help.c:581 sql_help.c:882
msgid "new_column_name"
msgstr "nuovo_nome_colonna"
-#: sql_help.c:405 sql_help.c:480 sql_help.c:589 sql_help.c:889 sql_help.c:1083
+#: sql_help.c:405 sql_help.c:480 sql_help.c:589 sql_help.c:893 sql_help.c:1087
msgid "where action is one of:"
msgstr "dove azione è una di:"
-#: sql_help.c:407 sql_help.c:412 sql_help.c:891 sql_help.c:896 sql_help.c:1085
-#: sql_help.c:1089 sql_help.c:1598 sql_help.c:1669 sql_help.c:1843
-#: sql_help.c:2041 sql_help.c:2261 sql_help.c:3000
+#: sql_help.c:407 sql_help.c:412 sql_help.c:895 sql_help.c:900 sql_help.c:1089
+#: sql_help.c:1093 sql_help.c:1592 sql_help.c:1663 sql_help.c:1837
+#: sql_help.c:2035 sql_help.c:2255 sql_help.c:2984
msgid "data_type"
msgstr "tipo_di_dato"
-#: sql_help.c:408 sql_help.c:892 sql_help.c:897 sql_help.c:1086
-#: sql_help.c:1090 sql_help.c:1599 sql_help.c:1672 sql_help.c:1771
-#: sql_help.c:2042 sql_help.c:2262 sql_help.c:2268
+#: sql_help.c:408 sql_help.c:896 sql_help.c:901 sql_help.c:1090
+#: sql_help.c:1094 sql_help.c:1593 sql_help.c:1666 sql_help.c:1765
+#: sql_help.c:2036 sql_help.c:2256 sql_help.c:2262
msgid "collation"
msgstr "ordinamento"
-#: sql_help.c:409 sql_help.c:893 sql_help.c:1673 sql_help.c:2043
-#: sql_help.c:2054
+#: sql_help.c:409 sql_help.c:897 sql_help.c:1667 sql_help.c:2037
+#: sql_help.c:2048
msgid "column_constraint"
msgstr "vincolo_di_colonna"
-#: sql_help.c:418 sql_help.c:591 sql_help.c:904
+#: sql_help.c:418 sql_help.c:591 sql_help.c:908
msgid "integer"
msgstr "intero"
-#: sql_help.c:420 sql_help.c:423 sql_help.c:593 sql_help.c:596 sql_help.c:906
-#: sql_help.c:909
+#: sql_help.c:420 sql_help.c:423 sql_help.c:593 sql_help.c:596 sql_help.c:910
+#: sql_help.c:913
msgid "attribute_option"
msgstr "opzione_attributo"
-#: sql_help.c:427 sql_help.c:428 sql_help.c:429 sql_help.c:430 sql_help.c:916
-#: sql_help.c:917 sql_help.c:918 sql_help.c:919 sql_help.c:1327
+#: sql_help.c:427 sql_help.c:428 sql_help.c:429 sql_help.c:430 sql_help.c:920
+#: sql_help.c:921 sql_help.c:922 sql_help.c:923 sql_help.c:1321
msgid "trigger_name"
msgstr "nome_trigger"
-#: sql_help.c:481 sql_help.c:1711
+#: sql_help.c:481 sql_help.c:1705
msgid "execution_cost"
msgstr "costo_di_esecuzione"
-#: sql_help.c:482 sql_help.c:1712
+#: sql_help.c:482 sql_help.c:1706
msgid "result_rows"
msgstr "righe_risultato"
@@ -3005,97 +2994,97 @@ msgstr "righe_risultato"
msgid "group_name"
msgstr "nome_gruppo"
-#: sql_help.c:498 sql_help.c:500 sql_help.c:1143 sql_help.c:1575
-#: sql_help.c:1936 sql_help.c:1938 sql_help.c:1941 sql_help.c:1942
-#: sql_help.c:2125 sql_help.c:2337 sql_help.c:2718 sql_help.c:3453
+#: sql_help.c:498 sql_help.c:500 sql_help.c:1147 sql_help.c:1569
+#: sql_help.c:1930 sql_help.c:1932 sql_help.c:1935 sql_help.c:1936
+#: sql_help.c:2119 sql_help.c:2331 sql_help.c:2702 sql_help.c:3437
msgid "user_name"
msgstr "nome_utente"
-#: sql_help.c:518 sql_help.c:1580 sql_help.c:1775 sql_help.c:1807
-#: sql_help.c:2050 sql_help.c:2058 sql_help.c:2090 sql_help.c:2112
-#: sql_help.c:2124 sql_help.c:2897 sql_help.c:3176
+#: sql_help.c:518 sql_help.c:1574 sql_help.c:1769 sql_help.c:1801
+#: sql_help.c:2044 sql_help.c:2052 sql_help.c:2084 sql_help.c:2106
+#: sql_help.c:2118 sql_help.c:2881 sql_help.c:3160
msgid "tablespace_name"
msgstr "nome_tablespace"
-#: sql_help.c:520 sql_help.c:523 sql_help.c:599 sql_help.c:601 sql_help.c:925
-#: sql_help.c:927 sql_help.c:1773 sql_help.c:1805 sql_help.c:2048
-#: sql_help.c:2056 sql_help.c:2088 sql_help.c:2110
+#: sql_help.c:520 sql_help.c:523 sql_help.c:599 sql_help.c:601 sql_help.c:929
+#: sql_help.c:931 sql_help.c:1767 sql_help.c:1799 sql_help.c:2042
+#: sql_help.c:2050 sql_help.c:2082 sql_help.c:2104
msgid "storage_parameter"
msgstr "parametro_di_memorizzazione"
-#: sql_help.c:546 sql_help.c:1305 sql_help.c:3259
+#: sql_help.c:546 sql_help.c:1299 sql_help.c:3243
msgid "large_object_oid"
msgstr "oid_large_object"
-#: sql_help.c:598 sql_help.c:924 sql_help.c:933 sql_help.c:936 sql_help.c:1234
+#: sql_help.c:598 sql_help.c:928 sql_help.c:937 sql_help.c:940 sql_help.c:1228
msgid "index_name"
msgstr "nome_indice"
-#: sql_help.c:657 sql_help.c:669 sql_help.c:1846
+#: sql_help.c:657 sql_help.c:669 sql_help.c:1840
msgid "strategy_number"
msgstr "strategia_num"
#: sql_help.c:659 sql_help.c:660 sql_help.c:663 sql_help.c:664 sql_help.c:670
-#: sql_help.c:671 sql_help.c:673 sql_help.c:674 sql_help.c:1848
-#: sql_help.c:1849 sql_help.c:1852 sql_help.c:1853
+#: sql_help.c:671 sql_help.c:673 sql_help.c:674 sql_help.c:1842
+#: sql_help.c:1843 sql_help.c:1846 sql_help.c:1847
msgid "op_type"
msgstr "tipo_op"
-#: sql_help.c:661 sql_help.c:1850
+#: sql_help.c:661 sql_help.c:1844
msgid "sort_family_name"
msgstr "nome_famiglia_sort"
-#: sql_help.c:662 sql_help.c:672 sql_help.c:1851
+#: sql_help.c:662 sql_help.c:672 sql_help.c:1845
msgid "support_number"
msgstr "num_supporto"
-#: sql_help.c:666 sql_help.c:1525 sql_help.c:1855
+#: sql_help.c:666 sql_help.c:1519 sql_help.c:1849
msgid "argument_type"
msgstr "tipo_argomento"
-#: sql_help.c:715 sql_help.c:1122 sql_help.c:1747 sql_help.c:1896
-#: sql_help.c:2320
+#: sql_help.c:715 sql_help.c:1126 sql_help.c:1741 sql_help.c:1890
+#: sql_help.c:2314
msgid "password"
msgstr "password"
-#: sql_help.c:716 sql_help.c:1123 sql_help.c:1748 sql_help.c:1897
-#: sql_help.c:2321
+#: sql_help.c:716 sql_help.c:1127 sql_help.c:1742 sql_help.c:1891
+#: sql_help.c:2315
msgid "timestamp"
msgstr "timestamp"
-#: sql_help.c:720 sql_help.c:724 sql_help.c:727 sql_help.c:730 sql_help.c:2877
-#: sql_help.c:3156
+#: sql_help.c:720 sql_help.c:724 sql_help.c:727 sql_help.c:730 sql_help.c:2861
+#: sql_help.c:3140
msgid "database_name"
msgstr "nome_database"
-#: sql_help.c:739 sql_help.c:775 sql_help.c:1049 sql_help.c:1193
-#: sql_help.c:1233 sql_help.c:1292 sql_help.c:1317 sql_help.c:1328
-#: sql_help.c:1385 sql_help.c:1390 sql_help.c:1667 sql_help.c:1767
-#: sql_help.c:1803 sql_help.c:1919 sql_help.c:1959 sql_help.c:2039
-#: sql_help.c:2051 sql_help.c:2108 sql_help.c:2210 sql_help.c:2396
-#: sql_help.c:2613 sql_help.c:2694 sql_help.c:2867 sql_help.c:2872
-#: sql_help.c:2914 sql_help.c:3146 sql_help.c:3151 sql_help.c:3247
-#: sql_help.c:3334 sql_help.c:3336 sql_help.c:3374 sql_help.c:3413
-#: sql_help.c:3552 sql_help.c:3554 sql_help.c:3592 sql_help.c:3624
-#: sql_help.c:3644 sql_help.c:3646 sql_help.c:3647 sql_help.c:3721
-#: sql_help.c:3723 sql_help.c:3761
+#: sql_help.c:739 sql_help.c:775 sql_help.c:1053 sql_help.c:1187
+#: sql_help.c:1227 sql_help.c:1286 sql_help.c:1311 sql_help.c:1322
+#: sql_help.c:1379 sql_help.c:1384 sql_help.c:1661 sql_help.c:1761
+#: sql_help.c:1797 sql_help.c:1913 sql_help.c:1953 sql_help.c:2033
+#: sql_help.c:2045 sql_help.c:2102 sql_help.c:2204 sql_help.c:2380
+#: sql_help.c:2597 sql_help.c:2678 sql_help.c:2851 sql_help.c:2856
+#: sql_help.c:2898 sql_help.c:3130 sql_help.c:3135 sql_help.c:3231
+#: sql_help.c:3318 sql_help.c:3320 sql_help.c:3358 sql_help.c:3397
+#: sql_help.c:3536 sql_help.c:3538 sql_help.c:3576 sql_help.c:3608
+#: sql_help.c:3628 sql_help.c:3630 sql_help.c:3631 sql_help.c:3705
+#: sql_help.c:3707 sql_help.c:3745
msgid "table_name"
msgstr "nome_tabella"
-#: sql_help.c:769 sql_help.c:1954
+#: sql_help.c:769 sql_help.c:1948
msgid "increment"
msgstr "incremento"
-#: sql_help.c:770 sql_help.c:1955
+#: sql_help.c:770 sql_help.c:1949
msgid "minvalue"
msgstr "valoremin"
-#: sql_help.c:771 sql_help.c:1956
+#: sql_help.c:771 sql_help.c:1950
msgid "maxvalue"
msgstr "valoremax"
-#: sql_help.c:772 sql_help.c:1957 sql_help.c:3332 sql_help.c:3411
-#: sql_help.c:3550 sql_help.c:3664 sql_help.c:3719
+#: sql_help.c:772 sql_help.c:1951 sql_help.c:3316 sql_help.c:3395
+#: sql_help.c:3534 sql_help.c:3648 sql_help.c:3703
msgid "start"
msgstr "inizio"
@@ -3103,791 +3092,774 @@ msgstr "inizio"
msgid "restart"
msgstr "riavvio"
-#: sql_help.c:774 sql_help.c:1958
+#: sql_help.c:774 sql_help.c:1952
msgid "cache"
msgstr "cache"
-#: sql_help.c:911 sql_help.c:2044 sql_help.c:2055
+#: sql_help.c:915 sql_help.c:2038 sql_help.c:2049
msgid "table_constraint"
msgstr "vincoli_di_tabella"
-#: sql_help.c:912
+#: sql_help.c:916
msgid "table_constraint_using_index"
msgstr "vincoli_di_tabella_con_indice"
-#: sql_help.c:920 sql_help.c:921 sql_help.c:922 sql_help.c:923
+#: sql_help.c:924 sql_help.c:925 sql_help.c:926 sql_help.c:927
msgid "rewrite_rule_name"
msgstr "nome_regola_di_riscrittura"
-#: sql_help.c:928 sql_help.c:929 sql_help.c:2047
+#: sql_help.c:932 sql_help.c:933 sql_help.c:2041
msgid "parent_table"
msgstr "tabella_padre"
-#: sql_help.c:930 sql_help.c:2052 sql_help.c:2899 sql_help.c:3178
+#: sql_help.c:934 sql_help.c:2046 sql_help.c:2883 sql_help.c:3162
msgid "type_name"
msgstr "nome_di_tipo"
-#: sql_help.c:934
+#: sql_help.c:938
msgid "and table_constraint_using_index is:"
msgstr "e vincolo_di_tabella_con_indice è:"
-#: sql_help.c:952 sql_help.c:955 sql_help.c:2127
+#: sql_help.c:956 sql_help.c:959 sql_help.c:2121
msgid "tablespace_option"
msgstr "opzione_tablespace"
-#: sql_help.c:976 sql_help.c:979 sql_help.c:985 sql_help.c:989
+#: sql_help.c:980 sql_help.c:983 sql_help.c:989 sql_help.c:993
msgid "token_type"
msgstr "tipo_di_token"
-#: sql_help.c:977 sql_help.c:980
+#: sql_help.c:981 sql_help.c:984
msgid "dictionary_name"
msgstr "nome_dizionario"
-#: sql_help.c:982 sql_help.c:986
+#: sql_help.c:986 sql_help.c:990
msgid "old_dictionary"
msgstr "vecchio_dizionario"
-#: sql_help.c:983 sql_help.c:987
+#: sql_help.c:987 sql_help.c:991
msgid "new_dictionary"
msgstr "nuovo_dizionario"
-#: sql_help.c:1074 sql_help.c:1084 sql_help.c:1087 sql_help.c:1088
-#: sql_help.c:2260
+#: sql_help.c:1078 sql_help.c:1088 sql_help.c:1091 sql_help.c:1092
+#: sql_help.c:2254
msgid "attribute_name"
msgstr "nome_attributo"
-#: sql_help.c:1075
+#: sql_help.c:1079
msgid "new_attribute_name"
msgstr "nuovo_nome_attributo"
-#: sql_help.c:1081
+#: sql_help.c:1085
msgid "new_enum_value"
msgstr "nuovo_valore_enum"
-#: sql_help.c:1082
+#: sql_help.c:1086
msgid "existing_enum_value"
msgstr "valore_enum_esistente"
-#: sql_help.c:1144 sql_help.c:1674 sql_help.c:1970 sql_help.c:2338
-#: sql_help.c:2719 sql_help.c:2883 sql_help.c:3162
+#: sql_help.c:1148 sql_help.c:1668 sql_help.c:1964 sql_help.c:2332
+#: sql_help.c:2703 sql_help.c:2867 sql_help.c:3146
msgid "server_name"
msgstr "nome_server"
-#: sql_help.c:1177 sql_help.c:1180 sql_help.c:2358
+#: sql_help.c:1176 sql_help.c:1179 sql_help.c:2347
msgid "view_option_name"
msgstr "nome_opzione_vista"
-#: sql_help.c:1178 sql_help.c:2359
+#: sql_help.c:1177 sql_help.c:2348
msgid "view_option_value"
msgstr "valore_opzione_vista"
-#: sql_help.c:1181 sql_help.c:2361
-msgid "where view_option_name can be one of:"
-msgstr "dove nome_opzione_vista può essere uno di:"
-
-#: sql_help.c:1182 sql_help.c:1398 sql_help.c:1399 sql_help.c:1402
-#: sql_help.c:2362 sql_help.c:2765 sql_help.c:2766 sql_help.c:2767
-#: sql_help.c:2768 sql_help.c:2769
-msgid "boolean"
-msgstr "booleano"
-
-#: sql_help.c:1183 sql_help.c:1331 sql_help.c:2363
-msgid "text"
-msgstr "testo"
-
-#: sql_help.c:1184 sql_help.c:2364
-msgid "local"
-msgstr "locale"
-
-#: sql_help.c:1185 sql_help.c:2365
-msgid "cascaded"
-msgstr "a_cascata"
-
-#: sql_help.c:1208 sql_help.c:3469 sql_help.c:3471 sql_help.c:3495
+#: sql_help.c:1202 sql_help.c:3453 sql_help.c:3455 sql_help.c:3479
msgid "transaction_mode"
msgstr "modalità_transazione"
-#: sql_help.c:1209 sql_help.c:3472 sql_help.c:3496
+#: sql_help.c:1203 sql_help.c:3456 sql_help.c:3480
msgid "where transaction_mode is one of:"
msgstr "dove modalità_transazione è una di:"
-#: sql_help.c:1289
+#: sql_help.c:1283
msgid "relation_name"
msgstr "nome_relazione"
-#: sql_help.c:1316
+#: sql_help.c:1310
msgid "rule_name"
msgstr "nome_ruolo"
-#: sql_help.c:1356 sql_help.c:3009 sql_help.c:3196
+#: sql_help.c:1325
+msgid "text"
+msgstr "testo"
+
+#: sql_help.c:1350 sql_help.c:2993 sql_help.c:3180
msgid "transaction_id"
msgstr "id_transazione"
-#: sql_help.c:1387 sql_help.c:1393 sql_help.c:2935
+#: sql_help.c:1381 sql_help.c:1387 sql_help.c:2919
msgid "filename"
msgstr "nome_file"
-#: sql_help.c:1388 sql_help.c:1394 sql_help.c:1921 sql_help.c:1922
-#: sql_help.c:1923
+#: sql_help.c:1382 sql_help.c:1388 sql_help.c:1915 sql_help.c:1916
+#: sql_help.c:1917
msgid "command"
msgstr "comando"
-#: sql_help.c:1392 sql_help.c:1808 sql_help.c:2113 sql_help.c:2360
-#: sql_help.c:2383 sql_help.c:2917
+#: sql_help.c:1386 sql_help.c:1802 sql_help.c:2107 sql_help.c:2349
+#: sql_help.c:2367 sql_help.c:2901
msgid "query"
msgstr "query"
-#: sql_help.c:1396 sql_help.c:2764
+#: sql_help.c:1390 sql_help.c:2748
msgid "where option can be one of:"
msgstr "dove opzione può essere una di:"
-#: sql_help.c:1397
+#: sql_help.c:1391
msgid "format_name"
msgstr "nome_formato"
-#: sql_help.c:1400
+#: sql_help.c:1392 sql_help.c:1393 sql_help.c:1396 sql_help.c:2749
+#: sql_help.c:2750 sql_help.c:2751 sql_help.c:2752 sql_help.c:2753
+msgid "boolean"
+msgstr "booleano"
+
+#: sql_help.c:1394
msgid "delimiter_character"
msgstr "carattere_delimitatore"
-#: sql_help.c:1401
+#: sql_help.c:1395
msgid "null_string"
msgstr "stringa_nulla"
-#: sql_help.c:1403
+#: sql_help.c:1397
msgid "quote_character"
msgstr "carattere_virgolette"
-#: sql_help.c:1404
+#: sql_help.c:1398
msgid "escape_character"
msgstr "carattere_di_escape"
-#: sql_help.c:1408
+#: sql_help.c:1402
msgid "encoding_name"
msgstr "nome_codifica"
-#: sql_help.c:1465 sql_help.c:1481 sql_help.c:1484
+#: sql_help.c:1459 sql_help.c:1475 sql_help.c:1478
msgid "arg_data_type"
msgstr "topo_dato_argomento"
-#: sql_help.c:1466 sql_help.c:1485 sql_help.c:1493 sql_help.c:1498
+#: sql_help.c:1460 sql_help.c:1479 sql_help.c:1487
msgid "sfunc"
msgstr "sfunz"
-#: sql_help.c:1467 sql_help.c:1486 sql_help.c:1494 sql_help.c:1500
+#: sql_help.c:1461 sql_help.c:1480 sql_help.c:1488
msgid "state_data_type"
msgstr "tipo_dato_stato"
-#: sql_help.c:1468 sql_help.c:1487 sql_help.c:1495 sql_help.c:1501
+#: sql_help.c:1462 sql_help.c:1481 sql_help.c:1489
msgid "state_data_size"
msgstr "dimensione_dato_stato"
-#: sql_help.c:1469 sql_help.c:1488 sql_help.c:1496 sql_help.c:1502
+#: sql_help.c:1463 sql_help.c:1482 sql_help.c:1490
msgid "ffunc"
msgstr "ffunz"
-#: sql_help.c:1470 sql_help.c:1489 sql_help.c:1497 sql_help.c:1503
+#: sql_help.c:1464 sql_help.c:1483 sql_help.c:1491
msgid "initial_condition"
msgstr "condizione_iniziale"
-#: sql_help.c:1471
+#: sql_help.c:1465 sql_help.c:1492
msgid "msfunc"
msgstr "msfunz"
-#: sql_help.c:1472
+#: sql_help.c:1466 sql_help.c:1493
msgid "minvfunc"
msgstr "minvfunz"
-#: sql_help.c:1473
+#: sql_help.c:1467 sql_help.c:1494
msgid "mstate_data_type"
msgstr "tipo_dato_mstato"
-#: sql_help.c:1474
+#: sql_help.c:1468 sql_help.c:1495
msgid "mstate_data_size"
msgstr "tipo_dato_mstato"
-#: sql_help.c:1475
+#: sql_help.c:1469 sql_help.c:1496
msgid "mffunc"
msgstr "mffunz"
-#: sql_help.c:1476
+#: sql_help.c:1470 sql_help.c:1497
msgid "minitial_condition"
msgstr "condizione_minima"
-#: sql_help.c:1477 sql_help.c:1504
+#: sql_help.c:1471 sql_help.c:1498
msgid "sort_operator"
msgstr "operatore_di_ordinamento"
-#: sql_help.c:1490
+#: sql_help.c:1484
msgid "or the old syntax"
msgstr "o la vecchia sintassi"
-#: sql_help.c:1492
+#: sql_help.c:1486
msgid "base_type"
msgstr "tipo_base"
-#: sql_help.c:1499
-msgid "invfunc"
-msgstr "invfunz"
-
-#: sql_help.c:1543
+#: sql_help.c:1537
msgid "locale"
msgstr "locale"
-#: sql_help.c:1544 sql_help.c:1578
+#: sql_help.c:1538 sql_help.c:1572
msgid "lc_collate"
msgstr "lc_collate"
-#: sql_help.c:1545 sql_help.c:1579
+#: sql_help.c:1539 sql_help.c:1573
msgid "lc_ctype"
msgstr "lc_ctype"
-#: sql_help.c:1547
+#: sql_help.c:1541
msgid "existing_collation"
msgstr "ordinamento_esistente"
-#: sql_help.c:1557
+#: sql_help.c:1551
msgid "source_encoding"
msgstr "codifica_origine"
-#: sql_help.c:1558
+#: sql_help.c:1552
msgid "dest_encoding"
msgstr "codifica_destinazione"
-#: sql_help.c:1576 sql_help.c:2153
+#: sql_help.c:1570 sql_help.c:2147
msgid "template"
msgstr "template"
-#: sql_help.c:1577
+#: sql_help.c:1571
msgid "encoding"
msgstr "codifica"
-#: sql_help.c:1602
+#: sql_help.c:1596
msgid "where constraint is:"
msgstr "dove vincolo di è:"
-#: sql_help.c:1616 sql_help.c:1918 sql_help.c:2209
+#: sql_help.c:1610 sql_help.c:1912 sql_help.c:2203
msgid "event"
msgstr "evento"
-#: sql_help.c:1617
+#: sql_help.c:1611
msgid "filter_variable"
msgstr "valiabile_filtro"
-#: sql_help.c:1629
+#: sql_help.c:1623
msgid "extension_name"
msgstr "nome_estensione"
-#: sql_help.c:1631
+#: sql_help.c:1625
msgid "version"
msgstr "versione"
-#: sql_help.c:1632
+#: sql_help.c:1626
msgid "old_version"
msgstr "vecchia_versione"
-#: sql_help.c:1677 sql_help.c:2059
+#: sql_help.c:1671 sql_help.c:2053
msgid "where column_constraint is:"
msgstr "dove vincolo_di_colonna è:"
-#: sql_help.c:1679 sql_help.c:1706 sql_help.c:2062
+#: sql_help.c:1673 sql_help.c:1700 sql_help.c:2056
msgid "default_expr"
msgstr "expr_default"
-#: sql_help.c:1707
+#: sql_help.c:1701
msgid "rettype"
msgstr "tipo_ritorno"
-#: sql_help.c:1709
+#: sql_help.c:1703
msgid "column_type"
msgstr "tipo_colonna"
-#: sql_help.c:1710 sql_help.c:2417 sql_help.c:2891 sql_help.c:3170
+#: sql_help.c:1704 sql_help.c:2401 sql_help.c:2875 sql_help.c:3154
msgid "lang_name"
msgstr "nome_linguaggio"
-#: sql_help.c:1716
+#: sql_help.c:1710
msgid "definition"
msgstr "definizione"
-#: sql_help.c:1717
+#: sql_help.c:1711
msgid "obj_file"
msgstr "file_obj"
-#: sql_help.c:1718
+#: sql_help.c:1712
msgid "link_symbol"
msgstr "simbolo_link"
-#: sql_help.c:1719
+#: sql_help.c:1713
msgid "attribute"
msgstr "attributo"
-#: sql_help.c:1754 sql_help.c:1903 sql_help.c:2327
+#: sql_help.c:1748 sql_help.c:1897 sql_help.c:2321
msgid "uid"
msgstr "uid"
-#: sql_help.c:1768
+#: sql_help.c:1762
msgid "method"
msgstr "metodo"
-#: sql_help.c:1772 sql_help.c:2094
+#: sql_help.c:1766 sql_help.c:2088
msgid "opclass"
msgstr "classe_op"
-#: sql_help.c:1776 sql_help.c:2080
+#: sql_help.c:1770 sql_help.c:2074
msgid "predicate"
msgstr "predicato"
-#: sql_help.c:1788
+#: sql_help.c:1782
msgid "call_handler"
msgstr "handler_chiamata"
-#: sql_help.c:1789
+#: sql_help.c:1783
msgid "inline_handler"
msgstr "handler_inline"
-#: sql_help.c:1790
+#: sql_help.c:1784
msgid "valfunction"
msgstr "funzione_valid"
-#: sql_help.c:1826
+#: sql_help.c:1820
msgid "com_op"
msgstr "com_op"
-#: sql_help.c:1827
+#: sql_help.c:1821
msgid "neg_op"
msgstr "neg_op"
-#: sql_help.c:1828
+#: sql_help.c:1822
msgid "res_proc"
msgstr "res_proc"
-#: sql_help.c:1829
+#: sql_help.c:1823
msgid "join_proc"
msgstr "proc_join"
-#: sql_help.c:1845
+#: sql_help.c:1839
msgid "family_name"
msgstr "nome_famiglia"
-#: sql_help.c:1856
+#: sql_help.c:1850
msgid "storage_type"
msgstr "tipo_memorizzazione"
-#: sql_help.c:1920 sql_help.c:2212 sql_help.c:2399 sql_help.c:3323
-#: sql_help.c:3325 sql_help.c:3402 sql_help.c:3404 sql_help.c:3541
-#: sql_help.c:3543 sql_help.c:3631 sql_help.c:3710 sql_help.c:3712
+#: sql_help.c:1914 sql_help.c:2206 sql_help.c:2383 sql_help.c:3307
+#: sql_help.c:3309 sql_help.c:3386 sql_help.c:3388 sql_help.c:3525
+#: sql_help.c:3527 sql_help.c:3615 sql_help.c:3694 sql_help.c:3696
msgid "condition"
msgstr "condizione"
-#: sql_help.c:1924 sql_help.c:2215
+#: sql_help.c:1918 sql_help.c:2209
msgid "where event can be one of:"
msgstr "dove evento può essere uno di:"
-#: sql_help.c:1937 sql_help.c:1939
+#: sql_help.c:1931 sql_help.c:1933
msgid "schema_element"
msgstr "elemento_di_schema"
-#: sql_help.c:1971
+#: sql_help.c:1965
msgid "server_type"
msgstr "tipo_di_server"
-#: sql_help.c:1972
+#: sql_help.c:1966
msgid "server_version"
msgstr "versione_server"
-#: sql_help.c:1973 sql_help.c:2881 sql_help.c:3160
+#: sql_help.c:1967 sql_help.c:2865 sql_help.c:3144
msgid "fdw_name"
msgstr "nome_fdw"
-#: sql_help.c:2045
+#: sql_help.c:2039
msgid "source_table"
msgstr "tabella_origine"
-#: sql_help.c:2046
+#: sql_help.c:2040
msgid "like_option"
msgstr "opzioni_di_like"
-#: sql_help.c:2063 sql_help.c:2064 sql_help.c:2073 sql_help.c:2075
-#: sql_help.c:2079
+#: sql_help.c:2057 sql_help.c:2058 sql_help.c:2067 sql_help.c:2069
+#: sql_help.c:2073
msgid "index_parameters"
msgstr "parametri_di_indice"
-#: sql_help.c:2065 sql_help.c:2082
+#: sql_help.c:2059 sql_help.c:2076
msgid "reftable"
msgstr "tabella_ref"
-#: sql_help.c:2066 sql_help.c:2083
+#: sql_help.c:2060 sql_help.c:2077
msgid "refcolumn"
msgstr "colonna_ref"
-#: sql_help.c:2069
+#: sql_help.c:2063
msgid "and table_constraint is:"
msgstr "e vincolo_di_tabella è:"
-#: sql_help.c:2077
+#: sql_help.c:2071
msgid "exclude_element"
msgstr "elemento_di_esclusione"
-#: sql_help.c:2078 sql_help.c:3330 sql_help.c:3409 sql_help.c:3548
-#: sql_help.c:3662 sql_help.c:3717
+#: sql_help.c:2072 sql_help.c:3314 sql_help.c:3393 sql_help.c:3532
+#: sql_help.c:3646 sql_help.c:3701
msgid "operator"
msgstr "operatore"
-#: sql_help.c:2086
+#: sql_help.c:2080
msgid "and like_option is:"
msgstr "e opzione_like è:"
-#: sql_help.c:2087
+#: sql_help.c:2081
msgid "index_parameters in UNIQUE, PRIMARY KEY, and EXCLUDE constraints are:"
msgstr "parametri_di_indice nei vincoli UNIQUE, PRIMARY KEY e EXCLUDE sono:"
-#: sql_help.c:2091
+#: sql_help.c:2085
msgid "exclude_element in an EXCLUDE constraint is:"
msgstr "elemento_di_esclusione in un vincolo EXCLUDE è:"
-#: sql_help.c:2126
+#: sql_help.c:2120
msgid "directory"
msgstr "directory"
-#: sql_help.c:2140
+#: sql_help.c:2134
msgid "parser_name"
msgstr "nome_parser"
-#: sql_help.c:2141
+#: sql_help.c:2135
msgid "source_config"
msgstr "config_origine"
-#: sql_help.c:2170
+#: sql_help.c:2164
msgid "start_function"
msgstr "funzione_inizio"
-#: sql_help.c:2171
+#: sql_help.c:2165
msgid "gettoken_function"
msgstr "funzione_gettoken"
-#: sql_help.c:2172
+#: sql_help.c:2166
msgid "end_function"
msgstr "funzione_fine"
-#: sql_help.c:2173
+#: sql_help.c:2167
msgid "lextypes_function"
msgstr "funzione_lextypes"
-#: sql_help.c:2174
+#: sql_help.c:2168
msgid "headline_function"
msgstr "funzione_headline"
-#: sql_help.c:2186
+#: sql_help.c:2180
msgid "init_function"
msgstr "funzione_init"
-#: sql_help.c:2187
+#: sql_help.c:2181
msgid "lexize_function"
msgstr "funzione_lexize"
-#: sql_help.c:2211
+#: sql_help.c:2205
msgid "referenced_table_name"
msgstr "nome_tabella_referenziata"
-#: sql_help.c:2214
+#: sql_help.c:2208
msgid "arguments"
msgstr "argomenti"
-#: sql_help.c:2264 sql_help.c:3268
+#: sql_help.c:2258 sql_help.c:3252
msgid "label"
msgstr "etichetta"
-#: sql_help.c:2266
+#: sql_help.c:2260
msgid "subtype"
msgstr "sottotipo"
-#: sql_help.c:2267
+#: sql_help.c:2261
msgid "subtype_operator_class"
msgstr "classe_operatore_sottotipo"
-#: sql_help.c:2269
+#: sql_help.c:2263
msgid "canonical_function"
msgstr "funzione_canonica"
-#: sql_help.c:2270
+#: sql_help.c:2264
msgid "subtype_diff_function"
msgstr "funzione_diff_sottotipo"
-#: sql_help.c:2272
+#: sql_help.c:2266
msgid "input_function"
msgstr "funzione_input"
-#: sql_help.c:2273
+#: sql_help.c:2267
msgid "output_function"
msgstr "funzione_output"
-#: sql_help.c:2274
+#: sql_help.c:2268
msgid "receive_function"
msgstr "funzione_receive"
-#: sql_help.c:2275
+#: sql_help.c:2269
msgid "send_function"
msgstr "funzione_send"
-#: sql_help.c:2276
+#: sql_help.c:2270
msgid "type_modifier_input_function"
msgstr "funzione_input_modificatore_tipo"
-#: sql_help.c:2277
+#: sql_help.c:2271
msgid "type_modifier_output_function"
msgstr "funzione_output_modificatore_tipo"
-#: sql_help.c:2278
+#: sql_help.c:2272
msgid "analyze_function"
msgstr "funzione_analyze"
-#: sql_help.c:2279
+#: sql_help.c:2273
msgid "internallength"
msgstr "lunghezza_interna"
-#: sql_help.c:2280
+#: sql_help.c:2274
msgid "alignment"
msgstr "allineamento"
-#: sql_help.c:2281
+#: sql_help.c:2275
msgid "storage"
msgstr "memorizzazione"
-#: sql_help.c:2282
+#: sql_help.c:2276
msgid "like_type"
msgstr "tipo_like"
-#: sql_help.c:2283
+#: sql_help.c:2277
msgid "category"
msgstr "categoria"
-#: sql_help.c:2284
+#: sql_help.c:2278
msgid "preferred"
msgstr "preferito"
-#: sql_help.c:2285
+#: sql_help.c:2279
msgid "default"
msgstr "predefinito"
-#: sql_help.c:2286
+#: sql_help.c:2280
msgid "element"
msgstr "elemento"
-#: sql_help.c:2287
+#: sql_help.c:2281
msgid "delimiter"
msgstr "delimitatore"
-#: sql_help.c:2288
+#: sql_help.c:2282
msgid "collatable"
msgstr "ordinabile"
-#: sql_help.c:2395 sql_help.c:2913 sql_help.c:3318 sql_help.c:3396
-#: sql_help.c:3536 sql_help.c:3623 sql_help.c:3705
+#: sql_help.c:2379 sql_help.c:2897 sql_help.c:3302 sql_help.c:3380
+#: sql_help.c:3520 sql_help.c:3607 sql_help.c:3689
msgid "with_query"
msgstr "query_with"
-#: sql_help.c:2397 sql_help.c:3337 sql_help.c:3340 sql_help.c:3343
-#: sql_help.c:3347 sql_help.c:3351 sql_help.c:3359 sql_help.c:3555
-#: sql_help.c:3558 sql_help.c:3561 sql_help.c:3565 sql_help.c:3569
-#: sql_help.c:3577 sql_help.c:3625 sql_help.c:3724 sql_help.c:3727
-#: sql_help.c:3730 sql_help.c:3734 sql_help.c:3738 sql_help.c:3746
+#: sql_help.c:2381 sql_help.c:3321 sql_help.c:3324 sql_help.c:3327
+#: sql_help.c:3331 sql_help.c:3335 sql_help.c:3343 sql_help.c:3539
+#: sql_help.c:3542 sql_help.c:3545 sql_help.c:3549 sql_help.c:3553
+#: sql_help.c:3561 sql_help.c:3609 sql_help.c:3708 sql_help.c:3711
+#: sql_help.c:3714 sql_help.c:3718 sql_help.c:3722 sql_help.c:3730
msgid "alias"
msgstr "alias"
-#: sql_help.c:2398
+#: sql_help.c:2382
msgid "using_list"
msgstr "lista_using"
-#: sql_help.c:2400 sql_help.c:2795 sql_help.c:2976 sql_help.c:3632
+#: sql_help.c:2384 sql_help.c:2779 sql_help.c:2960 sql_help.c:3616
msgid "cursor_name"
msgstr "nome_cursore"
-#: sql_help.c:2401 sql_help.c:2918 sql_help.c:3633
+#: sql_help.c:2385 sql_help.c:2902 sql_help.c:3617
msgid "output_expression"
msgstr "espressione_output"
-#: sql_help.c:2402 sql_help.c:2919 sql_help.c:3321 sql_help.c:3399
-#: sql_help.c:3539 sql_help.c:3634 sql_help.c:3708
+#: sql_help.c:2386 sql_help.c:2903 sql_help.c:3305 sql_help.c:3383
+#: sql_help.c:3523 sql_help.c:3618 sql_help.c:3692
msgid "output_name"
msgstr "nome_output"
-#: sql_help.c:2418
+#: sql_help.c:2402
msgid "code"
msgstr "codice"
-#: sql_help.c:2743
+#: sql_help.c:2727
msgid "parameter"
msgstr "parametro"
-#: sql_help.c:2762 sql_help.c:2763 sql_help.c:3001
+#: sql_help.c:2746 sql_help.c:2747 sql_help.c:2985
msgid "statement"
msgstr "istruzione"
-#: sql_help.c:2794 sql_help.c:2975
+#: sql_help.c:2778 sql_help.c:2959
msgid "direction"
msgstr "direzione"
-#: sql_help.c:2796 sql_help.c:2977
+#: sql_help.c:2780 sql_help.c:2961
msgid "where direction can be empty or one of:"
msgstr "dove direzione può essere vuota o una di:"
-#: sql_help.c:2797 sql_help.c:2798 sql_help.c:2799 sql_help.c:2800
-#: sql_help.c:2801 sql_help.c:2978 sql_help.c:2979 sql_help.c:2980
-#: sql_help.c:2981 sql_help.c:2982 sql_help.c:3331 sql_help.c:3333
-#: sql_help.c:3410 sql_help.c:3412 sql_help.c:3549 sql_help.c:3551
-#: sql_help.c:3663 sql_help.c:3665 sql_help.c:3718 sql_help.c:3720
+#: sql_help.c:2781 sql_help.c:2782 sql_help.c:2783 sql_help.c:2784
+#: sql_help.c:2785 sql_help.c:2962 sql_help.c:2963 sql_help.c:2964
+#: sql_help.c:2965 sql_help.c:2966 sql_help.c:3315 sql_help.c:3317
+#: sql_help.c:3394 sql_help.c:3396 sql_help.c:3533 sql_help.c:3535
+#: sql_help.c:3647 sql_help.c:3649 sql_help.c:3702 sql_help.c:3704
msgid "count"
msgstr "conteggio"
-#: sql_help.c:2874 sql_help.c:3153
+#: sql_help.c:2858 sql_help.c:3137
msgid "sequence_name"
msgstr "nome_sequenza"
-#: sql_help.c:2879 sql_help.c:3158
+#: sql_help.c:2863 sql_help.c:3142
msgid "domain_name"
msgstr "nome_dominio"
-#: sql_help.c:2887 sql_help.c:3166
+#: sql_help.c:2871 sql_help.c:3150
msgid "arg_name"
msgstr "nome_arg"
-#: sql_help.c:2888 sql_help.c:3167
+#: sql_help.c:2872 sql_help.c:3151
msgid "arg_type"
msgstr "tipo_arg"
-#: sql_help.c:2893 sql_help.c:3172
+#: sql_help.c:2877 sql_help.c:3156
msgid "loid"
msgstr "loid"
-#: sql_help.c:2927 sql_help.c:2990 sql_help.c:3609
+#: sql_help.c:2911 sql_help.c:2974 sql_help.c:3593
msgid "channel"
msgstr "canale"
-#: sql_help.c:2949
+#: sql_help.c:2933
msgid "lockmode"
msgstr "modalità_lock"
-#: sql_help.c:2950
+#: sql_help.c:2934
msgid "where lockmode is one of:"
msgstr "dove modalità_lock è una di:"
-#: sql_help.c:2991
+#: sql_help.c:2975
msgid "payload"
msgstr "payload"
-#: sql_help.c:3017
+#: sql_help.c:3001
msgid "old_role"
msgstr "vecchio_ruolo"
-#: sql_help.c:3018
+#: sql_help.c:3002
msgid "new_role"
msgstr "nuovo_ruolo"
-#: sql_help.c:3043 sql_help.c:3204 sql_help.c:3212
+#: sql_help.c:3027 sql_help.c:3188 sql_help.c:3196
msgid "savepoint_name"
msgstr "nome_punto_salvataggio"
-#: sql_help.c:3245
+#: sql_help.c:3229
msgid "provider"
msgstr "provider"
-#: sql_help.c:3322 sql_help.c:3361 sql_help.c:3363 sql_help.c:3401
-#: sql_help.c:3540 sql_help.c:3579 sql_help.c:3581 sql_help.c:3709
-#: sql_help.c:3748 sql_help.c:3750
+#: sql_help.c:3306 sql_help.c:3345 sql_help.c:3347 sql_help.c:3385
+#: sql_help.c:3524 sql_help.c:3563 sql_help.c:3565 sql_help.c:3693
+#: sql_help.c:3732 sql_help.c:3734
msgid "from_item"
msgstr "elemento_from"
-#: sql_help.c:3326 sql_help.c:3405 sql_help.c:3544 sql_help.c:3713
+#: sql_help.c:3310 sql_help.c:3389 sql_help.c:3528 sql_help.c:3697
msgid "window_name"
msgstr "nome_finestra"
-#: sql_help.c:3327 sql_help.c:3406 sql_help.c:3545 sql_help.c:3714
+#: sql_help.c:3311 sql_help.c:3390 sql_help.c:3529 sql_help.c:3698
msgid "window_definition"
msgstr "definizione_finestra"
-#: sql_help.c:3328 sql_help.c:3339 sql_help.c:3369 sql_help.c:3407
-#: sql_help.c:3546 sql_help.c:3557 sql_help.c:3587 sql_help.c:3715
-#: sql_help.c:3726 sql_help.c:3756
+#: sql_help.c:3312 sql_help.c:3323 sql_help.c:3353 sql_help.c:3391
+#: sql_help.c:3530 sql_help.c:3541 sql_help.c:3571 sql_help.c:3699
+#: sql_help.c:3710 sql_help.c:3740
msgid "select"
msgstr "select"
-#: sql_help.c:3335 sql_help.c:3553 sql_help.c:3722
+#: sql_help.c:3319 sql_help.c:3537 sql_help.c:3706
msgid "where from_item can be one of:"
msgstr "dove from_item può essere uno di:"
-#: sql_help.c:3338 sql_help.c:3341 sql_help.c:3344 sql_help.c:3348
-#: sql_help.c:3360 sql_help.c:3556 sql_help.c:3559 sql_help.c:3562
-#: sql_help.c:3566 sql_help.c:3578 sql_help.c:3725 sql_help.c:3728
-#: sql_help.c:3731 sql_help.c:3735 sql_help.c:3747
+#: sql_help.c:3322 sql_help.c:3325 sql_help.c:3328 sql_help.c:3332
+#: sql_help.c:3344 sql_help.c:3540 sql_help.c:3543 sql_help.c:3546
+#: sql_help.c:3550 sql_help.c:3562 sql_help.c:3709 sql_help.c:3712
+#: sql_help.c:3715 sql_help.c:3719 sql_help.c:3731
msgid "column_alias"
msgstr "alias_colonna"
-#: sql_help.c:3342 sql_help.c:3367 sql_help.c:3560 sql_help.c:3585
-#: sql_help.c:3729 sql_help.c:3754
+#: sql_help.c:3326 sql_help.c:3351 sql_help.c:3544 sql_help.c:3569
+#: sql_help.c:3713 sql_help.c:3738
msgid "with_query_name"
msgstr "nome_query_with"
-#: sql_help.c:3346 sql_help.c:3350 sql_help.c:3354 sql_help.c:3357
-#: sql_help.c:3564 sql_help.c:3568 sql_help.c:3572 sql_help.c:3575
-#: sql_help.c:3733 sql_help.c:3737 sql_help.c:3741 sql_help.c:3744
+#: sql_help.c:3330 sql_help.c:3334 sql_help.c:3338 sql_help.c:3341
+#: sql_help.c:3548 sql_help.c:3552 sql_help.c:3556 sql_help.c:3559
+#: sql_help.c:3717 sql_help.c:3721 sql_help.c:3725 sql_help.c:3728
msgid "argument"
msgstr "argomento"
-#: sql_help.c:3352 sql_help.c:3355 sql_help.c:3358 sql_help.c:3570
-#: sql_help.c:3573 sql_help.c:3576 sql_help.c:3739 sql_help.c:3742
-#: sql_help.c:3745
+#: sql_help.c:3336 sql_help.c:3339 sql_help.c:3342 sql_help.c:3554
+#: sql_help.c:3557 sql_help.c:3560 sql_help.c:3723 sql_help.c:3726
+#: sql_help.c:3729
msgid "column_definition"
msgstr "definizione_colonna"
-#: sql_help.c:3362 sql_help.c:3580 sql_help.c:3749
+#: sql_help.c:3346 sql_help.c:3564 sql_help.c:3733
msgid "join_type"
msgstr "tipo_join"
-#: sql_help.c:3364 sql_help.c:3582 sql_help.c:3751
+#: sql_help.c:3348 sql_help.c:3566 sql_help.c:3735
msgid "join_condition"
msgstr "condizione_join"
-#: sql_help.c:3365 sql_help.c:3583 sql_help.c:3752
+#: sql_help.c:3349 sql_help.c:3567 sql_help.c:3736
msgid "join_column"
msgstr "colonna_join"
-#: sql_help.c:3366 sql_help.c:3584 sql_help.c:3753
+#: sql_help.c:3350 sql_help.c:3568 sql_help.c:3737
msgid "and with_query is:"
msgstr "e with_query è:"
-#: sql_help.c:3370 sql_help.c:3588 sql_help.c:3757
+#: sql_help.c:3354 sql_help.c:3572 sql_help.c:3741
msgid "values"
msgstr "valori"
-#: sql_help.c:3371 sql_help.c:3589 sql_help.c:3758
+#: sql_help.c:3355 sql_help.c:3573 sql_help.c:3742
msgid "insert"
msgstr "insert"
-#: sql_help.c:3372 sql_help.c:3590 sql_help.c:3759
+#: sql_help.c:3356 sql_help.c:3574 sql_help.c:3743
msgid "update"
msgstr "update"
-#: sql_help.c:3373 sql_help.c:3591 sql_help.c:3760
+#: sql_help.c:3357 sql_help.c:3575 sql_help.c:3744
msgid "delete"
msgstr "delete"
-#: sql_help.c:3400
+#: sql_help.c:3384
msgid "new_table"
msgstr "nuova_tabella"
-#: sql_help.c:3425
+#: sql_help.c:3409
msgid "timezone"
msgstr "timezone"
-#: sql_help.c:3470
+#: sql_help.c:3454
msgid "snapshot_id"
msgstr "id_snapshot"
-#: sql_help.c:3630
+#: sql_help.c:3614
msgid "from_list"
msgstr "lista_from"
-#: sql_help.c:3661
+#: sql_help.c:3645
msgid "sort_expression"
msgstr "espressione_ordinamento"
@@ -4000,8 +3972,8 @@ msgid "change the definition of a table"
msgstr "cambia la definizione di una tabella"
#: sql_help.h:326
-msgid "change the definition of a tablespace or affect objects of a tablespace"
-msgstr "cambia la definizione di un tablespace o modifica gli oggetti di un tablespace"
+msgid "change the definition of a tablespace"
+msgstr "cambia la definizione di un tablespace"
#: sql_help.h:331
msgid "change the definition of a text search configuration"
@@ -4540,7 +4512,7 @@ msgstr "%s: attenzione: parametro in eccesso \"%s\" nella riga di comando ignora
msgid "%s: could not find own program executable\n"
msgstr "%s: il proprio programma eseguibile non è stato trovato\n"
-#: tab-complete.c:4085
+#: tab-complete.c:4110
#, c-format
msgid ""
"tab completion query failed: %s\n"
diff --git a/src/bin/psql/po/zh_CN.po b/src/bin/psql/po/zh_CN.po
index 58c6550048c..6612239a93c 100644
--- a/src/bin/psql/po/zh_CN.po
+++ b/src/bin/psql/po/zh_CN.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: psql (PostgreSQL 9.0)\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2013-09-02 00:25+0000\n"
-"PO-Revision-Date: 2013-09-02 16:48+0800\n"
+"POT-Creation-Date: 2014-11-22 21:11+0000\n"
+"PO-Revision-Date: 2014-11-28 16:08+0800\n"
"Last-Translator: Xiong He <iihero@qq.com>\n"
"Language-Team: Chinese (Simplified)\n"
"Language: zh_CN\n"
@@ -15,140 +15,151 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Poedit 1.5.4\n"
-# command.c:681
-# common.c:85
-# common.c:99
-# mainloop.c:71
-#: ../../common/fe_memutils.c:33 ../../common/fe_memutils.c:60
-#: ../../common/fe_memutils.c:83 command.c:1130 input.c:204 mainloop.c:72
-#: mainloop.c:234 tab-complete.c:3827
-#, c-format
-msgid "out of memory\n"
-msgstr "记忆体用尽\n"
-
-# common.c:78
-#: ../../common/fe_memutils.c:77
-#, c-format
-#| msgid "pg_strdup: cannot duplicate null pointer (internal error)\n"
-msgid "cannot duplicate null pointer (internal error)\n"
-msgstr "无法复制空指针 (内部错误)\n"
-
# command.c:240
-#: ../../port/exec.c:127 ../../port/exec.c:241 ../../port/exec.c:284
+#: ../../common/exec.c:127 ../../common/exec.c:241 ../../common/exec.c:284
#, c-format
msgid "could not identify current directory: %s"
-msgstr "无法识别目前的目录:%s"
+msgstr "无法识别目前目录:%s"
# command.c:122
-#: ../../port/exec.c:146
+#: ../../common/exec.c:146
#, c-format
msgid "invalid binary \"%s\""
msgstr "无效的二进制码 \"%s\""
# command.c:1103
-#: ../../port/exec.c:195
+#: ../../common/exec.c:195
#, c-format
msgid "could not read binary \"%s\""
msgstr "无法读取二进制码 \"%s\""
-#: ../../port/exec.c:202
+#: ../../common/exec.c:202
#, c-format
msgid "could not find a \"%s\" to execute"
msgstr "未能找到一个 \"%s\" 来执行"
-#: ../../port/exec.c:257 ../../port/exec.c:293
+#: ../../common/exec.c:257 ../../common/exec.c:293
#, c-format
-#| msgid "could not change directory to \"%s\": %m"
msgid "could not change directory to \"%s\": %s"
msgstr "无法跳转到目录 \"%s\" 中: %s"
# command.c:1103
-#: ../../port/exec.c:272
+#: ../../common/exec.c:272
#, c-format
msgid "could not read symbolic link \"%s\""
msgstr "无法读取符号连结 \"%s\""
-#: ../../port/exec.c:523
+#: ../../common/exec.c:523
#, c-format
-#| msgid "query failed: %s"
msgid "pclose failed: %s"
msgstr "pclose调用失败: %s"
-#: ../../port/wait_error.c:47
+# command.c:681
+# common.c:85
+# common.c:99
+# mainloop.c:71
+#: ../../common/fe_memutils.c:33 ../../common/fe_memutils.c:60
+#: ../../common/fe_memutils.c:83 input.c:205 mainloop.c:72 mainloop.c:234
+#, c-format
+msgid "out of memory\n"
+msgstr "记忆体用尽\n"
+
+# common.c:78
+#: ../../common/fe_memutils.c:77
+#, c-format
+msgid "cannot duplicate null pointer (internal error)\n"
+msgstr "无法复制空指针 (内部错误)\n"
+
+#: ../../common/username.c:45
+#, c-format
+#| msgid "could not load private key file \"%s\": %s"
+msgid "could not look up effective user ID %ld: %s"
+msgstr "无法找到有效的用户ID %ld: %s"
+
+#: ../../common/username.c:47 command.c:276
+#| msgid "server \"%s\" does not exist"
+msgid "user does not exist"
+msgstr "用户不存在"
+
+#: ../../common/username.c:61
+#, c-format
+msgid "user name lookup failure: %s"
+msgstr "用户名查找失败: %s"
+
+#: ../../common/wait_error.c:47
#, c-format
-#| msgid "could not execute plan"
msgid "command not executable"
msgstr "无法执行命令"
-#: ../../port/wait_error.c:51
+#: ../../common/wait_error.c:51
#, c-format
-#| msgid "case not found"
msgid "command not found"
msgstr "没有找到命令"
-#: ../../port/wait_error.c:56
+#: ../../common/wait_error.c:56
#, c-format
msgid "child process exited with exit code %d"
msgstr "子进程结束,结束代码 %d"
-#: ../../port/wait_error.c:63
+#: ../../common/wait_error.c:63
#, c-format
msgid "child process was terminated by exception 0x%X"
msgstr "子进程被例外(exception) 0x%X 终止"
-#: ../../port/wait_error.c:73
+#: ../../common/wait_error.c:73
#, c-format
msgid "child process was terminated by signal %s"
msgstr "子进程被信号 %s 终止"
-#: ../../port/wait_error.c:77
+#: ../../common/wait_error.c:77
#, c-format
msgid "child process was terminated by signal %d"
msgstr "子进程被信号 %d 终止"
-#: ../../port/wait_error.c:82
+#: ../../common/wait_error.c:82
#, c-format
msgid "child process exited with unrecognized status %d"
msgstr "子进程结束,不明状态代码 %d"
# command.c:120
-#: command.c:115
+#: command.c:117
#, c-format
msgid "Invalid command \\%s. Try \\? for help.\n"
msgstr "无效的命令 \\%s,用 \\? 显示说明。\n"
# command.c:122
-#: command.c:117
+#: command.c:119
#, c-format
msgid "invalid command \\%s\n"
msgstr "无效的命令 \\%s\n"
# command.c:131
-#: command.c:128
+#: command.c:130
#, c-format
msgid "\\%s: extra argument \"%s\" ignored\n"
msgstr "\\%s:忽略多余的参数 \"%s\" \n"
# command.c:240
-#: command.c:270
+#: command.c:274
#, c-format
-msgid "could not get home directory: %s\n"
-msgstr "无法取得 home 目录:%s\n"
+#| msgid "could not get home directory: %s\n"
+msgid "could not get home directory for user ID %ld: %s\n"
+msgstr "无法得到用户ID %ld: %s对应的home 目录\n"
# command.c:256
-#: command.c:286
+#: command.c:292
#, c-format
msgid "\\%s: could not change directory to \"%s\": %s\n"
msgstr "\\%s: 无法切换目录至 \"%s\": %s\n"
# common.c:636
# common.c:871
-#: command.c:307 common.c:446 common.c:851
+#: command.c:308 common.c:446 common.c:886
#, c-format
msgid "You are currently not connected to a database.\n"
msgstr "你目前没有与资料库连线。\n"
-#: command.c:314
+#: command.c:315
#, c-format
msgid ""
"You are connected to database \"%s\" as user \"%s\" via socket in \"%s\" at "
@@ -157,7 +168,7 @@ msgstr ""
"以用户 \"%2$s\" 的身份,通过套接字\"%3$s\"在端口\"%4$s\"连接到数据库 \"%1$s"
"\"\n"
-#: command.c:317
+#: command.c:318
#, c-format
msgid ""
"You are connected to database \"%s\" as user \"%s\" on host \"%s\" at port "
@@ -167,28 +178,28 @@ msgstr ""
# command.c:370
# command.c:760
-#: command.c:516 command.c:586 command.c:1382
+#: command.c:517 command.c:587 command.c:1382
#, c-format
msgid "no query buffer\n"
msgstr "没有查询缓存区\n"
-#: command.c:549 command.c:2826
+#: command.c:550 command.c:2978
#, c-format
msgid "invalid line number: %s\n"
msgstr "无效行号: %s\n"
# describe.c:117
-#: command.c:580
+#: command.c:581
#, c-format
msgid "The server (version %d.%d) does not support editing function source.\n"
msgstr "服务器(版本%d.%d)不支持编辑函数源码.\n"
-#: command.c:660
+#: command.c:661
msgid "No changes"
msgstr "没有发生"
# command.c:433
-#: command.c:714
+#: command.c:715
#, c-format
msgid "%s: invalid encoding name or conversion procedure not found\n"
msgstr "%s:无效的编码名称或找不到转换程序\n"
@@ -200,14 +211,14 @@ msgstr "%s:无效的编码名称或找不到转换程序\n"
# command.c:612
# command.c:740
# command.c:771
-#: command.c:810 command.c:860 command.c:874 command.c:891 command.c:998
-#: command.c:1048 command.c:1158 command.c:1362 command.c:1393
+#: command.c:812 command.c:862 command.c:876 command.c:893 command.c:1000
+#: command.c:1159 command.c:1362 command.c:1393
#, c-format
msgid "\\%s: missing required argument\n"
msgstr "\\%s:缺少所需参数\n"
# command.c:598
-#: command.c:923
+#: command.c:925
msgid "Query buffer is empty."
msgstr "查询缓存区是空的。"
@@ -215,42 +226,43 @@ msgstr "查询缓存区是空的。"
# command.c:939
# startup.c:187
# startup.c:205
-#: command.c:933
+#: command.c:935
msgid "Enter new password: "
msgstr "输入新的密码:"
-#: command.c:934
+#: command.c:936
msgid "Enter it again: "
msgstr "再次键入:"
-#: command.c:938
+#: command.c:940
#, c-format
msgid "Passwords didn't match.\n"
msgstr "Passwords didn't match.\n"
-#: command.c:956
+#: command.c:958
#, c-format
msgid "Password encryption failed.\n"
msgstr "密码加密失败.\n"
# startup.c:502
-#: command.c:1027 command.c:1139 command.c:1367
+#: command.c:1029 command.c:1140 command.c:1367
#, c-format
msgid "\\%s: error while setting variable\n"
msgstr "\\%s: 设定变量值时出错\n"
# command.c:632
-#: command.c:1068
+#: command.c:1087
msgid "Query buffer reset (cleared)."
msgstr "查询缓存区重置(清空)。"
# command.c:646
-#: command.c:1092
+#: command.c:1099
#, c-format
-msgid "Wrote history to file \"%s/%s\".\n"
-msgstr "书写历程到档案 \"%s/%s\".\n"
+#| msgid "Wrote history to file \"%s/%s\".\n"
+msgid "Wrote history to file \"%s\".\n"
+msgstr "写入历史到文件 \"%s\".\n"
-#: command.c:1163
+#: command.c:1164
#, c-format
msgid "\\%s: environment variable name must not contain \"=\"\n"
msgstr "\\%s: 环境变量不能包含 \"=\"\n"
@@ -290,10 +302,10 @@ msgstr "停止计时功能."
# common.c:170
# copy.c:530
# copy.c:575
-#: command.c:1410 command.c:1430 command.c:2027 command.c:2034 command.c:2043
-#: command.c:2053 command.c:2062 command.c:2076 command.c:2093 command.c:2152
-#: common.c:74 copy.c:342 copy.c:395 copy.c:410 psqlscan.l:1674
-#: psqlscan.l:1685 psqlscan.l:1695
+#: command.c:1410 command.c:1430 command.c:2018 command.c:2021 command.c:2024
+#: command.c:2030 command.c:2032 command.c:2040 command.c:2050 command.c:2059
+#: command.c:2073 command.c:2090 command.c:2149 common.c:74 copy.c:333
+#: copy.c:393 copy.c:408 psqlscan.l:1677 psqlscan.l:1688 psqlscan.l:1698
#, c-format
msgid "%s: %s\n"
msgstr "%s: %s\n"
@@ -307,7 +319,7 @@ msgstr "+ opt(%d) = |%s|\n"
# command.c:939
# startup.c:187
# startup.c:205
-#: command.c:1535 startup.c:185
+#: command.c:1535 startup.c:184
msgid "Password: "
msgstr "口令:"
@@ -315,12 +327,12 @@ msgstr "口令:"
# command.c:939
# startup.c:187
# startup.c:205
-#: command.c:1542 startup.c:188 startup.c:190
+#: command.c:1540 startup.c:186
#, c-format
msgid "Password for user %s: "
msgstr "用户 %s 的口令:"
-#: command.c:1587
+#: command.c:1585
#, c-format
msgid ""
"All connection parameters must be supplied because no database connection "
@@ -332,27 +344,27 @@ msgstr "没有可用的数据库连接,所以必须提供所有的连接参数
# common.c:605
# common.c:660
# common.c:903
-#: command.c:1673 command.c:2860 common.c:120 common.c:413 common.c:478
-#: common.c:894 common.c:919 common.c:1016 copy.c:504 copy.c:691
-#: large_obj.c:158 large_obj.c:193 large_obj.c:255 psqlscan.l:1946
+#: command.c:1671 command.c:3012 common.c:120 common.c:413 common.c:478
+#: common.c:929 common.c:954 common.c:1051 copy.c:492 copy.c:695
+#: large_obj.c:158 large_obj.c:193 large_obj.c:255 psqlscan.l:1949
#, c-format
msgid "%s"
msgstr "%s"
# command.c:957
-#: command.c:1677
+#: command.c:1675
#, c-format
msgid "Previous connection kept\n"
msgstr "保留上一次连线\n"
# command.c:969
-#: command.c:1681
+#: command.c:1679
#, c-format
msgid "\\connect: %s"
msgstr "\\连线:%s"
# command.c:981
-#: command.c:1714
+#: command.c:1712
#, c-format
msgid ""
"You are now connected to database \"%s\" as user \"%s\" via socket in \"%s\" "
@@ -362,7 +374,7 @@ msgstr ""
"\".\n"
# command.c:981
-#: command.c:1717
+#: command.c:1715
#, c-format
msgid ""
"You are now connected to database \"%s\" as user \"%s\" on host \"%s\" at "
@@ -371,21 +383,18 @@ msgstr ""
"您现在已经连线到数据库 \"%s\", 用户 \"%s\",主机 \"%s\",端口号 \"%s\".\n"
# command.c:981
-#: command.c:1721
+#: command.c:1719
#, c-format
msgid "You are now connected to database \"%s\" as user \"%s\".\n"
msgstr "您现在已经连线到数据库 \"%s\",用户 \"%s\".\n"
-#: command.c:1755
+#: command.c:1753
#, c-format
msgid "%s (%s, server %s)\n"
msgstr "%s (%s, 服务器 %s)\n"
-#: command.c:1763
+#: command.c:1761
#, c-format
-#| msgid ""
-#| "WARNING: %s version %d.%d, server version %d.%d.\n"
-#| " Some psql features might not work.\n"
msgid ""
"WARNING: %s major version %d.%d, server major version %d.%d.\n"
" Some psql features might not work.\n"
@@ -394,18 +403,29 @@ msgstr ""
" 一些psql功能可能无法工作.\n"
# startup.c:652
-#: command.c:1793
+#: command.c:1791
#, c-format
-msgid "SSL connection (cipher: %s, bits: %d)\n"
-msgstr "SSL连接 (加密:%s,二进制位: %d)\n"
+#| msgid "SSL connection (cipher: %s, bits: %d)\n"
+msgid "SSL connection (protocol: %s, cipher: %s, bits: %d, compression: %s)\n"
+msgstr "SSL连接 (协议: %s, 加密:%s,二进制位: %d, 压缩比: %s)\n"
+
+# help.c:48
+#: command.c:1793 help.c:46
+msgid "off"
+msgstr "关闭"
+
+# help.c:48
+#: command.c:1793 help.c:46
+msgid "on"
+msgstr "开启"
# startup.c:652
-#: command.c:1803
+#: command.c:1802
#, c-format
msgid "SSL connection (unknown cipher)\n"
msgstr "SSL连接 (未知加密)\n"
-#: command.c:1824
+#: command.c:1823
#, c-format
msgid ""
"WARNING: Console code page (%u) differs from Windows code page (%u)\n"
@@ -416,7 +436,7 @@ msgstr ""
" 8-bit 字元可能无法正常工作。查阅 psql 参考\n"
" 页 \"Windows 用户注意事项\" 的详细说明。\n"
-#: command.c:1908
+#: command.c:1907
#, c-format
msgid ""
"environment variable PSQL_EDITOR_LINENUMBER_ARG must be set to specify a "
@@ -424,31 +444,31 @@ msgid ""
msgstr "必须设置环境变量 PSQL_EDITOR_LINENUMBER_ARG,用于指定行号\n"
# command.c:1103
-#: command.c:1945
+#: command.c:1936
#, c-format
msgid "could not start editor \"%s\"\n"
msgstr "无法启动编辑器 \"%s\"\n"
# command.c:1105
-#: command.c:1947
+#: command.c:1938
#, c-format
msgid "could not start /bin/sh\n"
msgstr "无法启动 /bin/sh\n"
# command.c:1148
-#: command.c:1985
+#: command.c:1976
#, c-format
msgid "could not locate temporary directory: %s\n"
msgstr "找不到暂存目录:%s\n"
# command.c:1148
-#: command.c:2012
+#: command.c:2003
#, c-format
msgid "could not open temporary file \"%s\": %s\n"
msgstr "无法开启暂存档 \"%s\": %s\n"
# command.c:1340
-#: command.c:2274
+#: command.c:2271
#, c-format
msgid ""
"\\pset: allowed formats are unaligned, aligned, wrapped, html, latex, troff-"
@@ -456,186 +476,211 @@ msgid ""
msgstr ""
"\\pset:可以使用的格式有unaligned, aligned, wrapped, html, latex, troff-ms\n"
-# command.c:1345
-#: command.c:2279
-#, c-format
-msgid "Output format is %s.\n"
-msgstr "输出格式是 %s。\n"
-
-#: command.c:2295
+#: command.c:2290
#, c-format
msgid "\\pset: allowed line styles are ascii, old-ascii, unicode\n"
msgstr "\\pset: 所允许使用的文本风格是ASCII, OLD-ASCII, UNICODE\n"
-# command.c:1355
-#: command.c:2300
+# command.c:1493
+#: command.c:2432 command.c:2583
#, c-format
-msgid "Line style is %s.\n"
-msgstr "文本的风格是%s. \n"
+msgid "\\pset: unknown option: %s\n"
+msgstr "\\pset: 不明选项: %s\n"
# command.c:1355
-#: command.c:2311
+#: command.c:2450
#, c-format
msgid "Border style is %d.\n"
msgstr "边界风格是 %d。\n"
+#: command.c:2456
+#, c-format
+#| msgid "Target width is %d.\n"
+msgid "Target width is unset.\n"
+msgstr "目标宽度未设置.\n"
+
+#: command.c:2458
+#, c-format
+msgid "Target width is %d.\n"
+msgstr "目标宽度为 %d.\n"
+
# command.c:1364
-#: command.c:2326
+#: command.c:2465
#, c-format
msgid "Expanded display is on.\n"
msgstr "扩展显示已打开。\n"
# command.c:1364
-#: command.c:2328
+#: command.c:2467
#, c-format
msgid "Expanded display is used automatically.\n"
msgstr "扩展显示已自动打开。\n"
# command.c:1365
-#: command.c:2330
+#: command.c:2469
#, c-format
msgid "Expanded display is off.\n"
msgstr "扩展显示已关闭。\n"
-#: command.c:2344
-msgid "Showing locale-adjusted numeric output."
-msgstr "显示语言环境调整后的数字输出。"
+# command.c:1389
+#: command.c:2476 command.c:2484
+#, c-format
+msgid "Field separator is zero byte.\n"
+msgstr "栏位分隔符号是0字节\n"
+
+# command.c:1389
+#: command.c:2478
+#, c-format
+msgid "Field separator is \"%s\".\n"
+msgstr "栏位分隔符号是 \"%s\"。\n"
+
+# command.c:1485
+#: command.c:2491
+#, c-format
+#| msgid "Default footer is on."
+msgid "Default footer is on.\n"
+msgstr "打开预设步进器(Footer).\n"
+
+# command.c:1487
+#: command.c:2493
+#, c-format
+#| msgid "Default footer is off."
+msgid "Default footer is off.\n"
+msgstr "关闭预设步进器(Footer)。\n"
-#: command.c:2346
-msgid "Locale-adjusted numeric output is off."
-msgstr "语言环境调整后的数值输出关闭。"
+# command.c:1345
+#: command.c:2499
+#, c-format
+msgid "Output format is %s.\n"
+msgstr "输出格式是 %s。\n"
+
+# command.c:1355
+#: command.c:2505
+#, c-format
+msgid "Line style is %s.\n"
+msgstr "文本的风格是%s. \n"
# command.c:1377
-#: command.c:2359
+#: command.c:2512
#, c-format
msgid "Null display is \"%s\".\n"
msgstr " \"%s\" 是空值显示。\n"
-# command.c:1389
-#: command.c:2374 command.c:2386
+#: command.c:2520
#, c-format
-msgid "Field separator is zero byte.\n"
-msgstr "栏位分隔符号是0字节\n"
+#| msgid "Locale-adjusted numeric output is off."
+msgid "Locale-adjusted numeric output is on.\n"
+msgstr "语言环境调整后的数值输出开启。\n"
-# command.c:1389
-#: command.c:2376
+#: command.c:2522
#, c-format
-msgid "Field separator is \"%s\".\n"
-msgstr "栏位分隔符号是 \"%s\"。\n"
+#| msgid "Locale-adjusted numeric output is off."
+msgid "Locale-adjusted numeric output is off.\n"
+msgstr "语言环境调整后的数值输出关闭。\n"
+
+# command.c:1470
+#: command.c:2529
+#, c-format
+#| msgid "Pager is used for long output."
+msgid "Pager is used for long output.\n"
+msgstr "显示大量资料时使用分页器。\n"
+
+# command.c:1472
+#: command.c:2531
+#, c-format
+#| msgid "Pager is always used."
+msgid "Pager is always used.\n"
+msgstr "总是使用分页器。\n"
+
+# command.c:1474
+#: command.c:2533
+#, c-format
+#| msgid "Pager usage is off."
+msgid "Pager usage is off.\n"
+msgstr "不使用分页器。\n"
# command.c:1405
-#: command.c:2401 command.c:2415
+#: command.c:2540 command.c:2550
#, c-format
msgid "Record separator is zero byte.\n"
msgstr "记录分隔符号是 0字节。\n"
# command.c:1403
-#: command.c:2403
+#: command.c:2542
#, c-format
-msgid "Record separator is <newline>."
-msgstr "记录分隔符号是 <newline>。"
+#| msgid "Record separator is <newline>."
+msgid "Record separator is <newline>.\n"
+msgstr "记录分隔符号是 <newline>。\n"
# command.c:1405
-#: command.c:2405
+#: command.c:2544
#, c-format
msgid "Record separator is \"%s\".\n"
msgstr "记录分隔符号是 \"%s\"。\n"
-# command.c:1416
-#: command.c:2428
-msgid "Showing only tuples."
-msgstr "只显示 Tuples。"
+# command.c:1452
+#: command.c:2557
+#, c-format
+#| msgid "Table attribute is \"%s\".\n"
+msgid "Table attributes are \"%s\".\n"
+msgstr "表属性是 \"%s\".\n"
-# command.c:1418
-#: command.c:2430
-msgid "Tuples only is off."
-msgstr "关闭只显示 Tuples。"
+# command.c:1454
+#: command.c:2560
+#, c-format
+msgid "Table attributes unset.\n"
+msgstr "未设置资料表属性。\n"
# command.c:1434
-#: command.c:2446
+#: command.c:2567
#, c-format
msgid "Title is \"%s\".\n"
msgstr "标题是 \"%s\"。\n"
# command.c:1436
-#: command.c:2448
+#: command.c:2569
#, c-format
msgid "Title is unset.\n"
msgstr "无标题。\n"
-# command.c:1452
-#: command.c:2464
-#, c-format
-msgid "Table attribute is \"%s\".\n"
-msgstr "资料表属性是 \"%s\"。\n"
-
-# command.c:1454
-#: command.c:2466
-#, c-format
-msgid "Table attributes unset.\n"
-msgstr "未设置资料表属性。\n"
-
-# command.c:1470
-#: command.c:2487
-msgid "Pager is used for long output."
-msgstr "显示大量资料时使用分页器。"
-
-# command.c:1472
-#: command.c:2489
-msgid "Pager is always used."
-msgstr "总是使用分页器。"
-
-# command.c:1474
-#: command.c:2491
-msgid "Pager usage is off."
-msgstr "不使用分页器。"
-
-# command.c:1485
-#: command.c:2505
-msgid "Default footer is on."
-msgstr "打开预设步进器(Footer)。"
-
-# command.c:1487
-#: command.c:2507
-msgid "Default footer is off."
-msgstr "关闭预设步进器(Footer)。"
-
-#: command.c:2518
+# command.c:1418
+#: command.c:2576
#, c-format
-msgid "Target width is %d.\n"
-msgstr "目标宽度为 %d.\n"
+#| msgid "Tuples only is off."
+msgid "Tuples only is on.\n"
+msgstr "开启只显示 Tuples。\n"
-# command.c:1493
-#: command.c:2523
+# command.c:1418
+#: command.c:2578
#, c-format
-msgid "\\pset: unknown option: %s\n"
-msgstr "\\pset: 不明选项: %s\n"
+#| msgid "Tuples only is off."
+msgid "Tuples only is off.\n"
+msgstr "关闭只显示 Tuples。\n"
# command.c:1532
-#: command.c:2577
+#: command.c:2729
#, c-format
msgid "\\!: failed\n"
msgstr "\\!:失败\n"
-#: command.c:2597 command.c:2656
+#: command.c:2749 command.c:2808
#, c-format
msgid "\\watch cannot be used with an empty query\n"
msgstr "\\watch命令不能用于空查询\n"
-#: command.c:2619
+#: command.c:2771
#, c-format
msgid "Watch every %lds\t%s"
msgstr "Watch命令每%lds\t%s调用一次"
-#: command.c:2663
+#: command.c:2815
#, c-format
msgid "\\watch cannot be used with COPY\n"
msgstr "\\watch不能用于COPY命令中\n"
# fe-exec.c:1371
-#: command.c:2669
+#: command.c:2821
#, c-format
-#| msgid "unexpected PQresultStatus: %d\n"
msgid "unexpected result status for \\watch\n"
msgstr "\\Watch出现意外的结果状态\n"
@@ -664,12 +709,12 @@ msgid "Succeeded.\n"
msgstr "完成。\n"
# fe-exec.c:1371
-#: common.c:403 common.c:683 common.c:816
+#: common.c:403 common.c:683 common.c:851
#, c-format
msgid "unexpected PQresultStatus: %d\n"
msgstr "意外的 PQresultStatus: %d\n"
-#: common.c:452 common.c:459 common.c:877
+#: common.c:452 common.c:459 common.c:912
#, c-format
msgid ""
"********* QUERY **********\n"
@@ -700,25 +745,22 @@ msgstr "收到来自伺服器 \"%s\" 进程 PID %d 非同步通知。\n"
#: common.c:578
#, c-format
-#| msgid "%s: no data returned from server\n"
msgid "no rows returned for \\gset\n"
msgstr "\\gset没有记录行返回\n"
#: common.c:583
#, c-format
-#| msgid "more than one operator named %s"
msgid "more than one row returned for \\gset\n"
msgstr "\\gset返回超过1个记录行\n"
# startup.c:502
-#: common.c:611
+#: common.c:609
#, c-format
-#| msgid "%s: could not set variable \"%s\"\n"
msgid "could not set variable \"%s\"\n"
msgstr "无法设定变量 \"%s\"\n"
# common.c:879
-#: common.c:859
+#: common.c:894
#, c-format
msgid ""
"***(Single step mode: verify command)"
@@ -733,7 +775,7 @@ msgstr ""
"***(按 Enter 键继续或键入 x 来取消)********************\n"
# describe.c:117
-#: common.c:910
+#: common.c:945
#, c-format
msgid ""
"The server (version %d.%d) does not support savepoints for "
@@ -741,70 +783,74 @@ msgid ""
msgstr "服务器(版本 %d.%d)不支持保存点(Savepoint)ON_ERROR_ROLLBACK。\n"
# large_obj.c:58
-#: common.c:1004
+#: common.c:1039
#, c-format
msgid "unexpected transaction status (%d)\n"
msgstr "意外的事务状态值 (%d)\n"
# common.c:930
-#: common.c:1032
+#: common.c:1067
#, c-format
msgid "Time: %.3f ms\n"
msgstr "时间:%.3f ms\n"
# copy.c:122
-#: copy.c:100
+#: copy.c:98
#, c-format
msgid "\\copy: arguments required\n"
msgstr "\\copy:需要参数\n"
# copy.c:408
-#: copy.c:255
+#: copy.c:253
#, c-format
msgid "\\copy: parse error at \"%s\"\n"
msgstr "\\copy:在 \"%s\" 发生解读错误\n"
# copy.c:410
-#: copy.c:257
+#: copy.c:255
#, c-format
msgid "\\copy: parse error at end of line\n"
msgstr "\\copy:在行尾发生解读错误\n"
-#: copy.c:339
+#: copy.c:330
#, c-format
-#| msgid "%s: could not execute command \"%s\": %s\n"
msgid "could not execute command \"%s\": %s\n"
msgstr "无法执行命令 \"%s\": %s\n"
+#: copy.c:346
+#, c-format
+#| msgid "could not stat file \"%s\": %m"
+msgid "could not stat file \"%s\": %s\n"
+msgstr "无法取文件 \"%s\":%s 的状态\n"
+
# copy.c:541
-#: copy.c:355
+#: copy.c:350
#, c-format
msgid "%s: cannot copy from/to a directory\n"
msgstr "%s:无法从目录复制或复制到目录\n"
-#: copy.c:389
+#: copy.c:387
#, c-format
-#| msgid "could not close compression stream: %s\n"
msgid "could not close pipe to external command: %s\n"
msgstr "无法为外部命令: %s关闭管道\n"
# command.c:1103
-#: copy.c:457 copy.c:467
+#: copy.c:455 copy.c:466
#, c-format
msgid "could not write COPY data: %s\n"
msgstr "无法写入 COPY 资料:%s\n"
-#: copy.c:474
+#: copy.c:473
#, c-format
msgid "COPY data transfer failed: %s"
msgstr "COPY 资料转换失败:%s"
-#: copy.c:544
+#: copy.c:534
msgid "canceled by user"
msgstr "依用户取消"
# copy.c:668
-#: copy.c:554
+#: copy.c:544
msgid ""
"Enter data to be copied followed by a newline.\n"
"End with a backslash and a period on a line by itself."
@@ -816,7 +862,7 @@ msgstr ""
msgid "aborted because of read failure"
msgstr "因读取失败已被中止"
-#: copy.c:687
+#: copy.c:691
msgid "trying to exit copy mode"
msgstr "正在尝试退出"
@@ -829,11 +875,11 @@ msgstr "正在尝试退出"
# describe.c:1476
# describe.c:1585
# describe.c:1633
-#: describe.c:71 describe.c:247 describe.c:478 describe.c:605 describe.c:737
-#: describe.c:822 describe.c:891 describe.c:2666 describe.c:2870
-#: describe.c:2959 describe.c:3197 describe.c:3333 describe.c:3560
-#: describe.c:3632 describe.c:3643 describe.c:3702 describe.c:4110
-#: describe.c:4189
+#: describe.c:71 describe.c:259 describe.c:491 describe.c:615 describe.c:758
+#: describe.c:844 describe.c:914 describe.c:2759 describe.c:2964
+#: describe.c:3054 describe.c:3299 describe.c:3436 describe.c:3665
+#: describe.c:3737 describe.c:3748 describe.c:3807 describe.c:4215
+#: describe.c:4294
msgid "Schema"
msgstr "架构模式"
@@ -849,22 +895,23 @@ msgstr "架构模式"
# describe.c:1586
# describe.c:1634
# describe.c:1727
-#: describe.c:72 describe.c:149 describe.c:157 describe.c:248 describe.c:479
-#: describe.c:606 describe.c:656 describe.c:738 describe.c:892 describe.c:2667
-#: describe.c:2792 describe.c:2871 describe.c:2960 describe.c:3038
-#: describe.c:3198 describe.c:3261 describe.c:3334 describe.c:3561
-#: describe.c:3633 describe.c:3644 describe.c:3703 describe.c:3892
-#: describe.c:3973 describe.c:4187
+#: describe.c:72 describe.c:156 describe.c:164 describe.c:260 describe.c:492
+#: describe.c:616 describe.c:677 describe.c:759 describe.c:915 describe.c:2760
+#: describe.c:2886 describe.c:2965 describe.c:3055 describe.c:3134
+#: describe.c:3300 describe.c:3364 describe.c:3437 describe.c:3666
+#: describe.c:3738 describe.c:3749 describe.c:3808 describe.c:3997
+#: describe.c:4078 describe.c:4292
msgid "Name"
msgstr "名称"
# describe.c:177
-#: describe.c:73 describe.c:260 describe.c:306 describe.c:323
+#: describe.c:73 describe.c:272 describe.c:318 describe.c:335
msgid "Result data type"
msgstr "结果资料型别"
# describe.c:178
-#: describe.c:87 describe.c:91 describe.c:261 describe.c:307 describe.c:324
+#: describe.c:81 describe.c:94 describe.c:98 describe.c:273 describe.c:319
+#: describe.c:336
msgid "Argument data types"
msgstr "参数资料型别"
@@ -878,24 +925,24 @@ msgstr "参数资料型别"
# describe.c:1488
# describe.c:1733
# large_obj.c:256
-#: describe.c:98 describe.c:170 describe.c:353 describe.c:521 describe.c:610
-#: describe.c:681 describe.c:894 describe.c:1442 describe.c:2471
-#: describe.c:2700 describe.c:2823 describe.c:2897 describe.c:2969
-#: describe.c:3047 describe.c:3114 describe.c:3205 describe.c:3270
-#: describe.c:3335 describe.c:3471 describe.c:3510 describe.c:3577
-#: describe.c:3636 describe.c:3645 describe.c:3704 describe.c:3918
-#: describe.c:3995 describe.c:4124 describe.c:4190 large_obj.c:291
+#: describe.c:105 describe.c:182 describe.c:365 describe.c:534 describe.c:631
+#: describe.c:702 describe.c:917 describe.c:1486 describe.c:2564
+#: describe.c:2793 describe.c:2917 describe.c:2991 describe.c:3064
+#: describe.c:3147 describe.c:3215 describe.c:3307 describe.c:3373
+#: describe.c:3438 describe.c:3574 describe.c:3614 describe.c:3682
+#: describe.c:3741 describe.c:3750 describe.c:3809 describe.c:4023
+#: describe.c:4100 describe.c:4229 describe.c:4295 large_obj.c:291
#: large_obj.c:301
msgid "Description"
msgstr "描述"
# describe.c:97
-#: describe.c:116
+#: describe.c:123
msgid "List of aggregate functions"
msgstr "聚集函数列表"
# describe.c:117
-#: describe.c:137
+#: describe.c:144
#, c-format
msgid "The server (version %d.%d) does not support tablespaces.\n"
msgstr "服务器(版本%d.%d) 不支持使用表空间.\n"
@@ -905,48 +952,52 @@ msgstr "服务器(版本%d.%d) 不支持使用表空间.\n"
# describe.c:362
# describe.c:1478
# describe.c:1727
-#: describe.c:150 describe.c:158 describe.c:350 describe.c:657 describe.c:821
-#: describe.c:2676 describe.c:2796 describe.c:3040 describe.c:3262
-#: describe.c:3893 describe.c:3974 large_obj.c:290
+#: describe.c:157 describe.c:165 describe.c:362 describe.c:678 describe.c:843
+#: describe.c:2769 describe.c:2890 describe.c:3136 describe.c:3365
+#: describe.c:3998 describe.c:4079 large_obj.c:290
msgid "Owner"
msgstr "拥有者"
# describe.c:128
-#: describe.c:151 describe.c:159
+#: describe.c:158 describe.c:166
msgid "Location"
msgstr "所在地"
+#: describe.c:177 describe.c:2382
+msgid "Options"
+msgstr "选项"
+
# describe.c:150
-#: describe.c:187
+#: describe.c:199
msgid "List of tablespaces"
msgstr "表空间列表"
-#: describe.c:224
+#: describe.c:236
#, c-format
msgid "\\df only takes [antwS+] as options\n"
msgstr "\\df 只能将 [antwS+]作为选项\n"
-#: describe.c:230
+#: describe.c:242
#, c-format
msgid "\\df does not take a \"w\" option with server version %d.%d\n"
msgstr "\\df 不能有带着服务器版本%d.%d 的选项\"w\" \n"
#. translator: "agg" is short for "aggregate"
-#: describe.c:263 describe.c:309 describe.c:326
+#: describe.c:275 describe.c:321 describe.c:338
msgid "agg"
msgstr "agg"
-#: describe.c:264
+#: describe.c:276
msgid "window"
msgstr "窗口"
# describe.c:575
-#: describe.c:265 describe.c:310 describe.c:327 describe.c:1005
+#: describe.c:277 describe.c:322 describe.c:339 describe.c:1028
msgid "trigger"
msgstr "触发器"
# help.c:211
-#: describe.c:266 describe.c:311 describe.c:328
+#: describe.c:278 describe.c:323 describe.c:340
msgid "normal"
msgstr "常规"
@@ -954,108 +1005,112 @@ msgstr "常规"
# describe.c:745
# describe.c:1478
# describe.c:1587
-#: describe.c:267 describe.c:312 describe.c:329 describe.c:744 describe.c:831
-#: describe.c:1411 describe.c:2675 describe.c:2872 describe.c:3992
+#: describe.c:279 describe.c:324 describe.c:341 describe.c:765 describe.c:853
+#: describe.c:1455 describe.c:2768 describe.c:2966 describe.c:4097
msgid "Type"
msgstr "型别"
# sql_help.h:221
-#: describe.c:343
-#| msgid "define a cursor"
+#: describe.c:355
msgid "definer"
msgstr "定义者"
-#: describe.c:344
+#: describe.c:356
msgid "invoker"
msgstr "调用者"
-#: describe.c:345
+#: describe.c:357
msgid "Security"
msgstr "安全"
# describe.c:415
# describe.c:543
# describe.c:1477
-#: describe.c:346
+#: describe.c:358
msgid "immutable"
msgstr "不可改变"
# describe.c:415
# describe.c:543
# describe.c:1477
-#: describe.c:347
+#: describe.c:359
msgid "stable"
msgstr "稳定"
-#: describe.c:348
+#: describe.c:360
msgid "volatile"
msgstr "不稳定性"
-#: describe.c:349
+#: describe.c:361
msgid "Volatility"
msgstr "挥发性"
# describe.c:186
-#: describe.c:351
+#: describe.c:363
msgid "Language"
msgstr "程序语言"
# describe.c:187
-#: describe.c:352
+#: describe.c:364
msgid "Source code"
msgstr "原始程式"
# describe.c:221
-#: describe.c:450
+#: describe.c:462
msgid "List of functions"
msgstr "函数列表"
# describe.c:257
-#: describe.c:489
+#: describe.c:502
msgid "Internal name"
msgstr "内部名称"
# describe.c:257
-#: describe.c:490 describe.c:673 describe.c:2692 describe.c:2696
+#: describe.c:503 describe.c:694 describe.c:2785 describe.c:2789
msgid "Size"
msgstr "大小"
-#: describe.c:511
+#: describe.c:524
msgid "Elements"
msgstr "成员"
# describe.c:289
-#: describe.c:561
+#: describe.c:574
msgid "List of data types"
msgstr "资料型别列表"
# describe.c:321
-#: describe.c:607
+#: describe.c:617
msgid "Left arg type"
msgstr "左参数型别"
# describe.c:321
-#: describe.c:608
+#: describe.c:618
msgid "Right arg type"
msgstr "右参数型别"
# describe.c:322
-#: describe.c:609
+#: describe.c:619
msgid "Result type"
msgstr "结果型别"
+# describe.c:1691
+#: describe.c:624 describe.c:3206 describe.c:3573
+msgid "Function"
+msgstr "函数"
+
# describe.c:336
-#: describe.c:628
+#: describe.c:649
msgid "List of operators"
msgstr "运算子列表"
# describe.c:365
-#: describe.c:658
+#: describe.c:679
msgid "Encoding"
msgstr "字元编码"
# describe.c:128
-#: describe.c:663 describe.c:3199
+#: describe.c:684 describe.c:3301
msgid "Collate"
msgstr "校对规则"
@@ -1063,73 +1118,73 @@ msgstr "校对规则"
# describe.c:745
# describe.c:1478
# describe.c:1587
-#: describe.c:664 describe.c:3200
+#: describe.c:685 describe.c:3302
msgid "Ctype"
msgstr "Ctype"
# describe.c:1342
-#: describe.c:677
+#: describe.c:698
msgid "Tablespace"
msgstr "表空间"
# describe.c:381
-#: describe.c:699
+#: describe.c:720
msgid "List of databases"
msgstr "资料库列表"
# describe.c:415
# describe.c:543
# describe.c:1477
-#: describe.c:739 describe.c:824 describe.c:2668
+#: describe.c:760 describe.c:846 describe.c:2761
msgid "table"
msgstr "资料表"
# describe.c:415
# describe.c:543
# describe.c:1477
-#: describe.c:740 describe.c:2669
+#: describe.c:761 describe.c:2762
msgid "view"
msgstr "视观表"
-#: describe.c:741 describe.c:2670
+#: describe.c:762 describe.c:2763
msgid "materialized view"
msgstr "物化视图"
# describe.c:415
# describe.c:543
# describe.c:1477
-#: describe.c:742 describe.c:826 describe.c:2672
+#: describe.c:763 describe.c:848 describe.c:2765
msgid "sequence"
msgstr "序列数"
# describe.c:415
# describe.c:543
# describe.c:1477
-#: describe.c:743 describe.c:2674
+#: describe.c:764 describe.c:2767
msgid "foreign table"
msgstr "所引用的外表"
# sql_help.h:325
-#: describe.c:755
+#: describe.c:776
msgid "Column access privileges"
msgstr "列访问权限"
# describe.c:133
# describe.c:415
# describe.c:1733
-#: describe.c:781 describe.c:4334 describe.c:4338
+#: describe.c:802 describe.c:4439 describe.c:4443
msgid "Access privileges"
msgstr "存取权限"
# describe.c:117
-#: describe.c:809
+#: describe.c:831
#, c-format
msgid ""
"The server (version %d.%d) does not support altering default privileges.\n"
msgstr "服务器(版本%d.%d)不支持修改缺省权限.\n"
# describe.c:498
-#: describe.c:828
+#: describe.c:850
msgid "function"
msgstr "函数"
@@ -1137,729 +1192,761 @@ msgstr "函数"
# describe.c:745
# describe.c:1478
# describe.c:1587
-#: describe.c:830
+#: describe.c:852
msgid "type"
msgstr "类型Ctype"
# sql_help.h:325
-#: describe.c:854
+#: describe.c:876
msgid "Default access privileges"
msgstr "缺省的访问权限"
# describe.c:469
-#: describe.c:893
+#: describe.c:916
msgid "Object"
msgstr "物件"
-#: describe.c:907 sql_help.c:1447
+#: describe.c:930 sql_help.c:1595
msgid "constraint"
msgstr "约束"
-#: describe.c:934
+#: describe.c:957
msgid "operator class"
msgstr "操作符类"
# sql_help.h:269
-#: describe.c:963
+#: describe.c:986
msgid "operator family"
msgstr "操作符家族"
# describe.c:559
-#: describe.c:985
+#: describe.c:1008
msgid "rule"
msgstr "规则"
# describe.c:593
-#: describe.c:1027
+#: describe.c:1050
msgid "Object descriptions"
msgstr "物件描述"
# describe.c:641
-#: describe.c:1080
+#: describe.c:1104
#, c-format
msgid "Did not find any relation named \"%s\".\n"
msgstr "没有找到任何名称为 \"%s\" 的关联。\n"
# describe.c:728
-#: describe.c:1253
+#: describe.c:1295
#, c-format
msgid "Did not find any relation with OID %s.\n"
msgstr "没有找到任何OID为 %s 的关联。\n"
# describe.c:933
-#: describe.c:1355
+#: describe.c:1399
#, c-format
msgid "Unlogged table \"%s.%s\""
msgstr "不记录日志的表 \"%s.%s\""
# describe.c:859
-#: describe.c:1358
+#: describe.c:1402
#, c-format
msgid "Table \"%s.%s\""
msgstr "资料表 \"%s.%s\""
# describe.c:863
-#: describe.c:1362
+#: describe.c:1406
#, c-format
msgid "View \"%s.%s\""
msgstr "视观表 \"%s.%s\""
# describe.c:933
-#: describe.c:1367
+#: describe.c:1411
#, c-format
-#| msgid "Unlogged table \"%s.%s\""
msgid "Unlogged materialized view \"%s.%s\""
msgstr "不记录日志的物化视图 \"%s.%s\""
-#: describe.c:1370
+#: describe.c:1414
#, c-format
-#| msgid "analyzing \"%s.%s\""
msgid "Materialized view \"%s.%s\""
msgstr "物化视图 \"%s.%s\""
# describe.c:867
-#: describe.c:1374
+#: describe.c:1418
#, c-format
msgid "Sequence \"%s.%s\""
msgstr "序列数 \"%s.%s\""
# describe.c:871
-#: describe.c:1379
+#: describe.c:1423
#, c-format
msgid "Unlogged index \"%s.%s\""
msgstr "不记录日志的索引 \"%s.%s\""
# describe.c:871
-#: describe.c:1382
+#: describe.c:1426
#, c-format
msgid "Index \"%s.%s\""
msgstr "索引 \"%s.%s\""
# describe.c:875
-#: describe.c:1387
+#: describe.c:1431
#, c-format
msgid "Special relation \"%s.%s\""
msgstr "特殊关联 \"%s.%s\""
# describe.c:879
-#: describe.c:1391
+#: describe.c:1435
#, c-format
msgid "TOAST table \"%s.%s\""
msgstr "TOAST 资料表 \"%s.%s\""
# describe.c:883
-#: describe.c:1395
+#: describe.c:1439
#, c-format
msgid "Composite type \"%s.%s\""
msgstr "合成型别 \"%s.%s\""
# describe.c:933
-#: describe.c:1399
+#: describe.c:1443
#, c-format
msgid "Foreign table \"%s.%s\""
msgstr "引用的外部表 \"%s.%s\""
# describe.c:744
-#: describe.c:1410
+#: describe.c:1454
msgid "Column"
msgstr "栏位"
# describe.c:752
-#: describe.c:1419
+#: describe.c:1463
msgid "Modifiers"
msgstr "修饰词"
# describe.c:415
# describe.c:543
# describe.c:1477
-#: describe.c:1424
+#: describe.c:1468
msgid "Value"
msgstr "值"
# describe.c:1636
-#: describe.c:1427
+#: describe.c:1471
msgid "Definition"
msgstr "定义"
-#: describe.c:1430 describe.c:3913 describe.c:3994 describe.c:4062
-#: describe.c:4123
+#: describe.c:1474 describe.c:4018 describe.c:4099 describe.c:4167
+#: describe.c:4228
msgid "FDW Options"
msgstr "FDW选项"
# describe.c:1635
-#: describe.c:1434
+#: describe.c:1478
msgid "Storage"
msgstr "存储"
-#: describe.c:1437
+#: describe.c:1481
msgid "Stats target"
msgstr "统计目标"
-#: describe.c:1487
+#: describe.c:1531
#, c-format
msgid "collate %s"
msgstr "校对%s"
-#: describe.c:1495
+#: describe.c:1539
msgid "not null"
msgstr "非空"
# describe.c:1639
#. translator: default values of column definitions
-#: describe.c:1505
+#: describe.c:1549
#, c-format
msgid "default %s"
msgstr "缺省 %s"
# describe.c:925
-#: describe.c:1613
+#: describe.c:1664
msgid "primary key, "
msgstr "主键(PK),"
# describe.c:927
-#: describe.c:1615
+#: describe.c:1666
msgid "unique, "
msgstr "唯一的,"
# describe.c:933
-#: describe.c:1621
+#: describe.c:1672
#, c-format
msgid "for table \"%s.%s\""
msgstr "给资料表 \"%s.%s\""
# describe.c:937
-#: describe.c:1625
+#: describe.c:1676
#, c-format
msgid ", predicate (%s)"
msgstr ", 叙述 (%s)"
# describe.c:940
-#: describe.c:1628
+#: describe.c:1679
msgid ", clustered"
msgstr ", 已丛集"
-#: describe.c:1631
+#: describe.c:1682
msgid ", invalid"
msgstr ", 无效的"
-#: describe.c:1634
+#: describe.c:1685
msgid ", deferrable"
msgstr ",可延迟"
-#: describe.c:1637
+#: describe.c:1688
msgid ", initially deferred"
msgstr ",开始被延迟"
-#: describe.c:1672
+#: describe.c:1691
+msgid ", replica identity"
+msgstr ",复制标识"
+
+#: describe.c:1726
#, c-format
msgid "Owned by: %s"
msgstr "属于: %s"
# describe.c:1138
-#: describe.c:1728
+#: describe.c:1786
msgid "Indexes:"
msgstr "索引:"
# describe.c:1174
-#: describe.c:1809
+#: describe.c:1870
msgid "Check constraints:"
msgstr "检查约束限制"
# describe.c:1189
-#: describe.c:1840
+#: describe.c:1901
msgid "Foreign-key constraints:"
msgstr "外部键(FK)限制:"
-#: describe.c:1871
+#: describe.c:1932
msgid "Referenced by:"
msgstr "由引用:"
# describe.c:983
# describe.c:1204
-#: describe.c:1953 describe.c:2003
+#: describe.c:2014 describe.c:2064
msgid "Rules:"
msgstr "规则:"
-#: describe.c:1956
+#: describe.c:2017
msgid "Disabled rules:"
msgstr "已停用规则:"
-#: describe.c:1959
+#: describe.c:2020
msgid "Rules firing always:"
msgstr "永远触发规则"
-#: describe.c:1962
+#: describe.c:2023
msgid "Rules firing on replica only:"
msgstr "只有在复制时触发规则:"
# describe.c:977
-#: describe.c:1986
+#: describe.c:2047
msgid "View definition:"
msgstr "视图定义:"
# describe.c:1223
-#: describe.c:2109
+#: describe.c:2182
msgid "Triggers:"
msgstr "触发器:"
-#: describe.c:2112
+#: describe.c:2186
+#| msgid "Disabled triggers:"
+msgid "Disabled user triggers:"
+msgstr "禁用用户触发器:"
+
+#: describe.c:2188
msgid "Disabled triggers:"
msgstr "停用触发器:"
-#: describe.c:2115
+#: describe.c:2191
+#| msgid "Disabled triggers:"
+msgid "Disabled internal triggers:"
+msgstr "禁用内部触发器:"
+
+#: describe.c:2194
msgid "Triggers firing always:"
msgstr "永远激活触发器"
-#: describe.c:2118
+#: describe.c:2197
msgid "Triggers firing on replica only:"
msgstr "只有在复制时激活触发器"
# describe.c:1245
-#: describe.c:2197
+#: describe.c:2276
msgid "Inherits"
msgstr "继承"
-#: describe.c:2236
+#: describe.c:2315
#, c-format
msgid "Number of child tables: %d (Use \\d+ to list them.)"
msgstr "子表的数量:%d(可以使用 \\d+ 来列出它们)"
-#: describe.c:2243
+#: describe.c:2322
msgid "Child tables"
msgstr "子表"
-#: describe.c:2265
+#: describe.c:2344
#, c-format
msgid "Typed table of type: %s"
msgstr "类型的已确定类型表(typed table):%s"
-# describe.c:1259
-#: describe.c:2272
-msgid "Has OIDs"
-msgstr "有 OIDs"
-
-# describe.c:1262
-# describe.c:1638
-# describe.c:1692
-#: describe.c:2275 describe.c:2963 describe.c:3106
-msgid "no"
-msgstr "否"
-
-# describe.c:1262
-# describe.c:1637
-# describe.c:1694
-#: describe.c:2275 describe.c:2963 describe.c:3108
-msgid "yes"
-msgstr "是"
+# describe.c:1636
+#: describe.c:2358
+#| msgid "Replication"
+msgid "Replica Identity"
+msgstr "复制标识"
-#: describe.c:2288
-msgid "Options"
-msgstr "选项"
+# describe.c:1259
+#: describe.c:2371
+#| msgid "Has OIDs"
+msgid "Has OIDs: yes"
+msgstr "有 OIDs:yes"
# describe.c:1342
-#: describe.c:2366
+#: describe.c:2460
#, c-format
msgid "Tablespace: \"%s\""
msgstr "表空间:\"%s\""
# describe.c:1342
-#: describe.c:2379
+#. translator: before this string there's an index description like
+#. '"foo_pkey" PRIMARY KEY, btree (a)'
+#: describe.c:2472
#, c-format
msgid ", tablespace \"%s\""
msgstr ", 表空间 \"%s\""
# describe.c:1431
-#: describe.c:2464
+#: describe.c:2557
msgid "List of roles"
msgstr "角色列表"
# describe.c:1375
-#: describe.c:2466
+#: describe.c:2559
msgid "Role name"
msgstr "角色名称"
-#: describe.c:2467
+#: describe.c:2560
msgid "Attributes"
msgstr "属性"
-#: describe.c:2468
+#: describe.c:2561
msgid "Member of"
msgstr "成员属于"
# describe.c:1377
-#: describe.c:2479
+#: describe.c:2572
msgid "Superuser"
msgstr "超级用户"
-#: describe.c:2482
+#: describe.c:2575
msgid "No inheritance"
msgstr "没有继承"
-#: describe.c:2485
+#: describe.c:2578
msgid "Create role"
msgstr "建立角色"
-#: describe.c:2488
+#: describe.c:2581
msgid "Create DB"
msgstr "建立 DB"
-#: describe.c:2491
+#: describe.c:2584
msgid "Cannot login"
msgstr "无法登录"
# describe.c:1636
-#: describe.c:2495
+#: describe.c:2588
msgid "Replication"
msgstr "复制"
# help.c:123
-#: describe.c:2504
+#: describe.c:2597
msgid "No connections"
msgstr "没有连接"
# help.c:123
-#: describe.c:2506
+#: describe.c:2599
#, c-format
msgid "%d connection"
msgid_plural "%d connections"
msgstr[0] "%d个连接"
-#: describe.c:2516
+#: describe.c:2609
msgid "Password valid until "
msgstr "密码有效直至"
# describe.c:1375
-#: describe.c:2572
-#, fuzzy
+#: describe.c:2665
#| msgid "Role name"
msgid "Role"
-msgstr "角色名称"
+msgstr "角色"
-#: describe.c:2573
-#| msgid "database %s"
+#: describe.c:2666
msgid "Database"
msgstr "数据库"
-#: describe.c:2574
+#: describe.c:2667
msgid "Settings"
msgstr "设置"
-#: describe.c:2584
+#: describe.c:2677
#, c-format
msgid "No per-database role settings support in this server version.\n"
msgstr "在这个版本的服务器中不支持对每个数据库的角色进行设定.\n"
# describe.c:1542
-#: describe.c:2595
+#: describe.c:2688
#, c-format
msgid "No matching settings found.\n"
msgstr "没有找到所匹配的设置.\n"
# describe.c:1544
-#: describe.c:2597
+#: describe.c:2690
#, c-format
msgid "No settings found.\n"
msgstr "没有找到设置.\n"
# describe.c:1549
-#: describe.c:2602
+#: describe.c:2695
msgid "List of settings"
msgstr "设置的列表"
# describe.c:543
# describe.c:1477
-#: describe.c:2671
+#: describe.c:2764
msgid "index"
msgstr "索引"
# describe.c:1478
-#: describe.c:2673
+#: describe.c:2766
msgid "special"
msgstr "特殊"
# describe.c:1483
-#: describe.c:2681 describe.c:4111
+#: describe.c:2774 describe.c:4216
msgid "Table"
msgstr "资料表"
# describe.c:1542
-#: describe.c:2757
+#: describe.c:2850
#, c-format
msgid "No matching relations found.\n"
msgstr "没有找到符合的关联。\n"
# describe.c:1544
-#: describe.c:2759
+#: describe.c:2852
#, c-format
msgid "No relations found.\n"
msgstr "找不到关联。\n"
# describe.c:1549
-#: describe.c:2764
+#: describe.c:2857
msgid "List of relations"
msgstr "关联列表"
-#: describe.c:2800
+#: describe.c:2894
msgid "Trusted"
msgstr "信任"
# describe.c:257
-#: describe.c:2808
+#: describe.c:2902
msgid "Internal Language"
msgstr "内部语言"
-#: describe.c:2809
+#: describe.c:2903
msgid "Call Handler"
msgstr "调用函数"
-#: describe.c:2810 describe.c:3900
+#: describe.c:2904 describe.c:4005
msgid "Validator"
msgstr "验证"
-#: describe.c:2813
+#: describe.c:2907
msgid "Inline Handler"
msgstr "内联函数"
# describe.c:1431
-#: describe.c:2841
+#: describe.c:2935
msgid "List of languages"
msgstr "语言列表"
# describe.c:1588
-#: describe.c:2885
+#: describe.c:2979
msgid "Modifier"
msgstr "修饰词"
-#: describe.c:2886
+#: describe.c:2980
msgid "Check"
msgstr "检查"
# describe.c:1602
-#: describe.c:2928
+#: describe.c:3022
msgid "List of domains"
msgstr "共同值域列表"
# describe.c:1635
-#: describe.c:2961
+#: describe.c:3056
msgid "Source"
msgstr "来源"
# describe.c:1636
-#: describe.c:2962
+#: describe.c:3057
msgid "Destination"
msgstr "目的地"
+# describe.c:1262
+# describe.c:1638
+# describe.c:1692
+#: describe.c:3058 describe.c:3207
+msgid "no"
+msgstr "否"
+
+# describe.c:1262
+# describe.c:1637
+# describe.c:1694
+#: describe.c:3058 describe.c:3209
+msgid "yes"
+msgstr "是"
+
# describe.c:1639
-#: describe.c:2964
+#: describe.c:3059
msgid "Default?"
msgstr "预设?"
# describe.c:1653
-#: describe.c:3001
+#: describe.c:3096
msgid "List of conversions"
msgstr "字元编码转换列表"
-#: describe.c:3039
-#, fuzzy
+#: describe.c:3135
#| msgid "event"
msgid "Event"
-msgstr "事件"
+msgstr "Event"
# describe.c:415
# describe.c:543
# describe.c:1477
-#: describe.c:3041
-#| msgid "table"
+#: describe.c:3137
+#| msgid "Enabled"
+msgid "enabled"
+msgstr "启用"
+
+# describe.c:1636
+#: describe.c:3138
+#| msgid "Replication"
+msgid "replica"
+msgstr "replica"
+
+#: describe.c:3139
+msgid "always"
+msgstr "经常"
+
+# describe.c:415
+# describe.c:543
+# describe.c:1477
+#: describe.c:3140
+#| msgid "stable"
+msgid "disabled"
+msgstr "禁用"
+
+# describe.c:415
+# describe.c:543
+# describe.c:1477
+#: describe.c:3141
msgid "Enabled"
msgstr "使能"
-#: describe.c:3042
-#, fuzzy
+#: describe.c:3142
#| msgid "Procedural Languages"
msgid "Procedure"
-msgstr "过程语言"
+msgstr "过程"
-#: describe.c:3043
+#: describe.c:3143
msgid "Tags"
msgstr "标签"
# describe.c:1549
-#: describe.c:3062
-#| msgid "List of settings"
+#: describe.c:3162
msgid "List of event triggers"
msgstr "事件触发器列表"
# describe.c:1688
-#: describe.c:3103
+#: describe.c:3204
msgid "Source type"
msgstr "来源型别"
# describe.c:1689
-#: describe.c:3104
+#: describe.c:3205
msgid "Target type"
msgstr "目标型别"
-# describe.c:1691
-#: describe.c:3105 describe.c:3470
-msgid "Function"
-msgstr "函数"
-
# describe.c:1693
-#: describe.c:3107
+#: describe.c:3208
msgid "in assignment"
msgstr "在指派中"
# describe.c:1695
-#: describe.c:3109
+#: describe.c:3210
msgid "Implicit?"
msgstr "隐含的?"
# describe.c:1703
-#: describe.c:3160
+#: describe.c:3261
msgid "List of casts"
msgstr "型别转换列表"
# describe.c:117
-#: describe.c:3185
+#: describe.c:3287
#, c-format
msgid "The server (version %d.%d) does not support collations.\n"
msgstr "服务器(版本%d.%d)不支持排序校对。\n"
# describe.c:1549
-#: describe.c:3235
+#: describe.c:3337
msgid "List of collations"
msgstr "校对列表"
# describe.c:1753
-#: describe.c:3293
+#: describe.c:3396
msgid "List of schemas"
msgstr "架构模式列表"
# describe.c:117
-#: describe.c:3316 describe.c:3549 describe.c:3617 describe.c:3685
+#: describe.c:3419 describe.c:3654 describe.c:3722 describe.c:3790
#, c-format
msgid "The server (version %d.%d) does not support full text search.\n"
msgstr "服务器(版本%d.%d)不支持使用全文搜索.\n"
# describe.c:150
-#: describe.c:3350
+#: describe.c:3453
msgid "List of text search parsers"
msgstr "文本剖析器列表"
# describe.c:641
-#: describe.c:3393
+#: describe.c:3496
#, c-format
msgid "Did not find any text search parser named \"%s\".\n"
msgstr "没有找到任何命名为 \"%s\" 的文本剖析器。\n"
-#: describe.c:3468
+#: describe.c:3571
msgid "Start parse"
msgstr "开始剖析"
-#: describe.c:3469
+#: describe.c:3572
msgid "Method"
msgstr "方法"
-#: describe.c:3473
+#: describe.c:3576
msgid "Get next token"
msgstr "取得下一个标志符"
-#: describe.c:3475
+#: describe.c:3578
msgid "End parse"
msgstr "结束剖析"
-#: describe.c:3477
+#: describe.c:3580
msgid "Get headline"
msgstr "取得首行"
-#: describe.c:3479
+#: describe.c:3582
msgid "Get token types"
msgstr "取得标志符型别"
-#: describe.c:3489
+#: describe.c:3592
#, c-format
msgid "Text search parser \"%s.%s\""
msgstr "文本搜寻剖析器 \"%s.%s\""
-#: describe.c:3491
+#: describe.c:3594
#, c-format
msgid "Text search parser \"%s\""
msgstr "文本搜寻剖析器 \"%s\""
# describe.c:1375
-#: describe.c:3509
+#: describe.c:3613
msgid "Token name"
msgstr "标志名称"
-#: describe.c:3520
+#: describe.c:3624
#, c-format
msgid "Token types for parser \"%s.%s\""
msgstr "标志符别型给剖析器 \"%s.%s\""
-#: describe.c:3522
+#: describe.c:3626
#, c-format
msgid "Token types for parser \"%s\""
msgstr "标志符型别给剖析器 \"%s\""
-#: describe.c:3571
+#: describe.c:3676
msgid "Template"
msgstr "模版"
# help.c:88
-#: describe.c:3572
+#: describe.c:3677
msgid "Init options"
msgstr "初始选项"
# describe.c:1549
-#: describe.c:3594
+#: describe.c:3699
msgid "List of text search dictionaries"
msgstr "文本搜寻字典列表"
-#: describe.c:3634
+#: describe.c:3739
msgid "Init"
msgstr "初始化"
# describe.c:257
-#: describe.c:3635
+#: describe.c:3740
msgid "Lexize"
msgstr "词汇"
# describe.c:1753
-#: describe.c:3662
+#: describe.c:3767
msgid "List of text search templates"
msgstr "文本搜寻样式列表"
# describe.c:97
-#: describe.c:3719
+#: describe.c:3824
msgid "List of text search configurations"
msgstr "文本搜寻组态列表"
# describe.c:641
-#: describe.c:3763
+#: describe.c:3868
#, c-format
msgid "Did not find any text search configuration named \"%s\".\n"
msgstr "没有找到任何命名为 \"%s\" 的文本搜寻组态。\n"
-#: describe.c:3829
+#: describe.c:3934
msgid "Token"
msgstr "标志符"
-#: describe.c:3830
+#: describe.c:3935
msgid "Dictionaries"
msgstr "字典"
-#: describe.c:3841
+#: describe.c:3946
#, c-format
msgid "Text search configuration \"%s.%s\""
msgstr "文本搜寻组态 \"%s.%s\""
-#: describe.c:3844
+#: describe.c:3949
#, c-format
msgid "Text search configuration \"%s\""
msgstr "文本搜寻组态 \"%s\""
# describe.c:859
-#: describe.c:3848
+#: describe.c:3953
#, c-format
msgid ""
"\n"
@@ -1869,7 +1956,7 @@ msgstr ""
"剖析器:\"%s.%s\""
# describe.c:1342
-#: describe.c:3851
+#: describe.c:3956
#, c-format
msgid ""
"\n"
@@ -1879,147 +1966,142 @@ msgstr ""
"剖析器:\"%s\""
# describe.c:117
-#: describe.c:3883
+#: describe.c:3988
#, c-format
msgid "The server (version %d.%d) does not support foreign-data wrappers.\n"
msgstr "服务器(版本%d.%d)不支持使用外部数据封装器。\n"
-#: describe.c:3897
+#: describe.c:4002
msgid "Handler"
msgstr "处理函数"
# describe.c:289
-#: describe.c:3940
+#: describe.c:4045
msgid "List of foreign-data wrappers"
msgstr "外部数据封装器列表"
# describe.c:117
-#: describe.c:3963
+#: describe.c:4068
#, c-format
msgid "The server (version %d.%d) does not support foreign servers.\n"
msgstr "服务器(版本%d.%d)不支持使用外部服务器.\n"
-#: describe.c:3975
+#: describe.c:4080
msgid "Foreign-data wrapper"
msgstr "外部数据封装器"
-#: describe.c:3993 describe.c:4188
+#: describe.c:4098 describe.c:4293
msgid "Version"
msgstr "版本"
# describe.c:1653
-#: describe.c:4019
+#: describe.c:4124
msgid "List of foreign servers"
msgstr "外部服务器列表"
# describe.c:117
-#: describe.c:4042
+#: describe.c:4147
#, c-format
msgid "The server (version %d.%d) does not support user mappings.\n"
msgstr "服务器(版本%d.%d)不支持使用用户映射。\n"
# describe.c:1377
-#: describe.c:4051 describe.c:4112
+#: describe.c:4156 describe.c:4217
msgid "Server"
msgstr "服务器"
-#: describe.c:4052
+#: describe.c:4157
msgid "User name"
msgstr "用户名: "
# describe.c:1602
-#: describe.c:4077
+#: describe.c:4182
msgid "List of user mappings"
msgstr "列出用户映射"
# describe.c:117
-#: describe.c:4100
+#: describe.c:4205
#, c-format
msgid "The server (version %d.%d) does not support foreign tables.\n"
msgstr "服务器(版本%d.%d)不支持使用引用表.\n"
# describe.c:1653
-#: describe.c:4151
+#: describe.c:4256
msgid "List of foreign tables"
msgstr "引用表列表"
# describe.c:117
-#: describe.c:4174 describe.c:4228
+#: describe.c:4279 describe.c:4333
#, c-format
msgid "The server (version %d.%d) does not support extensions.\n"
msgstr "服务器(版本%d.%d) 不支持使用扩展.\n"
# describe.c:1653
-#: describe.c:4205
+#: describe.c:4310
msgid "List of installed extensions"
msgstr "已安装扩展列表"
# describe.c:641
-#: describe.c:4255
+#: describe.c:4360
#, c-format
msgid "Did not find any extension named \"%s\".\n"
msgstr "没有找到任何名称为 \"%s\" 的扩展。\n"
# describe.c:641
-#: describe.c:4258
+#: describe.c:4363
#, c-format
msgid "Did not find any extensions.\n"
msgstr "没有找到任何扩展.\n"
# describe.c:593
-#: describe.c:4302
+#: describe.c:4407
msgid "Object Description"
msgstr "对象描述"
-#: describe.c:4311
+#: describe.c:4416
#, c-format
msgid "Objects in extension \"%s\""
msgstr "对象用于扩展 \"%s\""
-# help.c:48
-#: help.c:48
-msgid "off"
-msgstr "关闭"
-
-# help.c:48
-#: help.c:48
-msgid "on"
-msgstr "开启"
-
-# help.c:70
-#: help.c:70
+# command.c:953
+# common.c:216
+# common.c:605
+# common.c:660
+# common.c:903
+#: help.c:62
#, c-format
-msgid "could not get current user name: %s\n"
-msgstr "无法取得目前的用户名称:%s\n"
+#| msgid "%s"
+msgid "%s\n"
+msgstr "%s\n"
# help.c:83
-#: help.c:82
+#: help.c:67
#, c-format
msgid ""
"psql is the PostgreSQL interactive terminal.\n"
"\n"
msgstr "psql是PostgreSQL 的交互式客户端工具。\n"
-#: help.c:83
+#: help.c:68
#, c-format
msgid "Usage:\n"
msgstr "使用方法:\n"
# help.c:86
-#: help.c:84
+#: help.c:69
#, c-format
msgid ""
" psql [OPTION]... [DBNAME [USERNAME]]\n"
"\n"
msgstr " psql [选项]... [数据库名称 [用户名称]]\n"
-#: help.c:86
+#: help.c:71
#, c-format
msgid "General options:\n"
msgstr "通用选项:\n"
# help.c:94
-#: help.c:91
+#: help.c:76
#, c-format
msgid ""
" -c, --command=COMMAND run only single command (SQL or internal) and "
@@ -2027,26 +2109,26 @@ msgid ""
msgstr " -c,--command=命令 执行单一命令(SQL或内部指令)然后结束\n"
# help.c:93
-#: help.c:92
+#: help.c:77
#, c-format
msgid ""
" -d, --dbname=DBNAME database name to connect to (default: \"%s\")\n"
msgstr " -d, --dbname=数据库名称 指定要连接的数据库 (缺省:\"%s\")\n"
# help.c:95
-#: help.c:93
+#: help.c:78
#, c-format
msgid " -f, --file=FILENAME execute commands from file, then exit\n"
msgstr " -f, --file=文件名 从文件中执行命令然后退出\n"
# help.c:96
-#: help.c:94
+#: help.c:79
#, c-format
msgid " -l, --list list available databases, then exit\n"
msgstr " -l, --list 列出所有可用的数据库,然后退出\n"
# help.c:97
-#: help.c:95
+#: help.c:80
#, c-format
msgid ""
" -v, --set=, --variable=NAME=VALUE\n"
@@ -2055,22 +2137,19 @@ msgstr ""
" -v, --set=, --variable=名称=值\n"
" 为psql变量(名称)设定值\n"
-#: help.c:97
+#: help.c:82
#, c-format
msgid " -V, --version output version information, then exit\n"
msgstr " -V, --version 输出版本信息, 然后退出\n"
# help.c:98
-#: help.c:98
+#: help.c:83
#, c-format
msgid " -X, --no-psqlrc do not read startup file (~/.psqlrc)\n"
msgstr " -X, --no-psqlrc 不读取启动文档(~/.psqlrc)\n"
-#: help.c:99
+#: help.c:84
#, c-format
-#| msgid ""
-#| " -1 (\"one\"), --single-transaction\n"
-#| " execute command file as a single transaction\n"
msgid ""
" -1 (\"one\"), --single-transaction\n"
" execute as a single transaction (if non-"
@@ -2079,13 +2158,13 @@ msgstr ""
" -1 (\"one\"), --single-transaction\n"
" 作为一个单一事务来执行命令文件(如果是非交互型的)\n"
-#: help.c:101
+#: help.c:86
#, c-format
msgid " -?, --help show this help, then exit\n"
msgstr " -?, --help 显示此帮助, 然后退出\n"
# help.c:102
-#: help.c:103
+#: help.c:88
#, c-format
msgid ""
"\n"
@@ -2095,58 +2174,58 @@ msgstr ""
"输入和输出选项:\n"
# help.c:103
-#: help.c:104
+#: help.c:89
#, c-format
msgid " -a, --echo-all echo all input from script\n"
msgstr " -a, --echo-all 显示所有来自于脚本的输入\n"
# help.c:104
-#: help.c:105
+#: help.c:90
#, c-format
msgid " -e, --echo-queries echo commands sent to server\n"
msgstr " -e, --echo-queries 显示发送给服务器的命令\n"
# help.c:105
-#: help.c:106
+#: help.c:91
#, c-format
msgid ""
" -E, --echo-hidden display queries that internal commands generate\n"
msgstr " -E, --echo-hidden 显示内部命令产生的查询\n"
# help.c:107
-#: help.c:107
+#: help.c:92
#, c-format
msgid " -L, --log-file=FILENAME send session log to file\n"
msgstr " -L, --log-file=文件名 将会话日志写入文件\n"
# help.c:108
-#: help.c:108
+#: help.c:93
#, c-format
msgid ""
" -n, --no-readline disable enhanced command line editing (readline)\n"
msgstr " -n, --no-readline 禁用增强命令行编辑功能(readline)\n"
# help.c:107
-#: help.c:109
+#: help.c:94
#, c-format
msgid " -o, --output=FILENAME send query results to file (or |pipe)\n"
msgstr " -o, --output=FILENAME 将查询结果写入文件(或 |管道)\n"
# help.c:106
-#: help.c:110
+#: help.c:95
#, c-format
msgid ""
" -q, --quiet run quietly (no messages, only query output)\n"
msgstr " -q, --quiet 以沉默模式运行(不显示消息,只有查询结果)\n"
# help.c:109
-#: help.c:111
+#: help.c:96
#, c-format
msgid " -s, --single-step single-step mode (confirm each query)\n"
msgstr " -s, --single-step 单步模式 (确认每个查询)\n"
# help.c:110
-#: help.c:112
+#: help.c:97
#, c-format
msgid ""
" -S, --single-line single-line mode (end of line terminates SQL "
@@ -2154,7 +2233,7 @@ msgid ""
msgstr " -S, --single-line 单行模式 (一行就是一条 SQL 命令)\n"
# help.c:112
-#: help.c:114
+#: help.c:99
#, c-format
msgid ""
"\n"
@@ -2164,29 +2243,33 @@ msgstr ""
"输出格式选项 :\n"
# help.c:113
-#: help.c:115
+#: help.c:100
#, c-format
msgid " -A, --no-align unaligned table output mode\n"
msgstr " -A, --no-align 使用非对齐表格输出模式\n"
# help.c:119
-#: help.c:116
+#: help.c:101
#, c-format
+#| msgid ""
+#| " -F, --field-separator=STRING\n"
+#| " set field separator (default: \"%s\")\n"
msgid ""
" -F, --field-separator=STRING\n"
-" set field separator (default: \"%s\")\n"
+" field separator for unaligned output (default: "
+"\"%s\")\n"
msgstr ""
-" -F, --field-separator=字符串\n"
-" 设字段分隔符(缺省:\"%s\")\n"
+" -F, --field-separator=STRING\n"
+" 为字段设置分隔符,用于不整齐的输出(缺省:\"%s\")\n"
# help.c:114
-#: help.c:119
+#: help.c:104
#, c-format
msgid " -H, --html HTML table output mode\n"
msgstr " -H, --html HTML 表格输出模式\n"
# help.c:118
-#: help.c:120
+#: help.c:105
#, c-format
msgid ""
" -P, --pset=VAR[=ARG] set printing option VAR to ARG (see \\pset "
@@ -2195,23 +2278,27 @@ msgstr ""
" -P, --pset=变量[=参数] 设置将变量打印到参数的选项(查阅 \\pset 命令)\n"
# help.c:121
-#: help.c:121
+#: help.c:106
#, c-format
+#| msgid ""
+#| " -R, --record-separator=STRING\n"
+#| " set record separator (default: newline)\n"
msgid ""
" -R, --record-separator=STRING\n"
-" set record separator (default: newline)\n"
+" record separator for unaligned output (default: "
+"newline)\n"
msgstr ""
-" -R, --record-separator=字符串\n"
-" 设定记录分隔符(缺省:换行符号)\n"
+" -R, --record-separator=STRING\n"
+" 为不整齐的输出设置字录的分隔符(缺省:换行符号)\n"
# help.c:115
-#: help.c:123
+#: help.c:108
#, c-format
msgid " -t, --tuples-only print rows only\n"
msgstr " -t, --tuples-only 只打印记录i\n"
# help.c:116
-#: help.c:124
+#: help.c:109
#, c-format
msgid ""
" -T, --table-attr=TEXT set HTML table tag attributes (e.g., width, "
@@ -2219,32 +2306,40 @@ msgid ""
msgstr " -T, --table-attr=文本 设定 HTML 表格标记属性(例如,宽度,边界)\n"
# help.c:117
-#: help.c:125
+#: help.c:110
#, c-format
msgid " -x, --expanded turn on expanded table output\n"
msgstr " -x, --expanded 打开扩展表格输出\n"
# help.c:119
-#: help.c:126
+#: help.c:111
#, c-format
+#| msgid ""
+#| " -z, --field-separator-zero\n"
+#| " set field separator to zero byte\n"
msgid ""
" -z, --field-separator-zero\n"
-" set field separator to zero byte\n"
+" set field separator for unaligned output to zero "
+"byte\n"
msgstr ""
" -z, --field-separator-zero\n"
-" 设置字段分隔符为字节0\n"
+" 为不整齐的输出设置字段分隔符为字节0\n"
# help.c:121
-#: help.c:128
+#: help.c:113
#, c-format
+#| msgid ""
+#| " -0, --record-separator-zero\n"
+#| " set record separator to zero byte\n"
msgid ""
" -0, --record-separator-zero\n"
-" set record separator to zero byte\n"
+" set record separator for unaligned output to zero "
+"byte\n"
msgstr ""
" -0, --record-separator-zero\n"
-" 设置记录分隔符为字节0\n"
+" 为不整齐的输出设置记录分隔符为字节0\n"
-#: help.c:131
+#: help.c:116
#, c-format
msgid ""
"\n"
@@ -2254,7 +2349,7 @@ msgstr ""
"联接选项:\n"
# help.c:126
-#: help.c:134
+#: help.c:119
#, c-format
msgid ""
" -h, --host=HOSTNAME database server host or socket directory "
@@ -2263,28 +2358,28 @@ msgstr ""
" -h, --host=主机名 数据库服务器主机或socket目录(缺省:\"%s\")\n"
# help.c:127
-#: help.c:135
+#: help.c:120
msgid "local socket"
msgstr "本地接口"
# help.c:130
-#: help.c:138
+#: help.c:123
#, c-format
msgid " -p, --port=PORT database server port (default: \"%s\")\n"
msgstr " -p, --port=端口 数据库服务器的端口(缺省:\"%s\")\n"
# help.c:136
-#: help.c:144
+#: help.c:129
#, c-format
msgid " -U, --username=USERNAME database user name (default: \"%s\")\n"
msgstr " -U, --username=用户名 指定数据库用户名(缺省:\"%s\")\n"
-#: help.c:145
+#: help.c:130
#, c-format
msgid " -w, --no-password never prompt for password\n"
msgstr " -w, --no-password 永远不提示输入口令\n"
-#: help.c:146
+#: help.c:131
#, c-format
msgid ""
" -W, --password force password prompt (should happen "
@@ -2292,7 +2387,7 @@ msgid ""
msgstr " -W, --password 强制口令提示 (自动)\n"
# help.c:140
-#: help.c:148
+#: help.c:133
#, c-format
msgid ""
"\n"
@@ -2307,43 +2402,40 @@ msgstr ""
"或者参考PostgreSQL文档中的psql章节.\n"
"\n"
-#: help.c:151
+#: help.c:136
#, c-format
msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
msgstr "臭虫报告至 <pgsql-bugs@postgresql.org>.\n"
# help.c:174
-#: help.c:172
+#: help.c:157
#, c-format
msgid "General\n"
msgstr "一般性\n"
# help.c:179
-#: help.c:173
+#: help.c:158
#, c-format
msgid ""
" \\copyright show PostgreSQL usage and distribution terms\n"
msgstr " \\copyright 显示PostgreSQL的使用和发行许可条款\n"
# help.c:194
-#: help.c:174
+#: help.c:159
#, c-format
msgid ""
" \\g [FILE] or ; execute query (and send results to file or |pipe)\n"
msgstr " \\g [文件] or; 执行查询 (并把结果写入文件或 |管道)\n"
# help.c:194
-#: help.c:175
+#: help.c:160
#, c-format
-#| msgid ""
-#| " \\g [FILE] or ; execute query (and send results to file or |"
-#| "pipe)\n"
msgid ""
" \\gset [PREFIX] execute query and store results in psql variables\n"
msgstr " \\gset [PREFIX] 执行查询并把结果存到psql变量中\n"
# help.c:182
-#: help.c:176
+#: help.c:161
#, c-format
msgid ""
" \\h [NAME] help on syntax of SQL commands, * for all "
@@ -2351,24 +2443,24 @@ msgid ""
msgstr " \\h [名称] SQL命令语法上的说明,用*显示全部命令的语法说明\n"
# help.c:183
-#: help.c:177
+#: help.c:162
#, c-format
msgid " \\q quit psql\n"
msgstr " \\q 退出 psql\n"
-#: help.c:178
+#: help.c:163
#, c-format
msgid " \\watch [SEC] execute query every SEC seconds\n"
msgstr " \\watch [SEC] 每隔SEC秒执行一次查询\n"
# help.c:192
-#: help.c:181
+#: help.c:166
#, c-format
msgid "Query Buffer\n"
msgstr "查询缓存区\n"
# help.c:193
-#: help.c:182
+#: help.c:167
#, c-format
msgid ""
" \\e [FILE] [LINE] edit the query buffer (or file) with external "
@@ -2376,44 +2468,44 @@ msgid ""
msgstr " \\e [FILE] [LINE] 使用外部编辑器编辑查询缓存区(或文件)\n"
# help.c:193
-#: help.c:183
+#: help.c:168
#, c-format
msgid ""
" \\ef [FUNCNAME [LINE]] edit function definition with external editor\n"
msgstr " \\ef [FUNCNAME [LINE]] 使用外部编辑器编辑函数定义\n"
# help.c:195
-#: help.c:184
+#: help.c:169
#, c-format
msgid " \\p show the contents of the query buffer\n"
msgstr " \\p 显示查询缓存区的内容\n"
# help.c:196
-#: help.c:185
+#: help.c:170
#, c-format
msgid " \\r reset (clear) the query buffer\n"
msgstr " \\r 重置(清除)查询缓存区\n"
# help.c:198
-#: help.c:187
+#: help.c:172
#, c-format
msgid " \\s [FILE] display history or save it to file\n"
msgstr " \\s [文件] 显示历史记录或将历史记录保存在文件中\n"
# help.c:200
-#: help.c:189
+#: help.c:174
#, c-format
msgid " \\w FILE write query buffer to file\n"
msgstr " \\w 文件 将查询缓存区的内容写入文件\n"
# help.c:203
-#: help.c:192
+#: help.c:177
#, c-format
msgid "Input/Output\n"
msgstr "输入/输出\n"
# help.c:251
-#: help.c:193
+#: help.c:178
#, c-format
msgid ""
" \\copy ... perform SQL COPY with data stream to the client "
@@ -2421,19 +2513,19 @@ msgid ""
msgstr " \\copy ... 执行 SQL COPY,将数据流发送到客户端主机\n"
# help.c:204
-#: help.c:194
+#: help.c:179
#, c-format
msgid " \\echo [STRING] write string to standard output\n"
msgstr " \\echo [字符串] 将字符串写到标准输出\n"
# help.c:205
-#: help.c:195
+#: help.c:180
#, c-format
msgid " \\i FILE execute commands from file\n"
msgstr " \\i 文件 从文件中执行命令\n"
# help.c:206
-#: help.c:196
+#: help.c:181
#, c-format
msgid ""
" \\ir FILE as \\i, but relative to location of current "
@@ -2441,289 +2533,286 @@ msgid ""
msgstr " \\ir FILE 与 \\i类似, 但是相对于当前脚本的位置\n"
# help.c:206
-#: help.c:197
+#: help.c:182
#, c-format
msgid " \\o [FILE] send all query results to file or |pipe\n"
msgstr " \\o [文件] 将全部查询结果写入文件或 |管道\n"
# help.c:207
-#: help.c:198
+#: help.c:183
#, c-format
msgid ""
" \\qecho [STRING] write string to query output stream (see \\o)\n"
msgstr " \\qecho [字符串] 将字符串写到查询输出串流(参考 \\o)\n"
# help.c:211
-#: help.c:201
+#: help.c:186
#, c-format
msgid "Informational\n"
msgstr "资讯性\n"
-#: help.c:202
+#: help.c:187
#, c-format
msgid " (options: S = show system objects, + = additional detail)\n"
msgstr " (选项: S = 显示系统对象, + = 其余的详细信息)\n"
# help.c:226
-#: help.c:203
+#: help.c:188
#, c-format
msgid " \\d[S+] list tables, views, and sequences\n"
msgstr " \\d[S+] 列出表,视图和序列\n"
# help.c:212
-#: help.c:204
+#: help.c:189
#, c-format
msgid " \\d[S+] NAME describe table, view, sequence, or index\n"
msgstr " \\d[S+] 名称 描述表,视图,序列,或索引\n"
# help.c:215
-#: help.c:205
+#: help.c:190
#, c-format
msgid " \\da[S] [PATTERN] list aggregates\n"
msgstr " \\da[S] [模式] 列出聚合函数\n"
# help.c:228
-#: help.c:206
+#: help.c:191
#, c-format
msgid " \\db[+] [PATTERN] list tablespaces\n"
msgstr " \\db[+] [模式] 列出表空间\n"
# help.c:217
-#: help.c:207
+#: help.c:192
#, c-format
msgid " \\dc[S+] [PATTERN] list conversions\n"
msgstr " \\dc[S+] [PATTERN] 列表转换\n"
# help.c:218
-#: help.c:208
+#: help.c:193
#, c-format
msgid " \\dC[+] [PATTERN] list casts\n"
msgstr " \\dC[+] [PATTERN] 列出类型强制转换\n"
# help.c:219
-#: help.c:209
+#: help.c:194
#, c-format
msgid ""
" \\dd[S] [PATTERN] show object descriptions not displayed elsewhere\n"
msgstr " \\dd[S] [PATTERN] 显示没有在别处显示的对象描述\n"
# help.c:218
-#: help.c:210
+#: help.c:195
#, c-format
msgid " \\ddp [PATTERN] list default privileges\n"
msgstr " \\ddp [模式] 列出缺省权限\n"
# help.c:220
-#: help.c:211
+#: help.c:196
#, c-format
msgid " \\dD[S+] [PATTERN] list domains\n"
msgstr " \\dD[S+] [PATTERN] 列出共同值域\n"
# help.c:228
-#: help.c:212
+#: help.c:197
#, c-format
msgid " \\det[+] [PATTERN] list foreign tables\n"
msgstr " \\det[+] [PATTERN] 列出引用表\n"
# help.c:228
-#: help.c:213
+#: help.c:198
#, c-format
msgid " \\des[+] [PATTERN] list foreign servers\n"
msgstr " \\des[+] [模式] 列出外部服务器\n"
# help.c:228
-#: help.c:214
+#: help.c:199
#, c-format
msgid " \\deu[+] [PATTERN] list user mappings\n"
msgstr " \\deu[+] [模式] 列出用户映射\n"
# help.c:222
-#: help.c:215
+#: help.c:200
#, c-format
msgid " \\dew[+] [PATTERN] list foreign-data wrappers\n"
msgstr " \\dew[+] [模式] 列出外部数据封装器\n"
# help.c:215
-#: help.c:216
+#: help.c:201
#, c-format
msgid ""
" \\df[antw][S+] [PATRN] list [only agg/normal/trigger/window] functions\n"
msgstr " \\df[antw][S+] [模式] 列出[只包括 聚合/常规/触发器/窗口]函数 \n"
# help.c:221
-#: help.c:217
+#: help.c:202
#, c-format
msgid " \\dF[+] [PATTERN] list text search configurations\n"
msgstr " \\dF[+] [模式] 列出文本搜索配置\n"
# help.c:228
-#: help.c:218
+#: help.c:203
#, c-format
msgid " \\dFd[+] [PATTERN] list text search dictionaries\n"
msgstr " \\dFd[+] [模式] 列出文本搜寻字典\n"
# help.c:228
-#: help.c:219
+#: help.c:204
#, c-format
msgid " \\dFp[+] [PATTERN] list text search parsers\n"
msgstr " \\dFp[+] [模式] 列出文本搜索解析器\n"
# help.c:228
-#: help.c:220
+#: help.c:205
#, c-format
msgid " \\dFt[+] [PATTERN] list text search templates\n"
msgstr " \\dFt[+] [模式] 列出文本搜索模版\n"
# help.c:222
-#: help.c:221
+#: help.c:206
#, c-format
msgid " \\dg[+] [PATTERN] list roles\n"
msgstr " \\dg[+] [PATTERN] 列出角色\n"
# help.c:220
-#: help.c:222
+#: help.c:207
#, c-format
msgid " \\di[S+] [PATTERN] list indexes\n"
msgstr " \\di[S+] [模式] 列出索引\n"
# help.c:225
-#: help.c:223
+#: help.c:208
#, c-format
msgid " \\dl list large objects, same as \\lo_list\n"
msgstr " \\dl 列出大对象, 功能与\\lo_list相同\n"
# help.c:228
-#: help.c:224
+#: help.c:209
#, c-format
msgid " \\dL[S+] [PATTERN] list procedural languages\n"
msgstr " \\dL[S+] [PATTERN] 列出所有过程语言\n"
# help.c:228
-#: help.c:225
+#: help.c:210
#, c-format
-#| msgid " \\dv[S+] [PATTERN] list views\n"
msgid " \\dm[S+] [PATTERN] list materialized views\n"
msgstr " \\dm[S+] [PATTERN] 列出所有物化视图\n"
# help.c:228
-#: help.c:226
+#: help.c:211
#, c-format
msgid " \\dn[S+] [PATTERN] list schemas\n"
msgstr " \\dn[S+] [PATTERN] 列出所有模式\n"
# help.c:224
-#: help.c:227
+#: help.c:212
#, c-format
msgid " \\do[S] [PATTERN] list operators\n"
msgstr " \\do[S] [模式] 列出运算符\n"
# help.c:220
-#: help.c:228
+#: help.c:213
#, c-format
msgid " \\dO[S+] [PATTERN] list collations\n"
msgstr " \\dO[S+] [PATTERN] 列出所有校对规则\n"
# help.c:226
-#: help.c:229
+#: help.c:214
#, c-format
msgid ""
" \\dp [PATTERN] list table, view, and sequence access privileges\n"
msgstr " \\dp [模式] 列出表,视图和序列的访问权限\n"
-#: help.c:230
+#: help.c:215
#, c-format
msgid " \\drds [PATRN1 [PATRN2]] list per-database role settings\n"
msgstr " \\drds [模式1 [模式2]] 列出每个数据库的角色设置\n"
# help.c:228
-#: help.c:231
+#: help.c:216
#, c-format
msgid " \\ds[S+] [PATTERN] list sequences\n"
msgstr " \\ds[S+] [模式] 列出序列\n"
# help.c:228
-#: help.c:232
+#: help.c:217
#, c-format
msgid " \\dt[S+] [PATTERN] list tables\n"
msgstr " \\dt[S+] [模式] 列出表\n"
# help.c:220
-#: help.c:233
+#: help.c:218
#, c-format
msgid " \\dT[S+] [PATTERN] list data types\n"
msgstr " \\dT[S+] [模式] 列出数据类型\n"
# help.c:228
-#: help.c:234
+#: help.c:219
#, c-format
msgid " \\du[+] [PATTERN] list roles\n"
msgstr " \\du[+] [PATTERN] 列出角色\n"
# help.c:228
-#: help.c:235
+#: help.c:220
#, c-format
msgid " \\dv[S+] [PATTERN] list views\n"
msgstr " \\dv[S+] [模式] 列出视图\n"
# help.c:228
-#: help.c:236
+#: help.c:221
#, c-format
msgid " \\dE[S+] [PATTERN] list foreign tables\n"
msgstr " \\dE[S+] [PATTERN] 列出引用表\n"
# help.c:217
-#: help.c:237
+#: help.c:222
#, c-format
msgid " \\dx[+] [PATTERN] list extensions\n"
msgstr " \\dx[+] [PATTERN] 列出扩展\n"
# help.c:218
-#: help.c:238
+#: help.c:223
#, c-format
-#| msgid " \\ddp [PATTERN] list default privileges\n"
msgid " \\dy [PATTERN] list event triggers\n"
msgstr " \\dy [PATTERN] 列出所有事件触发器\n"
# help.c:228
-#: help.c:239
+#: help.c:224
#, c-format
-#| msgid " \\dt[S+] [PATTERN] list tables\n"
msgid " \\l[+] [PATTERN] list databases\n"
msgstr " \\l[+] [PATTERN] 列出所有数据库\n"
# help.c:193
-#: help.c:240
+#: help.c:225
#, c-format
msgid " \\sf[+] FUNCNAME show a function's definition\n"
msgstr " \\sf[+] FUNCNAME 显示函数定义\n"
# help.c:218
-#: help.c:241
+#: help.c:226
#, c-format
msgid " \\z [PATTERN] same as \\dp\n"
msgstr " \\z [模式] 和\\dp的功能相同\n"
# help.c:233
-#: help.c:244
+#: help.c:229
#, c-format
msgid "Formatting\n"
msgstr "格式化\n"
# help.c:234
-#: help.c:245
+#: help.c:230
#, c-format
msgid ""
" \\a toggle between unaligned and aligned output mode\n"
msgstr " \\a 在非对齐模式和对齐模式之间切换\n"
# help.c:235
-#: help.c:246
+#: help.c:231
#, c-format
msgid " \\C [STRING] set table title, or unset if none\n"
msgstr " \\C [字符串] 设置表的标题,或如果没有的标题就取消\n"
# help.c:236
-#: help.c:247
+#: help.c:232
#, c-format
msgid ""
" \\f [STRING] show or set field separator for unaligned query "
@@ -2731,16 +2820,22 @@ msgid ""
msgstr " \\f [字符串] 显示或设定非对齐模式查询输出的字段分隔符\n"
# help.c:237
-#: help.c:248
+#: help.c:233
#, c-format
msgid " \\H toggle HTML output mode (currently %s)\n"
msgstr " \\H 切换HTML输出模式 (目前是 %s)\n"
# help.c:239
-#: help.c:250
+#: help.c:235
#, c-format
+#| msgid ""
+#| " \\pset NAME [VALUE] set table output option\n"
+#| " (NAME := {format|border|expanded|fieldsep|"
+#| "fieldsep_zero|footer|null|\n"
+#| " numericlocale|recordsep|recordsep_zero|"
+#| "tuples_only|title|tableattr|pager})\n"
msgid ""
-" \\pset NAME [VALUE] set table output option\n"
+" \\pset [NAME [VALUE]] set table output option\n"
" (NAME := {format|border|expanded|fieldsep|"
"fieldsep_zero|footer|null|\n"
" numericlocale|recordsep|recordsep_zero|tuples_only|"
@@ -2753,13 +2848,13 @@ msgstr ""
"title|tableattr|pager})\n"
# help.c:243
-#: help.c:253
+#: help.c:238
#, c-format
msgid " \\t [on|off] show only rows (currently %s)\n"
msgstr " \\t [开|关] 只显示记录 (目前是 %s)\n"
# help.c:245
-#: help.c:255
+#: help.c:240
#, c-format
msgid ""
" \\T [STRING] set HTML <table> tag attributes, or unset if none\n"
@@ -2767,19 +2862,19 @@ msgstr ""
" \\T [字符串] 设置HTML <表格>标签属性, 或者如果没有的话取消设置\n"
# help.c:246
-#: help.c:256
+#: help.c:241
#, c-format
msgid " \\x [on|off|auto] toggle expanded output (currently %s)\n"
msgstr " \\x [on|off|auto] 切换扩展输出模式(目前是 %s)\n"
# help.c:123
-#: help.c:260
+#: help.c:245
#, c-format
msgid "Connection\n"
msgstr "连接\n"
# help.c:175
-#: help.c:262
+#: help.c:247
#, c-format
msgid ""
" \\c[onnect] [DBNAME|- USER|- HOST|- PORT|-]\n"
@@ -2789,11 +2884,8 @@ msgstr ""
" 连接到新的数据库(目前是 \"%s\")\n"
# help.c:175
-#: help.c:266
+#: help.c:251
#, c-format
-#| msgid ""
-#| " \\c[onnect] [DBNAME|- USER|- HOST|- PORT|-]\n"
-#| " connect to new database (currently \"%s\")\n"
msgid ""
" \\c[onnect] [DBNAME|- USER|- HOST|- PORT|-]\n"
" connect to new database (currently no connection)\n"
@@ -2802,66 +2894,66 @@ msgstr ""
" 连接到新的数据库(当前没有连接)\n"
# help.c:180
-#: help.c:268
+#: help.c:253
#, c-format
msgid " \\encoding [ENCODING] show or set client encoding\n"
msgstr " \\encoding [编码名称] 显示或设定客户端编码\n"
-#: help.c:269
+#: help.c:254
#, c-format
msgid " \\password [USERNAME] securely change the password for a user\n"
msgstr " \\password [USERNAME] 安全地为用户改变口令\n"
-#: help.c:270
+#: help.c:255
#, c-format
msgid ""
" \\conninfo display information about current connection\n"
msgstr " \\conninfo 显示当前连接的相关信息\n"
-#: help.c:273
+#: help.c:258
#, c-format
msgid "Operating System\n"
msgstr "操作系统\n"
# help.c:178
-#: help.c:274
+#: help.c:259
#, c-format
msgid " \\cd [DIR] change the current working directory\n"
msgstr " \\cd [目录] 改变目前的工作目录\n"
# help.c:188
-#: help.c:275
+#: help.c:260
#, c-format
msgid " \\setenv NAME [VALUE] set or unset environment variable\n"
msgstr " \\setenv NAME [VALUE] 设置或清空环境变量\n"
# help.c:186
-#: help.c:276
+#: help.c:261
#, c-format
msgid " \\timing [on|off] toggle timing of commands (currently %s)\n"
msgstr " \\timing [开|关] 切换命令计时开关 (目前是 %s)\n"
# help.c:189
-#: help.c:278
+#: help.c:263
#, c-format
msgid ""
" \\! [COMMAND] execute command in shell or start interactive "
"shell\n"
msgstr " \\! [命令] 在 shell中执行命令或启动一个交互式shell\n"
-#: help.c:281
+#: help.c:266
#, c-format
msgid "Variables\n"
msgstr "变量\n"
# help.c:188
-#: help.c:282
+#: help.c:267
#, c-format
msgid " \\prompt [TEXT] NAME prompt user to set internal variable\n"
msgstr " \\prompt [文本] 名称 提示用户设定内部变量\n"
# help.c:184
-#: help.c:283
+#: help.c:268
#, c-format
msgid ""
" \\set [NAME [VALUE]] set internal variable, or list all if no "
@@ -2869,19 +2961,19 @@ msgid ""
msgstr " \\set [名称 [值数]] 设定内部变量,若无参数则列出全部变量\n"
# help.c:188
-#: help.c:284
+#: help.c:269
#, c-format
msgid " \\unset NAME unset (delete) internal variable\n"
msgstr " \\unset 名称 清空(删除)内部变量\n"
# large_obj.c:264
-#: help.c:287
+#: help.c:272
#, c-format
msgid "Large Objects\n"
msgstr "大对象\n"
# help.c:252
-#: help.c:288
+#: help.c:273
#, c-format
msgid ""
" \\lo_export LOBOID FILE\n"
@@ -2895,12 +2987,12 @@ msgstr ""
" \\lo_unlink LOBOID 大对象运算\n"
# help.c:285
-#: help.c:335
+#: help.c:320
msgid "Available help:\n"
msgstr "可用的说明:\n"
# help.c:344
-#: help.c:419
+#: help.c:404
#, c-format
msgid ""
"Command: %s\n"
@@ -2916,7 +3008,7 @@ msgstr ""
"\n"
# help.c:357
-#: help.c:435
+#: help.c:420
#, c-format
msgid ""
"No help available for \"%s\".\n"
@@ -2926,19 +3018,19 @@ msgstr ""
"请尝试用不带参数的 \\h 来看一下是否有可使用的帮助信息.\n"
# input.c:210
-#: input.c:193
+#: input.c:194
#, c-format
msgid "could not read from input file: %s\n"
msgstr "无法从输入档案读取:%s\n"
# input.c:210
-#: input.c:407
+#: input.c:451 input.c:490
#, c-format
msgid "could not save history to file \"%s\": %s\n"
msgstr "无法将历史记录储存到 \"%s\":%s\n"
# input.c:213
-#: input.c:412
+#: input.c:510
#, c-format
msgid "history is not supported by this installation\n"
msgstr "这个安装不支援命令记录\n"
@@ -3004,47 +3096,47 @@ msgid_plural "(%lu rows)"
msgstr[0] "(%lu 行记录)"
# print.c:428
-#: print.c:1175
+#: print.c:1174
#, c-format
msgid "(No rows)\n"
msgstr "(无资料列)\n"
-#: print.c:2239
+#: print.c:2238
#, c-format
msgid "Interrupted\n"
msgstr "已中断\n"
-#: print.c:2305
+#: print.c:2304
#, c-format
msgid "Cannot add header to table content: column count of %d exceeded.\n"
msgstr "无法对表的内容增加标题:已经超过%d列的数量.\n"
-#: print.c:2345
+#: print.c:2344
#, c-format
msgid "Cannot add cell to table content: total cell count of %d exceeded.\n"
msgstr "无法对表的内容添加单元: 总共有%d个单元超过.\n"
-#: print.c:2571
+#: print.c:2570
#, c-format
msgid "invalid output format (internal error): %d"
msgstr "无效的输出格式 (内部错误): %d"
-#: psqlscan.l:726
+#: psqlscan.l:727
#, c-format
msgid "skipping recursive expansion of variable \"%s\"\n"
msgstr "跳过变量 \"%s\"的递归扩展\n"
-#: psqlscan.l:1601
+#: psqlscan.l:1604
#, c-format
msgid "unterminated quoted string\n"
msgstr "未结束的引用字符串\n"
-#: psqlscan.l:1701
+#: psqlscan.l:1704
#, c-format
msgid "%s: out of memory\n"
msgstr "%s: 内存溢出\n"
-#: psqlscan.l:1930
+#: psqlscan.l:1933
#, c-format
msgid "can't escape without active connection\n"
msgstr "没有数据库连接时无法escape\n"
@@ -3061,404 +3153,438 @@ msgstr "没有数据库连接时无法escape\n"
# describe.c:1586
# describe.c:1634
# describe.c:1727
-#: sql_help.c:26 sql_help.c:29 sql_help.c:32 sql_help.c:44 sql_help.c:46
-#: sql_help.c:48 sql_help.c:59 sql_help.c:61 sql_help.c:63 sql_help.c:87
-#: sql_help.c:91 sql_help.c:93 sql_help.c:95 sql_help.c:97 sql_help.c:100
-#: sql_help.c:102 sql_help.c:104 sql_help.c:197 sql_help.c:199 sql_help.c:200
-#: sql_help.c:202 sql_help.c:204 sql_help.c:207 sql_help.c:209 sql_help.c:211
-#: sql_help.c:213 sql_help.c:225 sql_help.c:226 sql_help.c:227 sql_help.c:229
-#: sql_help.c:268 sql_help.c:270 sql_help.c:272 sql_help.c:274 sql_help.c:322
-#: sql_help.c:327 sql_help.c:329 sql_help.c:360 sql_help.c:362 sql_help.c:365
-#: sql_help.c:367 sql_help.c:420 sql_help.c:425 sql_help.c:430 sql_help.c:435
-#: sql_help.c:473 sql_help.c:475 sql_help.c:477 sql_help.c:480 sql_help.c:490
-#: sql_help.c:492 sql_help.c:530 sql_help.c:532 sql_help.c:535 sql_help.c:537
-#: sql_help.c:562 sql_help.c:566 sql_help.c:579 sql_help.c:582 sql_help.c:585
-#: sql_help.c:605 sql_help.c:617 sql_help.c:625 sql_help.c:628 sql_help.c:631
-#: sql_help.c:661 sql_help.c:667 sql_help.c:669 sql_help.c:673 sql_help.c:676
-#: sql_help.c:679 sql_help.c:688 sql_help.c:699 sql_help.c:701 sql_help.c:718
-#: sql_help.c:727 sql_help.c:729 sql_help.c:731 sql_help.c:743 sql_help.c:747
-#: sql_help.c:749 sql_help.c:810 sql_help.c:812 sql_help.c:815 sql_help.c:818
-#: sql_help.c:820 sql_help.c:878 sql_help.c:880 sql_help.c:882 sql_help.c:885
-#: sql_help.c:906 sql_help.c:909 sql_help.c:912 sql_help.c:915 sql_help.c:919
-#: sql_help.c:921 sql_help.c:923 sql_help.c:925 sql_help.c:939 sql_help.c:942
-#: sql_help.c:944 sql_help.c:946 sql_help.c:956 sql_help.c:958 sql_help.c:968
-#: sql_help.c:970 sql_help.c:979 sql_help.c:1000 sql_help.c:1002
-#: sql_help.c:1004 sql_help.c:1007 sql_help.c:1009 sql_help.c:1011
-#: sql_help.c:1049 sql_help.c:1055 sql_help.c:1057 sql_help.c:1060
-#: sql_help.c:1062 sql_help.c:1064 sql_help.c:1091 sql_help.c:1094
-#: sql_help.c:1096 sql_help.c:1098 sql_help.c:1100 sql_help.c:1102
-#: sql_help.c:1105 sql_help.c:1145 sql_help.c:1336 sql_help.c:1344
-#: sql_help.c:1388 sql_help.c:1392 sql_help.c:1402 sql_help.c:1420
-#: sql_help.c:1443 sql_help.c:1461 sql_help.c:1489 sql_help.c:1548
-#: sql_help.c:1590 sql_help.c:1612 sql_help.c:1632 sql_help.c:1633
-#: sql_help.c:1668 sql_help.c:1688 sql_help.c:1710 sql_help.c:1738
-#: sql_help.c:1759 sql_help.c:1794 sql_help.c:1975 sql_help.c:1988
-#: sql_help.c:2005 sql_help.c:2021 sql_help.c:2044 sql_help.c:2095
-#: sql_help.c:2099 sql_help.c:2101 sql_help.c:2107 sql_help.c:2125
-#: sql_help.c:2152 sql_help.c:2186 sql_help.c:2198 sql_help.c:2207
-#: sql_help.c:2251 sql_help.c:2269 sql_help.c:2277 sql_help.c:2285
-#: sql_help.c:2293 sql_help.c:2301 sql_help.c:2309 sql_help.c:2317
-#: sql_help.c:2325 sql_help.c:2334 sql_help.c:2345 sql_help.c:2353
-#: sql_help.c:2361 sql_help.c:2369 sql_help.c:2377 sql_help.c:2387
-#: sql_help.c:2396 sql_help.c:2405 sql_help.c:2413 sql_help.c:2421
-#: sql_help.c:2430 sql_help.c:2438 sql_help.c:2446 sql_help.c:2454
-#: sql_help.c:2462 sql_help.c:2470 sql_help.c:2478 sql_help.c:2486
-#: sql_help.c:2494 sql_help.c:2502 sql_help.c:2511 sql_help.c:2519
-#: sql_help.c:2536 sql_help.c:2551 sql_help.c:2757 sql_help.c:2808
-#: sql_help.c:2836 sql_help.c:2844 sql_help.c:3214 sql_help.c:3262
-#: sql_help.c:3370
+#: sql_help.c:32 sql_help.c:35 sql_help.c:38 sql_help.c:60 sql_help.c:62
+#: sql_help.c:64 sql_help.c:75 sql_help.c:77 sql_help.c:79 sql_help.c:103
+#: sql_help.c:107 sql_help.c:109 sql_help.c:111 sql_help.c:113 sql_help.c:116
+#: sql_help.c:118 sql_help.c:120 sql_help.c:213 sql_help.c:215 sql_help.c:216
+#: sql_help.c:218 sql_help.c:220 sql_help.c:223 sql_help.c:225 sql_help.c:227
+#: sql_help.c:229 sql_help.c:241 sql_help.c:242 sql_help.c:243 sql_help.c:245
+#: sql_help.c:290 sql_help.c:292 sql_help.c:294 sql_help.c:296 sql_help.c:354
+#: sql_help.c:359 sql_help.c:361 sql_help.c:396 sql_help.c:398 sql_help.c:401
+#: sql_help.c:403 sql_help.c:460 sql_help.c:465 sql_help.c:470 sql_help.c:475
+#: sql_help.c:515 sql_help.c:517 sql_help.c:519 sql_help.c:522 sql_help.c:524
+#: sql_help.c:535 sql_help.c:537 sql_help.c:577 sql_help.c:579 sql_help.c:582
+#: sql_help.c:584 sql_help.c:586 sql_help.c:612 sql_help.c:616 sql_help.c:629
+#: sql_help.c:632 sql_help.c:635 sql_help.c:655 sql_help.c:667 sql_help.c:675
+#: sql_help.c:678 sql_help.c:681 sql_help.c:711 sql_help.c:717 sql_help.c:719
+#: sql_help.c:723 sql_help.c:726 sql_help.c:729 sql_help.c:738 sql_help.c:749
+#: sql_help.c:751 sql_help.c:768 sql_help.c:777 sql_help.c:779 sql_help.c:781
+#: sql_help.c:793 sql_help.c:797 sql_help.c:799 sql_help.c:878 sql_help.c:880
+#: sql_help.c:883 sql_help.c:886 sql_help.c:888 sql_help.c:890 sql_help.c:951
+#: sql_help.c:953 sql_help.c:955 sql_help.c:958 sql_help.c:979 sql_help.c:982
+#: sql_help.c:985 sql_help.c:988 sql_help.c:992 sql_help.c:994 sql_help.c:996
+#: sql_help.c:998 sql_help.c:1012 sql_help.c:1015 sql_help.c:1017
+#: sql_help.c:1019 sql_help.c:1029 sql_help.c:1031 sql_help.c:1041
+#: sql_help.c:1043 sql_help.c:1052 sql_help.c:1073 sql_help.c:1075
+#: sql_help.c:1077 sql_help.c:1080 sql_help.c:1082 sql_help.c:1084
+#: sql_help.c:1122 sql_help.c:1128 sql_help.c:1130 sql_help.c:1133
+#: sql_help.c:1135 sql_help.c:1137 sql_help.c:1164 sql_help.c:1167
+#: sql_help.c:1169 sql_help.c:1171 sql_help.c:1173 sql_help.c:1175
+#: sql_help.c:1178 sql_help.c:1218 sql_help.c:1456 sql_help.c:1472
+#: sql_help.c:1485 sql_help.c:1536 sql_help.c:1540 sql_help.c:1550
+#: sql_help.c:1568 sql_help.c:1591 sql_help.c:1609 sql_help.c:1637
+#: sql_help.c:1696 sql_help.c:1738 sql_help.c:1760 sql_help.c:1780
+#: sql_help.c:1781 sql_help.c:1816 sql_help.c:1836 sql_help.c:1858
+#: sql_help.c:1886 sql_help.c:1911 sql_help.c:1947 sql_help.c:2133
+#: sql_help.c:2146 sql_help.c:2163 sql_help.c:2179 sql_help.c:2202
+#: sql_help.c:2253 sql_help.c:2257 sql_help.c:2259 sql_help.c:2265
+#: sql_help.c:2283 sql_help.c:2310 sql_help.c:2345 sql_help.c:2357
+#: sql_help.c:2366 sql_help.c:2416 sql_help.c:2444 sql_help.c:2452
+#: sql_help.c:2460 sql_help.c:2468 sql_help.c:2476 sql_help.c:2484
+#: sql_help.c:2492 sql_help.c:2500 sql_help.c:2509 sql_help.c:2520
+#: sql_help.c:2528 sql_help.c:2536 sql_help.c:2544 sql_help.c:2552
+#: sql_help.c:2562 sql_help.c:2571 sql_help.c:2580 sql_help.c:2588
+#: sql_help.c:2596 sql_help.c:2605 sql_help.c:2613 sql_help.c:2621
+#: sql_help.c:2629 sql_help.c:2637 sql_help.c:2645 sql_help.c:2653
+#: sql_help.c:2661 sql_help.c:2669 sql_help.c:2677 sql_help.c:2686
+#: sql_help.c:2694 sql_help.c:2711 sql_help.c:2726 sql_help.c:2932
+#: sql_help.c:2983 sql_help.c:3011 sql_help.c:3019 sql_help.c:3417
+#: sql_help.c:3465 sql_help.c:3585
msgid "name"
msgstr "名称"
-# describe.c:1689
-#: sql_help.c:27 sql_help.c:30 sql_help.c:33 sql_help.c:290 sql_help.c:423
-#: sql_help.c:428 sql_help.c:433 sql_help.c:438 sql_help.c:1218
-#: sql_help.c:1551 sql_help.c:2252 sql_help.c:2337 sql_help.c:3061
-msgid "argtype"
-msgstr "参数类型"
-
-#: sql_help.c:28 sql_help.c:45 sql_help.c:60 sql_help.c:92 sql_help.c:212
-#: sql_help.c:230 sql_help.c:330 sql_help.c:366 sql_help.c:429 sql_help.c:462
-#: sql_help.c:474 sql_help.c:491 sql_help.c:536 sql_help.c:581 sql_help.c:627
-#: sql_help.c:668 sql_help.c:690 sql_help.c:700 sql_help.c:730 sql_help.c:750
-#: sql_help.c:819 sql_help.c:879 sql_help.c:922 sql_help.c:943 sql_help.c:957
-#: sql_help.c:969 sql_help.c:981 sql_help.c:1008 sql_help.c:1056
-#: sql_help.c:1099
+#: sql_help.c:33 sql_help.c:36 sql_help.c:39 sql_help.c:300 sql_help.c:1279
+#: sql_help.c:2417 sql_help.c:3234
+#| msgid "aggregates cannot return sets"
+msgid "aggregate_signature"
+msgstr "aggregate_signature"
+
+#: sql_help.c:34 sql_help.c:61 sql_help.c:76 sql_help.c:108 sql_help.c:228
+#: sql_help.c:246 sql_help.c:362 sql_help.c:402 sql_help.c:469 sql_help.c:502
+#: sql_help.c:516 sql_help.c:536 sql_help.c:583 sql_help.c:631 sql_help.c:677
+#: sql_help.c:718 sql_help.c:740 sql_help.c:750 sql_help.c:780 sql_help.c:800
+#: sql_help.c:887 sql_help.c:952 sql_help.c:995 sql_help.c:1016
+#: sql_help.c:1030 sql_help.c:1042 sql_help.c:1054 sql_help.c:1081
+#: sql_help.c:1129 sql_help.c:1172
msgid "new_name"
msgstr "新的名称"
-#: sql_help.c:31 sql_help.c:47 sql_help.c:62 sql_help.c:94 sql_help.c:210
-#: sql_help.c:228 sql_help.c:328 sql_help.c:391 sql_help.c:434 sql_help.c:493
-#: sql_help.c:502 sql_help.c:552 sql_help.c:565 sql_help.c:584 sql_help.c:630
-#: sql_help.c:702 sql_help.c:728 sql_help.c:748 sql_help.c:863 sql_help.c:881
-#: sql_help.c:924 sql_help.c:945 sql_help.c:1003 sql_help.c:1097
+#: sql_help.c:37 sql_help.c:63 sql_help.c:78 sql_help.c:110 sql_help.c:226
+#: sql_help.c:244 sql_help.c:360 sql_help.c:431 sql_help.c:474 sql_help.c:538
+#: sql_help.c:547 sql_help.c:602 sql_help.c:615 sql_help.c:634 sql_help.c:680
+#: sql_help.c:752 sql_help.c:778 sql_help.c:798 sql_help.c:935 sql_help.c:954
+#: sql_help.c:997 sql_help.c:1018 sql_help.c:1076 sql_help.c:1170
msgid "new_owner"
msgstr "新的属主"
-#: sql_help.c:34 sql_help.c:49 sql_help.c:64 sql_help.c:214 sql_help.c:271
-#: sql_help.c:368 sql_help.c:439 sql_help.c:538 sql_help.c:569 sql_help.c:587
-#: sql_help.c:633 sql_help.c:732 sql_help.c:821 sql_help.c:926 sql_help.c:947
-#: sql_help.c:959 sql_help.c:971 sql_help.c:1010 sql_help.c:1101
+#: sql_help.c:40 sql_help.c:65 sql_help.c:80 sql_help.c:230 sql_help.c:293
+#: sql_help.c:404 sql_help.c:479 sql_help.c:585 sql_help.c:619 sql_help.c:637
+#: sql_help.c:683 sql_help.c:782 sql_help.c:889 sql_help.c:999 sql_help.c:1020
+#: sql_help.c:1032 sql_help.c:1044 sql_help.c:1083 sql_help.c:1174
msgid "new_schema"
msgstr "新的模式"
-#: sql_help.c:88 sql_help.c:325 sql_help.c:389 sql_help.c:392 sql_help.c:662
-#: sql_help.c:745 sql_help.c:940 sql_help.c:1050 sql_help.c:1076
-#: sql_help.c:1293 sql_help.c:1299 sql_help.c:1492 sql_help.c:1516
-#: sql_help.c:1521 sql_help.c:1591 sql_help.c:1739 sql_help.c:1815
-#: sql_help.c:1990 sql_help.c:2153 sql_help.c:2175 sql_help.c:2570
+# describe.c:1174
+#: sql_help.c:41 sql_help.c:1326 sql_help.c:2418 sql_help.c:3253
+#| msgid "where constraint is:"
+msgid "where aggregate_signature is:"
+msgstr "其中 aggregate_signature 是:"
+
+#: sql_help.c:42 sql_help.c:45 sql_help.c:48 sql_help.c:310 sql_help.c:333
+#: sql_help.c:336 sql_help.c:339 sql_help.c:461 sql_help.c:466 sql_help.c:471
+#: sql_help.c:476 sql_help.c:1295 sql_help.c:1327 sql_help.c:1330
+#: sql_help.c:1333 sql_help.c:1457 sql_help.c:1473 sql_help.c:1476
+#: sql_help.c:1697 sql_help.c:2419 sql_help.c:2422 sql_help.c:2425
+#: sql_help.c:2510 sql_help.c:2870 sql_help.c:3149 sql_help.c:3240
+#: sql_help.c:3254 sql_help.c:3257 sql_help.c:3260
+msgid "argmode"
+msgstr "参数模式"
+
+# describe.c:480
+#: sql_help.c:43 sql_help.c:46 sql_help.c:49 sql_help.c:311 sql_help.c:334
+#: sql_help.c:337 sql_help.c:340 sql_help.c:462 sql_help.c:467 sql_help.c:472
+#: sql_help.c:477 sql_help.c:1296 sql_help.c:1328 sql_help.c:1331
+#: sql_help.c:1334 sql_help.c:1458 sql_help.c:1474 sql_help.c:1477
+#: sql_help.c:1698 sql_help.c:2420 sql_help.c:2423 sql_help.c:2426
+#: sql_help.c:2511 sql_help.c:3241 sql_help.c:3255 sql_help.c:3258
+#: sql_help.c:3261
+msgid "argname"
+msgstr "参数名称"
+
+# describe.c:1689
+#: sql_help.c:44 sql_help.c:47 sql_help.c:50 sql_help.c:312 sql_help.c:335
+#: sql_help.c:338 sql_help.c:341 sql_help.c:463 sql_help.c:468 sql_help.c:473
+#: sql_help.c:478 sql_help.c:1297 sql_help.c:1329 sql_help.c:1332
+#: sql_help.c:1335 sql_help.c:1699 sql_help.c:2421 sql_help.c:2424
+#: sql_help.c:2427 sql_help.c:2512 sql_help.c:3242 sql_help.c:3256
+#: sql_help.c:3259 sql_help.c:3262
+msgid "argtype"
+msgstr "参数类型"
+
+#: sql_help.c:104 sql_help.c:357 sql_help.c:425 sql_help.c:432 sql_help.c:712
+#: sql_help.c:795 sql_help.c:1013 sql_help.c:1123 sql_help.c:1149
+#: sql_help.c:1383 sql_help.c:1389 sql_help.c:1640 sql_help.c:1664
+#: sql_help.c:1669 sql_help.c:1739 sql_help.c:1887 sql_help.c:1968
+#: sql_help.c:2148 sql_help.c:2311 sql_help.c:2333 sql_help.c:2745
msgid "option"
msgstr "选项"
-#: sql_help.c:89 sql_help.c:663 sql_help.c:1051 sql_help.c:1592
-#: sql_help.c:1740 sql_help.c:2154
+#: sql_help.c:105 sql_help.c:713 sql_help.c:1124 sql_help.c:1740
+#: sql_help.c:1888 sql_help.c:2312
msgid "where option can be:"
msgstr "选项可以是"
-#: sql_help.c:90 sql_help.c:664 sql_help.c:1052 sql_help.c:1427
-#: sql_help.c:1741 sql_help.c:2155
+#: sql_help.c:106 sql_help.c:714 sql_help.c:1125 sql_help.c:1575
+#: sql_help.c:1889 sql_help.c:2313
msgid "connlimit"
msgstr "连接限制"
# describe.c:1342
-#: sql_help.c:96 sql_help.c:553 sql_help.c:864
+#: sql_help.c:112 sql_help.c:526 sql_help.c:588 sql_help.c:603 sql_help.c:892
+#: sql_help.c:936
msgid "new_tablespace"
msgstr "新的表空间"
# sql_help.h:366
-#: sql_help.c:98 sql_help.c:101 sql_help.c:103 sql_help.c:443 sql_help.c:445
-#: sql_help.c:446 sql_help.c:671 sql_help.c:675 sql_help.c:678 sql_help.c:1058
-#: sql_help.c:1061 sql_help.c:1063 sql_help.c:1559 sql_help.c:2861
-#: sql_help.c:3203
+#: sql_help.c:114 sql_help.c:117 sql_help.c:119 sql_help.c:483 sql_help.c:485
+#: sql_help.c:486 sql_help.c:721 sql_help.c:725 sql_help.c:728 sql_help.c:811
+#: sql_help.c:814 sql_help.c:1131 sql_help.c:1134 sql_help.c:1136
+#: sql_help.c:1707 sql_help.c:3036 sql_help.c:3406
msgid "configuration_parameter"
msgstr "配置参数"
# describe.c:415
# describe.c:543
# describe.c:1477
-#: sql_help.c:99 sql_help.c:326 sql_help.c:385 sql_help.c:390 sql_help.c:393
-#: sql_help.c:444 sql_help.c:479 sql_help.c:544 sql_help.c:550 sql_help.c:672
-#: sql_help.c:746 sql_help.c:840 sql_help.c:858 sql_help.c:884 sql_help.c:941
-#: sql_help.c:1059 sql_help.c:1077 sql_help.c:1493 sql_help.c:1517
-#: sql_help.c:1522 sql_help.c:1560 sql_help.c:1561 sql_help.c:1620
-#: sql_help.c:1652 sql_help.c:1816 sql_help.c:1890 sql_help.c:1898
-#: sql_help.c:1930 sql_help.c:1952 sql_help.c:1991 sql_help.c:2176
-#: sql_help.c:3204 sql_help.c:3205
+#: sql_help.c:115 sql_help.c:358 sql_help.c:421 sql_help.c:426 sql_help.c:433
+#: sql_help.c:484 sql_help.c:521 sql_help.c:594 sql_help.c:600 sql_help.c:722
+#: sql_help.c:796 sql_help.c:812 sql_help.c:813 sql_help.c:911 sql_help.c:930
+#: sql_help.c:957 sql_help.c:1014 sql_help.c:1132 sql_help.c:1150
+#: sql_help.c:1641 sql_help.c:1665 sql_help.c:1670 sql_help.c:1708
+#: sql_help.c:1709 sql_help.c:1768 sql_help.c:1800 sql_help.c:1969
+#: sql_help.c:2043 sql_help.c:2051 sql_help.c:2083 sql_help.c:2105
+#: sql_help.c:2122 sql_help.c:2149 sql_help.c:2334 sql_help.c:3407
+#: sql_help.c:3408
msgid "value"
msgstr "值"
-#: sql_help.c:161
+#: sql_help.c:177
msgid "target_role"
msgstr "目标角色"
-#: sql_help.c:162 sql_help.c:1476 sql_help.c:1776 sql_help.c:1781
-#: sql_help.c:2677 sql_help.c:2684 sql_help.c:2698 sql_help.c:2704
-#: sql_help.c:2956 sql_help.c:2963 sql_help.c:2977 sql_help.c:2983
+#: sql_help.c:178 sql_help.c:1624 sql_help.c:1929 sql_help.c:1934
+#: sql_help.c:2852 sql_help.c:2859 sql_help.c:2873 sql_help.c:2879
+#: sql_help.c:3131 sql_help.c:3138 sql_help.c:3152 sql_help.c:3158
msgid "schema_name"
msgstr "模式名称"
-#: sql_help.c:163
+#: sql_help.c:179
msgid "abbreviated_grant_or_revoke"
msgstr "简写形式的可授予或回收的权限"
-#: sql_help.c:164
+#: sql_help.c:180
msgid "where abbreviated_grant_or_revoke is one of:"
msgstr "简写形式的可授予或回收权限是下列内容之一"
# describe.c:1375
-#: sql_help.c:165 sql_help.c:166 sql_help.c:167 sql_help.c:168 sql_help.c:169
-#: sql_help.c:170 sql_help.c:171 sql_help.c:172 sql_help.c:1595
-#: sql_help.c:1596 sql_help.c:1597 sql_help.c:1598 sql_help.c:1599
-#: sql_help.c:1744 sql_help.c:1745 sql_help.c:1746 sql_help.c:1747
-#: sql_help.c:1748 sql_help.c:2158 sql_help.c:2159 sql_help.c:2160
-#: sql_help.c:2161 sql_help.c:2162 sql_help.c:2678 sql_help.c:2682
-#: sql_help.c:2685 sql_help.c:2687 sql_help.c:2689 sql_help.c:2691
-#: sql_help.c:2693 sql_help.c:2699 sql_help.c:2701 sql_help.c:2703
-#: sql_help.c:2705 sql_help.c:2707 sql_help.c:2709 sql_help.c:2710
-#: sql_help.c:2711 sql_help.c:2957 sql_help.c:2961 sql_help.c:2964
-#: sql_help.c:2966 sql_help.c:2968 sql_help.c:2970 sql_help.c:2972
-#: sql_help.c:2978 sql_help.c:2980 sql_help.c:2982 sql_help.c:2984
-#: sql_help.c:2986 sql_help.c:2988 sql_help.c:2989 sql_help.c:2990
-#: sql_help.c:3224
+#: sql_help.c:181 sql_help.c:182 sql_help.c:183 sql_help.c:184 sql_help.c:185
+#: sql_help.c:186 sql_help.c:187 sql_help.c:188 sql_help.c:525 sql_help.c:587
+#: sql_help.c:891 sql_help.c:1743 sql_help.c:1744 sql_help.c:1745
+#: sql_help.c:1746 sql_help.c:1747 sql_help.c:1892 sql_help.c:1893
+#: sql_help.c:1894 sql_help.c:1895 sql_help.c:1896 sql_help.c:2316
+#: sql_help.c:2317 sql_help.c:2318 sql_help.c:2319 sql_help.c:2320
+#: sql_help.c:2853 sql_help.c:2857 sql_help.c:2860 sql_help.c:2862
+#: sql_help.c:2864 sql_help.c:2866 sql_help.c:2868 sql_help.c:2874
+#: sql_help.c:2876 sql_help.c:2878 sql_help.c:2880 sql_help.c:2882
+#: sql_help.c:2884 sql_help.c:2885 sql_help.c:2886 sql_help.c:3132
+#: sql_help.c:3136 sql_help.c:3139 sql_help.c:3141 sql_help.c:3143
+#: sql_help.c:3145 sql_help.c:3147 sql_help.c:3153 sql_help.c:3155
+#: sql_help.c:3157 sql_help.c:3159 sql_help.c:3161 sql_help.c:3163
+#: sql_help.c:3164 sql_help.c:3165 sql_help.c:3427
msgid "role_name"
msgstr "角色名称"
-#: sql_help.c:198 sql_help.c:378 sql_help.c:831 sql_help.c:833 sql_help.c:1093
-#: sql_help.c:1446 sql_help.c:1450 sql_help.c:1616 sql_help.c:1902
-#: sql_help.c:1912 sql_help.c:1934 sql_help.c:2725 sql_help.c:3108
-#: sql_help.c:3109 sql_help.c:3113 sql_help.c:3118 sql_help.c:3178
-#: sql_help.c:3179 sql_help.c:3184 sql_help.c:3189 sql_help.c:3314
-#: sql_help.c:3315 sql_help.c:3319 sql_help.c:3324 sql_help.c:3396
-#: sql_help.c:3398 sql_help.c:3429 sql_help.c:3471 sql_help.c:3472
-#: sql_help.c:3476 sql_help.c:3481
+#: sql_help.c:214 sql_help.c:414 sql_help.c:902 sql_help.c:904 sql_help.c:1166
+#: sql_help.c:1594 sql_help.c:1598 sql_help.c:1764 sql_help.c:2055
+#: sql_help.c:2065 sql_help.c:2087 sql_help.c:2900 sql_help.c:3303
+#: sql_help.c:3304 sql_help.c:3308 sql_help.c:3313 sql_help.c:3381
+#: sql_help.c:3382 sql_help.c:3387 sql_help.c:3392 sql_help.c:3521
+#: sql_help.c:3522 sql_help.c:3526 sql_help.c:3531 sql_help.c:3611
+#: sql_help.c:3613 sql_help.c:3644 sql_help.c:3690 sql_help.c:3691
+#: sql_help.c:3695 sql_help.c:3700
msgid "expression"
msgstr "表达式"
-#: sql_help.c:201
+#: sql_help.c:217
msgid "domain_constraint"
msgstr "域_约束"
-#: sql_help.c:203 sql_help.c:205 sql_help.c:208 sql_help.c:816 sql_help.c:846
-#: sql_help.c:847 sql_help.c:866 sql_help.c:1206 sql_help.c:1449
-#: sql_help.c:1524 sql_help.c:1901 sql_help.c:1911
+#: sql_help.c:219 sql_help.c:221 sql_help.c:224 sql_help.c:884 sql_help.c:917
+#: sql_help.c:918 sql_help.c:919 sql_help.c:939 sql_help.c:1285
+#: sql_help.c:1597 sql_help.c:1672 sql_help.c:2054 sql_help.c:2064
msgid "constraint_name"
msgstr "约束名称"
-#: sql_help.c:206 sql_help.c:817
+#: sql_help.c:222 sql_help.c:885
msgid "new_constraint_name"
msgstr "new_constraint_name(新约束名)"
-#: sql_help.c:269 sql_help.c:744
+#: sql_help.c:291 sql_help.c:794
msgid "new_version"
msgstr "新版本"
-#: sql_help.c:273 sql_help.c:275
+#: sql_help.c:295 sql_help.c:297
msgid "member_object"
msgstr "member_object"
-#: sql_help.c:276
+#: sql_help.c:298
msgid "where member_object is:"
msgstr "member_object的位置:"
-#: sql_help.c:277 sql_help.c:1199 sql_help.c:3052
-msgid "agg_name"
-msgstr "聚合函数名称"
-
-# describe.c:1689
-#: sql_help.c:278 sql_help.c:1200 sql_help.c:3053
-msgid "agg_type"
-msgstr "聚合函数操作数据的类型"
+#: sql_help.c:299 sql_help.c:1278 sql_help.c:3233
+#| msgid "agg_name"
+msgid "aggregate_name"
+msgstr "aggregate_name"
# describe.c:1688
-#: sql_help.c:279 sql_help.c:1201 sql_help.c:1368 sql_help.c:1372
-#: sql_help.c:1374 sql_help.c:2260
+#: sql_help.c:301 sql_help.c:1280 sql_help.c:1516 sql_help.c:1520
+#: sql_help.c:1522 sql_help.c:2435
msgid "source_type"
msgstr "类型指派中的源数据类型"
# describe.c:1689
-#: sql_help.c:280 sql_help.c:1202 sql_help.c:1369 sql_help.c:1373
-#: sql_help.c:1375 sql_help.c:2261
+#: sql_help.c:302 sql_help.c:1281 sql_help.c:1517 sql_help.c:1521
+#: sql_help.c:1523 sql_help.c:2436
msgid "target_type"
msgstr "类型指派中的目标数据类型"
# describe.c:1375
-#: sql_help.c:281 sql_help.c:282 sql_help.c:283 sql_help.c:284 sql_help.c:285
-#: sql_help.c:286 sql_help.c:291 sql_help.c:295 sql_help.c:297 sql_help.c:299
-#: sql_help.c:300 sql_help.c:301 sql_help.c:302 sql_help.c:303 sql_help.c:304
-#: sql_help.c:305 sql_help.c:306 sql_help.c:307 sql_help.c:308 sql_help.c:309
-#: sql_help.c:1203 sql_help.c:1208 sql_help.c:1209 sql_help.c:1210
-#: sql_help.c:1211 sql_help.c:1212 sql_help.c:1213 sql_help.c:1214
-#: sql_help.c:1219 sql_help.c:1221 sql_help.c:1225 sql_help.c:1227
-#: sql_help.c:1229 sql_help.c:1230 sql_help.c:1233 sql_help.c:1234
-#: sql_help.c:1235 sql_help.c:1236 sql_help.c:1237 sql_help.c:1238
-#: sql_help.c:1239 sql_help.c:1240 sql_help.c:1241 sql_help.c:1244
-#: sql_help.c:1245 sql_help.c:3049 sql_help.c:3054 sql_help.c:3055
-#: sql_help.c:3056 sql_help.c:3057 sql_help.c:3063 sql_help.c:3064
-#: sql_help.c:3065 sql_help.c:3066 sql_help.c:3067 sql_help.c:3068
-#: sql_help.c:3069 sql_help.c:3070
+#: sql_help.c:303 sql_help.c:304 sql_help.c:305 sql_help.c:306 sql_help.c:307
+#: sql_help.c:308 sql_help.c:313 sql_help.c:317 sql_help.c:319 sql_help.c:321
+#: sql_help.c:322 sql_help.c:323 sql_help.c:324 sql_help.c:325 sql_help.c:326
+#: sql_help.c:327 sql_help.c:328 sql_help.c:329 sql_help.c:330 sql_help.c:331
+#: sql_help.c:1282 sql_help.c:1287 sql_help.c:1288 sql_help.c:1289
+#: sql_help.c:1290 sql_help.c:1291 sql_help.c:1292 sql_help.c:1293
+#: sql_help.c:1298 sql_help.c:1300 sql_help.c:1304 sql_help.c:1306
+#: sql_help.c:1308 sql_help.c:1309 sql_help.c:1312 sql_help.c:1313
+#: sql_help.c:1314 sql_help.c:1315 sql_help.c:1316 sql_help.c:1317
+#: sql_help.c:1318 sql_help.c:1319 sql_help.c:1320 sql_help.c:1323
+#: sql_help.c:1324 sql_help.c:3230 sql_help.c:3235 sql_help.c:3236
+#: sql_help.c:3237 sql_help.c:3238 sql_help.c:3244 sql_help.c:3245
+#: sql_help.c:3246 sql_help.c:3247 sql_help.c:3248 sql_help.c:3249
+#: sql_help.c:3250 sql_help.c:3251
msgid "object_name"
msgstr "对象_名称"
# describe.c:498
-#: sql_help.c:287 sql_help.c:615 sql_help.c:1215 sql_help.c:1370
-#: sql_help.c:1405 sql_help.c:1464 sql_help.c:1669 sql_help.c:1700
-#: sql_help.c:2049 sql_help.c:2694 sql_help.c:2973 sql_help.c:3058
-#: sql_help.c:3134 sql_help.c:3139 sql_help.c:3340 sql_help.c:3345
-#: sql_help.c:3497 sql_help.c:3502
+#: sql_help.c:309 sql_help.c:665 sql_help.c:1294 sql_help.c:1518
+#: sql_help.c:1553 sql_help.c:1612 sql_help.c:1817 sql_help.c:1848
+#: sql_help.c:2207 sql_help.c:2869 sql_help.c:3148 sql_help.c:3239
+#: sql_help.c:3329 sql_help.c:3333 sql_help.c:3337 sql_help.c:3340
+#: sql_help.c:3547 sql_help.c:3551 sql_help.c:3555 sql_help.c:3558
+#: sql_help.c:3716 sql_help.c:3720 sql_help.c:3724 sql_help.c:3727
msgid "function_name"
msgstr "函数名称"
-#: sql_help.c:288 sql_help.c:421 sql_help.c:426 sql_help.c:431 sql_help.c:436
-#: sql_help.c:1216 sql_help.c:1549 sql_help.c:2335 sql_help.c:2695
-#: sql_help.c:2974 sql_help.c:3059
-msgid "argmode"
-msgstr "参数模式"
-
-# describe.c:480
-#: sql_help.c:289 sql_help.c:422 sql_help.c:427 sql_help.c:432 sql_help.c:437
-#: sql_help.c:1217 sql_help.c:1550 sql_help.c:2336 sql_help.c:3060
-msgid "argname"
-msgstr "参数名称"
-
# describe.c:512
-#: sql_help.c:292 sql_help.c:608 sql_help.c:1222 sql_help.c:1693
+#: sql_help.c:314 sql_help.c:658 sql_help.c:1301 sql_help.c:1841
msgid "operator_name"
msgstr "操作符名称"
# describe.c:321
-#: sql_help.c:293 sql_help.c:563 sql_help.c:567 sql_help.c:1223
-#: sql_help.c:1670 sql_help.c:2378
+#: sql_help.c:315 sql_help.c:613 sql_help.c:617 sql_help.c:1302
+#: sql_help.c:1818 sql_help.c:2553
msgid "left_type"
msgstr "操作符左边操作数的类型"
# describe.c:321
-#: sql_help.c:294 sql_help.c:564 sql_help.c:568 sql_help.c:1224
-#: sql_help.c:1671 sql_help.c:2379
+#: sql_help.c:316 sql_help.c:614 sql_help.c:618 sql_help.c:1303
+#: sql_help.c:1819 sql_help.c:2554
msgid "right_type"
msgstr "操作符右边操作数的类型"
-#: sql_help.c:296 sql_help.c:298 sql_help.c:580 sql_help.c:583 sql_help.c:586
-#: sql_help.c:606 sql_help.c:618 sql_help.c:626 sql_help.c:629 sql_help.c:632
-#: sql_help.c:1226 sql_help.c:1228 sql_help.c:1690 sql_help.c:1711
-#: sql_help.c:1917 sql_help.c:2388 sql_help.c:2397
+#: sql_help.c:318 sql_help.c:320 sql_help.c:630 sql_help.c:633 sql_help.c:636
+#: sql_help.c:656 sql_help.c:668 sql_help.c:676 sql_help.c:679 sql_help.c:682
+#: sql_help.c:1305 sql_help.c:1307 sql_help.c:1838 sql_help.c:1859
+#: sql_help.c:2070 sql_help.c:2563 sql_help.c:2572
msgid "index_method"
msgstr "访问索引的方法"
+#: sql_help.c:332
+msgid "and aggregate_signature is:"
+msgstr "aggregate_signature指的是:"
+
# describe.c:498
-#: sql_help.c:323 sql_help.c:1490
+#: sql_help.c:355 sql_help.c:1638
msgid "handler_function"
msgstr "handler_function(处理_函数)"
# describe.c:498
-#: sql_help.c:324 sql_help.c:1491
+#: sql_help.c:356 sql_help.c:1639
msgid "validator_function"
msgstr "validator_function(验证_函数)"
# describe.c:128
-#: sql_help.c:361 sql_help.c:424 sql_help.c:531 sql_help.c:811 sql_help.c:1001
-#: sql_help.c:1908 sql_help.c:1909 sql_help.c:1925 sql_help.c:1926
+#: sql_help.c:397 sql_help.c:464 sql_help.c:578 sql_help.c:879 sql_help.c:1074
+#: sql_help.c:2061 sql_help.c:2062 sql_help.c:2078 sql_help.c:2079
msgid "action"
msgstr "操作"
# describe.c:1375
-#: sql_help.c:363 sql_help.c:370 sql_help.c:374 sql_help.c:375 sql_help.c:377
-#: sql_help.c:379 sql_help.c:380 sql_help.c:381 sql_help.c:383 sql_help.c:386
-#: sql_help.c:388 sql_help.c:533 sql_help.c:540 sql_help.c:542 sql_help.c:545
-#: sql_help.c:547 sql_help.c:726 sql_help.c:813 sql_help.c:823 sql_help.c:827
-#: sql_help.c:828 sql_help.c:832 sql_help.c:834 sql_help.c:835 sql_help.c:836
-#: sql_help.c:838 sql_help.c:841 sql_help.c:843 sql_help.c:1092
-#: sql_help.c:1095 sql_help.c:1115 sql_help.c:1205 sql_help.c:1290
-#: sql_help.c:1295 sql_help.c:1309 sql_help.c:1310 sql_help.c:1514
-#: sql_help.c:1554 sql_help.c:1615 sql_help.c:1650 sql_help.c:1801
-#: sql_help.c:1881 sql_help.c:1894 sql_help.c:1913 sql_help.c:1915
-#: sql_help.c:1922 sql_help.c:1933 sql_help.c:1950 sql_help.c:2052
-#: sql_help.c:2187 sql_help.c:2679 sql_help.c:2680 sql_help.c:2724
-#: sql_help.c:2958 sql_help.c:2959 sql_help.c:3051 sql_help.c:3149
-#: sql_help.c:3355 sql_help.c:3395 sql_help.c:3397 sql_help.c:3414
-#: sql_help.c:3417 sql_help.c:3512
+#: sql_help.c:399 sql_help.c:406 sql_help.c:410 sql_help.c:411 sql_help.c:413
+#: sql_help.c:415 sql_help.c:416 sql_help.c:417 sql_help.c:419 sql_help.c:422
+#: sql_help.c:424 sql_help.c:580 sql_help.c:590 sql_help.c:592 sql_help.c:595
+#: sql_help.c:597 sql_help.c:776 sql_help.c:881 sql_help.c:894 sql_help.c:898
+#: sql_help.c:899 sql_help.c:903 sql_help.c:905 sql_help.c:906 sql_help.c:907
+#: sql_help.c:909 sql_help.c:912 sql_help.c:914 sql_help.c:1165
+#: sql_help.c:1168 sql_help.c:1188 sql_help.c:1284 sql_help.c:1380
+#: sql_help.c:1385 sql_help.c:1399 sql_help.c:1400 sql_help.c:1401
+#: sql_help.c:1662 sql_help.c:1702 sql_help.c:1763 sql_help.c:1798
+#: sql_help.c:1954 sql_help.c:2034 sql_help.c:2047 sql_help.c:2066
+#: sql_help.c:2068 sql_help.c:2075 sql_help.c:2086 sql_help.c:2103
+#: sql_help.c:2210 sql_help.c:2346 sql_help.c:2854 sql_help.c:2855
+#: sql_help.c:2899 sql_help.c:3133 sql_help.c:3134 sql_help.c:3232
+#: sql_help.c:3352 sql_help.c:3570 sql_help.c:3610 sql_help.c:3612
+#: sql_help.c:3629 sql_help.c:3632 sql_help.c:3739
msgid "column_name"
msgstr "列名称"
# describe.c:1375
-#: sql_help.c:364 sql_help.c:534 sql_help.c:814
+#: sql_help.c:400 sql_help.c:581 sql_help.c:882
msgid "new_column_name"
msgstr "new_column_name(新列名)"
-#: sql_help.c:369 sql_help.c:440 sql_help.c:539 sql_help.c:822 sql_help.c:1014
+#: sql_help.c:405 sql_help.c:480 sql_help.c:589 sql_help.c:893 sql_help.c:1087
msgid "where action is one of:"
msgstr "操作可以是下列选项之一"
# describe.c:526
-#: sql_help.c:371 sql_help.c:376 sql_help.c:824 sql_help.c:829 sql_help.c:1016
-#: sql_help.c:1020 sql_help.c:1444 sql_help.c:1515 sql_help.c:1689
-#: sql_help.c:1882 sql_help.c:2097 sql_help.c:2809
+#: sql_help.c:407 sql_help.c:412 sql_help.c:895 sql_help.c:900 sql_help.c:1089
+#: sql_help.c:1093 sql_help.c:1592 sql_help.c:1663 sql_help.c:1837
+#: sql_help.c:2035 sql_help.c:2255 sql_help.c:2984
msgid "data_type"
msgstr "数据_类型"
# describe.c:128
-#: sql_help.c:372 sql_help.c:825 sql_help.c:830 sql_help.c:1017
-#: sql_help.c:1021 sql_help.c:1445 sql_help.c:1518 sql_help.c:1617
-#: sql_help.c:1883 sql_help.c:2098 sql_help.c:2104
+#: sql_help.c:408 sql_help.c:896 sql_help.c:901 sql_help.c:1090
+#: sql_help.c:1094 sql_help.c:1593 sql_help.c:1666 sql_help.c:1765
+#: sql_help.c:2036 sql_help.c:2256 sql_help.c:2262
msgid "collation"
msgstr "校对规则"
-#: sql_help.c:373 sql_help.c:826 sql_help.c:1519 sql_help.c:1884
-#: sql_help.c:1895
+#: sql_help.c:409 sql_help.c:897 sql_help.c:1667 sql_help.c:2037
+#: sql_help.c:2048
msgid "column_constraint"
msgstr "列约束"
-#: sql_help.c:382 sql_help.c:541 sql_help.c:837
+#: sql_help.c:418 sql_help.c:591 sql_help.c:908
msgid "integer"
msgstr "整数"
-#: sql_help.c:384 sql_help.c:387 sql_help.c:543 sql_help.c:546 sql_help.c:839
-#: sql_help.c:842
+#: sql_help.c:420 sql_help.c:423 sql_help.c:593 sql_help.c:596 sql_help.c:910
+#: sql_help.c:913
msgid "attribute_option"
msgstr "属性选项"
-#: sql_help.c:441 sql_help.c:1557
+# describe.c:575
+#: sql_help.c:427 sql_help.c:428 sql_help.c:429 sql_help.c:430 sql_help.c:920
+#: sql_help.c:921 sql_help.c:922 sql_help.c:923 sql_help.c:1321
+msgid "trigger_name"
+msgstr "触发器_名称"
+
+#: sql_help.c:481 sql_help.c:1705
msgid "execution_cost"
msgstr "执行函数的开销"
-#: sql_help.c:442 sql_help.c:1558
+#: sql_help.c:482 sql_help.c:1706
msgid "result_rows"
msgstr "返回记录的数量"
-#: sql_help.c:457 sql_help.c:459 sql_help.c:461
+#: sql_help.c:497 sql_help.c:499 sql_help.c:501
msgid "group_name"
msgstr "组名称"
-#: sql_help.c:458 sql_help.c:460 sql_help.c:1074 sql_help.c:1421
-#: sql_help.c:1777 sql_help.c:1779 sql_help.c:1782 sql_help.c:1783
-#: sql_help.c:1963 sql_help.c:2173 sql_help.c:2527 sql_help.c:3234
+#: sql_help.c:498 sql_help.c:500 sql_help.c:1147 sql_help.c:1569
+#: sql_help.c:1930 sql_help.c:1932 sql_help.c:1935 sql_help.c:1936
+#: sql_help.c:2119 sql_help.c:2331 sql_help.c:2702 sql_help.c:3437
msgid "user_name"
msgstr "用户名"
# describe.c:1342
-#: sql_help.c:476 sql_help.c:1426 sql_help.c:1621 sql_help.c:1653
-#: sql_help.c:1891 sql_help.c:1899 sql_help.c:1931 sql_help.c:1953
-#: sql_help.c:1962 sql_help.c:2706 sql_help.c:2985
+#: sql_help.c:518 sql_help.c:1574 sql_help.c:1769 sql_help.c:1801
+#: sql_help.c:2044 sql_help.c:2052 sql_help.c:2084 sql_help.c:2106
+#: sql_help.c:2118 sql_help.c:2881 sql_help.c:3160
msgid "tablespace_name"
msgstr "表空间的名称"
-#: sql_help.c:478 sql_help.c:481 sql_help.c:549 sql_help.c:551 sql_help.c:857
-#: sql_help.c:859 sql_help.c:1619 sql_help.c:1651 sql_help.c:1889
-#: sql_help.c:1897 sql_help.c:1929 sql_help.c:1951
+#: sql_help.c:520 sql_help.c:523 sql_help.c:599 sql_help.c:601 sql_help.c:929
+#: sql_help.c:931 sql_help.c:1767 sql_help.c:1799 sql_help.c:2042
+#: sql_help.c:2050 sql_help.c:2082 sql_help.c:2104
msgid "storage_parameter"
msgstr "存储参数"
# large_obj.c:264
-#: sql_help.c:501 sql_help.c:1220 sql_help.c:3062
+#: sql_help.c:546 sql_help.c:1299 sql_help.c:3243
msgid "large_object_oid"
msgstr "大对象的OID"
# describe.c:543
# describe.c:1477
-#: sql_help.c:548 sql_help.c:856 sql_help.c:867 sql_help.c:1155
+#: sql_help.c:598 sql_help.c:928 sql_help.c:937 sql_help.c:940 sql_help.c:1228
msgid "index_name"
msgstr "索引名称"
-#: sql_help.c:607 sql_help.c:619 sql_help.c:1692
+#: sql_help.c:657 sql_help.c:669 sql_help.c:1840
msgid "strategy_number"
msgstr "访问索引所用方法的编号"
@@ -3466,22 +3592,22 @@ msgstr "访问索引所用方法的编号"
# describe.c:745
# describe.c:1478
# describe.c:1587
-#: sql_help.c:609 sql_help.c:610 sql_help.c:613 sql_help.c:614 sql_help.c:620
-#: sql_help.c:621 sql_help.c:623 sql_help.c:624 sql_help.c:1694
-#: sql_help.c:1695 sql_help.c:1698 sql_help.c:1699
+#: sql_help.c:659 sql_help.c:660 sql_help.c:663 sql_help.c:664 sql_help.c:670
+#: sql_help.c:671 sql_help.c:673 sql_help.c:674 sql_help.c:1842
+#: sql_help.c:1843 sql_help.c:1846 sql_help.c:1847
msgid "op_type"
msgstr "操作数类型"
-#: sql_help.c:611 sql_help.c:1696
+#: sql_help.c:661 sql_help.c:1844
msgid "sort_family_name"
msgstr "sort_family_name(排序家族名)"
-#: sql_help.c:612 sql_help.c:622 sql_help.c:1697
+#: sql_help.c:662 sql_help.c:672 sql_help.c:1845
msgid "support_number"
msgstr "访问索引所使用函数的编号"
# describe.c:1689
-#: sql_help.c:616 sql_help.c:1371 sql_help.c:1701
+#: sql_help.c:666 sql_help.c:1519 sql_help.c:1849
msgid "argument_type"
msgstr "参数类型"
@@ -3489,272 +3615,313 @@ msgstr "参数类型"
# command.c:939
# startup.c:187
# startup.c:205
-#: sql_help.c:665 sql_help.c:1053 sql_help.c:1593 sql_help.c:1742
-#: sql_help.c:2156
+#: sql_help.c:715 sql_help.c:1126 sql_help.c:1741 sql_help.c:1890
+#: sql_help.c:2314
msgid "password"
msgstr "口令"
-#: sql_help.c:666 sql_help.c:1054 sql_help.c:1594 sql_help.c:1743
-#: sql_help.c:2157
+#: sql_help.c:716 sql_help.c:1127 sql_help.c:1742 sql_help.c:1891
+#: sql_help.c:2315
msgid "timestamp"
msgstr "时间戳"
-#: sql_help.c:670 sql_help.c:674 sql_help.c:677 sql_help.c:680 sql_help.c:2686
-#: sql_help.c:2965
+#: sql_help.c:720 sql_help.c:724 sql_help.c:727 sql_help.c:730 sql_help.c:2861
+#: sql_help.c:3140
msgid "database_name"
msgstr "数据库名称"
# describe.c:415
# describe.c:543
# describe.c:1477
-#: sql_help.c:689 sql_help.c:725 sql_help.c:980 sql_help.c:1114
-#: sql_help.c:1154 sql_help.c:1207 sql_help.c:1232 sql_help.c:1243
-#: sql_help.c:1289 sql_help.c:1294 sql_help.c:1513 sql_help.c:1613
-#: sql_help.c:1649 sql_help.c:1761 sql_help.c:1800 sql_help.c:1880
-#: sql_help.c:1892 sql_help.c:1949 sql_help.c:2046 sql_help.c:2221
-#: sql_help.c:2422 sql_help.c:2503 sql_help.c:2676 sql_help.c:2681
-#: sql_help.c:2723 sql_help.c:2955 sql_help.c:2960 sql_help.c:3050
-#: sql_help.c:3123 sql_help.c:3125 sql_help.c:3155 sql_help.c:3194
-#: sql_help.c:3329 sql_help.c:3331 sql_help.c:3361 sql_help.c:3393
-#: sql_help.c:3413 sql_help.c:3415 sql_help.c:3416 sql_help.c:3486
-#: sql_help.c:3488 sql_help.c:3518
+#: sql_help.c:739 sql_help.c:775 sql_help.c:1053 sql_help.c:1187
+#: sql_help.c:1227 sql_help.c:1286 sql_help.c:1311 sql_help.c:1322
+#: sql_help.c:1379 sql_help.c:1384 sql_help.c:1661 sql_help.c:1761
+#: sql_help.c:1797 sql_help.c:1913 sql_help.c:1953 sql_help.c:2033
+#: sql_help.c:2045 sql_help.c:2102 sql_help.c:2204 sql_help.c:2380
+#: sql_help.c:2597 sql_help.c:2678 sql_help.c:2851 sql_help.c:2856
+#: sql_help.c:2898 sql_help.c:3130 sql_help.c:3135 sql_help.c:3231
+#: sql_help.c:3318 sql_help.c:3320 sql_help.c:3358 sql_help.c:3397
+#: sql_help.c:3536 sql_help.c:3538 sql_help.c:3576 sql_help.c:3608
+#: sql_help.c:3628 sql_help.c:3630 sql_help.c:3631 sql_help.c:3705
+#: sql_help.c:3707 sql_help.c:3745
msgid "table_name"
msgstr "表名"
-#: sql_help.c:719 sql_help.c:1795
+#: sql_help.c:769 sql_help.c:1948
msgid "increment"
msgstr "增量"
# describe.c:415
# describe.c:543
# describe.c:1477
-#: sql_help.c:720 sql_help.c:1796
+#: sql_help.c:770 sql_help.c:1949
msgid "minvalue"
msgstr "最小值"
# describe.c:415
# describe.c:543
# describe.c:1477
-#: sql_help.c:721 sql_help.c:1797
+#: sql_help.c:771 sql_help.c:1950
msgid "maxvalue"
msgstr "最大值"
-#: sql_help.c:722 sql_help.c:1798 sql_help.c:3121 sql_help.c:3192
-#: sql_help.c:3327 sql_help.c:3433 sql_help.c:3484
+#: sql_help.c:772 sql_help.c:1951 sql_help.c:3316 sql_help.c:3395
+#: sql_help.c:3534 sql_help.c:3648 sql_help.c:3703
msgid "start"
msgstr "起始值"
-#: sql_help.c:723
+#: sql_help.c:773
msgid "restart"
msgstr "重新启动后的序列值"
-#: sql_help.c:724 sql_help.c:1799
+#: sql_help.c:774 sql_help.c:1952
msgid "cache"
msgstr "缓存"
-#: sql_help.c:844 sql_help.c:1885 sql_help.c:1896
+#: sql_help.c:915 sql_help.c:2038 sql_help.c:2049
msgid "table_constraint"
msgstr "表约束"
-#: sql_help.c:845
+#: sql_help.c:916
msgid "table_constraint_using_index"
msgstr "table_constraint_using_index(表约束使用索引)"
-# describe.c:575
-#: sql_help.c:848 sql_help.c:849 sql_help.c:850 sql_help.c:851 sql_help.c:1242
-msgid "trigger_name"
-msgstr "触发器_名称"
-
-#: sql_help.c:852 sql_help.c:853 sql_help.c:854 sql_help.c:855
+#: sql_help.c:924 sql_help.c:925 sql_help.c:926 sql_help.c:927
msgid "rewrite_rule_name"
msgstr "重写规则名称"
-#: sql_help.c:860 sql_help.c:861 sql_help.c:1888
+#: sql_help.c:932 sql_help.c:933 sql_help.c:2041
msgid "parent_table"
msgstr "父表"
-#: sql_help.c:862 sql_help.c:1893 sql_help.c:2708 sql_help.c:2987
+#: sql_help.c:934 sql_help.c:2046 sql_help.c:2883 sql_help.c:3162
msgid "type_name"
msgstr "类型名称"
-#: sql_help.c:865
+#: sql_help.c:938
msgid "and table_constraint_using_index is:"
msgstr "table_constraint_using_index 是:"
# describe.c:1342
-#: sql_help.c:883 sql_help.c:886
+#: sql_help.c:956 sql_help.c:959 sql_help.c:2121
msgid "tablespace_option"
msgstr "表空间_选项"
-#: sql_help.c:907 sql_help.c:910 sql_help.c:916 sql_help.c:920
+#: sql_help.c:980 sql_help.c:983 sql_help.c:989 sql_help.c:993
msgid "token_type"
msgstr "符号类型"
-#: sql_help.c:908 sql_help.c:911
+#: sql_help.c:981 sql_help.c:984
msgid "dictionary_name"
msgstr "字典名称"
-#: sql_help.c:913 sql_help.c:917
+#: sql_help.c:986 sql_help.c:990
msgid "old_dictionary"
msgstr "旧的字典"
-#: sql_help.c:914 sql_help.c:918
+#: sql_help.c:987 sql_help.c:991
msgid "new_dictionary"
msgstr "新的字典"
-#: sql_help.c:1005 sql_help.c:1015 sql_help.c:1018 sql_help.c:1019
-#: sql_help.c:2096
+#: sql_help.c:1078 sql_help.c:1088 sql_help.c:1091 sql_help.c:1092
+#: sql_help.c:2254
msgid "attribute_name"
msgstr "属性_名称"
-#: sql_help.c:1006
+#: sql_help.c:1079
msgid "new_attribute_name"
msgstr "new_attribute_name(新属性名)"
-#: sql_help.c:1012
+#: sql_help.c:1085
msgid "new_enum_value"
msgstr "new_enum_value(新枚举名)"
-#: sql_help.c:1013
+#: sql_help.c:1086
msgid "existing_enum_value"
msgstr "existing_enum_value"
-#: sql_help.c:1075 sql_help.c:1520 sql_help.c:1811 sql_help.c:2174
-#: sql_help.c:2528 sql_help.c:2692 sql_help.c:2971
+#: sql_help.c:1148 sql_help.c:1668 sql_help.c:1964 sql_help.c:2332
+#: sql_help.c:2703 sql_help.c:2867 sql_help.c:3146
msgid "server_name"
msgstr "服务器名称"
# help.c:88
-#: sql_help.c:1103 sql_help.c:1106 sql_help.c:2188
+#: sql_help.c:1176 sql_help.c:1179 sql_help.c:2347
msgid "view_option_name"
msgstr "view_option_name(视图选项名)"
# help.c:88
-#: sql_help.c:1104 sql_help.c:2189
+#: sql_help.c:1177 sql_help.c:2348
msgid "view_option_value"
msgstr "view_option_value(视图选项值)"
-#: sql_help.c:1129 sql_help.c:3250 sql_help.c:3252 sql_help.c:3276
+#: sql_help.c:1202 sql_help.c:3453 sql_help.c:3455 sql_help.c:3479
msgid "transaction_mode"
msgstr "事务模式"
-#: sql_help.c:1130 sql_help.c:3253 sql_help.c:3277
+#: sql_help.c:1203 sql_help.c:3456 sql_help.c:3480
msgid "where transaction_mode is one of:"
msgstr "事务模式可以是下列选项之一:"
-#: sql_help.c:1204
+#: sql_help.c:1283
msgid "relation_name"
msgstr "relation_name(关系名)"
# describe.c:1375
-#: sql_help.c:1231
+#: sql_help.c:1310
msgid "rule_name"
msgstr "规则_名称"
-#: sql_help.c:1246
+#: sql_help.c:1325
msgid "text"
msgstr "文本"
-#: sql_help.c:1261 sql_help.c:2818 sql_help.c:3005
+#: sql_help.c:1350 sql_help.c:2993 sql_help.c:3180
msgid "transaction_id"
msgstr "事务_ID"
# describe.c:1375
-#: sql_help.c:1291 sql_help.c:1297 sql_help.c:2744
+#: sql_help.c:1381 sql_help.c:1387 sql_help.c:2919
msgid "filename"
msgstr "文件名"
-#: sql_help.c:1292 sql_help.c:1298 sql_help.c:1763 sql_help.c:1764
-#: sql_help.c:1765
+#: sql_help.c:1382 sql_help.c:1388 sql_help.c:1915 sql_help.c:1916
+#: sql_help.c:1917
msgid "command"
msgstr "命令"
-#: sql_help.c:1296 sql_help.c:1654 sql_help.c:1954 sql_help.c:2190
-#: sql_help.c:2208 sql_help.c:2726
+#: sql_help.c:1386 sql_help.c:1802 sql_help.c:2107 sql_help.c:2349
+#: sql_help.c:2367 sql_help.c:2901
msgid "query"
msgstr "查询"
-#: sql_help.c:1300 sql_help.c:2573
+#: sql_help.c:1390 sql_help.c:2748
msgid "where option can be one of:"
msgstr "选项可以是下列内容之一:"
# help.c:211
-#: sql_help.c:1301
+#: sql_help.c:1391
msgid "format_name"
msgstr "格式_名称"
-#: sql_help.c:1302 sql_help.c:1303 sql_help.c:1306 sql_help.c:2574
-#: sql_help.c:2575 sql_help.c:2576 sql_help.c:2577 sql_help.c:2578
+#: sql_help.c:1392 sql_help.c:1393 sql_help.c:1396 sql_help.c:2749
+#: sql_help.c:2750 sql_help.c:2751 sql_help.c:2752 sql_help.c:2753
msgid "boolean"
msgstr "布尔"
-#: sql_help.c:1304
+#: sql_help.c:1394
msgid "delimiter_character"
msgstr "分隔字符"
-#: sql_help.c:1305
+#: sql_help.c:1395
msgid "null_string"
msgstr "空字符串"
-#: sql_help.c:1307
+#: sql_help.c:1397
msgid "quote_character"
msgstr "引用字符"
-#: sql_help.c:1308
+#: sql_help.c:1398
msgid "escape_character"
msgstr "转义字符"
# describe.c:365
-#: sql_help.c:1311
+#: sql_help.c:1402
msgid "encoding_name"
msgstr "encoding_name(编码名)"
# describe.c:526
-#: sql_help.c:1337
-msgid "input_data_type"
-msgstr "输入数据类型"
+#: sql_help.c:1459 sql_help.c:1475 sql_help.c:1478
+#| msgid "data_type"
+msgid "arg_data_type"
+msgstr "arg_data_type"
# describe.c:415
# describe.c:543
# describe.c:1477
-#: sql_help.c:1338 sql_help.c:1346
+#: sql_help.c:1460 sql_help.c:1479 sql_help.c:1487
msgid "sfunc"
msgstr "状态转换函数名称"
# describe.c:526
-#: sql_help.c:1339 sql_help.c:1347
+#: sql_help.c:1461 sql_help.c:1480 sql_help.c:1488
msgid "state_data_type"
msgstr "状态值的数据类型"
+# describe.c:526
+#: sql_help.c:1462 sql_help.c:1481 sql_help.c:1489
+#| msgid "state_data_type"
+msgid "state_data_size"
+msgstr "state_data_size"
+
# describe.c:498
-#: sql_help.c:1340 sql_help.c:1348
+#: sql_help.c:1463 sql_help.c:1482 sql_help.c:1490
msgid "ffunc"
msgstr "计算最终结果集的函数名称"
-#: sql_help.c:1341 sql_help.c:1349
+#: sql_help.c:1464 sql_help.c:1483 sql_help.c:1491
msgid "initial_condition"
msgstr "初始条件"
+# describe.c:415
+# describe.c:543
+# describe.c:1477
+#: sql_help.c:1465 sql_help.c:1492
+#| msgid "sfunc"
+msgid "msfunc"
+msgstr "msfunc"
+
+# describe.c:415
+# describe.c:543
+# describe.c:1477
+#: sql_help.c:1466 sql_help.c:1493
+#| msgid "minvalue"
+msgid "minvfunc"
+msgstr "minvfunc"
+
+# describe.c:526
+#: sql_help.c:1467 sql_help.c:1494
+#| msgid "state_data_type"
+msgid "mstate_data_type"
+msgstr "mstate_data_type"
+
+# describe.c:526
+#: sql_help.c:1468 sql_help.c:1495
+#| msgid "state_data_type"
+msgid "mstate_data_size"
+msgstr "mstate_data_size"
+
+# describe.c:498
+#: sql_help.c:1469 sql_help.c:1496
+#| msgid "ffunc"
+msgid "mffunc"
+msgstr "mffunc"
+
+#: sql_help.c:1470 sql_help.c:1497
+#| msgid "initial_condition"
+msgid "minitial_condition"
+msgstr "minitial_condition"
+
# describe.c:512
-#: sql_help.c:1342 sql_help.c:1350
+#: sql_help.c:1471 sql_help.c:1498
msgid "sort_operator"
msgstr "排序_操作符"
-#: sql_help.c:1343
+#: sql_help.c:1484
msgid "or the old syntax"
msgstr "或者是旧的语法"
# describe.c:1689
-#: sql_help.c:1345
+#: sql_help.c:1486
msgid "base_type"
msgstr "基础_类型"
# help.c:127
-#: sql_help.c:1389
+#: sql_help.c:1537
msgid "locale"
msgstr "本地化语言"
-#: sql_help.c:1390 sql_help.c:1424
+#: sql_help.c:1538 sql_help.c:1572
msgid "lc_collate"
msgstr "排序规则"
@@ -3762,294 +3929,294 @@ msgstr "排序规则"
# describe.c:745
# describe.c:1478
# describe.c:1587
-#: sql_help.c:1391 sql_help.c:1425
+#: sql_help.c:1539 sql_help.c:1573
msgid "lc_ctype"
msgstr "字符分类"
# describe.c:1636
-#: sql_help.c:1393
+#: sql_help.c:1541
msgid "existing_collation"
msgstr "existing_collation(当前的本地化语言)"
# describe.c:187
-#: sql_help.c:1403
+#: sql_help.c:1551
msgid "source_encoding"
msgstr "源_编码"
# describe.c:365
-#: sql_help.c:1404
+#: sql_help.c:1552
msgid "dest_encoding"
msgstr "目的_编码"
-#: sql_help.c:1422 sql_help.c:1989
+#: sql_help.c:1570 sql_help.c:2147
msgid "template"
msgstr "模版"
# describe.c:365
-#: sql_help.c:1423
+#: sql_help.c:1571
msgid "encoding"
msgstr "字符集编码"
# describe.c:1174
-#: sql_help.c:1448
+#: sql_help.c:1596
msgid "where constraint is:"
msgstr "约束是:"
-#: sql_help.c:1462 sql_help.c:1760 sql_help.c:2045
+#: sql_help.c:1610 sql_help.c:1912 sql_help.c:2203
msgid "event"
msgstr "事件"
-#: sql_help.c:1463
+#: sql_help.c:1611
msgid "filter_variable"
msgstr "过滤器变量"
# describe.c:498
-#: sql_help.c:1475
+#: sql_help.c:1623
msgid "extension_name"
msgstr "extension_name(扩展名)"
-#: sql_help.c:1477
+#: sql_help.c:1625
msgid "version"
msgstr "version(版本)"
-#: sql_help.c:1478
+#: sql_help.c:1626
msgid "old_version"
msgstr "老版本"
# describe.c:1174
-#: sql_help.c:1523 sql_help.c:1900
+#: sql_help.c:1671 sql_help.c:2053
msgid "where column_constraint is:"
msgstr "列的约束是:"
# describe.c:1639
-#: sql_help.c:1525 sql_help.c:1552 sql_help.c:1903
+#: sql_help.c:1673 sql_help.c:1700 sql_help.c:2056
msgid "default_expr"
msgstr "缺省_表达式"
# describe.c:1689
-#: sql_help.c:1553
+#: sql_help.c:1701
msgid "rettype"
msgstr "返回类型"
-#: sql_help.c:1555
+#: sql_help.c:1703
msgid "column_type"
msgstr "列的类型"
-#: sql_help.c:1556 sql_help.c:2242 sql_help.c:2700 sql_help.c:2979
+#: sql_help.c:1704 sql_help.c:2401 sql_help.c:2875 sql_help.c:3154
msgid "lang_name"
msgstr "语言名称"
# describe.c:977
-#: sql_help.c:1562
+#: sql_help.c:1710
msgid "definition"
msgstr "定义"
-#: sql_help.c:1563
+#: sql_help.c:1711
msgid "obj_file"
msgstr "目标文件"
-#: sql_help.c:1564
+#: sql_help.c:1712
msgid "link_symbol"
msgstr "链接_符号"
-#: sql_help.c:1565
+#: sql_help.c:1713
msgid "attribute"
msgstr "属性"
-#: sql_help.c:1600 sql_help.c:1749 sql_help.c:2163
+#: sql_help.c:1748 sql_help.c:1897 sql_help.c:2321
msgid "uid"
msgstr "uid"
-#: sql_help.c:1614
+#: sql_help.c:1762
msgid "method"
msgstr "方法"
-#: sql_help.c:1618 sql_help.c:1935
+#: sql_help.c:1766 sql_help.c:2088
msgid "opclass"
msgstr "操作符类型的名称"
# describe.c:937
-#: sql_help.c:1622 sql_help.c:1921
+#: sql_help.c:1770 sql_help.c:2074
msgid "predicate"
msgstr "述词"
-#: sql_help.c:1634
+#: sql_help.c:1782
msgid "call_handler"
msgstr "调用函数"
-#: sql_help.c:1635
+#: sql_help.c:1783
msgid "inline_handler"
msgstr "匿名代码块"
# describe.c:498
-#: sql_help.c:1636
+#: sql_help.c:1784
msgid "valfunction"
msgstr "验证函数"
-#: sql_help.c:1672
+#: sql_help.c:1820
msgid "com_op"
msgstr "交换操作符"
-#: sql_help.c:1673
+#: sql_help.c:1821
msgid "neg_op"
msgstr "取负操作符"
-#: sql_help.c:1674
+#: sql_help.c:1822
msgid "res_proc"
msgstr "限制选择性估算函数"
-#: sql_help.c:1675
+#: sql_help.c:1823
msgid "join_proc"
msgstr "连接选择性估算函数"
-#: sql_help.c:1691
+#: sql_help.c:1839
msgid "family_name"
msgstr "操作符群的名称"
# describe.c:1635
-#: sql_help.c:1702
+#: sql_help.c:1850
msgid "storage_type"
msgstr "存储类型"
# help.c:123
-#: sql_help.c:1762 sql_help.c:2048 sql_help.c:2224 sql_help.c:3112
-#: sql_help.c:3114 sql_help.c:3183 sql_help.c:3185 sql_help.c:3318
-#: sql_help.c:3320 sql_help.c:3400 sql_help.c:3475 sql_help.c:3477
+#: sql_help.c:1914 sql_help.c:2206 sql_help.c:2383 sql_help.c:3307
+#: sql_help.c:3309 sql_help.c:3386 sql_help.c:3388 sql_help.c:3525
+#: sql_help.c:3527 sql_help.c:3615 sql_help.c:3694 sql_help.c:3696
msgid "condition"
msgstr "条件"
-#: sql_help.c:1778 sql_help.c:1780
+#: sql_help.c:1918 sql_help.c:2209
+msgid "where event can be one of:"
+msgstr "事件可以下述之一:"
+
+#: sql_help.c:1931 sql_help.c:1933
msgid "schema_element"
msgstr "模式中对象"
-#: sql_help.c:1812
+#: sql_help.c:1965
msgid "server_type"
msgstr "服务器类型"
-#: sql_help.c:1813
+#: sql_help.c:1966
msgid "server_version"
msgstr "服务器版本"
-#: sql_help.c:1814 sql_help.c:2690 sql_help.c:2969
+#: sql_help.c:1967 sql_help.c:2865 sql_help.c:3144
msgid "fdw_name"
msgstr "外部数据封装器的名称"
# describe.c:1688
-#: sql_help.c:1886
+#: sql_help.c:2039
msgid "source_table"
msgstr "源表"
# help.c:88
-#: sql_help.c:1887
+#: sql_help.c:2040
msgid "like_option"
msgstr "like选项"
-#: sql_help.c:1904 sql_help.c:1905 sql_help.c:1914 sql_help.c:1916
-#: sql_help.c:1920
+#: sql_help.c:2057 sql_help.c:2058 sql_help.c:2067 sql_help.c:2069
+#: sql_help.c:2073
msgid "index_parameters"
msgstr "索引参数"
# describe.c:415
# describe.c:543
# describe.c:1477
-#: sql_help.c:1906 sql_help.c:1923
+#: sql_help.c:2059 sql_help.c:2076
msgid "reftable"
msgstr "所引用的表"
# describe.c:744
-#: sql_help.c:1907 sql_help.c:1924
+#: sql_help.c:2060 sql_help.c:2077
msgid "refcolumn"
msgstr "所引用的列"
-#: sql_help.c:1910
+#: sql_help.c:2063
msgid "and table_constraint is:"
msgstr "表约束是:"
-#: sql_help.c:1918
+#: sql_help.c:2071
msgid "exclude_element"
msgstr "排除项"
# describe.c:512
-#: sql_help.c:1919 sql_help.c:3119 sql_help.c:3190 sql_help.c:3325
-#: sql_help.c:3431 sql_help.c:3482
+#: sql_help.c:2072 sql_help.c:3314 sql_help.c:3393 sql_help.c:3532
+#: sql_help.c:3646 sql_help.c:3701
msgid "operator"
msgstr "运算子"
-#: sql_help.c:1927
+#: sql_help.c:2080
msgid "and like_option is:"
msgstr "like_选项是"
-#: sql_help.c:1928
+#: sql_help.c:2081
msgid "index_parameters in UNIQUE, PRIMARY KEY, and EXCLUDE constraints are:"
msgstr "在UNIQUE, PRIMARY KEY和EXCLUDE中的索引参数是:"
-#: sql_help.c:1932
+#: sql_help.c:2085
msgid "exclude_element in an EXCLUDE constraint is:"
msgstr "在EXCLUDE约束中的排除项是:"
-#: sql_help.c:1964
+#: sql_help.c:2120
msgid "directory"
msgstr "目录"
-#: sql_help.c:1976
+#: sql_help.c:2134
msgid "parser_name"
msgstr "解析器名称 "
-#: sql_help.c:1977
+#: sql_help.c:2135
msgid "source_config"
msgstr "已存在的文本搜索配置名称"
# describe.c:498
-#: sql_help.c:2006
+#: sql_help.c:2164
msgid "start_function"
msgstr "启动_函数"
# sql_help.h:249
-#: sql_help.c:2007
+#: sql_help.c:2165
msgid "gettoken_function"
msgstr "获取下一个符号函数的名称"
# describe.c:498
-#: sql_help.c:2008
+#: sql_help.c:2166
msgid "end_function"
msgstr "结束_函数"
# describe.c:498
-#: sql_help.c:2009
+#: sql_help.c:2167
msgid "lextypes_function"
msgstr "语义类型_函数"
# describe.c:498
-#: sql_help.c:2010
+#: sql_help.c:2168
msgid "headline_function"
msgstr "标题_函数"
# describe.c:498
-#: sql_help.c:2022
+#: sql_help.c:2180
msgid "init_function"
msgstr "初始化_函数"
# describe.c:498
-#: sql_help.c:2023
+#: sql_help.c:2181
msgid "lexize_function"
msgstr "LEXIZE函数"
-#: sql_help.c:2047
+#: sql_help.c:2205
msgid "referenced_table_name"
msgstr "被引用表的名称"
-#: sql_help.c:2050
+#: sql_help.c:2208
msgid "arguments"
msgstr "参数"
-#: sql_help.c:2051
-msgid "where event can be one of:"
-msgstr "事件可以下述之一:"
-
# describe.c:415
# describe.c:543
# describe.c:1477
-#: sql_help.c:2100 sql_help.c:3071
+#: sql_help.c:2258 sql_help.c:3252
msgid "label"
msgstr "标签"
@@ -4057,1082 +4224,1084 @@ msgstr "标签"
# describe.c:745
# describe.c:1478
# describe.c:1587
-#: sql_help.c:2102
+#: sql_help.c:2260
msgid "subtype"
msgstr "子类型"
# describe.c:512
-#: sql_help.c:2103
+#: sql_help.c:2261
msgid "subtype_operator_class"
msgstr "subtype_operator_class(子类型_操作符_类)"
# describe.c:498
-#: sql_help.c:2105
+#: sql_help.c:2263
msgid "canonical_function"
msgstr "标准_函数"
# describe.c:498
-#: sql_help.c:2106
+#: sql_help.c:2264
msgid "subtype_diff_function"
msgstr "subtype_diff_function(子类型_区分_函数)"
# describe.c:498
-#: sql_help.c:2108
+#: sql_help.c:2266
msgid "input_function"
msgstr "输入_函数"
# describe.c:498
-#: sql_help.c:2109
+#: sql_help.c:2267
msgid "output_function"
msgstr "输出_函数"
# sql_help.h:249
-#: sql_help.c:2110
+#: sql_help.c:2268
msgid "receive_function"
msgstr "接收_函数"
# describe.c:498
-#: sql_help.c:2111
+#: sql_help.c:2269
msgid "send_function"
msgstr "发送_函数"
-#: sql_help.c:2112
+#: sql_help.c:2270
msgid "type_modifier_input_function"
msgstr "类型修改器数组输入函数名称"
-#: sql_help.c:2113
+#: sql_help.c:2271
msgid "type_modifier_output_function"
msgstr "类型修改器输出函数名称"
# describe.c:498
-#: sql_help.c:2114
+#: sql_help.c:2272
msgid "analyze_function"
msgstr "分析_函数"
-#: sql_help.c:2115
+#: sql_help.c:2273
msgid "internallength"
msgstr "内部长度"
# describe.c:1693
-#: sql_help.c:2116
+#: sql_help.c:2274
msgid "alignment"
msgstr "顺序排列(alignment)"
# describe.c:1635
-#: sql_help.c:2117
+#: sql_help.c:2275
msgid "storage"
msgstr "存储"
-#: sql_help.c:2118
+#: sql_help.c:2276
msgid "like_type"
msgstr "LIKE类型(like_type)"
-#: sql_help.c:2119
+#: sql_help.c:2277
msgid "category"
msgstr "类型"
-#: sql_help.c:2120
+#: sql_help.c:2278
msgid "preferred"
msgstr "优先"
# describe.c:1639
-#: sql_help.c:2121
+#: sql_help.c:2279
msgid "default"
msgstr "缺省"
-#: sql_help.c:2122
+#: sql_help.c:2280
msgid "element"
msgstr "成员项"
-#: sql_help.c:2123
+#: sql_help.c:2281
msgid "delimiter"
msgstr "分隔符"
-#: sql_help.c:2124
+#: sql_help.c:2282
msgid "collatable"
msgstr "要校对的"
-#: sql_help.c:2220 sql_help.c:2722 sql_help.c:3107 sql_help.c:3177
-#: sql_help.c:3313 sql_help.c:3392 sql_help.c:3470
+#: sql_help.c:2379 sql_help.c:2897 sql_help.c:3302 sql_help.c:3380
+#: sql_help.c:3520 sql_help.c:3607 sql_help.c:3689
msgid "with_query"
msgstr "with查询语句(with_query)"
-#: sql_help.c:2222 sql_help.c:3126 sql_help.c:3129 sql_help.c:3132
-#: sql_help.c:3136 sql_help.c:3332 sql_help.c:3335 sql_help.c:3338
-#: sql_help.c:3342 sql_help.c:3394 sql_help.c:3489 sql_help.c:3492
-#: sql_help.c:3495 sql_help.c:3499
+#: sql_help.c:2381 sql_help.c:3321 sql_help.c:3324 sql_help.c:3327
+#: sql_help.c:3331 sql_help.c:3335 sql_help.c:3343 sql_help.c:3539
+#: sql_help.c:3542 sql_help.c:3545 sql_help.c:3549 sql_help.c:3553
+#: sql_help.c:3561 sql_help.c:3609 sql_help.c:3708 sql_help.c:3711
+#: sql_help.c:3714 sql_help.c:3718 sql_help.c:3722 sql_help.c:3730
msgid "alias"
msgstr "化名"
-#: sql_help.c:2223
+#: sql_help.c:2382
msgid "using_list"
msgstr "USING列表(using_list)"
-#: sql_help.c:2225 sql_help.c:2604 sql_help.c:2785 sql_help.c:3401
+#: sql_help.c:2384 sql_help.c:2779 sql_help.c:2960 sql_help.c:3616
msgid "cursor_name"
msgstr "游标名称"
-#: sql_help.c:2226 sql_help.c:2727 sql_help.c:3402
+#: sql_help.c:2385 sql_help.c:2902 sql_help.c:3617
msgid "output_expression"
msgstr "输出表达式"
-#: sql_help.c:2227 sql_help.c:2728 sql_help.c:3110 sql_help.c:3180
-#: sql_help.c:3316 sql_help.c:3403 sql_help.c:3473
+#: sql_help.c:2386 sql_help.c:2903 sql_help.c:3305 sql_help.c:3383
+#: sql_help.c:3523 sql_help.c:3618 sql_help.c:3692
msgid "output_name"
msgstr "输出名称"
-#: sql_help.c:2243
+#: sql_help.c:2402
msgid "code"
msgstr "编码"
-#: sql_help.c:2552
+#: sql_help.c:2727
msgid "parameter"
msgstr "参数"
-#: sql_help.c:2571 sql_help.c:2572 sql_help.c:2810
+#: sql_help.c:2746 sql_help.c:2747 sql_help.c:2985
msgid "statement"
msgstr "语句"
# help.c:123
-#: sql_help.c:2603 sql_help.c:2784
+#: sql_help.c:2778 sql_help.c:2959
msgid "direction"
msgstr "方向"
-#: sql_help.c:2605 sql_help.c:2786
+#: sql_help.c:2780 sql_help.c:2961
msgid "where direction can be empty or one of:"
msgstr "方向可以为空或者是下列选项之一:"
-#: sql_help.c:2606 sql_help.c:2607 sql_help.c:2608 sql_help.c:2609
-#: sql_help.c:2610 sql_help.c:2787 sql_help.c:2788 sql_help.c:2789
-#: sql_help.c:2790 sql_help.c:2791 sql_help.c:3120 sql_help.c:3122
-#: sql_help.c:3191 sql_help.c:3193 sql_help.c:3326 sql_help.c:3328
-#: sql_help.c:3432 sql_help.c:3434 sql_help.c:3483 sql_help.c:3485
+#: sql_help.c:2781 sql_help.c:2782 sql_help.c:2783 sql_help.c:2784
+#: sql_help.c:2785 sql_help.c:2962 sql_help.c:2963 sql_help.c:2964
+#: sql_help.c:2965 sql_help.c:2966 sql_help.c:3315 sql_help.c:3317
+#: sql_help.c:3394 sql_help.c:3396 sql_help.c:3533 sql_help.c:3535
+#: sql_help.c:3647 sql_help.c:3649 sql_help.c:3702 sql_help.c:3704
msgid "count"
msgstr "查询所用返回记录的最大数量"
# describe.c:415
# describe.c:543
# describe.c:1477
-#: sql_help.c:2683 sql_help.c:2962
+#: sql_help.c:2858 sql_help.c:3137
msgid "sequence_name"
msgstr "序列名称"
# describe.c:1375
-#: sql_help.c:2688 sql_help.c:2967
+#: sql_help.c:2863 sql_help.c:3142
msgid "domain_name"
msgstr "域_名称"
-#: sql_help.c:2696 sql_help.c:2975
+#: sql_help.c:2871 sql_help.c:3150
msgid "arg_name"
msgstr "参数名称"
# describe.c:1689
-#: sql_help.c:2697 sql_help.c:2976
+#: sql_help.c:2872 sql_help.c:3151
msgid "arg_type"
msgstr "参数类型"
-#: sql_help.c:2702 sql_help.c:2981
+#: sql_help.c:2877 sql_help.c:3156
msgid "loid"
msgstr "loid"
-#: sql_help.c:2736 sql_help.c:2799 sql_help.c:3378
+#: sql_help.c:2911 sql_help.c:2974 sql_help.c:3593
msgid "channel"
msgstr "通道"
-#: sql_help.c:2758
+#: sql_help.c:2933
msgid "lockmode"
msgstr "锁模式"
-#: sql_help.c:2759
+#: sql_help.c:2934
msgid "where lockmode is one of:"
msgstr "锁模式可以是下列选项之一:"
-#: sql_help.c:2800
+#: sql_help.c:2975
msgid "payload"
msgstr "消息中负载流量(payload)"
-#: sql_help.c:2826
+#: sql_help.c:3001
msgid "old_role"
msgstr "旧的角色"
-#: sql_help.c:2827
+#: sql_help.c:3002
msgid "new_role"
msgstr "新的角色"
# sql_help.h:382
-#: sql_help.c:2852 sql_help.c:3013 sql_help.c:3021
+#: sql_help.c:3027 sql_help.c:3188 sql_help.c:3196
msgid "savepoint_name"
msgstr "保存点名称"
-#: sql_help.c:3048
+#: sql_help.c:3229
msgid "provider"
msgstr "provider(提供者)"
-#: sql_help.c:3111 sql_help.c:3142 sql_help.c:3144 sql_help.c:3182
-#: sql_help.c:3317 sql_help.c:3348 sql_help.c:3350 sql_help.c:3474
-#: sql_help.c:3505 sql_help.c:3507
+#: sql_help.c:3306 sql_help.c:3345 sql_help.c:3347 sql_help.c:3385
+#: sql_help.c:3524 sql_help.c:3563 sql_help.c:3565 sql_help.c:3693
+#: sql_help.c:3732 sql_help.c:3734
msgid "from_item"
msgstr "from列表中项"
-#: sql_help.c:3115 sql_help.c:3186 sql_help.c:3321 sql_help.c:3478
+#: sql_help.c:3310 sql_help.c:3389 sql_help.c:3528 sql_help.c:3697
msgid "window_name"
msgstr "窗口名称"
# describe.c:977
-#: sql_help.c:3116 sql_help.c:3187 sql_help.c:3322 sql_help.c:3479
+#: sql_help.c:3311 sql_help.c:3390 sql_help.c:3529 sql_help.c:3698
msgid "window_definition"
msgstr "窗口定义"
-#: sql_help.c:3117 sql_help.c:3128 sql_help.c:3150 sql_help.c:3188
-#: sql_help.c:3323 sql_help.c:3334 sql_help.c:3356 sql_help.c:3480
-#: sql_help.c:3491 sql_help.c:3513
+#: sql_help.c:3312 sql_help.c:3323 sql_help.c:3353 sql_help.c:3391
+#: sql_help.c:3530 sql_help.c:3541 sql_help.c:3571 sql_help.c:3699
+#: sql_help.c:3710 sql_help.c:3740
msgid "select"
msgstr "查询"
-#: sql_help.c:3124 sql_help.c:3330 sql_help.c:3487
+#: sql_help.c:3319 sql_help.c:3537 sql_help.c:3706
msgid "where from_item can be one of:"
msgstr "from 列表中的项可以是下列内容之一"
-#: sql_help.c:3127 sql_help.c:3130 sql_help.c:3133 sql_help.c:3137
-#: sql_help.c:3333 sql_help.c:3336 sql_help.c:3339 sql_help.c:3343
-#: sql_help.c:3490 sql_help.c:3493 sql_help.c:3496 sql_help.c:3500
+#: sql_help.c:3322 sql_help.c:3325 sql_help.c:3328 sql_help.c:3332
+#: sql_help.c:3344 sql_help.c:3540 sql_help.c:3543 sql_help.c:3546
+#: sql_help.c:3550 sql_help.c:3562 sql_help.c:3709 sql_help.c:3712
+#: sql_help.c:3715 sql_help.c:3719 sql_help.c:3731
msgid "column_alias"
msgstr "列的化名"
-#: sql_help.c:3131 sql_help.c:3148 sql_help.c:3337 sql_help.c:3354
-#: sql_help.c:3494 sql_help.c:3511
+#: sql_help.c:3326 sql_help.c:3351 sql_help.c:3544 sql_help.c:3569
+#: sql_help.c:3713 sql_help.c:3738
msgid "with_query_name"
msgstr "WITH查询语句名称(with_query_name)"
-#: sql_help.c:3135 sql_help.c:3140 sql_help.c:3341 sql_help.c:3346
-#: sql_help.c:3498 sql_help.c:3503
+#: sql_help.c:3330 sql_help.c:3334 sql_help.c:3338 sql_help.c:3341
+#: sql_help.c:3548 sql_help.c:3552 sql_help.c:3556 sql_help.c:3559
+#: sql_help.c:3717 sql_help.c:3721 sql_help.c:3725 sql_help.c:3728
msgid "argument"
msgstr "参数"
# describe.c:977
-#: sql_help.c:3138 sql_help.c:3141 sql_help.c:3344 sql_help.c:3347
-#: sql_help.c:3501 sql_help.c:3504
+#: sql_help.c:3336 sql_help.c:3339 sql_help.c:3342 sql_help.c:3554
+#: sql_help.c:3557 sql_help.c:3560 sql_help.c:3723 sql_help.c:3726
+#: sql_help.c:3729
msgid "column_definition"
msgstr "列定义"
-#: sql_help.c:3143 sql_help.c:3349 sql_help.c:3506
+#: sql_help.c:3346 sql_help.c:3564 sql_help.c:3733
msgid "join_type"
msgstr "连接操作的类型"
-#: sql_help.c:3145 sql_help.c:3351 sql_help.c:3508
+#: sql_help.c:3348 sql_help.c:3566 sql_help.c:3735
msgid "join_condition"
msgstr "用连接操作的条件"
-#: sql_help.c:3146 sql_help.c:3352 sql_help.c:3509
+#: sql_help.c:3349 sql_help.c:3567 sql_help.c:3736
msgid "join_column"
msgstr "用于连接操作的列"
-#: sql_help.c:3147 sql_help.c:3353 sql_help.c:3510
+#: sql_help.c:3350 sql_help.c:3568 sql_help.c:3737
msgid "and with_query is:"
msgstr "with查询语句是:"
# describe.c:415
# describe.c:543
# describe.c:1477
-#: sql_help.c:3151 sql_help.c:3357 sql_help.c:3514
+#: sql_help.c:3354 sql_help.c:3572 sql_help.c:3741
msgid "values"
msgstr "值"
-#: sql_help.c:3152 sql_help.c:3358 sql_help.c:3515
+#: sql_help.c:3355 sql_help.c:3573 sql_help.c:3742
msgid "insert"
msgstr "insert"
-#: sql_help.c:3153 sql_help.c:3359 sql_help.c:3516
+#: sql_help.c:3356 sql_help.c:3574 sql_help.c:3743
msgid "update"
msgstr "update"
-#: sql_help.c:3154 sql_help.c:3360 sql_help.c:3517
+#: sql_help.c:3357 sql_help.c:3575 sql_help.c:3744
msgid "delete"
msgstr "delete"
# describe.c:415
# describe.c:543
# describe.c:1477
-#: sql_help.c:3181
+#: sql_help.c:3384
msgid "new_table"
msgstr "新的表"
-#: sql_help.c:3206
+#: sql_help.c:3409
msgid "timezone"
msgstr "时间区域"
-#: sql_help.c:3251
+#: sql_help.c:3454
msgid "snapshot_id"
msgstr "snapshot_id"
-#: sql_help.c:3399
+#: sql_help.c:3614
msgid "from_list"
msgstr "from列表(from_list)"
-#: sql_help.c:3430
+#: sql_help.c:3645
msgid "sort_expression"
msgstr "排序表达式"
# sql_help.h:25
# sql_help.h:373
-#: sql_help.h:190 sql_help.h:885
+#: sql_help.h:191 sql_help.h:891
msgid "abort the current transaction"
msgstr "中止目前的交易"
# sql_help.h:29
-#: sql_help.h:195
+#: sql_help.h:196
msgid "change the definition of an aggregate function"
msgstr "更改聚集函数的定义"
# sql_help.h:45
-#: sql_help.h:200
+#: sql_help.h:201
msgid "change the definition of a collation"
msgstr "更改校对规则的定义"
# sql_help.h:33
-#: sql_help.h:205
+#: sql_help.h:206
msgid "change the definition of a conversion"
msgstr "更改一个字元编码转换的定义"
# sql_help.h:37
-#: sql_help.h:210
+#: sql_help.h:211
msgid "change a database"
msgstr "更改一个资料库"
# sql_help.h:325
-#: sql_help.h:215
+#: sql_help.h:216
msgid "define default access privileges"
msgstr "定义缺省的访问权限"
# sql_help.h:41
-#: sql_help.h:220
+#: sql_help.h:221
msgid "change the definition of a domain"
msgstr "更改共同值域的定义"
# sql_help.h:85
-#: sql_help.h:225
-#| msgid "change the definition of a trigger"
+#: sql_help.h:226
msgid "change the definition of an event trigger"
msgstr "更改事件触发器的定义"
# sql_help.h:33
-#: sql_help.h:230
+#: sql_help.h:231
msgid "change the definition of an extension"
msgstr "更改扩展的定义"
# sql_help.h:85
-#: sql_help.h:235
+#: sql_help.h:236
msgid "change the definition of a foreign-data wrapper"
msgstr "更改外部数据封装器的定义"
# sql_help.h:85
-#: sql_help.h:240
+#: sql_help.h:241
msgid "change the definition of a foreign table"
msgstr "更改外部表的定义"
# sql_help.h:45
-#: sql_help.h:245
+#: sql_help.h:246
msgid "change the definition of a function"
msgstr "更改函数的定义"
-#: sql_help.h:250
+#: sql_help.h:251
msgid "change role name or membership"
msgstr "更改角色名称或会员"
# sql_help.h:53
-#: sql_help.h:255
+#: sql_help.h:256
msgid "change the definition of an index"
msgstr "更改索引的定义"
# sql_help.h:57
-#: sql_help.h:260
+#: sql_help.h:261
msgid "change the definition of a procedural language"
msgstr "更改程序语言的定义"
# sql_help.h:77
-#: sql_help.h:265
+#: sql_help.h:266
msgid "change the definition of a large object"
msgstr "改变大对象的定义"
# sql_help.h:53
-#: sql_help.h:270
-#| msgid "change the definition of a view"
+#: sql_help.h:271
msgid "change the definition of a materialized view"
msgstr "更改物化视图的定义"
# sql_help.h:65
-#: sql_help.h:275
+#: sql_help.h:276
msgid "change the definition of an operator"
msgstr "更改运算子的定义"
# sql_help.h:61
-#: sql_help.h:280
+#: sql_help.h:281
msgid "change the definition of an operator class"
msgstr "更改运算子类别的定义"
# sql_help.h:65
-#: sql_help.h:285
+#: sql_help.h:286
msgid "change the definition of an operator family"
msgstr "更改一个运算子家族的识别"
# sql_help.h:37
-#: sql_help.h:290 sql_help.h:355
+#: sql_help.h:291 sql_help.h:361
msgid "change a database role"
msgstr "变更资料库角色"
# sql_help.h:77
-#: sql_help.h:295
-#| msgid "change the definition of a table"
+#: sql_help.h:296
msgid "change the definition of a rule"
msgstr "更改规则的定义"
# sql_help.h:69
-#: sql_help.h:300
+#: sql_help.h:301
msgid "change the definition of a schema"
msgstr "更改架构模式的定义"
# sql_help.h:73
-#: sql_help.h:305
+#: sql_help.h:306
msgid "change the definition of a sequence generator"
msgstr "更改序列数产生器的定义"
# sql_help.h:85
-#: sql_help.h:310
+#: sql_help.h:311
msgid "change the definition of a foreign server"
msgstr "更改外部服务器的定义"
+# sql_help.h:366
+#: sql_help.h:316
+#| msgid "configuration_parameter"
+msgid "change a server configuration parameter"
+msgstr "改变服务器的配置参数"
+
# sql_help.h:77
-#: sql_help.h:315
+#: sql_help.h:321
msgid "change the definition of a table"
msgstr "更改资料表的定义"
# sql_help.h:81
-#: sql_help.h:320
+#: sql_help.h:326
msgid "change the definition of a tablespace"
msgstr "更改表空间的定义"
# sql_help.h:33
-#: sql_help.h:325
+#: sql_help.h:331
msgid "change the definition of a text search configuration"
msgstr "更改一个文本搜寻组态的定义"
# sql_help.h:45
-#: sql_help.h:330
+#: sql_help.h:336
msgid "change the definition of a text search dictionary"
msgstr "更改一个文本搜寻字典的定义"
# sql_help.h:81
-#: sql_help.h:335
+#: sql_help.h:341
msgid "change the definition of a text search parser"
msgstr "更改一个文本搜寻剖析器的定义"
# sql_help.h:69
-#: sql_help.h:340
+#: sql_help.h:346
msgid "change the definition of a text search template"
msgstr "更改一个文本搜寻模版的定义"
# sql_help.h:85
-#: sql_help.h:345
+#: sql_help.h:351
msgid "change the definition of a trigger"
msgstr "更改触发器的定义"
# sql_help.h:89
-#: sql_help.h:350
+#: sql_help.h:356
msgid "change the definition of a type"
msgstr "更改资料型别的定义"
# sql_help.h:41
-#: sql_help.h:360
+#: sql_help.h:366
msgid "change the definition of a user mapping"
msgstr "更改用户映射的定义"
# sql_help.h:53
-#: sql_help.h:365
+#: sql_help.h:371
msgid "change the definition of a view"
msgstr "更改视观表的定义"
# sql_help.h:97
-#: sql_help.h:370
+#: sql_help.h:376
msgid "collect statistics about a database"
msgstr "关于资料库的收集统计"
# sql_help.h:101
# sql_help.h:413
-#: sql_help.h:375 sql_help.h:950
+#: sql_help.h:381 sql_help.h:956
msgid "start a transaction block"
msgstr "开始一个事物交易区块"
# sql_help.h:105
-#: sql_help.h:380
+#: sql_help.h:386
msgid "force a transaction log checkpoint"
msgstr "强制事物交易日志检查点"
# sql_help.h:109
-#: sql_help.h:385
+#: sql_help.h:391
msgid "close a cursor"
msgstr "关闭 cursor"
# sql_help.h:113
-#: sql_help.h:390
+#: sql_help.h:396
msgid "cluster a table according to an index"
msgstr "丛集一个资料表根据一个索引"
# sql_help.h:117
-#: sql_help.h:395
+#: sql_help.h:401
msgid "define or change the comment of an object"
msgstr "定义或更改一个物件的注解"
# sql_help.h:121
# sql_help.h:309
-#: sql_help.h:400 sql_help.h:790
+#: sql_help.h:406 sql_help.h:796
msgid "commit the current transaction"
msgstr "确认目前的事物交易"
-#: sql_help.h:405
+#: sql_help.h:411
msgid "commit a transaction that was earlier prepared for two-phase commit"
msgstr "提交一项事务交易这是两阶段提交的先前准备"
# sql_help.h:125
-#: sql_help.h:410
+#: sql_help.h:416
msgid "copy data between a file and a table"
msgstr "在档案和资料表间复制资料"
# sql_help.h:129
-#: sql_help.h:415
+#: sql_help.h:421
msgid "define a new aggregate function"
msgstr "定义一个新的聚集函数"
# sql_help.h:133
-#: sql_help.h:420
+#: sql_help.h:426
msgid "define a new cast"
msgstr "建立新的型别转换"
# sql_help.h:153
-#: sql_help.h:425
+#: sql_help.h:431
msgid "define a new collation"
msgstr "建立新的校对规则"
# sql_help.h:141
-#: sql_help.h:430
+#: sql_help.h:436
msgid "define a new encoding conversion"
msgstr "定义一个新的字元编码转换"
# sql_help.h:145
-#: sql_help.h:435
+#: sql_help.h:441
msgid "create a new database"
msgstr "建立新的资料库"
# sql_help.h:149
-#: sql_help.h:440
+#: sql_help.h:446
msgid "define a new domain"
msgstr "建立新的共同值域"
# sql_help.h:201
-#: sql_help.h:445
-#| msgid "define a new trigger"
+#: sql_help.h:451
msgid "define a new event trigger"
msgstr "定义新的事件触发器"
-#: sql_help.h:450
+#: sql_help.h:456
msgid "install an extension"
msgstr "安装一个扩展"
# sql_help.h:205
-#: sql_help.h:455
+#: sql_help.h:461
msgid "define a new foreign-data wrapper"
msgstr "定义一个新的外部数据封装器"
# sql_help.h:201
-#: sql_help.h:460
+#: sql_help.h:466
msgid "define a new foreign table"
msgstr "建立新的外部表"
# sql_help.h:153
-#: sql_help.h:465
+#: sql_help.h:471
msgid "define a new function"
msgstr "建立新的函数"
# sql_help.h:189
-#: sql_help.h:470 sql_help.h:505 sql_help.h:575
+#: sql_help.h:476 sql_help.h:511 sql_help.h:581
msgid "define a new database role"
msgstr "定义一个新资料库角色"
# sql_help.h:161
-#: sql_help.h:475
+#: sql_help.h:481
msgid "define a new index"
msgstr "建立新的索引"
# sql_help.h:165
-#: sql_help.h:480
+#: sql_help.h:486
msgid "define a new procedural language"
msgstr "建立新的程序语言"
# sql_help.h:213
-#: sql_help.h:485
-#| msgid "define a new view"
+#: sql_help.h:491
msgid "define a new materialized view"
msgstr "建立新的物化视图"
# sql_help.h:173
-#: sql_help.h:490
+#: sql_help.h:496
msgid "define a new operator"
msgstr "建立新的运算子"
# sql_help.h:169
-#: sql_help.h:495
+#: sql_help.h:501
msgid "define a new operator class"
msgstr "建立新的运算子类别"
# sql_help.h:173
-#: sql_help.h:500
+#: sql_help.h:506
msgid "define a new operator family"
msgstr "定义一个新的运算子家族"
# sql_help.h:177
-#: sql_help.h:510
+#: sql_help.h:516
msgid "define a new rewrite rule"
msgstr "建立新的重写规则"
# sql_help.h:181
-#: sql_help.h:515
+#: sql_help.h:521
msgid "define a new schema"
msgstr "建立新的架构模式"
# sql_help.h:185
-#: sql_help.h:520
+#: sql_help.h:526
msgid "define a new sequence generator"
msgstr "建立新的序列数产生器"
# sql_help.h:201
-#: sql_help.h:525
+#: sql_help.h:531
msgid "define a new foreign server"
msgstr "建立新的触发器"
# sql_help.h:189
-#: sql_help.h:530
+#: sql_help.h:536
msgid "define a new table"
msgstr "建立新的资料表"
# sql_help.h:193
# sql_help.h:389
-#: sql_help.h:535 sql_help.h:915
+#: sql_help.h:541 sql_help.h:921
msgid "define a new table from the results of a query"
msgstr "以查询结果建立新的资料表"
# sql_help.h:197
-#: sql_help.h:540
+#: sql_help.h:546
msgid "define a new tablespace"
msgstr "建立新的表空间"
# sql_help.h:129
-#: sql_help.h:545
+#: sql_help.h:551
msgid "define a new text search configuration"
msgstr "定义一个新文本搜寻组态"
# sql_help.h:129
-#: sql_help.h:550
+#: sql_help.h:556
msgid "define a new text search dictionary"
msgstr "定义一个新文本搜寻字典"
# sql_help.h:197
-#: sql_help.h:555
+#: sql_help.h:561
msgid "define a new text search parser"
msgstr "定义一个新文本搜寻剖析器"
# sql_help.h:181
-#: sql_help.h:560
+#: sql_help.h:566
msgid "define a new text search template"
msgstr "定义一个新文本搜寻模版"
# sql_help.h:201
-#: sql_help.h:565
+#: sql_help.h:571
msgid "define a new trigger"
msgstr "建立新的触发器"
# sql_help.h:205
-#: sql_help.h:570
+#: sql_help.h:576
msgid "define a new data type"
msgstr "建立新的资料型别"
-#: sql_help.h:580
+#: sql_help.h:586
msgid "define a new mapping of a user to a foreign server"
msgstr "将用户的新映射定义到一个外部服务器"
# sql_help.h:213
-#: sql_help.h:585
+#: sql_help.h:591
msgid "define a new view"
msgstr "建立新的视观表"
# sql_help.h:217
-#: sql_help.h:590
+#: sql_help.h:596
msgid "deallocate a prepared statement"
msgstr "释放一个已预备好的叙述区块"
# sql_help.h:221
-#: sql_help.h:595
+#: sql_help.h:601
msgid "define a cursor"
msgstr "建立一个 cursor"
# sql_help.h:225
-#: sql_help.h:600
+#: sql_help.h:606
msgid "delete rows of a table"
msgstr "删除资料表中的资料列"
-#: sql_help.h:605
+#: sql_help.h:611
msgid "discard session state"
msgstr "抛弃 session 状态"
-#: sql_help.h:610
+#: sql_help.h:616
msgid "execute an anonymous code block"
msgstr "执行一个匿名代码块"
# sql_help.h:229
-#: sql_help.h:615
+#: sql_help.h:621
msgid "remove an aggregate function"
msgstr "移除一个聚集函数"
# sql_help.h:233
-#: sql_help.h:620
+#: sql_help.h:626
msgid "remove a cast"
msgstr "移除一个型别转换"
# sql_help.h:249
-#: sql_help.h:625
+#: sql_help.h:631
msgid "remove a collation"
msgstr "移除一个校对规则"
# sql_help.h:237
-#: sql_help.h:630
+#: sql_help.h:636
msgid "remove a conversion"
msgstr "移除一个字元编码转换"
# sql_help.h:241
-#: sql_help.h:635
+#: sql_help.h:641
msgid "remove a database"
msgstr "移除资料库"
# sql_help.h:245
-#: sql_help.h:640
+#: sql_help.h:646
msgid "remove a domain"
msgstr "移除一个共同值域"
# sql_help.h:293
-#: sql_help.h:645
-#| msgid "remove a trigger"
+#: sql_help.h:651
msgid "remove an event trigger"
msgstr "移除事件触发器"
# sql_help.h:237
-#: sql_help.h:650
+#: sql_help.h:656
msgid "remove an extension"
msgstr "移除一个扩展"
# sql_help.h:297
-#: sql_help.h:655
+#: sql_help.h:661
msgid "remove a foreign-data wrapper"
msgstr "删除一个外部数据封装器"
# sql_help.h:285
-#: sql_help.h:660
+#: sql_help.h:666
msgid "remove a foreign table"
msgstr "移除外部引用表"
# sql_help.h:249
-#: sql_help.h:665
+#: sql_help.h:671
msgid "remove a function"
msgstr "移除函数"
# sql_help.h:241
-#: sql_help.h:670 sql_help.h:710 sql_help.h:775
+#: sql_help.h:676 sql_help.h:716 sql_help.h:781
msgid "remove a database role"
msgstr "移除一个资料库成员"
# sql_help.h:257
-#: sql_help.h:675
+#: sql_help.h:681
msgid "remove an index"
msgstr "移除一个索引"
# sql_help.h:261
-#: sql_help.h:680
+#: sql_help.h:686
msgid "remove a procedural language"
msgstr "移除一个程序语言"
# sql_help.h:305
-#: sql_help.h:685
-#| msgid "remove a view"
+#: sql_help.h:691
msgid "remove a materialized view"
msgstr "移除一个物化视图"
# sql_help.h:269
-#: sql_help.h:690
+#: sql_help.h:696
msgid "remove an operator"
msgstr "移除运算子"
# sql_help.h:265
-#: sql_help.h:695
+#: sql_help.h:701
msgid "remove an operator class"
msgstr "移除一个运算子类别"
# sql_help.h:269
-#: sql_help.h:700
+#: sql_help.h:706
msgid "remove an operator family"
msgstr "移除一个运算子家族"
-#: sql_help.h:705
+#: sql_help.h:711
msgid "remove database objects owned by a database role"
msgstr "依照一个资料库角色拥有的资料库物件来移除"
# sql_help.h:273
-#: sql_help.h:715
+#: sql_help.h:721
msgid "remove a rewrite rule"
msgstr "移除一个重写规则"
# sql_help.h:277
-#: sql_help.h:720
+#: sql_help.h:726
msgid "remove a schema"
msgstr "移除一个架构模式"
# sql_help.h:281
-#: sql_help.h:725
+#: sql_help.h:731
msgid "remove a sequence"
msgstr "移除序列数"
# sql_help.h:237
-#: sql_help.h:730
+#: sql_help.h:736
msgid "remove a foreign server descriptor"
msgstr "删除一个外部服务器描述符"
# sql_help.h:285
-#: sql_help.h:735
+#: sql_help.h:741
msgid "remove a table"
msgstr "移除资料表"
# sql_help.h:289
-#: sql_help.h:740
+#: sql_help.h:746
msgid "remove a tablespace"
msgstr "移除一个表空间"
# sql_help.h:301
-#: sql_help.h:745
+#: sql_help.h:751
msgid "remove a text search configuration"
msgstr "移除一个文本搜寻组态"
# sql_help.h:301
-#: sql_help.h:750
+#: sql_help.h:756
msgid "remove a text search dictionary"
msgstr "移除一个文本搜寻字典"
# sql_help.h:289
-#: sql_help.h:755
+#: sql_help.h:761
msgid "remove a text search parser"
msgstr "移除一个文本搜寻剖析器"
# sql_help.h:277
-#: sql_help.h:760
+#: sql_help.h:766
msgid "remove a text search template"
msgstr "移除一个文本搜寻模版"
# sql_help.h:293
-#: sql_help.h:765
+#: sql_help.h:771
msgid "remove a trigger"
msgstr "移除触发器"
# sql_help.h:297
-#: sql_help.h:770
+#: sql_help.h:776
msgid "remove a data type"
msgstr "移除资料型别"
-#: sql_help.h:780
+#: sql_help.h:786
msgid "remove a user mapping for a foreign server"
msgstr "为外部服务器删除用户映射"
# sql_help.h:305
-#: sql_help.h:785
+#: sql_help.h:791
msgid "remove a view"
msgstr "移除一个视观表"
# sql_help.h:313
-#: sql_help.h:795
+#: sql_help.h:801
msgid "execute a prepared statement"
msgstr "执行一个已准备好的叙述区块"
# sql_help.h:317
-#: sql_help.h:800
+#: sql_help.h:806
msgid "show the execution plan of a statement"
msgstr "显示一个叙述区块的执行计划"
# sql_help.h:321
-#: sql_help.h:805
+#: sql_help.h:811
msgid "retrieve rows from a query using a cursor"
msgstr "从使用 cursor 的查询读取资料"
# sql_help.h:325
-#: sql_help.h:810
+#: sql_help.h:816
msgid "define access privileges"
msgstr "建立存取权限"
# sql_help.h:329
-#: sql_help.h:815
+#: sql_help.h:821
msgid "create new rows in a table"
msgstr "在资料表中建立资料"
# sql_help.h:333
-#: sql_help.h:820
+#: sql_help.h:826
msgid "listen for a notification"
msgstr "等待通知"
# sql_help.h:337
-#: sql_help.h:825
+#: sql_help.h:831
msgid "load a shared library file"
msgstr "加载一个共享库文件"
# sql_help.h:341
-#: sql_help.h:830
+#: sql_help.h:836
msgid "lock a table"
msgstr "锁住资料表"
# sql_help.h:345
-#: sql_help.h:835
+#: sql_help.h:841
msgid "position a cursor"
msgstr "移动游标位置"
# sql_help.h:349
-#: sql_help.h:840
+#: sql_help.h:846
msgid "generate a notification"
msgstr "产生通告"
# sql_help.h:353
-#: sql_help.h:845
+#: sql_help.h:851
msgid "prepare a statement for execution"
msgstr "预先编译叙述以执行"
# sql_help.h:25
# sql_help.h:373
-#: sql_help.h:850
+#: sql_help.h:856
msgid "prepare the current transaction for two-phase commit"
msgstr "预备当前事务交易的二段式提交"
-#: sql_help.h:855
+#: sql_help.h:861
msgid "change the ownership of database objects owned by a database role"
msgstr "依照一个资料库角色拥有的的资料库物件来更变所有权"
-#: sql_help.h:860
+#: sql_help.h:866
msgid "replace the contents of a materialized view"
msgstr "替换物化视图的内容"
# sql_help.h:357
-#: sql_help.h:865
+#: sql_help.h:871
msgid "rebuild indexes"
msgstr "重新建构索引"
# sql_help.h:361
-#: sql_help.h:870
+#: sql_help.h:876
msgid "destroy a previously defined savepoint"
msgstr "删除先前建立的储存点(Savepoint)"
# sql_help.h:365
-#: sql_help.h:875
+#: sql_help.h:881
msgid "restore the value of a run-time parameter to the default value"
msgstr "将执行时期参数还原成预设值"
# sql_help.h:369
-#: sql_help.h:880
+#: sql_help.h:886
msgid "remove access privileges"
msgstr "移除存取权限"
-#: sql_help.h:890
+#: sql_help.h:896
msgid "cancel a transaction that was earlier prepared for two-phase commit"
msgstr "取消一个可以为两阶段提交容易配置的事务"
# sql_help.h:377
-#: sql_help.h:895
+#: sql_help.h:901
msgid "roll back to a savepoint"
msgstr "还原至一个储存点(Savepoint)"
# sql_help.h:381
-#: sql_help.h:900
+#: sql_help.h:906
msgid "define a new savepoint within the current transaction"
msgstr "在目前的事物交易中建立新的储存点(Savepoint)"
# sql_help.h:117
-#: sql_help.h:905
+#: sql_help.h:911
msgid "define or change a security label applied to an object"
msgstr "定义或更改一个对象的安全标签"
# sql_help.h:385
-#: sql_help.h:910 sql_help.h:955 sql_help.h:985
+#: sql_help.h:916 sql_help.h:961 sql_help.h:991
msgid "retrieve rows from a table or view"
msgstr "从资料表或视观表读取资料"
# sql_help.h:393
-#: sql_help.h:920
+#: sql_help.h:926
msgid "change a run-time parameter"
msgstr "更改一个执行时期参数"
# sql_help.h:397
-#: sql_help.h:925
+#: sql_help.h:931
msgid "set constraint check timing for the current transaction"
msgstr "为当前事务设定约束限制检查的时间模式"
# sql_help.h:405
-#: sql_help.h:930
+#: sql_help.h:936
msgid "set the current user identifier of the current session"
msgstr "设置当前 session 的当前用户的身份标识"
# sql_help.h:401
-#: sql_help.h:935
+#: sql_help.h:941
msgid ""
"set the session user identifier and the current user identifier of the "
"current session"
msgstr "设置会话用户标识符和当前会话的当前用户标识符"
# sql_help.h:405
-#: sql_help.h:940
+#: sql_help.h:946
msgid "set the characteristics of the current transaction"
msgstr "设定目前事物交易属性"
# sql_help.h:409
-#: sql_help.h:945
+#: sql_help.h:951
msgid "show the value of a run-time parameter"
msgstr "显示执行时期的参数值"
# sql_help.h:425
-#: sql_help.h:960
+#: sql_help.h:966
msgid "empty a table or set of tables"
msgstr "空的资料表或资料表设置"
# sql_help.h:421
-#: sql_help.h:965
+#: sql_help.h:971
msgid "stop listening for a notification"
msgstr "停止倾听通告"
# sql_help.h:425
-#: sql_help.h:970
+#: sql_help.h:976
msgid "update rows of a table"
msgstr "更新资料表中的资料列"
# sql_help.h:429
-#: sql_help.h:975
+#: sql_help.h:981
msgid "garbage-collect and optionally analyze a database"
msgstr "垃圾收集(GC)并选择性的分析资料库"
-#: sql_help.h:980
+#: sql_help.h:986
msgid "compute a set of rows"
msgstr "计算一个资料列的集合"
-#: startup.c:167
+#: startup.c:166
#, c-format
-#| msgid "%s can only be used in transaction blocks"
msgid "%s: -1 can only be used in non-interactive mode\n"
msgstr "%s: -1 只能用于非交互模式下\n"
# command.c:1148
-#: startup.c:269
+#: startup.c:266
#, c-format
msgid "%s: could not open log file \"%s\": %s\n"
msgstr "%s:无法开启日志档 \"%s\":%s\n"
-#: startup.c:331
+#: startup.c:328
#, c-format
msgid ""
"Type \"help\" for help.\n"
@@ -5142,37 +5311,42 @@ msgstr ""
"\n"
# startup.c:446
-#: startup.c:476
+#: startup.c:471
#, c-format
msgid "%s: could not set printing parameter \"%s\"\n"
msgstr "%s:无法设定列印参数 \"%s\"\n"
# startup.c:492
-#: startup.c:516
+#: startup.c:511
#, c-format
msgid "%s: could not delete variable \"%s\"\n"
msgstr "%s:无法删除变数 \"%s\"\n"
# startup.c:502
-#: startup.c:526
+#: startup.c:521
#, c-format
msgid "%s: could not set variable \"%s\"\n"
msgstr "%s:无法设定变数 \"%s\"\n"
# startup.c:533
# startup.c:539
-#: startup.c:569 startup.c:575
+#: startup.c:564 startup.c:570
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "尝试 \"%s --help\" 以得到更多资讯。\n"
# startup.c:557
-#: startup.c:592
+#: startup.c:587
#, c-format
msgid "%s: warning: extra command-line argument \"%s\" ignored\n"
msgstr "%s:警告:忽略多余的命令列参数 \"%s\"\n"
-#: tab-complete.c:3962
+#: startup.c:609
+#, c-format
+msgid "%s: could not find own program executable\n"
+msgstr "%s: 无法找到执行文件\n"
+
+#: tab-complete.c:4110
#, c-format
msgid ""
"tab completion query failed: %s\n"
diff --git a/src/bin/scripts/nls.mk b/src/bin/scripts/nls.mk
index b83a8ae76a2..36299d8267a 100644
--- a/src/bin/scripts/nls.mk
+++ b/src/bin/scripts/nls.mk
@@ -1,6 +1,6 @@
# src/bin/scripts/nls.mk
CATALOG_NAME = pgscripts
-AVAIL_LANGUAGES = cs de es fr it ja pl pt_BR ru zh_CN
+AVAIL_LANGUAGES = cs de es fr it ja pl pt_BR ru sv zh_CN
GETTEXT_FILES = createdb.c createlang.c createuser.c \
dropdb.c droplang.c dropuser.c \
clusterdb.c vacuumdb.c reindexdb.c \
diff --git a/src/bin/scripts/po/de.po b/src/bin/scripts/po/de.po
index c2ec8664701..7b823c74362 100644
--- a/src/bin/scripts/po/de.po
+++ b/src/bin/scripts/po/de.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: PostgreSQL 9.4\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2014-08-23 05:12+0000\n"
-"PO-Revision-Date: 2014-08-23 17:08-0400\n"
+"POT-Creation-Date: 2014-12-04 22:42+0000\n"
+"PO-Revision-Date: 2014-12-04 21:13-0500\n"
"Last-Translator: Peter Eisentraut <peter_e@gmx.net>\n"
"Language-Team: German <peter_e@gmx.net>\n"
"Language: de\n"
@@ -94,19 +94,19 @@ msgstr ""
#: clusterdb.c:262 createdb.c:252 createlang.c:236 createuser.c:348
#: dropdb.c:155 droplang.c:237 dropuser.c:156 pg_isready.c:222 reindexdb.c:342
-#: vacuumdb.c:394
+#: vacuumdb.c:425
#, c-format
msgid "Usage:\n"
msgstr "Aufruf:\n"
-#: clusterdb.c:263 reindexdb.c:343 vacuumdb.c:395
+#: clusterdb.c:263 reindexdb.c:343 vacuumdb.c:426
#, c-format
msgid " %s [OPTION]... [DBNAME]\n"
msgstr " %s [OPTION]... [DBNAME]\n"
#: clusterdb.c:264 createdb.c:254 createlang.c:238 createuser.c:350
#: dropdb.c:157 droplang.c:239 dropuser.c:158 pg_isready.c:225 reindexdb.c:344
-#: vacuumdb.c:396
+#: vacuumdb.c:427
#, c-format
msgid ""
"\n"
@@ -162,7 +162,7 @@ msgstr " -?, --help diese Hilfe anzeigen, dann beenden\n"
#: clusterdb.c:273 createdb.c:265 createlang.c:244 createuser.c:374
#: dropdb.c:163 droplang.c:245 dropuser.c:165 pg_isready.c:231 reindexdb.c:354
-#: vacuumdb.c:411
+#: vacuumdb.c:442
#, c-format
msgid ""
"\n"
@@ -172,36 +172,36 @@ msgstr ""
"Verbindungsoptionen:\n"
#: clusterdb.c:274 createlang.c:245 createuser.c:375 dropdb.c:164
-#: droplang.c:246 dropuser.c:166 reindexdb.c:355 vacuumdb.c:412
+#: droplang.c:246 dropuser.c:166 reindexdb.c:355 vacuumdb.c:443
#, c-format
msgid " -h, --host=HOSTNAME database server host or socket directory\n"
msgstr " -h, --host=HOSTNAME Name des Datenbankservers oder Socket-Verzeichnis\n"
#: clusterdb.c:275 createlang.c:246 createuser.c:376 dropdb.c:165
-#: droplang.c:247 dropuser.c:167 reindexdb.c:356 vacuumdb.c:413
+#: droplang.c:247 dropuser.c:167 reindexdb.c:356 vacuumdb.c:444
#, c-format
msgid " -p, --port=PORT database server port\n"
msgstr " -p, --port=PORT Port des Datenbankservers\n"
#: clusterdb.c:276 createlang.c:247 dropdb.c:166 droplang.c:248
-#: reindexdb.c:357 vacuumdb.c:414
+#: reindexdb.c:357 vacuumdb.c:445
#, c-format
msgid " -U, --username=USERNAME user name to connect as\n"
msgstr " -U, --username=NAME Datenbankbenutzername\n"
#: clusterdb.c:277 createlang.c:248 createuser.c:378 dropdb.c:167
-#: droplang.c:249 dropuser.c:169 reindexdb.c:358 vacuumdb.c:415
+#: droplang.c:249 dropuser.c:169 reindexdb.c:358 vacuumdb.c:446
#, c-format
msgid " -w, --no-password never prompt for password\n"
msgstr " -w, --no-password niemals nach Passwort fragen\n"
#: clusterdb.c:278 createlang.c:249 createuser.c:379 dropdb.c:168
-#: droplang.c:250 dropuser.c:170 reindexdb.c:359 vacuumdb.c:416
+#: droplang.c:250 dropuser.c:170 reindexdb.c:359 vacuumdb.c:447
#, c-format
msgid " -W, --password force password prompt\n"
msgstr " -W, --password Passwortfrage erzwingen\n"
-#: clusterdb.c:279 dropdb.c:169 reindexdb.c:360 vacuumdb.c:417
+#: clusterdb.c:279 dropdb.c:169 reindexdb.c:360 vacuumdb.c:448
#, c-format
msgid " --maintenance-db=DBNAME alternate maintenance database\n"
msgstr " --maintenance-db=DBNAME alternative Wartungsdatenbank\n"
@@ -218,7 +218,7 @@ msgstr ""
#: clusterdb.c:281 createdb.c:273 createlang.c:250 createuser.c:380
#: dropdb.c:170 droplang.c:251 dropuser.c:171 pg_isready.c:236 reindexdb.c:362
-#: vacuumdb.c:419
+#: vacuumdb.c:450
#, c-format
msgid ""
"\n"
@@ -763,6 +763,31 @@ msgstr "%s: %s"
msgid "%s: could not fetch default options\n"
msgstr "%s: konnte Standardoptionen nicht ermitteln\n"
+#: pg_isready.c:199
+#, c-format
+msgid "accepting connections\n"
+msgstr "Verbindungen werden angenommen\n"
+
+#: pg_isready.c:202
+#, c-format
+msgid "rejecting connections\n"
+msgstr "Verbindungen werden abgelehnt\n"
+
+#: pg_isready.c:205
+#, c-format
+msgid "no response\n"
+msgstr "keine Antwort\n"
+
+#: pg_isready.c:208
+#, c-format
+msgid "no attempt\n"
+msgstr "kein Verbindungsversuch\n"
+
+#: pg_isready.c:211
+#, c-format
+msgid "unknown\n"
+msgstr "unbekannt\n"
+
#: pg_isready.c:221
#, c-format
msgid ""
@@ -958,12 +983,12 @@ msgstr "Erzeuge mittlere Optimierer-Statistiken (10 Ziele)"
msgid "Generating default (full) optimizer statistics"
msgstr "Erzeuge volle Optimierer-Statistiken"
-#: vacuumdb.c:376
+#: vacuumdb.c:406
#, c-format
msgid "%s: vacuuming database \"%s\"\n"
msgstr "%s: führe Vacuum in Datenbank „%s“ aus\n"
-#: vacuumdb.c:393
+#: vacuumdb.c:424
#, c-format
msgid ""
"%s cleans and analyzes a PostgreSQL database.\n"
@@ -972,66 +997,66 @@ msgstr ""
"%s säubert und analysiert eine PostgreSQL-Datenbank.\n"
"\n"
-#: vacuumdb.c:397
+#: vacuumdb.c:428
#, c-format
msgid " -a, --all vacuum all databases\n"
msgstr " -a, --all führe Vacuum in allen Datenbanken aus\n"
-#: vacuumdb.c:398
+#: vacuumdb.c:429
#, c-format
msgid " -d, --dbname=DBNAME database to vacuum\n"
msgstr " -d, --dbname=DBNAME führe Vacuum in dieser Datenbank aus\n"
-#: vacuumdb.c:399
+#: vacuumdb.c:430
#, c-format
msgid " -e, --echo show the commands being sent to the server\n"
msgstr ""
" -e, --echo zeige die Befehle, die an den Server\n"
" gesendet werden\n"
-#: vacuumdb.c:400
+#: vacuumdb.c:431
#, c-format
msgid " -f, --full do full vacuuming\n"
msgstr " -f, --full führe volles Vacuum durch\n"
-#: vacuumdb.c:401
+#: vacuumdb.c:432
#, c-format
msgid " -F, --freeze freeze row transaction information\n"
msgstr " -F, --freeze Zeilentransaktionsinformationen einfrieren\n"
-#: vacuumdb.c:402
+#: vacuumdb.c:433
#, c-format
msgid " -q, --quiet don't write any messages\n"
msgstr " -q, --quiet unterdrücke alle Mitteilungen\n"
-#: vacuumdb.c:403
+#: vacuumdb.c:434
#, c-format
msgid " -t, --table='TABLE[(COLUMNS)]' vacuum specific table(s) only\n"
msgstr ""
" -t, --table='TABELLE[(SPALTEN)]'\n"
" führe Vacuum für bestimmte Tabelle(n) aus\n"
-#: vacuumdb.c:404
+#: vacuumdb.c:435
#, c-format
msgid " -v, --verbose write a lot of output\n"
msgstr " -v, --verbose erzeuge viele Meldungen\n"
-#: vacuumdb.c:405
+#: vacuumdb.c:436
#, c-format
msgid " -V, --version output version information, then exit\n"
msgstr " -V, --version Versionsinformationen anzeigen, dann beenden\n"
-#: vacuumdb.c:406
+#: vacuumdb.c:437
#, c-format
msgid " -z, --analyze update optimizer statistics\n"
msgstr " -z, --analyze aktualisiere Statistiken für den Optimierer\n"
-#: vacuumdb.c:407
+#: vacuumdb.c:438
#, c-format
msgid " -Z, --analyze-only only update optimizer statistics\n"
msgstr " -Z, --analyze-only aktualisiere nur Statistiken für den Optimierer\n"
-#: vacuumdb.c:408
+#: vacuumdb.c:439
#, c-format
msgid ""
" --analyze-in-stages only update optimizer statistics, in multiple\n"
@@ -1040,12 +1065,12 @@ msgstr ""
" --analyze-in-stages aktualisiere nur Statistiken für den Optimierer,\n"
" in mehreren Phasen für schnellere Ergebnisse\n"
-#: vacuumdb.c:410
+#: vacuumdb.c:441
#, c-format
msgid " -?, --help show this help, then exit\n"
msgstr " -?, --help diese Hilfe anzeigen, dann beenden\n"
-#: vacuumdb.c:418
+#: vacuumdb.c:449
#, c-format
msgid ""
"\n"
diff --git a/src/bin/scripts/po/fr.po b/src/bin/scripts/po/fr.po
index 97ca7c4012a..92eaf317dd1 100644
--- a/src/bin/scripts/po/fr.po
+++ b/src/bin/scripts/po/fr.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: PostgreSQL 8.4\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2014-05-17 11:12+0000\n"
-"PO-Revision-Date: 2014-05-17 15:32+0100\n"
+"POT-Creation-Date: 2014-12-04 22:42+0000\n"
+"PO-Revision-Date: 2014-12-05 10:11+0100\n"
"Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
"Language-Team: PostgreSQLfr <pgsql-fr-generale@postgresql.org>\n"
"Language: fr\n"
@@ -30,6 +30,22 @@ msgstr "mmoire puise\n"
msgid "cannot duplicate null pointer (internal error)\n"
msgstr "ne peut pas dupliquer un pointeur nul (erreur interne)\n"
+#: ../../common/username.c:45
+#, c-format
+#| msgid "could not load private key file \"%s\": %s"
+msgid "could not look up effective user ID %ld: %s"
+msgstr "n'a pas pu trouver l'identifiant rel %ld de l'utilisateur : %s"
+
+#: ../../common/username.c:47
+#| msgid "server \"%s\" does not exist"
+msgid "user does not exist"
+msgstr "l'utilisateur n'existe pas"
+
+#: ../../common/username.c:61
+#, c-format
+msgid "user name lookup failure: %s"
+msgstr "chec lors de la recherche du nom d'utilisateur : %s"
+
#: clusterdb.c:110 clusterdb.c:129 createdb.c:119 createdb.c:138
#: createlang.c:89 createlang.c:119 createlang.c:174 createuser.c:168
#: createuser.c:183 dropdb.c:94 dropdb.c:103 dropdb.c:111 droplang.c:88
@@ -94,19 +110,19 @@ msgstr ""
#: clusterdb.c:262 createdb.c:252 createlang.c:236 createuser.c:348
#: dropdb.c:155 droplang.c:237 dropuser.c:156 pg_isready.c:222 reindexdb.c:342
-#: vacuumdb.c:394
+#: vacuumdb.c:425
#, c-format
msgid "Usage:\n"
msgstr "Usage :\n"
-#: clusterdb.c:263 reindexdb.c:343 vacuumdb.c:395
+#: clusterdb.c:263 reindexdb.c:343 vacuumdb.c:426
#, c-format
msgid " %s [OPTION]... [DBNAME]\n"
msgstr " %s [OPTION]... [NOMBASE]\n"
#: clusterdb.c:264 createdb.c:254 createlang.c:238 createuser.c:350
#: dropdb.c:157 droplang.c:239 dropuser.c:158 pg_isready.c:225 reindexdb.c:344
-#: vacuumdb.c:396
+#: vacuumdb.c:427
#, c-format
msgid ""
"\n"
@@ -163,7 +179,7 @@ msgstr " -?, --help affiche cette aide puis quitte\n"
#: clusterdb.c:273 createdb.c:265 createlang.c:244 createuser.c:374
#: dropdb.c:163 droplang.c:245 dropuser.c:165 pg_isready.c:231 reindexdb.c:354
-#: vacuumdb.c:411
+#: vacuumdb.c:442
#, c-format
msgid ""
"\n"
@@ -173,7 +189,7 @@ msgstr ""
"Options de connexion :\n"
#: clusterdb.c:274 createlang.c:245 createuser.c:375 dropdb.c:164
-#: droplang.c:246 dropuser.c:166 reindexdb.c:355 vacuumdb.c:412
+#: droplang.c:246 dropuser.c:166 reindexdb.c:355 vacuumdb.c:443
#, c-format
msgid " -h, --host=HOSTNAME database server host or socket directory\n"
msgstr ""
@@ -181,30 +197,30 @@ msgstr ""
" rpertoire des sockets\n"
#: clusterdb.c:275 createlang.c:246 createuser.c:376 dropdb.c:165
-#: droplang.c:247 dropuser.c:167 reindexdb.c:356 vacuumdb.c:413
+#: droplang.c:247 dropuser.c:167 reindexdb.c:356 vacuumdb.c:444
#, c-format
msgid " -p, --port=PORT database server port\n"
msgstr " -p, --port=PORT port du serveur de bases de donnes\n"
#: clusterdb.c:276 createlang.c:247 dropdb.c:166 droplang.c:248
-#: reindexdb.c:357 vacuumdb.c:414
+#: reindexdb.c:357 vacuumdb.c:445
#, c-format
msgid " -U, --username=USERNAME user name to connect as\n"
msgstr " -U, --username=NOMUTILISATEUR nom d'utilisateur pour la connexion\n"
#: clusterdb.c:277 createlang.c:248 createuser.c:378 dropdb.c:167
-#: droplang.c:249 dropuser.c:169 reindexdb.c:358 vacuumdb.c:415
+#: droplang.c:249 dropuser.c:169 reindexdb.c:358 vacuumdb.c:446
#, c-format
msgid " -w, --no-password never prompt for password\n"
msgstr " -w, --no-password empche la demande d'un mot de passe\n"
#: clusterdb.c:278 createlang.c:249 createuser.c:379 dropdb.c:168
-#: droplang.c:250 dropuser.c:170 reindexdb.c:359 vacuumdb.c:416
+#: droplang.c:250 dropuser.c:170 reindexdb.c:359 vacuumdb.c:447
#, c-format
msgid " -W, --password force password prompt\n"
msgstr " -W, --password force la demande d'un mot de passe\n"
-#: clusterdb.c:279 dropdb.c:169 reindexdb.c:360 vacuumdb.c:417
+#: clusterdb.c:279 dropdb.c:169 reindexdb.c:360 vacuumdb.c:448
#, c-format
msgid " --maintenance-db=DBNAME alternate maintenance database\n"
msgstr " --maintenance-db=NOM_BASE indique une autre base par dfaut\n"
@@ -220,7 +236,7 @@ msgstr ""
#: clusterdb.c:281 createdb.c:273 createlang.c:250 createuser.c:380
#: dropdb.c:170 droplang.c:251 dropuser.c:171 pg_isready.c:236 reindexdb.c:362
-#: vacuumdb.c:419
+#: vacuumdb.c:450
#, c-format
msgid ""
"\n"
@@ -574,7 +590,6 @@ msgstr " -E, --encrypted chiffre le mot de passe stock\n"
#: createuser.c:356
#, c-format
-#| msgid " -s, --superuser role will be superuser\n"
msgid " -g, --role=ROLE new role will be a member of this role\n"
msgstr ""
" -g, --role=ROLE le nouveau rle sera un membre de ce rle\n"
@@ -817,6 +832,34 @@ msgstr "%s : %s"
msgid "%s: could not fetch default options\n"
msgstr "%s : n'a pas pu rcuprer les options par dfaut\n"
+#: pg_isready.c:199
+#, c-format
+#| msgid "Server started and accepting connections\n"
+msgid "accepting connections\n"
+msgstr "acceptation des connexions\n"
+
+#: pg_isready.c:202
+#, c-format
+#| msgid "Server started and accepting connections\n"
+msgid "rejecting connections\n"
+msgstr "rejet des connexions\n"
+
+#: pg_isready.c:205
+#, c-format
+msgid "no response\n"
+msgstr "pas de rponse\n"
+
+#: pg_isready.c:208
+#, c-format
+msgid "no attempt\n"
+msgstr "pas de tentative\n"
+
+#: pg_isready.c:211
+#, c-format
+#| msgid "[unknown]"
+msgid "unknown\n"
+msgstr "inconnu\n"
+
#: pg_isready.c:221
#, c-format
msgid ""
@@ -1046,12 +1089,12 @@ msgstr "Gnration de statistiques moyennes pour l'optimiseur (dix cibles)"
msgid "Generating default (full) optimizer statistics"
msgstr "Gnration de statistiques compltes pour l'optimiseur"
-#: vacuumdb.c:376
+#: vacuumdb.c:406
#, c-format
msgid "%s: vacuuming database \"%s\"\n"
msgstr "%s : excution de VACUUM sur la base de donnes %s \n"
-#: vacuumdb.c:393
+#: vacuumdb.c:424
#, c-format
msgid ""
"%s cleans and analyzes a PostgreSQL database.\n"
@@ -1060,20 +1103,20 @@ msgstr ""
"%s nettoie et analyse une base de donnes PostgreSQL.\n"
"\n"
-#: vacuumdb.c:397
+#: vacuumdb.c:428
#, c-format
msgid " -a, --all vacuum all databases\n"
msgstr ""
" -a, --all excute VACUUM sur toutes les bases de\n"
" donnes\n"
-#: vacuumdb.c:398
+#: vacuumdb.c:429
#, c-format
msgid " -d, --dbname=DBNAME database to vacuum\n"
msgstr ""
" -d, --dbname=NOMBASE excute VACUUM sur cette base de donnes\n"
-#: vacuumdb.c:399
+#: vacuumdb.c:430
#, c-format
msgid ""
" -e, --echo show the commands being sent to the "
@@ -1081,54 +1124,54 @@ msgid ""
msgstr ""
" -e, --echo affiche les commandes envoyes au serveur\n"
-#: vacuumdb.c:400
+#: vacuumdb.c:431
#, c-format
msgid " -f, --full do full vacuuming\n"
msgstr " -f, --full excute VACUUM en mode FULL\n"
-#: vacuumdb.c:401
+#: vacuumdb.c:432
#, c-format
msgid " -F, --freeze freeze row transaction information\n"
msgstr ""
" -F, --freeze gle les informations de transactions des\n"
" lignes\n"
-#: vacuumdb.c:402
+#: vacuumdb.c:433
#, c-format
msgid " -q, --quiet don't write any messages\n"
msgstr " -q, --quiet n'crit aucun message\n"
-#: vacuumdb.c:403
+#: vacuumdb.c:434
#, c-format
msgid " -t, --table='TABLE[(COLUMNS)]' vacuum specific table(s) only\n"
msgstr ""
" -t, --table='TABLE[(COLONNES)]' excute VACUUM sur cette (ces) tables\n"
-#: vacuumdb.c:404
+#: vacuumdb.c:435
#, c-format
msgid " -v, --verbose write a lot of output\n"
msgstr " -v, --verbose mode verbeux\n"
-#: vacuumdb.c:405
+#: vacuumdb.c:436
#, c-format
msgid ""
" -V, --version output version information, then exit\n"
msgstr " -V, --version affiche la version puis quitte\n"
-#: vacuumdb.c:406
+#: vacuumdb.c:437
#, c-format
msgid " -z, --analyze update optimizer statistics\n"
msgstr ""
" -z, --analyze met jour les statistiques de l'optimiseur\n"
-#: vacuumdb.c:407
+#: vacuumdb.c:438
#, c-format
msgid " -Z, --analyze-only only update optimizer statistics\n"
msgstr ""
" -Z, --analyze-only met seulement jour les statistiques de\n"
" l'optimiseur\n"
-#: vacuumdb.c:408
+#: vacuumdb.c:439
#, c-format
msgid ""
" --analyze-in-stages only update optimizer statistics, in "
@@ -1139,12 +1182,12 @@ msgstr ""
" l'optimiseur, en plusieurs tapes pour de\n"
" meilleurs rsultats\n"
-#: vacuumdb.c:410
+#: vacuumdb.c:441
#, c-format
msgid " -?, --help show this help, then exit\n"
msgstr " -?, --help affiche cette aide puis quitte\n"
-#: vacuumdb.c:418
+#: vacuumdb.c:449
#, c-format
msgid ""
"\n"
@@ -1153,25 +1196,26 @@ msgstr ""
"\n"
"Lire la description de la commande SQL VACUUM pour plus d'informations.\n"
-#~ msgid "%s: out of memory\n"
-#~ msgstr "%s : mmoire puise\n"
-
-#~ msgid "pg_strdup: cannot duplicate null pointer (internal error)\n"
+#~ msgid "%s: could not obtain information about current user: %s\n"
#~ msgstr ""
-#~ "pg_strdup : ne peut pas dupliquer un pointeur nul (erreur interne)\n"
+#~ "%s : n'a pas pu obtenir les informations concernant l'utilisateur "
+#~ "actuel : %s\n"
-#~ msgid " --help show this help, then exit\n"
-#~ msgstr " --help affiche cette aide et quitte\n"
+#~ msgid "%s: could not get current user name: %s\n"
+#~ msgstr "%s : n'a pas pu rcuprer le nom de l'utilisateur actuel : %s\n"
#~ msgid ""
-#~ " --version output version information, then exit\n"
-#~ msgstr " --version affiche la version et quitte\n"
+#~ " --version output version information, then exit\n"
+#~ msgstr " --version affiche la version et quitte\n"
-#~ msgid " --help show this help, then exit\n"
-#~ msgstr " --help affiche cette aide et quitte\n"
+#~ msgid " --help show this help, then exit\n"
+#~ msgstr " --help affiche cette aide et quitte\n"
-#~ msgid " --version output version information, then exit\n"
-#~ msgstr " --version affiche la version et quitte\n"
+#~ msgid ""
+#~ "%s: still %s functions declared in language \"%s\"; language not removed\n"
+#~ msgstr ""
+#~ "%s : il existe encore %s fonctions dclares dans le langage %s ;\n"
+#~ "langage non supprim\n"
#~ msgid ""
#~ "\n"
@@ -1183,23 +1227,22 @@ msgstr ""
#~ "Si une des options -d, -D, -r, -R, -s, -S et NOMROLE n'est pas prcise,\n"
#~ "elle sera demande interactivement.\n"
-#~ msgid ""
-#~ "%s: still %s functions declared in language \"%s\"; language not removed\n"
-#~ msgstr ""
-#~ "%s : il existe encore %s fonctions dclares dans le langage %s ;\n"
-#~ "langage non supprim\n"
+#~ msgid " --version output version information, then exit\n"
+#~ msgstr " --version affiche la version et quitte\n"
-#~ msgid " --help show this help, then exit\n"
-#~ msgstr " --help affiche cette aide et quitte\n"
+#~ msgid " --help show this help, then exit\n"
+#~ msgstr " --help affiche cette aide et quitte\n"
#~ msgid ""
-#~ " --version output version information, then exit\n"
-#~ msgstr " --version affiche la version et quitte\n"
+#~ " --version output version information, then exit\n"
+#~ msgstr " --version affiche la version et quitte\n"
-#~ msgid "%s: could not get current user name: %s\n"
-#~ msgstr "%s : n'a pas pu rcuprer le nom de l'utilisateur actuel : %s\n"
+#~ msgid " --help show this help, then exit\n"
+#~ msgstr " --help affiche cette aide et quitte\n"
-#~ msgid "%s: could not obtain information about current user: %s\n"
+#~ msgid "pg_strdup: cannot duplicate null pointer (internal error)\n"
#~ msgstr ""
-#~ "%s : n'a pas pu obtenir les informations concernant l'utilisateur "
-#~ "actuel : %s\n"
+#~ "pg_strdup : ne peut pas dupliquer un pointeur nul (erreur interne)\n"
+
+#~ msgid "%s: out of memory\n"
+#~ msgstr "%s : mmoire puise\n"
diff --git a/src/bin/scripts/po/it.po b/src/bin/scripts/po/it.po
index a9e74f7c100..204bf956c82 100644
--- a/src/bin/scripts/po/it.po
+++ b/src/bin/scripts/po/it.po
@@ -27,8 +27,8 @@ msgid ""
msgstr ""
"Project-Id-Version: pgscripts (PostgreSQL) 9.4\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2014-08-11 14:42+0000\n"
-"PO-Revision-Date: 2014-08-12 00:11+0100\n"
+"POT-Creation-Date: 2014-12-06 18:12+0000\n"
+"PO-Revision-Date: 2014-12-06 18:31+0100\n"
"Last-Translator: Daniele Varrazzo <daniele.varrazzo@gmail.com>\n"
"Language-Team: Gruppo traduzioni ITPUG <traduzioni@itpug.org>\n"
"Language: it\n"
@@ -116,19 +116,19 @@ msgstr ""
#: clusterdb.c:262 createdb.c:252 createlang.c:236 createuser.c:348
#: dropdb.c:155 droplang.c:237 dropuser.c:156 pg_isready.c:222 reindexdb.c:342
-#: vacuumdb.c:394
+#: vacuumdb.c:425
#, c-format
msgid "Usage:\n"
msgstr "Utilizzo:\n"
-#: clusterdb.c:263 reindexdb.c:343 vacuumdb.c:395
+#: clusterdb.c:263 reindexdb.c:343 vacuumdb.c:426
#, c-format
msgid " %s [OPTION]... [DBNAME]\n"
msgstr " %s [OPZIONE]... [NOMEDB]\n"
#: clusterdb.c:264 createdb.c:254 createlang.c:238 createuser.c:350
#: dropdb.c:157 droplang.c:239 dropuser.c:158 pg_isready.c:225 reindexdb.c:344
-#: vacuumdb.c:396
+#: vacuumdb.c:427
#, c-format
msgid ""
"\n"
@@ -182,7 +182,7 @@ msgstr " -?, --help mostra questo aiuto ed esci\n"
#: clusterdb.c:273 createdb.c:265 createlang.c:244 createuser.c:374
#: dropdb.c:163 droplang.c:245 dropuser.c:165 pg_isready.c:231 reindexdb.c:354
-#: vacuumdb.c:411
+#: vacuumdb.c:442
#, c-format
msgid ""
"\n"
@@ -192,36 +192,36 @@ msgstr ""
"Opzioni di connessione:\n"
#: clusterdb.c:274 createlang.c:245 createuser.c:375 dropdb.c:164
-#: droplang.c:246 dropuser.c:166 reindexdb.c:355 vacuumdb.c:412
+#: droplang.c:246 dropuser.c:166 reindexdb.c:355 vacuumdb.c:443
#, c-format
msgid " -h, --host=HOSTNAME database server host or socket directory\n"
msgstr " -h, --host=HOSTNAME host del server database o directory socket\n"
#: clusterdb.c:275 createlang.c:246 createuser.c:376 dropdb.c:165
-#: droplang.c:247 dropuser.c:167 reindexdb.c:356 vacuumdb.c:413
+#: droplang.c:247 dropuser.c:167 reindexdb.c:356 vacuumdb.c:444
#, c-format
msgid " -p, --port=PORT database server port\n"
msgstr " -p, --port=PORTA porta del server database\n"
#: clusterdb.c:276 createlang.c:247 dropdb.c:166 droplang.c:248
-#: reindexdb.c:357 vacuumdb.c:414
+#: reindexdb.c:357 vacuumdb.c:445
#, c-format
msgid " -U, --username=USERNAME user name to connect as\n"
msgstr " -U, --username=UTENTE nome utente da utilizzare per la connessione\n"
#: clusterdb.c:277 createlang.c:248 createuser.c:378 dropdb.c:167
-#: droplang.c:249 dropuser.c:169 reindexdb.c:358 vacuumdb.c:415
+#: droplang.c:249 dropuser.c:169 reindexdb.c:358 vacuumdb.c:446
#, c-format
msgid " -w, --no-password never prompt for password\n"
msgstr " -w, --no-password non richiedere mai una password\n"
#: clusterdb.c:278 createlang.c:249 createuser.c:379 dropdb.c:168
-#: droplang.c:250 dropuser.c:170 reindexdb.c:359 vacuumdb.c:416
+#: droplang.c:250 dropuser.c:170 reindexdb.c:359 vacuumdb.c:447
#, c-format
msgid " -W, --password force password prompt\n"
msgstr " -W, --password forza la richiesta di una password\n"
-#: clusterdb.c:279 dropdb.c:169 reindexdb.c:360 vacuumdb.c:417
+#: clusterdb.c:279 dropdb.c:169 reindexdb.c:360 vacuumdb.c:448
#, c-format
msgid " --maintenance-db=DBNAME alternate maintenance database\n"
msgstr " --maintenance-db=NOMEDB database di manutenzione alternativo\n"
@@ -237,7 +237,7 @@ msgstr ""
#: clusterdb.c:281 createdb.c:273 createlang.c:250 createuser.c:380
#: dropdb.c:170 droplang.c:251 dropuser.c:171 pg_isready.c:236 reindexdb.c:362
-#: vacuumdb.c:419
+#: vacuumdb.c:450
#, c-format
msgid ""
"\n"
@@ -774,6 +774,31 @@ msgstr "%s: %s"
msgid "%s: could not fetch default options\n"
msgstr "%s: caricamento delle opzioni di default fallito\n"
+#: pg_isready.c:199
+#, c-format
+msgid "accepting connections\n"
+msgstr "le connessioni sono accettate\n"
+
+#: pg_isready.c:202
+#, c-format
+msgid "rejecting connections\n"
+msgstr "le connessioni sono rifiutate\n"
+
+#: pg_isready.c:205
+#, c-format
+msgid "no response\n"
+msgstr "nessuna risposta\n"
+
+#: pg_isready.c:208
+#, c-format
+msgid "no attempt\n"
+msgstr "nessun tentativo\n"
+
+#: pg_isready.c:211
+#, c-format
+msgid "unknown\n"
+msgstr "sconosciuto\n"
+
#: pg_isready.c:221
#, c-format
msgid ""
@@ -968,12 +993,12 @@ msgstr "Generazione di statistiche ottimizzatore medie (10 obiettivi)"
msgid "Generating default (full) optimizer statistics"
msgstr "Generazione di statistiche ottimizzatore di default (completo)"
-#: vacuumdb.c:376
+#: vacuumdb.c:406
#, c-format
msgid "%s: vacuuming database \"%s\"\n"
msgstr "%s: pulizia del database \"%s\"\n"
-#: vacuumdb.c:393
+#: vacuumdb.c:424
#, c-format
msgid ""
"%s cleans and analyzes a PostgreSQL database.\n"
@@ -982,66 +1007,66 @@ msgstr ""
"%s pulisce ed analizza un database PostgreSQL.\n"
"\n"
-#: vacuumdb.c:397
+#: vacuumdb.c:428
#, c-format
msgid " -a, --all vacuum all databases\n"
msgstr " -a, --all pulisci tutti i database\n"
-#: vacuumdb.c:398
+#: vacuumdb.c:429
#, c-format
msgid " -d, --dbname=DBNAME database to vacuum\n"
msgstr " -d, --dbname=NOMEDB database da pulire\n"
-#: vacuumdb.c:399
+#: vacuumdb.c:430
#, c-format
msgid " -e, --echo show the commands being sent to the server\n"
msgstr " -e, --echo mostra i comandi inviati al server\n"
-#: vacuumdb.c:400
+#: vacuumdb.c:431
#, c-format
msgid " -f, --full do full vacuuming\n"
msgstr " -f, --full esegui una pulizia completa\n"
-#: vacuumdb.c:401
+#: vacuumdb.c:432
#, c-format
msgid " -F, --freeze freeze row transaction information\n"
msgstr ""
" -F, --freeze congela le informazioni per la transazione\n"
" sulla riga\n"
-#: vacuumdb.c:402
+#: vacuumdb.c:433
#, c-format
msgid " -q, --quiet don't write any messages\n"
msgstr " -q, --quiet non stampare alcun messaggio\n"
-#: vacuumdb.c:403
+#: vacuumdb.c:434
#, c-format
msgid " -t, --table='TABLE[(COLUMNS)]' vacuum specific table(s) only\n"
msgstr " -t, --table='TABELLA[(COLONNE)]' ripulisci solo le tabelle specificate\n"
-#: vacuumdb.c:404
+#: vacuumdb.c:435
#, c-format
msgid " -v, --verbose write a lot of output\n"
msgstr " -v, --verbose mostra molti messaggi\n"
-#: vacuumdb.c:405
+#: vacuumdb.c:436
#, c-format
msgid " -V, --version output version information, then exit\n"
msgstr " -V, --version mostra informazioni sulla versione ed esci\n"
-#: vacuumdb.c:406
+#: vacuumdb.c:437
#, c-format
msgid " -z, --analyze update optimizer statistics\n"
msgstr " -z, --analyze aggiorna le statistiche per l'ottimizzatore\n"
-#: vacuumdb.c:407
+#: vacuumdb.c:438
#, c-format
msgid " -Z, --analyze-only only update optimizer statistics\n"
msgstr ""
" -Z, --analyze-only aggiorna soltanto le statistiche per\n"
" l'ottimizzatore\n"
-#: vacuumdb.c:408
+#: vacuumdb.c:439
#, c-format
msgid ""
" --analyze-in-stages only update optimizer statistics, in multiple\n"
@@ -1050,12 +1075,12 @@ msgstr ""
" --analyze-in-stages aggiorna solo le statistiche dell'ottimizzatore,\n"
" in passi multipli per risultati più rapidi\n"
-#: vacuumdb.c:410
+#: vacuumdb.c:441
#, c-format
msgid " -?, --help show this help, then exit\n"
msgstr " -?, --help mostra questo aiuto ed esci\n"
-#: vacuumdb.c:418
+#: vacuumdb.c:449
#, c-format
msgid ""
"\n"
diff --git a/src/bin/scripts/po/sv.po b/src/bin/scripts/po/sv.po
new file mode 100644
index 00000000000..5308219d251
--- /dev/null
+++ b/src/bin/scripts/po/sv.po
@@ -0,0 +1,1063 @@
+# Swedish message translation file for postgresql
+# Dennis Björklund <db@zigo.dhs.org>, 2003, 2004, 2005, 2006.
+# Peter Eisentraut <peter_e@gmx.net>, 2013.
+# Mats Erik Andersson <bsd@gisladisker.se>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 9.4\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2014-11-28 12:42+0000\n"
+"PO-Revision-Date: 2014-11-28 16:40+0100\n"
+"Last-Translator: Mats Erik Andersson <bsd@gisladisker.se>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../../common/fe_memutils.c:33 ../../common/fe_memutils.c:60
+#: ../../common/fe_memutils.c:83
+#, c-format
+msgid "out of memory\n"
+msgstr "slut på minne\n"
+
+#: ../../common/fe_memutils.c:77
+#, c-format
+msgid "cannot duplicate null pointer (internal error)\n"
+msgstr "kan inte duplicera null-pekare (internt fel)\n"
+
+#: ../../common/username.c:45
+#, c-format
+msgid "could not look up effective user ID %ld: %s"
+msgstr "kunde inte slå upp effektivt användar-id %ld: %s"
+
+#: ../../common/username.c:47
+msgid "user does not exist"
+msgstr "användaren finns inte"
+
+#: ../../common/username.c:61
+#, c-format
+msgid "user name lookup failure: %s"
+msgstr "misslyckad sökning efter användarnamn: %s"
+
+#: clusterdb.c:110 clusterdb.c:129 createdb.c:119 createdb.c:138
+#: createlang.c:89 createlang.c:119 createlang.c:174 createuser.c:168
+#: createuser.c:183 dropdb.c:94 dropdb.c:103 dropdb.c:111 droplang.c:88
+#: droplang.c:118 droplang.c:174 dropuser.c:89 dropuser.c:104 dropuser.c:115
+#: pg_isready.c:93 pg_isready.c:107 reindexdb.c:120 reindexdb.c:139
+#: vacuumdb.c:139 vacuumdb.c:159
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "Försök med \"%s --help\" för mer information.\n"
+
+#: clusterdb.c:127 createdb.c:136 createlang.c:117 createuser.c:181
+#: dropdb.c:109 droplang.c:116 dropuser.c:102 pg_isready.c:105 reindexdb.c:137
+#: vacuumdb.c:157
+#, c-format
+msgid "%s: too many command-line arguments (first is \"%s\")\n"
+msgstr "%s: För många kommandoradsargument. Först kommer \"%s\".\n"
+
+#: clusterdb.c:139
+#, c-format
+msgid "%s: cannot cluster all databases and a specific one at the same time\n"
+msgstr "%s: Kan inte samtidigt klustra alla databaser och ytterligare en utvald.\n"
+
+#: clusterdb.c:146
+#, c-format
+msgid "%s: cannot cluster specific table(s) in all databases\n"
+msgstr "%s: Kan inte klustra en eller flera tabeller i alla databaser.\n"
+
+#: clusterdb.c:211
+#, c-format
+msgid "%s: clustering of table \"%s\" in database \"%s\" failed: %s"
+msgstr "%s: Misslyckad klustring av tabell \"%s\" i databas \"%s\": %s"
+
+#: clusterdb.c:214
+#, c-format
+msgid "%s: clustering of database \"%s\" failed: %s"
+msgstr "%s: Klustring av databas \"%s\" misslyckades: %s"
+
+#: clusterdb.c:245
+#, c-format
+msgid "%s: clustering database \"%s\"\n"
+msgstr "%s: Klustring av databasen \"%s\".\n"
+
+#: clusterdb.c:261
+#, c-format
+msgid ""
+"%s clusters all previously clustered tables in a database.\n"
+"\n"
+msgstr ""
+"%s klustrar alla tidigare klustrade tabeller i en databas.\n"
+"\n"
+
+#: clusterdb.c:262 createdb.c:252 createlang.c:236 createuser.c:348
+#: dropdb.c:155 droplang.c:237 dropuser.c:156 pg_isready.c:222 reindexdb.c:342
+#: vacuumdb.c:425
+#, c-format
+msgid "Usage:\n"
+msgstr "Användning:\n"
+
+#: clusterdb.c:263 reindexdb.c:343 vacuumdb.c:426
+#, c-format
+msgid " %s [OPTION]... [DBNAME]\n"
+msgstr " %s [FLAGGA]... [DBNAMN]\n"
+
+#: clusterdb.c:264 createdb.c:254 createlang.c:238 createuser.c:350
+#: dropdb.c:157 droplang.c:239 dropuser.c:158 pg_isready.c:225 reindexdb.c:344
+#: vacuumdb.c:427
+#, c-format
+msgid ""
+"\n"
+"Options:\n"
+msgstr ""
+"\n"
+"Programväxlar:\n"
+
+#: clusterdb.c:265
+#, c-format
+msgid " -a, --all cluster all databases\n"
+msgstr " -a, --all klustra alla databaser\n"
+
+#: clusterdb.c:266
+#, c-format
+msgid " -d, --dbname=DBNAME database to cluster\n"
+msgstr " -d, --dbname=DBNAME databas att klustra\n"
+
+#: clusterdb.c:267 createlang.c:240 createuser.c:354 dropdb.c:158
+#: droplang.c:241 dropuser.c:159 reindexdb.c:347
+#, c-format
+msgid " -e, --echo show the commands being sent to the server\n"
+msgstr " -e, --echo visa kommandon som skickas till servern\n"
+
+#: clusterdb.c:268 reindexdb.c:349
+#, c-format
+msgid " -q, --quiet don't write any messages\n"
+msgstr " -q, --quiet skriv inte ut några meddelanden\n"
+
+#: clusterdb.c:269
+#, c-format
+msgid " -t, --table=TABLE cluster specific table(s) only\n"
+msgstr " -t, --table=TABELL klustra denna tabell (får upprepas)\n"
+
+#: clusterdb.c:270
+#, c-format
+msgid " -v, --verbose write a lot of output\n"
+msgstr " -v, --verbose skriv massor med utdata\n"
+
+#: clusterdb.c:271 createlang.c:242 createuser.c:368 dropdb.c:160
+#: droplang.c:243 dropuser.c:162 reindexdb.c:352
+#, c-format
+msgid " -V, --version output version information, then exit\n"
+msgstr " -V, --version visa versionsinformation, avsluta sedan\n"
+
+#: clusterdb.c:272 createlang.c:243 createuser.c:373 dropdb.c:162
+#: droplang.c:244 dropuser.c:164 reindexdb.c:353
+#, c-format
+msgid " -?, --help show this help, then exit\n"
+msgstr " -?, --help visa denna hjälp, avsluta sedan\n"
+
+#: clusterdb.c:273 createdb.c:265 createlang.c:244 createuser.c:374
+#: dropdb.c:163 droplang.c:245 dropuser.c:165 pg_isready.c:231 reindexdb.c:354
+#: vacuumdb.c:442
+#, c-format
+msgid ""
+"\n"
+"Connection options:\n"
+msgstr ""
+"\n"
+"Växlar för förbindelser:\n"
+
+#: clusterdb.c:274 createlang.c:245 createuser.c:375 dropdb.c:164
+#: droplang.c:246 dropuser.c:166 reindexdb.c:355 vacuumdb.c:443
+#, c-format
+msgid " -h, --host=HOSTNAME database server host or socket directory\n"
+msgstr " -h, --host=VÄRDNAMN databasens värdnamn eller filkatalog för uttag\n"
+
+#: clusterdb.c:275 createlang.c:246 createuser.c:376 dropdb.c:165
+#: droplang.c:247 dropuser.c:167 reindexdb.c:356 vacuumdb.c:444
+#, c-format
+msgid " -p, --port=PORT database server port\n"
+msgstr " -p, --port=PORT databasens tjänsteport\n"
+
+#: clusterdb.c:276 createlang.c:247 dropdb.c:166 droplang.c:248
+#: reindexdb.c:357 vacuumdb.c:445
+#, c-format
+msgid " -U, --username=USERNAME user name to connect as\n"
+msgstr " -U, --username=ANVÄNDARE användarnamn vid förbindelsen\n"
+
+#: clusterdb.c:277 createlang.c:248 createuser.c:378 dropdb.c:167
+#: droplang.c:249 dropuser.c:169 reindexdb.c:358 vacuumdb.c:446
+#, c-format
+msgid " -w, --no-password never prompt for password\n"
+msgstr " -w, --no-password ingen efterfrågan av lösenord\n"
+
+#: clusterdb.c:278 createlang.c:249 createuser.c:379 dropdb.c:168
+#: droplang.c:250 dropuser.c:170 reindexdb.c:359 vacuumdb.c:447
+#, c-format
+msgid " -W, --password force password prompt\n"
+msgstr " -W, --password framtvinga fråga om lösenord\n"
+
+#: clusterdb.c:279 dropdb.c:169 reindexdb.c:360 vacuumdb.c:448
+#, c-format
+msgid " --maintenance-db=DBNAME alternate maintenance database\n"
+msgstr " --maintenance-db=DBNAMN annat val av underhållsdatabas\n"
+
+#: clusterdb.c:280
+#, c-format
+msgid ""
+"\n"
+"Read the description of the SQL command CLUSTER for details.\n"
+msgstr ""
+"\n"
+"Läs beskrivningen av SQL-kommandot CLUSTER för detaljer.\n"
+
+#: clusterdb.c:281 createdb.c:273 createlang.c:250 createuser.c:380
+#: dropdb.c:170 droplang.c:251 dropuser.c:171 pg_isready.c:236 reindexdb.c:362
+#: vacuumdb.c:450
+#, c-format
+msgid ""
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr ""
+"\n"
+"Rapportera fel till <pgsql-bugs@postgresql.org>.\n"
+
+#: common.c:69 common.c:115
+msgid "Password: "
+msgstr "Lösenord: "
+
+#: common.c:104
+#, c-format
+msgid "%s: could not connect to database %s\n"
+msgstr "%s: Kunde inte skapa förbindelse med databas %s.\n"
+
+#: common.c:131
+#, c-format
+msgid "%s: could not connect to database %s: %s"
+msgstr "%s: Kunde inte skapa förbindelse med databas %s: %s"
+
+#: common.c:180 common.c:208
+#, c-format
+msgid "%s: query failed: %s"
+msgstr "%s: Fråga misslyckades: %s"
+
+#: common.c:182 common.c:210
+#, c-format
+msgid "%s: query was: %s\n"
+msgstr "%s: Frågan var: %s\n"
+
+#. translator: abbreviation for "yes"
+#: common.c:251
+msgid "y"
+msgstr "j"
+
+#. translator: abbreviation for "no"
+#: common.c:253
+msgid "n"
+msgstr "n"
+
+#. translator: This is a question followed by the translated options for
+#. "yes" and "no".
+#: common.c:263
+#, c-format
+msgid "%s (%s/%s) "
+msgstr "%s (%s/%s) "
+
+#: common.c:284
+#, c-format
+msgid "Please answer \"%s\" or \"%s\".\n"
+msgstr "Var vänlig att svara \"%s\" eller \"%s\".\n"
+
+#: common.c:362 common.c:395
+#, c-format
+msgid "Cancel request sent\n"
+msgstr "Avbrottsbegäran skickad.\n"
+
+#: common.c:364 common.c:397
+#, c-format
+msgid "Could not send cancel request: %s"
+msgstr "Kunde inte skicka avbrottsbegäran: %s"
+
+#: createdb.c:146
+#, c-format
+msgid "%s: only one of --locale and --lc-ctype can be specified\n"
+msgstr "%s: Endast en av \"--locale\" och \"--lc-ctype\" är gångbar samtidigt.\n"
+
+#: createdb.c:152
+#, c-format
+msgid "%s: only one of --locale and --lc-collate can be specified\n"
+msgstr "%s: Endast en av \"--locale\" och \"--lc-collate\" är gångbar samtidigt.\n"
+
+#: createdb.c:164
+#, c-format
+msgid "%s: \"%s\" is not a valid encoding name\n"
+msgstr "%s: \"%s\" är inte en giltig teckenkodning.\n"
+
+#: createdb.c:213
+#, c-format
+msgid "%s: database creation failed: %s"
+msgstr "%s: Misslyckades med att skapa databas: %s"
+
+#: createdb.c:233
+#, c-format
+msgid "%s: comment creation failed (database was created): %s"
+msgstr "%s: Misslyckades med att skapa kommentar, men databasen skapades: %s"
+
+#: createdb.c:251
+#, c-format
+msgid ""
+"%s creates a PostgreSQL database.\n"
+"\n"
+msgstr ""
+"%s skapar en databas för PostgreSQL.\n"
+"\n"
+
+#: createdb.c:253
+#, c-format
+msgid " %s [OPTION]... [DBNAME] [DESCRIPTION]\n"
+msgstr " %s [FLAGGA]... [DBNAMN] [BESKRIVNING]\n"
+
+#: createdb.c:255
+#, c-format
+msgid " -D, --tablespace=TABLESPACE default tablespace for the database\n"
+msgstr " -D, --tablespace=TABELLRYMD förvalt tabellutrymme för databasen\n"
+
+#: createdb.c:256
+#, c-format
+msgid " -e, --echo show the commands being sent to the server\n"
+msgstr " -e, --echo visa kommandon som skickas till servern\n"
+
+#: createdb.c:257
+#, c-format
+msgid " -E, --encoding=ENCODING encoding for the database\n"
+msgstr " -E, --encoding=KODNING teckenkodning för databasen\n"
+
+#: createdb.c:258
+#, c-format
+msgid " -l, --locale=LOCALE locale settings for the database\n"
+msgstr " -l, --locale=LOKAL lokalnamn för databasen\n"
+
+#: createdb.c:259
+#, c-format
+msgid " --lc-collate=LOCALE LC_COLLATE setting for the database\n"
+msgstr " --lc-collate=LOKAL värde på LC_COLLATE för databasen\n"
+
+#: createdb.c:260
+#, c-format
+msgid " --lc-ctype=LOCALE LC_CTYPE setting for the database\n"
+msgstr " --lc-ctype=LOKAL värde på LC_CTYPE för databasen\n"
+
+#: createdb.c:261
+#, c-format
+msgid " -O, --owner=OWNER database user to own the new database\n"
+msgstr " -O, --owner=ÄGARE databasanvändare att sätta som ägare av databasen\n"
+
+#: createdb.c:262
+#, c-format
+msgid " -T, --template=TEMPLATE template database to copy\n"
+msgstr " -T, --template=MALL databasförlaga att kopiera\n"
+
+#: createdb.c:263
+#, c-format
+msgid " -V, --version output version information, then exit\n"
+msgstr " -V, --version visa versionsinformation, avsluta sedan\n"
+
+#: createdb.c:264
+#, c-format
+msgid " -?, --help show this help, then exit\n"
+msgstr " -?, --help visa denna hjälp, avsluta sedan\n"
+
+#: createdb.c:266
+#, c-format
+msgid " -h, --host=HOSTNAME database server host or socket directory\n"
+msgstr " -h, --host=VÄRDNAMN databasens värdnamn eller filkatalog för uttag\n"
+
+#: createdb.c:267
+#, c-format
+msgid " -p, --port=PORT database server port\n"
+msgstr " -p, --port=PORT databasens tjänsteport\n"
+
+#: createdb.c:268
+#, c-format
+msgid " -U, --username=USERNAME user name to connect as\n"
+msgstr " -U, --username=ANVÄNDARE användarnamn vid förbindelsen\n"
+
+#: createdb.c:269
+#, c-format
+msgid " -w, --no-password never prompt for password\n"
+msgstr " -w, --no-password ingen efterfrågan av lösenord\n"
+
+#: createdb.c:270
+#, c-format
+msgid " -W, --password force password prompt\n"
+msgstr " -W, --password framtvinga fråga om lösenord\n"
+
+#: createdb.c:271
+#, c-format
+msgid " --maintenance-db=DBNAME alternate maintenance database\n"
+msgstr " --maintenance-db=DBNAMN annat val av underhållsdatabas\n"
+
+#: createdb.c:272
+#, c-format
+msgid ""
+"\n"
+"By default, a database with the same name as the current user is created.\n"
+msgstr ""
+"\n"
+"Som standard skapas en databas med samma namn som nuvarande användares namn.\n"
+
+#: createlang.c:149 droplang.c:148
+msgid "Name"
+msgstr "Namn"
+
+#: createlang.c:150 droplang.c:149
+msgid "no"
+msgstr "nej"
+
+#: createlang.c:150 droplang.c:149
+msgid "yes"
+msgstr "ja"
+
+#: createlang.c:151 droplang.c:150
+msgid "Trusted?"
+msgstr "Tillförlitligt?"
+
+#: createlang.c:160 droplang.c:159
+msgid "Procedural Languages"
+msgstr "Procedurspråk"
+
+#: createlang.c:173 droplang.c:172
+#, c-format
+msgid "%s: missing required argument language name\n"
+msgstr "%s: Saknar nödvändigt språknamnsargument.\n"
+
+#: createlang.c:197
+#, c-format
+msgid "%s: language \"%s\" is already installed in database \"%s\"\n"
+msgstr "%s: Språket \"%s\" är redan installerat i databasen \"%s\".\n"
+
+#: createlang.c:219
+#, c-format
+msgid "%s: language installation failed: %s"
+msgstr "%s: Språkinstallation misslyckades: %s"
+
+#: createlang.c:235
+#, c-format
+msgid ""
+"%s installs a procedural language into a PostgreSQL database.\n"
+"\n"
+msgstr ""
+"%s installerar ett procedurspråk i en PostgreSQL-databas.\n"
+"\n"
+
+#: createlang.c:237 droplang.c:238
+#, c-format
+msgid " %s [OPTION]... LANGNAME [DBNAME]\n"
+msgstr " %s [FLAGGA]... SPRÅK [DBNAMN]\n"
+
+#: createlang.c:239
+#, c-format
+msgid " -d, --dbname=DBNAME database to install language in\n"
+msgstr " -d, --dbname=DBNAMN databas där språket installeras\n"
+
+#: createlang.c:241 droplang.c:242
+#, c-format
+msgid " -l, --list show a list of currently installed languages\n"
+msgstr " -l, --list lista alla nu installerade språk\n"
+
+#: createuser.c:190
+msgid "Enter name of role to add: "
+msgstr "Giv namnet på den roll som skall läggas till: "
+
+#: createuser.c:205
+msgid "Enter password for new role: "
+msgstr "Uppgiv lösenord för den nya rollen: "
+
+#: createuser.c:206
+msgid "Enter it again: "
+msgstr "Uppgiv det igen: "
+
+#: createuser.c:209
+#, c-format
+msgid "Passwords didn't match.\n"
+msgstr "Lösenorden stämmer inte överens.\n"
+
+#: createuser.c:218
+msgid "Shall the new role be a superuser?"
+msgstr "Skall den nya rollen vara en superanvändare?"
+
+#: createuser.c:233
+msgid "Shall the new role be allowed to create databases?"
+msgstr "Skall den nya rollen tillåtas skapa databaser?"
+
+#: createuser.c:241
+msgid "Shall the new role be allowed to create more new roles?"
+msgstr "Skall den nya rollen tillåtas skapa fler nya roller?"
+
+#: createuser.c:275
+#, c-format
+msgid "Password encryption failed.\n"
+msgstr "Misslyckad lösenordskryptering.\n"
+
+#: createuser.c:332
+#, c-format
+msgid "%s: creation of new role failed: %s"
+msgstr "%s: Misslyckades med att skapa ny roll: %s"
+
+#: createuser.c:347
+#, c-format
+msgid ""
+"%s creates a new PostgreSQL role.\n"
+"\n"
+msgstr ""
+"%s skapar en ny roll för PostgreSQL.\n"
+"\n"
+
+#: createuser.c:349 dropuser.c:157
+#, c-format
+msgid " %s [OPTION]... [ROLENAME]\n"
+msgstr " %s [FLAGGA]... [ROLLNAMN]\n"
+
+#: createuser.c:351
+#, c-format
+msgid " -c, --connection-limit=N connection limit for role (default: no limit)\n"
+msgstr " -c, --connection-limit=N anslutningstak för rollen (standard: ingen gräns)\n"
+
+#: createuser.c:352
+#, c-format
+msgid " -d, --createdb role can create new databases\n"
+msgstr " -d, --createdb rollen kan skapa nya databaser\n"
+
+#: createuser.c:353
+#, c-format
+msgid " -D, --no-createdb role cannot create databases (default)\n"
+msgstr " -D, --no-createdb rollen kan inte skapa databaser (standard)\n"
+
+#: createuser.c:355
+#, c-format
+msgid " -E, --encrypted encrypt stored password\n"
+msgstr " -E, --encrypted lösenordet skall sparas krypterat\n"
+
+#: createuser.c:356
+#, c-format
+msgid " -g, --role=ROLE new role will be a member of this role\n"
+msgstr " -g, --role=ROLL rollen skapas som medlem av ROLL\n"
+
+#: createuser.c:357
+#, c-format
+msgid ""
+" -i, --inherit role inherits privileges of roles it is a\n"
+" member of (default)\n"
+msgstr ""
+" -i, --inherit rollen ärver rättigheter från var roll den\n"
+" är medlem av (standard)\n"
+
+#: createuser.c:359
+#, c-format
+msgid " -I, --no-inherit role does not inherit privileges\n"
+msgstr " -I, --no-inherit rollen ärver inga rättigheter\n"
+
+#: createuser.c:360
+#, c-format
+msgid " -l, --login role can login (default)\n"
+msgstr " -l, --login rollen kan logga in (standard)\n"
+
+#: createuser.c:361
+#, c-format
+msgid " -L, --no-login role cannot login\n"
+msgstr " -L, --no-login rollen kan inte logga in\n"
+
+#: createuser.c:362
+#, c-format
+msgid " -N, --unencrypted do not encrypt stored password\n"
+msgstr " -N, --unencrypted lösenordet sparas okrypterat\n"
+
+#: createuser.c:363
+#, c-format
+msgid " -P, --pwprompt assign a password to new role\n"
+msgstr " -P, --pwprompt tilldela den nya rollen ett lösenord\n"
+
+#: createuser.c:364
+#, c-format
+msgid " -r, --createrole role can create new roles\n"
+msgstr " -r, --createrole rollen kan skapa nya roller\n"
+
+#: createuser.c:365
+#, c-format
+msgid " -R, --no-createrole role cannot create roles (default)\n"
+msgstr " -R, --no-createrole rollen kan inte skapa roller (standard)\n"
+
+#: createuser.c:366
+#, c-format
+msgid " -s, --superuser role will be superuser\n"
+msgstr " -s, --superuser rollen är en superanvändare\n"
+
+#: createuser.c:367
+#, c-format
+msgid " -S, --no-superuser role will not be superuser (default)\n"
+msgstr " -S, --no-superuser rollen är inte superanvändare (standard)\n"
+
+#: createuser.c:369
+#, c-format
+msgid ""
+" --interactive prompt for missing role name and attributes rather\n"
+" than using defaults\n"
+msgstr ""
+" --interactive fråga efter rollnamn och egenskaper, snarare än\n"
+" att falla tillbaka på förval\n"
+
+#: createuser.c:371
+#, c-format
+msgid " --replication role can initiate replication\n"
+msgstr " --replication rollen kan begära replikation\n"
+
+#: createuser.c:372
+#, c-format
+msgid " --no-replication role cannot initiate replication\n"
+msgstr " --no-replication rollen får inte begära replikation\n"
+
+#: createuser.c:377
+#, c-format
+msgid " -U, --username=USERNAME user name to connect as (not the one to create)\n"
+msgstr " -U, --username=ANVÄNDARE användarnamn vid förbindelsen (inte ny roll)\n"
+
+#: dropdb.c:102
+#, c-format
+msgid "%s: missing required argument database name\n"
+msgstr "%s: Saknar nödvändigt databasnamn.\n"
+
+#: dropdb.c:117
+#, c-format
+msgid "Database \"%s\" will be permanently removed.\n"
+msgstr "Databasen \"%s\" kommer att tas bort permanent.\n"
+
+#: dropdb.c:118 dropuser.c:123
+msgid "Are you sure?"
+msgstr "Är du säker?"
+
+#: dropdb.c:139
+#, c-format
+msgid "%s: database removal failed: %s"
+msgstr "%s: Borttagning av databas misslyckades: %s"
+
+#: dropdb.c:154
+#, c-format
+msgid ""
+"%s removes a PostgreSQL database.\n"
+"\n"
+msgstr ""
+"%s tar bort en PostgreSQL-databas.\n"
+"\n"
+
+#: dropdb.c:156
+#, c-format
+msgid " %s [OPTION]... DBNAME\n"
+msgstr " %s [FLAGGA]... DBNAMN\n"
+
+#: dropdb.c:159
+#, c-format
+msgid " -i, --interactive prompt before deleting anything\n"
+msgstr " -i, --interactive fråga innan något tas bort\n"
+
+#: dropdb.c:161
+#, c-format
+msgid " --if-exists don't report error if database doesn't exist\n"
+msgstr " --if-exists undertryck felrapport när databasen saknas\n"
+
+#: droplang.c:203
+#, c-format
+msgid "%s: language \"%s\" is not installed in database \"%s\"\n"
+msgstr "%s: Språk \"%s\" är inte installerat i databasen \"%s\".\n"
+
+#: droplang.c:221
+#, c-format
+msgid "%s: language removal failed: %s"
+msgstr "%s: Borttagning av språk misslyckades: %s"
+
+#: droplang.c:236
+#, c-format
+msgid ""
+"%s removes a procedural language from a database.\n"
+"\n"
+msgstr ""
+"%s tar bort ett procedurspråk från en databas.\n"
+"\n"
+
+#: droplang.c:240
+#, c-format
+msgid " -d, --dbname=DBNAME database from which to remove the language\n"
+msgstr " -d, --dbname=DBNAMN databas från vilken språket skall tas bort\n"
+
+#: dropuser.c:111
+msgid "Enter name of role to drop: "
+msgstr "Uppgiv namnet på den roll som skall tas bort: "
+
+#: dropuser.c:114
+#, c-format
+msgid "%s: missing required argument role name\n"
+msgstr "%s: Saknar ett nödvändigt rollnamn.\n"
+
+#: dropuser.c:122
+#, c-format
+msgid "Role \"%s\" will be permanently removed.\n"
+msgstr "Rollen \"%s\" kommer att tas bort permanent.\n"
+
+#: dropuser.c:140
+#, c-format
+msgid "%s: removal of role \"%s\" failed: %s"
+msgstr "%s: Borttagning av rollen \"%s\" misslyckades: %s"
+
+#: dropuser.c:155
+#, c-format
+msgid ""
+"%s removes a PostgreSQL role.\n"
+"\n"
+msgstr ""
+"%s tar bort en roll i PostgreSQL.\n"
+"\n"
+
+#: dropuser.c:160
+#, c-format
+msgid ""
+" -i, --interactive prompt before deleting anything, and prompt for\n"
+" role name if not specified\n"
+msgstr ""
+" -i, --interactive fråga innan något tas bort och fråga efter\n"
+" rollnamn om sådant saknas\n"
+
+#: dropuser.c:163
+#, c-format
+msgid " --if-exists don't report error if user doesn't exist\n"
+msgstr " --if-exists undertryck felrapport när användaren saknas\n"
+
+#: dropuser.c:168
+#, c-format
+msgid " -U, --username=USERNAME user name to connect as (not the one to drop)\n"
+msgstr ""
+" -U, --username=ANVÄNDARE användare som genomför förbindelsen, inte den\n"
+" roll som tas bort\n"
+
+#: pg_isready.c:142
+#, c-format
+msgid "%s: %s"
+msgstr "%s: %s"
+
+#: pg_isready.c:150
+#, c-format
+msgid "%s: could not fetch default options\n"
+msgstr "%s: Kunde inte inhämta förvalda värde.\n"
+
+#: pg_isready.c:199
+#, c-format
+msgid "accepting connections\n"
+msgstr "godtar förbindelser\n"
+
+#: pg_isready.c:202
+#, c-format
+msgid "rejecting connections\n"
+msgstr "vägrar förbindelser\n"
+
+#: pg_isready.c:205
+#, c-format
+msgid "no response\n"
+msgstr "inget gensvar\n"
+
+#: pg_isready.c:208
+#, c-format
+msgid "no attempt\n"
+msgstr "inget kontaktförsök\n"
+
+#: pg_isready.c:211
+#, c-format
+msgid "unknown\n"
+msgstr "okänt\n"
+
+#: pg_isready.c:221
+#, c-format
+msgid ""
+"%s issues a connection check to a PostgreSQL database.\n"
+"\n"
+msgstr ""
+"%s utför en förbindelsekontroll mot en PostgreSQL-databas.\n"
+"\n"
+
+#: pg_isready.c:223
+#, c-format
+msgid " %s [OPTION]...\n"
+msgstr " %s [FLAGGA]...\n"
+
+#: pg_isready.c:226
+#, c-format
+msgid " -d, --dbname=DBNAME database name\n"
+msgstr " -d, --dbname=DBNAMN databasens namn\n"
+
+#: pg_isready.c:227
+#, c-format
+msgid " -q, --quiet run quietly\n"
+msgstr " -q, --quiet tyst körning\n"
+
+#: pg_isready.c:228
+#, c-format
+msgid " -V, --version output version information, then exit\n"
+msgstr " -V, --version visa versionsinformation, avsluta sedan\n"
+
+#: pg_isready.c:229
+#, c-format
+msgid " -?, --help show this help, then exit\n"
+msgstr " -?, --help visa denna hjälp, avsluta sedan\n"
+
+#: pg_isready.c:232
+#, c-format
+msgid " -h, --host=HOSTNAME database server host or socket directory\n"
+msgstr " -h, --host=VÄRDNAMN databasens värdnamn eller filkatalog för uttag\n"
+
+#: pg_isready.c:233
+#, c-format
+msgid " -p, --port=PORT database server port\n"
+msgstr " -p, --port=PORT databasens tjänsteport\n"
+
+#: pg_isready.c:234
+#, c-format
+msgid " -t, --timeout=SECS seconds to wait when attempting connection, 0 disables (default: %s)\n"
+msgstr ""
+" -t, --timeout=SEK antal sekunder att vänta på förbindelse;\n"
+" 0 undertrycker tidsgräns, förval är %s sekunder\n"
+
+#: pg_isready.c:235
+#, c-format
+msgid " -U, --username=USERNAME user name to connect as\n"
+msgstr " -U, --username=ANVÄNDARE användarnamn vid förbindelsen\n"
+
+#: reindexdb.c:149
+#, c-format
+msgid "%s: cannot reindex all databases and a specific one at the same time\n"
+msgstr "%s: Kan inte nyindexera alla databaser och samtidigt en specifik databas.\n"
+
+#: reindexdb.c:154
+#, c-format
+msgid "%s: cannot reindex all databases and system catalogs at the same time\n"
+msgstr "%s: Kan inte indexera alla databaser samtidigt med systemkatalogerna.\n"
+
+#: reindexdb.c:159
+#, c-format
+msgid "%s: cannot reindex specific table(s) in all databases\n"
+msgstr "%s: Kan inte indexera specifik tabell i alla databaser.\n"
+
+#: reindexdb.c:164
+#, c-format
+msgid "%s: cannot reindex specific index(es) in all databases\n"
+msgstr "%s: Kan inte återskapa specifikt index i alla databaser.\n"
+
+#: reindexdb.c:175
+#, c-format
+msgid "%s: cannot reindex specific table(s) and system catalogs at the same time\n"
+msgstr "%s: Kan inte indexera specifik tabell och systemkatalogerna samtidigt.\n"
+
+#: reindexdb.c:180
+#, c-format
+msgid "%s: cannot reindex specific index(es) and system catalogs at the same time\n"
+msgstr "%s: Kan inte återskapa specifikt index och systemkatalogerna samtidigt.\n"
+
+#: reindexdb.c:264
+#, c-format
+msgid "%s: reindexing of table \"%s\" in database \"%s\" failed: %s"
+msgstr "%s: Misslyckad indexering av tabell \"%s\" i databasen \"%s\": %s"
+
+#: reindexdb.c:267
+#, c-format
+msgid "%s: reindexing of index \"%s\" in database \"%s\" failed: %s"
+msgstr "%s: Misslyckad indexering av index \"%s\" i databasen \"%s\": %s"
+
+#: reindexdb.c:270
+#, c-format
+msgid "%s: reindexing of database \"%s\" failed: %s"
+msgstr "%s: Misslyckad indexering av databasen \"%s\": %s"
+
+#: reindexdb.c:301
+#, c-format
+msgid "%s: reindexing database \"%s\"\n"
+msgstr "%s: Nyindexering av databasen \"%s\".\n"
+
+#: reindexdb.c:329
+#, c-format
+msgid "%s: reindexing of system catalogs failed: %s"
+msgstr "%s: Misslyckad indexering av systemkatalogerna: %s"
+
+#: reindexdb.c:341
+#, c-format
+msgid ""
+"%s reindexes a PostgreSQL database.\n"
+"\n"
+msgstr ""
+"%s indexerar en PostgreSQL-databas på nytt.\n"
+"\n"
+
+#: reindexdb.c:345
+#, c-format
+msgid " -a, --all reindex all databases\n"
+msgstr " -a, --all nyindexera alla databaser\n"
+
+#: reindexdb.c:346
+#, c-format
+msgid " -d, --dbname=DBNAME database to reindex\n"
+msgstr " -d, --dbname=DBNAME databas att nyindexera\n"
+
+#: reindexdb.c:348
+#, c-format
+msgid " -i, --index=INDEX recreate specific index(es) only\n"
+msgstr " -i, --index=INDEX återskapa enbart detta index (får upprepas)\n"
+
+#: reindexdb.c:350
+#, c-format
+msgid " -s, --system reindex system catalogs\n"
+msgstr " -s, --system nyindexera systemkatalogerna\n"
+
+#: reindexdb.c:351
+#, c-format
+msgid " -t, --table=TABLE reindex specific table(s) only\n"
+msgstr " -t, --table=TABELL nyindexera endast denna tabell (får upprepas)\n"
+
+#: reindexdb.c:361
+#, c-format
+msgid ""
+"\n"
+"Read the description of the SQL command REINDEX for details.\n"
+msgstr ""
+"\n"
+"Läs beskrivningen av SQL-kommandot REINDEX för detaljer.\n"
+
+#: vacuumdb.c:167
+#, c-format
+msgid "%s: cannot use the \"full\" option when performing only analyze\n"
+msgstr "%s: Växeln \"full\" kan inte utföras med enbart analys.\n"
+
+#: vacuumdb.c:173
+#, c-format
+msgid "%s: cannot use the \"freeze\" option when performing only analyze\n"
+msgstr "%s: Växeln \"freeze\" kan inte utföras med enbart analys.\n"
+
+#: vacuumdb.c:186
+#, c-format
+msgid "%s: cannot vacuum all databases and a specific one at the same time\n"
+msgstr "%s: Kan inte städa i alla databaser och samtidigt i ytterligare en.\n"
+
+#: vacuumdb.c:192
+#, c-format
+msgid "%s: cannot vacuum specific table(s) in all databases\n"
+msgstr "%s: Kan inte städa en specifik tabell i alla databaser.\n"
+
+#: vacuumdb.c:244
+#, c-format
+msgid "%s: vacuuming of table \"%s\" in database \"%s\" failed: %s"
+msgstr "%s: Misslyckad städning av tabell \"%s\" i databasen \"%s\": %s"
+
+#: vacuumdb.c:247
+#, c-format
+msgid "%s: vacuuming of database \"%s\" failed: %s"
+msgstr "%s: Misslyckad städning i databasen \"%s\": %s"
+
+#: vacuumdb.c:333
+msgid "Generating minimal optimizer statistics (1 target)"
+msgstr "Skapar minsta optimeringsstatistik, för ett mål."
+
+#: vacuumdb.c:334
+msgid "Generating medium optimizer statistics (10 targets)"
+msgstr "Skapar mellanstor optimeringsstatistik, för tio mål."
+
+#: vacuumdb.c:335
+msgid "Generating default (full) optimizer statistics"
+msgstr "Skapar förvald, en fullstor, optimeringsstatistik."
+
+#: vacuumdb.c:406
+#, c-format
+msgid "%s: vacuuming database \"%s\"\n"
+msgstr "%s: Utför vacuum i databasen \"%s\".\n"
+
+#: vacuumdb.c:424
+#, c-format
+msgid ""
+"%s cleans and analyzes a PostgreSQL database.\n"
+"\n"
+msgstr ""
+"%s städar och analyserar en PostgreSQL-databas.\n"
+"\n"
+
+#: vacuumdb.c:428
+#, c-format
+msgid " -a, --all vacuum all databases\n"
+msgstr " -a, --all städar i alla databaser\n"
+
+#: vacuumdb.c:429
+#, c-format
+msgid " -d, --dbname=DBNAME database to vacuum\n"
+msgstr " -d, --dbname=DBNAMN databas att utföra vacuum i\n"
+
+#: vacuumdb.c:430
+#, c-format
+msgid " -e, --echo show the commands being sent to the server\n"
+msgstr " -e, --echo visa kommandon som skickas till servern\n"
+
+#: vacuumdb.c:431
+#, c-format
+msgid " -f, --full do full vacuuming\n"
+msgstr " -f, --full utför full städning\n"
+
+#: vacuumdb.c:432
+#, c-format
+msgid " -F, --freeze freeze row transaction information\n"
+msgstr " -F, --freeze fixera utsagor om radtransaktioner\n"
+
+#: vacuumdb.c:433
+#, c-format
+msgid " -q, --quiet don't write any messages\n"
+msgstr " -q, --quiet skriv inte ut några meddelanden\n"
+
+#: vacuumdb.c:434
+#, c-format
+msgid " -t, --table='TABLE[(COLUMNS)]' vacuum specific table(s) only\n"
+msgstr " -t, --table='TABELL[(SPALTER)]' städa enbart i dessa tabeller\n"
+
+#: vacuumdb.c:435
+#, c-format
+msgid " -v, --verbose write a lot of output\n"
+msgstr " -v, --verbose skriv massor med utdata\n"
+
+#: vacuumdb.c:436
+#, c-format
+msgid " -V, --version output version information, then exit\n"
+msgstr " -V, --version visa versionsinformation, avsluta sedan\n"
+
+#: vacuumdb.c:437
+#, c-format
+msgid " -z, --analyze update optimizer statistics\n"
+msgstr " -z, --analyze uppdatera optimeringsstatistik\n"
+
+#: vacuumdb.c:438
+#, c-format
+msgid " -Z, --analyze-only only update optimizer statistics\n"
+msgstr " -Z, --analyze-only uppdatera bara optimeringsstatistik\n"
+
+#: vacuumdb.c:439
+#, c-format
+msgid ""
+" --analyze-in-stages only update optimizer statistics, in multiple\n"
+" stages for faster results\n"
+msgstr ""
+" --analyze-in-stages uppdatera bara optimeringsstatistik, men i\n"
+" flera steg för snabbare utfall\n"
+
+#: vacuumdb.c:441
+#, c-format
+msgid " -?, --help show this help, then exit\n"
+msgstr " -?, --help visa denna hjälp, avsluta sedan\n"
+
+#: vacuumdb.c:449
+#, c-format
+msgid ""
+"\n"
+"Read the description of the SQL command VACUUM for details.\n"
+msgstr ""
+"\n"
+"Läs beskrivningen av SQL-kommandot VACUUM för detaljer.\n"
diff --git a/src/bin/scripts/po/zh_CN.po b/src/bin/scripts/po/zh_CN.po
index d17693e5e08..38629ac8171 100644
--- a/src/bin/scripts/po/zh_CN.po
+++ b/src/bin/scripts/po/zh_CN.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: pgscripts (PostgreSQL 9.0)\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2013-09-02 00:27+0000\n"
-"PO-Revision-Date: 2013-09-02 16:30+0800\n"
+"POT-Creation-Date: 2014-11-22 21:12+0000\n"
+"PO-Revision-Date: 2014-12-06 13:14+0800\n"
"Last-Translator: Xiong He <iihero@qq.com>\n"
"Language-Team: Chinese (Simplified)\n"
"Language: zh_CN\n"
@@ -25,23 +25,38 @@ msgstr "内存溢出\n"
# common.c:78
#: ../../common/fe_memutils.c:77
#, c-format
-#| msgid "pg_strdup: cannot duplicate null pointer (internal error)\n"
msgid "cannot duplicate null pointer (internal error)\n"
msgstr "无法复制空指针 (内部错误)\n"
+#: ../../common/username.c:45
+#, c-format
+#| msgid "could not load private key file \"%s\": %s"
+msgid "could not look up effective user ID %ld: %s"
+msgstr "无法查找得到有效的用户ID %ld: %s"
+
+#: ../../common/username.c:47
+#| msgid "server \"%s\" does not exist"
+msgid "user does not exist"
+msgstr "用户不存在"
+
+#: ../../common/username.c:61
+#, c-format
+msgid "user name lookup failure: %s"
+msgstr "用户名查找失败: %s"
+
#: clusterdb.c:110 clusterdb.c:129 createdb.c:119 createdb.c:138
-#: createlang.c:89 createlang.c:119 createlang.c:172 createuser.c:163
-#: createuser.c:178 dropdb.c:94 dropdb.c:103 dropdb.c:111 droplang.c:88
-#: droplang.c:118 droplang.c:172 dropuser.c:89 dropuser.c:104 dropuser.c:115
-#: pg_isready.c:92 pg_isready.c:106 reindexdb.c:120 reindexdb.c:139
-#: vacuumdb.c:134 vacuumdb.c:154
+#: createlang.c:89 createlang.c:119 createlang.c:174 createuser.c:168
+#: createuser.c:183 dropdb.c:94 dropdb.c:103 dropdb.c:111 droplang.c:88
+#: droplang.c:118 droplang.c:174 dropuser.c:89 dropuser.c:104 dropuser.c:115
+#: pg_isready.c:93 pg_isready.c:107 reindexdb.c:120 reindexdb.c:139
+#: vacuumdb.c:139 vacuumdb.c:159
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "请用 \"%s --help\" 获取更多的信息.\n"
-#: clusterdb.c:127 createdb.c:136 createlang.c:117 createuser.c:176
-#: dropdb.c:109 droplang.c:116 dropuser.c:102 pg_isready.c:104 reindexdb.c:137
-#: vacuumdb.c:152
+#: clusterdb.c:127 createdb.c:136 createlang.c:117 createuser.c:181
+#: dropdb.c:109 droplang.c:116 dropuser.c:102 pg_isready.c:105 reindexdb.c:137
+#: vacuumdb.c:157
#, c-format
msgid "%s: too many command-line arguments (first is \"%s\")\n"
msgstr "%s: 太多的命令行参数 (第一个是 \"%s\")\n"
@@ -53,7 +68,6 @@ msgstr "%s: 无法对所有数据库和一个指定的数据库同时建簇\n"
#: clusterdb.c:146
#, c-format
-#| msgid "%s: cannot cluster a specific table in all databases\n"
msgid "%s: cannot cluster specific table(s) in all databases\n"
msgstr "%s: 无法在所有数据库中对指定表进行建簇\n"
@@ -81,21 +95,21 @@ msgstr ""
"%s 对一个数据库中先前已经建过簇的表进行建簇.\n"
"\n"
-#: clusterdb.c:262 createdb.c:252 createlang.c:234 createuser.c:329
-#: dropdb.c:155 droplang.c:235 dropuser.c:156 pg_isready.c:210 reindexdb.c:342
-#: vacuumdb.c:358
+#: clusterdb.c:262 createdb.c:252 createlang.c:236 createuser.c:348
+#: dropdb.c:155 droplang.c:237 dropuser.c:156 pg_isready.c:222 reindexdb.c:342
+#: vacuumdb.c:425
#, c-format
msgid "Usage:\n"
msgstr "使用方法:\n"
-#: clusterdb.c:263 reindexdb.c:343 vacuumdb.c:359
+#: clusterdb.c:263 reindexdb.c:343 vacuumdb.c:426
#, c-format
msgid " %s [OPTION]... [DBNAME]\n"
msgstr " %s [选项]... [数据库名]\n"
-#: clusterdb.c:264 createdb.c:254 createlang.c:236 createuser.c:331
-#: dropdb.c:157 droplang.c:237 dropuser.c:158 pg_isready.c:213 reindexdb.c:344
-#: vacuumdb.c:360
+#: clusterdb.c:264 createdb.c:254 createlang.c:238 createuser.c:350
+#: dropdb.c:157 droplang.c:239 dropuser.c:158 pg_isready.c:225 reindexdb.c:344
+#: vacuumdb.c:427
#, c-format
msgid ""
"\n"
@@ -114,8 +128,8 @@ msgstr " -a, --all 对所有数据库建簇\n"
msgid " -d, --dbname=DBNAME database to cluster\n"
msgstr " -d, --dbname=DBNAME 对数据库 DBNAME 建簇\n"
-#: clusterdb.c:267 createlang.c:238 createuser.c:335 dropdb.c:158
-#: droplang.c:239 dropuser.c:159 reindexdb.c:347
+#: clusterdb.c:267 createlang.c:240 createuser.c:354 dropdb.c:158
+#: droplang.c:241 dropuser.c:159 reindexdb.c:347
#, c-format
msgid ""
" -e, --echo show the commands being sent to the server\n"
@@ -128,7 +142,6 @@ msgstr " -q, --quiet 不写任何信息\n"
#: clusterdb.c:269
#, c-format
-#| msgid " -t, --table=TABLE cluster specific table only\n"
msgid " -t, --table=TABLE cluster specific table(s) only\n"
msgstr " -t, --table=TABLE 只对指定的表建簇\n"
@@ -137,21 +150,21 @@ msgstr " -t, --table=TABLE 只对指定的表建簇\n"
msgid " -v, --verbose write a lot of output\n"
msgstr " -v, --verbose 写大量的输出\n"
-#: clusterdb.c:271 createlang.c:240 createuser.c:348 dropdb.c:160
-#: droplang.c:241 dropuser.c:162 reindexdb.c:352
+#: clusterdb.c:271 createlang.c:242 createuser.c:368 dropdb.c:160
+#: droplang.c:243 dropuser.c:162 reindexdb.c:352
#, c-format
msgid " -V, --version output version information, then exit\n"
msgstr " -V, --version 输出版本信息, 然后退出\n"
-#: clusterdb.c:272 createlang.c:241 createuser.c:353 dropdb.c:162
-#: droplang.c:242 dropuser.c:164 reindexdb.c:353
+#: clusterdb.c:272 createlang.c:243 createuser.c:373 dropdb.c:162
+#: droplang.c:244 dropuser.c:164 reindexdb.c:353
#, c-format
msgid " -?, --help show this help, then exit\n"
msgstr " -?, --help 显示此帮助, 然后退出\n"
-#: clusterdb.c:273 createdb.c:265 createlang.c:242 createuser.c:354
-#: dropdb.c:163 droplang.c:243 dropuser.c:165 pg_isready.c:219 reindexdb.c:354
-#: vacuumdb.c:373
+#: clusterdb.c:273 createdb.c:265 createlang.c:244 createuser.c:374
+#: dropdb.c:163 droplang.c:245 dropuser.c:165 pg_isready.c:231 reindexdb.c:354
+#: vacuumdb.c:442
#, c-format
msgid ""
"\n"
@@ -160,37 +173,37 @@ msgstr ""
"\n"
"联接选项:\n"
-#: clusterdb.c:274 createlang.c:243 createuser.c:355 dropdb.c:164
-#: droplang.c:244 dropuser.c:166 reindexdb.c:355 vacuumdb.c:374
+#: clusterdb.c:274 createlang.c:245 createuser.c:375 dropdb.c:164
+#: droplang.c:246 dropuser.c:166 reindexdb.c:355 vacuumdb.c:443
#, c-format
msgid " -h, --host=HOSTNAME database server host or socket directory\n"
msgstr " -h, --host=HOSTNAM 数据库服务器所在机器的主机名或套接字目录\n"
-#: clusterdb.c:275 createlang.c:244 createuser.c:356 dropdb.c:165
-#: droplang.c:245 dropuser.c:167 reindexdb.c:356 vacuumdb.c:375
+#: clusterdb.c:275 createlang.c:246 createuser.c:376 dropdb.c:165
+#: droplang.c:247 dropuser.c:167 reindexdb.c:356 vacuumdb.c:444
#, c-format
msgid " -p, --port=PORT database server port\n"
msgstr " -p, --port=PORT 数据库服务器端口号\n"
-#: clusterdb.c:276 createlang.c:245 dropdb.c:166 droplang.c:246
-#: reindexdb.c:357 vacuumdb.c:376
+#: clusterdb.c:276 createlang.c:247 dropdb.c:166 droplang.c:248
+#: reindexdb.c:357 vacuumdb.c:445
#, c-format
msgid " -U, --username=USERNAME user name to connect as\n"
msgstr " -U, --username=USERNAME 联接的用户名\n"
-#: clusterdb.c:277 createlang.c:246 createuser.c:358 dropdb.c:167
-#: droplang.c:247 dropuser.c:169 reindexdb.c:358 vacuumdb.c:377
+#: clusterdb.c:277 createlang.c:248 createuser.c:378 dropdb.c:167
+#: droplang.c:249 dropuser.c:169 reindexdb.c:358 vacuumdb.c:446
#, c-format
msgid " -w, --no-password never prompt for password\n"
-msgstr " -w, -no-password 永远不提示输入口令\n"
+msgstr " -w, --no-password 永远不提示输入口令\n"
-#: clusterdb.c:278 createlang.c:247 createuser.c:359 dropdb.c:168
-#: droplang.c:248 dropuser.c:170 reindexdb.c:359 vacuumdb.c:378
+#: clusterdb.c:278 createlang.c:249 createuser.c:379 dropdb.c:168
+#: droplang.c:250 dropuser.c:170 reindexdb.c:359 vacuumdb.c:447
#, c-format
msgid " -W, --password force password prompt\n"
msgstr " -W, --password 强制提示输入口令\n"
-#: clusterdb.c:279 dropdb.c:169 reindexdb.c:360 vacuumdb.c:379
+#: clusterdb.c:279 dropdb.c:169 reindexdb.c:360 vacuumdb.c:448
#, c-format
msgid " --maintenance-db=DBNAME alternate maintenance database\n"
msgstr " --maintenance-db=DBNAME 更改维护数据库\n"
@@ -204,9 +217,9 @@ msgstr ""
"\n"
"阅读 SQL 命令 CLUSTER 的描述信息, 以便获得更详细的信息.\n"
-#: clusterdb.c:281 createdb.c:273 createlang.c:248 createuser.c:360
-#: dropdb.c:170 droplang.c:249 dropuser.c:171 pg_isready.c:224 reindexdb.c:362
-#: vacuumdb.c:381
+#: clusterdb.c:281 createdb.c:273 createlang.c:250 createuser.c:380
+#: dropdb.c:170 droplang.c:251 dropuser.c:171 pg_isready.c:236 reindexdb.c:362
+#: vacuumdb.c:450
#, c-format
msgid ""
"\n"
@@ -215,69 +228,59 @@ msgstr ""
"\n"
"臭虫报告至 <pgsql-bugs@postgresql.org>.\n"
-#: common.c:44
-#, c-format
-msgid "%s: could not obtain information about current user: %s\n"
-msgstr "%s: 无法获得当前用户的信息: %s\n"
-
-#: common.c:55
-#, c-format
-msgid "%s: could not get current user name: %s\n"
-msgstr "%s: 无法获取当前用户名称: %s\n"
-
-#: common.c:102 common.c:148
+#: common.c:69 common.c:115
msgid "Password: "
msgstr "口令: "
-#: common.c:137
+#: common.c:104
#, c-format
msgid "%s: could not connect to database %s\n"
msgstr "%s: 无法联接到数据库 %s\n"
-#: common.c:164
+#: common.c:131
#, c-format
msgid "%s: could not connect to database %s: %s"
msgstr "%s: 无法联接到数据库 %s: %s"
-#: common.c:213 common.c:241
+#: common.c:180 common.c:208
#, c-format
msgid "%s: query failed: %s"
msgstr "%s: 查询失败: %s"
-#: common.c:215 common.c:243
+#: common.c:182 common.c:210
#, c-format
msgid "%s: query was: %s\n"
msgstr "%s: 查询是: %s\n"
#. translator: abbreviation for "yes"
-#: common.c:284
+#: common.c:251
msgid "y"
msgstr "y"
#. translator: abbreviation for "no"
-#: common.c:286
+#: common.c:253
msgid "n"
msgstr "n"
#. translator: This is a question followed by the translated options for
#. "yes" and "no".
-#: common.c:296
+#: common.c:263
#, c-format
msgid "%s (%s/%s) "
msgstr "%s (%s/%s) "
-#: common.c:317
+#: common.c:284
#, c-format
msgid "Please answer \"%s\" or \"%s\".\n"
msgstr "请回答\"%s\"或\"%s\".\n"
-#: common.c:395 common.c:428
+#: common.c:362 common.c:395
#, c-format
msgid "Cancel request sent\n"
msgstr "取消发送的请求\n"
# fe-connect.c:1322
-#: common.c:397 common.c:430
+#: common.c:364 common.c:397
#, c-format
msgid "Could not send cancel request: %s"
msgstr "无法发送取消请求: %s"
@@ -340,7 +343,7 @@ msgstr " -E, --encoding=ENCODING 数据库编码\n"
#: createdb.c:258
#, c-format
msgid " -l, --locale=LOCALE locale settings for the database\n"
-msgstr " -O, --owner=OWNER 新数据库的所属用户\n"
+msgstr " -l, --locale=LOCALE 数据库的本地化设置\n"
#: createdb.c:259
#, c-format
@@ -433,22 +436,22 @@ msgstr "是否信任?"
msgid "Procedural Languages"
msgstr "过程语言"
-#: createlang.c:171 droplang.c:170
+#: createlang.c:173 droplang.c:172
#, c-format
msgid "%s: missing required argument language name\n"
msgstr "%s: 缺少要求的语言名称参数\n"
-#: createlang.c:195
+#: createlang.c:197
#, c-format
msgid "%s: language \"%s\" is already installed in database \"%s\"\n"
msgstr "%1$s: 数据库 \"%3$s\" 中已经安装了语言 \"%2$s\"\n"
-#: createlang.c:217
+#: createlang.c:219
#, c-format
msgid "%s: language installation failed: %s"
msgstr "%s: 语言安装失败: %s"
-#: createlang.c:233
+#: createlang.c:235
#, c-format
msgid ""
"%s installs a procedural language into a PostgreSQL database.\n"
@@ -457,62 +460,62 @@ msgstr ""
"%s 安装一个过程语言进 PostgreSQL 数据库.\n"
"\n"
-#: createlang.c:235 droplang.c:236
+#: createlang.c:237 droplang.c:238
#, c-format
msgid " %s [OPTION]... LANGNAME [DBNAME]\n"
msgstr " %s [选项]... 语言名称 [数据库名]\n"
-#: createlang.c:237
+#: createlang.c:239
#, c-format
msgid " -d, --dbname=DBNAME database to install language in\n"
msgstr " -d, --dbname=DBNAME 要安装语言的数据库\n"
-#: createlang.c:239 droplang.c:240
+#: createlang.c:241 droplang.c:242
#, c-format
msgid ""
" -l, --list show a list of currently installed languages\n"
msgstr " -l, --list 显示当前已经安装了的语言列表\n"
-#: createuser.c:185
+#: createuser.c:190
msgid "Enter name of role to add: "
msgstr "输入要增加的角色名称: "
-#: createuser.c:200
+#: createuser.c:205
msgid "Enter password for new role: "
msgstr "为新角色输入的口令: "
-#: createuser.c:201
+#: createuser.c:206
msgid "Enter it again: "
msgstr "再输入一遍: "
-#: createuser.c:204
+#: createuser.c:209
#, c-format
msgid "Passwords didn't match.\n"
msgstr "口令不匹配.\n"
-#: createuser.c:213
+#: createuser.c:218
msgid "Shall the new role be a superuser?"
msgstr "新的角色是否是超级用户?"
-#: createuser.c:228
+#: createuser.c:233
msgid "Shall the new role be allowed to create databases?"
msgstr "新的角色允许创建数据库吗?"
-#: createuser.c:236
+#: createuser.c:241
msgid "Shall the new role be allowed to create more new roles?"
msgstr "新角色允许创建其它新的角色吗? "
-#: createuser.c:270
+#: createuser.c:275
#, c-format
msgid "Password encryption failed.\n"
msgstr "密码加密失败.\n"
-#: createuser.c:313
+#: createuser.c:332
#, c-format
msgid "%s: creation of new role failed: %s"
msgstr "%s: 创建新用户失败: %s"
-#: createuser.c:328
+#: createuser.c:347
#, c-format
msgid ""
"%s creates a new PostgreSQL role.\n"
@@ -521,33 +524,39 @@ msgstr ""
"%s 创建一个新的 PostgreSQL 用户.\n"
"\n"
-#: createuser.c:330 dropuser.c:157
+#: createuser.c:349 dropuser.c:157
#, c-format
msgid " %s [OPTION]... [ROLENAME]\n"
msgstr " %s [选项]... [用户名]\n"
-#: createuser.c:332
+#: createuser.c:351
#, c-format
msgid ""
" -c, --connection-limit=N connection limit for role (default: no limit)\n"
msgstr " -c, --connection-limit=N 角色的连接限制(缺省: 没有限制)\n"
-#: createuser.c:333
+#: createuser.c:352
#, c-format
msgid " -d, --createdb role can create new databases\n"
msgstr " -d, --createdb 此角色可以创建新数据库\n"
-#: createuser.c:334
+#: createuser.c:353
#, c-format
msgid " -D, --no-createdb role cannot create databases (default)\n"
msgstr " -D, --no-createdb 此角色不可以创建新数据库(默认)\n"
-#: createuser.c:336
+#: createuser.c:355
#, c-format
msgid " -E, --encrypted encrypt stored password\n"
msgstr " -E, --encrypted 口令加密存储\n"
-#: createuser.c:337
+#: createuser.c:356
+#, c-format
+#| msgid " -s, --superuser role will be superuser\n"
+msgid " -g, --role=ROLE new role will be a member of this role\n"
+msgstr " -g, --role=ROLE 新的角色必须是这个角色的成员\n"
+
+#: createuser.c:357
#, c-format
msgid ""
" -i, --inherit role inherits privileges of roles it is a\n"
@@ -556,52 +565,52 @@ msgstr ""
" -i, --inherit 角色能够继承它所属角色的权限\n"
" (这是缺省情况)\n"
-#: createuser.c:339
+#: createuser.c:359
#, c-format
msgid " -I, --no-inherit role does not inherit privileges\n"
msgstr " -I, --no-inherit 角色不继承权限\n"
-#: createuser.c:340
+#: createuser.c:360
#, c-format
msgid " -l, --login role can login (default)\n"
msgstr " -l, --login 角色能够登录(这是缺省情况)\n"
-#: createuser.c:341
+#: createuser.c:361
#, c-format
msgid " -L, --no-login role cannot login\n"
msgstr " -L, --no-login 角色不能登录\n"
-#: createuser.c:342
+#: createuser.c:362
#, c-format
msgid " -N, --unencrypted do not encrypt stored password\n"
msgstr " -N, --unencrypted 口令不加密存储\n"
-#: createuser.c:343
+#: createuser.c:363
#, c-format
msgid " -P, --pwprompt assign a password to new role\n"
msgstr " -P, --pwprompt 给新角色指定口令\n"
-#: createuser.c:344
+#: createuser.c:364
#, c-format
msgid " -r, --createrole role can create new roles\n"
msgstr " -r, --createrole 这个角色可以创建新的角色\n"
-#: createuser.c:345
+#: createuser.c:365
#, c-format
msgid " -R, --no-createrole role cannot create roles (default)\n"
msgstr " -R, --no-createrole 这个角色没有创建其它角色的权限(默认)\n"
-#: createuser.c:346
+#: createuser.c:366
#, c-format
msgid " -s, --superuser role will be superuser\n"
msgstr " -s, --superuser 角色将是超级用户\n"
-#: createuser.c:347
+#: createuser.c:367
#, c-format
msgid " -S, --no-superuser role will not be superuser (default)\n"
msgstr " -S, --no-superuser 角色不能是超级用户(默认)\n"
-#: createuser.c:349
+#: createuser.c:369
#, c-format
msgid ""
" --interactive prompt for missing role name and attributes "
@@ -611,17 +620,17 @@ msgstr ""
" --interactive 提示缺少角色名及其属性\n"
" 而不是使用默认值\n"
-#: createuser.c:351
+#: createuser.c:371
#, c-format
msgid " --replication role can initiate replication\n"
msgstr " --replication 角色能启动复制\n"
-#: createuser.c:352
+#: createuser.c:372
#, c-format
msgid " --no-replication role cannot initiate replication\n"
msgstr " --no-replication 角色不能启动复制\n"
-#: createuser.c:357
+#: createuser.c:377
#, c-format
msgid ""
" -U, --username=USERNAME user name to connect as (not the one to create)\n"
@@ -672,17 +681,17 @@ msgid ""
" --if-exists don't report error if database doesn't exist\n"
msgstr " --if-exists 如果数据库不存在则不报告错误\n"
-#: droplang.c:201
+#: droplang.c:203
#, c-format
msgid "%s: language \"%s\" is not installed in database \"%s\"\n"
msgstr "%1$s: 数据库 \"%3$s\" 中, 没有安装语言 \"%2$s\"\n"
-#: droplang.c:219
+#: droplang.c:221
#, c-format
msgid "%s: language removal failed: %s"
msgstr "%s: 语言删除失败: %s"
-#: droplang.c:234
+#: droplang.c:236
#, c-format
msgid ""
"%s removes a procedural language from a database.\n"
@@ -691,7 +700,7 @@ msgstr ""
"%s 从数据库中删除一个过程语言.\n"
"\n"
-#: droplang.c:238
+#: droplang.c:240
#, c-format
msgid ""
" -d, --dbname=DBNAME database from which to remove the language\n"
@@ -758,23 +767,18 @@ msgstr " -U, --username=USERNAME 联接用户 (不是要删除的用户名)\n
# common.c:170
# copy.c:530
# copy.c:575
-#: pg_isready.c:138
+#: pg_isready.c:142
#, c-format
-#| msgid "%s: %s\n"
msgid "%s: %s"
msgstr "%s: %s"
-#: pg_isready.c:146
+#: pg_isready.c:150
#, c-format
-#| msgid "could not set default_with_oids: %s"
msgid "%s: could not fetch default options\n"
msgstr "%s: 无法取得缺省选项\n"
-#: pg_isready.c:209
+#: pg_isready.c:221
#, c-format
-#| msgid ""
-#| "%s creates a PostgreSQL database.\n"
-#| "\n"
msgid ""
"%s issues a connection check to a PostgreSQL database.\n"
"\n"
@@ -782,56 +786,51 @@ msgstr ""
"%s 发起一个到指定 PostgreSQL数据库的连接检查.\n"
"\n"
-#: pg_isready.c:211
+#: pg_isready.c:223
#, c-format
msgid " %s [OPTION]...\n"
msgstr " %s [选项]...\n"
-#: pg_isready.c:214
+#: pg_isready.c:226
#, c-format
-#| msgid " -d, --dbname=DBNAME database to reindex\n"
msgid " -d, --dbname=DBNAME database name\n"
msgstr " -d, --dbname=DBNAME 数据库名\n"
-#: pg_isready.c:215
+#: pg_isready.c:227
#, c-format
-#| msgid " -q, --quiet don't write any messages\n"
msgid " -q, --quiet run quietly\n"
msgstr " -q, --quiet 静默运行\n"
-#: pg_isready.c:216
+#: pg_isready.c:228
#, c-format
msgid " -V, --version output version information, then exit\n"
msgstr " -V, --version 输出版本信息, 然后退出\n"
-#: pg_isready.c:217
+#: pg_isready.c:229
#, c-format
msgid " -?, --help show this help, then exit\n"
msgstr " -?, --help 显示此帮助, 然后退出\n"
-#: pg_isready.c:220
+#: pg_isready.c:232
#, c-format
msgid " -h, --host=HOSTNAME database server host or socket directory\n"
msgstr " -h, --host=主机名 数据库服务器的主机名或套接字目录\n"
-#: pg_isready.c:221
+#: pg_isready.c:233
#, c-format
-#| msgid " -p, --port=PORT database server port\n"
msgid " -p, --port=PORT database server port\n"
msgstr " -p, --port=PORT 数据库服务器端口\n"
-#: pg_isready.c:222
+#: pg_isready.c:234
#, c-format
-#| msgid " -t, --timeout=SECS seconds to wait when using -w option\n"
msgid ""
" -t, --timeout=SECS seconds to wait when attempting connection, 0 "
"disables (default: %s)\n"
msgstr ""
" -t, --timeout=SECS 尝试连接时要等待的秒数, 值为0表示禁用(缺省值: %s)\n"
-#: pg_isready.c:223
+#: pg_isready.c:235
#, c-format
-#| msgid " -U, --username=USERNAME user name to connect as\n"
msgid " -U, --username=USERNAME user name to connect as\n"
msgstr " -U, --username=USERNAME 连接的用户名\n"
@@ -847,28 +846,22 @@ msgstr "%s: 无法对所有数据库和系统目录同时进行索引重建操
#: reindexdb.c:159
#, c-format
-#| msgid "%s: cannot reindex a specific table in all databases\n"
msgid "%s: cannot reindex specific table(s) in all databases\n"
msgstr "%s: 无法在所有数据库中对指定表上的索引进行重建\n"
#: reindexdb.c:164
#, c-format
-#| msgid "%s: cannot reindex a specific index in all databases\n"
msgid "%s: cannot reindex specific index(es) in all databases\n"
msgstr "%s: 无法在所有数据库中对指定的索引进行重建\n"
#: reindexdb.c:175
#, c-format
-#| msgid ""
-#| "%s: cannot reindex a specific table and system catalogs at the same time\n"
msgid ""
"%s: cannot reindex specific table(s) and system catalogs at the same time\n"
msgstr "%s: 无法对指定的表和系统视图同时进行索引重建操作\n"
#: reindexdb.c:180
#, c-format
-#| msgid ""
-#| "%s: cannot reindex a specific index and system catalogs at the same time\n"
msgid ""
"%s: cannot reindex specific index(es) and system catalogs at the same time\n"
msgstr "%s: 无法对指定索引和系统视图同时进行索引重建操作\n"
@@ -919,9 +912,8 @@ msgstr " -d, --dbname=数据库名称 对数据库中的索引进行重
#: reindexdb.c:348
#, c-format
-#| msgid " -i, --index=INDEX recreate specific index only\n"
msgid " -i, --index=INDEX recreate specific index(es) only\n"
-msgstr " -I, --index=INDEX 仅重新创建指定的索引\n"
+msgstr " -i, --index=INDEX 仅重新创建指定的索引\n"
#: reindexdb.c:350
#, c-format
@@ -930,7 +922,6 @@ msgstr " -s, --system 对系统视图重新创建索引\n"
#: reindexdb.c:351
#, c-format
-#| msgid " -t, --table=TABLE reindex specific table only\n"
msgid " -t, --table=TABLE reindex specific table(s) only\n"
msgstr " -t, --table=表名 只对指定的表重新创建索引\n"
@@ -943,43 +934,54 @@ msgstr ""
"\n"
"阅读SQL命令REINDEX的描述信息, 以便获得更详细的信息.\n"
-#: vacuumdb.c:162
+#: vacuumdb.c:167
#, c-format
msgid "%s: cannot use the \"full\" option when performing only analyze\n"
msgstr "%s: 在只执行分析的时候,无法使用选项\"full\"\n"
-#: vacuumdb.c:168
+#: vacuumdb.c:173
#, c-format
msgid "%s: cannot use the \"freeze\" option when performing only analyze\n"
msgstr "%s: 当只执行分析的时候,无法使用选项\"freeze\"\n"
-#: vacuumdb.c:181
+#: vacuumdb.c:186
#, c-format
msgid "%s: cannot vacuum all databases and a specific one at the same time\n"
msgstr "%s: 无法对所有数据库和一个指定的数据库同时清理\n"
-#: vacuumdb.c:187
+#: vacuumdb.c:192
#, c-format
-#| msgid "%s: cannot vacuum a specific table in all databases\n"
msgid "%s: cannot vacuum specific table(s) in all databases\n"
msgstr "%s: 无法在所有数据库中对指定的表进行清理\n"
-#: vacuumdb.c:306
+#: vacuumdb.c:244
#, c-format
msgid "%s: vacuuming of table \"%s\" in database \"%s\" failed: %s"
msgstr "%1$s: 在数据库 \"%3$s\" 中的表 \"%2$s\" 清理失败: %4$s"
-#: vacuumdb.c:309
+#: vacuumdb.c:247
#, c-format
msgid "%s: vacuuming of database \"%s\" failed: %s"
msgstr "%s: 数据库 \"%s\" 清理失败: %s"
-#: vacuumdb.c:341
+#: vacuumdb.c:333
+msgid "Generating minimal optimizer statistics (1 target)"
+msgstr "产生最小优化器统计(一个目标)"
+
+#: vacuumdb.c:334
+msgid "Generating medium optimizer statistics (10 targets)"
+msgstr "产生中等优化器统计(10个目标)"
+
+#: vacuumdb.c:335
+msgid "Generating default (full) optimizer statistics"
+msgstr "产生缺省(完全)优化器统计"
+
+#: vacuumdb.c:406
#, c-format
msgid "%s: vacuuming database \"%s\"\n"
msgstr "%s: 清理数据库 \"%s\"\n"
-#: vacuumdb.c:357
+#: vacuumdb.c:424
#, c-format
msgid ""
"%s cleans and analyzes a PostgreSQL database.\n"
@@ -988,71 +990,80 @@ msgstr ""
"%s 清理并且优化一个 PostgreSQL 数据库.\n"
"\n"
-#: vacuumdb.c:361
+#: vacuumdb.c:428
#, c-format
msgid " -a, --all vacuum all databases\n"
msgstr " -a, --all 清理所有的数据库\n"
-#: vacuumdb.c:362
+#: vacuumdb.c:429
#, c-format
msgid " -d, --dbname=DBNAME database to vacuum\n"
msgstr " -d, --dbname=DBNAME 清理数据库 DBNAME\n"
-#: vacuumdb.c:363
+#: vacuumdb.c:430
#, c-format
msgid ""
" -e, --echo show the commands being sent to the "
"server\n"
msgstr " -e, --echo 显示发送到服务端的命令\n"
-#: vacuumdb.c:364
+#: vacuumdb.c:431
#, c-format
msgid " -f, --full do full vacuuming\n"
msgstr " -f, --full 完全清理\n"
-#: vacuumdb.c:365
+#: vacuumdb.c:432
#, c-format
msgid " -F, --freeze freeze row transaction information\n"
msgstr " -F, --freeze 冻结记录的事务信息\n"
-#: vacuumdb.c:366
+#: vacuumdb.c:433
#, c-format
msgid " -q, --quiet don't write any messages\n"
msgstr " -q, --quiet 不写任何信息\n"
-#: vacuumdb.c:367
+#: vacuumdb.c:434
#, c-format
-#| msgid " -t, --table='TABLE[(COLUMNS)]' vacuum specific table only\n"
msgid " -t, --table='TABLE[(COLUMNS)]' vacuum specific table(s) only\n"
msgstr " -t, --table='TABLE[(COLUMNS)]' 只清理指定的表\n"
-#: vacuumdb.c:368
+#: vacuumdb.c:435
#, c-format
msgid " -v, --verbose write a lot of output\n"
msgstr " -v, --verbose 写大量的输出\n"
-#: vacuumdb.c:369
+#: vacuumdb.c:436
#, c-format
msgid ""
" -V, --version output version information, then exit\n"
msgstr " -V, --version 输出版本信息, 然后退出\n"
-#: vacuumdb.c:370
+#: vacuumdb.c:437
#, c-format
msgid " -z, --analyze update optimizer statistics\n"
-msgstr " -z, --anaylze 更新优化器的统计信息\n"
+msgstr " -z, --analyze 更新优化器统计\n"
-#: vacuumdb.c:371
+#: vacuumdb.c:438
#, c-format
msgid " -Z, --analyze-only only update optimizer statistics\n"
-msgstr " -z, --analyze-only 只更新优化器的统计信息\n"
+msgstr " -Z, --analyze-only 只更新优化器统计\n"
+
+#: vacuumdb.c:439
+#, c-format
+msgid ""
+" --analyze-in-stages only update optimizer statistics, in "
+"multiple\n"
+" stages for faster results\n"
+msgstr ""
+" --analyze-in-stages 只更新优化器统计, 分多\n"
+" 阶段产生更快的结果\n"
-#: vacuumdb.c:372
+#: vacuumdb.c:441
#, c-format
msgid " -?, --help show this help, then exit\n"
msgstr " -?, --help 显示此帮助信息, 然后退出\n"
-#: vacuumdb.c:380
+#: vacuumdb.c:449
#, c-format
msgid ""
"\n"
@@ -1061,68 +1072,74 @@ msgstr ""
"\n"
"阅读 SQL 命令 VACUUM 的描述信息, 以便获得更详细的信息.\n"
-#~ msgid " --help show this help, then exit\n"
-#~ msgstr " --help 显示此帮助信息, 然后退出\n"
+#~ msgid "%s: out of memory\n"
+#~ msgstr "%s: 内存溢出\n"
#~ msgid ""
-#~ " --version output version information, then exit\n"
-#~ msgstr " --versoin 输出版本信息, 然后退出\n"
+#~ " -D, --location=PATH alternative place to store the database\n"
+#~ msgstr " -D, --location=PATH 选择一个地方存放数据库\n"
-#~ msgid " --help show this help, then exit\n"
-#~ msgstr " --help 显示此帮助信息, 然后退出\n"
+#~ msgid " -W, --password prompt for password to connect\n"
+#~ msgstr " -W, --password 联接提示口令输入\n"
-#~ msgid " --version output version information, then exit\n"
-#~ msgstr " --version 输出版本信息, 然后退出\n"
+#~ msgid " -i, --sysid=SYSID select sysid for new user\n"
+#~ msgstr " -i, --sysid=SYSID 选择一个 sysid 给新用户\n"
+
+#~ msgid "%s: user ID must be a positive number\n"
+#~ msgstr "%s: 用户 ID 必需为一个正数\n"
#~ msgid ""
-#~ "\n"
-#~ "If one of -d, -D, -r, -R, -s, -S, and ROLENAME is not specified, you "
-#~ "will\n"
-#~ "be prompted interactively.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "如果 -d, -D, -r, -R, -s, -S 和 ROLENAME 一个都没有指定,将使用交互式提示\n"
-#~ "你.\n"
+#~ " -L, --pglib=DIRECTORY find language interpreter file in DIRECTORY\n"
+#~ msgstr " -L, --pglib=DIRECTORY 在 DIRECTORY 目录中查找语言翻译文件\n"
#~ msgid ""
-#~ "%s: still %s functions declared in language \"%s\"; language not removed\n"
-#~ msgstr "%s: 函数 %s 是用语言 \"%s\" 声明的; 语言未被删除\n"
+#~ "Supported languages are plpgsql, pltcl, pltclu, plperl, plperlu, and "
+#~ "plpythonu.\n"
+#~ msgstr ""
+#~ "已支持的语言有 plpgsql, pltcl, pltclu, plperl, plperlu, 和 plpythonu.\n"
-#~ msgid " --help show this help, then exit\n"
-#~ msgstr " --help 显示此帮助信息, 然后退出\n"
+#~ msgid "%s: unsupported language \"%s\"\n"
+#~ msgstr "%s: 不支持语言 \"%s\"\n"
+
+#~ msgid " -q, --quiet don't write any messages\n"
+#~ msgstr " -q, --quiet 不写任何信息\n"
#~ msgid ""
#~ " --version output version information, then exit\n"
#~ msgstr " --versoin 输出版本信息, 然后退出\n"
-#~ msgid " -q, --quiet don't write any messages\n"
-#~ msgstr " -q, --quiet 不写任何信息\n"
+#~ msgid " --help show this help, then exit\n"
+#~ msgstr " --help 显示此帮助信息, 然后退出\n"
-#~ msgid "%s: unsupported language \"%s\"\n"
-#~ msgstr "%s: 不支持语言 \"%s\"\n"
+#~ msgid ""
+#~ "%s: still %s functions declared in language \"%s\"; language not removed\n"
+#~ msgstr "%s: 函数 %s 是用语言 \"%s\" 声明的; 语言未被删除\n"
#~ msgid ""
-#~ "Supported languages are plpgsql, pltcl, pltclu, plperl, plperlu, and "
-#~ "plpythonu.\n"
+#~ "\n"
+#~ "If one of -d, -D, -r, -R, -s, -S, and ROLENAME is not specified, you "
+#~ "will\n"
+#~ "be prompted interactively.\n"
#~ msgstr ""
-#~ "已支持的语言有 plpgsql, pltcl, pltclu, plperl, plperlu, 和 plpythonu.\n"
+#~ "\n"
+#~ "如果 -d, -D, -r, -R, -s, -S 和 ROLENAME 一个都没有指定,将使用交互式提示\n"
+#~ "你.\n"
-#~ msgid ""
-#~ " -L, --pglib=DIRECTORY find language interpreter file in DIRECTORY\n"
-#~ msgstr " -L, --pglib=DIRECTORY 在 DIRECTORY 目录中查找语言翻译文件\n"
+#~ msgid " --version output version information, then exit\n"
+#~ msgstr " --version 输出版本信息, 然后退出\n"
-#~ msgid "%s: user ID must be a positive number\n"
-#~ msgstr "%s: 用户 ID 必需为一个正数\n"
+#~ msgid " --help show this help, then exit\n"
+#~ msgstr " --help 显示此帮助信息, 然后退出\n"
-#~ msgid " -i, --sysid=SYSID select sysid for new user\n"
-#~ msgstr " -i, --sysid=SYSID 选择一个 sysid 给新用户\n"
+#~ msgid ""
+#~ " --version output version information, then exit\n"
+#~ msgstr " --versoin 输出版本信息, 然后退出\n"
-#~ msgid " -W, --password prompt for password to connect\n"
-#~ msgstr " -W, --password 联接提示口令输入\n"
+#~ msgid " --help show this help, then exit\n"
+#~ msgstr " --help 显示此帮助信息, 然后退出\n"
-#~ msgid ""
-#~ " -D, --location=PATH alternative place to store the database\n"
-#~ msgstr " -D, --location=PATH 选择一个地方存放数据库\n"
+#~ msgid "%s: could not get current user name: %s\n"
+#~ msgstr "%s: 无法获取当前用户名称: %s\n"
-#~ msgid "%s: out of memory\n"
-#~ msgstr "%s: 内存溢出\n"
+#~ msgid "%s: could not obtain information about current user: %s\n"
+#~ msgstr "%s: 无法获得当前用户的信息: %s\n"