Translation updates

src/bin/initdb/nls.mk

@@ -1,5 +1,5 @@
-# $PostgreSQL: pgsql/src/bin/initdb/nls.mk,v 1.11 2004/09/13 12:20:21 petere Exp $
+# $PostgreSQL: pgsql/src/bin/initdb/nls.mk,v 1.12 2004/09/13 12:26:40 petere Exp $
 CATALOG_NAME	:= initdb
-AVAIL_LANGUAGES	:= de es fr it pt_BR ru sk sv zh_CN zh_TW
+AVAIL_LANGUAGES	:= cs de es fr it pt_BR ru sk sv zh_CN zh_TW
 GETTEXT_FILES	:= initdb.c
 GETTEXT_TRIGGERS:= _ simple_prompt

src/bin/initdb/po/cs.po

@@ -0,0 +1,513 @@
+# SOME DESCRIPTIVE TITLE.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 8.0\n"
+"POT-Creation-Date: 2004-08-10 01:27-0300\n"
+"PO-Revision-Date: 2004-08-10 18:07+0100\n"
+"Last-Translator: Michal Taborsky <michal@taborsky.cz>\n"
+"Language-Team: Czech <cs@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: initdb.c:233
+#: initdb.c:247
+#, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: nedostatek pam<61>ti\n"
+
+#: initdb.c:329
+#: initdb.c:1300
+#, c-format
+msgid "%s: could not open file \"%s\" for reading: %s\n"
+msgstr "%s: nelze otev<65><76>t soubor \"%s\" pro <20>ten<65>: %s\n"
+
+#: initdb.c:387
+#, c-format
+msgid "%s: could not open file \"%s\" for writing: %s\n"
+msgstr "%s: nelze otev<65><76>t soubor \"%s\" pro z<>pis: %s\n"
+
+#: initdb.c:515
+#: initdb.c:524
+#: initdb.c:532
+#, c-format
+msgid "%s: failed\n"
+msgstr "%s: selhalo\n"
+
+#: initdb.c:521
+#, c-format
+msgid "%s: removing data directory \"%s\"\n"
+msgstr "%s: odstra<72>uji datov<6F> adres<65><73> \"%s\"\n"
+
+#: initdb.c:529
+#, c-format
+msgid "%s: removing contents of data directory \"%s\"\n"
+msgstr "%s: odstra<72>uji obsah datov<6F>ho adres<65><73>e \"%s\"\n"
+
+#: initdb.c:540
+#, c-format
+msgid "%s: data directory \"%s\" not removed at user's request\n"
+msgstr "%s: datov<6F> adres<65><73> \"%s\" nebyl na <20><>dost u<>ivatele odstran<61>n\n"
+
+#: initdb.c:566
+#, 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: nem<65><6D>e b<><62>et pod u<>ivatelem root\n"
+"Pros<6F>m p<>ihla<6C>te se jako (neprivilegovan<61>) u<>ivatel, kter<65> bude vlastn<74>kem\n"
+"serverov<6F>ho procesu (nap<61><70>klad pomoc<6F> p<><70>kazu \"su\").\n"
+
+#: initdb.c:617
+#, c-format
+msgid "%s: \"%s\" is not a valid server encoding name\n"
+msgstr "%s: \"%s\" nen<65> platn<74> n<>zev k<>dov<6F>n<EFBFBD> znak<61>\n"
+
+#: initdb.c:772
+#, c-format
+msgid "%s: warning: encoding mismatch\n"
+msgstr "%s: varov<6F>n<EFBFBD>: nesouhlas<61> k<>dov<6F>n<EFBFBD> znak<61>\n"
+
+#: initdb.c:774
+#, c-format
+msgid ""
+"The encoding you selected (%s) and the encoding that the selected\n"
+"locale uses (%s) are not known to match.  This may lead to\n"
+"misbehavior in various character string processing functions.  To fix\n"
+"this situation, rerun %s and either do not specify an encoding\n"
+"explicitly, or choose a matching combination.\n"
+msgstr ""
+"K<>dov<6F>n<EFBFBD> znak<61>, kter<65> jste vybral (%s) a k<>dov<6F>n<EFBFBD> pou<6F>it<69> vybran<61>m\n"
+"n<>rodn<64>m nastaven<65>m (%s) si neodpov<6F>daj<61>. To m<><6D>e v<>st k neo<65>ek<65>van<61>mu\n"
+"chov<6F>n<EFBFBD> r<>zn<7A>ch funkc<6B> pro manipulaci s <20>et<65>zci. Pro opravu t<>to situace\n"
+"spus<75>te znovu %s a bu<62> nespecifikujte k<>dov<6F>n<EFBFBD> znak<61> explicitn<74>, nebo\n"
+"vyberte takovou kombinaci, kter<65> si odpov<6F>d<EFBFBD>.\n"
+
+#: initdb.c:926
+#, c-format
+msgid ""
+"%s: file \"%s\" does not exist\n"
+"This means you have a corrupted installation or identified\n"
+"the wrong directory with the invocation option -L.\n"
+msgstr ""
+"%s: soubor \"%s\" neexistuje\n"
+"To znamen<65>, <20>e va<76>e instalace je po<70>kozena, nebo jste\n"
+"zadal chybn<62> adres<65><73> v parametru -L p<>i spu<70>t<EFBFBD>n<EFBFBD>.\n"
+
+#: initdb.c:991
+msgid "selecting default max_connections ... "
+msgstr "vyb<79>r<EFBFBD>m z<>kladn<64> nastaven<65> max_connections ... "
+
+#: initdb.c:1027
+msgid "selecting default shared_buffers ... "
+msgstr "vyb<79>r<EFBFBD>m z<>kladn<64> nastaven<65> shared_buffers ... "
+
+#: initdb.c:1060
+msgid "creating configuration files ... "
+msgstr "vytv<74><76><EFBFBD>m konfigura<72>n<EFBFBD> soubory ..."
+
+#: initdb.c:1147
+#, c-format
+msgid "creating template1 database in %s/base/1 ... "
+msgstr "vytv<74><76><EFBFBD>m datab<61>zi template1 v %s/base/1 ... "
+
+#: initdb.c:1163
+#, 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: vstupn<70> soubor \"%s\" nepat<61><74> PostgreSQL %s\n"
+"Zkontrolujte si va<76>i instalaci nebo zadejte platnou cestu pomoc<6F>\n"
+"parametru -L.\n"
+
+#: initdb.c:1239
+msgid "initializing pg_shadow ... "
+msgstr "inicializuji pg_shadow ... "
+
+#: initdb.c:1275
+msgid "Enter new superuser password: "
+msgstr "Zadejte nov<6F> heslo pro superu<72>ivatele: "
+
+#: initdb.c:1276
+msgid "Enter it again: "
+msgstr "Zadejte ho znovu: "
+
+#: initdb.c:1279
+msgid "Passwords didn't match.\n"
+msgstr "Hesla nesouhlas<61>.\n"
+
+#: initdb.c:1306
+#, c-format
+msgid "%s: could not read password from file \"%s\": %s\n"
+msgstr "%s: nemohu p<>e<EFBFBD><65>st heslo ze souboru \"%s\": %s\n"
+
+#: initdb.c:1319
+msgid "setting password ... "
+msgstr "nastavuji heslo ... "
+
+#: initdb.c:1343
+#, c-format
+msgid "%s: The password file was not generated. Please report this problem.\n"
+msgstr "%s: Soubor s hesly nebyl vytvo<76>en. Pros<6F>me oznamte tento probl<62>m tv<74>rc<72>m.\n"
+
+#: initdb.c:1373
+msgid "enabling unlimited row size for system tables ... "
+msgstr "zap<61>n<EFBFBD>m neomezenou velikost <20><>dku pro syst<73>mov<6F> tabulky ..."
+
+#: initdb.c:1446
+msgid "initializing pg_depend ... "
+msgstr "inicializuji pg_depend ... "
+
+#: initdb.c:1474
+msgid "creating system views ... "
+msgstr "vytv<74><76><EFBFBD>m syst<73>mov<6F> pohledy ... "
+
+#: initdb.c:1511
+msgid "loading pg_description ... "
+msgstr "vytv<74><76><EFBFBD>m pg_description ... "
+
+#: initdb.c:1559
+msgid "creating conversions ... "
+msgstr "vytv<74><76><EFBFBD>m p<>evody ... "
+
+#: initdb.c:1615
+msgid "setting privileges on built-in objects ... "
+msgstr "nastavuji opr<70>vn<76>n<EFBFBD> pro vestav<61>n<EFBFBD> objekty ... "
+
+#: initdb.c:1673
+msgid "creating information schema ... "
+msgstr "vytv<74><76><EFBFBD>m sch<63>ma \"information\" ... "
+
+#: initdb.c:1735
+msgid "vacuuming database template1 ... "
+msgstr "pou<6F>t<EFBFBD>m VACUUM na datab<61>zi template1 ... "
+
+#: initdb.c:1791
+msgid "copying template1 to template0 ... "
+msgstr "kop<6F>ruji template1 do template0 ... "
+
+#: initdb.c:1848
+msgid "caught signal\n"
+msgstr "sign<67>l obdr<64>en\n"
+
+#: initdb.c:1853
+#, fuzzy
+msgid "could not write to child process\n"
+msgstr "nemohu zapsat do procesu potomka\n"
+
+#: initdb.c:1859
+msgid "ok\n"
+msgstr "ok\n"
+
+#: initdb.c:1889
+#, c-format
+msgid "%s: invalid locale name \"%s\"\n"
+msgstr "%s: neplatn<74> n<>zev n<>rodn<64>ho nastaven<65> (locale) \"%s\"\n"
+
+#: initdb.c:1956
+#, c-format
+msgid ""
+"%s initializes a PostgreSQL database cluster.\n"
+"\n"
+msgstr ""
+"%s inicializuje datab<61>zov<6F> klastr PostgreSQL.\n"
+"\n"
+
+#: initdb.c:1957
+msgid "Usage:\n"
+msgstr "Pou<6F>it<69>:\n"
+
+#: initdb.c:1958
+#, c-format
+msgid "  %s [OPTION]... [DATADIR]\n"
+msgstr "  %s [P<>EP<45>NA<4E>]... [DATAADR]\n"
+
+#: initdb.c:1959
+msgid ""
+"\n"
+"Options:\n"
+msgstr ""
+"\n"
+"P<>ep<65>na<6E>e:\n"
+
+#: initdb.c:1960
+msgid " [-D, --pgdata=]DATADIR     location for this database cluster\n"
+msgstr " [-D, --pgdata=]DATAADR     um<75>st<73>n<EFBFBD> tohoto datab<61>zov<6F>ho klastru\n"
+
+#: initdb.c:1961
+msgid "  -E, --encoding=ENCODING   set default encoding for new databases\n"
+msgstr "  -E, --encoding=K<>DOV<4F>N<EFBFBD>   nastaven<65> v<>choz<6F>ho k<>dov<6F>n<EFBFBD> pro nov<6F> datab<61>ze\n"
+
+#: initdb.c:1962
+msgid "  --locale=LOCALE           initialize database cluster with given locale\n"
+msgstr "  --locale=LOCALE           inicializuj klastr s t<>mto n<>rodn<64>m nastaven<65>m\n"
+
+#: initdb.c:1963
+msgid ""
+"  --lc-collate, --lc-ctype, --lc-messages=LOCALE\n"
+"  --lc-monetary, --lc-numeric, --lc-time=LOCALE\n"
+"                            initialize database cluster with given locale\n"
+"                            in the respective category (default taken from\n"
+"                            environment)\n"
+msgstr ""
+"  --lc-collate, --lc-ctype, --lc-messages=LOCALE\n"
+"  --lc-monetary, --lc-numeric, --lc-time=LOCALE\n"
+"                            inicializuj klastr s dan<61>m n<>rodn<64>m nastaven<65>m\n"
+"                            v p<><70>slu<6C>n<EFBFBD>ch kategori<72>ch (v<>choz<6F> hodnoty se \n"
+"                            vezmou z nastaven<65> prost<73>ed<65>)\n"
+
+#: initdb.c:1968
+msgid "  --no-locale               equivalent to --locale=C\n"
+msgstr "  --no-locale               ekvivalent --locale=C\n"
+
+#: initdb.c:1969
+msgid "  -A, --auth=method         default authentication method for local connections\n"
+msgstr "  -A, --auth=metoda         v<>choz<6F> autentika<6B>n<EFBFBD> metoda pro lok<6F>ln<6C> spojen<65>\n"
+
+#: initdb.c:1970
+msgid "  -U, --username=NAME       database superuser name\n"
+msgstr "  -U, --username=JM<4A>NO      jm<6A>no datab<61>zov<6F>ho superu<72>ivatele\n"
+
+#: initdb.c:1971
+msgid "  -W, --pwprompt            prompt for a password for the new superuser\n"
+msgstr "  -W, --pwprompt            zeptej se na heslo pro nov<6F>ho superu<72>ivatele\n"
+
+#: initdb.c:1972
+msgid "  --pwfile=filename         read password for the new superuser from file\n"
+msgstr "  --pwfile=filename         na<6E>ti heslo pro nov<6F>ho superu<72>ivatele ze souboru\n"
+
+#: initdb.c:1973
+msgid "  -?, --help                show this help, then exit\n"
+msgstr "  -?, --help                uka<6B> tuto n<>pov<6F>du, potom skon<6F>i\n"
+
+#: initdb.c:1974
+msgid "  -V, --version             output version information, then exit\n"
+msgstr "  -V, --version             vypi<70> infomace o verzi, potom skon<6F>i\n"
+
+#: initdb.c:1975
+msgid ""
+"\n"
+"Less commonly used options:\n"
+msgstr ""
+"\n"
+"M<>n<EFBFBD> <20>asto pou<6F><75>van<61> p<>ep<65>na<6E>e:\n"
+
+#: initdb.c:1976
+msgid "  -d, --debug               generate lots of debugging output\n"
+msgstr "  -d, --debug               generuj spoustu ladic<69>ch informac<61>\n"
+
+#: initdb.c:1977
+msgid "  -s, --show                show internal settings\n"
+msgstr "  -s, --show                uka<6B> intern<72> nastaven<65>\n"
+
+#: initdb.c:1978
+msgid "  -L DIRECTORY              where to find the input files\n"
+msgstr "  -L DIRECTORY              kde se nal<61>zaj<61> vstupn<70> soubory\n"
+
+#: initdb.c:1979
+msgid "  -n, --noclean             do not clean up after errors\n"
+msgstr "  -n, --noclean             neukl<6B>zet po chyb<79>\n"
+
+#: initdb.c:1980
+msgid ""
+"\n"
+"If the data directory is not specified, the environment variable PGDATA\n"
+"is used.\n"
+msgstr ""
+"\n"
+"Pokud nen<65> specifikov<6F>n datov<6F> adres<65><73>, pou<6F>ije se prom<6F>nn<6E>\n"
+"prost<73>ed<65> PGDATA.\n"
+
+#: initdb.c:1982
+msgid ""
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr ""
+"\n"
+"Chyby hla<6C>te na adresu <pgsql-bugs@postgresql.org>.\n"
+
+#: initdb.c:2073
+msgid "Running in debug mode.\n"
+msgstr "B<><42><EFBFBD>m v ladic<69>m re<72>imu.\n"
+
+#: initdb.c:2077
+msgid "Running in noclean mode.  Mistakes will not be cleaned up.\n"
+msgstr "Be<42><65>m v ne<6E>ist<73>m re<72>imu.  Chybn<62> kroky nebudou uklizeny.\n"
+
+#: initdb.c:2113
+#: initdb.c:2130
+#: initdb.c:2336
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "Zkuste \"%s --help\" pro v<>ce informac<61>.\n"
+
+#: initdb.c:2128
+#, c-format
+msgid "%s: too many command-line arguments (first is \"%s\")\n"
+msgstr "%s: p<><70>li<6C> mnoho argument<6E> v p<><70>kazov<6F> <20><>dce (prvn<76> je \"%s\")\n"
+
+#: initdb.c:2136
+#, c-format
+msgid "%s: you cannot specify both password prompt and password file\n"
+msgstr "%s: nen<65> mo<6D>no po<70>adovat jak v<>zvu k zad<61>n<EFBFBD> hesla, tak soubor s heslem\n"
+
+#: initdb.c:2142
+msgid ""
+"\n"
+"WARNING: enabling \"trust\" authentication for local connections.\n"
+"You can change this by editing pg_hba.conf or using the -A flag the\n"
+"next time you run initdb.\n"
+msgstr ""
+"\n"
+"VAROV<4F>N<EFBFBD>: zap<61>n<EFBFBD>m \"trust\" autentikaci pro lok<6F>ln<6C> spojen<65>.\n"
+"Toto m<><6D>ete zm<7A>nit <20>pravou souboru pg_hba.conf nebo pou<6F>it<69>m\n"
+"p<>ep<65>na<6E>e -A p<>i p<><70><EFBFBD>t<EFBFBD>m spu<70>t<EFBFBD>n<EFBFBD> initdb.\n"
+
+#: initdb.c:2164
+#, c-format
+msgid "%s: unknown authentication method \"%s\".\n"
+msgstr "%s: nezn<7A>m<EFBFBD> autentika<6B>n<EFBFBD> metoda \"%s\".\n"
+
+#: initdb.c:2173
+#, c-format
+msgid "%s: you need to specify a password for the superuser to enable %s authentication.\n"
+msgstr "%s: mus<75>te zadat heslo superu<72>ivatele pro pou<6F>it<69> autentikace typu %s.\n"
+
+#: initdb.c:2188
+#, 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: nen<65> zad<61>n datov<6F> adres<65><73>\n"
+"Mus<75>te zadat adres<65><73>, ve kter<65>m se bude nach<63>zet tato datab<61>ze.\n"
+"U<>i<EFBFBD>te tak bu<62> pou<6F>it<69>m p<>ep<65>na<6E>e -D nebo nastaven<65>m prom<6F>nn<6E>\n"
+"prost<73>ed<65> PGDATA.\n"
+
+#: initdb.c:2214
+#, c-format
+msgid ""
+"The program \"postgres\" is needed by %s but was not found in the same directory as \"%s\".\n"
+"Check your installation.\n"
+msgstr ""
+"Program \"postgres\" je vy<76>adov<6F>n aplikac<61> %s ale nebyl nalezen ve stejn<6A>m adres<65><73>i jako \"%s\".\n"
+"Zkontrolujte va<76>i instalaci.\n"
+
+#: initdb.c:2220
+#, c-format
+msgid ""
+"The program \"postgres\" was found by %s but was not the same version as \"%s\".\n"
+"Check your installation.\n"
+msgstr ""
+"Program \"postgres\" byl nalezen aplikac<61> %s ale nebyl ve stejn<6A> verzi jako \"%s\".\n"
+"Zkontrolujte va<76>i instalaci.\n"
+
+#: initdb.c:2242
+#, c-format
+msgid "%s: could not determine valid short version string\n"
+msgstr "%s: nemohu zjistit platn<74> kr<6B>tk<74> ozna<6E>en<65> verze\n"
+
+#: initdb.c:2295
+#, 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 ""
+"Soubory pat<61><74>c<EFBFBD> k t<>to datab<61>zi budou vlastn<74>ny u<>ivatelem \"%s\".\n"
+"Tento u<>ivatel mus<75> b<>t tak<61> vlastn<74>kem serverov<6F>ho procesu.\n"
+"\n"
+
+#: initdb.c:2306
+#, c-format
+msgid "The database cluster will be initialized with locale %s.\n"
+msgstr "Datab<61>zov<6F> klastr bude inicializov<6F>n s n<>rodn<64>m nastaven<65>m %s.\n"
+
+#: initdb.c:2310
+#, 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 ""
+"Datab<61>zov<6F> klastr bude inicializov<6F>n s n<>rodn<64>m nastaven<65>m\n"
+"  COLLATE:  %s\n"
+"  CTYPE:    %s\n"
+"  MESSAGES: %s\n"
+"  MONETARY: %s\n"
+"  NUMERIC:  %s\n"
+"  TIME:     %s\n"
+
+#: initdb.c:2334
+#, c-format
+msgid "%s: could not find suitable encoding for locale \"%s\"\n"
+msgstr "%s: nemohu naj<61>t vhodn<64> k<>dov<6F>n<EFBFBD> pro n<>rodn<64> nastaven<65> \"%s\"\n"
+
+#: initdb.c:2335
+#, c-format
+msgid "Rerun %s with the -E option.\n"
+msgstr "Spus<75>te znovu %s s p<>ep<65>na<6E>em -E.\n"
+
+#: initdb.c:2342
+#, c-format
+msgid "The default database encoding has accordingly been set to %s.\n"
+msgstr "V<>choz<6F> k<>dov<6F>n<EFBFBD> pro datab<61>ze bylo odpov<6F>daj<61>c<EFBFBD>m zp<7A>sobem nastaveno na %s.\n"
+
+#: initdb.c:2383
+#, c-format
+msgid "creating directory %s ... "
+msgstr "vytv<74><76><EFBFBD>m adres<65><73> %s ... "
+
+#: initdb.c:2397
+#, c-format
+msgid "fixing permissions on existing directory %s ... "
+msgstr "opravuji opr<70>vn<76>n<EFBFBD> pro existuj<75>c<EFBFBD> adres<65><73> %s ... "
+
+#: initdb.c:2415
+#, c-format
+msgid ""
+"%s: directory \"%s\" exists but is not empty\n"
+"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 ""
+"%s: adres<65><73> \"%s\" existuje, ale nen<65> pr<70>zdn<64>\n"
+"Pokud chcete v tomto adres<65><73>i inicializovat datab<61>zi, odstra<72>te nebo\n"
+"vypr<70>zdn<64>te adres<65><73> \"%s\" nebo spus<75>te %s\n"
+"s argumentem jin<69>m ne<6E> \"%s\".\n"
+
+#: initdb.c:2432
+#, c-format
+msgid "creating directory %s/%s ... "
+msgstr "vytv<74><76><EFBFBD>m adres<65><73> %s/%s ... "
+
+#: initdb.c:2493
+#, c-format
+msgid ""
+"\n"
+"Success. You can now start the database server using:\n"
+"\n"
+"    %s%s%s/postmaster -D %s%s%s\n"
+"or\n"
+"    %s%s%s/pg_ctl -D %s%s%s -l logfile start\n"
+"\n"
+msgstr ""
+"\n"
+"Povedlo se. M<><4D>ete za<7A><61>t pou<6F><75>vat datab<61>zov<6F> server spu<70>t<EFBFBD>n<EFBFBD>m:\n"
+"\n"
+"    %s%s%s/postmaster -D %s%s%s\n"
+"nebo\n"
+"    %s%s%s/pg_ctl -D %s%s%s -l soubor_logu start\n"
+"\n"
+

src/bin/initdb/po/zh_CN.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-05 14:27+0000\n"
+"POT-Creation-Date: 2004-08-31 08:59+0000\n"
 "PO-Revision-Date: 2003-09-15 13:48:19+0800\n"
 "Last-Translator: Bao Wei <weibao@qmail.zhengmai.net.cn>\n"
 "Language-Team: Weiping He <laser@zhengmai.com.cn>\n"
@@ -19,7 +19,7 @@ msgstr ""
 msgid "%s: out of memory\n"
 msgstr "%s: <20>ڴ<EFBFBD><DAB4><EFBFBD><EFBFBD><EFBFBD>\n"
 
-#: initdb.c:329 initdb.c:1300
+#: initdb.c:329 initdb.c:1298
 #, c-format
 msgid "%s: could not open file \"%s\" for reading: %s\n"
 msgstr "%s: Ϊ<>˶<EFBFBD>ȡ, <20>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD> \"%s\": %s\n"
@@ -60,17 +60,17 @@ msgstr ""
 "<22><><EFBFBD>Է<EFBFBD><D4B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ߵ<EFBFBD><DFB5>û<EFBFBD> (<28><><EFBFBD><EFBFBD>Ȩ) <20><><EFBFBD><EFBFBD>\n"
 "<22><>½ (ʹ<><CAB9>, e.g., \"su\").\n"
 
-#: initdb.c:617
+#: initdb.c:615
 #, c-format
 msgid "%s: \"%s\" is not a valid server encoding name\n"
 msgstr "%s: \"%s\" <20><><EFBFBD><EFBFBD>һ<EFBFBD><D2BB><EFBFBD><EFBFBD>Ч<EFBFBD>ķ<EFBFBD><C4B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
 
-#: initdb.c:772
+#: initdb.c:770
 #, c-format
 msgid "%s: warning: encoding mismatch\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD>: <20><><EFBFBD>벻ƥ<EBB2BB><C6A5>\n"
 
-#: initdb.c:774
+#: initdb.c:772
 #, c-format
 msgid ""
 "The encoding you selected (%s) and the encoding that the selected\n"
@@ -85,7 +85,7 @@ msgstr ""
 "<22><><EFBFBD><EFBFBD>.\n"
 "\n"
 
-#: initdb.c:926
+#: initdb.c:924
 #, c-format
 msgid ""
 "%s: file \"%s\" does not exist\n"
@@ -96,26 +96,26 @@ msgstr ""
 "<22><><EFBFBD><EFBFBD>ζ<EFBFBD><CEB6><EFBFBD><EFBFBD><EFBFBD>İ<EFBFBD>װ<EFBFBD><D7B0><EFBFBD><EFBFBD><EFBFBD>˴<EFBFBD><CBB4><EFBFBD><EFBFBD><EFBFBD>\n"
 "ʹ<><CAB9> -L ѡ<><D1A1>ָ<EFBFBD><D6B8><EFBFBD>˴<EFBFBD><CBB4><EFBFBD><EFBFBD><EFBFBD>·<EFBFBD><C2B7>.\n"
 
-#: initdb.c:991
+#: initdb.c:989
 #, c-format
 msgid "selecting default max_connections ... "
 msgstr "ѡ<><D1A1>Ĭ<EFBFBD><C4AC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (max_connections) ... "
 
-#: initdb.c:1027
+#: initdb.c:1025
 #, c-format
 msgid "selecting default shared_buffers ... "
 msgstr "ѡ<><D1A1>Ĭ<EFBFBD>Ϲ<EFBFBD><CFB9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>С (shared_buffers) ... "
 
-#: initdb.c:1060
+#: initdb.c:1058
 msgid "creating configuration files ... "
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD> ... "
 
-#: initdb.c:1147
+#: initdb.c:1145
 #, c-format
 msgid "creating template1 database in %s/base/1 ... "
 msgstr "<22><> %s/base/1 <20>д<EFBFBD><D0B4><EFBFBD> template1 <20><><EFBFBD>ݿ<EFBFBD> ... "
 
-#: initdb.c:1163
+#: initdb.c:1161
 #, c-format
 msgid ""
 "%s: input file \"%s\" does not belong to PostgreSQL %s\n"
@@ -124,95 +124,95 @@ msgstr ""
 "%s: <20><><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD> \"%s\" <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> PostgreSQL %s\n"
 "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>İ<EFBFBD>װ<EFBFBD><D7B0>ʹ<EFBFBD><CAB9> -L ѡ<><D1A1>ָ<EFBFBD><D6B8><EFBFBD><EFBFBD>ȷ<EFBFBD><C8B7>·<EFBFBD><C2B7>.\n"
 
-#: initdb.c:1239
+#: initdb.c:1237
 msgid "initializing pg_shadow ... "
 msgstr "<22><>ʼ<EFBFBD><CABC> pg_shadow ... "
 
-#: initdb.c:1275
+#: initdb.c:1273
 msgid "Enter new superuser password: "
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>µij<C2B5><C4B3><EFBFBD><EFBFBD>û<EFBFBD><C3BB><EFBFBD><EFBFBD><EFBFBD>: "
 
-#: initdb.c:1276
+#: initdb.c:1274
 msgid "Enter it again: "
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><D2BB>: "
 
-#: initdb.c:1279
+#: initdb.c:1277
 #, c-format
 msgid "Passwords didn't match.\n"
 msgstr "<22><><EFBFBD>ƥ<EEB2BB><C6A5>.\n"
 
-#: initdb.c:1306
+#: initdb.c:1304
 #, c-format
 msgid "%s: could not read password from file \"%s\": %s\n"
 msgstr "%s: <20>޷<EFBFBD><DEB7><EFBFBD><EFBFBD>ļ<EFBFBD> \"%s\" <20><>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD>: %s\n"
 
-#: initdb.c:1319
+#: initdb.c:1317
 #, c-format
 msgid "setting password ... "
 msgstr "<22><><EFBFBD>ÿ<EFBFBD><C3BF><EFBFBD> ... "
 
-#: initdb.c:1343
+#: initdb.c:1341
 #, c-format
 msgid "%s: The password file was not generated. Please report this problem.\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD>û<EFBFBD><C3BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <20>뱨<EFBFBD><EBB1A8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n"
 
-#: initdb.c:1373
+#: initdb.c:1371
 msgid "enabling unlimited row size for system tables ... "
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϵͳ<CFB5><CDB3><EFBFBD>д<EFBFBD>С ... "
 
-#: initdb.c:1446
+#: initdb.c:1444
 msgid "initializing pg_depend ... "
 msgstr "<22><>ʼ<EFBFBD><CABC> pg_depend ... "
 
-#: initdb.c:1474
+#: initdb.c:1472
 msgid "creating system views ... "
 msgstr "<22><><EFBFBD><EFBFBD>ϵͳ<CFB5><CDB3>ͼ ... "
 
-#: initdb.c:1511
+#: initdb.c:1509
 msgid "loading pg_description ... "
 msgstr "<22><><EFBFBD><EFBFBD> pg_description ... "
 
-#: initdb.c:1559
+#: initdb.c:1557
 msgid "creating conversions ... "
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>ַ<EFBFBD><D6B7><EFBFBD>ת<EFBFBD><D7AA> ... "
 
-#: initdb.c:1615
+#: initdb.c:1613
 msgid "setting privileges on built-in objects ... "
 msgstr "<22><><EFBFBD>ڽ<EFBFBD><DABD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȩ<EFBFBD><C8A8> ... "
 
-#: initdb.c:1673
+#: initdb.c:1671
 msgid "creating information schema ... "
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣģʽ ... "
 
-#: initdb.c:1735
+#: initdb.c:1734
 msgid "vacuuming database template1 ... "
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD> template1 ... "
 
-#: initdb.c:1791
+#: initdb.c:1790
 msgid "copying template1 to template0 ... "
 msgstr "<22><><EFBFBD><EFBFBD> template1 <20><> template0 ... "
 
-#: initdb.c:1848
+#: initdb.c:1847
 #, c-format
 msgid "caught signal\n"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>ź<EFBFBD>\n"
 
-#: initdb.c:1853
+#: initdb.c:1852
 #, c-format
 msgid "could not write to child process\n"
 msgstr "<22>޷<EFBFBD>д<EFBFBD><D0B4><EFBFBD>ӽ<EFBFBD><D3BD><EFBFBD>\n"
 
-#: initdb.c:1859
+#: initdb.c:1858
 #, c-format
 msgid "ok\n"
 msgstr "<22>ɹ<EFBFBD>\n"
 
-#: initdb.c:1889
+#: initdb.c:1888
 #, c-format
 msgid "%s: invalid locale name \"%s\"\n"
 msgstr "%s: <20><>Ч<EFBFBD><D0A7> locale <20><><EFBFBD><EFBFBD> \"%s\"\n"
 
-#: initdb.c:1956
+#: initdb.c:1955
 #, c-format
 msgid ""
 "%s initializes a PostgreSQL database cluster.\n"
@@ -221,17 +221,17 @@ msgstr ""
 "%s <20><>ʼ<EFBFBD><CABC>һ<EFBFBD><D2BB> PostgreSQL <20><><EFBFBD>ݿ<EFBFBD><DDBF><EFBFBD>.\n"
 "\n"
 
-#: initdb.c:1957
+#: initdb.c:1956
 #, c-format
 msgid "Usage:\n"
 msgstr "ʹ<>÷<EFBFBD><C3B7><EFBFBD>:\n"
 
-#: initdb.c:1958
+#: initdb.c:1957
 #, c-format
 msgid "  %s [OPTION]... [DATADIR]\n"
 msgstr "  %s [ѡ<><D1A1>]... [DATADIR]\n"
 
-#: initdb.c:1959
+#: initdb.c:1958
 #, c-format
 msgid ""
 "\n"
@@ -240,23 +240,23 @@ msgstr ""
 "\n"
 "ѡ<><D1A1>:\n"
 
-#: initdb.c:1960
+#: initdb.c:1959
 #, c-format
 msgid " [-D, --pgdata=]DATADIR     location for this database cluster\n"
 msgstr "  -D, --pgdata=DATADIR      <20><>ǰ<EFBFBD><C7B0><EFBFBD>ݿ<EFBFBD><DDBF>ص<EFBFBD>λ<EFBFBD><CEBB>\n"
 
-#: initdb.c:1961
+#: initdb.c:1960
 #, c-format
 msgid "  -E, --encoding=ENCODING   set default encoding for new databases\n"
 msgstr "  -E, --encoding=ENCODING   Ϊ<><CEAA><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD><DDBF><EFBFBD><EFBFBD><EFBFBD>Ĭ<EFBFBD>ϱ<EFBFBD><CFB1><EFBFBD>\n"
 
-#: initdb.c:1962
+#: initdb.c:1961
 #, c-format
 msgid ""
 "  --locale=LOCALE           initialize database cluster with given locale\n"
 msgstr "  --locale=LOCALE           <20><>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD><DDBF>ص<EFBFBD> locale\n"
 
-#: initdb.c:1963
+#: initdb.c:1962
 #, c-format
 msgid ""
 "  --lc-collate, --lc-ctype, --lc-messages=LOCALE\n"
@@ -271,47 +271,46 @@ msgstr ""
 "                            locale (Ĭ<><C4AC>ʹ<EFBFBD>û<EFBFBD><C3BB><EFBFBD><EFBFBD><EFBFBD>\n"
 "                            <20><>)\n"
 
-#: initdb.c:1968
+#: initdb.c:1967
 #, c-format
 msgid "  --no-locale               equivalent to --locale=C\n"
 msgstr "  --no-locale               <20><>ͬ<EFBFBD><CDAC> --locale=C\n"
 
-#: initdb.c:1969
+#: initdb.c:1968
 #, c-format
 msgid ""
 "  -A, --auth=method         default authentication method for local "
 "connections\n"
-msgstr ""
+msgstr "  -A, --auth=method         <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ӵ<EFBFBD>Ĭ<EFBFBD><C4AC><EFBFBD><EFBFBD>֤<EFBFBD><D6A4><EFBFBD><EFBFBD>\n"
-"  -A, --auth=method         <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ӵ<EFBFBD>Ĭ<EFBFBD><C4AC><EFBFBD><EFBFBD>֤<EFBFBD><D6A4><EFBFBD><EFBFBD>\n"
 
-#: initdb.c:1970
+#: initdb.c:1969
 #, c-format
 msgid "  -U, --username=NAME       database superuser name\n"
 msgstr "  -U, --username=NAME       <20><><EFBFBD>ݿⳬ<DDBF><E2B3AC><EFBFBD>û<EFBFBD><C3BB><EFBFBD>\n"
 
-#: initdb.c:1971
+#: initdb.c:1970
 #, c-format
 msgid ""
 "  -W, --pwprompt            prompt for a password for the new superuser\n"
 msgstr "  -W, --pwprompt            <20><><EFBFBD><EFBFBD><EFBFBD>µij<C2B5><C4B3><EFBFBD><EFBFBD>û<EFBFBD><C3BB><EFBFBD>ʾ<EFBFBD><CABE><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
 
-#: initdb.c:1972
+#: initdb.c:1971
 #, c-format
 msgid ""
 "  --pwfile=filename         read password for the new superuser from file\n"
 msgstr "  --pwfile=<3D>ļ<EFBFBD><C4BC><EFBFBD>           <20><><EFBFBD><EFBFBD><EFBFBD>µij<C2B5><C4B3><EFBFBD><EFBFBD>û<EFBFBD><C3BB><EFBFBD><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD>\n"
 
-#: initdb.c:1973
+#: initdb.c:1972
 #, c-format
 msgid "  -?, --help                show this help, then exit\n"
 msgstr "  -?, --help                <20><>ʾ<EFBFBD>˰<EFBFBD><CBB0><EFBFBD>, Ȼ<><C8BB><EFBFBD>˳<EFBFBD>\n"
 
-#: initdb.c:1974
+#: initdb.c:1973
 #, c-format
 msgid "  -V, --version             output version information, then exit\n"
 msgstr "  -V, --version             <20><><EFBFBD><EFBFBD><EFBFBD>汾<EFBFBD><E6B1BE>Ϣ, Ȼ<><C8BB><EFBFBD>˳<EFBFBD>\n"
 
-#: initdb.c:1975
+#: initdb.c:1974
 #, c-format
 msgid ""
 "\n"
@@ -320,27 +319,27 @@ msgstr ""
 "\n"
 "<22><><EFBFBD><EFBFBD>ͨʹ<CDA8><CAB9>ѡ<EFBFBD><D1A1>:\n"
 
-#: initdb.c:1976
+#: initdb.c:1975
 #, c-format
 msgid "  -d, --debug               generate lots of debugging output\n"
 msgstr "  -d, --debug               <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ij<EFBFBD><C4B3><EFBFBD><EFBFBD><EFBFBD>Ϣ\n"
 
-#: initdb.c:1977
+#: initdb.c:1976
 #, c-format
 msgid "  -s, --show                show internal settings\n"
 msgstr "  -s, --show                <20><>ʾ<EFBFBD>ڲ<EFBFBD><DAB2><EFBFBD><EFBFBD><EFBFBD>\n"
 
-#: initdb.c:1978
+#: initdb.c:1977
 #, c-format
 msgid "  -L DIRECTORY              where to find the input files\n"
 msgstr "  -L DIRECTORY              <20><><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD>λ<EFBFBD><CEBB>\n"
 
-#: initdb.c:1979
+#: initdb.c:1978
 #, c-format
 msgid "  -n, --noclean             do not clean up after errors\n"
 msgstr "  -n, --noclean             <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
 
-#: initdb.c:1980
+#: initdb.c:1979
 #, c-format
 msgid ""
 "\n"
@@ -350,7 +349,7 @@ msgstr ""
 "\n"
 "<22><><EFBFBD><EFBFBD>û<EFBFBD><C3BB>ָ<EFBFBD><D6B8><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ŀ¼, <20><>ʹ<EFBFBD>û<EFBFBD><C3BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> PGDATA\n"
 
-#: initdb.c:1982
+#: initdb.c:1981
 #, c-format
 msgid ""
 "\n"
@@ -359,32 +358,32 @@ msgstr ""
 "\n"
 "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <pgql-bugs@postgresql.org>.\n"
 
-#: initdb.c:2073
+#: initdb.c:2072
 #, c-format
 msgid "Running in debug mode.\n"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>ڳ<EFBFBD><DAB3><EFBFBD>ģʽ<C4A3><CABD>. \n"
 
-#: initdb.c:2077
+#: initdb.c:2076
 #, c-format
 msgid "Running in noclean mode.  Mistakes will not be cleaned up.\n"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> noclean ģʽ<C4A3><CABD>. <20><><EFBFBD>󽫲<EFBFBD><F3BDABB2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n"
 
-#: initdb.c:2113 initdb.c:2130 initdb.c:2335
+#: initdb.c:2112 initdb.c:2129 initdb.c:2341
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "<22><><EFBFBD><EFBFBD> \"%s --help\" <20><>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ.\n"
 
-#: initdb.c:2128
+#: initdb.c:2127
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD>в<EFBFBD><D0B2><EFBFBD>̫<EFBFBD><CCAB> (<28><>һ<EFBFBD><D2BB><EFBFBD><EFBFBD> \"%s\")\n"
 
-#: initdb.c:2136
+#: initdb.c:2135
 #, c-format
 msgid "%s: you cannot specify both password prompt and password file\n"
 msgstr "%s: <20>㲻<EFBFBD><E3B2BB>ͬʱָ<CAB1><D6B8><EFBFBD><EFBFBD>ʾ<EFBFBD><CABE><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϳ<EFBFBD><CDBF><EFBFBD><EFBFBD>ļ<EFBFBD>\n"
 
-#: initdb.c:2142
+#: initdb.c:2141
 msgid ""
 "\n"
 "WARNING: enabling \"trust\" authentication for local connections.\n"
@@ -396,20 +395,19 @@ msgstr ""
 "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͨ<EFBFBD><CDA8><EFBFBD>༭ pg_hba.conf <20><><EFBFBD>Ļ<EFBFBD><C4BB><EFBFBD><EFBFBD><EFBFBD>\n"
 "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> initdb ʱʹ<CAB1><CAB9> -A ѡ<><D1A1>.\n"
 
-#: initdb.c:2164
+#: initdb.c:2165
 #, c-format
 msgid "%s: unknown authentication method \"%s\".\n"
 msgstr "%s: δ֪<CEB4><D6AA>֤<EFBFBD><D6A4><EFBFBD><EFBFBD> \"%s\".\n"
 
-#: initdb.c:2173
+#: initdb.c:2174
 #, c-format
 msgid ""
 "%s: you need to specify a password for the superuser to enable %s "
 "authentication.\n"
-msgstr ""
+msgstr "%s: Ϊ<><CEAA><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %s <20><>֤, <20><><EFBFBD><EFBFBD>ҪΪ<D2AA><CEAA><EFBFBD><EFBFBD><EFBFBD>û<EFBFBD>ָ<EFBFBD><D6B8>һ<EFBFBD><D2BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n"
-"%s: Ϊ<><CEAA><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %s <20><>֤, <20><><EFBFBD><EFBFBD>ҪΪ<D2AA><CEAA><EFBFBD><EFBFBD><EFBFBD>û<EFBFBD>ָ<EFBFBD><D6B8>һ<EFBFBD><D2BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n"
 
-#: initdb.c:2188
+#: initdb.c:2189
 #, c-format
 msgid ""
 "%s: no data directory specified\n"
@@ -422,7 +420,7 @@ msgstr ""
 "<22><><EFBFBD><EFBFBD>. ʹ<><CAB9> -D ѡ<><D1A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
 "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> PGDATA.\n"
 
-#: initdb.c:2214
+#: initdb.c:2215
 #, c-format
 msgid ""
 "The program \"postgres\" is needed by %s but was not found in the same "
@@ -432,7 +430,7 @@ msgstr ""
 "%s <20><>Ҫ<EFBFBD><D2AA><EFBFBD><EFBFBD> \"postgres\", <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͬһ<CDAC><D2BB>Ŀ¼ \"%s\" <20><>û<EFBFBD>ҵ<EFBFBD>.\n"
 "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>İ<EFBFBD>װ.\n"
 
-#: initdb.c:2220
+#: initdb.c:2221
 #, c-format
 msgid ""
 "The program \"postgres\" was found by %s but was not the same version as \"%s"
@@ -442,12 +440,17 @@ msgstr ""
 "%s <20>ҵ<EFBFBD><D2B5><EFBFBD><EFBFBD><EFBFBD> \"postgres\", <20><><EFBFBD>ǺͰ汾 \"%s\" <20><>һ<EFBFBD><D2BB>.\n"
 "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>İ<EFBFBD>װ.\n"
 
-#: initdb.c:2241
+#: initdb.c:2240
+#, c-format
+msgid "%s: input file location must be an absolute path\n"
+msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD>λ<EFBFBD>ñ<EFBFBD><C3B1><EFBFBD>Ϊ<EFBFBD><CEAA><EFBFBD><EFBFBD>·<EFBFBD><C2B7>\n"
+
+#: initdb.c:2248
 #, c-format
 msgid "%s: could not determine valid short version string\n"
 msgstr "%s: <20>޷<EFBFBD>ȷ<EFBFBD><C8B7><EFBFBD><EFBFBD>Ч<EFBFBD>Ķ̰汾<CCB0>ַ<EFBFBD><D6B7><EFBFBD>\n"
 
-#: initdb.c:2294
+#: initdb.c:2301
 #, c-format
 msgid ""
 "The files belonging to this database system will be owned by user \"%s\".\n"
@@ -457,12 +460,12 @@ msgstr ""
 "<22><><EFBFBD>ڴ<EFBFBD><DAB4><EFBFBD><EFBFBD>ݿ<EFBFBD>ϵͳ<CFB5><CDB3><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD><EFBFBD><EFBFBD>Ϊ<EFBFBD>û<EFBFBD> \"%s\".\n"
 "<22><><EFBFBD>û<EFBFBD>Ҳ<EFBFBD><D2B2><EFBFBD><EFBFBD>Ϊ<EFBFBD><CEAA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̵<EFBFBD><CCB5><EFBFBD><EFBFBD><EFBFBD>.\n"
 
-#: initdb.c:2305
+#: initdb.c:2311
 #, c-format
 msgid "The database cluster will be initialized with locale %s.\n"
 msgstr "<22><><EFBFBD>ݿ<EFBFBD><DDBF>ؽ<EFBFBD><D8BD><EFBFBD><EFBFBD><EFBFBD> locale %s <20><>ʼ<EFBFBD><CABC>.\n"
 
-#: initdb.c:2309
+#: initdb.c:2314
 #, c-format
 msgid ""
 "The database cluster will be initialized with locales\n"
@@ -481,32 +484,32 @@ msgstr ""
 "  NUMERIC:  %s\n"
 "  TIME:     %s\n"
 
-#: initdb.c:2333
+#: initdb.c:2339
 #, c-format
 msgid "%s: could not find suitable encoding for locale \"%s\"\n"
 msgstr "%s: <20>޷<EFBFBD>Ϊ locale \"%s\" <20>ҵ<EFBFBD><D2B5><EFBFBD><EFBFBD>ʵı<CAB5><C4B1><EFBFBD>\n"
 
-#: initdb.c:2334
+#: initdb.c:2340
 #, c-format
 msgid "Rerun %s with the -E option.\n"
 msgstr "<22><> -E ѡ<><D1A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %s.\n"
 
-#: initdb.c:2341
+#: initdb.c:2347
 #, c-format
 msgid "The default database encoding has accordingly been set to %s.\n"
 msgstr "Ĭ<>ϵ<EFBFBD><CFB5><EFBFBD><EFBFBD>ݿ<EFBFBD><DDBF><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ѿ<EFBFBD><D1BE><EFBFBD>Ӧ<EFBFBD><D3A6><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ %s.\n"
 
-#: initdb.c:2382
+#: initdb.c:2388
 #, c-format
 msgid "creating directory %s ... "
 msgstr "<22><><EFBFBD><EFBFBD>Ŀ¼ %s ... "
 
-#: initdb.c:2396
+#: initdb.c:2402
 #, c-format
 msgid "fixing permissions on existing directory %s ... "
 msgstr "<22>޸<EFBFBD><DEB8>Ѵ<EFBFBD><D1B4><EFBFBD>Ŀ¼ %s <20><>Ȩ<EFBFBD><C8A8> ... "
 
-#: initdb.c:2414
+#: initdb.c:2420
 #, c-format
 msgid ""
 "%s: directory \"%s\" exists but is not empty\n"
@@ -519,12 +522,12 @@ msgstr ""
 "Ŀ¼ \"%s\" <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>д<EFBFBD><D0B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %s\n"
 "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> \"%s\".\n"
 
-#: initdb.c:2431
+#: initdb.c:2437
 #, c-format
 msgid "creating directory %s/%s ... "
 msgstr "<22><><EFBFBD><EFBFBD>Ŀ¼ %s/%s ... "
 
-#: initdb.c:2492
+#: initdb.c:2501
 #, c-format
 msgid ""
 "\n"

src/bin/pg_controldata/po/cs.po

@@ -1,20 +1,29 @@
 # Czech translation of pg_controldata messages.
 # Karel Zak <zakkr@zf.jcu.cz>, 2003.
 #
-# $PostgreSQL: pgsql/src/bin/pg_controldata/po/cs.po,v 1.2 2003/11/29 22:40:44 pgsql Exp $
+# $PostgreSQL: pgsql/src/bin/pg_controldata/po/cs.po,v 1.3 2004/09/13 12:26:43 petere Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.4\n"
-"POT-Creation-Date: 2003-06-29 12:25+0200\n"
+"POT-Creation-Date: 2004-08-12 01:15-0300\n"
-"PO-Revision-Date: 2003-07-12 23:20-0000\n"
+"PO-Revision-Date: 2004-08-12 22:17+0100\n"
-"Last-Translator: Karel Zak <zakkr@zf.jcu.cz>\n"
+"Last-Translator: Michal Taborsky <michal@taborsky.cz>\n"
 "Language-Team: Karel Zak <zakkr@zf.jcu.cz>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pg_controldata.c:31
+#: pg_controldata.c:28
+#, c-format
+msgid ""
+"%s displays control information of a PostgreSQL database cluster.\n"
+"\n"
+msgstr ""
+"%s uk<75><6B>e kontroln<6C> informace o PostgreSQL datab<61>zi.\n"
+"\n"
+
+#: pg_controldata.c:32
 #, c-format
 msgid ""
 "Usage:\n"
@@ -22,37 +31,32 @@ msgid ""
 "\n"
 "Options:\n"
 "  DATADIR        show cluster control information for DATADIR\n"
-"  -?, --help     display this help and exit\n"
+"  --help         show this help, then exit\n"
-"  -V, --version  display pg_controldata's version and exit\n"
+"  --version      output version information, then exit\n"
-"\n"
 msgstr ""
 "Pou<6F>it<69>:\n"
 "   %s [P<>EP<45>NA<4E>]\n"
 "\n"
 "P<>ep<65>na<6E>e:\n"
 " ADRES<45><53>        uk<75><6B>e kontroln<6C> informace pro ADRES<45><53>\n"
-" -?, --help     uk<75><6B>e tuto n<>pov<6F>du a skon<6F><6E>\n"
+"  --help         uk<EFBFBD><EFBFBD>e tuto n<>pov<6F>du a skon<6F><6E>\n"
-" -V, --version  uk<75><6B>e verzi tohoto programu a skon<6F><6E>\n"
+"  --version      uk<EFBFBD><EFBFBD>e verzi tohoto programu a skon<6F><6E>\n"
-"\n"
-
-#: pg_controldata.c:40
-#, c-format
-msgid "%s displays PostgreSQL database cluster control information.\n"
-msgstr "%s uk<75><6B>e kontroln<6C> informace o PostgreSQL datab<61>zi.\n"
 
 #: pg_controldata.c:41
 msgid ""
+"\n"
 "If no data directory is specified, the environment variable PGDATA\n"
 "is used.\n"
 "\n"
 msgstr ""
+"\n"
 "Nen<65>-li specifikov<6F>n datov<6F> adres<65><73> je pou<6F>ita prom<6F>nn<6E> prost<73>ed<65>\n"
 "PGDATA.\n"
 "\n"
 
 #: pg_controldata.c:42
 msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
-msgstr "Chyby pos<6F>lejte do <pgsql-bugs@postgresql.org>.\n"
+msgstr "Chyby pos<6F>lejte na adresu <pgsql-bugs@postgresql.org>.\n"
 
 #: pg_controldata.c:52
 msgid "starting up"
@@ -76,154 +80,165 @@ msgstr "v provozu"
 
 #: pg_controldata.c:62
 msgid "unrecognized status code"
-msgstr "neo<EFBFBD>ek<EFBFBD>van<EFBFBD> stavov<6F> k<>d"
+msgstr "nezn<EFBFBD>m<EFBFBD> stavov<6F> k<>d"
 
-#: pg_controldata.c:107
+#: pg_controldata.c:104
 #, c-format
 msgid "%s: no data directory specified\n"
 msgstr "%s: nen<65> specifikov<6F>n datov<6F> adres<65><73>\n"
 
-#: pg_controldata.c:108
+#: pg_controldata.c:105
 #, c-format
-msgid "Try '%s --help' for more information.\n"
+msgid "Try \"%s --help\" for more information.\n"
-msgstr "Zkuste '%s --help' pro v<>ce informac<61>.\n"
+msgstr "Zkuste \"%s --help\" pro v<>ce informac<61>.\n"
 
-#: pg_controldata.c:116
+#: pg_controldata.c:113
 #, c-format
-msgid "%s: could not open file \"%s\" for reading (%s)\n"
+msgid "%s: could not open file \"%s\" for reading: %s\n"
-msgstr "%s: nelze otev<65><76>t soubor \"%s\" pro <20>ten<65> (%s)\n"
+msgstr "%s: nelze otev<65><76>t soubor \"%s\" pro <20>ten<65>: %s\n"
 
-#: pg_controldata.c:123
+#: pg_controldata.c:120
 #, c-format
-msgid "%s: could not read file \"%s\" (%s)\n"
+msgid "%s: could not read file \"%s\": %s\n"
-msgstr "%s: nelze <20><>st soubor \"%s\" (%s)\n"
+msgstr "%s: nelze <20><>st soubor \"%s\": %s\n"
 
-#: pg_controldata.c:137
+#: pg_controldata.c:134
 msgid ""
 "WARNING: Calculated CRC checksum does not match value stored in file.\n"
 "Either the file is corrupt, or it has a different layout than this program\n"
 "is expecting.  The results below are untrustworthy.\n"
 "\n"
 msgstr ""
-"UPOZORN<52>N<EFBFBD>: Spo<70><6F>tan<61> CRC kontroln<6C> sou<6F>et nesouhlas<61> s hodnotou ulo<6C>enou v souboru.\n"
+"UPOZORN<52>N<EFBFBD>: Spo<70><6F>tan<61> CRC kontroln<6C> sou<6F>et nesouhlas<61> s hodnotou ulo<6C>enou\n"
-"Bu<42> je soubor po<70>kozen nebo m<> jinou <20>pravu ne<6E> tento program\n"
+"v souboru. Bu<EFBFBD> je soubor po<70>kozen nebo m<> jinou <20>pravu ne<6E> tento program\n"
 "o<>ek<65>v<EFBFBD>.  N<><4E>e uveden<65> v<>sledky jsou ned<65>v<EFBFBD>ryhodn<64>.\n"
 "\n"
 
-#: pg_controldata.c:150
+#: pg_controldata.c:153
 #, c-format
 msgid "pg_control version number:            %u\n"
-msgstr "<22><>slo verze pg_controlu:            %u\n"
+msgstr "<22><>slo verze pg_controlu:              %u\n"
 
-#: pg_controldata.c:151
+#: pg_controldata.c:154
 #, c-format
 msgid "Catalog version number:               %u\n"
 msgstr "<22><>slo verze katalogu:               %u\n"
 
-#: pg_controldata.c:152
+#: pg_controldata.c:155
+#, c-format
+msgid "Database system identifier:           %s\n"
+msgstr "Identifik<69>tor datab<61>zov<6F>ho syst<73>mu:   %s\n"
+
+#: pg_controldata.c:156
 #, c-format
 msgid "Database cluster state:               %s\n"
-msgstr "Status seskupen<EFBFBD> datab<61>ze:               %s\n"
+msgstr "Status datab<EFBFBD>zov<EFBFBD>ho klastu:           %s\n"
 
-#: pg_controldata.c:153
+#: pg_controldata.c:157
 #, c-format
 msgid "pg_control last modified:             %s\n"
-msgstr "Posledn<EFBFBD> modifikace pg_controlu:             %s\n"
+msgstr "posledn<EFBFBD> modifikace pg_controlu:      %s\n"
 
-#: pg_controldata.c:154
+#: pg_controldata.c:158
 #, c-format
 msgid "Current log file ID:                  %u\n"
 msgstr "ID sou<6F>asn<73>ho log souboru:                  %u\n"
 
-#: pg_controldata.c:155
+#: pg_controldata.c:159
 #, c-format
 msgid "Next log file segment:                %u\n"
 msgstr "N<>sleduj<75>c<EFBFBD> segment log souboru:                %u\n"
 
-#: pg_controldata.c:156
+#: pg_controldata.c:160
 #, c-format
 msgid "Latest checkpoint location:           %X/%X\n"
 msgstr "Posledn<64> um<75>st<73>n<EFBFBD> kontroln<6C>ho bodu:           %X/%X\n"
 
-#: pg_controldata.c:158
+#: pg_controldata.c:162
 #, c-format
 msgid "Prior checkpoint location:            %X/%X\n"
 msgstr "P<>ede<64>l<EFBFBD> um<75>st<73>n<EFBFBD> kontroln<6C>ho bodu:            %X/%X\n"
 
-#: pg_controldata.c:160
+#: pg_controldata.c:164
 #, c-format
 msgid "Latest checkpoint's REDO location:    %X/%X\n"
-msgstr "Posledn<64>j<EFBFBD><EFBFBD> um<75>st<73>n<EFBFBD> REDO kontroln<6C>ho bodu:    %X/%X\n"
+msgstr "Posledn<64> um<75>st<73>n<EFBFBD> REDO kontroln<6C>ho bodu:    %X/%X\n"
 
-#: pg_controldata.c:162
+#: pg_controldata.c:166
 #, c-format
 msgid "Latest checkpoint's UNDO location:    %X/%X\n"
 msgstr "Posledn<64> um<75>st<73>n<EFBFBD> UNDO kontroln<6C>ho bodu:    %X/%X\n"
 
-#: pg_controldata.c:164
+#: pg_controldata.c:168
 #, c-format
-msgid "Latest checkpoint's StartUpID:        %u\n"
+msgid "Latest checkpoint's TimeLineID:       %u\n"
-msgstr "Posledn<64> um<75>st<73>n<EFBFBD> StartUpID kontroln<6C>ho bodu:        %u\n"
+msgstr 
+"TimeLineID posledn<64>ho kontroln<6C>ho bodu:     %u\n"
 
-#: pg_controldata.c:165
+#: pg_controldata.c:169
 #, c-format
 msgid "Latest checkpoint's NextXID:          %u\n"
 msgstr "Posledn<64> um<75>st<73>n<EFBFBD> NextXID kontroln<6C>ho bodu:          %u\n"
 
-#: pg_controldata.c:166
+#: pg_controldata.c:170
 #, c-format
 msgid "Latest checkpoint's NextOID:          %u\n"
 msgstr "Posledn<64> um<75>st<73>n<EFBFBD> NextOID kontroln<6C>ho bodu:          %u\n"
 
-#: pg_controldata.c:167
+#: pg_controldata.c:171
 #, c-format
 msgid "Time of latest checkpoint:            %s\n"
 msgstr"<22>as posledn<64>ho kontroln<6C>ho bodu:       %s\n"
 
-#: pg_controldata.c:168
+#: pg_controldata.c:172
 #, c-format
 msgid "Database block size:                  %u\n"
 msgstr "Velikost datab<61>zov<6F>ho bloku:                  %u\n"
 
-#: pg_controldata.c:169
+#: pg_controldata.c:173
 #, c-format
 msgid "Blocks per segment of large relation: %u\n"
 msgstr "Blok<6F> v segmentu velk<6C> relace: %u\n"
 
-#: pg_controldata.c:170
+#: pg_controldata.c:174
+#, c-format
+msgid "Bytes per WAL segment:                %u\n"
+msgstr "Byt<79> ve WAL sementu:                  %u\n"
+
+#: pg_controldata.c:175
 #, c-format
 msgid "Maximum length of identifiers:        %u\n"
 msgstr "Maxim<69>ln<6C> d<>lka identifik<69>tor<6F>:        %u\n"
 
-#: pg_controldata.c:171
+#: pg_controldata.c:176
 #, c-format
 msgid "Maximum number of function arguments: %u\n"
 msgstr "Maxim<69>ln<6C> po<70>et argument<6E> funkc<6B>: %u\n"
 
-#: pg_controldata.c:172
+#: pg_controldata.c:177
 #, c-format
 msgid "Date/time type storage:               %s\n"
 msgstr "Zp<5A>sob ulo<6C>en<65> typu date/time:               %s\n"
 
-#: pg_controldata.c:173
+#: pg_controldata.c:178
 msgid "64-bit integers"
 msgstr "64-bitov<6F> <20><>sla"
 
-#: pg_controldata.c:173
+#: pg_controldata.c:178
-msgid "Floating point"
+msgid "floating-point numbers"
-msgstr "Plovouc<EFBFBD> <20><>rka"
+msgstr "<EFBFBD><EFBFBD>sla s plovouc<EFBFBD> <20><>dovou <20><>rkou"
 
-#: pg_controldata.c:174
+#: pg_controldata.c:179
 #, c-format
 msgid "Maximum length of locale name:        %u\n"
 msgstr "Maxim<69>ln<6C> d<>lka jm<6A>na locale:        %u\n"
 
-#: pg_controldata.c:175
+#: pg_controldata.c:180
 #, c-format
 msgid "LC_COLLATE:                           %s\n"
 msgstr "LC_COLLATE (porovn<76>v<EFBFBD>n<EFBFBD> <20>et<65>zc<7A>):                           %s\n"
 
-#: pg_controldata.c:176
+#: pg_controldata.c:181
 #, c-format
 msgid "LC_CTYPE:                             %s\n"
 msgstr "LC_CTYPE (typy znak<61>):                             %s\n"

src/bin/pg_controldata/po/zh_CN.po

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-22 09:35+0000\n"
+"POT-Creation-Date: 2004-08-31 08:57+0000\n"
 "PO-Revision-Date: 2004-01-10 13:45+0800\n"
 "Last-Translator: Bao Wei <weibao@qmail.zhengmai.net.cn>\n"
 "Language-Team: Weiping He <laser@zhengmai.com.cn>\n"
@@ -116,130 +116,130 @@ msgstr ""
 "<22><><EFBFBD><EFBFBD><EFBFBD>Ľ<EFBFBD><C4BD><EFBFBD><EFBFBD>Dz<EFBFBD><C7B2>ɿ<EFBFBD><C9BF><EFBFBD>.\n"
 "\n"
 
-#: pg_controldata.c:153
+#: pg_controldata.c:154
 #, c-format
 msgid "pg_control version number:            %u\n"
 msgstr "pg_control <20>汾:                      %u\n"
 
-#: pg_controldata.c:154
+#: pg_controldata.c:155
 #, c-format
 msgid "Catalog version number:               %u\n"
 msgstr "Catalog <20>汾:                         %u\n"
 
-#: pg_controldata.c:155
+#: pg_controldata.c:156
 #, c-format
 msgid "Database system identifier:           %s\n"
 msgstr "<22><><EFBFBD>ݿ<EFBFBD>ϵͳ<CFB5><CDB3>ʶ<EFBFBD><CAB6>:                     %s\n"
 
-#: pg_controldata.c:156
+#: pg_controldata.c:157
 #, c-format
 msgid "Database cluster state:               %s\n"
 msgstr "<22><><EFBFBD>ݿ<EFBFBD><DDBF><EFBFBD>״̬:                         %s\n"
 
-#: pg_controldata.c:157
+#: pg_controldata.c:158
 #, c-format
 msgid "pg_control last modified:             %s\n"
 msgstr "pg_control <20><><EFBFBD><EFBFBD><EFBFBD>޸<EFBFBD>:                  %s\n"
 
-#: pg_controldata.c:158
+#: pg_controldata.c:159
 #, c-format
 msgid "Current log file ID:                  %u\n"
 msgstr "<22><>ǰ<EFBFBD><C7B0>־<EFBFBD>ļ<EFBFBD>ID:                       %u\n"
 
-#: pg_controldata.c:159
+#: pg_controldata.c:160
 #, c-format
 msgid "Next log file segment:                %u\n"
 msgstr "<22><>һ<EFBFBD><D2BB><EFBFBD><EFBFBD>־<EFBFBD>ļ<EFBFBD><C4BC><EFBFBD>:                     %u\n"
 
-#: pg_controldata.c:160
+#: pg_controldata.c:161
 #, c-format
 msgid "Latest checkpoint location:           %X/%X\n"
 msgstr "<22><><EFBFBD>¼<EFBFBD><C2BC><EFBFBD><EFBFBD><EFBFBD>λ<EFBFBD><CEBB>:                       %X/%X\n"
 
-#: pg_controldata.c:162
+#: pg_controldata.c:163
 #, c-format
 msgid "Prior checkpoint location:            %X/%X\n"
 msgstr "<22><><EFBFBD>ȼ<EFBFBD><C8BC><EFBFBD><EFBFBD><EFBFBD>λ<EFBFBD><CEBB>:                       %X/%X\n"
 
-#: pg_controldata.c:164
+#: pg_controldata.c:165
 #, c-format
 msgid "Latest checkpoint's REDO location:    %X/%X\n"
 msgstr "<22><><EFBFBD>¼<EFBFBD><C2BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> REDO λ<><CEBB>:               %X/%X\n"
 
-#: pg_controldata.c:166
+#: pg_controldata.c:167
 #, c-format
 msgid "Latest checkpoint's UNDO location:    %X/%X\n"
 msgstr "<22><><EFBFBD>¼<EFBFBD><C2BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> UNDO λ<><CEBB>:               %X/%X\n"
 
-#: pg_controldata.c:168
+#: pg_controldata.c:169
 #, c-format
 msgid "Latest checkpoint's TimeLineID:       %u\n"
 msgstr "<22><><EFBFBD>¼<EFBFBD><C2BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> TimeLineID:              %u\n"
 
-#: pg_controldata.c:169
+#: pg_controldata.c:170
 #, c-format
 msgid "Latest checkpoint's NextXID:          %u\n"
 msgstr "<22><><EFBFBD>¼<EFBFBD><C2BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> NextXID:                 %u\n"
 
-#: pg_controldata.c:170
+#: pg_controldata.c:171
 #, c-format
 msgid "Latest checkpoint's NextOID:          %u\n"
 msgstr "<22><><EFBFBD>¼<EFBFBD><C2BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> NextOID:                 %u\n"
 
-#: pg_controldata.c:171
+#: pg_controldata.c:172
 #, c-format
 msgid "Time of latest checkpoint:            %s\n"
 msgstr "<22><><EFBFBD>¼<EFBFBD><C2BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1>:                     %s\n"
 
-#: pg_controldata.c:172
+#: pg_controldata.c:173
 #, c-format
 msgid "Database block size:                  %u\n"
 msgstr "<22><><EFBFBD>ݿ<EFBFBD><DDBF><EFBFBD><EFBFBD><EFBFBD>С:                         %u\n"
 
-#: pg_controldata.c:173
+#: pg_controldata.c:174
 #, c-format
 msgid "Blocks per segment of large relation: %u\n"
 msgstr "<22><><EFBFBD><EFBFBD>ϵ<EFBFBD><CFB5>ÿ<EFBFBD>ο<EFBFBD><CEBF><EFBFBD>:                     %u\n"
 
-#: pg_controldata.c:174
+#: pg_controldata.c:175
 #, c-format
 msgid "Bytes per WAL segment:                %u\n"
 msgstr "ÿһ<C3BF><D2BB> WAL <20><><EFBFBD>ֽ<EFBFBD><D6BD><EFBFBD>:                  %u\n"
 
-#: pg_controldata.c:175
+#: pg_controldata.c:176
 #, c-format
 msgid "Maximum length of identifiers:        %u\n"
 msgstr "<22><>ʶ<EFBFBD><CAB6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>󳤶<EFBFBD>:                     %u\n"
 
-#: pg_controldata.c:176
+#: pg_controldata.c:177
 #, c-format
 msgid "Maximum number of function arguments: %u\n"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:                   %u\n"
 
-#: pg_controldata.c:177
+#: pg_controldata.c:178
 #, c-format
 msgid "Date/time type storage:               %s\n"
 msgstr "<22><><EFBFBD><EFBFBD>/ʱ<><CAB1> <20><><EFBFBD>ʹ洢:                   %s\n"
 
-#: pg_controldata.c:178
+#: pg_controldata.c:179
 msgid "64-bit integers"
 msgstr "64λ<34><CEBB><EFBFBD><EFBFBD>"
 
-#: pg_controldata.c:178
+#: pg_controldata.c:179
 msgid "floating-point numbers"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
-#: pg_controldata.c:179
+#: pg_controldata.c:180
 #, c-format
 msgid "Maximum length of locale name:        %u\n"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֵ<EFBFBD><D6B5><EFBFBD><EFBFBD>󳤶<EFBFBD>:                   %u\n"
 
-#: pg_controldata.c:180
+#: pg_controldata.c:181
 #, c-format
 msgid "LC_COLLATE:                           %s\n"
 msgstr "LC_COLLATE:                           %s\n"
 
-#: pg_controldata.c:181
+#: pg_controldata.c:182
 #, c-format
 msgid "LC_CTYPE:                             %s\n"
 msgstr "LC_CTYPE:                             %s\n"

src/bin/pg_ctl/nls.mk

@@ -1,5 +1,5 @@
-# $PostgreSQL: pgsql/src/bin/pg_ctl/nls.mk,v 1.6 2004/09/13 12:20:23 petere Exp $
+# $PostgreSQL: pgsql/src/bin/pg_ctl/nls.mk,v 1.7 2004/09/13 12:26:45 petere Exp $
 CATALOG_NAME	:= pg_ctl
-AVAIL_LANGUAGES	:= es ru sk sv zh_CN zh_TW
+AVAIL_LANGUAGES	:= cs es ru sk sv zh_CN zh_TW
 GETTEXT_FILES	:= pg_ctl.c
 GETTEXT_TRIGGERS:= _ simple_prompt

src/bin/pg_ctl/po/cs.po

@@ -0,0 +1,463 @@
+# SOME DESCRIPTIVE TITLE.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 8.0\n"
+"POT-Creation-Date: 2004-08-12 01:16-0300\n"
+"PO-Revision-Date: 2004-08-13 19:12+0100\n"
+"Last-Translator: Michal Taborsky <michal@taborsky.cz>\n"
+"Language-Team: Czech <cs@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: pg_ctl.c:184
+#: pg_ctl.c:200
+#: pg_ctl.c:1230
+#, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: nedostatek pam<61>ti\n"
+
+#: pg_ctl.c:431
+#, c-format
+msgid "%s: Another postmaster may be running. Trying to start postmaster anyway.\n"
+msgstr "%s: Dal<61><6C> postmaster mo<6D>n<EFBFBD> b<><62><EFBFBD>. Zkou<6F><75>m ho p<>esto spustit.\n"
+
+#: pg_ctl.c:449
+#, c-format
+msgid "%s: cannot read %s\n"
+msgstr "%s: nemohu <20><>st %s\n"
+
+#: pg_ctl.c:455
+#, c-format
+msgid "%s: option file %s must have exactly 1 line\n"
+msgstr "%s: soubor s p<>ep<65>na<6E>i %s mus<75> m<>t p<>esn<73> 1 <20><>dku\n"
+
+#: pg_ctl.c:497
+#, c-format
+msgid ""
+"The program \"postmaster\" is needed by %s but was not found in the same directory as \"%s\".\n"
+"Check your installation.\n"
+msgstr ""
+"%s pot<6F>ebuje program \"postmaster\", kter<65> ale nebyl  nalezen ve stejn<6A>m adres<65><73>i jako \"%s\".\n"
+"Zkontrolujte va<76>i instalaci.\n"
+
+#: pg_ctl.c:503
+#, c-format
+msgid ""
+"The program \"postmaster\" was found by %s but was not the same version as \"%s\".\n"
+"Check your installation.\n"
+msgstr ""
+"%s nalezl program \"postmaster\", ten je ale jin<69> verze ne<6E> \"%s\".\n"
+"Zkontrolujte va<76>i instalaci.\n"
+
+#: pg_ctl.c:514
+msgid "Unable to run the postmaster binary\n"
+msgstr "Nemohu spustit bin<69>rn<72> program postmaster.\n"
+
+#: pg_ctl.c:524
+#, c-format
+msgid ""
+"%s: cannot start postmaster\n"
+"Examine the log output\n"
+msgstr ""
+"%s: nemohu spusit postmaster\n"
+"Zkontrolujte v<>stup v logu\n"
+
+#: pg_ctl.c:535
+msgid "waiting for postmaster to start..."
+msgstr "<22>ek<65>m na start postmastera..."
+
+#: pg_ctl.c:540
+msgid "could not start postmaster\n"
+msgstr "nebylo mo<6D>no spustit postmaster\n"
+
+#: pg_ctl.c:542
+msgid ""
+"done\n"
+"postmaster started\n"
+msgstr ""
+"hotovo\n"
+"postmaster spu<70>t<EFBFBD>n\n"
+
+#: pg_ctl.c:545
+msgid "postmaster starting\n"
+msgstr "postmaster startuje\n"
+
+#: pg_ctl.c:560
+#: pg_ctl.c:639
+#: pg_ctl.c:709
+#, c-format
+msgid "%s: could not find %s\n"
+msgstr "%s: nebylo mo<6D>no naj<61>t %s\n"
+
+#: pg_ctl.c:561
+#: pg_ctl.c:710
+msgid "Is postmaster running?\n"
+msgstr "B<><42><EFBFBD> postmaster?\n"
+
+#: pg_ctl.c:567
+#, c-format
+msgid "%s: cannot stop postmaster; postgres is running (PID: %ld)\n"
+msgstr "%s: nemohu zastavit postmaster; postgres b<><62><EFBFBD> (PID: %ld)\n"
+
+#: pg_ctl.c:575
+#: pg_ctl.c:656
+#, c-format
+msgid "stop signal failed (PID: %ld): %s\n"
+msgstr "sign<67>l stop selhal (PID: %ld): %s\n"
+
+#: pg_ctl.c:583
+msgid "postmaster shutting down\n"
+msgstr "postmaster se ukon<6F>uje\n"
+
+#: pg_ctl.c:590
+#: pg_ctl.c:663
+msgid "waiting for postmaster to shut down..."
+msgstr "<22>ek<65>m na ukon<6F>en<65> postmastera..."
+
+#: pg_ctl.c:612
+#: pg_ctl.c:687
+msgid " failed\n"
+msgstr " selhalo\n"
+
+#: pg_ctl.c:614
+#: pg_ctl.c:689
+#, c-format
+msgid "%s: postmaster does not shut down\n"
+msgstr "%s: postmaster se neukon<6F>uje\n"
+
+#: pg_ctl.c:618
+#: pg_ctl.c:694
+msgid "done\n"
+msgstr "hotovo\n"
+
+#: pg_ctl.c:620
+#: pg_ctl.c:696
+msgid "postmaster stopped\n"
+msgstr "postmaster zastaven\n"
+
+#: pg_ctl.c:640
+msgid ""
+"Is postmaster running?\n"
+"starting postmaster anyway\n"
+msgstr ""
+"Be<42><65> ji<6A> postmaster?\n"
+"p<>esto postmaster spou<6F>t<EFBFBD>m\n"
+
+#: pg_ctl.c:647
+#, c-format
+msgid "%s: cannot restart postmaster; postgres is running (PID: %ld)\n"
+msgstr "%s: nemohu restartovat postmaster; postgres b<><62><EFBFBD> (PID: %ld)\n"
+
+#: pg_ctl.c:650
+#: pg_ctl.c:719
+msgid "Please terminate postgres and try again.\n"
+msgstr "Pros<6F>m ukon<6F>ete postgres a zkuste znovu.\n"
+
+#: pg_ctl.c:716
+#, c-format
+msgid "%s: cannot reload postmaster; postgres is running (PID: %ld)\n"
+msgstr "%s: nemohu znovuna<6E><61>st postmaster; postgres b<><62><EFBFBD> (PID: %ld)\n"
+
+#: pg_ctl.c:725
+#, c-format
+msgid "reload signal failed (PID: %ld): %s\n"
+msgstr "sign<67>l znovuna<6E>ten<65> selhal (PID: %ld): %s\n"
+
+#: pg_ctl.c:731
+msgid "postmaster signaled\n"
+msgstr "postmaster obdr<64>el sign<67>l\n"
+
+#: pg_ctl.c:746
+#, c-format
+msgid "%s: postmaster or postgres not running\n"
+msgstr "%s: postmaster nebo postgres neb<65><62><EFBFBD>\n"
+
+#: pg_ctl.c:752
+#, c-format
+msgid "%s: a standalone backend \"postgres\" is running (PID: %ld)\n"
+msgstr "%s: samostatn<74> \"postgres\" b<><62><EFBFBD> (PID: %ld)\n"
+
+#: pg_ctl.c:758
+#, c-format
+msgid "%s: postmaster is running (PID: %ld)\n"
+msgstr "%s: postmaster b<><62><EFBFBD> (PID: %ld)\n"
+
+#: pg_ctl.c:774
+#, c-format
+msgid "signal %d failed (PID: %ld): %s\n"
+msgstr "sign<67>l %d selhal (PID: %ld): %s\n"
+
+#: pg_ctl.c:801
+msgid "Unable to find exe"
+msgstr "Nemohu naj<61>t exe"
+
+#: pg_ctl.c:844
+#: pg_ctl.c:875
+msgid "Unable to open service manager\n"
+msgstr "Nemohu otev<65><76>t spr<70>vce slu<6C>eb\n"
+
+#: pg_ctl.c:850
+#, c-format
+msgid "Service \"%s\" already registered\n"
+msgstr "Slu<6C>ba \"%s\" je ji<6A> registrov<6F>na\n"
+
+#: pg_ctl.c:861
+#, c-format
+msgid "Unable to register service \"%s\" [%d]\n"
+msgstr "Nemohu registrovat slu<6C>bu \"%s\" [%d]\n"
+
+#: pg_ctl.c:881
+#, c-format
+msgid "Service \"%s\" not registered\n"
+msgstr "Slu<6C>ba \"%s\" neregistrov<6F>na\n"
+
+#: pg_ctl.c:888
+#, c-format
+msgid "Unable to open service \"%s\" [%d]\n"
+msgstr "Nemohu otev<65><76>t slu<6C>bu \"%s\" [%d]\n"
+
+#: pg_ctl.c:894
+#, c-format
+msgid "Unable to unregister service \"%s\" [%d]\n"
+msgstr "Nemohu zaregistrovat slu<6C>bu \"%s\" [%d]\n"
+
+#: pg_ctl.c:1012
+#, c-format
+msgid ""
+"\n"
+"Try \"%s --help\" for more information.\n"
+msgstr ""
+"\n"
+"Zkuste \"%s --help\" pro v<>ce informac<61>.\n"
+
+#: pg_ctl.c:1020
+#, c-format
+msgid ""
+"%s is a utility to start, stop, restart, reload configuration files,\n"
+"report the status of a PostgreSQL server, or kill a PostgreSQL process\n"
+"\n"
+msgstr ""
+"%s je pom<6F>cka pro spu<70>t<EFBFBD>n<EFBFBD>, zastaven<65>, restart, znovuna<6E>ten<65> konfigura<72>n<EFBFBD>ch\n"
+"soubor<6F>, nahl<68><6C>en<65> stavu PostgreSQL serveru nebo ukon<6F>en<65> PostgreSQL\n"
+"procesu.\n"
+"\n"
+
+#: pg_ctl.c:1022
+msgid "Usage:\n"
+msgstr "Pou<6F>it<69>:\n"
+
+#: pg_ctl.c:1023
+#, c-format
+msgid "  %s start   [-w] [-D DATADIR] [-s] [-l FILENAME] [-o \"OPTIONS\"]\n"
+msgstr "  %s start   [-w] [-D ADRES<45><53>] [-s] [-l SOUBOR] [-o \"P<>EP<45>NA<4E>E\"]\n"
+
+#: pg_ctl.c:1024
+#, c-format
+msgid "  %s stop    [-W] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
+msgstr "  %s stop    [-W] [-D ADRES<45><53>] [-s] [-m M<>D-UKON<4F>EN<45>]\n"
+
+#: pg_ctl.c:1025
+#, c-format
+msgid "  %s restart [-w] [-D DATADIR] [-s] [-m SHUTDOWN-MODE] [-o \"OPTIONS\"]\n"
+msgstr "  %s restart [-w] [-D ADRES<45><53>] [-s] [-m M<>D-UKON<4F>EN<45>] [-o \"P<>EP<45>NA<4E>E\"]\n"
+
+#: pg_ctl.c:1026
+#, c-format
+msgid "  %s reload  [-D DATADIR] [-s]\n"
+msgstr "  %s reload  [-D ADRES<45><53>] [-s]\n"
+
+#: pg_ctl.c:1027
+#, c-format
+msgid "  %s status  [-D DATADIR]\n"
+msgstr "  %s status  [-D ADRES<45><53>]\n"
+
+#: pg_ctl.c:1028
+#, c-format
+msgid "  %s kill    SIGNALNAME PROCESSID\n"
+msgstr "  %s kill    SIGN<47>L IDPROCESU\n"
+
+#: pg_ctl.c:1030
+#, c-format
+msgid "  %s register   [-N servicename] [-U username] [-P password] [-D DATADIR] [-o \"OPTIONS\"]\n"
+msgstr "  %s register   [-N jm<6A>no-slu<6C>by] [-U u<>ivatel] [-P heslo] [-D ADRES<45><53>] [-o \"P<>EP<45>NA<4E>E\"]\n"
+
+#: pg_ctl.c:1031
+#, c-format
+msgid "  %s unregister [-N servicename]\n"
+msgstr "  %s unregister [-N jm<6A>no-slu<6C>by]\n"
+
+#: pg_ctl.c:1033
+msgid "Common options:\n"
+msgstr "Spole<6C>n<EFBFBD> p<>ep<65>na<6E>e:\n"
+
+#: pg_ctl.c:1034
+msgid "  -D, --pgdata DATADIR   location of the database storage area\n"
+msgstr "  -D, --pgdata ADRES<45><53>   um<75>st<73>n<EFBFBD> <20>lo<6C>i<EFBFBD>t<EFBFBD> datab<61>ze\n"
+
+#: pg_ctl.c:1035
+msgid "  -s, --silent only print errors, no informational messages\n"
+msgstr "  -s, --silent vypisuj jen chyby, <20><>dn<64> informativn<76> zpr<70>vy\n"
+
+#: pg_ctl.c:1037
+msgid "  -N       service name with which to register PostgreSQL server\n"
+msgstr "  -N       jm<6A>no slu<6C>by, pod kter<65>m registrovat PostgreSQL server\n"
+
+#: pg_ctl.c:1038
+msgid "  -P       password of account to register PostgreSQL server\n"
+msgstr "  -P       heslo k <20><>tu pro registraci PostreSQL serveru\n"
+
+#: pg_ctl.c:1039
+msgid "  -U       user name of account to register PostgreSQL server\n"
+msgstr "  -U        u<>ivatelsk<73> jm<6A>no pro registraci PostgreSQL server\n"
+
+#: pg_ctl.c:1041
+msgid "  -w           wait until operation completes\n"
+msgstr "  -w           <20>ekat na dokon<6F>en<65> operace\n"
+
+#: pg_ctl.c:1042
+msgid "  -W           do not wait until operation completes\n"
+msgstr "  -W           ne<6E>ekat na dokon<6F>en<65> operace\n"
+
+#: pg_ctl.c:1043
+msgid "  --help       show this help, then exit\n"
+msgstr "  --help       vypsat tuto n<>pov<6F>du, potom skon<6F>it\n"
+
+#: pg_ctl.c:1044
+msgid "  --version    output version information, then exit\n"
+msgstr "  --version    vypsat informace o verzi, potom skon<6F>it\n"
+
+#: pg_ctl.c:1045
+msgid ""
+"(The default is to wait for shutdown, but not for start or restart.)\n"
+"\n"
+msgstr ""
+"(V<>choz<6F> chov<6F>n<EFBFBD> je <20>ekat na ukon<6F>en<65>, ale ne p<>i startu nebo restartu.)\n"
+"\n"
+
+#: pg_ctl.c:1046
+msgid ""
+"If the -D option is omitted, the environment variable PGDATA is used.\n"
+"\n"
+msgstr ""
+"Pokud je vynech<63>n parametr -D, pou<6F>ije se prom<6F>nn<6E> prost<73>ed<65> PGDATA.\n"
+"\n"
+
+#: pg_ctl.c:1047
+msgid "Options for start or restart:\n"
+msgstr "P<>ep<65>na<6E>e pro start nebo restart:\n"
+
+#: pg_ctl.c:1048
+msgid ""
+"  -l, --log FILENAME      write (or append) server log to FILENAME.  The\n"
+"                          use of this option is highly recommended.\n"
+msgstr ""
+"  -l, --log SOUBOR        zapisuj (nebo p<>ipoj na konec) log serveru do SOUBORU.\n"
+"                          Pou<6F>it<69> tohoto p<>ep<65>na<6E>e se v<>ele doporu<72>uje.\n"
+
+#: pg_ctl.c:1050
+msgid ""
+"  -o OPTIONS              command line options to pass to the postmaster\n"
+"                          (PostgreSQL server executable)\n"
+msgstr ""
+"  -o P<>EP<45>NA<4E>E            p<>ep<65>na<6E>e, kter<65> budou p<>ed<65>ny postmasteru\n"
+"                          (co<63> je vlastn<74> program PostgreSQL serveru)\n"
+
+#: pg_ctl.c:1052
+msgid ""
+"  -p PATH-TO-POSTMASTER   normally not necessary\n"
+"\n"
+msgstr ""
+"  -p CESTA-K-POSTMASTERU  za norm<72>ln<6C>ch okolnost<73> nen<65> pot<6F>eba\n"
+"\n"
+
+#: pg_ctl.c:1053
+msgid "Options for stop or restart:\n"
+msgstr "P<>ep<65>na<6E>e pro zastaven<65> nebo restart:\n"
+
+#: pg_ctl.c:1054
+msgid ""
+"  -m SHUTDOWN-MODE   may be 'smart', 'fast', or 'immediate'\n"
+"\n"
+msgstr ""
+"  -m M<>D-UKON<4F>EN<45>    m<><6D>e b<>t 'smart', 'fast' nebo 'immediate'\n"
+"\n"
+
+#: pg_ctl.c:1055
+msgid "Allowed signal names for kill:\n"
+msgstr "Povolen<65> sign<67>ly pro \"kill\":\n"
+
+#: pg_ctl.c:1056
+msgid ""
+"  HUP INT QUIT ABRT TERM USR1 USR2\n"
+"\n"
+msgstr ""
+"  HUP INT QUIT ABRT TERM USR1 USR2\n"
+"\n"
+
+#: pg_ctl.c:1057
+msgid "Shutdown modes are:\n"
+msgstr "M<>dy ukon<6F>en<65> jsou:\n"
+
+#: pg_ctl.c:1058
+msgid "  smart       quit after all clients have disconnected\n"
+msgstr "  smart       skon<6F>i potom, co se odpoj<6F> v<>ichni klienti\n"
+
+#: pg_ctl.c:1059
+msgid "  fast        quit directly, with proper shutdown\n"
+msgstr "  fast        skon<6F>i ihned, s pat<61>i<EFBFBD>n<EFBFBD>m ukon<6F>en<65>m\n"
+
+#: pg_ctl.c:1060
+msgid ""
+"  immediate   quit without complete shutdown; will lead to recovery on restart\n"
+"\n"
+msgstr ""
+"  immediate   skon<6F>i bez <20>pln<6C>ho ukon<6F>en<65>; p<>i dal<61><6C>m startu se spust<73> obnoven<65>\n"
+"\n"
+
+#: pg_ctl.c:1061
+msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr "Chyby hla<6C>te na adresu <pgsql-bugs@postgresql.org>.\n"
+
+#: pg_ctl.c:1086
+#, c-format
+msgid "%s: invalid shutdown mode %s\n"
+msgstr "%s: neplatn<74> m<>d ukon<6F>en<65> %s\n"
+
+#: pg_ctl.c:1119
+#, c-format
+msgid "%s: invalid signal \"%s\"\n"
+msgstr "%s: neplatn<74> sign<67>l \"%s\"\n"
+
+#: pg_ctl.c:1246
+#, c-format
+msgid "%s: invalid option %s\n"
+msgstr "%s: neplatn<74> p<>ep<65>na<6E> %s\n"
+
+#: pg_ctl.c:1257
+#, c-format
+msgid "%s: extra operation mode %s\n"
+msgstr "%s: extra operation mode %s\n"
+
+#: pg_ctl.c:1276
+#, c-format
+msgid "%s: invalid kill syntax\n"
+msgstr "%s: neplatn<74> syntaxe ukon<6F>en<65> (kill)\n"
+
+#: pg_ctl.c:1294
+#, c-format
+msgid "%s: invalid operation mode %s\n"
+msgstr "%s: neplatn<74> m<>d pr<70>ce %s\n"
+
+#: pg_ctl.c:1304
+#, c-format
+msgid "%s: no operation specified\n"
+msgstr "%s: nen<65> specifikov<6F>na operace\n"
+
+#: pg_ctl.c:1320
+#, c-format
+msgid "%s: no database directory specified and environment variable PGDATA unset\n"
+msgstr "%s: nen<65> zad<61>n datov<6F> adres<65><73> a ani nen<65> nastavena prom<6F>nn<6E> prost<73>ed<65> PGDATA\n"
+

src/bin/pg_ctl/po/zh_CN.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-05 14:26+0000\n"
+"POT-Creation-Date: 2004-08-31 08:57+0000\n"
 "PO-Revision-Date: 2004-06-10 11:23+0000\n"
 "Last-Translator: Bao Wei<weibao@imsi.cn>\n"
 "Language-Team: Weiping He <laser@imsi.cn>\n"
@@ -14,28 +14,28 @@ msgstr ""
 "Content-Type: text/plain; charset=GB2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pg_ctl.c:184 pg_ctl.c:200 pg_ctl.c:1230
+#: pg_ctl.c:193 pg_ctl.c:209 pg_ctl.c:1293
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: <20>ڴ<EFBFBD><DAB4><EFBFBD><EFBFBD><EFBFBD>\n"
 
-#: pg_ctl.c:431
+#: pg_ctl.c:452
 #, c-format
 msgid ""
 "%s: Another postmaster may be running. Trying to start postmaster anyway.\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD> postmaster <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> postmaster.\n"
 
-#: pg_ctl.c:449
+#: pg_ctl.c:470
 #, c-format
 msgid "%s: cannot read %s\n"
 msgstr "%s: <20>޷<EFBFBD><DEB7><EFBFBD>ȡ %s\n"
 
-#: pg_ctl.c:455
+#: pg_ctl.c:476
 #, c-format
 msgid "%s: option file %s must have exactly 1 line\n"
 msgstr "%s: ѡ<><D1A1><EFBFBD>ļ<EFBFBD> %s ֻ<><D6BB><EFBFBD><EFBFBD>һ<EFBFBD><D2BB>\n"
 
-#: pg_ctl.c:497
+#: pg_ctl.c:522
 #, c-format
 msgid ""
 "The program \"postmaster\" is needed by %s but was not found in the same "
@@ -45,7 +45,7 @@ msgstr ""
 "<22><><EFBFBD><EFBFBD> \"postmaster\" <20><> %s <20><>Ҫ<EFBFBD><D2AA>, <20><>û<EFBFBD><C3BB><EFBFBD><EFBFBD>ͬһ<CDAC><D2BB>Ŀ¼ \"%s\" <20><><EFBFBD><EFBFBD>.\n"
 "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>İ<EFBFBD>װ.\n"
 
-#: pg_ctl.c:503
+#: pg_ctl.c:528
 #, c-format
 msgid ""
 "The program \"postmaster\" was found by %s but was not the same version as "
@@ -55,11 +55,11 @@ msgstr ""
 "%s <20>ҵ<EFBFBD><D2B5><EFBFBD><EFBFBD><EFBFBD> \"postmaster\", <20><><EFBFBD>汾<EFBFBD><E6B1BE> \"%s\" <20><>һ<EFBFBD><D2BB>.\n"
 "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>İ<EFBFBD>װ.\n"
 
-#: pg_ctl.c:514
+#: pg_ctl.c:539
 msgid "Unable to run the postmaster binary\n"
 msgstr "<22>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD> postmaster <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD>\n"
 
-#: pg_ctl.c:524
+#: pg_ctl.c:549
 #, c-format
 msgid ""
 "%s: cannot start postmaster\n"
@@ -68,17 +68,17 @@ msgstr ""
 "%s: <20>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD> postmaster\n"
 "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>־<EFBFBD><D6BE><EFBFBD><EFBFBD>\n"
 
-#: pg_ctl.c:535
+#: pg_ctl.c:560
 #, c-format
 msgid "waiting for postmaster to start..."
 msgstr "<22>ȴ<EFBFBD> postmaster <20><><EFBFBD><EFBFBD> ..."
 
-#: pg_ctl.c:540
+#: pg_ctl.c:565
 #, c-format
 msgid "could not start postmaster\n"
 msgstr "<22>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD> postmaster\n"
 
-#: pg_ctl.c:542
+#: pg_ctl.c:567
 #, c-format
 msgid ""
 "done\n"
@@ -87,61 +87,61 @@ msgstr ""
 "<22><><EFBFBD><EFBFBD>\n"
 "postmaster <20>Ѿ<EFBFBD><D1BE><EFBFBD><EFBFBD><EFBFBD>\n"
 
-#: pg_ctl.c:545
+#: pg_ctl.c:570
 #, c-format
 msgid "postmaster starting\n"
 msgstr "<22><><EFBFBD><EFBFBD> postmaster\n"
 
-#: pg_ctl.c:560 pg_ctl.c:639 pg_ctl.c:709
+#: pg_ctl.c:585 pg_ctl.c:664 pg_ctl.c:734
 #, c-format
 msgid "%s: could not find %s\n"
 msgstr "%s: <20>޷<EFBFBD><DEB7>ҵ<EFBFBD> %s\n"
 
-#: pg_ctl.c:561 pg_ctl.c:710
+#: pg_ctl.c:586 pg_ctl.c:735
 msgid "Is postmaster running?\n"
 msgstr "<22>Ƿ<EFBFBD> postmaster <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>?\n"
 
-#: pg_ctl.c:567
+#: pg_ctl.c:592
 #, c-format
 msgid "%s: cannot stop postmaster; postgres is running (PID: %ld)\n"
 msgstr "%s: <20>޷<EFBFBD>ֹͣ postmaster; postgres <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (PID: %ld)\n"
 
-#: pg_ctl.c:575 pg_ctl.c:656
+#: pg_ctl.c:600 pg_ctl.c:681
 #, c-format
 msgid "stop signal failed (PID: %ld): %s\n"
 msgstr "ֹͣ<CDA3>ź<EFBFBD>ʧ<EFBFBD><CAA7> (PID: %ld): %s\n"
 
-#: pg_ctl.c:583
+#: pg_ctl.c:608
 #, c-format
 msgid "postmaster shutting down\n"
 msgstr "<22>ر<EFBFBD> postmaster\n"
 
-#: pg_ctl.c:590 pg_ctl.c:663
+#: pg_ctl.c:615 pg_ctl.c:688
 #, c-format
 msgid "waiting for postmaster to shut down..."
 msgstr "<22>ȴ<EFBFBD> postmaster <20>ر<EFBFBD> ..."
 
-#: pg_ctl.c:612 pg_ctl.c:687
+#: pg_ctl.c:637 pg_ctl.c:712
 #, c-format
 msgid " failed\n"
 msgstr " ʧ<><CAA7>\n"
 
-#: pg_ctl.c:614 pg_ctl.c:689
+#: pg_ctl.c:639 pg_ctl.c:714
 #, c-format
 msgid "%s: postmaster does not shut down\n"
 msgstr "%s: postmaster û<>йر<D0B9>\n"
 
-#: pg_ctl.c:618 pg_ctl.c:694
+#: pg_ctl.c:643 pg_ctl.c:719
 #, c-format
 msgid "done\n"
 msgstr "<22><><EFBFBD><EFBFBD>\n"
 
-#: pg_ctl.c:620 pg_ctl.c:696
+#: pg_ctl.c:645 pg_ctl.c:721
 #, c-format
 msgid "postmaster stopped\n"
 msgstr "postmaster <20>Ѿ<EFBFBD><D1BE>ر<EFBFBD>\n"
 
-#: pg_ctl.c:640
+#: pg_ctl.c:665
 msgid ""
 "Is postmaster running?\n"
 "starting postmaster anyway\n"
@@ -149,84 +149,84 @@ msgstr ""
 "<22>Ƿ<EFBFBD> postmaster <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>?\n"
 "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> postmaster\n"
 
-#: pg_ctl.c:647
+#: pg_ctl.c:672
 #, c-format
 msgid "%s: cannot restart postmaster; postgres is running (PID: %ld)\n"
 msgstr "%s: <20>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD> postmaster; postgres <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (PID: %ld)\n"
 
-#: pg_ctl.c:650 pg_ctl.c:719
+#: pg_ctl.c:675 pg_ctl.c:744
 msgid "Please terminate postgres and try again.\n"
 msgstr "<22><><EFBFBD><EFBFBD>ֹ postgres <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n"
 
-#: pg_ctl.c:716
+#: pg_ctl.c:741
 #, c-format
 msgid "%s: cannot reload postmaster; postgres is running (PID: %ld)\n"
 msgstr "%s: <20>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD> postmaser; postgres <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (PID: %ld)\n"
 
-#: pg_ctl.c:725
+#: pg_ctl.c:750
 #, c-format
 msgid "reload signal failed (PID: %ld): %s\n"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>ź<EFBFBD>ʧ<EFBFBD><CAA7> (PID: %ld): %s\n"
 
-#: pg_ctl.c:731
+#: pg_ctl.c:756
 #, c-format
 msgid "postmaster signaled\n"
 msgstr "postmaster <20><><EFBFBD><EFBFBD><EFBFBD>ź<EFBFBD>\n"
 
-#: pg_ctl.c:746
+#: pg_ctl.c:771
 #, c-format
 msgid "%s: postmaster or postgres not running\n"
 msgstr "%s: postmaster <20><><EFBFBD><EFBFBD> postgres û<><C3BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
 
-#: pg_ctl.c:752
+#: pg_ctl.c:777
 #, c-format
 msgid "%s: a standalone backend \"postgres\" is running (PID: %ld)\n"
 msgstr "%s: һ<><D2BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ĺ<EFBFBD><C4BA><EFBFBD> \"postgres\" <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (PID: %ld)\n"
 
-#: pg_ctl.c:758
+#: pg_ctl.c:784
 #, c-format
 msgid "%s: postmaster is running (PID: %ld)\n"
 msgstr "%s: postmaster <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (PID: %ld)\n"
 
-#: pg_ctl.c:774
+#: pg_ctl.c:800
 #, c-format
 msgid "signal %d failed (PID: %ld): %s\n"
 msgstr "<22>ź<EFBFBD> %d ʧ<><CAA7> (PID: %ld): %s\n"
 
-#: pg_ctl.c:801
+#: pg_ctl.c:831
 msgid "Unable to find exe"
 msgstr "<22>޷<EFBFBD><DEB7>ҵ<EFBFBD>ִ<EFBFBD><D6B4><EFBFBD>ļ<EFBFBD>"
 
-#: pg_ctl.c:844 pg_ctl.c:875
+#: pg_ctl.c:878 pg_ctl.c:910
 msgid "Unable to open service manager\n"
 msgstr "<22>޷<EFBFBD><DEB7>򿪷<EFBFBD><F2BFAAB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
 
-#: pg_ctl.c:850
+#: pg_ctl.c:884
 #, c-format
 msgid "Service \"%s\" already registered\n"
 msgstr "<22><><EFBFBD><EFBFBD> \"%s\" <20>Ѿ<EFBFBD>ע<EFBFBD><D7A2><EFBFBD><EFBFBD>\n"
 
-#: pg_ctl.c:861
+#: pg_ctl.c:895
 #, c-format
 msgid "Unable to register service \"%s\" [%d]\n"
 msgstr "<22>޷<EFBFBD>ע<EFBFBD><D7A2><EFBFBD><EFBFBD><EFBFBD><EFBFBD> \"%s\" [%d]\n"
 
-#: pg_ctl.c:881
+#: pg_ctl.c:916
 #, c-format
 msgid "Service \"%s\" not registered\n"
 msgstr "<22><><EFBFBD><EFBFBD> \"%s\" û<><C3BB>ע<EFBFBD><D7A2>\n"
 
-#: pg_ctl.c:888
+#: pg_ctl.c:923
 #, c-format
 msgid "Unable to open service \"%s\" [%d]\n"
 msgstr "<22>޷<EFBFBD><DEB7>򿪷<EFBFBD><F2BFAAB7><EFBFBD> \"%s\" [%d]\n"
 
-#: pg_ctl.c:894
+#: pg_ctl.c:930
 #, c-format
 msgid "Unable to unregister service \"%s\" [%d]\n"
 msgstr "<22>޷<EFBFBD>ȡ<EFBFBD><C8A1>ע<EFBFBD><D7A2><EFBFBD><EFBFBD><EFBFBD><EFBFBD> \"%s\" [%d]\n"
 
-#: pg_ctl.c:1012
+#: pg_ctl.c:1067
 #, c-format
 msgid ""
 "\n"
@@ -235,7 +235,7 @@ msgstr ""
 "\n"
 "<22><><EFBFBD><EFBFBD> \"%s --help\" <20><>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ.\n"
 
-#: pg_ctl.c:1020
+#: pg_ctl.c:1075
 #, c-format
 msgid ""
 "%s is a utility to start, stop, restart, reload configuration files,\n"
@@ -246,107 +246,107 @@ msgstr ""
 "<22><><EFBFBD><EFBFBD>ɱ<EFBFBD><C9B1> PostgreSQL <20><><EFBFBD>̵Ĺ<CCB5><C4B9><EFBFBD>\n"
 "\n"
 
-#: pg_ctl.c:1022
+#: pg_ctl.c:1077
 #, c-format
 msgid "Usage:\n"
 msgstr "ʹ<>÷<EFBFBD><C3B7><EFBFBD>:\n"
 
-#: pg_ctl.c:1023
+#: pg_ctl.c:1078
 #, c-format
 msgid "  %s start   [-w] [-D DATADIR] [-s] [-l FILENAME] [-o \"OPTIONS\"]\n"
 msgstr "  %s start   [-w] [-D <20><><EFBFBD><EFBFBD>Ŀ¼] [-s] [-l <20>ļ<EFBFBD><C4BC><EFBFBD>] [-o \"ѡ<><D1A1>\"]\n"
 
-#: pg_ctl.c:1024
+#: pg_ctl.c:1079
 #, c-format
 msgid "  %s stop    [-W] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
 msgstr "  %s stop    [-W] [-D <20><><EFBFBD><EFBFBD>Ŀ¼] [-s] [-m <20>ر<EFBFBD>ģʽ]\n"
 
-#: pg_ctl.c:1025
+#: pg_ctl.c:1080
 #, c-format
 msgid ""
 "  %s restart [-w] [-D DATADIR] [-s] [-m SHUTDOWN-MODE] [-o \"OPTIONS\"]\n"
 msgstr "  %s restart [-w] [-D <20><><EFBFBD><EFBFBD>Ŀ¼] [-s] [-m <20>ر<EFBFBD>ģʽ] [-o \"ѡ<><D1A1>\"]\n"
 
-#: pg_ctl.c:1026
+#: pg_ctl.c:1081
 #, c-format
 msgid "  %s reload  [-D DATADIR] [-s]\n"
 msgstr "  %s reload  [-D <20><><EFBFBD><EFBFBD>Ŀ¼] [-s]\n"
 
-#: pg_ctl.c:1027
+#: pg_ctl.c:1082
 #, c-format
 msgid "  %s status  [-D DATADIR]\n"
 msgstr "  %s status  [-D <20><><EFBFBD><EFBFBD>Ŀ¼]\n"
 
-#: pg_ctl.c:1028
+#: pg_ctl.c:1083
 #, c-format
 msgid "  %s kill    SIGNALNAME PROCESSID\n"
 msgstr "  %s kill    <20>ź<EFBFBD><C5BA><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> ID\n"
 
-#: pg_ctl.c:1030
+#: pg_ctl.c:1085
 #, c-format
 msgid ""
 "  %s register   [-N servicename] [-U username] [-P password] [-D DATADIR] [-"
-"o \"OPTIONS\"]\n"
+"w] [-o \"OPTIONS\"]\n"
 msgstr ""
-"  %s register   [-N <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>] [-U <20>û<EFBFBD><C3BB><EFBFBD>] [-P <20><><EFBFBD><EFBFBD>] [-D DATADIR] [-o "
+"  %s register   [-N <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>] [-U <20>û<EFBFBD><C3BB><EFBFBD>] [-P <20><><EFBFBD><EFBFBD>] [-D DATADIR] [-"
-"\"OPTIONS\"]\n"
+"w] [-o \"ѡ<><D1A1>\"]\n"
 
-#: pg_ctl.c:1031
+#: pg_ctl.c:1086
 #, c-format
 msgid "  %s unregister [-N servicename]\n"
 msgstr "  %s unregister [-N <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]\n"
 
-#: pg_ctl.c:1033
+#: pg_ctl.c:1088
 #, c-format
 msgid "Common options:\n"
 msgstr "<22><>ͨѡ<CDA8><D1A1>:\n"
 
-#: pg_ctl.c:1034
+#: pg_ctl.c:1089
 #, c-format
 msgid "  -D, --pgdata DATADIR   location of the database storage area\n"
 msgstr "  -D, --pgdata <20><><EFBFBD><EFBFBD>Ŀ¼  <20><><EFBFBD>ݴ洢<DDB4><E6B4A2>λ<EFBFBD><CEBB>\n"
 
-#: pg_ctl.c:1035
+#: pg_ctl.c:1090
 #, c-format
 msgid "  -s, --silent only print errors, no informational messages\n"
 msgstr "  -s, --silent ֻ<><D6BB>ӡ<EFBFBD><D3A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ, û<><C3BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ\n"
 
-#: pg_ctl.c:1037
+#: pg_ctl.c:1092
 #, c-format
 msgid "  -N       service name with which to register PostgreSQL server\n"
 msgstr "  -N       ע<>ᵽ PostgreSQL <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ķ<EFBFBD><C4B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
 
-#: pg_ctl.c:1038
+#: pg_ctl.c:1093
 #, c-format
 msgid "  -P       password of account to register PostgreSQL server\n"
 msgstr "  -P       ע<>ᵽ PostgreSQL <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʻ<EFBFBD><CABB>Ŀ<EFBFBD><C4BF><EFBFBD>\n"
 
-#: pg_ctl.c:1039
+#: pg_ctl.c:1094
 #, c-format
 msgid "  -U       user name of account to register PostgreSQL server\n"
 msgstr "  -U       ע<>ᵽ PostgreSQL <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʻ<EFBFBD><CABB><EFBFBD><EFBFBD>û<EFBFBD><C3BB><EFBFBD>\n"
 
-#: pg_ctl.c:1041
+#: pg_ctl.c:1096
 #, c-format
 msgid "  -w           wait until operation completes\n"
 msgstr "  -w           <20>ȴ<EFBFBD>ֱ<EFBFBD><D6B1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
 
-#: pg_ctl.c:1042
+#: pg_ctl.c:1097
 #, c-format
 msgid "  -W           do not wait until operation completes\n"
 msgstr "  -W           <20><><EFBFBD>õȴ<C3B5><C8B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
 
-#: pg_ctl.c:1043
+#: pg_ctl.c:1098
 #, c-format
 msgid "  --help       show this help, then exit\n"
 msgstr "  --help       <20><>ʾ<EFBFBD>˰<EFBFBD><CBB0><EFBFBD><EFBFBD><EFBFBD>Ϣ, Ȼ<><C8BB><EFBFBD>˳<EFBFBD>\n"
 
-#: pg_ctl.c:1044
+#: pg_ctl.c:1099
 #, c-format
 msgid "  --version    output version information, then exit\n"
 msgstr "  --version    <20><><EFBFBD><EFBFBD><EFBFBD>汾<EFBFBD><E6B1BE>Ϣ, Ȼ<><C8BB><EFBFBD>˳<EFBFBD>\n"
 
-#: pg_ctl.c:1045
+#: pg_ctl.c:1100
 #, c-format
 msgid ""
 "(The default is to wait for shutdown, but not for start or restart.)\n"
@@ -355,7 +355,7 @@ msgstr ""
 "(Ĭ<><C4AC>Ϊ<EFBFBD>رյȴ<D5B5>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.)\n"
 "\n"
 
-#: pg_ctl.c:1046
+#: pg_ctl.c:1101
 #, c-format
 msgid ""
 "If the -D option is omitted, the environment variable PGDATA is used.\n"
@@ -364,12 +364,12 @@ msgstr ""
 "<22><><EFBFBD><EFBFBD>ʡ<EFBFBD><CAA1><EFBFBD><EFBFBD> -D ѡ<><D1A1>, <20><>ʹ<EFBFBD><CAB9> PGDATA <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n"
 "\n"
 
-#: pg_ctl.c:1047
+#: pg_ctl.c:1102
 #, c-format
 msgid "Options for start or restart:\n"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѡ<EFBFBD><D1A1>:\n"
 
-#: pg_ctl.c:1048
+#: pg_ctl.c:1103
 #, c-format
 msgid ""
 "  -l, --log FILENAME      write (or append) server log to FILENAME.  The\n"
@@ -378,7 +378,7 @@ msgstr ""
 "  -l, --log FILENAME      д<><D0B4> (<28><>׷<EFBFBD><D7B7>) <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>־<EFBFBD><D6BE><EFBFBD>ļ<EFBFBD> FILENAME.\n"
 "                          ǿ<>ҽ<EFBFBD><D2BD><EFBFBD>ʹ<EFBFBD>ô<EFBFBD>ѡ<EFBFBD><D1A1>.\n"
 
-#: pg_ctl.c:1050
+#: pg_ctl.c:1105
 #, c-format
 msgid ""
 "  -o OPTIONS              command line options to pass to the postmaster\n"
@@ -387,7 +387,7 @@ msgstr ""
 "  -o OPTIONS              <20><><EFBFBD>ݸ<EFBFBD> postmaster <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѡ<EFBFBD><D1A1>\n"
 "                          (PostgreSQL <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ִ<EFBFBD><D6B4>)\n"
 
-#: pg_ctl.c:1052
+#: pg_ctl.c:1107
 #, c-format
 msgid ""
 "  -p PATH-TO-POSTMASTER   normally not necessary\n"
@@ -396,12 +396,12 @@ msgstr ""
 "  -p PATH-TO-POSTMASTER   <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ҫ\n"
 "\n"
 
-#: pg_ctl.c:1053
+#: pg_ctl.c:1108
 #, c-format
 msgid "Options for stop or restart:\n"
 msgstr "ֹͣ<CDA3><D6B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѡ<EFBFBD><D1A1>:\n"
 
-#: pg_ctl.c:1054
+#: pg_ctl.c:1109
 #, c-format
 msgid ""
 "  -m SHUTDOWN-MODE   may be 'smart', 'fast', or 'immediate'\n"
@@ -410,12 +410,12 @@ msgstr ""
 "  -m SHUTDOWN-MODE   <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 'smart', 'fast', <20><><EFBFBD><EFBFBD> 'immediate'\n"
 "\n"
 
-#: pg_ctl.c:1055
+#: pg_ctl.c:1110
 #, c-format
 msgid "Allowed signal names for kill:\n"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>رյ<D8B1><D5B5>ź<EFBFBD><C5BA><EFBFBD><EFBFBD><EFBFBD>:\n"
 
-#: pg_ctl.c:1056
+#: pg_ctl.c:1111
 #, c-format
 msgid ""
 "  HUP INT QUIT ABRT TERM USR1 USR2\n"
@@ -424,22 +424,22 @@ msgstr ""
 "  HUP INT QUIT ABRT TERM USR1 USR2\n"
 "\n"
 
-#: pg_ctl.c:1057
+#: pg_ctl.c:1112
 #, c-format
 msgid "Shutdown modes are:\n"
 msgstr "<22>ر<EFBFBD>ģʽ<C4A3><CABD><EFBFBD><EFBFBD><EFBFBD>¼<EFBFBD><C2BC><EFBFBD>:\n"
 
-#: pg_ctl.c:1058
+#: pg_ctl.c:1113
 #, c-format
 msgid "  smart       quit after all clients have disconnected\n"
 msgstr "  smart       <20><><EFBFBD>пͻ<D0BF><CDBB>˶Ͽ<CBB6><CFBF><EFBFBD><EFBFBD>Ӻ<EFBFBD><D3BA>˳<EFBFBD>\n"
 
-#: pg_ctl.c:1059
+#: pg_ctl.c:1114
 #, c-format
 msgid "  fast        quit directly, with proper shutdown\n"
 msgstr "  fast        ֱ<><D6B1><EFBFBD>˳<EFBFBD>, <20><>ȷ<EFBFBD>Ĺر<C4B9>\n"
 
-#: pg_ctl.c:1060
+#: pg_ctl.c:1115
 #, c-format
 msgid ""
 "  immediate   quit without complete shutdown; will lead to recovery on "
@@ -449,47 +449,47 @@ msgstr ""
 "  immediate   <20><><EFBFBD><EFBFBD>ȫ<EFBFBD>Ĺر<C4B9><D8B1>˳<EFBFBD>; <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ָ<EFBFBD>\n"
 "\n"
 
-#: pg_ctl.c:1061
+#: pg_ctl.c:1116
 #, c-format
 msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr "<22><><EFBFBD>󱨸<EFBFBD><F3B1A8B8><EFBFBD> <pgsql-bugs@postgresql.org>.\n"
 
-#: pg_ctl.c:1086
+#: pg_ctl.c:1141
 #, c-format
 msgid "%s: invalid shutdown mode %s\n"
 msgstr "%s: <20><>Ч<EFBFBD>Ĺر<C4B9>ģʽ %s\n"
 
-#: pg_ctl.c:1119
+#: pg_ctl.c:1174
 #, c-format
 msgid "%s: invalid signal \"%s\"\n"
 msgstr "%s: <20><>Ч<EFBFBD>ź<EFBFBD> \"%s\"\n"
 
-#: pg_ctl.c:1246
+#: pg_ctl.c:1309
 #, c-format
 msgid "%s: invalid option %s\n"
 msgstr "%s: <20><>Чѡ<D0A7><D1A1> %s\n"
 
-#: pg_ctl.c:1257
+#: pg_ctl.c:1320
 #, c-format
 msgid "%s: extra operation mode %s\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD>IJ<EFBFBD><C4B2><EFBFBD>ģʽ %s\n"
 
-#: pg_ctl.c:1276
+#: pg_ctl.c:1339
 #, c-format
 msgid "%s: invalid kill syntax\n"
 msgstr "%s: <20><>Ч<EFBFBD><D0A7> kill <20>﷨\n"
 
-#: pg_ctl.c:1294
+#: pg_ctl.c:1357
 #, c-format
 msgid "%s: invalid operation mode %s\n"
 msgstr "%s: <20><>Ч<EFBFBD>IJ<EFBFBD><C4B2><EFBFBD>ģʽ %s\n"
 
-#: pg_ctl.c:1304
+#: pg_ctl.c:1367
 #, c-format
 msgid "%s: no operation specified\n"
 msgstr "%s: û<><C3BB>ָ<EFBFBD><D6B8><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
 
-#: pg_ctl.c:1320
+#: pg_ctl.c:1383
 #, c-format
 msgid ""
 "%s: no database directory specified and environment variable PGDATA unset\n"

src/bin/pg_resetxlog/po/cs.po

@@ -1,76 +1,76 @@
 # Czech translation of pg_resetxlog messages
 # Karel Zak <zakkr@zf.jcu.cz>, 2003.
 #
-# $PostgreSQL: pgsql/src/bin/pg_resetxlog/po/cs.po,v 1.2 2003/11/29 22:40:48 pgsql Exp $
+# $PostgreSQL: pgsql/src/bin/pg_resetxlog/po/cs.po,v 1.3 2004/09/13 12:26:46 petere Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.4\n"
-"POT-Creation-Date: 2003-06-29 12:25+0200\n"
+"POT-Creation-Date: 2004-08-16 13:07-0300\n"
-"PO-Revision-Date: 2003-07-13 00:04-0000\n"
+"PO-Revision-Date: 2004-08-17 09:20+0100\n"
-"Last-Translator: Karel Zak <zakkr@zf.jcu.cz>\n"
+"Last-Translator: Michal Taborsky <michal@taborsky.cz>\n"
 "Language-Team: Karel <20><>k <zakkr@zf.jcu.cz>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pg_resetxlog.c:141
+#: pg_resetxlog.c:120
 #, c-format
-msgid "%s: invalid argument for -x option\n"
+msgid "%s: invalid argument for option -x\n"
-msgstr "%s: neplatn<74> parametr pro -x p<EFBFBD>ep<EFBFBD>na<EFBFBD>\n"
+msgstr "%s: neplatn<74> argument pro p<>ep<65>na<6E> -x\n"
 
-#: pg_resetxlog.c:142
+#: pg_resetxlog.c:121
-#: pg_resetxlog.c:157
+#: pg_resetxlog.c:136
+#: pg_resetxlog.c:151
+#: pg_resetxlog.c:158
+#: pg_resetxlog.c:164
 #: pg_resetxlog.c:172
-#: pg_resetxlog.c:179
-#: pg_resetxlog.c:185
-#: pg_resetxlog.c:193
 #, c-format
-msgid "Try '%s --help' for more information.\n"
+msgid "Try \"%s --help\" for more information.\n"
-msgstr "Zkuste '%s --help' pro v<>ce informac<61>.\n"
+msgstr "Zkuste \"%s --help\" pro v<>ce informac<61>.\n"
 
-#: pg_resetxlog.c:147
+#: pg_resetxlog.c:126
 #, c-format
 msgid "%s: transaction ID (-x) must not be 0\n"
 msgstr "%s: ID transakce (-x) nesm<73> b<>t 0\n"
 
-#: pg_resetxlog.c:156
+#: pg_resetxlog.c:135
 #, c-format
-msgid "%s: invalid argument for -o option\n"
+msgid "%s: invalid argument for option -o\n"
-msgstr "%s: neplatn<74> parametr pro -o p<EFBFBD>ep<EFBFBD>na<EFBFBD>\n"
+msgstr "%s: neplatn<74> argument pro p<>ep<65>na<6E> -o\n"
 
-#: pg_resetxlog.c:162
+#: pg_resetxlog.c:141
 #, c-format
 msgid "%s: OID (-o) must not be 0\n"
 msgstr "%s: OID (-o) nesm<73> b<>t 0\n"
 
-#: pg_resetxlog.c:171
+#: pg_resetxlog.c:150
-#: pg_resetxlog.c:178
+#: pg_resetxlog.c:157
 #, c-format
-msgid "%s: invalid argument for -l option\n"
+msgid "%s: invalid argument for option -l\n"
-msgstr "%s: neplatn<74> parametr pro -l p<EFBFBD>ep<EFBFBD>na<EFBFBD>\n"
+msgstr "%s: neplatn<74> argument pro p<>ep<65>na<6E> -l\n"
 
-#: pg_resetxlog.c:192
+#: pg_resetxlog.c:171
 #, c-format
 msgid "%s: no data directory specified\n"
 msgstr "%s: nen<65> specifikov<6F>n datov<6F> adres<65><73>\n"
 
-#: pg_resetxlog.c:212
+#: pg_resetxlog.c:191
-#: pg_resetxlog.c:308
+#: pg_resetxlog.c:287
 #, c-format
-msgid "%s: could not open %s for reading: %s\n"
+msgid "%s: could not open file \"%s\" for reading: %s\n"
-msgstr "%s: nelze otev<65><76>t %s pro <20>ten<65>: %s\n"
+msgstr "%s: nelze otev<65><76>t soubor \"%s\" pro <20>ten<65>: %s\n"
 
-#: pg_resetxlog.c:218
+#: pg_resetxlog.c:197
 #, c-format
 msgid ""
-"%s: lock file %s exists\n"
+"%s: lock file \"%s\" exists\n"
 "Is a server running? If not, delete the lock file and try again.\n"
 msgstr ""
-"%s: soubor se z<>mkem %s existuje\n"
+"%s: soubor se z<>mkem \"%s\" existuje\n"
-"Neb<65><62><EFBFBD> ji<6A> server? Jestli<6C>e ne sma<6D>te soubor se z<>mkem a zkuste to znova.\n"
+"Neb<65><62><EFBFBD> ji<6A> server? Jestli<6C>e ne, sma<6D>te soubor se z<>mkem a zkuste to znova.\n"
 
-#: pg_resetxlog.c:257
+#: pg_resetxlog.c:236
 msgid ""
 "\n"
 "If these values seem acceptable, use -f to force reset.\n"
@@ -78,7 +78,7 @@ msgstr ""
 "\n"
 "Jestli<6C>e tyto hodnoty vypadaj<61> akceptovateln<6C>, pou<6F>ijte -f pro vynucen<65> reset.\n"
 
-#: pg_resetxlog.c:269
+#: pg_resetxlog.c:248
 msgid ""
 "The database server was not shut down cleanly.\n"
 "Resetting the transaction log may cause data to be lost.\n"
@@ -86,49 +86,49 @@ msgid ""
 msgstr ""
 "Datab<61>zov<6F> server nebyl ukon<6F>en standardn<64>.\n"
 "Resetov<6F>n<EFBFBD> transak<61>n<EFBFBD>ho logu m<><6D>e b<>t d<>vodem ke ztr<74>t<EFBFBD> dat.\n"
-"Jestli<6C>e to chcete i tak prov<6F>st pou<6F>ijte -f pro vynucen<65> reset.\n"
+"Jestli<6C>e i p<>esto chcete pokra<EFBFBD>ovat, pou<6F>ijte -f pro vynucen<65> reset.\n"
 
-#: pg_resetxlog.c:282
+#: pg_resetxlog.c:261
 msgid "Transaction log reset\n"
 msgstr "Transak<61>n<EFBFBD> log resetov<6F>n\n"
 
-#: pg_resetxlog.c:311
+#: pg_resetxlog.c:290
 #, c-format
 msgid ""
-"If you are sure the data directory path is correct, do\n"
+"If you are sure the data directory path is correct, execute\n"
 "  touch %s\n"
 "and try again.\n"
 msgstr ""
-"M<>te-li jistotu, <20>e jsou data v adres<65><73>i korektn<EFBFBD>, prove<76>te\n"
+"M<>te-li jistotu, <20>e je cesta k datov<6F>mu adres<65><73>i spr<EFBFBD>vn<EFBFBD>, prove<76>te\n"
 "  touch %s\n"
 "a zkuste to znovu.\n"
 
-#: pg_resetxlog.c:324
+#: pg_resetxlog.c:303
 #, c-format
-msgid "%s: could not read %s: %s\n"
+msgid "%s: could not read file \"%s\": %s\n"
-msgstr "%s: nelze <20><>st %s: %s\n"
+msgstr "%s: nelze <20><>st soubor \"%s\": %s\n"
 
-#: pg_resetxlog.c:347
+#: pg_resetxlog.c:326
 #, c-format
 msgid "%s: pg_control exists but has invalid CRC; proceed with caution\n"
 msgstr "%s: pg_control existuje, ale s neplatn<74>m kontroln<6C>m sou<6F>tem CRC; postupujte opatrn<72>\n"
 
-#: pg_resetxlog.c:356
+#: pg_resetxlog.c:335
 #, c-format
 msgid "%s: pg_control exists but is broken or unknown version; ignoring it\n"
-msgstr "%s: pg_control existuje, ale je po<70>kozen nebo nezn<7A>me verze; ignoruji to\n"
+msgstr "%s: pg_control existuje, ale je po<70>kozen nebo nezn<7A>m<EFBFBD> verze; ignoruji to\n"
 
-#: pg_resetxlog.c:407
+#: pg_resetxlog.c:399
 #, c-format
 msgid "%s: invalid LC_COLLATE setting\n"
-msgstr "%s: neplatn<74> LC_COLLATE nastaven<EFBFBD>\n"
+msgstr "%s: neplatn<74> nastaven<65> LC_COLLATE\n"
 
-#: pg_resetxlog.c:414
+#: pg_resetxlog.c:406
 #, c-format
 msgid "%s: invalid LC_CTYPE setting\n"
-msgstr "%s: neplatn<74> LC_CTYPE nastaven<EFBFBD>\n"
+msgstr "%s: neplatn<74> nastaven<65> LC_CTYPE\n"
 
-#: pg_resetxlog.c:436
+#: pg_resetxlog.c:430
 msgid ""
 "Guessed pg_control values:\n"
 "\n"
@@ -136,7 +136,7 @@ msgstr ""
 "Odhadnut<75> hodnoty pg_controlu:\n"
 "\n"
 
-#: pg_resetxlog.c:438
+#: pg_resetxlog.c:432
 msgid ""
 "pg_control values:\n"
 "\n"
@@ -144,146 +144,151 @@ msgstr ""
 "Hodnoty pg_controlu:\n"
 "\n"
 
-#: pg_resetxlog.c:440
+#: pg_resetxlog.c:441
 #, c-format
 msgid "pg_control version number:            %u\n"
 msgstr "<22><>slo verze pg_controlu:            %u\n"
 
-#: pg_resetxlog.c:441
+#: pg_resetxlog.c:442
 #, c-format
 msgid "Catalog version number:               %u\n"
 msgstr "<22><>slo verze katalogu:               %u\n"
 
-#: pg_resetxlog.c:442
+#: pg_resetxlog.c:443
+#, c-format
+msgid "Database system identifier:           %s\n"
+msgstr "Identifik<69>tor datab<61>zov<6F>ho syst<73>mu:   %s\n"
+
+#: pg_resetxlog.c:444
 #, c-format
 msgid "Current log file ID:                  %u\n"
 msgstr "Sou<6F>asn<73> ID log souboru:                  %u\n"
 
-#: pg_resetxlog.c:443
+#: pg_resetxlog.c:445
 #, c-format
 msgid "Next log file segment:                %u\n"
 msgstr "N<>sleduj<75>c<EFBFBD> segment log souboru:                %u\n"
 
-#: pg_resetxlog.c:444
-#, c-format
-msgid "Latest checkpoint's StartUpID:        %u\n"
-msgstr "Posledn<64> um<75>st<73>n<EFBFBD> StartUpID kontroln<6C>ho bodu:        %u\n"
-
-#: pg_resetxlog.c:445
-#, c-format
-msgid "Latest checkpoint's NextXID:          %u\n"
-msgstr "Posledn<64> um<75>st<73>n<EFBFBD> NextXID kontroln<6C>ho bodu:          %u\n"
-
 #: pg_resetxlog.c:446
 #, c-format
-msgid "Latest checkpoint's NextOID:          %u\n"
+msgid "Latest checkpoint's TimeLineID:       %u\n"
-msgstr "Posledn<EFBFBD> um<75>st<73>n<EFBFBD> NextOID kontroln<6C>ho bodu:          %u\n"
+msgstr "TimeLineID posledn<64>ho kontroln<6C>ho bodu: %u\n"
 
 #: pg_resetxlog.c:447
 #, c-format
+msgid "Latest checkpoint's NextXID:          %u\n"
+msgstr "NextXID posledn<64>ho kontroln<6C>ho bodu:  %u\n"
+
+#: pg_resetxlog.c:448
+#, c-format
+msgid "Latest checkpoint's NextOID:          %u\n"
+msgstr "NextOID posledn<64>ho kontroln<6C>ho bodu:  %u\n"
+
+#: pg_resetxlog.c:449
+#, c-format
 msgid "Database block size:                  %u\n"
 msgstr "Velikost datab<61>zov<6F>ho bloku:                  %u\n"
 
-#: pg_resetxlog.c:448
+#: pg_resetxlog.c:450
 #, c-format
 msgid "Blocks per segment of large relation: %u\n"
 msgstr "Blok<6F> v segmentu velk<6C> relace: %u\n"
 
-#: pg_resetxlog.c:449
+#: pg_resetxlog.c:451
 #, c-format
 msgid "Maximum length of identifiers:        %u\n"
 msgstr "Maxim<69>ln<6C> d<>lka identifik<69>tor<6F>:        %u\n"
 
-#: pg_resetxlog.c:450
+#: pg_resetxlog.c:452
 #, c-format
 msgid "Maximum number of function arguments: %u\n"
 msgstr "Maxim<69>ln<6C> po<70>et argument<6E> funkc<6B>: %u\n"
 
-#: pg_resetxlog.c:451
+#: pg_resetxlog.c:453
 #, c-format
 msgid "Date/time type storage:               %s\n"
 msgstr "Zp<5A>sob ulo<6C>en<65> typu date/time:               %s\n"
 
-#: pg_resetxlog.c:452
+#: pg_resetxlog.c:454
 msgid "64-bit integers"
-msgstr "64-bitov<6F> <20><>sla"
+msgstr "64-bitov<6F> cel<65> <20><>sla"
 
-#: pg_resetxlog.c:452
+#: pg_resetxlog.c:454
-msgid "Floating point"
+msgid "floating-point numbers"
-msgstr "Plovouc<EFBFBD> <20><>rka"
+msgstr "<EFBFBD><EFBFBD>sla s plovouc<EFBFBD> <20><>rkou"
 
-#: pg_resetxlog.c:453
+#: pg_resetxlog.c:455
 #, c-format
 msgid "Maximum length of locale name:        %u\n"
 msgstr "Maxim<69>ln<6C> d<>lka jm<6A>na locale:        %u\n"
 
-#: pg_resetxlog.c:454
+#: pg_resetxlog.c:456
 #, c-format
 msgid "LC_COLLATE:                           %s\n"
 msgstr "LC_COLLATE (porovn<76>v<EFBFBD>n<EFBFBD> <20>et<65>zc<7A>):                           %s\n"
 
-#: pg_resetxlog.c:455
+#: pg_resetxlog.c:457
 #, c-format
 msgid "LC_CTYPE:                             %s\n"
 msgstr "LC_CTYPE (typy znak<61>):                             %s\n"
 
-#: pg_resetxlog.c:508
+#: pg_resetxlog.c:518
 #, c-format
 msgid "%s: internal error -- sizeof(ControlFileData) is too large ... fix xlog.c\n"
 msgstr "%s: intern<72> chyba -- sizeof(ControlFileData) je p<><70>li<6C> velk<6C> ... opravte xlog.c\n"
 
-#: pg_resetxlog.c:521
+#: pg_resetxlog.c:531
 #, c-format
 msgid "%s: could not create pg_control file: %s\n"
 msgstr "%s: nelze vytvo<76>it pg_control soubor: %s\n"
 
-#: pg_resetxlog.c:532
+#: pg_resetxlog.c:542
 #, c-format
 msgid "%s: could not write pg_control file: %s\n"
 msgstr "%s: nelze zapsat pg_control soubor: %s\n"
 
-#: pg_resetxlog.c:539
+#: pg_resetxlog.c:549
-#: pg_resetxlog.c:680
+#: pg_resetxlog.c:704
 #, c-format
 msgid "%s: fsync error: %s\n"
 msgstr "%s: fsync chyba: %s\n"
 
-#: pg_resetxlog.c:560
+#: pg_resetxlog.c:570
 #, c-format
-msgid "%s: could not open directory %s: %s\n"
+msgid "%s: could not open directory \"%s\": %s\n"
-msgstr "%s: nelze otev<65><76>t adres<65><73> %s: %s\n"
+msgstr "%s: nelze otev<65><76>t adres<65><73> \"%s\": %s\n"
-
-#: pg_resetxlog.c:574
-#, c-format
-msgid "%s: could not delete file %s: %s\n"
-msgstr "%s: nelze smazat soubor %s: %s\n"
 
 #: pg_resetxlog.c:584
 #, c-format
-msgid "%s: could not read from directory %s: %s\n"
+msgid "%s: could not delete file \"%s\": %s\n"
-msgstr "%s: nelze <EFBFBD><EFBFBD>st z adres<65><73>e %s: %s\n"
+msgstr "%s: nelze smazat soubor \"%s\": %s\n"
 
-#: pg_resetxlog.c:647
+#: pg_resetxlog.c:600
 #, c-format
-msgid "%s: could not open %s: %s\n"
+msgid "%s: could not read from directory \"%s\": %s\n"
-msgstr "%s: nelze otev<EFBFBD><EFBFBD>t %s: %s\n"
+msgstr "%s: nelze <EFBFBD><EFBFBD>st z adres<65><73>e \"%s\": %s\n"
 
-#: pg_resetxlog.c:658
+#: pg_resetxlog.c:671
-#: pg_resetxlog.c:672
 #, c-format
-msgid "%s: could not write %s: %s\n"
+msgid "%s: could not open file \"%s\": %s\n"
-msgstr "%s: nelze zapsat %s: %s\n"
+msgstr "%s: nelze otev<EFBFBD><EFBFBD>t soubor \"%s\": %s\n"
 
-#: pg_resetxlog.c:691
+#: pg_resetxlog.c:682
+#: pg_resetxlog.c:696
+#, c-format
+msgid "%s: could not write file \"%s\": %s\n"
+msgstr "%s: nelze zapsat do souboru \"%s\": %s\n"
+
+#: pg_resetxlog.c:715
 #, c-format
 msgid ""
 "%s resets the PostgreSQL transaction log.\n"
 "\n"
 msgstr ""
-"%s resetuji PostgreSQL transak<61>n<EFBFBD> log.\n"
+"%s resetuje PostgreSQL transak<61>n<EFBFBD> log.\n"
 "\n"
 
-#: pg_resetxlog.c:692
+#: pg_resetxlog.c:716
 #, c-format
 msgid ""
 "Usage:\n"
@@ -294,43 +299,43 @@ msgstr ""
 "  %s [P<>EP<45>NA<4E>]... ADRES<45><53>\n"
 "\n"
 
-#: pg_resetxlog.c:693
+#: pg_resetxlog.c:717
 msgid "Options:\n"
 msgstr "P<>ep<65>na<6E>e:\n"
 
-#: pg_resetxlog.c:694
+#: pg_resetxlog.c:718
 msgid "  -f              force update to be done\n"
 msgstr "  -f              provede vynucen<65> update\n"
 
-#: pg_resetxlog.c:695
+#: pg_resetxlog.c:719
 msgid "  -l FILEID,SEG   force minimum WAL starting location for new transaction log\n"
 msgstr "  -l FILEID,SEG   vynut<75> minim<69>ln<6C> po<70><6F>te<74>n<EFBFBD> WAL pozici pro novou transak<61>n<EFBFBD> log\n"
 
-#: pg_resetxlog.c:696
+#: pg_resetxlog.c:720
 msgid "  -n              no update, just show extracted control values (for testing)\n"
 msgstr "  -n              bez zm<7A>ny, jen uk<75><6B>e z<>skan<61> kontroln<6C> hodnoty (pro testov<6F>n<EFBFBD>)\n"
 
-#: pg_resetxlog.c:697
+#: pg_resetxlog.c:721
 msgid "  -o OID          set next OID\n"
 msgstr "  -o OID          nastav<61> n<>sleduj<75>c<EFBFBD> OID\n"
 
-#: pg_resetxlog.c:698
+#: pg_resetxlog.c:722
 msgid "  -x XID          set next transaction ID\n"
 msgstr "  -x XID          nastav<61> n<>sleduj<75>c<EFBFBD> ID transakce\n"
 
-#: pg_resetxlog.c:699
+#: pg_resetxlog.c:723
 msgid "  --help          show this help, then exit\n"
 msgstr "  --help          uk<75><6B>e tuto n<>pov<6F>du a skon<6F><6E>\n"
 
-#: pg_resetxlog.c:700
+#: pg_resetxlog.c:724
 msgid "  --version       output version information, then exit\n"
 msgstr "  --version       uk<75><6B>e informace o verzi a skon<6F><6E>\n"
 
-#: pg_resetxlog.c:701
+#: pg_resetxlog.c:725
 msgid ""
 "\n"
 "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr ""
 "\n"
-"Chybov<EFBFBD> hl<68><6C>en<65> pos<6F>lejte do <pgsql-bugs@postgresql.org>.\n"
+"Chyby hla<6C>te na adresu <pgsql-bugs@postgresql.org>.\n"
 

src/bin/pg_resetxlog/po/zh_CN.po

@@ -5,56 +5,56 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-08-05 22:13+0000\n"
+"POT-Creation-Date: 2004-08-31 08:57+0000\n"
-"PO-Revision-Date: 2003-09-15 13:47+0800\n"
+"PO-Revision-Date: 2004-01-10 13:47+0800\n"
-"Last-Translator: Bao Wei <bao_paul@yahoo.com.cn>\n"
+"Last-Translator: Bao Wei <weibao@qmail.zhengmai.net.cn>\n"
-"Language-Team: Bao Wei <bao_paul@yahoo.com.cn>\n"
+"Language-Team: Weiping He <laser@zhengmai.com.cn>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=GB2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pg_resetxlog.c:141
+#: pg_resetxlog.c:120
 #, c-format
 msgid "%s: invalid argument for option -x\n"
 msgstr "%s: Ϊ -x ѡ<><D1A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ч<EFBFBD><D0A7><EFBFBD><EFBFBD>\n"
 
-#: pg_resetxlog.c:142 pg_resetxlog.c:157 pg_resetxlog.c:172 pg_resetxlog.c:179
+#: pg_resetxlog.c:121 pg_resetxlog.c:136 pg_resetxlog.c:151 pg_resetxlog.c:158
-#: pg_resetxlog.c:185 pg_resetxlog.c:193
+#: pg_resetxlog.c:164 pg_resetxlog.c:172
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "<22><><EFBFBD><EFBFBD> \"%s --help\" <20><>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ.\n"
 
-#: pg_resetxlog.c:147
+#: pg_resetxlog.c:126
 #, c-format
 msgid "%s: transaction ID (-x) must not be 0\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD> ID (-x) <20><><EFBFBD><EFBFBD>Ϊ 0\n"
 
-#: pg_resetxlog.c:156
+#: pg_resetxlog.c:135
 #, c-format
 msgid "%s: invalid argument for option -o\n"
 msgstr "%s: Ϊ -o ѡ<><D1A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ч<EFBFBD><D0A7><EFBFBD><EFBFBD>\n"
 
-#: pg_resetxlog.c:162
+#: pg_resetxlog.c:141
 #, c-format
 msgid "%s: OID (-o) must not be 0\n"
 msgstr "%s: OID (-o) <20><><EFBFBD><EFBFBD>Ϊ 0\n"
 
-#: pg_resetxlog.c:171 pg_resetxlog.c:178
+#: pg_resetxlog.c:150 pg_resetxlog.c:157
 #, c-format
 msgid "%s: invalid argument for option -l\n"
 msgstr "%s: Ϊ -l ѡ<><D1A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ч<EFBFBD><D0A7><EFBFBD><EFBFBD>\n"
 
-#: pg_resetxlog.c:192
+#: pg_resetxlog.c:171
 #, c-format
 msgid "%s: no data directory specified\n"
 msgstr "%s: û<><C3BB>ָ<EFBFBD><D6B8><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ŀ¼\n"
 
-#: pg_resetxlog.c:212 pg_resetxlog.c:308
+#: pg_resetxlog.c:191 pg_resetxlog.c:287
 #, c-format
 msgid "%s: could not open file \"%s\" for reading: %s\n"
 msgstr "%s: <20>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD> \"%s\" <20><>ȡ<EFBFBD><C8A1>Ϣ: %s\n"
 
-#: pg_resetxlog.c:218
+#: pg_resetxlog.c:197
 #, c-format
 msgid ""
 "%s: lock file \"%s\" exists\n"
@@ -63,7 +63,8 @@ msgstr ""
 "%s: <20><><EFBFBD>ļ<EFBFBD> \"%s\" <20>Ѿ<EFBFBD><D1BE><EFBFBD><EFBFBD><EFBFBD>\n"
 "<22>Ƿ<EFBFBD><C7B7><EFBFBD>һ<EFBFBD><D2BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>? <20><><EFBFBD><EFBFBD>û<EFBFBD><C3BB>, ɾ<><C9BE><EFBFBD>Ǹ<EFBFBD><C7B8><EFBFBD><EFBFBD>ļ<EFBFBD>Ȼ<EFBFBD><C8BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><D2BB>.\n"
 
-#: pg_resetxlog.c:257
+#: pg_resetxlog.c:236
+#, c-format
 msgid ""
 "\n"
 "If these values seem acceptable, use -f to force reset.\n"
@@ -71,7 +72,8 @@ msgstr ""
 "\n"
 "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Щֵ<D0A9>ɽ<EFBFBD><C9BD><EFBFBD>, <20><> -f ǿ<><C7BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n"
 
-#: pg_resetxlog.c:269
+#: pg_resetxlog.c:248
+#, c-format
 msgid ""
 "The database server was not shut down cleanly.\n"
 "Resetting the transaction log may cause data to be lost.\n"
@@ -81,11 +83,12 @@ msgstr ""
 "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>־<EFBFBD>п<EFBFBD><D0BF>ܻ<EFBFBD><DCBB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʧ<EFBFBD><CAA7><EFBFBD><EFBFBD>.\n"
 "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><> -f ǿ<><C7BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n"
 
-#: pg_resetxlog.c:282
+#: pg_resetxlog.c:261
+#, c-format
 msgid "Transaction log reset\n"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>־<EFBFBD><D6BE><EFBFBD><EFBFBD>\n"
 
-#: pg_resetxlog.c:311
+#: pg_resetxlog.c:290
 #, c-format
 msgid ""
 "If you are sure the data directory path is correct, execute\n"
@@ -96,32 +99,33 @@ msgstr ""
 "  touch %s\n"
 "Ȼ<><C8BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><D2BB>.\n"
 
-#: pg_resetxlog.c:324
+#: pg_resetxlog.c:303
 #, c-format
 msgid "%s: could not read file \"%s\": %s\n"
 msgstr "%s: <20>޷<EFBFBD><DEB7><EFBFBD>ȡ<EFBFBD>ļ<EFBFBD> \"%s\": %s\n"
 
-#: pg_resetxlog.c:347
+#: pg_resetxlog.c:326
 #, c-format
 msgid "%s: pg_control exists but has invalid CRC; proceed with caution\n"
 msgstr "%s: pg_control <20>Ѿ<EFBFBD><D1BE><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ч<EFBFBD><D0A7>CRC; <20><><EFBFBD>о<EFBFBD><D0BE><EFBFBD><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
 
-#: pg_resetxlog.c:356
+#: pg_resetxlog.c:335
 #, c-format
 msgid "%s: pg_control exists but is broken or unknown version; ignoring it\n"
 msgstr "%s: pg_control <20>Ѿ<EFBFBD><D1BE><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD>ƻ<EFBFBD><C6BB><EFBFBD><EFBFBD><EFBFBD>Ч<EFBFBD>汾; <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
 
-#: pg_resetxlog.c:407
+#: pg_resetxlog.c:399
 #, c-format
 msgid "%s: invalid LC_COLLATE setting\n"
 msgstr "%s: <20><>Ч<EFBFBD><D0A7> LC_COLLATE <20><><EFBFBD><EFBFBD>\n"
 
-#: pg_resetxlog.c:414
+#: pg_resetxlog.c:406
 #, c-format
 msgid "%s: invalid LC_CTYPE setting\n"
 msgstr "%s: <20><>Ч<EFBFBD><D0A7> LC_CTYPE <20><><EFBFBD><EFBFBD>\n"
 
-#: pg_resetxlog.c:436
+#: pg_resetxlog.c:430
+#, c-format
 msgid ""
 "Guessed pg_control values:\n"
 "\n"
@@ -129,7 +133,8 @@ msgstr ""
 "<22>²<EFBFBD><C2B2><EFBFBD> pg_control ֵ:\n"
 "\n"
 
-#: pg_resetxlog.c:438
+#: pg_resetxlog.c:432
+#, c-format
 msgid ""
 "pg_control values:\n"
 "\n"
@@ -137,136 +142,141 @@ msgstr ""
 "pg_control ֵ:\n"
 "\n"
 
-#: pg_resetxlog.c:440
+#: pg_resetxlog.c:441
 #, c-format
 msgid "pg_control version number:            %u\n"
 msgstr "pg_control <20>汾:                      %u\n"
 
-#: pg_resetxlog.c:441
+#: pg_resetxlog.c:442
 #, c-format
 msgid "Catalog version number:               %u\n"
 msgstr "Catalog <20>汾:                         %u\n"
 
-#: pg_resetxlog.c:442
+#: pg_resetxlog.c:443
+#, c-format
+msgid "Database system identifier:           %s\n"
+msgstr "<22><><EFBFBD>ݿ<EFBFBD>ϵͳ<CFB5><CDB3>ʶ<EFBFBD><CAB6>:                     %s\n"
+
+#: pg_resetxlog.c:444
 #, c-format
 msgid "Current log file ID:                  %u\n"
 msgstr "<22><>ǰ<EFBFBD><C7B0>־<EFBFBD>ļ<EFBFBD>ID:                       %u\n"
 
-#: pg_resetxlog.c:443
+#: pg_resetxlog.c:445
 #, c-format
 msgid "Next log file segment:                %u\n"
 msgstr "<22><>һ<EFBFBD><D2BB><EFBFBD><EFBFBD>־<EFBFBD>ļ<EFBFBD><C4BC><EFBFBD>:                     %u\n"
 
-#: pg_resetxlog.c:444
+#: pg_resetxlog.c:446
 #, c-format
-msgid "Latest checkpoint's StartUpID:        %u\n"
+msgid "Latest checkpoint's TimeLineID:       %u\n"
-msgstr "<22><><EFBFBD>¼<EFBFBD><C2BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> StartUpID:               %u\n"
+msgstr "<22><><EFBFBD>¼<EFBFBD><C2BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> TimeLineID:              %u\n"
 
-#: pg_resetxlog.c:445
+#: pg_resetxlog.c:447
 #, c-format
 msgid "Latest checkpoint's NextXID:          %u\n"
 msgstr "<22><><EFBFBD>¼<EFBFBD><C2BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> NextXID:                 %u\n"
 
-#: pg_resetxlog.c:446
+#: pg_resetxlog.c:448
 #, c-format
 msgid "Latest checkpoint's NextOID:          %u\n"
 msgstr "<22><><EFBFBD>¼<EFBFBD><C2BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> NextOID:                 %u\n"
 
-#: pg_resetxlog.c:447
+#: pg_resetxlog.c:449
 #, c-format
 msgid "Database block size:                  %u\n"
 msgstr "<22><><EFBFBD>ݿ<EFBFBD><DDBF><EFBFBD><EFBFBD><EFBFBD>С:                         %u\n"
 
-#: pg_resetxlog.c:448
+#: pg_resetxlog.c:450
 #, c-format
 msgid "Blocks per segment of large relation: %u\n"
 msgstr "<22><><EFBFBD><EFBFBD>ϵ<EFBFBD><CFB5>ÿ<EFBFBD>ο<EFBFBD><CEBF><EFBFBD>:                     %u\n"
 
-#: pg_resetxlog.c:449
+#: pg_resetxlog.c:451
 #, c-format
 msgid "Maximum length of identifiers:        %u\n"
 msgstr "<22><>ʾ<EFBFBD><CABE><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>󳤶<EFBFBD>:                     %u\n"
 
-#: pg_resetxlog.c:450
+#: pg_resetxlog.c:452
 #, c-format
 msgid "Maximum number of function arguments: %u\n"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:                   %u\n"
 
-#: pg_resetxlog.c:451
+#: pg_resetxlog.c:453
 #, c-format
 msgid "Date/time type storage:               %s\n"
 msgstr "<22><><EFBFBD><EFBFBD>/ʱ<><CAB1><EFBFBD><EFBFBD><EFBFBD>ʹ洢:                    %s\n"
 
-#: pg_resetxlog.c:452
+#: pg_resetxlog.c:454
 msgid "64-bit integers"
 msgstr "64λ<34><CEBB><EFBFBD><EFBFBD>"
 
-#: pg_resetxlog.c:452
+#: pg_resetxlog.c:454
 msgid "floating-point numbers"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
-#: pg_resetxlog.c:453
+#: pg_resetxlog.c:455
 #, c-format
 msgid "Maximum length of locale name:        %u\n"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֵ<EFBFBD><D6B5><EFBFBD><EFBFBD>󳤶<EFBFBD>:                   %u\n"
 
-#: pg_resetxlog.c:454
+#: pg_resetxlog.c:456
 #, c-format
 msgid "LC_COLLATE:                           %s\n"
 msgstr "LC_COLLATE:                           %s\n"
 
-#: pg_resetxlog.c:455
+#: pg_resetxlog.c:457
 #, c-format
 msgid "LC_CTYPE:                             %s\n"
 msgstr "LC_CTYPE:                             %s\n"
 
-#: pg_resetxlog.c:508
+#: pg_resetxlog.c:518
 #, c-format
 msgid ""
 "%s: internal error -- sizeof(ControlFileData) is too large ... fix xlog.c\n"
 msgstr "%s: <20>ڲ<EFBFBD><DAB2><EFBFBD><EFBFBD><EFBFBD> -- sizeof(ControlFileData) ̫<><CCAB> ... <20>޸<EFBFBD> xlog.c\n"
 
-#: pg_resetxlog.c:521
+#: pg_resetxlog.c:531
 #, c-format
 msgid "%s: could not create pg_control file: %s\n"
 msgstr "%s: <20>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD> pg_control <20>ļ<EFBFBD>: %s\n"
 
-#: pg_resetxlog.c:532
+#: pg_resetxlog.c:542
 #, c-format
 msgid "%s: could not write pg_control file: %s\n"
 msgstr "%s: <20>޷<EFBFBD>д pg_control <20>ļ<EFBFBD>: %s\n"
 
-#: pg_resetxlog.c:539 pg_resetxlog.c:680
+#: pg_resetxlog.c:549 pg_resetxlog.c:705
 #, c-format
 msgid "%s: fsync error: %s\n"
 msgstr "%s: fsync <20><><EFBFBD><EFBFBD>: %s\n"
 
-#: pg_resetxlog.c:560
+#: pg_resetxlog.c:570
 #, c-format
 msgid "%s: could not open directory \"%s\": %s\n"
 msgstr "%s: <20>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD>Ŀ¼ \"%s\": %s\n"
 
-#: pg_resetxlog.c:574
+#: pg_resetxlog.c:584
 #, c-format
 msgid "%s: could not delete file \"%s\": %s\n"
 msgstr "%s: <20>޷<EFBFBD>ɾ<EFBFBD><C9BE><EFBFBD>ļ<EFBFBD> \"%s\": %s\n"
 
-#: pg_resetxlog.c:584
+#: pg_resetxlog.c:603
 #, c-format
 msgid "%s: could not read from directory \"%s\": %s\n"
 msgstr "%s: <20>޷<EFBFBD><DEB7><EFBFBD>Ŀ¼ \"%s\" <20>ж<EFBFBD>ȡ: %s\n"
 
-#: pg_resetxlog.c:647
+#: pg_resetxlog.c:672
 #, c-format
 msgid "%s: could not open file \"%s\": %s\n"
 msgstr "%s: <20>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD> \"%s\": %s\n"
 
-#: pg_resetxlog.c:658 pg_resetxlog.c:672
+#: pg_resetxlog.c:683 pg_resetxlog.c:697
 #, c-format
 msgid "%s: could not write file \"%s\": %s\n"
 msgstr "%s: <20>޷<EFBFBD>д<EFBFBD>ļ<EFBFBD> \"%s\": %s\n"
 
-#: pg_resetxlog.c:691
+#: pg_resetxlog.c:716
 #, c-format
 msgid ""
 "%s resets the PostgreSQL transaction log.\n"
@@ -275,7 +285,7 @@ msgstr ""
 "%s <20><><EFBFBD><EFBFBD> PostgreSQL <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>־.\n"
 "\n"
 
-#: pg_resetxlog.c:692
+#: pg_resetxlog.c:717
 #, c-format
 msgid ""
 "Usage:\n"
@@ -286,43 +296,52 @@ msgstr ""
 "  %s [ѡ<><D1A1>]... <20><><EFBFBD><EFBFBD>Ŀ¼\n"
 "\n"
 
-#: pg_resetxlog.c:693
+#: pg_resetxlog.c:718
+#, c-format
 msgid "Options:\n"
 msgstr "ѡ<><D1A1>:\n"
 
-#: pg_resetxlog.c:694
+#: pg_resetxlog.c:719
+#, c-format
 msgid "  -f              force update to be done\n"
 msgstr "  -f                ǿ<>Ƹ<EFBFBD><C6B8><EFBFBD>\n"
 
-#: pg_resetxlog.c:695
+#: pg_resetxlog.c:720
+#, c-format
 msgid ""
 "  -l FILEID,SEG   force minimum WAL starting location for new transaction "
 "log\n"
 msgstr "  -l FILEID,SEG     <20><><EFBFBD>µ<EFBFBD><C2B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>־<EFBFBD><D6BE>ǿ<EFBFBD><C7BF><EFBFBD><EFBFBD>С WAL <20><>ʼλ<CABC><CEBB>\n"
 
-#: pg_resetxlog.c:696
+#: pg_resetxlog.c:721
+#, c-format
 msgid ""
 "  -n              no update, just show extracted control values (for "
 "testing)\n"
 msgstr "  -n                δ<><CEB4><EFBFBD><EFBFBD>, ֻ<><D6BB>ʾ<EFBFBD><CABE>ȡ<EFBFBD>Ŀ<EFBFBD><C4BF><EFBFBD>ֵ (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>;)\n"
 
-#: pg_resetxlog.c:697
+#: pg_resetxlog.c:722
+#, c-format
 msgid "  -o OID          set next OID\n"
 msgstr "  -o OID            <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><D2BB> OID\n"
 
-#: pg_resetxlog.c:698
+#: pg_resetxlog.c:723
+#, c-format
 msgid "  -x XID          set next transaction ID\n"
 msgstr "  -x XID            <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><D2BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ID\n"
 
-#: pg_resetxlog.c:699
+#: pg_resetxlog.c:724
+#, c-format
 msgid "  --help          show this help, then exit\n"
 msgstr "  --help            <20><>ʾ<EFBFBD>˰<EFBFBD><CBB0><EFBFBD><EFBFBD><EFBFBD>Ϣ, Ȼ<><C8BB><EFBFBD>˳<EFBFBD>\n"
 
-#: pg_resetxlog.c:700
+#: pg_resetxlog.c:725
+#, c-format
 msgid "  --version       output version information, then exit\n"
 msgstr "  --version         <20><><EFBFBD><EFBFBD><EFBFBD>汾<EFBFBD><E6B1BE>Ϣ, Ȼ<><C8BB><EFBFBD>˳<EFBFBD>\n"
 
-#: pg_resetxlog.c:701
+#: pg_resetxlog.c:726
+#, c-format
 msgid ""
 "\n"
 "Report bugs to <pgsql-bugs@postgresql.org>.\n"
@@ -330,6 +349,9 @@ msgstr ""
 "\n"
 "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <pgsql-bugs@postgresql.org>.\n"
 
+#~ msgid "Latest checkpoint's StartUpID:        %u\n"
+#~ msgstr "<22><><EFBFBD>¼<EFBFBD><C2BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> StartUpID:               %u\n"
+
 #~ msgid "%s: invalid argument for -x option\n"
 #~ msgstr "%s: Ϊ -x ѡ<><D1A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ч<EFBFBD><D0A7><EFBFBD><EFBFBD>\n"
 

src/bin/scripts/po/zh_CN.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-06-26 10:44+0000\n"
+"POT-Creation-Date: 2004-08-31 08:56+0000\n"
 "PO-Revision-Date: 2003-09-15 21:03+0000\n"
 "Last-Translator: Bao Wei <weibao@qmail.zhengmai.net.cn>\n"
 "Language-Team: Weiping He <laser@zhengmai.com.cn>\n"
@@ -17,13 +17,13 @@ msgstr ""
 #: createdb.c:102 createdb.c:121 createlang.c:97 createlang.c:118
 #: createlang.c:160 createuser.c:117 createuser.c:132 dropdb.c:84 dropdb.c:93
 #: dropdb.c:101 droplang.c:94 droplang.c:115 droplang.c:157 dropuser.c:84
-#: dropuser.c:99 clusterdb.c:97 clusterdb.c:112 vacuumdb.c:114 vacuumdb.c:129
+#: dropuser.c:99 clusterdb.c:95 clusterdb.c:110 vacuumdb.c:112 vacuumdb.c:127
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "<22><><EFBFBD><EFBFBD> \"%s --help\" <20><>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ.\n"
 
 #: createdb.c:119 createlang.c:116 createuser.c:130 dropdb.c:99 droplang.c:113
-#: dropuser.c:97 clusterdb.c:110 vacuumdb.c:127
+#: dropuser.c:97 clusterdb.c:108 vacuumdb.c:125
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: ̫<><CCAB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>в<EFBFBD><D0B2><EFBFBD> (<28><>һ<EFBFBD><D2BB><EFBFBD><EFBFBD> \"%s\")\n"
@@ -53,7 +53,7 @@ msgstr ""
 "\n"
 
 #: createdb.c:218 createlang.c:299 createuser.c:240 dropdb.c:147
-#: droplang.c:280 dropuser.c:147 clusterdb.c:236 vacuumdb.c:262
+#: droplang.c:280 dropuser.c:147 clusterdb.c:234 vacuumdb.c:260
 #, c-format
 msgid "Usage:\n"
 msgstr "ʹ<>÷<EFBFBD><C3B7><EFBFBD>:\n"
@@ -64,7 +64,7 @@ msgid "  %s [OPTION]... [DBNAME] [DESCRIPTION]\n"
 msgstr "  %s [ѡ<><D1A1>]... [<5B><><EFBFBD>ݿ<EFBFBD><DDBF><EFBFBD><EFBFBD><EFBFBD>] [<5B><><EFBFBD><EFBFBD>]\n"
 
 #: createdb.c:220 createlang.c:301 createuser.c:242 dropdb.c:149
-#: droplang.c:282 dropuser.c:149 clusterdb.c:238 vacuumdb.c:264
+#: droplang.c:282 dropuser.c:149 clusterdb.c:236 vacuumdb.c:262
 #, c-format
 msgid ""
 "\n"
@@ -114,7 +114,7 @@ msgstr "  --help
 msgid "  --version                    output version information, then exit\n"
 msgstr "  --versoin                    <20><><EFBFBD><EFBFBD><EFBFBD>汾<EFBFBD><E6B1BE>Ϣ, Ȼ<><C8BB><EFBFBD>˳<EFBFBD>\n"
 
-#: createdb.c:229 createuser.c:255 clusterdb.c:246 vacuumdb.c:275
+#: createdb.c:229 createuser.c:255 clusterdb.c:244 vacuumdb.c:273
 #, c-format
 msgid ""
 "\n"
@@ -155,7 +155,7 @@ msgstr ""
 "Ĭ<><C4AC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20>Ե<EFBFBD>ǰ<EFBFBD>û<EFBFBD><C3BB><EFBFBD><EFBFBD>û<EFBFBD><C3BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD>.\n"
 
 #: createdb.c:235 createlang.c:312 createuser.c:262 dropdb.c:159
-#: droplang.c:292 dropuser.c:159 clusterdb.c:252 vacuumdb.c:281
+#: droplang.c:292 dropuser.c:159 clusterdb.c:250 vacuumdb.c:279
 #, c-format
 msgid ""
 "\n"
@@ -232,7 +232,7 @@ msgid "  -d, --dbname=DBNAME       database to install language in\n"
 msgstr "  -d, --dbname=DBNAME       Ҫ<><D2AA>װ<EFBFBD><D7B0><EFBFBD>Ե<EFBFBD><D4B5><EFBFBD><EFBFBD>ݿ<EFBFBD>\n"
 
 #: createlang.c:303 createuser.c:251 dropdb.c:150 droplang.c:284
-#: dropuser.c:150 clusterdb.c:242
+#: dropuser.c:150 clusterdb.c:240
 #, c-format
 msgid ""
 "  -e, --echo                show the commands being sent to the server\n"
@@ -251,35 +251,35 @@ msgid ""
 msgstr "  -L, --pglib=DIRECTORY     <20><> DIRECTORY Ŀ¼<C4BF>в<EFBFBD><D0B2><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Է<EFBFBD><D4B7><EFBFBD><EFBFBD>ļ<EFBFBD>\n"
 
 #: createlang.c:306 createuser.c:256 dropdb.c:153 droplang.c:286
-#: dropuser.c:153 clusterdb.c:247 vacuumdb.c:276
+#: dropuser.c:153 clusterdb.c:245 vacuumdb.c:274
 #, c-format
 msgid "  -h, --host=HOSTNAME       database server host or socket directory\n"
 msgstr "  -h, --host=HOSTNAM        <20><><EFBFBD>ݿ<EFBFBD><DDBF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڻ<EFBFBD><DABB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>׽<EFBFBD><D7BD><EFBFBD>Ŀ¼\n"
 
 #: createlang.c:307 createuser.c:257 dropdb.c:154 droplang.c:287
-#: dropuser.c:154 clusterdb.c:248 vacuumdb.c:277
+#: dropuser.c:154 clusterdb.c:246 vacuumdb.c:275
 #, c-format
 msgid "  -p, --port=PORT           database server port\n"
 msgstr "  -p, --port=PORT           <20><><EFBFBD>ݿ<EFBFBD><DDBF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˿ں<CBBF>\n"
 
-#: createlang.c:308 dropdb.c:155 droplang.c:288 clusterdb.c:249 vacuumdb.c:278
+#: createlang.c:308 dropdb.c:155 droplang.c:288 clusterdb.c:247 vacuumdb.c:276
 #, c-format
 msgid "  -U, --username=USERNAME   user name to connect as\n"
 msgstr "  -U, --username=USERNAME   <20><><EFBFBD>ӵ<EFBFBD><D3B5>û<EFBFBD><C3BB><EFBFBD>\n"
 
-#: createlang.c:309 dropdb.c:156 droplang.c:289 clusterdb.c:250 vacuumdb.c:279
+#: createlang.c:309 dropdb.c:156 droplang.c:289 clusterdb.c:248 vacuumdb.c:277
 #, c-format
 msgid "  -W, --password            prompt for password\n"
 msgstr "  -W, --password            <20><>ʾ<EFBFBD><CABE><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
 
 #: createlang.c:310 createuser.c:253 dropdb.c:157 droplang.c:290
-#: dropuser.c:157 clusterdb.c:244
+#: dropuser.c:157 clusterdb.c:242
 #, c-format
 msgid "  --help                    show this help, then exit\n"
 msgstr "  --help                    <20><>ʾ<EFBFBD>˰<EFBFBD><CBB0><EFBFBD><EFBFBD><EFBFBD>Ϣ, Ȼ<><C8BB><EFBFBD>˳<EFBFBD>\n"
 
 #: createlang.c:311 createuser.c:254 dropdb.c:158 droplang.c:291
-#: dropuser.c:158 clusterdb.c:245
+#: dropuser.c:158 clusterdb.c:243
 #, c-format
 msgid "  --version                 output version information, then exit\n"
 msgstr "  --version                 <20><><EFBFBD><EFBFBD><EFBFBD>汾<EFBFBD><E6B1BE>Ϣ, Ȼ<><C8BB><EFBFBD>˳<EFBFBD>\n"
@@ -373,7 +373,7 @@ msgstr "  -N, --unencrypted
 msgid "  -i, --sysid=SYSID         select sysid for new user\n"
 msgstr "  -i, --sysid=SYSID         ѡ<><D1A1>һ<EFBFBD><D2BB> sysid <20><><EFBFBD><EFBFBD><EFBFBD>û<EFBFBD>\n"
 
-#: createuser.c:252 dropdb.c:152 dropuser.c:152 clusterdb.c:243
+#: createuser.c:252 dropdb.c:152 dropuser.c:152 clusterdb.c:241
 #, c-format
 msgid "  -q, --quiet               don't write any messages\n"
 msgstr "  -q, --quiet               <20><>д<EFBFBD>κ<EFBFBD><CEBA><EFBFBD>Ϣ\n"
@@ -498,32 +498,32 @@ msgid ""
 "  -U, --username=USERNAME   user name to connect as (not the one to drop)\n"
 msgstr "  -U, --username=USERNAME   <20><><EFBFBD><EFBFBD><EFBFBD>û<EFBFBD> (<28><><EFBFBD><EFBFBD>Ҫɾ<D2AA><C9BE><EFBFBD><EFBFBD><EFBFBD>û<EFBFBD><C3BB><EFBFBD>)\n"
 
-#: clusterdb.c:120
+#: clusterdb.c:118
 #, c-format
 msgid "%s: cannot cluster all databases and a specific one at the same time\n"
 msgstr "%s: <20>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD><DDBF><EFBFBD>һ<EFBFBD><D2BB>ָ<EFBFBD><D6B8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD>ͬʱ<CDAC><CAB1><EFBFBD><EFBFBD>\n"
 
-#: clusterdb.c:126
+#: clusterdb.c:124
 #, c-format
 msgid "%s: cannot cluster a specific table in all databases\n"
 msgstr "%s: <20>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD><DDBF>ж<EFBFBD>һ<EFBFBD><D2BB>ָ<EFBFBD><D6B8><EFBFBD>ı<EFBFBD><C4B1><EFBFBD><EFBFBD>н<EFBFBD><D0BD><EFBFBD>\n"
 
-#: clusterdb.c:182
+#: clusterdb.c:180
 #, c-format
 msgid "%s: clustering of table \"%s\" in database \"%s\" failed: %s"
 msgstr "%1$s: <20><><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD> \"%3$s\" <20>еı<D0B5> \"%2$s\" <20><><EFBFBD><EFBFBD>ʧ<EFBFBD><CAA7>: %4$s"
 
-#: clusterdb.c:185
+#: clusterdb.c:183
 #, c-format
 msgid "%s: clustering of database \"%s\" failed: %s"
 msgstr "%s: <20><><EFBFBD>ݿ<EFBFBD> \"%s\" <20><><EFBFBD><EFBFBD>ʧ<EFBFBD><CAA7>: %s"
 
-#: clusterdb.c:221
+#: clusterdb.c:219
 #, c-format
 msgid "%s: clustering database \"%s\"\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD> \"%s\" <20><><EFBFBD>н<EFBFBD><D0BD><EFBFBD>\n"
 
-#: clusterdb.c:235
+#: clusterdb.c:233
 #, c-format
 msgid ""
 "%s clusters all previously clustered tables in a database.\n"
@@ -532,27 +532,27 @@ msgstr ""
 "%s <20><>һ<EFBFBD><D2BB><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD><DDBF><EFBFBD><EFBFBD><EFBFBD>ǰ<EFBFBD>Ѿ<EFBFBD><D1BE><EFBFBD><EFBFBD><EFBFBD><EFBFBD>صı<D8B5><C4B1><EFBFBD><EFBFBD>н<EFBFBD><D0BD><EFBFBD>.\n"
 "\n"
 
-#: clusterdb.c:237 vacuumdb.c:263
+#: clusterdb.c:235 vacuumdb.c:261
 #, c-format
 msgid "  %s [OPTION]... [DBNAME]\n"
 msgstr "  %s [ѡ<><D1A1>]... [<5B><><EFBFBD>ݿ<EFBFBD><DDBF><EFBFBD>]\n"
 
-#: clusterdb.c:239
+#: clusterdb.c:237
 #, c-format
 msgid "  -a, --all                 cluster all databases\n"
 msgstr "  -a, --all                 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݿ⽨<DDBF><E2BDA8>\n"
 
-#: clusterdb.c:240
+#: clusterdb.c:238
 #, c-format
 msgid "  -d, --dbname=DBNAME       database to cluster\n"
 msgstr "  -d, --dbname=DBNAME       <20><><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD> DBNAME <20><><EFBFBD><EFBFBD>\n"
 
-#: clusterdb.c:241
+#: clusterdb.c:239
 #, c-format
 msgid "  -t, --table=TABLE         cluster specific table only\n"
 msgstr "  -t, --table=TABLE         ֻ<><D6BB>ָ<EFBFBD><D6B8><EFBFBD>ı<EFBFBD> TABLE <20><><EFBFBD><EFBFBD>\n"
 
-#: clusterdb.c:251
+#: clusterdb.c:249
 #, c-format
 msgid ""
 "\n"
@@ -561,32 +561,32 @@ msgstr ""
 "\n"
 "<22>Ķ<EFBFBD> SQL <20><><EFBFBD><EFBFBD> CLUSTER <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ, <20>Ա<EFBFBD><D4B1><EFBFBD><EFBFBD>ø<EFBFBD><C3B8><EFBFBD>ϸ<EFBFBD><CFB8><EFBFBD><EFBFBD>Ϣ.\n"
 
-#: vacuumdb.c:137
+#: vacuumdb.c:135
 #, c-format
 msgid "%s: cannot vacuum all databases and a specific one at the same time\n"
 msgstr "%s: <20>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD><DDBF><EFBFBD>һ<EFBFBD><D2BB>ָ<EFBFBD><D6B8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD>ͬʱ<CDAC><CAB1><EFBFBD><EFBFBD>\n"
 
-#: vacuumdb.c:143
+#: vacuumdb.c:141
 #, c-format
 msgid "%s: cannot vacuum a specific table in all databases\n"
 msgstr "%s: <20>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD><DDBF>ж<EFBFBD>һ<EFBFBD><D2BB>ָ<EFBFBD><D6B8><EFBFBD>ı<EFBFBD><C4B1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
 
-#: vacuumdb.c:207
+#: vacuumdb.c:205
 #, c-format
 msgid "%s: vacuuming of table \"%s\" in database \"%s\" failed: %s"
 msgstr "%1$s: <20><><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD> \"%3$s\" <20>еı<D0B5> \"%2$s\" <20><><EFBFBD><EFBFBD>ʧ<EFBFBD><CAA7>: %4$s"
 
-#: vacuumdb.c:210
+#: vacuumdb.c:208
 #, c-format
 msgid "%s: vacuuming of database \"%s\" failed: %s"
 msgstr "%s: <20><><EFBFBD>ݿ<EFBFBD> \"%s\" <20><><EFBFBD><EFBFBD>ʧ<EFBFBD><CAA7>: %s"
 
-#: vacuumdb.c:247
+#: vacuumdb.c:245
 #, c-format
 msgid "%s: vacuuming database \"%s\"\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD> \"%s\"\n"
 
-#: vacuumdb.c:261
+#: vacuumdb.c:259
 #, c-format
 msgid ""
 "%s cleans and analyzes a PostgreSQL database.\n"
@@ -595,60 +595,60 @@ msgstr ""
 "%s <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ż<EFBFBD>һ<EFBFBD><D2BB> PostgreSQL <20><><EFBFBD>ݿ<EFBFBD>.\n"
 "\n"
 
-#: vacuumdb.c:265
+#: vacuumdb.c:263
 #, c-format
 msgid "  -a, --all                       vacuum all databases\n"
 msgstr "  -a, --all                       <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>е<EFBFBD><D0B5><EFBFBD><EFBFBD>ݿ<EFBFBD>\n"
 
-#: vacuumdb.c:266
+#: vacuumdb.c:264
 #, c-format
 msgid "  -d, --dbname=DBNAME             database to vacuum\n"
 msgstr "  -d, --dbname=DBNAME             <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD> DBNAME\n"
 
-#: vacuumdb.c:267
+#: vacuumdb.c:265
 #, c-format
 msgid "  -t, --table='TABLE[(COLUMNS)]'  vacuum specific table only\n"
 msgstr "  -t, --table='TABLE[(COLUMNS)]'  ֻ<><D6BB><EFBFBD><EFBFBD>ָ<EFBFBD><D6B8><EFBFBD>ı<EFBFBD> TABLE\n"
 
-#: vacuumdb.c:268
+#: vacuumdb.c:266
 #, c-format
 msgid "  -f, --full                      do full vacuuming\n"
 msgstr "  -f, --full                      <20><>ȫ<EFBFBD><C8AB><EFBFBD><EFBFBD>\n"
 
-#: vacuumdb.c:269
+#: vacuumdb.c:267
 #, c-format
 msgid "  -z, --analyze                   update optimizer hints\n"
 msgstr "  -z, --anaylze                   <20><><EFBFBD><EFBFBD><EFBFBD>Ż<EFBFBD><C5BB><EFBFBD><EFBFBD><EFBFBD>Ϣ\n"
 
-#: vacuumdb.c:270
+#: vacuumdb.c:268
 #, c-format
 msgid ""
 "  -e, --echo                      show the commands being sent to the "
 "server\n"
 msgstr "  -e, --echo                      <20><>ʾ<EFBFBD><CABE><EFBFBD>͵<EFBFBD><CDB5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˵<EFBFBD><CBB5><EFBFBD><EFBFBD><EFBFBD>\n"
 
-#: vacuumdb.c:271
+#: vacuumdb.c:269
 #, c-format
 msgid "  -q, --quiet                     don't write any messages\n"
 msgstr "  -q, --quiet                     <20><>д<EFBFBD>κ<EFBFBD><CEBA><EFBFBD>Ϣ\n"
 
-#: vacuumdb.c:272
+#: vacuumdb.c:270
 #, c-format
 msgid "  -v, --verbose                   write a lot of output\n"
 msgstr "  -v, --verbose                   д<><D0B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
 
-#: vacuumdb.c:273
+#: vacuumdb.c:271
 #, c-format
 msgid "  --help                          show this help, then exit\n"
 msgstr "  --help                          <20><>ʾ<EFBFBD>˰<EFBFBD><CBB0><EFBFBD><EFBFBD><EFBFBD>Ϣ, Ȼ<><C8BB><EFBFBD>˳<EFBFBD>\n"
 
-#: vacuumdb.c:274
+#: vacuumdb.c:272
 #, c-format
 msgid ""
 "  --version                       output version information, then exit\n"
 msgstr "  --versoin                       <20><><EFBFBD><EFBFBD><EFBFBD>汾<EFBFBD><E6B1BE>Ϣ, Ȼ<><C8BB><EFBFBD>˳<EFBFBD>\n"
 
-#: vacuumdb.c:280
+#: vacuumdb.c:278
 #, c-format
 msgid ""
 "\n"

src/interfaces/libpq/po/cs.po

@@ -1,14 +1,14 @@
 # Czech translation of libpq messages
 # Karel Zak <zakkr@zf.jcu.cz>, 2001-2003.
 #
-# $PostgreSQL: pgsql/src/interfaces/libpq/po/cs.po,v 1.3 2003/11/29 22:41:29 pgsql Exp $
+# $PostgreSQL: pgsql/src/interfaces/libpq/po/cs.po,v 1.4 2004/09/13 12:26:47 petere Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.4\n"
-"POT-Creation-Date: 2003-06-29 12:25+0200\n"
+"POT-Creation-Date: 2004-08-12 01:17-0300\n"
-"PO-Revision-Date: 2003-07-22 13:40+0100\n"
+"PO-Revision-Date: 2004-08-12 22:04+0100\n"
-"Last-Translator: Karel Zak <zakkr@zf.jcu.cz>\n"
+"Last-Translator: Michal Taborsky <michal@taborsky.cz>\n"
 "Language-Team: Karel Zak <zakkr@zf.jcu.cz>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
@@ -22,7 +22,7 @@ msgstr "Kerberos 4 chyba: %s\n"
 #: fe-auth.c:394
 #, c-format
 msgid "could not set socket to blocking mode: %s\n"
-msgstr "nelze nastavit blokovan<EFBFBD> m<>d soketu: %s\n"
+msgstr "nelze nastavit soket do blokuj<75>c<EFBFBD>ho m<>du: %s\n"
 
 #: fe-auth.c:411
 #: fe-auth.c:415
@@ -33,9 +33,9 @@ msgstr "Kerberos 5 autentifikace odm
 #: fe-auth.c:441
 #, c-format
 msgid "could not restore non-blocking mode on socket: %s\n"
-msgstr "nelze obnovit neblokovan<EFBFBD> m<>d soketu: %s\n"
+msgstr "nelze obnovit neblokuj<EFBFBD>c<EFBFBD> m<>d soketu: %s\n"
 
-#: fe-auth.c:509
+#: fe-auth.c:508
 msgid "SCM_CRED authentication method not supported\n"
 msgstr "autentifika<6B>n<EFBFBD> metoda SCM_CRED nen<65> podporov<6F>na\n"
 
@@ -43,44 +43,54 @@ msgstr "autentifika
 msgid "Kerberos 4 authentication failed\n"
 msgstr "Kerberos 4 autentifikace selhala\n"
 
-#: fe-auth.c:606
+#: fe-auth.c:608
 msgid "Kerberos 4 authentication not supported\n"
 msgstr "Kerberos 4 autentifikace nen<65> podporov<6F>na\n"
 
-#: fe-auth.c:616
+#: fe-auth.c:619
 msgid "Kerberos 5 authentication failed\n"
 msgstr "Kerberos 5 autentifikace selhala\n"
 
-#: fe-auth.c:622
+#: fe-auth.c:627
 msgid "Kerberos 5 authentication not supported\n"
 msgstr "Kerberos 5 autentifikace nen<65> podporov<6F>na\n"
 
-#: fe-auth.c:650
+#: fe-auth.c:655
 #, c-format
 msgid "authentication method %u not supported\n"
 msgstr "autentifika<6B>n<EFBFBD> metoda %u nen<65> podporov<6F>na\n"
 
-#: fe-auth.c:687
+#: fe-auth.c:692
 #, c-format
 msgid "invalid authentication service name \"%s\", ignored\n"
-msgstr "neplatn<74> jm<6A>no autentifika<6B>n<EFBFBD> slu<6C>by \"%s\" ignorov<6F>no\n"
+msgstr "neplatn<74> jm<6A>no autentifika<6B>n<EFBFBD> slu<6C>by \"%s\", ignorov<6F>no\n"
 
-#: fe-auth.c:758
+#: fe-auth.c:764
 #, c-format
 msgid "fe_getauthname: invalid authentication system: %d\n"
 msgstr "fe_getauthname: neplatn<74> autentifika<6B>n<EFBFBD> syst<73>m: %d\n"
 
-#: fe-connect.c:717
+#: fe-connect.c:452
+#, c-format
+msgid "invalid sslmode value: \"%s\"\n"
+msgstr "neplatn<74> hodnota sslmode: \"%s\"\n"
+
+#: fe-connect.c:472
+#, c-format
+msgid "sslmode value \"%s\" invalid when SSL support is not compiled in\n"
+msgstr "hodnota sslmode \"%s\" je naplatn<74> pokud nen<65> zakompilov<6F>na podpora SSL\n"
+
+#: fe-connect.c:783
 #, c-format
 msgid "could not set socket to non-blocking mode: %s\n"
-msgstr "nelze nastavit neblokovan<EFBFBD> m<>d soketu: %s\n"
+msgstr "nelze nastavit soket do neblokuj<75>c<EFBFBD>ho m<>du: %s\n"
 
-#: fe-connect.c:744
+#: fe-connect.c:810
 #, c-format
 msgid "could not set socket to TCP no delay mode: %s\n"
 msgstr "nelze nastavit \"no delay\" m<>d TCP soketu: %s\n"
 
-#: fe-connect.c:772
+#: fe-connect.c:841
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -91,241 +101,251 @@ msgstr ""
 "\tJe spu<70>t<EFBFBD>n server lok<6F>ln<6C> a akceptuje\n"
 "\tspojen<65> pomoc<6F> Unix soketu \"%s\"?\n"
 
-#: fe-connect.c:780
+#: fe-connect.c:853
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
-"\tIs the server running on host %s and accepting\n"
+"\tIs the server running on host \"%s\" and accepting\n"
 "\tTCP/IP connections on port %s?\n"
 msgstr ""
 "nelze nav<61>zat spojen<65> se serverem: %s\n"
-"\tJe server na %s spu<70>t<EFBFBD>n a akceptuje\n"
+"\tJe server na \"%s\" spu<70>t<EFBFBD>n a akceptuje\n"
 "\tTCP/IP spojen<65> na portu %s?\n"
 
-#: fe-connect.c:862
+#: fe-connect.c:945
 #, c-format
-msgid "getaddrinfo() failed: %s\n"
+msgid "could not translate host name \"%s\" to address: %s\n"
-msgstr "getaddrinfo() selhal: %s\n"
+msgstr "nemohu p<>elo<6C>it jm<6A>no hostitele \"%s\" na adresu: %s\n"
 
-#: fe-connect.c:1056
+#: fe-connect.c:949
+#, c-format
+msgid "could not translate Unix-domain socket path \"%s\" to address: %s\n"
+msgstr "nemohu p<>elo<6C>it cestu Unix-domain soketu \"%s\" na adresu: %s\n"
+
+#: fe-connect.c:1153
 msgid "invalid connection state, probably indicative of memory corruption\n"
-msgstr "neplatn<74> status spojen<65>, pravd<76>podobn<62> indikuj<75>c<EFBFBD> poru<72>en<65> pam<61>ti\n"
+msgstr "neplatn<74> stav spojen<65>, pravd<76>podobn<62> indikuj<75>c<EFBFBD> poru<72>en<65> pam<61>ti\n"
 
-#: fe-connect.c:1101
+#: fe-connect.c:1196
 #, c-format
 msgid "could not create socket: %s\n"
 msgstr "nelze vytvo<76>it soket: %s\n"
 
-#: fe-connect.c:1207
+#: fe-connect.c:1307
 #, c-format
 msgid "could not get socket error status: %s\n"
 msgstr "nelze obdr<64>et chybov<6F> status soketu: %s\n"
 
-#: fe-connect.c:1244
+#: fe-connect.c:1346
 #, c-format
 msgid "could not get client address from socket: %s\n"
 msgstr "nelze z<>skat adresu klienta ze soketu: %s\n"
 
-#: fe-connect.c:1289
+#: fe-connect.c:1391
 #, c-format
 msgid "could not send SSL negotiation packet: %s\n"
 msgstr "nelze poslat SSL \"negotiation packet\": %s\n"
 
-#: fe-connect.c:1311
+#: fe-connect.c:1413
-#: fe-connect.c:2361
+#: fe-connect.c:2536
-#: fe-connect.c:2370
+#: fe-connect.c:2545
-#: fe-connect.c:2937
+#: fe-connect.c:3122
-#: fe-lobj.c:538
+#: fe-lobj.c:548
 msgid "out of memory\n"
 msgstr "nedostatek pam<61>ti\n"
 
-#: fe-connect.c:1324
+#: fe-connect.c:1426
 #, c-format
 msgid "could not send startup packet: %s\n"
 msgstr "nelze poslat po<70><6F>te<74>n<EFBFBD> paket: %s\n"
 
-#: fe-connect.c:1364
+#: fe-connect.c:1466
 #, c-format
 msgid "could not receive server response to SSL negotiation packet: %s\n"
 msgstr "nelze obdr<64>et odpov<6F><76> serveru na SSL \"negotiation packet\": %s\n"
 
-#: fe-connect.c:1383
+#: fe-connect.c:1485
-#: fe-connect.c:1400
+#: fe-connect.c:1502
 msgid "server does not support SSL, but SSL was required\n"
 msgstr "server nepodporuje SSL, le<6C> SSL je vy<76>adov<6F>no\n"
 
-#: fe-connect.c:1416
+#: fe-connect.c:1518
 #, c-format
 msgid "received invalid response to SSL negotiation: %c\n"
 msgstr "p<>ijata neplatn<74> odpov<6F><76> na SSL negotiation: %c\n"
 
-#: fe-connect.c:1472
+#: fe-connect.c:1575
-#: fe-connect.c:1504
+#: fe-connect.c:1607
 #, c-format
 msgid "expected authentication request from server, but received %c\n"
 msgstr "o<>ek<65>v<EFBFBD>n byl autentifika<6B>n<EFBFBD> dotaz ze serveru, ale p<>ijat byl %c\n"
 
-#: fe-connect.c:1698
+#: fe-connect.c:1843
 msgid "unexpected message from server during startup\n"
 msgstr "neo<65>ek<65>van<61> zpr<70>va ze serveru b<>hem startu\n"
 
-#: fe-connect.c:1767
+#: fe-connect.c:1913
 #, c-format
 msgid "invalid connection state %c, probably indicative of memory corruption\n"
 msgstr "neplatn<74> status spojen<65> %c, pravd<76>podobn<62> indikuj<75>c<EFBFBD> poru<72>en<65> pam<61>ti\n"
 
-#: fe-connect.c:2409
+#: fe-connect.c:2584
 #, c-format
 msgid "missing \"=\" after \"%s\" in connection info string\n"
 msgstr "chybn<62> \"=\" po \"%s\" v informa<6D>n<EFBFBD>m <20>et<65>zci spojen<65>\n"
 
-#: fe-connect.c:2458
+#: fe-connect.c:2633
 msgid "unterminated quoted string in connection info string\n"
 msgstr "neukon<6F>en<65> <20>et<65>zec v uvozovk<76>ch v informa<6D>n<EFBFBD>m <20>et<65>zci spojen<65>\n"
 
-#: fe-connect.c:2492
+#: fe-connect.c:2667
 #, c-format
 msgid "invalid connection option \"%s\"\n"
 msgstr "neplatn<74> parametr spojen<65> \"%s\"\n"
 
-#: fe-connect.c:2704
+#: fe-connect.c:2889
 msgid "connection pointer is NULL\n"
 msgstr "pointer spojen<65> je NULL\n"
 
-#: fe-connect.c:2955
+#: fe-connect.c:3140
 #, c-format
 msgid "WARNING: Password file %s has world or group read access; permission should be u=rw (0600)\n"
 msgstr "UPOZORN<52>N<EFBFBD>: Soubor s hesly %s m<> p<><70>stupov<6F> pr<70>va pro <20>ten<65> pro skupinu nebo v<>echny u<>ivatele; pr<70>va by m<>la b<>t u=rw (0600)\n"
 
-#: fe-exec.c:474
+#: fe-exec.c:484
 msgid "NOTICE"
 msgstr "POZN<5A>MKA"
 
-#: fe-exec.c:623
+#: fe-exec.c:653
-#: fe-exec.c:682
+#: fe-exec.c:705
 msgid "command string is a null pointer\n"
-msgstr "<22>et<65>zec p<><70>kazu je NULL\n"
+msgstr "<22>et<65>zec p<><70>kazu je pr<EFBFBD>zdn<EFBFBD> ukazatel\n"
 
-#: fe-exec.c:675
+#: fe-exec.c:740
-#: fe-exec.c:1310
+msgid "statement name is a null pointer\n"
-msgid "function requires at least 3.0 protocol\n"
+msgstr "n<>zev v<>razu je pr<70>zdn<64> ukazatel\n"
-msgstr "funkce vy<76>aduje alespo<70> protokol 3.0\n"
 
-#: fe-exec.c:821
+#: fe-exec.c:771
 msgid "no connection to the server\n"
 msgstr "nen<65> spojen<65> se serverem\n"
 
-#: fe-exec.c:828
+#: fe-exec.c:778
 msgid "another command is already in progress\n"
 msgstr "zpracov<6F>v<EFBFBD> se ji<6A> jin<69> p<><70>kaz\n"
 
-#: fe-exec.c:1013
+#: fe-exec.c:814
+#: fe-exec.c:1465
+msgid "function requires at least protocol version 3.0\n"
+msgstr "funkce vy<76>aduje protokol alespo<70> 3.0 a vy<76><79><EFBFBD>\n"
+
+#: fe-exec.c:1116
 #, c-format
 msgid "unexpected asyncStatus: %d\n"
 msgstr "neo<65>ek<65>van<61> asyncStatus: %d\n"
 
-#: fe-exec.c:1092
+#: fe-exec.c:1221
 msgid "COPY terminated by new PQexec"
 msgstr "COPY bylo ukon<6F>eno nov<6F>m PQexec"
 
-#: fe-exec.c:1104
+#: fe-exec.c:1229
 msgid "COPY IN state must be terminated first\n"
 msgstr "COPY IN status mus<75> b<>t nejd<6A><64>ve ukon<6F>en\n"
 
-#: fe-exec.c:1125
+#: fe-exec.c:1249
 msgid "COPY OUT state must be terminated first\n"
 msgstr "COPY OUT status mus<75> b<>t nejd<6A><64>ve ukon<6F>en\n"
 
-#: fe-exec.c:1225
+#: fe-exec.c:1358
-#: fe-exec.c:1279
+#: fe-exec.c:1423
-#: fe-exec.c:1352
+#: fe-exec.c:1507
 msgid "no COPY in progress\n"
 msgstr "COPY se neprov<6F>d<EFBFBD>\n"
 
-#: fe-exec.c:1544
+#: fe-exec.c:1699
 msgid "connection in wrong state\n"
 msgstr "spojen<65> je ve <20>patn<74>m stavu\n"
 
-#: fe-exec.c:1575
+#: fe-exec.c:1730
 msgid "invalid ExecStatusType code"
 msgstr "neplatn<74> ExecStatusType k<>d"
 
-#: fe-exec.c:1639
+#: fe-exec.c:1794
-#: fe-exec.c:1662
+#: fe-exec.c:1817
 #, c-format
 msgid "column number %d is out of range 0..%d"
 msgstr "<22><>slo sloupce %d je mimo rozsah 0..%d"
 
-#: fe-exec.c:1655
+#: fe-exec.c:1810
 #, c-format
 msgid "row number %d is out of range 0..%d"
 msgstr "<22><>slo <20><>dky %d je mimo rozsah 0..%d"
 
-#: fe-exec.c:1892
+#: fe-exec.c:2094
 #, c-format
 msgid "could not interpret result from server: %s"
 msgstr "nelze interpretovat v<>sledek ze serveru: %s"
 
-#: fe-lobj.c:401
+#: fe-lobj.c:402
-#: fe-lobj.c:485
+#: fe-lobj.c:487
 #, c-format
 msgid "could not open file \"%s\": %s\n"
 msgstr "nelze otev<65><76>t soubor \"%s\": %s\n"
 
-#: fe-lobj.c:413
+#: fe-lobj.c:414
 #, c-format
 msgid "could not create large object for file \"%s\"\n"
 msgstr "nelze vytvo<76>it \"large object\" pro soubor \"%s\"\n"
 
-#: fe-lobj.c:423
+#: fe-lobj.c:424
-#: fe-lobj.c:473
+#: fe-lobj.c:474
 #, c-format
 msgid "could not open large object %u\n"
 msgstr "nelze otev<65><76>t \"large object\" %u\n"
 
-#: fe-lobj.c:438
+#: fe-lobj.c:439
 #, c-format
 msgid "error while reading file \"%s\"\n"
 msgstr "chyba b<>hem <20>ten<65> souboru \"%s\"\n"
 
-#: fe-lobj.c:500
+#: fe-lobj.c:502
+#: fe-lobj.c:515
 #, c-format
 msgid "error while writing to file \"%s\"\n"
 msgstr "chyba b<>hem z<>pisu do souboru \"%s\"\n"
 
-#: fe-lobj.c:566
+#: fe-lobj.c:593
 msgid "query to initialize large object functions did not return data\n"
 msgstr "dotaz inicializuj<75>c<EFBFBD> \"large object\" funkce nevr<76>til data\n"
 
-#: fe-lobj.c:604
+#: fe-lobj.c:631
 msgid "cannot determine OID of function lo_open\n"
 msgstr "nelze ur<75>it OID funkce lo_open\n"
 
-#: fe-lobj.c:611
+#: fe-lobj.c:638
 msgid "cannot determine OID of function lo_close\n"
 msgstr "nelze ur<75>it OID funkce lo_close\n"
 
-#: fe-lobj.c:618
+#: fe-lobj.c:645
 msgid "cannot determine OID of function lo_creat\n"
 msgstr "nelze ur<75>it OID funkce lo_create\n"
 
-#: fe-lobj.c:625
+#: fe-lobj.c:652
 msgid "cannot determine OID of function lo_unlink\n"
 msgstr "nelze ur<75>it OID funkce lo_unlink\n"
 
-#: fe-lobj.c:632
+#: fe-lobj.c:659
 msgid "cannot determine OID of function lo_lseek\n"
 msgstr "nelze ur<75>it OID funkce lo_lseek\n"
 
-#: fe-lobj.c:639
+#: fe-lobj.c:666
 msgid "cannot determine OID of function lo_tell\n"
 msgstr "nelze ur<75>it OID funkce lo_tell\n"
 
-#: fe-lobj.c:646
+#: fe-lobj.c:673
 msgid "cannot determine OID of function loread\n"
 msgstr "nelze ur<75>it OID funkce loread\n"
 
-#: fe-lobj.c:653
+#: fe-lobj.c:680
 msgid "cannot determine OID of function lowrite\n"
 msgstr "nelze ur<75>it OID funkce lowrite\n"
 
@@ -339,19 +359,19 @@ msgstr "pqGetInt nepodporuje integer velikosti %lu"
 msgid "integer of size %lu not supported by pqPutInt"
 msgstr "pqPutInt nepodporuje integer velikosti %lu"
 
-#: fe-misc.c:540
+#: fe-misc.c:544
-#: fe-misc.c:732
+#: fe-misc.c:748
 msgid "connection not open\n"
 msgstr "spojen<65> nen<65> otev<65>eno\n"
 
-#: fe-misc.c:605
+#: fe-misc.c:610
-#: fe-misc.c:685
+#: fe-misc.c:701
 #, c-format
 msgid "could not receive data from server: %s\n"
 msgstr "nelze p<>ijmout data ze serveru: %s\n"
 
-#: fe-misc.c:702
+#: fe-misc.c:718
-#: fe-misc.c:770
+#: fe-misc.c:786
 msgid ""
 "server closed the connection unexpectedly\n"
 "\tThis probably means the server terminated abnormally\n"
@@ -361,140 +381,140 @@ msgstr ""
 "\tToto pravd<76>podobn<62> znamen<65>, <20>e byl ukon<6F>en nestandardn<64>\n"
 "\tp<74>ed nebo b<>hem vykon<6F>v<EFBFBD>n<EFBFBD> po<70>adavku.\n"
 
-#: fe-misc.c:787
+#: fe-misc.c:803
 #, c-format
 msgid "could not send data to server: %s\n"
 msgstr "nelze poslat data na server: %s\n"
 
-#: fe-misc.c:889
+#: fe-misc.c:922
 msgid "timeout expired\n"
 msgstr "<22>asov<6F> interval ub<75>hl\n"
 
-#: fe-misc.c:934
+#: fe-misc.c:967
 msgid "socket not open\n"
 msgstr "soket nen<65> otev<65>en\n"
 
-#: fe-misc.c:959
+#: fe-misc.c:990
 #, c-format
 msgid "select() failed: %s\n"
 msgstr "select() selhal: %s\n"
 
-#: fe-secure.c:246
+#: fe-secure.c:260
 #, c-format
 msgid "could not establish SSL connection: %s\n"
 msgstr "nelze vytvo<76>it SSL spojen<65>: %s\n"
 
-#: fe-secure.c:306
+#: fe-secure.c:323
-#: fe-secure.c:373
+#: fe-secure.c:403
-#: fe-secure.c:881
+#: fe-secure.c:1022
 #, c-format
 msgid "SSL SYSCALL error: %s\n"
 msgstr "SSL SYSCALL chyba: %s\n"
 
-#: fe-secure.c:310
+#: fe-secure.c:328
-#: fe-secure.c:377
+#: fe-secure.c:408
-#: fe-secure.c:885
+#: fe-secure.c:1026
 msgid "SSL SYSCALL error: EOF detected\n"
 msgstr "SSL SYSCALL chyba: detekov<6F>n EOF\n"
 
-#: fe-secure.c:316
+#: fe-secure.c:339
-#: fe-secure.c:382
+#: fe-secure.c:418
-#: fe-secure.c:891
+#: fe-secure.c:1034
 #, c-format
 msgid "SSL error: %s\n"
 msgstr "SSL chyba: %s\n"
 
-#: fe-secure.c:325
+#: fe-secure.c:349
-#: fe-secure.c:391
+#: fe-secure.c:428
-#: fe-secure.c:897
+#: fe-secure.c:1042
-msgid "Unknown SSL error code\n"
+msgid "unrecognized SSL error code\n"
-msgstr "Nezn<EFBFBD>m<EFBFBD> SSL chybov<6F> k<>d\n"
+msgstr "nezn<EFBFBD>m<EFBFBD> chybov<6F> k<>d SSL\n"
 
-#: fe-secure.c:447
+#: fe-secure.c:490
 #, c-format
 msgid "error querying socket: %s\n"
 msgstr "chyba dotazov<6F>n<EFBFBD> soketu: %s\n"
 
-#: fe-secure.c:469
+#: fe-secure.c:518
 #, c-format
 msgid "could not get information about host (%s): %s\n"
 msgstr "nelze obdr<64>et informace o hostu (%s): %s\n"
 
-#: fe-secure.c:488
+#: fe-secure.c:537
 msgid "unsupported protocol\n"
 msgstr "nepodporovan<61> protokol\n"
 
-#: fe-secure.c:510
+#: fe-secure.c:559
 #, c-format
 msgid "server common name \"%s\" does not resolve to %ld.%ld.%ld.%ld\n"
 msgstr "jm<6A>no serveru \"%s\" nelze p<>elo<6C>it na %ld.%ld.%ld.%ld\n"
 
-#: fe-secure.c:517
+#: fe-secure.c:566
 #, c-format
 msgid "server common name \"%s\" does not resolve to peer address\n"
 msgstr "jm<6A>no serveru \"%s\" nelze p<>elo<6C>it na peer adresu\n"
 
-#: fe-secure.c:692
+#: fe-secure.c:749
 msgid "could not get user information\n"
 msgstr "nelze obdr<64>et informace o u<>ivateli\n"
 
-#: fe-secure.c:704
+#: fe-secure.c:761
 #, c-format
 msgid "could not open certificate (%s): %s\n"
 msgstr "nelze otev<65><76>t certifik<69>t (%s): %s\n"
 
-#: fe-secure.c:711
+#: fe-secure.c:769
 #, c-format
 msgid "could not read certificate (%s): %s\n"
 msgstr "nelze <20><>st certifik<69>t (%s): %s\n"
 
-#: fe-secure.c:724
+#: fe-secure.c:783
 #, c-format
 msgid "certificate present, but not private key (%s)\n"
 msgstr "certifik<69>t je p<><70>tomen, ale priv<69>tn<74> kl<6B><6C> ne (%s)\n"
 
-#: fe-secure.c:733
+#: fe-secure.c:792
 #, c-format
 msgid "private key (%s) has wrong permissions\n"
 msgstr "priv<69>tn<74> kl<6B><6C> (%s) m<> <20>patn<74> opr<70>vn<76>n<EFBFBD>\n"
 
-#: fe-secure.c:740
+#: fe-secure.c:799
 #, c-format
 msgid "could not open private key file (%s): %s\n"
 msgstr "nelze otev<65><76>t soubor s priv<69>tn<74>m kl<6B><6C>em (%s): %s\n"
 
-#: fe-secure.c:749
+#: fe-secure.c:808
 #, c-format
 msgid "private key (%s) changed during execution\n"
 msgstr "priv<69>tn<74> kl<6B><6C> (%s) byl za chodu zm<7A>n<EFBFBD>n b<>hem\n"
 
-#: fe-secure.c:756
+#: fe-secure.c:816
 #, c-format
 msgid "could not read private key (%s): %s\n"
 msgstr "nelze <20><>st priv<69>tn<74> kl<6B><6C> (%s): %s\n"
 
-#: fe-secure.c:768
+#: fe-secure.c:830
 #, c-format
 msgid "certificate/private key mismatch (%s): %s\n"
 msgstr "certifik<69>t/priv<69>tn<74> kl<6B><6C> nesouhlas<61> (%s): %s\n"
 
-#: fe-secure.c:798
+#: fe-secure.c:909
 #, c-format
 msgid "could not create SSL context: %s\n"
 msgstr "nelze vytvo<76>it SSL kontext: %s\n"
 
-#: fe-secure.c:815
+#: fe-secure.c:953
-#: fe-secure.c:823
+#: fe-secure.c:962
 #, c-format
 msgid "could not read root certificate list (%s): %s\n"
 msgstr "nelze <20><>st certifik<69>tov<6F> ko<6B>enov<6F> seznam (%s): %s\n"
 
-#: fe-secure.c:915
+#: fe-secure.c:1061
 #, c-format
 msgid "certificate could not be validated: %s\n"
 msgstr "certifik<69>t nen<65> platn<74>: %s\n"
 
-#: fe-secure.c:927
+#: fe-secure.c:1074
 #, c-format
 msgid "certificate could not be obtained: %s\n"
 msgstr "certifik<69>t nelze obdr<64>et: %s\n"

src/interfaces/libpq/po/zh_CN.po

@@ -1,13 +1,13 @@
 # simplified Chinese translation file for libpq
 # Bao Wei <weibao@forevertek.com>, 2002
 #
-# $PostgreSQL: pgsql/src/interfaces/libpq/po/zh_CN.po,v 1.5 2004/08/10 19:02:03 petere Exp $
+# $PostgreSQL: pgsql/src/interfaces/libpq/po/zh_CN.po,v 1.6 2004/09/13 12:35:18 petere Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-22 09:41+0000\n"
+"POT-Creation-Date: 2004-08-31 08:59+0000\n"
 "PO-Revision-Date: 2003-09-15 13:47:06+0800\n"
 "Last-Translator: Bao Wei <weibao@qmail.zhengmai.net.cn>\n"
 "Language-Team: Weiping He <laser@zhengmai.com.cn>\n"
@@ -129,117 +129,117 @@ msgstr ""
 "%s <20>ϵ<EFBFBD> TCP/IP <20><><EFBFBD><EFBFBD>?\n"
 
 # fe-misc.c:702
-#: fe-connect.c:945
+#: fe-connect.c:946
 #, c-format
 msgid "could not translate host name \"%s\" to address: %s\n"
 msgstr "<22>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> \"%s\" <20><><EFBFBD><EFBFBD>ַ: %s\n"
 
 # fe-misc.c:702
-#: fe-connect.c:949
+#: fe-connect.c:950
 #, c-format
 msgid "could not translate Unix-domain socket path \"%s\" to address: %s\n"
 msgstr "<22>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD> Unix-domian <20>׽<EFBFBD><D7BD><EFBFBD>·<EFBFBD><C2B7> \"%s\" <20><><EFBFBD><EFBFBD>ַ: %s\n"
 
 # fe-connect.c:1232
-#: fe-connect.c:1153
+#: fe-connect.c:1154
 msgid "invalid connection state, probably indicative of memory corruption\n"
 msgstr "<22><>Ч<EFBFBD><D0A7><EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬, <20><><EFBFBD><EFBFBD><EFBFBD>Ǵ洢<C7B4><E6B4A2><EFBFBD><EFBFBD><EFBFBD>ݱ<EFBFBD><DDB1>ƻ<EFBFBD><C6BB>ı<EFBFBD>־\n"
 
 # fe-connect.c:891
-#: fe-connect.c:1196
+#: fe-connect.c:1197
 #, c-format
 msgid "could not create socket: %s\n"
 msgstr "<22>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD>׽<EFBFBD><D7BD><EFBFBD>: %s\n"
 
 # fe-connect.c:1263
-#: fe-connect.c:1307
+#: fe-connect.c:1308
 #, c-format
 msgid "could not get socket error status: %s\n"
 msgstr "<22>޷<EFBFBD><DEB7><EFBFBD>ȡ<EFBFBD>׽<EFBFBD><D7BD>ִ<EFBFBD><D6B4><EFBFBD>״̬: %s\n"
 
 # fe-connect.c:1283
-#: fe-connect.c:1346
+#: fe-connect.c:1347
 #, c-format
 msgid "could not get client address from socket: %s\n"
 msgstr "<22>޷<EFBFBD><DEB7><EFBFBD><EFBFBD>׽<EFBFBD><D7BD>ֻ<EFBFBD>ȡ<EFBFBD>ͻ<EFBFBD><CDBB>˵<EFBFBD>ַ: %s\n"
 
 # fe-connect.c:959
-#: fe-connect.c:1391
+#: fe-connect.c:1392
 #, c-format
 msgid "could not send SSL negotiation packet: %s\n"
 msgstr "<22>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD> SSL <20><><EFBFBD>ְ<EFBFBD>: %s\n"
 
 # fe-connect.c:2427 fe-connect.c:2436 fe-connect.c:2933 fe-exec.c:1284
 # fe-lobj.c:536
-#: fe-connect.c:1413 fe-connect.c:2536 fe-connect.c:2545 fe-connect.c:3112
+#: fe-connect.c:1414 fe-connect.c:2538 fe-connect.c:2547 fe-connect.c:3126
-#: fe-lobj.c:548
+#: fe-lobj.c:556
 msgid "out of memory\n"
 msgstr "<22>ڴ<EFBFBD><DAB4>þ<EFBFBD>\n"
 
 # fe-connect.c:1322
-#: fe-connect.c:1426
+#: fe-connect.c:1427
 #, c-format
 msgid "could not send startup packet: %s\n"
 msgstr "<22>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %s\n"
 
 # fe-connect.c:972
-#: fe-connect.c:1466
+#: fe-connect.c:1467
 #, c-format
 msgid "could not receive server response to SSL negotiation packet: %s\n"
 msgstr "<22>޷<EFBFBD><DEB7>յ<EFBFBD><D5B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> SSL <20><><EFBFBD>ְ<EFBFBD><D6B0><EFBFBD><EFBFBD><EFBFBD>Ӧ: %s\n"
 
 # fe-connect.c:1010
-#: fe-connect.c:1485 fe-connect.c:1502
+#: fe-connect.c:1486 fe-connect.c:1503
 msgid "server does not support SSL, but SSL was required\n"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>֧<EFBFBD><D6A7> SSL, <20><><EFBFBD><EFBFBD>Ҫ<EFBFBD><D2AA>ʹ<EFBFBD><CAB9> SSL\n"
 
 # fe-connect.c:1001
-#: fe-connect.c:1518
+#: fe-connect.c:1519
 #, c-format
 msgid "received invalid response to SSL negotiation: %c\n"
 msgstr "<22>յ<EFBFBD><D5B5><EFBFBD> SSL <20><><EFBFBD>ֵ<EFBFBD><D6B5><EFBFBD>Ч<EFBFBD><D0A7>Ӧ: %c\n"
 
 # fe-connect.c:1378
-#: fe-connect.c:1575 fe-connect.c:1607
+#: fe-connect.c:1576 fe-connect.c:1608
 #, c-format
 msgid "expected authentication request from server, but received %c\n"
 msgstr "<22>ڴ<EFBFBD><DAB4><EFBFBD><EFBFBD>Է<EFBFBD><D4B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>֤<EFBFBD><D6A4><EFBFBD><EFBFBD>, ȴ<>յ<EFBFBD> %c\n"
 
 # fe-connect.c:1490
-#: fe-connect.c:1843
+#: fe-connect.c:1844
 msgid "unexpected message from server during startup\n"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>յ<EFBFBD><D5B5><EFBFBD><EFBFBD>Է<EFBFBD><D4B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ķ<EFBFBD>Ԥ<EFBFBD><D4A4><EFBFBD><EFBFBD>Ϣ\n"
 
 # fe-connect.c:1549
-#: fe-connect.c:1913
+#: fe-connect.c:1914
 #, c-format
 msgid "invalid connection state %c, probably indicative of memory corruption\n"
 msgstr "<22><>Ч<EFBFBD><D0A7><EFBFBD><EFBFBD><EFBFBD><EFBFBD>״̬ %c, <20><><EFBFBD><EFBFBD><EFBFBD>Ǵ洢<C7B4><E6B4A2><EFBFBD><EFBFBD><EFBFBD>ݱ<EFBFBD><DDB1>ƻ<EFBFBD><C6BB>ı<EFBFBD>־\n"
 
 # fe-connect.c:2475
-#: fe-connect.c:2584
+#: fe-connect.c:2586
 #, c-format
 msgid "missing \"=\" after \"%s\" in connection info string\n"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ<EFBFBD>ִ<EFBFBD><D6B4><EFBFBD><EFBFBD><EFBFBD> \"%s\" <20><><EFBFBD><EFBFBD>ȱ<EFBFBD><C8B1> \"=\"\n"
 
 # fe-connect.c:2524
-#: fe-connect.c:2633
+#: fe-connect.c:2635
 msgid "unterminated quoted string in connection info string\n"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ<EFBFBD>ִ<EFBFBD><D6B4><EFBFBD>δ<EFBFBD><CEB4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ִ<EFBFBD>\n"
 
 # fe-connect.c:2558
-#: fe-connect.c:2667
+#: fe-connect.c:2669
 #, c-format
 msgid "invalid connection option \"%s\"\n"
 msgstr "<22>Ƿ<EFBFBD><C7B7><EFBFBD><EFBFBD><EFBFBD>ѡ<EFBFBD><D1A1> \"%s\"\n"
 
 # fe-connect.c:2744
-#: fe-connect.c:2879
+#: fe-connect.c:2891
 msgid "connection pointer is NULL\n"
 msgstr "<22><><EFBFBD><EFBFBD>ָ<EFBFBD><D6B8><EFBFBD><EFBFBD> NULL\n"
 
 # fe-connect.c:2953
-#: fe-connect.c:3130
+#: fe-connect.c:3148
 #, c-format
 msgid ""
 "WARNING: Password file %s has world or group read access; permission should "
@@ -270,7 +270,7 @@ msgstr "û
 msgid "another command is already in progress\n"
 msgstr "<22>Ѿ<EFBFBD><D1BE><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><D2BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڴ<EFBFBD><DAB4><EFBFBD>\n"
 
-#: fe-exec.c:814 fe-exec.c:1465
+#: fe-exec.c:814 fe-exec.c:1466
 msgid "function requires at least protocol version 3.0\n"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ҫ 3.0 <20>汾<EFBFBD><E6B1BE>Э<EFBFBD><D0AD>\n"
 
@@ -295,110 +295,110 @@ msgid "COPY OUT state must be terminated first\n"
 msgstr "COPY OUT ״̬<D7B4><CCAC><EFBFBD><EFBFBD><EFBFBD>Ƚ<EFBFBD><C8BD><EFBFBD>\n"
 
 # fe-exec.c:1780
-#: fe-exec.c:1358 fe-exec.c:1423 fe-exec.c:1507
+#: fe-exec.c:1358 fe-exec.c:1423 fe-exec.c:1508
 msgid "no COPY in progress\n"
 msgstr "û<><C3BB><EFBFBD><EFBFBD><EFBFBD>ڴ<EFBFBD><DAB4><EFBFBD><EFBFBD><EFBFBD> COPY\n"
 
 # fe-exec.c:1884
-#: fe-exec.c:1699
+#: fe-exec.c:1700
 msgid "connection in wrong state\n"
 msgstr "<22><><EFBFBD>Ӵ<EFBFBD><D3B4>ڴ<EFBFBD><DAB4><EFBFBD>״̬\n"
 
 # fe-exec.c:2055
-#: fe-exec.c:1730
+#: fe-exec.c:1731
 msgid "invalid ExecStatusType code"
 msgstr "<22>Ƿ<EFBFBD> ExecStatusType <20><><EFBFBD><EFBFBD>"
 
 # fe-exec.c:2108 fe-exec.c:2141
-#: fe-exec.c:1794 fe-exec.c:1817
+#: fe-exec.c:1795 fe-exec.c:1818
 #, c-format
 msgid "column number %d is out of range 0..%d"
 msgstr "<22>к<EFBFBD><D0BA><EFBFBD> %d <20><><EFBFBD><EFBFBD><EFBFBD>˷<EFBFBD>Χ 0..%d"
 
 # fe-exec.c:2130
-#: fe-exec.c:1810
+#: fe-exec.c:1811
 #, c-format
 msgid "row number %d is out of range 0..%d"
 msgstr "<22>к<EFBFBD><D0BA><EFBFBD> %d <20><><EFBFBD><EFBFBD><EFBFBD>˷<EFBFBD>Χ 0..%d"
 
 # fe-exec.c:2325
-#: fe-exec.c:2094
+#: fe-exec.c:2093
 #, c-format
 msgid "could not interpret result from server: %s"
 msgstr "<22>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Է<EFBFBD><D4B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ľ<EFBFBD><C4BD><EFBFBD>: %s"
 
 # fe-lobj.c:400 fe-lobj.c:483
-#: fe-lobj.c:402 fe-lobj.c:487
+#: fe-lobj.c:410 fe-lobj.c:495
 #, c-format
 msgid "could not open file \"%s\": %s\n"
 msgstr "<22>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD> \"%s\": %s\n"
 
 # fe-lobj.c:412
-#: fe-lobj.c:414
+#: fe-lobj.c:422
 #, c-format
 msgid "could not create large object for file \"%s\"\n"
 msgstr "<22>޷<EFBFBD>Ϊ<EFBFBD>ļ<EFBFBD> \"%s\" <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
 
 # fe-lobj.c:422 fe-lobj.c:472
-#: fe-lobj.c:424 fe-lobj.c:474
+#: fe-lobj.c:432 fe-lobj.c:482
 #, c-format
 msgid "could not open large object %u\n"
 msgstr "<22>޷<EFBFBD><DEB7>򿪴<EFBFBD><F2BFAAB4><EFBFBD><EFBFBD><EFBFBD> %u\n"
 
 # fe-lobj.c:437
-#: fe-lobj.c:439
+#: fe-lobj.c:447
 #, c-format
 msgid "error while reading file \"%s\"\n"
 msgstr "<22><>ȡ<EFBFBD>ļ<EFBFBD> \"%s\" ʱ<><CAB1><EFBFBD><EFBFBD>\n"
 
 # fe-lobj.c:498
-#: fe-lobj.c:502 fe-lobj.c:515
+#: fe-lobj.c:510 fe-lobj.c:523
 #, c-format
 msgid "error while writing to file \"%s\"\n"
 msgstr "д<><D0B4><EFBFBD>ļ<EFBFBD> \"%s\" ʱ<><CAB1><EFBFBD><EFBFBD>\n"
 
 # fe-lobj.c:564
-#: fe-lobj.c:593
+#: fe-lobj.c:601
 msgid "query to initialize large object functions did not return data\n"
 msgstr "<22><>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>IJ<EFBFBD>ѯû<D1AF>з<EFBFBD><D0B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
 
 # fe-lobj.c:602
-#: fe-lobj.c:631
+#: fe-lobj.c:639
 msgid "cannot determine OID of function lo_open\n"
 msgstr "<22>޷<EFBFBD><DEB7>жϺ<D0B6><CFBA><EFBFBD> lo_open <20><> OID\n"
 
 # fe-lobj.c:609
-#: fe-lobj.c:638
+#: fe-lobj.c:646
 msgid "cannot determine OID of function lo_close\n"
 msgstr "<22>޷<EFBFBD><DEB7>жϺ<D0B6><CFBA><EFBFBD> lo_close <20><> OID\n"
 
 # fe-lobj.c:616
-#: fe-lobj.c:645
+#: fe-lobj.c:653
 msgid "cannot determine OID of function lo_creat\n"
 msgstr "<22>޷<EFBFBD><DEB7>жϺ<D0B6><CFBA><EFBFBD> lo_creat <20><> OID\n"
 
 # fe-lobj.c:623
-#: fe-lobj.c:652
+#: fe-lobj.c:660
 msgid "cannot determine OID of function lo_unlink\n"
 msgstr "<22>޷<EFBFBD><DEB7>жϺ<D0B6><CFBA><EFBFBD> lo_unlink <20><> OID\n"
 
 # fe-lobj.c:630
-#: fe-lobj.c:659
+#: fe-lobj.c:667
 msgid "cannot determine OID of function lo_lseek\n"
 msgstr "<22>޷<EFBFBD><DEB7>жϺ<D0B6><CFBA><EFBFBD> lo_lseek <20><> OID\n"
 
 # fe-lobj.c:637
-#: fe-lobj.c:666
+#: fe-lobj.c:674
 msgid "cannot determine OID of function lo_tell\n"
 msgstr "<22>޷<EFBFBD><DEB7>жϺ<D0B6><CFBA><EFBFBD> lo_tell <20><> OID\n"
 
 # fe-lobj.c:644
-#: fe-lobj.c:673
+#: fe-lobj.c:681
 msgid "cannot determine OID of function loread\n"
 msgstr "<22>޷<EFBFBD><DEB7>жϺ<D0B6><CFBA><EFBFBD> loread <20><> OID\n"
 
 # fe-lobj.c:651
-#: fe-lobj.c:680
+#: fe-lobj.c:688
 msgid "cannot determine OID of function lowrite\n"
 msgstr "<22>޷<EFBFBD><DEB7>жϺ<D0B6><CFBA><EFBFBD> lowrite <20><> OID\n"
 
@@ -442,137 +442,137 @@ msgstr ""
 msgid "could not send data to server: %s\n"
 msgstr "<22>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %s\n"
 
-#: fe-misc.c:922
+#: fe-misc.c:923
 msgid "timeout expired\n"
 msgstr "<22><>ʱ<EFBFBD><CAB1>\n"
 
 # fe-misc.c:450 fe-misc.c:642 fe-misc.c:798
-#: fe-misc.c:967
+#: fe-misc.c:968
 msgid "socket not open\n"
 msgstr "<22>׽<EFBFBD><D7BD><EFBFBD>δ<EFBFBD><CEB4><EFBFBD><EFBFBD>\n"
 
 # fe-misc.c:389 fe-misc.c:423 fe-misc.c:838
-#: fe-misc.c:990
+#: fe-misc.c:991
 #, c-format
 msgid "select() failed: %s\n"
 msgstr "select() ʧ<><CAA7>: %s\n"
 
-#: fe-secure.c:260
+#: fe-secure.c:262
 #, c-format
 msgid "could not establish SSL connection: %s\n"
 msgstr "<22>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD> SSL <20><><EFBFBD><EFBFBD>: %s\n"
 
-#: fe-secure.c:323 fe-secure.c:403 fe-secure.c:1022
+#: fe-secure.c:325 fe-secure.c:406 fe-secure.c:1036
 #, c-format
 msgid "SSL SYSCALL error: %s\n"
 msgstr "SSL SYSCALL <20><><EFBFBD><EFBFBD>: %s\n"
 
-#: fe-secure.c:328 fe-secure.c:408 fe-secure.c:1026
+#: fe-secure.c:330 fe-secure.c:411 fe-secure.c:1040
 msgid "SSL SYSCALL error: EOF detected\n"
 msgstr "SSL SYSCALL <20><><EFBFBD><EFBFBD>: <20><><EFBFBD>ֽ<EFBFBD><D6BD><EFBFBD><EFBFBD><EFBFBD>\n"
 
 # fe-auth.c:232
-#: fe-secure.c:339 fe-secure.c:418 fe-secure.c:1034
+#: fe-secure.c:342 fe-secure.c:422 fe-secure.c:1049
 #, c-format
 msgid "SSL error: %s\n"
 msgstr "SSL <20><><EFBFBD><EFBFBD>: %s\n"
 
-#: fe-secure.c:349 fe-secure.c:428 fe-secure.c:1042
+#: fe-secure.c:352 fe-secure.c:432 fe-secure.c:1057
 msgid "unrecognized SSL error code\n"
 msgstr "δ֪<CEB4><D6AA> SSL <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
 
 # fe-lobj.c:498
-#: fe-secure.c:490
+#: fe-secure.c:494
 #, c-format
 msgid "error querying socket: %s\n"
 msgstr "<22><>ѯ<EFBFBD>׽<EFBFBD><D7BD>ִ<EFBFBD><D6B4><EFBFBD>: %s\n"
 
 # fe-connect.c:1263
-#: fe-secure.c:518
+#: fe-secure.c:522
 #, c-format
 msgid "could not get information about host (%s): %s\n"
 msgstr "<22>޷<EFBFBD><DEB7><EFBFBD>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (%s) <20><><EFBFBD><EFBFBD>Ϣ: %s\n"
 
-#: fe-secure.c:537
+#: fe-secure.c:541
 msgid "unsupported protocol\n"
 msgstr "<22><>֧<EFBFBD>ֵ<EFBFBD>Э<EFBFBD><D0AD>\n"
 
-#: fe-secure.c:559
+#: fe-secure.c:563
 #, c-format
 msgid "server common name \"%s\" does not resolve to %ld.%ld.%ld.%ld\n"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> \"%s\" <20><><EFBFBD>ܽ<EFBFBD><DCBD><EFBFBD><EFBFBD><EFBFBD> %ld.%ld.%ld.%ld\n"
 
-#: fe-secure.c:566
+#: fe-secure.c:570
 #, c-format
 msgid "server common name \"%s\" does not resolve to peer address\n"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> \"%s\" <20><><EFBFBD>ܽ<EFBFBD><DCBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Զ˵<D4B6>ַ\n"
 
 # fe-connect.c:1263
-#: fe-secure.c:749
+#: fe-secure.c:753
 msgid "could not get user information\n"
 msgstr "<22>޷<EFBFBD><DEB7><EFBFBD>ȡ<EFBFBD>û<EFBFBD><C3BB><EFBFBD>Ϣ\n"
 
 # fe-lobj.c:400 fe-lobj.c:483
-#: fe-secure.c:761
+#: fe-secure.c:765
 #, c-format
 msgid "could not open certificate (%s): %s\n"
 msgstr "<22>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD>֤<EFBFBD><D6A4> (%s): %s\n"
 
 # fe-lobj.c:400 fe-lobj.c:483
-#: fe-secure.c:769
+#: fe-secure.c:774
 #, c-format
 msgid "could not read certificate (%s): %s\n"
 msgstr "<22>޷<EFBFBD><DEB7><EFBFBD>ȡ֤<C8A1><D6A4> (%s): %s\n"
 
-#: fe-secure.c:783
+#: fe-secure.c:788
 #, c-format
 msgid "certificate present, but not private key (%s)\n"
 msgstr "<22><>֤<EFBFBD><D6A4>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˽Կ (%s)\n"
 
-#: fe-secure.c:792
+#: fe-secure.c:797
 #, c-format
 msgid "private key (%s) has wrong permissions\n"
 msgstr "˽Կ (%s) <20>д<EFBFBD><D0B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
 
 # fe-lobj.c:400 fe-lobj.c:483
-#: fe-secure.c:799
+#: fe-secure.c:804
 #, c-format
 msgid "could not open private key file (%s): %s\n"
 msgstr "<22>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD>˽Կ<CBBD>ļ<EFBFBD> (%s): %s\n"
 
-#: fe-secure.c:808
+#: fe-secure.c:813
 #, c-format
 msgid "private key (%s) changed during execution\n"
 msgstr "<22><>ִ<EFBFBD>й<EFBFBD><D0B9><EFBFBD><EFBFBD><EFBFBD>˽Կ (%s) <20>ı<EFBFBD><C4B1><EFBFBD>\n"
 
 # fe-connect.c:891
-#: fe-secure.c:816
+#: fe-secure.c:822
 #, c-format
 msgid "could not read private key (%s): %s\n"
 msgstr "<22>޷<EFBFBD><DEB7><EFBFBD>ȡ˽Կ (%s): %s\n"
 
-#: fe-secure.c:830
+#: fe-secure.c:837
 #, c-format
 msgid "certificate/private key mismatch (%s): %s\n"
 msgstr "֤<><D6A4>/˽Կ<CBBD><D4BF>ƥ<EFBFBD><C6A5> (%s): %s\n"
 
-#: fe-secure.c:909
+#: fe-secure.c:921
 #, c-format
 msgid "could not create SSL context: %s\n"
 msgstr "<22>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD> SSL <20><><EFBFBD><EFBFBD>: %s\n"
 
 # fe-connect.c:891
-#: fe-secure.c:953 fe-secure.c:962
+#: fe-secure.c:966 fe-secure.c:976
 #, c-format
 msgid "could not read root certificate list (%s): %s\n"
 msgstr "<22>޷<EFBFBD><DEB7><EFBFBD>ȡ<EFBFBD><C8A1>֤<EFBFBD><D6A4><EFBFBD>б<EFBFBD> (%s): %s\n"
 
-#: fe-secure.c:1061
+#: fe-secure.c:1076
 #, c-format
 msgid "certificate could not be validated: %s\n"
 msgstr "<22>޷<EFBFBD><DEB7><EFBFBD>֤֤<D6A4><D6A4>: %s\n"
 
-#: fe-secure.c:1074
+#: fe-secure.c:1090
 #, c-format
 msgid "certificate could not be obtained: %s\n"
 msgstr "<22>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD>֤<EFBFBD><D6A4>: %s\n"

src/interfaces/libpq/po/zh_TW.po

@@ -3,9 +3,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 8.0\n"
+"Project-Id-Version: PostgreSQL 7.5\n"
-"POT-Creation-Date: 2004-07-29 01:12-0300\n"
+"POT-Creation-Date: 2004-08-04 02:53-0300\n"
-"PO-Revision-Date: 2004-08-01 13:21+0800\n"
+"PO-Revision-Date: 2004-08-18 12:15+0800\n"
 "Last-Translator: Zhenbang Wei <forth@zbwei.net>\n"
 "Language-Team: Zhenbang Wei <forth@zbwei.net>\n"
 "MIME-Version: 1.0\n"
@@ -386,7 +386,7 @@ msgstr "無法向伺服器傳送資料: %s\n"
 
 #: fe-misc.c:922
 msgid "timeout expired\n"
-msgstr "發生愈時\n"
+msgstr "發生逾時\n"
 
 #: fe-misc.c:967
 msgid "socket not open\n"