Translation updates

diff --git a/src/bin/initdb/nls.mk b/src/bin/initdb/nls.mk
index ac9d52c..e5b4d1f 100644 (file)
--- a/src/bin/initdb/nls.mk
+++ b/src/bin/initdb/nls.mk
@@ -1,5 +1,5 @@
-# $PostgreSQL: pgsql/src/bin/initdb/nls.mk,v 1.7 2004/07/25 12:00:06 petere Exp $
+# $PostgreSQL: pgsql/src/bin/initdb/nls.mk,v 1.8 2004/07/30 05:28:31 petere Exp $
 CATALOG_NAME   := initdb
-AVAIL_LANGUAGES        := de fr it pt_BR ru sv
+AVAIL_LANGUAGES        := de fr it pt_BR ru sv zh_TW
 GETTEXT_FILES  := initdb.c
 GETTEXT_TRIGGERS:= _ simple_prompt

diff --git a/src/bin/initdb/po/zh_TW.po b/src/bin/initdb/po/zh_TW.po
new file mode 100644 (file)
index 0000000..7b6f793
--- /dev/null
+++ b/src/bin/initdb/po/zh_TW.po
@@ -0,0 +1,477 @@
+# Traditional Chinese translation for initdb.
+# 2004-07-30 Zhenbang Wei <forth@zbwei.net>
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 7.5\n"
+"POT-Creation-Date: 2004-07-29 01:10-0300\n"
+"PO-Revision-Date: 2004-07-30 10:21+0800\n"
+"Last-Translator: Zhenbang Wei <forth@zbwei.net>\n"
+"Language-Team: Zhenbang Wei <forth@zbwei.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=Big5\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: initdb.c:223
+#: initdb.c:237
+#, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: °O¾ÐÅé¥ÎºÉ\n"
+
+#: initdb.c:343
+#: initdb.c:1305
+#, c-format
+msgid "%s: could not open file \"%s\" for reading: %s\n"
+msgstr "%s: µLªk¶}±ÒÀÉ®×\"%s\"Ū¨ú¸ê®Æ: %s\n"
+
+#: initdb.c:401
+#, c-format
+msgid "%s: could not open file \"%s\" for writing: %s\n"
+msgstr "%s: µLªk¶}±ÒÀÉ®×\"%s\"¼g¤J¸ê®Æ: %s\n"
+
+#: initdb.c:529
+#: initdb.c:538
+#: initdb.c:546
+#, c-format
+msgid "%s: failed\n"
+msgstr "%s: ¥¢±Ñ\n"
+
+#: initdb.c:535
+#, c-format
+msgid "%s: removing data directory \"%s\"\n"
+msgstr "%s: ²¾°£¸ê®Æ¥Ø¿ý \"%s\"\n"
+
+#: initdb.c:543
+#, c-format
+msgid "%s: removing contents of data directory \"%s\"\n"
+msgstr "%s: ²¾°£¸ê®Æ¥Ø¿ý \"%s\" ªº¤º®e\n"
+
+#: initdb.c:554
+#, c-format
+msgid "%s: data directory \"%s\" not removed at user's request\n"
+msgstr "%s: µLªk¨Ì¨Ï¥ÎªÌªº­n¨D²¾°£¸ê®Æ¥Ø¿ý \"%s\"\n"
+
+#: initdb.c:580
+#, 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: µLªk¥Hroot¨­¥÷°õ¦æ\n"
+"½Ð¥H±N·|¾Ö¦³¦øªA¾¹¦æµ{ªº«D¯SÅv¨Ï¥ÎªÌµn¤J(¨Ò¦p¥Î\"su\")¡C\n"
+
+#: initdb.c:631
+#, c-format
+msgid "%s: \"%s\" is not a valid server encoding name\n"
+msgstr "%s: \"%s\" ¤£¬O¦³®Äªº¦øªA¾¹½s½X¦WºÙ\n"
+
+#: initdb.c:786
+#, c-format
+msgid "%s: warning: encoding mismatch\n"
+msgstr "%s: ĵ§i¡G½s½X¤£²Å\n"
+
+#: initdb.c:788
+#, 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 ""
+"§A¿ï¾Üªº½s½X(%s)©Mlocale¨Ï¥Îªº½s½X(%s)¤£²Å¡A³o¼Ë¥i¯à·|Åý¤å\n"
+"¦r³B²z¨ç¦¡¥X²{²§±`¦æ¬°¡A­n­×¥¿³o­Ó°ÝÃD¡A½Ð­«·s°õ¦æ %s ¥B\n"
+"¤£«ü©w¨Ï¥Îªº½s½X©Î¬O«ü©w¥¿½Tªº½s½X²Õ¦X¡C\n"
+
+#: initdb.c:940
+#, 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: ÀÉ®× \"%s\" ¤£¦s¦b\n"
+"³oªí¥Ü§Aªº¦w¸Ë¥i¯àµo¥Í¿ù»~¡A©Î¬O«ü©w¤F¿ù»~ªº\n"
+"¥Ø¿ýµ¹¿ï¶µ -L¡C\n"
+
+#: initdb.c:1005
+msgid "selecting default max_connections ... "
+msgstr "¿ï¾Ü¹w³]ªº max_connections ..."
+
+#: initdb.c:1041
+msgid "selecting default shared_buffers ... "
+msgstr "¿ï¾Ü¹w³]ªº shared_buffers ..."
+
+#: initdb.c:1074
+msgid "creating configuration files ... "
+msgstr "«Ø¥ß³]©wÀÉ..."
+
+#: initdb.c:1152
+#, c-format
+msgid "creating template1 database in %s/base/1 ... "
+msgstr "«Ø¥ß template1 ¸ê®Æ®w©ó %s/base/1 ... "
+
+#: initdb.c:1168
+#, 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: ¿é¤JÀÉ \"%s\" ¤£ÄÝ©ó PostgreSQL %s\n"
+"½ÐÀˬd§Aªº¦w¸Ë©Î¥Î -L ¿ï¶µ«ü©w¥¿½Tªº¸ô®|¡C\n"
+
+#: initdb.c:1244
+msgid "initializing pg_shadow ... "
+msgstr "ªì©l¤Æpg_shadow..."
+
+#: initdb.c:1280
+msgid "Enter new superuser password: "
+msgstr "¿é¤J·sªººÞ²zªÌ±K½X:"
+
+#: initdb.c:1281
+msgid "Enter it again: "
+msgstr "¦A¿é¤J¤@¦¸:"
+
+#: initdb.c:1284
+msgid "Passwords didn't match.\n"
+msgstr "±K½X¤£²Å¡C\n"
+
+#: initdb.c:1311
+#, c-format
+msgid "%s: could not read password from file \"%s\": %s\n"
+msgstr "%s: µLªk±qÀÉ®× \"%s\" Ū¨ú±K½X: %s\n"
+
+#: initdb.c:1324
+msgid "setting password ... "
+msgstr "³]©w±K½X..."
+
+#: initdb.c:1348
+#, c-format
+msgid "%s: The password file was not generated. Please report this problem.\n"
+msgstr "%s: µLªk²£¥Í±K½XÀÉ¡A½Ð¦^³ø³o­Ó¿ù»~¡C\n"
+
+#: initdb.c:1378
+msgid "enabling unlimited row size for system tables ... "
+msgstr "±Ò¥Î¨t²Î¸ê®ÆªíµL¦æ¤j¤p­­¨î ..."
+
+#: initdb.c:1451
+msgid "initializing pg_depend ... "
+msgstr "ªì©l¤Æpg_depend..."
+
+#: initdb.c:1479
+msgid "creating system views ... "
+msgstr "«Ø¥ß¨t²ÎÀ˵ø..."
+
+#: initdb.c:1516
+msgid "loading pg_description ... "
+msgstr "¸ü¤Jpg_description..."
+
+#: initdb.c:1564
+msgid "creating conversions ... "
+msgstr "«Ø¥ß conversions ... "
+
+#: initdb.c:1620
+msgid "setting privileges on built-in objects ... "
+msgstr "³]©w¤º«Øª«¥óªºÅv­­ ... "
+
+#: initdb.c:1678
+msgid "creating information schema ... "
+msgstr "«Ø¥ß information schema ... "
+
+#: initdb.c:1740
+msgid "vacuuming database template1 ... "
+msgstr "­«¾ã¸ê®Æ®w template1 ..."
+
+#: initdb.c:1796
+msgid "copying template1 to template0 ... "
+msgstr "½Æ»s template1 ¦Ü template0 ..."
+
+#: initdb.c:1853
+msgid "caught signal\n"
+msgstr "®·®»¨ì«H¸¹\n"
+
+#: initdb.c:1858
+msgid "could not write to child process\n"
+msgstr "µLªk¼g¦Ü¤l¦æµ{\n"
+
+#: initdb.c:1864
+msgid "ok\n"
+msgstr "¦¨¥\\n"
+
+#: initdb.c:1894
+#, c-format
+msgid "%s: invalid locale name \"%s\"\n"
+msgstr "%s: µL®Äªºlocale¦WºÙ \"%s\"\n"
+
+#: initdb.c:1961
+#, c-format
+msgid ""
+"%s initializes a PostgreSQL database cluster.\n"
+"\n"
+msgstr ""
+"%s ªì©l¤ÆPostgreSQL¸ê®Æ®wcluster.\n"
+"\n"
+
+#: initdb.c:1962
+msgid "Usage:\n"
+msgstr "¥Îªk:\n"
+
+#: initdb.c:1963
+#, c-format
+msgid "  %s [OPTION]... [DATADIR]\n"
+msgstr "  %s [¿ï¶µ]... [¸ê®Æ¥Ø¿ý]\n"
+
+#: initdb.c:1964
+msgid ""
+"\n"
+"Options:\n"
+msgstr ""
+"\n"
+"¿ï¶µ:\n"
+
+#: initdb.c:1965
+msgid " [-D, --pgdata=]DATADIR     location for this database cluster\n"
+msgstr " [-D, --pgdata=]DATADIR     ¸ê®Æ®wclusterªº¥Ø¿ý\n"
+
+#: initdb.c:1966
+msgid "  -E, --encoding=ENCODING   set default encoding for new databases\n"
+msgstr "  -E, --encoding=ENCODING   ·s¸ê®Æ®wªº¹w³]½s½X\n"
+
+#: initdb.c:1967
+msgid "  --locale=LOCALE           initialize database cluster with given locale\n"
+msgstr "  --locale=LOCALE           ¥H«ü©wªºlocaleªì©l¤Æ¸ê®Æ®wcluster\n"
+
+#: initdb.c:1968
+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"
+"                            «ü©w¤£¦PºØÃþªºlocale¥Hªì©l¤Æ¸ê®Æ®wcluster\n"
+"                            (¹w³]±qÀô¹ÒÅܼƨú±o)\n"
+
+#: initdb.c:1973
+msgid "  --no-locale               equivalent to --locale=C\n"
+msgstr "  --no-locale               ¥\¯à¦P --locale=C\n"
+
+#: initdb.c:1974
+msgid "  -U, --username=NAME       database superuser name\n"
+msgstr "  -U, --username=NAME       ¸ê®Æ®wºÞ²zªÌ¦WºÙ\n"
+
+#: initdb.c:1975
+msgid "  -W, --pwprompt            prompt for a password for the new superuser\n"
+msgstr "  -W, --pwprompt            ¸ß°Ý·sºÞ²zªÌªº±K½X\n"
+
+#: initdb.c:1976
+msgid "  --pwfile=filename         read password for the new superuser from file\n"
+msgstr "  --pwfile=filename         ±qÀÉ®×Ū¨ú·sºÞ²zªÌªº±K½X\n"
+
+#: initdb.c:1977
+msgid "  -?, --help                show this help, then exit\n"
+msgstr "  -?, --help                Åã¥Ü³o¥÷»¡©úµM«áµ²§ô\n"
+
+#: initdb.c:1978
+msgid "  -V, --version             output version information, then exit\n"
+msgstr "  -V, --version             Åã¥Üª©¥»¸ê°TµM«áµ²§ô\n"
+
+#: initdb.c:1979
+msgid ""
+"\n"
+"Less commonly used options:\n"
+msgstr ""
+"\n"
+"«D±`¥Î¿ï¶µ:\n"
+
+#: initdb.c:1980
+msgid "  -d, --debug               generate lots of debugging output\n"
+msgstr "  -d, --debug               Åã¥Ü°£¿ù°T®§\n"
+
+#: initdb.c:1981
+msgid "  -s, --show                show internal settings\n"
+msgstr "  -s, --show                Åã¥Ü¤º³¡³]©w\n"
+
+#: initdb.c:1982
+msgid "  -L DIRECTORY              where to find the input files\n"
+msgstr "  -L DIRECTORY              where to find the input files\n"
+
+#: initdb.c:1983
+msgid "  -n, --noclean             do not clean up after errors\n"
+msgstr "  -n, --noclean             µo¥Í¿ù»~®É¤£°µ²M²z\n"
+
+#: initdb.c:1984
+msgid ""
+"\n"
+"If the data directory is not specified, the environment variable PGDATA\n"
+"is used.\n"
+msgstr ""
+"\n"
+"¦pªG¨S¦³«ü©w¸ê®Æ¥Ø¿ý´N·|¨Ï¥ÎÀô¹ÒÅܼÆPGDATA¡C\n"
+
+#: initdb.c:1986
+msgid ""
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr ""
+"\n"
+"¦^³ø¿ù»~µ¹ <pgsql-bugs@postgresql.org>¡C\n"
+
+#: initdb.c:2073
+msgid "Running in debug mode.\n"
+msgstr "¥H°£¿ù¼Ò¦¡°õ¦æ¡C\n"
+
+#: initdb.c:2077
+msgid "Running in noclean mode.  Mistakes will not be cleaned up.\n"
+msgstr "¥Hnoclean¼Ò¦¡°õ¦æ¡Aµo¥Í¿ù»~®É¤£·|²M²z¡C\n"
+
+#: initdb.c:2113
+#: initdb.c:2130
+#: initdb.c:2298
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "°õ¦æ\"%s --help\"¨ú±o§ó¦h¸ê°T¡C\n"
+
+#: initdb.c:2128
+#, c-format
+msgid "%s: too many command-line arguments (first is \"%s\")\n"
+msgstr "%s: ©R¥O¦C°Ñ¼Æ¹L¦h(²Ä¤@­Ó¬O \"%s\")\n"
+
+#: initdb.c:2136
+#, c-format
+msgid "%s: you cannot specify both password prompt and password file\n"
+msgstr "%s: ¤£¯à¦P®É¨Ï¥Î¸ß°Ý±K½X©M«ü©w±K½XÀÉ\n"
+
+#: initdb.c:2151
+#, 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: ¥¼«ü©w¸ê®Æ¥Ø¿ý\n"
+"§A¥²¶·«ü©w¸ê®Æ®w¨t²Î¦s©ñ¸ê®Æªº¥Ø¿ý¡A§A¥i¥H¨Ï¥Î -D ¿ï¶µ\n"
+"©Î¬OÀô¹ÒÅܼÆPGDATA¡C\n"
+
+#: initdb.c:2177
+#, 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 ""
+"%s »Ý­nµ{¦¡ \"postgres\"¡A¦ý¬O¦b»P\"%s\"¬Û¦Pªº¥Ø¿ý¤¤§ä¤£¨ì¡C\n"
+"½ÐÀˬd§Aªº¦w¸Ë¡C\n"
+
+#: initdb.c:2183
+#, c-format
+msgid ""
+"The program \"postgres\" was found by %s but was not the same version as \"%s\".\n"
+"Check your installation.\n"
+msgstr ""
+"%s ¤w§ä¨ìµ{¦¡\"postgres\"¡A¦ý¬O»P\"%s\"ªºª©¥»¤£²Å¡C\n"
+"½ÐÀˬd§Aªº¦w¸Ë¡C\n"
+
+#: initdb.c:2204
+#, c-format
+msgid "%s: could not determine valid short version string\n"
+msgstr "%s: µLªk¨ú±oµuª©¥»¦r¦ê\n"
+
+#: initdb.c:2257
+#, 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 ""
+"¨Ï¥ÎªÌ\"%s\"±N·|¦¨¬°¸ê®Æ®w¨t²ÎÀɮשM¦øªA¾¹¦æµ{ªº¾Ö¦³ªÌ¡C\n"
+"\n"
+
+#: initdb.c:2268
+#, c-format
+msgid "The database cluster will be initialized with locale %s.\n"
+msgstr "¸ê®Æ®wcluster·|¥Hlocale %sªì©l¤Æ¡C\n"
+
+#: initdb.c:2272
+#, 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 ""
+"¸ê®Æ®wcluster·|¥H¤U¦Clocaleªì©l¤Æ\n"
+"  COLLATE:  %s\n"
+"  CTYPE:    %s\n"
+"  MESSAGES: %s\n"
+"  MONETARY: %s\n"
+"  NUMERIC:  %s\n"
+"  TIME:     %s\n"
+
+#: initdb.c:2296
+#, c-format
+msgid "%s: could not find suitable encoding for locale \"%s\"\n"
+msgstr "%s: §ä¤£¨ì¾A¦Xªº½s½Xµ¹locale \"%s\"\n"
+
+#: initdb.c:2297
+#, c-format
+msgid "Rerun %s with the -E option.\n"
+msgstr "¥Î -E ¿ï¶µ­«·s°õ¦æ %s¡C\n"
+
+#: initdb.c:2304
+#, c-format
+msgid "The default database encoding has accordingly been set to %s.\n"
+msgstr "¹w³]¸ê®Æ®w½s½X³Q³]¬° %s¡C\n"
+
+#: initdb.c:2345
+#, c-format
+msgid "creating directory %s ... "
+msgstr "«Ø¥ß¥Ø¿ý %s ..."
+
+#: initdb.c:2359
+#, c-format
+msgid "fixing permissions on existing directory %s ... "
+msgstr "­×¥¿²{¦³¥Ø¿ý %s ªºÅv­­..."
+
+#: initdb.c:2377
+#, 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: ¥Ø¿ý\"%s\"¤£¬OªÅªº\n"
+"¦pªG§A·Q«Ø¥ß·sªº¸ê®Æ®w¨t²Î¡A½Ð±N¥Ø¿ý\"%s\"§R°£©Î²MªÅ¡A\n"
+"©Î¬O¦b°õ¦æ %s ®É¥[¤W\"%s\"¥H¥~ªº°Ñ¼Æ¡C\n"
+
+#: initdb.c:2394
+#, c-format
+msgid "creating directory %s/%s ... "
+msgstr "«Ø¥ß¥Ø¿ý %s/%s ..."
+
+#: initdb.c:2452
+#, 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"
+"°õ¦æ¦¨¥\¡A²{¦b§A¥i¥H¥Î¤U¦C©R¥O±Ò°Ê¸ê®Æ®w¦øªA¾¹:\n"
+"\n"
+"    %s%s%s/postmaster -D %s%s%s\n"
+"©Î\n"
+"    %s%s%s/pg_ctl -D %s%s%s -l logfile start\n"
+"\n"
+

diff --git a/src/bin/pg_controldata/po/zh_TW.po b/src/bin/pg_controldata/po/zh_TW.po
index 66efd85..63ab073 100644 (file)
--- a/src/bin/pg_controldata/po/zh_TW.po
+++ b/src/bin/pg_controldata/po/zh_TW.po
@@ -1,17 +1,16 @@
-# Traditional Chinese translation file for pg_controldata
-# 2003-11-25 Zhenbang Wei <forth@zbwei.net>
-# 
+# Traditional Chinese translation file for pg_controldata.
+# 2004-07-30 Zhenbang Wei <forth@zbwei.net>
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 7.4\n"
-"POT-Creation-Date: 2003-11-25 04:33-0400\n"
-"PO-Revision-Date: 2003-11-25 09:26+0800\n"
+"Project-Id-Version: PostgreSQL 7.5\n"
+"POT-Creation-Date: 2004-07-29 19:15-0300\n"
+"PO-Revision-Date: 2004-07-30 11:06+0800\n"
 "Last-Translator: Zhenbang Wei <forth@zbwei.net>\n"
 "Language-Team: Zhenbang Wei <forth@zbwei.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=Big5\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: pg_controldata.c:28
 #, c-format
@@ -19,7 +18,7 @@ msgid ""
 "%s displays control information of a PostgreSQL database cluster.\n"
 "\n"
 msgstr ""
-"%s Åã¥ÜPostgreSQL¸ê®Æ®wÂO¶°±±¨î°T®§¡C\n"
+"%s Åã¥ÜPostgreSQL¸ê®Æ®wcluster±±¨î¸ê°T¡C\n"
 "\n"
 
 #: pg_controldata.c:32
@@ -49,12 +48,12 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"¦pªG¨S¦³«ü©w¸ê®Æ¦s©ñ¥Ø¿ý¡A«h¨Ï¥ÎÀô¹ÒÅܼÆPGDATA¡C\n"
+"¦pªG¨S¦³«ü©w¸ê®Æ¥Ø¿ý´N·|¨Ï¥ÎÀô¹ÒÅܼÆPGDATA¡C\n"
 "\n"
 
 #: pg_controldata.c:42
 msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
-msgstr "±N¿ù»~¦^³ø¦Ü<pgsql-bugs@postgresql.org>.\n"
+msgstr "¦^³ø¿ù»~¦Ü<pgsql-bugs@postgresql.org>¡C\n"
 
 #: pg_controldata.c:52
 msgid "starting up"
@@ -80,27 +79,27 @@ msgstr "
 msgid "unrecognized status code"
 msgstr "µLªkÃѧOªºª¬ºA½X"
 
-#: pg_controldata.c:107
+#: pg_controldata.c:104
 #, c-format
 msgid "%s: no data directory specified\n"
-msgstr "%s: ¨S¦³«ü©w¸ê®Æ¦s©ñ¥Ø¿ý\n"
+msgstr "%s: ¨S¦³«ü©w¸ê®Æ¥Ø¿ý\n"
 
-#: pg_controldata.c:108
+#: pg_controldata.c:105
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
-msgstr "¥Î\"%s --help\"Åã¥Ü§ó¦h°T®§¡C\n"
+msgstr "°õ¦æ\"%s --help\"Åã¥Ü§ó¦h¸ê°T¡C\n"
 
-#: pg_controldata.c:116
+#: pg_controldata.c:113
 #, c-format
 msgid "%s: could not open file \"%s\" for reading: %s\n"
 msgstr "%s: µLªk¶}±ÒÀÉ®×\"%s\"¥HŪ¨ú: %s\n"
 
-#: pg_controldata.c:123
+#: pg_controldata.c:120
 #, c-format
 msgid "%s: could not read file \"%s\": %s\n"
 msgstr "%s: µLªkŪ¨úÀÉ®×\"%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"
@@ -112,120 +111,131 @@ msgstr ""
 "ªºµ²ªG¬O¤£¥i«H¿àªº¡C\n"
 "\n"
 
-#: pg_controldata.c:150
+#: pg_controldata.c:153
 #, c-format
 msgid "pg_control version number:            %u\n"
-msgstr "pg_control ª©¥»:                      %u\n"
+msgstr "pg_controlª©¥»¸¹½X:                   %u\n"
 
-#: pg_controldata.c:151
+#: pg_controldata.c:154
 #, c-format
 msgid "Catalog version number:               %u\n"
-msgstr "Catalog ª©¥»:                         %u\n"
+msgstr "catalogª©¥»¸¹½X:                      %u\n"
+
+#: pg_controldata.c:155
+#, c-format
+msgid "Database system identifier:           %s\n"
+msgstr "¸ê®Æ®w¨t²ÎÃѧO¦WºÙ:                   %s\n"
 
-#: pg_controldata.c:152
+#: pg_controldata.c:156
 #, c-format
 msgid "Database cluster state:               %s\n"
-msgstr "¸ê®Æ®wÂO¶°ª¬ºA:                         %s\n"
+msgstr "¸ê®Æ®wclusterª¬ºA:                    %s\n"
 
-#: pg_controldata.c:153
+#: pg_controldata.c:157
 #, c-format
 msgid "pg_control last modified:             %s\n"
-msgstr "pg_control³Ì«á­×§ï:                  %s\n"
+msgstr "pg_control³Ì«á­×§ï®É¶¡:               %s\n"
 
-#: pg_controldata.c:154
+#: pg_controldata.c:158
 #, c-format
 msgid "Current log file ID:                  %u\n"
 msgstr "¥Ø«eªº¤é»xÀÉID:                       %u\n"
 
-#: pg_controldata.c:155
+#: pg_controldata.c:159
 #, c-format
 msgid "Next log file segment:                %u\n"
-msgstr "¤U¤@­Ó¤é»xÀɮװϬq:                     %u\n"
+msgstr "¤U¤@­Ó¤é»xÀɮװϬq:                   %u\n"
 
-#: pg_controldata.c:156
+#: pg_controldata.c:160
 #, c-format
 msgid "Latest checkpoint location:           %X/%X\n"
-msgstr "³Ì·sªºÀˬdÂI¦ì¸m:                       %X/%X\n"
+msgstr "³Ì·sªºÀˬdÂI¦ì¸m:                     %X/%X\n"
 
-#: pg_controldata.c:158
+#: pg_controldata.c:162
 #, c-format
 msgid "Prior checkpoint location:            %X/%X\n"
-msgstr "«e¤@­ÓÀˬdÂI¦ì¸m:                       %X/%X\n"
+msgstr "«e¤@­ÓÀˬdÂI¦ì¸m:                     %X/%X\n"
 
-#: pg_controldata.c:160
+#: pg_controldata.c:164
 #, c-format
 msgid "Latest checkpoint's REDO location:    %X/%X\n"
-msgstr "³Ì·sÀˬdÂIªºREDO¦ì¸m:               %X/%X\n"
+msgstr "³Ì·sªºÀˬdÂIREDO¦ì¸m:                 %X/%X\n"
 
-#: pg_controldata.c:162
+#: pg_controldata.c:166
 #, c-format
 msgid "Latest checkpoint's UNDO location:    %X/%X\n"
-msgstr "³Ì·sÀˬdÂIªºUNDO¦ì¸m:               %X/%X\n"
+msgstr "³Ì·sªºÀˬdÂIUNDO¦ì¸m:                 %X/%X\n"
 
-#: pg_controldata.c:164
+#: pg_controldata.c:168
 #, c-format
-msgid "Latest checkpoint's StartUpID:        %u\n"
-msgstr "³Ì·sÀˬdÂIªºStartUpID:               %u\n"
+msgid "Latest checkpoint's TimeLineID:       %u\n"
+msgstr "³Ì·sªºÀˬdÂITimeLineID:               %u\n"
 
-#: pg_controldata.c:165
+#: pg_controldata.c:169
 #, c-format
 msgid "Latest checkpoint's NextXID:          %u\n"
-msgstr "³Ì·sÀˬdÂIªºNextXID:                 %u\n"
+msgstr "³Ì·sªºÀˬdÂINextXID:                  %u\n"
 
-#: pg_controldata.c:166
+#: pg_controldata.c:170
 #, c-format
 msgid "Latest checkpoint's NextOID:          %u\n"
-msgstr "³Ì·sÀˬdÂIªºNextOID:                 %u\n"
+msgstr "³Ì·sªºÀˬdÂINextOID:                  %u\n"
 
-#: pg_controldata.c:167
+#: pg_controldata.c:171
 #, c-format
 msgid "Time of latest checkpoint:            %s\n"
-msgstr "³Ì·sÀˬdÂIªº®É¶¡:                     %s\n"
+msgstr "³Ì·sªºÀˬdÂI®É¶¡:                     %s\n"
 
-#: pg_controldata.c:168
+#: pg_controldata.c:172
 #, c-format
 msgid "Database block size:                  %u\n"
-msgstr "¸ê®Æ®w°Ï¶ô¤j¤p:                         %u\n"
+msgstr "¸ê®Æ®w°Ï¶ô¤j¤p:                       %u\n"
 
-#: pg_controldata.c:169
+#: pg_controldata.c:173
 #, c-format
 msgid "Blocks per segment of large relation: %u\n"
-msgstr "¤j«¬ÃöÁp¨C¤@¬qªº°Ï¶ô¼Æ:                     %u\n"
+msgstr "large relation¨C­Ó°Ï¬qªº°Ï¶ô¼Æ:       %u\n"
 
-#: pg_controldata.c:170
+#: pg_controldata.c:174
+#, c-format
+msgid "Bytes per WAL segment:                %u\n"
+msgstr "¨C­ÓWAL°Ï¬qªº¦ì¤¸²Õ¼Æ:                %u\n"
+
+#: pg_controldata.c:175
 #, c-format
 msgid "Maximum length of identifiers:        %u\n"
 msgstr "ÃѧO¦rªº³Ì¤jªø«×:                     %u\n"
 
-#: pg_controldata.c:171
+#: pg_controldata.c:176
 #, c-format
 msgid "Maximum number of function arguments: %u\n"
 msgstr "¨ç¦¡°Ñ¼Æªº³Ì¤j­Ó¼Æ:                   %u\n"
 
-#: pg_controldata.c:172
+#: pg_controldata.c:177
 #, c-format
 msgid "Date/time type storage:               %s\n"
-msgstr "¤é´Á/®É¶¡Ãþ«¬Àx¦s:                   %s\n"
+msgstr "¤é´Á/®É¶¡Àx¦sÃþ«¬:                    %s\n"
 
-#: pg_controldata.c:173
+#: pg_controldata.c:178
 msgid "64-bit integers"
 msgstr "64¦ì¤¸¾ã¼Æ"
 
-#: pg_controldata.c:173
+#: pg_controldata.c:178
 msgid "floating-point numbers"
 msgstr "¯BÂI¼Æ"
 
-#: pg_controldata.c:174
+#: pg_controldata.c:179
 #, c-format
 msgid "Maximum length of locale name:        %u\n"
-msgstr "°Ï°ì(locale)¦WºÙªº³Ì¤jªø«×:                   %u\n"
+msgstr "locale¦WºÙªº³Ì¤jªø«×:                 %u\n"
 
-#: pg_controldata.c:175
+#: pg_controldata.c:180
 #, c-format
 msgid "LC_COLLATE:                           %s\n"
 msgstr "LC_COLLATE:                           %s\n"
 
-#: pg_controldata.c:176
+#: pg_controldata.c:181
 #, c-format
 msgid "LC_CTYPE:                             %s\n"
 msgstr "LC_CTYPE:                             %s\n"
+

diff --git a/src/bin/pg_ctl/nls.mk b/src/bin/pg_ctl/nls.mk
index 1b04954..e10229e 100644 (file)
--- a/src/bin/pg_ctl/nls.mk
+++ b/src/bin/pg_ctl/nls.mk
@@ -1,5 +1,5 @@
-# $PostgreSQL: pgsql/src/bin/pg_ctl/nls.mk,v 1.2 2004/06/25 09:49:36 dennis Exp $
+# $PostgreSQL: pgsql/src/bin/pg_ctl/nls.mk,v 1.3 2004/07/30 05:28:42 petere Exp $
 CATALOG_NAME   := pg_ctl
-AVAIL_LANGUAGES        := ru sv
+AVAIL_LANGUAGES        := ru sv zh_TW
 GETTEXT_FILES  := pg_ctl.c
 GETTEXT_TRIGGERS:= _ simple_prompt

diff --git a/src/bin/pg_ctl/po/zh_TW.po b/src/bin/pg_ctl/po/zh_TW.po
new file mode 100644 (file)
index 0000000..1be04b6
--- /dev/null
+++ b/src/bin/pg_ctl/po/zh_TW.po
@@ -0,0 +1,455 @@
+# Traditional Chinese translation for pg_ctl.
+# 2004-07-30 Zhenbang Wei <forth@zbwei.net>
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 7.5\n"
+"POT-Creation-Date: 2004-07-29 19:16-0300\n"
+"PO-Revision-Date: 2004-07-30 12:27+0800\n"
+"Last-Translator: Zhenbang Wei <forth@zbwei.net>\n"
+"Language-Team: Zhenbang Wei <forth@zbwei.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=Big5\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: °O¾ÐÅé¥ÎºÉ\n"
+
+#: pg_ctl.c:431
+#, c-format
+msgid "%s: Another postmaster may be running. Trying to start postmaster anyway.\n"
+msgstr "%s: ¥i¯à¦³¥t¤@­Ópostmaster¥¿¦b°õ¦æ¡A¹Á¸Õ±j¨î±Ò°Êpostmaster¡C\n"
+
+#: pg_ctl.c:449
+#, c-format
+msgid "%s: cannot read %s\n"
+msgstr "%s: µLªkŪ¨ú %s\n"
+
+#: pg_ctl.c:455
+#, c-format
+msgid "%s: option file %s must have exactly 1 line\n"
+msgstr "%s: ¿ï¶µÀÉ %s ¥u¯à¦³¤@¦æ¸ê®Æ\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 »Ý­n\"postmaster\"µ{¦¡¡A¦ý¬O¦b»P\"%s\"¬Û¦Pªº¥Ø¿ý¤¤§ä¤£¨ì¡C\n"
+"Àˬd§Aªº¦w¸Ë¡C\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 ¤w§ä¨ìµ{¦¡\"postmaster\"¡A¦ý¬O»P \"%s\"ª©¥»¤£²Å¡C\n"
+"½ÐÀˬd§Aªº¦w¸Ë¡C\n"
+
+#: pg_ctl.c:514
+msgid "Unable to run the postmaster binary\n"
+msgstr "µLªk°õ¦æpostmaster°õ¦æÀÉ\n"
+
+#: pg_ctl.c:524
+#, c-format
+msgid ""
+"%s: cannot start postmaster\n"
+"Examine the log output\n"
+msgstr ""
+"%s: µLªk±Ò°Êpostmaster\n"
+"½ÐÀˬdlog¿é¥X\n"
+
+#: pg_ctl.c:535
+msgid "waiting for postmaster to start..."
+msgstr "µ¥«Ýpostmaster±Ò°Ê..."
+
+#: pg_ctl.c:540
+msgid "could not start postmaster\n"
+msgstr "µLªk±Ò°Êpostmaster\n"
+
+#: pg_ctl.c:542
+msgid ""
+"done\n"
+"postmaster started\n"
+msgstr ""
+"§¹¦¨\n"
+"postmaster¤w¸g±Ò°Ê\n"
+
+#: pg_ctl.c:545
+msgid "postmaster starting\n"
+msgstr "postmaster¥¿¦b±Ò°Ê\n"
+
+#: pg_ctl.c:560
+#: pg_ctl.c:639
+#: pg_ctl.c:709
+#, c-format
+msgid "%s: could not find %s\n"
+msgstr "%s: §ä¤£¨ì %s\n"
+
+#: pg_ctl.c:561
+#: pg_ctl.c:710
+msgid "Is postmaster running?\n"
+msgstr "postmaster¬O§_¥¿¦b°õ¦æ¡H\n"
+
+#: pg_ctl.c:567
+#, c-format
+msgid "%s: cannot stop postmaster; postgres is running (PID: %ld)\n"
+msgstr "%s: µLªk°±¤îpostmaster¡Apostgres¥¿¦b°õ¦æ(PID: %ld)\n"
+
+#: pg_ctl.c:575
+#: pg_ctl.c:656
+#, c-format
+msgid "stop signal failed (PID: %ld): %s\n"
+msgstr "stop«H¸¹¥¢±Ñ(PID: %ld): %s\n"
+
+#: pg_ctl.c:583
+msgid "postmaster shutting down\n"
+msgstr "postmaster¥¿¦bÃö³¬\n"
+
+#: pg_ctl.c:590
+#: pg_ctl.c:663
+msgid "waiting for postmaster to shut down..."
+msgstr "µ¥«ÝpostmasterÃö³¬..."
+
+#: pg_ctl.c:612
+#: pg_ctl.c:687
+msgid " failed\n"
+msgstr "¥¢±Ñ\n"
+
+#: pg_ctl.c:614
+#: pg_ctl.c:689
+#, c-format
+msgid "%s: postmaster does not shut down\n"
+msgstr "%s: postmasterµLªkÃö³¬\n"
+
+#: pg_ctl.c:618
+#: pg_ctl.c:694
+msgid "done\n"
+msgstr "§¹¦¨\n"
+
+#: pg_ctl.c:620
+#: pg_ctl.c:696
+msgid "postmaster stopped\n"
+msgstr "postmaster°±¤î°õ¦æ\n"
+
+#: pg_ctl.c:640
+msgid ""
+"Is postmaster running?\n"
+"starting postmaster anyway\n"
+msgstr ""
+"postmaster¬O§_¥¿¦b°õ¦æ¡H\n"
+"±j¨î±Ò°Êpostmaster\n"
+
+#: pg_ctl.c:647
+#, c-format
+msgid "%s: cannot restart postmaster; postgres is running (PID: %ld)\n"
+msgstr "%s: µLªk­«·s±Ò°Êpostmaster¡Apostgres¥¿¦b°õ¦æ(PID: %ld)\n"
+
+#: pg_ctl.c:650
+#: pg_ctl.c:719
+msgid "Please terminate postgres and try again.\n"
+msgstr "½Ðµ²§ôpostgresµM«á¦A¸Õ¤@¦¸¡C\n"
+
+#: pg_ctl.c:716
+#, c-format
+msgid "%s: cannot reload postmaster; postgres is running (PID: %ld)\n"
+msgstr "%s: µLªk­«·s¸ü¤Jpostmaster¡A postgres¥¿¦b°õ¦æ(PID: %ld)\n"
+
+#: pg_ctl.c:725
+#, c-format
+msgid "reload signal failed (PID: %ld): %s\n"
+msgstr "reload«H¸¹¥¢±Ñ(PID: %ld): %s\n"
+
+#: pg_ctl.c:731
+msgid "postmaster signaled\n"
+msgstr "¤w³qª¾postmaster\n"
+
+#: pg_ctl.c:746
+#, c-format
+msgid "%s: postmaster or postgres not running\n"
+msgstr "%s: postmaster©Îpostgres©|¥¼°õ¦æ\n"
+
+#: pg_ctl.c:752
+#, c-format
+msgid "%s: a standalone backend \"postgres\" is running (PID: %ld)\n"
+msgstr "%s: ¤@­Ó¿W¥ß«áºÝ\"postgres\"¥¿¦b°õ¦æ(PID: %ld)\n"
+
+#: pg_ctl.c:758
+#, c-format
+msgid "%s: postmaster is running (PID: %ld)\n"
+msgstr "%s: postmaster¥¿¦b°õ¦æ(PID: %ld)\n"
+
+#: pg_ctl.c:774
+#, c-format
+msgid "signal %d failed (PID: %ld): %s\n"
+msgstr "«H¸¹ %d ¥¢±Ñ(PID: %ld): %s\n"
+
+#: pg_ctl.c:801
+msgid "Unable to find exe"
+msgstr "§ä¤£¨ì°õ¦æÀÉ"
+
+#: pg_ctl.c:844
+#: pg_ctl.c:875
+msgid "Unable to open service manager\n"
+msgstr "µLªk¶}±ÒªA°ÈºÞ²z­û\n"
+
+#: pg_ctl.c:850
+#, c-format
+msgid "Service \"%s\" already registered\n"
+msgstr "ªA°È\"%s\"¤w¸g³Qµù¥U\n"
+
+#: pg_ctl.c:861
+#, c-format
+msgid "Unable to register service \"%s\" [%d]\n"
+msgstr "µLªkµù¥UªA°È\"%s\" [%d]\n"
+
+#: pg_ctl.c:881
+#, c-format
+msgid "Service \"%s\" not registered\n"
+msgstr "ªA°È\"%s\"¥¼³Qµù¥U\n"
+
+#: pg_ctl.c:888
+#, c-format
+msgid "Unable to open service \"%s\" [%d]\n"
+msgstr "µLªk¶}±ÒªA°È\"%s\" [%d]\n"
+
+#: pg_ctl.c:894
+#, c-format
+msgid "Unable to unregister service \"%s\" [%d]\n"
+msgstr "µLªk²¾°£ªA°È\"%s\" [%d]\n"
+
+#: pg_ctl.c:1012
+#, c-format
+msgid ""
+"\n"
+"Try \"%s --help\" for more information.\n"
+msgstr ""
+"\n"
+"°õ¦æ\"%s --help\"¥HÅã¥Ü§ó¦h¸ê°T¡C\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 ¥i¥H¥Î¨Ó±Ò°Ê¡B°±¤î¡B­«·s±Ò°Ê¡B­«·s¸ü¤J³]©wÀÉ¡B\n"
+"³ø§iPostgreSQL¦øªA¾¹ª¬ºA¡A©Î¬O±þ±¼PostgreSQL¦æµ{\n"
+"\n"
+
+#: pg_ctl.c:1022
+msgid "Usage:\n"
+msgstr "¨Ï¥Î¤èªk:\n"
+
+#: pg_ctl.c:1023
+#, c-format
+msgid "  %s start   [-w] [-D DATADIR] [-s] [-l FILENAME] [-o \"OPTIONS\"]\n"
+msgstr "  %s start   [-w] [-D ¸ê®Æ¥Ø¿ý] [-s] [-l ÀɦW] [-o \"¿ï¶µ\"]\n"
+
+#: pg_ctl.c:1024
+#, c-format
+msgid "  %s stop    [-W] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
+msgstr "  %s stop    [-W] [-D ¸ê®Æ¥Ø¿ý] [-s] [-m Ãö³¬¼Ò¦¡]\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 ¸ê®Æ¥Ø¿ý] [-s] [-m Ãö³¬¼Ò¦¡] [-o \"¿ï¶µ\"]\n"
+
+#: pg_ctl.c:1026
+#, c-format
+msgid "  %s reload  [-D DATADIR] [-s]\n"
+msgstr "  %s reload  [-D ¸ê®Æ¥Ø¿ý] [-s]\n"
+
+#: pg_ctl.c:1027
+#, c-format
+msgid "  %s status  [-D DATADIR]\n"
+msgstr "  %s status  [-D ¸ê®Æ¥Ø¿ý]\n"
+
+#: pg_ctl.c:1028
+#, c-format
+msgid "  %s kill    SIGNALNAME PROCESSID\n"
+msgstr "  %s kill    «H¸¹¦WºÙ ¦æµ{ID\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 ªA°È¦WºÙ] [-U ¨Ï¥ÎªÌ] [-P ±K½X] [-D ¸ê®Æ¥Ø¿ý] [-o \"¿ï¶µ\"]\n"
+
+#: pg_ctl.c:1031
+#, c-format
+msgid "  %s unregister [-N servicename]\n"
+msgstr "  %s unregister [-N ªA°È¦WºÙ]\n"
+
+#: pg_ctl.c:1033
+msgid "Common options:\n"
+msgstr "¤@¯ë¿ï¶µ:\n"
+
+#: pg_ctl.c:1034
+msgid "  -D, --pgdata DATADIR   location of the database storage area\n"
+msgstr "  -D, --pgdata ¸ê®Æ¥Ø¿ý  ¦s©ñ¸ê®Æ®wªº¥Ø¿ý\n"
+
+#: pg_ctl.c:1035
+msgid "  -s, --silent only print errors, no informational messages\n"
+msgstr "  -s, --silent ¥uÅã¥Ü¿ù»~¡A¤£Åã¥Ü¨ä¥¦°T®§\n"
+
+#: pg_ctl.c:1037
+msgid "  -N       service name with which to register PostgreSQL server\n"
+msgstr "  -N       ¥Î¨Óµù¥UPostgreSQL¦øªA¾¹ªºªA°È¦WºÙ\n"
+
+#: pg_ctl.c:1038
+msgid "  -P       password of account to register PostgreSQL server\n"
+msgstr "  -P       ¥Î¨Óµù¥UPostgreSQL¦øªA¾¹ªº±K½X\n"
+
+#: pg_ctl.c:1039
+msgid "  -U       user name of account to register PostgreSQL server\n"
+msgstr "  -U       ¥Î¨Óµù¥UPostgreSQL¦øªA¾¹ªº±b¸¹\n"
+
+#: pg_ctl.c:1041
+msgid "  -w           wait until operation completes\n"
+msgstr "  -w           µ¥«Ý¾Þ§@§¹¦¨\n"
+
+#: pg_ctl.c:1042
+msgid "  -W           do not wait until operation completes\n"
+msgstr "  -W           ¤£µ¥«Ý¾Þ§@§¹¦¨\n"
+
+#: pg_ctl.c:1043
+msgid "  --help       show this help, then exit\n"
+msgstr "  --help       Åã¥Ü³o¥÷»¡©úµM«áµ²§ô\n"
+
+#: pg_ctl.c:1044
+msgid "  --version    output version information, then exit\n"
+msgstr "  --version    Åã¥Üª©¥»¸ê°TµM«áµ²§ô\n"
+
+#: pg_ctl.c:1045
+msgid ""
+"(The default is to wait for shutdown, but not for start or restart.)\n"
+"\n"
+msgstr ""
+"(¹w³]¬OÃö³¬®É¦Ó«D±Ò°Ê©Î­«·s±Ò°Ê®Éµ¥«Ý¡C)\n"
+"\n"
+
+#: pg_ctl.c:1046
+msgid ""
+"If the -D option is omitted, the environment variable PGDATA is used.\n"
+"\n"
+msgstr ""
+"¿ï¶µ -D ¤w¸g¨ú®ø¡A§ï¥ÎÀô¹ÒÅܼÆPGDATA¡C\n"
+"\n"
+
+#: pg_ctl.c:1047
+msgid "Options for start or restart:\n"
+msgstr "±Ò°Ê©Î­«·s±Ò°Ê¥i¥Î¿ï¶µ:\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 ÀɦW          ±N¦øªA¾¹log¼g¤JÀɮסA«Øij¨Ï¥Î¡C\n"
+
+#: pg_ctl.c:1050
+msgid ""
+"  -o OPTIONS              command line options to pass to the postmaster\n"
+"                          (PostgreSQL server executable)\n"
+msgstr "  -o ¿ï¶µ                 ¶Çµ¹postmaster(PostgreSQL¦øªA¾¹°õ¦æÀÉ)ªº©R¥O¦C¿ï¶µ\n"
+
+#: pg_ctl.c:1052
+msgid ""
+"  -p PATH-TO-POSTMASTER   normally not necessary\n"
+"\n"
+msgstr ""
+"  -p postmasterªº¸ô®|     ³q±`¤£»Ý­n\n"
+"\n"
+
+#: pg_ctl.c:1053
+msgid "Options for stop or restart:\n"
+msgstr "°±¤î©Î­«·s±Ò°Ê¥i¥Î¿ï¶µ:\n"
+
+#: pg_ctl.c:1054
+msgid ""
+"  -m SHUTDOWN-MODE   may be 'smart', 'fast', or 'immediate'\n"
+"\n"
+msgstr ""
+"  -m Ãö³¬¼Ò¦¡        ¥i¥H¬O'smart'¡B'fast'©Î'immediate'\n"
+"\n"
+
+#: pg_ctl.c:1055
+msgid "Allowed signal names for kill:\n"
+msgstr "kill¥i¥H¨Ï¥Îªº«H¸¹¦WºÙ:\n"
+
+#: pg_ctl.c:1056
+msgid ""
+"  HUP INT QUIT ABRT TERM USR1 USR2\n"
+"\n"
+msgstr ""
+
+#: pg_ctl.c:1057
+msgid "Shutdown modes are:\n"
+msgstr "Ãö³¬¼Ò¦¡:\n"
+
+#: pg_ctl.c:1058
+msgid "  smart       quit after all clients have disconnected\n"
+msgstr "  smart       ¦b©Ò¦³¥Î¤áºÝÂ_½u«áÃö³¬\n"
+
+#: pg_ctl.c:1059
+msgid "  fast        quit directly, with proper shutdown\n"
+msgstr "  fast        ª½±µ¥¿±`Ãö³¬\n"
+
+#: pg_ctl.c:1060
+msgid ""
+"  immediate   quit without complete shutdown; will lead to recovery on restart\n"
+"\n"
+msgstr ""
+"  immediate   ¥ß§YÃö³¬¡A·|¾É­P¤U¦¸±Ò°Ê®É»Ý­n´_­ìµ{§Ç\n"
+"\n"
+
+#: pg_ctl.c:1061
+msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr "¦^³ø¿ù»~¦Ü <pgsql-bugs@postgresql.org>¡C\n"
+
+#: pg_ctl.c:1086
+#, c-format
+msgid "%s: invalid shutdown mode %s\n"
+msgstr "%s: µL®ÄªºÃö³¬¼Ò¦¡ %s\n"
+
+#: pg_ctl.c:1119
+#, c-format
+msgid "%s: invalid signal \"%s\"\n"
+msgstr "%s: µL®Äªº«H¸¹\"%s\"\n"
+
+#: pg_ctl.c:1246
+#, c-format
+msgid "%s: invalid option %s\n"
+msgstr "%s: µL®Äªº¿ï¶µ %s\n"
+
+#: pg_ctl.c:1257
+#, c-format
+msgid "%s: extra operation mode %s\n"
+msgstr "%s: ¦h¾lªº¾Þ§@¼Ò¦¡ %s\n"
+
+#: pg_ctl.c:1276
+#, c-format
+msgid "%s: invalid kill syntax\n"
+msgstr "%s: µL®Äªºkill»yªk\n"
+
+#: pg_ctl.c:1294
+#, c-format
+msgid "%s: invalid operation mode %s\n"
+msgstr "%s: µL®Äªº¾Þ§@¼Ò¦¡ %s\n"
+
+#: pg_ctl.c:1304
+#, c-format
+msgid "%s: no operation specified\n"
+msgstr "%s: ¥¼«ü©w¾Þ§@¤è¦¡\n"
+
+#: pg_ctl.c:1320
+#, c-format
+msgid "%s: no database directory specified and environment variable PGDATA unset\n"
+msgstr "%s: ¥¼«ü©w¸ê®Æ¥Ø¿ý©M³]©wÀô¹ÒÅܼÆPGDATA\n"

diff --git a/src/bin/pg_resetxlog/nls.mk b/src/bin/pg_resetxlog/nls.mk
index d3a13a6..202365d 100644 (file)
--- a/src/bin/pg_resetxlog/nls.mk
+++ b/src/bin/pg_resetxlog/nls.mk
@@ -1,5 +1,5 @@
-# $PostgreSQL: pgsql/src/bin/pg_resetxlog/nls.mk,v 1.12 2004/04/15 08:15:08 petere Exp $
+# $PostgreSQL: pgsql/src/bin/pg_resetxlog/nls.mk,v 1.13 2004/07/30 05:28:47 petere Exp $
 CATALOG_NAME   := pg_resetxlog
-AVAIL_LANGUAGES        := cs de es fr hu it nb pt_BR ru sl sv zh_CN
+AVAIL_LANGUAGES        := cs de es fr hu it nb pt_BR ru sl sv zh_CN zh_TW
 GETTEXT_FILES  := pg_resetxlog.c
 GETTEXT_TRIGGERS:= _

diff --git a/src/bin/pg_resetxlog/po/zh_TW.po b/src/bin/pg_resetxlog/po/zh_TW.po
new file mode 100644 (file)
index 0000000..e0932be
--- /dev/null
+++ b/src/bin/pg_resetxlog/po/zh_TW.po
@@ -0,0 +1,338 @@
+# Traditional Chinese translation for pg_resetxlog.
+# 2004-07-30 Zhenbang Wei <forth@zbwei.net>
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 7.5\n"
+"POT-Creation-Date: 2004-07-29 19:16-0300\n"
+"PO-Revision-Date: 2004-07-30 12:56+0800\n"
+"Last-Translator: Zhenbang Wei <forth@zbwei.net>\n"
+"Language-Team: Zhenbang Wei <forth@zbwei.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=Big5\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: pg_resetxlog.c:120
+#, c-format
+msgid "%s: invalid argument for option -x\n"
+msgstr "%s: ¿ï¶µ -x ªº°Ñ¼ÆµL®Ä\n"
+
+#: pg_resetxlog.c:121
+#: pg_resetxlog.c:136
+#: pg_resetxlog.c:151
+#: pg_resetxlog.c:158
+#: pg_resetxlog.c:164
+#: pg_resetxlog.c:172
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "°õ¦æ\"%s --help\"¥HÅã¥Ü§ó¦h¸ê°T¡C\n"
+
+#: pg_resetxlog.c:126
+#, c-format
+msgid "%s: transaction ID (-x) must not be 0\n"
+msgstr "%s: ¥æ©ö ID (-x) ¥²¶·¬O 0\n"
+
+#: pg_resetxlog.c:135
+#, c-format
+msgid "%s: invalid argument for option -o\n"
+msgstr "%s: ¿ï¶µ -o ªº°Ñ¼ÆµL®Ä\n"
+
+#: pg_resetxlog.c:141
+#, c-format
+msgid "%s: OID (-o) must not be 0\n"
+msgstr "%s: OID (-o) ¥²¶·¬O 0\n"
+
+#: pg_resetxlog.c:150
+#: pg_resetxlog.c:157
+#, c-format
+msgid "%s: invalid argument for option -l\n"
+msgstr "%s: ¿ï¶µ -l ªº°Ñ¼ÆµL®Ä\n"
+
+#: pg_resetxlog.c:171
+#, c-format
+msgid "%s: no data directory specified\n"
+msgstr "%s: ¥¼«ü©w¸ê®Æ¥Ø¿ý\n"
+
+#: pg_resetxlog.c:191
+#: pg_resetxlog.c:287
+#, c-format
+msgid "%s: could not open file \"%s\" for reading: %s\n"
+msgstr "%s: µLªk¶}±ÒÀÉ®×\"%s\"¥HŪ¨ú: %s\n"
+
+#: pg_resetxlog.c:197
+#, c-format
+msgid ""
+"%s: lock file \"%s\" exists\n"
+"Is a server running?  If not, delete the lock file and try again.\n"
+msgstr ""
+"%s: Âê©wÀÉ\"%s\"¤w¦s¦b\n"
+"¦øªA¾¹¬O§_¥¿¦b°õ¦æ¡H¦pªG¤£¬O¡A§R°£Âê©wÀÉ«á¦A¸Õ¤@¦¸¡C\n"
+
+#: pg_resetxlog.c:236
+msgid ""
+"\n"
+"If these values seem acceptable, use -f to force reset.\n"
+msgstr ""
+"\n"
+"¦pªG¥i¥H±µ¨ü³o¨Ç­È¡A½Ð¥Î -f ±j¨î­«³]¡C\n"
+
+#: 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"
+"If you want to proceed anyway, use -f to force reset.\n"
+msgstr ""
+"¸ê®Æ®w¦øªA¾¹¨S¦³¥¿±`Ãö³¬¡A­«³]¥æ©ö¤é»x¥i¯à¾É­P\n"
+"¸ê®Æ¿ò¥¢¡A¦pªG§A¤´­n°õ¦æ¡A½Ð¥Î -f ±j¨î­«³]¡C\n"
+
+#: pg_resetxlog.c:261
+msgid "Transaction log reset\n"
+msgstr "­«³]¥æ©ö¤é»x\n"
+
+#: pg_resetxlog.c:290
+#, c-format
+msgid ""
+"If you are sure the data directory path is correct, execute\n"
+"  touch %s\n"
+"and try again.\n"
+msgstr ""
+"¦pªG§A½T©w¸ê®Æ¥Ø¿ýªº¸ô®|¥¿½T¡A½Ð°õ¦æ\n"
+"  touch %s\n"
+"µM«á¦A¸Õ¤@¦¸¡C\n"
+
+#: pg_resetxlog.c:303
+#, c-format
+msgid "%s: could not read file \"%s\": %s\n"
+msgstr "%s: µLªkŪ¨úÀÉ®×\"%s\": %s\n"
+
+#: pg_resetxlog.c:326
+#, c-format
+msgid "%s: pg_control exists but has invalid CRC; proceed with caution\n"
+msgstr "%s: pg_controlªºCRC¿ù»~¡AÄ~Äò°õ¦æ·|¦³¦MÀI\n"
+
+#: pg_resetxlog.c:335
+#, c-format
+msgid "%s: pg_control exists but is broken or unknown version; ignoring it\n"
+msgstr "%s: pg_control¥i¯à·lÃa©Îª©¥»¿ù»~¡A±N¥¦©¿²¤\n"
+
+#: pg_resetxlog.c:399
+#, c-format
+msgid "%s: invalid LC_COLLATE setting\n"
+msgstr "%s: µL®ÄªºLC_COLLATE³]©w\n"
+
+#: pg_resetxlog.c:406
+#, c-format
+msgid "%s: invalid LC_CTYPE setting\n"
+msgstr "%s: µL®ÄªºLC_CTYPE³]©w\n"
+
+#: pg_resetxlog.c:430
+msgid ""
+"Guessed pg_control values:\n"
+"\n"
+msgstr ""
+"²q´úªºpg_control­È:\n"
+"\n"
+
+#: pg_resetxlog.c:432
+msgid ""
+"pg_control values:\n"
+"\n"
+msgstr ""
+"pg_control­È:\n"
+"\n"
+
+#: pg_resetxlog.c:441
+#, c-format
+msgid "pg_control version number:            %u\n"
+msgstr "pg_controlª©¥»¸¹½X:                   %u\n"
+
+#: pg_resetxlog.c:442
+#, c-format
+msgid "Catalog version number:               %u\n"
+msgstr "catalogª©¥»¸¹½X:                      %u\n"
+
+#: pg_resetxlog.c:443
+#, c-format
+msgid "Database system identifier:           %s\n"
+msgstr "¸ê®Æ®w¨t²ÎÃѧO¦WºÙ:                   %s\n"
+
+#: pg_resetxlog.c:444
+#, c-format
+msgid "Current log file ID:                  %u\n"
+msgstr "¥Ø«eªº¤é»xÀÉID:                       %u\n"
+
+#: pg_resetxlog.c:445
+#, c-format
+msgid "Next log file segment:                %u\n"
+msgstr "¤U¤@­Ó¤é»xÀɮװϬq:                   %u\n"
+
+#: pg_resetxlog.c:446
+#, c-format
+msgid "Latest checkpoint's TimeLineID:       %u\n"
+msgstr "³Ì·sªºÀˬdÂITimeLineID:               %u\n"
+
+#: pg_resetxlog.c:447
+#, c-format
+msgid "Latest checkpoint's NextXID:          %u\n"
+msgstr "³Ì·sªºÀˬdÂINextXID:                  %u\n"
+
+#: pg_resetxlog.c:448
+#, c-format
+msgid "Latest checkpoint's NextOID:          %u\n"
+msgstr "³Ì·sªºÀˬdÂINextOID:                  %u\n"
+
+#: pg_resetxlog.c:449
+#, c-format
+msgid "Database block size:                  %u\n"
+msgstr "¸ê®Æ®w°Ï¶ô¤j¤p:                       %u\n"
+
+#: pg_resetxlog.c:450
+#, c-format
+msgid "Blocks per segment of large relation: %u\n"
+msgstr "large relation¨C­Ó°Ï¬qªº°Ï¶ô¼Æ:       %u\n"
+
+#: pg_resetxlog.c:451
+#, c-format
+msgid "Maximum length of identifiers:        %u\n"
+msgstr "ÃѧO¦rªº³Ì¤jªø«×:                     %u\n"
+
+#: pg_resetxlog.c:452
+#, c-format
+msgid "Maximum number of function arguments: %u\n"
+msgstr "¨ç¦¡°Ñ¼Æªº³Ì¤j­Ó¼Æ:                   %u\n"
+
+#: pg_resetxlog.c:453
+#, c-format
+msgid "Date/time type storage:               %s\n"
+msgstr "¤é´Á/®É¶¡Àx¦sÃþ«¬:                    %s\n"
+
+#: pg_resetxlog.c:454
+msgid "64-bit integers"
+msgstr "64¦ì¤¸¾ã¼Æ"
+
+#: pg_resetxlog.c:454
+msgid "floating-point numbers"
+msgstr "¯BÂI¼Æ"
+
+#: pg_resetxlog.c:455
+#, c-format
+msgid "Maximum length of locale name:        %u\n"
+msgstr "locale¦WºÙªº³Ì¤jªø«×:                 %u\n"
+
+#: pg_resetxlog.c:456
+#, c-format
+msgid "LC_COLLATE:                           %s\n"
+msgstr "LC_COLLATE:                           %s\n"
+
+#: pg_resetxlog.c:457
+#, c-format
+msgid "LC_CTYPE:                             %s\n"
+msgstr "LC_CTYPE:                             %s\n"
+
+#: pg_resetxlog.c:518
+#, c-format
+msgid "%s: internal error -- sizeof(ControlFileData) is too large ... fix xlog.c\n"
+msgstr "%s: ¤º³¡¿ù»~ -- sizeof(ControlFileData)¤Ó¤j ... ½Ð­×¥¿xlog.c\n"
+
+#: pg_resetxlog.c:531
+#, c-format
+msgid "%s: could not create pg_control file: %s\n"
+msgstr "%s: µLªk«Ø¥ßpg_controlÀÉ: %s\n"
+
+#: pg_resetxlog.c:542
+#, c-format
+msgid "%s: could not write pg_control file: %s\n"
+msgstr "%s: µLªk¼g¤Jpg_controlÀÉ: %s\n"
+
+#: pg_resetxlog.c:549
+#: pg_resetxlog.c:704
+#, c-format
+msgid "%s: fsync error: %s\n"
+msgstr "%s: fsyncµo¥Í¿ù»~: %s\n"
+
+#: pg_resetxlog.c:570
+#, c-format
+msgid "%s: could not open directory \"%s\": %s\n"
+msgstr "%s: µLªk¶}±Ò¥Ø¿ý\"%s\": %s\n"
+
+#: pg_resetxlog.c:584
+#, c-format
+msgid "%s: could not delete file \"%s\": %s\n"
+msgstr "%s: µLªk§R°£ÀÉ®×\"%s\": %s\n"
+
+#: pg_resetxlog.c:600
+#, c-format
+msgid "%s: could not read from directory \"%s\": %s\n"
+msgstr "%s: µLªkŪ¨ú¥Ø¿ý\"%s\": %s\n"
+
+#: pg_resetxlog.c:671
+#, c-format
+msgid "%s: could not open file \"%s\": %s\n"
+msgstr "%s: µLªk¶}±ÒÀÉ®×\"%s\": %s\n"
+
+#: pg_resetxlog.c:682
+#: pg_resetxlog.c:696
+#, c-format
+msgid "%s: could not write file \"%s\": %s\n"
+msgstr "%s: µLªk¼g¤JÀÉ®×\"%s\": %s\n"
+
+#: pg_resetxlog.c:715
+#, c-format
+msgid ""
+"%s resets the PostgreSQL transaction log.\n"
+"\n"
+msgstr ""
+"%s ­«³]PostgreSQL¥æ©ö¤é»x¡C\n"
+"\n"
+
+#: pg_resetxlog.c:716
+#, c-format
+msgid ""
+"Usage:\n"
+"  %s [OPTION]... DATADIR\n"
+"\n"
+msgstr ""
+"¨Ï¥Î¤èªk:\n"
+"  %s [¿ï¶µ]... ¸ê®Æ¥Ø¿ý\n"
+"\n"
+
+#: pg_resetxlog.c:717
+msgid "Options:\n"
+msgstr "¿ï¶µ:\n"
+
+#: pg_resetxlog.c:718
+msgid "  -f              force update to be done\n"
+msgstr "  -f              ±j¨î°õ¦æ§ó·s\n"
+
+#: pg_resetxlog.c:719
+msgid "  -l FILEID,SEG   force minimum WAL starting location for new transaction log\n"
+msgstr "  -l FILEID,SEG   ±j¨î·s¥æ©ö¤é»xªº³Ì¤pWAL¶}©l¦ì¸m\n"
+
+#: pg_resetxlog.c:720
+msgid "  -n              no update, just show extracted control values (for testing)\n"
+msgstr "  -n              ¤£°õ¦æ§ó·s¡A¥uÅã¥Ü¨ú±oªº±±¨î¸ê°T(¥H¨Ñ´ú¸Õ)\n"
+
+#: pg_resetxlog.c:721
+msgid "  -o OID          set next OID\n"
+msgstr "  -o OID          ³]©w¤U¤@­ÓOID\n"
+
+#: pg_resetxlog.c:722
+msgid "  -x XID          set next transaction ID\n"
+msgstr "  -x XID          ³]©w¤U¤@­Ó¥æ©öID\n"
+
+#: pg_resetxlog.c:723
+msgid "  --help          show this help, then exit\n"
+msgstr "  --help          Åã¥Ü³o¥÷»¡©úµM«áµ²§ô\n"
+
+#: pg_resetxlog.c:724
+msgid "  --version       output version information, then exit\n"
+msgstr "  --version       Åã¥Üª©¥»¸ê°TµM«áµ²§ô\n"
+
+#: pg_resetxlog.c:725
+msgid ""
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr ""
+"\n"
+"¦^³ø¿ù»~¦Ü <pgsql-bugs@postgresql.org>¡C\n"
+