summaryrefslogtreecommitdiff
path: root/src/bin
diff options
context:
space:
mode:
authorMichael P2011-07-05 03:16:11 +0000
committerMichael P2011-07-06 03:40:35 +0000
commit0bbfc1e6338b5d98d6cb83fa75f2c38f527d4d4b (patch)
tree46fa412a31d08ea6e53d488ae7bc231df0b273da /src/bin
parent091b0e828cf0fd5bbd1f9ae58ab96fc983e55d77 (diff)
parenta4bebdd92624e018108c2610fc3f2c1584b6c687 (diff)
Merge commit 'a4bebdd92624e018108c2610fc3f2c1584b6c687' into master
This is the commit merge of Postgres-XC with the intersection of PostgreSQL REL9_1_STABLE and master branches. Conflicts: COPYRIGHT contrib/pgbench/pgbench.c src/Makefile src/backend/access/transam/recovery.conf.sample src/backend/access/transam/varsup.c src/backend/access/transam/xlog.c src/backend/catalog/Makefile src/backend/catalog/dependency.c src/backend/catalog/system_views.sql src/backend/commands/copy.c src/backend/commands/explain.c src/backend/commands/sequence.c src/backend/commands/tablecmds.c src/backend/commands/vacuum.c src/backend/executor/nodeAgg.c src/backend/nodes/copyfuncs.c src/backend/nodes/equalfuncs.c src/backend/nodes/outfuncs.c src/backend/nodes/readfuncs.c src/backend/optimizer/path/allpaths.c src/backend/optimizer/plan/createplan.c src/backend/optimizer/plan/setrefs.c src/backend/parser/gram.y src/backend/parser/parse_utilcmd.c src/backend/postmaster/postmaster.c src/backend/rewrite/rewriteHandler.c src/backend/storage/lmgr/proc.c src/backend/tcop/postgres.c src/backend/utils/adt/ruleutils.c src/backend/utils/init/postinit.c src/backend/utils/misc/guc.c src/backend/utils/misc/postgresql.conf.sample src/backend/utils/sort/tuplesort.c src/bin/initdb/initdb.c src/bin/pg_ctl/pg_ctl.c src/bin/pg_dump/pg_dump.c src/include/access/xlog.h src/include/catalog/catversion.h src/include/catalog/indexing.h src/include/catalog/pg_aggregate.h src/include/catalog/pg_proc.h src/include/commands/copy.h src/include/nodes/parsenodes.h src/include/nodes/primnodes.h src/include/optimizer/pathnode.h src/include/parser/kwlist.h src/include/storage/procarray.h src/test/regress/expected/.gitignore src/test/regress/expected/aggregates.out src/test/regress/expected/alter_table.out src/test/regress/expected/bit.out src/test/regress/expected/box.out src/test/regress/expected/delete.out src/test/regress/expected/float4.out src/test/regress/expected/float8.out src/test/regress/expected/int2.out src/test/regress/expected/int8.out src/test/regress/expected/interval.out src/test/regress/expected/numeric.out src/test/regress/expected/point.out src/test/regress/expected/polygon.out src/test/regress/expected/sequence.out src/test/regress/expected/timestamp.out src/test/regress/expected/timestamptz.out src/test/regress/expected/transactions.out src/test/regress/expected/window.out src/test/regress/input/misc.source src/test/regress/output/create_misc_1.source src/test/regress/output/misc.source src/test/regress/sql/aggregates.sql src/test/regress/sql/alter_table.sql src/test/regress/sql/bit.sql src/test/regress/sql/box.sql src/test/regress/sql/delete.sql src/test/regress/sql/domain.sql src/test/regress/sql/float4.sql src/test/regress/sql/float8.sql src/test/regress/sql/int2.sql src/test/regress/sql/int8.sql src/test/regress/sql/interval.sql src/test/regress/sql/lseg.sql src/test/regress/sql/numeric.sql src/test/regress/sql/path.sql src/test/regress/sql/point.sql src/test/regress/sql/polygon.sql src/test/regress/sql/portals.sql src/test/regress/sql/sequence.sql src/test/regress/sql/timestamp.sql src/test/regress/sql/timestamptz.sql src/test/regress/sql/transactions.sql src/test/regress/sql/window.sql src/test/regress/sql/with.sql
Diffstat (limited to 'src/bin')
-rw-r--r--src/bin/Makefile9
-rw-r--r--src/bin/initdb/.gitignore4
-rw-r--r--src/bin/initdb/Makefile8
-rw-r--r--src/bin/initdb/initdb.c548
-rw-r--r--src/bin/initdb/nls.mk4
-rw-r--r--src/bin/initdb/po/cs.po4
-rw-r--r--src/bin/initdb/po/de.po319
-rw-r--r--src/bin/initdb/po/es.po294
-rw-r--r--src/bin/initdb/po/fr.po6
-rw-r--r--src/bin/initdb/po/it.po22
-rw-r--r--src/bin/initdb/po/ja.po301
-rw-r--r--src/bin/initdb/po/ko.po809
-rw-r--r--src/bin/initdb/po/pt_BR.po4
-rw-r--r--src/bin/initdb/po/ro.po845
-rw-r--r--src/bin/initdb/po/ru.po748
-rw-r--r--src/bin/initdb/po/sv.po295
-rw-r--r--src/bin/initdb/po/tr.po346
-rw-r--r--src/bin/initdb/po/zh_CN.po636
-rw-r--r--src/bin/initdb/po/zh_TW.po875
-rw-r--r--src/bin/pg_basebackup/.gitignore1
-rw-r--r--src/bin/pg_basebackup/Makefile38
-rw-r--r--src/bin/pg_basebackup/nls.mk5
-rw-r--r--src/bin/pg_basebackup/pg_basebackup.c1124
-rw-r--r--src/bin/pg_basebackup/po/de.po365
-rw-r--r--src/bin/pg_basebackup/po/es.po353
-rw-r--r--src/bin/pg_config/.gitignore1
-rw-r--r--src/bin/pg_config/Makefile8
-rw-r--r--src/bin/pg_config/nls.mk4
-rw-r--r--src/bin/pg_config/pg_config.c4
-rw-r--r--src/bin/pg_config/po/es.po111
-rw-r--r--src/bin/pg_config/po/fr.po108
-rw-r--r--src/bin/pg_config/po/ja.po112
-rw-r--r--src/bin/pg_config/po/ko.po126
-rw-r--r--src/bin/pg_config/po/pt_BR.po77
-rw-r--r--src/bin/pg_config/po/ro.po219
-rw-r--r--src/bin/pg_config/po/ru.po274
-rw-r--r--src/bin/pg_config/po/sv.po102
-rw-r--r--src/bin/pg_config/po/ta.po2
-rw-r--r--src/bin/pg_config/po/tr.po105
-rw-r--r--src/bin/pg_config/po/zh_CN.po246
-rw-r--r--src/bin/pg_config/po/zh_TW.po304
-rw-r--r--src/bin/pg_controldata/.gitignore3
-rw-r--r--src/bin/pg_controldata/Makefile8
-rw-r--r--src/bin/pg_controldata/nls.mk4
-rw-r--r--src/bin/pg_controldata/pg_controldata.c2
-rw-r--r--src/bin/pg_controldata/po/es.po110
-rw-r--r--src/bin/pg_controldata/po/fr.po2
-rw-r--r--src/bin/pg_controldata/po/ja.po151
-rw-r--r--src/bin/pg_controldata/po/ko.po139
-rw-r--r--src/bin/pg_controldata/po/pt_BR.po9
-rw-r--r--src/bin/pg_controldata/po/ro.po341
-rw-r--r--src/bin/pg_controldata/po/ru.po365
-rw-r--r--src/bin/pg_controldata/po/tr.po155
-rw-r--r--src/bin/pg_controldata/po/zh_CN.po283
-rw-r--r--src/bin/pg_controldata/po/zh_TW.po338
-rw-r--r--src/bin/pg_ctl/.gitignore1
-rw-r--r--src/bin/pg_ctl/Makefile8
-rw-r--r--src/bin/pg_ctl/nls.mk4
-rw-r--r--src/bin/pg_ctl/pg_ctl.c568
-rw-r--r--src/bin/pg_ctl/po/de.po399
-rw-r--r--src/bin/pg_ctl/po/fr.po2
-rw-r--r--src/bin/pg_ctl/po/ja.po267
-rw-r--r--src/bin/pg_ctl/po/ru.po628
-rw-r--r--src/bin/pg_ctl/po/tr.po299
-rw-r--r--src/bin/pg_ctl/po/zh_CN.po533
-rw-r--r--src/bin/pg_ctl/po/zh_TW.po771
-rw-r--r--src/bin/pg_dump/.gitignore5
-rw-r--r--src/bin/pg_dump/Makefile14
-rw-r--r--src/bin/pg_dump/README8
-rw-r--r--src/bin/pg_dump/common.c92
-rw-r--r--src/bin/pg_dump/compress_io.c684
-rw-r--r--src/bin/pg_dump/compress_io.h70
-rw-r--r--src/bin/pg_dump/dumputils.c13
-rw-r--r--src/bin/pg_dump/dumputils.h6
-rw-r--r--src/bin/pg_dump/keywords.c4
-rw-r--r--src/bin/pg_dump/nls.mk4
-rw-r--r--src/bin/pg_dump/pg_backup.h10
-rw-r--r--src/bin/pg_dump/pg_backup_archiver.c352
-rw-r--r--src/bin/pg_dump/pg_backup_archiver.h27
-rw-r--r--src/bin/pg_dump/pg_backup_custom.c438
-rw-r--r--src/bin/pg_dump/pg_backup_db.c2
-rw-r--r--src/bin/pg_dump/pg_backup_db.h2
-rw-r--r--src/bin/pg_dump/pg_backup_directory.c683
-rw-r--r--src/bin/pg_dump/pg_backup_files.c2
-rw-r--r--src/bin/pg_dump/pg_backup_null.c2
-rw-r--r--src/bin/pg_dump/pg_backup_tar.c10
-rw-r--r--src/bin/pg_dump/pg_backup_tar.h2
-rw-r--r--src/bin/pg_dump/pg_dump.c2670
-rw-r--r--src/bin/pg_dump/pg_dump.h35
-rw-r--r--src/bin/pg_dump/pg_dump_sort.c80
-rw-r--r--src/bin/pg_dump/pg_dumpall.c144
-rw-r--r--src/bin/pg_dump/pg_restore.c59
-rw-r--r--src/bin/pg_dump/po/de.po985
-rw-r--r--src/bin/pg_dump/po/es.po883
-rw-r--r--src/bin/pg_dump/po/fr.po38
-rw-r--r--src/bin/pg_dump/po/it.po6
-rw-r--r--src/bin/pg_dump/po/ja.po953
-rw-r--r--src/bin/pg_dump/po/ko.po2147
-rw-r--r--src/bin/pg_dump/po/pt_BR.po744
-rw-r--r--src/bin/pg_dump/po/tr.po1155
-rw-r--r--src/bin/pg_dump/po/zh_CN.po2141
-rw-r--r--src/bin/pg_dump/po/zh_TW.po2213
-rw-r--r--src/bin/pg_resetxlog/.gitignore3
-rw-r--r--src/bin/pg_resetxlog/Makefile8
-rw-r--r--src/bin/pg_resetxlog/nls.mk4
-rw-r--r--src/bin/pg_resetxlog/pg_resetxlog.c4
-rw-r--r--src/bin/pg_resetxlog/po/es.po165
-rw-r--r--src/bin/pg_resetxlog/po/fr.po2
-rw-r--r--src/bin/pg_resetxlog/po/ja.po176
-rw-r--r--src/bin/pg_resetxlog/po/ko.po227
-rw-r--r--src/bin/pg_resetxlog/po/pt_BR.po7
-rw-r--r--src/bin/pg_resetxlog/po/ro.po420
-rw-r--r--src/bin/pg_resetxlog/po/ru.po2
-rw-r--r--src/bin/pg_resetxlog/po/tr.po215
-rw-r--r--src/bin/pg_resetxlog/po/zh_CN.po354
-rw-r--r--src/bin/pg_resetxlog/po/zh_TW.po475
-rw-r--r--src/bin/pgevent/Makefile4
-rw-r--r--src/bin/pgevent/README2
-rw-r--r--src/bin/pgevent/pgevent.c2
-rw-r--r--src/bin/pgevent/pgmsgevent.h2
-rw-r--r--src/bin/psql/.cvsignore3
-rw-r--r--src/bin/psql/.gitignore8
-rw-r--r--src/bin/psql/Makefile8
-rw-r--r--src/bin/psql/command.c415
-rw-r--r--src/bin/psql/command.h4
-rw-r--r--src/bin/psql/common.c23
-rw-r--r--src/bin/psql/common.h6
-rw-r--r--src/bin/psql/copy.c4
-rw-r--r--src/bin/psql/copy.h4
-rw-r--r--src/bin/psql/create_help.pl4
-rw-r--r--src/bin/psql/describe.c801
-rw-r--r--src/bin/psql/describe.h20
-rw-r--r--src/bin/psql/help.c92
-rw-r--r--src/bin/psql/help.h4
-rw-r--r--src/bin/psql/input.c4
-rw-r--r--src/bin/psql/input.h4
-rw-r--r--src/bin/psql/large_obj.c6
-rw-r--r--src/bin/psql/large_obj.h4
-rw-r--r--src/bin/psql/mainloop.c4
-rw-r--r--src/bin/psql/mainloop.h4
-rw-r--r--src/bin/psql/mbprint.c28
-rw-r--r--src/bin/psql/mbprint.h2
-rw-r--r--src/bin/psql/nls.mk4
-rw-r--r--src/bin/psql/po/cs.po2
-rw-r--r--src/bin/psql/po/de.po2291
-rw-r--r--src/bin/psql/po/es.po1625
-rw-r--r--src/bin/psql/po/fr.po1198
-rw-r--r--src/bin/psql/po/ja.po1649
-rw-r--r--src/bin/psql/po/pt_BR.po4399
-rw-r--r--src/bin/psql/po/zh_CN.po4343
-rw-r--r--src/bin/psql/po/zh_TW.po5626
-rw-r--r--src/bin/psql/print.c8
-rw-r--r--src/bin/psql/print.h4
-rw-r--r--src/bin/psql/prompt.c4
-rw-r--r--src/bin/psql/prompt.h4
-rw-r--r--src/bin/psql/psqlscan.h4
-rw-r--r--src/bin/psql/psqlscan.l56
-rw-r--r--src/bin/psql/settings.h4
-rw-r--r--src/bin/psql/startup.c18
-rw-r--r--src/bin/psql/stringutils.c4
-rw-r--r--src/bin/psql/stringutils.h4
-rw-r--r--src/bin/psql/tab-complete.c712
-rw-r--r--src/bin/psql/tab-complete.h4
-rw-r--r--src/bin/psql/variables.c4
-rw-r--r--src/bin/psql/variables.h4
-rw-r--r--src/bin/scripts/.gitignore15
-rw-r--r--src/bin/scripts/Makefile24
-rw-r--r--src/bin/scripts/clusterdb.c4
-rw-r--r--src/bin/scripts/common.c4
-rw-r--r--src/bin/scripts/common.h4
-rw-r--r--src/bin/scripts/createdb.c15
-rw-r--r--src/bin/scripts/createlang.c14
-rw-r--r--src/bin/scripts/createuser.c4
-rw-r--r--src/bin/scripts/dropdb.c8
-rw-r--r--src/bin/scripts/droplang.c166
-rw-r--r--src/bin/scripts/dropuser.c4
-rw-r--r--src/bin/scripts/nls.mk4
-rw-r--r--src/bin/scripts/po/cs.po2
-rw-r--r--src/bin/scripts/po/fr.po2
-rw-r--r--src/bin/scripts/po/ja.po448
-rw-r--r--src/bin/scripts/po/ko.po565
-rw-r--r--src/bin/scripts/po/ro.po905
-rw-r--r--src/bin/scripts/po/tr.po160
-rw-r--r--src/bin/scripts/po/zh_CN.po672
-rw-r--r--src/bin/scripts/po/zh_TW.po954
-rw-r--r--src/bin/scripts/reindexdb.c4
-rw-r--r--src/bin/scripts/vacuumdb.c4
187 files changed, 44487 insertions, 16829 deletions
diff --git a/src/bin/Makefile b/src/bin/Makefile
index db0594b8f6..3809412a2d 100644
--- a/src/bin/Makefile
+++ b/src/bin/Makefile
@@ -2,10 +2,10 @@
#
# Makefile for src/bin (client programs)
#
-# Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
+# Portions Copyright (c) 1996-2011, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California
#
-# $PostgreSQL: pgsql/src/bin/Makefile,v 1.56 2010/01/02 16:57:58 momjian Exp $
+# src/bin/Makefile
#
#-------------------------------------------------------------------------
@@ -14,10 +14,9 @@ top_builddir = ../..
include $(top_builddir)/src/Makefile.global
SUBDIRS = initdb pg_ctl pg_dump \
- psql scripts pg_config pg_controldata pg_resetxlog
+ psql scripts pg_config pg_controldata pg_resetxlog pg_basebackup
ifeq ($(PORTNAME), win32)
SUBDIRS+=pgevent
endif
-all install installdirs uninstall distprep clean distclean maintainer-clean:
- @for dir in $(SUBDIRS); do $(MAKE) -C $$dir $@ || exit; done
+$(recurse)
diff --git a/src/bin/initdb/.gitignore b/src/bin/initdb/.gitignore
new file mode 100644
index 0000000000..843eaf0c1e
--- /dev/null
+++ b/src/bin/initdb/.gitignore
@@ -0,0 +1,4 @@
+/encnames.c
+/pqsignal.c
+
+/initdb
diff --git a/src/bin/initdb/Makefile b/src/bin/initdb/Makefile
index 2ffcb54153..7dd6683813 100644
--- a/src/bin/initdb/Makefile
+++ b/src/bin/initdb/Makefile
@@ -2,10 +2,10 @@
#
# Makefile for src/bin/initdb
#
-# Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
+# Portions Copyright (c) 1996-2011, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California
#
-# $PostgreSQL: pgsql/src/bin/initdb/Makefile,v 1.61 2010/07/05 18:54:37 tgl Exp $
+# src/bin/initdb/Makefile
#
#-------------------------------------------------------------------------
@@ -20,9 +20,9 @@ override CPPFLAGS := -DFRONTEND -I$(libpq_srcdir) $(CPPFLAGS)
OBJS= initdb.o encnames.o pqsignal.o $(WIN32RES)
-all: submake-libpgport initdb
+all: initdb
-initdb: $(OBJS)
+initdb: $(OBJS) | submake-libpgport
$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
# We used to pull in all of libpq to get encnames and pqsignal, but that
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index 64ba610e57..fd430d8528 100644
--- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
@@ -38,12 +38,11 @@
*
* This code is released under the terms of the PostgreSQL License.
*
- * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
- * Portions Copyright (c) 1994, Regents of the University of California
+ * Portions Copyright (c) 1996-2011, PostgreSQL Global Development Group
* Portions Copyright (c) 2010-2011 Nippon Telegraph and Telephone Corporation
- * Portions taken from FreeBSD.
+ * Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.186 2010/02/26 02:01:15 momjian Exp $
+ * src/bin/initdb/initdb.c
*
*-------------------------------------------------------------------------
*/
@@ -85,6 +84,7 @@ static char *username = "";
static bool pwprompt = false;
static char *pwfilename = NULL;
static char *authmethod = "";
+static char *authmethodlocal = "";
static bool debug = false;
static bool noclean = false;
static bool show_setting = false;
@@ -154,11 +154,9 @@ static char **filter_lines_with_token(char **lines, const char *token);
static char **readfile(const char *path);
static void writefile(char *path, char **lines);
static FILE *popen_check(const char *command, const char *mode);
-static int mkdir_p(char *path, mode_t omode);
static void exit_nicely(void);
static char *get_id(void);
static char *get_encoding_id(char *encoding_name);
-static int check_data_dir(char *dir);
static bool mkdatadir(const char *subdir);
static void set_input(char **dest, char *filename);
static void check_input(char *path);
@@ -172,6 +170,7 @@ static void get_set_pwd(void);
static void setup_depend(void);
static void setup_sysviews(void);
static void setup_description(void);
+static void setup_collation(void);
static void setup_conversion(void);
static void setup_dictionary(void);
static void setup_privileges(void);
@@ -188,6 +187,7 @@ static int locale_date_order(const char *locale);
static bool check_locale_name(const char *locale);
static bool check_locale_encoding(const char *locale, int encoding);
static void setlocales(void);
+static char *localemap(char *locale);
static void usage(const char *progname);
#ifdef WIN32
@@ -231,6 +231,12 @@ do { \
output_failed = true, output_errno = errno; \
} while (0)
+#define PG_CMD_PRINTF3(fmt, arg1, arg2, arg3) \
+do { \
+ if (fprintf(cmdfd, fmt, arg1, arg2, arg3) < 0 || fflush(cmdfd) < 0) \
+ output_failed = true, output_errno = errno; \
+} while (0)
+
#ifndef WIN32
#define QUOTE_PATH ""
#define DIR_SEP "/"
@@ -472,110 +478,6 @@ popen_check(const char *command, const char *mode)
return cmdfd;
}
-/* source stolen from FreeBSD /src/bin/mkdir/mkdir.c and adapted */
-
-/*
- * this tries to build all the elements of a path to a directory a la mkdir -p
- * we assume the path is in canonical form, i.e. uses / as the separator
- * we also assume it isn't null.
- *
- * note that on failure, the path arg has been modified to show the particular
- * directory level we had problems with.
- */
-static int
-mkdir_p(char *path, mode_t omode)
-{
- struct stat sb;
- mode_t numask,
- oumask;
- int first,
- last,
- retval;
- char *p;
-
- p = path;
- oumask = 0;
- retval = 0;
-
-#ifdef WIN32
- /* skip network and drive specifiers for win32 */
- if (strlen(p) >= 2)
- {
- if (p[0] == '/' && p[1] == '/')
- {
- /* network drive */
- p = strstr(p + 2, "/");
- if (p == NULL)
- return 1;
- }
- else if (p[1] == ':' &&
- ((p[0] >= 'a' && p[0] <= 'z') ||
- (p[0] >= 'A' && p[0] <= 'Z')))
- {
- /* local drive */
- p += 2;
- }
- }
-#endif
-
- if (p[0] == '/') /* Skip leading '/'. */
- ++p;
- for (first = 1, last = 0; !last; ++p)
- {
- if (p[0] == '\0')
- last = 1;
- else if (p[0] != '/')
- continue;
- *p = '\0';
- if (!last && p[1] == '\0')
- last = 1;
- if (first)
- {
- /*
- * POSIX 1003.2: For each dir operand that does not name an
- * existing directory, effects equivalent to those caused by the
- * following command shall occcur:
- *
- * mkdir -p -m $(umask -S),u+wx $(dirname dir) && mkdir [-m mode]
- * dir
- *
- * We change the user's umask and then restore it, instead of
- * doing chmod's.
- */
- oumask = umask(0);
- numask = oumask & ~(S_IWUSR | S_IXUSR);
- (void) umask(numask);
- first = 0;
- }
- if (last)
- (void) umask(oumask);
-
- /* check for pre-existing directory; ok if it's a parent */
- if (stat(path, &sb) == 0)
- {
- if (!S_ISDIR(sb.st_mode))
- {
- if (last)
- errno = EEXIST;
- else
- errno = ENOTDIR;
- retval = 1;
- break;
- }
- }
- else if (mkdir(path, last ? omode : S_IRWXU | S_IRWXG | S_IRWXO) < 0)
- {
- retval = 1;
- break;
- }
- if (!last)
- *p = '/';
- }
- if (!first && !last)
- (void) umask(oumask);
- return retval;
-}
-
/*
* clean up any files we created on failure
* if we created the data directory remove it too
@@ -804,59 +706,6 @@ find_matching_ts_config(const char *lc_type)
/*
- * make sure the directory either doesn't exist or is empty
- *
- * Returns 0 if nonexistent, 1 if exists and empty, 2 if not empty,
- * or -1 if trouble accessing directory
- */
-static int
-check_data_dir(char *dir)
-{
- DIR *chkdir;
- struct dirent *file;
- int result = 1;
-
- errno = 0;
-
- chkdir = opendir(dir);
-
- if (!chkdir)
- return (errno == ENOENT) ? 0 : -1;
-
- while ((file = readdir(chkdir)) != NULL)
- {
- if (strcmp(".", file->d_name) == 0 ||
- strcmp("..", file->d_name) == 0)
- {
- /* skip this and parent directory */
- continue;
- }
- else
- {
- result = 2; /* not empty */
- break;
- }
- }
-
-#ifdef WIN32
-
- /*
- * This fix is in mingw cvs (runtime/mingwex/dirent.c rev 1.4), but not in
- * released version
- */
- if (GetLastError() == ERROR_NO_MORE_FILES)
- errno = 0;
-#endif
-
- closedir(chkdir);
-
- if (errno != 0)
- result = -1; /* some kind of I/O error? */
-
- return result;
-}
-
-/*
* make the data directory (or one of its subdirectories if subdir is not NULL)
*/
static bool
@@ -872,7 +721,7 @@ mkdatadir(const char *subdir)
else
strcpy(path, pg_data);
- if (mkdir_p(path, 0700) == 0)
+ if (pg_mkdir_p(path, S_IRWXU) == 0)
return true;
fprintf(stderr, _("%s: could not create directory \"%s\": %s\n"),
@@ -1168,7 +1017,7 @@ setup_config(void)
snprintf(path, sizeof(path), "%s/postgresql.conf", pg_data);
writefile(path, conflines);
- chmod(path, 0600);
+ chmod(path, S_IRUSR | S_IWUSR);
free(conflines);
@@ -1231,15 +1080,23 @@ setup_config(void)
conflines = replace_token(conflines,
"@authmethod@",
authmethod);
+ conflines = replace_token(conflines,
+ "@authmethodlocal@",
+ authmethodlocal);
conflines = replace_token(conflines,
"@authcomment@",
strcmp(authmethod, "trust") ? "" : AUTHTRUST_WARNING);
+ /* Replace username for replication */
+ conflines = replace_token(conflines,
+ "@default_username@",
+ username);
+
snprintf(path, sizeof(path), "%s/pg_hba.conf", pg_data);
writefile(path, conflines);
- chmod(path, 0600);
+ chmod(path, S_IRUSR | S_IWUSR);
free(conflines);
@@ -1250,7 +1107,7 @@ setup_config(void)
snprintf(path, sizeof(path), "%s/pg_ident.conf", pg_data);
writefile(path, conflines);
- chmod(path, 0600);
+ chmod(path, S_IRUSR | S_IWUSR);
free(conflines);
@@ -1315,9 +1172,9 @@ bootstrap_template1(void)
bki_lines = replace_token(bki_lines, "ENCODING", encodingid);
- bki_lines = replace_token(bki_lines, "LC_COLLATE", lc_collate);
+ bki_lines = replace_token(bki_lines, "LC_COLLATE", escape_quotes(lc_collate));
- bki_lines = replace_token(bki_lines, "LC_CTYPE", lc_ctype);
+ bki_lines = replace_token(bki_lines, "LC_CTYPE", escape_quotes(lc_ctype));
/*
* Pass correct LC_xxx environment to bootstrap.
@@ -1543,6 +1400,8 @@ setup_depend(void)
" FROM pg_ts_template;\n",
"INSERT INTO pg_depend SELECT 0,0,0, tableoid,oid,0, 'p' "
" FROM pg_ts_config;\n",
+ "INSERT INTO pg_depend SELECT 0,0,0, tableoid,oid,0, 'p' "
+ " FROM pg_collation;\n",
"INSERT INTO pg_shdepend SELECT 0,0,0,0, tableoid,oid, 'p' "
" FROM pg_authid;\n",
NULL
@@ -1649,11 +1508,205 @@ setup_description(void)
" FROM tmp_pg_shdescription t, pg_class c "
" WHERE c.relname = t.classname;\n");
+ /* Create default descriptions for operator implementation functions */
+ PG_CMD_PUTS("WITH funcdescs AS ( "
+ "SELECT p.oid as p_oid, oprname, "
+ "coalesce(obj_description(o.oid, 'pg_operator'),'') as opdesc "
+ "FROM pg_proc p JOIN pg_operator o ON oprcode = p.oid ) "
+ "INSERT INTO pg_description "
+ " SELECT p_oid, 'pg_proc'::regclass, 0, "
+ " 'implementation of ' || oprname || ' operator' "
+ " FROM funcdescs "
+ " WHERE opdesc NOT LIKE 'deprecated%' AND "
+ " NOT EXISTS (SELECT 1 FROM pg_description "
+ " WHERE objoid = p_oid AND classoid = 'pg_proc'::regclass);\n");
+
PG_CMD_CLOSE;
check_ok();
}
+#ifdef HAVE_LOCALE_T
+/*
+ * "Normalize" a locale name, stripping off encoding tags such as
+ * ".utf8" (e.g., "en_US.utf8" -> "en_US", but "br_FR.iso885915@euro"
+ * -> "br_FR@euro"). Return true if a new, different name was
+ * generated.
+ */
+static bool
+normalize_locale_name(char *new, const char *old)
+{
+ char *n = new;
+ const char *o = old;
+ bool changed = false;
+
+ while (*o)
+ {
+ if (*o == '.')
+ {
+ /* skip over encoding tag such as ".utf8" or ".UTF-8" */
+ o++;
+ while ((*o >= 'A' && *o <= 'Z')
+ || (*o >= 'a' && *o <= 'z')
+ || (*o >= '0' && *o <= '9')
+ || (*o == '-'))
+ o++;
+ changed = true;
+ }
+ else
+ *n++ = *o++;
+ }
+ *n = '\0';
+
+ return changed;
+}
+#endif /* HAVE_LOCALE_T */
+
+/*
+ * populate pg_collation
+ */
+static void
+setup_collation(void)
+{
+#if defined(HAVE_LOCALE_T) && !defined(WIN32)
+ int i;
+ FILE *locale_a_handle;
+ char localebuf[NAMEDATALEN];
+ int count = 0;
+
+ PG_CMD_DECL;
+#endif
+
+ fputs(_("creating collations ... "), stdout);
+ fflush(stdout);
+
+#if defined(HAVE_LOCALE_T) && !defined(WIN32)
+ snprintf(cmd, sizeof(cmd),
+ "\"%s\" %s template1 >%s",
+ backend_exec, backend_options,
+ DEVNULL);
+
+ locale_a_handle = popen_check("locale -a", "r");
+ if (!locale_a_handle)
+ return; /* complaint already printed */
+
+ PG_CMD_OPEN;
+
+ PG_CMD_PUTS("CREATE TEMP TABLE tmp_pg_collation ( "
+ " collname name, "
+ " locale name, "
+ " encoding int) WITHOUT OIDS;\n");
+
+ while (fgets(localebuf, sizeof(localebuf), locale_a_handle))
+ {
+ size_t len;
+ int enc;
+ bool skip;
+ char *quoted_locale;
+ char alias[NAMEDATALEN];
+
+ len = strlen(localebuf);
+
+ if (len == 0 || localebuf[len - 1] != '\n')
+ {
+ if (debug)
+ fprintf(stderr, _("%s: locale name too long, skipped: %s\n"),
+ progname, localebuf);
+ continue;
+ }
+ localebuf[len - 1] = '\0';
+
+ /*
+ * Some systems have locale names that don't consist entirely of ASCII
+ * letters (such as "bokm&aring;l" or "fran&ccedil;ais"). This is
+ * pretty silly, since we need the locale itself to interpret the
+ * non-ASCII characters. We can't do much with those, so we filter
+ * them out.
+ */
+ skip = false;
+ for (i = 0; i < len; i++)
+ {
+ if (IS_HIGHBIT_SET(localebuf[i]))
+ {
+ skip = true;
+ break;
+ }
+ }
+ if (skip)
+ {
+ if (debug)
+ fprintf(stderr, _("%s: locale name has non-ASCII characters, skipped: %s\n"),
+ progname, localebuf);
+ continue;
+ }
+
+ enc = pg_get_encoding_from_locale(localebuf, debug);
+ if (enc < 0)
+ {
+ /* error message printed by pg_get_encoding_from_locale() */
+ continue;
+ }
+ if (!PG_VALID_BE_ENCODING(enc))
+ continue; /* ignore locales for client-only encodings */
+ if (enc == PG_SQL_ASCII)
+ continue; /* C/POSIX are already in the catalog */
+
+ count++;
+
+ quoted_locale = escape_quotes(localebuf);
+
+ PG_CMD_PRINTF3("INSERT INTO tmp_pg_collation VALUES (E'%s', E'%s', %d);\n",
+ quoted_locale, quoted_locale, enc);
+
+ /*
+ * Generate aliases such as "en_US" in addition to "en_US.utf8" for
+ * ease of use. Note that collation names are unique per encoding
+ * only, so this doesn't clash with "en_US" for LATIN1, say.
+ */
+ if (normalize_locale_name(alias, localebuf))
+ PG_CMD_PRINTF3("INSERT INTO tmp_pg_collation VALUES (E'%s', E'%s', %d);\n",
+ escape_quotes(alias), quoted_locale, enc);
+ }
+
+ /* Add an SQL-standard name */
+ PG_CMD_PRINTF1("INSERT INTO tmp_pg_collation VALUES ('ucs_basic', 'C', %d);\n", PG_UTF8);
+
+ /*
+ * When copying collations to the final location, eliminate aliases that
+ * conflict with an existing locale name for the same encoding. For
+ * example, "br_FR.iso88591" is normalized to "br_FR", both for encoding
+ * LATIN1. But the unnormalized locale "br_FR" already exists for LATIN1.
+ * Prefer the alias that matches the OS locale name, else the first locale
+ * name by sort order (arbitrary choice to be deterministic).
+ *
+ * Also, eliminate any aliases that conflict with pg_collation's
+ * hard-wired entries for "C" etc.
+ */
+ PG_CMD_PUTS("INSERT INTO pg_collation (collname, collnamespace, collowner, collencoding, collcollate, collctype) "
+ " SELECT DISTINCT ON (collname, encoding)"
+ " collname, "
+ " (SELECT oid FROM pg_namespace WHERE nspname = 'pg_catalog') AS collnamespace, "
+ " (SELECT relowner FROM pg_class WHERE relname = 'pg_collation') AS collowner, "
+ " encoding, locale, locale "
+ " FROM tmp_pg_collation"
+ " WHERE NOT EXISTS (SELECT 1 FROM pg_collation WHERE collname = tmp_pg_collation.collname)"
+ " ORDER BY collname, encoding, (collname = locale) DESC, locale;\n");
+
+ pclose(locale_a_handle);
+ PG_CMD_CLOSE;
+
+ check_ok();
+ if (count == 0 && !debug)
+ {
+ printf(_("No usable system locales were found.\n"));
+ printf(_("Use the option \"--debug\" to see details.\n"));
+ }
+#else /* not HAVE_LOCALE_T && not WIN32 */
+ printf(_("not supported on this platform\n"));
+ fflush(stdout);
+#endif /* not HAVE_LOCALE_T && not WIN32 */
+}
+
/*
* load conversion functions
*/
@@ -1877,7 +1930,7 @@ load_plpgsql(void)
PG_CMD_OPEN;
- PG_CMD_PUTS("CREATE LANGUAGE plpgsql;\n");
+ PG_CMD_PUTS("CREATE EXTENSION plpgsql;\n");
PG_CMD_CLOSE;
@@ -1939,6 +1992,8 @@ make_template0(void)
"REVOKE CREATE,TEMPORARY ON DATABASE template1 FROM public;\n",
"REVOKE CREATE,TEMPORARY ON DATABASE template0 FROM public;\n",
+ "COMMENT ON DATABASE template0 IS 'unmodifiable empty database';\n",
+
/*
* Finally vacuum to clean up dead rows in pg_database
*/
@@ -1974,6 +2029,7 @@ make_postgres(void)
const char **line;
static const char *postgres_setup[] = {
"CREATE DATABASE postgres;\n",
+ "COMMENT ON DATABASE postgres IS 'default administrative connection database';\n",
NULL
};
@@ -2183,7 +2239,7 @@ check_locale_encoding(const char *locale, int user_enc)
{
int locale_enc;
- locale_enc = pg_get_encoding_from_locale(locale);
+ locale_enc = pg_get_encoding_from_locale(locale, true);
/* See notes in createdb() to understand these tests */
if (!(locale_enc == user_enc ||
@@ -2209,6 +2265,83 @@ check_locale_encoding(const char *locale, int user_enc)
return true;
}
+#ifdef WIN32
+
+/*
+ * Replace 'needle' with 'replacement' in 'str' . Note that the replacement
+ * is done in-place, so 'replacement' must be shorter than 'needle'.
+ */
+static void
+strreplace(char *str, char *needle, char *replacement)
+{
+ char *s;
+
+ s = strstr(str, needle);
+ if (s != NULL)
+ {
+ int replacementlen = strlen(replacement);
+ char *rest = s + strlen(needle);
+
+ memcpy(s, replacement, replacementlen);
+ memmove(s + replacementlen, rest, strlen(rest) + 1);
+ }
+}
+#endif /* WIN32 */
+
+/*
+ * Windows has a problem with locale names that have a dot in the country
+ * name. For example:
+ *
+ * "Chinese (Traditional)_Hong Kong S.A.R..950"
+ *
+ * For some reason, setlocale() doesn't accept that. Fortunately, Windows'
+ * setlocale() accepts various alternative names for such countries, so we
+ * map the full country names to accepted aliases.
+ *
+ * The returned string is always malloc'd - if no mapping is done it is
+ * just a malloc'd copy of the original.
+ */
+static char *
+localemap(char *locale)
+{
+ locale = xstrdup(locale);
+
+#ifdef WIN32
+
+ /*
+ * Map the full country name to an abbreviation that setlocale() accepts.
+ *
+ * "HKG" is listed here:
+ * http://msdn.microsoft.com/en-us/library/cdax410z%28v=vs.71%29.aspx
+ * (Country/Region Strings).
+ *
+ * "ARE" is the ISO-3166 three-letter code for U.A.E. It is not on the
+ * above list, but seems to work anyway.
+ */
+ strreplace(locale, "Hong Kong S.A.R.", "HKG");
+ strreplace(locale, "U.A.E.", "ARE");
+
+ /*
+ * The ISO-3166 country code for Macau S.A.R. is MAC, but Windows doesn't
+ * seem to recognize that. And Macau isn't listed in the table of accepted
+ * abbreviations linked above.
+ *
+ * Fortunately, "ZHM" seems to be accepted as an alias for "Chinese
+ * (Traditional)_Macau S.A.R..950", so we use that. Note that it's unlike
+ * HKG and ARE, ZHM is an alias for the whole locale name, not just the
+ * country part. I'm not sure where that "ZHM" comes from, must be some
+ * legacy naming scheme. But hey, it works.
+ *
+ * Some versions of Windows spell it "Macau", others "Macao".
+ */
+ strreplace(locale, "Chinese (Traditional)_Macau S.A.R..950", "ZHM");
+ strreplace(locale, "Chinese_Macau S.A.R..950", "ZHM");
+ strreplace(locale, "Chinese (Traditional)_Macao S.A.R..950", "ZHM");
+ strreplace(locale, "Chinese_Macao S.A.R..950", "ZHM");
+#endif /* WIN32 */
+
+ return locale;
+}
/*
* set up the locale variables
@@ -2241,25 +2374,25 @@ setlocales(void)
*/
if (strlen(lc_ctype) == 0 || !check_locale_name(lc_ctype))
- lc_ctype = xstrdup(setlocale(LC_CTYPE, NULL));
+ lc_ctype = localemap(setlocale(LC_CTYPE, NULL));
if (strlen(lc_collate) == 0 || !check_locale_name(lc_collate))
- lc_collate = xstrdup(setlocale(LC_COLLATE, NULL));
+ lc_collate = localemap(setlocale(LC_COLLATE, NULL));
if (strlen(lc_numeric) == 0 || !check_locale_name(lc_numeric))
- lc_numeric = xstrdup(setlocale(LC_NUMERIC, NULL));
+ lc_numeric = localemap(setlocale(LC_NUMERIC, NULL));
if (strlen(lc_time) == 0 || !check_locale_name(lc_time))
- lc_time = xstrdup(setlocale(LC_TIME, NULL));
+ lc_time = localemap(setlocale(LC_TIME, NULL));
if (strlen(lc_monetary) == 0 || !check_locale_name(lc_monetary))
- lc_monetary = xstrdup(setlocale(LC_MONETARY, NULL));
+ lc_monetary = localemap(setlocale(LC_MONETARY, NULL));
if (strlen(lc_messages) == 0 || !check_locale_name(lc_messages))
#if defined(LC_MESSAGES) && !defined(WIN32)
{
/* when available get the current locale setting */
- lc_messages = xstrdup(setlocale(LC_MESSAGES, NULL));
+ lc_messages = localemap(setlocale(LC_MESSAGES, NULL));
}
#else
{
/* when not available, get the CTYPE setting */
- lc_messages = xstrdup(setlocale(LC_CTYPE, NULL));
+ lc_messages = localemap(setlocale(LC_CTYPE, NULL));
}
#endif
@@ -2268,7 +2401,10 @@ setlocales(void)
#ifdef WIN32
typedef BOOL (WINAPI * __CreateRestrictedToken) (HANDLE, DWORD, DWORD, PSID_AND_ATTRIBUTES, DWORD, PLUID_AND_ATTRIBUTES, DWORD, PSID_AND_ATTRIBUTES, PHANDLE);
+/* Windows API define missing from some versions of MingW headers */
+#ifndef DISABLE_MAX_PRIVILEGE
#define DISABLE_MAX_PRIVILEGE 0x1
+#endif
/*
* Create a restricted token and execute the specified process with it.
@@ -2461,6 +2597,7 @@ main(int argc, char *argv[])
"pg_xlog/archive_status",
"pg_clog",
"pg_notify",
+ "pg_serial",
"pg_subtrans",
"pg_twophase",
"pg_multixact/members",
@@ -2596,8 +2733,8 @@ main(int argc, char *argv[])
}
if (strcmp(authmethod, "md5") &&
+ strcmp(authmethod, "peer") &&
strcmp(authmethod, "ident") &&
- strncmp(authmethod, "ident ", 6) && /* ident with space = param */
strcmp(authmethod, "trust") &&
#ifdef USE_PAM
strcmp(authmethod, "pam") &&
@@ -2626,6 +2763,20 @@ main(int argc, char *argv[])
exit(1);
}
+ /*
+ * When ident is specified, use peer for local connections. Mirrored, when
+ * peer is specified, use ident for TCP connections.
+ */
+ if (strcmp(authmethod, "ident") == 0)
+ authmethodlocal = "peer";
+ else if (strcmp(authmethod, "peer") == 0)
+ {
+ authmethodlocal = "peer";
+ authmethod = "ident";
+ }
+ else
+ authmethodlocal = authmethod;
+
if (strlen(pg_data) == 0)
{
pgdenv = getenv("PGDATA");
@@ -2836,7 +2987,7 @@ main(int argc, char *argv[])
{
int ctype_enc;
- ctype_enc = pg_get_encoding_from_locale(lc_ctype);
+ ctype_enc = pg_get_encoding_from_locale(lc_ctype, true);
if (ctype_enc == -1)
{
@@ -2850,7 +3001,19 @@ main(int argc, char *argv[])
}
else if (!pg_valid_server_encoding_id(ctype_enc))
{
- /* We recognized it, but it's not a legal server encoding */
+ /*
+ * We recognized it, but it's not a legal server encoding. On
+ * Windows, UTF-8 works with any locale, so we can fall back to
+ * UTF-8.
+ */
+#ifdef WIN32
+ printf(_("Encoding %s implied by locale is not allowed as a server-side encoding.\n"
+ "The default database encoding will be set to %s instead.\n"),
+ pg_encoding_to_char(ctype_enc),
+ pg_encoding_to_char(PG_UTF8));
+ ctype_enc = PG_UTF8;
+ encodingid = encodingid_to_string(ctype_enc);
+#else
fprintf(stderr,
_("%s: locale %s requires unsupported encoding %s\n"),
progname, lc_ctype, pg_encoding_to_char(ctype_enc));
@@ -2859,6 +3022,7 @@ main(int argc, char *argv[])
"Rerun %s with a different locale selection.\n"),
pg_encoding_to_char(ctype_enc), progname);
exit(1);
+#endif
}
else
{
@@ -2906,7 +3070,7 @@ main(int argc, char *argv[])
printf("\n");
- umask(077);
+ umask(S_IRWXG | S_IRWXO);
/*
* now we are starting to do real work, trap signals so we can clean up
@@ -2931,7 +3095,7 @@ main(int argc, char *argv[])
pqsignal(SIGPIPE, SIG_IGN);
#endif
- switch (check_data_dir(pg_data))
+ switch (pg_check_dir(pg_data))
{
case 0:
/* PGDATA not there, must create it */
@@ -2953,7 +3117,7 @@ main(int argc, char *argv[])
pg_data);
fflush(stdout);
- if (chmod(pg_data, 0700) != 0)
+ if (chmod(pg_data, S_IRWXU) != 0)
{
fprintf(stderr, _("%s: could not change permissions of directory \"%s\": %s\n"),
progname, pg_data, strerror(errno));
@@ -2997,8 +3161,8 @@ main(int argc, char *argv[])
exit_nicely();
}
- /* check if the specified xlog directory is empty */
- switch (check_data_dir(xlog_dir))
+ /* check if the specified xlog directory exists/is empty */
+ switch (pg_check_dir(xlog_dir))
{
case 0:
/* xlog directory not there, must create it */
@@ -3006,7 +3170,7 @@ main(int argc, char *argv[])
xlog_dir);
fflush(stdout);
- if (mkdir_p(xlog_dir, 0700) != 0)
+ if (pg_mkdir_p(xlog_dir, S_IRWXU) != 0)
{
fprintf(stderr, _("%s: could not create directory \"%s\": %s\n"),
progname, xlog_dir, strerror(errno));
@@ -3017,13 +3181,14 @@ main(int argc, char *argv[])
made_new_xlogdir = true;
break;
+
case 1:
/* Present but empty, fix permissions and use it */
printf(_("fixing permissions on existing directory %s ... "),
xlog_dir);
fflush(stdout);
- if (chmod(xlog_dir, 0700) != 0)
+ if (chmod(xlog_dir, S_IRWXU) != 0)
{
fprintf(stderr, _("%s: could not change permissions of directory \"%s\": %s\n"),
progname, xlog_dir, strerror(errno));
@@ -3034,6 +3199,7 @@ main(int argc, char *argv[])
found_existing_xlogdir = true;
break;
+
case 2:
/* Present and not empty */
fprintf(stderr,
@@ -3111,6 +3277,8 @@ main(int argc, char *argv[])
setup_description();
+ setup_collation();
+
setup_conversion();
setup_dictionary();
@@ -3139,11 +3307,11 @@ main(int argc, char *argv[])
printf(_("\nSuccess.\n You can now start the database server of the Postgres-XC coordinator using:\n\n"
" %s%s%spostgres%s -C -D %s%s%s\n"
"or\n"
- " %s%s%spg_ctl%s start -D %s%s%s -S coordinator -l logfile\n\n"
+ " %s%s%spg_ctl%s start -D %s%s%s -Z coordinator -l logfile\n\n"
" You can now start the database server of the Postgres-XC datanode using:\n\n"
" %s%s%spostgres%s -X -D %s%s%s\n"
"or \n"
- " %s%s%spg_ctl%s start -D %s%s%s -S datanode -l logfile\n\n"),
+ " %s%s%spg_ctl%s start -D %s%s%s -Z datanode -l logfile\n\n"),
QUOTE_PATH, bin_dir, (strlen(bin_dir) > 0) ? DIR_SEP : "", QUOTE_PATH,
QUOTE_PATH, pg_data_native, QUOTE_PATH,
QUOTE_PATH, bin_dir, (strlen(bin_dir) > 0) ? DIR_SEP : "", QUOTE_PATH,
diff --git a/src/bin/initdb/nls.mk b/src/bin/initdb/nls.mk
index f9b2879e68..0dc5107aa4 100644
--- 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.23 2010/05/13 15:56:37 petere Exp $
+# src/bin/initdb/nls.mk
CATALOG_NAME := initdb
-AVAIL_LANGUAGES := cs de es fr it ja pt_BR ru sv ta tr zh_CN
+AVAIL_LANGUAGES := cs de es fr it ja ko pt_BR ro ru sv ta tr zh_CN zh_TW
GETTEXT_FILES := initdb.c ../../port/dirmod.c ../../port/exec.c
GETTEXT_TRIGGERS:= _ simple_prompt
diff --git a/src/bin/initdb/po/cs.po b/src/bin/initdb/po/cs.po
index 2acf6fd4c7..0372714dc7 100644
--- a/src/bin/initdb/po/cs.po
+++ b/src/bin/initdb/po/cs.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: postgresql-8.4\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
"POT-Creation-Date: 2009-06-06 23:08+0000\n"
-"PO-Revision-Date: 2009-06-07 14:25+0200\n"
+"PO-Revision-Date: 2010-09-25 00:36+0300\n"
"Last-Translator: Zdeněk Kotala\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -158,7 +158,7 @@ msgstr "vybírám základní nastavení shared_buffers ... "
#: initdb.c:1147
msgid "creating configuration files ... "
-msgstr "vytvářím konfigurační soubory ..."
+msgstr "vytvářím konfigurační soubory ... "
#: initdb.c:1314
#, c-format
diff --git a/src/bin/initdb/po/de.po b/src/bin/initdb/po/de.po
index bb75b777f4..390f1c7597 100644
--- a/src/bin/initdb/po/de.po
+++ b/src/bin/initdb/po/de.po
@@ -1,99 +1,100 @@
# German message translation file for initdb.
-# Peter Eisentraut <peter_e@gmx.net>, 2003 - 2009.
+# Peter Eisentraut <peter_e@gmx.net>, 2003 - 2011.
#
# Use these quotes: »%s«
#
-# pgtranslation Id: initdb.po,v 1.15 2009/12/19 11:16:00 petere Exp $
+# pgtranslation Id: initdb.po,v 1.17 2011/05/10 18:41:25 petere Exp $
#
msgid ""
msgstr ""
-"Project-Id-Version: PostgreSQL 8.5\n"
+"Project-Id-Version: PostgreSQL 9.1\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2009-12-19 07:13+0000\n"
-"PO-Revision-Date: 2009-12-19 13:12+0200\n"
+"POT-Creation-Date: 2011-05-09 04:39+0000\n"
+"PO-Revision-Date: 2011-05-09 21:07+0300\n"
"Last-Translator: Peter Eisentraut <peter_e@gmx.net>\n"
"Language-Team: Peter Eisentraut <peter_e@gmx.net>\n"
+"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: initdb.c:255 initdb.c:269
+#: initdb.c:260 initdb.c:274
#, c-format
msgid "%s: out of memory\n"
msgstr "%s: Speicher aufgebraucht\n"
-#: initdb.c:378 initdb.c:1469
+#: initdb.c:383 initdb.c:1284
#, c-format
msgid "%s: could not open file \"%s\" for reading: %s\n"
msgstr "%s: konnte Datei »%s« nicht zum Lesen öffnen: %s\n"
-#: initdb.c:434 initdb.c:993 initdb.c:1022
+#: initdb.c:439 initdb.c:805 initdb.c:834
#, c-format
msgid "%s: could not open file \"%s\" for writing: %s\n"
msgstr "%s: konnte Datei »%s« nicht zum Schreiben öffnen: %s\n"
-#: initdb.c:442 initdb.c:450 initdb.c:1000 initdb.c:1028
+#: initdb.c:447 initdb.c:455 initdb.c:812 initdb.c:840
#, c-format
msgid "%s: could not write file \"%s\": %s\n"
msgstr "%s: konnte Datei »%s« nicht schreiben: %s\n"
-#: initdb.c:469
+#: initdb.c:474
#, c-format
msgid "%s: could not execute command \"%s\": %s\n"
msgstr "%s: konnte Befehl »%s« nicht ausführen: %s\n"
-#: initdb.c:589
+#: initdb.c:490
#, c-format
msgid "%s: removing data directory \"%s\"\n"
msgstr "%s: entferne Datenverzeichnis »%s«\n"
-#: initdb.c:592
+#: initdb.c:493
#, c-format
msgid "%s: failed to remove data directory\n"
msgstr "%s: konnte Datenverzeichnis nicht entfernen\n"
-#: initdb.c:598
+#: initdb.c:499
#, c-format
msgid "%s: removing contents of data directory \"%s\"\n"
msgstr "%s: entferne Inhalt des Datenverzeichnisses »%s«\n"
-#: initdb.c:601
+#: initdb.c:502
#, c-format
msgid "%s: failed to remove contents of data directory\n"
msgstr "%s: konnte Inhalt des Datenverzeichnisses nicht entfernen\n"
-#: initdb.c:607
+#: initdb.c:508
#, c-format
msgid "%s: removing transaction log directory \"%s\"\n"
msgstr "%s: entferne Transaktionslogverzeichnis »%s«\n"
-#: initdb.c:610
+#: initdb.c:511
#, c-format
msgid "%s: failed to remove transaction log directory\n"
msgstr "%s: konnte Transaktionslogverzeichnis nicht entfernen\n"
-#: initdb.c:616
+#: initdb.c:517
#, c-format
msgid "%s: removing contents of transaction log directory \"%s\"\n"
msgstr "%s: entferne Inhalt des Transaktionslogverzeichnisses »%s«\n"
-#: initdb.c:619
+#: initdb.c:520
#, c-format
msgid "%s: failed to remove contents of transaction log directory\n"
msgstr "%s: konnte Inhalt des Transaktionslogverzeichnisses nicht entfernen\n"
-#: initdb.c:628
+#: initdb.c:529
#, c-format
msgid "%s: data directory \"%s\" not removed at user's request\n"
msgstr "%s: Datenverzeichnis »%s« wurde auf Anwenderwunsch nicht entfernt\n"
-#: initdb.c:633
+#: initdb.c:534
#, c-format
msgid "%s: transaction log directory \"%s\" not removed at user's request\n"
msgstr ""
"%s: Transaktionslogverzeichnis »%s« wurde auf Anwenderwunsch nicht entfernt\n"
-#: initdb.c:655
+#: initdb.c:556
#, c-format
msgid ""
"%s: cannot be run as root\n"
@@ -104,32 +105,32 @@ msgstr ""
"Bitte loggen Sie sich (z.B. mit »su«) als der (unprivilegierte) Benutzer\n"
"ein, der Eigentümer des Serverprozesses sein soll.\n"
-#: initdb.c:667
+#: initdb.c:568
#, c-format
msgid "%s: could not obtain information about current user: %s\n"
msgstr "%s: konnte Informationen über aktuellen Benutzer nicht ermitteln: %s\n"
-#: initdb.c:684
+#: initdb.c:585
#, c-format
msgid "%s: could not get current user name: %s\n"
msgstr "%s: konnte aktuellen Benutzernamen nicht ermitteln: %s\n"
-#: initdb.c:715
+#: initdb.c:616
#, c-format
msgid "%s: \"%s\" is not a valid server encoding name\n"
msgstr "%s: »%s« ist keine gültige Serverkodierung\n"
-#: initdb.c:913 initdb.c:3052
+#: initdb.c:725 initdb.c:3161
#, c-format
msgid "%s: could not create directory \"%s\": %s\n"
msgstr "%s: konnte Verzeichnis »%s« nicht erzeugen: %s\n"
-#: initdb.c:943
+#: initdb.c:755
#, c-format
msgid "%s: file \"%s\" does not exist\n"
msgstr "%s: Datei »%s« existiert nicht\n"
-#: initdb.c:945 initdb.c:954 initdb.c:964
+#: initdb.c:757 initdb.c:766 initdb.c:776
#, c-format
msgid ""
"This might mean you have a corrupted installation or identified\n"
@@ -139,36 +140,36 @@ msgstr ""
"das\n"
"falsche Verzeichnis mit der Kommandozeilenoption -L angegeben haben.\n"
-#: initdb.c:951
+#: initdb.c:763
#, c-format
msgid "%s: could not access file \"%s\": %s\n"
msgstr "%s: konnte nicht auf Datei »%s« zugreifen: %s\n"
-#: initdb.c:962
+#: initdb.c:774
#, c-format
msgid "%s: file \"%s\" is not a regular file\n"
msgstr "%s: Datei »%s« ist keine normale Datei\n"
-#: initdb.c:1070
+#: initdb.c:882
#, c-format
msgid "selecting default max_connections ... "
msgstr "wähle Vorgabewert für max_connections ... "
-#: initdb.c:1099
+#: initdb.c:911
#, c-format
msgid "selecting default shared_buffers ... "
msgstr "wähle Vorgabewert für shared_buffers ... "
-#: initdb.c:1142
+#: initdb.c:954
msgid "creating configuration files ... "
msgstr "erzeuge Konfigurationsdateien ... "
-#: initdb.c:1309
+#: initdb.c:1124
#, c-format
msgid "creating template1 database in %s/base/1 ... "
msgstr "erzeuge Datenbank template1 in %s/base/1 ... "
-#: initdb.c:1325
+#: initdb.c:1140
#, c-format
msgid ""
"%s: input file \"%s\" does not belong to PostgreSQL %s\n"
@@ -178,103 +179,132 @@ msgstr ""
"Prüfen Sie Ihre Installation oder geben Sie den korrekten Pfad mit der\n"
"Option -L an.\n"
-#: initdb.c:1410
+#: initdb.c:1225
msgid "initializing pg_authid ... "
msgstr "initialisiere pg_authid ... "
-#: initdb.c:1444
+#: initdb.c:1259
msgid "Enter new superuser password: "
msgstr "Geben Sie das neue Superuser-Passwort ein: "
-#: initdb.c:1445
+#: initdb.c:1260
msgid "Enter it again: "
msgstr "Geben Sie es noch einmal ein: "
-#: initdb.c:1448
+#: initdb.c:1263
#, c-format
msgid "Passwords didn't match.\n"
msgstr "Passwörter stimmten nicht überein.\n"
-#: initdb.c:1475
+#: initdb.c:1290
#, c-format
msgid "%s: could not read password from file \"%s\": %s\n"
msgstr "%s: konnte Passwort nicht aus Datei »%s« lesen: %s\n"
-#: initdb.c:1488
+#: initdb.c:1303
#, c-format
msgid "setting password ... "
msgstr "setze das Passwort ... "
-#: initdb.c:1586
+#: initdb.c:1403
msgid "initializing dependencies ... "
msgstr "initialisiere Abhängigkeiten ... "
-#: initdb.c:1614
+#: initdb.c:1431
msgid "creating system views ... "
msgstr "erzeuge Systemsichten ... "
-#: initdb.c:1650
+#: initdb.c:1467
msgid "loading system objects' descriptions ... "
msgstr "lade Systemobjektbeschreibungen ... "
-#: initdb.c:1702
+#: initdb.c:1573
+msgid "creating collations ... "
+msgstr "erzeuge Sortierfolgen ... "
+
+#: initdb.c:1605
+#, c-format
+msgid "%s: locale name too long, skipped: %s\n"
+msgstr "%s: Locale-Name zu lang, wird ausgelassen: %s\n"
+
+#: initdb.c:1630
+#, c-format
+msgid "%s: locale name has non-ASCII characters, skipped: %s\n"
+msgstr "%s: Locale-Name hat Nicht-ASCII-Zeichen, wird ausgelassen: %s\n"
+
+#: initdb.c:1687
+#, c-format
+msgid "No usable system locales were found.\n"
+msgstr "Es wurden keine brauchbaren System-Locales gefunden.\n"
+
+#: initdb.c:1688
+#, c-format
+msgid "Use the option \"--debug\" to see details.\n"
+msgstr "Verwenden Sie die Option »--debug«, um Einzelheiten zu sehen.\n"
+
+#: initdb.c:1691
+#, c-format
+msgid "not supported on this platform\n"
+msgstr "auf dieser Plattform nicht unterstützt\n"
+
+#: initdb.c:1706
msgid "creating conversions ... "
msgstr "erzeuge Konversionen ... "
-#: initdb.c:1737
+#: initdb.c:1741
msgid "creating dictionaries ... "
msgstr "erzeuge Wörterbücher ... "
-#: initdb.c:1791
+#: initdb.c:1795
msgid "setting privileges on built-in objects ... "
msgstr "setze Privilegien der eingebauten Objekte ... "
-#: initdb.c:1849
+#: initdb.c:1853
msgid "creating information schema ... "
msgstr "erzeuge Informationsschema ... "
-#: initdb.c:1905
+#: initdb.c:1909
msgid "loading PL/pgSQL server-side language ... "
-msgstr "lade Serversprache PL/pgSQL ..."
+msgstr "lade Serversprache PL/pgSQL ... "
-#: initdb.c:1930
+#: initdb.c:1934
msgid "vacuuming database template1 ... "
-msgstr "führe Vacuum in Datenbank template1 durch ..."
+msgstr "führe Vacuum in Datenbank template1 durch ... "
-#: initdb.c:1984
+#: initdb.c:1990
msgid "copying template1 to template0 ... "
msgstr "kopiere template1 nach template0 ... "
-#: initdb.c:2015
+#: initdb.c:2022
msgid "copying template1 to postgres ... "
msgstr "kopiere template1 nach postgres ... "
-#: initdb.c:2072
+#: initdb.c:2079
#, c-format
msgid "caught signal\n"
msgstr "Signal abgefangen\n"
-#: initdb.c:2078
+#: initdb.c:2085
#, c-format
msgid "could not write to child process: %s\n"
msgstr "konnte nicht an Kindprozess schreiben: %s\n"
-#: initdb.c:2086
+#: initdb.c:2093
#, c-format
msgid "ok\n"
msgstr "ok\n"
-#: initdb.c:2206
+#: initdb.c:2213
#, c-format
msgid "%s: invalid locale name \"%s\"\n"
msgstr "%s: ungültiger Locale-Name »%s«\n"
-#: initdb.c:2232
+#: initdb.c:2239
#, c-format
msgid "%s: encoding mismatch\n"
msgstr "%s: unpassende Kodierungen\n"
-#: initdb.c:2234
+#: initdb.c:2241
#, c-format
msgid ""
"The encoding you selected (%s) and the encoding that the\n"
@@ -289,7 +319,7 @@ msgstr ""
"führen. Starten Sie %s erneut und geben Sie entweder keine\n"
"Kodierung explizit an oder wählen Sie eine passende Kombination.\n"
-#: initdb.c:2415
+#: initdb.c:2502
#, c-format
msgid ""
"%s initializes a PostgreSQL database cluster.\n"
@@ -298,17 +328,17 @@ msgstr ""
"%s initialisiert einen PostgreSQL-Datenbankcluster.\n"
"\n"
-#: initdb.c:2416
+#: initdb.c:2503
#, c-format
msgid "Usage:\n"
msgstr "Aufruf:\n"
-#: initdb.c:2417
+#: initdb.c:2504
#, c-format
msgid " %s [OPTION]... [DATADIR]\n"
msgstr " %s [OPTION]... [DATENVERZEICHNIS]\n"
-#: initdb.c:2418
+#: initdb.c:2505
#, c-format
msgid ""
"\n"
@@ -317,7 +347,7 @@ msgstr ""
"\n"
"Optionen:\n"
-#: initdb.c:2419
+#: initdb.c:2506
#, c-format
msgid ""
" -A, --auth=METHOD default authentication method for local "
@@ -326,25 +356,25 @@ msgstr ""
" -A, --auth=METHODE vorgegebene Authentifizierungsmethode für lokale "
"Verbindungen\n"
-#: initdb.c:2420
+#: initdb.c:2507
#, c-format
msgid " [-D, --pgdata=]DATADIR location for this database cluster\n"
msgstr ""
" [-D, --pgdata=]DATENVERZ Datenverzeichnis für diesen Datenbankcluster\n"
-#: initdb.c:2421
+#: initdb.c:2508
#, c-format
msgid " -E, --encoding=ENCODING set default encoding for new databases\n"
msgstr ""
" -E, --encoding=KODIERUNG setze Standardkodierung für neue Datenbanken\n"
-#: initdb.c:2422
+#: initdb.c:2509
#, c-format
msgid " --locale=LOCALE set default locale for new databases\n"
msgstr ""
" --locale=LOCALE setze Standardlocale für neue Datenbanken\n"
-#: initdb.c:2423
+#: initdb.c:2510
#, c-format
msgid ""
" --lc-collate=, --lc-ctype=, --lc-messages=LOCALE\n"
@@ -360,19 +390,19 @@ msgstr ""
" für neue Datenbanken (Voreinstellung aus der\n"
" Umgebung entnommen)\n"
-#: initdb.c:2427
+#: initdb.c:2514
#, c-format
msgid " --no-locale equivalent to --locale=C\n"
msgstr " --no-locale entspricht --locale=C\n"
-#: initdb.c:2428
+#: initdb.c:2515
#, c-format
msgid ""
" --pwfile=FILE read password for the new superuser from file\n"
msgstr ""
" --pwfile=DATEI lese Passwort des neuen Superusers aus Datei\n"
-#: initdb.c:2429
+#: initdb.c:2516
#, c-format
msgid ""
" -T, --text-search-config=CFG\n"
@@ -381,24 +411,24 @@ msgstr ""
" -T, --text-search-config=KFG\n"
" Standardtextsuchekonfiguration\n"
-#: initdb.c:2431
+#: initdb.c:2518
#, c-format
msgid " -U, --username=NAME database superuser name\n"
msgstr " -U, --username=NAME Datenbank-Superusername\n"
-#: initdb.c:2432
+#: initdb.c:2519
#, c-format
msgid ""
" -W, --pwprompt prompt for a password for the new superuser\n"
msgstr " -W, --pwprompt frage nach Passwort für neuen Superuser\n"
-#: initdb.c:2433
+#: initdb.c:2520
#, c-format
msgid ""
" -X, --xlogdir=XLOGDIR location for the transaction log directory\n"
msgstr " -X, --xlogdir=XLOGVERZ Verzeichnis für den Transaktionslog\n"
-#: initdb.c:2434
+#: initdb.c:2521
#, c-format
msgid ""
"\n"
@@ -407,27 +437,27 @@ msgstr ""
"\n"
"Weniger häufig verwendete Optionen:\n"
-#: initdb.c:2435
+#: initdb.c:2522
#, c-format
msgid " -d, --debug generate lots of debugging output\n"
msgstr " -d, --debug erzeuge eine Menge Debug-Ausgaben\n"
-#: initdb.c:2436
+#: initdb.c:2523
#, c-format
msgid " -L DIRECTORY where to find the input files\n"
msgstr " -L VERZEICHNIS wo sind die Eingabedateien zu finden\n"
-#: initdb.c:2437
+#: initdb.c:2524
#, c-format
msgid " -n, --noclean do not clean up after errors\n"
msgstr " -n, --noclean nach Fehlern nicht aufräumen\n"
-#: initdb.c:2438
+#: initdb.c:2525
#, c-format
msgid " -s, --show show internal settings\n"
msgstr " -s, --show zeige interne Einstellungen\n"
-#: initdb.c:2439
+#: initdb.c:2526
#, c-format
msgid ""
"\n"
@@ -436,18 +466,18 @@ msgstr ""
"\n"
"Weitere Optionen:\n"
-#: initdb.c:2440
+#: initdb.c:2527
#, c-format
msgid " -?, --help show this help, then exit\n"
msgstr " -?, --help diese Hilfe anzeigen, dann beenden\n"
-#: initdb.c:2441
+#: initdb.c:2528
#, c-format
msgid " -V, --version output version information, then exit\n"
msgstr ""
" -V, --version Versionsinformationen anzeigen, dann beenden\n"
-#: initdb.c:2442
+#: initdb.c:2529
#, c-format
msgid ""
"\n"
@@ -458,7 +488,7 @@ msgstr ""
"Wenn kein Datenverzeichnis angegeben ist, dann wird die Umgebungsvariable\n"
"PGDATA verwendet.\n"
-#: initdb.c:2444
+#: initdb.c:2531
#, c-format
msgid ""
"\n"
@@ -467,33 +497,33 @@ msgstr ""
"\n"
"Berichten Sie Fehler an <pgsql-bugs@postgresql.org>.\n"
-#: initdb.c:2549
+#: initdb.c:2637
#, c-format
msgid "Running in debug mode.\n"
msgstr "Debug-Modus ist an.\n"
-#: initdb.c:2553
+#: initdb.c:2641
#, c-format
msgid "Running in noclean mode. Mistakes will not be cleaned up.\n"
msgstr "Noclean-Modus ist an. Bei Fehlern wird nicht aufgeräumt.\n"
-#: initdb.c:2596 initdb.c:2614 initdb.c:2888
+#: initdb.c:2684 initdb.c:2702 initdb.c:2984
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "Versuchen Sie »%s --help« für weitere Informationen.\n"
-#: initdb.c:2612
+#: initdb.c:2700
#, c-format
msgid "%s: too many command-line arguments (first is \"%s\")\n"
msgstr "%s: zu viele Kommandozeilenargumente (das erste ist »%s«)\n"
-#: initdb.c:2621
+#: initdb.c:2709
#, c-format
msgid "%s: password prompt and password file cannot be specified together\n"
msgstr ""
"%s: Passwortprompt und Passwortdatei können nicht zusammen angegeben werden\n"
-#: initdb.c:2627
+#: initdb.c:2715
msgid ""
"\n"
"WARNING: enabling \"trust\" authentication for local connections\n"
@@ -505,12 +535,12 @@ msgstr ""
"Sie können dies ändern, indem Sie pg_hba.conf bearbeiten oder beim\n"
"nächsten Aufruf von initdb die Option -A verwenden.\n"
-#: initdb.c:2650
+#: initdb.c:2738
#, c-format
msgid "%s: unrecognized authentication method \"%s\"\n"
msgstr "%s: unbekannte Authentifizierungsmethode »%s«\n"
-#: initdb.c:2660
+#: initdb.c:2748
#, c-format
msgid ""
"%s: must specify a password for the superuser to enable %s authentication\n"
@@ -518,7 +548,7 @@ msgstr ""
"%s: Superuser-Passwort muss angegeben werden um %s-Authentifizierung "
"einzuschalten\n"
-#: initdb.c:2675
+#: initdb.c:2777
#, c-format
msgid ""
"%s: no data directory specified\n"
@@ -531,7 +561,7 @@ msgstr ""
"werden soll. Machen Sie dies entweder mit der Kommandozeilenoption -D\n"
"oder mit der Umgebungsvariable PGDATA.\n"
-#: initdb.c:2759
+#: initdb.c:2861
#, c-format
msgid ""
"The program \"postgres\" is needed by %s but was not found in the\n"
@@ -542,7 +572,7 @@ msgstr ""
"selben Verzeichnis wie »%s« gefunden.\n"
"Prüfen Sie Ihre Installation.\n"
-#: initdb.c:2766
+#: initdb.c:2868
#, c-format
msgid ""
"The program \"postgres\" was found by \"%s\"\n"
@@ -553,17 +583,12 @@ msgstr ""
"aber es hatte nicht die gleiche Version wie %s.\n"
"Prüfen Sie Ihre Installation.\n"
-#: initdb.c:2785
+#: initdb.c:2887
#, c-format
msgid "%s: input file location must be an absolute path\n"
msgstr "%s: Eingabedatei muss absoluten Pfad haben\n"
-#: initdb.c:2793
-#, c-format
-msgid "%s: could not determine valid short version string\n"
-msgstr "%s: konnte keine gültige kurze Versionszeichenkette ermitteln\n"
-
-#: initdb.c:2848
+#: initdb.c:2944
#, c-format
msgid ""
"The files belonging to this database system will be owned by user \"%s\".\n"
@@ -574,12 +599,12 @@ msgstr ""
"»%s« gehören. Diesem Benutzer muss auch der Serverprozess gehören.\n"
"\n"
-#: initdb.c:2858
+#: initdb.c:2954
#, c-format
msgid "The database cluster will be initialized with locale %s.\n"
msgstr "Der Datenbankcluster wird mit der Locale %s initialisiert werden.\n"
-#: initdb.c:2861
+#: initdb.c:2957
#, c-format
msgid ""
"The database cluster will be initialized with locales\n"
@@ -598,22 +623,31 @@ msgstr ""
" NUMERIC: %s\n"
" TIME: %s\n"
-#: initdb.c:2885
+#: initdb.c:2981
#, c-format
msgid "%s: could not find suitable encoding for locale %s\n"
msgstr "%s: konnte keine passende Kodierung für Locale »%s« finden\n"
-#: initdb.c:2887
+#: initdb.c:2983
#, c-format
msgid "Rerun %s with the -E option.\n"
msgstr "Führen Sie %s erneut mit der Option -E aus.\n"
-#: initdb.c:2896
+#: initdb.c:2996
+#, c-format
+msgid ""
+"Encoding %s implied by locale is not allowed as a server-side encoding.\n"
+"The default database encoding will be set to %s instead.\n"
+msgstr ""
+"Die von der Locale gesetzte Kodierung %s ist nicht als serverseitige Kodierung erlaubt.\n"
+"Die Standarddatenbankkodierung wird stattdessen auf %s gesetzt.\n"
+
+#: initdb.c:3004
#, c-format
msgid "%s: locale %s requires unsupported encoding %s\n"
msgstr "%s: Locale %s benötigt nicht unterstützte Kodierung %s\n"
-#: initdb.c:2899
+#: initdb.c:3007
#, c-format
msgid ""
"Encoding %s is not allowed as a server-side encoding.\n"
@@ -622,25 +656,25 @@ msgstr ""
"Kodierung %s ist nicht als serverseitige Kodierung erlaubt.\n"
"Starten Sie %s erneut mit einer anderen Locale-Wahl.\n"
-#: initdb.c:2907
+#: initdb.c:3016
#, c-format
msgid "The default database encoding has accordingly been set to %s.\n"
msgstr "Die Standarddatenbankkodierung wurde entsprechend auf %s gesetzt.\n"
-#: initdb.c:2924
+#: initdb.c:3033
#, c-format
msgid "%s: could not find suitable text search configuration for locale %s\n"
msgstr ""
"%s: konnte keine passende Textsuchekonfiguration für Locale »%s« finden\n"
-#: initdb.c:2935
+#: initdb.c:3044
#, c-format
msgid ""
"%s: warning: suitable text search configuration for locale %s is unknown\n"
msgstr ""
"%s: Warnung: passende Textsuchekonfiguration für Locale »%s« ist unbekannt\n"
-#: initdb.c:2940
+#: initdb.c:3049
#, c-format
msgid ""
"%s: warning: specified text search configuration \"%s\" might not match "
@@ -649,32 +683,32 @@ msgstr ""
"%s: Warnung: angegebene Textsuchekonfiguration »%s« passt möglicherweise "
"nicht zur Locale »%s«\n"
-#: initdb.c:2945
+#: initdb.c:3054
#, c-format
msgid "The default text search configuration will be set to \"%s\".\n"
msgstr "Die Standardtextsuchekonfiguration wird auf »%s« gesetzt.\n"
-#: initdb.c:2979 initdb.c:3046
+#: initdb.c:3088 initdb.c:3155
#, c-format
msgid "creating directory %s ... "
msgstr "erzeuge Verzeichnis %s ... "
-#: initdb.c:2993 initdb.c:3063
+#: initdb.c:3102 initdb.c:3173
#, c-format
msgid "fixing permissions on existing directory %s ... "
msgstr "berichtige Zugriffsrechte des bestehenden Verzeichnisses %s ... "
-#: initdb.c:2999 initdb.c:3069
+#: initdb.c:3108 initdb.c:3179
#, c-format
msgid "%s: could not change permissions of directory \"%s\": %s\n"
msgstr "%s: konnte Rechte des Verzeichnisses »%s« nicht ändern: %s\n"
-#: initdb.c:3012 initdb.c:3081
+#: initdb.c:3121 initdb.c:3192
#, c-format
msgid "%s: directory \"%s\" exists but is not empty\n"
msgstr "%s: Verzeichnis »%s« existiert aber ist nicht leer\n"
-#: initdb.c:3015
+#: initdb.c:3124
#, c-format
msgid ""
"If you want to create a new database system, either remove or empty\n"
@@ -685,17 +719,17 @@ msgstr ""
"Sie das Verzeichnis »%s« or führen Sie %s\n"
"mit einem anderen Argument als »%s« aus.\n"
-#: initdb.c:3023 initdb.c:3091
+#: initdb.c:3132 initdb.c:3202
#, c-format
msgid "%s: could not access directory \"%s\": %s\n"
msgstr "%s: konnte nicht auf Verzeichnis »%s« zugreifen: %s\n"
-#: initdb.c:3037
+#: initdb.c:3146
#, c-format
msgid "%s: transaction log directory location must be an absolute path\n"
msgstr "%s: Transaktionslogverzeichnis muss absoluten Pfad haben\n"
-#: initdb.c:3084
+#: initdb.c:3195
#, c-format
msgid ""
"If you want to store the transaction log there, either\n"
@@ -704,23 +738,23 @@ msgstr ""
"Wenn Sie dort den Transaktionslog ablegen wollen, entfernen oder leeren\n"
"Sie das Verzeichnis »%s«.\n"
-#: initdb.c:3103
+#: initdb.c:3214
#, c-format
msgid "%s: could not create symbolic link \"%s\": %s\n"
msgstr "%s: konnte symbolische Verknüpfung »%s« nicht erzeugen: %s\n"
-#: initdb.c:3108
+#: initdb.c:3219
#, c-format
msgid "%s: symlinks are not supported on this platform"
msgstr ""
"%s: symbolische Verknüpfungen werden auf dieser Plattform nicht unterstützt"
-#: initdb.c:3114
+#: initdb.c:3225
#, c-format
msgid "creating subdirectories ... "
msgstr "erzeuge Unterverzeichnisse ... "
-#: initdb.c:3178
+#: initdb.c:3291
#, c-format
msgid ""
"\n"
@@ -751,77 +785,82 @@ msgstr "Speicher aufgebraucht\n"
msgid "could not set junction for \"%s\": %s\n"
msgstr "konnte Junction für »%s« nicht erzeugen: %s\n"
-#: ../../port/dirmod.c:325
+#: ../../port/dirmod.c:361
+#, c-format
+msgid "could not get junction for \"%s\": %s\n"
+msgstr "konnte Junction für »%s« nicht ermitteln: %s\n"
+
+#: ../../port/dirmod.c:443
#, c-format
msgid "could not open directory \"%s\": %s\n"
msgstr "konnte Verzeichnis »%s« nicht öffnen: %s\n"
-#: ../../port/dirmod.c:362
+#: ../../port/dirmod.c:480
#, c-format
msgid "could not read directory \"%s\": %s\n"
msgstr "konnte Verzeichnis »%s« nicht lesen: %s\n"
-#: ../../port/dirmod.c:445
+#: ../../port/dirmod.c:563
#, c-format
msgid "could not stat file or directory \"%s\": %s\n"
msgstr "konnte »stat« für Datei oder Verzeichnis »%s« nicht ausführen: %s\n"
-#: ../../port/dirmod.c:472 ../../port/dirmod.c:489
+#: ../../port/dirmod.c:590 ../../port/dirmod.c:607
#, c-format
msgid "could not remove file or directory \"%s\": %s\n"
msgstr "konnte Datei oder Verzeichnis »%s« nicht entfernen: %s\n"
-#: ../../port/exec.c:195 ../../port/exec.c:309 ../../port/exec.c:352
+#: ../../port/exec.c:125 ../../port/exec.c:239 ../../port/exec.c:282
#, c-format
msgid "could not identify current directory: %s"
msgstr "konnte aktuelles Verzeichnis nicht ermitteln: %s"
-#: ../../port/exec.c:214
+#: ../../port/exec.c:144
#, c-format
msgid "invalid binary \"%s\""
msgstr "ungültige Programmdatei »%s«"
-#: ../../port/exec.c:263
+#: ../../port/exec.c:193
#, c-format
msgid "could not read binary \"%s\""
msgstr "konnte Programmdatei »%s« nicht lesen"
-#: ../../port/exec.c:270
+#: ../../port/exec.c:200
#, c-format
msgid "could not find a \"%s\" to execute"
msgstr "konnte kein »%s« zum Ausführen finden"
-#: ../../port/exec.c:325 ../../port/exec.c:361
+#: ../../port/exec.c:255 ../../port/exec.c:291
#, c-format
msgid "could not change directory to \"%s\""
msgstr "konnte nicht in Verzeichnis »%s« wechseln"
-#: ../../port/exec.c:340
+#: ../../port/exec.c:270
#, c-format
msgid "could not read symbolic link \"%s\""
msgstr "konnte symbolische Verknüpfung »%s« nicht lesen"
-#: ../../port/exec.c:586
+#: ../../port/exec.c:517
#, c-format
msgid "child process exited with exit code %d"
msgstr "Kindprozess hat mit Code %d beendet"
-#: ../../port/exec.c:590
+#: ../../port/exec.c:521
#, c-format
msgid "child process was terminated by exception 0x%X"
msgstr "Kindprozess wurde durch Ausnahme 0x%X beendet"
-#: ../../port/exec.c:599
+#: ../../port/exec.c:530
#, c-format
msgid "child process was terminated by signal %s"
msgstr "Kindprozess wurde von Signal %s beendet"
-#: ../../port/exec.c:602
+#: ../../port/exec.c:533
#, c-format
msgid "child process was terminated by signal %d"
msgstr "Kindprozess wurde von Signal %d beendet"
-#: ../../port/exec.c:606
+#: ../../port/exec.c:537
#, c-format
msgid "child process exited with unrecognized status %d"
msgstr "Kindprozess hat mit unbekanntem Status %d beendet"
diff --git a/src/bin/initdb/po/es.po b/src/bin/initdb/po/es.po
index 6ca05d2b82..97475d8e11 100644
--- a/src/bin/initdb/po/es.po
+++ b/src/bin/initdb/po/es.po
@@ -5,14 +5,14 @@
#
# Álvaro Herrera <alvherre@alvh.no-ip.org>, 2004-2010
#
-# pgtranslation Id: initdb.po,v 1.8 2010/02/02 20:07:49 alvherre Exp $
+# pgtranslation Id: initdb.po,v 1.10 2010/09/24 21:58:59 petere Exp $
#
msgid ""
msgstr ""
"Project-Id-Version: initdb (PostgreSQL 8.4)\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2009-04-13 15:11+0000\n"
-"PO-Revision-Date: 2010-02-02 17:01-0300\n"
+"POT-Creation-Date: 2010-08-30 20:02+0000\n"
+"PO-Revision-Date: 2010-09-25 00:37+0300\n"
"Last-Translator: Álvaro Herrera <alvherre@alvh.no-ip.org>\n"
"Language-Team: PgSQL-es-Ayuda <pgsql-es-ayuda@postgresql.org>\n"
"MIME-Version: 1.0\n"
@@ -24,82 +24,82 @@ msgstr ""
msgid "%s: out of memory\n"
msgstr "%s: memoria agotada\n"
-#: initdb.c:377 initdb.c:1490
+#: initdb.c:377 initdb.c:1432
#, c-format
msgid "%s: could not open file \"%s\" for reading: %s\n"
msgstr "%s: no se pudo abrir el archivo «%s» para lectura: %s\n"
-#: initdb.c:439 initdb.c:998 initdb.c:1027
+#: initdb.c:433 initdb.c:956 initdb.c:985
#, c-format
msgid "%s: could not open file \"%s\" for writing: %s\n"
msgstr "%s: no se pudo abrir el archivo «%s» para escritura: %s\n"
-#: initdb.c:447 initdb.c:455 initdb.c:1005 initdb.c:1033
+#: initdb.c:441 initdb.c:449 initdb.c:963 initdb.c:991
#, c-format
msgid "%s: could not write file \"%s\": %s\n"
msgstr "%s: no se pudo escribir el archivo «%s»: %s\n"
-#: initdb.c:474
+#: initdb.c:468
#, c-format
msgid "%s: could not execute command \"%s\": %s\n"
msgstr "%s: no se pudo ejecutar la orden «%s»: %s\n"
-#: initdb.c:594
+#: initdb.c:588
#, c-format
msgid "%s: removing data directory \"%s\"\n"
msgstr "%s: eliminando el directorio de datos «%s»\n"
-#: initdb.c:597
+#: initdb.c:591
#, c-format
msgid "%s: failed to remove data directory\n"
msgstr "%s: no se pudo eliminar el directorio de datos\n"
-#: initdb.c:603
+#: initdb.c:597
#, c-format
msgid "%s: removing contents of data directory \"%s\"\n"
msgstr "%s: eliminando el contenido del directorio «%s»\n"
-#: initdb.c:606
+#: initdb.c:600
#, c-format
msgid "%s: failed to remove contents of data directory\n"
msgstr "%s: no se pudo eliminar el contenido del directorio de datos\n"
-#: initdb.c:612
+#: initdb.c:606
#, c-format
msgid "%s: removing transaction log directory \"%s\"\n"
msgstr "%s: eliminando el directorio de registro de transacciones «%s»\n"
-#: initdb.c:615
+#: initdb.c:609
#, c-format
msgid "%s: failed to remove transaction log directory\n"
msgstr "%s: no se pudo eliminar el directorio de registro de transacciones\n"
-#: initdb.c:621
+#: initdb.c:615
#, c-format
msgid "%s: removing contents of transaction log directory \"%s\"\n"
msgstr ""
"%s: eliminando el contenido del directorio de registro de transacciones «%s»\n"
-#: initdb.c:624
+#: initdb.c:618
#, c-format
msgid "%s: failed to remove contents of transaction log directory\n"
msgstr ""
"%s: no se pudo eliminar el contenido del directorio de registro de "
"transacciones\n"
-#: initdb.c:633
+#: initdb.c:627
#, c-format
msgid "%s: data directory \"%s\" not removed at user's request\n"
msgstr "%s: directorio de datos «%s» no eliminado a petición del usuario\n"
-#: initdb.c:638
+#: initdb.c:632
#, c-format
msgid "%s: transaction log directory \"%s\" not removed at user's request\n"
msgstr ""
"%s: el directorio de registro de transacciones «%s» no fue eliminado \n"
"a petición del usuario\n"
-#: initdb.c:662
+#: initdb.c:654
#, c-format
msgid ""
"%s: cannot be run as root\n"
@@ -110,32 +110,32 @@ msgstr ""
"Por favor conéctese (usando, por ejemplo, «su») como un usuario sin\n"
"privilegios especiales, quien ejecutará el proceso servidor.\n"
-#: initdb.c:672
+#: initdb.c:666
#, c-format
msgid "%s: could not obtain information about current user: %s\n"
msgstr "%s: no se pudo obtener información sobre el usuario actual: %s\n"
-#: initdb.c:689
+#: initdb.c:683
#, c-format
msgid "%s: could not get current user name: %s\n"
msgstr "%s: no se pudo obtener el nombre de usuario actual: %s\n"
-#: initdb.c:720
+#: initdb.c:714
#, c-format
msgid "%s: \"%s\" is not a valid server encoding name\n"
msgstr "%s: «%s» no es un nombre válido de codificación\n"
-#: initdb.c:918 initdb.c:3058
+#: initdb.c:876 initdb.c:3009
#, c-format
msgid "%s: could not create directory \"%s\": %s\n"
msgstr "%s: no se pudo crear el directorio «%s»: %s\n"
-#: initdb.c:948
+#: initdb.c:906
#, c-format
msgid "%s: file \"%s\" does not exist\n"
msgstr "%s: el archivo «%s» no existe\n"
-#: initdb.c:950 initdb.c:959 initdb.c:969
+#: initdb.c:908 initdb.c:917 initdb.c:927
#, c-format
msgid ""
"This might mean you have a corrupted installation or identified\n"
@@ -144,36 +144,36 @@ msgstr ""
"Esto puede significar que tiene una instalación corrupta o ha\n"
"identificado el directorio equivocado con la opción -L.\n"
-#: initdb.c:956
+#: initdb.c:914
#, c-format
msgid "%s: could not access file \"%s\": %s\n"
msgstr "%s: no se pudo acceder al archivo «%s»: %s\n"
-#: initdb.c:967
+#: initdb.c:925
#, c-format
msgid "%s: file \"%s\" is not a regular file\n"
msgstr "%s: el archivo «%s» no es un archivo regular\n"
-#: initdb.c:1075
+#: initdb.c:1033
#, c-format
msgid "selecting default max_connections ... "
msgstr "seleccionando el valor para max_connections ... "
-#: initdb.c:1104
+#: initdb.c:1062
#, c-format
msgid "selecting default shared_buffers ... "
msgstr "seleccionando el valor para shared_buffers ... "
-#: initdb.c:1147
+#: initdb.c:1105
msgid "creating configuration files ... "
msgstr "creando archivos de configuración ... "
-#: initdb.c:1314
+#: initdb.c:1272
#, c-format
msgid "creating template1 database in %s/base/1 ... "
msgstr "creando base de datos template1 en %s/base/1 ... "
-#: initdb.c:1330
+#: initdb.c:1288
#, c-format
msgid ""
"%s: input file \"%s\" does not belong to PostgreSQL %s\n"
@@ -183,106 +183,103 @@ msgstr ""
"Verifique su instalación o especifique la ruta correcta usando la opción -"
"L.\n"
-#: initdb.c:1429
+#: initdb.c:1373
msgid "initializing pg_authid ... "
msgstr "inicializando pg_authid ... "
-#: initdb.c:1465
+#: initdb.c:1407
msgid "Enter new superuser password: "
msgstr "Ingrese la nueva contraseña del superusuario: "
-#: initdb.c:1466
+#: initdb.c:1408
msgid "Enter it again: "
msgstr "Ingrésela nuevamente: "
-#: initdb.c:1469
+#: initdb.c:1411
#, c-format
msgid "Passwords didn't match.\n"
msgstr "Las constraseñas no coinciden.\n"
-#: initdb.c:1496
+#: initdb.c:1438
#, c-format
msgid "%s: could not read password from file \"%s\": %s\n"
msgstr "%s: no se pudo leer la contraseña desde el archivo «%s»: %s\n"
-#: initdb.c:1509
+#: initdb.c:1451
#, c-format
msgid "setting password ... "
msgstr "estableciendo contraseña ... "
-#: initdb.c:1533
-#, c-format
-msgid "%s: The password file was not generated. Please report this problem.\n"
-msgstr ""
-"%s: El archivo de contraseña no fue generado.\n"
-"Por favor reporte este problema.\n"
-
-#: initdb.c:1617
+#: initdb.c:1549
msgid "initializing dependencies ... "
msgstr "inicializando dependencias ... "
-#: initdb.c:1645
+#: initdb.c:1577
msgid "creating system views ... "
msgstr "creando las vistas de sistema ... "
-#: initdb.c:1681
+#: initdb.c:1613
msgid "loading system objects' descriptions ... "
msgstr "cargando las descripciones de los objetos del sistema ... "
-#: initdb.c:1733
+#: initdb.c:1665
msgid "creating conversions ... "
msgstr "creando conversiones ... "
-#: initdb.c:1768
+#: initdb.c:1700
msgid "creating dictionaries ... "
msgstr "creando directorios ... "
-#: initdb.c:1821
+#: initdb.c:1754
msgid "setting privileges on built-in objects ... "
msgstr "estableciendo privilegios en objetos predefinidos ... "
-#: initdb.c:1879
+#: initdb.c:1812
msgid "creating information schema ... "
msgstr "creando el esquema de información ... "
-#: initdb.c:1935
+#: initdb.c:1868
+msgid "loading PL/pgSQL server-side language ... "
+msgstr "instalando el lenguaje PL/pgSQL ... "
+
+#: initdb.c:1893
msgid "vacuuming database template1 ... "
msgstr "haciendo vacuum a la base de datos template1 ... "
-#: initdb.c:1989
+#: initdb.c:1947
msgid "copying template1 to template0 ... "
msgstr "copiando template1 a template0 ... "
-#: initdb.c:2020
+#: initdb.c:1978
msgid "copying template1 to postgres ... "
msgstr "copiando template1 a postgres ... "
-#: initdb.c:2077
+#: initdb.c:2035
#, c-format
msgid "caught signal\n"
msgstr "se ha capturado una señal\n"
-#: initdb.c:2083
+#: initdb.c:2041
#, c-format
msgid "could not write to child process: %s\n"
msgstr "no se pudo escribir al proceso hijo: %s\n"
-#: initdb.c:2091
+#: initdb.c:2049
#, c-format
msgid "ok\n"
msgstr "hecho\n"
-#: initdb.c:2211
+#: initdb.c:2169
#, c-format
msgid "%s: invalid locale name \"%s\"\n"
msgstr "%s: nombre de configuración local «%s» no es válido\n"
-#: initdb.c:2244
+#: initdb.c:2195
#, c-format
msgid "%s: encoding mismatch\n"
msgstr "%s: codificaciones no coinciden\n"
-#: initdb.c:2246
+#: initdb.c:2197
#, c-format
msgid ""
"The encoding you selected (%s) and the encoding that the\n"
@@ -297,7 +294,7 @@ msgstr ""
"Ejecute %s nuevamente y no especifique una codificación, o bien especifique\n"
"una combinación adecuada.\n"
-#: initdb.c:2427
+#: initdb.c:2378
#, c-format
msgid ""
"%s initializes a PostgreSQL database cluster.\n"
@@ -306,17 +303,17 @@ msgstr ""
"%s inicializa un cluster de base de datos PostgreSQL.\n"
"\n"
-#: initdb.c:2428
+#: initdb.c:2379
#, c-format
msgid "Usage:\n"
msgstr "Empleo:\n"
-#: initdb.c:2429
+#: initdb.c:2380
#, c-format
msgid " %s [OPTION]... [DATADIR]\n"
msgstr " %s [OPCIÓN]... [DATADIR]\n"
-#: initdb.c:2430
+#: initdb.c:2381
#, c-format
msgid ""
"\n"
@@ -325,7 +322,7 @@ msgstr ""
"\n"
"Opciones:\n"
-#: initdb.c:2431
+#: initdb.c:2382
#, c-format
msgid ""
" -A, --auth=METHOD default authentication method for local "
@@ -334,46 +331,48 @@ msgstr ""
" -A, --auth=METODO método de autentificación por omisión para\n"
" conexiones locales\n"
-#: initdb.c:2432
+#: initdb.c:2383
#, c-format
msgid " [-D, --pgdata=]DATADIR location for this database cluster\n"
msgstr ""
" [-D, --pgdata=]DATADIR ubicación para este cluster de bases de datos\n"
-#: initdb.c:2433
+#: initdb.c:2384
#, c-format
msgid " -E, --encoding=ENCODING set default encoding for new databases\n"
msgstr ""
" -E, --encoding=CODIF codificación por omisión para nuevas bases de "
"datos\n"
-#: initdb.c:2434
+#: initdb.c:2385
#, c-format
msgid " --locale=LOCALE set default locale for new databases\n"
msgstr ""
" --locale=LOCALE configuración regional por omisión para \n"
" nuevas bases de datos\n"
-#: initdb.c:2435
+#: initdb.c:2386
#, c-format
msgid ""
" --lc-collate=, --lc-ctype=, --lc-messages=LOCALE\n"
" --lc-monetary=, --lc-numeric=, --lc-time=LOCALE\n"
-" set default locale in the respective category for\n"
+" set default locale in the respective category "
+"for\n"
" new databases (default taken from environment)\n"
msgstr ""
" --lc-collate=, --lc-ctype=, --lc-messages=LOCALE\n"
" --lc-monetary=, --lc-numeric=, --lc-time=LOCALE\n"
" inicializar usando esta configuración local\n"
-" en la categoría respectiva (el valor por omisión\n"
+" en la categoría respectiva (el valor por "
+"omisión\n"
" es tomado de variables de ambiente)\n"
-#: initdb.c:2439
+#: initdb.c:2390
#, c-format
msgid " --no-locale equivalent to --locale=C\n"
msgstr " --no-locale equivalente a --locale=C\n"
-#: initdb.c:2440
+#: initdb.c:2391
#, c-format
msgid ""
" --pwfile=FILE read password for the new superuser from file\n"
@@ -381,7 +380,7 @@ msgstr ""
" --pwfile=ARCHIVO leer contraseña del nuevo superusuario del "
"archivo\n"
-#: initdb.c:2441
+#: initdb.c:2392
#, c-format
msgid ""
" -T, --text-search-config=CFG\n"
@@ -390,19 +389,19 @@ msgstr ""
" -T, --text-search-config=CONF\n"
" configuración de búsqueda en texto por omisión\n"
-#: initdb.c:2443
+#: initdb.c:2394
#, c-format
msgid " -U, --username=NAME database superuser name\n"
msgstr " -U, --username=USUARIO nombre del superusuario del cluster\n"
-#: initdb.c:2444
+#: initdb.c:2395
#, c-format
msgid ""
" -W, --pwprompt prompt for a password for the new superuser\n"
msgstr ""
" -W, --pwprompt pedir una contraseña para el nuevo superusuario\n"
-#: initdb.c:2445
+#: initdb.c:2396
#, c-format
msgid ""
" -X, --xlogdir=XLOGDIR location for the transaction log directory\n"
@@ -410,7 +409,7 @@ msgstr ""
" -X, --xlogdir=XLOGDIR ubicación del directorio del registro de\n"
" transacciones\n"
-#: initdb.c:2446
+#: initdb.c:2397
#, c-format
msgid ""
"\n"
@@ -419,27 +418,27 @@ msgstr ""
"\n"
"Opciones menos usadas:\n"
-#: initdb.c:2447
+#: initdb.c:2398
#, c-format
msgid " -d, --debug generate lots of debugging output\n"
msgstr " -d, --debug genera mucha salida de depuración\n"
-#: initdb.c:2448
+#: initdb.c:2399
#, c-format
msgid " -L DIRECTORY where to find the input files\n"
msgstr " -L DIRECTORIO donde encontrar los archivos de entrada\n"
-#: initdb.c:2449
+#: initdb.c:2400
#, c-format
msgid " -n, --noclean do not clean up after errors\n"
msgstr " -n, --noclean no limpiar después de errores\n"
-#: initdb.c:2450
+#: initdb.c:2401
#, c-format
msgid " -s, --show show internal settings\n"
msgstr " -s, --show muestra variables internas\n"
-#: initdb.c:2451
+#: initdb.c:2402
#, c-format
msgid ""
"\n"
@@ -448,17 +447,17 @@ msgstr ""
"\n"
"Otras opciones:\n"
-#: initdb.c:2452
+#: initdb.c:2403
#, c-format
msgid " -?, --help show this help, then exit\n"
msgstr " -?, --help mostrar esta ayuda y salir\n"
-#: initdb.c:2453
+#: initdb.c:2404
#, c-format
msgid " -V, --version output version information, then exit\n"
msgstr " -V, --version mostrar información de version y salir\n"
-#: initdb.c:2454
+#: initdb.c:2405
#, c-format
msgid ""
"\n"
@@ -469,7 +468,7 @@ msgstr ""
"Si el directorio de datos no es especificado, se usa la variable de\n"
"ambiente PGDATA.\n"
-#: initdb.c:2456
+#: initdb.c:2407
#, c-format
msgid ""
"\n"
@@ -478,34 +477,34 @@ msgstr ""
"\n"
"Reporte errores a <pgsql-bugs@postgresql.org>.\n"
-#: initdb.c:2561
+#: initdb.c:2512
#, c-format
msgid "Running in debug mode.\n"
msgstr "Ejecutando en modo de depuración.\n"
-#: initdb.c:2565
+#: initdb.c:2516
#, c-format
msgid "Running in noclean mode. Mistakes will not be cleaned up.\n"
msgstr "Ejecutando en modo sucio. Los errores no serán limpiados.\n"
-#: initdb.c:2608 initdb.c:2626 initdb.c:2894
+#: initdb.c:2559 initdb.c:2577 initdb.c:2845
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "Use «%s --help» para obtener mayor información.\n"
-#: initdb.c:2624
+#: initdb.c:2575
#, c-format
msgid "%s: too many command-line arguments (first is \"%s\")\n"
msgstr "%s: demasiados argumentos de línea de órdenes (el primero es «%s»)\n"
-#: initdb.c:2633
+#: initdb.c:2584
#, c-format
msgid "%s: password prompt and password file cannot be specified together\n"
msgstr ""
"%s: la petición de contraseña y el archivo de contraseña no pueden\n"
"ser especificados simultáneamente\n"
-#: initdb.c:2639
+#: initdb.c:2590
msgid ""
"\n"
"WARNING: enabling \"trust\" authentication for local connections\n"
@@ -517,12 +516,12 @@ msgstr ""
"Puede cambiar esto editando pg_hba.conf o usando el parámetro -A\n"
"la próxima vez que ejecute initdb.\n"
-#: initdb.c:2662
+#: initdb.c:2613
#, c-format
msgid "%s: unrecognized authentication method \"%s\"\n"
msgstr "%s: método de autentificación desconocido: «%s»\n"
-#: initdb.c:2672
+#: initdb.c:2623
#, c-format
msgid ""
"%s: must specify a password for the superuser to enable %s authentication\n"
@@ -530,7 +529,7 @@ msgstr ""
"%s: debe especificar una contraseña al superusuario para activar\n"
"autentificación %s\n"
-#: initdb.c:2687
+#: initdb.c:2638
#, c-format
msgid ""
"%s: no data directory specified\n"
@@ -542,7 +541,7 @@ msgstr ""
"Debe especificar el directorio donde residirán los datos para este cluster.\n"
"Hágalo usando la opción -D o la variable de ambiente PGDATA.\n"
-#: initdb.c:2763
+#: initdb.c:2722
#, c-format
msgid ""
"The program \"postgres\" is needed by %s but was not found in the\n"
@@ -553,7 +552,7 @@ msgstr ""
"directorio que «%s».\n"
"Verifique su instalación.\n"
-#: initdb.c:2770
+#: initdb.c:2729
#, c-format
msgid ""
"The program \"postgres\" was found by \"%s\"\n"
@@ -564,17 +563,12 @@ msgstr ""
"de la misma versión que «%s».\n"
"Verifique su instalación.\n"
-#: initdb.c:2789
+#: initdb.c:2748
#, c-format
msgid "%s: input file location must be an absolute path\n"
msgstr "%s: la ubicación de archivos de entrada debe ser una ruta absoluta\n"
-#: initdb.c:2797
-#, c-format
-msgid "%s: could not determine valid short version string\n"
-msgstr "%s: no se pudo determinar una cadena corta de número de versión\n"
-
-#: initdb.c:2852
+#: initdb.c:2805
#, c-format
msgid ""
"The files belonging to this database system will be owned by user \"%s\".\n"
@@ -584,12 +578,12 @@ msgstr ""
"Los archivos de este cluster serán de propiedad del usuario «%s».\n"
"Este usuario también debe ser quien ejecute el proceso servidor.\n"
-#: initdb.c:2862
+#: initdb.c:2815
#, c-format
msgid "The database cluster will be initialized with locale %s.\n"
msgstr "El cluster será inicializado con configuración local %s.\n"
-#: initdb.c:2865
+#: initdb.c:2818
#, c-format
msgid ""
"The database cluster will be initialized with locales\n"
@@ -608,25 +602,25 @@ msgstr ""
" NUMERIC: %s\n"
" TIME: %s\n"
-#: initdb.c:2891
+#: initdb.c:2842
#, c-format
msgid "%s: could not find suitable encoding for locale %s\n"
msgstr ""
"%s: no se pudo encontrar una codificación apropiada para\n"
"la configuración local %s\n"
-#: initdb.c:2893
+#: initdb.c:2844
#, c-format
msgid "Rerun %s with the -E option.\n"
msgstr "Ejecute %s con la opción -E.\n"
-#: initdb.c:2902
+#: initdb.c:2853
#, c-format
msgid "%s: locale %s requires unsupported encoding %s\n"
msgstr ""
"%s: la configuración local %s requiere la codificación no soportada %s\n"
-#: initdb.c:2905
+#: initdb.c:2856
#, c-format
msgid ""
"Encoding %s is not allowed as a server-side encoding.\n"
@@ -636,19 +630,19 @@ msgstr ""
"del servidor.\n"
"Ejecute %s nuevamente con una selección de configuración local diferente.\n"
-#: initdb.c:2913
+#: initdb.c:2864
#, c-format
msgid "The default database encoding has accordingly been set to %s.\n"
msgstr "La codificación por omisión ha sido por lo tanto definida a %s.\n"
-#: initdb.c:2930
+#: initdb.c:2881
#, c-format
msgid "%s: could not find suitable text search configuration for locale %s\n"
msgstr ""
"%s: no se pudo encontrar una configuración para búsqueda en texto apropiada\n"
"para la configuración local %s\n"
-#: initdb.c:2941
+#: initdb.c:2892
#, c-format
msgid ""
"%s: warning: suitable text search configuration for locale %s is unknown\n"
@@ -656,7 +650,7 @@ msgstr ""
"%s: atención: la configuración de búsqueda en texto apropiada para\n"
"la configuración local %s es desconocida\n"
-#: initdb.c:2946
+#: initdb.c:2897
#, c-format
msgid ""
"%s: warning: specified text search configuration \"%s\" might not match "
@@ -665,32 +659,32 @@ msgstr ""
"%s: atención: la configuración de búsqueda en texto «%s» especificada\n"
"podría no coincidir con la configuración local %s\n"
-#: initdb.c:2951
+#: initdb.c:2902
#, c-format
msgid "The default text search configuration will be set to \"%s\".\n"
msgstr "La configuración de búsqueda en texto ha sido definida a «%s».\n"
-#: initdb.c:2985 initdb.c:3052
+#: initdb.c:2936 initdb.c:3003
#, c-format
msgid "creating directory %s ... "
msgstr "creando el directorio %s ... "
-#: initdb.c:2999 initdb.c:3069
+#: initdb.c:2950 initdb.c:3020
#, c-format
msgid "fixing permissions on existing directory %s ... "
msgstr "corrigiendo permisos en el directorio existente %s ... "
-#: initdb.c:3005 initdb.c:3075
+#: initdb.c:2956 initdb.c:3026
#, c-format
msgid "%s: could not change permissions of directory \"%s\": %s\n"
msgstr "%s: no se pudo cambiar los permisos del directorio «%s»: %s\n"
-#: initdb.c:3018 initdb.c:3087
+#: initdb.c:2969 initdb.c:3038
#, c-format
msgid "%s: directory \"%s\" exists but is not empty\n"
msgstr "%s: el directorio «%s» no está vacío\n"
-#: initdb.c:3021
+#: initdb.c:2972
#, c-format
msgid ""
"If you want to create a new database system, either remove or empty\n"
@@ -701,17 +695,18 @@ msgstr ""
"el directorio «%s», o ejecute %s\n"
"con un argumento distinto de «%s».\n"
-#: initdb.c:3029 initdb.c:3097
+#: initdb.c:2980 initdb.c:3048
#, c-format
msgid "%s: could not access directory \"%s\": %s\n"
msgstr "%s: no se pudo acceder al directorio «%s»: %s\n"
-#: initdb.c:3043
+#: initdb.c:2994
#, c-format
msgid "%s: transaction log directory location must be an absolute path\n"
-msgstr "%s: la ubicación de archivos de transacción debe ser una ruta absoluta\n"
+msgstr ""
+"%s: la ubicación de archivos de transacción debe ser una ruta absoluta\n"
-#: initdb.c:3090
+#: initdb.c:3041
#, c-format
msgid ""
"If you want to store the transaction log there, either\n"
@@ -720,22 +715,22 @@ msgstr ""
"Si quiere almacenar el directorio de registro de transacciones ahí,\n"
"elimine o vacíe el directorio «%s».\n"
-#: initdb.c:3109
+#: initdb.c:3060
#, c-format
msgid "%s: could not create symbolic link \"%s\": %s\n"
msgstr "%s: no se pudo crear el enlace simbólico «%s»: %s\n"
-#: initdb.c:3114
+#: initdb.c:3065
#, c-format
msgid "%s: symlinks are not supported on this platform"
msgstr "%s: los enlaces simbólicos no están soportados en esta plataforma"
-#: initdb.c:3120
+#: initdb.c:3071
#, c-format
msgid "creating subdirectories ... "
msgstr "creando subdirectorios ... "
-#: initdb.c:3182
+#: initdb.c:3135
#, c-format
msgid ""
"\n"
@@ -759,87 +754,96 @@ msgstr ""
msgid "out of memory\n"
msgstr "memoria agotada\n"
-#: ../../port/dirmod.c:270
+#: ../../port/dirmod.c:286
#, c-format
msgid "could not set junction for \"%s\": %s\n"
msgstr "no se pudo definir un junction para «%s»: %s\n"
-#: ../../port/dirmod.c:309
+#: ../../port/dirmod.c:325
#, c-format
msgid "could not open directory \"%s\": %s\n"
msgstr "no se pudo abrir el directorio «%s»: %s\n"
-#: ../../port/dirmod.c:346
+#: ../../port/dirmod.c:362
#, c-format
msgid "could not read directory \"%s\": %s\n"
msgstr "no se pudo leer el directorio «%s»: %s\n"
-#: ../../port/dirmod.c:429
+#: ../../port/dirmod.c:445
#, c-format
msgid "could not stat file or directory \"%s\": %s\n"
msgstr "no se pudo hacer stat al archivo o directorio «%s»: %s\n"
-#: ../../port/dirmod.c:456 ../../port/dirmod.c:473
+#: ../../port/dirmod.c:472 ../../port/dirmod.c:489
#, c-format
msgid "could not remove file or directory \"%s\": %s\n"
msgstr "no se pudo borrar el archivo o el directorio «%s»: %s\n"
-#: ../../port/exec.c:195 ../../port/exec.c:309 ../../port/exec.c:352
+#: ../../port/exec.c:125 ../../port/exec.c:239 ../../port/exec.c:282
#, c-format
msgid "could not identify current directory: %s"
msgstr "no se pudo identificar el directorio actual: %s"
-#: ../../port/exec.c:214
+#: ../../port/exec.c:144
#, c-format
msgid "invalid binary \"%s\""
msgstr "binario «%s» no es válido"
-#: ../../port/exec.c:263
+#: ../../port/exec.c:193
#, c-format
msgid "could not read binary \"%s\""
msgstr "no se pudo leer el binario «%s»"
-#: ../../port/exec.c:270
+#: ../../port/exec.c:200
#, c-format
msgid "could not find a \"%s\" to execute"
msgstr "no se pudo encontrar un «%s» para ejecutar"
-#: ../../port/exec.c:325 ../../port/exec.c:361
+#: ../../port/exec.c:255 ../../port/exec.c:291
#, c-format
msgid "could not change directory to \"%s\""
msgstr "no se pudo cambiar el directorio a «%s»"
-#: ../../port/exec.c:340
+#: ../../port/exec.c:270
#, c-format
msgid "could not read symbolic link \"%s\""
msgstr "no se pudo leer el enlace simbólico «%s»"
-#: ../../port/exec.c:586
+#: ../../port/exec.c:516
#, c-format
msgid "child process exited with exit code %d"
msgstr "el proceso hijo terminó con código de salida %d"
-#: ../../port/exec.c:590
+#: ../../port/exec.c:520
#, c-format
msgid "child process was terminated by exception 0x%X"
msgstr "el proceso hijo fue terminado por una excepción 0x%X"
-#: ../../port/exec.c:599
+#: ../../port/exec.c:529
#, c-format
msgid "child process was terminated by signal %s"
msgstr "el proceso hijo fue terminado por una señal %s"
-#: ../../port/exec.c:602
+#: ../../port/exec.c:532
#, c-format
msgid "child process was terminated by signal %d"
msgstr "el proceso hijo fue terminado por una señal %d"
-#: ../../port/exec.c:606
+#: ../../port/exec.c:536
#, c-format
msgid "child process exited with unrecognized status %d"
msgstr "el proceso hijo terminó con código no reconocido %d"
#~ msgid ""
+#~ "%s: The password file was not generated. Please report this problem.\n"
+#~ msgstr ""
+#~ "%s: El archivo de contraseña no fue generado.\n"
+#~ "Por favor reporte este problema.\n"
+
+#~ msgid "%s: could not determine valid short version string\n"
+#~ msgstr "%s: no se pudo determinar una cadena corta de número de versión\n"
+
+#~ msgid ""
#~ " --locale=LOCALE initialize database cluster with given "
#~ "locale\n"
#~ msgstr ""
diff --git a/src/bin/initdb/po/fr.po b/src/bin/initdb/po/fr.po
index 1952eaf5dd..952cba4835 100644
--- a/src/bin/initdb/po/fr.po
+++ b/src/bin/initdb/po/fr.po
@@ -1,7 +1,7 @@
# translation of initdb.po to fr_fr
# french message translation file for initdb
#
-# $PostgreSQL: pgsql/src/bin/initdb/po/fr.po,v 1.17 2009/12/19 20:23:25 petere Exp $
+# $PostgreSQL$
#
# Use these quotes: %s
#
@@ -12,7 +12,7 @@ msgstr ""
"Project-Id-Version: PostgreSQL 8.4\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
"POT-Creation-Date: 2009-12-19 01:11+0000\n"
-"PO-Revision-Date: 2009-12-19 02:26+0100\n"
+"PO-Revision-Date: 2010-09-25 00:38+0300\n"
"Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
"Language-Team: PostgreSQLfr <pgsql-fr-generale@postgresql.org>\n"
"MIME-Version: 1.0\n"
@@ -246,7 +246,7 @@ msgstr "cration du schma d'informations... "
#: initdb.c:1905
msgid "loading PL/pgSQL server-side language ... "
-msgstr "chargement du langage PL/pgSQL..."
+msgstr "chargement du langage PL/pgSQL... "
#: initdb.c:1930
msgid "vacuuming database template1 ... "
diff --git a/src/bin/initdb/po/it.po b/src/bin/initdb/po/it.po
index 0124b431e4..82db331063 100644
--- a/src/bin/initdb/po/it.po
+++ b/src/bin/initdb/po/it.po
@@ -24,7 +24,7 @@ msgstr ""
"Project-Id-Version: PostgreSQL 8.4\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
"POT-Creation-Date: 2010-03-26 13:16+0000\n"
-"PO-Revision-Date: 2010-03-27 12:44:19+0100\n"
+"PO-Revision-Date: 2010-09-25 00:44+0300\n"
"Last-Translator: Gabriele Bartolini <gabriele.bartolini@2ndquadrant.it>\n"
"Language-Team: Gruppo traduzioni ITPUG <traduzioni@itpug.org>\n"
"MIME-Version: 1.0\n"
@@ -177,12 +177,12 @@ msgstr "%s: il file \"%s\" non è un file regolare\n"
#: initdb.c:1033
#, c-format
msgid "selecting default max_connections ... "
-msgstr "selezione del parametro max_connections predefinito ..."
+msgstr "selezione del parametro max_connections predefinito ... "
#: initdb.c:1062
#, c-format
msgid "selecting default shared_buffers ... "
-msgstr "si sta selezionando lo shared_buffers predefinito ..."
+msgstr "si sta selezionando lo shared_buffers predefinito ... "
#: initdb.c:1105
msgid "creating configuration files ... "
@@ -205,7 +205,7 @@ msgstr ""
#: initdb.c:1373
msgid "initializing pg_authid ... "
-msgstr "inizializzazione di pg_authid ..."
+msgstr "inizializzazione di pg_authid ... "
#: initdb.c:1407
msgid "Enter new superuser password: "
@@ -228,15 +228,15 @@ msgstr "%s: impossibile leggere il file delle password \"%s\": %s\n"
#: initdb.c:1451
#, c-format
msgid "setting password ... "
-msgstr "impostazione password ..."
+msgstr "impostazione password ... "
#: initdb.c:1549
msgid "initializing dependencies ... "
-msgstr "inizializzazione delle dipendenze ..."
+msgstr "inizializzazione delle dipendenze ... "
#: initdb.c:1577
msgid "creating system views ... "
-msgstr "creazione delle viste di sistema ..."
+msgstr "creazione delle viste di sistema ... "
#: initdb.c:1613
msgid "loading system objects' descriptions ... "
@@ -244,15 +244,15 @@ msgstr "caricamento delle descrizioni degli oggetti di sistema"
#: initdb.c:1665
msgid "creating conversions ... "
-msgstr "creazione delle conversioni ..."
+msgstr "creazione delle conversioni ... "
#: initdb.c:1700
msgid "creating dictionaries ... "
-msgstr "creazione dizionari... "
+msgstr "creazione dizionari ... "
#: initdb.c:1754
msgid "setting privileges on built-in objects ... "
-msgstr "impostazione dei privilegi per gli oggetti incorporati ..."
+msgstr "impostazione dei privilegi per gli oggetti incorporati ... "
#: initdb.c:1812
msgid "creating information schema ... "
@@ -260,7 +260,7 @@ msgstr "creazione dello schema informazioni ... "
#: initdb.c:1868
msgid "loading PL/pgSQL server-side language ... "
-msgstr "caricamento sul server del linguaggio PL/pgSQL ..."
+msgstr "caricamento sul server del linguaggio PL/pgSQL ... "
#: initdb.c:1893
msgid "vacuuming database template1 ... "
diff --git a/src/bin/initdb/po/ja.po b/src/bin/initdb/po/ja.po
index 413828fa1e..708e1e0285 100644
--- a/src/bin/initdb/po/ja.po
+++ b/src/bin/initdb/po/ja.po
@@ -1,93 +1,93 @@
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PostgreSQL 8.4\n"
+"Project-Id-Version: PostgreSQL 9.0.0rc1\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2009-04-11 22:46+0900\n"
-"PO-Revision-Date: 2009-08-25 23:04+0900\n"
+"POT-Creation-Date: 2010-07-20 12:52+0900\n"
+"PO-Revision-Date: 2010-09-25 00:58+0300\n"
"Last-Translator: HOTTA Michihide <hotta@net-newbie.com>\n"
"Language-Team: jpug-doc <jpug-doc@ml.postgresql.jp>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: initdb.c:254 initdb.c:268
#, c-format
msgid "%s: out of memory\n"
msgstr "%s: メモリ不足です\n"
-#: initdb.c:377 initdb.c:1490
+#: initdb.c:377 initdb.c:1432
#, c-format
msgid "%s: could not open file \"%s\" for reading: %s\n"
msgstr "%s: 読み取り用のファイル\"%s\"をオープンできませんでした:%s\n"
-#: initdb.c:439 initdb.c:998 initdb.c:1027
+#: initdb.c:433 initdb.c:956 initdb.c:985
#, c-format
msgid "%s: could not open file \"%s\" for writing: %s\n"
msgstr "%s:書き込み用のファイル\"%s\"をオープンできませんでした: %s\n"
-#: initdb.c:447 initdb.c:455 initdb.c:1005 initdb.c:1033
+#: initdb.c:441 initdb.c:449 initdb.c:963 initdb.c:991
#, c-format
msgid "%s: could not write file \"%s\": %s\n"
msgstr "%s:ファイル\"%s\"の書き込みに失敗しました: %s\n"
-#: initdb.c:474
+#: initdb.c:468
#, c-format
msgid "%s: could not execute command \"%s\": %s\n"
msgstr "%s: コマンド\"%s\"の実効に失敗しました: %s\n"
-#: initdb.c:594
+#: initdb.c:588
#, c-format
msgid "%s: removing data directory \"%s\"\n"
msgstr "%s: データディレクトリ\"%s\"の削除を削除しています\n"
-#: initdb.c:597
+#: initdb.c:591
#, c-format
msgid "%s: failed to remove data directory\n"
msgstr "%s: データディレクトリの削除に失敗しました\n"
-#: initdb.c:603
+#: initdb.c:597
#, c-format
msgid "%s: removing contents of data directory \"%s\"\n"
msgstr "%s: データディレクトリ\"%s\"の内容を削除しています\n"
-#: initdb.c:606
+#: initdb.c:600
#, c-format
msgid "%s: failed to remove contents of data directory\n"
msgstr "%s: データディレクトリの内容の削除に失敗しました\n"
-#: initdb.c:612
+#: initdb.c:606
#, c-format
msgid "%s: removing transaction log directory \"%s\"\n"
msgstr "%s: トランザクションログディレクトリ\"%s\"を削除しています\n"
-#: initdb.c:615
+#: initdb.c:609
#, c-format
msgid "%s: failed to remove transaction log directory\n"
msgstr "%s: トランザクションログディレクトリの削除に失敗しました\n"
-#: initdb.c:621
+#: initdb.c:615
#, c-format
msgid "%s: removing contents of transaction log directory \"%s\"\n"
msgstr "%s: トランザクションログディレクトリ\"%s\"の内容を削除しています\n"
-#: initdb.c:624
+#: initdb.c:618
#, c-format
msgid "%s: failed to remove contents of transaction log directory\n"
msgstr "%s: トランザクションログディレクトリの内容の削除に失敗しました\n"
-#: initdb.c:633
+#: initdb.c:627
#, c-format
msgid "%s: data directory \"%s\" not removed at user's request\n"
msgstr "%s: ユーザが要求したデータディレクトリ\"%s\"を削除しません\n"
-#: initdb.c:638
+#: initdb.c:632
#, c-format
msgid "%s: transaction log directory \"%s\" not removed at user's request\n"
msgstr ""
"%s: ユーザが要求したトランザクションログディレクトリ\"%s\"を削除しません\n"
-#: initdb.c:662
+#: initdb.c:654
#, c-format
msgid ""
"%s: cannot be run as root\n"
@@ -98,32 +98,32 @@ msgstr ""
"サーバプロセスの所有者となる(非特権)ユーザとして(例えば\"su\"を使用して)ログ"
"インしてください。\n"
-#: initdb.c:672
+#: initdb.c:666
#, c-format
msgid "%s: could not obtain information about current user: %s\n"
msgstr "%s: 現在のユーザに関する情報を得ることができませんでした: %s\n"
-#: initdb.c:689
+#: initdb.c:683
#, c-format
msgid "%s: could not get current user name: %s\n"
msgstr "%s: 現在のユーザ名を得ることができませんでした: %s\n"
-#: initdb.c:720
+#: initdb.c:714
#, c-format
msgid "%s: \"%s\" is not a valid server encoding name\n"
msgstr "%s: \"%s\" は無効なサーバ符号化方式名です。\n"
-#: initdb.c:918 initdb.c:3058
+#: initdb.c:876 initdb.c:3009
#, c-format
msgid "%s: could not create directory \"%s\": %s\n"
msgstr "%s: ディレクトリ\"%s\"を作成できませんでした。: %s\n"
-#: initdb.c:948
+#: initdb.c:906
#, c-format
msgid "%s: file \"%s\" does not exist\n"
msgstr "%s: ファイル\"%s\"がありません\n"
-#: initdb.c:950 initdb.c:959 initdb.c:969
+#: initdb.c:908 initdb.c:917 initdb.c:927
#, c-format
msgid ""
"This might mean you have a corrupted installation or identified\n"
@@ -132,36 +132,36 @@ msgstr ""
"インストレーションが破損しているか-Lオプションで指定したディ\n"
"レクトリが間違っているかを意味する可能性があります。\n"
-#: initdb.c:956
+#: initdb.c:914
#, c-format
msgid "%s: could not access file \"%s\": %s\n"
msgstr "%s: ファイル\"%s\"にアクセスできませんでした: %s\n"
-#: initdb.c:967
+#: initdb.c:925
#, c-format
msgid "%s: file \"%s\" is not a regular file\n"
msgstr "%s: \"%s\" は通常のファイルではありません\n"
-#: initdb.c:1075
+#: initdb.c:1033
#, c-format
msgid "selecting default max_connections ... "
msgstr "デフォルトのmax_connectionsを選択しています ... "
-#: initdb.c:1104
+#: initdb.c:1062
#, c-format
msgid "selecting default shared_buffers ... "
msgstr "デフォルトの shared_buffers を選択しています ... "
-#: initdb.c:1147
+#: initdb.c:1105
msgid "creating configuration files ... "
msgstr "設定ファイルを作成しています ... "
-#: initdb.c:1314
+#: initdb.c:1272
#, c-format
msgid "creating template1 database in %s/base/1 ... "
msgstr "%s/base/1にtemplate1データベースを作成しています ... "
-#: initdb.c:1330
+#: initdb.c:1288
#, c-format
msgid ""
"%s: input file \"%s\" does not belong to PostgreSQL %s\n"
@@ -171,106 +171,104 @@ msgstr ""
"インストレーションを検査し、-Lオプションを使用して正しいパスを指定してくださ"
"い。\n"
-#: initdb.c:1429
+#: initdb.c:1373
msgid "initializing pg_authid ... "
msgstr "pg_authidを初期化しています ... "
-#: initdb.c:1465
+#: initdb.c:1407
msgid "Enter new superuser password: "
msgstr "新しいスーパーユーザのパスワードを入力してください:"
-#: initdb.c:1466
+#: initdb.c:1408
msgid "Enter it again: "
msgstr "再入力してください:"
-#: initdb.c:1469
+#: initdb.c:1411
#, c-format
msgid "Passwords didn't match.\n"
msgstr "パスワードが一致しません。\n"
-#: initdb.c:1496
+#: initdb.c:1438
#, c-format
msgid "%s: could not read password from file \"%s\": %s\n"
msgstr ""
"%s: ファイル\"%s\"からパスワードを読み取ることができませんでした。: %s\n"
-#: initdb.c:1509
+#: initdb.c:1451
#, c-format
msgid "setting password ... "
msgstr "パスワードを設定しています ... "
-#: initdb.c:1533
-#, c-format
-msgid "%s: The password file was not generated. Please report this problem.\n"
-msgstr ""
-"%s: パスワードファイルが生成できませんでした。この問題を報告してください。\n"
-
-#: initdb.c:1617
+#: initdb.c:1549
msgid "initializing dependencies ... "
msgstr "依存関係を初期化しています ... "
-#: initdb.c:1645
+#: initdb.c:1577
msgid "creating system views ... "
msgstr "システムビューを作成しています ... "
-#: initdb.c:1681
+#: initdb.c:1613
msgid "loading system objects' descriptions ... "
msgstr "システムオブジェクトの定義をロードしています ... "
-#: initdb.c:1733
+#: initdb.c:1665
msgid "creating conversions ... "
msgstr "変換を作成しています ... "
-#: initdb.c:1768
+#: initdb.c:1700
msgid "creating dictionaries ... "
msgstr "ディレクトリを作成しています ... "
-#: initdb.c:1821
+#: initdb.c:1754
msgid "setting privileges on built-in objects ... "
msgstr "組み込みオブジェクトに権限を設定しています ... "
-#: initdb.c:1879
+#: initdb.c:1812
msgid "creating information schema ... "
msgstr "情報スキーマを作成しています ... "
-#: initdb.c:1935
+#: initdb.c:1868
+msgid "loading PL/pgSQL server-side language ... "
+msgstr "PL/pgSQL サーバサイド言語をロードしています ... "
+
+#: initdb.c:1893
msgid "vacuuming database template1 ... "
msgstr "template1データベースをバキュームしています ... "
-#: initdb.c:1989
+#: initdb.c:1947
msgid "copying template1 to template0 ... "
msgstr "template1からtemplate0へコピーしています ... "
-#: initdb.c:2020
+#: initdb.c:1978
msgid "copying template1 to postgres ... "
msgstr "template1からpostgresへコピーしています ... "
-#: initdb.c:2077
+#: initdb.c:2035
#, c-format
msgid "caught signal\n"
msgstr "シグナルが発生しました\n"
-#: initdb.c:2083
+#: initdb.c:2041
#, c-format
msgid "could not write to child process: %s\n"
msgstr "子プロセスへの書き込みができませんでした: %s\n"
-#: initdb.c:2091
+#: initdb.c:2049
#, c-format
msgid "ok\n"
msgstr "ok\n"
-#: initdb.c:2211
+#: initdb.c:2169
#, c-format
msgid "%s: invalid locale name \"%s\"\n"
msgstr "\"%s: ロケール名\"%s\"は無効です。\n"
-#: initdb.c:2244
+#: initdb.c:2195
#, c-format
msgid "%s: encoding mismatch\n"
msgstr "%s: 符号化方式が合いません\n"
-#: initdb.c:2246
+#: initdb.c:2197
#, c-format
msgid ""
"The encoding you selected (%s) and the encoding that the\n"
@@ -279,29 +277,29 @@ msgid ""
"Rerun %s and either do not specify an encoding explicitly,\n"
"or choose a matching combination.\n"
msgstr ""
-"選択した符号化方式(%s)と選択したロケールが使用する符号化方式(%s)\n"
-"が合ういません。かどうか不明です。これにより各種の文字列処理関数\n"
-"が不正な動作をする可能性があります。明示的な符号化方式の指定を止\n"
-"めるか合致する組み合わせを選択して%sを再実行してください\n"
+"選択した符号化方式(%s)と選択したロケールが使用する符号化方式(%s)が\n"
+"が合いません。これにより各種の文字列処理関数が不正な動作をする可能性が\n"
+"あります。明示的な符号化方式の指定を止めるか合致する組み合わせを\n"
+"選択して%sを再実行してください\n"
-#: initdb.c:2427
+#: initdb.c:2378
#, c-format
msgid ""
"%s initializes a PostgreSQL database cluster.\n"
"\n"
msgstr "%sはPostgreSQLデータベースクラスタを初期化します。\n"
-#: initdb.c:2428
+#: initdb.c:2379
#, c-format
msgid "Usage:\n"
msgstr "使用方法:\n"
-#: initdb.c:2429
+#: initdb.c:2380
#, c-format
msgid " %s [OPTION]... [DATADIR]\n"
msgstr " %s [OPTION]... [DATADIR]\n"
-#: initdb.c:2430
+#: initdb.c:2381
#, c-format
msgid ""
"\n"
@@ -310,7 +308,7 @@ msgstr ""
"\n"
"オプション:\n"
-#: initdb.c:2431
+#: initdb.c:2382
#, c-format
msgid ""
" -A, --auth=METHOD default authentication method for local "
@@ -318,24 +316,24 @@ msgid ""
msgstr ""
" -A, --auth=METHOD ローカルな接続向けのデフォルトの認証方式です\n"
-#: initdb.c:2432
+#: initdb.c:2383
#, c-format
msgid " [-D, --pgdata=]DATADIR location for this database cluster\n"
msgstr " [-D, --pgdata=]DATADIR データベースクラスタの場所です\n"
-#: initdb.c:2433
+#: initdb.c:2384
#, c-format
msgid " -E, --encoding=ENCODING set default encoding for new databases\n"
msgstr ""
" -E, --encoding=ENCODING 新規データベース用のデフォルトの符号化方式です\n"
-#: initdb.c:2434
+#: initdb.c:2385
#, c-format
msgid " --locale=LOCALE set default locale for new databases\n"
msgstr ""
" --locale=LOCALE 新しいデータベースのデフォルトロケールをセット\n"
-#: initdb.c:2435
+#: initdb.c:2386
#, c-format
msgid ""
" --lc-collate=, --lc-ctype=, --lc-messages=LOCALE\n"
@@ -350,12 +348,12 @@ msgstr ""
" デフォルトロケールをセット(デフォルト値は\n"
" 環境変数から選ばれます)\n"
-#: initdb.c:2439
+#: initdb.c:2390
#, c-format
msgid " --no-locale equivalent to --locale=C\n"
msgstr " --no-locale --locale=C と同じです\n"
-#: initdb.c:2440
+#: initdb.c:2391
#, c-format
msgid ""
" --pwfile=FILE read password for the new superuser from file\n"
@@ -363,7 +361,7 @@ msgstr ""
" --pwfile=ファイル名 新しいスーパーユーザのパスワードをファイルから読"
"み込む\n"
-#: initdb.c:2441
+#: initdb.c:2392
#, c-format
msgid ""
" -T, --text-search-config=CFG\n"
@@ -372,12 +370,12 @@ msgstr ""
" -T, --text-search-config=CFG\\\n"
" デフォルトのテキスト検索設定です\n"
-#: initdb.c:2443
+#: initdb.c:2394
#, c-format
msgid " -U, --username=NAME database superuser name\n"
msgstr " -U, --username=NAME データベーススーパーユーザの名前です\n"
-#: initdb.c:2444
+#: initdb.c:2395
#, c-format
msgid ""
" -W, --pwprompt prompt for a password for the new superuser\n"
@@ -385,14 +383,14 @@ msgstr ""
" -W, --pwprompt 新規スーパーユーザに対してパスワード入力を促しま"
"す\n"
-#: initdb.c:2445
+#: initdb.c:2396
#, c-format
msgid ""
" -X, --xlogdir=XLOGDIR location for the transaction log directory\n"
msgstr ""
" -X, --xlogdir=XLOGDIR トランザクションログディレクトリの場所です\n"
-#: initdb.c:2446
+#: initdb.c:2397
#, c-format
msgid ""
"\n"
@@ -401,27 +399,27 @@ msgstr ""
"\n"
"使用頻度の低いオプション:\n"
-#: initdb.c:2447
+#: initdb.c:2398
#, c-format
msgid " -d, --debug generate lots of debugging output\n"
msgstr " -d, --debug 多くのデバッグ用の出力を生成します\n"
-#: initdb.c:2448
+#: initdb.c:2399
#, c-format
msgid " -L DIRECTORY where to find the input files\n"
msgstr " -L DIRECTORY 入力ファイルの場所を指定します\n"
-#: initdb.c:2449
+#: initdb.c:2400
#, c-format
msgid " -n, --noclean do not clean up after errors\n"
msgstr " -n, --noclean エラー発生後の削除を行いません\n"
-#: initdb.c:2450
+#: initdb.c:2401
#, c-format
msgid " -s, --show show internal settings\n"
msgstr " -s, --show 内部設定を表示します\n"
-#: initdb.c:2451
+#: initdb.c:2402
#, c-format
msgid ""
"\n"
@@ -430,17 +428,17 @@ msgstr ""
"\n"
"その他のオプション:\n"
-#: initdb.c:2452
+#: initdb.c:2403
#, c-format
msgid " -?, --help show this help, then exit\n"
msgstr " -?, --help このヘルプを表示し、終了します\n"
-#: initdb.c:2453
+#: initdb.c:2404
#, c-format
msgid " -V, --version output version information, then exit\n"
msgstr " -V, --version バージョン情報を表示し、終了します\n"
-#: initdb.c:2454
+#: initdb.c:2405
#, c-format
msgid ""
"\n"
@@ -450,7 +448,7 @@ msgstr ""
"\n"
"データディレクトリが指定されない場合、PGDATA環境変数が使用されます。\n"
-#: initdb.c:2456
+#: initdb.c:2407
#, c-format
msgid ""
"\n"
@@ -459,33 +457,33 @@ msgstr ""
"\n"
"不具合は<pgsql-bugs@postgresql.org>まで報告してください。\n"
-#: initdb.c:2561
+#: initdb.c:2512
#, c-format
msgid "Running in debug mode.\n"
msgstr "デバッグモードで実行しています。\n"
-#: initdb.c:2565
+#: initdb.c:2516
#, c-format
msgid "Running in noclean mode. Mistakes will not be cleaned up.\n"
msgstr ""
"削除を行わないモードで実行しています。失敗した場合でも削除されません。\n"
-#: initdb.c:2608 initdb.c:2626 initdb.c:2894
+#: initdb.c:2559 initdb.c:2577 initdb.c:2845
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "詳細は\"%s --help\"を行ってください。\n"
-#: initdb.c:2624
+#: initdb.c:2575
#, c-format
msgid "%s: too many command-line arguments (first is \"%s\")\n"
msgstr "%s: コマンドライン引数が多すぎます。(始めは\"%s\")\n"
-#: initdb.c:2633
+#: initdb.c:2584
#, c-format
msgid "%s: password prompt and password file cannot be specified together\n"
msgstr "%s: パスワードプロンプトとパスワードファイルは同時に指定できません\n"
-#: initdb.c:2639
+#: initdb.c:2590
msgid ""
"\n"
"WARNING: enabling \"trust\" authentication for local connections\n"
@@ -497,19 +495,19 @@ msgstr ""
"pg_hba.confを編集する、もしくは、次回initdbを実行する時に-Aオプショ\n"
"ンを使用することで変更することができます。\n"
-#: initdb.c:2662
+#: initdb.c:2613
#, c-format
msgid "%s: unrecognized authentication method \"%s\"\n"
msgstr "%s: \"%s\"は未知の認証方式です\n"
-#: initdb.c:2672
+#: initdb.c:2623
#, c-format
msgid ""
"%s: must specify a password for the superuser to enable %s authentication\n"
msgstr ""
"\"%s: %s認証を有効にするためにスーパーユーザのパスワードを指定してください\n"
-#: initdb.c:2687
+#: initdb.c:2638
#, c-format
msgid ""
"%s: no data directory specified\n"
@@ -522,7 +520,7 @@ msgstr ""
"ません。-Dオプションを付けて呼び出す、あるいは、PGDATA環境変数を使用する\n"
"ことで指定することができます。\n"
-#: initdb.c:2763
+#: initdb.c:2722
#, c-format
msgid ""
"The program \"postgres\" is needed by %s but was not found in the\n"
@@ -533,7 +531,7 @@ msgstr ""
"ませんでした。\n"
"インストレーションを検査してください。\n"
-#: initdb.c:2770
+#: initdb.c:2729
#, c-format
msgid ""
"The program \"postgres\" was found by \"%s\"\n"
@@ -544,17 +542,12 @@ msgstr ""
"はありませんでした。\n"
"インストレーションを検査してください。\n"
-#: initdb.c:2789
+#: initdb.c:2748
#, c-format
msgid "%s: input file location must be an absolute path\n"
msgstr "%s: 入力ファイルの場所は絶対パスでなければなりません\n"
-#: initdb.c:2797
-#, c-format
-msgid "%s: could not determine valid short version string\n"
-msgstr "%s: 有効な省略版の文字列を決定できませんでした\n"
-
-#: initdb.c:2852
+#: initdb.c:2805
#, c-format
msgid ""
"The files belonging to this database system will be owned by user \"%s\".\n"
@@ -565,12 +558,12 @@ msgstr ""
"このユーザがサーバプロセスを所有しなければなりません。\n"
"\n"
-#: initdb.c:2862
+#: initdb.c:2815
#, c-format
msgid "The database cluster will be initialized with locale %s.\n"
msgstr "データベースクラスタはロケール%sで初期化されます。\n"
-#: initdb.c:2865
+#: initdb.c:2818
#, c-format
msgid ""
"The database cluster will be initialized with locales\n"
@@ -589,22 +582,22 @@ msgstr ""
" NUMERIC: %s\n"
" TIME: %s\n"
-#: initdb.c:2891
+#: initdb.c:2842
#, c-format
msgid "%s: could not find suitable encoding for locale %s\n"
msgstr "%s: ロケール%s用に適切な符号化方式がありませんでした\n"
-#: initdb.c:2893
+#: initdb.c:2844
#, c-format
msgid "Rerun %s with the -E option.\n"
msgstr "-Eオプションを付けて%sを再実行してください。\n"
-#: initdb.c:2902
+#: initdb.c:2853
#, c-format
msgid "%s: locale %s requires unsupported encoding %s\n"
msgstr "%s: ロケール%sはサポートしない符号化方式%sを必要とします\n"
-#: initdb.c:2905
+#: initdb.c:2856
#, c-format
msgid ""
"Encoding %s is not allowed as a server-side encoding.\n"
@@ -613,23 +606,23 @@ msgstr ""
"符号化方式%sはサーバ側の符号化方式として使用できません。\n"
"別のロケールを選択して%sを再実行してください\n"
-#: initdb.c:2913
+#: initdb.c:2864
#, c-format
msgid "The default database encoding has accordingly been set to %s.\n"
msgstr "デフォルトのデータベース符号化方式は%sに設定されました。\n"
-#: initdb.c:2930
+#: initdb.c:2881
#, c-format
msgid "%s: could not find suitable text search configuration for locale %s\n"
msgstr "%s: ロケール\"%s\"用の適切なテキスト検索設定が見つかりません\n"
-#: initdb.c:2941
+#: initdb.c:2892
#, c-format
msgid ""
"%s: warning: suitable text search configuration for locale %s is unknown\n"
msgstr "%s:警告:ロケール%sに適したテキスト検索設定が不明です。\n"
-#: initdb.c:2946
+#: initdb.c:2897
#, c-format
msgid ""
"%s: warning: specified text search configuration \"%s\" might not match "
@@ -638,32 +631,32 @@ msgstr ""
"%s:警告:指定したテキスト検索設定\"%s\"がロケール%sに合わない可能性\n"
"があります\n"
-#: initdb.c:2951
+#: initdb.c:2902
#, c-format
msgid "The default text search configuration will be set to \"%s\".\n"
msgstr "デフォルトのテキスト検索設定は%sに設定されました。\n"
-#: initdb.c:2985 initdb.c:3052
+#: initdb.c:2936 initdb.c:3003
#, c-format
msgid "creating directory %s ... "
msgstr "ディレクトリ%sを作成しています ... "
-#: initdb.c:2999 initdb.c:3069
+#: initdb.c:2950 initdb.c:3020
#, c-format
msgid "fixing permissions on existing directory %s ... "
msgstr "ディレクトリ%sの権限を設定しています ... "
-#: initdb.c:3005 initdb.c:3075
+#: initdb.c:2956 initdb.c:3026
#, c-format
msgid "%s: could not change permissions of directory \"%s\": %s\n"
msgstr "%s: ディレクトリ\"%s\"の権限を変更できませんでした: %s\n"
-#: initdb.c:3018 initdb.c:3087
+#: initdb.c:2969 initdb.c:3038
#, c-format
msgid "%s: directory \"%s\" exists but is not empty\n"
msgstr "%s: ディレクトリ\"%s\"は存在しますが、空ではありません\n"
-#: initdb.c:3021
+#: initdb.c:2972
#, c-format
msgid ""
"If you want to create a new database system, either remove or empty\n"
@@ -674,19 +667,19 @@ msgstr ""
"を削除するか空にしてください。または、%sを\"%s\"以外の引数で実行して\n"
"ください。\n"
-#: initdb.c:3029 initdb.c:3097
+#: initdb.c:2980 initdb.c:3048
#, c-format
msgid "%s: could not access directory \"%s\": %s\n"
msgstr "%s: ディレクトリ\"%s\"にアクセスできませんでした: %s\n"
-#: initdb.c:3043
+#: initdb.c:2994
#, c-format
msgid "%s: transaction log directory location must be an absolute path\n"
msgstr ""
"%s: トランザクションログのディレクトリの位置は、絶対パスでなければなりませ"
"ん\n"
-#: initdb.c:3090
+#: initdb.c:3041
#, c-format
msgid ""
"If you want to store the transaction log there, either\n"
@@ -695,22 +688,22 @@ msgstr ""
"そこにトランザクションログを格納したい場合はディレクトリ\"%s\"を削除するか\n"
"空にしてください\n"
-#: initdb.c:3109
+#: initdb.c:3060
#, c-format
msgid "%s: could not create symbolic link \"%s\": %s\n"
msgstr "%s: シンボリックリンク\"%s\"を作成できませんでした: %s\n"
-#: initdb.c:3114
+#: initdb.c:3065
#, c-format
msgid "%s: symlinks are not supported on this platform"
msgstr "%s: このプラットフォームでシンボリックリンクはサポートされていません"
-#: initdb.c:3120
+#: initdb.c:3071
#, c-format
msgid "creating subdirectories ... "
msgstr "サブディレクトリを作成しています ... "
-#: initdb.c:3182
+#: initdb.c:3135
#, c-format
msgid ""
"\n"
@@ -724,7 +717,7 @@ msgstr ""
"\n"
"成功しました。以下を使用してデータベースサーバを起動することができます。\n"
"\n"
-" %s%s%spostgres%s -D %s%s%s\n"
+" %s%s%spostmaster%s -D %s%s%s\n"
"または\n"
" %s%s%spg_ctl%s -D %s%s%s -l logfile start\n"
"\n"
@@ -734,97 +727,83 @@ msgstr ""
msgid "out of memory\n"
msgstr "メモリ不足です\n"
-#: ../../port/dirmod.c:270
+#: ../../port/dirmod.c:286
#, c-format
msgid "could not set junction for \"%s\": %s\n"
msgstr "\"%s\"のjunctionを設定できませんでした: %s\n"
-#: ../../port/dirmod.c:309
+#: ../../port/dirmod.c:325
#, c-format
msgid "could not open directory \"%s\": %s\n"
msgstr "ディレクトリ\"%s\"をオープンできませんでした。: %s\n"
-#: ../../port/dirmod.c:346
+#: ../../port/dirmod.c:362
#, c-format
msgid "could not read directory \"%s\": %s\n"
msgstr "ディレクトリ\"%s\"を読み取れませんでした。: %s\n"
-#: ../../port/dirmod.c:429
+#: ../../port/dirmod.c:445
#, c-format
msgid "could not stat file or directory \"%s\": %s\n"
msgstr ""
"\"%s\"というファイルまたはディレクトリの情報を取得できませんでした。: %s\n"
-#: ../../port/dirmod.c:456 ../../port/dirmod.c:473
+#: ../../port/dirmod.c:472 ../../port/dirmod.c:489
#, c-format
msgid "could not remove file or directory \"%s\": %s\n"
msgstr "\"%s\"というファイルまたはディレクトリを削除できませんでした。: %s\n"
-#: ../../port/exec.c:195 ../../port/exec.c:309 ../../port/exec.c:352
+#: ../../port/exec.c:125 ../../port/exec.c:239 ../../port/exec.c:282
#, c-format
msgid "could not identify current directory: %s"
msgstr "現在のディレクトリを識別できませんでした: %s"
-#: ../../port/exec.c:214
+#: ../../port/exec.c:144
#, c-format
msgid "invalid binary \"%s\""
msgstr "バイナリ\"%s\"は無効です"
-#: ../../port/exec.c:263
+#: ../../port/exec.c:193
#, c-format
msgid "could not read binary \"%s\""
msgstr "バイナリ\"%s\"を読み取れませんでした"
-#: ../../port/exec.c:270
+#: ../../port/exec.c:200
#, c-format
msgid "could not find a \"%s\" to execute"
msgstr "実行する\"%s\"がありませんでした"
-#: ../../port/exec.c:325 ../../port/exec.c:361
+#: ../../port/exec.c:255 ../../port/exec.c:291
#, c-format
msgid "could not change directory to \"%s\""
msgstr "ディレクトリを\"%s\"に変更できませんでした"
-#: ../../port/exec.c:340
+#: ../../port/exec.c:270
#, c-format
msgid "could not read symbolic link \"%s\""
msgstr "シンボリックリンク\"%s\"を読み取りできませんでした"
-#: ../../port/exec.c:586
+#: ../../port/exec.c:516
#, c-format
msgid "child process exited with exit code %d"
msgstr "子プロセスが終了コード%dで終了しました"
-#: ../../port/exec.c:590
+#: ../../port/exec.c:520
#, c-format
msgid "child process was terminated by exception 0x%X"
msgstr "子プロセスが例外0x%Xで終了しました"
-#: ../../port/exec.c:599
+#: ../../port/exec.c:529
#, c-format
msgid "child process was terminated by signal %s"
msgstr "子プロセスがシグナル%sで終了しました"
-#: ../../port/exec.c:602
+#: ../../port/exec.c:532
#, c-format
msgid "child process was terminated by signal %d"
msgstr "子プロセスがシグナル%dで終了しました"
-#: ../../port/exec.c:606
+#: ../../port/exec.c:536
#, c-format
msgid "child process exited with unrecognized status %d"
msgstr "子プロセスが未知のステータス%dで終了しました"
-
-#~ msgid ""
-#~ " --locale=LOCALE initialize database cluster with given "
-#~ "locale\n"
-#~ msgstr ""
-#~ " --locale=LOCALE 指定ロケールでデータベースクラスタを初期化しま"
-#~ "す。\n"
-
-#~ msgid ""
-#~ " --pwfile=FILE read password for the new superuser from "
-#~ "file\n"
-#~ msgstr ""
-#~ " --pwfile=FILE 新規スーパーユーザのパスワードをファイルから読"
-#~ "み取ります\n"
diff --git a/src/bin/initdb/po/ko.po b/src/bin/initdb/po/ko.po
new file mode 100644
index 0000000000..65e5c06a89
--- /dev/null
+++ b/src/bin/initdb/po/ko.po
@@ -0,0 +1,809 @@
+# Korean message translation file for PostgreSQL initdb
+# Ioseph Kim <ioseph@uri.sarang.net>, 2004.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 8.4\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2010-09-09 16:34+0000\n"
+"PO-Revision-Date: 2010-09-24 12:25-0400\n"
+"Last-Translator: EnterpriseDB translation team <dev-escalations@enterprisedb.com>\n"
+"Language-Team: EnterpriseDB translation team <dev-escalations@enterprisedb.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=euc-kr\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: initdb.c:254 initdb.c:268
+#, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: ޸ \n"
+
+#: initdb.c:377 initdb.c:1490
+#, c-format
+msgid "%s: could not open file \"%s\" for reading: %s\n"
+msgstr "%s: \"%s\" б : %s\n"
+
+#: initdb.c:439 initdb.c:998 initdb.c:1027
+#, c-format
+msgid "%s: could not open file \"%s\" for writing: %s\n"
+msgstr "%s: \"%s\" : %s\n"
+
+#: initdb.c:447 initdb.c:455 initdb.c:1005 initdb.c:1033
+#, c-format
+msgid "%s: could not write file \"%s\": %s\n"
+msgstr "%s: \"%s\" : %s\n"
+
+#: initdb.c:474
+#, c-format
+msgid "%s: could not execute command \"%s\": %s\n"
+msgstr "%s: \"%s\" : %s\n"
+
+#: initdb.c:594
+#, c-format
+msgid "%s: removing data directory \"%s\"\n"
+msgstr "%s: \"%s\" ͸ ֽϴ.\n"
+
+#: initdb.c:597
+#, c-format
+msgid "%s: failed to remove data directory\n"
+msgstr "%s: ͸ µ ߽ϴ\n"
+
+#: initdb.c:603
+#, c-format
+msgid "%s: removing contents of data directory \"%s\"\n"
+msgstr "%s: \"%s\" ͸ ֽϴ.\n"
+
+#: initdb.c:606
+#, c-format
+msgid "%s: failed to remove contents of data directory\n"
+msgstr "%s: ͸ µ ߽ϴ\n"
+
+#: initdb.c:612
+#, c-format
+msgid "%s: removing transaction log directory \"%s\"\n"
+msgstr "%s: \"%s\" Ʈ α ͸ ֽϴ.\n"
+
+#: initdb.c:615
+#, c-format
+msgid "%s: failed to remove transaction log directory\n"
+msgstr "%s: Ʈ α ͸ µ ߽ϴ\n"
+
+#: initdb.c:621
+#, c-format
+msgid "%s: removing contents of transaction log directory \"%s\"\n"
+msgstr "%s: \"%s\" Ʈ α ͸ ֽϴ.\n"
+
+#: initdb.c:624
+#, c-format
+msgid "%s: failed to remove contents of transaction log directory\n"
+msgstr "%s: Ʈ α ͸ µ ߽ϴ\n"
+
+#: initdb.c:633
+#, c-format
+msgid "%s: data directory \"%s\" not removed at user's request\n"
+msgstr "%s: \"%s\" ͸ û ʾҽϴ.\n"
+
+#: initdb.c:638
+#, c-format
+msgid "%s: transaction log directory \"%s\" not removed at user's request\n"
+msgstr ""
+"%s: \"%s\" Ʈ α ͸ û ʾҽϴ.\n"
+
+#: initdb.c:660
+#, c-format
+msgid ""
+"%s: cannot be run as root\n"
+"Please log in (using, e.g., \"su\") as the (unprivileged) user that will\n"
+"own the server process.\n"
+msgstr ""
+"%s: root α׷ ʽÿ\n"
+"ý۰ , μ ְ Ϲ ڷ\n"
+"α ؼ(\"su\", \"runas\" ̿) Ͻʽÿ.\n"
+
+#: initdb.c:672
+#, c-format
+msgid "%s: could not obtain information about current user: %s\n"
+msgstr "%s: : %s\n"
+
+#: initdb.c:689
+#, c-format
+msgid "%s: could not get current user name: %s\n"
+msgstr "%s: ̸ : %s\n"
+
+#: initdb.c:720
+#, c-format
+msgid "%s: \"%s\" is not a valid server encoding name\n"
+msgstr "%s: \"%s\" ڵ ڵ ̸ ϴ.\n"
+
+#: initdb.c:918 initdb.c:3058
+#, c-format
+msgid "%s: could not create directory \"%s\": %s\n"
+msgstr "%s: \"%s\" ͸ : %s\n"
+
+#: initdb.c:948
+#, c-format
+msgid "%s: file \"%s\" does not exist\n"
+msgstr "%s: \"%s\" \n"
+
+#: initdb.c:950 initdb.c:959 initdb.c:969
+#, c-format
+msgid ""
+"This might mean you have a corrupted installation or identified\n"
+"the wrong directory with the invocation option -L.\n"
+msgstr ""
+"ġ ߸Ǿų &ndash;L ȣ ɼ ĺ ͸\n"
+"߸Ǿ ֽϴ.\n"
+
+#: initdb.c:956
+#, c-format
+msgid "%s: could not access file \"%s\": %s\n"
+msgstr "%s: \"%s\" Ͽ ׼ : %s\n"
+
+#: initdb.c:967
+#, c-format
+msgid "%s: file \"%s\" is not a regular file\n"
+msgstr "%s: \"%s\" Ϲ ƴ\n"
+
+#: initdb.c:1075
+#, c-format
+msgid "selecting default max_connections ... "
+msgstr "max_connections ʱⰪ ϴ ..."
+
+#: initdb.c:1104
+#, c-format
+msgid "selecting default shared_buffers ... "
+msgstr "⺻ shared_buffers ϴ ... "
+
+#: initdb.c:1147
+msgid "creating configuration files ... "
+msgstr "ȯ漳 ..."
+
+#: initdb.c:1314
+#, c-format
+msgid "creating template1 database in %s/base/1 ... "
+msgstr "%s/base/1 ȿ template1 ͺ̽ ..."
+
+#: initdb.c:1330
+#, 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: \"%s\" Է PostgreSQL %s ƴմϴ.\n"
+"ġ¸ Ȯ , -L ɼ ٸ θ Ͻʽÿ.\n"
+
+#: initdb.c:1429
+msgid "initializing pg_authid ... "
+msgstr "pg_authid ʱȭ ..."
+
+#: initdb.c:1465
+msgid "Enter new superuser password: "
+msgstr " superuser ȣ ԷϽʽÿ:"
+
+#: initdb.c:1466
+msgid "Enter it again: "
+msgstr "ȣ Ȯ:"
+
+#: initdb.c:1469
+#, c-format
+msgid "Passwords didn't match.\n"
+msgstr "ȣ Ʋϴ.\n"
+
+#: initdb.c:1496
+#, c-format
+msgid "%s: could not read password from file \"%s\": %s\n"
+msgstr "%s: file \"%s\" Ͽ ȣ ϴ: %s\n"
+
+#: initdb.c:1509
+#, c-format
+msgid "setting password ... "
+msgstr "ȣ ..."
+
+#: initdb.c:1533
+#, c-format
+msgid "%s: The password file was not generated. Please report this problem.\n"
+msgstr ""
+"%s: ȣ ߽ϴ. ˷ֽʽÿ.\n"
+
+#: initdb.c:1617
+msgid "initializing dependencies ... "
+msgstr " ʱȭ ..."
+
+#: initdb.c:1645
+msgid "creating system views ... "
+msgstr "ý ... "
+
+#: initdb.c:1681
+msgid "loading system objects' descriptions ... "
+msgstr "ý ü ڷ Է ..."
+
+#: initdb.c:1733
+msgid "creating conversions ... "
+msgstr "ڵ ȯĢ(conversion) ..."
+
+#: initdb.c:1768
+msgid "creating dictionaries ... "
+msgstr " ... "
+
+#: initdb.c:1821
+msgid "setting privileges on built-in objects ... "
+msgstr "尳ü ׼ ... "
+
+#: initdb.c:1879
+msgid "creating information schema ... "
+msgstr "information schema ..."
+
+#: initdb.c:1935
+msgid "vacuuming database template1 ... "
+msgstr "template1 ͺ̽ û ..."
+
+#: initdb.c:1989
+msgid "copying template1 to template0 ... "
+msgstr "template1 ͺ̽ template0 ͺ̽ ..."
+
+#: initdb.c:2020
+msgid "copying template1 to postgres ... "
+msgstr "template1 ͺ̽ postgres ͺ̽ ..."
+
+#: initdb.c:2077
+#, c-format
+msgid "caught signal\n"
+msgstr "ý ȣ(signal) ޾\n"
+
+#: initdb.c:2083
+#, c-format
+msgid "could not write to child process: %s\n"
+msgstr " μ : %s\n"
+
+#: initdb.c:2091
+#, c-format
+msgid "ok\n"
+msgstr "Ϸ\n"
+
+#: initdb.c:2211
+#, c-format
+msgid "%s: invalid locale name \"%s\"\n"
+msgstr "%s: ߸ Ķ ̸ \"%s\"\n"
+
+#: initdb.c:2244
+#, c-format
+msgid "%s: encoding mismatch\n"
+msgstr "%s: ڵ ġ\n"
+
+#: initdb.c:2246
+#, c-format
+msgid ""
+"The encoding you selected (%s) and the encoding that the\n"
+"selected locale uses (%s) do not match. This would lead to\n"
+"misbehavior in various character string processing functions.\n"
+"Rerun %s and either do not specify an encoding explicitly,\n"
+"or choose a matching combination.\n"
+msgstr ""
+" ڵ(%s) Ķ ϴ\n"
+"ڵ(%s) ġ ʽϴ. ̷ \n"
+" ڿ ó Լ ۵ ߻ ֽϴ.\n"
+"%s() ٽ ϰ ڵ ʰų\n"
+"ġϴ Ͻʽÿ.\n"
+
+#: initdb.c:2427
+#, c-format
+msgid ""
+"%s initializes a PostgreSQL database cluster.\n"
+"\n"
+msgstr ""
+"%s PostgreSQL ͺ̽ Ŭ͸ ʱȭ ϴ α׷.\n"
+"\n"
+
+#: initdb.c:2428
+#, c-format
+msgid "Usage:\n"
+msgstr ":\n"
+
+#: initdb.c:2429
+#, c-format
+msgid " %s [OPTION]... [DATADIR]\n"
+msgstr " %s [ɼ]... [DATADIR]\n"
+
+#: initdb.c:2430
+#, c-format
+msgid ""
+"\n"
+"Options:\n"
+msgstr ""
+"\n"
+"ɼǵ:\n"
+
+#: initdb.c:2431
+#, c-format
+msgid ""
+" -A, --auth=METHOD default authentication method for local "
+"connections\n"
+msgstr " -A, --auth=METHOD ⺻ \n"
+
+#: initdb.c:2432
+#, c-format
+msgid " [-D, --pgdata=]DATADIR location for this database cluster\n"
+msgstr " [-D, --pgdata=]DATADIR ͺ̽ Ŭ͸ ͸\n"
+
+#: initdb.c:2433
+#, c-format
+msgid " -E, --encoding=ENCODING set default encoding for new databases\n"
+msgstr " -E, --encoding=ENCODING ͺ̽ ⺻ ڵ\n"
+
+#: initdb.c:2434
+#, c-format
+msgid " --locale=LOCALE set default locale for new databases\n"
+msgstr " --locale=LOCALE ͺ̽ ⺻ Ķ \n"
+
+#: initdb.c:2435
+#, c-format
+msgid ""
+" --lc-collate=, --lc-ctype=, --lc-messages=LOCALE\n"
+" --lc-monetary=, --lc-numeric=, --lc-time=LOCALE\n"
+" set default locale in the respective category "
+"for\n"
+" new databases (default taken from environment)\n"
+msgstr ""
+" --lc-collate=, --lc-ctype=, --lc-messages=LOCALE\n"
+" --lc-monetary=, --lc-numeric=, --lc-time=LOCALE\n"
+" ͺ̽ ֿ ⺻ Ķ \n"
+" (ȯ濡 ⺻ )\n"
+
+#: initdb.c:2439
+#, c-format
+msgid " --no-locale equivalent to --locale=C\n"
+msgstr " --no-locale -locale=C \n"
+
+#: initdb.c:2440
+#, c-format
+msgid ""
+" --pwfile=FILE read password for the new superuser from file\n"
+msgstr " --pwfile=FILE Ͽ superuser ȣ б\n"
+
+#: initdb.c:2441
+#, c-format
+msgid ""
+" -T, --text-search-config=CFG\n"
+" default text search configuration\n"
+msgstr ""
+" -T, --text-search-config=CFG\n"
+" ⺻ ؽƮ ˻ \n"
+
+#: initdb.c:2443
+#, c-format
+msgid " -U, --username=NAME database superuser name\n"
+msgstr " -U, --username=NAME ͺ̽ superuser ̸\n"
+
+#: initdb.c:2444
+#, c-format
+msgid ""
+" -W, --pwprompt prompt for a password for the new superuser\n"
+msgstr " -W, --pwprompt superuser ȣ Է \n"
+
+#: initdb.c:2445
+#, c-format
+msgid ""
+" -X, --xlogdir=XLOGDIR location for the transaction log directory\n"
+msgstr " -X, --xlogdir=XLOGDIR Ʈ α ͸ ġ\n"
+
+#: initdb.c:2446
+#, c-format
+msgid ""
+"\n"
+"Less commonly used options:\n"
+msgstr ""
+"\n"
+" Ϲ Ǵ ɼǵ:\n"
+
+#: initdb.c:2447
+#, c-format
+msgid " -d, --debug generate lots of debugging output\n"
+msgstr " -d, --debug 뿡 ʿ 鵵 Բ \n"
+
+#: initdb.c:2448
+#, c-format
+msgid " -L DIRECTORY where to find the input files\n"
+msgstr " -L DIRECTORY Էϵ ִ ͸\n"
+
+#: initdb.c:2449
+#, c-format
+msgid " -n, --noclean do not clean up after errors\n"
+msgstr " -n, --noclean ߻Ǿ ״ \n"
+
+#: initdb.c:2450
+#, c-format
+msgid " -s, --show show internal settings\n"
+msgstr " -s, --show \n"
+
+#: initdb.c:2451
+#, c-format
+msgid ""
+"\n"
+"Other options:\n"
+msgstr ""
+"\n"
+"Ÿ ɼ:\n"
+
+#: initdb.c:2452
+#, c-format
+msgid " -?, --help show this help, then exit\n"
+msgstr " -?, --help ְ ħ\n"
+
+#: initdb.c:2453
+#, c-format
+msgid " -V, --version output version information, then exit\n"
+msgstr " -V, --version ְ ħ\n"
+
+#: initdb.c:2454
+#, c-format
+msgid ""
+"\n"
+"If the data directory is not specified, the environment variable PGDATA\n"
+"is used.\n"
+msgstr ""
+"\n"
+" ͸ , PGDATA ȯ մϴ.\n"
+
+#: initdb.c:2456
+#, c-format
+msgid ""
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr ""
+"\n"
+": <pgsql-bugs@postgresql.org>.\n"
+
+#: initdb.c:2561
+#, c-format
+msgid "Running in debug mode.\n"
+msgstr " .\n"
+
+#: initdb.c:2565
+#, c-format
+msgid "Running in noclean mode. Mistakes will not be cleaned up.\n"
+msgstr " . ߻Ǿ մϴ.\n"
+
+#: initdb.c:2608 initdb.c:2626 initdb.c:2894
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr " ڼ \"%s --help\" ɼ Ͻʽÿ.\n"
+
+#: initdb.c:2624
+#, c-format
+msgid "%s: too many command-line arguments (first is \"%s\")\n"
+msgstr "%s: ʹ μ ߽ϴ. (ó \"%s\")\n"
+
+#: initdb.c:2633
+#, c-format
+msgid "%s: password prompt and password file cannot be specified together\n"
+msgstr ""
+"%s: ȣ Է¹޴ ɼǰ ȣ Ͽ ɼ ÿ "
+"ϴ\n"
+
+#: initdb.c:2639
+msgid ""
+"\n"
+"WARNING: enabling \"trust\" authentication for local connections\n"
+"You can change this by editing pg_hba.conf or using the -A option the\n"
+"next time you run initdb.\n"
+msgstr ""
+"\n"
+": \"trust\" ߽ϴ.\n"
+" ٲٷ, pg_hba.conf ϵ,\n"
+" initdb , -A ɼ ؼ ֽ"
+"ϴ.\n"
+
+#: initdb.c:2662
+#, c-format
+msgid "%s: unrecognized authentication method \"%s\"\n"
+msgstr "%s: \"%s\"\n"
+
+#: initdb.c:2672
+#, c-format
+msgid ""
+"%s: must specify a password for the superuser to enable %s authentication\n"
+msgstr ""
+"%s: %s Ϸ, ݵ superuser ȣ ؾմϴ.\n"
+
+#: initdb.c:2687
+#, 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: ͸ ʾҽϴ\n"
+" ۾ Ϸ, ݵ ͸ ־մϴ.\n"
+"ϴ -D ɼ ̳, PGDATA ȯ ָ ˴"
+".\n"
+
+#: initdb.c:2763
+#, c-format
+msgid ""
+"The program \"postgres\" is needed by %s but was not found in the\n"
+"same directory as \"%s\".\n"
+"Check your installation.\n"
+msgstr ""
+"%s α׷ \"postgres\" α׷ ʿ մϴ. ׷, \n"
+"\"%s\" ִ ͸ȿ ϴ.\n"
+"ġ ¸ Ȯ ֽʽÿ.\n"
+
+#: initdb.c:2770
+#, c-format
+msgid ""
+"The program \"postgres\" was found by \"%s\"\n"
+"but was not the same version as %s.\n"
+"Check your installation.\n"
+msgstr ""
+"\"%s\" α׷ \"postgres\" α׷ ã \n"
+"%s α׷ Ʋϴ.\n"
+"ġ ¸ Ȯ ֽʽÿ.\n"
+
+#: initdb.c:2789
+#, c-format
+msgid "%s: input file location must be an absolute path\n"
+msgstr "%s: Է ġ ݵ οմϴ.\n"
+
+#: initdb.c:2797
+#, c-format
+msgid "%s: could not determine valid short version string\n"
+msgstr "%s: ˸ ڿ(short version string) \n"
+
+#: initdb.c:2852
+#, 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\" id\n"
+" Դϴ. ڴ μ ְ ˴ϴ.\n"
+"\n"
+
+#: initdb.c:2862
+#, c-format
+msgid "The database cluster will be initialized with locale %s.\n"
+msgstr "ͺ̽ Ŭʹ %s Ķ ʱȭ Դϴ.\n"
+
+#: initdb.c:2865
+#, 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 ""
+"ͺ̽ Ŭʹ Ķ ʱȭ Դϴ.\n"
+" COLLATE: %s\n"
+" CTYPE: %s\n"
+" MESSAGES: %s\n"
+" MONETARY: %s\n"
+" NUMERIC: %s\n"
+" TIME: %s\n"
+
+#: initdb.c:2891
+#, c-format
+msgid "%s: could not find suitable encoding for locale %s\n"
+msgstr "%s: %s Ķ ˸ ڵ ã \n"
+
+#: initdb.c:2893
+#, c-format
+msgid "Rerun %s with the -E option.\n"
+msgstr "-E ɼ %s ֽʽÿ.\n"
+
+#: initdb.c:2902
+#, c-format
+msgid "%s: locale %s requires unsupported encoding %s\n"
+msgstr "%s: %s Ķ ʴ ڵ %s ʿ\n"
+
+#: initdb.c:2905
+#, c-format
+msgid ""
+"Encoding %s is not allowed as a server-side encoding.\n"
+"Rerun %s with a different locale selection.\n"
+msgstr ""
+"%s ڵ ڵ ϴ.\n"
+"ٸ Ķ ϰ %s() ٽ Ͻʽÿ.\n"
+
+#: initdb.c:2913
+#, c-format
+msgid "The default database encoding has accordingly been set to %s.\n"
+msgstr "⺻ ͺ̽ %s ڵ Ǿϴ.\n"
+
+#: initdb.c:2930
+#, c-format
+msgid "%s: could not find suitable text search configuration for locale %s\n"
+msgstr "%s: %s Ķ ˸ ؽƮ ˻ ã \n"
+
+#: initdb.c:2941
+#, c-format
+msgid ""
+"%s: warning: suitable text search configuration for locale %s is unknown\n"
+msgstr "%s: : %s Ķ ˸ ؽƮ ˻ \n"
+
+#: initdb.c:2946
+#, c-format
+msgid ""
+"%s: warning: specified text search configuration \"%s\" might not match "
+"locale %s\n"
+msgstr ""
+"%s: : ؽƮ ˻ \"%s\"() %s Ķ ġ \n"
+
+#: initdb.c:2951
+#, c-format
+msgid "The default text search configuration will be set to \"%s\".\n"
+msgstr "⺻ ؽƮ ˻ \"%s\"() ˴ϴ.\n"
+
+#: initdb.c:2985 initdb.c:3052
+#, c-format
+msgid "creating directory %s ... "
+msgstr "%s ͸ ..."
+
+#: initdb.c:2999 initdb.c:3069
+#, c-format
+msgid "fixing permissions on existing directory %s ... "
+msgstr "̹ ִ %s ͸ ׼ ġ ..."
+
+#: initdb.c:3005 initdb.c:3075
+#, c-format
+msgid "%s: could not change permissions of directory \"%s\": %s\n"
+msgstr "%s: \"%s\" ͸ ׼ ٲ ϴ: %s\n"
+
+#: initdb.c:3018 initdb.c:3087
+#, c-format
+msgid "%s: directory \"%s\" exists but is not empty\n"
+msgstr "%s: \"%s\" ͸ \n"
+
+#: initdb.c:3021
+#, c-format
+msgid ""
+"If you want to create a new database system, either remove or empty\n"
+"the directory \"%s\" or run %s\n"
+"with an argument other than \"%s\".\n"
+msgstr ""
+"ο ͺ̽ ý \n"
+"\"%s\" ͸ ϰų ʽÿ. Ǵ %s()\n"
+"\"%s\" ̿ μ Ͽ Ͻʽÿ.\n"
+
+#: initdb.c:3029 initdb.c:3097
+#, c-format
+msgid "%s: could not access directory \"%s\": %s\n"
+msgstr "%s: \"%s\" ͸ ׼ : %s\n"
+
+#: initdb.c:3043
+#, c-format
+msgid "%s: transaction log directory location must be an absolute path\n"
+msgstr "%s: Ʈ α ͸ ġ ο \n"
+
+#: initdb.c:3090
+#, c-format
+msgid ""
+"If you want to store the transaction log there, either\n"
+"remove or empty the directory \"%s\".\n"
+msgstr ""
+"Ʈ α׸ ش ġ Ϸ\n"
+"\"%s\" ͸ ϰų ʽÿ.\n"
+
+#: initdb.c:3109
+#, c-format
+msgid "%s: could not create symbolic link \"%s\": %s\n"
+msgstr "%s: \"%s\" ɹ ũ : %s\n"
+
+#: initdb.c:3114
+#, c-format
+msgid "%s: symlinks are not supported on this platform"
+msgstr "%s: ÷ ɺ ũ "
+
+#: initdb.c:3120
+#, c-format
+msgid "creating subdirectories ... "
+msgstr " ͸ ..."
+
+#: initdb.c:3182
+#, c-format
+msgid ""
+"\n"
+"Success. You can now start the database server using:\n"
+"\n"
+" %s%s%spostgres%s -D %s%s%s\n"
+"or\n"
+" %s%s%spg_ctl%s -D %s%s%s -l logfile start\n"
+"\n"
+msgstr ""
+"\n"
+"۾Ϸ. ̿ؼ ֽϴ:\n"
+"\n"
+" %s%s%spostgres%s -D %s%s%s\n"
+"Ǵ\n"
+" %s%s%spg_ctl%s -D %s%s%s -l logfile start\n"
+"\n"
+
+#: ../../port/dirmod.c:75 ../../port/dirmod.c:88 ../../port/dirmod.c:101
+#, c-format
+msgid "out of memory\n"
+msgstr "޸ \n"
+
+#: ../../port/dirmod.c:286
+#, c-format
+msgid "could not set junction for \"%s\": %s\n"
+msgstr "\"%s\" : %s\n"
+
+#: ../../port/dirmod.c:325
+#, c-format
+msgid "could not open directory \"%s\": %s\n"
+msgstr "\"%s\" ͸ : %s\n"
+
+#: ../../port/dirmod.c:362
+#, c-format
+msgid "could not read directory \"%s\": %s\n"
+msgstr "\"%s\" ͸ : %s\n"
+
+#: ../../port/dirmod.c:445
+#, c-format
+msgid "could not stat file or directory \"%s\": %s\n"
+msgstr " Ǵ ͸ \"%s\" ¸ Ȯ : %s\n"
+
+#: ../../port/dirmod.c:472 ../../port/dirmod.c:489
+#, c-format
+msgid "could not remove file or directory \"%s\": %s\n"
+msgstr "\"%s\" Ǵ ͸ : %s\n"
+
+#: ../../port/exec.c:195 ../../port/exec.c:309 ../../port/exec.c:352
+#, c-format
+msgid "could not identify current directory: %s"
+msgstr " ͸ : %s"
+
+#: ../../port/exec.c:214
+#, c-format
+msgid "invalid binary \"%s\""
+msgstr "\"%s\" ߸ ̳ʸ Դϴ"
+
+#: ../../port/exec.c:263
+#, c-format
+msgid "could not read binary \"%s\""
+msgstr "\"%s\" ̳ʸ "
+
+#: ../../port/exec.c:270
+#, c-format
+msgid "could not find a \"%s\" to execute"
+msgstr "\"%s\" ã "
+
+#: ../../port/exec.c:325 ../../port/exec.c:361
+#, c-format
+msgid "could not change directory to \"%s\""
+msgstr "\"%s\" ͸ ̵ "
+
+#: ../../port/exec.c:340
+#, c-format
+msgid "could not read symbolic link \"%s\""
+msgstr "\"%s\" ɹ ũ "
+
+#: ../../port/exec.c:586
+#, c-format
+msgid "child process exited with exit code %d"
+msgstr " μ Ǿ, ڵ %d"
+
+#: ../../port/exec.c:590
+#, c-format
+msgid "child process was terminated by exception 0x%X"
+msgstr "0x%X ܷ μ Ǿ."
+
+#: ../../port/exec.c:599
+#, c-format
+msgid "child process was terminated by signal %s"
+msgstr "%s ñ׳ Ǿ μ Ǿ"
+
+#: ../../port/exec.c:602
+#, c-format
+msgid "child process was terminated by signal %d"
+msgstr " μ Ǿ, ñ׳ %d"
+
+#: ../../port/exec.c:606
+#, c-format
+msgid "child process exited with unrecognized status %d"
+msgstr " μ Ǿ, ˼ %d"
diff --git a/src/bin/initdb/po/pt_BR.po b/src/bin/initdb/po/pt_BR.po
index c4ead7058a..e2bc1c49cc 100644
--- a/src/bin/initdb/po/pt_BR.po
+++ b/src/bin/initdb/po/pt_BR.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: PostgreSQL 9.0\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
"POT-Creation-Date: 2010-05-08 21:46-0300\n"
-"PO-Revision-Date: 2005-10-04 22:36-0300\n"
+"PO-Revision-Date: 2010-09-25 00:45+0300\n"
"Last-Translator: Euler Taveira de Oliveira <euler@timbira.com>\n"
"Language-Team: Brazilian Portuguese <pgbr-dev@listas.postgresql.org.br>\n"
"MIME-Version: 1.0\n"
@@ -234,7 +234,7 @@ msgstr "criando esquema informação ... "
#: initdb.c:1868
msgid "loading PL/pgSQL server-side language ... "
-msgstr "carregando linguagem PL/pgSQL ..."
+msgstr "carregando linguagem PL/pgSQL ... "
#: initdb.c:1893
msgid "vacuuming database template1 ... "
diff --git a/src/bin/initdb/po/ro.po b/src/bin/initdb/po/ro.po
new file mode 100644
index 0000000000..53fff76003
--- /dev/null
+++ b/src/bin/initdb/po/ro.po
@@ -0,0 +1,845 @@
+# translation of initdb-ro.po to Română
+#
+# Alin Vaida <alin.vaida@gmail.com>, 2004, 2005, 2006.
+msgid ""
+msgstr ""
+"Project-Id-Version: initdb-ro\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2010-09-02 17:59+0000\n"
+"PO-Revision-Date: 2010-09-27 22:01-0000\n"
+"Last-Translator: Max <max@oceanline.co.uk>\n"
+"Language-Team: Română <max@oceanline.ro>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.2\n"
+"X-Poedit-Language: Romanian\n"
+"X-Poedit-Country: ROMANIA\n"
+
+#: initdb.c:254
+#: initdb.c:268
+#, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: memorie insuficientă\n"
+
+#: initdb.c:377
+#: initdb.c:1432
+#, c-format
+msgid "%s: could not open file \"%s\" for reading: %s\n"
+msgstr "%s: imposibil de deschis fişierul \"%s\" pentru citire: %s\n"
+
+#: initdb.c:433
+#: initdb.c:956
+#: initdb.c:985
+#, c-format
+msgid "%s: could not open file \"%s\" for writing: %s\n"
+msgstr "%s: imposibil de deschis fişierul \"%s\" pentru scriere: %s\n"
+
+#: initdb.c:441
+#: initdb.c:449
+#: initdb.c:963
+#: initdb.c:991
+#, c-format
+msgid "%s: could not write file \"%s\": %s\n"
+msgstr "%s: imposibil de scris fişierul \"%s\": %s\n"
+
+#: initdb.c:468
+#, c-format
+msgid "%s: could not execute command \"%s\": %s\n"
+msgstr "%s: imposibil de executat comanda\"%s\": %s\n"
+
+#: initdb.c:588
+#, c-format
+msgid "%s: removing data directory \"%s\"\n"
+msgstr "%s: eliminare director de date \"%s\"\n"
+
+#: initdb.c:591
+#, c-format
+msgid "%s: failed to remove data directory\n"
+msgstr "%s: eliminare director de date eşuată\n"
+
+#: initdb.c:597
+#, c-format
+msgid "%s: removing contents of data directory \"%s\"\n"
+msgstr "%s: eliminare conţinut al directorului de date \"%s\"\n"
+
+#: initdb.c:600
+#, c-format
+msgid "%s: failed to remove contents of data directory\n"
+msgstr "%s: eliminare conţinut al directorului de date eşuată\n"
+
+#: initdb.c:606
+#, c-format
+msgid "%s: removing transaction log directory \"%s\"\n"
+msgstr "%s: eliminare directorul jurnal de tranzacţii \"%s\"\n"
+
+#: initdb.c:609
+#, c-format
+msgid "%s: failed to remove transaction log directory\n"
+msgstr "%s: eliminarea directorului fișierului jurnal de tranzacții a eșuat\n"
+
+#: initdb.c:615
+#, c-format
+msgid "%s: removing contents of transaction log directory \"%s\"\n"
+msgstr "%s: eliminare conţinut al directorului jurnal de tranzacții \"%s\"\n"
+
+#: initdb.c:618
+#, c-format
+msgid "%s: failed to remove contents of transaction log directory\n"
+msgstr "%s: eliminarea conţinutului directorului jurnal de tranzacți a eşuat\n"
+
+#: initdb.c:627
+#, c-format
+msgid "%s: data directory \"%s\" not removed at user's request\n"
+msgstr "%s: directorul de date \"%s\" nu a fost eliminat la solicitarea utilizatorului\n"
+
+#: initdb.c:632
+#, c-format
+msgid "%s: transaction log directory \"%s\" not removed at user's request\n"
+msgstr "%s: directorul jurnal de tranzacții \"%s\" nu a fost eliminat la solicitarea utilizatorului\n"
+
+#: initdb.c:654
+#, 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: nu poate fi rulat ca root\n"
+"Autentificaţi-vă (folosind, de exempu, \"su\") ca utilizatorul (neprivilegiat)\n"
+"care va deţine procesul server.\n"
+
+#: initdb.c:666
+#, c-format
+msgid "%s: could not obtain information about current user: %s\n"
+msgstr "%s: imposibil de obţinut informaţii despre utilizatorul curent: %s\n"
+
+#: initdb.c:683
+#, c-format
+msgid "%s: could not get current user name: %s\n"
+msgstr "%s: imposibil de obţinut numele utilizatorului curent: %s\n"
+
+#: initdb.c:714
+#, c-format
+msgid "%s: \"%s\" is not a valid server encoding name\n"
+msgstr "%s: \"%s\" nu este un nume valid de codificare pentru server\n"
+
+#: initdb.c:876
+#: initdb.c:3009
+#, c-format
+msgid "%s: could not create directory \"%s\": %s\n"
+msgstr "%s: imposibil de creat directorul \"%s\": %s\n"
+
+#: initdb.c:906
+#, c-format
+msgid "%s: file \"%s\" does not exist\n"
+msgstr "%s: fişierul \"%s\" nu există\n"
+
+#: initdb.c:908
+#: initdb.c:917
+#: initdb.c:927
+#, c-format
+msgid ""
+"This might mean you have a corrupted installation or identified\n"
+"the wrong directory with the invocation option -L.\n"
+msgstr ""
+"Acest lucru înseamnă că aveţi o instalare coruptă sau că aţi specificat\n"
+"un director greşit pentru opţiunea -L.\n"
+
+#: initdb.c:914
+#, c-format
+msgid "%s: could not access file \"%s\": %s\n"
+msgstr "%s: imposibil de accesat fişierul \"%s\": %s\n"
+
+#: initdb.c:925
+#, c-format
+msgid "%s: file \"%s\" is not a regular file\n"
+msgstr "%s: fişierul \"%s\" nu este un fișier obișnuit\n"
+
+#: initdb.c:1033
+#, c-format
+msgid "selecting default max_connections ... "
+msgstr "selectare valoare implicită pentru max_connections ... "
+
+#: initdb.c:1062
+#, c-format
+msgid "selecting default shared_buffers ... "
+msgstr "selectare valoare implicită pentru shared_buffers ... "
+
+#: initdb.c:1105
+msgid "creating configuration files ... "
+msgstr "creare fişiere de configurare ... "
+
+#: initdb.c:1272
+#, c-format
+msgid "creating template1 database in %s/base/1 ... "
+msgstr "creare bază de date template1 în %s/base/1 ... "
+
+#: initdb.c:1288
+#, 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: fişierul de intrare \"%s\" nu aparţine de PostgreSQL %s\n"
+"Verificaţi instalarea sau specificaţi calea corectă folosind opţiunea -L.\n"
+
+#: initdb.c:1373
+msgid "initializing pg_authid ... "
+msgstr "iniţializare pg_authid ... "
+
+#: initdb.c:1407
+msgid "Enter new superuser password: "
+msgstr "Introduceţi noua parolă pentru utilizatorul privilegiat: "
+
+#: initdb.c:1408
+msgid "Enter it again: "
+msgstr "Introduceţi din nou: "
+
+#: initdb.c:1411
+#, c-format
+msgid "Passwords didn't match.\n"
+msgstr "Parola nu se verifică\n"
+
+#: initdb.c:1438
+#, c-format
+msgid "%s: could not read password from file \"%s\": %s\n"
+msgstr "%s: imposibil de citit parola din fişierul \"%s\": %s\n"
+
+#: initdb.c:1451
+#, c-format
+msgid "setting password ... "
+msgstr "setare parolă ... "
+
+#: initdb.c:1549
+msgid "initializing dependencies ... "
+msgstr "iniţializare dependinţe ... "
+
+#: initdb.c:1577
+msgid "creating system views ... "
+msgstr "creare vizualizări sistem ... "
+
+#: initdb.c:1613
+msgid "loading system objects' descriptions ... "
+msgstr "încărcare descrieri obiecte sistem ... "
+
+#: initdb.c:1665
+msgid "creating conversions ... "
+msgstr "creare conversii ... "
+
+#: initdb.c:1700
+msgid "creating dictionaries ... "
+msgstr "creare dicționare ... "
+
+#: initdb.c:1754
+msgid "setting privileges on built-in objects ... "
+msgstr "setare privilegii pentru obiectele predefinite ... "
+
+#: initdb.c:1812
+msgid "creating information schema ... "
+msgstr "creare schemă de informaţii ... "
+
+#: initdb.c:1868
+msgid "loading PL/pgSQL server-side language ... "
+msgstr "încărcând limbajul server PL/pgSQL ... "
+
+#: initdb.c:1893
+msgid "vacuuming database template1 ... "
+msgstr "vidare bază de date template1 ... "
+
+#: initdb.c:1947
+msgid "copying template1 to template0 ... "
+msgstr "copiere template1 în template0 ... "
+
+#: initdb.c:1978
+msgid "copying template1 to postgres ... "
+msgstr "copiere template1 în postgres ... "
+
+#: initdb.c:2035
+#, c-format
+msgid "caught signal\n"
+msgstr "interceptare semnal\n"
+
+#: initdb.c:2041
+#, c-format
+msgid "could not write to child process: %s\n"
+msgstr "imposibil de scris în procesul fiu: %s\n"
+
+#: initdb.c:2049
+#, c-format
+msgid "ok\n"
+msgstr "ok\n"
+
+#: initdb.c:2169
+#, c-format
+msgid "%s: invalid locale name \"%s\"\n"
+msgstr "%s: nume de localizare incorect \"%s\"\n"
+
+#: initdb.c:2195
+#, c-format
+msgid "%s: encoding mismatch\n"
+msgstr "%s: nepotrivire de codificare\n"
+
+#: initdb.c:2197
+#, c-format
+msgid ""
+"The encoding you selected (%s) and the encoding that the\n"
+"selected locale uses (%s) do not match. This would lead to\n"
+"misbehavior in various character string processing functions.\n"
+"Rerun %s and either do not specify an encoding explicitly,\n"
+"or choose a matching combination.\n"
+msgstr ""
+"Codificarea selectată (%s) şi codificarea folosită de localizarea selectată (%s)\n"
+"nu se potrivesc. Acest lucru poate genera probleme în diverse \n"
+"funcţii de prelucrare a şirurilor de caractere. Pentru a remedia situaţia,\n"
+"rulaţi %s din nou şi fie nu specificaţi nici o codificare, fie selectaţi\n"
+"o combinaţie potrivită.\n"
+
+#: initdb.c:2378
+#, c-format
+msgid ""
+"%s initializes a PostgreSQL database cluster.\n"
+"\n"
+msgstr ""
+"%s iniţializează un grup de baze de date PostgreSQL.\n"
+"\n"
+
+#: initdb.c:2379
+#, c-format
+msgid "Usage:\n"
+msgstr "Utilizare:\n"
+
+#: initdb.c:2380
+#, c-format
+msgid " %s [OPTION]... [DATADIR]\n"
+msgstr " %s [OPŢIUNE]... [DIRDATE]\n"
+
+#: initdb.c:2381
+#, c-format
+msgid ""
+"\n"
+"Options:\n"
+msgstr ""
+"\n"
+"Opţiuni:\n"
+
+#: initdb.c:2382
+#, c-format
+msgid " -A, --auth=METHOD default authentication method for local connections\n"
+msgstr " -A, --auth=METODĂ metoda de autentificare implicită pentru conexiunile locale\n"
+
+#: initdb.c:2383
+#, c-format
+msgid " [-D, --pgdata=]DATADIR location for this database cluster\n"
+msgstr " [-D, --pgdata=]DIRDATE locaţia pentru acest grup de baze de date\n"
+
+#: initdb.c:2384
+#, c-format
+msgid " -E, --encoding=ENCODING set default encoding for new databases\n"
+msgstr " -E, --encoding=CODIFICARE setează codificarea implicită pentru bazele de date noi\n"
+
+#: initdb.c:2385
+#, c-format
+msgid " --locale=LOCALE set default locale for new databases\n"
+msgstr " --locale=CODIFICARE setează codificarea implicită pentru bazele de date noi\n"
+
+#: initdb.c:2386
+#, c-format
+msgid ""
+" --lc-collate=, --lc-ctype=, --lc-messages=LOCALE\n"
+" --lc-monetary=, --lc-numeric=, --lc-time=LOCALE\n"
+" set default locale in the respective category for\n"
+" new databases (default taken from environment)\n"
+msgstr ""
+" --lc-collate=, --lc-ctype=, --lc-messages=LOCALIZARE\n"
+" --lc-monetary=, --lc-numeric=, --lc-time=LOCALIZARE\n"
+" setează localizarea pentru bazele de date noi\n"
+" în categoria predefinită (implicit, luată din mediu)\n"
+
+#: initdb.c:2390
+#, c-format
+msgid " --no-locale equivalent to --locale=C\n"
+msgstr " --no-locale echivalent cu --locale=C\n"
+
+#: initdb.c:2391
+#, c-format
+msgid " --pwfile=FILE read password for the new superuser from file\n"
+msgstr " --pwfile=FIȘIER citire parolă pentru noul utilizator privilegiat din fişier\n"
+
+#: initdb.c:2392
+#, c-format
+msgid ""
+" -T, --text-search-config=CFG\n"
+" default text search configuration\n"
+msgstr ""
+" -T, --text-search-config=CFG\n"
+" configurarea prestabilită pentru căutare text\n"
+
+#: initdb.c:2394
+#, c-format
+msgid " -U, --username=NAME database superuser name\n"
+msgstr " -U, --username=NUME nume utilizator privilegiat pentru baza de date\n"
+
+#: initdb.c:2395
+#, c-format
+msgid " -W, --pwprompt prompt for a password for the new superuser\n"
+msgstr " -W, --pwprompt solicitare parolă pentru noul utilizator privilegiat\n"
+
+#: initdb.c:2396
+#, c-format
+msgid " -X, --xlogdir=XLOGDIR location for the transaction log directory\n"
+msgstr " -X, --xlogdir=XLOGDIR locația directorului jurnal de tranzacții\n"
+
+#: initdb.c:2397
+#, c-format
+msgid ""
+"\n"
+"Less commonly used options:\n"
+msgstr ""
+"\n"
+"Opţiuni mai puţin folosite:\n"
+
+#: initdb.c:2398
+#, c-format
+msgid " -d, --debug generate lots of debugging output\n"
+msgstr " -d, --debug generează mesaje pentru depanare\n"
+
+#: initdb.c:2399
+#, c-format
+msgid " -L DIRECTORY where to find the input files\n"
+msgstr " -L DIRECTOR locaţia fişierele de intrare\n"
+
+#: initdb.c:2400
+#, c-format
+msgid " -n, --noclean do not clean up after errors\n"
+msgstr " -n, --noclean nu se face curat după erori\n"
+
+#: initdb.c:2401
+#, c-format
+msgid " -s, --show show internal settings\n"
+msgstr " -s, --show afişează setările interne\n"
+
+#: initdb.c:2402
+#, c-format
+msgid ""
+"\n"
+"Other options:\n"
+msgstr ""
+"\n"
+"Alte opţiuni:\n"
+
+#: initdb.c:2403
+#, c-format
+msgid " -?, --help show this help, then exit\n"
+msgstr " -?, --help afişează acest mesaj de ajutor, apoi iese\n"
+
+#: initdb.c:2404
+#, c-format
+msgid " -V, --version output version information, then exit\n"
+msgstr " -V, --version afişează informaţiile despre versiune, apoi iese\n"
+
+#: initdb.c:2405
+#, c-format
+msgid ""
+"\n"
+"If the data directory is not specified, the environment variable PGDATA\n"
+"is used.\n"
+msgstr ""
+"\n"
+"Dacă nu este specificat directorul de date, este folosită variabila de mediu PGDATA.\n"
+
+#: initdb.c:2407
+#, c-format
+msgid ""
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr ""
+"\n"
+"Raportaţi erorile la <pgsql-bugs@postgresql.org>.\n"
+
+#: initdb.c:2512
+#, c-format
+msgid "Running in debug mode.\n"
+msgstr "Rulare în mod depanare.\n"
+
+#: initdb.c:2516
+#, c-format
+msgid "Running in noclean mode. Mistakes will not be cleaned up.\n"
+msgstr "Rulare în mod \"noclean\". Greşelile nu vor fi corectate.\n"
+
+#: initdb.c:2559
+#: initdb.c:2577
+#: initdb.c:2845
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "Încercaţi \"%s --help\" pentru mai multe informaţii.\n"
+
+#: initdb.c:2575
+#, c-format
+msgid "%s: too many command-line arguments (first is \"%s\")\n"
+msgstr "%s: prea multe argumente în linia de comandă (primul este \"%s\")\n"
+
+#: initdb.c:2584
+#, c-format
+msgid "%s: password prompt and password file cannot be specified together\n"
+msgstr "%s: solicitarea parolei şi fişierul de parole nu pot fi specificate împreună\n"
+
+#: initdb.c:2590
+msgid ""
+"\n"
+"WARNING: enabling \"trust\" authentication for local connections\n"
+"You can change this by editing pg_hba.conf or using the -A option the\n"
+"next time you run initdb.\n"
+msgstr ""
+"\n"
+"AVERTISMENT: activare autentificare \"trust\" pentru conexiunile locale\n"
+"Puteţi modifica acest lucru editând pg_hba.conf sau folosind opţiunea -A\n"
+"la următoarea rulare a initdb.\n"
+
+#: initdb.c:2613
+#, c-format
+msgid "%s: unrecognized authentication method \"%s\"\n"
+msgstr "%s: metodă de autentificare nerecunoscută \"%s\"\n"
+
+#: initdb.c:2623
+#, c-format
+msgid "%s: must specify a password for the superuser to enable %s authentication\n"
+msgstr "%s: trebuie să specificaţi o parolă pentru utilizatorul privilegiat pentru a activa autentificarea %s\n"
+
+#: initdb.c:2638
+#, 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: nici un director de date specificat\n"
+"Trebuie să identificaţi un director în care vor sta datele pentru acest sistem\n"
+"de baze de date. Puteţi face acest lucru folosind opţiunea -D sau\n"
+"variabila de mediu PGDATA.\n"
+
+#: initdb.c:2722
+#, c-format
+msgid ""
+"The program \"postgres\" is needed by %s but was not found in the\n"
+"same directory as \"%s\".\n"
+"Check your installation.\n"
+msgstr ""
+"Programul \"postgres\" este necesar pentru %s, dar nu a fost găsit\n"
+"în acelaşi director cu \"%s\".\n"
+"Verificaţi instalarea.\n"
+
+#: initdb.c:2729
+#, c-format
+msgid ""
+"The program \"postgres\" was found by \"%s\"\n"
+"but was not the same version as %s.\n"
+"Check your installation.\n"
+msgstr ""
+"Pogramul \"postgres\" a fost găsit de \"%s\",\n"
+"dar nu are aceeaşi versiune ca %s.\n"
+"Verificaţi instalarea.\n"
+
+#: initdb.c:2748
+#, c-format
+msgid "%s: input file location must be an absolute path\n"
+msgstr "%s: locaţia fişierului de intrare trebuie să fie o cale absolută\n"
+
+#: initdb.c:2805
+#, 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 ""
+"Fişierele acestui sistem de baze de date vor aparţine utilizatorului \"%s\".\n"
+"Acest utilizator trebuie să deţină şi procesul serverului.\n"
+"\n"
+
+#: initdb.c:2815
+#, c-format
+msgid "The database cluster will be initialized with locale %s.\n"
+msgstr "Grupul de baze de date va fi iniţializat cu localizarea %s.\n"
+
+#: initdb.c:2818
+#, 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 ""
+"Grupul de baze de date va fi iniţializat cu localizările\n"
+" COLLATE: %s\n"
+" CTYPE: %s\n"
+" MESSAGES: %s\n"
+" MONETARY: %s\n"
+" NUMERIC: %s\n"
+" TIME: %s\n"
+
+#: initdb.c:2842
+#, c-format
+msgid "%s: could not find suitable encoding for locale %s\n"
+msgstr "%s: imposibil de găsit o codificare potrivită pentru localizarea %s\n"
+
+#: initdb.c:2844
+#, c-format
+msgid "Rerun %s with the -E option.\n"
+msgstr "Re-rulaţi %s cu opţiunea -E.\n"
+
+#: initdb.c:2853
+#, c-format
+msgid "%s: locale %s requires unsupported encoding %s\n"
+msgstr "%s: localizarea %s necesită codificarea nesuportată %s\n"
+
+#: initdb.c:2856
+#, c-format
+msgid ""
+"Encoding %s is not allowed as a server-side encoding.\n"
+"Rerun %s with a different locale selection.\n"
+msgstr ""
+"Codificarea %s nu este permisă ca și codificare server.\n"
+"Rulați din nou %s după ce selectați o localizare diferită.\n"
+
+#: initdb.c:2864
+#, c-format
+msgid "The default database encoding has accordingly been set to %s.\n"
+msgstr "Codificarea implicită a bazei de date a fost setată în mod corespunzător la %s.\n"
+
+#: initdb.c:2881
+#, c-format
+msgid "%s: could not find suitable text search configuration for locale %s\n"
+msgstr "%s: imposibil de găsit configurarea potrivită pentru căutare text pentru localizarea %s\n"
+
+#: initdb.c:2892
+#, c-format
+msgid "%s: warning: suitable text search configuration for locale %s is unknown\n"
+msgstr "%s: atenție: configurarea potrivită pentru căutare text pentru localizarea %s nu este cunoscută\n"
+
+#: initdb.c:2897
+#, c-format
+msgid "%s: warning: specified text search configuration \"%s\" might not match locale %s\n"
+msgstr "%s: atenție: configurarea specificată pentru căutare text \"%s\" posibil să nu se potrivească cu localizarea %s\n"
+
+#: initdb.c:2902
+#, c-format
+msgid "The default text search configuration will be set to \"%s\".\n"
+msgstr "Configurarrea implicită pentru căutare text va fi stabilită la \"%s\".\n"
+
+#: initdb.c:2936
+#: initdb.c:3003
+#, c-format
+msgid "creating directory %s ... "
+msgstr "creare director %s ... "
+
+#: initdb.c:2950
+#: initdb.c:3020
+#, c-format
+msgid "fixing permissions on existing directory %s ... "
+msgstr "stabilire permisiuni pentru directorul existent %s ... "
+
+#: initdb.c:2956
+#: initdb.c:3026
+#, c-format
+msgid "%s: could not change permissions of directory \"%s\": %s\n"
+msgstr "%s: imposibil de schimbat drepturile de acces pentru directorul \"%s\": %s\n"
+
+#: initdb.c:2969
+#: initdb.c:3038
+#, c-format
+msgid "%s: directory \"%s\" exists but is not empty\n"
+msgstr "%s: directorul \"%s\" există dar nu este gol\n"
+
+#: initdb.c:2972
+#, c-format
+msgid ""
+"If you want to create a new database system, either remove or empty\n"
+"the directory \"%s\" or run %s\n"
+"with an argument other than \"%s\".\n"
+msgstr ""
+"Dacă doriţi să creaţi un nou sistem de baze de date, ștergeți sau goliţi\n"
+"directorul \"%s\" sau rulaţi %s\n"
+"cu alt argument decât \"%s\".\n"
+
+#: initdb.c:2980
+#: initdb.c:3048
+#, c-format
+msgid "%s: could not access directory \"%s\": %s\n"
+msgstr "%s: imposibil de accesat directorul \"%s\": %s\n"
+
+#: initdb.c:2994
+#, c-format
+msgid "%s: transaction log directory location must be an absolute path\n"
+msgstr "%s: locaţia fişierului log de tranzacții trebuie să fie o cale absolută\n"
+
+#: initdb.c:3041
+#, c-format
+msgid ""
+"If you want to store the transaction log there, either\n"
+"remove or empty the directory \"%s\".\n"
+msgstr ""
+"Dacă doriți să stocați fișierul jurnal de tranzacții aici, fie\n"
+"ștergeți sau goliți directorul \"%s\".\n"
+
+#: initdb.c:3060
+#, c-format
+msgid "%s: could not create symbolic link \"%s\": %s\n"
+msgstr "%s: nu poate crea legătura simbolică \"%s\": %s\n"
+
+#: initdb.c:3065
+#, c-format
+msgid "%s: symlinks are not supported on this platform"
+msgstr "%s: symlink nu sunt suportate pe această platformă"
+
+#: initdb.c:3071
+#, c-format
+msgid "creating subdirectories ... "
+msgstr "creare subdirectoare ..."
+
+#: initdb.c:3135
+#, c-format
+msgid ""
+"\n"
+"Success. You can now start the database server using:\n"
+"\n"
+" %s%s%spostgres%s -D %s%s%s\n"
+"or\n"
+" %s%s%spg_ctl%s -D %s%s%s -l logfile start\n"
+"\n"
+msgstr ""
+"\n"
+"Succes. Acum puteţi porni serverul de baze de date folosind:\n"
+"\n"
+" %s%s%s/postmaster%s -D %s%s%s\n"
+"sau\n"
+" %s%s%s/pg_ctl%s -D %s%s%s -l fişier_jurnal start\n"
+"\n"
+
+#: ../../port/dirmod.c:75
+#: ../../port/dirmod.c:88
+#: ../../port/dirmod.c:101
+#, c-format
+msgid "out of memory\n"
+msgstr "memorie insuficientă\n"
+
+#: ../../port/dirmod.c:286
+#, c-format
+msgid "could not set junction for \"%s\": %s\n"
+msgstr "imposibil de stabilit joncțiunea pentru \"%s\": %s\n"
+
+#: ../../port/dirmod.c:325
+#, c-format
+msgid "could not open directory \"%s\": %s\n"
+msgstr "imposibil de deschis directorul \"%s\": %s\n"
+
+#: ../../port/dirmod.c:362
+#, c-format
+msgid "could not read directory \"%s\": %s\n"
+msgstr "imposibil de citit directorul \"%s\": %s\n"
+
+#: ../../port/dirmod.c:445
+#, c-format
+msgid "could not stat file or directory \"%s\": %s\n"
+msgstr "imposibil de stabilit directorul \"%s\": %s\n"
+
+#: ../../port/dirmod.c:472
+#: ../../port/dirmod.c:489
+#, c-format
+msgid "could not remove file or directory \"%s\": %s\n"
+msgstr "imposibil de eliminat directorul \"%s\": %s\n"
+
+#: ../../port/exec.c:125
+#: ../../port/exec.c:239
+#: ../../port/exec.c:282
+#, c-format
+msgid "could not identify current directory: %s"
+msgstr "imposibil de identificat directorul curent: %s"
+
+#: ../../port/exec.c:144
+#, c-format
+msgid "invalid binary \"%s\""
+msgstr "binar incorect \"%s\""
+
+#: ../../port/exec.c:193
+#, c-format
+msgid "could not read binary \"%s\""
+msgstr "imposibil de citit binar \"%s\""
+
+#: ../../port/exec.c:200
+#, c-format
+msgid "could not find a \"%s\" to execute"
+msgstr "imposibil de găsit \"%s\" pentru executare"
+
+#: ../../port/exec.c:255
+#: ../../port/exec.c:291
+#, c-format
+msgid "could not change directory to \"%s\""
+msgstr "imposibil de schimbat directorul în \"%s\""
+
+#: ../../port/exec.c:270
+#, c-format
+msgid "could not read symbolic link \"%s\""
+msgstr "imposibil de citit legătura simbolică \"%s\""
+
+#: ../../port/exec.c:516
+#, c-format
+msgid "child process exited with exit code %d"
+msgstr "procesul fiu a ieşit cu codul %d"
+
+#: ../../port/exec.c:520
+#, c-format
+msgid "child process was terminated by exception 0x%X"
+msgstr "procesul fiu a fost terminat cu excepția 0x%X"
+
+#: ../../port/exec.c:529
+#, c-format
+msgid "child process was terminated by signal %s"
+msgstr "procesul fiu a fost terminat cu semnalul %s"
+
+#: ../../port/exec.c:532
+#, c-format
+msgid "child process was terminated by signal %d"
+msgstr "procesul fiu a fost terminat cu semnalul %d"
+
+#: ../../port/exec.c:536
+#, c-format
+msgid "child process exited with unrecognized status %d"
+msgstr "procesul fiu a ieşit cu starea nerecunoscută %d"
+
+#~ msgid ""
+#~ "%s: The password file was not generated. Please report this problem.\n"
+#~ msgstr ""
+#~ "%s: Fişierul de parole nu a fost generat. Raportaţi această problemă.\n"
+
+#~ msgid "enabling unlimited row size for system tables ... "
+#~ msgstr "activare dimensiune rând nelimitată pentru tabelele sistem ... "
+
+#~ msgid ""
+#~ " --locale=LOCALE initialize database cluster with given "
+#~ "locale\n"
+#~ msgstr ""
+#~ " --locale=LOCALIZARE iniţializează grupul de baze de date cu "
+#~ "localizarea dată\n"
+
+#~ msgid "%s: could not determine valid short version string\n"
+#~ msgstr "%s: imposibil de determinat şirul scurt de versiune corect\n"
+
+#~ msgid "creating directory %s/%s ... "
+#~ msgstr "creare director %s/%s ... "
+
+#~ msgid "could not rename file \"%s\" to \"%s\", continuing to try\n"
+#~ msgstr ""
+#~ "imposibil de redenumit fişierul \"%s\" în %s, se încearcă în continuare\n"
+
+#~ msgid "completed rename of file \"%s\" to \"%s\"\n"
+#~ msgstr "redenumirea fişierului \"%s\" în \"%s\" terminată\n"
+
+#~ msgid "could not remove file \"%s\", continuing to try\n"
+#~ msgstr "imposibil de eliminat fişierul \"%s\", se încearcă în continuare\n"
+
+#~ msgid "completed removal of file \"%s\"\n"
+#~ msgstr "eliminarea fişierului \"%s\" terminată\n"
diff --git a/src/bin/initdb/po/ru.po b/src/bin/initdb/po/ru.po
index f34b8b79e8..307010af5e 100644
--- a/src/bin/initdb/po/ru.po
+++ b/src/bin/initdb/po/ru.po
@@ -1,16 +1,17 @@
# ru.po
-# INITDB Translated Messages into the Russian Language (KOI8-R)
+# INITDB Translated Messages into the Russian Language (UTF-8)
#
# Copyright (c) 2004 Serguei A. Mokhov, mokhov@cs.concordia.ca
# Distributed under the same licensing terms as PostgreSQL itself.
#
-# $PostgreSQL: pgsql/src/bin/initdb/po/ru.po,v 1.16 2009/04/09 19:38:51 petere Exp $
+# pgtranslation Id: initdb.po,v 1.4 2010/12/07 21:22:21 petere Exp $
#
# translation of subject-specific terminology, see:
-# :
+# перевод некоторых специфичных терминов:
# http://wiki.postgresql.org/wiki/NLS/ru/dict
#
# ChangeLog:
+# - November , 2010: complete translation for 9 current, Andrey Sudnik <sudnikand@yandex.ru>
# - March 26, 2009: complete translation for 8.3, Sergey Burladyan <eshkinkot@gmail.com>
# - January 17, 2005: complete translation for 8.0, Serguei A. Mokhov <mokhov@cs.concordia.ca>
# - December, 2004: New translation by Oleg Bartunov <oleg@sai.msu.su>
@@ -18,403 +19,443 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: PostgreSQL 8.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-16 09:15+0000\n"
-"PO-Revision-Date: 2009-03-29 09:47+0400\n"
-"Last-Translator: Serguei A. Mokhov <mokhov@cs.concordia.ca>\n"
+"Project-Id-Version: PostgreSQL 9 current\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2010-11-29 18:40+0000\n"
+"PO-Revision-Date: 2010-11-30 16:12+0600\n"
+"Last-Translator: Andrey Sudnik <sudnikand@yandex.ru>\n"
"Language-Team: pgsql-ru-general <pgsql-ru-general@postgresql.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=koi8-r\n"
+"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Language: Russian\n"
"X-Poedit-Country: RUSSIAN FEDERATION\n"
+"X-Poedit-SourceCharset: utf-8\n"
-#: initdb.c:261 initdb.c:275
+#: initdb.c:254
+#: initdb.c:268
#, c-format
msgid "%s: out of memory\n"
-msgstr "%s: \n"
+msgstr "%s: не хватило памяти\n"
-#: initdb.c:384 initdb.c:1475
+#: initdb.c:377
+#: initdb.c:1432
#, c-format
msgid "%s: could not open file \"%s\" for reading: %s\n"
-msgstr "%s: \"%s\" : %s\n"
+msgstr "%s: не удалось открыть файл \"%s\" для чтения: %s\n"
-#: initdb.c:446 initdb.c:993 initdb.c:1022
+#: initdb.c:433
+#: initdb.c:956
+#: initdb.c:985
#, c-format
msgid "%s: could not open file \"%s\" for writing: %s\n"
-msgstr "%s: \"%s\" : %s\n"
+msgstr "%s: не удалось открыть файл \"%s\" для записи: %s\n"
-#: initdb.c:454 initdb.c:462 initdb.c:1000 initdb.c:1028
+#: initdb.c:441
+#: initdb.c:449
+#: initdb.c:963
+#: initdb.c:991
#, c-format
msgid "%s: could not write file \"%s\": %s\n"
-msgstr "%s: \"%s\": %s\n"
+msgstr "%s: не удалось записать в файл \"%s\": %s\n"
-#: initdb.c:481
+#: initdb.c:468
#, c-format
msgid "%s: could not execute command \"%s\": %s\n"
-msgstr "%s: \"%s\": %s\n"
+msgstr "%s: не удалось выполнить команду \"%s\": %s\n"
-#: initdb.c:601
+#: initdb.c:588
#, c-format
msgid "%s: removing data directory \"%s\"\n"
-msgstr "%s: \"%s\"\n"
+msgstr "%s: удаление директории данных \"%s\"\n"
-#: initdb.c:604
+#: initdb.c:591
#, c-format
msgid "%s: failed to remove data directory\n"
-msgstr "%s: \n"
+msgstr "%s: ошибка при удалении директории данных\n"
-#: initdb.c:610
+#: initdb.c:597
#, c-format
msgid "%s: removing contents of data directory \"%s\"\n"
-msgstr "%s: \"%s\"\n"
+msgstr "%s: удаление содержимого директории данных \"%s\"\n"
-#: initdb.c:613
+#: initdb.c:600
#, c-format
msgid "%s: failed to remove contents of data directory\n"
-msgstr "%s: \n"
+msgstr "%s: ошибка при удалении содержимого директории данных\n"
-#: initdb.c:619
+#: initdb.c:606
#, c-format
msgid "%s: removing transaction log directory \"%s\"\n"
-msgstr "%s: \"%s\"\n"
+msgstr "%s: удаление директории журнала транзакций \"%s\"\n"
-#: initdb.c:622
+#: initdb.c:609
#, c-format
msgid "%s: failed to remove transaction log directory\n"
-msgstr "%s: \n"
+msgstr "%s: ошибка при удалении директории журнала транзакций\n"
-#: initdb.c:628
+#: initdb.c:615
#, c-format
msgid "%s: removing contents of transaction log directory \"%s\"\n"
-msgstr "%s: \"%s\"\n"
+msgstr "%s: удаление содержимого директории журнала транзакций \"%s\"\n"
-#: initdb.c:631
+#: initdb.c:618
#, c-format
msgid "%s: failed to remove contents of transaction log directory\n"
-msgstr "%s: \n"
+msgstr "%s: ошибка при удалении содержимого директории журнала транзакций\n"
-#: initdb.c:640
+#: initdb.c:627
#, c-format
msgid "%s: data directory \"%s\" not removed at user's request\n"
-msgstr "%s: \"%s\" \n"
+msgstr "%s: директория данных \"%s\" не удалена по запросу пользователя\n"
-#: initdb.c:645
+#: initdb.c:632
#, c-format
msgid "%s: transaction log directory \"%s\" not removed at user's request\n"
-msgstr "%s: \"%s\" \n"
+msgstr "%s: директория журнала транзакций \"%s\" не удалена по запросу пользователя\n"
-#: initdb.c:669
+#: initdb.c:654
#, c-format
msgid ""
"%s: cannot be run as root\n"
"Please log in (using, e.g., \"su\") as the (unprivileged) user that will\n"
"own the server process.\n"
msgstr ""
-"%s: root'\n"
-", () (,\n"
-" \"su\"), .\n"
+"%s: нельзя запускать под root'ом\n"
+"Пожалуйста, зайдите как (непривилегированный) пользователь (например,\n"
+"используя \"su\"), под которым будет выполняться серверный процесс.\n"
-#: initdb.c:715
+#: initdb.c:666
+#, c-format
+msgid "%s: could not obtain information about current user: %s\n"
+msgstr "%s: не удалось получить информацию о текущем пользователе: %s\n"
+
+#: initdb.c:683
+#, c-format
+msgid "%s: could not get current user name: %s\n"
+msgstr "%s: не удалось получить имя текущего пользователя: %s\n"
+
+#: initdb.c:714
#, c-format
msgid "%s: \"%s\" is not a valid server encoding name\n"
-msgstr "%s: \"%s\" \n"
+msgstr "%s: \"%s\" не является верной кодировкой сервера\n"
-#: initdb.c:913 initdb.c:3027
+#: initdb.c:876
+#: initdb.c:3009
#, c-format
msgid "%s: could not create directory \"%s\": %s\n"
-msgstr "%s: \"%s\": %s\n"
+msgstr "%s: не удалось создать директорию \"%s\": %s\n"
-#: initdb.c:943
+#: initdb.c:906
#, c-format
msgid "%s: file \"%s\" does not exist\n"
-msgstr "%s: \"%s\" \n"
+msgstr "%s: файл \"%s\" не существует\n"
-#: initdb.c:945 initdb.c:954 initdb.c:964
+#: initdb.c:908
+#: initdb.c:917
+#: initdb.c:927
#, c-format
msgid ""
"This might mean you have a corrupted installation or identified\n"
"the wrong directory with the invocation option -L.\n"
msgstr ""
-" , \n"
-" -L.\n"
+"Это означает, что у вас проблемы с установкой или указана\n"
+"неправильная директория в опции запуска -L.\n"
-#: initdb.c:951
+#: initdb.c:914
#, c-format
msgid "%s: could not access file \"%s\": %s\n"
-msgstr "%s: \"%s\": %s\n"
+msgstr "%s: нет доступа к файлу \"%s\": %s\n"
-#: initdb.c:962
+#: initdb.c:925
#, c-format
msgid "%s: file \"%s\" is not a regular file\n"
-msgstr "%s: \"%s\" \n"
+msgstr "%s: файл \"%s\" не является обычным файлом\n"
-#: initdb.c:1074
+#: initdb.c:1033
#, c-format
msgid "selecting default max_connections ... "
-msgstr " max_connections ... "
+msgstr "выбирается значение по умолчанию для max_connections ... "
-#: initdb.c:1105
+#: initdb.c:1062
#, c-format
-msgid "selecting default shared_buffers/max_fsm_pages ... "
-msgstr " shared_buffers/max_fsm_pages ... "
+msgid "selecting default shared_buffers ... "
+msgstr "выбирается значение по умолчанию для shared_buffers ... "
-#: initdb.c:1151
+#: initdb.c:1105
msgid "creating configuration files ... "
-msgstr " ... "
+msgstr "создание конфигурационных файлов ... "
-#: initdb.c:1320
+#: initdb.c:1272
#, c-format
msgid "creating template1 database in %s/base/1 ... "
-msgstr " template1 %s/base/1 ... "
+msgstr "создание базы template1 в %s/base/1 ... "
-#: initdb.c:1336
+#: initdb.c:1288
#, 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: \"%s\" PostgreSQL %s\n"
-" -L.\n"
+"%s: входной файл \"%s\" не принадлежит PostgreSQL %s\n"
+"Проверьте вашу установку или укажите правильный путь с помощью опции -L.\n"
-#: initdb.c:1414
+#: initdb.c:1373
msgid "initializing pg_authid ... "
-msgstr " pg_authid ... "
+msgstr "инициализация pg_authid ... "
-#: initdb.c:1450
+#: initdb.c:1407
msgid "Enter new superuser password: "
-msgstr " : "
+msgstr "Введите новый пароль администратора: "
-#: initdb.c:1451
+#: initdb.c:1408
msgid "Enter it again: "
-msgstr " : "
+msgstr "Введите его снова: "
-#: initdb.c:1454
+#: initdb.c:1411
#, c-format
msgid "Passwords didn't match.\n"
-msgstr " .\n"
+msgstr "Пароли не совпадают.\n"
-#: initdb.c:1481
+#: initdb.c:1438
#, c-format
msgid "%s: could not read password from file \"%s\": %s\n"
-msgstr "%s: \"%s\": %s\n"
+msgstr "%s: не удалось считать пароль из файла \"%s\": %s\n"
-#: initdb.c:1494
+#: initdb.c:1451
#, c-format
msgid "setting password ... "
-msgstr " ... "
-
-#: initdb.c:1518
-#, c-format
-msgid "%s: The password file was not generated. Please report this problem.\n"
-msgstr ""
-"%s: . , .\n"
+msgstr "установка пароля ... "
-#: initdb.c:1602
+#: initdb.c:1549
msgid "initializing dependencies ... "
-msgstr " ... "
+msgstr "инициализация зависимостей ... "
-#: initdb.c:1630
+#: initdb.c:1577
msgid "creating system views ... "
-msgstr " ... "
+msgstr "создание системных представлений ... "
-#: initdb.c:1666
+#: initdb.c:1613
msgid "loading system objects' descriptions ... "
-msgstr " ... "
+msgstr "загрузка системных описаний объектов ... "
-#: initdb.c:1718
+#: initdb.c:1665
msgid "creating conversions ... "
-msgstr " ... "
+msgstr "создание конверсий ... "
-#: initdb.c:1753
+#: initdb.c:1700
msgid "creating dictionaries ... "
-msgstr " ... "
+msgstr "создание словарей ... "
-#: initdb.c:1806
+#: initdb.c:1754
msgid "setting privileges on built-in objects ... "
-msgstr " ... "
+msgstr "установка привилегий для встроенных объектов ... "
-#: initdb.c:1864
+#: initdb.c:1812
msgid "creating information schema ... "
-msgstr " ... "
+msgstr "создание информационной схемы ... "
-#: initdb.c:1920
+#: initdb.c:1868
+msgid "loading PL/pgSQL server-side language ... "
+msgstr "загружется PL/pgSQL язык на стороне сервера ... "
+
+#: initdb.c:1893
msgid "vacuuming database template1 ... "
-msgstr " template1 ... "
+msgstr "сборка мусора в базе template1 ... "
-#: initdb.c:1974
+#: initdb.c:1947
msgid "copying template1 to template0 ... "
-msgstr " template1 template0 ... "
+msgstr "копирование template1 в template0 ... "
-#: initdb.c:2005
+#: initdb.c:1978
msgid "copying template1 to postgres ... "
-msgstr " template1 postgres ... "
+msgstr "копирование template1 в postgres ... "
-#: initdb.c:2062
+#: initdb.c:2035
#, c-format
msgid "caught signal\n"
-msgstr " \n"
+msgstr "перехвачен сигнал\n"
-#: initdb.c:2068
+#: initdb.c:2041
#, c-format
msgid "could not write to child process: %s\n"
-msgstr " : %s\n"
+msgstr "не удалось записать в дочерний процесс: %s\n"
-#: initdb.c:2076
+#: initdb.c:2049
#, c-format
msgid "ok\n"
-msgstr "\n"
+msgstr "ок\n"
-#: initdb.c:2194
+#: initdb.c:2169
#, c-format
msgid "%s: invalid locale name \"%s\"\n"
-msgstr "%s: \"%s\"\n"
+msgstr "%s: ошибочное имя локали \"%s\"\n"
-#: initdb.c:2366
+#: initdb.c:2195
+#, c-format
+msgid "%s: encoding mismatch\n"
+msgstr "%s: несоответствие кодировки\n"
+
+#: initdb.c:2197
+#, c-format
+msgid ""
+"The encoding you selected (%s) and the encoding that the\n"
+"selected locale uses (%s) do not match. This would lead to\n"
+"misbehavior in various character string processing functions.\n"
+"Rerun %s and either do not specify an encoding explicitly,\n"
+"or choose a matching combination.\n"
+msgstr ""
+"Кодировка которую вы выбрали (%s) и кодировка выбранной\n"
+"локали (%s) не совпадают. Это может привести к неожиданным\n"
+"результатам в различных функциях связанных с обработкой строк. \n"
+"Для исправления перезапустите %s и, либо не указывайте\n"
+"кодировку, либо задайте правильную комбинацию кодировки и локали.\n"
+
+#: initdb.c:2378
#, c-format
msgid ""
"%s initializes a PostgreSQL database cluster.\n"
"\n"
msgstr ""
-"%s PostgreSQL.\n"
+"%s инициализирует кластер PostgreSQL.\n"
"\n"
-#: initdb.c:2367
+#: initdb.c:2379
#, c-format
msgid "Usage:\n"
-msgstr ":\n"
+msgstr "Использование:\n"
-#: initdb.c:2368
+#: initdb.c:2380
#, c-format
msgid " %s [OPTION]... [DATADIR]\n"
-msgstr " %s []... [-]\n"
+msgstr " %s [ОПЦИИ]... [ДИРЕКТОРИЯ-ДАННЫХ]\n"
-#: initdb.c:2369
+#: initdb.c:2381
#, c-format
msgid ""
"\n"
"Options:\n"
msgstr ""
"\n"
-":\n"
+"Опции:\n"
-#: initdb.c:2370
+#: initdb.c:2382
+#, c-format
+msgid " -A, --auth=METHOD default authentication method for local connections\n"
+msgstr " -A, --auth=МЕТОД метод аутентификации по умолчанию для локальных подключений\n"
+
+#: initdb.c:2383
#, c-format
msgid " [-D, --pgdata=]DATADIR location for this database cluster\n"
-msgstr " [-D, --pgdata=]- \n"
+msgstr " [-D, --pgdata=]ДИР-ДАННЫХ местонахождение для этого кластера баз данных\n"
-#: initdb.c:2371
+#: initdb.c:2384
#, c-format
msgid " -E, --encoding=ENCODING set default encoding for new databases\n"
-msgstr " -E, --encoding= \n"
+msgstr " -E, --encoding=КОДИРОВКА установить кодировку по умолчанию для новых баз\n"
-#: initdb.c:2372
+#: initdb.c:2385
#, c-format
-msgid ""
-" --locale=LOCALE initialize database cluster with given locale\n"
-msgstr " --locale= \n"
+msgid " --locale=LOCALE set default locale for new databases\n"
+msgstr " --locale=LOCALE установить локаль по умолчанию для новых баз\n"
-#: initdb.c:2373
+#: initdb.c:2386
#, c-format
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"
+" --lc-collate=, --lc-ctype=, --lc-messages=LOCALE\n"
+" --lc-monetary=, --lc-numeric=, --lc-time=LOCALE\n"
+" set default locale in the respective category for\n"
+" new databases (default taken from environment)\n"
msgstr ""
-" --lc-collate, --lc-ctype, --lc-messages=\n"
-" --lc-monetary, --lc-numeric, --lc-time=\n"
-" \n"
-" \n"
-" ( )\n"
+" --lc-collate=, --lc-ctype=, --lc-messages=LOCALE\n"
+" --lc-monetary=, --lc-numeric=, --lc-time=LOCALE\n"
+" установить локаль в соответствующей категории для\n"
+" новых баз (значения по умолчанию берутся из окружения)\n"
-#: initdb.c:2378
+#: initdb.c:2390
#, c-format
-msgid " --no-locale equivalent to --locale=C\n"
-msgstr " --no-locale --locale=C\n"
+msgid " --no-locale equivalent to --locale=C\n"
+msgstr " --no-locale эквивалентно --locale=C\n"
-#: initdb.c:2379
+#: initdb.c:2391
+#, c-format
+msgid " --pwfile=FILE read password for the new superuser from file\n"
+msgstr " --pwfile=FILE читать пароль для нового администратора из файла\n"
+
+#: initdb.c:2392
#, c-format
msgid ""
" -T, --text-search-config=CFG\n"
" default text search configuration\n"
msgstr ""
-" -T, --text-search-config=\n"
-" \n"
+" -T, --text-search-config=КОНФИГУРАЦИЯ\n"
+" конфигурация полнотекстового поиска по умолчанию\n"
-#: initdb.c:2381
+#: initdb.c:2394
#, c-format
-msgid ""
-" -X, --xlogdir=XLOGDIR location for the transaction log directory\n"
-msgstr " -X, --xlogdir=XLOGDIR \n"
+msgid " -U, --username=NAME database superuser name\n"
+msgstr " -U, --username=ИМЯ имя администратора базы данных\n"
-#: initdb.c:2382
+#: initdb.c:2395
#, c-format
-msgid ""
-" -A, --auth=METHOD default authentication method for local "
-"connections\n"
-msgstr " -A, --auth= \n"
+msgid " -W, --pwprompt prompt for a password for the new superuser\n"
+msgstr " -W, --pwprompt запросить пароль для нового администратора\n"
-#: initdb.c:2383
+#: initdb.c:2396
#, c-format
-msgid " -U, --username=NAME database superuser name\n"
-msgstr " -U, --username= \n"
+msgid " -X, --xlogdir=XLOGDIR location for the transaction log directory\n"
+msgstr " -X, --xlogdir=XLOGDIR местонахождение для директории журнала транзакций\n"
-#: initdb.c:2384
+#: initdb.c:2397
#, c-format
msgid ""
-" -W, --pwprompt prompt for a password for the new superuser\n"
+"\n"
+"Less commonly used options:\n"
msgstr ""
-" -W, --pwprompt \n"
+"\n"
+"Редко используемые опции:\n"
-#: initdb.c:2385
+#: initdb.c:2398
#, c-format
-msgid ""
-" --pwfile=FILE read password for the new superuser from file\n"
-msgstr " --pwfile= \n"
+msgid " -d, --debug generate lots of debugging output\n"
+msgstr " -d, --debug выдавать много отладочных сообщений\n"
-#: initdb.c:2386
+#: initdb.c:2399
#, c-format
-msgid " -?, --help show this help, then exit\n"
-msgstr " -?, --help \n"
+msgid " -L DIRECTORY where to find the input files\n"
+msgstr " -L ДИРЕКТОРИЯ где найти входные файлы\n"
-#: initdb.c:2387
+#: initdb.c:2400
#, c-format
-msgid " -V, --version output version information, then exit\n"
-msgstr " -V, --version \n"
+msgid " -n, --noclean do not clean up after errors\n"
+msgstr " -n, --noclean не очищать после ошибок\n"
-#: initdb.c:2388
+#: initdb.c:2401
+#, c-format
+msgid " -s, --show show internal settings\n"
+msgstr " -s, --show показать внутренние установки\n"
+
+#: initdb.c:2402
#, c-format
msgid ""
"\n"
-"Less commonly used options:\n"
+"Other options:\n"
msgstr ""
"\n"
-" :\n"
+"Другие опции:\n"
-#: initdb.c:2389
+#: initdb.c:2403
#, c-format
-msgid " -d, --debug generate lots of debugging output\n"
-msgstr " -d, --debug \n"
-
-#: initdb.c:2390
-#, c-format
-msgid " -s, --show show internal settings\n"
-msgstr " -s, --show \n"
-
-#: initdb.c:2391
-#, c-format
-msgid " -L DIRECTORY where to find the input files\n"
-msgstr " -L \n"
+msgid " -?, --help show this help, then exit\n"
+msgstr " -?, --help показать эту помощь и выйти\n"
-#: initdb.c:2392
+#: initdb.c:2404
#, c-format
-msgid " -n, --noclean do not clean up after errors\n"
-msgstr " -n, --noclean \n"
+msgid " -V, --version output version information, then exit\n"
+msgstr " -V, --version показать версию и выйти\n"
-#: initdb.c:2393
+#: initdb.c:2405
#, c-format
msgid ""
"\n"
@@ -422,46 +463,45 @@ msgid ""
"is used.\n"
msgstr ""
"\n"
-" , "
-" PGDATA.\n"
+"Если директория данных не указана, используется значение переменной окружения PGDATA.\n"
-#: initdb.c:2395
+#: initdb.c:2407
#, c-format
msgid ""
"\n"
"Report bugs to <pgsql-bugs@postgresql.org>.\n"
msgstr ""
"\n"
-" : <pgsql-bugs@postgresql.org>.\n"
+"Сообщения об ошибках: <pgsql-bugs@postgresql.org>.\n"
-#: initdb.c:2498
+#: initdb.c:2512
#, c-format
msgid "Running in debug mode.\n"
-msgstr " .\n"
+msgstr "Выполнение в режиме отладки.\n"
-#: initdb.c:2502
+#: initdb.c:2516
#, c-format
msgid "Running in noclean mode. Mistakes will not be cleaned up.\n"
-msgstr ""
-" 'noclean'. "
-" .\n"
+msgstr "Выполнение в режиме 'noclean'. Сборка мусора и чистка после ошибок производиться не будет.\n"
-#: initdb.c:2545 initdb.c:2563 initdb.c:2831
+#: initdb.c:2559
+#: initdb.c:2577
+#: initdb.c:2845
#, c-format
msgid "Try \"%s --help\" for more information.\n"
-msgstr " \"%s --help\" .\n"
+msgstr "Наберите \"%s --help\" для более подробной информации.\n"
-#: initdb.c:2561
+#: initdb.c:2575
#, c-format
msgid "%s: too many command-line arguments (first is \"%s\")\n"
-msgstr "%s: (: \"%s\")\n"
+msgstr "%s: слишком много аргументов командной строки (первый: \"%s\")\n"
-#: initdb.c:2570
+#: initdb.c:2584
#, c-format
msgid "%s: password prompt and password file cannot be specified together\n"
-msgstr "%s: \n"
+msgstr "%s: нельзя указывать одновременно запрос пароля и файл паролей\n"
-#: initdb.c:2576
+#: initdb.c:2590
msgid ""
"\n"
"WARNING: enabling \"trust\" authentication for local connections\n"
@@ -469,24 +509,21 @@ msgid ""
"next time you run initdb.\n"
msgstr ""
"\n"
-": \"trust\" .\n"
-" ţ , pg_hba.conf -A,\n"
-" initdb.\n"
+"ВНИМАНИЕ: используется аутентификация \"trust\" для локальных подключений.\n"
+"Вы можете её поменять, отредактировав pg_hba.conf или используя опцию -A,\n"
+"при следующем выполнении initdb.\n"
-#: initdb.c:2599
+#: initdb.c:2613
#, c-format
msgid "%s: unrecognized authentication method \"%s\"\n"
-msgstr "%s: \"%s\"\n"
+msgstr "%s: нераспознанный метод аутентификации \"%s\"\n"
-#: initdb.c:2609
+#: initdb.c:2623
#, c-format
-msgid ""
-"%s: must specify a password for the superuser to enable %s authentication\n"
-msgstr ""
-"%s: %"
-"s\n"
+msgid "%s: must specify a password for the superuser to enable %s authentication\n"
+msgstr "%s: необходимо указать пароль администратора для включения аутентификации %s\n"
-#: initdb.c:2624
+#: initdb.c:2638
#, c-format
msgid ""
"%s: no data directory specified\n"
@@ -494,60 +531,55 @@ msgid ""
"will reside. Do this with either the invocation option -D or the\n"
"environment variable PGDATA.\n"
msgstr ""
-"%s: \n"
-" \n"
-" . -D\n"
-" PGDATA.\n"
+"%s: директория данных не указана\n"
+"Вы должны указать директорию для расположения данных для\n"
+"для этой системы. Это можно сделать с помощью указания опции -D\n"
+"или установки переменной окружения PGDATA.\n"
-#: initdb.c:2700
+#: initdb.c:2722
#, c-format
msgid ""
"The program \"postgres\" is needed by %s but was not found in the\n"
"same directory as \"%s\".\n"
"Check your installation.\n"
msgstr ""
-" \"postgres\" %s, \n"
-" , \"%s\".\n"
-" .\n"
+"Программа \"postgres\" нужна для %s, но она не найдена в \n"
+"той же директории, что и \"%s\".\n"
+"Проверьте вашу установку.\n"
-#: initdb.c:2707
+#: initdb.c:2729
#, c-format
msgid ""
"The program \"postgres\" was found by \"%s\"\n"
"but was not the same version as %s.\n"
"Check your installation.\n"
msgstr ""
-" \"postgres\" %s, \n"
-" %s.\n"
-" .\n"
+"Программа \"postgres\" найдена рядом с %s, но не\n"
+"с той же версией как %s.\n"
+"Проверьте вашу установку.\n"
-#: initdb.c:2726
+#: initdb.c:2748
#, c-format
msgid "%s: input file location must be an absolute path\n"
-msgstr "%s: ԣ\n"
+msgstr "%s: местонахождение входного файла должно быть абсолютным путём\n"
-#: initdb.c:2734
-#, c-format
-msgid "%s: could not determine valid short version string\n"
-msgstr "%s: \n"
-
-#: initdb.c:2789
+#: initdb.c:2805
#, 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 ""
-", , \n"
-" \"%s\". \n"
-" .\n"
+"Файлы, сопутствующие этой системе баз данных, будут\n"
+"принадлежать пользователю \"%s\". Этот пользователь\n"
+"также должен быть владельцем процесса сервера.\n"
-#: initdb.c:2799
+#: initdb.c:2815
#, c-format
msgid "The database cluster will be initialized with locale %s.\n"
-msgstr " %s.\n"
+msgstr "Кластер баз данных будет инициализирован с локалью %s.\n"
-#: initdb.c:2802
+#: initdb.c:2818
#, c-format
msgid ""
"The database cluster will be initialized with locales\n"
@@ -558,7 +590,7 @@ msgid ""
" NUMERIC: %s\n"
" TIME: %s\n"
msgstr ""
-" :\n"
+"Кластер баз данных будет инициализирован со следующими локалями:\n"
" COLLATE: %s\n"
" CTYPE: %s\n"
" MESSAGES: %s\n"
@@ -566,144 +598,126 @@ msgstr ""
" NUMERIC: %s\n"
" TIME: %s\n"
-#: initdb.c:2828
+#: initdb.c:2842
#, c-format
msgid "%s: could not find suitable encoding for locale %s\n"
-msgstr "%s: %s\n"
+msgstr "%s: не удалось найти подходящую кодировку для локали %s\n"
-#: initdb.c:2830
+#: initdb.c:2844
#, c-format
msgid "Rerun %s with the -E option.\n"
-msgstr " %s -E.\n"
+msgstr "Перезапустите %s с опцией -E.\n"
-#: initdb.c:2839
+#: initdb.c:2853
#, c-format
msgid "%s: locale %s requires unsupported encoding %s\n"
-msgstr "%s: %s %s\n"
+msgstr "%s: локаль %s требует не поддерживаемую кодировку %s\n"
-#: initdb.c:2842
+#: initdb.c:2856
#, c-format
msgid ""
"Encoding %s is not allowed as a server-side encoding.\n"
"Rerun %s with a different locale selection.\n"
msgstr ""
-" %s .\n"
-" %s .\n"
+"Кодировка %s недопустима в качестве кодировки сервера.\n"
+"Перезапустите %s выбрав другую локаль.\n"
-#: initdb.c:2850
+#: initdb.c:2864
#, c-format
msgid "The default database encoding has accordingly been set to %s.\n"
-msgstr " %s.\n"
-
-#: initdb.c:2880
-#, c-format
-msgid "%s: encoding mismatch\n"
-msgstr "%s: \n"
-
-#: initdb.c:2882
-#, c-format
-msgid ""
-"The encoding you selected (%s) and the encoding that the\n"
-"selected locale uses (%s) do not match. This would lead to\n"
-"misbehavior in various character string processing functions.\n"
-"Rerun %s and either do not specify an encoding explicitly,\n"
-"or choose a matching combination.\n"
-msgstr ""
-" (%s) \n"
-" (%s) . \n"
-" . \n"
-" %s , \n"
-", .\n"
+msgstr "Кодировка базы по умолчанию установлена в %s.\n"
-#: initdb.c:2899
+#: initdb.c:2881
#, c-format
msgid "%s: could not find suitable text search configuration for locale %s\n"
-msgstr "%s: %s\n"
+msgstr "%s: не удалось найти подходящую конфигурацию полнотекстового поиска для локали %s\n"
-#: initdb.c:2910
+#: initdb.c:2892
#, c-format
-msgid ""
-"%s: warning: suitable text search configuration for locale %s is unknown\n"
-msgstr "%s: : %s \n"
+msgid "%s: warning: suitable text search configuration for locale %s is unknown\n"
+msgstr "%s: внимание: подходящая конфигурация полнотекстового поиска для локали %s неизвестна\n"
-#: initdb.c:2915
+#: initdb.c:2897
#, c-format
-msgid ""
-"%s: warning: specified text search configuration \"%s\" might not match "
-"locale %s\n"
-msgstr "%s: : \"%s\" %s\n"
+msgid "%s: warning: specified text search configuration \"%s\" might not match locale %s\n"
+msgstr "%s: внимание: указанная конфигурация полнотекстового поиска \"%s\" может не соответствовать локали %s\n"
-#: initdb.c:2920
+#: initdb.c:2902
#, c-format
msgid "The default text search configuration will be set to \"%s\".\n"
-msgstr " \"%s\".\n"
+msgstr "Конфигурация полнотекстового поиска по умолчанию установлена в \"%s\".\n"
-#: initdb.c:2954 initdb.c:3021
+#: initdb.c:2936
+#: initdb.c:3003
#, c-format
msgid "creating directory %s ... "
-msgstr " %s ... "
+msgstr "создание директории %s ... "
-#: initdb.c:2968 initdb.c:3038
+#: initdb.c:2950
+#: initdb.c:3020
#, c-format
msgid "fixing permissions on existing directory %s ... "
-msgstr " %s ... "
+msgstr "исправление прав на существующую директорию %s ... "
-#: initdb.c:2974 initdb.c:3044
+#: initdb.c:2956
+#: initdb.c:3026
#, c-format
msgid "%s: could not change permissions of directory \"%s\": %s\n"
-msgstr "%s: \"%s\": %s\n"
+msgstr "%s: не удалось поменять права на директорию \"%s\": %s\n"
-#: initdb.c:2987 initdb.c:3056
+#: initdb.c:2969
+#: initdb.c:3038
#, c-format
msgid "%s: directory \"%s\" exists but is not empty\n"
-msgstr "%s: \"%s\" \n"
+msgstr "%s: директория \"%s\" существует но не пуста\n"
-#: initdb.c:2990
+#: initdb.c:2972
#, c-format
msgid ""
"If you want to create a new database system, either remove or empty\n"
"the directory \"%s\" or run %s\n"
"with an argument other than \"%s\".\n"
msgstr ""
-" , \n"
-" \"%s\" ţ %s\n"
-" \"%s\".\n"
+"Если вы хотите создать новую систему баз данных, удалите либо всю \n"
+"директорию \"%s\" или её содержимое или выполните %s\n"
+"с аргументом отличным от \"%s\".\n"
-#: initdb.c:2998 initdb.c:3066
+#: initdb.c:2980
+#: initdb.c:3048
#, c-format
msgid "%s: could not access directory \"%s\": %s\n"
-msgstr "%s: \"%s\": %s\n"
+msgstr "%s: нет доступа к директории \"%s\": %s\n"
-#: initdb.c:3012
+#: initdb.c:2994
#, c-format
msgid "%s: transaction log directory location must be an absolute path\n"
-msgstr "%s: ԣ\n"
+msgstr "%s: местонахождение директории журнала транзакций должно быть абсолютным путём\n"
-#: initdb.c:3059
+#: initdb.c:3041
#, c-format
msgid ""
"If you want to store the transaction log there, either\n"
"remove or empty the directory \"%s\".\n"
msgstr ""
-" , \n"
-" \"%s\" ӣ ţ .\n"
+"Если вы действительно хотите хранить журнал транзакций здесь, удалите\n"
+"директорию \"%s\" либо всё её содержимое.\n"
-#: initdb.c:3078
+#: initdb.c:3060
#, c-format
msgid "%s: could not create symbolic link \"%s\": %s\n"
-msgstr "%s: \"%s\": %s\n"
+msgstr "%s: не удалось создать символическую ссылку \"%s\": %s\n"
-#: initdb.c:3083
+#: initdb.c:3065
#, c-format
msgid "%s: symlinks are not supported on this platform"
-msgstr "%s: "
+msgstr "%s: символьные ссылки не поддерживаются на этой платформе"
-#: initdb.c:3089
+#: initdb.c:3071
#, c-format
msgid "creating subdirectories ... "
-msgstr " ... "
+msgstr "создание поддиректорий ... "
-#: initdb.c:3151
+#: initdb.c:3135
#, c-format
msgid ""
"\n"
@@ -715,100 +729,122 @@ msgid ""
"\n"
msgstr ""
"\n"
-". :\n"
+"Успех. Вы теперь можете запустить сервер баз данных:\n"
"\n"
" %s%s%spostgres%s -D %s%s%s\n"
-"\n"
+"или\n"
" %s%s%spg_ctl%s -D %s%s%s -l logfile start\n"
"\n"
-#: ../../port/dirmod.c:75 ../../port/dirmod.c:88 ../../port/dirmod.c:101
+#: ../../port/dirmod.c:75
+#: ../../port/dirmod.c:88
+#: ../../port/dirmod.c:101
#, c-format
msgid "out of memory\n"
-msgstr " \n"
+msgstr "нехватка памяти\n"
-#: ../../port/dirmod.c:270
+#: ../../port/dirmod.c:286
#, c-format
msgid "could not set junction for \"%s\": %s\n"
-msgstr " \"%s\": %s\n"
+msgstr "не удалось создать связь для \"%s\": %s\n"
-#: ../../port/dirmod.c:309
+#: ../../port/dirmod.c:325
#, c-format
msgid "could not open directory \"%s\": %s\n"
-msgstr " \"%s\": %s\n"
+msgstr "не удалось открыть директорию \"%s\": %s\n"
-#: ../../port/dirmod.c:346
+#: ../../port/dirmod.c:362
#, c-format
msgid "could not read directory \"%s\": %s\n"
-msgstr " \"%s\": %s\n"
+msgstr "не удалось прочитать директорию \"%s\": %s\n"
-#: ../../port/dirmod.c:429
+#: ../../port/dirmod.c:445
#, c-format
msgid "could not stat file or directory \"%s\": %s\n"
-msgstr " \"%s\": %s\n"
+msgstr "не удалось получить статус файла или директории \"%s\": %s\n"
-#: ../../port/dirmod.c:456 ../../port/dirmod.c:473
+#: ../../port/dirmod.c:472
+#: ../../port/dirmod.c:489
#, c-format
msgid "could not remove file or directory \"%s\": %s\n"
-msgstr " \"%s\": %s\n"
+msgstr "не удалось удалить файл или директорию \"%s\": %s\n"
-#: ../../port/exec.c:195 ../../port/exec.c:309 ../../port/exec.c:352
+#: ../../port/exec.c:125
+#: ../../port/exec.c:239
+#: ../../port/exec.c:282
#, c-format
msgid "could not identify current directory: %s"
-msgstr " : %s"
+msgstr "не удалось идентифицировать текущую директорию: %s"
-#: ../../port/exec.c:214
+#: ../../port/exec.c:144
#, c-format
msgid "invalid binary \"%s\""
-msgstr " \"%s\""
+msgstr "неверный бинарный \"%s\""
-#: ../../port/exec.c:263
+#: ../../port/exec.c:193
#, c-format
msgid "could not read binary \"%s\""
-msgstr " \"%s\""
+msgstr "не удалось считать бинарный \"%s\""
-#: ../../port/exec.c:270
+#: ../../port/exec.c:200
#, c-format
msgid "could not find a \"%s\" to execute"
-msgstr "\"%s\" "
+msgstr "\"%s\" не найден для выполнения"
-#: ../../port/exec.c:325 ../../port/exec.c:361
+#: ../../port/exec.c:255
+#: ../../port/exec.c:291
#, c-format
msgid "could not change directory to \"%s\""
-msgstr " \"%s\""
+msgstr "не удалось поменять директорию на \"%s\""
-#: ../../port/exec.c:340
+#: ../../port/exec.c:270
#, c-format
msgid "could not read symbolic link \"%s\""
-msgstr " \"%s\""
+msgstr "не удалось считать символическую ссылку \"%s\""
-#: ../../port/exec.c:586
+#: ../../port/exec.c:516
#, c-format
msgid "child process exited with exit code %d"
-msgstr " %d"
+msgstr "дочерний процесс завершился с кодом возврата %d"
-#: ../../port/exec.c:590
+#: ../../port/exec.c:520
#, c-format
msgid "child process was terminated by exception 0x%X"
-msgstr " ۣ 0x%X"
+msgstr "дочерний процесс завершён исключением 0x%X"
-#: ../../port/exec.c:599
+#: ../../port/exec.c:529
#, c-format
msgid "child process was terminated by signal %s"
-msgstr " ۣ %s"
+msgstr "дочерний процесс завершён сигналом %s"
-#: ../../port/exec.c:602
+#: ../../port/exec.c:532
#, c-format
msgid "child process was terminated by signal %d"
-msgstr " ۣ %d"
+msgstr "дочерний процесс завершён сигналом %d"
-#: ../../port/exec.c:606
+#: ../../port/exec.c:536
#, c-format
msgid "child process exited with unrecognized status %d"
-msgstr " %d"
+msgstr "дочерний процесс завершился с нераспознанным статусом %d"
+
+#~ msgid ""
+#~ "%s: The password file was not generated. Please report this problem.\n"
+#~ msgstr ""
+#~ "%s: Не удалось сгенерировать пароль. Пожалуйста, сообщите об этой "
+#~ "проблеме.\n"
+
+#~ msgid ""
+#~ " --locale=LOCALE initialize database cluster with given "
+#~ "locale\n"
+#~ msgstr ""
+#~ " --locale=ЛОКАЛЬ инициализировать кластер баз данных с "
+#~ "указанной локалью\n"
+
+#~ msgid "%s: could not determine valid short version string\n"
+#~ msgstr "%s: не в состоянии определить правильную короткую строку версии\n"
#~ msgid "enabling unlimited row size for system tables ... "
-#~ msgstr " ... "
+#~ msgstr "разрешение неограниченного размера строки для системных таблиц ... "
#~ msgid "creating directory %s/%s ... "
-#~ msgstr " %s/%s ... "
+#~ msgstr "создание директории %s/%s ... "
diff --git a/src/bin/initdb/po/sv.po b/src/bin/initdb/po/sv.po
index 1f5b9ee26b..cfc3457280 100644
--- a/src/bin/initdb/po/sv.po
+++ b/src/bin/initdb/po/sv.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: PostgreSQL 8.4\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2009-06-13 17:08+0000\n"
-"PO-Revision-Date: 2009-06-13 22:44+0300\n"
+"POT-Creation-Date: 2010-07-27 06:03+0000\n"
+"PO-Revision-Date: 2010-09-25 00:47+0300\n"
"Last-Translator: Peter Eisentraut <peter_e@gmx.net>\n"
"Language-Team: Swedish <sv@li.org>\n"
"MIME-Version: 1.0\n"
@@ -22,79 +22,79 @@ msgstr ""
msgid "%s: out of memory\n"
msgstr "%s: slut p minnet\n"
-#: initdb.c:377 initdb.c:1490
+#: initdb.c:377 initdb.c:1432
#, c-format
msgid "%s: could not open file \"%s\" for reading: %s\n"
msgstr "%s: kunde inte ppna filen \"%s\" fr lsning: %s\n"
-#: initdb.c:439 initdb.c:998 initdb.c:1027
+#: initdb.c:433 initdb.c:956 initdb.c:985
#, c-format
msgid "%s: could not open file \"%s\" for writing: %s\n"
msgstr "%s: kunde inte ppna filen \"%s\" fr skrivning: %s\n"
-#: initdb.c:447 initdb.c:455 initdb.c:1005 initdb.c:1033
+#: initdb.c:441 initdb.c:449 initdb.c:963 initdb.c:991
#, c-format
msgid "%s: could not write file \"%s\": %s\n"
msgstr "%s: kunde inte skriva fil \"%s\": %s\n"
-#: initdb.c:474
+#: initdb.c:468
#, c-format
msgid "%s: could not execute command \"%s\": %s\n"
msgstr "%s: kunde inte utfra kommandot \"%s\": %s\n"
-#: initdb.c:594
+#: initdb.c:588
#, c-format
msgid "%s: removing data directory \"%s\"\n"
msgstr "%s: tar bort datakatalog \"%s\"\n"
-#: initdb.c:597
+#: initdb.c:591
#, c-format
msgid "%s: failed to remove data directory\n"
msgstr "%s: misslyckades att ta bort datakatalogen\n"
-#: initdb.c:603
+#: initdb.c:597
#, c-format
msgid "%s: removing contents of data directory \"%s\"\n"
msgstr "%s: tar bort innehllet i datakatalog \"%s\"\n"
-#: initdb.c:606
+#: initdb.c:600
#, c-format
msgid "%s: failed to remove contents of data directory\n"
msgstr "%s: misslyckades med att ta bort innehllet i datakatalogen\n"
-#: initdb.c:612
+#: initdb.c:606
#, c-format
msgid "%s: removing transaction log directory \"%s\"\n"
msgstr "%s: tar bort transaktionsloggskatalog \"%s\"\n"
-#: initdb.c:615
+#: initdb.c:609
#, c-format
msgid "%s: failed to remove transaction log directory\n"
msgstr "%s: misslyckades att ta bort transaktionsloggskatalogen\n"
-#: initdb.c:621
+#: initdb.c:615
#, c-format
msgid "%s: removing contents of transaction log directory \"%s\"\n"
msgstr "%s: tar bort innehllet i transaktionsloggskatalog \"%s\"\n"
-#: initdb.c:624
+#: initdb.c:618
#, c-format
msgid "%s: failed to remove contents of transaction log directory\n"
msgstr ""
"%s: misslyckades med att ta bort innehllet i transaktionsloggskatalogen\n"
-#: initdb.c:633
+#: initdb.c:627
#, c-format
msgid "%s: data directory \"%s\" not removed at user's request\n"
msgstr "%s: datakatalog \"%s\" ej borttagen p anvndarens begran\n"
-#: initdb.c:638
+#: initdb.c:632
#, c-format
msgid "%s: transaction log directory \"%s\" not removed at user's request\n"
msgstr ""
"%s: transaktionsloggskatalog \"%s\" ej borttagen p anvndarens begran\n"
-#: initdb.c:660
+#: initdb.c:654
#, c-format
msgid ""
"%s: cannot be run as root\n"
@@ -105,32 +105,32 @@ msgstr ""
"Logga in (dvs. anvnd \"su\") som den (ickepriviligerade) anvndaren som\n"
"skall ga serverprocessen.\n"
-#: initdb.c:672
+#: initdb.c:666
#, c-format
msgid "%s: could not obtain information about current user: %s\n"
msgstr "%s: kunde inte f information om den aktuella anvndaren: %s\n"
-#: initdb.c:689
+#: initdb.c:683
#, c-format
msgid "%s: could not get current user name: %s\n"
msgstr "%s: kunde inte ta reda p det aktuella anvndarnamnet: %s\n"
-#: initdb.c:720
+#: initdb.c:714
#, c-format
msgid "%s: \"%s\" is not a valid server encoding name\n"
msgstr "%s: \"%s\" r inte ett giltigt kodningsnamn fr servern\n"
-#: initdb.c:918 initdb.c:3058
+#: initdb.c:876 initdb.c:3009
#, c-format
msgid "%s: could not create directory \"%s\": %s\n"
msgstr "%s: kunde inte skapa katalogen \"%s\": %s\n"
-#: initdb.c:948
+#: initdb.c:906
#, c-format
msgid "%s: file \"%s\" does not exist\n"
msgstr "%s: filen \"%s\" existerar inte\n"
-#: initdb.c:950 initdb.c:959 initdb.c:969
+#: initdb.c:908 initdb.c:917 initdb.c:927
#, c-format
msgid ""
"This might mean you have a corrupted installation or identified\n"
@@ -139,36 +139,36 @@ msgstr ""
"Det kan betyda att du har en korrupt installation eller att du angivit\n"
"fel katalog till flaggan -L\n"
-#: initdb.c:956
+#: initdb.c:914
#, c-format
msgid "%s: could not access file \"%s\": %s\n"
msgstr "%s: kunde inte komma t filen \"%s\": %s\n"
-#: initdb.c:967
+#: initdb.c:925
#, c-format
msgid "%s: file \"%s\" is not a regular file\n"
msgstr "%s: \"%s\" r inte en normal fil\n"
-#: initdb.c:1075
+#: initdb.c:1033
#, c-format
msgid "selecting default max_connections ... "
msgstr "vljer initialt vrde fr max_connections ... "
-#: initdb.c:1104
+#: initdb.c:1062
#, c-format
msgid "selecting default shared_buffers ... "
msgstr "vljer initialt vrde fr shared_buffers ... "
-#: initdb.c:1147
+#: initdb.c:1105
msgid "creating configuration files ... "
-msgstr "skapar konfigurationsfiler ..."
+msgstr "skapar konfigurationsfiler ... "
-#: initdb.c:1314
+#: initdb.c:1272
#, c-format
msgid "creating template1 database in %s/base/1 ... "
msgstr "skapar databasen template1 i %s/base/1 ... "
-#: initdb.c:1330
+#: initdb.c:1288
#, c-format
msgid ""
"%s: input file \"%s\" does not belong to PostgreSQL %s\n"
@@ -178,105 +178,103 @@ msgstr ""
"Kontrollera din installation eller ange den korrekta katalogen\n"
"med hjlp av flaggan -L.\n"
-#: initdb.c:1429
+#: initdb.c:1373
msgid "initializing pg_authid ... "
msgstr "initierar pg_authid ... "
-#: initdb.c:1465
+#: initdb.c:1407
msgid "Enter new superuser password: "
msgstr "Mata in ett nytt lsenord fr superanvndaren: "
-#: initdb.c:1466
+#: initdb.c:1408
msgid "Enter it again: "
msgstr "Mata in det igen: "
-#: initdb.c:1469
+#: initdb.c:1411
#, c-format
msgid "Passwords didn't match.\n"
msgstr "Lsenorden stmde inte verens.\n"
-#: initdb.c:1496
+#: initdb.c:1438
#, c-format
msgid "%s: could not read password from file \"%s\": %s\n"
msgstr "%s: kunde inte lsa lsenordet frn filen \"%s\": %s\n"
-#: initdb.c:1509
+#: initdb.c:1451
#, c-format
msgid "setting password ... "
msgstr "sparar lsenord ... "
-#: initdb.c:1533
-#, c-format
-msgid "%s: The password file was not generated. Please report this problem.\n"
-msgstr ""
-"%s: Lsenordsfilen skapades inte. Var vnlig och rapportera detta felet.\n"
-
-#: initdb.c:1617
+#: initdb.c:1549
msgid "initializing dependencies ... "
msgstr "initierar beroenden ... "
-#: initdb.c:1645
+#: initdb.c:1577
msgid "creating system views ... "
msgstr "skapar systemvyer ... "
-#: initdb.c:1681
+#: initdb.c:1613
msgid "loading system objects' descriptions ... "
-msgstr "laddar systemobjektens beskrivningar... "
+msgstr "laddar systemobjektens beskrivningar ... "
-#: initdb.c:1733
+#: initdb.c:1665
msgid "creating conversions ... "
msgstr "skapar konverteringar ... "
-#: initdb.c:1768
+#: initdb.c:1700
msgid "creating dictionaries ... "
msgstr "skapar kataloger ... "
-#: initdb.c:1821
+#: initdb.c:1754
msgid "setting privileges on built-in objects ... "
msgstr "stter rttigheter fr inbyggda objekt ... "
-#: initdb.c:1879
+#: initdb.c:1812
msgid "creating information schema ... "
msgstr "skapar informationsschema ... "
-#: initdb.c:1935
+#: initdb.c:1868
+msgid "loading PL/pgSQL server-side language ... "
+msgstr ""
+
+#: initdb.c:1893
msgid "vacuuming database template1 ... "
msgstr "kr vacuum p databasen template1 ... "
-#: initdb.c:1989
+#: initdb.c:1947
msgid "copying template1 to template0 ... "
msgstr "kopierar template1 till template0 ... "
-#: initdb.c:2020
+#: initdb.c:1978
msgid "copying template1 to postgres ... "
msgstr "kopierar template1 till postgres ... "
-#: initdb.c:2077
+#: initdb.c:2035
#, c-format
msgid "caught signal\n"
msgstr "fngade signal\n"
-#: initdb.c:2083
+#: initdb.c:2041
#, c-format
msgid "could not write to child process: %s\n"
msgstr "kunde inte skriva till barnprocess: %s\n"
-#: initdb.c:2091
+#: initdb.c:2049
#, c-format
msgid "ok\n"
msgstr "ok\n"
-#: initdb.c:2211
+#: initdb.c:2169
#, c-format
msgid "%s: invalid locale name \"%s\"\n"
msgstr "%s: oknt lokalnamn \"%s\"\n"
-#: initdb.c:2244
+#: initdb.c:2195
#, c-format
msgid "%s: encoding mismatch\n"
msgstr "%s: kodningar passar inte ihop\n"
-#: initdb.c:2246
+#: initdb.c:2197
#, c-format
msgid ""
"The encoding you selected (%s) and the encoding that the\n"
@@ -291,7 +289,7 @@ msgstr ""
"Ls problemet genom att kra %s igen och lt bli att ange en\n"
"kodning eller vlj kodningar som passar ihop.\n"
-#: initdb.c:2427
+#: initdb.c:2378
#, c-format
msgid ""
"%s initializes a PostgreSQL database cluster.\n"
@@ -300,17 +298,17 @@ msgstr ""
"%s initierar ett PostgreSQL databaskluster.\n"
"\n"
-#: initdb.c:2428
+#: initdb.c:2379
#, c-format
msgid "Usage:\n"
msgstr "Anvndning:\n"
-#: initdb.c:2429
+#: initdb.c:2380
#, c-format
msgid " %s [OPTION]... [DATADIR]\n"
msgstr " %s [FLAGGA]... [DATAKATALOG]\n"
-#: initdb.c:2430
+#: initdb.c:2381
#, c-format
msgid ""
"\n"
@@ -319,7 +317,7 @@ msgstr ""
"\n"
"Flaggor:\n"
-#: initdb.c:2431
+#: initdb.c:2382
#, c-format
msgid ""
" -A, --auth=METHOD default authentication method for local "
@@ -328,22 +326,22 @@ msgstr ""
" -A, --auth=METOD standardautentiseringsmetod fr lokal "
"uppkoppling\n"
-#: initdb.c:2432
+#: initdb.c:2383
#, c-format
msgid " [-D, --pgdata=]DATADIR location for this database cluster\n"
msgstr " [-D, --pgdata=]DATAKATALOG plats fr detta databaskluster\n"
-#: initdb.c:2433
+#: initdb.c:2384
#, c-format
msgid " -E, --encoding=ENCODING set default encoding for new databases\n"
msgstr " -E, --encoding=KODNING stt standardkodning fr nya databaser\n"
-#: initdb.c:2434
+#: initdb.c:2385
#, c-format
msgid " --locale=LOCALE set default locale for new databases\n"
msgstr " --locale=LOKAL stt standardlokal fr nya databaser\n"
-#: initdb.c:2435
+#: initdb.c:2386
#, c-format
msgid ""
" --lc-collate=, --lc-ctype=, --lc-messages=LOCALE\n"
@@ -354,21 +352,24 @@ msgid ""
msgstr ""
" --lc-collate=, --lc-ctype=, --lc-messages=LOKAL\n"
" --lc-monetary=, --lc-numeric=, --lc-time=LOKAL\n"
-" stt standardlokal i respektive kategori fr nya\n"
+" stt standardlokal i respektive kategori fr "
+"nya\n"
" databaser (standard tagen frn omgivningen)\n"
-#: initdb.c:2439
+#: initdb.c:2390
#, c-format
msgid " --no-locale equivalent to --locale=C\n"
msgstr " --no-locale samma som --locale=C\n"
-#: initdb.c:2440
+#: initdb.c:2391
#, c-format
msgid ""
" --pwfile=FILE read password for the new superuser from file\n"
-msgstr " --pwfile=FIL ls in lsenord fr nya superanvndaren frn fil\n"
+msgstr ""
+" --pwfile=FIL ls in lsenord fr nya superanvndaren frn "
+"fil\n"
-#: initdb.c:2441
+#: initdb.c:2392
#, c-format
msgid ""
" -T, --text-search-config=CFG\n"
@@ -377,12 +378,12 @@ msgstr ""
" -T, --text-search-config=CFG\n"
" standardkonfiguration fr textskning\n"
-#: initdb.c:2443
+#: initdb.c:2394
#, c-format
msgid " -U, --username=NAME database superuser name\n"
msgstr " -U, --username=NAMN databasens superanvndarnamn\n"
-#: initdb.c:2444
+#: initdb.c:2395
#, c-format
msgid ""
" -W, --pwprompt prompt for a password for the new superuser\n"
@@ -390,13 +391,13 @@ msgstr ""
" -W, --pwprompt frga efter lsenord fr den nya "
"superanvndaren\n"
-#: initdb.c:2445
+#: initdb.c:2396
#, c-format
msgid ""
" -X, --xlogdir=XLOGDIR location for the transaction log directory\n"
msgstr " -X, --xlogdir=XLOGDIR plats fr transaktionsloggskatalogen\n"
-#: initdb.c:2446
+#: initdb.c:2397
#, c-format
msgid ""
"\n"
@@ -405,44 +406,46 @@ msgstr ""
"\n"
"Mindre vanliga flaggor:\n"
-#: initdb.c:2447
+#: initdb.c:2398
#, c-format
msgid " -d, --debug generate lots of debugging output\n"
msgstr " -d, --debug generera massor med debugutskrifter\n"
-#: initdb.c:2448
+#: initdb.c:2399
#, c-format
msgid " -L DIRECTORY where to find the input files\n"
msgstr " -L KATALOG var indatafilerna kan hittas\n"
-#: initdb.c:2449
+#: initdb.c:2400
#, c-format
msgid " -n, --noclean do not clean up after errors\n"
msgstr " -n, --noclean stda inte upp efter fel\n"
-#: initdb.c:2450
+#: initdb.c:2401
#, c-format
msgid " -s, --show show internal settings\n"
msgstr " -s, --show visa interna instllningar\n"
-#: initdb.c:2451
+#: initdb.c:2402
#, c-format
msgid ""
"\n"
"Other options:\n"
-msgstr "\nAndra flaggor:\n"
+msgstr ""
+"\n"
+"Andra flaggor:\n"
-#: initdb.c:2452
+#: initdb.c:2403
#, c-format
msgid " -?, --help show this help, then exit\n"
msgstr " -?, --help visa den hr hjlpen, avsluta sedan\n"
-#: initdb.c:2453
+#: initdb.c:2404
#, c-format
msgid " -V, --version output version information, then exit\n"
msgstr " -V, --version visa versionsinformation, avsluta sedan\n"
-#: initdb.c:2454
+#: initdb.c:2405
#, c-format
msgid ""
"\n"
@@ -452,39 +455,41 @@ msgstr ""
"\n"
"On datakatalogen inte anges s tas den frn omgivningsvaribeln PGDATA.\n"
-#: initdb.c:2456
+#: initdb.c:2407
#, c-format
msgid ""
"\n"
"Report bugs to <pgsql-bugs@postgresql.org>.\n"
-msgstr "\nRapportera fel till <pgsql-bugs@postgresql.org>.\n"
+msgstr ""
+"\n"
+"Rapportera fel till <pgsql-bugs@postgresql.org>.\n"
-#: initdb.c:2561
+#: initdb.c:2512
#, c-format
msgid "Running in debug mode.\n"
msgstr "Kr i debug-lge.\n"
-#: initdb.c:2565
+#: initdb.c:2516
#, c-format
msgid "Running in noclean mode. Mistakes will not be cleaned up.\n"
msgstr "Kr i noclean-lge. Misstag kommer inte stdas upp.\n"
-#: initdb.c:2608 initdb.c:2626 initdb.c:2894
+#: initdb.c:2559 initdb.c:2577 initdb.c:2845
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "Frsk med \"%s --help\" fr mer information.\n"
-#: initdb.c:2624
+#: initdb.c:2575
#, c-format
msgid "%s: too many command-line arguments (first is \"%s\")\n"
msgstr "%s: fr mnga kommandoradsargument (frsta r \"%s\")\n"
-#: initdb.c:2633
+#: initdb.c:2584
#, c-format
msgid "%s: password prompt and password file cannot be specified together\n"
msgstr "%s: lsenordsfrga och lsenordsfil kan inte anges samtidigt\n"
-#: initdb.c:2639
+#: initdb.c:2590
msgid ""
"\n"
"WARNING: enabling \"trust\" authentication for local connections\n"
@@ -496,12 +501,12 @@ msgstr ""
"Du kan ndra detta genom att redigera pg_hba.conf eller anvnda\n"
"flaggan -A nsta gng du kr initdb.\n"
-#: initdb.c:2662
+#: initdb.c:2613
#, c-format
msgid "%s: unrecognized authentication method \"%s\"\n"
msgstr "%s: oknd autentiseringsmetod \"%s\"\n"
-#: initdb.c:2672
+#: initdb.c:2623
#, c-format
msgid ""
"%s: must specify a password for the superuser to enable %s authentication\n"
@@ -509,7 +514,7 @@ msgstr ""
"%s: du mste ange ett lsenord fr superanvndaren fr att\n"
"sl p \"%s\"-autentisering\n"
-#: initdb.c:2687
+#: initdb.c:2638
#, c-format
msgid ""
"%s: no data directory specified\n"
@@ -522,7 +527,7 @@ msgstr ""
"lagras. Gr detta antingen med flaggan -D eller genom att stta\n"
"omgivningsvariabeln PGDATA.\n"
-#: initdb.c:2763
+#: initdb.c:2722
#, c-format
msgid ""
"The program \"postgres\" is needed by %s but was not found in the\n"
@@ -533,7 +538,7 @@ msgstr ""
"katalog som \"%s\".\n"
"Kontrollera din installation.\n"
-#: initdb.c:2770
+#: initdb.c:2729
#, c-format
msgid ""
"The program \"postgres\" was found by \"%s\"\n"
@@ -544,17 +549,12 @@ msgstr ""
"%s.\n"
"Kontrollera din installation.\n"
-#: initdb.c:2789
+#: initdb.c:2748
#, c-format
msgid "%s: input file location must be an absolute path\n"
msgstr "%s: platsen fr indatafiler mste vara en absolut skvg\n"
-#: initdb.c:2797
-#, c-format
-msgid "%s: could not determine valid short version string\n"
-msgstr "%s: kunde inte faststlla en giltig kort versionsstrng\n"
-
-#: initdb.c:2852
+#: initdb.c:2805
#, c-format
msgid ""
"The files belonging to this database system will be owned by user \"%s\".\n"
@@ -565,12 +565,12 @@ msgstr ""
"Denna anvndare mste ocks kra server-processen.\n"
"\n"
-#: initdb.c:2862
+#: initdb.c:2815
#, c-format
msgid "The database cluster will be initialized with locale %s.\n"
msgstr "Databasklustret kommer initieras med lokalen %s.\n"
-#: initdb.c:2865
+#: initdb.c:2818
#, c-format
msgid ""
"The database cluster will be initialized with locales\n"
@@ -589,22 +589,22 @@ msgstr ""
" NUMERIC: %s\n"
" TIME: %s\n"
-#: initdb.c:2891
+#: initdb.c:2842
#, c-format
msgid "%s: could not find suitable encoding for locale %s\n"
msgstr "%s: kunde inte hitta en lmplig kodning fr lokalen %s\n"
-#: initdb.c:2893
+#: initdb.c:2844
#, c-format
msgid "Rerun %s with the -E option.\n"
msgstr "Kr %s igen med flaggan -E.\n"
-#: initdb.c:2902
+#: initdb.c:2853
#, c-format
msgid "%s: locale %s requires unsupported encoding %s\n"
msgstr "%s: lokal %s krver osupportad kodning %s\n"
-#: initdb.c:2905
+#: initdb.c:2856
#, c-format
msgid ""
"Encoding %s is not allowed as a server-side encoding.\n"
@@ -613,24 +613,24 @@ msgstr ""
"Kodning %s r inte godknd fr servern.\n"
"Starta om %s med en annan lokal vald.\n"
-#: initdb.c:2913
+#: initdb.c:2864
#, c-format
msgid "The default database encoding has accordingly been set to %s.\n"
msgstr "Databasens standardkodning har satts till %s.\n"
-#: initdb.c:2930
+#: initdb.c:2881
#, c-format
msgid "%s: could not find suitable text search configuration for locale %s\n"
msgstr ""
"%s: kunde inte hitta en lmplig textskningskonfiguration fr lokalen %s\n"
-#: initdb.c:2941
+#: initdb.c:2892
#, c-format
msgid ""
"%s: warning: suitable text search configuration for locale %s is unknown\n"
msgstr "%s: varning: lmplig textskningskonfiguration fr lokal %s r oknd\n"
-#: initdb.c:2946
+#: initdb.c:2897
#, c-format
msgid ""
"%s: warning: specified text search configuration \"%s\" might not match "
@@ -639,32 +639,32 @@ msgstr ""
"%s: varning: angiven textskningskonfiguration \"%s\" stmmer eventuellt "
"inte verens med lokal %s\n"
-#: initdb.c:2951
+#: initdb.c:2902
#, c-format
msgid "The default text search configuration will be set to \"%s\".\n"
msgstr "Databasens standardtextskningskonfiguration har satts till \"%s\".\n"
-#: initdb.c:2985 initdb.c:3052
+#: initdb.c:2936 initdb.c:3003
#, c-format
msgid "creating directory %s ... "
msgstr "skapar katalog %s ... "
-#: initdb.c:2999 initdb.c:3069
+#: initdb.c:2950 initdb.c:3020
#, c-format
msgid "fixing permissions on existing directory %s ... "
msgstr "stter rttigheter p existerande katalog %s ... "
-#: initdb.c:3005 initdb.c:3075
+#: initdb.c:2956 initdb.c:3026
#, c-format
msgid "%s: could not change permissions of directory \"%s\": %s\n"
msgstr "%s: kunde inte ndra rttigheter p katalogen \"%s\": %s\n"
-#: initdb.c:3018 initdb.c:3087
+#: initdb.c:2969 initdb.c:3038
#, c-format
msgid "%s: directory \"%s\" exists but is not empty\n"
msgstr "%s: katalogen \"%s\" existerar men r inte tom\n"
-#: initdb.c:3021
+#: initdb.c:2972
#, c-format
msgid ""
"If you want to create a new database system, either remove or empty\n"
@@ -676,17 +676,18 @@ msgstr ""
"n \"%s\".\n"
"\n"
-#: initdb.c:3029 initdb.c:3097
+#: initdb.c:2980 initdb.c:3048
#, c-format
msgid "%s: could not access directory \"%s\": %s\n"
msgstr "%s: kunde inte komma t katalogen \"%s\": %s\n"
-#: initdb.c:3043
+#: initdb.c:2994
#, c-format
msgid "%s: transaction log directory location must be an absolute path\n"
-msgstr "%s: platsen fr transaktionsloggskatalogen mste vara en absolut skvg\n"
+msgstr ""
+"%s: platsen fr transaktionsloggskatalogen mste vara en absolut skvg\n"
-#: initdb.c:3090
+#: initdb.c:3041
#, c-format
msgid ""
"If you want to store the transaction log there, either\n"
@@ -695,22 +696,22 @@ msgstr ""
"om du vill lagra transaktionsloggen dr, radera eller\n"
"tm katalogen \"%s\".\n"
-#: initdb.c:3109
+#: initdb.c:3060
#, c-format
msgid "%s: could not create symbolic link \"%s\": %s\n"
msgstr "%s: kunde inte skapa symbolisk lnk \"%s\": %s\n"
-#: initdb.c:3114
+#: initdb.c:3065
#, c-format
msgid "%s: symlinks are not supported on this platform"
msgstr "%s: symboliska lnkar stds inte p denna plattform"
-#: initdb.c:3120
+#: initdb.c:3071
#, c-format
msgid "creating subdirectories ... "
msgstr "skapar underkataloger ... "
-#: initdb.c:3182
+#: initdb.c:3135
#, c-format
msgid ""
"\n"
@@ -734,82 +735,82 @@ msgstr ""
msgid "out of memory\n"
msgstr "slut p minnet\n"
-#: ../../port/dirmod.c:270
+#: ../../port/dirmod.c:286
#, c-format
msgid "could not set junction for \"%s\": %s\n"
msgstr "kunde inte skapa en knutpunkt (junction) fr \"%s\": %s\n"
-#: ../../port/dirmod.c:309
+#: ../../port/dirmod.c:325
#, c-format
msgid "could not open directory \"%s\": %s\n"
msgstr "kunde inte ppna katalogen \"%s\": %s\n"
-#: ../../port/dirmod.c:346
+#: ../../port/dirmod.c:362
#, c-format
msgid "could not read directory \"%s\": %s\n"
msgstr "kunde inte lsa katalogen \"%s\": %s\n"
-#: ../../port/dirmod.c:429
+#: ../../port/dirmod.c:445
#, c-format
msgid "could not stat file or directory \"%s\": %s\n"
msgstr "kunde inte gra stat() p fil eller katalog \"%s\": %s\n"
-#: ../../port/dirmod.c:456 ../../port/dirmod.c:473
+#: ../../port/dirmod.c:472 ../../port/dirmod.c:489
#, c-format
msgid "could not remove file or directory \"%s\": %s\n"
msgstr "kunde inte ta bort filen eller katalogen \"%s\": %s\n"
-#: ../../port/exec.c:195 ../../port/exec.c:309 ../../port/exec.c:352
+#: ../../port/exec.c:125 ../../port/exec.c:239 ../../port/exec.c:282
#, c-format
msgid "could not identify current directory: %s"
msgstr "kunde inte identifiera aktuella katalogen: %s"
-#: ../../port/exec.c:214
+#: ../../port/exec.c:144
#, c-format
msgid "invalid binary \"%s\""
msgstr "ogiltig binr \"%s\""
-#: ../../port/exec.c:263
+#: ../../port/exec.c:193
#, c-format
msgid "could not read binary \"%s\""
msgstr "kunde inte lsa binr \"%s\""
-#: ../../port/exec.c:270
+#: ../../port/exec.c:200
#, c-format
msgid "could not find a \"%s\" to execute"
msgstr "kunde inte hitta en \"%s\" att kra"
-#: ../../port/exec.c:325 ../../port/exec.c:361
+#: ../../port/exec.c:255 ../../port/exec.c:291
#, c-format
msgid "could not change directory to \"%s\""
msgstr "kunde inte byta katalog till \"%s\""
-#: ../../port/exec.c:340
+#: ../../port/exec.c:270
#, c-format
msgid "could not read symbolic link \"%s\""
msgstr "kunde inte lsa symbolisk lnk \"%s\""
-#: ../../port/exec.c:586
+#: ../../port/exec.c:516
#, c-format
msgid "child process exited with exit code %d"
msgstr "barnprocess avslutade med kod %d"
-#: ../../port/exec.c:590
+#: ../../port/exec.c:520
#, c-format
msgid "child process was terminated by exception 0x%X"
msgstr "barnprocess terminerades av fel 0x%X"
-#: ../../port/exec.c:599
+#: ../../port/exec.c:529
#, c-format
msgid "child process was terminated by signal %s"
msgstr "barnprocess terminerades av signal %s"
-#: ../../port/exec.c:602
+#: ../../port/exec.c:532
#, c-format
msgid "child process was terminated by signal %d"
msgstr "barnprocess terminerades av signal %d"
-#: ../../port/exec.c:606
+#: ../../port/exec.c:536
#, c-format
msgid "child process exited with unrecognized status %d"
msgstr "barnprocess avslutade med oknd statuskod %d"
diff --git a/src/bin/initdb/po/tr.po b/src/bin/initdb/po/tr.po
index 2565541980..3f162f28eb 100644
--- a/src/bin/initdb/po/tr.po
+++ b/src/bin/initdb/po/tr.po
@@ -6,9 +6,9 @@ msgid ""
msgstr ""
"Project-Id-Version: initdb-tr\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2009-04-29 07:09+0000\n"
-"PO-Revision-Date: 2009-04-29 16:27+0200\n"
-"Last-Translator: Devrim GÜNDÜZ <devrim@commandprompt.com>\n"
+"POT-Creation-Date: 2010-08-31 20:02+0000\n"
+"PO-Revision-Date: 2010-09-25 00:54+0300\n"
+"Last-Translator: Devrim GÜNDÜZ <devrim@gunduz.org>\n"
"Language-Team: Turkish <ceviri@postgresql.org.tr>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -25,82 +25,82 @@ msgid "%s: out of memory\n"
msgstr "%s: yetersiz bellek\n"
#: initdb.c:377
-#: initdb.c:1490
+#: initdb.c:1432
#, c-format
msgid "%s: could not open file \"%s\" for reading: %s\n"
msgstr "%s: \"%s\" dosyası, okunmak için açılamadı: %s\n"
-#: initdb.c:439
-#: initdb.c:998
-#: initdb.c:1027
+#: initdb.c:433
+#: initdb.c:956
+#: initdb.c:985
#, c-format
msgid "%s: could not open file \"%s\" for writing: %s\n"
msgstr "%s: \"%s\" dosyası, yazılmak için açılamadı: %s\n"
-#: initdb.c:447
-#: initdb.c:455
-#: initdb.c:1005
-#: initdb.c:1033
+#: initdb.c:441
+#: initdb.c:449
+#: initdb.c:963
+#: initdb.c:991
#, c-format
msgid "%s: could not write file \"%s\": %s\n"
msgstr "%s: \"%s\" dosyasına yazılamadı: %s\n"
-#: initdb.c:474
+#: initdb.c:468
#, c-format
msgid "%s: could not execute command \"%s\": %s\n"
msgstr "%s: \"%s\" komutu yürütme başlatma hatası: %s\n"
-#: initdb.c:594
+#: initdb.c:588
#, c-format
msgid "%s: removing data directory \"%s\"\n"
msgstr "%s: veri dizini siliniyor \"%s\"\n"
-#: initdb.c:597
+#: initdb.c:591
#, c-format
msgid "%s: failed to remove data directory\n"
msgstr "%s: veri dizini silme başarısız\n"
-#: initdb.c:603
+#: initdb.c:597
#, c-format
msgid "%s: removing contents of data directory \"%s\"\n"
msgstr "%s: veri dizininin içindekiler siliniyor \"%s\"\n"
-#: initdb.c:606
+#: initdb.c:600
#, c-format
msgid "%s: failed to remove contents of data directory\n"
msgstr "%s: veri dizininin içindekilerinin silme işlemini başarısız\n"
-#: initdb.c:612
+#: initdb.c:606
#, c-format
msgid "%s: removing transaction log directory \"%s\"\n"
msgstr "%s: transaction log dizini siliniyor \"%s\"\n"
-#: initdb.c:615
+#: initdb.c:609
#, c-format
msgid "%s: failed to remove transaction log directory\n"
msgstr "%s: transaction log dizini silme başarısız\n"
-#: initdb.c:621
+#: initdb.c:615
#, c-format
msgid "%s: removing contents of transaction log directory \"%s\"\n"
msgstr "%s: transaction log dizininin içindekileri siliniyor \"%s\"\n"
-#: initdb.c:624
+#: initdb.c:618
#, c-format
msgid "%s: failed to remove contents of transaction log directory\n"
msgstr "%s: transaction log dizininin içindekilerinin silme işlemini başarısız\n"
-#: initdb.c:633
+#: initdb.c:627
#, c-format
msgid "%s: data directory \"%s\" not removed at user's request\n"
msgstr "%s: \"%s\" veri dizini kullanıcının isteği üzerine silinmedi\n"
-#: initdb.c:638
+#: initdb.c:632
#, c-format
msgid "%s: transaction log directory \"%s\" not removed at user's request\n"
msgstr "%s: \"%s\" transaction log dizini kullanıcının isteği üzerine silinmedi\n"
-#: initdb.c:662
+#: initdb.c:654
#, c-format
msgid ""
"%s: cannot be run as root\n"
@@ -110,35 +110,35 @@ msgstr ""
"%s: root olarak çalıştırılamaz.\n"
"(Örneğin \"su\" kullanarak ) sunucu sürecinin sahibi olacak şekilde sisteme yetkisiz bir kullanıcı olarak giriş yapın.\n"
-#: initdb.c:672
+#: initdb.c:666
#, c-format
msgid "%s: could not obtain information about current user: %s\n"
msgstr "%s: geçerli kullanıcı hakkında bilgi alınamadı: %s\n"
-#: initdb.c:689
+#: initdb.c:683
#, c-format
msgid "%s: could not get current user name: %s\n"
msgstr "%s: geçerli kullanıcı adı alınamadı: %s\n"
-#: initdb.c:720
+#: initdb.c:714
#, c-format
msgid "%s: \"%s\" is not a valid server encoding name\n"
msgstr "%s: \"%s\" geçerli bir dil kodlaması adı değil\n"
-#: initdb.c:918
-#: initdb.c:3058
+#: initdb.c:876
+#: initdb.c:3009
#, c-format
msgid "%s: could not create directory \"%s\": %s\n"
msgstr "%s: \"%s\" dizini oluşturma başarısız: %s\n"
-#: initdb.c:948
+#: initdb.c:906
#, c-format
msgid "%s: file \"%s\" does not exist\n"
msgstr "%s: \"%s\" dosyası mevcut değil\n"
-#: initdb.c:950
-#: initdb.c:959
-#: initdb.c:969
+#: initdb.c:908
+#: initdb.c:917
+#: initdb.c:927
#, c-format
msgid ""
"This might mean you have a corrupted installation or identified\n"
@@ -147,36 +147,36 @@ msgstr ""
"Bu durum, bozulmus bir kurulumunuz olduğu ya da\n"
"-L parametresi ile yanlış dizin belirttiğiniz anlamına gelir.\n"
-#: initdb.c:956
+#: initdb.c:914
#, c-format
msgid "%s: could not access file \"%s\": %s\n"
msgstr "%s: \"%s\" dosyasına erişim hatası: %s\n"
-#: initdb.c:967
+#: initdb.c:925
#, c-format
msgid "%s: file \"%s\" is not a regular file\n"
msgstr "%s: \"%s\" düzgün bir dosya değildir.\n"
-#: initdb.c:1075
+#: initdb.c:1033
#, c-format
msgid "selecting default max_connections ... "
msgstr "ön tanımlı max_connections seçiliyor ... "
-#: initdb.c:1104
+#: initdb.c:1062
#, c-format
msgid "selecting default shared_buffers ... "
msgstr "öntanımlı shared_buffers değeri seçiliyor ... "
-#: initdb.c:1147
+#: initdb.c:1105
msgid "creating configuration files ... "
msgstr "yapılandırma dosyaları yaratılıyor ... "
-#: initdb.c:1314
+#: initdb.c:1272
#, c-format
msgid "creating template1 database in %s/base/1 ... "
msgstr "%s/base/1 içinde template1 veritabanı yaratılıyor."
-#: initdb.c:1330
+#: initdb.c:1288
#, c-format
msgid ""
"%s: input file \"%s\" does not belong to PostgreSQL %s\n"
@@ -185,104 +185,103 @@ msgstr ""
"%s: \"%s\" girdi dosyası PostgreSQL'e ait değil %s\n"
"Kurulumunuzu kontrol edin ya da -L seçeneği ile doğru dizini belirtin.\n"
-#: initdb.c:1429
+#: initdb.c:1373
msgid "initializing pg_authid ... "
msgstr "pg_authid ilklendiriliyor ... "
-#: initdb.c:1465
+#: initdb.c:1407
msgid "Enter new superuser password: "
msgstr "Yeni superuser şifresini giriniz: "
-#: initdb.c:1466
+#: initdb.c:1408
msgid "Enter it again: "
msgstr "Yeniden giriniz: "
-#: initdb.c:1469
+#: initdb.c:1411
#, c-format
msgid "Passwords didn't match.\n"
msgstr "Şifreler uyuşmadı.\n"
-#: initdb.c:1496
+#: initdb.c:1438
#, c-format
msgid "%s: could not read password from file \"%s\": %s\n"
msgstr "%s: \"%s\" dosyasından şifre okunamadı: %s\n"
-#: initdb.c:1509
+#: initdb.c:1451
#, c-format
msgid "setting password ... "
msgstr "şifre ayarlanıyor ... "
-#: initdb.c:1533
-#, c-format
-msgid "%s: The password file was not generated. Please report this problem.\n"
-msgstr "%s: Şifre dosyası üretilemedi. Lütfen bu hatayı bildiriniz.\n"
-
-#: initdb.c:1617
+#: initdb.c:1549
msgid "initializing dependencies ... "
msgstr "bağlılıklar ilklendiriliyor ... "
-#: initdb.c:1645
+#: initdb.c:1577
msgid "creating system views ... "
msgstr "sistem viewları yaratılıyor ... "
-#: initdb.c:1681
+#: initdb.c:1613
msgid "loading system objects' descriptions ... "
msgstr "sistem nesnelerinin açıklamaları yükleniyor ... "
-#: initdb.c:1733
+#: initdb.c:1665
msgid "creating conversions ... "
msgstr "dönüşümler yükleniyor ... "
-#: initdb.c:1768
+#: initdb.c:1700
msgid "creating dictionaries ... "
-msgstr "sözlükler oluşturuluyor... "
+msgstr "sözlükler oluşturuluyor ... "
-#: initdb.c:1821
+#: initdb.c:1754
msgid "setting privileges on built-in objects ... "
msgstr "gömülü nesnelerdeki izinler ayarlanıyor ... "
-#: initdb.c:1879
+#: initdb.c:1812
msgid "creating information schema ... "
msgstr "information schema yaratılıyor ... "
-#: initdb.c:1935
+#: initdb.c:1868
+msgid "loading PL/pgSQL server-side language ... "
+msgstr "PL/pgSQL sunucu tarafı dili yükleniyor ... "
+
+#: initdb.c:1893
msgid "vacuuming database template1 ... "
msgstr "template1 veritabanı vakumlanıyor ... "
-#: initdb.c:1989
+#: initdb.c:1947
msgid "copying template1 to template0 ... "
msgstr "template1 template0'a kopyalanıyor ... "
-#: initdb.c:2020
+#: initdb.c:1978
msgid "copying template1 to postgres ... "
msgstr "template1, postgres'e kopyalanıyor ... "
-#: initdb.c:2077
+#: initdb.c:2035
#, c-format
msgid "caught signal\n"
msgstr "sinyal yakalandı\n"
-#: initdb.c:2083
+#: initdb.c:2041
#, c-format
msgid "could not write to child process: %s\n"
msgstr "çocuk sürece yazılamadı: %s\n"
-#: initdb.c:2091
+#: initdb.c:2049
#, c-format
msgid "ok\n"
msgstr "tamam\n"
-#: initdb.c:2211
+#: initdb.c:2169
#, c-format
msgid "%s: invalid locale name \"%s\"\n"
msgstr "%s: geçersiz yerel adı \"%s\"\n"
-#: initdb.c:2244
+#: initdb.c:2195
#, c-format
msgid "%s: encoding mismatch\n"
msgstr "%s: dil kodlaması uyuşmazlığı\n"
-#: initdb.c:2246
+#: initdb.c:2197
#, c-format
msgid ""
"The encoding you selected (%s) and the encoding that the\n"
@@ -297,7 +296,7 @@ msgstr ""
" düzeltebilmek için %s komutunu yeniden çalıştırın ve de ya kodlama \n"
" belirtmeyin ya da eşleştirilebilir bir kodlama seçin.\n"
-#: initdb.c:2427
+#: initdb.c:2378
#, c-format
msgid ""
"%s initializes a PostgreSQL database cluster.\n"
@@ -306,17 +305,17 @@ msgstr ""
"%sbir PostgreSQL Veritabanı kümesini ilklendirir.\n"
"\n"
-#: initdb.c:2428
+#: initdb.c:2379
#, c-format
msgid "Usage:\n"
msgstr "Kullanımı:\n"
-#: initdb.c:2429
+#: initdb.c:2380
#, c-format
msgid " %s [OPTION]... [DATADIR]\n"
msgstr " %s [SEÇENEK]... [DATADIR]\n"
-#: initdb.c:2430
+#: initdb.c:2381
#, c-format
msgid ""
"\n"
@@ -325,27 +324,27 @@ msgstr ""
"\n"
"Seçenekler:\n"
-#: initdb.c:2431
+#: initdb.c:2382
#, c-format
msgid " -A, --auth=METHOD default authentication method for local connections\n"
msgstr " -A, --auth=METHOD yerel bağlantılar için ön tanımlı yetkilendirme yöntemi\n"
-#: initdb.c:2432
+#: initdb.c:2383
#, c-format
msgid " [-D, --pgdata=]DATADIR location for this database cluster\n"
msgstr "[-D, --pgdata=]DATADIR bu veritabanı kümesi için yer\n"
-#: initdb.c:2433
+#: initdb.c:2384
#, c-format
msgid " -E, --encoding=ENCODING set default encoding for new databases\n"
msgstr " -E, --encoding=ENCODING yeni veritabanları için öntanımlı dil kodlamasını ayarlar\n"
-#: initdb.c:2434
+#: initdb.c:2385
#, c-format
msgid " --locale=LOCALE set default locale for new databases\n"
msgstr " --locale=LOCALE yeni veritabanı için öntanımlı yerel\n"
-#: initdb.c:2435
+#: initdb.c:2386
#, c-format
msgid ""
" --lc-collate=, --lc-ctype=, --lc-messages=LOCALE\n"
@@ -358,17 +357,17 @@ msgstr ""
" yeni veritabanları için ilgili kategorideki öntanımlı yerel bilgisini\n"
" çevrede değişkenlerinden al\n"
-#: initdb.c:2439
+#: initdb.c:2390
#, c-format
msgid " --no-locale equivalent to --locale=C\n"
msgstr " --no-locale --locale=C'ye eşdeğer\n"
-#: initdb.c:2440
+#: initdb.c:2391
#, c-format
msgid " --pwfile=FILE read password for the new superuser from file\n"
msgstr " --pwfile=DOSYA yeni superuser için parolayı dosyadan oku\n"
-#: initdb.c:2441
+#: initdb.c:2392
#, c-format
msgid ""
" -T, --text-search-config=CFG\n"
@@ -377,22 +376,22 @@ msgstr ""
" -T, --text-search-config=CFG\n"
" öntanımlı metin arama yapılandırması\n"
-#: initdb.c:2443
+#: initdb.c:2394
#, c-format
msgid " -U, --username=NAME database superuser name\n"
msgstr " -U, --username=NAME veritabanı superuser kullanıcısı adı\n"
-#: initdb.c:2444
+#: initdb.c:2395
#, c-format
msgid " -W, --pwprompt prompt for a password for the new superuser\n"
msgstr " -W, --pwprompt yeni superuser için şifre sorar\n"
-#: initdb.c:2445
+#: initdb.c:2396
#, c-format
msgid " -X, --xlogdir=XLOGDIR location for the transaction log directory\n"
msgstr " -X, --xlogdir=XLOGDIR transaction log dizini\n"
-#: initdb.c:2446
+#: initdb.c:2397
#, c-format
msgid ""
"\n"
@@ -401,27 +400,27 @@ msgstr ""
"\n"
"Daha az kullanılan seçenekler:\n"
-#: initdb.c:2447
+#: initdb.c:2398
#, c-format
msgid " -d, --debug generate lots of debugging output\n"
msgstr " -d, --debug bol miktarda debug çıktısı üretir\n"
-#: initdb.c:2448
+#: initdb.c:2399
#, c-format
msgid " -L DIRECTORY where to find the input files\n"
msgstr " -L DIRECTORY girdi dosyalarının nerede bulunacağını belirtir\n"
-#: initdb.c:2449
+#: initdb.c:2400
#, c-format
msgid " -n, --noclean do not clean up after errors\n"
msgstr " -n, --noclean hatalardan sonra temizlik yapma\n"
-#: initdb.c:2450
+#: initdb.c:2401
#, c-format
msgid " -s, --show show internal settings\n"
msgstr " -s, --show dahili ayarları gösterir\n"
-#: initdb.c:2451
+#: initdb.c:2402
#, c-format
msgid ""
"\n"
@@ -430,17 +429,17 @@ msgstr ""
"\n"
"Diğer seçenekler:\n"
-#: initdb.c:2452
+#: initdb.c:2403
#, c-format
msgid " -?, --help show this help, then exit\n"
msgstr " -?, --help bu yardımı gösterir ve sonra çıkar\n"
-#: initdb.c:2453
+#: initdb.c:2404
#, c-format
msgid " -V, --version output version information, then exit\n"
msgstr " -V, --version sürüm bilgisini gösterir ve sonra çıkar\n"
-#: initdb.c:2454
+#: initdb.c:2405
#, c-format
msgid ""
"\n"
@@ -450,7 +449,7 @@ msgstr ""
"\n"
"Eğer veri dizini belirtilmezse, PGDATA çevresel değişkeni kullanılacaktır\n"
-#: initdb.c:2456
+#: initdb.c:2407
#, c-format
msgid ""
"\n"
@@ -459,34 +458,34 @@ msgstr ""
"\n"
"Hataları <pgsql-bugs@postgresql.org> adresine bildirebilirsiniz.\n"
-#: initdb.c:2561
+#: initdb.c:2512
#, c-format
msgid "Running in debug mode.\n"
msgstr "Debug modunda çalışıyor.\n"
-#: initdb.c:2565
+#: initdb.c:2516
#, c-format
msgid "Running in noclean mode. Mistakes will not be cleaned up.\n"
msgstr "noclean modunda çalışıyor. Hatalar silinmeyecek.\n"
-#: initdb.c:2608
-#: initdb.c:2626
-#: initdb.c:2894
+#: initdb.c:2559
+#: initdb.c:2577
+#: initdb.c:2845
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "Ayrıntılı bilgi için \"%s --help\" komutunu deneyebilirsiniz.\n"
-#: initdb.c:2624
+#: initdb.c:2575
#, c-format
msgid "%s: too many command-line arguments (first is \"%s\")\n"
msgstr "%s: Çok fazla komut satırı girdisi var (ilki \"%s\")\n"
-#: initdb.c:2633
+#: initdb.c:2584
#, c-format
msgid "%s: password prompt and password file cannot be specified together\n"
msgstr "%s: şifre promptu ve şifre dosyası birlikte belirtilemez\n"
-#: initdb.c:2639
+#: initdb.c:2590
msgid ""
"\n"
"WARNING: enabling \"trust\" authentication for local connections\n"
@@ -498,17 +497,17 @@ msgstr ""
"Bunu, pg_hba.conf dosyasını düzenleyerek ya da initdb'yi yeniden \n"
" çalıştırdığınızda -A parametresi ile değiştirebilirsiniz..\n"
-#: initdb.c:2662
+#: initdb.c:2613
#, c-format
msgid "%s: unrecognized authentication method \"%s\"\n"
msgstr "%s: bilinmeyen yetkilendirme yöntemi\"%s\".\n"
-#: initdb.c:2672
+#: initdb.c:2623
#, c-format
msgid "%s: must specify a password for the superuser to enable %s authentication\n"
msgstr "%s: %s yetkilendirmesini etkinleştirmek için superuser'a şifre atamanız gerekmektedir.\n"
-#: initdb.c:2687
+#: initdb.c:2638
#, c-format
msgid ""
"%s: no data directory specified\n"
@@ -520,7 +519,7 @@ msgstr ""
"Bu veritabanı sistemi için verinin hangi dizinde duracağını belirtmeniz gerekmektedir.\n"
"Bunu ya -D seçeneği ile ya da PGDATA çevresel değişkeni ile yapabilirsiniz.\n"
-#: initdb.c:2763
+#: initdb.c:2722
#, c-format
msgid ""
"The program \"postgres\" is needed by %s but was not found in the\n"
@@ -531,7 +530,7 @@ msgstr ""
"ile aynı dizinde bulunamadı.\n"
"Kurulumunuzu kontrol ediniz.\n"
-#: initdb.c:2770
+#: initdb.c:2729
#, c-format
msgid ""
"The program \"postgres\" was found by \"%s\"\n"
@@ -542,17 +541,12 @@ msgstr ""
"ile aynı sürüm numarasına sahip değil.\n"
"Kurulumunuzu kontrol ediniz.\n"
-#: initdb.c:2789
+#: initdb.c:2748
#, c-format
msgid "%s: input file location must be an absolute path\n"
msgstr "%s: girdi dosyasının yeri mutlak bir yol olmalıdır\n"
-#: initdb.c:2797
-#, c-format
-msgid "%s: could not determine valid short version string\n"
-msgstr "%s: geçerli bir kısa sürüm katarı belirlenemedi\n"
-
-#: initdb.c:2852
+#: initdb.c:2805
#, c-format
msgid ""
"The files belonging to this database system will be owned by user \"%s\".\n"
@@ -563,12 +557,12 @@ msgstr ""
"Bu kullanıcı aynı zamanda sunucu sürecinin de sahibi olmalıdır.\n"
"\n"
-#: initdb.c:2862
+#: initdb.c:2815
#, c-format
msgid "The database cluster will be initialized with locale %s.\n"
msgstr "Veritabanı kümesi %s yereli ile ilklendirilecek.\n"
-#: initdb.c:2865
+#: initdb.c:2818
#, c-format
msgid ""
"The database cluster will be initialized with locales\n"
@@ -587,22 +581,22 @@ msgstr ""
" NUMERIC: %s\n"
" TIME: %s\n"
-#: initdb.c:2891
+#: initdb.c:2842
#, c-format
msgid "%s: could not find suitable encoding for locale %s\n"
msgstr "%s: %s yereli için uygun dil kodlaması bulunamadı.\n"
-#: initdb.c:2893
+#: initdb.c:2844
#, c-format
msgid "Rerun %s with the -E option.\n"
msgstr "%s komutunu -E seçeneği ile yeniden çalıştırın.\n"
-#: initdb.c:2902
+#: initdb.c:2853
#, c-format
msgid "%s: locale %s requires unsupported encoding %s\n"
msgstr "%s: %s yereli desteklenmeyen %s dil kodlamasını gerektirir\n"
-#: initdb.c:2905
+#: initdb.c:2856
#, c-format
msgid ""
"Encoding %s is not allowed as a server-side encoding.\n"
@@ -611,56 +605,56 @@ msgstr ""
"%s dil kodlaması sunucu tarafında izin verilen bir dil kodlaması değildir\n"
" %s'i değişik bir dil seçimi ile tekrar çalıştırın.\n"
-#: initdb.c:2913
+#: initdb.c:2864
#, c-format
msgid "The default database encoding has accordingly been set to %s.\n"
msgstr "Öntanımlı veritabanı dil kodlaması %s olarak ayarlandı.\n"
-#: initdb.c:2930
+#: initdb.c:2881
#, c-format
msgid "%s: could not find suitable text search configuration for locale %s\n"
msgstr "%s: \"%s\" yereli için uygun metin arama yapılandırması bulunamadı.\n"
-#: initdb.c:2941
+#: initdb.c:2892
#, c-format
msgid "%s: warning: suitable text search configuration for locale %s is unknown\n"
msgstr "%s: uyarı: %s yereli için uygun metin arama yapılandırması bilinmiyor.\n"
-#: initdb.c:2946
+#: initdb.c:2897
#, c-format
msgid "%s: warning: specified text search configuration \"%s\" might not match locale %s\n"
msgstr "%s: uyarı: belirtilen metin arama yapılandırması \"%s\", %s yereli ile eşleşmeyebilir\n"
-#: initdb.c:2951
+#: initdb.c:2902
#, c-format
msgid "The default text search configuration will be set to \"%s\".\n"
msgstr "Öntanımlı metin arama yapılandırması \"%s\" olarak ayarlanacak.\n"
-#: initdb.c:2985
-#: initdb.c:3052
+#: initdb.c:2936
+#: initdb.c:3003
#, c-format
msgid "creating directory %s ... "
-msgstr "%s dizini yaratılıyor... "
+msgstr "%s dizini yaratılıyor ... "
-#: initdb.c:2999
-#: initdb.c:3069
+#: initdb.c:2950
+#: initdb.c:3020
#, c-format
msgid "fixing permissions on existing directory %s ... "
-msgstr "mevcut %s dizininin izinleri düzeltiliyor..."
+msgstr "mevcut %s dizininin izinleri düzeltiliyor ... "
-#: initdb.c:3005
-#: initdb.c:3075
+#: initdb.c:2956
+#: initdb.c:3026
#, c-format
msgid "%s: could not change permissions of directory \"%s\": %s\n"
msgstr "%s: \"%s\" dizininin erişim haklarını değiştirilemiyor: %s\n"
-#: initdb.c:3018
-#: initdb.c:3087
+#: initdb.c:2969
+#: initdb.c:3038
#, c-format
msgid "%s: directory \"%s\" exists but is not empty\n"
msgstr "%s: \"%s\" dizini mevcut, ama boş değil\n"
-#: initdb.c:3021
+#: initdb.c:2972
#, c-format
msgid ""
"If you want to create a new database system, either remove or empty\n"
@@ -671,18 +665,18 @@ msgstr ""
"kaldırın, ya boşaltın ya da ya da %s 'i \n"
"\"%s\" argümanından başka bir argüman ile çalıştırın.\n"
-#: initdb.c:3029
-#: initdb.c:3097
+#: initdb.c:2980
+#: initdb.c:3048
#, c-format
msgid "%s: could not access directory \"%s\": %s\n"
msgstr "%s: \"%s\" dizine erişim hatası: %s\n"
-#: initdb.c:3043
+#: initdb.c:2994
#, c-format
msgid "%s: transaction log directory location must be an absolute path\n"
msgstr "%s: transaction log dizini mutlak bir yol olmalıdır\n"
-#: initdb.c:3090
+#: initdb.c:3041
#, c-format
msgid ""
"If you want to store the transaction log there, either\n"
@@ -691,22 +685,22 @@ msgstr ""
"Eğer transaction kayıt dosyasını saklamak istiyorsanız, \n"
"\"%s\" dizinini kaldırın ya da boşaltın\n"
-#: initdb.c:3109
+#: initdb.c:3060
#, c-format
msgid "%s: could not create symbolic link \"%s\": %s\n"
msgstr "%s: symbolic link \"%s\" oluşturma hatası: %s\n"
-#: initdb.c:3114
+#: initdb.c:3065
#, c-format
msgid "%s: symlinks are not supported on this platform"
msgstr "%s: bu platformda sembolik bağlantı desteklenmemektedir"
-#: initdb.c:3120
+#: initdb.c:3071
#, c-format
msgid "creating subdirectories ... "
-msgstr "alt dizinler oluşturuluyor... "
+msgstr "alt dizinler oluşturuluyor ... "
-#: initdb.c:3182
+#: initdb.c:3135
#, c-format
msgid ""
"\n"
@@ -733,112 +727,86 @@ msgstr ""
msgid "out of memory\n"
msgstr "bellek yetersiz\n"
-#: ../../port/dirmod.c:270
+#: ../../port/dirmod.c:286
#, c-format
msgid "could not set junction for \"%s\": %s\n"
msgstr "\"%s\" junction ayarlama hatası: %s\n"
-#: ../../port/dirmod.c:309
+#: ../../port/dirmod.c:325
#, c-format
msgid "could not open directory \"%s\": %s\n"
msgstr "\"%s\" dizini açma başarısız: %s\n"
-#: ../../port/dirmod.c:346
+#: ../../port/dirmod.c:362
#, c-format
msgid "could not read directory \"%s\": %s\n"
msgstr "\"%s\" dizini okuma başarısız: %s\n"
-#: ../../port/dirmod.c:429
+#: ../../port/dirmod.c:445
#, c-format
msgid "could not stat file or directory \"%s\": %s\n"
msgstr "\"%s\" dosya ya da dizini bulunamadı: %s\n"
-#: ../../port/dirmod.c:456
-#: ../../port/dirmod.c:473
+#: ../../port/dirmod.c:472
+#: ../../port/dirmod.c:489
#, c-format
msgid "could not remove file or directory \"%s\": %s\n"
msgstr "\"%s\" dizini kaldırma başarısız: %s\n"
-#: ../../port/exec.c:195
-#: ../../port/exec.c:309
-#: ../../port/exec.c:352
+#: ../../port/exec.c:125
+#: ../../port/exec.c:239
+#: ../../port/exec.c:282
#, c-format
msgid "could not identify current directory: %s"
msgstr "geçerli dizin tespit edilemedi: %s"
-#: ../../port/exec.c:214
+#: ../../port/exec.c:144
#, c-format
msgid "invalid binary \"%s\""
msgstr "geçersiz ikili (binary) \"%s\""
-#: ../../port/exec.c:263
+#: ../../port/exec.c:193
#, c-format
msgid "could not read binary \"%s\""
msgstr "\"%s\" ikili (binary) dosyası okunamadı"
-#: ../../port/exec.c:270
+#: ../../port/exec.c:200
#, c-format
msgid "could not find a \"%s\" to execute"
msgstr "\"%s\" çalıştırmak için bulunamadı"
-#: ../../port/exec.c:325
-#: ../../port/exec.c:361
+#: ../../port/exec.c:255
+#: ../../port/exec.c:291
#, c-format
msgid "could not change directory to \"%s\""
msgstr "çalışma dizini \"%s\" olarak değiştirilemedi"
-#: ../../port/exec.c:340
+#: ../../port/exec.c:270
#, c-format
msgid "could not read symbolic link \"%s\""
msgstr "symbolic link \"%s\" okuma hatası"
-#: ../../port/exec.c:586
+#: ../../port/exec.c:516
#, c-format
msgid "child process exited with exit code %d"
msgstr "alt süreç %d çıkış koduyla sonuçlandırılmıştır"
-#: ../../port/exec.c:590
+#: ../../port/exec.c:520
#, c-format
msgid "child process was terminated by exception 0x%X"
msgstr "alt süreç 0x%X exception tarafından sonlandırılmıştır"
-#: ../../port/exec.c:599
+#: ../../port/exec.c:529
#, c-format
msgid "child process was terminated by signal %s"
msgstr "alt süreç %s sinyali tarafından sonlandırılmıştır"
-#: ../../port/exec.c:602
+#: ../../port/exec.c:532
#, c-format
msgid "child process was terminated by signal %d"
msgstr "alt süreç %d sinyali tarafından sonlandırılmıştır"
-#: ../../port/exec.c:606
+#: ../../port/exec.c:536
#, c-format
msgid "child process exited with unrecognized status %d"
msgstr "alt süreç %d bilinmeyen durumu ile sonlandırılmıştır"
-
-#~ msgid ""
-#~ " --locale=LOCALE initialize database cluster with given "
-#~ "locale\n"
-#~ msgstr ""
-#~ " --locale=LOCALE veritabanı kümesini verilen yerel ile "
-#~ "ilklendirir\n"
-#~ 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\" dosyası bulunamadı\n"
-#~ "Bu ileti, bozulmus bir kurulumunuz olduğu ya da\n"
-#~ "initdb betiğine verdiğiniz -L parametresi ile yanlış dizin belirttiğiniz "
-#~ "anlamına gelir..\n"
-#~ msgid ""
-#~ "%s: file \"%s\" is not a regular file\n"
-#~ "This means you have a corrupted installation or identified\n"
-#~ "the wrong directory with the invocation option -L.\n"
-#~ msgstr ""
-#~ "%s: \"%s\" dosyası normal bir dosya değildir\n"
-#~ "Bu durum, bozulmus bir kurulumunuz olduğu ya da\n"
-#~ "initdb betiğine verdiğiniz -L parametresi ile yanlış dizin belirttiğiniz "
-#~ "anlamına gelir.\n"
-
diff --git a/src/bin/initdb/po/zh_CN.po b/src/bin/initdb/po/zh_CN.po
index f6467c43cb..ce60473f9f 100644
--- a/src/bin/initdb/po/zh_CN.po
+++ b/src/bin/initdb/po/zh_CN.po
@@ -4,282 +4,271 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: PostgreSQL 8.0\n"
+"Project-Id-Version: initdb (PostgreSQL 9.0)\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-02-19 01:52+0000\n"
-"PO-Revision-Date: 2010-03-30 13:49+0800\n"
+"POT-Creation-Date: 2010-10-01 14:40+0000\n"
+"PO-Revision-Date: 2010-09-26 09:05+0800\n"
"Last-Translator: Weibin <ssmei_2000@yahoo.com>\n"
-"Language-Team: Weiping He <laser@zhengmai.com.cn>\n"
+"Language-Team: Chinese (Simplified)\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=GB2312\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: initdb.c:254
-#: initdb.c:268
+#: initdb.c:254 initdb.c:268
#, c-format
msgid "%s: out of memory\n"
-msgstr "%s: ڴ\n"
+msgstr "%s: 内存溢出\n"
-#: initdb.c:377
-#: initdb.c:1490
+#: initdb.c:377 initdb.c:1432
#, c-format
msgid "%s: could not open file \"%s\" for reading: %s\n"
-msgstr "%s: Ϊ˶ȡ, ޷ļ \"%s\": %s\n"
+msgstr "%s: 为了读取, 无法打开文件 \"%s\": %s\n"
-#: initdb.c:439
-#: initdb.c:998
-#: initdb.c:1027
+#: initdb.c:433 initdb.c:956 initdb.c:985
#, c-format
msgid "%s: could not open file \"%s\" for writing: %s\n"
-msgstr "%s: Ϊд, ޷ļ \"%s\": %s\n"
+msgstr "%s: 为了写, 无法打开文件 \"%s\": %s\n"
-#: initdb.c:447
-#: initdb.c:455
-#: initdb.c:1005
-#: initdb.c:1033
+#: initdb.c:441 initdb.c:449 initdb.c:963 initdb.c:991
#, c-format
msgid "%s: could not write file \"%s\": %s\n"
-msgstr "%s: ޷дļ \"%s\": %s\n"
+msgstr "%s: 无法写文件 \"%s\": %s\n"
-#: initdb.c:474
+#: initdb.c:468
#, c-format
msgid "%s: could not execute command \"%s\": %s\n"
-msgstr "%s: ޷ִ \"%s\": %s\n"
+msgstr "%s: 无法执行命令 \"%s\": %s\n"
-#: initdb.c:594
+#: initdb.c:588
#, c-format
msgid "%s: removing data directory \"%s\"\n"
-msgstr "%s: ɾĿ¼ \"%s\"\n"
+msgstr "%s: 删除数据目录 \"%s\"\n"
-#: initdb.c:597
+#: initdb.c:591
#, c-format
msgid "%s: failed to remove data directory\n"
-msgstr "%s: ɾĿ¼ʧ\n"
+msgstr "%s: 删除数据目录失败\n"
-#: initdb.c:603
+#: initdb.c:597
#, c-format
msgid "%s: removing contents of data directory \"%s\"\n"
-msgstr "%s: ɾĿ¼ \"%s\" \n"
+msgstr "%s: 删除数据目录 \"%s\" 的内容\n"
-#: initdb.c:606
+#: initdb.c:600
#, c-format
msgid "%s: failed to remove contents of data directory\n"
-msgstr "%s: ɾĿ¼ʧ\n"
+msgstr "%s: 删除数据目录内容失败\n"
-#: initdb.c:612
+#: initdb.c:606
#, c-format
msgid "%s: removing transaction log directory \"%s\"\n"
-msgstr "%s: ɾ־ļĿ¼ \"%s\"\n"
+msgstr "%s: 正在删除事务日志文件目录 \"%s\"\n"
-#: initdb.c:615
+#: initdb.c:609
#, c-format
msgid "%s: failed to remove transaction log directory\n"
-msgstr "%s: ɾĿ¼ʧ\n"
+msgstr "%s: 删除数据目录失败\n"
-#: initdb.c:621
+#: initdb.c:615
#, c-format
msgid "%s: removing contents of transaction log directory \"%s\"\n"
-msgstr "%s: ɾ־Ŀ¼ \"%s\" \n"
+msgstr "%s: 删除事务日志目录 \"%s\" 的内容\n"
-#: initdb.c:624
+#: initdb.c:618
#, c-format
msgid "%s: failed to remove contents of transaction log directory\n"
-msgstr "%s: ɾ־Ŀ¼ʧ\n"
+msgstr "%s: 删除事务日志目录的内容失败\n"
-#: initdb.c:633
+#: initdb.c:627
#, c-format
msgid "%s: data directory \"%s\" not removed at user's request\n"
-msgstr "%s: ûҪݿĿ¼ \"%s\" ɾ\n"
+msgstr "%s: 在用户的要求下数据库目录 \"%s\" 不被删除\n"
-#: initdb.c:638
+#: initdb.c:632
#, c-format
msgid "%s: transaction log directory \"%s\" not removed at user's request\n"
-msgstr "%s: ûҪ²ɾ־Ŀ¼ \"%s\"\n"
+msgstr "%s: 在用户的要求下不删除事务日志目录 \"%s\"\n"
-#: initdb.c:660
+#: initdb.c:654
#, c-format
msgid ""
"%s: cannot be run as root\n"
"Please log in (using, e.g., \"su\") as the (unprivileged) user that will\n"
"own the server process.\n"
msgstr ""
-"%s: ޷ root û\n"
-"Էߵû (Ȩ) \n"
-"½ (ʹ, e.g., \"su\").\n"
+"%s: 无法以 root 用户运行\n"
+"请以服务器进程所有者的用户 (无特权) 身份\n"
+"登陆 (使用, e.g., \"su\").\n"
-#: initdb.c:672
+#: initdb.c:666
#, c-format
msgid "%s: could not obtain information about current user: %s\n"
-msgstr "%s: ޷õǰûϢ: %s\n"
+msgstr "%s: 无法获得当前用户的信息: %s\n"
-#: initdb.c:689
+#: initdb.c:683
#, c-format
msgid "%s: could not get current user name: %s\n"
-msgstr "%s: ޷ȡǰû: %s\n"
+msgstr "%s: 无法获取当前用户名称: %s\n"
-#: initdb.c:720
+#: initdb.c:714
#, c-format
msgid "%s: \"%s\" is not a valid server encoding name\n"
-msgstr "%s: \"%s\" һЧķ\n"
+msgstr "%s: \"%s\" 不是一个有效的服务器编码名字\n"
-#: initdb.c:918
-#: initdb.c:3058
+#: initdb.c:876 initdb.c:3009
#, c-format
msgid "%s: could not create directory \"%s\": %s\n"
-msgstr "%s: ޷Ŀ¼ \"%s\": %s\n"
+msgstr "%s: 无法创建目录 \"%s\": %s\n"
-#: initdb.c:948
+#: initdb.c:906
#, c-format
msgid "%s: file \"%s\" does not exist\n"
-msgstr "%s: ļ \"%s\" \n"
+msgstr "%s: 文件 \"%s\" 不存在\n"
-#: initdb.c:950
-#: initdb.c:959
-#: initdb.c:969
+#: initdb.c:908 initdb.c:917 initdb.c:927
#, c-format
msgid ""
"This might mean you have a corrupted installation or identified\n"
"the wrong directory with the invocation option -L.\n"
msgstr ""
-"ζİװ˴\n"
-"ʹ -L ѡָ˴·.\n"
+"这意味着您的安装发生了错误或\n"
+"使用 -L 选项指定了错误的路径.\n"
-#: initdb.c:956
+#: initdb.c:914
#, c-format
msgid "%s: could not access file \"%s\": %s\n"
-msgstr "%s: ޷ļ \"%s\": %s\n"
+msgstr "%s: 无法访问文件 \"%s\": %s\n"
-#: initdb.c:967
+#: initdb.c:925
#, c-format
msgid "%s: file \"%s\" is not a regular file\n"
-msgstr "%s: ļ \"%s\" dzļ\n"
+msgstr "%s: 文件 \"%s\" 不是常规文件\n"
-#: initdb.c:1075
+#: initdb.c:1033
#, c-format
msgid "selecting default max_connections ... "
-msgstr "ѡĬ (max_connections) ... "
+msgstr "选择默认最大联接数 (max_connections) ... "
-#: initdb.c:1104
+#: initdb.c:1062
#, c-format
msgid "selecting default shared_buffers ... "
-msgstr "ѡĬϹС (shared_buffers) ... "
+msgstr "选择默认共享缓冲区大小 (shared_buffers) ... "
-#: initdb.c:1147
+#: initdb.c:1105
msgid "creating configuration files ... "
-msgstr "ļ ... "
+msgstr "创建配置文件 ... "
-#: initdb.c:1314
+#: initdb.c:1272
#, c-format
msgid "creating template1 database in %s/base/1 ... "
-msgstr " %s/base/1 д template1 ݿ ... "
+msgstr "在 %s/base/1 中创建 template1 数据库 ... "
-#: initdb.c:1330
+#: initdb.c:1288
#, 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: ļ \"%s\" PostgreSQL %s\n"
-"İװʹ -L ѡָȷ·.\n"
+"%s: 输入文件 \"%s\" 不属于 PostgreSQL %s\n"
+"检查你的安装或使用 -L 选项指定正确的路径.\n"
-#: initdb.c:1429
+#: initdb.c:1373
msgid "initializing pg_authid ... "
-msgstr "ʼ pg_authid ... "
+msgstr "初始化 pg_authid ... "
-#: initdb.c:1465
+#: initdb.c:1407
msgid "Enter new superuser password: "
-msgstr "µijû: "
+msgstr "输入新的超级用户口令: "
-#: initdb.c:1466
+#: initdb.c:1408
msgid "Enter it again: "
-msgstr "һ: "
+msgstr "再输入一遍: "
-#: initdb.c:1469
+#: initdb.c:1411
#, c-format
msgid "Passwords didn't match.\n"
-msgstr "ƥ.\n"
+msgstr "口令不匹配.\n"
-#: initdb.c:1496
+#: initdb.c:1438
#, c-format
msgid "%s: could not read password from file \"%s\": %s\n"
-msgstr "%s: ޷ļ \"%s\" ȡ: %s\n"
+msgstr "%s: 无法从文件 \"%s\" 读取口令: %s\n"
-#: initdb.c:1509
+#: initdb.c:1451
#, c-format
msgid "setting password ... "
-msgstr "ÿ ... "
-
-#: initdb.c:1533
-#, c-format
-msgid "%s: The password file was not generated. Please report this problem.\n"
-msgstr "%s: ļû. 뱨.\n"
+msgstr "设置口令 ... "
-#: initdb.c:1617
+#: initdb.c:1549
msgid "initializing dependencies ... "
-msgstr "ʼdependencies ... "
+msgstr "初始化dependencies ... "
-#: initdb.c:1645
+#: initdb.c:1577
msgid "creating system views ... "
-msgstr "ϵͳͼ ... "
+msgstr "创建系统视图 ... "
-#: initdb.c:1681
+#: initdb.c:1613
msgid "loading system objects' descriptions ... "
-msgstr "ڼϵͳ ..."
+msgstr "正在加载系统对象描述 ..."
-#: initdb.c:1733
+#: initdb.c:1665
msgid "creating conversions ... "
-msgstr "ַת ... "
+msgstr "创建字符集转换 ... "
-#: initdb.c:1768
+#: initdb.c:1700
msgid "creating dictionaries ... "
-msgstr "ڴֵ ... "
+msgstr "正在创建字典 ... "
-#: initdb.c:1821
+#: initdb.c:1754
msgid "setting privileges on built-in objects ... "
-msgstr "ڽȨ ... "
+msgstr "对内建对象设置权限 ... "
-#: initdb.c:1879
+#: initdb.c:1812
msgid "creating information schema ... "
-msgstr "Ϣģʽ ... "
+msgstr "创建信息模式 ... "
+
+#: initdb.c:1868
+msgid "loading PL/pgSQL server-side language ... "
+msgstr "正在装载PL/pgSQL服务器端编程语言..."
-#: initdb.c:1935
+#: initdb.c:1893
msgid "vacuuming database template1 ... "
-msgstr "ݿ template1 ... "
+msgstr "清理数据库 template1 ... "
-#: initdb.c:1989
+#: initdb.c:1947
msgid "copying template1 to template0 ... "
-msgstr " template1 template0 ... "
+msgstr "拷贝 template1 到 template0 ... "
-#: initdb.c:2020
+#: initdb.c:1978
msgid "copying template1 to postgres ... "
-msgstr " template1 template0 ... "
+msgstr "拷贝 template1 到 template0 ... "
-#: initdb.c:2077
+#: initdb.c:2035
#, c-format
msgid "caught signal\n"
-msgstr "ź\n"
+msgstr "捕获信号\n"
-#: initdb.c:2083
+#: initdb.c:2041
#, c-format
msgid "could not write to child process: %s\n"
-msgstr "޷дӽ: %s\n"
+msgstr "无法写到子进程: %s\n"
-#: initdb.c:2091
+#: initdb.c:2049
#, c-format
msgid "ok\n"
-msgstr "ɹ\n"
+msgstr "成功\n"
-#: initdb.c:2211
+#: initdb.c:2169
#, c-format
msgid "%s: invalid locale name \"%s\"\n"
-msgstr "%s: Ч locale \"%s\"\n"
+msgstr "%s: 无效的 locale 名字 \"%s\"\n"
-#: initdb.c:2244
+#: initdb.c:2195
#, c-format
msgid "%s: encoding mismatch\n"
-msgstr "%s: : 벻ƥ\n"
+msgstr "%s: 警告: 编码不匹配\n"
-#: initdb.c:2246
+#: initdb.c:2197
#, c-format
msgid ""
"The encoding you selected (%s) and the encoding that the\n"
@@ -288,157 +277,163 @@ msgid ""
"Rerun %s and either do not specify an encoding explicitly,\n"
"or choose a matching combination.\n"
msgstr ""
-"ѡı (%s) ѡԻʹõı (%s) ƥ.\n"
-"´ַͬĺʱ.\n"
-"Ҫ޸, %s ҲҪȷָ, ѡһƥ\n"
-".\n"
+"您选择的编码 (%s) 和所选择的语言环境使用的编码 (%s) 不匹配的.\n"
+"这样将导致处理不同字符串的函数时产生错误.\n"
+"要修复此问题, 重新运行 %s 并且不要明确指定编码, 或者先选择一个匹配\n"
+"组合类型.\n"
"\n"
-#: initdb.c:2427
+#: initdb.c:2378
#, c-format
msgid ""
"%s initializes a PostgreSQL database cluster.\n"
"\n"
msgstr ""
-"%s ʼһ PostgreSQL ݿ.\n"
+"%s 初始化一个 PostgreSQL 数据库簇.\n"
"\n"
-#: initdb.c:2428
+#: initdb.c:2379
#, c-format
msgid "Usage:\n"
-msgstr "ʹ÷:\n"
+msgstr "使用方法:\n"
-#: initdb.c:2429
+#: initdb.c:2380
#, c-format
msgid " %s [OPTION]... [DATADIR]\n"
-msgstr " %s [ѡ]... [DATADIR]\n"
+msgstr " %s [选项]... [DATADIR]\n"
-#: initdb.c:2430
+#: initdb.c:2381
#, c-format
msgid ""
"\n"
"Options:\n"
msgstr ""
"\n"
-"ѡ:\n"
+"选项:\n"
-#: initdb.c:2431
+#: initdb.c:2382
#, c-format
-msgid " -A, --auth=METHOD default authentication method for local connections\n"
-msgstr " -A, --auth=METHOD ӵĬ֤\n"
+msgid ""
+" -A, --auth=METHOD default authentication method for local "
+"connections\n"
+msgstr " -A, --auth=METHOD 本地连接的默认认证方法\n"
-#: initdb.c:2432
+#: initdb.c:2383
#, c-format
msgid " [-D, --pgdata=]DATADIR location for this database cluster\n"
-msgstr " -D, --pgdata=DATADIR ǰݿصλ\n"
+msgstr " -D, --pgdata=DATADIR 当前数据库簇的位置\n"
-#: initdb.c:2433
+#: initdb.c:2384
#, c-format
msgid " -E, --encoding=ENCODING set default encoding for new databases\n"
-msgstr " -E, --encoding=ENCODING ΪݿĬϱ\n"
+msgstr " -E, --encoding=ENCODING 为新数据库设置默认编码\n"
-#: initdb.c:2434
+#: initdb.c:2385
#, c-format
msgid " --locale=LOCALE set default locale for new databases\n"
-msgstr " --locale=LOCALE ΪݿĬԻ\n"
+msgstr " --locale=LOCALE 为新数据库设置默认语言环境\n"
-#: initdb.c:2435
+#: initdb.c:2386
#, c-format
msgid ""
" --lc-collate=, --lc-ctype=, --lc-messages=LOCALE\n"
" --lc-monetary=, --lc-numeric=, --lc-time=LOCALE\n"
-" set default locale in the respective category for\n"
+" set default locale in the respective category "
+"for\n"
" new databases (default taken from environment)\n"
msgstr ""
" --lc-collate, --lc-ctype, --lc-messages=LOCALE\n"
" --lc-monetary, --lc-numeric, --lc-time=LOCALE\n"
-" ΪµݿڸԵĿ¼зֱ\n"
-" 趨ȱʡԻĬʹû\n"
-" )\n"
+" 为新的数据库簇在各自的目录中分别\n"
+" 设定缺省语言环境(默认使用环境变\n"
+" 量)\n"
-#: initdb.c:2439
+#: initdb.c:2390
#, c-format
msgid " --no-locale equivalent to --locale=C\n"
-msgstr " --no-locale ͬ --locale=C\n"
+msgstr " --no-locale 等同于 --locale=C\n"
-#: initdb.c:2440
+#: initdb.c:2391
#, c-format
-msgid " --pwfile=FILE read password for the new superuser from file\n"
-msgstr " --pwfile=ļ µijûļȡ\n"
+msgid ""
+" --pwfile=FILE read password for the new superuser from file\n"
+msgstr " --pwfile=文件名 对于新的超级用户从文件读取口令\n"
-#: initdb.c:2441
+#: initdb.c:2392
#, c-format
msgid ""
" -T, --text-search-config=CFG\n"
" default text search configuration\n"
msgstr ""
" -T, --text-search-config=CFG\n"
-" ȱʡı\n"
+" 缺省的文本搜索配置\n"
-#: initdb.c:2443
+#: initdb.c:2394
#, c-format
msgid " -U, --username=NAME database superuser name\n"
-msgstr " -U, --username=NAME ݿⳬû\n"
+msgstr " -U, --username=NAME 数据库超级用户名\n"
-#: initdb.c:2444
+#: initdb.c:2395
#, c-format
-msgid " -W, --pwprompt prompt for a password for the new superuser\n"
-msgstr " -W, --pwprompt µijûʾ\n"
+msgid ""
+" -W, --pwprompt prompt for a password for the new superuser\n"
+msgstr " -W, --pwprompt 对于新的超级用户提示输入口令\n"
-#: initdb.c:2445
+#: initdb.c:2396
#, c-format
-msgid " -X, --xlogdir=XLOGDIR location for the transaction log directory\n"
-msgstr " -X, --xlogdir=XLOGDIR ǰ־Ŀ¼λ\n"
+msgid ""
+" -X, --xlogdir=XLOGDIR location for the transaction log directory\n"
+msgstr " -X, --xlogdir=XLOGDIR 当前事务日志目录的位置\n"
-#: initdb.c:2446
+#: initdb.c:2397
#, c-format
msgid ""
"\n"
"Less commonly used options:\n"
msgstr ""
"\n"
-"ͨʹѡ:\n"
+"非普通使用选项:\n"
-#: initdb.c:2447
+#: initdb.c:2398
#, c-format
msgid " -d, --debug generate lots of debugging output\n"
-msgstr " -d, --debug ijϢ\n"
+msgstr " -d, --debug 产生大量的除错信息\n"
-#: initdb.c:2448
+#: initdb.c:2399
#, c-format
msgid " -L DIRECTORY where to find the input files\n"
-msgstr " -L DIRECTORY ļλ\n"
+msgstr " -L DIRECTORY 输入文件的位置\n"
-#: initdb.c:2449
+#: initdb.c:2400
#, c-format
msgid " -n, --noclean do not clean up after errors\n"
-msgstr " -n, --noclean \n"
+msgstr " -n, --noclean 出错后不清理\n"
-#: initdb.c:2450
+#: initdb.c:2401
#, c-format
msgid " -s, --show show internal settings\n"
-msgstr " -s, --show ʾڲ\n"
+msgstr " -s, --show 显示内部设置\n"
-#: initdb.c:2451
+#: initdb.c:2402
#, c-format
msgid ""
"\n"
"Other options:\n"
msgstr ""
"\n"
-"ѡ:\n"
+"其它选项:\n"
-#: initdb.c:2452
+#: initdb.c:2403
#, c-format
msgid " -?, --help show this help, then exit\n"
-msgstr " -?, --help ʾ˰, Ȼ˳\n"
+msgstr " -?, --help 显示此帮助, 然后退出\n"
-#: initdb.c:2453
+#: initdb.c:2404
#, c-format
msgid " -V, --version output version information, then exit\n"
-msgstr " -V, --version 汾Ϣ, Ȼ˳\n"
+msgstr " -V, --version 输出版本信息, 然后退出\n"
-#: initdb.c:2454
+#: initdb.c:2405
#, c-format
msgid ""
"\n"
@@ -446,45 +441,43 @@ msgid ""
"is used.\n"
msgstr ""
"\n"
-"ûָĿ¼, ʹû PGDATA\n"
+"如果没有指定数据目录, 将使用环境变量 PGDATA\n"
-#: initdb.c:2456
+#: initdb.c:2407
#, c-format
msgid ""
"\n"
"Report bugs to <pgsql-bugs@postgresql.org>.\n"
msgstr ""
"\n"
-" <pgql-bugs@postgresql.org>.\n"
+"报告错误至 <pgql-bugs@postgresql.org>.\n"
-#: initdb.c:2561
+#: initdb.c:2512
#, c-format
msgid "Running in debug mode.\n"
-msgstr "ڳģʽ. \n"
+msgstr "运行在除错模式中. \n"
-#: initdb.c:2565
+#: initdb.c:2516
#, c-format
msgid "Running in noclean mode. Mistakes will not be cleaned up.\n"
-msgstr " noclean ģʽ. 󽫲.\n"
+msgstr "运行在 noclean 模式中. 错误将不被清理.\n"
-#: initdb.c:2608
-#: initdb.c:2626
-#: initdb.c:2894
+#: initdb.c:2559 initdb.c:2577 initdb.c:2845
#, c-format
msgid "Try \"%s --help\" for more information.\n"
-msgstr " \"%s --help\" ȡϢ.\n"
+msgstr "请用 \"%s --help\" 获取更多的信息.\n"
-#: initdb.c:2624
+#: initdb.c:2575
#, c-format
msgid "%s: too many command-line arguments (first is \"%s\")\n"
-msgstr "%s: в̫ (һ \"%s\")\n"
+msgstr "%s: 命令行参数太多 (第一个是 \"%s\")\n"
-#: initdb.c:2633
+#: initdb.c:2584
#, c-format
msgid "%s: password prompt and password file cannot be specified together\n"
-msgstr "%s: ʾͿļͬʱָ\n"
+msgstr "%s: 口令提示和口令文件不能同时都指定\n"
-#: initdb.c:2639
+#: initdb.c:2590
msgid ""
"\n"
"WARNING: enabling \"trust\" authentication for local connections\n"
@@ -492,21 +485,22 @@ msgid ""
"next time you run initdb.\n"
msgstr ""
"\n"
-": Ϊ \"trust\" ֤.\n"
-"ͨ༭ pg_hba.conf Ļ\n"
-" initdb ʱʹ -A ѡ.\n"
+"警告: 为本地连接启动了 \"trust\" 认证.\n"
+"你可以通过编辑 pg_hba.conf 更改或你下\n"
+"次运行 initdb 时使用 -A 选项.\n"
-#: initdb.c:2662
+#: initdb.c:2613
#, c-format
msgid "%s: unrecognized authentication method \"%s\"\n"
-msgstr "%s: δ֪֤ \"%s\".\n"
+msgstr "%s: 未知认证方法 \"%s\".\n"
-#: initdb.c:2672
+#: initdb.c:2623
#, c-format
-msgid "%s: must specify a password for the superuser to enable %s authentication\n"
-msgstr "%s: Ϊ %s ֤, ҪΪûָһ\n"
+msgid ""
+"%s: must specify a password for the superuser to enable %s authentication\n"
+msgstr "%s: 为了启动 %s 认证, 你需要为超级用户指定一个口令\n"
-#: initdb.c:2687
+#: initdb.c:2638
#, c-format
msgid ""
"%s: no data directory specified\n"
@@ -514,59 +508,54 @@ msgid ""
"will reside. Do this with either the invocation option -D or the\n"
"environment variable PGDATA.\n"
msgstr ""
-"%s: ûָĿ¼\n"
-"ȷϴݿϵͳĿ¼\n"
-". ʹ -D ѡ\n"
-" PGDATA.\n"
+"%s: 没有指定数据目录\n"
+"您必须确认此数据库系统的数据所在目录\n"
+"存在. 使用 -D 选项或者\n"
+"环境变量 PGDATA.\n"
-#: initdb.c:2763
+#: initdb.c:2722
#, c-format
msgid ""
"The program \"postgres\" is needed by %s but was not found in the\n"
"same directory as \"%s\".\n"
"Check your installation.\n"
msgstr ""
-"%s Ҫ \"postgres\", ͬһĿ¼ \"%s\" ûҵ.\n"
+"%s 需要程序 \"postgres\", 但是在同一个目录 \"%s\" 中没找到.\n"
"\n"
-"İװ.\n"
+"检查您的安装.\n"
-#: initdb.c:2770
+#: initdb.c:2729
#, c-format
msgid ""
"The program \"postgres\" was found by \"%s\"\n"
"but was not the same version as %s.\n"
"Check your installation.\n"
msgstr ""
-"%s ҵ \"postgres\", ǺͰ汾 \"%s\" һ.\n"
+"%s 找到程序 \"postgres\", 但是和版本 \"%s\" 不一致.\n"
"\n"
-"İװ.\n"
+"检查您的安装.\n"
-#: initdb.c:2789
+#: initdb.c:2748
#, c-format
msgid "%s: input file location must be an absolute path\n"
-msgstr "%s: ļλñΪ·\n"
-
-#: initdb.c:2797
-#, c-format
-msgid "%s: could not determine valid short version string\n"
-msgstr "%s: ޷ȷЧĶ̰汾ַ\n"
+msgstr "%s: 输入文件位置必须为绝对路径\n"
-#: initdb.c:2852
+#: initdb.c:2805
#, 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"
-"ûҲΪ̵.\n"
+"属于此数据库系统的文件宿主为用户 \"%s\".\n"
+"此用户也必须为服务器进程的宿主.\n"
-#: initdb.c:2862
+#: initdb.c:2815
#, c-format
msgid "The database cluster will be initialized with locale %s.\n"
-msgstr "ݿؽ locale %s ʼ.\n"
+msgstr "数据库簇将带有 locale %s 初始化.\n"
-#: initdb.c:2865
+#: initdb.c:2818
#, c-format
msgid ""
"The database cluster will be initialized with locales\n"
@@ -577,7 +566,7 @@ msgid ""
" NUMERIC: %s\n"
" TIME: %s\n"
msgstr ""
-"ݿؽһ locales ʼ\n"
+"数据库簇将带有一下 locales 初始化\n"
" COLLATE: %s\n"
" CTYPE: %s\n"
" MESSAGES: %s\n"
@@ -585,124 +574,122 @@ msgstr ""
" NUMERIC: %s\n"
" TIME: %s\n"
-#: initdb.c:2891
+#: initdb.c:2842
#, c-format
msgid "%s: could not find suitable encoding for locale %s\n"
-msgstr "%s: ޷Ϊ locale \"%s\" ҵʵı\n"
+msgstr "%s: 无法为 locale \"%s\" 找到合适的编码\n"
-#: initdb.c:2893
+#: initdb.c:2844
#, c-format
msgid "Rerun %s with the -E option.\n"
-msgstr " -E ѡ %s.\n"
+msgstr "带 -E 选项重新运行 %s.\n"
-#: initdb.c:2902
+#: initdb.c:2853
#, c-format
msgid "%s: locale %s requires unsupported encoding %s\n"
-msgstr "%s: Ի %sҪʹòֵ֧ı%s\n"
+msgstr "%s: 语言环境 %s要求使用不支持的编码%s\n"
-#: initdb.c:2905
+#: initdb.c:2856
#, c-format
msgid ""
"Encoding %s is not allowed as a server-side encoding.\n"
"Rerun %s with a different locale selection.\n"
msgstr ""
-"%sΪ˱.\n"
-"ʹһͬԻ%s .\n"
+"不允许将编码%s作为服务器端编码.\n"
+"使用一个不同的语言环境重新运行%s .\n"
-#: initdb.c:2913
+#: initdb.c:2864
#, c-format
msgid "The default database encoding has accordingly been set to %s.\n"
-msgstr "ĬϵݿѾӦΪ %s.\n"
+msgstr "默认的数据库编码已经相应的设置为 %s.\n"
-#: initdb.c:2930
+#: initdb.c:2881
#, c-format
msgid "%s: could not find suitable text search configuration for locale %s\n"
-msgstr "%s: ޷ΪԻ\"%s\" ҵʵı\n"
+msgstr "%s: 无法为语言环境\"%s\" 找到合适的编码配置\n"
-#: initdb.c:2941
+#: initdb.c:2892
#, c-format
-msgid "%s: warning: suitable text search configuration for locale %s is unknown\n"
-msgstr "%s: : Ի%sʵıδ֪\n"
+msgid ""
+"%s: warning: suitable text search configuration for locale %s is unknown\n"
+msgstr "%s: 警告: 对于语言环境%s合适的文本搜索配置未知\n"
-#: initdb.c:2946
+#: initdb.c:2897
#, c-format
-msgid "%s: warning: specified text search configuration \"%s\" might not match locale %s\n"
-msgstr "%s: : ָı\"%s\"Ի%sƥ\n"
+msgid ""
+"%s: warning: specified text search configuration \"%s\" might not match "
+"locale %s\n"
+msgstr "%s: 警告: 所指定的文本搜索配置\"%s\"可能与语言环境%s不匹配\n"
-#: initdb.c:2951
+#: initdb.c:2902
#, c-format
msgid "The default text search configuration will be set to \"%s\".\n"
-msgstr "ȱʡıýᱻõ\"%s\"\n"
+msgstr "缺省的文本搜索配置将会被设置到\"%s\"\n"
-#: initdb.c:2985
-#: initdb.c:3052
+#: initdb.c:2936 initdb.c:3003
#, c-format
msgid "creating directory %s ... "
-msgstr "Ŀ¼ %s ... "
+msgstr "创建目录 %s ... "
-#: initdb.c:2999
-#: initdb.c:3069
+#: initdb.c:2950 initdb.c:3020
#, c-format
msgid "fixing permissions on existing directory %s ... "
-msgstr "޸ѴĿ¼ %s Ȩ ... "
+msgstr "修复已存在目录 %s 的权限 ... "
-#: initdb.c:3005
-#: initdb.c:3075
+#: initdb.c:2956 initdb.c:3026
#, c-format
msgid "%s: could not change permissions of directory \"%s\": %s\n"
-msgstr "%s: ޷ıĿ¼ \"%s\" Ȩ: %s\n"
+msgstr "%s: 无法改变目录 \"%s\" 的权限: %s\n"
-#: initdb.c:3018
-#: initdb.c:3087
+#: initdb.c:2969 initdb.c:3038
#, c-format
msgid "%s: directory \"%s\" exists but is not empty\n"
-msgstr "%s: Ŀ¼\"%s\"Ѵڣǿյ\n"
+msgstr "%s: 目录\"%s\"已存在,但不是空的\n"
-#: initdb.c:3021
+#: initdb.c:2972
#, c-format
msgid ""
"If you want to create a new database system, either remove or empty\n"
"the directory \"%s\" or run %s\n"
"with an argument other than \"%s\".\n"
msgstr ""
-"봴һµݿϵͳ, ɾ\n"
-"Ŀ¼ \"%s\" д %s\n"
-" \"%s\".\n"
+"如果您想创建一个新的数据库系统, 请删除或清空\n"
+"目录 \"%s\" 或者运行带参数的 %s\n"
+"而不是 \"%s\".\n"
-#: initdb.c:3029
-#: initdb.c:3097
+#: initdb.c:2980 initdb.c:3048
#, c-format
msgid "%s: could not access directory \"%s\": %s\n"
-msgstr "%s: ޷Ŀ¼ \"%s\": %s\n"
+msgstr "%s: 无法访问目录 \"%s\": %s\n"
-#: initdb.c:3043
+#: initdb.c:2994
#, c-format
msgid "%s: transaction log directory location must be an absolute path\n"
-msgstr "%s: ־Ŀ¼λñΪ·\n"
+msgstr "%s: 事务日志目录的位置必须为绝对路径\n"
-#: initdb.c:3090
+#: initdb.c:3041
#, c-format
msgid ""
"If you want to store the transaction log there, either\n"
"remove or empty the directory \"%s\".\n"
-msgstr "Ҫ洢־ҪɾĿ¼\"%s\".\n"
+msgstr "如果您要存储事务日志,需要删除或者清空目录\"%s\".\n"
-#: initdb.c:3109
+#: initdb.c:3060
#, c-format
msgid "%s: could not create symbolic link \"%s\": %s\n"
-msgstr "%s: ޷ \"%s\": %s\n"
+msgstr "%s: 无法创建符号链接 \"%s\": %s\n"
-#: initdb.c:3114
+#: initdb.c:3065
#, c-format
msgid "%s: symlinks are not supported on this platform"
-msgstr "%s: ƽ̨ϲ֧ʹ÷"
+msgstr "%s: 在这个平台上不支持使用符号链接"
-#: initdb.c:3120
+#: initdb.c:3071
#, c-format
msgid "creating subdirectories ... "
-msgstr "ڴĿ¼ ... "
+msgstr "正在创建子目录 ... "
-#: initdb.c:3182
+#: initdb.c:3135
#, c-format
msgid ""
"\n"
@@ -714,113 +701,114 @@ msgid ""
"\n"
msgstr ""
"\n"
-"ɹ. ڿݿ:\n"
+"成功. 您现在可以用下面的命令运行数据库服务器:\n"
"\n"
" %s%s%s%spostmaster -D %s%s%s\n"
-"\n"
+"或者\n"
" %s%s%s%spg_ctl -D %s%s%s -l logfile start\n"
"\n"
-#: ../../port/dirmod.c:75
-#: ../../port/dirmod.c:88
-#: ../../port/dirmod.c:101
+#: ../../port/dirmod.c:75 ../../port/dirmod.c:88 ../../port/dirmod.c:101
#, c-format
msgid "out of memory\n"
-msgstr "ڴ\n"
+msgstr "内存溢出\n"
#: ../../port/dirmod.c:286
#, c-format
msgid "could not set junction for \"%s\": %s\n"
-msgstr "޷Ϊ \"%s\": %s\n"
+msgstr "无法为 \"%s\"设置连接: %s\n"
#: ../../port/dirmod.c:325
#, c-format
msgid "could not open directory \"%s\": %s\n"
-msgstr "޷Ŀ¼ \"%s\": %s\n"
+msgstr "无法打开目录 \"%s\": %s\n"
#: ../../port/dirmod.c:362
#, c-format
msgid "could not read directory \"%s\": %s\n"
-msgstr "޷ȡĿ¼ \"%s\": %s\n"
+msgstr "无法读取目录 \"%s\": %s\n"
#: ../../port/dirmod.c:445
#, c-format
msgid "could not stat file or directory \"%s\": %s\n"
-msgstr "޷ȡļĿ¼ \"%s\"״̬: %s\n"
+msgstr "无法获取文件或目录 \"%s\"的状态: %s\n"
-#: ../../port/dirmod.c:472
-#: ../../port/dirmod.c:489
+#: ../../port/dirmod.c:472 ../../port/dirmod.c:489
#, c-format
msgid "could not remove file or directory \"%s\": %s\n"
-msgstr "޷ɾļĿ¼ \"%s\": %s\n"
+msgstr "无法删除文件或目录 \"%s\": %s\n"
-#: ../../port/exec.c:195
-#: ../../port/exec.c:309
-#: ../../port/exec.c:352
+#: ../../port/exec.c:125 ../../port/exec.c:239 ../../port/exec.c:282
#, c-format
msgid "could not identify current directory: %s"
-msgstr "޷ȷϵǰĿ¼: %s"
+msgstr "无法确认当前目录: %s"
# command.c:122
-#: ../../port/exec.c:214
+#: ../../port/exec.c:144
#, c-format
msgid "invalid binary \"%s\""
-msgstr "ЧĶ \"%s\""
+msgstr "无效的二进制码 \"%s\""
# command.c:1103
-#: ../../port/exec.c:263
+#: ../../port/exec.c:193
#, c-format
msgid "could not read binary \"%s\""
-msgstr "޷ȡ \"%s\""
+msgstr "无法读取二进制码 \"%s\""
-#: ../../port/exec.c:270
+#: ../../port/exec.c:200
#, c-format
msgid "could not find a \"%s\" to execute"
-msgstr "δҵһ \"%s\" ִ"
+msgstr "未能找到一个 \"%s\" 来执行"
-#: ../../port/exec.c:325
-#: ../../port/exec.c:361
+#: ../../port/exec.c:255 ../../port/exec.c:291
#, c-format
msgid "could not change directory to \"%s\""
-msgstr "޷Ŀ¼ \"%s\""
+msgstr "无法进入目录 \"%s\""
-#: ../../port/exec.c:340
+#: ../../port/exec.c:270
#, c-format
msgid "could not read symbolic link \"%s\""
-msgstr "޷ȡ \"%s\""
+msgstr "无法读取符号链结 \"%s\""
-#: ../../port/exec.c:586
+#: ../../port/exec.c:516
#, c-format
msgid "child process exited with exit code %d"
-msgstr "ӽ˳, ˳Ϊ %d"
+msgstr "子进程已退出, 退出码为 %d"
-#: ../../port/exec.c:590
+#: ../../port/exec.c:520
#, c-format
msgid "child process was terminated by exception 0x%X"
-msgstr "ӽ̱(exception) 0x%X ֹ"
+msgstr "子进程被例外(exception) 0x%X 终止"
-#: ../../port/exec.c:599
+#: ../../port/exec.c:529
#, c-format
msgid "child process was terminated by signal %s"
-msgstr "ӽ̱ź %s ֹ"
+msgstr "子进程被信号 %s 终止"
-#: ../../port/exec.c:602
+#: ../../port/exec.c:532
#, c-format
msgid "child process was terminated by signal %d"
-msgstr "ӽ̱ź %d ֹ"
+msgstr "子进程被信号 %d 终止"
-#: ../../port/exec.c:606
+#: ../../port/exec.c:536
#, c-format
msgid "child process exited with unrecognized status %d"
-msgstr "ӽ˳, δ֪״̬ %d"
+msgstr "子进程已退出, 未知状态 %d"
+
+#~ msgid ""
+#~ "%s: The password file was not generated. Please report this problem.\n"
+#~ msgstr "%s: 口令文件没有生成. 请报告这个问题.\n"
+
+#~ msgid "%s: could not determine valid short version string\n"
+#~ msgstr "%s: 无法确定有效的短版本字符串\n"
#~ msgid "enabling unlimited row size for system tables ... "
-#~ msgstr "ϵͳдС ... "
+#~ msgstr "启动不限制系统表行大小 ... "
#~ msgid ""
#~ " --locale=LOCALE initialize database cluster with given "
#~ "locale\n"
-#~ msgstr " --locale=LOCALE ʼݿص locale\n"
+#~ msgstr " --locale=LOCALE 初始化数据库簇的 locale\n"
#~ msgid "creating directory %s/%s ... "
-#~ msgstr "Ŀ¼ %s/%s ... "
+#~ msgstr "创建目录 %s/%s ... "
diff --git a/src/bin/initdb/po/zh_TW.po b/src/bin/initdb/po/zh_TW.po
new file mode 100644
index 0000000000..f1df8ef2f2
--- /dev/null
+++ b/src/bin/initdb/po/zh_TW.po
@@ -0,0 +1,875 @@
+# Traditional Chinese message translation file for initdb
+# Copyright (C) 2011 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+# 2004-12-13 Zhenbang Wei <forth@zbwei.net>
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 9.1\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2011-05-11 20:39+0000\n"
+"PO-Revision-Date: 2011-05-09 11:58+0800\n"
+"Last-Translator: Zhenbang Wei <znbang@gmail.com>\n"
+"Language-Team: EnterpriseDB translation team <dev-escalations@enterprisedb."
+"com>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: initdb.c:260 initdb.c:274
+#, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: 記憶體用盡\n"
+
+#: initdb.c:383 initdb.c:1284
+#, c-format
+msgid "%s: could not open file \"%s\" for reading: %s\n"
+msgstr "%s: 無法開啟檔案\"%s\"讀取資料: %s\n"
+
+#: initdb.c:439 initdb.c:805 initdb.c:834
+#, c-format
+msgid "%s: could not open file \"%s\" for writing: %s\n"
+msgstr "%s: 無法開啟檔案\"%s\"寫入資料: %s\n"
+
+#: initdb.c:447 initdb.c:455 initdb.c:812 initdb.c:840
+#, c-format
+msgid "%s: could not write file \"%s\": %s\n"
+msgstr "%s: 無法寫入檔案\"%s\"; %s\n"
+
+#: initdb.c:474
+#, c-format
+msgid "%s: could not execute command \"%s\": %s\n"
+msgstr "%s: 無法執行命令\"%s\": %s\n"
+
+#: initdb.c:490
+#, c-format
+msgid "%s: removing data directory \"%s\"\n"
+msgstr "%s: 刪除資料目錄 \"%s\"\n"
+
+#: initdb.c:493
+#, c-format
+msgid "%s: failed to remove data directory\n"
+msgstr "%s: 無法刪除資料目錄\n"
+
+#: initdb.c:499
+#, c-format
+msgid "%s: removing contents of data directory \"%s\"\n"
+msgstr "%s: 刪除資料目錄\"%s\"的內容\n"
+
+#: initdb.c:502
+#, c-format
+msgid "%s: failed to remove contents of data directory\n"
+msgstr "%s: 無法刪除資料目錄的內容\n"
+
+# access/transam/xlog.c:2163
+#: initdb.c:508
+#, c-format
+msgid "%s: removing transaction log directory \"%s\"\n"
+msgstr "%s: 正在移除交易日誌目錄 \"%s\"\n"
+
+#: initdb.c:511
+#, c-format
+msgid "%s: failed to remove transaction log directory\n"
+msgstr "%s: 無法移除交易日誌目錄\n"
+
+#: initdb.c:517
+#, c-format
+msgid "%s: removing contents of transaction log directory \"%s\"\n"
+msgstr "%s: 正在移除交易日誌目錄的內容 \"%s\"\n"
+
+#: initdb.c:520
+#, c-format
+msgid "%s: failed to remove contents of transaction log directory\n"
+msgstr "%s: 無法移除交易日誌目錄的內容\n"
+
+#: initdb.c:529
+#, c-format
+msgid "%s: data directory \"%s\" not removed at user's request\n"
+msgstr "%s: 無法依使用者的要求刪除資料目錄 \"%s\"\n"
+
+#: initdb.c:534
+#, c-format
+msgid "%s: transaction log directory \"%s\" not removed at user's request\n"
+msgstr "%s: 無法依使用者要求刪除交易日誌目錄 \"%s\"\n"
+
+#: initdb.c:556
+#, c-format
+msgid ""
+"%s: cannot be run as root\n"
+"Please log in (using, e.g., \"su\") as the (unprivileged) user that will\n"
+"own the server process.\n"
+msgstr ""
+"%s: 無法以root身份執行\n"
+"請以將會擁有伺服器行程的非特權使用者登入(例如用\"su\")。\n"
+
+#: initdb.c:568
+#, c-format
+msgid "%s: could not obtain information about current user: %s\n"
+msgstr "%s: 無法取得目前使用者資訊; %s\n"
+
+#: initdb.c:585
+#, c-format
+msgid "%s: could not get current user name: %s\n"
+msgstr "%s: 無法取得目前使用者名稱: %s\n"
+
+#: initdb.c:616
+#, c-format
+msgid "%s: \"%s\" is not a valid server encoding name\n"
+msgstr "%s: \"%s\" 不是有效的伺服器編碼名稱\n"
+
+#: initdb.c:725 initdb.c:3168
+#, c-format
+msgid "%s: could not create directory \"%s\": %s\n"
+msgstr "%s: 無法建立目錄\"%s\": %s\n"
+
+#: initdb.c:755
+#, c-format
+msgid "%s: file \"%s\" does not exist\n"
+msgstr "%s: 檔案 \"%s\" 不存在\n"
+
+#: initdb.c:757 initdb.c:766 initdb.c:776
+#, c-format
+msgid ""
+"This might mean you have a corrupted installation or identified\n"
+"the wrong directory with the invocation option -L.\n"
+msgstr ""
+"這可能表示你的安裝已損毀,或是指定\n"
+"給引動選項 -L 的目錄不正確。\n"
+
+# utils/fmgr/dfmgr.c:107 utils/fmgr/dfmgr.c:209 utils/fmgr/dfmgr.c:263
+#: initdb.c:763
+#, c-format
+msgid "%s: could not access file \"%s\": %s\n"
+msgstr "%s: 無法存取檔案 \"%s\":%s\n"
+
+#: initdb.c:774
+#, c-format
+msgid "%s: file \"%s\" is not a regular file\n"
+msgstr "%s: 檔案 \"%s\" 不是一般檔案\n"
+
+#: initdb.c:882
+#, c-format
+msgid "selecting default max_connections ... "
+msgstr "選擇預設的max_connections ..."
+
+#: initdb.c:911
+#, c-format
+msgid "selecting default shared_buffers ... "
+msgstr "選擇預設的shared_buffers ..."
+
+#: initdb.c:954
+msgid "creating configuration files ... "
+msgstr "建立設定檔..."
+
+#: initdb.c:1124
+#, c-format
+msgid "creating template1 database in %s/base/1 ... "
+msgstr "建立 template1 資料庫於 %s/base/1 ... "
+
+#: initdb.c:1140
+#, 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: 輸入檔 \"%s\" 不屬於 PostgreSQL %s\n"
+"請檢查你的安裝或用 -L 選項指定正確的路徑。\n"
+
+#: initdb.c:1225
+msgid "initializing pg_authid ... "
+msgstr "初始化 pg_authid..."
+
+#: initdb.c:1259
+msgid "Enter new superuser password: "
+msgstr "輸入新的管理者密碼:"
+
+#: initdb.c:1260
+msgid "Enter it again: "
+msgstr "再輸入一次: "
+
+#: initdb.c:1263
+#, c-format
+msgid "Passwords didn't match.\n"
+msgstr "密碼不符。\n"
+
+#: initdb.c:1290
+#, c-format
+msgid "%s: could not read password from file \"%s\": %s\n"
+msgstr "%s: 無法從檔案\"%s\"讀取密碼: %s\n"
+
+#: initdb.c:1303
+#, c-format
+msgid "setting password ... "
+msgstr "設定密碼..."
+
+#: initdb.c:1403
+msgid "initializing dependencies ... "
+msgstr "初始化相依性..."
+
+#: initdb.c:1431
+msgid "creating system views ... "
+msgstr "建立系統views..."
+
+#: initdb.c:1467
+msgid "loading system objects' descriptions ... "
+msgstr "正在載入系統物件的描述..."
+
+#: initdb.c:1573
+msgid "creating collations ... "
+msgstr "建立定序 ... "
+
+#: initdb.c:1606
+#, c-format
+msgid "%s: locale name too long, skipped: %s\n"
+msgstr "%s: 區域名稱太長,忽略: %s\n"
+
+#: initdb.c:1631
+#, c-format
+msgid "%s: locale name has non-ASCII characters, skipped: %s\n"
+msgstr "%s: 區域名稱有非ASCII字元,忽略: %s\n"
+
+# describe.c:1542
+#: initdb.c:1694
+#, c-format
+msgid "No usable system locales were found.\n"
+msgstr "找不到可用的系統區域。\n"
+
+#: initdb.c:1695
+#, c-format
+msgid "Use the option \"--debug\" to see details.\n"
+msgstr "用 \"--debug\" 選項取得詳細資訊。\n"
+
+# commands/tablespace.c:386 commands/tablespace.c:483
+#: initdb.c:1698
+#, c-format
+msgid "not supported on this platform\n"
+msgstr "在此平台不支援\n"
+
+#: initdb.c:1713
+msgid "creating conversions ... "
+msgstr "建立轉換 ... "
+
+#: initdb.c:1748
+msgid "creating dictionaries ... "
+msgstr "建立字典..."
+
+#: initdb.c:1802
+msgid "setting privileges on built-in objects ... "
+msgstr "設定內建物件的權限 ... "
+
+#: initdb.c:1860
+msgid "creating information schema ... "
+msgstr "建立information schema ... "
+
+#: initdb.c:1916
+msgid "loading PL/pgSQL server-side language ... "
+msgstr "載入 PL/pgSQL 伺服器端語言 ..."
+
+#: initdb.c:1941
+msgid "vacuuming database template1 ... "
+msgstr "重整資料庫template1 ..."
+
+#: initdb.c:1997
+msgid "copying template1 to template0 ... "
+msgstr "複製 template1 到 template0 ..."
+
+#: initdb.c:2029
+msgid "copying template1 to postgres ... "
+msgstr "複製 template1 到 postgres..."
+
+#: initdb.c:2086
+#, c-format
+msgid "caught signal\n"
+msgstr "捕捉到信號\n"
+
+#: initdb.c:2092
+#, c-format
+msgid "could not write to child process: %s\n"
+msgstr "無法寫至子行程: %s\n"
+
+#: initdb.c:2100
+#, c-format
+msgid "ok\n"
+msgstr "成功\n"
+
+#: initdb.c:2220
+#, c-format
+msgid "%s: invalid locale name \"%s\"\n"
+msgstr "%s: 無效的區域名稱 \"%s\"\n"
+
+#: initdb.c:2246
+#, c-format
+msgid "%s: encoding mismatch\n"
+msgstr "%s: 編碼不符\n"
+
+#: initdb.c:2248
+#, c-format
+msgid ""
+"The encoding you selected (%s) and the encoding that the\n"
+"selected locale uses (%s) do not match. This would lead to\n"
+"misbehavior in various character string processing functions.\n"
+"Rerun %s and either do not specify an encoding explicitly,\n"
+"or choose a matching combination.\n"
+msgstr ""
+"您選取的編碼 (%s) 與\n"
+"所選區域使用的編碼 (%s) 不符。如此會導致\n"
+"各種字元字串處理函式出現異常行為。\n"
+"請重新執行 %s,且不以明確方式指定編碼,\n"
+"或選擇相符的編碼組合。\n"
+
+#: initdb.c:2509
+#, c-format
+msgid ""
+"%s initializes a PostgreSQL database cluster.\n"
+"\n"
+msgstr ""
+"%s 初始化 PostgreSQL 資料庫 cluster。\n"
+"\n"
+
+#: initdb.c:2510
+#, c-format
+msgid "Usage:\n"
+msgstr "使用方法:\n"
+
+#: initdb.c:2511
+#, c-format
+msgid " %s [OPTION]... [DATADIR]\n"
+msgstr " %s [選項]... [資料目錄]\n"
+
+#: initdb.c:2512
+#, c-format
+msgid ""
+"\n"
+"Options:\n"
+msgstr ""
+"\n"
+"選項:\n"
+
+#: initdb.c:2513
+#, c-format
+msgid ""
+" -A, --auth=METHOD default authentication method for local "
+"connections\n"
+msgstr " -A, --auth=METHOD 本地端預設的連線驗證方式\n"
+
+#: initdb.c:2514
+#, c-format
+msgid " [-D, --pgdata=]DATADIR location for this database cluster\n"
+msgstr " [-D, --pgdata=]DATADIR 資料庫cluster的目錄\n"
+
+#: initdb.c:2515
+#, c-format
+msgid " -E, --encoding=ENCODING set default encoding for new databases\n"
+msgstr " -E, --encoding=ENCODING 新資料庫的預設編稼\n"
+
+#: initdb.c:2516
+#, c-format
+msgid " --locale=LOCALE set default locale for new databases\n"
+msgstr " --locale=LOCALE 設定新資料庫的預設區域\n"
+
+#: initdb.c:2517
+#, c-format
+msgid ""
+" --lc-collate=, --lc-ctype=, --lc-messages=LOCALE\n"
+" --lc-monetary=, --lc-numeric=, --lc-time=LOCALE\n"
+" set default locale in the respective category "
+"for\n"
+" new databases (default taken from environment)\n"
+msgstr ""
+" --lc-collate=, --lc-ctype=, --lc-messages=LOCALE\n"
+" --lc-monetary=, --lc-numeric=, --lc-time=LOCALE\n"
+" 設定個別種類中的預設區域,for\n"
+" 新資料庫 (取自環境的預設值)\n"
+
+#: initdb.c:2521
+#, c-format
+msgid " --no-locale equivalent to --locale=C\n"
+msgstr " --no-locale 功能同 --locale=C\n"
+
+#: initdb.c:2522
+#, c-format
+msgid ""
+" --pwfile=FILE read password for the new superuser from file\n"
+msgstr " --pwfile=FILE 從檔案讀取新超級用戶的密碼\n"
+
+#: initdb.c:2523
+#, c-format
+msgid ""
+" -T, --text-search-config=CFG\n"
+" default text search configuration\n"
+msgstr ""
+" -T, --text-search-config=CFG\n"
+" 預設文本搜尋設定\n"
+
+#: initdb.c:2525
+#, c-format
+msgid " -U, --username=NAME database superuser name\n"
+msgstr " -U, --username=NAME 資料庫管理者名稱\n"
+
+#: initdb.c:2526
+#, c-format
+msgid ""
+" -W, --pwprompt prompt for a password for the new superuser\n"
+msgstr " -W, --pwprompt 詢問新管理者的密碼\n"
+
+#: initdb.c:2527
+#, c-format
+msgid ""
+" -X, --xlogdir=XLOGDIR location for the transaction log directory\n"
+msgstr " -X, --xlogdir=XLOGDIR 交易日誌目錄的位置\n"
+
+#: initdb.c:2528
+#, c-format
+msgid ""
+"\n"
+"Less commonly used options:\n"
+msgstr ""
+"\n"
+"非常用選項:\n"
+
+#: initdb.c:2529
+#, c-format
+msgid " -d, --debug generate lots of debugging output\n"
+msgstr " -d, --debug 顯示除錯訊息\n"
+
+#: initdb.c:2530
+#, c-format
+msgid " -L DIRECTORY where to find the input files\n"
+msgstr " -L DIRECTORY where to find the input files\n"
+
+#: initdb.c:2531
+#, c-format
+msgid " -n, --noclean do not clean up after errors\n"
+msgstr " -n, --noclean 發生錯誤時不清除\n"
+
+#: initdb.c:2532
+#, c-format
+msgid " -s, --show show internal settings\n"
+msgstr " -s, --show 顯示內部設定\n"
+
+#: initdb.c:2533
+#, c-format
+msgid ""
+"\n"
+"Other options:\n"
+msgstr ""
+"\n"
+"其他選項:\n"
+
+#: initdb.c:2534
+#, c-format
+msgid " -?, --help show this help, then exit\n"
+msgstr " -?, --help 顯示這份說明然後結束\n"
+
+#: initdb.c:2535
+#, c-format
+msgid " -V, --version output version information, then exit\n"
+msgstr " -V, --version 顯示版本資訊然後結束\n"
+
+#: initdb.c:2536
+#, c-format
+msgid ""
+"\n"
+"If the data directory is not specified, the environment variable PGDATA\n"
+"is used.\n"
+msgstr ""
+"\n"
+"如果沒有指定資料普錄就?使用環境變數PGDATA。\n"
+
+#: initdb.c:2538
+#, c-format
+msgid ""
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr ""
+"\n"
+"回報錯誤給<pgsql-bugs@postgresql.org>。\n"
+
+#: initdb.c:2644
+#, c-format
+msgid "Running in debug mode.\n"
+msgstr "以除錯模式執行。\n"
+
+#: initdb.c:2648
+#, c-format
+msgid "Running in noclean mode. Mistakes will not be cleaned up.\n"
+msgstr "以noclean模式執行,發生錯誤時不會清理。\n"
+
+#: initdb.c:2691 initdb.c:2709 initdb.c:2991
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "執行\"%s --help\"取得更多資訊。\n"
+
+#: initdb.c:2707
+#, c-format
+msgid "%s: too many command-line arguments (first is \"%s\")\n"
+msgstr "%s: 命令列參數過多(第一個是 \"%s\")\n"
+
+#: initdb.c:2716
+#, c-format
+msgid "%s: password prompt and password file cannot be specified together\n"
+msgstr "%s: 密碼提示和密碼檔不能一起指定\n"
+
+#: initdb.c:2722
+msgid ""
+"\n"
+"WARNING: enabling \"trust\" authentication for local connections\n"
+"You can change this by editing pg_hba.conf or using the -A option the\n"
+"next time you run initdb.\n"
+msgstr ""
+"\n"
+"警告:對本地端連線使用\"trust\"驗證\n"
+"你可以編輯pg_hba.conf改變設定,或在執行initdb時使用 -A 選項。\n"
+
+#: initdb.c:2745
+#, c-format
+msgid "%s: unrecognized authentication method \"%s\"\n"
+msgstr "%s: 無法辨認的驗證方式\"%s\"\n"
+
+#: initdb.c:2755
+#, c-format
+msgid ""
+"%s: must specify a password for the superuser to enable %s authentication\n"
+msgstr "%s: 必須提供管理者密碼才能使用 %s 驗證\n"
+
+#: initdb.c:2784
+#, 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: 未指定資料目錄\n"
+"你必須指定資料庫系統存放資料的目錄,你可以使用 -D 選項\n"
+"或是環境變數 PGDATA。\n"
+
+#: initdb.c:2868
+#, c-format
+msgid ""
+"The program \"postgres\" is needed by %s but was not found in the\n"
+"same directory as \"%s\".\n"
+"Check your installation.\n"
+msgstr ""
+"%s 需要程式 \"postgres\",但是在與\"%s\"相同的目錄中找不到。\n"
+"請檢查你的安裝。\n"
+
+#: initdb.c:2875
+#, c-format
+msgid ""
+"The program \"postgres\" was found by \"%s\"\n"
+"but was not the same version as %s.\n"
+"Check your installation.\n"
+msgstr ""
+"\"%s\" 已找到程式 \"postgres\",但是與 %s 的版本不符。\n"
+"請檢查你的安裝。\n"
+
+#: initdb.c:2894
+#, c-format
+msgid "%s: input file location must be an absolute path\n"
+msgstr "%s: 輸入檔位置必須是絕對路徑\n"
+
+#: initdb.c:2951
+#, 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"
+"\n"
+
+#: initdb.c:2961
+#, c-format
+msgid "The database cluster will be initialized with locale %s.\n"
+msgstr "資料庫 cluster 會以區域 %s 初始化。\n"
+
+#: initdb.c:2964
+#, 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 ""
+"資料庫 cluster 會以下列區域初始化\n"
+" COLLATE: %s\n"
+" CTYPE: %s\n"
+" MESSAGES: %s\n"
+" MONETARY: %s\n"
+" NUMERIC: %s\n"
+" TIME: %s\n"
+
+#: initdb.c:2988
+#, c-format
+msgid "%s: could not find suitable encoding for locale %s\n"
+msgstr "%s: 無法為區域 %s 找到合適的編碼\n"
+
+#: initdb.c:2990
+#, c-format
+msgid "Rerun %s with the -E option.\n"
+msgstr "用 -E 選項重新執行 %s。\n"
+
+#: initdb.c:3003
+#, c-format
+msgid ""
+"Encoding %s implied by locale is not allowed as a server-side encoding.\n"
+"The default database encoding will be set to %s instead.\n"
+msgstr ""
+"區域的編碼 %s 不可做為伺服器端編碼。\n"
+"預設伺服器編碼會被設為 %s。\n"
+
+#: initdb.c:3011
+#, c-format
+msgid "%s: locale %s requires unsupported encoding %s\n"
+msgstr "%s: 區域 %s 需要不支援的編碼 %s\n"
+
+#: initdb.c:3014
+#, c-format
+msgid ""
+"Encoding %s is not allowed as a server-side encoding.\n"
+"Rerun %s with a different locale selection.\n"
+msgstr ""
+"編碼 %s 不可做為伺服器端編碼。\n"
+"請以不同的區域選項重新執行 %s。\n"
+
+#: initdb.c:3023
+#, c-format
+msgid "The default database encoding has accordingly been set to %s.\n"
+msgstr "預設資料庫編碼被設為 %s。\n"
+
+#: initdb.c:3040
+#, c-format
+msgid "%s: could not find suitable text search configuration for locale %s\n"
+msgstr "%s: 無法為區域 %s 找到合適的文本搜尋設定\n"
+
+# utils/misc/guc.c:2507
+#: initdb.c:3051
+#, c-format
+msgid ""
+"%s: warning: suitable text search configuration for locale %s is unknown\n"
+msgstr "%s: 警告: 適合區域 %s 的文本搜尋設定不明\n"
+
+#: initdb.c:3056
+#, c-format
+msgid ""
+"%s: warning: specified text search configuration \"%s\" might not match "
+"locale %s\n"
+msgstr "%s: 警告: 指定的文本搜尋設定 \"%s\" 可能與區域 %s 不相符\n"
+
+#: initdb.c:3061
+#, c-format
+msgid "The default text search configuration will be set to \"%s\".\n"
+msgstr "預設的文本搜尋設定將設為 \"%s\"。\n"
+
+#: initdb.c:3095 initdb.c:3162
+#, c-format
+msgid "creating directory %s ... "
+msgstr "建立目錄 %s ..."
+
+#: initdb.c:3109 initdb.c:3180
+#, c-format
+msgid "fixing permissions on existing directory %s ... "
+msgstr "修正現有目錄 %s 的權限..."
+
+#: initdb.c:3115 initdb.c:3186
+#, c-format
+msgid "%s: could not change permissions of directory \"%s\": %s\n"
+msgstr "%s: 無法修改目錄 \"%s\" 的權限: %s\n"
+
+# commands/tablespace.c:334
+#: initdb.c:3128 initdb.c:3199
+#, c-format
+msgid "%s: directory \"%s\" exists but is not empty\n"
+msgstr "%s: 目錄 \"%s\" 已存在但不是空目錄\n"
+
+#: initdb.c:3131
+#, c-format
+msgid ""
+"If you want to create a new database system, either remove or empty\n"
+"the directory \"%s\" or run %s\n"
+"with an argument other than \"%s\".\n"
+msgstr ""
+"如果你想建立新的資料庫系統,請將目錄 \"%s\" 移除或清空,\n"
+"或是在執行 %s\n"
+"時加上 \"%s\" 以外的參數。\n"
+
+#: initdb.c:3139 initdb.c:3209
+#, c-format
+msgid "%s: could not access directory \"%s\": %s\n"
+msgstr "%s: 無法存取目錄 \"%s\": %s\n"
+
+#: initdb.c:3153
+#, c-format
+msgid "%s: transaction log directory location must be an absolute path\n"
+msgstr "%s: 交易日誌目錄位置必須是絕對路徑\n"
+
+#: initdb.c:3202
+#, c-format
+msgid ""
+"If you want to store the transaction log there, either\n"
+"remove or empty the directory \"%s\".\n"
+msgstr ""
+"如果您要將交易日誌儲存在那裡,\n"
+"請移除或清空目錄 \"%s\"。\n"
+
+# commands/tablespace.c:355 commands/tablespace.c:984
+#: initdb.c:3221
+#, c-format
+msgid "%s: could not create symbolic link \"%s\": %s\n"
+msgstr "%s: 無法建立符號連結 \"%s\":%s\n"
+
+# commands/tablespace.c:386 commands/tablespace.c:483
+#: initdb.c:3226
+#, c-format
+msgid "%s: symlinks are not supported on this platform"
+msgstr "%s: 此平台不支援符號連結"
+
+#: initdb.c:3232
+#, c-format
+msgid "creating subdirectories ... "
+msgstr "建立子目錄..."
+
+#: initdb.c:3298
+#, c-format
+msgid ""
+"\n"
+"Success. You can now start the database server using:\n"
+"\n"
+" %s%s%spostgres%s -D %s%s%s\n"
+"or\n"
+" %s%s%spg_ctl%s -D %s%s%s -l logfile start\n"
+"\n"
+msgstr ""
+"\n"
+"執行成功。您現在可以使用下列指令啟動資料庫伺服器:\n"
+"\n"
+" %s%s%spostgres%s -D %s%s%s\n"
+"或\n"
+" %s%s%spg_ctl%s -D %s%s%s -l logfile start\n"
+"\n"
+
+#: ../../port/dirmod.c:75 ../../port/dirmod.c:88 ../../port/dirmod.c:101
+#, c-format
+msgid "out of memory\n"
+msgstr "記憶體用盡\n"
+
+#: ../../port/dirmod.c:286
+#, c-format
+msgid "could not set junction for \"%s\": %s\n"
+msgstr "無法為 \"%s\" 設定連接: %s\n"
+
+#: ../../port/dirmod.c:361
+#, c-format
+msgid "could not get junction for \"%s\": %s\n"
+msgstr "無法為 \"%s\" 取得連接: %s\n"
+
+# access/transam/slru.c:930 commands/tablespace.c:529
+# commands/tablespace.c:694 utils/adt/misc.c:174
+#: ../../port/dirmod.c:443
+#, c-format
+msgid "could not open directory \"%s\": %s\n"
+msgstr "無法開啟目錄 \"%s\":%s\n"
+
+# access/transam/slru.c:967 commands/tablespace.c:577
+# commands/tablespace.c:721
+#: ../../port/dirmod.c:480
+#, c-format
+msgid "could not read directory \"%s\": %s\n"
+msgstr "無法讀取目錄 \"%s\":%s\n"
+
+# access/transam/slru.c:967 commands/tablespace.c:577
+# commands/tablespace.c:721
+#: ../../port/dirmod.c:563
+#, c-format
+msgid "could not stat file or directory \"%s\": %s\n"
+msgstr "無法對檔案或目錄 \"%s\" 執行 stat 函式:%s\n"
+
+# commands/tablespace.c:610
+#: ../../port/dirmod.c:590 ../../port/dirmod.c:607
+#, c-format
+msgid "could not remove file or directory \"%s\": %s\n"
+msgstr "無法移除檔案或目錄 \"%s\":%s\n"
+
+#: ../../port/exec.c:125 ../../port/exec.c:239 ../../port/exec.c:282
+#, c-format
+msgid "could not identify current directory: %s"
+msgstr "無法識別目前的目錄:%s"
+
+# command.c:122
+#: ../../port/exec.c:144
+#, c-format
+msgid "invalid binary \"%s\""
+msgstr "無效的二進制碼 \"%s\""
+
+# command.c:1103
+#: ../../port/exec.c:193
+#, c-format
+msgid "could not read binary \"%s\""
+msgstr "無法讀取二進制碼 \"%s\""
+
+#: ../../port/exec.c:200
+#, c-format
+msgid "could not find a \"%s\" to execute"
+msgstr "未能找到一個 \"%s\" 來執行"
+
+#: ../../port/exec.c:255 ../../port/exec.c:291
+#, c-format
+msgid "could not change directory to \"%s\""
+msgstr "無法切換目錄至\"%s\""
+
+#: ../../port/exec.c:270
+#, c-format
+msgid "could not read symbolic link \"%s\""
+msgstr "無法讀取符號連結\"%s\""
+
+#: ../../port/exec.c:517
+#, c-format
+msgid "child process exited with exit code %d"
+msgstr "子行程結束,結束代碼 %d"
+
+#: ../../port/exec.c:521
+#, c-format
+msgid "child process was terminated by exception 0x%X"
+msgstr "子行程被例外(exception) 0x%X 終止"
+
+#: ../../port/exec.c:530
+#, c-format
+msgid "child process was terminated by signal %s"
+msgstr "子行程被信號 %s 終止"
+
+#: ../../port/exec.c:533
+#, c-format
+msgid "child process was terminated by signal %d"
+msgstr "子行程被信號 %d 結束"
+
+#: ../../port/exec.c:537
+#, c-format
+msgid "child process exited with unrecognized status %d"
+msgstr "子行程結束,不明結束代碼 %d"
+
+#~ msgid ""
+#~ "%s: The password file was not generated. Please report this problem.\n"
+#~ msgstr "%s:無法產生密碼檔,請回報這個錯誤。\n"
+
+#~ msgid "%s: could not determine valid short version string\n"
+#~ msgstr "%s:無法取得短版本字串\n"
+
+#~ msgid "enabling unlimited row size for system tables ... "
+#~ msgstr "啟用系統資料表的無資料筆數限制 ..."
+
+#~ msgid ""
+#~ " --locale=LOCALE initialize database cluster with given "
+#~ "locale\n"
+#~ msgstr " --locale=LOCALE 以指定的locale初始化資料庫cluster\n"
+
+#~ msgid "creating directory %s/%s ... "
+#~ msgstr "建立目錄 %s/%s ..."
+
+#~ msgid "%s: failed\n"
+#~ msgstr "%s:失敗\n"
diff --git a/src/bin/pg_basebackup/.gitignore b/src/bin/pg_basebackup/.gitignore
new file mode 100644
index 0000000000..a2510fbd82
--- /dev/null
+++ b/src/bin/pg_basebackup/.gitignore
@@ -0,0 +1 @@
+/pg_basebackup
diff --git a/src/bin/pg_basebackup/Makefile b/src/bin/pg_basebackup/Makefile
new file mode 100644
index 0000000000..ccb15025ef
--- /dev/null
+++ b/src/bin/pg_basebackup/Makefile
@@ -0,0 +1,38 @@
+#-------------------------------------------------------------------------
+#
+# Makefile for src/bin/pg_basebackup
+#
+# Portions Copyright (c) 1996-2011, PostgreSQL Global Development Group
+# Portions Copyright (c) 1994, Regents of the University of California
+#
+# src/bin/pg_basebackup/Makefile
+#
+#-------------------------------------------------------------------------
+
+PGFILEDESC = "pg_basebackup - takes a streaming base backup of a PostgreSQL instance"
+PGAPPICON=win32
+
+subdir = src/bin/pg_basebackup
+top_builddir = ../../..
+include $(top_builddir)/src/Makefile.global
+
+override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
+
+OBJS= pg_basebackup.o $(WIN32RES)
+
+all: pg_basebackup
+
+pg_basebackup: $(OBJS) | submake-libpq submake-libpgport
+ $(CC) $(CFLAGS) $(OBJS) $(libpq_pgport) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
+
+install: all installdirs
+ $(INSTALL_PROGRAM) pg_basebackup$(X) '$(DESTDIR)$(bindir)/pg_basebackup$(X)'
+
+installdirs:
+ $(MKDIR_P) '$(DESTDIR)$(bindir)'
+
+uninstall:
+ rm -f '$(DESTDIR)$(bindir)/pg_basebackup$(X)'
+
+clean distclean maintainer-clean:
+ rm -f pg_basebackup$(X) $(OBJS)
diff --git a/src/bin/pg_basebackup/nls.mk b/src/bin/pg_basebackup/nls.mk
new file mode 100644
index 0000000000..8a479d72cd
--- /dev/null
+++ b/src/bin/pg_basebackup/nls.mk
@@ -0,0 +1,5 @@
+# src/bin/pg_basebackup/nls.mk
+CATALOG_NAME := pg_basebackup
+AVAIL_LANGUAGES := de es
+GETTEXT_FILES := pg_basebackup.c
+GETTEXT_TRIGGERS:= _
diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c
new file mode 100644
index 0000000000..9bf1fcdc4b
--- /dev/null
+++ b/src/bin/pg_basebackup/pg_basebackup.c
@@ -0,0 +1,1124 @@
+/*-------------------------------------------------------------------------
+ *
+ * pg_basebackup.c - receive a base backup using streaming replication protocol
+ *
+ * Author: Magnus Hagander <magnus@hagander.net>
+ *
+ * Portions Copyright (c) 1996-2011, PostgreSQL Global Development Group
+ *
+ * IDENTIFICATION
+ * src/bin/pg_basebackup/pg_basebackup.c
+ *-------------------------------------------------------------------------
+ */
+
+#include "postgres_fe.h"
+#include "libpq-fe.h"
+
+#include <unistd.h>
+#include <dirent.h>
+#include <sys/stat.h>
+
+#ifdef HAVE_LIBZ
+#include <zlib.h>
+#endif
+
+#include "getopt_long.h"
+
+
+/* Global options */
+static const char *progname;
+char *basedir = NULL;
+char format = 'p'; /* p(lain)/t(ar) */
+char *label = "pg_basebackup base backup";
+bool showprogress = false;
+int verbose = 0;
+int compresslevel = 0;
+bool includewal = false;
+bool fastcheckpoint = false;
+char *dbhost = NULL;
+char *dbuser = NULL;
+char *dbport = NULL;
+int dbgetpassword = 0; /* 0=auto, -1=never, 1=always */
+
+/* Progress counters */
+static uint64 totalsize;
+static uint64 totaldone;
+static int tablespacecount;
+
+/* Connection kept global so we can disconnect easily */
+static PGconn *conn = NULL;
+
+#define disconnect_and_exit(code) \
+ { \
+ if (conn != NULL) PQfinish(conn); \
+ exit(code); \
+ }
+
+/* Function headers */
+static char *xstrdup(const char *s);
+static void *xmalloc0(int size);
+static void usage(void);
+static void verify_dir_is_empty_or_create(char *dirname);
+static void progress_report(int tablespacenum, char *fn);
+static PGconn *GetConnection(void);
+
+static void ReceiveTarFile(PGconn *conn, PGresult *res, int rownum);
+static void ReceiveAndUnpackTarFile(PGconn *conn, PGresult *res, int rownum);
+static void BaseBackup(void);
+
+#ifdef HAVE_LIBZ
+static const char *
+get_gz_error(gzFile *gzf)
+{
+ int errnum;
+ const char *errmsg;
+
+ errmsg = gzerror(gzf, &errnum);
+ if (errnum == Z_ERRNO)
+ return strerror(errno);
+ else
+ return errmsg;
+}
+#endif
+
+/*
+ * strdup() and malloc() replacements that prints an error and exits
+ * if something goes wrong. Can never return NULL.
+ */
+static char *
+xstrdup(const char *s)
+{
+ char *result;
+
+ result = strdup(s);
+ if (!result)
+ {
+ fprintf(stderr, _("%s: out of memory\n"), progname);
+ exit(1);
+ }
+ return result;
+}
+
+static void *
+xmalloc0(int size)
+{
+ void *result;
+
+ result = malloc(size);
+ if (!result)
+ {
+ fprintf(stderr, _("%s: out of memory\n"), progname);
+ exit(1);
+ }
+ MemSet(result, 0, size);
+ return result;
+}
+
+
+static void
+usage(void)
+{
+ printf(_("%s takes a base backup of a running PostgreSQL server.\n\n"),
+ progname);
+ printf(_("Usage:\n"));
+ printf(_(" %s [OPTION]...\n"), progname);
+ printf(_("\nOptions controlling the output:\n"));
+ printf(_(" -D, --pgdata=DIRECTORY receive base backup into directory\n"));
+ printf(_(" -F, --format=p|t output format (plain, tar)\n"));
+ printf(_(" -x, --xlog include required WAL files in backup\n"));
+ printf(_(" -z, --gzip compress tar output\n"));
+ printf(_(" -Z, --compress=0-9 compress tar output with given compression level\n"));
+ printf(_("\nGeneral options:\n"));
+ printf(_(" -c, --checkpoint=fast|spread\n"
+ " set fast or spread checkpointing\n"));
+ printf(_(" -l, --label=LABEL set backup label\n"));
+ printf(_(" -P, --progress show progress information\n"));
+ printf(_(" -v, --verbose output verbose messages\n"));
+ printf(_(" --help show this help, then exit\n"));
+ printf(_(" --version output version information, then exit\n"));
+ printf(_("\nConnection options:\n"));
+ printf(_(" -h, --host=HOSTNAME database server host or socket directory\n"));
+ printf(_(" -p, --port=PORT database server port number\n"));
+ printf(_(" -U, --username=NAME connect as specified database user\n"));
+ printf(_(" -w, --no-password never prompt for password\n"));
+ printf(_(" -W, --password force password prompt (should happen automatically)\n"));
+ printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));
+}
+
+
+/*
+ * Verify that the given directory exists and is empty. If it does not
+ * exist, it is created. If it exists but is not empty, an error will
+ * be give and the process ended.
+ */
+static void
+verify_dir_is_empty_or_create(char *dirname)
+{
+ switch (pg_check_dir(dirname))
+ {
+ case 0:
+
+ /*
+ * Does not exist, so create
+ */
+ if (pg_mkdir_p(dirname, S_IRWXU) == -1)
+ {
+ fprintf(stderr,
+ _("%s: could not create directory \"%s\": %s\n"),
+ progname, dirname, strerror(errno));
+ disconnect_and_exit(1);
+ }
+ return;
+ case 1:
+
+ /*
+ * Exists, empty
+ */
+ return;
+ case 2:
+
+ /*
+ * Exists, not empty
+ */
+ fprintf(stderr,
+ _("%s: directory \"%s\" exists but is not empty\n"),
+ progname, dirname);
+ disconnect_and_exit(1);
+ case -1:
+
+ /*
+ * Access problem
+ */
+ fprintf(stderr, _("%s: could not access directory \"%s\": %s\n"),
+ progname, dirname, strerror(errno));
+ disconnect_and_exit(1);
+ }
+}
+
+
+/*
+ * Print a progress report based on the global variables. If verbose output
+ * is enabled, also print the current file name.
+ */
+static void
+progress_report(int tablespacenum, char *fn)
+{
+ int percent = (int) ((totaldone / 1024) * 100 / totalsize);
+
+ if (percent > 100)
+ percent = 100;
+
+ if (verbose)
+ {
+ if (!fn)
+
+ /*
+ * No filename given, so clear the status line (used for last
+ * call)
+ */
+ fprintf(stderr,
+ INT64_FORMAT "/" INT64_FORMAT " kB (100%%) %i/%i tablespaces %35s\r",
+ totaldone / 1024, totalsize,
+ tablespacenum, tablespacecount, "");
+ else
+ fprintf(stderr,
+ INT64_FORMAT "/" INT64_FORMAT " kB (%i%%) %i/%i tablespaces (%-30.30s)\r",
+ totaldone / 1024, totalsize,
+ percent,
+ tablespacenum, tablespacecount, fn);
+ }
+ else
+ fprintf(stderr, INT64_FORMAT "/" INT64_FORMAT " kB (%i%%) %i/%i tablespaces\r",
+ totaldone / 1024, totalsize,
+ percent,
+ tablespacenum, tablespacecount);
+}
+
+
+/*
+ * Receive a tar format file from the connection to the server, and write
+ * the data from this file directly into a tar file. If compression is
+ * enabled, the data will be compressed while written to the file.
+ *
+ * The file will be named base.tar[.gz] if it's for the main data directory
+ * or <tablespaceoid>.tar[.gz] if it's for another tablespace.
+ *
+ * No attempt to inspect or validate the contents of the file is done.
+ */
+static void
+ReceiveTarFile(PGconn *conn, PGresult *res, int rownum)
+{
+ char fn[MAXPGPATH];
+ char *copybuf = NULL;
+ FILE *tarfile = NULL;
+
+#ifdef HAVE_LIBZ
+ gzFile *ztarfile = NULL;
+#endif
+
+ if (PQgetisnull(res, rownum, 0))
+
+ /*
+ * Base tablespaces
+ */
+ if (strcmp(basedir, "-") == 0)
+ {
+#ifdef HAVE_LIBZ
+ if (compresslevel > 0)
+ {
+ ztarfile = gzdopen(dup(fileno(stdout)), "wb");
+ if (gzsetparams(ztarfile, compresslevel, Z_DEFAULT_STRATEGY) != Z_OK)
+ {
+ fprintf(stderr, _("%s: could not set compression level %i: %s\n"),
+ progname, compresslevel, get_gz_error(ztarfile));
+ disconnect_and_exit(1);
+ }
+ }
+ else
+#endif
+ tarfile = stdout;
+ }
+ else
+ {
+#ifdef HAVE_LIBZ
+ if (compresslevel > 0)
+ {
+ snprintf(fn, sizeof(fn), "%s/base.tar.gz", basedir);
+ ztarfile = gzopen(fn, "wb");
+ if (gzsetparams(ztarfile, compresslevel, Z_DEFAULT_STRATEGY) != Z_OK)
+ {
+ fprintf(stderr, _("%s: could not set compression level %i: %s\n"),
+ progname, compresslevel, get_gz_error(ztarfile));
+ disconnect_and_exit(1);
+ }
+ }
+ else
+#endif
+ {
+ snprintf(fn, sizeof(fn), "%s/base.tar", basedir);
+ tarfile = fopen(fn, "wb");
+ }
+ }
+ else
+ {
+ /*
+ * Specific tablespace
+ */
+#ifdef HAVE_LIBZ
+ if (compresslevel > 0)
+ {
+ snprintf(fn, sizeof(fn), "%s/%s.tar.gz", basedir, PQgetvalue(res, rownum, 0));
+ ztarfile = gzopen(fn, "wb");
+ if (gzsetparams(ztarfile, compresslevel, Z_DEFAULT_STRATEGY) != Z_OK)
+ {
+ fprintf(stderr, _("%s: could not set compression level %i: %s\n"),
+ progname, compresslevel, get_gz_error(ztarfile));
+ disconnect_and_exit(1);
+ }
+ }
+ else
+#endif
+ {
+ snprintf(fn, sizeof(fn), "%s/%s.tar", basedir, PQgetvalue(res, rownum, 0));
+ tarfile = fopen(fn, "wb");
+ }
+ }
+
+#ifdef HAVE_LIBZ
+ if (compresslevel > 0)
+ {
+ if (!ztarfile)
+ {
+ /* Compression is in use */
+ fprintf(stderr, _("%s: could not create compressed file \"%s\": %s\n"),
+ progname, fn, get_gz_error(ztarfile));
+ disconnect_and_exit(1);
+ }
+ }
+ else
+#endif
+ {
+ /* Either no zlib support, or zlib support but compresslevel = 0 */
+ if (!tarfile)
+ {
+ fprintf(stderr, _("%s: could not create file \"%s\": %s\n"),
+ progname, fn, strerror(errno));
+ disconnect_and_exit(1);
+ }
+ }
+
+ /*
+ * Get the COPY data stream
+ */
+ res = PQgetResult(conn);
+ if (PQresultStatus(res) != PGRES_COPY_OUT)
+ {
+ fprintf(stderr, _("%s: could not get COPY data stream: %s"),
+ progname, PQerrorMessage(conn));
+ disconnect_and_exit(1);
+ }
+
+ while (1)
+ {
+ int r;
+
+ if (copybuf != NULL)
+ {
+ PQfreemem(copybuf);
+ copybuf = NULL;
+ }
+
+ r = PQgetCopyData(conn, &copybuf, 0);
+ if (r == -1)
+ {
+ /*
+ * End of chunk. Close file (but not stdout).
+ *
+ * Also, write two completely empty blocks at the end of the tar
+ * file, as required by some tar programs.
+ */
+ char zerobuf[1024];
+
+ MemSet(zerobuf, 0, sizeof(zerobuf));
+#ifdef HAVE_LIBZ
+ if (ztarfile != NULL)
+ {
+ if (gzwrite(ztarfile, zerobuf, sizeof(zerobuf)) != sizeof(zerobuf))
+ {
+ fprintf(stderr, _("%s: could not write to compressed file \"%s\": %s\n"),
+ progname, fn, get_gz_error(ztarfile));
+ }
+ }
+ else
+#endif
+ {
+ if (fwrite(zerobuf, sizeof(zerobuf), 1, tarfile) != 1)
+ {
+ fprintf(stderr, _("%s: could not write to file \"%s\": %s\n"),
+ progname, fn, strerror(errno));
+ disconnect_and_exit(1);
+ }
+ }
+
+ if (strcmp(basedir, "-") == 0)
+ {
+#ifdef HAVE_LIBZ
+ if (ztarfile)
+ gzclose(ztarfile);
+#endif
+ }
+ else
+ {
+#ifdef HAVE_LIBZ
+ if (ztarfile != NULL)
+ gzclose(ztarfile);
+#endif
+ if (tarfile != NULL)
+ fclose(tarfile);
+ }
+
+ break;
+ }
+ else if (r == -2)
+ {
+ fprintf(stderr, _("%s: could not read COPY data: %s"),
+ progname, PQerrorMessage(conn));
+ disconnect_and_exit(1);
+ }
+
+#ifdef HAVE_LIBZ
+ if (ztarfile != NULL)
+ {
+ if (gzwrite(ztarfile, copybuf, r) != r)
+ {
+ fprintf(stderr, _("%s: could not write to compressed file \"%s\": %s\n"),
+ progname, fn, get_gz_error(ztarfile));
+ }
+ }
+ else
+#endif
+ {
+ if (fwrite(copybuf, r, 1, tarfile) != 1)
+ {
+ fprintf(stderr, _("%s: could not write to file \"%s\": %s\n"),
+ progname, fn, strerror(errno));
+ disconnect_and_exit(1);
+ }
+ }
+ totaldone += r;
+ if (showprogress)
+ progress_report(rownum, fn);
+ } /* while (1) */
+
+ if (copybuf != NULL)
+ PQfreemem(copybuf);
+}
+
+/*
+ * Receive a tar format stream from the connection to the server, and unpack
+ * the contents of it into a directory. Only files, directories and
+ * symlinks are supported, no other kinds of special files.
+ *
+ * If the data is for the main data directory, it will be restored in the
+ * specified directory. If it's for another tablespace, it will be restored
+ * in the original directory, since relocation of tablespaces is not
+ * supported.
+ */
+static void
+ReceiveAndUnpackTarFile(PGconn *conn, PGresult *res, int rownum)
+{
+ char current_path[MAXPGPATH];
+ char fn[MAXPGPATH];
+ int current_len_left;
+ int current_padding = 0;
+ char *copybuf = NULL;
+ FILE *file = NULL;
+
+ if (PQgetisnull(res, rownum, 0))
+ strcpy(current_path, basedir);
+ else
+ strcpy(current_path, PQgetvalue(res, rownum, 1));
+
+ /*
+ * Make sure we're unpacking into an empty directory
+ */
+ verify_dir_is_empty_or_create(current_path);
+
+ /*
+ * Get the COPY data
+ */
+ res = PQgetResult(conn);
+ if (PQresultStatus(res) != PGRES_COPY_OUT)
+ {
+ fprintf(stderr, _("%s: could not get COPY data stream: %s"),
+ progname, PQerrorMessage(conn));
+ disconnect_and_exit(1);
+ }
+
+ while (1)
+ {
+ int r;
+
+ if (copybuf != NULL)
+ {
+ PQfreemem(copybuf);
+ copybuf = NULL;
+ }
+
+ r = PQgetCopyData(conn, &copybuf, 0);
+
+ if (r == -1)
+ {
+ /*
+ * End of chunk
+ */
+ if (file)
+ fclose(file);
+
+ break;
+ }
+ else if (r == -2)
+ {
+ fprintf(stderr, _("%s: could not read COPY data: %s"),
+ progname, PQerrorMessage(conn));
+ disconnect_and_exit(1);
+ }
+
+ if (file == NULL)
+ {
+ int filemode;
+
+ /*
+ * No current file, so this must be the header for a new file
+ */
+ if (r != 512)
+ {
+ fprintf(stderr, _("%s: invalid tar block header size: %i\n"),
+ progname, r);
+ disconnect_and_exit(1);
+ }
+ totaldone += 512;
+
+ if (sscanf(copybuf + 124, "%11o", &current_len_left) != 1)
+ {
+ fprintf(stderr, _("%s: could not parse file size\n"),
+ progname);
+ disconnect_and_exit(1);
+ }
+
+ /* Set permissions on the file */
+ if (sscanf(&copybuf[100], "%07o ", &filemode) != 1)
+ {
+ fprintf(stderr, _("%s: could not parse file mode\n"),
+ progname);
+ disconnect_and_exit(1);
+ }
+
+ /*
+ * All files are padded up to 512 bytes
+ */
+ current_padding =
+ ((current_len_left + 511) & ~511) - current_len_left;
+
+ /*
+ * First part of header is zero terminated filename
+ */
+ snprintf(fn, sizeof(fn), "%s/%s", current_path, copybuf);
+ if (fn[strlen(fn) - 1] == '/')
+ {
+ /*
+ * Ends in a slash means directory or symlink to directory
+ */
+ if (copybuf[156] == '5')
+ {
+ /*
+ * Directory
+ */
+ fn[strlen(fn) - 1] = '\0'; /* Remove trailing slash */
+ if (mkdir(fn, S_IRWXU) != 0)
+ {
+ fprintf(stderr,
+ _("%s: could not create directory \"%s\": %s\n"),
+ progname, fn, strerror(errno));
+ disconnect_and_exit(1);
+ }
+#ifndef WIN32
+ if (chmod(fn, (mode_t) filemode))
+ fprintf(stderr, _("%s: could not set permissions on directory \"%s\": %s\n"),
+ progname, fn, strerror(errno));
+#endif
+ }
+ else if (copybuf[156] == '2')
+ {
+ /*
+ * Symbolic link
+ */
+ fn[strlen(fn) - 1] = '\0'; /* Remove trailing slash */
+ if (symlink(&copybuf[157], fn) != 0)
+ {
+ fprintf(stderr,
+ _("%s: could not create symbolic link from \"%s\" to \"%s\": %s\n"),
+ progname, fn, &copybuf[157], strerror(errno));
+ disconnect_and_exit(1);
+ }
+ }
+ else
+ {
+ fprintf(stderr, _("%s: unrecognized link indicator \"%c\"\n"),
+ progname, copybuf[156]);
+ disconnect_and_exit(1);
+ }
+ continue; /* directory or link handled */
+ }
+
+ /*
+ * regular file
+ */
+ file = fopen(fn, "wb");
+ if (!file)
+ {
+ fprintf(stderr, _("%s: could not create file \"%s\": %s\n"),
+ progname, fn, strerror(errno));
+ disconnect_and_exit(1);
+ }
+
+#ifndef WIN32
+ if (chmod(fn, (mode_t) filemode))
+ fprintf(stderr, _("%s: could not set permissions on file \"%s\": %s\n"),
+ progname, fn, strerror(errno));
+#endif
+
+ if (current_len_left == 0)
+ {
+ /*
+ * Done with this file, next one will be a new tar header
+ */
+ fclose(file);
+ file = NULL;
+ continue;
+ }
+ } /* new file */
+ else
+ {
+ /*
+ * Continuing blocks in existing file
+ */
+ if (current_len_left == 0 && r == current_padding)
+ {
+ /*
+ * Received the padding block for this file, ignore it and
+ * close the file, then move on to the next tar header.
+ */
+ fclose(file);
+ file = NULL;
+ totaldone += r;
+ continue;
+ }
+
+ if (fwrite(copybuf, r, 1, file) != 1)
+ {
+ fprintf(stderr, _("%s: could not write to file \"%s\": %s\n"),
+ progname, fn, strerror(errno));
+ disconnect_and_exit(1);
+ }
+ totaldone += r;
+ if (showprogress)
+ progress_report(rownum, fn);
+
+ current_len_left -= r;
+ if (current_len_left == 0 && current_padding == 0)
+ {
+ /*
+ * Received the last block, and there is no padding to be
+ * expected. Close the file and move on to the next tar
+ * header.
+ */
+ fclose(file);
+ file = NULL;
+ continue;
+ }
+ } /* continuing data in existing file */
+ } /* loop over all data blocks */
+
+ if (file != NULL)
+ {
+ fprintf(stderr, _("%s: COPY stream ended before last file was finished\n"), progname);
+ disconnect_and_exit(1);
+ }
+
+ if (copybuf != NULL)
+ PQfreemem(copybuf);
+}
+
+
+static PGconn *
+GetConnection(void)
+{
+ PGconn *tmpconn;
+ int argcount = 4; /* dbname, replication, fallback_app_name,
+ * password */
+ int i;
+ const char **keywords;
+ const char **values;
+ char *password = NULL;
+
+ if (dbhost)
+ argcount++;
+ if (dbuser)
+ argcount++;
+ if (dbport)
+ argcount++;
+
+ keywords = xmalloc0((argcount + 1) * sizeof(*keywords));
+ values = xmalloc0((argcount + 1) * sizeof(*values));
+
+ keywords[0] = "dbname";
+ values[0] = "replication";
+ keywords[1] = "replication";
+ values[1] = "true";
+ keywords[2] = "fallback_application_name";
+ values[2] = progname;
+ i = 3;
+ if (dbhost)
+ {
+ keywords[i] = "host";
+ values[i] = dbhost;
+ i++;
+ }
+ if (dbuser)
+ {
+ keywords[i] = "user";
+ values[i] = dbuser;
+ i++;
+ }
+ if (dbport)
+ {
+ keywords[i] = "port";
+ values[i] = dbport;
+ i++;
+ }
+
+ while (true)
+ {
+ if (dbgetpassword == 1)
+ {
+ /* Prompt for a password */
+ password = simple_prompt(_("Password: "), 100, false);
+ keywords[argcount - 1] = "password";
+ values[argcount - 1] = password;
+ }
+
+ tmpconn = PQconnectdbParams(keywords, values, true);
+ if (password)
+ free(password);
+
+ if (PQstatus(tmpconn) == CONNECTION_BAD &&
+ PQconnectionNeedsPassword(tmpconn) &&
+ dbgetpassword != -1)
+ {
+ dbgetpassword = 1; /* ask for password next time */
+ PQfinish(tmpconn);
+ continue;
+ }
+
+ if (PQstatus(tmpconn) != CONNECTION_OK)
+ {
+ fprintf(stderr, _("%s: could not connect to server: %s"),
+ progname, PQerrorMessage(tmpconn));
+ exit(1);
+ }
+
+ /* Connection ok! */
+ free(values);
+ free(keywords);
+ return tmpconn;
+ }
+}
+
+static void
+BaseBackup(void)
+{
+ PGresult *res;
+ char current_path[MAXPGPATH];
+ char escaped_label[MAXPGPATH];
+ int i;
+ char xlogstart[64];
+ char xlogend[64];
+
+ /*
+ * Connect in replication mode to the server
+ */
+ conn = GetConnection();
+
+ /*
+ * Start the actual backup
+ */
+ PQescapeStringConn(conn, escaped_label, label, sizeof(escaped_label), &i);
+ snprintf(current_path, sizeof(current_path), "BASE_BACKUP LABEL '%s' %s %s %s %s",
+ escaped_label,
+ showprogress ? "PROGRESS" : "",
+ includewal ? "WAL" : "",
+ fastcheckpoint ? "FAST" : "",
+ includewal ? "NOWAIT" : "");
+
+ if (PQsendQuery(conn, current_path) == 0)
+ {
+ fprintf(stderr, _("%s: could not send base backup command: %s"),
+ progname, PQerrorMessage(conn));
+ disconnect_and_exit(1);
+ }
+
+ /*
+ * Get the starting xlog position
+ */
+ res = PQgetResult(conn);
+ if (PQresultStatus(res) != PGRES_TUPLES_OK)
+ {
+ fprintf(stderr, _("%s: could not initiate base backup: %s"),
+ progname, PQerrorMessage(conn));
+ disconnect_and_exit(1);
+ }
+ if (PQntuples(res) != 1)
+ {
+ fprintf(stderr, _("%s: no start point returned from server\n"),
+ progname);
+ disconnect_and_exit(1);
+ }
+ strcpy(xlogstart, PQgetvalue(res, 0, 0));
+ if (verbose && includewal)
+ fprintf(stderr, "xlog start point: %s\n", xlogstart);
+ PQclear(res);
+ MemSet(xlogend, 0, sizeof(xlogend));
+
+ /*
+ * Get the header
+ */
+ res = PQgetResult(conn);
+ if (PQresultStatus(res) != PGRES_TUPLES_OK)
+ {
+ fprintf(stderr, _("%s: could not get backup header: %s"),
+ progname, PQerrorMessage(conn));
+ disconnect_and_exit(1);
+ }
+ if (PQntuples(res) < 1)
+ {
+ fprintf(stderr, _("%s: no data returned from server\n"), progname);
+ disconnect_and_exit(1);
+ }
+
+ /*
+ * Sum up the total size, for progress reporting
+ */
+ totalsize = totaldone = 0;
+ tablespacecount = PQntuples(res);
+ for (i = 0; i < PQntuples(res); i++)
+ {
+ if (showprogress)
+ totalsize += atol(PQgetvalue(res, i, 2));
+
+ /*
+ * Verify tablespace directories are empty. Don't bother with the
+ * first once since it can be relocated, and it will be checked before
+ * we do anything anyway.
+ */
+ if (format == 'p' && !PQgetisnull(res, i, 1))
+ verify_dir_is_empty_or_create(PQgetvalue(res, i, 1));
+ }
+
+ /*
+ * When writing to stdout, require a single tablespace
+ */
+ if (format == 't' && strcmp(basedir, "-") == 0 && PQntuples(res) > 1)
+ {
+ fprintf(stderr, _("%s: can only write single tablespace to stdout, database has %i\n"),
+ progname, PQntuples(res));
+ disconnect_and_exit(1);
+ }
+
+ /*
+ * Start receiving chunks
+ */
+ for (i = 0; i < PQntuples(res); i++)
+ {
+ if (format == 't')
+ ReceiveTarFile(conn, res, i);
+ else
+ ReceiveAndUnpackTarFile(conn, res, i);
+ } /* Loop over all tablespaces */
+
+ if (showprogress)
+ {
+ progress_report(PQntuples(res), NULL);
+ fprintf(stderr, "\n"); /* Need to move to next line */
+ }
+ PQclear(res);
+
+ /*
+ * Get the stop position
+ */
+ res = PQgetResult(conn);
+ if (PQresultStatus(res) != PGRES_TUPLES_OK)
+ {
+ fprintf(stderr, _("%s: could not get WAL end position from server\n"),
+ progname);
+ disconnect_and_exit(1);
+ }
+ if (PQntuples(res) != 1)
+ {
+ fprintf(stderr, _("%s: no WAL end position returned from server\n"),
+ progname);
+ disconnect_and_exit(1);
+ }
+ strcpy(xlogend, PQgetvalue(res, 0, 0));
+ if (verbose && includewal)
+ fprintf(stderr, "xlog end point: %s\n", xlogend);
+ PQclear(res);
+
+ res = PQgetResult(conn);
+ if (PQresultStatus(res) != PGRES_COMMAND_OK)
+ {
+ fprintf(stderr, _("%s: final receive failed: %s"),
+ progname, PQerrorMessage(conn));
+ disconnect_and_exit(1);
+ }
+
+ /*
+ * End of copy data. Final result is already checked inside the loop.
+ */
+ PQfinish(conn);
+
+ if (verbose)
+ fprintf(stderr, "%s: base backup completed\n", progname);
+}
+
+
+int
+main(int argc, char **argv)
+{
+ static struct option long_options[] = {
+ {"help", no_argument, NULL, '?'},
+ {"version", no_argument, NULL, 'V'},
+ {"pgdata", required_argument, NULL, 'D'},
+ {"format", required_argument, NULL, 'F'},
+ {"checkpoint", required_argument, NULL, 'c'},
+ {"xlog", no_argument, NULL, 'x'},
+ {"gzip", no_argument, NULL, 'z'},
+ {"compress", required_argument, NULL, 'Z'},
+ {"label", required_argument, NULL, 'l'},
+ {"host", required_argument, NULL, 'h'},
+ {"port", required_argument, NULL, 'p'},
+ {"username", required_argument, NULL, 'U'},
+ {"no-password", no_argument, NULL, 'w'},
+ {"password", no_argument, NULL, 'W'},
+ {"verbose", no_argument, NULL, 'v'},
+ {"progress", no_argument, NULL, 'P'},
+ {NULL, 0, NULL, 0}
+ };
+ int c;
+
+ int option_index;
+
+ progname = get_progname(argv[0]);
+ set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("pg_basebackup"));
+
+ if (argc > 1)
+ {
+ if (strcmp(argv[1], "--help") == 0 || strcmp(argv[1], "-?") == 0)
+ {
+ usage();
+ exit(0);
+ }
+ else if (strcmp(argv[1], "-V") == 0
+ || strcmp(argv[1], "--version") == 0)
+ {
+ puts("pg_basebackup (PostgreSQL) " PG_VERSION);
+ exit(0);
+ }
+ }
+
+ while ((c = getopt_long(argc, argv, "D:F:l:Z:c:h:p:U:xwWvP",
+ long_options, &option_index)) != -1)
+ {
+ switch (c)
+ {
+ case 'D':
+ basedir = xstrdup(optarg);
+ break;
+ case 'F':
+ if (strcmp(optarg, "p") == 0 || strcmp(optarg, "plain") == 0)
+ format = 'p';
+ else if (strcmp(optarg, "t") == 0 || strcmp(optarg, "tar") == 0)
+ format = 't';
+ else
+ {
+ fprintf(stderr, _("%s: invalid output format \"%s\", must be \"plain\" or \"tar\"\n"),
+ progname, optarg);
+ exit(1);
+ }
+ break;
+ case 'x':
+ includewal = true;
+ break;
+ case 'l':
+ label = xstrdup(optarg);
+ break;
+ case 'z':
+#ifdef HAVE_LIBZ
+ compresslevel = Z_DEFAULT_COMPRESSION;
+#else
+ compresslevel = 1; /* will be rejected below */
+#endif
+ break;
+ case 'Z':
+ compresslevel = atoi(optarg);
+ if (compresslevel <= 0 || compresslevel > 9)
+ {
+ fprintf(stderr, _("%s: invalid compression level \"%s\"\n"),
+ progname, optarg);
+ exit(1);
+ }
+ break;
+ case 'c':
+ if (pg_strcasecmp(optarg, "fast") == 0)
+ fastcheckpoint = true;
+ else if (pg_strcasecmp(optarg, "spread") == 0)
+ fastcheckpoint = false;
+ else
+ {
+ fprintf(stderr, _("%s: invalid checkpoint argument \"%s\", must be \"fast\" or \"spread\"\n"),
+ progname, optarg);
+ exit(1);
+ }
+ break;
+ case 'h':
+ dbhost = xstrdup(optarg);
+ break;
+ case 'p':
+ dbport = xstrdup(optarg);
+ break;
+ case 'U':
+ dbuser = xstrdup(optarg);
+ break;
+ case 'w':
+ dbgetpassword = -1;
+ break;
+ case 'W':
+ dbgetpassword = 1;
+ break;
+ case 'v':
+ verbose++;
+ break;
+ case 'P':
+ showprogress = true;
+ break;
+ default:
+
+ /*
+ * getopt_long already emitted a complaint
+ */
+ fprintf(stderr, _("Try \"%s --help\" for more information.\n"),
+ progname);
+ exit(1);
+ }
+ }
+
+ /*
+ * Any non-option arguments?
+ */
+ if (optind < argc)
+ {
+ fprintf(stderr,
+ _("%s: too many command-line arguments (first is \"%s\")\n"),
+ progname, argv[optind]);
+ fprintf(stderr, _("Try \"%s --help\" for more information.\n"),
+ progname);
+ exit(1);
+ }
+
+ /*
+ * Required arguments
+ */
+ if (basedir == NULL)
+ {
+ fprintf(stderr, _("%s: no target directory specified\n"), progname);
+ fprintf(stderr, _("Try \"%s --help\" for more information.\n"),
+ progname);
+ exit(1);
+ }
+
+ /*
+ * Mutually exclusive arguments
+ */
+ if (format == 'p' && compresslevel > 0)
+ {
+ fprintf(stderr,
+ _("%s: only tar mode backups can be compressed\n"),
+ progname);
+ fprintf(stderr, _("Try \"%s --help\" for more information.\n"),
+ progname);
+ exit(1);
+ }
+
+#ifndef HAVE_LIBZ
+ if (compresslevel > 0)
+ {
+ fprintf(stderr,
+ _("%s: this build does not support compression\n"),
+ progname);
+ exit(1);
+ }
+#endif
+
+ /*
+ * Verify that the target directory exists, or create it. For plaintext
+ * backups, always require the directory. For tar backups, require it
+ * unless we are writing to stdout.
+ */
+ if (format == 'p' || strcmp(basedir, "-") != 0)
+ verify_dir_is_empty_or_create(basedir);
+
+
+ BaseBackup();
+
+ return 0;
+}
diff --git a/src/bin/pg_basebackup/po/de.po b/src/bin/pg_basebackup/po/de.po
new file mode 100644
index 0000000000..b375824008
--- /dev/null
+++ b/src/bin/pg_basebackup/po/de.po
@@ -0,0 +1,365 @@
+# German message translation file for pg_basebackup
+# Copyright (C) 2011 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+# Peter Eisentraut <peter_e@gmx.net>, 2011.
+#
+# Use these quotes: »%s«
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 9.1\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2011-05-31 18:39+0000\n"
+"PO-Revision-Date: 2011-05-31 23:12+0300\n"
+"Last-Translator: Peter Eisentraut <peter_e@gmx.net>\n"
+"Language-Team: Peter Eisentraut <peter_e@gmx.net>\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: pg_basebackup.c:96 pg_basebackup.c:110
+#, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: Speicher aufgebraucht\n"
+
+#: pg_basebackup.c:121
+#, c-format
+msgid ""
+"%s takes a base backup of a running PostgreSQL server.\n"
+"\n"
+msgstr ""
+"%s erzeugt eine Basissicherung eines laufenden PostgreSQL-Servers.\n"
+"\n"
+
+#: pg_basebackup.c:123
+#, c-format
+msgid "Usage:\n"
+msgstr "Aufruf:\n"
+
+#: pg_basebackup.c:124
+#, c-format
+msgid " %s [OPTION]...\n"
+msgstr " %s [OPTION]...\n"
+
+#: pg_basebackup.c:125
+#, c-format
+msgid ""
+"\n"
+"Options controlling the output:\n"
+msgstr ""
+"\n"
+"Optionen, die die Ausgabe kontrollieren:\n"
+
+#: pg_basebackup.c:126
+#, c-format
+msgid " -D, --pgdata=DIRECTORY receive base backup into directory\n"
+msgstr ""
+" -D, --pgdata=VERZEICHNIS Basissicherung in dieses Verzeichnis empfangen\n"
+
+#: pg_basebackup.c:127
+#, c-format
+msgid " -F, --format=p|t output format (plain, tar)\n"
+msgstr " -F, --format=c|t|p Ausgabeformat (plain, tar)\n"
+
+#: pg_basebackup.c:128
+#, c-format
+msgid " -x, --xlog include required WAL files in backup\n"
+msgstr ""
+" -x, --xlog benötigte WAL-Dateien in Sicherung einbeziehen\n"
+
+#: pg_basebackup.c:129
+#, c-format
+msgid " -z, --gzip compress tar output\n"
+msgstr " -z, --gzip Tar-Ausgabe komprimieren\n"
+
+#: pg_basebackup.c:130
+#, c-format
+msgid ""
+" -Z, --compress=0-9 compress tar output with given compression level\n"
+msgstr ""
+" -Z, --compress=0-9 Tar-Ausgabe mit angegebenem Niveau komprimieren\n"
+
+#: pg_basebackup.c:131
+#, c-format
+msgid ""
+"\n"
+"General options:\n"
+msgstr ""
+"\n"
+"Allgemeine Optionen:\n"
+
+#: pg_basebackup.c:132
+#, c-format
+msgid ""
+" -c, --checkpoint=fast|spread\n"
+" set fast or spread checkpointing\n"
+msgstr ""
+" -c, --checkpoint=fast|spread\n"
+" schnelles oder verteiltes Checkpointing "
+"einstellen\n"
+
+#: pg_basebackup.c:134
+#, c-format
+msgid " -l, --label=LABEL set backup label\n"
+msgstr " -l, --label=LABEL Backup-Label setzen\n"
+
+#: pg_basebackup.c:135
+#, c-format
+msgid " -P, --progress show progress information\n"
+msgstr " -P, --progress Fortschrittsinformationen zeigen\n"
+
+#: pg_basebackup.c:136
+#, c-format
+msgid " -v, --verbose output verbose messages\n"
+msgstr " -v, --verbose »Verbose«-Modus\n"
+
+#: pg_basebackup.c:137
+#, c-format
+msgid " --help show this help, then exit\n"
+msgstr " --help diese Hilfe anzeigen, dann beenden\n"
+
+#: pg_basebackup.c:138
+#, c-format
+msgid " --version output version information, then exit\n"
+msgstr ""
+" --version Versionsinformationen anzeigen, dann beenden\n"
+
+#: pg_basebackup.c:139
+#, c-format
+msgid ""
+"\n"
+"Connection options:\n"
+msgstr ""
+"\n"
+"Verbindungsoptionen:\n"
+
+#: pg_basebackup.c:140
+#, c-format
+msgid " -h, --host=HOSTNAME database server host or socket directory\n"
+msgstr ""
+" -h, --host=HOSTNAME Name des Datenbankservers oder Socket-"
+"Verzeichnis\n"
+
+#: pg_basebackup.c:141
+#, c-format
+msgid " -p, --port=PORT database server port number\n"
+msgstr " -p, --port=PORT Portnummer des Datenbankservers\n"
+
+#: pg_basebackup.c:142
+#, c-format
+msgid " -U, --username=NAME connect as specified database user\n"
+msgstr " -U, --username=NAME Datenbankbenutzername\n"
+
+#: pg_basebackup.c:143
+#, c-format
+msgid " -w, --no-password never prompt for password\n"
+msgstr " -w, --no-password niemals nach Passwort fragen\n"
+
+#: pg_basebackup.c:144
+#, c-format
+msgid ""
+" -W, --password force password prompt (should happen "
+"automatically)\n"
+msgstr ""
+" -W, --password nach Passwort fragen (sollte automatisch "
+"geschehen)\n"
+
+#: pg_basebackup.c:145
+#, c-format
+msgid ""
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr ""
+"\n"
+"Berichten Sie Fehler an <pgsql-bugs@postgresql.org>.\n"
+
+#: pg_basebackup.c:167 pg_basebackup.c:581
+#, c-format
+msgid "%s: could not create directory \"%s\": %s\n"
+msgstr "%s: konnte Verzeichnis »%s« nicht erzeugen: %s\n"
+
+#: pg_basebackup.c:184
+#, c-format
+msgid "%s: directory \"%s\" exists but is not empty\n"
+msgstr "%s: Verzeichnis »%s« existiert aber ist nicht leer\n"
+
+#: pg_basebackup.c:192
+#, c-format
+msgid "%s: could not access directory \"%s\": %s\n"
+msgstr "%s: konnte nicht auf Verzeichnis »%s« zugreifen: %s\n"
+
+#: pg_basebackup.c:272 pg_basebackup.c:290 pg_basebackup.c:314
+#, c-format
+msgid "%s: could not set compression level %i: %s\n"
+msgstr "%s: konnte Komprimierungsniveau %i nicht setzen: %s\n"
+
+#: pg_basebackup.c:333
+#, c-format
+msgid "%s: could not create compressed file \"%s\": %s\n"
+msgstr "%s: konnte komprimierte Datei »%s« nicht erzeugen: %s\n"
+
+#: pg_basebackup.c:344 pg_basebackup.c:620
+#, c-format
+msgid "%s: could not create file \"%s\": %s\n"
+msgstr "%s: konnte Datei »%s« nicht erzeugen: %s\n"
+
+#: pg_basebackup.c:356 pg_basebackup.c:493
+#, c-format
+msgid "%s: could not get COPY data stream: %s"
+msgstr "%s: konnte COPY-Datenstrom nicht empfangen: %s"
+
+#: pg_basebackup.c:388 pg_basebackup.c:434
+#, c-format
+msgid "%s: could not write to compressed file \"%s\": %s\n"
+msgstr "%s: konnte nicht in komprimierte Datei »%s« schreiben: %s\n"
+
+#: pg_basebackup.c:397 pg_basebackup.c:443 pg_basebackup.c:660
+#, c-format
+msgid "%s: could not write to file \"%s\": %s\n"
+msgstr "%s: konnte nicht in Datei »%s« schreiben: %s\n"
+
+#: pg_basebackup.c:424 pg_basebackup.c:522
+#, c-format
+msgid "%s: could not read COPY data: %s"
+msgstr "%s: konnte COPY-Daten nicht lesen: %s"
+
+#: pg_basebackup.c:536
+#, c-format
+msgid "%s: invalid tar block header size: %i\n"
+msgstr "%s: ungültige Tar-Block-Kopf-Größe: %i\n"
+
+#: pg_basebackup.c:544
+#, c-format
+msgid "%s: could not parse file size\n"
+msgstr "%s: konnte Dateigröße nicht entziffern\n"
+
+#: pg_basebackup.c:552
+#, c-format
+msgid "%s: could not parse file mode\n"
+msgstr "%s: konnte Dateimodus nicht entziffern\n"
+
+#: pg_basebackup.c:587
+#, c-format
+msgid "%s: could not set permissions on directory \"%s\": %s\n"
+msgstr "%s: konnte Zugriffsrechte des Verzeichnisses »%s« nicht setzen: %s\n"
+
+#: pg_basebackup.c:600
+#, c-format
+msgid "%s: could not create symbolic link from \"%s\" to \"%s\": %s\n"
+msgstr ""
+"%s: konnte symbolische Verknüpfung von »%s« nach »%s« nicht erzeugen: %s\n"
+
+#: pg_basebackup.c:607
+#, c-format
+msgid "%s: unrecognized link indicator \"%c\"\n"
+msgstr "%s: unbekannter Verknüpfungsindikator »%c«\n"
+
+#: pg_basebackup.c:627
+#, c-format
+msgid "%s: could not set permissions on file \"%s\": %s\n"
+msgstr "%s: konnte Rechte der Datei »%s« nicht setzen: %s\n"
+
+#: pg_basebackup.c:685
+#, c-format
+msgid "%s: COPY stream ended before last file was finished\n"
+msgstr "%s: COPY-Strom endete vor dem Ende der letzten Datei\n"
+
+#: pg_basebackup.c:746
+msgid "Password: "
+msgstr "Passwort: "
+
+#: pg_basebackup.c:766
+#, c-format
+msgid "%s: could not connect to server: %s"
+msgstr "%s: konnte nicht mit Server verbinden: %s"
+
+#: pg_basebackup.c:806
+#, c-format
+msgid "%s: could not send base backup command: %s"
+msgstr "%s: konnte Basissicherungsbefehl nicht senden: %s"
+
+#: pg_basebackup.c:817
+#, c-format
+msgid "%s: could not initiate base backup: %s"
+msgstr "%s: konnte Basissicherung nicht starten: %s"
+
+#: pg_basebackup.c:823
+#, c-format
+msgid "%s: no start point returned from server\n"
+msgstr "%s: kein Startpunkt vom Server zurückgegeben\n"
+
+#: pg_basebackup.c:839
+#, c-format
+msgid "%s: could not get backup header: %s"
+msgstr "%s: konnte Kopf der Sicherung nicht empfangen: %s"
+
+#: pg_basebackup.c:845
+#, c-format
+msgid "%s: no data returned from server\n"
+msgstr "%s: keine Daten vom Server zurückgegeben\n"
+
+#: pg_basebackup.c:873
+#, c-format
+msgid "%s: can only write single tablespace to stdout, database has %i\n"
+msgstr ""
+"%s: kann nur einen einzelnen Tablespace auf die Standardausgabe schreiben, "
+"Datenbank hat %i\n"
+
+#: pg_basebackup.c:902
+#, c-format
+msgid "%s: could not get WAL end position from server\n"
+msgstr "%s: konnte WAL-Endposition nicht vom Server empfangen\n"
+
+#: pg_basebackup.c:908
+#, c-format
+msgid "%s: no WAL end position returned from server\n"
+msgstr "%s: kein WAL-Endpunkt vom Server zurückgegeben\n"
+
+#: pg_basebackup.c:920
+#, c-format
+msgid "%s: final receive failed: %s"
+msgstr "%s: letztes Empfangen fehlgeschlagen: %s"
+
+#: pg_basebackup.c:994
+#, c-format
+msgid "%s: invalid output format \"%s\", must be \"plain\" or \"tar\"\n"
+msgstr "%s: ungültiges Ausgabeformat »%s«, muss »plain« oder »tar« sein\n"
+
+#: pg_basebackup.c:1016
+#, c-format
+msgid "%s: invalid compression level \"%s\"\n"
+msgstr "%s: ungültiges Komprimierungsniveau »%s«\n"
+
+#: pg_basebackup.c:1028
+#, c-format
+msgid ""
+"%s: invalid checkpoint argument \"%s\", must be \"fast\" or \"spread\"\n"
+msgstr ""
+"%s: ungültiges Checkpoint-Argument »%s«, muss »fast« oder »spread« sein\n"
+
+#: pg_basebackup.c:1059 pg_basebackup.c:1073 pg_basebackup.c:1084
+#: pg_basebackup.c:1097
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "Versuchen Sie »%s --help« für weitere Informationen.\n"
+
+#: pg_basebackup.c:1071
+#, c-format
+msgid "%s: too many command-line arguments (first is \"%s\")\n"
+msgstr "%s: zu viele Kommandozeilenargumente (das erste ist »%s«)\n"
+
+#: pg_basebackup.c:1083
+#, c-format
+msgid "%s: no target directory specified\n"
+msgstr "%s: kein Zielverzeichnis angegeben\n"
+
+#: pg_basebackup.c:1095
+#, c-format
+msgid "%s: only tar mode backups can be compressed\n"
+msgstr "%s: nur Sicherungen im Tar-Modus können komprimiert werden\n"
+
+#: pg_basebackup.c:1106
+#, c-format
+msgid "%s: this build does not support compression\n"
+msgstr "%s: diese Installation unterstützt keine Komprimierung\n"
diff --git a/src/bin/pg_basebackup/po/es.po b/src/bin/pg_basebackup/po/es.po
new file mode 100644
index 0000000000..d27ce7ffa1
--- /dev/null
+++ b/src/bin/pg_basebackup/po/es.po
@@ -0,0 +1,353 @@
+# Spanish message translation file for pg_basebackup
+# Copyright (C) 2011 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+# Álvaro Herrera <alvherre@alvh.no-ip.org>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: pg_basebackup (PostgreSQL 9.1)\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2011-05-22 14:48-0400\n"
+"PO-Revision-Date: 2011-05-31 17:42-0400\n"
+"Last-Translator: Álvaro Herrera <alvherre@alvh.no-ip.org>\n"
+"Language-Team: Spanish <pgsql-es-ayuda@postgresql.org>\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: pg_basebackup.c:96 pg_basebackup.c:110
+#, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: memoria agotada\n"
+
+#: pg_basebackup.c:121
+#, c-format
+msgid ""
+"%s takes a base backup of a running PostgreSQL server.\n"
+"\n"
+msgstr ""
+"%s obtiene un respaldo base a partir de un servidor PostgreSQL en ejecución.\n"
+"\n"
+
+#: pg_basebackup.c:123
+#, c-format
+msgid "Usage:\n"
+msgstr "Empleo:\n"
+
+#: pg_basebackup.c:124
+#, c-format
+msgid " %s [OPTION]...\n"
+msgstr " %s [OPCIÓN]...\n"
+
+#: pg_basebackup.c:125
+#, c-format
+msgid ""
+"\n"
+"Options controlling the output:\n"
+msgstr ""
+"\n"
+"Opciones que controlan la salida:\n"
+
+#: pg_basebackup.c:126
+#, c-format
+msgid " -D, --pgdata=DIRECTORY receive base backup into directory\n"
+msgstr " -D, --pgdata=DIRECTORIO recibir el respaldo base en directorio\n"
+
+#: pg_basebackup.c:127
+#, c-format
+msgid " -F, --format=p|t output format (plain, tar)\n"
+msgstr " -F, --format=p|t formato de salida (plano, tar)\n"
+
+#: pg_basebackup.c:128
+#, c-format
+msgid " -x, --xlog include required WAL files in backup\n"
+msgstr " -x, --xlog incluye los archivos WAL necesarios en el respaldo\n"
+
+#: pg_basebackup.c:129
+#, c-format
+msgid " -Z, --compress=0-9 compress tar output\n"
+msgstr " -Z, --compress=0-9 comprimir la salida de tar\n"
+
+#: pg_basebackup.c:130
+#, c-format
+msgid ""
+"\n"
+"General options:\n"
+msgstr ""
+"\n"
+"Opciones generales:\n"
+
+#: pg_basebackup.c:131
+#, c-format, fuzzy
+msgid ""
+" -c, --checkpoint=fast|spread\n"
+" set fast or spread checkpointing\n"
+msgstr ""
+" -c, --checkpoint=fast|spread\n"
+" utilizar checkpoint rápido o extendido\n"
+
+#: pg_basebackup.c:133
+#, c-format
+msgid " -l, --label=LABEL set backup label\n"
+msgstr " -l, --label=ETIQUETA establecer etiqueta del respaldo\n"
+
+#: pg_basebackup.c:134
+#, c-format, fuzzy
+msgid " -P, --progress show progress information\n"
+msgstr " -P, --progress mostrar información de progreso\n"
+
+#: pg_basebackup.c:135
+#, c-format
+msgid " -v, --verbose output verbose messages\n"
+msgstr " -v, --verbose desplegar mensajes verbosos\n"
+
+#: pg_basebackup.c:136
+#, c-format
+msgid " --help show this help, then exit\n"
+msgstr " --help mostrar esta ayuda, luego salir\n"
+
+#: pg_basebackup.c:137
+#, c-format
+msgid " --version output version information, then exit\n"
+msgstr " --version desplegar información de versión, luego salir\n"
+
+#: pg_basebackup.c:138
+#, c-format
+msgid ""
+"\n"
+"Connection options:\n"
+msgstr ""
+"\n"
+"Opciones de conexión:\n"
+
+#: pg_basebackup.c:139
+#, c-format
+msgid " -h, --host=HOSTNAME database server host or socket directory\n"
+msgstr " -h, --host=ANFITRIÓN dirección del servidor o directorio del socket\n"
+
+#: pg_basebackup.c:140
+#, c-format
+msgid " -p, --port=PORT database server port number\n"
+msgstr " -p, --port=PORT número de port del servidor\n"
+
+#: pg_basebackup.c:141
+#, c-format
+msgid " -U, --username=NAME connect as specified database user\n"
+msgstr " -U, --username=NOMBRE conectarse con el usuario especificado\n"
+
+#: pg_basebackup.c:142
+#, c-format
+msgid " -w, --no-password never prompt for password\n"
+msgstr " -w, --no-password no pedir contraseña\n"
+
+#: pg_basebackup.c:143
+#, c-format
+msgid ""
+" -W, --password force password prompt (should happen "
+"automatically)\n"
+msgstr ""
+" -W, --password forzar un prompt para la contraseña\n"
+" (debería ser automático)\n"
+
+#: pg_basebackup.c:144
+#, c-format
+msgid ""
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr ""
+"\n"
+"Reporte errores a <pgsql-bugs@postgresql.org>.\n"
+
+#: pg_basebackup.c:166 pg_basebackup.c:558
+#, c-format
+msgid "%s: could not create directory \"%s\": %s\n"
+msgstr "%s: no se pudo crear el directorio «%s»: %s\n"
+
+#: pg_basebackup.c:183
+#, c-format
+msgid "%s: directory \"%s\" exists but is not empty\n"
+msgstr "%s: el directorio «%s» existe pero no está vacío\n"
+
+#: pg_basebackup.c:191
+#, c-format
+msgid "%s: could not access directory \"%s\": %s\n"
+msgstr "%s: no se pudo acceder al directorio «%s»: %s\n"
+
+#: pg_basebackup.c:274 pg_basebackup.c:298
+#, c-format
+msgid "%s: could not set compression level %i: %s\n"
+msgstr "%s: no se pudo definir el nivel de compresión %i: %s\n"
+
+#: pg_basebackup.c:317
+#, c-format
+msgid "%s: could not create compressed file \"%s\": %s\n"
+msgstr "%s: no se pudo crear el archivo comprimido «%s»: %s\n"
+
+#: pg_basebackup.c:328 pg_basebackup.c:597
+#, c-format
+msgid "%s: could not create file \"%s\": %s\n"
+msgstr "%s: no se pudo crear el archivo «%s»: %s\n"
+
+#: pg_basebackup.c:340 pg_basebackup.c:470
+#, c-format
+msgid "%s: could not get COPY data stream: %s"
+msgstr "%s: no se pudo obtener un flujo de datos COPY: %s"
+
+#: pg_basebackup.c:372 pg_basebackup.c:411
+#, c-format
+msgid "%s: could not write to compressed file \"%s\": %s\n"
+msgstr "%s: no se pudo escribir al archivo comprimido «%s»: %s\n"
+
+#: pg_basebackup.c:381 pg_basebackup.c:420 pg_basebackup.c:637
+#, c-format
+msgid "%s: could not write to file \"%s\": %s\n"
+msgstr "%s: no se pudo escribir al archivo «%s»: %s\n"
+
+#: pg_basebackup.c:401 pg_basebackup.c:499
+#, c-format
+msgid "%s: could not read COPY data: %s"
+msgstr "%s: no fue posible leer datos COPY: %s"
+
+#: pg_basebackup.c:513
+#, c-format
+msgid "%s: invalid tar block header size: %i\n"
+msgstr "%s: tamaño de bloque de cabecera de tar no válido: %i\n"
+
+#: pg_basebackup.c:521
+#, c-format
+msgid "%s: could not parse file size\n"
+msgstr "%s: no se pudo interpretar el tamaño del archivo\n"
+
+#: pg_basebackup.c:529
+#, c-format
+msgid "%s: could not parse file mode\n"
+msgstr "%s: nose pudo interpretar el modo del archivo\n"
+
+#: pg_basebackup.c:564
+#, c-format
+msgid "%s: could not set permissions on directory \"%s\": %s\n"
+msgstr "%s: no se pudo definir los permisos en el directorio «%s»: %s\n"
+
+#: pg_basebackup.c:577
+# FIXME: Why no quotes?
+#, c-format
+msgid "%s: could not create symbolic link from %s to %s: %s\n"
+msgstr "%s: no se pudo crear un enlace simbólico desde %s a %s: %s\n"
+
+#: pg_basebackup.c:584
+#, c-format
+msgid "%s: unrecognized link indicator \"%c\"\n"
+msgstr "%s: indicador de enlace «%c» no reconocido\n"
+
+#: pg_basebackup.c:604
+#, c-format
+msgid "%s: could not set permissions on file \"%s\": %s\n"
+msgstr "%s: no se pudo definir los permisos al archivo «%s»: %s\n"
+
+#: pg_basebackup.c:662
+#, c-format
+msgid "%s: last file was never finished\n"
+msgstr "%s: el último archivo nunca fue completado\n"
+
+#: pg_basebackup.c:723
+msgid "Password: "
+msgstr "Contraseña: "
+
+#: pg_basebackup.c:743
+#, c-format
+msgid "%s: could not connect to server: %s"
+msgstr "%s: no se pudo conectar al servidor: %s"
+
+#: pg_basebackup.c:783
+#, c-format
+msgid "%s: could not start base backup: %s"
+msgstr "%s: no se pudo comenzar el respaldo base: %s"
+
+#: pg_basebackup.c:794
+#, c-format
+msgid "%s: could not initiate base backup: %s"
+msgstr "%s: no se pudo iniciar el respaldo base: %s"
+
+#: pg_basebackup.c:800
+#, c-format
+msgid "%s: no start point returned from server\n"
+msgstr "%s: el servidor no retornó un punto de inicio\n"
+
+#: pg_basebackup.c:816
+#, c-format
+msgid "%s: could not get backup header: %s"
+msgstr "%s: no se pudo obtener la cabecera de respaldo: %s"
+
+#: pg_basebackup.c:822
+#, c-format
+msgid "%s: no data returned from server\n"
+msgstr "%s: el servidor no retornó datos\n"
+
+#: pg_basebackup.c:850
+#, c-format
+msgid "%s: can only write single tablespace to stdout, database has %i\n"
+msgstr "%s: sólo se puede escribir un tablespace a stdout, la base de datos tiene %i\n"
+
+#: pg_basebackup.c:879
+#, c-format
+msgid "%s: could not get end xlog position from server\n"
+msgstr "%s: no se pudo obtener la posición de fin de xlog del servidor\n"
+
+#: pg_basebackup.c:885
+#, c-format
+msgid "%s: no end point returned from server\n"
+msgstr "%s: el servidor no retornó un punto de fin de xlog\n"
+
+#: pg_basebackup.c:897
+#, c-format
+msgid "%s: final receive failed: %s"
+msgstr "%s: la recepción final falló: %s"
+
+#: pg_basebackup.c:970
+#, c-format
+msgid "%s: invalid output format \"%s\", must be \"plain\" or \"tar\"\n"
+msgstr "%s: formato de salida «%s» no válido, debe ser «plain» o «tar»\n"
+
+#: pg_basebackup.c:985
+#, c-format
+msgid "%s: invalid compression level \"%s\"\n"
+msgstr "%s: valor de compresión «%s» no válido\n"
+
+#: pg_basebackup.c:997
+#, c-format
+msgid ""
+"%s: invalid checkpoint argument \"%s\", must be \"fast\" or \"spread\"\n"
+msgstr ""
+"%s: argumento de checkpoint «%s» no válido, debe ser «fast» o «spread»\n"
+
+#: pg_basebackup.c:1028 pg_basebackup.c:1042 pg_basebackup.c:1053
+#: pg_basebackup.c:1066
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "Use «%s --help» para obtener más información.\n"
+
+#: pg_basebackup.c:1040
+#, c-format
+msgid "%s: too many command-line arguments (first is \"%s\")\n"
+msgstr "%s: demasiados argumentos en la línea de órdenes (el primero es «%s»)\n"
+
+#: pg_basebackup.c:1052
+#, c-format
+msgid "%s: no target directory specified\n"
+msgstr "%s: no se especificó un directorio de salida\n"
+
+#: pg_basebackup.c:1064
+#, c-format
+msgid "%s: only tar mode backups can be compressed\n"
+msgstr "%s: sólo los respaldos de modo tar pueden ser comprimidos\n"
+
+#: pg_basebackup.c:1075
+#, c-format
+msgid "%s: this build does not support compression\n"
+msgstr "%s: esta instalación no soporta compresión\n"
+
+#: pg_basebackup.c:1083
+#, c-format
+msgid "%s: compression is not supported on standard output\n"
+msgstr "%s: la compresión no está soportada en standard output\n"
diff --git a/src/bin/pg_config/.gitignore b/src/bin/pg_config/.gitignore
new file mode 100644
index 0000000000..169bc766de
--- /dev/null
+++ b/src/bin/pg_config/.gitignore
@@ -0,0 +1 @@
+/pg_config
diff --git a/src/bin/pg_config/Makefile b/src/bin/pg_config/Makefile
index b9ca579046..479db9cd4b 100644
--- a/src/bin/pg_config/Makefile
+++ b/src/bin/pg_config/Makefile
@@ -2,9 +2,9 @@
#
# Makefile for src/bin/pg_config
#
-# Copyright (c) 1998-2010, PostgreSQL Global Development Group
+# Copyright (c) 1998-2011, PostgreSQL Global Development Group
#
-# $PostgreSQL: pgsql/src/bin/pg_config/Makefile,v 1.25 2010/07/05 18:54:38 tgl Exp $
+# src/bin/pg_config/Makefile
#
#-------------------------------------------------------------------------
@@ -31,9 +31,9 @@ override CPPFLAGS += -DVAL_LDFLAGS_EX="\"$(LDFLAGS_EX)\""
override CPPFLAGS += -DVAL_LDFLAGS_SL="\"$(LDFLAGS_SL)\""
override CPPFLAGS += -DVAL_LIBS="\"$(LIBS)\""
-all: submake-libpgport pg_config
+all: pg_config
-pg_config: $(OBJS)
+pg_config: $(OBJS) | submake-libpgport
$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
install: all installdirs
diff --git a/src/bin/pg_config/nls.mk b/src/bin/pg_config/nls.mk
index 0372494f44..609c57f93e 100644
--- a/src/bin/pg_config/nls.mk
+++ b/src/bin/pg_config/nls.mk
@@ -1,5 +1,5 @@
-# $PostgreSQL: pgsql/src/bin/pg_config/nls.mk,v 1.21 2010/05/13 15:56:37 petere Exp $
+# src/bin/pg_config/nls.mk
CATALOG_NAME := pg_config
-AVAIL_LANGUAGES := de es fr it ja ko nb pt_BR ro ru sv ta tr zh_CN
+AVAIL_LANGUAGES := de es fr it ja ko nb pt_BR ro ru sv ta tr zh_CN zh_TW
GETTEXT_FILES := pg_config.c ../../port/exec.c
GETTEXT_TRIGGERS:= _
diff --git a/src/bin/pg_config/pg_config.c b/src/bin/pg_config/pg_config.c
index e8ddbed027..532c4a61e3 100644
--- a/src/bin/pg_config/pg_config.c
+++ b/src/bin/pg_config/pg_config.c
@@ -15,9 +15,9 @@
*
* This code is released under the terms of the PostgreSQL License.
*
- * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2011, PostgreSQL Global Development Group
*
- * $PostgreSQL: pgsql/src/bin/pg_config/pg_config.c,v 1.33 2010/07/05 18:54:38 tgl Exp $
+ * src/bin/pg_config/pg_config.c
*
*-------------------------------------------------------------------------
*/
diff --git a/src/bin/pg_config/po/es.po b/src/bin/pg_config/po/es.po
index a7f3908a3b..5173aee521 100644
--- a/src/bin/pg_config/po/es.po
+++ b/src/bin/pg_config/po/es.po
@@ -5,14 +5,14 @@
#
# Alvaro Herrera <alvherre@alvh.no-ip.org>, 2004-2010
#
-# pgtranslation Id: pg_config.po,v 1.5 2010/02/02 20:07:49 alvherre Exp $
+# pgtranslation Id: pg_config.po,v 1.6 2010/08/31 04:57:53 alvherre Exp $
#
msgid ""
msgstr ""
-"Project-Id-Version: pg_config (PostgreSQL 8.4)\n"
+"Project-Id-Version: pg_config (PostgreSQL 9.0)\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2009-04-13 15:12+0000\n"
-"PO-Revision-Date: 2010-02-02 17:01-0300\n"
+"POT-Creation-Date: 2010-08-30 20:03+0000\n"
+"PO-Revision-Date: 2010-08-31 00:57-0400\n"
"Last-Translator: Alvaro Herrera <alvherre@alvh.no-ip.org>\n"
"Language-Team: es <pgsql-es-ayuda@postgresql.org>\n"
"MIME-Version: 1.0\n"
@@ -21,11 +21,12 @@ msgstr ""
#: pg_config.c:243 pg_config.c:259 pg_config.c:275 pg_config.c:291
#: pg_config.c:307 pg_config.c:323 pg_config.c:339 pg_config.c:355
+#: pg_config.c:371
#, c-format
msgid "not recorded\n"
msgstr "no registrado\n"
-#: pg_config.c:411
+#: pg_config.c:428
#, c-format
msgid ""
"\n"
@@ -36,43 +37,45 @@ msgstr ""
"%s provee información sobre la versión instalada de PostgreSQL.\n"
"\n"
-#: pg_config.c:412
+#: pg_config.c:429
#, c-format
msgid "Usage:\n"
msgstr "Empleo:\n"
-#: pg_config.c:413
+#: pg_config.c:430
#, c-format
msgid ""
" %s [OPTION]...\n"
"\n"
-msgstr " %s [OPCIÓN]...\n"
+msgstr ""
+" %s [OPCIÓN]...\n"
"\n"
-#: pg_config.c:414
+#: pg_config.c:431
#, c-format
msgid "Options:\n"
msgstr "Opciones:\n"
-#: pg_config.c:415
+#: pg_config.c:432
#, c-format
msgid " --bindir show location of user executables\n"
msgstr ""
" --bindir muestra la ubicación de ejecutables de usuario\n"
-#: pg_config.c:416
+#: pg_config.c:433
#, c-format
msgid " --docdir show location of documentation files\n"
msgstr ""
" --docdir muestra la ubicación de archivos de documentación\n"
-#: pg_config.c:417
+#: pg_config.c:434
#, c-format
msgid " --htmldir show location of HTML documentation files\n"
msgstr ""
-" --htmldir muestra la ubicación de archivos de documentación HTML\n"
+" --htmldir muestra la ubicación de archivos de documentación "
+"HTML\n"
-#: pg_config.c:418
+#: pg_config.c:435
#, c-format
msgid ""
" --includedir show location of C header files of the client\n"
@@ -81,14 +84,14 @@ msgstr ""
" --includedir muestra la ubicación de archivos de encabezados C\n"
" de las interfaces cliente\n"
-#: pg_config.c:420
+#: pg_config.c:437
#, c-format
msgid " --pkgincludedir show location of other C header files\n"
msgstr ""
" --pkgincludedir muestra la ubicación de otros archivos de\n"
" encabezados C\n"
-#: pg_config.c:421
+#: pg_config.c:438
#, c-format
msgid ""
" --includedir-server show location of C header files for the server\n"
@@ -96,32 +99,32 @@ msgstr ""
" --includedir-server muestra la ubicación de archivos de encabezados C\n"
" del servidor\n"
-#: pg_config.c:422
+#: pg_config.c:439
#, c-format
msgid " --libdir show location of object code libraries\n"
msgstr ""
" --libdir muestra la ubicación de bibliotecas\n"
" de código objeto\n"
-#: pg_config.c:423
+#: pg_config.c:440
#, c-format
msgid " --pkglibdir show location of dynamically loadable modules\n"
msgstr ""
" --pkglibdir muestra la ubicación de módulos para carga dinámica\n"
-#: pg_config.c:424
+#: pg_config.c:441
#, c-format
msgid " --localedir show location of locale support files\n"
msgstr ""
" --localedir muestra la ubicación de archivos de soporte de\n"
" configuraciones locales\n"
-#: pg_config.c:425
+#: pg_config.c:442
#, c-format
msgid " --mandir show location of manual pages\n"
msgstr " --mandir muestra la ubicación de páginas de manual\n"
-#: pg_config.c:426
+#: pg_config.c:443
#, c-format
msgid ""
" --sharedir show location of architecture-independent support "
@@ -130,7 +133,7 @@ msgstr ""
" --sharedir muestra la ubicación de archivos de soporte\n"
" independientes de arquitectura\n"
-#: pg_config.c:427
+#: pg_config.c:444
#, c-format
msgid ""
" --sysconfdir show location of system-wide configuration files\n"
@@ -138,14 +141,14 @@ msgstr ""
" --sysconfdir muestra la ubicación de archivos de configuración\n"
" global del sistema\n"
-#: pg_config.c:428
+#: pg_config.c:445
#, c-format
msgid " --pgxs show location of extension makefile\n"
msgstr ""
" --pgxs muestra la ubicación del archivo makefile\n"
" para extensiones\n"
-#: pg_config.c:429
+#: pg_config.c:446
#, c-format
msgid ""
" --configure show options given to \"configure\" script when\n"
@@ -154,14 +157,14 @@ msgstr ""
" --configure muestra las opciones que se dieron a «configure»\n"
" cuando PostgreSQL fue construido\n"
-#: pg_config.c:431
+#: pg_config.c:448
#, c-format
msgid " --cc show CC value used when PostgreSQL was built\n"
msgstr ""
" --cc muestra el valor de CC cuando PostgreSQL fue "
"construido\n"
-#: pg_config.c:432
+#: pg_config.c:449
#, c-format
msgid ""
" --cppflags show CPPFLAGS value used when PostgreSQL was built\n"
@@ -169,7 +172,7 @@ msgstr ""
" --cppflags muestra el valor de CPPFLAGS cuando PostgreSQL fue\n"
" construido\n"
-#: pg_config.c:433
+#: pg_config.c:450
#, c-format
msgid ""
" --cflags show CFLAGS value used when PostgreSQL was built\n"
@@ -177,7 +180,7 @@ msgstr ""
" --cflags muestra el valor de CFLAGS cuando PostgreSQL fue\n"
" construido\n"
-#: pg_config.c:434
+#: pg_config.c:451
#, c-format
msgid ""
" --cflags_sl show CFLAGS_SL value used when PostgreSQL was built\n"
@@ -185,7 +188,7 @@ msgstr ""
" --cflags_sl muestra el valor de CFLAGS_SL cuando PostgreSQL fue\n"
" construido\n"
-#: pg_config.c:435
+#: pg_config.c:452
#, c-format
msgid ""
" --ldflags show LDFLAGS value used when PostgreSQL was built\n"
@@ -193,7 +196,17 @@ msgstr ""
" --ldflags muestra el valor de LDFLAGS cuando PostgreSQL fue\n"
" construido\n"
-#: pg_config.c:436
+#: pg_config.c:453
+#, c-format
+msgid ""
+" --ldflags_ex show LDFLAGS_EX value used when PostgreSQL was "
+"built\n"
+msgstr ""
+" --ldflags_ex muestra el valor de LDFLAGS_EX cuando PostgreSQL "
+"fue\n"
+" construido\n"
+
+#: pg_config.c:454
#, c-format
msgid ""
" --ldflags_sl show LDFLAGS_SL value used when PostgreSQL was "
@@ -203,7 +216,7 @@ msgstr ""
"fue\n"
" construido\n"
-#: pg_config.c:437
+#: pg_config.c:455
#, c-format
msgid ""
" --libs show LIBS value used when PostgreSQL was built\n"
@@ -211,17 +224,17 @@ msgstr ""
" --libs muestra el valor de LIBS cuando PostgreSQL fue\n"
" construido\n"
-#: pg_config.c:438
+#: pg_config.c:456
#, c-format
msgid " --version show the PostgreSQL version\n"
msgstr " --version muestra la versión de PostgreSQL\n"
-#: pg_config.c:439
+#: pg_config.c:457
#, c-format
msgid " --help show this help, then exit\n"
msgstr " --help muestra esta ayuda y termina\n"
-#: pg_config.c:440
+#: pg_config.c:458
#, c-format
msgid ""
"\n"
@@ -232,77 +245,77 @@ msgstr ""
"Si no se pasa ningún argumento, se muestra toda la información conocida\n"
"\n"
-#: pg_config.c:441
+#: pg_config.c:459
#, c-format
msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
msgstr "Reporte errores a <pgsql-bugs@postgresql.org>.\n"
-#: pg_config.c:447
+#: pg_config.c:465
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "Use «%s --help» para mayor información.\n"
-#: pg_config.c:486
+#: pg_config.c:504
#, c-format
msgid "%s: could not find own program executable\n"
msgstr "%s: no se pudo encontrar el ejecutable propio\n"
-#: pg_config.c:509
+#: pg_config.c:527
#, c-format
msgid "%s: invalid argument: %s\n"
msgstr "%s: el argumento no es válido: %s\n"
-#: ../../port/exec.c:195 ../../port/exec.c:309 ../../port/exec.c:352
+#: ../../port/exec.c:125 ../../port/exec.c:239 ../../port/exec.c:282
#, c-format
msgid "could not identify current directory: %s"
msgstr "no se pudo identificar el directorio actual: %s"
-#: ../../port/exec.c:214
+#: ../../port/exec.c:144
#, c-format
msgid "invalid binary \"%s\""
msgstr "el binario «%s» no es válido"
-#: ../../port/exec.c:263
+#: ../../port/exec.c:193
#, c-format
msgid "could not read binary \"%s\""
msgstr "no se pudo leer el binario «%s»"
-#: ../../port/exec.c:270
+#: ../../port/exec.c:200
#, c-format
msgid "could not find a \"%s\" to execute"
msgstr "no se pudo encontrar un «%s» para ejecutar"
-#: ../../port/exec.c:325 ../../port/exec.c:361
+#: ../../port/exec.c:255 ../../port/exec.c:291
#, c-format
msgid "could not change directory to \"%s\""
msgstr "no se pudo cambiar el directorio a «%s»"
-#: ../../port/exec.c:340
+#: ../../port/exec.c:270
#, c-format
msgid "could not read symbolic link \"%s\""
msgstr "no se pudo leer el enlace simbólico «%s»"
-#: ../../port/exec.c:586
+#: ../../port/exec.c:516
#, c-format
msgid "child process exited with exit code %d"
msgstr "el proceso hijo terminó con código de salida %d"
-#: ../../port/exec.c:590
+#: ../../port/exec.c:520
#, c-format
msgid "child process was terminated by exception 0x%X"
msgstr "el proceso hijo fue terminado por una excepción 0x%X"
-#: ../../port/exec.c:599
+#: ../../port/exec.c:529
#, c-format
msgid "child process was terminated by signal %s"
msgstr "el proceso hijo fue terminado por una señal %s"
-#: ../../port/exec.c:602
+#: ../../port/exec.c:532
#, c-format
msgid "child process was terminated by signal %d"
msgstr "el proceso hijo fue terminado por una señal %d"
-#: ../../port/exec.c:606
+#: ../../port/exec.c:536
#, c-format
msgid "child process exited with unrecognized status %d"
msgstr "el proceso hijo terminó con código no reconocido %d"
diff --git a/src/bin/pg_config/po/fr.po b/src/bin/pg_config/po/fr.po
index 50316c68c2..feb4f9fbd3 100644
--- a/src/bin/pg_config/po/fr.po
+++ b/src/bin/pg_config/po/fr.po
@@ -1,7 +1,7 @@
# translation of pg_config.po to fr_fr
# french message translation file for pg_config
#
-# $PostgreSQL: pgsql/src/bin/pg_config/po/fr.po,v 1.11 2009/05/14 21:41:51 alvherre Exp $
+# $PostgreSQL$
#
# Use these quotes: %s
#
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: PostgreSQL 8.4\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2009-04-16 03:09+0000\n"
-"PO-Revision-Date: 2009-04-16 08:37+0200\n"
-"Last-Translator: Stphane Schildknecht <stephane.schildknecht@dalibo.com>\n"
+"POT-Creation-Date: 2010-07-10 21:17+0000\n"
+"PO-Revision-Date: 2010-07-11 10:59+0100\n"
+"Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
"Language-Team: PostgreSQLfr <pgsql-fr-generale@postgresql.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-15\n"
@@ -27,11 +27,12 @@ msgstr ""
#: pg_config.c:323
#: pg_config.c:339
#: pg_config.c:355
+#: pg_config.c:371
#, c-format
msgid "not recorded\n"
msgstr "non enregistr\n"
-#: pg_config.c:411
+#: pg_config.c:428
#, c-format
msgid ""
"\n"
@@ -42,12 +43,12 @@ msgstr ""
"%s fournit des informations sur la version installe de PostgreSQL.\n"
"\n"
-#: pg_config.c:412
+#: pg_config.c:429
#, c-format
msgid "Usage:\n"
msgstr "Usage :\n"
-#: pg_config.c:413
+#: pg_config.c:430
#, c-format
msgid ""
" %s [OPTION]...\n"
@@ -56,29 +57,29 @@ msgstr ""
" %s [OPTION]...\n"
"\n"
-#: pg_config.c:414
+#: pg_config.c:431
#, c-format
msgid "Options:\n"
msgstr "Options :\n"
-#: pg_config.c:415
+#: pg_config.c:432
#, c-format
msgid " --bindir show location of user executables\n"
msgstr " --bindir affiche l'emplacement des excutables utilisateur\n"
-#: pg_config.c:416
+#: pg_config.c:433
#, c-format
msgid " --docdir show location of documentation files\n"
msgstr " --docdir affiche l'emplacement des fichiers de documentation\n"
-#: pg_config.c:417
+#: pg_config.c:434
#, c-format
msgid " --htmldir show location of HTML documentation files\n"
msgstr ""
" --htmldir affiche l'emplacement des fichiers de documentation\n"
" HTML\n"
-#: pg_config.c:418
+#: pg_config.c:435
#, c-format
msgid ""
" --includedir show location of C header files of the client\n"
@@ -87,64 +88,64 @@ msgstr ""
" --includedir affiche l'emplacement des fichiers d'en-tte C\n"
" des interfaces client\n"
-#: pg_config.c:420
+#: pg_config.c:437
#, c-format
msgid " --pkgincludedir show location of other C header files\n"
msgstr ""
" --pkgincludedir affiche l'emplacement des autres fichiers d'en-tte\n"
" C\n"
-#: pg_config.c:421
+#: pg_config.c:438
#, c-format
msgid " --includedir-server show location of C header files for the server\n"
msgstr ""
" --includedir-server affiche l'emplacement des fichiers d'en-tte C du\n"
" serveur\n"
-#: pg_config.c:422
+#: pg_config.c:439
#, c-format
msgid " --libdir show location of object code libraries\n"
msgstr " --libdir affiche l'emplacement des bibliothques\n"
-#: pg_config.c:423
+#: pg_config.c:440
#, c-format
msgid " --pkglibdir show location of dynamically loadable modules\n"
msgstr ""
" --pkglibdir affiche l'emplacement des modules chargeables\n"
" dynamiquement\n"
-#: pg_config.c:424
+#: pg_config.c:441
#, c-format
msgid " --localedir show location of locale support files\n"
msgstr ""
" --localedir affiche l'emplacement des fichiers de support de la\n"
" locale\n"
-#: pg_config.c:425
+#: pg_config.c:442
#, c-format
msgid " --mandir show location of manual pages\n"
msgstr " --mandir affiche l'emplacement des pages man\n"
-#: pg_config.c:426
+#: pg_config.c:443
#, c-format
msgid " --sharedir show location of architecture-independent support files\n"
msgstr ""
" --sharedir affiche l'emplacement des fichiers de support\n"
" indpendants de l'architecture\n"
-#: pg_config.c:427
+#: pg_config.c:444
#, c-format
msgid " --sysconfdir show location of system-wide configuration files\n"
msgstr ""
" --sysconfdir affiche l'emplacement des fichiers de configuration\n"
" globaux du systme\n"
-#: pg_config.c:428
+#: pg_config.c:445
#, c-format
msgid " --pgxs show location of extension makefile\n"
msgstr " --pgxs affiche l'emplacement du makefile des extensions\n"
-#: pg_config.c:429
+#: pg_config.c:446
#, c-format
msgid ""
" --configure show options given to \"configure\" script when\n"
@@ -153,66 +154,73 @@ msgstr ""
" --configure affiche les options passes au script configure \n"
" la construction de PostgreSQL\n"
-#: pg_config.c:431
+#: pg_config.c:448
#, c-format
msgid " --cc show CC value used when PostgreSQL was built\n"
msgstr ""
" --cc affiche la valeur de CC utilise lors de la\n"
" construction de PostgreSQL\n"
-#: pg_config.c:432
+#: pg_config.c:449
#, c-format
msgid " --cppflags show CPPFLAGS value used when PostgreSQL was built\n"
msgstr ""
" --cppflags affiche la valeur de CPPFLAGS utilise lors de la\n"
" construction de PostgreSQL\n"
-#: pg_config.c:433
+#: pg_config.c:450
#, c-format
msgid " --cflags show CFLAGS value used when PostgreSQL was built\n"
msgstr ""
" --cflags affiche la valeur de CFLAGS utilise lors de la\n"
" construction de PostgreSQL\n"
-#: pg_config.c:434
+#: pg_config.c:451
#, c-format
msgid " --cflags_sl show CFLAGS_SL value used when PostgreSQL was built\n"
msgstr ""
" --cflags_sl affiche la valeur de CFLAGS_SL utilise lors de la\n"
" construction de PostgreSQL\n"
-#: pg_config.c:435
+#: pg_config.c:452
#, c-format
msgid " --ldflags show LDFLAGS value used when PostgreSQL was built\n"
msgstr ""
" --ldflags affiche la valeur de LDFLAGS utilise lors de la\n"
" construction de PostgreSQL\n"
-#: pg_config.c:436
+#: pg_config.c:453
+#, c-format
+msgid " --ldflags_ex show LDFLAGS_EX value used when PostgreSQL was built\n"
+msgstr ""
+" --ldflags_ex affiche la valeur de LDFLAGS_EX utilise lors de la\n"
+" construction de PostgreSQL\n"
+
+#: pg_config.c:454
#, c-format
msgid " --ldflags_sl show LDFLAGS_SL value used when PostgreSQL was built\n"
msgstr ""
" --ldflags_sl affiche la valeur de LDFLAGS_SL utilise lors de la\n"
" construction de PostgreSQL\n"
-#: pg_config.c:437
+#: pg_config.c:455
#, c-format
msgid " --libs show LIBS value used when PostgreSQL was built\n"
msgstr ""
" --libs affiche la valeur de LIBS utilise lors de la\n"
" construction de PostgreSQL\n"
-#: pg_config.c:438
+#: pg_config.c:456
#, c-format
msgid " --version show the PostgreSQL version\n"
msgstr " --version affiche la version de PostgreSQL\n"
-#: pg_config.c:439
+#: pg_config.c:457
#, c-format
msgid " --help show this help, then exit\n"
msgstr " --help affiche cette aide puis quitte\n"
-#: pg_config.c:440
+#: pg_config.c:458
#, c-format
msgid ""
"\n"
@@ -223,80 +231,80 @@ msgstr ""
"Sans argument, tous les lments connus sont affichs.\n"
"\n"
-#: pg_config.c:441
+#: pg_config.c:459
#, c-format
msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
msgstr "Rapporter les bogues <pgsql-bugs@postgresql.org>.\n"
-#: pg_config.c:447
+#: pg_config.c:465
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "Essayer %s --help pour plus d'informations.\n"
-#: pg_config.c:486
+#: pg_config.c:504
#, c-format
msgid "%s: could not find own program executable\n"
msgstr "%s : n'a pas pu trouver son propre excutable\n"
-#: pg_config.c:509
+#: pg_config.c:527
#, c-format
msgid "%s: invalid argument: %s\n"
msgstr "%s : argument invalide : %s\n"
-#: ../../port/exec.c:195
-#: ../../port/exec.c:309
-#: ../../port/exec.c:352
+#: ../../port/exec.c:125
+#: ../../port/exec.c:239
+#: ../../port/exec.c:282
#, c-format
msgid "could not identify current directory: %s"
msgstr "n'a pas pu identifier le rpertoire courant : %s"
-#: ../../port/exec.c:214
+#: ../../port/exec.c:144
#, c-format
msgid "invalid binary \"%s\""
msgstr "binaire %s invalide"
-#: ../../port/exec.c:263
+#: ../../port/exec.c:193
#, c-format
msgid "could not read binary \"%s\""
msgstr "n'a pas pu lire le binaire %s "
-#: ../../port/exec.c:270
+#: ../../port/exec.c:200
#, c-format
msgid "could not find a \"%s\" to execute"
msgstr "n'a pas pu trouver un %s excuter"
-#: ../../port/exec.c:325
-#: ../../port/exec.c:361
+#: ../../port/exec.c:255
+#: ../../port/exec.c:291
#, c-format
msgid "could not change directory to \"%s\""
msgstr "n'a pas pu accder au rpertoire %s "
-#: ../../port/exec.c:340
+#: ../../port/exec.c:270
#, c-format
msgid "could not read symbolic link \"%s\""
msgstr "n'a pas pu lire le lien symbolique %s "
-#: ../../port/exec.c:586
+#: ../../port/exec.c:516
#, c-format
msgid "child process exited with exit code %d"
msgstr "le processus fils a quitt avec le code de sortie %d"
-#: ../../port/exec.c:590
+#: ../../port/exec.c:520
#, c-format
msgid "child process was terminated by exception 0x%X"
msgstr "le processus fils a t termin par l'exception 0x%X"
-#: ../../port/exec.c:599
+#: ../../port/exec.c:529
#, c-format
msgid "child process was terminated by signal %s"
msgstr "le processus fils a t termin par le signal %s"
-#: ../../port/exec.c:602
+#: ../../port/exec.c:532
#, c-format
msgid "child process was terminated by signal %d"
msgstr "le processus fils a t termin par le signal %d"
-#: ../../port/exec.c:606
+#: ../../port/exec.c:536
#, c-format
msgid "child process exited with unrecognized status %d"
msgstr "le processus fils a quitt avec un statut %d non reconnu"
diff --git a/src/bin/pg_config/po/ja.po b/src/bin/pg_config/po/ja.po
index 5ebc2419c5..b85e72c4dd 100644
--- a/src/bin/pg_config/po/ja.po
+++ b/src/bin/pg_config/po/ja.po
@@ -3,23 +3,25 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: PostgreSQL 8.4\n"
+"Project-Id-Version: PostgreSQL 9.0 beta 3\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2009-04-06 21:53+0900\n"
-"PO-Revision-Date: 2009-04-06 21:56+0900\n"
+"POT-Creation-Date: 2010-07-20 12:54+0900\n"
+"PO-Revision-Date: 2010-07-15 19:00+0900\n"
"Last-Translator: HOTTA Michihide <hotta@net-newbie.com>\n"
"Language-Team: jpug-doc <jpug-doc@ml.postgresql.jp>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: pg_config.c:243 pg_config.c:259 pg_config.c:275 pg_config.c:291
#: pg_config.c:307 pg_config.c:323 pg_config.c:339 pg_config.c:355
+#: pg_config.c:371
#, c-format
msgid "not recorded\n"
msgstr "記録されていません\n"
-#: pg_config.c:411
+#: pg_config.c:428
#, c-format
msgid ""
"\n"
@@ -30,12 +32,13 @@ msgstr ""
"%sはインストールされたバージョンのPostgreSQLに関する情報を提供します。\n"
"\n"
-#: pg_config.c:412
+#: pg_config.c:429
#, c-format
msgid "Usage:\n"
msgstr "使用方法:\n"
-#: pg_config.c:413
+#: pg_config.c:430
+#, c-format
msgid ""
" %s [OPTION]...\n"
"\n"
@@ -43,68 +46,68 @@ msgstr ""
" %s [オプション]...\n"
"\n"
-#: pg_config.c:414
+#: pg_config.c:431
#, c-format
msgid "Options:\n"
msgstr "オプション:\n"
-#: pg_config.c:415
+#: pg_config.c:432
#, c-format
msgid " --bindir show location of user executables\n"
msgstr " --bindir ユーザ実行ファイルの場所を表示します\n"
-#: pg_config.c:416
+#: pg_config.c:433
#, c-format
msgid " --docdir show location of documentation files\n"
msgstr " --docdir 文書ファイルの場所を表示します\n"
-#: pg_config.c:417
+#: pg_config.c:434
+#, c-format
msgid " --htmldir show location of HTML documentation files\n"
msgstr " --docdir html文書ファイルの場所を表示します\n"
-#: pg_config.c:418
+#: pg_config.c:435
#, c-format
msgid ""
" --includedir show location of C header files of the client\n"
" interfaces\n"
msgstr ""
-" --includedir クライアントインタフェース用Cヘッダファイルの場所"
-"を表示します\n"
+" --includedir クライアントインタフェース用Cヘッダファイルの場所を表"
+"示します\n"
-#: pg_config.c:420
+#: pg_config.c:437
#, c-format
msgid " --pkgincludedir show location of other C header files\n"
msgstr " --pkgincludedir その他のCヘッダファイルの場所を表示します\n"
-#: pg_config.c:421
+#: pg_config.c:438
#, c-format
msgid ""
" --includedir-server show location of C header files for the server\n"
-msgstr ""
-" --includedir-server サーバ用Cヘッダファイルの場所を表示します\n"
+msgstr " --includedir-server サーバ用Cヘッダファイルの場所を表示します\n"
-#: pg_config.c:422
+#: pg_config.c:439
#, c-format
msgid " --libdir show location of object code libraries\n"
msgstr ""
" --libdir オブジェクトコードライブラリの場所を表示します\n"
-#: pg_config.c:423
+#: pg_config.c:440
#, c-format
msgid " --pkglibdir show location of dynamically loadable modules\n"
msgstr " --pkglibdir 動的ロード可能モジュールの場所を表示します\n"
-#: pg_config.c:424
+#: pg_config.c:441
#, c-format
msgid " --localedir show location of locale support files\n"
msgstr " --localedir ロケールサポートファイルの場所を表示します\n"
-#: pg_config.c:425
+#: pg_config.c:442
#, c-format
msgid " --mandir show location of manual pages\n"
msgstr " --mandir マニュアルページの場所を表示します\n"
-#: pg_config.c:426
+#: pg_config.c:443
#, c-format
msgid ""
" --sharedir show location of architecture-independent support "
@@ -113,18 +116,18 @@ msgstr ""
" --sharedir アーキテクチャに依存しないサポートファイルの場所を表"
"示します。\n"
-#: pg_config.c:427
+#: pg_config.c:444
#, c-format
msgid ""
" --sysconfdir show location of system-wide configuration files\n"
msgstr " --sysconfdir システム全体の設定ファイルの場所を表示します\n"
-#: pg_config.c:428
+#: pg_config.c:445
#, c-format
msgid " --pgxs show location of extension makefile\n"
msgstr " --pgxs 拡張makefileの場所を表示します\n"
-#: pg_config.c:429
+#: pg_config.c:446
#, c-format
msgid ""
" --configure show options given to \"configure\" script when\n"
@@ -133,40 +136,49 @@ msgstr ""
" --configure PostgreSQL構築時の\"configure\"スクリプトで指定したオ"
"プションを表示します\n"
-#: pg_config.c:431
+#: pg_config.c:448
#, c-format
msgid " --cc show CC value used when PostgreSQL was built\n"
msgstr " --cc PostgreSQL構築時に使用したCCの値を表示します\n"
-#: pg_config.c:432
+#: pg_config.c:449
#, c-format
msgid ""
" --cppflags show CPPFLAGS value used when PostgreSQL was built\n"
msgstr ""
" --cppflags PostgreSQL構築時に使用したCPPFLAGSの値を表示します\n"
-#: pg_config.c:433
+#: pg_config.c:450
#, c-format
msgid ""
" --cflags show CFLAGS value used when PostgreSQL was built\n"
msgstr ""
" --cflags PostgreSQL構築時に使用したCFLAGSの値を表示します\n"
-#: pg_config.c:434
+#: pg_config.c:451
#, c-format
msgid ""
" --cflags_sl show CFLAGS_SL value used when PostgreSQL was built\n"
msgstr ""
" --cflags_sl PostgreSQL構築時に使用したCFLAGS_SLの値を表示します\n"
-#: pg_config.c:435
+#: pg_config.c:452
#, c-format
msgid ""
" --ldflags show LDFLAGS value used when PostgreSQL was built\n"
msgstr ""
" --ldflags PostgreSQL構築時に使用したLDFLAGSの値を表示します\n"
-#: pg_config.c:436
+#: pg_config.c:453
+#, c-format
+msgid ""
+" --ldflags_ex show LDFLAGS_EX value used when PostgreSQL was "
+"built\n"
+msgstr ""
+" --ldflags_ex PostgreSQL構築時に使用したLDFLAGS_EXの値を表示しま"
+"す\n"
+
+#: pg_config.c:454
#, c-format
msgid ""
" --ldflags_sl show LDFLAGS_SL value used when PostgreSQL was "
@@ -175,24 +187,24 @@ msgstr ""
" --ldflags_sl PostgreSQL構築時に使用したLDFLAGS_SLの値を表示しま"
"す\n"
-#: pg_config.c:437
+#: pg_config.c:455
#, c-format
msgid ""
" --libs show LIBS value used when PostgreSQL was built\n"
msgstr ""
" --libs PostgreSQL構築時に使用したLIBSの値を表示します\n"
-#: pg_config.c:438
+#: pg_config.c:456
#, c-format
msgid " --version show the PostgreSQL version\n"
msgstr " --version PostgreSQLのバージョンを表示します\n"
-#: pg_config.c:439
+#: pg_config.c:457
#, c-format
msgid " --help show this help, then exit\n"
msgstr " --help ヘルプを表示し、終了します\n"
-#: pg_config.c:440
+#: pg_config.c:458
#, c-format
msgid ""
"\n"
@@ -203,77 +215,77 @@ msgstr ""
"引数がない場合、既知の項目をすべて表示します。\n"
"\n"
-#: pg_config.c:441
+#: pg_config.c:459
#, c-format
msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
msgstr "不具合は<pgsql-bugs@postgresql.org>まで報告してください。\n"
-#: pg_config.c:447
+#: pg_config.c:465
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "詳細は\"%s --help\"を行ってください\n"
-#: pg_config.c:486
+#: pg_config.c:504
#, c-format
msgid "%s: could not find own program executable\n"
msgstr "%s: 実行ファイル自体がありませんでした\n"
-#: pg_config.c:509
+#: pg_config.c:527
#, c-format
msgid "%s: invalid argument: %s\n"
msgstr "%s: 無効な引数です: %s\n"
-#: ../../port/exec.c:195 ../../port/exec.c:309 ../../port/exec.c:352
+#: ../../port/exec.c:125 ../../port/exec.c:239 ../../port/exec.c:282
#, c-format
msgid "could not identify current directory: %s"
msgstr "現在のディレクトリを認識できませんでした: %s"
-#: ../../port/exec.c:214
+#: ../../port/exec.c:144
#, c-format
msgid "invalid binary \"%s\""
msgstr "バイナリ\"%s\"は無効です"
-#: ../../port/exec.c:263
+#: ../../port/exec.c:193
#, c-format
msgid "could not read binary \"%s\""
msgstr "バイナリ\"%s\"を読み取れませんでした"
-#: ../../port/exec.c:270
+#: ../../port/exec.c:200
#, c-format
msgid "could not find a \"%s\" to execute"
msgstr "実行する\"%s\"がありませんでした"
-#: ../../port/exec.c:325 ../../port/exec.c:361
+#: ../../port/exec.c:255 ../../port/exec.c:291
#, c-format
msgid "could not change directory to \"%s\""
msgstr "ディレクトリ\"%s\"に移動できませんでした"
-#: ../../port/exec.c:340
+#: ../../port/exec.c:270
#, c-format
msgid "could not read symbolic link \"%s\""
msgstr "シンボリックリンク\"%s\"を読み取ることができませんでした"
-#: ../../port/exec.c:586
+#: ../../port/exec.c:516
#, c-format
msgid "child process exited with exit code %d"
msgstr "子プロセスが終了コード%dで終了しました"
-#: ../../port/exec.c:590
+#: ../../port/exec.c:520
#, c-format
msgid "child process was terminated by exception 0x%X"
msgstr "子プロセスが例外0x%Xで終了しました"
-#: ../../port/exec.c:599
+#: ../../port/exec.c:529
#, c-format
msgid "child process was terminated by signal %s"
msgstr "子プロセスがシグナル%sで終了しました"
-#: ../../port/exec.c:602
+#: ../../port/exec.c:532
#, c-format
msgid "child process was terminated by signal %d"
msgstr "子プロセスがシグナル%dで終了しました"
-#: ../../port/exec.c:606
+#: ../../port/exec.c:536
#, c-format
msgid "child process exited with unrecognized status %d"
msgstr "子プロセスが未知のステータス%dで終了しました"
diff --git a/src/bin/pg_config/po/ko.po b/src/bin/pg_config/po/ko.po
index ec691ec6b6..6369661b90 100644
--- a/src/bin/pg_config/po/ko.po
+++ b/src/bin/pg_config/po/ko.po
@@ -3,23 +3,24 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: PostgreSQL 8.3dev\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-09 01:13-0400\n"
-"PO-Revision-Date: 2007-02-10 01:09+0900\n"
-"Last-Translator: Ioseph Kim <ioseph@uri.sarang.net>\n"
-"Language-Team: KOREAN <pgsql-kr@postgresql.or.kr>\n"
+"Project-Id-Version: PostgreSQL 8.4\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2010-09-09 16:34+0000\n"
+"PO-Revision-Date: 2010-09-24 12:26-0400\n"
+"Last-Translator: EnterpriseDB translation team <dev-escalations@enterprisedb.com>\n"
+"Language-Team: EnterpriseDB translation team <dev-escalations@enterprisedb.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=euc-kr\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
-#: pg_config.c:231 pg_config.c:247 pg_config.c:263 pg_config.c:279
-#: pg_config.c:295 pg_config.c:311 pg_config.c:327 pg_config.c:343
+#: pg_config.c:243 pg_config.c:259 pg_config.c:275 pg_config.c:291
+#: pg_config.c:307 pg_config.c:323 pg_config.c:339 pg_config.c:355
#, c-format
msgid "not recorded\n"
msgstr "ش \n"
-#: pg_config.c:398
+#: pg_config.c:411
#, c-format
msgid ""
"\n"
@@ -30,38 +31,43 @@ msgstr ""
"%s α׷ ġ PostgreSQL մϴ.\n"
"\n"
-#: pg_config.c:399
+#: pg_config.c:412
#, c-format
msgid "Usage:\n"
msgstr ":\n"
-#: pg_config.c:400
+#: pg_config.c:413
#, c-format
msgid ""
-" %s [ OPTION ... ]\n"
+" %s [OPTION]...\n"
"\n"
msgstr ""
-" %s [ ɼ ... ]\n"
+" %s [OPTION]...\n"
"\n"
-#: pg_config.c:401
+#: pg_config.c:414
#, c-format
msgid "Options:\n"
msgstr "ɼǵ:\n"
-#: pg_config.c:402
+#: pg_config.c:415
#, c-format
msgid " --bindir show location of user executables\n"
msgstr ""
" --bindir ڰ ִ α׷ ִ\n"
" θ \n"
-#: pg_config.c:403
+#: pg_config.c:416
#, c-format
msgid " --docdir show location of documentation files\n"
msgstr " --docdir ϵ ִ ġ \n"
-#: pg_config.c:404
+#: pg_config.c:417
+#, c-format
+msgid " --htmldir show location of HTML documentation files\n"
+msgstr " --htmldir HTML ġ \n"
+
+#: pg_config.c:418
#, c-format
msgid ""
" --includedir show location of C header files of the client\n"
@@ -70,38 +76,38 @@ msgstr ""
" --includedir Ŭ̾Ʈ ̽ C ִ θ\n"
" \n"
-#: pg_config.c:406
+#: pg_config.c:420
#, c-format
msgid " --pkgincludedir show location of other C header files\n"
msgstr " --pkgincludedir Ÿ C ġ \n"
-#: pg_config.c:407
+#: pg_config.c:421
#, c-format
msgid ""
" --includedir-server show location of C header files for the server\n"
msgstr " --includedir-server C θ \n"
-#: pg_config.c:408
+#: pg_config.c:422
#, c-format
msgid " --libdir show location of object code libraries\n"
msgstr " --libdir ̺귯 θ \n"
-#: pg_config.c:409
+#: pg_config.c:423
#, c-format
msgid " --pkglibdir show location of dynamically loadable modules\n"
msgstr " --pkglibdir ȣ θ \n"
-#: pg_config.c:410
+#: pg_config.c:424
#, c-format
msgid " --localedir show location of locale support files\n"
msgstr " --localedir ϵ ġ \n"
-#: pg_config.c:411
+#: pg_config.c:425
#, c-format
msgid " --mandir show location of manual pages\n"
msgstr " --mandir ġ \n"
-#: pg_config.c:412
+#: pg_config.c:426
#, c-format
msgid ""
" --sharedir show location of architecture-independent support "
@@ -109,18 +115,18 @@ msgid ""
msgstr ""
" --sharedir Ǵ share ϵ ġ \n"
-#: pg_config.c:413
+#: pg_config.c:427
#, c-format
msgid ""
" --sysconfdir show location of system-wide configuration files\n"
msgstr " --sysconfdir ý ȯ ġ \n"
-#: pg_config.c:414
+#: pg_config.c:428
#, c-format
msgid " --pgxs show location of extension makefile\n"
msgstr " --pgxs Ȯ makefile θ \n"
-#: pg_config.c:415
+#: pg_config.c:429
#, c-format
msgid ""
" --configure show options given to \"configure\" script when\n"
@@ -129,61 +135,61 @@ msgstr ""
" --configure PostgreSQL \"configure\" ũƮ\n"
" ɼǵ \n"
-#: pg_config.c:417
+#: pg_config.c:431
#, c-format
msgid " --cc show CC value used when PostgreSQL was built\n"
msgstr " --cc PostgreSQL CC \n"
-#: pg_config.c:418
+#: pg_config.c:432
#, c-format
msgid ""
" --cppflags show CPPFLAGS value used when PostgreSQL was built\n"
msgstr " --cppflags PostgreSQL CPPFLAGS \n"
-#: pg_config.c:419
+#: pg_config.c:433
#, c-format
msgid ""
" --cflags show CFLAGS value used when PostgreSQL was built\n"
msgstr ""
" --cflags PostgreSQL , CFLAGS \n"
-#: pg_config.c:420
+#: pg_config.c:434
#, c-format
msgid ""
" --cflags_sl show CFLAGS_SL value used when PostgreSQL was built\n"
msgstr " --cflags_sl PostgreSQL CFLAGS_SL \n"
-#: pg_config.c:421
+#: pg_config.c:435
#, c-format
msgid ""
" --ldflags show LDFLAGS value used when PostgreSQL was built\n"
msgstr ""
" --ldflags PostgreSQL , LDFLAGS \n"
-#: pg_config.c:422
+#: pg_config.c:436
#, c-format
msgid ""
" --ldflags_sl show LDFLAGS_SL value used when PostgreSQL was "
"built\n"
msgstr " --ldflags_sl PostgreSQL LDFLAGS_SL \n"
-#: pg_config.c:423
+#: pg_config.c:437
#, c-format
msgid ""
" --libs show LIBS value used when PostgreSQL was built\n"
msgstr " --libs PostgreSQL , LIBS \n"
-#: pg_config.c:424
+#: pg_config.c:438
#, c-format
msgid " --version show the PostgreSQL version\n"
msgstr " --version PostgreSQL \n"
-#: pg_config.c:425
+#: pg_config.c:439
#, c-format
msgid " --help show this help, then exit\n"
msgstr " --help ְ ħ\n"
-#: pg_config.c:426
+#: pg_config.c:440
#, c-format
msgid ""
"\n"
@@ -191,80 +197,80 @@ msgid ""
"\n"
msgstr ""
"\n"
-" ڰ ׸ \n"
+" μ ׸ \n"
"\n"
-#: pg_config.c:427
+#: pg_config.c:441
#, c-format
msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
msgstr ": <pgsql-bugs@postgresql.org>.\n"
-#: pg_config.c:433
+#: pg_config.c:447
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr " ڼ ʿϸ, \"%s --help\"\n"
-#: pg_config.c:472
+#: pg_config.c:486
#, c-format
-msgid "%s: could not find own executable\n"
-msgstr "%s: ƴմϴ\n"
+msgid "%s: could not find own program executable\n"
+msgstr "%s: α׷ ã ϴ\n"
-#: pg_config.c:495
+#: pg_config.c:509
#, c-format
msgid "%s: invalid argument: %s\n"
-msgstr "%s: ߸ : %s\n"
+msgstr "%s: ߸ μ: %s\n"
-#: ../../port/exec.c:192 ../../port/exec.c:306 ../../port/exec.c:349
+#: ../../port/exec.c:195 ../../port/exec.c:309 ../../port/exec.c:352
#, c-format
msgid "could not identify current directory: %s"
-msgstr " 丮 : %s"
+msgstr " ͸ : %s"
-#: ../../port/exec.c:211
+#: ../../port/exec.c:214
#, c-format
msgid "invalid binary \"%s\""
-msgstr "߸ : \"%s\""
+msgstr "߸ ̳ʸ : \"%s\""
-#: ../../port/exec.c:260
+#: ../../port/exec.c:263
#, c-format
msgid "could not read binary \"%s\""
-msgstr "\"%s\" "
+msgstr "\"%s\" ̳ʸ "
-#: ../../port/exec.c:267
+#: ../../port/exec.c:270
#, c-format
msgid "could not find a \"%s\" to execute"
msgstr " \"%s\" ã "
-#: ../../port/exec.c:322 ../../port/exec.c:358
+#: ../../port/exec.c:325 ../../port/exec.c:361
#, c-format
msgid "could not change directory to \"%s\""
-msgstr "\"%s\" 丮 ̵ "
+msgstr "\"%s\" ͸ ̵ "
-#: ../../port/exec.c:337
+#: ../../port/exec.c:340
#, c-format
msgid "could not read symbolic link \"%s\""
msgstr "\"%s\" ɹ ũ "
-#: ../../port/exec.c:583
+#: ../../port/exec.c:586
#, c-format
msgid "child process exited with exit code %d"
msgstr " μ Ǿ, ڵ %d"
-#: ../../port/exec.c:587
+#: ../../port/exec.c:590
#, c-format
msgid "child process was terminated by exception 0x%X"
msgstr "0x%X ó μ Ǿ"
-#: ../../port/exec.c:596
+#: ../../port/exec.c:599
#, c-format
msgid "child process was terminated by signal %s"
msgstr "%s ñ׳ Ǿ μ Ǿ"
-#: ../../port/exec.c:599
+#: ../../port/exec.c:602
#, c-format
msgid "child process was terminated by signal %d"
msgstr " μ Ǿ, ñ׳ %d"
-#: ../../port/exec.c:603
+#: ../../port/exec.c:606
#, c-format
msgid "child process exited with unrecognized status %d"
msgstr " μ Ǿ, ˼ %d"
diff --git a/src/bin/pg_config/po/pt_BR.po b/src/bin/pg_config/po/pt_BR.po
index af5cc5015b..d852a2523c 100644
--- a/src/bin/pg_config/po/pt_BR.po
+++ b/src/bin/pg_config/po/pt_BR.po
@@ -7,21 +7,23 @@ msgid ""
msgstr ""
"Project-Id-Version: PostgreSQL 9.0\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-05-08 21:44-0300\n"
+"POT-Creation-Date: 2010-07-08 21:08-0300\n"
"PO-Revision-Date: 2005-10-04 22:15-0300\n"
"Last-Translator: Euler Taveira de Oliveira <euler@timbira.com>\n"
"Language-Team: Brazilian Portuguese <pgbr-dev@listas.postgresql.org.br>\n"
+"Language: pt_BR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: pg_config.c:243 pg_config.c:259 pg_config.c:275 pg_config.c:291
#: pg_config.c:307 pg_config.c:323 pg_config.c:339 pg_config.c:355
+#: pg_config.c:371
#, c-format
msgid "not recorded\n"
msgstr "não informado\n"
-#: pg_config.c:411
+#: pg_config.c:428
#, c-format
msgid ""
"\n"
@@ -32,12 +34,12 @@ msgstr ""
"%s fornece informação sobre a versão do PostgreSQL instalada.\n"
"\n"
-#: pg_config.c:412
+#: pg_config.c:429
#, c-format
msgid "Usage:\n"
msgstr "Uso:\n"
-#: pg_config.c:413
+#: pg_config.c:430
#, c-format
msgid ""
" %s [OPTION]...\n"
@@ -46,28 +48,28 @@ msgstr ""
" %s [OPÇÃO]...\n"
"\n"
-#: pg_config.c:414
+#: pg_config.c:431
#, c-format
msgid "Options:\n"
msgstr "Opções:\n"
-#: pg_config.c:415
+#: pg_config.c:432
#, c-format
msgid " --bindir show location of user executables\n"
msgstr " --bindir mostra local dos executáveis\n"
-#: pg_config.c:416
+#: pg_config.c:433
#, c-format
msgid " --docdir show location of documentation files\n"
msgstr " --docdir mostra local dos arquivos da documentação\n"
-#: pg_config.c:417
+#: pg_config.c:434
#, c-format
msgid " --htmldir show location of HTML documentation files\n"
msgstr ""
" --htmldir mostra local dos arquivos HTML da documentação\n"
-#: pg_config.c:418
+#: pg_config.c:435
#, c-format
msgid ""
" --includedir show location of C header files of the client\n"
@@ -77,43 +79,43 @@ msgstr ""
"interfaces\n"
" com cliente\n"
-#: pg_config.c:420
+#: pg_config.c:437
#, c-format
msgid " --pkgincludedir show location of other C header files\n"
msgstr ""
" --pkgincludedir mostra local dos outros arquivos de cabeçalho\n"
-#: pg_config.c:421
+#: pg_config.c:438
#, c-format
msgid ""
" --includedir-server show location of C header files for the server\n"
msgstr ""
" --includedir-server mostra local dos arquivos de cabeçalho do servidor\n"
-#: pg_config.c:422
+#: pg_config.c:439
#, c-format
msgid " --libdir show location of object code libraries\n"
msgstr " --libdir mostra local das bibliotecas objeto\n"
-#: pg_config.c:423
+#: pg_config.c:440
#, c-format
msgid " --pkglibdir show location of dynamically loadable modules\n"
msgstr ""
" --pkglibdir mostra local dos módulos carregáveis dinamicamente\n"
-#: pg_config.c:424
+#: pg_config.c:441
#, c-format
msgid " --localedir show location of locale support files\n"
msgstr ""
" --localedir mostra local dos arquivos de suporte a configurações "
"regionais\n"
-#: pg_config.c:425
+#: pg_config.c:442
#, c-format
msgid " --mandir show location of manual pages\n"
msgstr " --bindir mostra local das páginas de manual\n"
-#: pg_config.c:426
+#: pg_config.c:443
#, c-format
msgid ""
" --sharedir show location of architecture-independent support "
@@ -122,7 +124,7 @@ msgstr ""
" --sharedir mostra local dos arquivos de suporte independentes "
"de arquitetura\n"
-#: pg_config.c:427
+#: pg_config.c:444
#, c-format
msgid ""
" --sysconfdir show location of system-wide configuration files\n"
@@ -130,12 +132,12 @@ msgstr ""
" --sysconfdir mostra local dos arquivos de configuração do "
"sistema\n"
-#: pg_config.c:428
+#: pg_config.c:445
#, c-format
msgid " --pgxs show location of extension makefile\n"
msgstr " --pgxs mostra local do makefile extensível\n"
-#: pg_config.c:429
+#: pg_config.c:446
#, c-format
msgid ""
" --configure show options given to \"configure\" script when\n"
@@ -145,14 +147,14 @@ msgstr ""
"quando\n"
" o PostgreSQL foi construído\n"
-#: pg_config.c:431
+#: pg_config.c:448
#, c-format
msgid " --cc show CC value used when PostgreSQL was built\n"
msgstr ""
" --cc mostra valor de CC utilizado quando PostgreSQL foi "
"construído\n"
-#: pg_config.c:432
+#: pg_config.c:449
#, c-format
msgid ""
" --cppflags show CPPFLAGS value used when PostgreSQL was built\n"
@@ -160,7 +162,7 @@ msgstr ""
" --cppflags mostra valor de CPPFLAGS utilizado quando PostgreSQL "
"foi construído\n"
-#: pg_config.c:433
+#: pg_config.c:450
#, c-format
msgid ""
" --cflags show CFLAGS value used when PostgreSQL was built\n"
@@ -168,7 +170,7 @@ msgstr ""
" --cflags mostra valor de CFLAGS utilizado quando PostgreSQL "
"foi construído\n"
-#: pg_config.c:434
+#: pg_config.c:451
#, c-format
msgid ""
" --cflags_sl show CFLAGS_SL value used when PostgreSQL was built\n"
@@ -176,7 +178,7 @@ msgstr ""
" --cflags_sl mostra valor de CFLAGS_SL utilizado quando "
"PostgreSQL foi construído\n"
-#: pg_config.c:435
+#: pg_config.c:452
#, c-format
msgid ""
" --ldflags show LDFLAGS value used when PostgreSQL was built\n"
@@ -184,7 +186,16 @@ msgstr ""
" --ldflags mostra valor de LDFLAGS utilizado quando PostgreSQL "
"foi construído\n"
-#: pg_config.c:436
+#: pg_config.c:453
+#, c-format
+msgid ""
+" --ldflags_ex show LDFLAGS_EX value used when PostgreSQL was "
+"built\n"
+msgstr ""
+" --ldflags_ex mostra valor de LDFLAGS_EX utilizado quando "
+"PostgreSQL foi construído\n"
+
+#: pg_config.c:454
#, c-format
msgid ""
" --ldflags_sl show LDFLAGS_SL value used when PostgreSQL was "
@@ -193,7 +204,7 @@ msgstr ""
" --ldflags_sl mostra valor de LDFLAGS_SL utilizado quando "
"PostgreSQL foi construído\n"
-#: pg_config.c:437
+#: pg_config.c:455
#, c-format
msgid ""
" --libs show LIBS value used when PostgreSQL was built\n"
@@ -201,17 +212,17 @@ msgstr ""
" --libs mostra valor de LIBS utilizado quando PostgreSQL foi "
"construído\n"
-#: pg_config.c:438
+#: pg_config.c:456
#, c-format
msgid " --version show the PostgreSQL version\n"
msgstr " --version mostra a versão do PostgreSQL\n"
-#: pg_config.c:439
+#: pg_config.c:457
#, c-format
msgid " --help show this help, then exit\n"
msgstr " --help mostra esta ajuda e termina\n"
-#: pg_config.c:440
+#: pg_config.c:458
#, c-format
msgid ""
"\n"
@@ -222,22 +233,22 @@ msgstr ""
"Sem argumentos, todos os itens serão mostrados.\n"
"\n"
-#: pg_config.c:441
+#: pg_config.c:459
#, c-format
msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
msgstr "Relate erros a <pgsql-bugs@postgresql.org>.\n"
-#: pg_config.c:447
+#: pg_config.c:465
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "Tente \"%s --help\" para obter informações adicionais.\n"
-#: pg_config.c:486
+#: pg_config.c:504
#, c-format
msgid "%s: could not find own program executable\n"
msgstr "%s: não pôde encontrar executável\n"
-#: pg_config.c:509
+#: pg_config.c:527
#, c-format
msgid "%s: invalid argument: %s\n"
msgstr "%s: argumento inválido: %s\n"
diff --git a/src/bin/pg_config/po/ro.po b/src/bin/pg_config/po/ro.po
index 2e5441a6f5..283cc115ec 100644
--- a/src/bin/pg_config/po/ro.po
+++ b/src/bin/pg_config/po/ro.po
@@ -1,26 +1,35 @@
-# translation of pg_config-ro.po to Romn
+# translation of pg_config-ro.po to Română
#
# Alin Vaida <alin.vaida@gmail.com>, 2004, 2005, 2006.
msgid ""
msgstr ""
"Project-Id-Version: pg_config-ro\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-24 15:25+0100\n"
-"PO-Revision-Date: 2006-02-05 19:10+0200\n"
-"Last-Translator: Alin Vaida <alin.vaida@gmail.com>\n"
-"Language-Team: Romn <en@li.org>\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2010-09-02 18:00+0000\n"
+"PO-Revision-Date: 2010-09-04 21:44-0000\n"
+"Last-Translator: Max <max@oceanline.co.uk>\n"
+"Language-Team: Română <max@oceanline.co.uk>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.2\n"
-
-#: pg_config.c:241 pg_config.c:257 pg_config.c:273 pg_config.c:289
-#: pg_config.c:305 pg_config.c:321 pg_config.c:337 pg_config.c:353
+"X-Poedit-Language: Romanian\n"
+"X-Poedit-Country: ROMANIA\n"
+
+#: pg_config.c:243
+#: pg_config.c:259
+#: pg_config.c:275
+#: pg_config.c:291
+#: pg_config.c:307
+#: pg_config.c:323
+#: pg_config.c:339
+#: pg_config.c:355
+#: pg_config.c:371
#, c-format
msgid "not recorded\n"
-msgstr "ne-nregistrat\n"
+msgstr "ne-înregistrat\n"
-#: pg_config.c:408
+#: pg_config.c:428
#, c-format
msgid ""
"\n"
@@ -28,156 +37,157 @@ msgid ""
"\n"
msgstr ""
"\n"
-"%s: furnizeaz informaii despre versiunea de PostgreSQL instalat\n"
+"%s: furnizează informaţii despre versiunea de PostgreSQL instalată\n"
"\n"
-#: pg_config.c:409
+#: pg_config.c:429
#, c-format
msgid "Usage:\n"
msgstr "Utilizare:\n"
-#: pg_config.c:410
+#: pg_config.c:430
#, c-format
msgid ""
-" %s [ OPTION ... ]\n"
+" %s [OPTION]...\n"
"\n"
msgstr ""
-" %s [ OPIUNE... ]\n"
+" %s [OPȚIUNE]...\n"
"\n"
-#: pg_config.c:411
+#: pg_config.c:431
#, c-format
msgid "Options:\n"
-msgstr "Opiuni:\n"
+msgstr "Opţiuni:\n"
-#: pg_config.c:412
+#: pg_config.c:432
#, c-format
msgid " --bindir show location of user executables\n"
-msgstr " --bindir afieaz locaia fiierelor executabile\n"
+msgstr " --bindir afişează locaţia fişierelor executabile\n"
-#: pg_config.c:413
+#: pg_config.c:433
#, c-format
msgid " --docdir show location of documentation files\n"
-msgstr " --docdir afieaz locaia documentaiei\n"
+msgstr " --docdir afişează locaţia documentaţiei\n"
-#: pg_config.c:414
+#: pg_config.c:434
+#, c-format
+msgid " --htmldir show location of HTML documentation files\n"
+msgstr " --docdir afişează locaţia documentaţiei HTML\n"
+
+#: pg_config.c:435
#, c-format
msgid ""
" --includedir show location of C header files of the client\n"
" interfaces\n"
-msgstr ""
-" --includedir afieaz locaia fiierelor header C ale "
-"interfeelor client\n"
+msgstr " --includedir afişează locaţia fişierelor header C ale interfeţelor client\n"
-#: pg_config.c:416
+#: pg_config.c:437
#, c-format
msgid " --pkgincludedir show location of other C header files\n"
-msgstr " --pkgincludedir afieaz locaia celorlalte fiiere header C\n"
+msgstr " --pkgincludedir afişează locaţia celorlalte fişiere header C\n"
-#: pg_config.c:417
+#: pg_config.c:438
#, c-format
msgid " --includedir-server show location of C header files for the server\n"
-msgstr " --includedir-server afieaz locaia fiierelor header C pentru server\n"
+msgstr " --includedir-server afişează locaţia fişierelor header C pentru server\n"
-#: pg_config.c:418
+#: pg_config.c:439
#, c-format
msgid " --libdir show location of object code libraries\n"
-msgstr " --libdir afieaz locaia bibliotecilor de cod obiect\n"
+msgstr " --libdir afişează locaţia bibliotecilor de cod obiect\n"
-#: pg_config.c:419
+#: pg_config.c:440
#, c-format
msgid " --pkglibdir show location of dynamically loadable modules\n"
-msgstr " --pkglibdir afieaz locaia modulelor ncrcabile dinamic\n"
+msgstr " --pkglibdir afişează locaţia modulelor încărcabile dinamic\n"
-#: pg_config.c:420
+#: pg_config.c:441
#, c-format
msgid " --localedir show location of locale support files\n"
-msgstr " --localedir afieaz locaia fiierelor de suport pentru localizare\n"
+msgstr " --localedir afişează locaţia fişierelor de suport pentru localizare\n"
-#: pg_config.c:421
+#: pg_config.c:442
#, c-format
msgid " --mandir show location of manual pages\n"
-msgstr " --mandir afieaz locaia paginilor de manual\n"
+msgstr " --mandir afişează locaţia paginilor de manual\n"
-#: pg_config.c:422
+#: pg_config.c:443
#, c-format
-msgid ""
-" --sharedir show location of architecture-independent support "
-"files\n"
-msgstr " --sharedir afieaz locaia fiierelor de suport independent de arhitectur\n"
+msgid " --sharedir show location of architecture-independent support files\n"
+msgstr " --sharedir afişează locaţia fişierelor de suport independent de arhitectură\n"
-#: pg_config.c:423
+#: pg_config.c:444
#, c-format
msgid " --sysconfdir show location of system-wide configuration files\n"
-msgstr " --sysconfdir afieaz locaia fiierelor de configurare pentru ntreg sistemul\n"
+msgstr " --sysconfdir afişează locaţia fişierelor de configurare pentru întreg sistemul\n"
-#: pg_config.c:424
+#: pg_config.c:445
#, c-format
msgid " --pgxs show location of extension makefile\n"
-msgstr ""
-" --pgxs afieaz locaia fiierului makefile pentru "
-"extensii\n"
+msgstr " --pgxs afişează locaţia fişierului makefile pentru extensii\n"
-#: pg_config.c:425
+#: pg_config.c:446
#, c-format
msgid ""
" --configure show options given to \"configure\" script when\n"
" PostgreSQL was built\n"
msgstr ""
-" --configure afieaz opiunile cu care a fost rulat scriptul "
-"\"configure\"\n"
+" --configure afişează opţiunile cu care a fost rulat scriptul \"configure\"\n"
" la compilarea PostgreSQL\n"
-#: pg_config.c:427
+#: pg_config.c:448
#, c-format
msgid " --cc show CC value used when PostgreSQL was built\n"
-msgstr " --cc afieaz valoarea CC folosit la compilarea PostgreSQL\n"
+msgstr " --cc afişează valoarea CC folosită la compilarea PostgreSQL\n"
-#: pg_config.c:428
+#: pg_config.c:449
#, c-format
msgid " --cppflags show CPPFLAGS value used when PostgreSQL was built\n"
-msgstr " --cppflags afieaz valoarea CPPFLAGS folosit la compilarea PostgreSQL\n"
+msgstr " --cppflags afişează valoarea CPPFLAGS folosită la compilarea PostgreSQL\n"
-#: pg_config.c:429
+#: pg_config.c:450
#, c-format
msgid " --cflags show CFLAGS value used when PostgreSQL was built\n"
-msgstr " --cflags afieaz valoarea CFLAGS folosit la compilarea PostgreSQL\n"
+msgstr " --cflags afişează valoarea CFLAGS folosită la compilarea PostgreSQL\n"
-#: pg_config.c:430
+#: pg_config.c:451
#, c-format
msgid " --cflags_sl show CFLAGS_SL value used when PostgreSQL was built\n"
-msgstr " --cflags_sl afieaz valoarea CFLAGS_SL folosit la compilarea PostgreSQL\n"
+msgstr " --cflags_sl afişează valoarea CFLAGS_SL folosită la compilarea PostgreSQL\n"
-#: pg_config.c:431
+#: pg_config.c:452
#, c-format
msgid " --ldflags show LDFLAGS value used when PostgreSQL was built\n"
-msgstr " --ldflags afieaz valoarea LDFLAGS folosit la compilarea PostgreSQL\n"
+msgstr " --ldflags afişează valoarea LDFLAGS folosită la compilarea PostgreSQL\n"
-#: pg_config.c:432
+#: pg_config.c:453
#, c-format
-msgid ""
-" --ldflags_sl show LDFLAGS_SL value used when PostgreSQL was "
-"built\n"
-msgstr " --ldflags_sl afieaz valoarea LDFLAGS_SL folosit la compilarea PostgreSQL\n"
+msgid " --ldflags_ex show LDFLAGS_EX value used when PostgreSQL was built\n"
+msgstr " --ldflags_sl afişează valoarea LDFLAGS_SL folosită la compilarea PostgreSQL\n"
-#: pg_config.c:433
+#: pg_config.c:454
+#, c-format
+msgid " --ldflags_sl show LDFLAGS_SL value used when PostgreSQL was built\n"
+msgstr " --ldflags_sl afişează valoarea LDFLAGS_SL folosită la compilarea PostgreSQL\n"
+
+#: pg_config.c:455
#, c-format
msgid " --libs show LIBS value used when PostgreSQL was built\n"
-msgstr " --libs afieaz valoarea LIBS folosit la compilarea PostgreSQL\n"
+msgstr " --libs afişează valoarea LIBS folosită la compilarea PostgreSQL\n"
-#: pg_config.c:434
+#: pg_config.c:456
#, c-format
msgid " --version show the PostgreSQL version\n"
-msgstr " --version afieaz versiunea PostgreSQL\n"
+msgstr " --version afişează versiunea PostgreSQL\n"
-#: pg_config.c:435
+#: pg_config.c:457
#, c-format
msgid " --help show this help, then exit\n"
msgstr ""
-" --help afieaz acest ajutor, apoi iese\n"
+" --help afişează acest ajutor, apoi iese\n"
"\n"
-#: pg_config.c:436
+#: pg_config.c:458
#, c-format
msgid ""
"\n"
@@ -185,71 +195,84 @@ msgid ""
"\n"
msgstr ""
"\n"
-"Fr argumente, afieaz toate elementele cunoscute\n"
+"Fără argumente, afişează toate elementele cunoscute\n"
"\n"
-#: pg_config.c:437
+#: pg_config.c:459
#, c-format
msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
-msgstr "Raportai erorile la <pgsql-bugs@postgresql.org>.\n"
+msgstr "Raportaţi erorile la <pgsql-bugs@postgresql.org>.\n"
-#: pg_config.c:443
+#: pg_config.c:465
#, c-format
msgid "Try \"%s --help\" for more information.\n"
-msgstr "ncercai \"%s --help\" pentru mai multe informaii.\n"
+msgstr "Încercaţi \"%s --help\" pentru mai multe informaţii.\n"
-#: pg_config.c:482
+#: pg_config.c:504
#, c-format
-msgid "%s: could not find own executable\n"
-msgstr "%s: imposibil de gsit propriul executabil\n"
+msgid "%s: could not find own program executable\n"
+msgstr "%s: imposibil de găsit propriul program executabil\n"
-#: pg_config.c:505
+#: pg_config.c:527
#, c-format
msgid "%s: invalid argument: %s\n"
msgstr "%s: argument incorect: %s\n"
-#: ../../port/exec.c:193 ../../port/exec.c:307 ../../port/exec.c:350
+#: ../../port/exec.c:125
+#: ../../port/exec.c:239
+#: ../../port/exec.c:282
#, c-format
msgid "could not identify current directory: %s"
msgstr "imposibil de identificat directorul curent: %s"
-#: ../../port/exec.c:212
+#: ../../port/exec.c:144
#, c-format
msgid "invalid binary \"%s\""
msgstr "binar incorect \"%s\""
-#: ../../port/exec.c:261
+#: ../../port/exec.c:193
#, c-format
msgid "could not read binary \"%s\""
msgstr "imposibil de citit binar \"%s\""
-#: ../../port/exec.c:268
+#: ../../port/exec.c:200
#, c-format
msgid "could not find a \"%s\" to execute"
-msgstr "imposibil de gsit \"%s\" pentru executare"
+msgstr "imposibil de găsit \"%s\" pentru executare"
-#: ../../port/exec.c:323 ../../port/exec.c:359
+#: ../../port/exec.c:255
+#: ../../port/exec.c:291
#, c-format
msgid "could not change directory to \"%s\""
-msgstr "imposibil de schimbat directorul n \"%s\""
+msgstr "imposibil de schimbat directorul în \"%s\""
-#: ../../port/exec.c:338
+#: ../../port/exec.c:270
#, c-format
msgid "could not read symbolic link \"%s\""
-msgstr "imposibil de citit legtura simbolic \"%s\""
+msgstr "imposibil de citit legătura simbolică \"%s\""
-#: ../../port/exec.c:584
+#: ../../port/exec.c:516
#, c-format
msgid "child process exited with exit code %d"
-msgstr "procesul fiu a ieit cu codul %d"
+msgstr "procesul fiu a ieşit cu codul %d"
+
+#: ../../port/exec.c:520
+#, c-format
+msgid "child process was terminated by exception 0x%X"
+msgstr "procesul fiu a fost terminat cu excepția 0x%X"
+
+#: ../../port/exec.c:529
+#, c-format
+msgid "child process was terminated by signal %s"
+msgstr "procesul fiu a fost terminat cu semnalul %s"
-#: ../../port/exec.c:587
+#: ../../port/exec.c:532
#, c-format
msgid "child process was terminated by signal %d"
msgstr "procesul fiu a fost terminat cu semnalul %d"
-#: ../../port/exec.c:590
+#: ../../port/exec.c:536
#, c-format
msgid "child process exited with unrecognized status %d"
-msgstr "procesul fiu a ieit cu starea nerecunoscut %d"
+msgstr "procesul fiu a ieşit cu starea nerecunoscută %d"
diff --git a/src/bin/pg_config/po/ru.po b/src/bin/pg_config/po/ru.po
index d729669b7a..caaffc8458 100644
--- a/src/bin/pg_config/po/ru.po
+++ b/src/bin/pg_config/po/ru.po
@@ -1,16 +1,17 @@
# ru.po
-# PG_CONFIG Translated Messages into the Russian Language (KOI8-R)
+# PG_CONFIG Translated Messages into the Russian Language (UTF-8)
#
# Copyright (c) 2004-2005 Serguei A. Mokhov, mokhov@cs.concordia.ca
# Distributed under the same licensing terms as PostgreSQL itself.
#
-# $PostgreSQL: pgsql/src/bin/pg_config/po/ru.po,v 1.6 2009/04/09 19:38:51 petere Exp $
+# pgtranslation Id: pg_config.po,v 1.4 2010/12/07 21:22:21 petere Exp $
#
# translation of subject-specific terminology, see:
-# :
+# перевод некоторых специфичных терминов:
# http://wiki.postgresql.org/wiki/NLS/ru/dict
#
# ChangeLog:
+# - December 1, 2010: translation for 9.1, Andrey Sudnik <sudnikand@gmail.com>
# - March 26, 2009: complete translation for 8.3, Sergey Burladyan <eshkinkot@gmail.com>
# - January 17, 2005: Complete translation for 8.0, Serguei A. Mokhov <mokhov@cs.concordia.ca>
# - December, 2004: Corrections and improvements by Oleg Bartunov <oleg@sai.msu.su>
@@ -18,25 +19,34 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: PostgreSQL 8.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-16 09:15+0000\n"
-"PO-Revision-Date: 2009-03-29 08:14+0400\n"
-"Last-Translator: Serguei A. Mokhov <mokhov@cs.concordia.ca>\n"
+"Project-Id-Version: PostgreSQL 9.1\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2010-11-29 18:40+0000\n"
+"PO-Revision-Date: 2010-12-01 00:56+0700\n"
+"Last-Translator: Andrey Sudnik <sudnikand@gmail.com>\n"
"Language-Team: pgsql-ru-general <pgsql-ru-general@postgresql.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=koi8-r\n"
+"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Language: Russian\n"
"X-Poedit-Country: RUSSIAN FEDERATION\n"
-
-#: pg_config.c:231 pg_config.c:247 pg_config.c:263 pg_config.c:279
-#: pg_config.c:295 pg_config.c:311 pg_config.c:327 pg_config.c:343
+"X-Poedit-SourceCharset: utf-8\n"
+
+#: pg_config.c:243
+#: pg_config.c:259
+#: pg_config.c:275
+#: pg_config.c:291
+#: pg_config.c:307
+#: pg_config.c:323
+#: pg_config.c:339
+#: pg_config.c:355
+#: pg_config.c:371
#, c-format
msgid "not recorded\n"
-msgstr " \n"
+msgstr "не сохранено\n"
-#: pg_config.c:398
+#: pg_config.c:428
#, c-format
msgid ""
"\n"
@@ -44,243 +54,251 @@ msgid ""
"\n"
msgstr ""
"\n"
-"%s PostgreSQL.\n"
+"%s предоставляет информацию об установленной версии PostgreSQL.\n"
"\n"
-#: pg_config.c:399
+#: pg_config.c:429
#, c-format
msgid "Usage:\n"
-msgstr ":\n"
+msgstr "Использование:\n"
-#: pg_config.c:400
+#: pg_config.c:430
#, c-format
msgid ""
-" %s [ OPTION ... ]\n"
+" %s [OPTION]...\n"
+"\n"
+msgstr ""
+" %s [ОПЦИЯ]...\n"
"\n"
-msgstr " %s [ ... ]\n\n"
-#: pg_config.c:401
+#: pg_config.c:431
#, c-format
msgid "Options:\n"
-msgstr ":\n"
+msgstr "Опции:\n"
-#: pg_config.c:402
+#: pg_config.c:432
#, c-format
msgid " --bindir show location of user executables\n"
-msgstr " --bindir \n"
+msgstr " --bindir показать расположение выполняемых файлов\n"
-#: pg_config.c:403
+#: pg_config.c:433
#, c-format
msgid " --docdir show location of documentation files\n"
-msgstr " --docdir \n"
+msgstr " --docdir показать расположение файлов документации\n"
-#: pg_config.c:404
+#: pg_config.c:434
+#, c-format
+msgid " --htmldir show location of HTML documentation files\n"
+msgstr " --htmldir показать расположение HTML файлов документации\n"
+
+#: pg_config.c:435
#, c-format
msgid ""
" --includedir show location of C header files of the client\n"
" interfaces\n"
msgstr ""
-" --includedir - C (.h)\n"
-" \n"
+" --includedir показать расположение файлов-заголовков C (.h)\n"
+" клиентских интерфейсов\n"
-#: pg_config.c:406
+#: pg_config.c:437
#, c-format
msgid " --pkgincludedir show location of other C header files\n"
-msgstr " --pkgincludedir - C (.h)\n"
+msgstr " --pkgincludedir показать расположение других файлов-заголовков C (.h)\n"
-#: pg_config.c:407
+#: pg_config.c:438
#, c-format
-msgid ""
-" --includedir-server show location of C header files for the server\n"
-msgstr ""
-" --includedir-server - C (.h) "
-"\n"
+msgid " --includedir-server show location of C header files for the server\n"
+msgstr " --includedir-server показать расположение файлов-заголовков C (.h) сервера\n"
-#: pg_config.c:408
+#: pg_config.c:439
#, c-format
msgid " --libdir show location of object code libraries\n"
-msgstr ""
-" --libdir \n"
+msgstr " --libdir показать расположение библиотек объектного кода\n"
-#: pg_config.c:409
+#: pg_config.c:440
#, c-format
msgid " --pkglibdir show location of dynamically loadable modules\n"
-msgstr ""
-" --pkglibdir "
-"\n"
+msgstr " --pkglibdir показать расположение динамически загружаемых модулей\n"
-#: pg_config.c:410
+#: pg_config.c:441
#, c-format
msgid " --localedir show location of locale support files\n"
-msgstr " --localedir \n"
+msgstr " --localedir показать расположение файлов описания локалей\n"
-#: pg_config.c:411
+#: pg_config.c:442
#, c-format
msgid " --mandir show location of manual pages\n"
-msgstr " --mandir \n"
+msgstr " --mandir показать расположение справочных страниц\n"
-#: pg_config.c:412
+#: pg_config.c:443
#, c-format
-msgid ""
-" --sharedir show location of architecture-independent support "
-"files\n"
-msgstr " --sharedir - \n"
+msgid " --sharedir show location of architecture-independent support files\n"
+msgstr " --sharedir показать расположение платформенно-независимых файлов\n"
-#: pg_config.c:413
+#: pg_config.c:444
#, c-format
-msgid ""
-" --sysconfdir show location of system-wide configuration files\n"
-msgstr " --sysconfdir \n"
+msgid " --sysconfdir show location of system-wide configuration files\n"
+msgstr " --sysconfdir показать расположение общесистемных конфигурационных файлов\n"
-#: pg_config.c:414
+#: pg_config.c:445
#, c-format
msgid " --pgxs show location of extension makefile\n"
-msgstr ""
-" --pgxs makefile \n"
+msgstr " --pgxs показать расположение makefile для расширений\n"
-#: pg_config.c:415
+#: pg_config.c:446
#, c-format
msgid ""
" --configure show options given to \"configure\" script when\n"
" PostgreSQL was built\n"
msgstr ""
-" --configure , \"configure\"\n"
-" PostgreSQL\n"
+" --configure показать опции, использованные \"configure\"\n"
+" при компиляции PostgreSQL\n"
-#: pg_config.c:417
+#: pg_config.c:448
#, c-format
msgid " --cc show CC value used when PostgreSQL was built\n"
-msgstr " --cc CC PostgreSQL\n"
+msgstr " --cc показать значение CC использованное при компиляции PostgreSQL\n"
-#: pg_config.c:418
+#: pg_config.c:449
#, c-format
-msgid ""
-" --cppflags show CPPFLAGS value used when PostgreSQL was built\n"
-msgstr " --cppflags CPPFLAGS PostgreSQL\n"
+msgid " --cppflags show CPPFLAGS value used when PostgreSQL was built\n"
+msgstr " --cppflags показать значение CPPFLAGS использованное при компиляции PostgreSQL\n"
-#: pg_config.c:419
+#: pg_config.c:450
#, c-format
-msgid ""
-" --cflags show CFLAGS value used when PostgreSQL was built\n"
-msgstr " --cflags CFLAGS PostgreSQL\n"
+msgid " --cflags show CFLAGS value used when PostgreSQL was built\n"
+msgstr " --cflags показать значение CFLAGS использованное при компиляции PostgreSQL\n"
-#: pg_config.c:420
+#: pg_config.c:451
#, c-format
-msgid ""
-" --cflags_sl show CFLAGS_SL value used when PostgreSQL was built\n"
-msgstr " --cflags_sl CFLAGS_SL PostgreSQL\n"
+msgid " --cflags_sl show CFLAGS_SL value used when PostgreSQL was built\n"
+msgstr " --cflags_sl показать значение CFLAGS_SL использованное при компиляции PostgreSQL\n"
-#: pg_config.c:421
+#: pg_config.c:452
#, c-format
-msgid ""
-" --ldflags show LDFLAGS value used when PostgreSQL was built\n"
-msgstr " --ldflags LDFLAGS PostgreSQL\n"
+msgid " --ldflags show LDFLAGS value used when PostgreSQL was built\n"
+msgstr " --ldflags показать значение LDFLAGS использованное при компиляции PostgreSQL\n"
-#: pg_config.c:422
+#: pg_config.c:453
#, c-format
-msgid ""
-" --ldflags_sl show LDFLAGS_SL value used when PostgreSQL was "
-"built\n"
-msgstr " --ldflags_sl LDFLAGS_SL PostgreSQL\n"
+msgid " --ldflags_ex show LDFLAGS_EX value used when PostgreSQL was built\n"
+msgstr " --ldflags_ex показать значение LDFLAGS_EX используемое при компиляции PostgreSQL\n"
-#: pg_config.c:423
+#: pg_config.c:454
#, c-format
-msgid ""
-" --libs show LIBS value used when PostgreSQL was built\n"
-msgstr " --libs LIBS PostgreSQL\n"
+msgid " --ldflags_sl show LDFLAGS_SL value used when PostgreSQL was built\n"
+msgstr " --ldflags_sl показать значение LDFLAGS_SL использованное при компиляции PostgreSQL\n"
-#: pg_config.c:424
+#: pg_config.c:455
+#, c-format
+msgid " --libs show LIBS value used when PostgreSQL was built\n"
+msgstr " --libs показать значение LIBS использованное при компиляции PostgreSQL\n"
+
+#: pg_config.c:456
#, c-format
msgid " --version show the PostgreSQL version\n"
-msgstr " --version PostgreSQL\n"
+msgstr " --version показать версию PostgreSQL\n"
-#: pg_config.c:425
+#: pg_config.c:457
#, c-format
msgid " --help show this help, then exit\n"
-msgstr " --help \n"
+msgstr " --help показать эту подсказку и выйти\n"
-#: pg_config.c:426
+#: pg_config.c:458
#, c-format
msgid ""
"\n"
"With no arguments, all known items are shown.\n"
"\n"
-msgstr "\n , .\n\n"
+msgstr ""
+"\n"
+"При запуске без аргументов, будут показаны все известные значения.\n"
+"\n"
-#: pg_config.c:427
+#: pg_config.c:459
#, c-format
msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
-msgstr " : <pgsql-bugs@postgresql.org>.\n"
+msgstr "Сообщать об ошибках: <pgsql-bugs@postgresql.org>.\n"
-#: pg_config.c:433
+#: pg_config.c:465
#, c-format
msgid "Try \"%s --help\" for more information.\n"
-msgstr " \"%s --help\" \n"
+msgstr "Наберите \"%s --help\" для более подробной информации\n"
-#: pg_config.c:472
+#: pg_config.c:504
#, c-format
msgid "%s: could not find own program executable\n"
-msgstr "%s: \n"
+msgstr "%s: не удалось найти свой собственный выполняемый файл\n"
-#: pg_config.c:495
+#: pg_config.c:527
#, c-format
msgid "%s: invalid argument: %s\n"
-msgstr "%s: : %s\n"
+msgstr "%s: неверный аргумент: %s\n"
-#: ../../port/exec.c:195 ../../port/exec.c:309 ../../port/exec.c:352
+#: ../../port/exec.c:125
+#: ../../port/exec.c:239
+#: ../../port/exec.c:282
#, c-format
msgid "could not identify current directory: %s"
-msgstr " : %s"
+msgstr "не удалось идентифицировать текущую директорию: %s"
-#: ../../port/exec.c:214
+#: ../../port/exec.c:144
#, c-format
msgid "invalid binary \"%s\""
-msgstr " \"%s\""
+msgstr "неверный бинарный \"%s\""
-#: ../../port/exec.c:263
+#: ../../port/exec.c:193
#, c-format
msgid "could not read binary \"%s\""
-msgstr " \"%s\""
+msgstr "не удалось считать бинарный \"%s\""
-#: ../../port/exec.c:270
+#: ../../port/exec.c:200
#, c-format
msgid "could not find a \"%s\" to execute"
-msgstr "\"%s\" "
+msgstr "\"%s\" не найден для выполнения"
-#: ../../port/exec.c:325 ../../port/exec.c:361
+#: ../../port/exec.c:255
+#: ../../port/exec.c:291
#, c-format
msgid "could not change directory to \"%s\""
-msgstr " \"%s\""
+msgstr "не удалось поменять директорию на \"%s\""
-#: ../../port/exec.c:340
+#: ../../port/exec.c:270
#, c-format
msgid "could not read symbolic link \"%s\""
-msgstr " \"%s\""
+msgstr "не получилось считать символическую ссылку \"%s\""
-#: ../../port/exec.c:586
+#: ../../port/exec.c:516
#, c-format
msgid "child process exited with exit code %d"
-msgstr " %d"
+msgstr "дочерний процесс завершился с кодом возврата %d"
-#: ../../port/exec.c:590
+#: ../../port/exec.c:520
#, c-format
msgid "child process was terminated by exception 0x%X"
-msgstr " ۣ 0x%X"
+msgstr "дочерний процесс завершён исключением 0x%X"
-#: ../../port/exec.c:599
+#: ../../port/exec.c:529
#, c-format
msgid "child process was terminated by signal %s"
-msgstr " ۣ %s"
+msgstr "дочерний процесс завершён сигналом %s"
-#: ../../port/exec.c:602
+#: ../../port/exec.c:532
#, c-format
msgid "child process was terminated by signal %d"
-msgstr " ۣ %d"
+msgstr "дочерний процесс завершён сигналом %d"
-#: ../../port/exec.c:606
+#: ../../port/exec.c:536
#, c-format
msgid "child process exited with unrecognized status %d"
-msgstr " %d"
-
+msgstr "дочерний процесс завершился с нераспознанным статусом %d"
+
+#~ msgid ""
+#~ " %s [ OPTION ... ]\n"
+#~ "\n"
+#~ msgstr ""
+#~ " %s [ ОПЦИЯ ... ]\n"
+#~ "\n"
#~ msgid "%s: argument required\n"
-#~ msgstr "%s: \n"
+#~ msgstr "%s: требуется аргумент\n"
+
diff --git a/src/bin/pg_config/po/sv.po b/src/bin/pg_config/po/sv.po
index 77da1db1f8..caef9dcada 100644
--- a/src/bin/pg_config/po/sv.po
+++ b/src/bin/pg_config/po/sv.po
@@ -5,8 +5,8 @@ msgid ""
msgstr ""
"Project-Id-Version: PostgreSQL 8.4\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2009-06-13 17:08+0000\n"
-"PO-Revision-Date: 2009-06-13 22:42+0300\n"
+"POT-Creation-Date: 2010-07-27 06:04+0000\n"
+"PO-Revision-Date: 2010-07-27 22:11+0300\n"
"Last-Translator: Peter Eisentraut <peter_e@gmx.net>\n"
"Language-Team: Swedish <sv@li.org>\n"
"MIME-Version: 1.0\n"
@@ -15,11 +15,12 @@ msgstr ""
#: pg_config.c:243 pg_config.c:259 pg_config.c:275 pg_config.c:291
#: pg_config.c:307 pg_config.c:323 pg_config.c:339 pg_config.c:355
+#: pg_config.c:371
#, c-format
msgid "not recorded\n"
msgstr "ej sparat\n"
-#: pg_config.c:411
+#: pg_config.c:428
#, c-format
msgid ""
"\n"
@@ -30,39 +31,41 @@ msgstr ""
"%s ger information on den installerade versionen av PostgreSQL.\n"
"\n"
-#: pg_config.c:412
+#: pg_config.c:429
#, c-format
msgid "Usage:\n"
msgstr "Anvndning:\n"
-#: pg_config.c:413
+#: pg_config.c:430
#, c-format
msgid ""
" %s [OPTION]...\n"
"\n"
-msgstr " %s [FLAGGA]...\n\n"
+msgstr ""
+" %s [FLAGGA]...\n"
+"\n"
-#: pg_config.c:414
+#: pg_config.c:431
#, c-format
msgid "Options:\n"
msgstr "Flaggor:\n"
-#: pg_config.c:415
+#: pg_config.c:432
#, c-format
msgid " --bindir show location of user executables\n"
msgstr " --bindir visar platsen fr krbara filer\n"
-#: pg_config.c:416
+#: pg_config.c:433
#, c-format
msgid " --docdir show location of documentation files\n"
msgstr " --docdir visa platsen fr dokumentationsfiler\n"
-#: pg_config.c:417
+#: pg_config.c:434
#, c-format
msgid " --htmldir show location of HTML documentation files\n"
msgstr " --htmldir visa platsen fr HTML-dokumentationsfiler\n"
-#: pg_config.c:418
+#: pg_config.c:435
#, c-format
msgid ""
" --includedir show location of C header files of the client\n"
@@ -71,57 +74,57 @@ msgstr ""
" --includedir visar platsen fr C-header-filerna till\n"
" klientinterface\n"
-#: pg_config.c:420
+#: pg_config.c:437
#, c-format
msgid " --pkgincludedir show location of other C header files\n"
msgstr " --pkgincludedir visa platsen fr C-header-filer\n"
-#: pg_config.c:421
+#: pg_config.c:438
#, c-format
msgid ""
" --includedir-server show location of C header files for the server\n"
msgstr ""
" --includedir-server visar platsen fr C-header-filerna till servern\n"
-#: pg_config.c:422
+#: pg_config.c:439
#, c-format
msgid " --libdir show location of object code libraries\n"
msgstr " --libdir visar platsen fr bibliotekens objektfiler\n"
-#: pg_config.c:423
+#: pg_config.c:440
#, c-format
msgid " --pkglibdir show location of dynamically loadable modules\n"
msgstr " --pkglibdir visar platsen fr dynamiskt laddade moduler\n"
-#: pg_config.c:424
+#: pg_config.c:441
#, c-format
msgid " --localedir show location of locale support files\n"
msgstr " --localedir visa platsen fr lokalstdfiler\n"
-#: pg_config.c:425
+#: pg_config.c:442
#, c-format
msgid " --mandir show location of manual pages\n"
msgstr " --mandir visa platsen fr manualsidor\n"
-#: pg_config.c:426
+#: pg_config.c:443
#, c-format
msgid ""
" --sharedir show location of architecture-independent support "
"files\n"
msgstr " --sharedir visa platsen fr arkitekturoberoende filer\n"
-#: pg_config.c:427
+#: pg_config.c:444
#, c-format
msgid ""
" --sysconfdir show location of system-wide configuration files\n"
msgstr " --sysconfdir visa platsen fr systemkonfigurationsfiler\n"
-#: pg_config.c:428
+#: pg_config.c:445
#, c-format
msgid " --pgxs show location of extension makefile\n"
msgstr " --pgxs visar platsen fr makefilen till utkningar\n"
-#: pg_config.c:429
+#: pg_config.c:446
#, c-format
msgid ""
" --configure show options given to \"configure\" script when\n"
@@ -130,14 +133,14 @@ msgstr ""
" --configure dessa flaggor gavs till \"configure\"-skriptet nr\n"
" PostgreSQL byggdes\n"
-#: pg_config.c:431
+#: pg_config.c:448
#, c-format
msgid " --cc show CC value used when PostgreSQL was built\n"
msgstr ""
" --cc visa vrdet p CC som anvndes nr PostgreSQL "
"byggdes\n"
-#: pg_config.c:432
+#: pg_config.c:449
#, c-format
msgid ""
" --cppflags show CPPFLAGS value used when PostgreSQL was built\n"
@@ -145,7 +148,7 @@ msgstr ""
" --cppflags visa vrdet p CPPFLAGS som anvndes nr PostgreSQL "
"byggdes\n"
-#: pg_config.c:433
+#: pg_config.c:450
#, c-format
msgid ""
" --cflags show CFLAGS value used when PostgreSQL was built\n"
@@ -153,7 +156,7 @@ msgstr ""
" --cflags visa vrdet p CFLAGS som anvndes nr PostgreSQL "
"byggdes\n"
-#: pg_config.c:434
+#: pg_config.c:451
#, c-format
msgid ""
" --cflags_sl show CFLAGS_SL value used when PostgreSQL was built\n"
@@ -161,7 +164,7 @@ msgstr ""
" --cflags_sl visa vrdet p CFLAGS_SL som anvndes nr PostgreSQL "
"byggdes\n"
-#: pg_config.c:435
+#: pg_config.c:452
#, c-format
msgid ""
" --ldflags show LDFLAGS value used when PostgreSQL was built\n"
@@ -169,7 +172,14 @@ msgstr ""
" --ldflags visa vrdet p LDFLAGS som anvndes nr PostgreSQL "
"byggdes\n"
-#: pg_config.c:436
+#: pg_config.c:453
+#, c-format
+msgid ""
+" --ldflags_ex show LDFLAGS_EX value used when PostgreSQL was "
+"built\n"
+msgstr " --ldflags_ex visa vrdet p LDFLAGS_EX som anvndes nr PostgreSQL byggdes\n"
+
+#: pg_config.c:454
#, c-format
msgid ""
" --ldflags_sl show LDFLAGS_SL value used when PostgreSQL was "
@@ -178,7 +188,7 @@ msgstr ""
" --ldflags_sl visa vrdet p LDFLAGS_SL som anvndes nr "
"PostgreSQL byggdes\n"
-#: pg_config.c:437
+#: pg_config.c:455
#, c-format
msgid ""
" --libs show LIBS value used when PostgreSQL was built\n"
@@ -186,17 +196,17 @@ msgstr ""
" --libs visa vrdet p LIBS som anvndes nr PostgreSQL "
"byggdes\n"
-#: pg_config.c:438
+#: pg_config.c:456
#, c-format
msgid " --version show the PostgreSQL version\n"
msgstr " --version visa PostgreSQLs version\n"
-#: pg_config.c:439
+#: pg_config.c:457
#, c-format
msgid " --help show this help, then exit\n"
msgstr " --help visa den hr hjlpen, avsluta sedan\n"
-#: pg_config.c:440
+#: pg_config.c:458
#, c-format
msgid ""
"\n"
@@ -207,77 +217,77 @@ msgstr ""
"Utan argument s visas alla knda vrden.\n"
"\n"
-#: pg_config.c:441
+#: pg_config.c:459
#, c-format
msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
msgstr "Rapportera fel till <pgsql-bugs@postgresql.org>.\n"
-#: pg_config.c:447
+#: pg_config.c:465
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "Frsk med \"%s --help\" fr mer information.\n"
-#: pg_config.c:486
+#: pg_config.c:504
#, c-format
msgid "%s: could not find own program executable\n"
msgstr "%s: kunde inte hitta min egen krbara fil\n"
-#: pg_config.c:509
+#: pg_config.c:527
#, c-format
msgid "%s: invalid argument: %s\n"
msgstr "%s: ogiltigt argument: %s\n"
-#: ../../port/exec.c:195 ../../port/exec.c:309 ../../port/exec.c:352
+#: ../../port/exec.c:125 ../../port/exec.c:239 ../../port/exec.c:282
#, c-format
msgid "could not identify current directory: %s"
msgstr "kunde inte identifiera aktuella katalogen: %s"
-#: ../../port/exec.c:214
+#: ../../port/exec.c:144
#, c-format
msgid "invalid binary \"%s\""
msgstr "ogiltig binr \"%s\""
-#: ../../port/exec.c:263
+#: ../../port/exec.c:193
#, c-format
msgid "could not read binary \"%s\""
msgstr "kunde inte lsa binr \"%s\""
-#: ../../port/exec.c:270
+#: ../../port/exec.c:200
#, c-format
msgid "could not find a \"%s\" to execute"
msgstr "kunde inte hitta en \"%s\" att kra"
-#: ../../port/exec.c:325 ../../port/exec.c:361
+#: ../../port/exec.c:255 ../../port/exec.c:291
#, c-format
msgid "could not change directory to \"%s\""
msgstr "kunde inte byta katalog till \"%s\""
-#: ../../port/exec.c:340
+#: ../../port/exec.c:270
#, c-format
msgid "could not read symbolic link \"%s\""
msgstr "kunde inte lsa symbolisk lnk \"%s\""
-#: ../../port/exec.c:586
+#: ../../port/exec.c:516
#, c-format
msgid "child process exited with exit code %d"
msgstr "barnprocess avslutade med kod %d"
-#: ../../port/exec.c:590
+#: ../../port/exec.c:520
#, c-format
msgid "child process was terminated by exception 0x%X"
msgstr "barnprocess terminerades av felkod 0x%X"
-#: ../../port/exec.c:599
+#: ../../port/exec.c:529
#, c-format
msgid "child process was terminated by signal %s"
msgstr "barnprocess terminerades av signal %s"
-#: ../../port/exec.c:602
+#: ../../port/exec.c:532
#, c-format
msgid "child process was terminated by signal %d"
msgstr "barnprocess terminerades av signal %d"
-#: ../../port/exec.c:606
+#: ../../port/exec.c:536
#, c-format
msgid "child process exited with unrecognized status %d"
msgstr "barnprocess avslutade med oknd statuskod %d"
diff --git a/src/bin/pg_config/po/ta.po b/src/bin/pg_config/po/ta.po
index 34b51a3a59..36e94d17b7 100644
--- a/src/bin/pg_config/po/ta.po
+++ b/src/bin/pg_config/po/ta.po
@@ -75,7 +75,7 @@ msgid ""
" --includedir show location of C header files of the client\n"
" interfaces\n"
msgstr ""
-" --includedir வாங்கியிக்கான C முதற் கோப்புகளின் இருப்பிடத்தைக் காட்டுக\n"
+" --includedir வாங்கிக்கான C முதற் கோப்புகளின் இருப்பிடத்தைக் காட்டுக\n"
" இடைமுகப்புகள்\n"
#: pg_config.c:406
diff --git a/src/bin/pg_config/po/tr.po b/src/bin/pg_config/po/tr.po
index ab876768c6..477e33b8f4 100644
--- a/src/bin/pg_config/po/tr.po
+++ b/src/bin/pg_config/po/tr.po
@@ -6,9 +6,9 @@ msgid ""
msgstr ""
"Project-Id-Version: pg_config-tr\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2009-04-29 07:09+0000\n"
-"PO-Revision-Date: 2009-04-29 16:28+0200\n"
-"Last-Translator: Devrim GÜNDÜZ <devrim@commandprompt.com>\n"
+"POT-Creation-Date: 2010-08-31 20:02+0000\n"
+"PO-Revision-Date: 2010-09-01 11:05+0200\n"
+"Last-Translator: Devrim GÜNDÜZ <devrim@gunduz.org>\n"
"Language-Team: Turkish <ceviri@postgresql.org.tr>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -25,11 +25,12 @@ msgstr ""
#: pg_config.c:323
#: pg_config.c:339
#: pg_config.c:355
+#: pg_config.c:371
#, c-format
msgid "not recorded\n"
msgstr "kayıtlı değil\n"
-#: pg_config.c:411
+#: pg_config.c:428
#, c-format
msgid ""
"\n"
@@ -40,12 +41,12 @@ msgstr ""
"%s kurulu PostgreSQL sürümü hakkında bilgi verir.\n"
"\n"
-#: pg_config.c:412
+#: pg_config.c:429
#, c-format
msgid "Usage:\n"
msgstr "Kullanımı:\n"
-#: pg_config.c:413
+#: pg_config.c:430
#, c-format
msgid ""
" %s [OPTION]...\n"
@@ -54,27 +55,27 @@ msgstr ""
" %s [SEÇENEK]...\n"
"\n"
-#: pg_config.c:414
+#: pg_config.c:431
#, c-format
msgid "Options:\n"
msgstr "Seçenekler:\n"
-#: pg_config.c:415
+#: pg_config.c:432
#, c-format
msgid " --bindir show location of user executables\n"
msgstr " --bindir kullanıcı tarafından çalıştırılabilir dosyaların yerlerini göster\n"
-#: pg_config.c:416
+#: pg_config.c:433
#, c-format
msgid " --docdir show location of documentation files\n"
msgstr " --docdir dokümantasyon dosyaların yerini göster\n"
-#: pg_config.c:417
+#: pg_config.c:434
#, c-format
msgid " --htmldir show location of HTML documentation files\n"
msgstr " --docdir HTML belge dosyalarının yerini göster\n"
-#: pg_config.c:418
+#: pg_config.c:435
#, c-format
msgid ""
" --includedir show location of C header files of the client\n"
@@ -83,52 +84,52 @@ msgstr ""
" --includedir İstemci arabirimlerinin C başlık dosyalarının yerlerini\n"
" göster\n"
-#: pg_config.c:420
+#: pg_config.c:437
#, c-format
msgid " --pkgincludedir show location of other C header files\n"
msgstr " --pkgincludedir diğer C başlık dosyalarının yerlerini göster\n"
-#: pg_config.c:421
+#: pg_config.c:438
#, c-format
msgid " --includedir-server show location of C header files for the server\n"
msgstr " --includedir-server Sunucu için C başlık dosyalarının yerlerini göster\n"
-#: pg_config.c:422
+#: pg_config.c:439
#, c-format
msgid " --libdir show location of object code libraries\n"
msgstr " --libdir nesne kod kütüphanelerinin yerini göster\n"
-#: pg_config.c:423
+#: pg_config.c:440
#, c-format
msgid " --pkglibdir show location of dynamically loadable modules\n"
msgstr " --pkglibdir Dinamik olarak yüklenebilen modüllerin yerlerini göster\n"
-#: pg_config.c:424
+#: pg_config.c:441
#, c-format
msgid " --localedir show location of locale support files\n"
msgstr " --localedir yerel dil destek dosyalarının yerini göster\n"
-#: pg_config.c:425
+#: pg_config.c:442
#, c-format
msgid " --mandir show location of manual pages\n"
msgstr " --mandir kullanıcı kılavuzu (man) dosyaların yerini göster\n"
-#: pg_config.c:426
+#: pg_config.c:443
#, c-format
msgid " --sharedir show location of architecture-independent support files\n"
msgstr " --sharedir platform bağımsız dosyaların yerini göster\n"
-#: pg_config.c:427
+#: pg_config.c:444
#, c-format
msgid " --sysconfdir show location of system-wide configuration files\n"
msgstr " --sysconfdir sistem geneli parametre dosyaların yerini göster\n"
-#: pg_config.c:428
+#: pg_config.c:445
#, c-format
msgid " --pgxs show location of extension makefile\n"
msgstr " --pgxs extension makefile dosyasının yerini göster\n"
-#: pg_config.c:429
+#: pg_config.c:446
#, c-format
msgid ""
" --configure show options given to \"configure\" script when\n"
@@ -137,52 +138,57 @@ msgstr ""
" --configure PostgreSQL yapılandırıldığında \"configure\" betiğine verilen\n"
" seçeneklerin listesini göster\n"
-#: pg_config.c:431
+#: pg_config.c:448
#, c-format
msgid " --cc show CC value used when PostgreSQL was built\n"
msgstr " --ldflags PostgreSQL derleme sırasında kullanılan CC değerini göster\n"
-#: pg_config.c:432
+#: pg_config.c:449
#, c-format
msgid " --cppflags show CPPFLAGS value used when PostgreSQL was built\n"
msgstr " --ldflags PostgreSQL derleme sırasında kullanılan CPPFLAGS değerini göster\n"
-#: pg_config.c:433
+#: pg_config.c:450
#, c-format
msgid " --cflags show CFLAGS value used when PostgreSQL was built\n"
msgstr " --ldflags PostgreSQL derleme sırasında kullanılan CFLAGS değerini göster\n"
-#: pg_config.c:434
+#: pg_config.c:451
#, c-format
msgid " --cflags_sl show CFLAGS_SL value used when PostgreSQL was built\n"
msgstr " --ldflags PostgreSQL derleme sırasında kullanılan CFLAGS_SL değerini göster\n"
-#: pg_config.c:435
+#: pg_config.c:452
#, c-format
msgid " --ldflags show LDFLAGS value used when PostgreSQL was built\n"
msgstr " --ldflags PostgreSQL derleme sırasında kullanılan LDFLAGS değerini göster\n"
-#: pg_config.c:436
+#: pg_config.c:453
+#, c-format
+msgid " --ldflags_ex show LDFLAGS_EX value used when PostgreSQL was built\n"
+msgstr " --ldflags_ex PostgreSQL derlemesi sırasında kullanılan LDFLAGS_EX değerini göster\n"
+
+#: pg_config.c:454
#, c-format
msgid " --ldflags_sl show LDFLAGS_SL value used when PostgreSQL was built\n"
msgstr " --ldflags PostgreSQL derleme sırasında kullanılan LDFLAGS_SL değerini göster\n"
-#: pg_config.c:437
+#: pg_config.c:455
#, c-format
msgid " --libs show LIBS value used when PostgreSQL was built\n"
msgstr " --libs PostgreSQL derleme sırasında kullanılan LIBS değerini göster\n"
-#: pg_config.c:438
+#: pg_config.c:456
#, c-format
msgid " --version show the PostgreSQL version\n"
msgstr " --version PostgreSQL sürümünü göster ve çık\n"
-#: pg_config.c:439
+#: pg_config.c:457
#, c-format
msgid " --help show this help, then exit\n"
msgstr " --help bu yardımı göster ve çık\n"
-#: pg_config.c:440
+#: pg_config.c:458
#, c-format
msgid ""
"\n"
@@ -193,80 +199,80 @@ msgstr ""
"Parametre verilmediyse, tüm değerleri gösterilmektedir.\n"
"\n"
-#: pg_config.c:441
+#: pg_config.c:459
#, c-format
msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
msgstr "Hataları <pgsql-bugs@postgresql.org> adresine bildirebilirsiniz.\n"
-#: pg_config.c:447
+#: pg_config.c:465
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "Daha fazla bilgi için\"%s --help\" parametresini kullanabilirsiniz\n"
-#: pg_config.c:486
+#: pg_config.c:504
#, c-format
msgid "%s: could not find own program executable\n"
msgstr "%s: çalıştırılabilir dosya bulunamadı\n"
-#: pg_config.c:509
+#: pg_config.c:527
#, c-format
msgid "%s: invalid argument: %s\n"
msgstr "%s: geçersiz argüman: %s\n"
-#: ../../port/exec.c:195
-#: ../../port/exec.c:309
-#: ../../port/exec.c:352
+#: ../../port/exec.c:125
+#: ../../port/exec.c:239
+#: ../../port/exec.c:282
#, c-format
msgid "could not identify current directory: %s"
msgstr "geçerli dizin tespit edilemedi: %s"
-#: ../../port/exec.c:214
+#: ../../port/exec.c:144
#, c-format
msgid "invalid binary \"%s\""
msgstr "geçersiz ikili (binary) \"%s\""
-#: ../../port/exec.c:263
+#: ../../port/exec.c:193
#, c-format
msgid "could not read binary \"%s\""
msgstr "\"%s\" ikili (binary) dosyası okunamadı"
-#: ../../port/exec.c:270
+#: ../../port/exec.c:200
#, c-format
msgid "could not find a \"%s\" to execute"
msgstr "\"%s\" çalıştırmak için bulunamadı"
-#: ../../port/exec.c:325
-#: ../../port/exec.c:361
+#: ../../port/exec.c:255
+#: ../../port/exec.c:291
#, c-format
msgid "could not change directory to \"%s\""
msgstr "çalışma dizini \"%s\" olarak değiştirilemedi"
-#: ../../port/exec.c:340
+#: ../../port/exec.c:270
#, c-format
msgid "could not read symbolic link \"%s\""
msgstr "symbolic link \"%s\" okuma hatası"
-#: ../../port/exec.c:586
+#: ../../port/exec.c:516
#, c-format
msgid "child process exited with exit code %d"
msgstr "alt süreç %d çıkış koduyla sonuçlandı"
-#: ../../port/exec.c:590
+#: ../../port/exec.c:520
#, c-format
msgid "child process was terminated by exception 0x%X"
msgstr "alt süreç 0x%X exception tarafından sonlandırıldı"
-#: ../../port/exec.c:599
+#: ../../port/exec.c:529
#, c-format
msgid "child process was terminated by signal %s"
msgstr "alt süreç %s sinyali tarafından sonlandırıldı"
-#: ../../port/exec.c:602
+#: ../../port/exec.c:532
#, c-format
msgid "child process was terminated by signal %d"
msgstr "alt süreç %d sinyali tarafından sonlandırıldı"
-#: ../../port/exec.c:606
+#: ../../port/exec.c:536
#, c-format
msgid "child process exited with unrecognized status %d"
msgstr "alt süreç %d bilinmeyen durumu ile sonlandırıldı"
@@ -277,4 +283,3 @@ msgstr "alt süreç %d bilinmeyen durumu ile sonlandırıldı"
#~ msgstr ""
#~ " %s [ SEÇENEK ... ]\n"
#~ "\n"
-
diff --git a/src/bin/pg_config/po/zh_CN.po b/src/bin/pg_config/po/zh_CN.po
index ef25fa3c24..30b232ea51 100644
--- a/src/bin/pg_config/po/zh_CN.po
+++ b/src/bin/pg_config/po/zh_CN.po
@@ -4,29 +4,24 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: PostgreSQL 8.0\n"
+"Project-Id-Version: pg_config (PostgreSQL 9.0)\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-02-19 01:52+0000\n"
-"PO-Revision-Date: 2010-03-30 13:51+0800\n"
+"POT-Creation-Date: 2010-10-01 14:40+0000\n"
+"PO-Revision-Date: 2010-10-01 12:43+0800\n"
"Last-Translator: Weibin <ssmei_2000@yahoo.com>\n"
-"Language-Team: Weiping He <laser@imsi.cn>\n"
+"Language-Team: Chinese (Simplified)\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=GB2312\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: pg_config.c:243
-#: pg_config.c:259
-#: pg_config.c:275
-#: pg_config.c:291
-#: pg_config.c:307
-#: pg_config.c:323
-#: pg_config.c:339
-#: pg_config.c:355
+#: pg_config.c:243 pg_config.c:259 pg_config.c:275 pg_config.c:291
+#: pg_config.c:307 pg_config.c:323 pg_config.c:339 pg_config.c:355
+#: pg_config.c:371
#, c-format
msgid "not recorded\n"
-msgstr "ûм¼\n"
+msgstr "没有记录\n"
-#: pg_config.c:411
+#: pg_config.c:428
#, c-format
msgid ""
"\n"
@@ -34,152 +29,170 @@ msgid ""
"\n"
msgstr ""
"\n"
-"%s ṩ PostgreSQL İװϢ.\n"
+"%s 提供 PostgreSQL 的安装信息.\n"
"\n"
-#: pg_config.c:412
+#: pg_config.c:429
#, c-format
msgid "Usage:\n"
-msgstr "ʹ÷:\n"
+msgstr "使用方法:\n"
-#: pg_config.c:413
+#: pg_config.c:430
#, c-format
msgid ""
" %s [OPTION]...\n"
"\n"
-msgstr " %s [ѡ]...\n"
+msgstr " %s [选项]...\n"
-#: pg_config.c:414
+#: pg_config.c:431
#, c-format
msgid "Options:\n"
-msgstr "ѡ:\n"
+msgstr "选项:\n"
-#: pg_config.c:415
+#: pg_config.c:432
#, c-format
msgid " --bindir show location of user executables\n"
-msgstr " --bindir ʾִļλ\n"
+msgstr " --bindir 显示执行文件所在位置\n"
-#: pg_config.c:416
+#: pg_config.c:433
#, c-format
msgid " --docdir show location of documentation files\n"
-msgstr " --docdir ʾĵλ\n"
+msgstr " --docdir 显示文档所在位置\n"
-#: pg_config.c:417
+#: pg_config.c:434
#, c-format
msgid " --htmldir show location of HTML documentation files\n"
-msgstr " --htmldir ʾHTMLĵļλ\n"
+msgstr " --htmldir 显示HTML文档文件所在位置\n"
-#: pg_config.c:418
+#: pg_config.c:435
#, c-format
msgid ""
" --includedir show location of C header files of the client\n"
" interfaces\n"
msgstr ""
-" --includedir ʾͻ˽ӿ C ͷļ\n"
-" λ\n"
+" --includedir 显示客户端接口 C 头文件所在\n"
+" 位置\n"
-#: pg_config.c:420
+#: pg_config.c:437
#, c-format
msgid " --pkgincludedir show location of other C header files\n"
-msgstr " --pkgincludedir ʾCͷļڵλ\n"
+msgstr " --pkgincludedir 显示其它C语言头文件所在的位置\n"
-#: pg_config.c:421
+#: pg_config.c:438
#, c-format
-msgid " --includedir-server show location of C header files for the server\n"
-msgstr " --includedir-server ʾ C ͷļλ\n"
+msgid ""
+" --includedir-server show location of C header files for the server\n"
+msgstr " --includedir-server 显示服务端 C 头文件所在位置\n"
-#: pg_config.c:422
+#: pg_config.c:439
#, c-format
msgid " --libdir show location of object code libraries\n"
-msgstr " --libdir ʾĿļλ\n"
+msgstr " --libdir 显示目标代码库文件所在位置\n"
-#: pg_config.c:423
+#: pg_config.c:440
#, c-format
msgid " --pkglibdir show location of dynamically loadable modules\n"
-msgstr " --pkglibdir ʾ̬ؿλ\n"
+msgstr " --pkglibdir 显示动态加载库所在位置\n"
-#: pg_config.c:424
+#: pg_config.c:441
#, c-format
msgid " --localedir show location of locale support files\n"
-msgstr " --localedir ʾԻ֧ļλ\n"
+msgstr " --localedir 显示语言环境支持文件所在位置\n"
-#: pg_config.c:425
+#: pg_config.c:442
#, c-format
msgid " --mandir show location of manual pages\n"
-msgstr " --mandir ʾοֲλ\n"
+msgstr " --mandir 显示参考手册所在位置\n"
-#: pg_config.c:426
+#: pg_config.c:443
#, c-format
-msgid " --sharedir show location of architecture-independent support files\n"
-msgstr " --sharedir ʾܹ֧ļλ\n"
+msgid ""
+" --sharedir show location of architecture-independent support "
+"files\n"
+msgstr " --sharedir 显示独立架构支持文件所在位置\n"
-#: pg_config.c:427
+#: pg_config.c:444
#, c-format
-msgid " --sysconfdir show location of system-wide configuration files\n"
-msgstr " --sysconfdir ʾϵͳΧļλ\n"
+msgid ""
+" --sysconfdir show location of system-wide configuration files\n"
+msgstr " --sysconfdir 显示系统范围的配置文件的所在位置\n"
-#: pg_config.c:428
+#: pg_config.c:445
#, c-format
msgid " --pgxs show location of extension makefile\n"
-msgstr " --pgxs ʾչ makefile λ\n"
+msgstr " --pgxs 显示扩展 makefile 所在位置\n"
-#: pg_config.c:429
+#: pg_config.c:446
#, c-format
msgid ""
" --configure show options given to \"configure\" script when\n"
" PostgreSQL was built\n"
msgstr ""
-" --configure ʾ PostgreSQL ʱ \"configure\"\n"
-" ѡ\n"
+" --configure 显示编译 PostgreSQL 时 \"configure\"\n"
+" 的选项\n"
-#: pg_config.c:431
+#: pg_config.c:448
#, c-format
msgid " --cc show CC value used when PostgreSQL was built\n"
-msgstr " --cc ʾڴPostgreSQLʱʹõCCֵ\n"
+msgstr " --cc 显示在创建PostgreSQL时所使用的CC值\n"
-#: pg_config.c:432
+#: pg_config.c:449
#, c-format
-msgid " --cppflags show CPPFLAGS value used when PostgreSQL was built\n"
-msgstr " --cppflags PostgreSQLʱʾCPPFLAGSֵ\n"
+msgid ""
+" --cppflags show CPPFLAGS value used when PostgreSQL was built\n"
+msgstr " --cppflags 当创建PostgreSQL时显示CPPFLAGS的值\n"
-#: pg_config.c:433
+#: pg_config.c:450
#, c-format
-msgid " --cflags show CFLAGS value used when PostgreSQL was built\n"
-msgstr " --cflags ʾڴPostgreSQLʱʹõCFLAGֵ\n"
+msgid ""
+" --cflags show CFLAGS value used when PostgreSQL was built\n"
+msgstr " --cflags 显示在创建PostgreSQL时所使用的CFLAG值\n"
-#: pg_config.c:434
+#: pg_config.c:451
#, c-format
-msgid " --cflags_sl show CFLAGS_SL value used when PostgreSQL was built\n"
-msgstr " --cflags_sl PostgreSQLʱʾCFLAGS_SLֵ\n"
+msgid ""
+" --cflags_sl show CFLAGS_SL value used when PostgreSQL was built\n"
+msgstr " --cflags_sl 当创建PostgreSQL时显示CFLAGS_SL的值\n"
-#: pg_config.c:435
+#: pg_config.c:452
#, c-format
-msgid " --ldflags show LDFLAGS value used when PostgreSQL was built\n"
-msgstr " --ldflags ʾڴPostgreSQLʱʹõLDFLAGֵ\n"
+msgid ""
+" --ldflags show LDFLAGS value used when PostgreSQL was built\n"
+msgstr " --ldflags 显示在创建PostgreSQL时所使用的LDFLAG值\n"
-#: pg_config.c:436
+#: pg_config.c:453
#, c-format
-msgid " --ldflags_sl show LDFLAGS_SL value used when PostgreSQL was built\n"
-msgstr " --ldflags_sl PostgreSQLʱʾLDFLAGS_SLֵ\n"
+msgid ""
+" --ldflags_ex show LDFLAGS_EX value used when PostgreSQL was "
+"built\n"
+msgstr " --ldflags_ex 当创建PostgreSQL时显示LDFLAGS_EX的值\n"
-#: pg_config.c:437
+#: pg_config.c:454
#, c-format
-msgid " --libs show LIBS value used when PostgreSQL was built\n"
-msgstr " --libs ʾڴPostgreSQLʱʹõLIBSֵ\n"
+msgid ""
+" --ldflags_sl show LDFLAGS_SL value used when PostgreSQL was "
+"built\n"
+msgstr " --ldflags_sl 当创建PostgreSQL时显示LDFLAGS_SL的值\n"
-#: pg_config.c:438
+#: pg_config.c:455
+#, c-format
+msgid ""
+" --libs show LIBS value used when PostgreSQL was built\n"
+msgstr " --libs 显示在创建PostgreSQL时所使用的LIBS值\n"
+
+#: pg_config.c:456
#, c-format
msgid " --version show the PostgreSQL version\n"
-msgstr " --version ʾPostgreSQLİ汾Ϣ\n"
+msgstr " --version 显示PostgreSQL的版本信息\n"
-#: pg_config.c:439
+#: pg_config.c:457
#, c-format
msgid " --help show this help, then exit\n"
msgstr ""
-" --help ʾ˰Ϣ, Ȼ˳\n"
+" --help 显示此帮助信息, 然后退出\n"
"\n"
-#: pg_config.c:440
+#: pg_config.c:458
#, c-format
msgid ""
"\n"
@@ -187,94 +200,91 @@ msgid ""
"\n"
msgstr ""
"\n"
-"ûв,ʾ֪ijԱ.\n"
+"没有参数,将显示所有已知的成员.\n"
"\n"
-#: pg_config.c:441
+#: pg_config.c:459
#, c-format
msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
-msgstr "汨 <pgsql-bugs@postgresql.org>.\n"
+msgstr "臭虫报告至 <pgsql-bugs@postgresql.org>.\n"
-#: pg_config.c:447
+#: pg_config.c:465
#, c-format
msgid "Try \"%s --help\" for more information.\n"
-msgstr " \"%s --help\" ȡϢ.\n"
+msgstr "请用 \"%s --help\" 获取更多的信息.\n"
-#: pg_config.c:486
+#: pg_config.c:504
#, c-format
msgid "%s: could not find own program executable\n"
-msgstr "%s: ޷ҵִļ\n"
+msgstr "%s: 无法找到执行文件\n"
-#: pg_config.c:509
+#: pg_config.c:527
#, c-format
msgid "%s: invalid argument: %s\n"
-msgstr "%s: Ч: %s\n"
+msgstr "%s: 无效参数: %s\n"
-#: ../../port/exec.c:195
-#: ../../port/exec.c:309
-#: ../../port/exec.c:352
+#: ../../port/exec.c:125 ../../port/exec.c:239 ../../port/exec.c:282
#, c-format
msgid "could not identify current directory: %s"
-msgstr "޷ȷϵǰĿ¼: %s"
+msgstr "无法确认当前目录: %s"
# command.c:122
-#: ../../port/exec.c:214
+#: ../../port/exec.c:144
#, c-format
msgid "invalid binary \"%s\""
-msgstr "ЧĶ \"%s\""
+msgstr "无效的二进制码 \"%s\""
# command.c:1103
-#: ../../port/exec.c:263
+#: ../../port/exec.c:193
#, c-format
msgid "could not read binary \"%s\""
-msgstr "޷ȡ \"%s\""
+msgstr "无法读取二进制码 \"%s\""
-#: ../../port/exec.c:270
+#: ../../port/exec.c:200
#, c-format
msgid "could not find a \"%s\" to execute"
-msgstr "δҵһ \"%s\" ִ"
+msgstr "未能找到一个 \"%s\" 来执行"
-#: ../../port/exec.c:325
-#: ../../port/exec.c:361
+#: ../../port/exec.c:255 ../../port/exec.c:291
#, c-format
msgid "could not change directory to \"%s\""
-msgstr "޷Ŀ¼ \"%s\""
+msgstr "无法进入目录 \"%s\""
-#: ../../port/exec.c:340
+#: ../../port/exec.c:270
#, c-format
msgid "could not read symbolic link \"%s\""
-msgstr "޷ȡ \"%s\""
+msgstr "无法读取符号链结 \"%s\""
-#: ../../port/exec.c:586
+#: ../../port/exec.c:516
#, c-format
msgid "child process exited with exit code %d"
-msgstr "ӽ˳, ˳Ϊ %d"
+msgstr "子进程已退出, 退出码为 %d"
-#: ../../port/exec.c:590
+#: ../../port/exec.c:520
#, c-format
msgid "child process was terminated by exception 0x%X"
-msgstr "ӽ̱(exception) 0x%X ֹ"
+msgstr "子进程被例外(exception) 0x%X 终止"
-#: ../../port/exec.c:599
+#: ../../port/exec.c:529
#, c-format
msgid "child process was terminated by signal %s"
-msgstr "ӽ̱ź %s ֹ"
+msgstr "子进程被信号 %s 终止"
-#: ../../port/exec.c:602
+#: ../../port/exec.c:532
#, c-format
msgid "child process was terminated by signal %d"
-msgstr "ӽ̱ź %d ֹ"
+msgstr "子进程被信号 %d 终止"
-#: ../../port/exec.c:606
+#: ../../port/exec.c:536
#, c-format
msgid "child process exited with unrecognized status %d"
-msgstr "ӽ˳, δ֪״̬ %d"
+msgstr "子进程已退出, 未知状态 %d"
#~ msgid ""
#~ " %s OPTION...\n"
#~ "\n"
#~ msgstr ""
-#~ " %s ѡ...\n"
+#~ " %s 选项...\n"
#~ "\n"
#~ msgid ""
@@ -282,10 +292,10 @@ msgstr "ӽ˳, δ֪״̬ %d"
#~ "Try \"%s --help\" for more information\n"
#~ msgstr ""
#~ "\n"
-#~ " \"%s --help\" ȡϢ\n"
+#~ "试用 \"%s --help\" 获取更多的信息\n"
#~ msgid "%s: argument required\n"
-#~ msgstr "%s: Ҫ\n"
+#~ msgstr "%s: 需要参数\n"
#~ msgid "%s: could not find own executable\n"
-#~ msgstr "%s: Ҳִļ\n"
+#~ msgstr "%s: 找不到执行文件\n"
diff --git a/src/bin/pg_config/po/zh_TW.po b/src/bin/pg_config/po/zh_TW.po
new file mode 100644
index 0000000000..05d685bffb
--- /dev/null
+++ b/src/bin/pg_config/po/zh_TW.po
@@ -0,0 +1,304 @@
+# Traditional Chinese message translation file for pg_config
+# Copyright (C) 2011 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+# 2004-12-13 Zhenbang Wei <forth@zbwei.net>
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 9.1\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2011-05-11 20:40+0000\n"
+"PO-Revision-Date: 2011-05-09 13:55+0800\n"
+"Last-Translator: Zhenbang Wei <znbang@gmail.com>\n"
+"Language-Team: EnterpriseDB translation team <dev-escalations@enterprisedb."
+"com>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: pg_config.c:243 pg_config.c:259 pg_config.c:275 pg_config.c:291
+#: pg_config.c:307 pg_config.c:323 pg_config.c:339 pg_config.c:355
+#: pg_config.c:371
+#, c-format
+msgid "not recorded\n"
+msgstr "沒有紀錄\n"
+
+#: pg_config.c:428
+#, c-format
+msgid ""
+"\n"
+"%s provides information about the installed version of PostgreSQL.\n"
+"\n"
+msgstr ""
+"\n"
+"%s 顯示已安裝 PostgreSQL 資訊。\n"
+"\n"
+
+#: pg_config.c:429
+#, c-format
+msgid "Usage:\n"
+msgstr "使用方法:\n"
+
+#: pg_config.c:430
+#, c-format
+msgid ""
+" %s [OPTION]...\n"
+"\n"
+msgstr ""
+" %s [選項]...\n"
+"\n"
+
+#: pg_config.c:431
+#, c-format
+msgid "Options:\n"
+msgstr "選項:\n"
+
+#: pg_config.c:432
+#, c-format
+msgid " --bindir show location of user executables\n"
+msgstr " --bindir 顯示執行檔位置\n"
+
+#: pg_config.c:433
+#, c-format
+msgid " --docdir show location of documentation files\n"
+msgstr " --docdir 顯示文件檔位置\n"
+
+#: pg_config.c:434
+#, c-format
+msgid " --htmldir show location of HTML documentation files\n"
+msgstr " --htmldir 顯示 HTML 文件檔位置\n"
+
+#: pg_config.c:435
+#, c-format
+msgid ""
+" --includedir show location of C header files of the client\n"
+" interfaces\n"
+msgstr " --includedir 顯使用戶端介面 C 標頭檔位置\n"
+
+#: pg_config.c:437
+#, c-format
+msgid " --pkgincludedir show location of other C header files\n"
+msgstr " --pkgincludedir 顯示其他 C 標頭檔位置\n"
+
+#: pg_config.c:438
+#, c-format
+msgid ""
+" --includedir-server show location of C header files for the server\n"
+msgstr " --includedir-server 顯示伺服器 C 標頭檔位置\n"
+
+#: pg_config.c:439
+#, c-format
+msgid " --libdir show location of object code libraries\n"
+msgstr " --libdir 顯示程式庫位置\n"
+
+#: pg_config.c:440
+#, c-format
+msgid " --pkglibdir show location of dynamically loadable modules\n"
+msgstr " --pkglibdir 顯示可動態載入模組位置\n"
+
+#: pg_config.c:441
+#, c-format
+msgid " --localedir show location of locale support files\n"
+msgstr " --localedir 顯示區域支援檔位置\n"
+
+#: pg_config.c:442
+#, c-format
+msgid " --mandir show location of manual pages\n"
+msgstr " --mandir 顯示使用說明位置\n"
+
+#: pg_config.c:443
+#, c-format
+msgid ""
+" --sharedir show location of architecture-independent support "
+"files\n"
+msgstr " --sharedir 顯示與架構無關的支援檔位置\n"
+
+#: pg_config.c:444
+#, c-format
+msgid ""
+" --sysconfdir show location of system-wide configuration files\n"
+msgstr " --sysconfdir 顯示系統層級設定檔位置\n"
+
+#: pg_config.c:445
+#, c-format
+msgid " --pgxs show location of extension makefile\n"
+msgstr " --pgxs 顯示外部程式 makefile 位置\n"
+
+#: pg_config.c:446
+#, c-format
+msgid ""
+" --configure show options given to \"configure\" script when\n"
+" PostgreSQL was built\n"
+msgstr ""
+" --configure 顯示建立 PostgreSQL 時 \"configure\" 命令搞\n"
+" 所使用的參數\n"
+
+#: pg_config.c:448
+#, c-format
+msgid " --cc show CC value used when PostgreSQL was built\n"
+msgstr " --cc 顯示建立 PostgreSQL 時使用的 CC 值\n"
+
+#: pg_config.c:449
+#, c-format
+msgid ""
+" --cppflags show CPPFLAGS value used when PostgreSQL was built\n"
+msgstr " --cppflags 顯示建立 PostgreSQL 時使用的 CPPFLAGS 值\n"
+
+#: pg_config.c:450
+#, c-format
+msgid ""
+" --cflags show CFLAGS value used when PostgreSQL was built\n"
+msgstr " --cflags 顯示建立 PostgreSQL 時使用的 CFLAGS 值\n"
+
+#: pg_config.c:451
+#, c-format
+msgid ""
+" --cflags_sl show CFLAGS_SL value used when PostgreSQL was built\n"
+msgstr " --cflags_sl 顯示建立 PostgreSQL 時使用的 CFLAGS_SL 值\n"
+
+#: pg_config.c:452
+#, c-format
+msgid ""
+" --ldflags show LDFLAGS value used when PostgreSQL was built\n"
+msgstr " --ldflags 顯示建立 PostgreSQL 時使用的 LDFLAGS 值\n"
+
+#: pg_config.c:453
+#, c-format
+msgid ""
+" --ldflags_ex show LDFLAGS_EX value used when PostgreSQL was "
+"built\n"
+msgstr " --ldflags_ex 顯示建立 PostgreSQL 時使用的 LDFLAGS_EX 值\n"
+
+#: pg_config.c:454
+#, c-format
+msgid ""
+" --ldflags_sl show LDFLAGS_SL value used when PostgreSQL was "
+"built\n"
+msgstr " --ldflags_sl 顯示建立 PostgreSQL 時使用的 LDFLAGS_SL 值\n"
+
+#: pg_config.c:455
+#, c-format
+msgid ""
+" --libs show LIBS value used when PostgreSQL was built\n"
+msgstr " --libs 顯示建立 PostgreSQL 時使用的 LIBS 值\n"
+
+#: pg_config.c:456
+#, c-format
+msgid " --version show the PostgreSQL version\n"
+msgstr " --version 顯示 PostgreSQL 版本\n"
+
+#: pg_config.c:457
+#, c-format
+msgid " --help show this help, then exit\n"
+msgstr " --help 顯示說明然後結束\n"
+
+#: pg_config.c:458
+#, c-format
+msgid ""
+"\n"
+"With no arguments, all known items are shown.\n"
+"\n"
+msgstr ""
+"\n"
+"沒有參數,已顯示所有已知項目。\n"
+"\n"
+
+#: pg_config.c:459
+#, c-format
+msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr "回報錯誤至 <pgsql-bugs@postgresql.org>。\n"
+
+# postmaster/postmaster.c:512 postmaster/postmaster.c:525
+#: pg_config.c:465
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "執行 \"%s --help\" 顯示更多資訊。\n"
+
+#: pg_config.c:504
+#, c-format
+msgid "%s: could not find own program executable\n"
+msgstr "%s: 找不到程式執行檔\n"
+
+#: pg_config.c:527
+#, c-format
+msgid "%s: invalid argument: %s\n"
+msgstr "%s: 無效的參數: %s\n"
+
+#: ../../port/exec.c:125 ../../port/exec.c:239 ../../port/exec.c:282
+#, c-format
+msgid "could not identify current directory: %s"
+msgstr "無法識別目前的目錄: %s"
+
+# command.c:122
+#: ../../port/exec.c:144
+#, c-format
+msgid "invalid binary \"%s\""
+msgstr "無效的 binary \"%s\""
+
+# command.c:1103
+#: ../../port/exec.c:193
+#, c-format
+msgid "could not read binary \"%s\""
+msgstr "無法讀取 binary \"%s\""
+
+#: ../../port/exec.c:200
+#, c-format
+msgid "could not find a \"%s\" to execute"
+msgstr "找不到 \"%s\" 執行"
+
+#: ../../port/exec.c:255 ../../port/exec.c:291
+#, c-format
+msgid "could not change directory to \"%s\""
+msgstr "無法切換目錄至 \"%s\""
+
+#: ../../port/exec.c:270
+#, c-format
+msgid "could not read symbolic link \"%s\""
+msgstr "無法讀取符號連結 \"%s\""
+
+#: ../../port/exec.c:517
+#, c-format
+msgid "child process exited with exit code %d"
+msgstr "子行程結束,結束代碼 %d"
+
+#: ../../port/exec.c:521
+#, c-format
+msgid "child process was terminated by exception 0x%X"
+msgstr "子行程被例外 0x%X 結束"
+
+#: ../../port/exec.c:530
+#, c-format
+msgid "child process was terminated by signal %s"
+msgstr "子行程被信號 %s 結束"
+
+#: ../../port/exec.c:533
+#, c-format
+msgid "child process was terminated by signal %d"
+msgstr "子行程被信號 %d 結束"
+
+#: ../../port/exec.c:537
+#, c-format
+msgid "child process exited with unrecognized status %d"
+msgstr "子行程結束,不明狀態代碼 %d"
+
+#~ msgid ""
+#~ " %s OPTION...\n"
+#~ "\n"
+#~ msgstr ""
+#~ " %s 選項...\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Try \"%s --help\" for more information\n"
+#~ msgstr ""
+#~ "\n"
+#~ "執行\"%s --help\"取得更多資訊\n"
+
+#~ msgid "%s: argument required\n"
+#~ msgstr "%s:不能省略參數\n"
+
+#~ msgid "%s: could not find own executable\n"
+#~ msgstr "%s:找不到執行檔\n"
diff --git a/src/bin/pg_controldata/.gitignore b/src/bin/pg_controldata/.gitignore
new file mode 100644
index 0000000000..32ea40181f
--- /dev/null
+++ b/src/bin/pg_controldata/.gitignore
@@ -0,0 +1,3 @@
+/pg_crc.c
+
+/pg_controldata
diff --git a/src/bin/pg_controldata/Makefile b/src/bin/pg_controldata/Makefile
index ab551fe691..207f5e525d 100644
--- a/src/bin/pg_controldata/Makefile
+++ b/src/bin/pg_controldata/Makefile
@@ -2,9 +2,9 @@
#
# Makefile for src/bin/pg_controldata
#
-# Copyright (c) 1998-2010, PostgreSQL Global Development Group
+# Copyright (c) 1998-2011, PostgreSQL Global Development Group
#
-# $PostgreSQL: pgsql/src/bin/pg_controldata/Makefile,v 1.22 2010/07/05 18:54:38 tgl Exp $
+# src/bin/pg_controldata/Makefile
#
#-------------------------------------------------------------------------
@@ -17,9 +17,9 @@ include $(top_builddir)/src/Makefile.global
OBJS= pg_controldata.o pg_crc.o $(WIN32RES)
-all: submake-libpgport pg_controldata
+all: pg_controldata
-pg_controldata: $(OBJS)
+pg_controldata: $(OBJS) | submake-libpgport
$(CC) $(CFLAGS) $^ $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
pg_crc.c: $(top_srcdir)/src/backend/utils/hash/pg_crc.c
diff --git a/src/bin/pg_controldata/nls.mk b/src/bin/pg_controldata/nls.mk
index 251e0801fd..7edaaff7f3 100644
--- a/src/bin/pg_controldata/nls.mk
+++ b/src/bin/pg_controldata/nls.mk
@@ -1,5 +1,5 @@
-# $PostgreSQL: pgsql/src/bin/pg_controldata/nls.mk,v 1.21 2010/05/13 15:56:37 petere Exp $
+# src/bin/pg_controldata/nls.mk
CATALOG_NAME := pg_controldata
-AVAIL_LANGUAGES := de es fr it ja ko pt_BR sv ta tr zh_CN
+AVAIL_LANGUAGES := de es fr it ja ko pt_BR ro ru sv ta tr zh_CN zh_TW
GETTEXT_FILES := pg_controldata.c
GETTEXT_TRIGGERS:= _
diff --git a/src/bin/pg_controldata/pg_controldata.c b/src/bin/pg_controldata/pg_controldata.c
index b62b59e0dc..2d52f784ae 100644
--- a/src/bin/pg_controldata/pg_controldata.c
+++ b/src/bin/pg_controldata/pg_controldata.c
@@ -6,7 +6,7 @@
* copyright (c) Oliver Elphick <olly@lfix.co.uk>, 2001;
* licence: BSD
*
- * $PostgreSQL: pgsql/src/bin/pg_controldata/pg_controldata.c,v 1.50 2010/06/03 03:20:00 rhaas Exp $
+ * src/bin/pg_controldata/pg_controldata.c
*/
/*
diff --git a/src/bin/pg_controldata/po/es.po b/src/bin/pg_controldata/po/es.po
index 73784ee4ac..6e165aa484 100644
--- a/src/bin/pg_controldata/po/es.po
+++ b/src/bin/pg_controldata/po/es.po
@@ -6,14 +6,14 @@
# Karim Mribti <karim@mribti.com>, 2002.
# Alvaro Herrera <alvherre@alvh.no-ip.org>, 2003-2010
#
-# pgtranslation Id: pg_controldata.po,v 1.10 2010/05/05 16:40:54 alvherre Exp $
+# pgtranslation Id: pg_controldata.po,v 1.11 2010/08/31 17:31:32 alvherre Exp $
#
msgid ""
msgstr ""
-"Project-Id-Version: pg_controldata (PostgreSQL 8.4)\n"
+"Project-Id-Version: pg_controldata (PostgreSQL 9.0)\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-05-03 17:16+0000\n"
-"PO-Revision-Date: 2010-05-05 12:40-0400\n"
+"POT-Creation-Date: 2010-08-31 07:16+0000\n"
+"PO-Revision-Date: 2010-08-31 13:31-0400\n"
"Last-Translator: Alvaro Herrera <alvherre@alvh.no-ip.org>\n"
"Language-Team: Castellano <pgsql-es-ayuda@postgresql.org>\n"
"MIME-Version: 1.0\n"
@@ -74,50 +74,54 @@ msgid "shut down"
msgstr "apagado"
#: pg_controldata.c:61
+msgid "shut down in recovery"
+msgstr "apagado durante recuperación"
+
+#: pg_controldata.c:63
msgid "shutting down"
msgstr "apagándose"
-#: pg_controldata.c:63
+#: pg_controldata.c:65
msgid "in crash recovery"
msgstr "en recuperación"
-#: pg_controldata.c:65
+#: pg_controldata.c:67
msgid "in archive recovery"
msgstr "en recuperación desde archivo"
-#: pg_controldata.c:67
+#: pg_controldata.c:69
msgid "in production"
msgstr "en producción"
-#: pg_controldata.c:69
+#: pg_controldata.c:71
msgid "unrecognized status code"
msgstr "código de estado no reconocido"
-#: pg_controldata.c:84
+#: pg_controldata.c:86
msgid "unrecognized wal_level"
msgstr "wal_level no reconocido"
-#: pg_controldata.c:127
+#: pg_controldata.c:129
#, c-format
msgid "%s: no data directory specified\n"
msgstr "%s: no se ha especificado un directorio de datos\n"
-#: pg_controldata.c:128
+#: pg_controldata.c:130
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "Intente «%s --help» para mayor información.\n"
-#: pg_controldata.c:136
+#: pg_controldata.c:138
#, c-format
msgid "%s: could not open file \"%s\" for reading: %s\n"
msgstr "%s: no se ha podido abrir el archivo «%s» para la lectura: %s\n"
-#: pg_controldata.c:143
+#: pg_controldata.c:145
#, c-format
msgid "%s: could not read file \"%s\": %s\n"
msgstr "%s: no se ha podido leer el archivo «%s»: %s\n"
-#: pg_controldata.c:157
+#: pg_controldata.c:159
#, c-format
msgid ""
"WARNING: Calculated CRC checksum does not match value stored in file.\n"
@@ -130,12 +134,12 @@ msgstr ""
"bien tiene una estructura diferente de la que este programa está\n"
"esperando. Los resultados presentados a continuación no son confiables.\n"
-#: pg_controldata.c:184
+#: pg_controldata.c:186
#, c-format
msgid "pg_control version number: %u\n"
msgstr "Número de versión de pg_control: %u\n"
-#: pg_controldata.c:187
+#: pg_controldata.c:189
#, c-format
msgid ""
"WARNING: possible byte ordering mismatch\n"
@@ -151,183 +155,183 @@ msgstr ""
"serán incorrectos, y esta instalación de PostgreSQL será incompatible con\n"
"este directorio de datos.\n"
-#: pg_controldata.c:191
+#: pg_controldata.c:193
#, c-format
msgid "Catalog version number: %u\n"
msgstr "Número de versión del catálogo: %u\n"
-#: pg_controldata.c:193
+#: pg_controldata.c:195
#, c-format
msgid "Database system identifier: %s\n"
msgstr "Identificador de sistema: %s\n"
-#: pg_controldata.c:195
+#: pg_controldata.c:197
#, c-format
msgid "Database cluster state: %s\n"
msgstr "Estado del sistema de base de datos: %s\n"
-#: pg_controldata.c:197
+#: pg_controldata.c:199
#, c-format
msgid "pg_control last modified: %s\n"
msgstr "Última modificación de pg_control: %s\n"
-#: pg_controldata.c:199
+#: pg_controldata.c:201
#, c-format
msgid "Latest checkpoint location: %X/%X\n"
msgstr "Ubicación del último checkpoint: %X/%X\n"
-#: pg_controldata.c:202
+#: pg_controldata.c:204
#, c-format
msgid "Prior checkpoint location: %X/%X\n"
msgstr "Ubicación del checkpoint anterior: %X/%X\n"
-#: pg_controldata.c:205
+#: pg_controldata.c:207
#, c-format
msgid "Latest checkpoint's REDO location: %X/%X\n"
msgstr "Ubicación de REDO de último checkpoint: %X/%X\n"
-#: pg_controldata.c:208
+#: pg_controldata.c:210
#, c-format
msgid "Latest checkpoint's TimeLineID: %u\n"
msgstr "TimeLineID del último checkpoint: %u\n"
-#: pg_controldata.c:210
+#: pg_controldata.c:212
#, c-format
msgid "Latest checkpoint's NextXID: %u/%u\n"
msgstr "NextXID del checkpoint más reciente: %u/%u\n"
-#: pg_controldata.c:213
+#: pg_controldata.c:215
#, c-format
msgid "Latest checkpoint's NextOID: %u\n"
msgstr "NextOID de último checkpoint: %u\n"
-#: pg_controldata.c:215
+#: pg_controldata.c:217
#, c-format
msgid "Latest checkpoint's NextMultiXactId: %u\n"
msgstr "NextMultiXactId de último checkpoint: %u\n"
-#: pg_controldata.c:217
+#: pg_controldata.c:219
#, c-format
msgid "Latest checkpoint's NextMultiOffset: %u\n"
msgstr "NextMultiOffset de último checkpoint: %u\n"
-#: pg_controldata.c:219
+#: pg_controldata.c:221
#, c-format
msgid "Latest checkpoint's oldestXID: %u\n"
msgstr "oldestXID del último checkpoint: %u\n"
-#: pg_controldata.c:221
+#: pg_controldata.c:223
#, c-format
msgid "Latest checkpoint's oldestXID's DB: %u\n"
msgstr "DB del oldestXID del último checkpoint: %u\n"
-#: pg_controldata.c:223
+#: pg_controldata.c:225
#, c-format
msgid "Latest checkpoint's oldestActiveXID: %u\n"
msgstr "oldestActiveXID del último checkpoint: %u\n"
-#: pg_controldata.c:225
+#: pg_controldata.c:227
#, c-format
msgid "Time of latest checkpoint: %s\n"
msgstr "Instante de último checkpoint: %s\n"
-#: pg_controldata.c:227
+#: pg_controldata.c:229
#, c-format
msgid "Minimum recovery ending location: %X/%X\n"
msgstr "Punto final mínimo de recuperación: %X/%X\n"
-#: pg_controldata.c:230
+#: pg_controldata.c:232
#, c-format
msgid "Backup start location: %X/%X\n"
msgstr "Ubicación del inicio de backup: %X/%X\n"
-#: pg_controldata.c:233
+#: pg_controldata.c:235
#, c-format
msgid "Current wal_level setting: %s\n"
msgstr "Parámetro wal_level actual: %s\n"
-#: pg_controldata.c:235
+#: pg_controldata.c:237
#, c-format
msgid "Current max_connections setting: %d\n"
msgstr "Parámetro max_connections actual: %d\n"
-#: pg_controldata.c:237
+#: pg_controldata.c:239
#, c-format
msgid "Current max_prepared_xacts setting: %d\n"
msgstr "Parámetro max_prepared_xacts actual: %d\n"
-#: pg_controldata.c:239
+#: pg_controldata.c:241
#, c-format
msgid "Current max_locks_per_xact setting: %d\n"
msgstr "Parámetro max_locks_per_xact actual: %d\n"
-#: pg_controldata.c:241
+#: pg_controldata.c:243
#, c-format
msgid "Maximum data alignment: %u\n"
msgstr "Alineamiento máximo de datos: %u\n"
-#: pg_controldata.c:244
+#: pg_controldata.c:246
#, c-format
msgid "Database block size: %u\n"
msgstr "Tamaño de bloque de la base de datos: %u\n"
-#: pg_controldata.c:246
+#: pg_controldata.c:248
#, c-format
msgid "Blocks per segment of large relation: %u\n"
msgstr "Bloques por segmento en relación grande: %u\n"
-#: pg_controldata.c:248
+#: pg_controldata.c:250
#, c-format
msgid "WAL block size: %u\n"
msgstr "Tamaño del bloque de WAL: %u\n"
-#: pg_controldata.c:250
+#: pg_controldata.c:252
#, c-format
msgid "Bytes per WAL segment: %u\n"
msgstr "Bytes por segmento WAL: %u\n"
-#: pg_controldata.c:252
+#: pg_controldata.c:254
#, c-format
msgid "Maximum length of identifiers: %u\n"
msgstr "Máxima longitud de identificadores: %u\n"
-#: pg_controldata.c:254
+#: pg_controldata.c:256
#, c-format
msgid "Maximum columns in an index: %u\n"
msgstr "Máximo número de columnas de un índice: %u\n"
-#: pg_controldata.c:256
+#: pg_controldata.c:258
#, c-format
msgid "Maximum size of a TOAST chunk: %u\n"
msgstr "Longitud máxima de un trozo TOAST: %u\n"
-#: pg_controldata.c:258
+#: pg_controldata.c:260
#, c-format
msgid "Date/time type storage: %s\n"
msgstr "Tipo de almacenamiento de horas y fechas: %s\n"
-#: pg_controldata.c:259
+#: pg_controldata.c:261
msgid "64-bit integers"
msgstr "enteros de 64 bits"
-#: pg_controldata.c:259
+#: pg_controldata.c:261
msgid "floating-point numbers"
msgstr "números de punto flotante"
-#: pg_controldata.c:260
+#: pg_controldata.c:262
#, c-format
msgid "Float4 argument passing: %s\n"
msgstr "Paso de parámetros float4: %s\n"
-#: pg_controldata.c:261 pg_controldata.c:263
+#: pg_controldata.c:263 pg_controldata.c:265
msgid "by value"
msgstr "por valor"
-#: pg_controldata.c:261 pg_controldata.c:263
+#: pg_controldata.c:263 pg_controldata.c:265
msgid "by reference"
msgstr "por referencia"
-#: pg_controldata.c:262
+#: pg_controldata.c:264
#, c-format
msgid "Float8 argument passing: %s\n"
msgstr "Paso de parámetros float8: %s\n"
diff --git a/src/bin/pg_controldata/po/fr.po b/src/bin/pg_controldata/po/fr.po
index 581b1660fd..aab583e6e4 100644
--- a/src/bin/pg_controldata/po/fr.po
+++ b/src/bin/pg_controldata/po/fr.po
@@ -1,7 +1,7 @@
# translation of pg_controldata.po to fr_fr
# french message translation file for pg_controldata
#
-# $PostgreSQL: pgsql/src/bin/pg_controldata/po/fr.po,v 1.21 2010/07/08 21:32:27 petere Exp $
+# $PostgreSQL$
#
# Use these quotes: %s
#
diff --git a/src/bin/pg_controldata/po/ja.po b/src/bin/pg_controldata/po/ja.po
index 6d8e6d0a0c..410dfaa762 100644
--- a/src/bin/pg_controldata/po/ja.po
+++ b/src/bin/pg_controldata/po/ja.po
@@ -3,17 +3,18 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: PostgreSQL 8.4\n"
+"Project-Id-Version: PostgreSQL 9.0 beta 3\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2009-04-06 23:57+0900\n"
-"PO-Revision-Date: 2009-04-07 20:07+0900\n"
+"POT-Creation-Date: 2010-07-20 12:55+0900\n"
+"PO-Revision-Date: 2010-07-15 19:00+0900\n"
"Last-Translator: HOTTA Michihide <hotta@net-newbie.com>\n"
"Language-Team: jpug-doc <jpug-doc@ml.postgresql.jp>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
-#: pg_controldata.c:24
+#: pg_controldata.c:33
#, c-format
msgid ""
"%s displays control information of a PostgreSQL database cluster.\n"
@@ -22,7 +23,7 @@ msgstr ""
"\"%s はPostgreSQLデータベースクラスタの制御情報を表示します。\n"
"\n"
-#: pg_controldata.c:28
+#: pg_controldata.c:37
#, c-format
msgid ""
"Usage:\n"
@@ -39,7 +40,7 @@ msgstr ""
" --help ヘルプを表示し、終了します\n"
" --version バージョン情報を表示し、終了します\n"
-#: pg_controldata.c:36
+#: pg_controldata.c:45
#, c-format
msgid ""
"\n"
@@ -53,60 +54,68 @@ msgstr ""
"す。\n"
"\n"
-#: pg_controldata.c:38
+#: pg_controldata.c:47
#, c-format
msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
msgstr "不具合は<pgsql-bugs@postgresql.org>まで報告してください。\n"
-#: pg_controldata.c:48
+#: pg_controldata.c:57
msgid "starting up"
msgstr "起動"
-#: pg_controldata.c:50
+#: pg_controldata.c:59
msgid "shut down"
msgstr "シャットダウン"
-#: pg_controldata.c:52
+#: pg_controldata.c:61
+msgid "shut down in recovery"
+msgstr "リカバリしながらシャットダウン中"
+
+#: pg_controldata.c:63
msgid "shutting down"
msgstr "シャットダウン中"
-#: pg_controldata.c:54
+#: pg_controldata.c:65
msgid "in crash recovery"
msgstr "クラッシュリカバリ中"
-#: pg_controldata.c:56
+#: pg_controldata.c:67
msgid "in archive recovery"
msgstr "アーカイブリカバリ中"
-#: pg_controldata.c:58
+#: pg_controldata.c:69
msgid "in production"
msgstr "運用中"
-#: pg_controldata.c:60
+#: pg_controldata.c:71
msgid "unrecognized status code"
msgstr "未知のステータスコード"
-#: pg_controldata.c:103
+#: pg_controldata.c:86
+msgid "unrecognized wal_level"
+msgstr "wal_level を認識できません"
+
+#: pg_controldata.c:129
#, c-format
msgid "%s: no data directory specified\n"
msgstr "%s: データディレクトリが指定されていません\n"
-#: pg_controldata.c:104
+#: pg_controldata.c:130
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "詳細は\"%s --help\"を実行してください\n"
-#: pg_controldata.c:112
+#: pg_controldata.c:138
#, c-format
msgid "%s: could not open file \"%s\" for reading: %s\n"
msgstr "%s: 読み取り用の\"%s\"ファイルのオープンに失敗しました: %s\n"
-#: pg_controldata.c:119
+#: pg_controldata.c:145
#, c-format
msgid "%s: could not read file \"%s\": %s\n"
msgstr "%s: \"%s\"ファイルの読み取りに失敗しました: %s\n"
-#: pg_controldata.c:133
+#: pg_controldata.c:159
#, c-format
msgid ""
"WARNING: Calculated CRC checksum does not match value stored in file.\n"
@@ -119,12 +128,12 @@ msgstr ""
"可能性があります。以下の結果は信用できません。\n"
"\n"
-#: pg_controldata.c:160
+#: pg_controldata.c:186
#, c-format
msgid "pg_control version number: %u\n"
msgstr "pg_controlバージョン番号: %u\n"
-#: pg_controldata.c:163
+#: pg_controldata.c:189
#, c-format
msgid ""
"WARNING: possible byte ordering mismatch\n"
@@ -139,141 +148,183 @@ msgstr ""
"PostgreSQL\n"
"インストレーションはこのデータディレクトリと互換性がなくなります。\n"
-#: pg_controldata.c:167
+#: pg_controldata.c:193
#, c-format
msgid "Catalog version number: %u\n"
msgstr "カタログバージョン番号: %u\n"
-#: pg_controldata.c:169
+#: pg_controldata.c:195
#, c-format
msgid "Database system identifier: %s\n"
msgstr "データベースシステム識別子: %s\n"
-#: pg_controldata.c:171
+#: pg_controldata.c:197
#, c-format
msgid "Database cluster state: %s\n"
msgstr "データベースクラスタの状態: %s\n"
-#: pg_controldata.c:173
+#: pg_controldata.c:199
#, c-format
msgid "pg_control last modified: %s\n"
msgstr "pg_control最終更新: %s\n"
-#: pg_controldata.c:175
+#: pg_controldata.c:201
#, c-format
msgid "Latest checkpoint location: %X/%X\n"
msgstr "最終チェックポイント位置: %X/%X\n"
-#: pg_controldata.c:178
+#: pg_controldata.c:204
#, c-format
msgid "Prior checkpoint location: %X/%X\n"
msgstr "前回のチェックポイント位置: %X/%X\n"
-#: pg_controldata.c:181
+#: pg_controldata.c:207
#, c-format
msgid "Latest checkpoint's REDO location: %X/%X\n"
msgstr "最終チェックポイントのREDO位置: %X/%X\n"
-#: pg_controldata.c:184
+#: pg_controldata.c:210
#, c-format
msgid "Latest checkpoint's TimeLineID: %u\n"
msgstr "最終チェックポイントの時系列ID: %u\n"
-#: pg_controldata.c:186
+#: pg_controldata.c:212
#, c-format
msgid "Latest checkpoint's NextXID: %u/%u\n"
msgstr "最終チェックポイントのNextXID: %u/%u\n"
-#: pg_controldata.c:189
+#: pg_controldata.c:215
#, c-format
msgid "Latest checkpoint's NextOID: %u\n"
msgstr "最終チェックポイントのNextOID: %u\n"
-#: pg_controldata.c:191
+#: pg_controldata.c:217
#, c-format
msgid "Latest checkpoint's NextMultiXactId: %u\n"
msgstr "最終チェックポイントのNextMultiXactId: %u\n"
-#: pg_controldata.c:193
+#: pg_controldata.c:219
#, c-format
msgid "Latest checkpoint's NextMultiOffset: %u\n"
msgstr "最終チェックポイントのNextMultiOffset: %u\n"
-#: pg_controldata.c:195
+#: pg_controldata.c:221
+#, c-format
+msgid "Latest checkpoint's oldestXID: %u\n"
+msgstr "最終チェックポイントのoldestXID: %u\n"
+
+#: pg_controldata.c:223
+#, c-format
+msgid "Latest checkpoint's oldestXID's DB: %u\n"
+msgstr "最終チェックポイントのoldestXIDのDB: %u\n"
+
+#: pg_controldata.c:225
+#, c-format
+msgid "Latest checkpoint's oldestActiveXID: %u\n"
+msgstr "最終チェックポイントのoldestActiveXID: %u\n"
+
+#: pg_controldata.c:227
#, c-format
msgid "Time of latest checkpoint: %s\n"
msgstr "最終チェックポイント時刻: %s\n"
-#: pg_controldata.c:197
+#: pg_controldata.c:229
#, c-format
msgid "Minimum recovery ending location: %X/%X\n"
msgstr "最小リカバリ終了位置: %X/%X\n"
-#: pg_controldata.c:200
+#: pg_controldata.c:232
+#, c-format
+msgid "Backup start location: %X/%X\n"
+msgstr "バックアップ開始位置: %X/%X\n"
+
+#: pg_controldata.c:235
+#, c-format
+msgid "Current wal_level setting: %s\n"
+msgstr "wal_level の現在設定 %s\n"
+
+#: pg_controldata.c:237
+#, c-format
+msgid "Current max_connections setting: %d\n"
+msgstr "max_connections の現在設定: %d\n"
+
+#: pg_controldata.c:239
+#, c-format
+msgid "Current max_prepared_xacts setting: %d\n"
+msgstr "max_prepared_xacts の現在設定: %d\n"
+
+#: pg_controldata.c:241
+#, c-format
+msgid "Current max_locks_per_xact setting: %d\n"
+msgstr "max_locks_per_xact の現在設定: %d\n"
+
+#: pg_controldata.c:243
#, c-format
msgid "Maximum data alignment: %u\n"
msgstr "最大データアラインメント %u\n"
-#: pg_controldata.c:203
+#: pg_controldata.c:246
#, c-format
msgid "Database block size: %u\n"
msgstr "データベースのブロックサイズ: %u\n"
-#: pg_controldata.c:205
+#: pg_controldata.c:248
#, c-format
msgid "Blocks per segment of large relation: %u\n"
msgstr "ラージリレーションのセグメント当たりのブロック数: %u\n"
-#: pg_controldata.c:207
+#: pg_controldata.c:250
#, c-format
msgid "WAL block size: %u\n"
msgstr "WALブロックのサイズ: %u\n"
-#: pg_controldata.c:209
+#: pg_controldata.c:252
#, c-format
msgid "Bytes per WAL segment: %u\n"
msgstr "WALセグメント当たりのバイト数: %u\n"
-#: pg_controldata.c:211
+#: pg_controldata.c:254
#, c-format
msgid "Maximum length of identifiers: %u\n"
msgstr "識別子の最大長: %u\n"
-#: pg_controldata.c:213
+#: pg_controldata.c:256
#, c-format
msgid "Maximum columns in an index: %u\n"
msgstr "インデックス内の最大列数: %u\n"
-#: pg_controldata.c:215
+#: pg_controldata.c:258
#, c-format
msgid "Maximum size of a TOAST chunk: %u\n"
msgstr "TOASTチャンクの最大サイズ: %u\n"
-#: pg_controldata.c:217
+#: pg_controldata.c:260
#, c-format
msgid "Date/time type storage: %s\n"
msgstr "日付/時刻型の格納方式: %s\n"
-#: pg_controldata.c:218
+#: pg_controldata.c:261
msgid "64-bit integers"
msgstr "64ビット整数"
-#: pg_controldata.c:218
+#: pg_controldata.c:261
msgid "floating-point numbers"
msgstr "浮動小数点数"
-#: pg_controldata.c:219
+#: pg_controldata.c:262
+#, c-format
msgid "Float4 argument passing: %s\n"
msgstr "Float4 引数の渡し方: %s\n"
-#: pg_controldata.c:220 pg_controldata.c:222
+#: pg_controldata.c:263 pg_controldata.c:265
msgid "by value"
msgstr "値渡し"
-#: pg_controldata.c:220 pg_controldata.c:222
+#: pg_controldata.c:263 pg_controldata.c:265
msgid "by reference"
msgstr "参照渡し"
-#: pg_controldata.c:221
+#: pg_controldata.c:264
+#, c-format
msgid "Float8 argument passing: %s\n"
msgstr "Float8 引数の渡し方: %s\n"
diff --git a/src/bin/pg_controldata/po/ko.po b/src/bin/pg_controldata/po/ko.po
index 448b9c86d7..ffaea791f4 100644
--- a/src/bin/pg_controldata/po/ko.po
+++ b/src/bin/pg_controldata/po/ko.po
@@ -3,15 +3,16 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: PostgreSQL 8.2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-07 00:38+0900\n"
-"PO-Revision-Date: 2004-12-16 11:37+0900\n"
-"Last-Translator: Ioseph Kim <ioseph@uri.sarang.net>\n"
-"Language-Team: KOREAN <pgsql-kr@postgresql.or.kr>\n"
+"Project-Id-Version: PostgreSQL 8.4\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2010-09-09 16:34+0000\n"
+"PO-Revision-Date: 2010-09-24 12:36-0400\n"
+"Last-Translator: EnterpriseDB translation team <dev-escalations@enterprisedb.com>\n"
+"Language-Team: EnterpriseDB translation team <dev-escalations@enterprisedb.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=euc-kr\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: pg_controldata.c:24
#, c-format
@@ -49,7 +50,7 @@ msgid ""
"\n"
msgstr ""
"\n"
-"DATADIR 丮 , PGDATA ȯ \n"
+"DATADIR ͸ , PGDATA ȯ \n"
"մϴ.\n"
"\n"
@@ -86,27 +87,27 @@ msgstr "󰡵"
msgid "unrecognized status code"
msgstr "˼ ڵ"
-#: pg_controldata.c:102
+#: pg_controldata.c:103
#, c-format
msgid "%s: no data directory specified\n"
-msgstr "%s: 丮 ʾҽϴ\n"
+msgstr "%s: ͸ ʾҽϴ\n"
-#: pg_controldata.c:103
+#: pg_controldata.c:104
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr " ڼ \"%s --help\"\n"
-#: pg_controldata.c:111
+#: pg_controldata.c:112
#, c-format
msgid "%s: could not open file \"%s\" for reading: %s\n"
msgstr "%s: \"%s\" б ϴ: %s\n"
-#: pg_controldata.c:118
+#: pg_controldata.c:119
#, c-format
msgid "%s: could not read file \"%s\": %s\n"
msgstr "%s: \"%s\" ϴ: %s\n"
-#: pg_controldata.c:132
+#: pg_controldata.c:133
#, c-format
msgid ""
"WARNING: Calculated CRC checksum does not match value stored in file.\n"
@@ -119,155 +120,163 @@ msgstr ""
"Դϴ. µ ֽϴ.\n"
"\n"
-#: pg_controldata.c:152
+#: pg_controldata.c:160
#, c-format
msgid "pg_control version number: %u\n"
msgstr "pg_control ȣ: %u\n"
-#: pg_controldata.c:154
+#: pg_controldata.c:163
+#, c-format
+msgid ""
+"WARNING: possible byte ordering mismatch\n"
+"The byte ordering used to store the pg_control file might not match the one\n"
+"used by this program. In that case the results below would be incorrect, "
+"and\n"
+"the PostgreSQL installation would be incompatible with this data directory.\n"
+msgstr ""
+": Ʈ ġ ʽϴ.\n"
+"pg_control ϴ Ʈ \n"
+" α׷ ϴ ġؾ մϴ. Ʒ ùٸ"
+" \n"
+" ͸ PostgreSQL ġ ϴ.\n"
+
+#: pg_controldata.c:167
#, c-format
msgid "Catalog version number: %u\n"
-msgstr "īŸα ȣ: %u\n"
+msgstr "īŻα ȣ: %u\n"
-#: pg_controldata.c:156
+#: pg_controldata.c:169
#, c-format
msgid "Database system identifier: %s\n"
msgstr "ͺ̽ ý ĺ: %s\n"
-#: pg_controldata.c:158
+#: pg_controldata.c:171
#, c-format
msgid "Database cluster state: %s\n"
msgstr "ͺ̽ Ŭ : %s\n"
-#: pg_controldata.c:160
+#: pg_controldata.c:173
#, c-format
msgid "pg_control last modified: %s\n"
msgstr "pg_control ð: %s\n"
-#: pg_controldata.c:162
-#, c-format
-msgid "Current log file ID: %u\n"
-msgstr " α ID: %u\n"
-
-#: pg_controldata.c:164
-#, c-format
-msgid "Next log file segment: %u\n"
-msgstr " α ׸Ʈ: %u\n"
-
-#: pg_controldata.c:166
+#: pg_controldata.c:175
#, c-format
msgid "Latest checkpoint location: %X/%X\n"
msgstr " üũƮ ġ: %X/%X\n"
-#: pg_controldata.c:169
+#: pg_controldata.c:178
#, c-format
msgid "Prior checkpoint location: %X/%X\n"
msgstr " üũƮ ġ: %X/%X\n"
-#: pg_controldata.c:172
+#: pg_controldata.c:181
#, c-format
msgid "Latest checkpoint's REDO location: %X/%X\n"
msgstr " üũƮ REDO ġ: %X/%X\n"
-#: pg_controldata.c:175
-#, c-format
-msgid "Latest checkpoint's UNDO location: %X/%X\n"
-msgstr " üũƮ UNDO ġ: %X/%X\n"
-
-#: pg_controldata.c:178
+#: pg_controldata.c:184
#, c-format
msgid "Latest checkpoint's TimeLineID: %u\n"
msgstr " üũƮ TimeLineID: %u\n"
-#: pg_controldata.c:180
+#: pg_controldata.c:186
#, c-format
msgid "Latest checkpoint's NextXID: %u/%u\n"
msgstr " üũƮ NextXID: %u/%u\n"
-#: pg_controldata.c:183
+#: pg_controldata.c:189
#, c-format
msgid "Latest checkpoint's NextOID: %u\n"
msgstr " üũƮ NextOID: %u\n"
-#: pg_controldata.c:185
+#: pg_controldata.c:191
#, c-format
msgid "Latest checkpoint's NextMultiXactId: %u\n"
msgstr " üũƮ NextMultiXactId: %u\n"
-#: pg_controldata.c:187
+#: pg_controldata.c:193
#, c-format
msgid "Latest checkpoint's NextMultiOffset: %u\n"
msgstr " üũƮ NextMultiOffset: %u\n"
-#: pg_controldata.c:189
+#: pg_controldata.c:195
#, c-format
msgid "Time of latest checkpoint: %s\n"
msgstr " üũƮ ð: %s\n"
-#: pg_controldata.c:191
+#: pg_controldata.c:197
#, c-format
msgid "Minimum recovery ending location: %X/%X\n"
msgstr "ּ ġ: %X/%X\n"
-#: pg_controldata.c:194
+#: pg_controldata.c:200
#, c-format
msgid "Maximum data alignment: %u\n"
msgstr "ִ ڷ : %u\n"
-#: pg_controldata.c:197
+#: pg_controldata.c:203
#, c-format
msgid "Database block size: %u\n"
msgstr "ͺ̽ ũ: %u\n"
-#: pg_controldata.c:199
+#: pg_controldata.c:205
#, c-format
msgid "Blocks per segment of large relation: %u\n"
msgstr " ̼ ׸Ʈ : %u\n"
-#: pg_controldata.c:201
+#: pg_controldata.c:207
#, c-format
msgid "WAL block size: %u\n"
msgstr "WAL ũ: %u\n"
-#: pg_controldata.c:203
+#: pg_controldata.c:209
#, c-format
msgid "Bytes per WAL segment: %u\n"
msgstr "WAL ׸Ʈ ũ(byte): %u\n"
-#: pg_controldata.c:205
+#: pg_controldata.c:211
#, c-format
msgid "Maximum length of identifiers: %u\n"
msgstr "ĺ ִ : %u\n"
-#: pg_controldata.c:207
+#: pg_controldata.c:213
#, c-format
msgid "Maximum columns in an index: %u\n"
-msgstr "ε ϴ ִ Į: %u\n"
+msgstr "ε ϴ ִ : %u\n"
-#: pg_controldata.c:209
+#: pg_controldata.c:215
+#, c-format
+msgid "Maximum size of a TOAST chunk: %u\n"
+msgstr "TOAST ûũ ִ ũ: %u\n"
+
+#: pg_controldata.c:217
#, c-format
msgid "Date/time type storage: %s\n"
msgstr "¥/ð ڷ : %s\n"
-#: pg_controldata.c:210
+#: pg_controldata.c:218
msgid "64-bit integers"
msgstr "64-Ʈ "
-#: pg_controldata.c:210
+#: pg_controldata.c:218
msgid "floating-point numbers"
msgstr "εҼ"
-#: pg_controldata.c:211
+#: pg_controldata.c:219
#, c-format
-msgid "Maximum length of locale name: %u\n"
-msgstr " ̸ ִ : %u\n"
+msgid "Float4 argument passing: %s\n"
+msgstr "Float4 μ : %s\n"
-#: pg_controldata.c:213
-#, c-format
-msgid "LC_COLLATE: %s\n"
-msgstr "LC_COLLATE: %s\n"
+#: pg_controldata.c:220 pg_controldata.c:222
+msgid "by value"
+msgstr ""
-#: pg_controldata.c:215
+#: pg_controldata.c:220 pg_controldata.c:222
+msgid "by reference"
+msgstr ""
+
+#: pg_controldata.c:221
#, c-format
-msgid "LC_CTYPE: %s\n"
-msgstr "LC_CTYPE: %s\n"
+msgid "Float8 argument passing: %s\n"
+msgstr "Float8 μ : %s\n"
diff --git a/src/bin/pg_controldata/po/pt_BR.po b/src/bin/pg_controldata/po/pt_BR.po
index 9242b0a86d..d54f4dd69c 100644
--- a/src/bin/pg_controldata/po/pt_BR.po
+++ b/src/bin/pg_controldata/po/pt_BR.po
@@ -7,10 +7,11 @@ msgid ""
msgstr ""
"Project-Id-Version: PostgreSQL 9.0\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-06-13 15:23-0300\n"
+"POT-Creation-Date: 2010-07-26 15:07-0300\n"
"PO-Revision-Date: 2005-10-04 23:00-0300\n"
"Last-Translator: Euler Taveira de Oliveira <euler@timbira.com>\n"
"Language-Team: Brazilian Portuguese <pgbr-dev@listas.postgresql.org.br>\n"
+"Language: pt_BR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -217,12 +218,12 @@ msgstr "Último ponto de controle NextMultiOffset: %u\n"
#: pg_controldata.c:221
#, c-format
msgid "Latest checkpoint's oldestXID: %u\n"
-msgstr "Último ponto de controle oldestXID: %u\n"
+msgstr "oldestXID do último ponto de controle: %u\n"
#: pg_controldata.c:223
-#, fuzzy, c-format
+#, c-format
msgid "Latest checkpoint's oldestXID's DB: %u\n"
-msgstr "Último ponto de controle do BD oldestXID: %u\n"
+msgstr "BD do oldestXID do último ponto de controle: %u\n"
#: pg_controldata.c:225
#, c-format
diff --git a/src/bin/pg_controldata/po/ro.po b/src/bin/pg_controldata/po/ro.po
new file mode 100644
index 0000000000..c7c93e1530
--- /dev/null
+++ b/src/bin/pg_controldata/po/ro.po
@@ -0,0 +1,341 @@
+# translation of pg_controldata-ro.po to Română
+#
+# Alin Vaida <alin.vaida@gmail.com>, 2004, 2006.
+msgid ""
+msgstr ""
+"Project-Id-Version: pg_controldata-ro\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2010-09-02 18:03+0000\n"
+"PO-Revision-Date: 2010-09-05 15:48-0000\n"
+"Last-Translator: Max <max@oceanline.co.uk>\n"
+"Language-Team: Română <en@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.2\n"
+
+#: pg_controldata.c:33
+#, c-format
+msgid ""
+"%s displays control information of a PostgreSQL database cluster.\n"
+"\n"
+msgstr ""
+"%s afişează informaţii de control despre un grup de baze de date PostgreSQL.\n"
+"\n"
+
+#: pg_controldata.c:37
+#, c-format
+msgid ""
+"Usage:\n"
+" %s [OPTION] [DATADIR]\n"
+"\n"
+"Options:\n"
+" --help show this help, then exit\n"
+" --version output version information, then exit\n"
+msgstr ""
+"Utilizare:\n"
+" %s [OPŢIUNE] [DIRDATE]\n"
+"\n"
+"Opţiuni:\n"
+" --help afişează acest ajutor, apoi iese\n"
+" --version afişează informaţiile despre versiune, apoi iese\n"
+
+#: pg_controldata.c:45
+#, c-format
+msgid ""
+"\n"
+"If no data directory (DATADIR) is specified, the environment variable PGDATA\n"
+"is used.\n"
+"\n"
+msgstr ""
+"\n"
+"Dacă nu este specificat nici un director de date (DIRDATE),\n"
+"este folosită variabila de mediu PGDATA.\n"
+"\n"
+
+#: pg_controldata.c:47
+#, c-format
+msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr "Raportaţi erorile la <pgsql-bugs@postgresql.org>.\n"
+
+#: pg_controldata.c:57
+msgid "starting up"
+msgstr "pornire"
+
+#: pg_controldata.c:59
+msgid "shut down"
+msgstr "închidere"
+
+#: pg_controldata.c:61
+msgid "shut down in recovery"
+msgstr "închidere în recuperare"
+
+#: pg_controldata.c:63
+msgid "shutting down"
+msgstr "închidere"
+
+#: pg_controldata.c:65
+msgid "in crash recovery"
+msgstr "întrerupere în recuperare"
+
+#: pg_controldata.c:67
+msgid "in archive recovery"
+msgstr "pornire recuperare arhivă"
+
+#: pg_controldata.c:69
+msgid "in production"
+msgstr "în producţie"
+
+#: pg_controldata.c:71
+msgid "unrecognized status code"
+msgstr "cod de stare nerecunoscut"
+
+#: pg_controldata.c:86
+msgid "unrecognized wal_level"
+msgstr "nivel WAL necunoscut"
+
+#: pg_controldata.c:129
+#, c-format
+msgid "%s: no data directory specified\n"
+msgstr "%s: nici un director de date specificat\n"
+
+#: pg_controldata.c:130
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "Încercaţi \"%s --help\" pentru mai multe informaţii.\n"
+
+#: pg_controldata.c:138
+#, c-format
+msgid "%s: could not open file \"%s\" for reading: %s\n"
+msgstr "%s: imposibil de deschis fişierul \"%s\" pentru citire: %s\n"
+
+#: pg_controldata.c:145
+#, c-format
+msgid "%s: could not read file \"%s\": %s\n"
+msgstr "%s: imposibil de citit fişierul \"%s\": %s\n"
+
+#: pg_controldata.c:159
+#, c-format
+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 ""
+"AVERTISMENT: Suma de control CRC calculată diferă de valoarea stocată în fişier.\n"
+"Fie fişierul este corupt, fie are un aspect diferit de cel aşteptat de acest program.\n"
+"Rezultatele de mai jos nu sunt de încredere.\n"
+"\n"
+
+#: pg_controldata.c:186
+#, c-format
+msgid "pg_control version number: %u\n"
+msgstr "Număr versiune pg_control: %u\n"
+
+#: pg_controldata.c:189
+#, c-format
+msgid ""
+"WARNING: possible byte ordering mismatch\n"
+"The byte ordering used to store the pg_control file might not match the one\n"
+"used by this program. In that case the results below would be incorrect, and\n"
+"the PostgreSQL installation would be incompatible with this data directory.\n"
+msgstr ""
+"AVERTISMENT: posibilă nepotrivire a ordinii octet\n"
+"Ordinea octet utilizată la stocarea fișierului pg_control e posibil să nu se potrivească cu\n"
+"cea folosită de acest program. În acest caz rezultatele de mai jos vor fi incorecte și\n"
+"instalarea PostgreSQL nu va fi compatibilă cu acest director de date.\n"
+
+#: pg_controldata.c:193
+#, c-format
+msgid "Catalog version number: %u\n"
+msgstr "Număr versiune catalog: %u\n"
+
+#: pg_controldata.c:195
+#, c-format
+msgid "Database system identifier: %s\n"
+msgstr "Identificator sistem baze de date: %s\n"
+
+#: pg_controldata.c:197
+#, c-format
+msgid "Database cluster state: %s\n"
+msgstr "Stare grup baze de date: %s\n"
+
+#: pg_controldata.c:199
+#, c-format
+msgid "pg_control last modified: %s\n"
+msgstr "Ultima modificare pg_control: %s\n"
+
+#: pg_controldata.c:201
+#, c-format
+msgid "Latest checkpoint location: %X/%X\n"
+msgstr "Locaţia ultimului punct de control: %X/%X\n"
+
+#: pg_controldata.c:204
+#, c-format
+msgid "Prior checkpoint location: %X/%X\n"
+msgstr "Locaţie pct. de control anterior: %X/%X\n"
+
+#: pg_controldata.c:207
+#, c-format
+msgid "Latest checkpoint's REDO location: %X/%X\n"
+msgstr "Loc. REDO a ultimului pct. de ctrl.: %X/%X\n"
+
+#: pg_controldata.c:210
+#, c-format
+msgid "Latest checkpoint's TimeLineID: %u\n"
+msgstr "TimeLineID ultimul punct de control: %u\n"
+
+#: pg_controldata.c:212
+#, c-format
+msgid "Latest checkpoint's NextXID: %u/%u\n"
+msgstr "NextXID-ul ultimului punct de control: %u/%u\n"
+
+#: pg_controldata.c:215
+#, c-format
+msgid "Latest checkpoint's NextOID: %u\n"
+msgstr "NextOID-ul ultimului punct de control: %u\n"
+
+#: pg_controldata.c:217
+#, c-format
+msgid "Latest checkpoint's NextMultiXactId: %u\n"
+msgstr "NextMultiXactId al ultimulului punct de control: %u\n"
+
+#: pg_controldata.c:219
+#, c-format
+msgid "Latest checkpoint's NextMultiOffset: %u\n"
+msgstr "NextMultiOffset al ultimulului punct de control: %u\n"
+
+#: pg_controldata.c:221
+#, c-format
+msgid "Latest checkpoint's oldestXID: %u\n"
+msgstr "oldestXID-ul ultimului punct de control : %u\n"
+
+#: pg_controldata.c:223
+#, c-format
+msgid "Latest checkpoint's oldestXID's DB: %u\n"
+msgstr "oldestXID-ul DB al ultimului punct de control: %u\n"
+
+#: pg_controldata.c:225
+#, c-format
+msgid "Latest checkpoint's oldestActiveXID: %u\n"
+msgstr "oldestActiveXID-ul ultimulului punct de control: %u\n"
+
+#: pg_controldata.c:227
+#, c-format
+msgid "Time of latest checkpoint: %s\n"
+msgstr "Timpul ultimului punct de control: %s\n"
+
+#: pg_controldata.c:229
+#, c-format
+msgid "Minimum recovery ending location: %X/%X\n"
+msgstr "Locaţia minimă a sfârșitului recuperării: %X/%X\n"
+
+#: pg_controldata.c:232
+#, c-format
+msgid "Backup start location: %X/%X\n"
+msgstr "Locaţie start Backup: %X/%X\n"
+
+#: pg_controldata.c:235
+#, c-format
+msgid "Current wal_level setting: %s\n"
+msgstr "Valoarea curentă a nivelului WAL (wal_level): %s\n"
+
+#: pg_controldata.c:237
+#, c-format
+msgid "Current max_connections setting: %d\n"
+msgstr "Setarea curentă pentru max_connections: %d\n"
+
+#: pg_controldata.c:239
+#, c-format
+msgid "Current max_prepared_xacts setting: %d\n"
+msgstr "Setarea curentă pentru max_prepared_xacts: %d\n"
+
+#: pg_controldata.c:241
+#, c-format
+msgid "Current max_locks_per_xact setting: %d\n"
+msgstr "Setarea curentă pentru max_locks_per_xact: %d\n"
+
+#: pg_controldata.c:243
+#, c-format
+msgid "Maximum data alignment: %u\n"
+msgstr "Aliniere maximă a datelor: %u\n"
+
+#: pg_controldata.c:246
+#, c-format
+msgid "Database block size: %u\n"
+msgstr "Dimensiune bloc bază de date: %u\n"
+
+#: pg_controldata.c:248
+#, c-format
+msgid "Blocks per segment of large relation: %u\n"
+msgstr "Blocuri/segment pentru relaţii mari: %u\n"
+
+#: pg_controldata.c:250
+#, c-format
+msgid "WAL block size: %u\n"
+msgstr "Dimensiune bloc WAL: %u\n"
+
+#: pg_controldata.c:252
+#, c-format
+msgid "Bytes per WAL segment: %u\n"
+msgstr "Octeţi per segment WAL: %u\n"
+
+#: pg_controldata.c:254
+#, c-format
+msgid "Maximum length of identifiers: %u\n"
+msgstr "Lungime maximă a identificatorilor: %u\n"
+
+#: pg_controldata.c:256
+#, c-format
+msgid "Maximum columns in an index: %u\n"
+msgstr "Numărul maxim de coloane într-un index: %u\n"
+
+#: pg_controldata.c:258
+#, c-format
+msgid "Maximum size of a TOAST chunk: %u\n"
+msgstr "Dimensiunea maximă a bucății TOAST: %u\n"
+
+#: pg_controldata.c:260
+#, c-format
+msgid "Date/time type storage: %s\n"
+msgstr "Stocare tip dată/timp: %s\n"
+
+#: pg_controldata.c:261
+msgid "64-bit integers"
+msgstr "întregi pe 64 de biţi"
+
+#: pg_controldata.c:261
+msgid "floating-point numbers"
+msgstr "numere în virgulă mobilă"
+
+#: pg_controldata.c:262
+#, c-format
+msgid "Float4 argument passing: %s\n"
+msgstr "Trimitere argument de tip Float4: %s\n"
+
+#: pg_controldata.c:263
+#: pg_controldata.c:265
+msgid "by value"
+msgstr "prin valoare"
+
+#: pg_controldata.c:263
+#: pg_controldata.c:265
+msgid "by reference"
+msgstr "prin referință"
+
+#: pg_controldata.c:264
+#, c-format
+msgid "Float8 argument passing: %s\n"
+msgstr "Trimitere argument de tip Float8: %s\n"
+
+#~ msgid "Next log file segment: %u\n"
+#~ msgstr "Segment fişier jurnal următor: %u\n"
+
+#~ msgid "Latest checkpoint's UNDO location: %X/%X\n"
+#~ msgstr "Loc. UNDO a ultimului pct. de ctrl.: %X/%X\n"
+
+#~ msgid "LC_COLLATE: %s\n"
+#~ msgstr "LC_COLLATE: %s\n"
+
+#~ msgid "LC_CTYPE: %s\n"
+#~ msgstr "LC_CTYPE: %s\n"
diff --git a/src/bin/pg_controldata/po/ru.po b/src/bin/pg_controldata/po/ru.po
new file mode 100644
index 0000000000..9d70061825
--- /dev/null
+++ b/src/bin/pg_controldata/po/ru.po
@@ -0,0 +1,365 @@
+# ru.po
+# PG_CONTROLDATA Translated Messages into the Russian Language (UTF-8)
+#
+# pgtranslation Id: pg_controldata.po,v 1.3 2011/05/14 01:57:42 alvherre Exp $
+#
+# ChangeLog:
+# - January 27, 2011: improvments by Andrey Sudnik for 9.x <sudnikand@gmail.com>
+# - December, 2004: Corrections and improvements by Oleg Bartunov <oleg@sai.msu.su>
+# - March 27 - September 24, 2004: Updates for 8.0; <mokhov@cs.concordia.ca>
+# - July 24 - August 23, 2003: Updates for 7.4.*; <mokhov@cs.concordia.ca>
+# - September 7, 2002: Complete post 7.3beta1 Translation, Serguei A. Mokhov <mokhov@cs.concordia.ca>
+# - August 31, 2002: Initial Translation, Serguei A. Mokhov <mokhov@cs.concordia.ca>
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 9.x\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2011-05-13 20:40+0000\n"
+"PO-Revision-Date: 2011-01-27 02:40+0700\n"
+"Last-Translator: Andrey Sudnik <sudnikand@gmail.com>\n"
+"Language-Team: pgsql-ru-general <pgsql-ru-general@postgresql.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Russian\n"
+"X-Poedit-Country: RUSSIAN FEDERATION\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#: pg_controldata.c:33
+#, c-format
+msgid ""
+"%s displays control information of a PostgreSQL database cluster.\n"
+"\n"
+msgstr ""
+"%s показывает информацию по управлению кластером баз PostgreSQL.\n"
+"\n"
+
+#: pg_controldata.c:37
+#, c-format
+msgid ""
+"Usage:\n"
+" %s [OPTION] [DATADIR]\n"
+"\n"
+"Options:\n"
+" --help show this help, then exit\n"
+" --version output version information, then exit\n"
+msgstr ""
+"Использование:\n"
+" %s [OPTION] [DATADIR]\n"
+"\n"
+"Опции:\n"
+" --help показать эту подсказку и выйти\n"
+" --version показать версию и выйти\n"
+"\n"
+
+#: pg_controldata.c:45
+#, c-format
+msgid ""
+"\n"
+"If no data directory (DATADIR) is specified, the environment variable "
+"PGDATA\n"
+"is used.\n"
+"\n"
+msgstr ""
+"\n"
+"Если директория данных (DATADIR) не указана, будет использоваться значение\n"
+"переменной окружения PGDATA.\n"
+"\n"
+
+#: pg_controldata.c:47
+#, c-format
+msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr "Сообщать об ошибках: <pgsql-bugs@postgresql.org>.\n"
+
+#: pg_controldata.c:57
+msgid "starting up"
+msgstr "запускается"
+
+#: pg_controldata.c:59
+msgid "shut down"
+msgstr "остановлен"
+
+#: pg_controldata.c:61
+msgid "shut down in recovery"
+msgstr "восстановление из-за выключения"
+
+#: pg_controldata.c:63
+msgid "shutting down"
+msgstr "останавливается"
+
+#: pg_controldata.c:65
+msgid "in crash recovery"
+msgstr "восстановление из-за падения"
+
+#: pg_controldata.c:67
+msgid "in archive recovery"
+msgstr "восстановление из-за архивации"
+
+#: pg_controldata.c:69
+msgid "in production"
+msgstr "в работе"
+
+#: pg_controldata.c:71
+msgid "unrecognized status code"
+msgstr "не распознанный код статуса"
+
+#: pg_controldata.c:86
+msgid "unrecognized wal_level"
+msgstr "не распознанный wal_level"
+
+#: pg_controldata.c:129
+#, c-format
+msgid "%s: no data directory specified\n"
+msgstr "%s: директория данных не указана\n"
+
+#: pg_controldata.c:130
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "Наберите \"%s --help\" для более подробной информации.\n"
+
+#: pg_controldata.c:138
+#, c-format
+msgid "%s: could not open file \"%s\" for reading: %s\n"
+msgstr "%s: не удалось открыть файл \"%s\" для чтения: %s\n"
+
+#: pg_controldata.c:145
+#, c-format
+msgid "%s: could not read file \"%s\": %s\n"
+msgstr "%s: не удалось считать файл \"%s\": %s\n"
+
+#: pg_controldata.c:159
+#, c-format
+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 ""
+"ВНИМАНИЕ: Вычисленная контрольная сумма CRC не совпадает со значением в "
+"файле.\n"
+"Файл либо повреждён, либо его формат отличается от ожидаемого этой "
+"программой.\n"
+"Не стоит доверять результатам представленным ниже.\n"
+"\n"
+
+#: pg_controldata.c:186
+#, c-format
+msgid "pg_control version number: %u\n"
+msgstr "Номер версии pg_control: %u\n"
+
+#: pg_controldata.c:189
+#, c-format
+msgid ""
+"WARNING: possible byte ordering mismatch\n"
+"The byte ordering used to store the pg_control file might not match the one\n"
+"used by this program. In that case the results below would be incorrect, "
+"and\n"
+"the PostgreSQL installation would be incompatible with this data directory.\n"
+msgstr ""
+"ВНИМАНИЕ: возможно ошибка порядка следования байт\n"
+"Порядок следования байт используемый в файле pg_control может не "
+"соответствовать\n"
+"тому, который используется этой программой. В этом случае результаты будут "
+"неверными и\n"
+"установленный PostgreSQL будет несовместим с этой директорией данных.\n"
+
+#: pg_controldata.c:193
+#, c-format
+msgid "Catalog version number: %u\n"
+msgstr "Номер версии каталога: %u\n"
+
+#: pg_controldata.c:195
+#, c-format
+msgid "Database system identifier: %s\n"
+msgstr "Идентификатор системы баз данных: %s\n"
+
+#: pg_controldata.c:197
+#, c-format
+msgid "Database cluster state: %s\n"
+msgstr "Состояние кластера базы: %s\n"
+
+#: pg_controldata.c:199
+#, c-format
+msgid "pg_control last modified: %s\n"
+msgstr "Последнее обновление pg_control: %s\n"
+
+#: pg_controldata.c:201
+#, c-format
+msgid "Latest checkpoint location: %X/%X\n"
+msgstr "Положение последней checkpoint: %X/%X\n"
+
+#: pg_controldata.c:204
+#, c-format
+msgid "Prior checkpoint location: %X/%X\n"
+msgstr "Положение предыдущей checkpoint: %X/%X\n"
+
+#: pg_controldata.c:207
+#, c-format
+msgid "Latest checkpoint's REDO location: %X/%X\n"
+msgstr "Положение REDO последнего чекпоинта: %X/%X\n"
+
+#: pg_controldata.c:210
+#, c-format
+msgid "Latest checkpoint's TimeLineID: %u\n"
+msgstr "TimeLineID последней checkpoint: %u\n"
+
+#: pg_controldata.c:212
+#, c-format
+msgid "Latest checkpoint's NextXID: %u/%u\n"
+msgstr "NextXID последней контрольной точки: %u/%u\n"
+
+#: pg_controldata.c:215
+#, c-format
+msgid "Latest checkpoint's NextOID: %u\n"
+msgstr "NextOID последней checkpoint: %u\n"
+
+#: pg_controldata.c:217
+#, c-format
+msgid "Latest checkpoint's NextMultiXactId: %u\n"
+msgstr "NextMultiXactId последней контрольной точки: %u\n"
+
+#: pg_controldata.c:219
+#, c-format
+msgid "Latest checkpoint's NextMultiOffset: %u\n"
+msgstr "NextMultiOffset последней контрольной точки: %u\n"
+
+#: pg_controldata.c:221
+#, c-format
+msgid "Latest checkpoint's oldestXID: %u\n"
+msgstr "Последней oldestXID чекпоинта: %u\n"
+
+#: pg_controldata.c:223
+#, c-format
+msgid "Latest checkpoint's oldestXID's DB: %u\n"
+msgstr "Последний DB oldestXID-а чекпоинта: %u\n"
+
+#: pg_controldata.c:225
+#, c-format
+msgid "Latest checkpoint's oldestActiveXID: %u\n"
+msgstr "Последней oldestActiveXID чекпоинта: %u\n"
+
+#: pg_controldata.c:227
+#, c-format
+msgid "Time of latest checkpoint: %s\n"
+msgstr "Время последней checkpoint: %s\n"
+
+#: pg_controldata.c:229
+#, c-format
+msgid "Minimum recovery ending location: %X/%X\n"
+msgstr "Минимальное расположение конца восстановления: %X/%X\n"
+
+#: pg_controldata.c:232
+#, c-format
+msgid "Backup start location: %X/%X\n"
+msgstr "Начало расположения бэкапа: %X/%X\n"
+
+#: pg_controldata.c:235
+#, c-format
+msgid "Current wal_level setting: %s\n"
+msgstr "Текущее значение wal_level: %s\n"
+
+#: pg_controldata.c:237
+#, c-format
+msgid "Current max_connections setting: %d\n"
+msgstr "Текущее значение max_connections: %d\n"
+
+#: pg_controldata.c:239
+#, c-format
+msgid "Current max_prepared_xacts setting: %d\n"
+msgstr "Текущее значение max_prepared_xacts: %d\n"
+
+#: pg_controldata.c:241
+#, c-format
+msgid "Current max_locks_per_xact setting: %d\n"
+msgstr "Текущее значение max_locks_per_xact: %d\n"
+
+#: pg_controldata.c:243
+#, c-format
+msgid "Maximum data alignment: %u\n"
+msgstr "Максимальный размер выравнивания данных: %u\n"
+
+#: pg_controldata.c:246
+#, c-format
+msgid "Database block size: %u\n"
+msgstr "Размер блока базы: %u\n"
+
+#: pg_controldata.c:248
+#, c-format
+msgid "Blocks per segment of large relation: %u\n"
+msgstr "Блоков на сегмент большого отношения: %u\n"
+
+#: pg_controldata.c:250
+#, c-format
+msgid "WAL block size: %u\n"
+msgstr "Размер блока WAL: %u\n"
+
+#: pg_controldata.c:252
+#, c-format
+msgid "Bytes per WAL segment: %u\n"
+msgstr "Количество байт на сегмент WAL: %u\n"
+
+#: pg_controldata.c:254
+#, c-format
+msgid "Maximum length of identifiers: %u\n"
+msgstr "Максимальная длина идентификаторов: %u\n"
+
+#: pg_controldata.c:256
+#, c-format
+msgid "Maximum columns in an index: %u\n"
+msgstr "Максимальное число колонок в индексе: %u\n"
+
+#: pg_controldata.c:258
+#, c-format
+msgid "Maximum size of a TOAST chunk: %u\n"
+msgstr "Максимальный размер порции TOAST: %u\n"
+
+#: pg_controldata.c:260
+#, c-format
+msgid "Date/time type storage: %s\n"
+msgstr "Формат хранения даты/времени: %s\n"
+
+#: pg_controldata.c:261
+msgid "64-bit integers"
+msgstr "64-битные целые"
+
+#: pg_controldata.c:261
+msgid "floating-point numbers"
+msgstr "числа с плавающей запятой"
+
+#: pg_controldata.c:262
+#, c-format
+msgid "Float4 argument passing: %s\n"
+msgstr "Float4 прохождение аргумента: %s\n"
+
+#: pg_controldata.c:263 pg_controldata.c:265
+msgid "by value"
+msgstr "по значению"
+
+#: pg_controldata.c:263 pg_controldata.c:265
+msgid "by reference"
+msgstr "по ссылке"
+
+#: pg_controldata.c:264
+#, c-format
+msgid "Float8 argument passing: %s\n"
+msgstr "Float8 прохождение аргумента: %s\n"
+
+#~ msgid "Next log file segment: %u\n"
+#~ msgstr "Следующий сегмент файла журнала: %u\n"
+
+#~ msgid "Latest checkpoint's UNDO location: %X/%X\n"
+#~ msgstr "Положение UNDO последней checkpoint: %X/%X\n"
+
+#~ msgid "Maximum number of function arguments: %u\n"
+#~ msgstr "Максимальное число аргументов функции: %u\n"
+
+#~ msgid "Maximum length of locale name: %u\n"
+#~ msgstr "Максимальная длина имени локали: %u\n"
+
+#~ msgid "LC_COLLATE: %s\n"
+#~ msgstr "LC_COLLATE: %s\n"
+
+#~ msgid "LC_CTYPE: %s\n"
+#~ msgstr "LC_CTYPE: %s\n"
diff --git a/src/bin/pg_controldata/po/tr.po b/src/bin/pg_controldata/po/tr.po
index af9cfa8c42..8e40241a1d 100644
--- a/src/bin/pg_controldata/po/tr.po
+++ b/src/bin/pg_controldata/po/tr.po
@@ -5,9 +5,9 @@ msgid ""
msgstr ""
"Project-Id-Version: pg_controldata-tr\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2009-04-29 07:08+0000\n"
-"PO-Revision-Date: 2009-04-29 16:29+0200\n"
-"Last-Translator: Devrim GÜNDÜZ <devrim@commandprompt.com>\n"
+"POT-Creation-Date: 2010-08-31 20:06+0000\n"
+"PO-Revision-Date: 2010-09-01 10:33+0200\n"
+"Last-Translator: Devrim GÜNDÜZ <devrim@gunduz.org>\n"
"Language-Team: Turkish <ceviri@postgresql.org.tr>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -16,7 +16,7 @@ msgstr ""
"X-Poedit-Language: Turkish\n"
"X-Poedit-Country: TURKEY\n"
-#: pg_controldata.c:24
+#: pg_controldata.c:33
#, c-format
msgid ""
"%s displays control information of a PostgreSQL database cluster.\n"
@@ -25,7 +25,7 @@ msgstr ""
"%s PostgreSQL veritabanı kümesinin kontrol bilgisini gösterir.\n"
"\n"
-#: pg_controldata.c:28
+#: pg_controldata.c:37
#, c-format
msgid ""
"Usage:\n"
@@ -42,7 +42,7 @@ msgstr ""
" --help bu yardımı gösterir ve sonra çıkar\n"
" --version sürüm bilgisini gösterir ve çıkar\n"
-#: pg_controldata.c:36
+#: pg_controldata.c:45
#, c-format
msgid ""
"\n"
@@ -55,60 +55,68 @@ msgstr ""
"kullanılır.\n"
"\n"
-#: pg_controldata.c:38
+#: pg_controldata.c:47
#, c-format
msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
msgstr "Hataları <pgsql-bugs@postgresql.org> adresine bildirebilirsiniz.\n"
-#: pg_controldata.c:48
+#: pg_controldata.c:57
msgid "starting up"
msgstr "başlıyor"
-#: pg_controldata.c:50
+#: pg_controldata.c:59
msgid "shut down"
msgstr "kapat"
-#: pg_controldata.c:52
+#: pg_controldata.c:61
+msgid "shut down in recovery"
+msgstr "kurtarma modunda kapatma"
+
+#: pg_controldata.c:63
msgid "shutting down"
msgstr "kapanıyor"
-#: pg_controldata.c:54
+#: pg_controldata.c:65
msgid "in crash recovery"
msgstr "çöküş (crash) kurtarma modunda"
-#: pg_controldata.c:56
+#: pg_controldata.c:67
msgid "in archive recovery"
msgstr "arşiv kurtarma modunda"
-#: pg_controldata.c:58
+#: pg_controldata.c:69
msgid "in production"
msgstr "üretim modunda"
-#: pg_controldata.c:60
+#: pg_controldata.c:71
msgid "unrecognized status code"
msgstr "tanımlayamayan durum kodu"
-#: pg_controldata.c:103
+#: pg_controldata.c:86
+msgid "unrecognized wal_level"
+msgstr "tanımsız wal_level değeri"
+
+#: pg_controldata.c:129
#, c-format
msgid "%s: no data directory specified\n"
msgstr "%s: hiçbir veri dizini belirtilmedi\n"
-#: pg_controldata.c:104
+#: pg_controldata.c:130
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "Ayrıntılı bilgi için \"%s --help\" komutunu kullanabilirsiniz.\n"
-#: pg_controldata.c:112
+#: pg_controldata.c:138
#, c-format
msgid "%s: could not open file \"%s\" for reading: %s\n"
msgstr "%s: \"%s\" dosyası okunmak için açılamadı: %s\n"
-#: pg_controldata.c:119
+#: pg_controldata.c:145
#, c-format
msgid "%s: could not read file \"%s\": %s\n"
msgstr "%s: \"%s\" dosyası okunamadı: %s\n"
-#: pg_controldata.c:133
+#: pg_controldata.c:159
#, c-format
msgid ""
"WARNING: Calculated CRC checksum does not match value stored in file.\n"
@@ -121,12 +129,12 @@ msgstr ""
"bir yapıya sahip olabilir. Aşağıdaki sonuçlar güvenilir değildir.\n"
"\n"
-#: pg_controldata.c:160
+#: pg_controldata.c:186
#, c-format
msgid "pg_control version number: %u\n"
msgstr "pg_control sürüm numarası: %u\n"
-#: pg_controldata.c:163
+#: pg_controldata.c:189
#, c-format
msgid ""
"WARNING: possible byte ordering mismatch\n"
@@ -140,153 +148,194 @@ msgstr ""
"sonuçlar yanlış olacak ve PostgreSQL kurulumu bu veri dizini ile uyumsuz\n"
"olacaktır.\n"
-#: pg_controldata.c:167
+#: pg_controldata.c:193
#, c-format
msgid "Catalog version number: %u\n"
msgstr "Katalog sürüm numarası: %u\n"
-#: pg_controldata.c:169
+#: pg_controldata.c:195
#, c-format
msgid "Database system identifier: %s\n"
msgstr "Veritabanı sistem belirteci: %s\n"
-#: pg_controldata.c:171
+#: pg_controldata.c:197
#, c-format
msgid "Database cluster state: %s\n"
msgstr "Veritabanı kümesinin durumu: %s\n"
-#: pg_controldata.c:173
+#: pg_controldata.c:199
#, c-format
msgid "pg_control last modified: %s\n"
msgstr "pg_control son düzenlenme tarihi: %s\n"
-#: pg_controldata.c:175
+#: pg_controldata.c:201
#, c-format
msgid "Latest checkpoint location: %X/%X\n"
msgstr "En son checkpoint yeri: %X/%X\n"
-#: pg_controldata.c:178
+#: pg_controldata.c:204
#, c-format
msgid "Prior checkpoint location: %X/%X\n"
msgstr "Önceki checkpoint yeri: %X/%X\n"
-#: pg_controldata.c:181
+#: pg_controldata.c:207
#, c-format
msgid "Latest checkpoint's REDO location: %X/%X\n"
msgstr "En son checkpoint'in REDO yeri: %X/%X\n"
-#: pg_controldata.c:184
+#: pg_controldata.c:210
#, c-format
msgid "Latest checkpoint's TimeLineID: %u\n"
msgstr "En son checkpoint'in TimeLineID'si: %u\n"
-#: pg_controldata.c:186
+#: pg_controldata.c:212
#, c-format
msgid "Latest checkpoint's NextXID: %u/%u\n"
msgstr "En son checkpoint'in NextXID'si: %u/%u\n"
-#: pg_controldata.c:189
+#: pg_controldata.c:215
#, c-format
msgid "Latest checkpoint's NextOID: %u\n"
msgstr "En son checkpoint'in NextOID'si: %u\n"
-#: pg_controldata.c:191
+#: pg_controldata.c:217
#, c-format
msgid "Latest checkpoint's NextMultiXactId: %u\n"
msgstr "En son checkpoint'in NextMultiXactId'si: %u\n"
-#: pg_controldata.c:193
+#: pg_controldata.c:219
#, c-format
msgid "Latest checkpoint's NextMultiOffset: %u\n"
msgstr "En son checkpoint'in NextMultiOffset'i: %u\n"
-#: pg_controldata.c:195
+#: pg_controldata.c:221
+#, c-format
+msgid "Latest checkpoint's oldestXID: %u\n"
+msgstr "En son checkpoint'in oldestXID'si: %u\n"
+
+#: pg_controldata.c:223
+#, c-format
+msgid "Latest checkpoint's oldestXID's DB: %u\n"
+msgstr "En son checkpoint'in oldestXID'sini DB'si: %u\n"
+
+#: pg_controldata.c:225
+#, c-format
+msgid "Latest checkpoint's oldestActiveXID: %u\n"
+msgstr "En son checkpoint'in odestActiveXID'si: %u\n"
+
+#: pg_controldata.c:227
#, c-format
msgid "Time of latest checkpoint: %s\n"
msgstr "En son checkpoint'in zamanı: %s\n"
-#: pg_controldata.c:197
+#: pg_controldata.c:229
#, c-format
msgid "Minimum recovery ending location: %X/%X\n"
msgstr "Minimum kurtarma sonlandırma yeri: %X/%X\n"
-#: pg_controldata.c:200
+#: pg_controldata.c:232
+#, c-format
+msgid "Backup start location: %X/%X\n"
+msgstr "Yedek başlama yeri: %X/%X\n"
+
+#: pg_controldata.c:235
+#, c-format
+msgid "Current wal_level setting: %s\n"
+msgstr "Mevcut wal_level ayarı %s\n"
+
+#: pg_controldata.c:237
+#, c-format
+msgid "Current max_connections setting: %d\n"
+msgstr "Mevcut max_connections ayarı: %d\n"
+
+#: pg_controldata.c:239
+#, c-format
+msgid "Current max_prepared_xacts setting: %d\n"
+msgstr "Mevcut max_prepared_xacts ayarı: %d\n"
+
+#: pg_controldata.c:241
+#, c-format
+msgid "Current max_locks_per_xact setting: %d\n"
+msgstr "Mevcut max_locks_per_xact ayarı: %d\n"
+
+#: pg_controldata.c:243
#, c-format
msgid "Maximum data alignment: %u\n"
msgstr "Azami veri hizalama: %u\n"
-#: pg_controldata.c:203
+#: pg_controldata.c:246
#, c-format
msgid "Database block size: %u\n"
msgstr "Veritabanı blok boyutu: %u\n"
-#: pg_controldata.c:205
+#: pg_controldata.c:248
#, c-format
msgid "Blocks per segment of large relation: %u\n"
msgstr "Büyük ilişkilerin parçası başına blok sayısı: %u\n"
-#: pg_controldata.c:207
+#: pg_controldata.c:250
#, c-format
msgid "WAL block size: %u\n"
msgstr "WAL blok boyutu: %u\n"
-#: pg_controldata.c:209
+#: pg_controldata.c:252
#, c-format
msgid "Bytes per WAL segment: %u\n"
msgstr "Her bir WAL parçası başına byte sayısı: %u\n"
-#: pg_controldata.c:211
+#: pg_controldata.c:254
#, c-format
msgid "Maximum length of identifiers: %u\n"
msgstr "Belirteçlerin en fazla uzunluğu: %u\n"
-#: pg_controldata.c:213
+#: pg_controldata.c:256
#, c-format
msgid "Maximum columns in an index: %u\n"
msgstr "İndekste en fazla kolon sayısı: %u\n"
-#: pg_controldata.c:215
+#: pg_controldata.c:258
#, c-format
msgid "Maximum size of a TOAST chunk: %u\n"
msgstr "TOAST parçasının en yüksek boyutu: %u\n"
-#: pg_controldata.c:217
+#: pg_controldata.c:260
#, c-format
msgid "Date/time type storage: %s\n"
msgstr "Tarih/zaman tipi saklanması: %s\n"
-#: pg_controldata.c:218
+#: pg_controldata.c:261
msgid "64-bit integers"
msgstr "64-bit tamsayı"
-#: pg_controldata.c:218
+#: pg_controldata.c:261
msgid "floating-point numbers"
msgstr "kayan noktalı sayılar"
-#: pg_controldata.c:219
+#: pg_controldata.c:262
#, c-format
msgid "Float4 argument passing: %s\n"
msgstr "Float4 argument passing: %s\n"
-#: pg_controldata.c:220
-#: pg_controldata.c:222
+#: pg_controldata.c:263
+#: pg_controldata.c:265
msgid "by value"
msgstr "değer ile"
-#: pg_controldata.c:220
-#: pg_controldata.c:222
+#: pg_controldata.c:263
+#: pg_controldata.c:265
msgid "by reference"
msgstr "referans ile"
-#: pg_controldata.c:221
+#: pg_controldata.c:264
#, c-format
msgid "Float8 argument passing: %s\n"
msgstr "Float8 argument passing: %s\n"
#~ msgid "Maximum length of locale name: %u\n"
#~ msgstr "Yerel adının en fazla büyüklüğü: %u\n"
+
#~ msgid "LC_COLLATE: %s\n"
#~ msgstr "LC_COLLATE: %s\n"
+
#~ msgid "LC_CTYPE: %s\n"
#~ msgstr "LC_CTYPE: %s\n"
-
diff --git a/src/bin/pg_controldata/po/zh_CN.po b/src/bin/pg_controldata/po/zh_CN.po
index b23477e369..9891563523 100644
--- a/src/bin/pg_controldata/po/zh_CN.po
+++ b/src/bin/pg_controldata/po/zh_CN.po
@@ -3,26 +3,26 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: PostgreSQL 8.0\n"
+"Project-Id-Version: pg_controldata (PostgreSQL 9.0)\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-02-19 01:58+0000\n"
-"PO-Revision-Date: 2010-03-30 13:52+0800\n"
+"POT-Creation-Date: 2010-10-01 14:40+0000\n"
+"PO-Revision-Date: 2010-10-01 12:45+0800\n"
"Last-Translator: Weibin <ssmei_2000@yahoo.com>\n"
-"Language-Team: Weiping He <laser@zhengmai.com.cn>\n"
+"Language-Team: Chinese (Simplified)\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=GB2312\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: pg_controldata.c:24
+#: pg_controldata.c:33
#, c-format
msgid ""
"%s displays control information of a PostgreSQL database cluster.\n"
"\n"
msgstr ""
-"%s ʾ PostgreSQL ݿؿϢ.\n"
+"%s 显示 PostgreSQL 数据库簇控制信息.\n"
"\n"
-#: pg_controldata.c:28
+#: pg_controldata.c:37
#, c-format
msgid ""
"Usage:\n"
@@ -32,80 +32,89 @@ msgid ""
" --help show this help, then exit\n"
" --version output version information, then exit\n"
msgstr ""
-"ʹ÷:\n"
-" %s [ѡ] [Ŀ¼]\n"
+"使用方法:\n"
+" %s [选项] [数据目录]\n"
"\n"
-"ѡ:\n"
-" --help ʾ˰Ϣ, Ȼ˳\n"
-" --version ʾ pg_controldata İ汾, Ȼ˳\n"
+"选项:\n"
+" --help 显示此帮助信息, 然后退出\n"
+" --version 显示 pg_controldata 的版本, 然后退出\n"
-#: pg_controldata.c:36
+#: pg_controldata.c:45
#, c-format
msgid ""
"\n"
-"If no data directory (DATADIR) is specified, the environment variable PGDATA\n"
+"If no data directory (DATADIR) is specified, the environment variable "
+"PGDATA\n"
"is used.\n"
"\n"
msgstr ""
"\n"
-"ûָĿ¼ (DATADIR), ʹ\n"
-"PGDATA.\n"
+"如果没有指定数据目录(DATADIR), 将使用\n"
+"环境变量PGDATA.\n"
"\n"
-#: pg_controldata.c:38
+#: pg_controldata.c:47
#, c-format
msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
-msgstr " <pgsql-bugs@postgresql.org>.\n"
+msgstr "报告错误至 <pgsql-bugs@postgresql.org>.\n"
-#: pg_controldata.c:48
+#: pg_controldata.c:57
msgid "starting up"
-msgstr ""
+msgstr "正在启动"
-#: pg_controldata.c:50
+#: pg_controldata.c:59
msgid "shut down"
-msgstr "ر"
+msgstr "关闭"
-#: pg_controldata.c:52
+#: pg_controldata.c:61
+msgid "shut down in recovery"
+msgstr "在恢复过程中关闭数据库"
+
+#: pg_controldata.c:63
msgid "shutting down"
-msgstr "ڹر"
+msgstr "正在关闭"
-#: pg_controldata.c:54
+#: pg_controldata.c:65
msgid "in crash recovery"
-msgstr "ڻָ"
+msgstr "在恢复中"
-#: pg_controldata.c:56
+#: pg_controldata.c:67
msgid "in archive recovery"
-msgstr "ڹ鵵ָ"
+msgstr "正在归档恢复"
-#: pg_controldata.c:58
+#: pg_controldata.c:69
msgid "in production"
-msgstr ""
+msgstr "在运行中"
-#: pg_controldata.c:60
+#: pg_controldata.c:71
msgid "unrecognized status code"
-msgstr "Ͽɵ״̬"
+msgstr "不被认可的状态码"
+
+#: pg_controldata.c:86
+msgid "unrecognized wal_level"
+msgstr "参数wal_level的值无法识别"
-#: pg_controldata.c:103
+#: pg_controldata.c:129
#, c-format
msgid "%s: no data directory specified\n"
-msgstr "%s: ûָĿ¼\n"
+msgstr "%s: 没有指定数据目录\n"
-#: pg_controldata.c:104
+#: pg_controldata.c:130
#, c-format
msgid "Try \"%s --help\" for more information.\n"
-msgstr " \"%s --help\" ʾϢ.\n"
+msgstr "用 \"%s --help\" 显示更多的信息.\n"
-#: pg_controldata.c:112
+#: pg_controldata.c:138
#, c-format
msgid "%s: could not open file \"%s\" for reading: %s\n"
-msgstr "%s: ޷ļ \"%s\" ȡϢ: %s\n"
+msgstr "%s: 无法打开文件 \"%s\" 读取信息: %s\n"
-#: pg_controldata.c:119
+#: pg_controldata.c:145
#, c-format
msgid "%s: could not read file \"%s\": %s\n"
-msgstr "%s: ޷ȡļ \"%s\": %s\n"
+msgstr "%s: 无法读取文件 \"%s\": %s\n"
-#: pg_controldata.c:133
+#: pg_controldata.c:159
#, c-format
msgid ""
"WARNING: Calculated CRC checksum does not match value stored in file.\n"
@@ -113,180 +122,216 @@ msgid ""
"is expecting. The results below are untrustworthy.\n"
"\n"
msgstr ""
-": CRCУֵѱļеֵƥ.\n"
-"ļ,ֵͬ.\n"
-"ĽDzɿ.\n"
+"警告: 计算出来的CRC校验值与已保存在文件中的值不匹配.\n"
+"不是文件坏了,就是设计与程序的期望值不同.\n"
+"下面的结果是不可靠的.\n"
"\n"
-#: pg_controldata.c:160
+#: pg_controldata.c:186
#, c-format
msgid "pg_control version number: %u\n"
-msgstr "pg_control 汾: %u\n"
+msgstr "pg_control 版本: %u\n"
-#: pg_controldata.c:163
+#: pg_controldata.c:189
#, c-format
msgid ""
"WARNING: possible byte ordering mismatch\n"
"The byte ordering used to store the pg_control file might not match the one\n"
-"used by this program. In that case the results below would be incorrect, and\n"
+"used by this program. In that case the results below would be incorrect, "
+"and\n"
"the PostgreSQL installation would be incompatible with this data directory.\n"
msgstr ""
-": ֽ˳ƥ\n"
-"ڴ洢ļpg_controlֽ˳ʹõIJƥ\n"
-"½Dzȷ,װPostgreSQL\n"
-"Ŀ¼\n"
+"警告: 可能字节顺序不匹配\n"
+"用于存储文件pg_control的字节顺序可能与程序使用的不匹配\n"
+"在那种情况下结果将会是不正确的,并且所安装的PostgreSQL\n"
+"将会与这个数据目录不兼容\n"
-#: pg_controldata.c:167
+#: pg_controldata.c:193
#, c-format
msgid "Catalog version number: %u\n"
-msgstr "Catalog 汾: %u\n"
+msgstr "Catalog 版本: %u\n"
-#: pg_controldata.c:169
+#: pg_controldata.c:195
#, c-format
msgid "Database system identifier: %s\n"
-msgstr "ݿϵͳʶ: %s\n"
+msgstr "数据库系统标识符: %s\n"
-#: pg_controldata.c:171
+#: pg_controldata.c:197
#, c-format
msgid "Database cluster state: %s\n"
-msgstr "ݿ״̬: %s\n"
+msgstr "数据库簇状态: %s\n"
-#: pg_controldata.c:173
+#: pg_controldata.c:199
#, c-format
msgid "pg_control last modified: %s\n"
-msgstr "pg_control ޸: %s\n"
+msgstr "pg_control 最后修改: %s\n"
-#: pg_controldata.c:175
+#: pg_controldata.c:201
#, c-format
msgid "Latest checkpoint location: %X/%X\n"
-msgstr "¼λ: %X/%X\n"
+msgstr "最新检查点位置: %X/%X\n"
-#: pg_controldata.c:178
+#: pg_controldata.c:204
#, c-format
msgid "Prior checkpoint location: %X/%X\n"
-msgstr "ȼλ: %X/%X\n"
+msgstr "优先检查点位置: %X/%X\n"
-#: pg_controldata.c:181
+#: pg_controldata.c:207
#, c-format
msgid "Latest checkpoint's REDO location: %X/%X\n"
-msgstr "¼ REDO λ: %X/%X\n"
+msgstr "最新检查点的 REDO 位置: %X/%X\n"
-#: pg_controldata.c:184
+#: pg_controldata.c:210
#, c-format
msgid "Latest checkpoint's TimeLineID: %u\n"
-msgstr "¼ TimeLineID: %u\n"
+msgstr "最新检查点的 TimeLineID: %u\n"
-#: pg_controldata.c:186
+#: pg_controldata.c:212
#, c-format
msgid "Latest checkpoint's NextXID: %u/%u\n"
-msgstr "¼ NextXID: %u/%u\n"
+msgstr "最新检查点的 NextXID: %u/%u\n"
-#: pg_controldata.c:189
+#: pg_controldata.c:215
#, c-format
msgid "Latest checkpoint's NextOID: %u\n"
-msgstr "¼ NextOID: %u\n"
+msgstr "最新检查点的 NextOID: %u\n"
-#: pg_controldata.c:191
+#: pg_controldata.c:217
#, c-format
msgid "Latest checkpoint's NextMultiXactId: %u\n"
-msgstr "¼NextMultiXactId: %u\n"
+msgstr "最新检查点的NextMultiXactId: %u\n"
-#: pg_controldata.c:193
+#: pg_controldata.c:219
#, c-format
msgid "Latest checkpoint's NextMultiOffset: %u\n"
-msgstr "¼NextMultiOffsetD: %u\n"
+msgstr "最新检查点的NextMultiOffsetD: %u\n"
-#: pg_controldata.c:195
+#: pg_controldata.c:221
+#, c-format
+msgid "Latest checkpoint's oldestXID: %u\n"
+msgstr "最新检查点的oldestXID: %u\n"
+
+#: pg_controldata.c:223
+#, c-format
+msgid "Latest checkpoint's oldestXID's DB: %u\n"
+msgstr "最新检查点的oldestXID所在的数据库:%u\n"
+
+#: pg_controldata.c:225
+#, c-format
+msgid "Latest checkpoint's oldestActiveXID: %u\n"
+msgstr "最新检查点检查oldestActiveXID: %u\n"
+
+#: pg_controldata.c:227
#, c-format
msgid "Time of latest checkpoint: %s\n"
-msgstr "¼ʱ: %s\n"
+msgstr "最新检查点的时间: %s\n"
-#: pg_controldata.c:197
+#: pg_controldata.c:229
#, c-format
msgid "Minimum recovery ending location: %X/%X\n"
-msgstr "Сָλ: %X/%X\n"
+msgstr "最小恢复结束位置: %X/%X\n"
+
+#: pg_controldata.c:232
+#, c-format
+msgid "Backup start location: %X/%X\n"
+msgstr "开始进行备份的点位置: %X/%X\n"
-#: pg_controldata.c:200
+#: pg_controldata.c:235
+#, c-format
+msgid "Current wal_level setting: %s\n"
+msgstr "参数wal_level的当前设置: %s\n"
+
+#: pg_controldata.c:237
+#, c-format
+msgid "Current max_connections setting: %d\n"
+msgstr "参数max_connections的当前设置: %d\n"
+
+#: pg_controldata.c:239
+#, c-format
+msgid "Current max_prepared_xacts setting: %d\n"
+msgstr "参数 max_prepared_xacts的当前设置: %d\n"
+
+#: pg_controldata.c:241
+#, c-format
+msgid "Current max_locks_per_xact setting: %d\n"
+msgstr "参数max_locks_per_xact setting的当前设置: %d\n"
+
+#: pg_controldata.c:243
#, c-format
msgid "Maximum data alignment: %u\n"
-msgstr "У׼: %u\n"
+msgstr "最大数据校准: %u\n"
-#: pg_controldata.c:203
+#: pg_controldata.c:246
#, c-format
msgid "Database block size: %u\n"
-msgstr "ݿС: %u\n"
+msgstr "数据库块大小: %u\n"
-#: pg_controldata.c:205
+#: pg_controldata.c:248
#, c-format
msgid "Blocks per segment of large relation: %u\n"
-msgstr "ϵÿο: %u\n"
+msgstr "大关系的每段块数: %u\n"
-#: pg_controldata.c:207
+#: pg_controldata.c:250
#, c-format
msgid "WAL block size: %u\n"
-msgstr "WALĿС: %u\n"
+msgstr "WAL的块大小: %u\n"
-#: pg_controldata.c:209
+#: pg_controldata.c:252
#, c-format
msgid "Bytes per WAL segment: %u\n"
-msgstr "ÿһ WAL ֽ: %u\n"
+msgstr "每一个 WAL 段字节数: %u\n"
-#: pg_controldata.c:211
+#: pg_controldata.c:254
#, c-format
msgid "Maximum length of identifiers: %u\n"
-msgstr "ʶ󳤶: %u\n"
+msgstr "标识符的最大长度: %u\n"
-#: pg_controldata.c:213
+#: pg_controldata.c:256
#, c-format
msgid "Maximum columns in an index: %u\n"
-msgstr "пʹ: %u\n"
+msgstr "在索引中可允许使用最大的列数: %u\n"
-#: pg_controldata.c:215
+#: pg_controldata.c:258
#, c-format
msgid "Maximum size of a TOAST chunk: %u\n"
-msgstr "TOAST󳤶: %u\n"
+msgstr "TOAST区块的最大长度: %u\n"
-#: pg_controldata.c:217
+#: pg_controldata.c:260
#, c-format
msgid "Date/time type storage: %s\n"
-msgstr "/ʱ ʹ洢: %s\n"
+msgstr "日期/时间 类型存储: %s\n"
-#: pg_controldata.c:218
+#: pg_controldata.c:261
msgid "64-bit integers"
-msgstr "64λ"
+msgstr "64位整数"
-#: pg_controldata.c:218
+#: pg_controldata.c:261
msgid "floating-point numbers"
-msgstr ""
+msgstr "浮点数"
-#: pg_controldata.c:219
+#: pg_controldata.c:262
#, c-format
msgid "Float4 argument passing: %s\n"
-msgstr "ڴFlloat4͵IJ: %s\n"
+msgstr "正在传递Flloat4类型的参数: %s\n"
-#: pg_controldata.c:220
-#: pg_controldata.c:222
+#: pg_controldata.c:263 pg_controldata.c:265
msgid "by value"
-msgstr "ֵ"
+msgstr "由值"
-#: pg_controldata.c:220
-#: pg_controldata.c:222
+#: pg_controldata.c:263 pg_controldata.c:265
msgid "by reference"
-msgstr ""
+msgstr "由引用"
-#: pg_controldata.c:221
+#: pg_controldata.c:264
#, c-format
msgid "Float8 argument passing: %s\n"
-msgstr "ڴFlloat8͵IJ: %s\n"
-
-#~ msgid "Current log file ID: %u\n"
-#~ msgstr "ǰ־ļID: %u\n"
+msgstr "正在传递Flloat8类型的参数: %s\n"
#~ msgid "Latest checkpoint's UNDO location: %X/%X\n"
-#~ msgstr "¼ UNDO λ: %X/%X\n"
+#~ msgstr "最新检查点的 UNDO 位置: %X/%X\n"
#~ msgid "Maximum number of function arguments: %u\n"
-#~ msgstr ": %u\n"
+#~ msgstr "函数参数的最大个数: %u\n"
#~ msgid "LC_COLLATE: %s\n"
#~ msgstr "LC_COLLATE: %s\n"
@@ -295,4 +340,4 @@ msgstr "ڴFlloat8͵IJ: %s\n"
#~ msgstr "LC_CTYPE: %s\n"
#~ msgid "Latest checkpoint's StartUpID: %u\n"
-#~ msgstr "¼ StartUpID: %u\n"
+#~ msgstr "最新检查点的 StartUpID: %u\n"
diff --git a/src/bin/pg_controldata/po/zh_TW.po b/src/bin/pg_controldata/po/zh_TW.po
new file mode 100644
index 0000000000..e0d868315f
--- /dev/null
+++ b/src/bin/pg_controldata/po/zh_TW.po
@@ -0,0 +1,338 @@
+# Traditional Chinese message translation file for pg_controldata
+# Copyright (C) 2011 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+# 2004-11-01 Zhenbang Wei <forth@zbwei.net>
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 9.1\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2011-05-11 20:40+0000\n"
+"PO-Revision-Date: 2011-05-09 15:43+0800\n"
+"Last-Translator: Zhenbang Wei <znbang@gmail.com>\n"
+"Language-Team: EnterpriseDB translation team <dev-escalations@enterprisedb."
+"com>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: pg_controldata.c:33
+#, c-format
+msgid ""
+"%s displays control information of a PostgreSQL database cluster.\n"
+"\n"
+msgstr ""
+"%s 顯示 PostgreSQL 資料庫 cluster 控制資訊。\n"
+"\n"
+
+#: pg_controldata.c:37
+#, c-format
+msgid ""
+"Usage:\n"
+" %s [OPTION] [DATADIR]\n"
+"\n"
+"Options:\n"
+" --help show this help, then exit\n"
+" --version output version information, then exit\n"
+msgstr ""
+"用法:\n"
+" %s [選項] [資料目錄]\n"
+"\n"
+"選項:\n"
+" --help 顯示說明訊息然後結束\n"
+" --version 顯示版本資訊然後結束\n"
+
+#: pg_controldata.c:45
+#, c-format
+msgid ""
+"\n"
+"If no data directory (DATADIR) is specified, the environment variable "
+"PGDATA\n"
+"is used.\n"
+"\n"
+msgstr ""
+"\n"
+"如果沒有指定資料目錄就會用環境變數PGDATA。\n"
+"\n"
+
+#: pg_controldata.c:47
+#, c-format
+msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr "回報錯誤至 <pgsql-bugs@postgresql.org>。\n"
+
+#: pg_controldata.c:57
+msgid "starting up"
+msgstr "正在啟動"
+
+#: pg_controldata.c:59
+msgid "shut down"
+msgstr "關閉"
+
+# access/transam/xlog.c:3596
+#: pg_controldata.c:61
+msgid "shut down in recovery"
+msgstr "在復原時關閉"
+
+#: pg_controldata.c:63
+msgid "shutting down"
+msgstr "正在關閉"
+
+#: pg_controldata.c:65
+msgid "in crash recovery"
+msgstr "損毀復原中"
+
+# access/transam/xlog.c:3596
+#: pg_controldata.c:67
+msgid "in archive recovery"
+msgstr "封存復原中"
+
+#: pg_controldata.c:69
+msgid "in production"
+msgstr "運作中"
+
+#: pg_controldata.c:71
+msgid "unrecognized status code"
+msgstr "無法識別的狀態碼"
+
+# access/transam/xlog.c:3720
+#: pg_controldata.c:86
+msgid "unrecognized wal_level"
+msgstr "無法識別的 wal_level"
+
+#: pg_controldata.c:129
+#, c-format
+msgid "%s: no data directory specified\n"
+msgstr "%s: 沒有指定資料目錄\n"
+
+#: pg_controldata.c:130
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "執行 \"%s --help\" 顯示更多資訊。\n"
+
+#: pg_controldata.c:138
+#, c-format
+msgid "%s: could not open file \"%s\" for reading: %s\n"
+msgstr "%s: 無法開啟檔案 \"%s\" 讀取: %s\n"
+
+#: pg_controldata.c:145
+#, c-format
+msgid "%s: could not read file \"%s\": %s\n"
+msgstr "%s: 無法讀取檔案 \"%s\": %s\n"
+
+#: pg_controldata.c:159
+#, c-format
+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 ""
+"警告: 計算出來的 CRC 校驗值與儲存在檔案中的值不符。\n"
+"可能是檔案損壞,或是與程式所預期的結構不同,下列\n"
+"的結果是不可靠的。\n"
+"\n"
+
+#: pg_controldata.c:186
+#, c-format
+msgid "pg_control version number: %u\n"
+msgstr "pg_control 版本: %u\n"
+
+#: pg_controldata.c:189
+#, c-format
+msgid ""
+"WARNING: possible byte ordering mismatch\n"
+"The byte ordering used to store the pg_control file might not match the one\n"
+"used by this program. In that case the results below would be incorrect, "
+"and\n"
+"the PostgreSQL installation would be incompatible with this data directory.\n"
+msgstr ""
+"警告: 可能出現位元組排序方式不相符情況\n"
+"用來儲存 pg_control 檔的位元組排序\n"
+"可能與此程式使用的位元組排序不相符。如此下列結果會不正確,而且\n"
+"PostgreSQL 安裝會與此資料目錄不相容。\n"
+
+#: pg_controldata.c:193
+#, c-format
+msgid "Catalog version number: %u\n"
+msgstr "catalog 版本: %u\n"
+
+#: pg_controldata.c:195
+#, c-format
+msgid "Database system identifier: %s\n"
+msgstr "資料庫系統識別: %s\n"
+
+#: pg_controldata.c:197
+#, c-format
+msgid "Database cluster state: %s\n"
+msgstr "資料庫 cluster 狀態: %s\n"
+
+#: pg_controldata.c:199
+#, c-format
+msgid "pg_control last modified: %s\n"
+msgstr "pg_control 最後修改時間: %s\n"
+
+#: pg_controldata.c:201
+#, c-format
+msgid "Latest checkpoint location: %X/%X\n"
+msgstr "最近檢查點位置: %X/%X\n"
+
+#: pg_controldata.c:204
+#, c-format
+msgid "Prior checkpoint location: %X/%X\n"
+msgstr "前次檢查點位置: %X/%X\n"
+
+#: pg_controldata.c:207
+#, c-format
+msgid "Latest checkpoint's REDO location: %X/%X\n"
+msgstr "最近檢查點 REDO 位置: %X/%X\n"
+
+#: pg_controldata.c:210
+#, c-format
+msgid "Latest checkpoint's TimeLineID: %u\n"
+msgstr "最近檢查點 TimeLineID: %u\n"
+
+#: pg_controldata.c:212
+#, c-format
+msgid "Latest checkpoint's NextXID: %u/%u\n"
+msgstr "最近檢查點 NextXID: %u/%u\n"
+
+#: pg_controldata.c:215
+#, c-format
+msgid "Latest checkpoint's NextOID: %u\n"
+msgstr "最近檢查點 NextOID: %u\n"
+
+#: pg_controldata.c:217
+#, c-format
+msgid "Latest checkpoint's NextMultiXactId: %u\n"
+msgstr "最近檢查點 NextMultiXactId: %u\n"
+
+#: pg_controldata.c:219
+#, c-format
+msgid "Latest checkpoint's NextMultiOffset: %u\n"
+msgstr "最近檢查點 NextMultiOffset: %u\n"
+
+#: pg_controldata.c:221
+#, c-format
+msgid "Latest checkpoint's oldestXID: %u\n"
+msgstr "最近檢查點 oldestXID: %u\n"
+
+#: pg_controldata.c:223
+#, c-format
+msgid "Latest checkpoint's oldestXID's DB: %u\n"
+msgstr "最近檢查點 oldestXID 所在資料庫: %u\n"
+
+#: pg_controldata.c:225
+#, c-format
+msgid "Latest checkpoint's oldestActiveXID: %u\n"
+msgstr "最近檢查點 oldestActiveXID: %u\n"
+
+#: pg_controldata.c:227
+#, c-format
+msgid "Time of latest checkpoint: %s\n"
+msgstr "最近檢查點時間: %s\n"
+
+#: pg_controldata.c:229
+#, c-format
+msgid "Minimum recovery ending location: %X/%X\n"
+msgstr "復原結束位置下限: %X/%X\n"
+
+#: pg_controldata.c:232
+#, c-format
+msgid "Backup start location: %X/%X\n"
+msgstr "備份開始位置: %X/%X\n"
+
+#: pg_controldata.c:235
+#, c-format
+msgid "Current wal_level setting: %s\n"
+msgstr "目前的 wal_level 設定: %s\n"
+
+#: pg_controldata.c:237
+#, c-format
+msgid "Current max_connections setting: %d\n"
+msgstr "目前的 max_connections 設定: %d\n"
+
+#: pg_controldata.c:239
+#, c-format
+msgid "Current max_prepared_xacts setting: %d\n"
+msgstr "目前的 max_prepared_xacts 設定: %d\n"
+
+#: pg_controldata.c:241
+#, c-format
+msgid "Current max_locks_per_xact setting: %d\n"
+msgstr "目前的 max_locks_per_xact 設定: %d\n"
+
+#: pg_controldata.c:243
+#, c-format
+msgid "Maximum data alignment: %u\n"
+msgstr "資料對齊上限: %u\n"
+
+#: pg_controldata.c:246
+#, c-format
+msgid "Database block size: %u\n"
+msgstr "資料庫區塊大小: %u\n"
+
+#: pg_controldata.c:248
+#, c-format
+msgid "Blocks per segment of large relation: %u\n"
+msgstr "大型關聯每個區段的區塊數: %u\n"
+
+#: pg_controldata.c:250
+#, c-format
+msgid "WAL block size: %u\n"
+msgstr "WAL 區塊大小: %u\n"
+
+#: pg_controldata.c:252
+#, c-format
+msgid "Bytes per WAL segment: %u\n"
+msgstr "每個 WAL 區段的位元組數: %u\n"
+
+#: pg_controldata.c:254
+#, c-format
+msgid "Maximum length of identifiers: %u\n"
+msgstr "識別字的最大長度: %u\n"
+
+#: pg_controldata.c:256
+#, c-format
+msgid "Maximum columns in an index: %u\n"
+msgstr "索引中資料行上限: %u\n"
+
+#: pg_controldata.c:258
+#, c-format
+msgid "Maximum size of a TOAST chunk: %u\n"
+msgstr "TOAST 區塊大小上限: %u\n"
+
+#: pg_controldata.c:260
+#, c-format
+msgid "Date/time type storage: %s\n"
+msgstr "日期/時間儲存類型: %s\n"
+
+#: pg_controldata.c:261
+msgid "64-bit integers"
+msgstr "64位元整數"
+
+#: pg_controldata.c:261
+msgid "floating-point numbers"
+msgstr "浮點數"
+
+#: pg_controldata.c:262
+#, c-format
+msgid "Float4 argument passing: %s\n"
+msgstr "Float4 參數傳遞方式: %s\n"
+
+#: pg_controldata.c:263 pg_controldata.c:265
+msgid "by value"
+msgstr "傳值"
+
+#: pg_controldata.c:263 pg_controldata.c:265
+msgid "by reference"
+msgstr "傳址"
+
+#: pg_controldata.c:264
+#, c-format
+msgid "Float8 argument passing: %s\n"
+msgstr "Float8 參數傳遞方式: %s\n"
+
+#~ msgid "Maximum number of function arguments: %u\n"
+#~ msgstr "函式參數的最大個數: %u\n"
diff --git a/src/bin/pg_ctl/.gitignore b/src/bin/pg_ctl/.gitignore
new file mode 100644
index 0000000000..c90c1030ef
--- /dev/null
+++ b/src/bin/pg_ctl/.gitignore
@@ -0,0 +1 @@
+/pg_ctl
diff --git a/src/bin/pg_ctl/Makefile b/src/bin/pg_ctl/Makefile
index 6bd63995e6..00fc682795 100644
--- a/src/bin/pg_ctl/Makefile
+++ b/src/bin/pg_ctl/Makefile
@@ -2,10 +2,10 @@
#
# Makefile for src/bin/pg_ctl
#
-# Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
+# Portions Copyright (c) 1996-2011, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California
#
-# $PostgreSQL: pgsql/src/bin/pg_ctl/Makefile,v 1.30 2010/07/05 18:54:38 tgl Exp $
+# src/bin/pg_ctl/Makefile
#
#-------------------------------------------------------------------------
@@ -20,9 +20,9 @@ override CPPFLAGS := -DDEF_PGPORT=$(DEF_PGPORT) -I$(libpq_srcdir) $(CPPFLAGS)
OBJS= pg_ctl.o $(WIN32RES)
-all: submake-libpq submake-libpgport pg_ctl
+all: pg_ctl
-pg_ctl: $(OBJS) $(libpq_builddir)/libpq.a
+pg_ctl: $(OBJS) | submake-libpq submake-libpgport
$(CC) $(CFLAGS) $(OBJS) $(libpq_pgport) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
install: all installdirs
diff --git a/src/bin/pg_ctl/nls.mk b/src/bin/pg_ctl/nls.mk
index 2f52d24a8f..29f8a59c60 100644
--- 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.20 2010/05/13 15:56:37 petere Exp $
+# src/bin/pg_ctl/nls.mk
CATALOG_NAME := pg_ctl
-AVAIL_LANGUAGES := de es fr it ja ko pt_BR ru sv ta tr zh_CN
+AVAIL_LANGUAGES := de es fr it ja ko pt_BR ru sv ta tr zh_CN zh_TW
GETTEXT_FILES := pg_ctl.c ../../port/exec.c
GETTEXT_TRIGGERS:= _ simple_prompt
diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
index 860a677411..0a4b709aee 100644
--- a/src/bin/pg_ctl/pg_ctl.c
+++ b/src/bin/pg_ctl/pg_ctl.c
@@ -2,10 +2,10 @@
*
* pg_ctl --- start/stops/restarts the PostgreSQL server
*
- * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2011, PostgreSQL Global Development Group
* Portions Copyright (c) 2010-2011 Nippon Telegraph and Telephone Corporation
*
- * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.122 2010/04/07 03:48:51 itagaki Exp $
+ * src/bin/pg_ctl/pg_ctl.c
*
*-------------------------------------------------------------------------
*/
@@ -23,6 +23,7 @@
#include <locale.h>
#include <signal.h>
+#include <time.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
@@ -64,6 +65,7 @@ typedef enum
STOP_COMMAND,
RELOAD_COMMAND,
STATUS_COMMAND,
+ PROMOTE_COMMAND,
KILL_COMMAND,
REGISTER_COMMAND,
UNREGISTER_COMMAND,
@@ -90,6 +92,25 @@ static char *register_username = NULL;
static char *register_password = NULL;
static char *argv0 = NULL;
static bool allow_core_files = false;
+static time_t start_time;
+
+static char postopts_file[MAXPGPATH];
+static char pid_file[MAXPGPATH];
+static char backup_file[MAXPGPATH];
+static char recovery_file[MAXPGPATH];
+static char promote_file[MAXPGPATH];
+
+#if defined(WIN32) || defined(__CYGWIN__)
+static DWORD pgctl_start_type = SERVICE_AUTO_START;
+static SERVICE_STATUS status;
+static SERVICE_STATUS_HANDLE hStatus = (SERVICE_STATUS_HANDLE) 0;
+static HANDLE shutdownHandles[2];
+static pid_t postmasterPID = -1;
+
+#define shutdownEvent shutdownHandles[0]
+#define postmasterProcess shutdownHandles[1]
+#endif
+
#ifdef PGXC
static char *pgxcCommand = NULL;
#endif
@@ -98,7 +119,7 @@ static void
write_stderr(const char *fmt,...)
/* This extension allows gcc to check the format string for consistency with
the supplied arguments. */
-__attribute__((format(printf, 1, 2)));
+__attribute__((format(PG_PRINTF_ATTRIBUTE, 1, 2)));
static void *pg_malloc(size_t size);
static char *xstrdup(const char *s);
static void do_advice(void);
@@ -111,6 +132,7 @@ static void do_stop(void);
static void do_restart(void);
static void do_reload(void);
static void do_status(void);
+static void do_promote(void);
static void do_kill(pgpid_t pid);
static void print_msg(const char *msg);
@@ -124,14 +146,6 @@ static void WINAPI pgwin32_ServiceHandler(DWORD);
static void WINAPI pgwin32_ServiceMain(DWORD, LPTSTR *);
static void pgwin32_doRunAsService(void);
static int CreateRestrictedProcess(char *cmd, PROCESS_INFORMATION *processInfo, bool as_service);
-
-static SERVICE_STATUS status;
-static SERVICE_STATUS_HANDLE hStatus = (SERVICE_STATUS_HANDLE) 0;
-static HANDLE shutdownHandles[2];
-static pid_t postmasterPID = -1;
-
-#define shutdownEvent shutdownHandles[0]
-#define postmasterProcess shutdownHandles[1]
#endif
static pgpid_t get_pgpid(void);
@@ -139,14 +153,9 @@ static char **readfile(const char *path);
static int start_postmaster(void);
static void read_post_opts(void);
-static bool test_postmaster_connection(bool);
+static PGPing test_postmaster_connection(bool);
static bool postmaster_is_alive(pid_t pid);
-static char postopts_file[MAXPGPATH];
-static char pid_file[MAXPGPATH];
-static char conf_file[MAXPGPATH];
-static char backup_file[MAXPGPATH];
-
#if defined(HAVE_GETRLIMIT) && defined(RLIMIT_CORE)
static void unlimit_core_size(void);
#endif
@@ -158,6 +167,9 @@ write_eventlog(int level, const char *line)
{
static HANDLE evtHandle = INVALID_HANDLE_VALUE;
+ if (silent_mode && level == EVENTLOG_INFORMATION_TYPE)
+ return;
+
if (evtHandle == INVALID_HANDLE_VALUE)
{
evtHandle = RegisterEventSource(NULL, "PostgreSQL");
@@ -361,6 +373,10 @@ start_postmaster(void)
/*
* Since there might be quotes to handle here, it is easier simply to pass
* everything to a shell to process them.
+ *
+ * XXX it would be better to fork and exec so that we would know the child
+ * postmaster's PID directly; then test_postmaster_connection could use
+ * the PID without having to rely on reading it back from the pidfile.
*/
if (log_file != NULL)
#ifdef PGXC
@@ -410,153 +426,218 @@ start_postmaster(void)
/*
* Find the pgport and try a connection
+ *
* Note that the checkpoint parameter enables a Windows service control
* manager checkpoint, it's got nothing to do with database checkpoints!!
*/
-static bool
+static PGPing
test_postmaster_connection(bool do_checkpoint)
{
- PGconn *conn;
- bool success = false;
+ PGPing ret = PQPING_NO_RESPONSE;
+ bool found_stale_pidfile = false;
+ pgpid_t pm_pid = 0;
+ char connstr[MAXPGPATH * 2 + 256];
int i;
- char portstr[32];
- char *p;
- char *q;
- char connstr[128]; /* Should be way more than enough! */
- *portstr = '\0';
+ /* if requested wait time is zero, return "still starting up" code */
+ if (wait_seconds <= 0)
+ return PQPING_REJECT;
- /*
- * Look in post_opts for a -p switch.
- *
- * This parsing code is not amazingly bright; it could for instance get
- * fooled if ' -p' occurs within a quoted argument value. Given that few
- * people pass complicated settings in post_opts, it's probably good
- * enough.
- */
- for (p = post_opts; *p;)
- {
- /* advance past whitespace */
- while (isspace((unsigned char) *p))
- p++;
+ connstr[0] = '\0';
- if (strncmp(p, "-p", 2) == 0)
- {
- p += 2;
- /* advance past any whitespace/quoting */
- while (isspace((unsigned char) *p) || *p == '\'' || *p == '"')
- p++;
- /* find end of value (not including any ending quote!) */
- q = p;
- while (*q &&
- !(isspace((unsigned char) *q) || *q == '\'' || *q == '"'))
- q++;
- /* and save the argument value */
- strlcpy(portstr, p, Min((q - p) + 1, sizeof(portstr)));
- /* keep looking, maybe there is another -p */
- p = q;
- }
- /* Advance to next whitespace */
- while (*p && !isspace((unsigned char) *p))
- p++;
- }
-
- /*
- * Search config file for a 'port' option.
- *
- * This parsing code isn't amazingly bright either, but it should be okay
- * for valid port settings.
- */
- if (!*portstr)
+ for (i = 0; i < wait_seconds; i++)
{
- char **optlines;
-
- optlines = readfile(conf_file);
- if (optlines != NULL)
+ /* Do we need a connection string? */
+ if (connstr[0] == '\0')
{
- for (; *optlines != NULL; optlines++)
+ /*----------
+ * The number of lines in postmaster.pid tells us several things:
+ *
+ * # of lines
+ * 0 lock file created but status not written
+ * 2 pre-9.1 server, shared memory not created
+ * 3 pre-9.1 server, shared memory created
+ * 5 9.1+ server, ports not opened
+ * 6 9.1+ server, shared memory not created
+ * 7 9.1+ server, shared memory created
+ *
+ * This code does not support pre-9.1 servers. On Unix machines
+ * we could consider extracting the port number from the shmem
+ * key, but that (a) is not robust, and (b) doesn't help with
+ * finding out the socket directory. And it wouldn't work anyway
+ * on Windows.
+ *
+ * If we see less than 6 lines in postmaster.pid, just keep
+ * waiting.
+ *----------
+ */
+ char **optlines;
+
+ /* Try to read the postmaster.pid file */
+ if ((optlines = readfile(pid_file)) != NULL &&
+ optlines[0] != NULL &&
+ optlines[1] != NULL &&
+ optlines[2] != NULL)
{
- p = *optlines;
-
- while (isspace((unsigned char) *p))
- p++;
- if (strncmp(p, "port", 4) != 0)
- continue;
- p += 4;
- while (isspace((unsigned char) *p))
- p++;
- if (*p != '=')
- continue;
- p++;
- /* advance past any whitespace/quoting */
- while (isspace((unsigned char) *p) || *p == '\'' || *p == '"')
- p++;
- /* find end of value (not including any ending quote/comment!) */
- q = p;
- while (*q &&
- !(isspace((unsigned char) *q) ||
- *q == '\'' || *q == '"' || *q == '#'))
- q++;
- /* and save the argument value */
- strlcpy(portstr, p, Min((q - p) + 1, sizeof(portstr)));
- /* keep looking, maybe there is another */
- }
- }
- }
+ if (optlines[3] == NULL)
+ {
+ /* File is exactly three lines, must be pre-9.1 */
+ write_stderr(_("\n%s: -w option is not supported when starting a pre-9.1 server\n"),
+ progname);
+ return PQPING_NO_ATTEMPT;
+ }
+ else if (optlines[4] != NULL &&
+ optlines[5] != NULL)
+ {
+ /* File is complete enough for us, parse it */
+ long pmpid;
+ time_t pmstart;
+
+ /*
+ * Make sanity checks. If it's for a standalone backend
+ * (negative PID), or the recorded start time is before
+ * pg_ctl started, then either we are looking at the wrong
+ * data directory, or this is a pre-existing pidfile that
+ * hasn't (yet?) been overwritten by our child postmaster.
+ * Allow 2 seconds slop for possible cross-process clock
+ * skew.
+ */
+ pmpid = atol(optlines[LOCK_FILE_LINE_PID - 1]);
+ pmstart = atol(optlines[LOCK_FILE_LINE_START_TIME - 1]);
+ if (pmpid <= 0 || pmstart < start_time - 2)
+ {
+ /*
+ * Set flag to report stale pidfile if it doesn't get
+ * overwritten before we give up waiting.
+ */
+ found_stale_pidfile = true;
+ }
+ else
+ {
+ /*
+ * OK, seems to be a valid pidfile from our child.
+ */
+ int portnum;
+ char *sockdir;
+ char *hostaddr;
+ char host_str[MAXPGPATH];
- /* Check environment */
- if (!*portstr && getenv("PGPORT") != NULL)
- strlcpy(portstr, getenv("PGPORT"), sizeof(portstr));
+ found_stale_pidfile = false;
+ pm_pid = (pgpid_t) pmpid;
- /* Else use compiled-in default */
- if (!*portstr)
- snprintf(portstr, sizeof(portstr), "%d", DEF_PGPORT);
+ /*
+ * Extract port number and host string to use. Prefer
+ * using Unix socket if available.
+ */
+ portnum = atoi(optlines[LOCK_FILE_LINE_PORT - 1]);
+ sockdir = optlines[LOCK_FILE_LINE_SOCKET_DIR - 1];
+ hostaddr = optlines[LOCK_FILE_LINE_LISTEN_ADDR - 1];
- /*
- * We need to set a connect timeout otherwise on Windows the SCM will
- * probably timeout first
- */
- snprintf(connstr, sizeof(connstr),
- "dbname=postgres port=%s connect_timeout=5", portstr);
+ /*
+ * While unix_socket_directory can accept relative
+ * directories, libpq's host parameter must have a
+ * leading slash to indicate a socket directory. So,
+ * ignore sockdir if it's relative, and try to use TCP
+ * instead.
+ */
+ if (sockdir[0] == '/')
+ strlcpy(host_str, sockdir, sizeof(host_str));
+ else
+ strlcpy(host_str, hostaddr, sizeof(host_str));
- for (i = 0; i < wait_seconds; i++)
- {
- if ((conn = PQconnectdb(connstr)) != NULL &&
- (PQstatus(conn) == CONNECTION_OK ||
- PQconnectionNeedsPassword(conn)))
+ /* remove trailing newline */
+ if (strchr(host_str, '\n') != NULL)
+ *strchr(host_str, '\n') = '\0';
+
+ /* Fail if couldn't get either sockdir or host addr */
+ if (host_str[0] == '\0')
+ {
+ write_stderr(_("\n%s: -w option cannot use a relative socket directory specification\n"),
+ progname);
+ return PQPING_NO_ATTEMPT;
+ }
+
+ /* If postmaster is listening on "*", use localhost */
+ if (strcmp(host_str, "*") == 0)
+ strcpy(host_str, "localhost");
+
+ /*
+ * We need to set connect_timeout otherwise on Windows
+ * the Service Control Manager (SCM) will probably
+ * timeout first.
+ */
+ snprintf(connstr, sizeof(connstr),
+ "dbname=postgres port=%d host='%s' connect_timeout=5",
+ portnum, host_str);
+ }
+ }
+ }
+ }
+
+ /* If we have a connection string, ping the server */
+ if (connstr[0] != '\0')
{
- PQfinish(conn);
- success = true;
- break;
+ ret = PQping(connstr);
+ if (ret == PQPING_OK || ret == PQPING_NO_ATTEMPT)
+ break;
}
- else
+
+ /*
+ * The postmaster should create postmaster.pid very soon after being
+ * started. If it's not there after we've waited 5 or more seconds,
+ * assume startup failed and give up waiting. (Note this covers both
+ * cases where the pidfile was never created, and where it was created
+ * and then removed during postmaster exit.) Also, if there *is* a
+ * file there but it appears stale, issue a suitable warning and give
+ * up waiting.
+ */
+ if (i >= 5)
{
- PQfinish(conn);
+ struct stat statbuf;
-#if defined(WIN32)
- if (do_checkpoint)
+ if (stat(pid_file, &statbuf) != 0)
+ return PQPING_NO_RESPONSE;
+
+ if (found_stale_pidfile)
{
- /*
- * Increment the wait hint by 6 secs (connection timeout +
- * sleep) We must do this to indicate to the SCM that our
- * startup time is changing, otherwise it'll usually send a
- * stop signal after 20 seconds, despite incrementing the
- * checkpoint counter.
- */
- status.dwWaitHint += 6000;
- status.dwCheckPoint++;
- SetServiceStatus(hStatus, (LPSERVICE_STATUS) &status);
+ write_stderr(_("\n%s: this data directory appears to be running a pre-existing postmaster\n"),
+ progname);
+ return PQPING_NO_RESPONSE;
}
+ }
- else
-#endif
- print_msg(".");
+ /*
+ * If we've been able to identify the child postmaster's PID, check
+ * the process is still alive. This covers cases where the postmaster
+ * successfully created the pidfile but then crashed without removing
+ * it.
+ */
+ if (pm_pid > 0 && !postmaster_is_alive((pid_t) pm_pid))
+ return PQPING_NO_RESPONSE;
- pg_usleep(1000000); /* 1 sec */
+ /* No response, or startup still in process; wait */
+#if defined(WIN32)
+ if (do_checkpoint)
+ {
+ /*
+ * Increment the wait hint by 6 secs (connection timeout + sleep)
+ * We must do this to indicate to the SCM that our startup time is
+ * changing, otherwise it'll usually send a stop signal after 20
+ * seconds, despite incrementing the checkpoint counter.
+ */
+ status.dwWaitHint += 6000;
+ status.dwCheckPoint++;
+ SetServiceStatus(hStatus, (LPSERVICE_STATUS) &status);
}
+ else
+#endif
+ print_msg(".");
+
+ pg_usleep(1000000); /* 1 sec */
}
- return success;
+ /* return result of last call to PQping */
+ return ret;
}
@@ -694,7 +775,6 @@ do_init(void)
static void
do_start(void)
{
- pgpid_t pid;
pgpid_t old_pid = 0;
int exitcode;
@@ -744,34 +824,32 @@ do_start(void)
exit(1);
}
- if (old_pid != 0)
- {
- pg_usleep(1000000);
- pid = get_pgpid();
- if (pid == old_pid)
- {
- write_stderr(_("%s: could not start server\n"
- "Examine the log output.\n"),
- progname);
- exit(1);
- }
- }
-
if (do_wait)
{
print_msg(_("waiting for server to start..."));
- if (test_postmaster_connection(false) == false)
- {
- write_stderr(_("%s: could not start server\n"
- "Examine the log output.\n"),
- progname);
- exit(1);
- }
- else
+ switch (test_postmaster_connection(false))
{
- print_msg(_(" done\n"));
- print_msg(_("server started\n"));
+ case PQPING_OK:
+ print_msg(_(" done\n"));
+ print_msg(_("server started\n"));
+ break;
+ case PQPING_REJECT:
+ print_msg(_(" stopped waiting\n"));
+ print_msg(_("server is still starting up\n"));
+ break;
+ case PQPING_NO_RESPONSE:
+ print_msg(_(" stopped waiting\n"));
+ write_stderr(_("%s: could not start server\n"
+ "Examine the log output.\n"),
+ progname);
+ exit(1);
+ break;
+ case PQPING_NO_ATTEMPT:
+ print_msg(_(" failed\n"));
+ write_stderr(_("%s: could not wait for server because of misconfiguration\n"),
+ progname);
+ exit(1);
}
}
else
@@ -817,7 +895,15 @@ do_stop(void)
}
else
{
- if ((shutdown_mode == SMART_MODE) && (stat(backup_file, &statbuf) == 0))
+ /*
+ * If backup_label exists, an online backup is running. Warn the user
+ * that smart shutdown will wait for it to finish. However, if
+ * recovery.conf is also present, we're recovering from an online
+ * backup instead of performing one.
+ */
+ if (shutdown_mode == SMART_MODE &&
+ stat(backup_file, &statbuf) == 0 &&
+ stat(recovery_file, &statbuf) != 0)
{
print_msg(_("WARNING: online backup mode is active\n"
"Shutdown will not complete until pg_stop_backup() is called.\n\n"));
@@ -841,6 +927,9 @@ do_stop(void)
print_msg(_(" failed\n"));
write_stderr(_("%s: server does not shut down\n"), progname);
+ if (shutdown_mode == SMART_MODE)
+ write_stderr(_("HINT: The \"-m fast\" option immediately disconnects sessions rather than\n"
+ "waiting for session-initiated disconnection.\n"));
exit(1);
}
print_msg(_(" done\n"));
@@ -894,7 +983,15 @@ do_restart(void)
exit(1);
}
- if ((shutdown_mode == SMART_MODE) && (stat(backup_file, &statbuf) == 0))
+ /*
+ * If backup_label exists, an online backup is running. Warn the user
+ * that smart shutdown will wait for it to finish. However, if
+ * recovery.conf is also present, we're recovering from an online
+ * backup instead of performing one.
+ */
+ if (shutdown_mode == SMART_MODE &&
+ stat(backup_file, &statbuf) == 0 &&
+ stat(recovery_file, &statbuf) != 0)
{
print_msg(_("WARNING: online backup mode is active\n"
"Shutdown will not complete until pg_stop_backup() is called.\n\n"));
@@ -920,6 +1017,9 @@ do_restart(void)
print_msg(_(" failed\n"));
write_stderr(_("%s: server does not shut down\n"), progname);
+ if (shutdown_mode == SMART_MODE)
+ write_stderr(_("HINT: The \"-m fast\" option immediately disconnects sessions rather than\n"
+ "waiting for session-initiated disconnection.\n"));
exit(1);
}
@@ -936,7 +1036,6 @@ do_restart(void)
do_start();
}
-
static void
do_reload(void)
{
@@ -969,6 +1068,72 @@ do_reload(void)
print_msg(_("server signaled\n"));
}
+
+/*
+ * promote
+ */
+
+static void
+do_promote(void)
+{
+ FILE *prmfile;
+ pgpid_t pid;
+ struct stat statbuf;
+
+ pid = get_pgpid();
+
+ if (pid == 0) /* no pid file */
+ {
+ write_stderr(_("%s: PID file \"%s\" does not exist\n"), progname, pid_file);
+ write_stderr(_("Is server running?\n"));
+ exit(1);
+ }
+ else if (pid < 0) /* standalone backend, not postmaster */
+ {
+ pid = -pid;
+ write_stderr(_("%s: cannot promote server; "
+ "single-user server is running (PID: %ld)\n"),
+ progname, pid);
+ exit(1);
+ }
+
+ /* If recovery.conf doesn't exist, the server is not in standby mode */
+ if (stat(recovery_file, &statbuf) != 0)
+ {
+ write_stderr(_("%s: cannot promote server; "
+ "server is not in standby mode\n"),
+ progname);
+ exit(1);
+ }
+
+ if ((prmfile = fopen(promote_file, "w")) == NULL)
+ {
+ write_stderr(_("%s: could not create promote signal file \"%s\": %s\n"),
+ progname, promote_file, strerror(errno));
+ exit(1);
+ }
+ if (fclose(prmfile))
+ {
+ write_stderr(_("%s: could not write promote signal file \"%s\": %s\n"),
+ progname, promote_file, strerror(errno));
+ exit(1);
+ }
+
+ sig = SIGUSR1;
+ if (kill((pid_t) pid, sig) != 0)
+ {
+ write_stderr(_("%s: could not send promote signal (PID: %ld): %s\n"),
+ progname, pid, strerror(errno));
+ if (unlink(promote_file) != 0)
+ write_stderr(_("%s: could not remove promote signal file \"%s\": %s\n"),
+ progname, promote_file, strerror(errno));
+ exit(1);
+ }
+
+ print_msg(_("server promoting\n"));
+}
+
+
/*
* utility routines
*/
@@ -1129,6 +1294,9 @@ pgwin32_CommandLine(bool registration)
/* concatenate */
sprintf(cmdLine + strlen(cmdLine), " -t %d", wait_seconds);
+ if (registration && silent_mode)
+ strcat(cmdLine, " -s");
+
if (post_opts)
{
strcat(cmdLine, " ");
@@ -1162,7 +1330,7 @@ pgwin32_doRegister(void)
if ((hService = CreateService(hSCM, register_servicename, register_servicename,
SERVICE_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS,
- SERVICE_AUTO_START, SERVICE_ERROR_NORMAL,
+ pgctl_start_type, SERVICE_ERROR_NORMAL,
pgwin32_CommandLine(true),
NULL, NULL, "RPCSS\0", register_username, register_password)) == NULL)
{
@@ -1289,9 +1457,9 @@ pgwin32_ServiceMain(DWORD argc, LPTSTR *argv)
if (do_wait)
{
write_eventlog(EVENTLOG_INFORMATION_TYPE, _("Waiting for server startup...\n"));
- if (test_postmaster_connection(true) == false)
+ if (test_postmaster_connection(true) != PQPING_OK)
{
- write_eventlog(EVENTLOG_INFORMATION_TYPE, _("Timed out waiting for server startup\n"));
+ write_eventlog(EVENTLOG_ERROR_TYPE, _("Timed out waiting for server startup\n"));
pgwin32_SetServiceStatus(SERVICE_STOPPED);
return;
}
@@ -1364,8 +1532,10 @@ typedef BOOL (WINAPI * __SetInformationJobObject) (HANDLE, JOBOBJECTINFOCLASS, L
typedef BOOL (WINAPI * __AssignProcessToJobObject) (HANDLE, HANDLE);
typedef BOOL (WINAPI * __QueryInformationJobObject) (HANDLE, JOBOBJECTINFOCLASS, LPVOID, DWORD, LPDWORD);
-/* Windows API define missing from MingW headers */
+/* Windows API define missing from some versions of MingW headers */
+#ifndef DISABLE_MAX_PRIVILEGE
#define DISABLE_MAX_PRIVILEGE 0x1
+#endif
/*
* Create a restricted token, a job object sandbox, and execute the specified
@@ -1588,8 +1758,7 @@ do_advice(void)
static void
do_help(void)
{
- printf(_("%s is a utility to start, stop, restart, reload configuration files,\n"
- "report the status of a PostgreSQL server, or signal a PostgreSQL process.\n\n"), progname);
+ printf(_("%s is a utility to initialize, start, stop, or control a PostgreSQL server.\n\n"), progname);
printf(_("Usage:\n"));
printf(_(" %s init[db] [-D DATADIR] [-s] [-o \"OPTIONS\"]\n"), progname);
#ifdef PGXC
@@ -1604,10 +1773,11 @@ do_help(void)
printf(_(" %s stop [-W] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"), progname);
printf(_(" %s reload [-D DATADIR] [-s]\n"), progname);
printf(_(" %s status [-D DATADIR]\n"), progname);
+ printf(_(" %s promote [-D DATADIR] [-s]\n"), progname);
printf(_(" %s kill SIGNALNAME PID\n"), progname);
#if defined(WIN32) || defined(__CYGWIN__)
printf(_(" %s register [-N SERVICENAME] [-U USERNAME] [-P PASSWORD] [-D DATADIR]\n"
- " [-w] [-t SECS] [-o \"OPTIONS\"]\n"), progname);
+ " [-S START-TYPE] [-w] [-t SECS] [-o \"OPTIONS\"]\n"), progname);
printf(_(" %s unregister [-N SERVICENAME]\n"), progname);
#endif
@@ -1616,7 +1786,7 @@ do_help(void)
printf(_(" -s, --silent only print errors, no informational messages\n"));
printf(_(" -t SECS seconds to wait when using -w option\n"));
#ifdef PGXC
- printf(_(" -S NODE-TYPE can be \"coordinator\" or \"datanode\" (Postgres-XC)\n"));
+ printf(_(" -Z NODE-TYPE can be \"coordinator\" or \"datanode\" (Postgres-XC)\n"));
#endif
printf(_(" -w wait until operation completes\n"));
printf(_(" -W do not wait until operation completes\n"));
@@ -1651,6 +1821,11 @@ do_help(void)
printf(_(" -N SERVICENAME service name with which to register PostgreSQL server\n"));
printf(_(" -P PASSWORD password of account to register PostgreSQL server\n"));
printf(_(" -U USERNAME user name of account to register PostgreSQL server\n"));
+ printf(_(" -S START-TYPE service start type to register PostgreSQL server\n"));
+
+ printf(_("\nStart types are:\n"));
+ printf(_(" auto start service automatically during system startup (default)\n"));
+ printf(_(" demand start service on demand\n"));
#endif
printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));
@@ -1715,10 +1890,26 @@ set_sig(char *signame)
do_advice();
exit(1);
}
-
}
+#if defined(WIN32) || defined(__CYGWIN__)
+static void
+set_starttype(char *starttypeopt)
+{
+ if (strcmp(starttypeopt, "a") == 0 || strcmp(starttypeopt, "auto") == 0)
+ pgctl_start_type = SERVICE_AUTO_START;
+ else if (strcmp(starttypeopt, "d") == 0 || strcmp(starttypeopt, "demand") == 0)
+ pgctl_start_type = SERVICE_DEMAND_START;
+ else
+ {
+ write_stderr(_("%s: unrecognized start type \"%s\"\n"), progname, starttypeopt);
+ do_advice();
+ exit(1);
+ }
+}
+#endif
+
int
main(int argc, char **argv)
@@ -1745,6 +1936,7 @@ main(int argc, char **argv)
progname = get_progname(argv[0]);
set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("pg_ctl"));
+ start_time = time(NULL);
/*
* save argv[0] so do_start() can look for the postmaster if necessary. we
@@ -1752,7 +1944,7 @@ main(int argc, char **argv)
*/
argv0 = argv[0];
- umask(077);
+ umask(S_IRWXG | S_IRWXO);
/* support --help and --version even if invoked as root */
if (argc > 1)
@@ -1797,9 +1989,9 @@ main(int argc, char **argv)
while (optind < argc)
{
#ifdef PGXC
- while ((c = getopt_long(argc, argv, "cD:l:m:N:o:p:P:S:st:U:wW", long_options, &option_index)) != -1)
+ while ((c = getopt_long(argc, argv, "cD:l:m:N:o:p:P:sS:t:U:wWZ:", long_options, &option_index)) != -1)
#else
- while ((c = getopt_long(argc, argv, "cD:l:m:N:o:p:P:st:U:wW", long_options, &option_index)) != -1)
+ while ((c = getopt_long(argc, argv, "cD:l:m:N:o:p:P:sS:t:U:wW", long_options, &option_index)) != -1)
#endif
{
switch (c)
@@ -1845,7 +2037,7 @@ main(int argc, char **argv)
register_password = xstrdup(optarg);
break;
#ifdef PGXC
- case 'S':
+ case 'Z':
if (strcmp(optarg, "coordinator") == 0)
pgxcCommand = strdup("-C");
else if (strcmp(optarg, "datanode") == 0)
@@ -1854,6 +2046,15 @@ main(int argc, char **argv)
case 's':
silent_mode = true;
break;
+ case 'S':
+#if defined(WIN32) || defined(__CYGWIN__)
+ set_starttype(optarg);
+#else
+ write_stderr(_("%s: -S option not supported on this platform\n"),
+ progname);
+ exit(1);
+#endif
+ break;
case 't':
wait_seconds = atoi(optarg);
break;
@@ -1914,6 +2115,8 @@ main(int argc, char **argv)
ctl_command = RELOAD_COMMAND;
else if (strcmp(argv[optind], "status") == 0)
ctl_command = STATUS_COMMAND;
+ else if (strcmp(argv[optind], "promote") == 0)
+ ctl_command = PROMOTE_COMMAND;
else if (strcmp(argv[optind], "kill") == 0)
{
if (argc - optind < 3)
@@ -1956,7 +2159,7 @@ main(int argc, char **argv)
if ((ctl_command == START_COMMAND || ctl_command == RESTART_COMMAND)
&& !pgxcCommand)
{
- write_stderr(_("%s: coordinator or datanode option not specified (-S)\n"),
+ write_stderr(_("%s: coordinator or datanode option not specified (-Z)\n"),
progname);
do_advice();
exit(1);
@@ -1974,8 +2177,7 @@ main(int argc, char **argv)
if (pg_data == NULL &&
ctl_command != KILL_COMMAND && ctl_command != UNREGISTER_COMMAND)
{
- write_stderr(_("%s: no database directory specified "
- "and environment variable PGDATA unset\n"),
+ write_stderr(_("%s: no database directory specified and environment variable PGDATA unset\n"),
progname);
do_advice();
exit(1);
@@ -2007,8 +2209,9 @@ main(int argc, char **argv)
{
snprintf(postopts_file, MAXPGPATH, "%s/postmaster.opts", pg_data);
snprintf(pid_file, MAXPGPATH, "%s/postmaster.pid", pg_data);
- snprintf(conf_file, MAXPGPATH, "%s/postgresql.conf", pg_data);
snprintf(backup_file, MAXPGPATH, "%s/backup_label", pg_data);
+ snprintf(recovery_file, MAXPGPATH, "%s/recovery.conf", pg_data);
+ snprintf(promote_file, MAXPGPATH, "%s/promote", pg_data);
}
switch (ctl_command)
@@ -2031,6 +2234,9 @@ main(int argc, char **argv)
case RELOAD_COMMAND:
do_reload();
break;
+ case PROMOTE_COMMAND:
+ do_promote();
+ break;
case KILL_COMMAND:
do_kill(killproc);
break;
diff --git a/src/bin/pg_ctl/po/de.po b/src/bin/pg_ctl/po/de.po
index df3df83b48..02e4ad6e78 100644
--- a/src/bin/pg_ctl/po/de.po
+++ b/src/bin/pg_ctl/po/de.po
@@ -1,55 +1,77 @@
# German message translation file for pg_ctl
-# Peter Eisentraut <peter_e@gmx.net>, 2004 - 2010.
+# Peter Eisentraut <peter_e@gmx.net>, 2004 - 2011.
#
-# pgtranslation Id: pg_ctl.po,v 1.12 2010/02/18 19:01:40 petere Exp $
+# pgtranslation Id: pg_ctl.po,v 1.14 2011/06/08 21:26:42 petere Exp $
#
# Use these quotes: »%s«
#
msgid ""
msgstr ""
-"Project-Id-Version: PostgreSQL 9.0\n"
+"Project-Id-Version: PostgreSQL 9.1\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-02-18 13:21+0000\n"
-"PO-Revision-Date: 2010-02-18 20:53+0200\n"
+"POT-Creation-Date: 2011-06-08 18:40+0000\n"
+"PO-Revision-Date: 2011-06-09 00:24+0300\n"
"Last-Translator: Peter Eisentraut <peter_e@gmx.net>\n"
"Language-Team: Peter Eisentraut <peter_e@gmx.net>\n"
+"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: pg_ctl.c:225 pg_ctl.c:240 pg_ctl.c:1828
+#: pg_ctl.c:234 pg_ctl.c:249 pg_ctl.c:2029
#, c-format
msgid "%s: out of memory\n"
msgstr "%s: Speicher aufgebraucht\n"
-#: pg_ctl.c:274
+#: pg_ctl.c:283
#, c-format
msgid "%s: could not open PID file \"%s\": %s\n"
msgstr "%s: konnte PID-Datei »%s« nicht öffnen: %s\n"
-#: pg_ctl.c:281
+#: pg_ctl.c:290
#, c-format
msgid "%s: invalid data in PID file \"%s\"\n"
msgstr "%s: ungültige Daten in PID-Datei »%s«\n"
-#: pg_ctl.c:557
+#: pg_ctl.c:467
+#, c-format
+msgid ""
+"\n"
+"%s: -w option is not supported when starting a pre-9.1 server\n"
+msgstr "\n%s: Option -w wird nicht unterstützt beim Starten eines Servers vor Version 9.1\n"
+
+#: pg_ctl.c:537
+#, c-format
+msgid ""
+"\n"
+"%s: -w option cannot use a relative socket directory specification\n"
+msgstr "\n%s: Option -w kann keine relative Angabe des Socket-Verzeichnisses verwenden\n"
+
+#: pg_ctl.c:585
+#, c-format
+msgid ""
+"\n"
+"%s: this data directory appears to be running a pre-existing postmaster\n"
+msgstr "\n%s: in diesem Datenverzeichnis läuft anscheinend bereits in Postmaster\n"
+
+#: pg_ctl.c:635
#, c-format
msgid "%s: cannot set core file size limit; disallowed by hard limit\n"
msgstr ""
"%s: kann Grenzwert für Core-Datei-Größe nicht setzen; durch harten Grenzwert "
"verboten\n"
-#: pg_ctl.c:582
+#: pg_ctl.c:660
#, c-format
msgid "%s: could not read file \"%s\"\n"
msgstr "%s: konnte Datei »%s« nicht lesen\n"
-#: pg_ctl.c:587
+#: pg_ctl.c:665
#, c-format
msgid "%s: option file \"%s\" must have exactly one line\n"
msgstr "%s: Optionsdatei »%s« muss genau eine Zeile haben\n"
-#: pg_ctl.c:635
+#: pg_ctl.c:713
#, c-format
msgid ""
"The program \"%s\" is needed by %s but was not found in the\n"
@@ -60,7 +82,7 @@ msgstr ""
"selben Verzeichnis wie »%s« gefunden.\n"
"Prüfen Sie Ihre Installation.\n"
-#: pg_ctl.c:641
+#: pg_ctl.c:719
#, c-format
msgid ""
"The program \"%s\" was found by \"%s\"\n"
@@ -71,23 +93,43 @@ msgstr ""
"aber es hatte nicht die gleiche Version wie %s.\n"
"Prüfen Sie Ihre Installation.\n"
-#: pg_ctl.c:674
+#: pg_ctl.c:752
#, c-format
msgid "%s: database system initialization failed\n"
msgstr "%s: Initialisierung des Datenbanksystems fehlgeschlagen\n"
-#: pg_ctl.c:690
+#: pg_ctl.c:767
#, c-format
msgid "%s: another server might be running; trying to start server anyway\n"
msgstr ""
"%s: ein anderer Server läuft möglicherweise; versuche trotzdem zu starten\n"
-#: pg_ctl.c:727
+#: pg_ctl.c:804
#, c-format
msgid "%s: could not start server: exit code was %d\n"
msgstr "%s: konnte Server nicht starten: Exitcode war %d\n"
-#: pg_ctl.c:738
+#: pg_ctl.c:811
+msgid "waiting for server to start..."
+msgstr "warte auf Start des Servers..."
+
+#: pg_ctl.c:816 pg_ctl.c:917 pg_ctl.c:1008
+msgid " done\n"
+msgstr " fertig\n"
+
+#: pg_ctl.c:817
+msgid "server started\n"
+msgstr "Server gestartet\n"
+
+#: pg_ctl.c:820 pg_ctl.c:824
+msgid " stopped waiting\n"
+msgstr " Warten beendet\n"
+
+#: pg_ctl.c:821
+msgid "server is still starting up\n"
+msgstr "Server startet immer noch\n"
+
+#: pg_ctl.c:825
#, c-format
msgid ""
"%s: could not start server\n"
@@ -96,52 +138,44 @@ msgstr ""
"%s: konnte Server nicht starten\n"
"Prüfen Sie die Logausgabe.\n"
-#: pg_ctl.c:747
-msgid "waiting for server to start..."
-msgstr "warte auf Start des Servers..."
+#: pg_ctl.c:831 pg_ctl.c:909 pg_ctl.c:999
+msgid " failed\n"
+msgstr " Fehler\n"
-#: pg_ctl.c:751
+#: pg_ctl.c:832
#, c-format
-msgid "could not start server\n"
-msgstr "konnte Server nicht starten\n"
-
-#: pg_ctl.c:756 pg_ctl.c:829 pg_ctl.c:909
-msgid " done\n"
-msgstr " fertig\n"
-
-#: pg_ctl.c:757
-msgid "server started\n"
-msgstr "Server gestartet\n"
+msgid "%s: could not wait for server because of misconfiguration\n"
+msgstr "%s: konnte wegen Fehlkonfiguration nicht auf Server warten\n"
-#: pg_ctl.c:761
+#: pg_ctl.c:838
msgid "server starting\n"
msgstr "Server startet\n"
-#: pg_ctl.c:776 pg_ctl.c:851 pg_ctl.c:931
+#: pg_ctl.c:853 pg_ctl.c:939 pg_ctl.c:1029 pg_ctl.c:1069
#, c-format
msgid "%s: PID file \"%s\" does not exist\n"
msgstr "%s: PID-Datei »%s« existiert nicht\n"
-#: pg_ctl.c:777 pg_ctl.c:853 pg_ctl.c:932
+#: pg_ctl.c:854 pg_ctl.c:941 pg_ctl.c:1030 pg_ctl.c:1070
msgid "Is server running?\n"
msgstr "Läuft der Server?\n"
-#: pg_ctl.c:783
+#: pg_ctl.c:860
#, c-format
msgid "%s: cannot stop server; single-user server is running (PID: %ld)\n"
msgstr ""
"%s: kann Server nicht anhalten; Einzelbenutzerserver läuft (PID: %ld)\n"
-#: pg_ctl.c:791 pg_ctl.c:875
+#: pg_ctl.c:868 pg_ctl.c:963
#, c-format
msgid "%s: could not send stop signal (PID: %ld): %s\n"
msgstr "%s: konnte Stopp-Signal nicht senden (PID: %ld): %s\n"
-#: pg_ctl.c:798
+#: pg_ctl.c:875
msgid "server shutting down\n"
msgstr "Server fährt herunter\n"
-#: pg_ctl.c:805 pg_ctl.c:882
+#: pg_ctl.c:890 pg_ctl.c:978
msgid ""
"WARNING: online backup mode is active\n"
"Shutdown will not complete until pg_stop_backup() is called.\n"
@@ -152,166 +186,200 @@ msgstr ""
"aufgerufen wird.\n"
"\n"
-#: pg_ctl.c:809 pg_ctl.c:886
+#: pg_ctl.c:894 pg_ctl.c:982
msgid "waiting for server to shut down..."
msgstr "warte auf Herunterfahren des Servers..."
-#: pg_ctl.c:824 pg_ctl.c:903
-msgid " failed\n"
-msgstr " Fehler\n"
-
-#: pg_ctl.c:826 pg_ctl.c:905
+#: pg_ctl.c:911 pg_ctl.c:1001
#, c-format
msgid "%s: server does not shut down\n"
msgstr "%s: Server fährt nicht herunter\n"
-#: pg_ctl.c:831 pg_ctl.c:910
-#, c-format
+#: pg_ctl.c:913 pg_ctl.c:1003
+msgid ""
+"HINT: The \"-m fast\" option immediately disconnects sessions rather than\n"
+"waiting for session-initiated disconnection.\n"
+msgstr ""
+"TIPP: Die Option »-m fast« beendet Sitzungen sofort, statt auf das Beenden\n"
+"durch die Sitzungen selbst zu warten.\n"
+
+#: pg_ctl.c:919 pg_ctl.c:1009
msgid "server stopped\n"
msgstr "Server angehalten\n"
-#: pg_ctl.c:854 pg_ctl.c:916
+#: pg_ctl.c:942 pg_ctl.c:1015
msgid "starting server anyway\n"
msgstr "starte Server trotzdem\n"
-#: pg_ctl.c:863
+#: pg_ctl.c:951
#, c-format
msgid "%s: cannot restart server; single-user server is running (PID: %ld)\n"
msgstr ""
"%s: kann Server nicht neu starten; Einzelbenutzerserver läuft (PID: %ld)\n"
-#: pg_ctl.c:866 pg_ctl.c:941
+#: pg_ctl.c:954 pg_ctl.c:1039
msgid "Please terminate the single-user server and try again.\n"
msgstr ""
"Bitte beenden Sie den Einzelbenutzerserver und versuchen Sie es noch "
"einmal.\n"
-#: pg_ctl.c:914
+#: pg_ctl.c:1013
#, c-format
msgid "%s: old server process (PID: %ld) seems to be gone\n"
msgstr "%s: alter Serverprozess (PID: %ld) scheint verschwunden zu sein\n"
-#: pg_ctl.c:938
+#: pg_ctl.c:1036
#, c-format
msgid "%s: cannot reload server; single-user server is running (PID: %ld)\n"
msgstr ""
"%s: kann Server nicht neu laden; Einzelbenutzerserver läuft (PID: %ld)\n"
-#: pg_ctl.c:947
+#: pg_ctl.c:1045
#, c-format
msgid "%s: could not send reload signal (PID: %ld): %s\n"
msgstr "%s: konnte Signal zum Neuladen nicht senden (PID: %ld): %s\n"
-#: pg_ctl.c:952
+#: pg_ctl.c:1050
msgid "server signaled\n"
msgstr "Signal an Server gesendet\n"
-#: pg_ctl.c:996
+#: pg_ctl.c:1076
+#, c-format
+msgid "%s: cannot promote server; single-user server is running (PID: %ld)\n"
+msgstr "%s: kann Server nicht befördern; Einzelbenutzerserver läuft (PID: %ld)\n"
+
+#: pg_ctl.c:1085
+#, c-format
+msgid "%s: cannot promote server; server is not in standby mode\n"
+msgstr "%s: kann Server nicht befördern; Server ist nicht im Standby-Modus\n"
+
+#: pg_ctl.c:1093
+#, c-format
+msgid "%s: could not create promote signal file \"%s\": %s\n"
+msgstr "%s: konnte Signaldatei zum Befördern »%s« nicht erzeugen: %s\n"
+
+#: pg_ctl.c:1099
+#, c-format
+msgid "%s: could not write promote signal file \"%s\": %s\n"
+msgstr "%s: konnte Signaldatei zum Befördern »%s« nicht schreiben: %s\n"
+
+#: pg_ctl.c:1107
+#, c-format
+msgid "%s: could not send promote signal (PID: %ld): %s\n"
+msgstr "%s: konnte Signal zum Befördern nicht senden (PID: %ld): %s\n"
+
+#: pg_ctl.c:1110
+#, c-format
+msgid "%s: could not remove promote signal file \"%s\": %s\n"
+msgstr "%s: konnte Signaldatei zum Befördern »%s« nicht entfernen: %s\n"
+
+#: pg_ctl.c:1115
+msgid "server promoting\n"
+msgstr "Server wird befördert\n"
+
+#: pg_ctl.c:1160
#, c-format
msgid "%s: single-user server is running (PID: %ld)\n"
msgstr "%s: Einzelbenutzerserver läuft (PID: %ld)\n"
-#: pg_ctl.c:1008
+#: pg_ctl.c:1172
#, c-format
msgid "%s: server is running (PID: %ld)\n"
msgstr "%s: Server läuft (PID: %ld)\n"
-#: pg_ctl.c:1019
+#: pg_ctl.c:1183
#, c-format
msgid "%s: no server running\n"
msgstr "%s: kein Server läuft\n"
-#: pg_ctl.c:1030
+#: pg_ctl.c:1194
#, c-format
msgid "%s: could not send signal %d (PID: %ld): %s\n"
msgstr "%s: konnte Signal %d nicht senden (PID: %ld): %s\n"
-#: pg_ctl.c:1064
+#: pg_ctl.c:1228
#, c-format
msgid "%s: could not find own program executable\n"
msgstr "%s: konnte eigene Programmdatei nicht finden\n"
-#: pg_ctl.c:1074
+#: pg_ctl.c:1238
#, c-format
msgid "%s: could not find postgres program executable\n"
msgstr "%s: konnte »postgres« Programmdatei nicht finden\n"
-#: pg_ctl.c:1132 pg_ctl.c:1164
+#: pg_ctl.c:1300 pg_ctl.c:1332
#, c-format
msgid "%s: could not open service manager\n"
msgstr "%s: konnte Servicemanager nicht öffnen\n"
-#: pg_ctl.c:1138
+#: pg_ctl.c:1306
#, c-format
msgid "%s: service \"%s\" already registered\n"
-msgstr "%s: Service »%s« bereits registriert\n"
+msgstr "%s: Systemdienst »%s« ist bereits registriert\n"
-#: pg_ctl.c:1149
+#: pg_ctl.c:1317
#, c-format
msgid "%s: could not register service \"%s\": error code %d\n"
-msgstr "%s: konnte Service »%s« nicht registrieren: Fehlercode %d\n"
+msgstr "%s: konnte Systemdienst »%s« nicht registrieren: Fehlercode %d\n"
-#: pg_ctl.c:1170
+#: pg_ctl.c:1338
#, c-format
msgid "%s: service \"%s\" not registered\n"
-msgstr "%s: Service »%s« nicht registriert\n"
+msgstr "%s: Systemdienst »%s« ist nicht registriert\n"
-#: pg_ctl.c:1177
+#: pg_ctl.c:1345
#, c-format
msgid "%s: could not open service \"%s\": error code %d\n"
-msgstr "%s: konnte Service »%s« nicht öffnen: Fehlercode %d\n"
+msgstr "%s: konnte Systemdienst »%s« nicht öffnen: Fehlercode %d\n"
-#: pg_ctl.c:1184
+#: pg_ctl.c:1352
#, c-format
msgid "%s: could not unregister service \"%s\": error code %d\n"
-msgstr "%s: konnte Service »%s« nicht deregistrieren: Fehlercode %d\n"
+msgstr "%s: konnte Systemdienst »%s« nicht deregistrieren: Fehlercode %d\n"
-#: pg_ctl.c:1270
+#: pg_ctl.c:1438
msgid "Waiting for server startup...\n"
msgstr "Warte auf Start des Servers...\n"
-#: pg_ctl.c:1273
+#: pg_ctl.c:1441
msgid "Timed out waiting for server startup\n"
msgstr "Zeitüberschreitung beim Warten auf Start des Servers\n"
-#: pg_ctl.c:1277
+#: pg_ctl.c:1445
msgid "Server started and accepting connections\n"
msgstr "Server wurde gestartet und nimmt Verbindungen an\n"
-#: pg_ctl.c:1327
+#: pg_ctl.c:1495
#, c-format
msgid "%s: could not start service \"%s\": error code %d\n"
-msgstr "%s: konnte Service »%s« nicht starten: Fehlercode %d\n"
+msgstr "%s: konnte Systemdienst »%s« nicht starten: Fehlercode %d\n"
-#: pg_ctl.c:1562
+#: pg_ctl.c:1732
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "Versuchen Sie »%s --help« für weitere Informationen.\n"
-#: pg_ctl.c:1570
+#: pg_ctl.c:1740
#, c-format
msgid ""
-"%s is a utility to start, stop, restart, reload configuration files,\n"
-"report the status of a PostgreSQL server, or signal a PostgreSQL process.\n"
+"%s is a utility to initialize, start, stop, or control a PostgreSQL server.\n"
"\n"
msgstr ""
-"%s ist ein Hilfsprogramm, um einen PostgreSQL-Server zu starten,\n"
-"anzuhalten, neu zu starten, Konfigurationsdateien neu zu laden, den\n"
-"Serverstatus auszugeben oder ein Signal an einen PostgreSQL-Prozess zu\n"
-"senden.\n"
+"%s ist ein Hilfsprogramm, um einen PostgreSQL-Server zu initialisieren, zu\n"
+"starten, anzuhalten oder zu steuern.\n"
"\n"
-#: pg_ctl.c:1572
+#: pg_ctl.c:1741
#, c-format
msgid "Usage:\n"
msgstr "Aufruf:\n"
-#: pg_ctl.c:1573
+#: pg_ctl.c:1742
#, c-format
msgid " %s init[db] [-D DATADIR] [-s] [-o \"OPTIONS\"]\n"
msgstr " %s init[db] [-D DATENVERZ] [-s] [-o \"OPTIONEN\"]\n"
-#: pg_ctl.c:1574
+#: pg_ctl.c:1743
#, c-format
msgid ""
" %s start [-w] [-t SECS] [-D DATADIR] [-s] [-l FILENAME] [-o \"OPTIONS"
@@ -320,12 +388,12 @@ msgstr ""
" %s start [-w] [-t SEK] [-D DATENVERZ] [-s] [-l DATEINAME] [-o \"OPTIONEN"
"\"]\n"
-#: pg_ctl.c:1575
+#: pg_ctl.c:1744
#, c-format
msgid " %s stop [-W] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
msgstr " %s stop [-W] [-t SEK] [-D DATENVERZ] [-s] [-m SHUTDOWN-MODUS]\n"
-#: pg_ctl.c:1576
+#: pg_ctl.c:1745
#, c-format
msgid ""
" %s restart [-w] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
@@ -334,36 +402,42 @@ msgstr ""
" %s restart [-w] [-t SEK] [-D DATENVERZ] [-s] [-m SHUTDOWN-MODUS]\n"
" [-o \"OPTIONEN\"]\n"
-#: pg_ctl.c:1578
+#: pg_ctl.c:1747
#, c-format
msgid " %s reload [-D DATADIR] [-s]\n"
msgstr " %s reload [-D DATENVERZ] [-s]\n"
-#: pg_ctl.c:1579
+#: pg_ctl.c:1748
#, c-format
msgid " %s status [-D DATADIR]\n"
msgstr " %s status [-D DATENVERZ]\n"
-#: pg_ctl.c:1580
+#: pg_ctl.c:1749
+#, c-format
+msgid " %s promote [-D DATADIR] [-s]\n"
+msgstr " %s promote [-D DATENVERZ] [-s]\n"
+
+#: pg_ctl.c:1750
#, c-format
msgid " %s kill SIGNALNAME PID\n"
msgstr " %s kill SIGNALNAME PID\n"
-#: pg_ctl.c:1582
+#: pg_ctl.c:1752
#, c-format
msgid ""
" %s register [-N SERVICENAME] [-U USERNAME] [-P PASSWORD] [-D DATADIR]\n"
-" [-w] [-t SECS] [-o \"OPTIONS\"]\n"
+" [-S START-TYPE] [-w] [-t SECS] [-o \"OPTIONS\"]\n"
msgstr ""
-" %s register [-N SERVICENAME] [-U BENUTZERNAME] [-P PASSWORT]\n"
-" [-D DATENVERZ] [-t SEK] [-w] [-o \"OPTIONEN\"]\n"
+" %s register [-N DIENSTNAME] [-U BENUTZERNAME] [-P PASSWORT] [-D "
+"DATENVERZ]\n"
+" [-S STARTTYP] [-w] [-t SEK] [-o \"OPTIONEN\"]\n"
-#: pg_ctl.c:1584
+#: pg_ctl.c:1754
#, c-format
msgid " %s unregister [-N SERVICENAME]\n"
-msgstr " %s unregister [-N SERVICENAME]\n"
+msgstr " %s unregister [-N DIENSTNAME]\n"
-#: pg_ctl.c:1587
+#: pg_ctl.c:1757
#, c-format
msgid ""
"\n"
@@ -372,44 +446,44 @@ msgstr ""
"\n"
"Optionen für alle Modi:\n"
-#: pg_ctl.c:1588
+#: pg_ctl.c:1758
#, c-format
msgid " -D, --pgdata DATADIR location of the database storage area\n"
msgstr " -D, --pgdata DATENVERZ Datenbankverzeichnis\n"
-#: pg_ctl.c:1589
+#: pg_ctl.c:1759
#, c-format
msgid " -s, --silent only print errors, no informational messages\n"
msgstr ""
" -s, --silent zeige nur Fehler, keine Informationsmeldungen\n"
-#: pg_ctl.c:1590
+#: pg_ctl.c:1760
#, c-format
msgid " -t SECS seconds to wait when using -w option\n"
msgstr " -t SEK Sekunden zu warten bei Option -w\n"
-#: pg_ctl.c:1591
+#: pg_ctl.c:1761
#, c-format
msgid " -w wait until operation completes\n"
msgstr " -w warte bis Operation abgeschlossen ist\n"
-#: pg_ctl.c:1592
+#: pg_ctl.c:1762
#, c-format
msgid " -W do not wait until operation completes\n"
msgstr " -W warte nicht bis Operation abgeschlossen ist\n"
-#: pg_ctl.c:1593
+#: pg_ctl.c:1763
#, c-format
msgid " --help show this help, then exit\n"
msgstr " --help diese Hilfe anzeigen, dann beenden\n"
-#: pg_ctl.c:1594
+#: pg_ctl.c:1764
#, c-format
msgid " --version output version information, then exit\n"
msgstr ""
" --version Versionsinformationen anzeigen, dann beenden\n"
-#: pg_ctl.c:1595
+#: pg_ctl.c:1765
#, c-format
msgid ""
"(The default is to wait for shutdown, but not for start or restart.)\n"
@@ -419,14 +493,14 @@ msgstr ""
"Start oder Neustart.)\n"
"\n"
-#: pg_ctl.c:1596
+#: pg_ctl.c:1766
#, c-format
msgid "If the -D option is omitted, the environment variable PGDATA is used.\n"
msgstr ""
"Wenn die Option -D weggelassen wird, dann wird die Umgebungsvariable\n"
"PGDATA verwendet.\n"
-#: pg_ctl.c:1598
+#: pg_ctl.c:1768
#, c-format
msgid ""
"\n"
@@ -435,24 +509,24 @@ msgstr ""
"\n"
"Optionen für Start oder Neustart:\n"
-#: pg_ctl.c:1600
+#: pg_ctl.c:1770
#, c-format
msgid " -c, --core-files allow postgres to produce core files\n"
msgstr " -c, --core-files erlaubt postgres Core-Dateien zu erzeugen\n"
-#: pg_ctl.c:1602
+#: pg_ctl.c:1772
#, c-format
msgid " -c, --core-files not applicable on this platform\n"
msgstr " -c, --core-files betrifft diese Plattform nicht\n"
-#: pg_ctl.c:1604
+#: pg_ctl.c:1774
#, c-format
msgid " -l, --log FILENAME write (or append) server log to FILENAME\n"
msgstr ""
" -l, --log DATEINAME schreibe Serverlog in DATEINAME (wird an\n"
" bestehende Datei angehängt)\n"
-#: pg_ctl.c:1605
+#: pg_ctl.c:1775
#, c-format
msgid ""
" -o OPTIONS command line options to pass to postgres\n"
@@ -461,12 +535,12 @@ msgstr ""
" -o OPTIONEN Kommandozeilenoptionen für postgres (PostgreSQL-\n"
" Serverprogramm) oder initdb\n"
-#: pg_ctl.c:1607
+#: pg_ctl.c:1777
#, c-format
msgid " -p PATH-TO-POSTGRES normally not necessary\n"
msgstr " -p PFAD-ZU-POSTGRES normalerweise nicht notwendig\n"
-#: pg_ctl.c:1608
+#: pg_ctl.c:1778
#, c-format
msgid ""
"\n"
@@ -475,12 +549,12 @@ msgstr ""
"\n"
"Optionen für Anhalten oder Neustart:\n"
-#: pg_ctl.c:1609
+#: pg_ctl.c:1779
#, c-format
msgid " -m SHUTDOWN-MODE can be \"smart\", \"fast\", or \"immediate\"\n"
msgstr " -m SHUTDOWN-MODUS kann »smart«, »fast« oder »immediate« sein\n"
-#: pg_ctl.c:1611
+#: pg_ctl.c:1781
#, c-format
msgid ""
"\n"
@@ -489,18 +563,18 @@ msgstr ""
"\n"
"Shutdown-Modi sind:\n"
-#: pg_ctl.c:1612
+#: pg_ctl.c:1782
#, c-format
msgid " smart quit after all clients have disconnected\n"
msgstr ""
" smart beende nachdem alle Clientverbindungen geschlossen sind\n"
-#: pg_ctl.c:1613
+#: pg_ctl.c:1783
#, c-format
msgid " fast quit directly, with proper shutdown\n"
msgstr " fast beende direkt, mit richtigem Shutdown\n"
-#: pg_ctl.c:1614
+#: pg_ctl.c:1784
#, c-format
msgid ""
" immediate quit without complete shutdown; will lead to recovery on "
@@ -509,7 +583,7 @@ msgstr ""
" immediate beende ohne vollständigen Shutdown; führt zu Recovery-Lauf\n"
" beim Neustart\n"
-#: pg_ctl.c:1616
+#: pg_ctl.c:1786
#, c-format
msgid ""
"\n"
@@ -518,34 +592,63 @@ msgstr ""
"\n"
"Erlaubte Signalnamen für »kill«:\n"
-#: pg_ctl.c:1620
+#: pg_ctl.c:1790
#, c-format
msgid ""
"\n"
"Options for register and unregister:\n"
msgstr ""
"\n"
-"Optionen für »register« oder »unregister«:\n"
+"Optionen für »register« und »unregister«:\n"
-#: pg_ctl.c:1621
+#: pg_ctl.c:1791
#, c-format
msgid ""
" -N SERVICENAME service name with which to register PostgreSQL server\n"
-msgstr " -N SERVICENAME Servicename um PostgreSQL-Server zu registrieren\n"
+msgstr ""
+" -N DIENSTNAME Systemdienstname für Registrierung des PostgreSQL-Servers\n"
-#: pg_ctl.c:1622
+#: pg_ctl.c:1792
#, c-format
msgid " -P PASSWORD password of account to register PostgreSQL server\n"
msgstr ""
-" -P PASSWORD Passwort des Benutzers um PostgreSQL-Server zu "
-"registrieren\n"
+" -P PASSWORD Passwort des Benutzers für Registrierung des PostgreSQL-"
+"Servers\n"
-#: pg_ctl.c:1623
+#: pg_ctl.c:1793
#, c-format
msgid " -U USERNAME user name of account to register PostgreSQL server\n"
-msgstr " -U USERNAME Benutzername um PostgreSQL-Server zu registrieren\n"
+msgstr ""
+" -U USERNAME Benutzername für Registrierung des PostgreSQL-Servers\n"
-#: pg_ctl.c:1626
+#: pg_ctl.c:1794
+#, c-format
+msgid " -S START-TYPE service start type to register PostgreSQL server\n"
+msgstr " -S STARTTYP Systemdienst-Starttyp für PostgreSQL-Server\n"
+
+#: pg_ctl.c:1796
+#, c-format
+msgid ""
+"\n"
+"Start types are:\n"
+msgstr ""
+"\n"
+"Starttypen sind:\n"
+
+#: pg_ctl.c:1797
+#, c-format
+msgid ""
+" auto start service automatically during system startup (default)\n"
+msgstr ""
+" auto Dienst automatisch starten beim Start des Betriebssystems\n"
+" (Voreinstellung)\n"
+
+#: pg_ctl.c:1798
+#, c-format
+msgid " demand start service on demand\n"
+msgstr " demand Dienst bei Bedarf starten\n"
+
+#: pg_ctl.c:1801
#, c-format
msgid ""
"\n"
@@ -554,17 +657,22 @@ msgstr ""
"\n"
"Berichten Sie Fehler an <pgsql-bugs@postgresql.org>.\n"
-#: pg_ctl.c:1651
+#: pg_ctl.c:1826
#, c-format
msgid "%s: unrecognized shutdown mode \"%s\"\n"
msgstr "%s: unbekannter Shutdown-Modus »%s«\n"
-#: pg_ctl.c:1684
+#: pg_ctl.c:1859
#, c-format
msgid "%s: unrecognized signal name \"%s\"\n"
msgstr "%s: unbekannter Signalname »%s«\n"
-#: pg_ctl.c:1749
+#: pg_ctl.c:1876
+#, c-format
+msgid "%s: unrecognized start type \"%s\"\n"
+msgstr "%s: unbekannter Starttyp »%s«\n"
+
+#: pg_ctl.c:1941
#, c-format
msgid ""
"%s: cannot be run as root\n"
@@ -575,27 +683,32 @@ msgstr ""
"Bitte loggen Sie sich (z.B. mit »su«) als der (unprivilegierte) Benutzer\n"
"ein, der Eigentümer des Serverprozesses sein soll.\n"
-#: pg_ctl.c:1858
+#: pg_ctl.c:2012
+#, c-format
+msgid "%s: -S option not supported on this platform\n"
+msgstr "%s: Option -S wird auf dieser Plattform nicht unterstützt\n"
+
+#: pg_ctl.c:2059
#, c-format
msgid "%s: too many command-line arguments (first is \"%s\")\n"
msgstr "%s: zu viele Kommandozeilenargumente (das erste ist »%s«)\n"
-#: pg_ctl.c:1880
+#: pg_ctl.c:2083
#, c-format
msgid "%s: missing arguments for kill mode\n"
msgstr "%s: fehlende Argumente für »kill«-Modus\n"
-#: pg_ctl.c:1898
+#: pg_ctl.c:2101
#, c-format
msgid "%s: unrecognized operation mode \"%s\"\n"
msgstr "%s: unbekannter Operationsmodus »%s«\n"
-#: pg_ctl.c:1908
+#: pg_ctl.c:2111
#, c-format
msgid "%s: no operation specified\n"
msgstr "%s: keine Operation angegeben\n"
-#: pg_ctl.c:1924
+#: pg_ctl.c:2127
#, c-format
msgid ""
"%s: no database directory specified and environment variable PGDATA unset\n"
@@ -633,27 +746,27 @@ msgstr "konnte nicht in Verzeichnis »%s« wechseln"
msgid "could not read symbolic link \"%s\""
msgstr "konnte symbolische Verknüpfung »%s« nicht lesen"
-#: ../../port/exec.c:516
+#: ../../port/exec.c:517
#, c-format
msgid "child process exited with exit code %d"
msgstr "Kindprozess hat mit Code %d beendet"
-#: ../../port/exec.c:520
+#: ../../port/exec.c:521
#, c-format
msgid "child process was terminated by exception 0x%X"
msgstr "Kindprozess wurde durch Ausnahme 0x%X beendet"
-#: ../../port/exec.c:529
+#: ../../port/exec.c:530
#, c-format
msgid "child process was terminated by signal %s"
msgstr "Kindprozess wurde von Signal %s beendet"
-#: ../../port/exec.c:532
+#: ../../port/exec.c:533
#, c-format
msgid "child process was terminated by signal %d"
msgstr "Kindprozess wurde von Signal %d beendet"
-#: ../../port/exec.c:536
+#: ../../port/exec.c:537
#, c-format
msgid "child process exited with unrecognized status %d"
msgstr "Kindprozess hat mit unbekanntem Status %d beendet"
diff --git a/src/bin/pg_ctl/po/fr.po b/src/bin/pg_ctl/po/fr.po
index 5b171e8103..695ab5d67e 100644
--- a/src/bin/pg_ctl/po/fr.po
+++ b/src/bin/pg_ctl/po/fr.po
@@ -1,7 +1,7 @@
# translation of pg_ctl.po to fr_fr
# french message translation file for pg_ctl
#
-# $PostgreSQL: pgsql/src/bin/pg_ctl/po/fr.po,v 1.15 2009/12/19 20:23:25 petere Exp $
+# $PostgreSQL$
#
# Use these quotes: %s
#
diff --git a/src/bin/pg_ctl/po/ja.po b/src/bin/pg_ctl/po/ja.po
index 0ffb41f640..0ed66da7aa 100644
--- a/src/bin/pg_ctl/po/ja.po
+++ b/src/bin/pg_ctl/po/ja.po
@@ -3,83 +3,89 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: PostgreSQL 8.4\n"
+"Project-Id-Version: PostgreSQL 9.0 beta 3\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2009-04-07 22:01+0900\n"
-"PO-Revision-Date: 2009-04-12 14:17+0900\n"
+"POT-Creation-Date: 2010-07-20 12:55+0900\n"
+"PO-Revision-Date: 2010-07-15 19:26+0900\n"
"Last-Translator: HOTTA Michihide <hotta@net-newbie.com>\n"
"Language-Team: jpug-doc <jpug-doc@ml.postgresql.jp>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
-#: pg_ctl.c:227 pg_ctl.c:242 pg_ctl.c:1778
+#: pg_ctl.c:225 pg_ctl.c:240 pg_ctl.c:1834
#, c-format
msgid "%s: out of memory\n"
msgstr "%s: メモリ不足です\n"
-#: pg_ctl.c:276
+#: pg_ctl.c:274
#, c-format
msgid "%s: could not open PID file \"%s\": %s\n"
msgstr "%s: PIDファイル\"%s\"をオープンできませんでした: %s\n"
-#: pg_ctl.c:283
+#: pg_ctl.c:281
#, c-format
msgid "%s: invalid data in PID file \"%s\"\n"
msgstr "%s: PIDファイル\"%s\"内に無効なデータがあります\n"
-#: pg_ctl.c:559
+#: pg_ctl.c:557
#, c-format
msgid "%s: cannot set core file size limit; disallowed by hard limit\n"
msgstr ""
"%s: コアファイルのサイズ制限を設定できません:固定の制限により許されていませ"
"ん\n"
-#: pg_ctl.c:584
+#: pg_ctl.c:582
#, c-format
msgid "%s: could not read file \"%s\"\n"
msgstr "%s: ファイル\"%s\"を読み取ることに失敗しました\n"
-#: pg_ctl.c:589
+#: pg_ctl.c:587
#, c-format
msgid "%s: option file \"%s\" must have exactly one line\n"
msgstr "%s: オプションファイル\"%s\"は1行のみでなければなりません\n"
-#: pg_ctl.c:631
-#, c-format
-msgid "%s: another server might be running; trying to start server anyway\n"
-msgstr ""
-"%s: 他のサーバが動作中の可能性がありますが、とにかくpostmasterの起動を試みま"
-"す。\n"
-
-#: pg_ctl.c:658
+#: pg_ctl.c:635
#, c-format
msgid ""
-"The program \"postgres\" is needed by %s but was not found in the\n"
+"The program \"%s\" is needed by %s but was not found in the\n"
"same directory as \"%s\".\n"
"Check your installation.\n"
msgstr ""
-"%sでは\"postgres\"プログラムが必要ですが、\"%s\"と同じディレクトリにあり\n"
-"ませんでした。\n"
-"インストレーションを検査してください。\n"
+"%2$sには\"%1$s\"プログラムが必要ですが、\"%3$s\"と同じディレクトリ\n"
+"にありませんでした。\n"
+"インストール状況を確認してください。\n"
-#: pg_ctl.c:664
+#: pg_ctl.c:641
#, c-format
msgid ""
-"The program \"postgres\" was found by \"%s\"\n"
+"The program \"%s\" was found by \"%s\"\n"
"but was not the same version as %s.\n"
"Check your installation.\n"
msgstr ""
-"\"postgres\"プログラムは\"%s\"にありましたが、%sと同じバージョンで\n"
-"はありませんでした。\n"
+"\"%2$s\"がプログラム\"%1$s\"を見つけましたが、これは%3$sと同じ\n"
+"バージョンではありませんでした。\n"
"インストレーションを検査してください。\n"
-#: pg_ctl.c:681
+#: pg_ctl.c:674
+#, c-format
+msgid "%s: database system initialization failed\n"
+msgstr "%s: データベースシステムが初期化に失敗しました\n"
+
+#: pg_ctl.c:690
+#, c-format
+msgid "%s: another server might be running; trying to start server anyway\n"
+msgstr ""
+"%s: 他のサーバが動作中の可能性がありますが、とにかくpostmasterの起動を試みま"
+"す。\n"
+
+#: pg_ctl.c:727
#, c-format
msgid "%s: could not start server: exit code was %d\n"
msgstr "%s: サーバを起動できませんでした。終了コードは%dでした。\n"
-#: pg_ctl.c:692
+#: pg_ctl.c:738 pg_ctl.c:751
#, c-format
msgid ""
"%s: could not start server\n"
@@ -88,53 +94,48 @@ msgstr ""
"%s: サーバを起動できませんでした。\n"
"ログ出力を確認してください。\n"
-#: pg_ctl.c:701
+#: pg_ctl.c:747
msgid "waiting for server to start..."
msgstr "サーバの起動完了を待っています..."
-#: pg_ctl.c:705
-#, c-format
-msgid "could not start server\n"
-msgstr "サーバを起動できませんでした\n"
-
-#: pg_ctl.c:710 pg_ctl.c:783 pg_ctl.c:863
+#: pg_ctl.c:758 pg_ctl.c:831 pg_ctl.c:911
msgid " done\n"
msgstr "完了\n"
-#: pg_ctl.c:711
+#: pg_ctl.c:759
msgid "server started\n"
msgstr "サーバ起動完了\n"
-#: pg_ctl.c:715
+#: pg_ctl.c:763
msgid "server starting\n"
msgstr "サーバは起動中です。\n"
-#: pg_ctl.c:730 pg_ctl.c:805 pg_ctl.c:885
+#: pg_ctl.c:778 pg_ctl.c:853 pg_ctl.c:933
#, c-format
msgid "%s: PID file \"%s\" does not exist\n"
msgstr "%s: PIDファイル\"%s\"がありません\n"
-#: pg_ctl.c:731 pg_ctl.c:807 pg_ctl.c:886
+#: pg_ctl.c:779 pg_ctl.c:855 pg_ctl.c:934
msgid "Is server running?\n"
msgstr "サーバが動作していますか?\n"
-#: pg_ctl.c:737
+#: pg_ctl.c:785
#, c-format
msgid "%s: cannot stop server; single-user server is running (PID: %ld)\n"
msgstr ""
"%s: サーバを停止できません。シングルユーザサーバ(PID: %ld)が動作していま"
"す。\n"
-#: pg_ctl.c:745 pg_ctl.c:829
+#: pg_ctl.c:793 pg_ctl.c:877
#, c-format
msgid "%s: could not send stop signal (PID: %ld): %s\n"
msgstr "%s: 停止シグナルを送信できませんでした。(PID: %ld): %s\n"
-#: pg_ctl.c:752
+#: pg_ctl.c:800
msgid "server shutting down\n"
msgstr "サーバの停止中です\n"
-#: pg_ctl.c:759 pg_ctl.c:836
+#: pg_ctl.c:807 pg_ctl.c:884
msgid ""
"WARNING: online backup mode is active\n"
"Shutdown will not complete until pg_stop_backup() is called.\n"
@@ -144,141 +145,140 @@ msgstr ""
"pg_stop_backup()が呼び出されるまでシャットダウンは完了しません\n"
"\n"
-#: pg_ctl.c:763 pg_ctl.c:840
+#: pg_ctl.c:811 pg_ctl.c:888
msgid "waiting for server to shut down..."
msgstr "サーバ停止処理の完了を待っています..."
-#: pg_ctl.c:778 pg_ctl.c:857
+#: pg_ctl.c:826 pg_ctl.c:905
msgid " failed\n"
msgstr "失敗しました\n"
-#: pg_ctl.c:780 pg_ctl.c:859
+#: pg_ctl.c:828 pg_ctl.c:907
#, c-format
msgid "%s: server does not shut down\n"
msgstr "%s: サーバは停止していません\n"
-#: pg_ctl.c:785 pg_ctl.c:864
-#, c-format
+#: pg_ctl.c:833 pg_ctl.c:912
msgid "server stopped\n"
msgstr "サーバは停止しました\n"
-#: pg_ctl.c:808 pg_ctl.c:870
+#: pg_ctl.c:856 pg_ctl.c:918
msgid "starting server anyway\n"
msgstr "とにかくサーバを起動しています\n"
-#: pg_ctl.c:817
+#: pg_ctl.c:865
#, c-format
msgid "%s: cannot restart server; single-user server is running (PID: %ld)\n"
msgstr ""
"%s: サーバを再起動できません。シングルユーザサーバ(PID: %ld)が動作中です。\n"
-#: pg_ctl.c:820 pg_ctl.c:895
+#: pg_ctl.c:868 pg_ctl.c:943
msgid "Please terminate the single-user server and try again.\n"
msgstr "シングルユーザサーバを終了させてから、再度実行してください\n"
-#: pg_ctl.c:868
+#: pg_ctl.c:916
#, c-format
msgid "%s: old server process (PID: %ld) seems to be gone\n"
msgstr "%s: 古いサーバプロセス(PID: %ld)が動作していないようです\n"
-#: pg_ctl.c:892
+#: pg_ctl.c:940
#, c-format
msgid "%s: cannot reload server; single-user server is running (PID: %ld)\n"
msgstr ""
"%s: サーバをリロードできません。シングルユーザサーバ(PID: %ld)が動作中です\n"
-#: pg_ctl.c:901
+#: pg_ctl.c:949
#, c-format
msgid "%s: could not send reload signal (PID: %ld): %s\n"
msgstr "%s: リロードシグナルを送信できませんでした。(PID: %ld): %s\n"
-#: pg_ctl.c:906
+#: pg_ctl.c:954
msgid "server signaled\n"
msgstr "サーバにシグナルを送信しました\n"
-#: pg_ctl.c:950
+#: pg_ctl.c:998
#, c-format
msgid "%s: single-user server is running (PID: %ld)\n"
msgstr "%s: シングルユーザサーバが動作中です(PID: %ld)\n"
-#: pg_ctl.c:962
+#: pg_ctl.c:1010
#, c-format
msgid "%s: server is running (PID: %ld)\n"
msgstr "%s: サーバが動作中です(PID: %ld)\n"
-#: pg_ctl.c:973
+#: pg_ctl.c:1021
#, c-format
msgid "%s: no server running\n"
msgstr "%s: サーバが動作していません\n"
-#: pg_ctl.c:984
+#: pg_ctl.c:1032
#, c-format
msgid "%s: could not send signal %d (PID: %ld): %s\n"
msgstr "%s: シグナル%dを送信できませんでした(PID: %ld): %s\n"
-#: pg_ctl.c:1018
+#: pg_ctl.c:1066
#, c-format
msgid "%s: could not find own program executable\n"
msgstr "%s: 本プログラムの実行ファイルの検索に失敗しました\n"
-#: pg_ctl.c:1028
+#: pg_ctl.c:1076
#, c-format
msgid "%s: could not find postgres program executable\n"
msgstr "%s: postgres の実行ファイルが見つかりません\n"
-#: pg_ctl.c:1086 pg_ctl.c:1118
+#: pg_ctl.c:1138 pg_ctl.c:1170
#, c-format
msgid "%s: could not open service manager\n"
msgstr "%s: サービスマネージャのオープンに失敗しました\n"
-#: pg_ctl.c:1092
+#: pg_ctl.c:1144
#, c-format
msgid "%s: service \"%s\" already registered\n"
msgstr "%s: サービス\\\"%s\\\"は登録済みです\n"
-#: pg_ctl.c:1103
+#: pg_ctl.c:1155
#, c-format
msgid "%s: could not register service \"%s\": error code %d\n"
msgstr "%s: サービス\"%s\"の登録に失敗しました: エラーコード %d\n"
-#: pg_ctl.c:1124
+#: pg_ctl.c:1176
#, c-format
msgid "%s: service \"%s\" not registered\n"
msgstr "%s: サービス\"%s\"は登録されていません\n"
-#: pg_ctl.c:1131
+#: pg_ctl.c:1183
#, c-format
msgid "%s: could not open service \"%s\": error code %d\n"
msgstr "%s: サービス\"%s\"のオープンに失敗しました: エラーコード %d\n"
-#: pg_ctl.c:1138
+#: pg_ctl.c:1190
#, c-format
msgid "%s: could not unregister service \"%s\": error code %d\n"
msgstr "%s: サービス\"%s\"の登録削除に失敗しました: エラーコード %d\n"
-#: pg_ctl.c:1224
+#: pg_ctl.c:1276
msgid "Waiting for server startup...\n"
msgstr "サーバの起動完了を待っています...\n"
-#: pg_ctl.c:1227
+#: pg_ctl.c:1279
msgid "Timed out waiting for server startup\n"
msgstr "サーバの起動待機がタイムアウトしました\n"
-#: pg_ctl.c:1231
+#: pg_ctl.c:1283
msgid "Server started and accepting connections\n"
msgstr "サーバは起動し、接続を受け付けています\n"
-#: pg_ctl.c:1281
+#: pg_ctl.c:1333
#, c-format
msgid "%s: could not start service \"%s\": error code %d\n"
msgstr "%s: サービス\"%s\"の起動に失敗しました: エラーコード %d\n"
-#: pg_ctl.c:1513
+#: pg_ctl.c:1568
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "詳細は\"%s --help\"を実行してください。\n"
-#: pg_ctl.c:1521
+#: pg_ctl.c:1576
#, c-format
msgid ""
"%s is a utility to start, stop, restart, reload configuration files,\n"
@@ -289,12 +289,17 @@ msgstr ""
"を行うユーティリティです。また、PostgreSQLプロセスへシグナルも送信します。\n"
"\n"
-#: pg_ctl.c:1523
+#: pg_ctl.c:1578
#, c-format
msgid "Usage:\n"
msgstr "使用方法:\n"
-#: pg_ctl.c:1524
+#: pg_ctl.c:1579
+#, c-format
+msgid " %s init[db] [-D DATADIR] [-s] [-o \"OPTIONS\"]\n"
+msgstr " %s init[db] [-D DATADIR] [-s] [-o \"オプション\"]\n"
+
+#: pg_ctl.c:1580
#, c-format
msgid ""
" %s start [-w] [-t SECS] [-D DATADIR] [-s] [-l FILENAME] [-o \"OPTIONS"
@@ -303,12 +308,12 @@ msgstr ""
" %s start [-w] [-t SECS] [-D DATADIR] [-s] [-l FILENAME] [-o \"OPTIONS"
"\"]\n"
-#: pg_ctl.c:1525
+#: pg_ctl.c:1581
#, c-format
msgid " %s stop [-W] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
msgstr " %s stop [-W] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
-#: pg_ctl.c:1526
+#: pg_ctl.c:1582
#, c-format
msgid ""
" %s restart [-w] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
@@ -317,22 +322,22 @@ msgstr ""
" %s restart [-w] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
" [-o \"OPTIONS\"]\n"
-#: pg_ctl.c:1528
+#: pg_ctl.c:1584
#, c-format
msgid " %s reload [-D DATADIR] [-s]\n"
msgstr " %s reload [-D DATADIR] [-s]\n"
-#: pg_ctl.c:1529
+#: pg_ctl.c:1585
#, c-format
msgid " %s status [-D DATADIR]\n"
msgstr " %s status [-D DATADIR]\n"
-#: pg_ctl.c:1530
+#: pg_ctl.c:1586
#, c-format
msgid " %s kill SIGNALNAME PID\n"
msgstr " %s kill SIGNALNAME PID\n"
-#: pg_ctl.c:1532
+#: pg_ctl.c:1588
#, c-format
msgid ""
" %s register [-N SERVICENAME] [-U USERNAME] [-P PASSWORD] [-D DATADIR]\n"
@@ -341,12 +346,12 @@ msgstr ""
" %s register [-N SERVICENAME] [-U USERNAME] [-P PASSWORD] [-D DATADIR]\n"
" [-w] [-t SECS] [-o \"OPTIONS\"]\n"
-#: pg_ctl.c:1534
+#: pg_ctl.c:1590
#, c-format
msgid " %s unregister [-N SERVICENAME]\n"
msgstr " %s unregister [-N SERVICENAME]\n"
-#: pg_ctl.c:1537
+#: pg_ctl.c:1593
#, c-format
msgid ""
"\n"
@@ -355,44 +360,44 @@ msgstr ""
"\n"
"一般的なオプション:\n"
-#: pg_ctl.c:1538
+#: pg_ctl.c:1594
#, c-format
msgid " -D, --pgdata DATADIR location of the database storage area\n"
msgstr " -D, --pgdata DATADIR データベース格納領域の場所です\n"
-#: pg_ctl.c:1539
+#: pg_ctl.c:1595
#, c-format
msgid " -s, --silent only print errors, no informational messages\n"
msgstr ""
" -s, --silent エラーメッセージのみを表示し、情報メッセージは表示し"
"ません\n"
-#: pg_ctl.c:1540
+#: pg_ctl.c:1596
#, c-format
msgid " -t SECS seconds to wait when using -w option\n"
msgstr " -t SECS -wオプションを使用する時の待機秒数です。\n"
-#: pg_ctl.c:1541
+#: pg_ctl.c:1597
#, c-format
msgid " -w wait until operation completes\n"
msgstr " -w 作業が完了するまで待機します\n"
-#: pg_ctl.c:1542
+#: pg_ctl.c:1598
#, c-format
msgid " -W do not wait until operation completes\n"
msgstr " -W 作業の完了まで待機しません\n"
-#: pg_ctl.c:1543
+#: pg_ctl.c:1599
#, c-format
msgid " --help show this help, then exit\n"
msgstr " --help ヘルプを表示し、終了します\n"
-#: pg_ctl.c:1544
+#: pg_ctl.c:1600
#, c-format
msgid " --version output version information, then exit\n"
msgstr " --version バージョン情報を表示し、終了します\n"
-#: pg_ctl.c:1545
+#: pg_ctl.c:1601
#, c-format
msgid ""
"(The default is to wait for shutdown, but not for start or restart.)\n"
@@ -402,12 +407,12 @@ msgstr ""
"ません。)\n"
"\n"
-#: pg_ctl.c:1546
+#: pg_ctl.c:1602
#, c-format
msgid "If the -D option is omitted, the environment variable PGDATA is used.\n"
msgstr "-Dオプションの省略時、PGDATA環境変数が使用されます。\n"
-#: pg_ctl.c:1548
+#: pg_ctl.c:1604
#, c-format
msgid ""
"\n"
@@ -416,38 +421,38 @@ msgstr ""
"\n"
"起動、再起動用のオプション\n"
-#: pg_ctl.c:1550
+#: pg_ctl.c:1606
#, c-format
msgid " -c, --core-files allow postgres to produce core files\n"
msgstr ""
" -c, --core-files postgresはコアファイルを生成することができます。\n"
-#: pg_ctl.c:1552
+#: pg_ctl.c:1608
#, c-format
msgid " -c, --core-files not applicable on this platform\n"
msgstr " -c, --core-files このプラットフォームでは実行できません\n"
-#: pg_ctl.c:1554
+#: pg_ctl.c:1610
#, c-format
msgid " -l, --log FILENAME write (or append) server log to FILENAME\n"
msgstr ""
" -l, --log FILENAME サーバログをFILENAMEへ出力(あるいは追加)します\n"
-#: pg_ctl.c:1555
+#: pg_ctl.c:1611
#, c-format
msgid ""
" -o OPTIONS command line options to pass to postgres\n"
-" (PostgreSQL server executable)\n"
+" (PostgreSQL server executable) or initdb\n"
msgstr ""
-" -o OPTIONS postgres(PostgreSQLサーバ実行ファイル)に渡す\n"
-" コマンドラインオプションです\n"
+" -o オプション postgres(PostgreSQLサーバ実行ファイル)または\n"
+" initdb に渡すコマンドラインオプション\n"
-#: pg_ctl.c:1557
+#: pg_ctl.c:1613
#, c-format
msgid " -p PATH-TO-POSTGRES normally not necessary\n"
msgstr " -p PATH-TO-POSTGRES 通常は不要です\n"
-#: pg_ctl.c:1558
+#: pg_ctl.c:1614
#, c-format
msgid ""
"\n"
@@ -456,13 +461,13 @@ msgstr ""
"\n"
"停止、再起動用のオプション:\n"
-#: pg_ctl.c:1559
+#: pg_ctl.c:1615
#, c-format
msgid " -m SHUTDOWN-MODE can be \"smart\", \"fast\", or \"immediate\"\n"
msgstr ""
" -m SHUTDOWN-MODE \"smart\"、\"fast\"、\"immediate\"のいずれかです\n"
-#: pg_ctl.c:1561
+#: pg_ctl.c:1617
#, c-format
msgid ""
"\n"
@@ -471,17 +476,17 @@ msgstr ""
"\n"
"シャットダウンモードは以下の通りです:\n"
-#: pg_ctl.c:1562
+#: pg_ctl.c:1618
#, c-format
msgid " smart quit after all clients have disconnected\n"
msgstr " smart 全クライアントの接続切断後に停止します\n"
-#: pg_ctl.c:1563
+#: pg_ctl.c:1619
#, c-format
msgid " fast quit directly, with proper shutdown\n"
msgstr " fast シャットダウン手続き後に停止します\n"
-#: pg_ctl.c:1564
+#: pg_ctl.c:1620
#, c-format
msgid ""
" immediate quit without complete shutdown; will lead to recovery on "
@@ -490,7 +495,7 @@ msgstr ""
" immediate シャットダウン手続きを行わずに停止します。再起動時にリカバリ状"
"態になる可能性があります\n"
-#: pg_ctl.c:1566
+#: pg_ctl.c:1622
#, c-format
msgid ""
"\n"
@@ -499,7 +504,7 @@ msgstr ""
"\n"
"killモードで利用できるシグナル名:\n"
-#: pg_ctl.c:1570
+#: pg_ctl.c:1626
#, c-format
msgid ""
"\n"
@@ -508,24 +513,24 @@ msgstr ""
"\n"
"登録、登録解除用のオプション:\n"
-#: pg_ctl.c:1571
+#: pg_ctl.c:1627
#, c-format
msgid ""
" -N SERVICENAME service name with which to register PostgreSQL server\n"
msgstr " -N SERVICENAME PostgreSQLサーバを登録するためのサービス名です\n"
-#: pg_ctl.c:1572
+#: pg_ctl.c:1628
#, c-format
msgid " -P PASSWORD password of account to register PostgreSQL server\n"
msgstr ""
" -P PASSWORD PostgreSQLサーバを登録するアカウントのパスワードです\n"
-#: pg_ctl.c:1573
+#: pg_ctl.c:1629
#, c-format
msgid " -U USERNAME user name of account to register PostgreSQL server\n"
msgstr " -U USERNAME PostgreSQLサーバを登録するアカウントのユーザ名です\n"
-#: pg_ctl.c:1576
+#: pg_ctl.c:1632
#, c-format
msgid ""
"\n"
@@ -534,17 +539,17 @@ msgstr ""
"\n"
"不具合は<pgsql-bugs@postgresql.org>まで報告してください。\n"
-#: pg_ctl.c:1601
+#: pg_ctl.c:1657
#, c-format
msgid "%s: unrecognized shutdown mode \"%s\"\n"
msgstr "%s: シャットダウンモード\"%s\"は不明です\n"
-#: pg_ctl.c:1634
+#: pg_ctl.c:1690
#, c-format
msgid "%s: unrecognized signal name \"%s\"\n"
msgstr "%s: シグナル名\"%s\"は不明です\n"
-#: pg_ctl.c:1699
+#: pg_ctl.c:1755
#, c-format
msgid ""
"%s: cannot be run as root\n"
@@ -555,83 +560,83 @@ msgstr ""
"サーバプロセスの所有者となる(非特権)ユーザとして(例えば\"su\"を使用して)\n"
"ログインしてください。\n"
-#: pg_ctl.c:1808
+#: pg_ctl.c:1864
#, c-format
msgid "%s: too many command-line arguments (first is \"%s\")\n"
msgstr "%s: コマンドライン引数が多すぎます(先頭は\"%s\")\n"
-#: pg_ctl.c:1827
+#: pg_ctl.c:1886
#, c-format
msgid "%s: missing arguments for kill mode\n"
msgstr "%s: killモード用の引数がありません\n"
-#: pg_ctl.c:1845
+#: pg_ctl.c:1904
#, c-format
msgid "%s: unrecognized operation mode \"%s\"\n"
msgstr "%s: 操作モード\"%s\"は不明です\n"
-#: pg_ctl.c:1855
+#: pg_ctl.c:1914
#, c-format
msgid "%s: no operation specified\n"
msgstr "%s: 操作モードが指定されていません\n"
-#: pg_ctl.c:1871
+#: pg_ctl.c:1930
#, c-format
msgid ""
"%s: no database directory specified and environment variable PGDATA unset\n"
msgstr "%s: データベースの指定も、PGDATA環境変数の設定もありません\n"
-#: ../../port/exec.c:195 ../../port/exec.c:309 ../../port/exec.c:352
+#: ../../port/exec.c:125 ../../port/exec.c:239 ../../port/exec.c:282
#, c-format
msgid "could not identify current directory: %s"
msgstr "現在のディレクトリを認識できませんでした: %s"
-#: ../../port/exec.c:214
+#: ../../port/exec.c:144
#, c-format
msgid "invalid binary \"%s\""
msgstr "バイナリ\"%s\"は無効です"
-#: ../../port/exec.c:263
+#: ../../port/exec.c:193
#, c-format
msgid "could not read binary \"%s\""
msgstr "バイナリ\"%s\"を読み取れませんでした"
-#: ../../port/exec.c:270
+#: ../../port/exec.c:200
#, c-format
msgid "could not find a \"%s\" to execute"
msgstr "実行する\"%s\"がありませんでした"
-#: ../../port/exec.c:325 ../../port/exec.c:361
+#: ../../port/exec.c:255 ../../port/exec.c:291
#, c-format
msgid "could not change directory to \"%s\""
msgstr "ディレクトリを\"%s\"に変更できませんでした"
-#: ../../port/exec.c:340
+#: ../../port/exec.c:270
#, c-format
msgid "could not read symbolic link \"%s\""
msgstr "シンボリックリンク\"%s\"の読み取りに失敗しました"
-#: ../../port/exec.c:586
+#: ../../port/exec.c:516
#, c-format
msgid "child process exited with exit code %d"
msgstr "子プロセスが終了コード%dで終了しました"
-#: ../../port/exec.c:590
+#: ../../port/exec.c:520
#, c-format
msgid "child process was terminated by exception 0x%X"
msgstr "子プロセスが例外0x%Xで終了しました"
-#: ../../port/exec.c:599
+#: ../../port/exec.c:529
#, c-format
msgid "child process was terminated by signal %s"
msgstr "子プロセスがシグナル%sで終了しました"
-#: ../../port/exec.c:602
+#: ../../port/exec.c:532
#, c-format
msgid "child process was terminated by signal %d"
msgstr "子プロセスがシグナル%dで終了しました"
-#: ../../port/exec.c:606
+#: ../../port/exec.c:536
#, c-format
msgid "child process exited with unrecognized status %d"
msgstr "子プロセスが未知のステータス%dで終了しました"
diff --git a/src/bin/pg_ctl/po/ru.po b/src/bin/pg_ctl/po/ru.po
index 99e3b73b0d..9fe60e996c 100644
--- a/src/bin/pg_ctl/po/ru.po
+++ b/src/bin/pg_ctl/po/ru.po
@@ -1,16 +1,17 @@
# ru.po
-# PG_CTL Translated Messages into the Russian Language (KOI8-R)
+# PG_CTL Translated Messages into the Russian Language (UTF-8)
#
# Copyright (c) 2004-2005 Serguei A. Mokhov, mokhov@cs.concordia.ca
# Distributed under the same licensing terms as PostgreSQL itself.
#
-# $PostgreSQL: pgsql/src/bin/pg_ctl/po/ru.po,v 1.11 2009/04/09 19:38:51 petere Exp $
+# pgtranslation Id: pg_ctl.po,v 1.4 2010/12/07 21:22:21 petere Exp $
#
# translation of subject-specific terminology, see:
-# :
+# перевод некоторых специфичных терминов:
# http://wiki.postgresql.org/wiki/NLS/ru/dict
#
# ChangeLog:
+# - December 1, 2010: Complete translation for 9.1, Andrey Sudnik <sudnikand@gmail.com>
# - March 26, 2009: complete translation for 8.3, Sergey Burladyan <eshkinkot@gmail.com>
# - January 17, 2005: Complete translation for 8.0, Serguei A. Mokhov <mokhov@cs.concordia.ca>
# - December, 2004: New version of translation by Oleg Bartunov <oleg@sai.msu.su>
@@ -18,628 +19,703 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: PostgreSQL 8.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-16 09:17+0000\n"
-"PO-Revision-Date: 2009-03-29 10:29+0400\n"
-"Last-Translator: Serguei A. Mokhov <mokhov@cs.concordia.ca>\n"
+"Project-Id-Version: PostgreSQL 9.1\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2010-11-29 18:40+0000\n"
+"PO-Revision-Date: 2010-12-01 01:17+0700\n"
+"Last-Translator: Andrey Sudnik <sudnikand@gmail.com>\n"
"Language-Team: pgsql-ru-general <pgsql-ru-general@postgresql.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=koi8-r\n"
+"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Language: Russian\n"
"X-Poedit-Country: RUSSIAN FEDERATION\n"
+"X-Poedit-SourceCharset: utf-8\n"
-#: pg_ctl.c:230 pg_ctl.c:245 pg_ctl.c:1765
+#: pg_ctl.c:227
+#: pg_ctl.c:242
+#: pg_ctl.c:1884
#, c-format
msgid "%s: out of memory\n"
-msgstr "%s: \n"
+msgstr "%s: не хватает памяти\n"
-#: pg_ctl.c:279
+#: pg_ctl.c:276
#, c-format
msgid "%s: could not open PID file \"%s\": %s\n"
-msgstr "%s: PID- \"%s\": %s\n"
+msgstr "%s: не удалось открыть PID-файл \"%s\": %s\n"
-#: pg_ctl.c:286
+#: pg_ctl.c:283
#, c-format
msgid "%s: invalid data in PID file \"%s\"\n"
-msgstr "%s: PID- \"%s\"\n"
+msgstr "%s: неверные данные в PID-файле \"%s\"\n"
-#: pg_ctl.c:565
+#: pg_ctl.c:550
#, c-format
msgid "%s: cannot set core file size limit; disallowed by hard limit\n"
-msgstr "%s: core-; ֣ \n"
+msgstr "%s: не удалось установить ограничение на размер core-файла; отвергнуто жёстким ограничением\n"
-#: pg_ctl.c:595
+#: pg_ctl.c:575
#, c-format
msgid "%s: could not read file \"%s\"\n"
-msgstr "%s: \"%s\"\n"
+msgstr "%s: не удалось прочитать файл \"%s\"\n"
-#: pg_ctl.c:601
+#: pg_ctl.c:580
#, c-format
msgid "%s: option file \"%s\" must have exactly one line\n"
-msgstr "%s: \"%s\" \n"
+msgstr "%s: файл опций \"%s\" должен иметь ровно одну строку\n"
-#: pg_ctl.c:649
-#, c-format
-msgid "%s: another server might be running; trying to start server anyway\n"
-msgstr "%s: , , ӣ \n"
-
-#: pg_ctl.c:676
+#: pg_ctl.c:628
#, c-format
msgid ""
-"The program \"postgres\" is needed by %s but was not found in the\n"
+"The program \"%s\" is needed by %s but was not found in the\n"
"same directory as \"%s\".\n"
"Check your installation.\n"
msgstr ""
-" \"postgres\" %s, \n"
-" , \"%s\".\n"
-" .\n"
+"Программа \"%s\" нужна для %s, но не найдена\n"
+"в той же директории, что и \"%s\".\n"
+"Проверьте вашу установку.\n"
-#: pg_ctl.c:682
+#: pg_ctl.c:634
#, c-format
msgid ""
-"The program \"postgres\" was found by \"%s\"\n"
+"The program \"%s\" was found by \"%s\"\n"
"but was not the same version as %s.\n"
"Check your installation.\n"
msgstr ""
-" \"postgres\" \"%s\",\n"
-" , %s.\n"
-" .\n"
+"Программа \"%s\" найдена рядом с \"%s\",\n"
+"но не той же версии, что и %s.\n"
+"Проверьте вашу установку.\n"
+
+#: pg_ctl.c:667
+#, c-format
+msgid "%s: database system initialization failed\n"
+msgstr "%s: создание базы данных не удалось\n"
-#: pg_ctl.c:699
+#: pg_ctl.c:683
+#, c-format
+msgid "%s: another server might be running; trying to start server anyway\n"
+msgstr "%s: возможно, другой сервер уже запущен, пробуем запустить сервер всё равно\n"
+
+#: pg_ctl.c:720
#, c-format
msgid "%s: could not start server: exit code was %d\n"
-msgstr "%s: , : %d\n"
+msgstr "%s: не удалось запустить сервер, код возврата: %d\n"
-#: pg_ctl.c:710
+#: pg_ctl.c:731
+#: pg_ctl.c:754
#, c-format
msgid ""
"%s: could not start server\n"
"Examine the log output.\n"
msgstr ""
-"%s: \n"
-" .\n"
+"%s: не удалось запустить сервер\n"
+"Проверьте вывод в протоколе выполнения.\n"
-#: pg_ctl.c:719
+#: pg_ctl.c:740
msgid "waiting for server to start..."
-msgstr " ..."
+msgstr "ожидание запуска сервера..."
-#: pg_ctl.c:723
-#, c-format
-msgid "could not start server\n"
-msgstr " \n"
-
-#: pg_ctl.c:728 pg_ctl.c:794 pg_ctl.c:867
+#: pg_ctl.c:745
+#: pg_ctl.c:843
+#: pg_ctl.c:931
msgid " done\n"
-msgstr " \n"
+msgstr " готово\n"
-#: pg_ctl.c:729
+#: pg_ctl.c:746
msgid "server started\n"
-msgstr " \n"
+msgstr "сервер запущен\n"
+
+#: pg_ctl.c:749
+#: pg_ctl.c:753
+msgid " stopped waiting\n"
+msgstr " остановка ожидания\n"
+
+#: pg_ctl.c:750
+msgid "server is still starting up\n"
+msgstr "сервер всё ещё запускается\n"
+
+#: pg_ctl.c:760
+#: pg_ctl.c:838
+#: pg_ctl.c:925
+msgid " failed\n"
+msgstr " ошибка\n"
-#: pg_ctl.c:733
+#: pg_ctl.c:761
+#, c-format
+msgid "%s: could not wait for server because of misconfiguration\n"
+msgstr "%s: не удалось дождаться сервера вследствие ошибки конфигурации\n"
+
+#: pg_ctl.c:767
msgid "server starting\n"
-msgstr " \n"
+msgstr "сервер запускается\n"
-#: pg_ctl.c:747 pg_ctl.c:815 pg_ctl.c:889
+#: pg_ctl.c:782
+#: pg_ctl.c:865
+#: pg_ctl.c:953
#, c-format
msgid "%s: PID file \"%s\" does not exist\n"
-msgstr "%s: PID- \"%s\" \n"
+msgstr "%s: PID-файл \"%s\" не существует\n"
-#: pg_ctl.c:748 pg_ctl.c:817 pg_ctl.c:890
+#: pg_ctl.c:783
+#: pg_ctl.c:867
+#: pg_ctl.c:954
msgid "Is server running?\n"
-msgstr " ?\n"
+msgstr "Запущен ли сервер?\n"
-#: pg_ctl.c:754
+#: pg_ctl.c:789
#, c-format
msgid "%s: cannot stop server; single-user server is running (PID: %ld)\n"
-msgstr "%s: ; (PID: %ld)\n"
+msgstr "%s: не удалось остановить сервер; выполняется однопользовательский сервер (PID: %ld)\n"
-#: pg_ctl.c:762 pg_ctl.c:839
+#: pg_ctl.c:797
+#: pg_ctl.c:889
#, c-format
msgid "%s: could not send stop signal (PID: %ld): %s\n"
-msgstr "%s: (PID: %ld): %s\n"
+msgstr "%s: не удалось отправить сигнал остановки (PID: %ld): %s\n"
-#: pg_ctl.c:769
+#: pg_ctl.c:804
msgid "server shutting down\n"
-msgstr " \n"
+msgstr "сервер завершает работу\n"
-#: pg_ctl.c:774 pg_ctl.c:844
-msgid "waiting for server to shut down..."
-msgstr " ..."
+#: pg_ctl.c:819
+#: pg_ctl.c:904
+msgid ""
+"WARNING: online backup mode is active\n"
+"Shutdown will not complete until pg_stop_backup() is called.\n"
+"\n"
+msgstr ""
+"ВНИМАНИЕ: активен режим онлайн резервирования\n"
+"Выключение не завершится пока не вызовут pg_stop_backup().\n"
+"\n"
-#: pg_ctl.c:789 pg_ctl.c:861
-msgid " failed\n"
-msgstr " \n"
+#: pg_ctl.c:823
+#: pg_ctl.c:908
+msgid "waiting for server to shut down..."
+msgstr "ожидание завершения работы сервера..."
-#: pg_ctl.c:791 pg_ctl.c:863
+#: pg_ctl.c:840
+#: pg_ctl.c:927
#, c-format
msgid "%s: server does not shut down\n"
-msgstr "%s: \n"
+msgstr "%s: сервер не останавливается\n"
-#: pg_ctl.c:796 pg_ctl.c:868
-#, c-format
+#: pg_ctl.c:845
+#: pg_ctl.c:932
msgid "server stopped\n"
-msgstr " \n"
+msgstr "сервер остановлен\n"
-#: pg_ctl.c:818 pg_ctl.c:874
+#: pg_ctl.c:868
+#: pg_ctl.c:938
msgid "starting server anyway\n"
-msgstr " , \n"
+msgstr "сервер запускается, несмотря ни на что\n"
-#: pg_ctl.c:827
+#: pg_ctl.c:877
#, c-format
msgid "%s: cannot restart server; single-user server is running (PID: %ld)\n"
-msgstr "%s: ; (PID: %ld)\n"
+msgstr "%s: невозможно перезапустить сервер; выполняется однопользовательский сервер (PID: %ld)\n"
-#: pg_ctl.c:830 pg_ctl.c:899
+#: pg_ctl.c:880
+#: pg_ctl.c:963
msgid "Please terminate the single-user server and try again.\n"
-msgstr ", .\n"
+msgstr "Пожалуйста, остановите однопользовательский сервер и попытайтесь снова.\n"
-#: pg_ctl.c:872
+#: pg_ctl.c:936
#, c-format
msgid "%s: old server process (PID: %ld) seems to be gone\n"
-msgstr "%s: (PID: %ld) \n"
+msgstr "%s: похоже что старый процесс сервера (PID: %ld) завершился\n"
-#: pg_ctl.c:896
+#: pg_ctl.c:960
#, c-format
msgid "%s: cannot reload server; single-user server is running (PID: %ld)\n"
-msgstr "%s: ; (PID: %ld)\n"
+msgstr "%s: невозможно перезагрузить сервер; выполняется однопользовательский сервер (PID: %ld)\n"
-#: pg_ctl.c:905
+#: pg_ctl.c:969
#, c-format
msgid "%s: could not send reload signal (PID: %ld): %s\n"
-msgstr "%s: (PID: %ld): %s\n"
+msgstr "%s: не удалось отправить сигнал перезагрузки (PID: %ld): %s\n"
-#: pg_ctl.c:910
+#: pg_ctl.c:974
msgid "server signaled\n"
-msgstr " \n"
+msgstr "отправлен сигнал серверу\n"
-#: pg_ctl.c:954
+#: pg_ctl.c:1018
#, c-format
msgid "%s: single-user server is running (PID: %ld)\n"
-msgstr "%s: (PID: %ld)\n"
+msgstr "%s: выполняется однопользовательский сервер (PID: %ld)\n"
-#: pg_ctl.c:966
+#: pg_ctl.c:1030
#, c-format
msgid "%s: server is running (PID: %ld)\n"
-msgstr "%s: (PID: %ld)\n"
+msgstr "%s: выполняется сервер (PID: %ld)\n"
-#: pg_ctl.c:977
+#: pg_ctl.c:1041
#, c-format
msgid "%s: no server running\n"
-msgstr "%s: \n"
+msgstr "%s: нет запущенного сервера\n"
-#: pg_ctl.c:988
+#: pg_ctl.c:1052
#, c-format
msgid "%s: could not send signal %d (PID: %ld): %s\n"
-msgstr "%s: %d (PID: %ld): %s\n"
+msgstr "%s: не удалось отправить сигнал %d (PID: %ld): %s\n"
-#: pg_ctl.c:1022
+#: pg_ctl.c:1086
#, c-format
msgid "%s: could not find own program executable\n"
-msgstr "%s: \n"
+msgstr "%s: не удалось найти свой исполняемый файл\n"
-#: pg_ctl.c:1031
+#: pg_ctl.c:1096
#, c-format
msgid "%s: could not find postgres program executable\n"
-msgstr "%s: postgres'\n"
+msgstr "%s: не удалось найти исполняемый файл postgres'а\n"
-#: pg_ctl.c:1089 pg_ctl.c:1121
+#: pg_ctl.c:1158
+#: pg_ctl.c:1190
#, c-format
msgid "%s: could not open service manager\n"
-msgstr "%s: \n"
+msgstr "%s: невозможно открыть менеджер служб\n"
-#: pg_ctl.c:1095
+#: pg_ctl.c:1164
#, c-format
msgid "%s: service \"%s\" already registered\n"
-msgstr "%s: \"%s\" \n"
+msgstr "%s: служба \"%s\" уже зарегистрирована\n"
-#: pg_ctl.c:1106
+#: pg_ctl.c:1175
#, c-format
msgid "%s: could not register service \"%s\": error code %d\n"
-msgstr "%s: \"%s\": %d\n"
+msgstr "%s: не удалось зарегистрировать службу \"%s\": код ошибки %d\n"
-#: pg_ctl.c:1127
+#: pg_ctl.c:1196
#, c-format
msgid "%s: service \"%s\" not registered\n"
-msgstr "%s: \"%s\" \n"
+msgstr "%s: служба \"%s\" не зарегистрирована\n"
-#: pg_ctl.c:1134
+#: pg_ctl.c:1203
#, c-format
msgid "%s: could not open service \"%s\": error code %d\n"
-msgstr "%s: \"%s\": %d\n"
+msgstr "%s: не удалось открыть службу \"%s\": код ошибки %d\n"
-#: pg_ctl.c:1141
+#: pg_ctl.c:1210
#, c-format
msgid "%s: could not unregister service \"%s\": error code %d\n"
-msgstr "%s: \"%s\": %d\n\n"
+msgstr ""
+"%s: невозможно удалить службу \"%s\": код ошибки %d\n"
+"\n"
-#: pg_ctl.c:1227
+#: pg_ctl.c:1296
msgid "Waiting for server startup...\n"
-msgstr " ...\n"
+msgstr "Ожидание запуска сервера...\n"
-#: pg_ctl.c:1230
+#: pg_ctl.c:1299
msgid "Timed out waiting for server startup\n"
-msgstr " \n"
+msgstr "Превышено время ожидания запуска сервера\n"
-#: pg_ctl.c:1234
+#: pg_ctl.c:1303
msgid "Server started and accepting connections\n"
-msgstr " \n"
+msgstr "Сервер запущен и принимает подключения\n"
-#: pg_ctl.c:1284
+#: pg_ctl.c:1353
#, c-format
msgid "%s: could not start service \"%s\": error code %d\n"
-msgstr "%s: \"%s\": %d\n"
+msgstr "%s: не удалось запустить службу \"%s\": код ошибки %d\n"
-#: pg_ctl.c:1500
+#: pg_ctl.c:1588
#, c-format
msgid "Try \"%s --help\" for more information.\n"
-msgstr " \"%s --help\" .\n"
+msgstr "Наберите \"%s --help\" для более подробной информации.\n"
-#: pg_ctl.c:1508
+#: pg_ctl.c:1596
#, c-format
msgid ""
"%s is a utility to start, stop, restart, reload configuration files,\n"
"report the status of a PostgreSQL server, or signal a PostgreSQL process.\n"
"\n"
msgstr ""
-"%s , , ,\n"
-" , \n"
-"PostgreSQL, PostgreSQL-.\n"
+"%s является утилитой для запуска, остановки, перезапуска,\n"
+"перезагрузки конфигурационных файлов, информирования о состоянии сервера\n"
+"PostgreSQL, или отправки сигналов PostgreSQL-процессу.\n"
"\n"
-#: pg_ctl.c:1510
+#: pg_ctl.c:1598
#, c-format
msgid "Usage:\n"
-msgstr ":\n"
+msgstr "Использование:\n"
-#: pg_ctl.c:1511
+#: pg_ctl.c:1599
#, c-format
-msgid ""
-" %s start [-w] [-t SECS] [-D DATADIR] [-s] [-l FILENAME] [-o \"OPTIONS"
-"\"]\n"
-msgstr " %s start [-w] [-t ] [-D -] [-s] [-l -] [-o \"\"]\n"
+msgid " %s init[db] [-D DATADIR] [-s] [-o \"OPTIONS\"]\n"
+msgstr " %s init[db] [-D ДИРЕКТОРИЯ-ДАННЫХ] [-s] [-o \"ОПЦИИ\"]\n"
+
+#: pg_ctl.c:1600
+#, c-format
+msgid " %s start [-w] [-t SECS] [-D DATADIR] [-s] [-l FILENAME] [-o \"OPTIONS\"]\n"
+msgstr " %s start [-w] [-t СЕКУНДЫ] [-D ДИРЕКТОРИЯ-ДАННЫХ] [-s] [-l ИМЯ-ФАЙЛА] [-o \"ОПЦИИ\"]\n"
-#: pg_ctl.c:1512
+#: pg_ctl.c:1601
#, c-format
msgid " %s stop [-W] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
-msgstr " %s stop [-W] [-t ] [-D -] [-s] [-m -]\n"
+msgstr " %s stop [-W] [-t СЕКУНДЫ] [-D ДИРЕКТОРИЯ-ДАННЫХ] [-s] [-m РЕЖИМ-ОСТАНОВКИ]\n"
-#: pg_ctl.c:1513
+#: pg_ctl.c:1602
#, c-format
msgid ""
" %s restart [-w] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
" [-o \"OPTIONS\"]\n"
msgstr ""
-" %s restart [-w] [-t ] [-D -] [-s] [-m -]\n"
-" [-o \"\"]\n"
+" %s restart [-w] [-t СЕКУНДЫ] [-D ДИРЕКТОРИЯ-ДАННЫХ] [-s] [-m РЕЖИМ-ОСТАНОВКИ]\n"
+" [-o \"ОПЦИИ\"]\n"
-#: pg_ctl.c:1515
+#: pg_ctl.c:1604
#, c-format
msgid " %s reload [-D DATADIR] [-s]\n"
-msgstr " %s reload [-D -] [-s]\n"
+msgstr " %s reload [-D ДИРЕКТОРИЯ-ДАННЫХ] [-s]\n"
-#: pg_ctl.c:1516
+#: pg_ctl.c:1605
#, c-format
msgid " %s status [-D DATADIR]\n"
-msgstr " %s status [-D -]\n"
+msgstr " %s status [-D ДИРЕКТОРИЯ-ДАННЫХ]\n"
-#: pg_ctl.c:1517
+#: pg_ctl.c:1606
#, c-format
msgid " %s kill SIGNALNAME PID\n"
-msgstr " %s kill - PID\n"
+msgstr " %s kill ИМЯ-СИГНАЛА PID\n"
-#: pg_ctl.c:1519
+#: pg_ctl.c:1608
#, c-format
msgid ""
" %s register [-N SERVICENAME] [-U USERNAME] [-P PASSWORD] [-D DATADIR]\n"
-" [-w] [-t SECS] [-o \"OPTIONS\"]\n"
+" [-S START-TYPE] [-w] [-t SECS] [-o \"OPTIONS\"]\n"
msgstr ""
-" %s register [-N -] [-U -] [-P ] [-D -]\n"
-" [-w] [-t ] [-o \"\"]\n"
+" %s register [-N ИМЯ-СЛУЖБЫ] [-U ИМЯ-ПОЛЬЗОВАТЕЛЯ] [-P ПАРОЛЬ] [-D ДИРЕКТОРИЯ-ДАННЫХ]\n"
+" [-S ТИП-ЗАПУСКА] [-w] [-t СЕКУНДЫ] [-o \"ОПЦИИ\"]\n"
-#: pg_ctl.c:1521
+#: pg_ctl.c:1610
#, c-format
msgid " %s unregister [-N SERVICENAME]\n"
-msgstr " %s unregister [-N -]\n"
+msgstr " %s unregister [-N ИМЯ-СЛУЖБЫ]\n"
-#: pg_ctl.c:1524
+#: pg_ctl.c:1613
#, c-format
msgid ""
"\n"
"Common options:\n"
msgstr ""
"\n"
-" :\n"
+"Опции общего характера:\n"
-#: pg_ctl.c:1525
+#: pg_ctl.c:1614
#, c-format
msgid " -D, --pgdata DATADIR location of the database storage area\n"
-msgstr " -D, --pgdata - \n"
+msgstr " -D, --pgdata ДИРЕКТОРИЯ-ДАННЫХ местонахождение хранилища баз данных\n"
-#: pg_ctl.c:1526
+#: pg_ctl.c:1615
#, c-format
msgid " -s, --silent only print errors, no informational messages\n"
-msgstr ""
-" -s, --silent , "
-"\n"
+msgstr " -s, --silent сообщать только ошибки, исключая информационные сообщения\n"
-#: pg_ctl.c:1527
+#: pg_ctl.c:1616
#, c-format
msgid " -t SECS seconds to wait when using -w option\n"
-msgstr " -t -w\n"
+msgstr " -t СЕКУНДЫ сколько секунд ждать при использовании опции -w\n"
-#: pg_ctl.c:1528
+#: pg_ctl.c:1617
#, c-format
msgid " -w wait until operation completes\n"
-msgstr " -w \n"
+msgstr " -w ждать до завершения операции\n"
-#: pg_ctl.c:1529
+#: pg_ctl.c:1618
#, c-format
msgid " -W do not wait until operation completes\n"
-msgstr " -W \n"
+msgstr " -W не ждать завершения операции\n"
-#: pg_ctl.c:1530
+#: pg_ctl.c:1619
#, c-format
msgid " --help show this help, then exit\n"
-msgstr " --help \n"
+msgstr " --help показать эту подсказку и выйти\n"
-#: pg_ctl.c:1531
+#: pg_ctl.c:1620
#, c-format
msgid " --version output version information, then exit\n"
-msgstr " --version \n"
+msgstr " --version показать версию и выйти\n"
-#: pg_ctl.c:1532
+#: pg_ctl.c:1621
#, c-format
msgid ""
"(The default is to wait for shutdown, but not for start or restart.)\n"
"\n"
msgstr ""
-"( , , "
-"\n"
+"(По умолчанию, ждать завершения остановки, но не в случае запуска или перезапуска\n"
"\n"
-#: pg_ctl.c:1533
+#: pg_ctl.c:1622
#, c-format
msgid "If the -D option is omitted, the environment variable PGDATA is used.\n"
-msgstr ""
-" -D , "
-"PGDATA.\n"
+msgstr "Если опция -D не задана,то будет использоваться переменная окружения PGDATA.\n"
-#: pg_ctl.c:1535
+#: pg_ctl.c:1624
#, c-format
msgid ""
"\n"
"Options for start or restart:\n"
msgstr ""
"\n"
-" :\n"
+"Опции запуска или перезапуска:\n"
+
+#: pg_ctl.c:1626
+#, c-format
+msgid " -c, --core-files allow postgres to produce core files\n"
+msgstr " -c, --core-files разрешить postgres'у генерировать core-файлы\n"
+
+#: pg_ctl.c:1628
+#, c-format
+msgid " -c, --core-files not applicable on this platform\n"
+msgstr " -c, --core-files неприменимо на этой платформе\n"
-#: pg_ctl.c:1536
+#: pg_ctl.c:1630
#, c-format
msgid " -l, --log FILENAME write (or append) server log to FILENAME\n"
-msgstr " -l, --log - ( ) -.\n"
+msgstr " -l, --log ИМЯ-ФАЙЛА записывать (или добавлять) протокол выполнения сервера в ИМЯ-ФАЙЛА.\n"
-#: pg_ctl.c:1537
+#: pg_ctl.c:1631
#, c-format
msgid ""
" -o OPTIONS command line options to pass to postgres\n"
-" (PostgreSQL server executable)\n"
+" (PostgreSQL server executable) or initdb\n"
msgstr ""
-" -o o postgres'\n"
-" ( PostgreSQL)\n"
+" -o OPTIONS опции командной строки для передачи postgres\n"
+" (исполнительный файл сервера PostgreSQL) или initdb\n"
-#: pg_ctl.c:1539
+#: pg_ctl.c:1633
#, c-format
msgid " -p PATH-TO-POSTGRES normally not necessary\n"
-msgstr " -p --POSTGRES \n"
+msgstr " -p ПУТЬ-К-POSTGRES обычно не требуется\n"
-#: pg_ctl.c:1541
-#, c-format
-msgid " -c, --core-files allow postgres to produce core files\n"
-msgstr " -c, --core-files postgres' core-\n"
-
-#: pg_ctl.c:1543
-#, c-format
-msgid " -c, --core-files not applicable on this platform\n"
-msgstr " -c, --core-files \n"
-
-#: pg_ctl.c:1545
+#: pg_ctl.c:1634
#, c-format
msgid ""
"\n"
"Options for stop or restart:\n"
msgstr ""
"\n"
-" :\n"
+"Опции для остановки или перезапуска:\n"
-#: pg_ctl.c:1546
+#: pg_ctl.c:1635
#, c-format
msgid " -m SHUTDOWN-MODE can be \"smart\", \"fast\", or \"immediate\"\n"
-msgstr " -m - \"smart\", \"fast\" \"immediate\"\n"
+msgstr " -m РЕЖИМ-ОСТАНОВКИ может быть \"smart\", \"fast\" или \"immediate\"\n"
-#: pg_ctl.c:1548
+#: pg_ctl.c:1637
#, c-format
msgid ""
"\n"
"Shutdown modes are:\n"
msgstr ""
"\n"
-" :\n"
+"Режимы остановки:\n"
-#: pg_ctl.c:1549
+#: pg_ctl.c:1638
#, c-format
msgid " smart quit after all clients have disconnected\n"
-msgstr " smart \n"
+msgstr " smart закончить работу после отключения всех клиентов\n"
-#: pg_ctl.c:1550
+#: pg_ctl.c:1639
#, c-format
msgid " fast quit directly, with proper shutdown\n"
-msgstr " fast , \n"
+msgstr " fast закончить быстро,но с полноценной остановкой\n"
-#: pg_ctl.c:1551
+#: pg_ctl.c:1640
#, c-format
-msgid ""
-" immediate quit without complete shutdown; will lead to recovery on "
-"restart\n"
+msgid " immediate quit without complete shutdown; will lead to recovery on restart\n"
msgstr ""
-" immediate ; ģ \n"
-" \n"
+" immediate выйти немедленно без полноценной остановки; приведёт к\n"
+" восстановлению при перезапуске\n"
-#: pg_ctl.c:1553
+#: pg_ctl.c:1642
#, c-format
msgid ""
"\n"
"Allowed signal names for kill:\n"
msgstr ""
"\n"
-"ۣ kill:\n"
+"Разрешённые названия сигналов для команды kill:\n"
-#: pg_ctl.c:1557
+#: pg_ctl.c:1646
#, c-format
msgid ""
"\n"
"Options for register and unregister:\n"
msgstr ""
"\n"
-" :\n"
+"Опции для регистрации и снятия с регистрации:\n"
-#: pg_ctl.c:1558
+#: pg_ctl.c:1647
#, c-format
-msgid ""
-" -N SERVICENAME service name with which to register PostgreSQL server\n"
-msgstr " -N - PostgreSQL\n"
+msgid " -N SERVICENAME service name with which to register PostgreSQL server\n"
+msgstr " -N ИМЯ-СЛУЖБЫ имя службы для регистрации сервера PostgreSQL\n"
-#: pg_ctl.c:1559
+#: pg_ctl.c:1648
#, c-format
msgid " -P PASSWORD password of account to register PostgreSQL server\n"
-msgstr " -P PostgreSQL\n"
+msgstr " -P ПАРОЛЬ пароль аккаунта для регистрации сервера PostgreSQL\n"
-#: pg_ctl.c:1560
+#: pg_ctl.c:1649
#, c-format
msgid " -U USERNAME user name of account to register PostgreSQL server\n"
-msgstr " -U - PostgreSQL\n"
+msgstr " -U ИМЯ-ПОЛЬЗОВАТЕЛЯ имя пользователя для регистрации сервера PostgreSQL\n"
+
+#: pg_ctl.c:1650
+#, c-format
+msgid " -S START-TYPE service start type to register PostgreSQL server\n"
+msgstr " -S ТИП-ЗАПУСКА тип запуска службы для регистрации сервера PostgreSQL\n"
+
+#: pg_ctl.c:1652
+#, c-format
+msgid ""
+"\n"
+"Start types are:\n"
+msgstr ""
+"\n"
+"Типы запуска:\n"
+
+#: pg_ctl.c:1653
+#, c-format
+msgid " auto start service automatically during system startup (default)\n"
+msgstr " auto запускать сервис автоматически при старте системы (по умолчанию)\n"
+
+#: pg_ctl.c:1654
+#, c-format
+msgid " demand start service on demand\n"
+msgstr " demand запускать сервис по требованию\n"
-#: pg_ctl.c:1563
+#: pg_ctl.c:1657
#, c-format
msgid ""
"\n"
"Report bugs to <pgsql-bugs@postgresql.org>.\n"
msgstr ""
"\n"
-" <pgsql-bugs@postgresql.org>.\n"
+"Посылать сообщения об ошибках на адрес <pgsql-bugs@postgresql.org>.\n"
-#: pg_ctl.c:1588
+#: pg_ctl.c:1682
#, c-format
msgid "%s: unrecognized shutdown mode \"%s\"\n"
-msgstr "%s: \"%s\"\n"
+msgstr "%s: неизвестный режим остановки \"%s\"\n"
-#: pg_ctl.c:1621
+#: pg_ctl.c:1715
#, c-format
msgid "%s: unrecognized signal name \"%s\"\n"
-msgstr "%s: \"%s\"\n"
+msgstr "%s: нераспознанное имя сигнала \"%s\"\n"
+
+#: pg_ctl.c:1732
+#, c-format
+msgid "%s: unrecognized start type \"%s\"\n"
+msgstr "%s: нераспознанный тип запуска \"%s\"\n"
-#: pg_ctl.c:1686
+#: pg_ctl.c:1796
#, c-format
msgid ""
"%s: cannot be run as root\n"
"Please log in (using, e.g., \"su\") as the (unprivileged) user that will\n"
"own the server process.\n"
msgstr ""
-"%s: root\n"
-", "
-"(, \"su\"),\n"
-" .\n"
+"%s: нельзя выполнять под пользователем root\n"
+"Пожалуйста, войдите в систему как непривилегированный пользователь (например, используя \"su\"),\n"
+"под которым будет выполняться серверный процесс.\n"
-#: pg_ctl.c:1795
+#: pg_ctl.c:1867
+#, c-format
+msgid "%s: -S option not supported on this platform\n"
+msgstr "%s: опция -S не поддерживается на данной платформе\n"
+
+#: pg_ctl.c:1914
#, c-format
msgid "%s: too many command-line arguments (first is \"%s\")\n"
-msgstr "%s: (: \"%s\")\n"
+msgstr "%s: слишком много аргументов командной строки (первый: \"%s\")\n"
-#: pg_ctl.c:1814
+#: pg_ctl.c:1936
#, c-format
msgid "%s: missing arguments for kill mode\n"
-msgstr "%s: kill\n"
+msgstr "%s: отсутствуют аргументы для режима kill\n"
-#: pg_ctl.c:1832
+#: pg_ctl.c:1954
#, c-format
msgid "%s: unrecognized operation mode \"%s\"\n"
-msgstr "%s: \"%s\"\n"
+msgstr "%s: нераспознанный режим работы \"%s\"\n"
-#: pg_ctl.c:1842
+#: pg_ctl.c:1964
#, c-format
msgid "%s: no operation specified\n"
-msgstr "%s: \n"
+msgstr "%s: команда не указана\n"
-#: pg_ctl.c:1858
+#: pg_ctl.c:1980
#, c-format
-msgid ""
-"%s: no database directory specified and environment variable PGDATA unset\n"
-msgstr ""
-"%s: PGDATA "
-"\n"
+msgid "%s: no database directory specified and environment variable PGDATA unset\n"
+msgstr "%s: директория баз данных не указана и переменная окружения PGDATA не установлена\n"
-#: ../../port/exec.c:195 ../../port/exec.c:309 ../../port/exec.c:352
+#: ../../port/exec.c:125
+#: ../../port/exec.c:239
+#: ../../port/exec.c:282
#, c-format
msgid "could not identify current directory: %s"
-msgstr " : %s"
+msgstr "не удалось определить текущую директорию: %s"
-#: ../../port/exec.c:214
+#: ../../port/exec.c:144
#, c-format
msgid "invalid binary \"%s\""
-msgstr " \"%s\""
+msgstr "неверный бинарный \"%s\""
-#: ../../port/exec.c:263
+#: ../../port/exec.c:193
#, c-format
msgid "could not read binary \"%s\""
-msgstr " \"%s\""
+msgstr "не удалось считать бинарный \"%s\""
-#: ../../port/exec.c:270
+#: ../../port/exec.c:200
#, c-format
msgid "could not find a \"%s\" to execute"
-msgstr "\"%s\" "
+msgstr "\"%s\" не найден для выполнения"
-#: ../../port/exec.c:325 ../../port/exec.c:361
+#: ../../port/exec.c:255
+#: ../../port/exec.c:291
#, c-format
msgid "could not change directory to \"%s\""
-msgstr " \"%s\""
+msgstr "не удалось поменять директорию на \"%s\""
-#: ../../port/exec.c:340
+#: ../../port/exec.c:270
#, c-format
msgid "could not read symbolic link \"%s\""
-msgstr " \"%s\""
+msgstr "не получилось считать ссылку \"%s\""
-#: ../../port/exec.c:586
+#: ../../port/exec.c:516
#, c-format
msgid "child process exited with exit code %d"
-msgstr " %d"
+msgstr "дочерний процесс завершился с кодом возврата %d"
-#: ../../port/exec.c:590
+#: ../../port/exec.c:520
#, c-format
msgid "child process was terminated by exception 0x%X"
-msgstr " ۣ 0x%X"
+msgstr "дочерний процесс завершён исключением 0x%X"
-#: ../../port/exec.c:599
+#: ../../port/exec.c:529
#, c-format
msgid "child process was terminated by signal %s"
-msgstr " ۣ %s"
+msgstr "дочерний процесс завершён сигналом %s"
-#: ../../port/exec.c:602
+#: ../../port/exec.c:532
#, c-format
msgid "child process was terminated by signal %d"
-msgstr " %d"
+msgstr "дочерний процесс был завершен сигналом %d"
-#: ../../port/exec.c:606
+#: ../../port/exec.c:536
#, c-format
msgid "child process exited with unrecognized status %d"
-msgstr " %d"
+msgstr "дочерний процесс завершился с нераспознанным статусом %d"
+#~ msgid "could not start server\n"
+#~ msgstr "не удалось запустить сервер\n"
#~ msgid "%s: neither postmaster nor postgres running\n"
-#~ msgstr "%s: postmaster, postgres\n"
-
+#~ msgstr "%s: не выполняются ни postmaster, ни postgres\n"
#~ msgid "%s: a standalone backend \"postgres\" is running (PID: %ld)\n"
-#~ msgstr "%s: \"postgres\" (PID: %ld)\n"
-
+#~ msgstr "%s: выполняется независимый процесс \"postgres\" (PID: %ld)\n"
#~ msgid "%s: invalid option %s\n"
-#~ msgstr "%s: %s\n"
+#~ msgstr "%s: неверная опция %s\n"
+
diff --git a/src/bin/pg_ctl/po/tr.po b/src/bin/pg_ctl/po/tr.po
index ac834c37dd..74343c3712 100644
--- a/src/bin/pg_ctl/po/tr.po
+++ b/src/bin/pg_ctl/po/tr.po
@@ -5,9 +5,9 @@ msgid ""
msgstr ""
"Project-Id-Version: pg_ctl-tr\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2009-04-29 07:18+0000\n"
-"PO-Revision-Date: 2009-04-29 16:32+0200\n"
-"Last-Translator: Devrim GÜNDÜZ <devrim@commandprompt.com>\n"
+"POT-Creation-Date: 2010-08-31 20:08+0000\n"
+"PO-Revision-Date: 2010-09-01 11:15+0200\n"
+"Last-Translator: Devrim GÜNDÜZ <devrim@gunduz.org>\n"
"Language-Team: Turkish <ceviri@postgresql.org.tr>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -16,71 +16,77 @@ msgstr ""
"X-Poedit-Language: Turkish\n"
"X-Poedit-Country: TURKEY\n"
-#: pg_ctl.c:223
-#: pg_ctl.c:238
-#: pg_ctl.c:1774
+#: pg_ctl.c:225
+#: pg_ctl.c:240
+#: pg_ctl.c:1834
#, c-format
msgid "%s: out of memory\n"
msgstr "%s: yetersiz bellek\n"
-#: pg_ctl.c:272
+#: pg_ctl.c:274
#, c-format
msgid "%s: could not open PID file \"%s\": %s\n"
msgstr "%s: \"%s\" PID dosyası açılamadı: %s\n"
-#: pg_ctl.c:279
+#: pg_ctl.c:281
#, c-format
msgid "%s: invalid data in PID file \"%s\"\n"
msgstr "%s: \"%s\" PID dosyasında geçersiz veri\n"
-#: pg_ctl.c:555
+#: pg_ctl.c:557
#, c-format
msgid "%s: cannot set core file size limit; disallowed by hard limit\n"
msgstr "%s: core boyutu ayarlanamadı; hard limit tarafından sınırlanmış.\n"
-#: pg_ctl.c:580
+#: pg_ctl.c:582
#, c-format
msgid "%s: could not read file \"%s\"\n"
msgstr "%s: \"%s\" dosyası okunamadı\n"
-#: pg_ctl.c:585
+#: pg_ctl.c:587
#, c-format
msgid "%s: option file \"%s\" must have exactly one line\n"
msgstr "%s: \"%s\" seçenek dosyası sadece 1 satır olmalıdır\n"
-#: pg_ctl.c:627
-#, c-format
-msgid "%s: another server might be running; trying to start server anyway\n"
-msgstr "%s: başka bir sunucu çalışıyor olabilir; yine de başlatmaya çalışılıyor.\n"
-
-#: pg_ctl.c:654
+#: pg_ctl.c:635
#, c-format
msgid ""
-"The program \"postgres\" is needed by %s but was not found in the\n"
+"The program \"%s\" is needed by %s but was not found in the\n"
"same directory as \"%s\".\n"
"Check your installation.\n"
msgstr ""
-"\"postgres\" programına %s tarafından gereksinim duyuluyor ancak \n"
+"\"%s\" programına %s tarafından gereksinim duyuluyor, ancak \n"
"\"%s\" ile aynı dizinde bulunamadı.\n"
"Kurulumunuzu kontrol ediniz.\n"
-#: pg_ctl.c:660
+#: pg_ctl.c:641
#, c-format
msgid ""
-"The program \"postgres\" was found by \"%s\"\n"
+"The program \"%s\" was found by \"%s\"\n"
"but was not the same version as %s.\n"
"Check your installation.\n"
msgstr ""
-"\"postgres\" programı \"%s\" tarafından\n"
+"\"%s\" programı \"%s\" tarafından\n"
"bulundu ancak %s ile aynı sürüm numarasına sahip değil.\n"
"Kurulumunuzu kontrol ediniz.\n"
-#: pg_ctl.c:677
+#: pg_ctl.c:674
+#, c-format
+msgid "%s: database system initialization failed\n"
+msgstr "%s: veritabanı ilklendirme başarısız oldu\n"
+
+#: pg_ctl.c:690
+#, c-format
+msgid "%s: another server might be running; trying to start server anyway\n"
+msgstr "%s: başka bir sunucu çalışıyor olabilir; yine de başlatmaya çalışılıyor.\n"
+
+#: pg_ctl.c:727
#, c-format
msgid "%s: could not start server: exit code was %d\n"
msgstr "%s: sunucu başlatılamadı: çıkış kodu: %d\n"
-#: pg_ctl.c:688
+#: pg_ctl.c:738
+#: pg_ctl.c:751
#, c-format
msgid ""
"%s: could not start server\n"
@@ -89,59 +95,54 @@ msgstr ""
"%s: sunucu başlatılamadı\n"
"Kayıt dosyasını inceleyiniz\n"
-#: pg_ctl.c:697
+#: pg_ctl.c:747
msgid "waiting for server to start..."
msgstr "sunucunun başlaması bekleniyor..."
-#: pg_ctl.c:701
-#, c-format
-msgid "could not start server\n"
-msgstr "sunucu başlatılamadı\n"
-
-#: pg_ctl.c:706
-#: pg_ctl.c:779
-#: pg_ctl.c:859
+#: pg_ctl.c:758
+#: pg_ctl.c:831
+#: pg_ctl.c:911
msgid " done\n"
msgstr " tamam\n"
-#: pg_ctl.c:707
+#: pg_ctl.c:759
msgid "server started\n"
msgstr "sunucu başlatıldı\n"
-#: pg_ctl.c:711
+#: pg_ctl.c:763
msgid "server starting\n"
msgstr "sunucu başlıyor\n"
-#: pg_ctl.c:726
-#: pg_ctl.c:801
-#: pg_ctl.c:881
+#: pg_ctl.c:778
+#: pg_ctl.c:853
+#: pg_ctl.c:933
#, c-format
msgid "%s: PID file \"%s\" does not exist\n"
msgstr "%s: \"%s\" PID dosyası bulunamadı\n"
-#: pg_ctl.c:727
-#: pg_ctl.c:803
-#: pg_ctl.c:882
+#: pg_ctl.c:779
+#: pg_ctl.c:855
+#: pg_ctl.c:934
msgid "Is server running?\n"
msgstr "sunucu çalışıyor mu?\n"
-#: pg_ctl.c:733
+#: pg_ctl.c:785
#, c-format
msgid "%s: cannot stop server; single-user server is running (PID: %ld)\n"
msgstr "%s: sunucu durdurulamadı; tek kullanıcılı sunucu çalışıyor (PID: %ld)\n"
-#: pg_ctl.c:741
-#: pg_ctl.c:825
+#: pg_ctl.c:793
+#: pg_ctl.c:877
#, c-format
msgid "%s: could not send stop signal (PID: %ld): %s\n"
msgstr "%s:durdurma sinyali başarısız oldu (PID: %ld): %s\n"
-#: pg_ctl.c:748
+#: pg_ctl.c:800
msgid "server shutting down\n"
msgstr "sunucu kapatılıyor\n"
-#: pg_ctl.c:755
-#: pg_ctl.c:832
+#: pg_ctl.c:807
+#: pg_ctl.c:884
msgid ""
"WARNING: online backup mode is active\n"
"Shutdown will not complete until pg_stop_backup() is called.\n"
@@ -151,146 +152,145 @@ msgstr ""
"pg_stop_backup() çalıştırılmadam sunucu kapatılmayacaktır.\n"
"\n"
-#: pg_ctl.c:759
-#: pg_ctl.c:836
+#: pg_ctl.c:811
+#: pg_ctl.c:888
msgid "waiting for server to shut down..."
msgstr "sunucunun kapanması bekleniyor..."
-#: pg_ctl.c:774
-#: pg_ctl.c:853
+#: pg_ctl.c:826
+#: pg_ctl.c:905
msgid " failed\n"
msgstr " başarısız oldu\n"
-#: pg_ctl.c:776
-#: pg_ctl.c:855
+#: pg_ctl.c:828
+#: pg_ctl.c:907
#, c-format
msgid "%s: server does not shut down\n"
msgstr "%s: sunucu kapanmıyor\n"
-#: pg_ctl.c:781
-#: pg_ctl.c:860
-#, c-format
+#: pg_ctl.c:833
+#: pg_ctl.c:912
msgid "server stopped\n"
msgstr "sunucu durduruldu\n"
-#: pg_ctl.c:804
-#: pg_ctl.c:866
+#: pg_ctl.c:856
+#: pg_ctl.c:918
msgid "starting server anyway\n"
msgstr "sunucu yine de başlatılıyor\n"
-#: pg_ctl.c:813
+#: pg_ctl.c:865
#, c-format
msgid "%s: cannot restart server; single-user server is running (PID: %ld)\n"
msgstr "%s: sunucu başlatılamadı; tek kullanıcılı sunucu çalışıyor (PID: %ld)\n"
-#: pg_ctl.c:816
-#: pg_ctl.c:891
+#: pg_ctl.c:868
+#: pg_ctl.c:943
msgid "Please terminate the single-user server and try again.\n"
msgstr "Lütfen tek kullanıcılı sunucuyu durdurun ve yeniden deneyin.\n"
-#: pg_ctl.c:864
+#: pg_ctl.c:916
#, c-format
msgid "%s: old server process (PID: %ld) seems to be gone\n"
msgstr "%s: eski sunucu süreci (PID: %ld) kaybolmuştur\n"
-#: pg_ctl.c:888
+#: pg_ctl.c:940
#, c-format
msgid "%s: cannot reload server; single-user server is running (PID: %ld)\n"
msgstr "%s: sunucu yeniden yüklenemedi, tek kullanıcılı sunucu çalışıyor (PID: %ld)\n"
-#: pg_ctl.c:897
+#: pg_ctl.c:949
#, c-format
msgid "%s: could not send reload signal (PID: %ld): %s\n"
msgstr "%s: yeniden yükleme sinyali gönderilemedi (PID: %ld): %s\n"
-#: pg_ctl.c:902
+#: pg_ctl.c:954
msgid "server signaled\n"
msgstr "sunucuya sinyal gönderildi\n"
-#: pg_ctl.c:946
+#: pg_ctl.c:998
#, c-format
msgid "%s: single-user server is running (PID: %ld)\n"
msgstr "%s: sunucu, tek kullanıcı biçiminde çalışıyor (PID: %ld)\n"
-#: pg_ctl.c:958
+#: pg_ctl.c:1010
#, c-format
msgid "%s: server is running (PID: %ld)\n"
msgstr "%s: sunucu çalışıyor (PID: %ld)\n"
-#: pg_ctl.c:969
+#: pg_ctl.c:1021
#, c-format
msgid "%s: no server running\n"
msgstr "%s: çalışan sunucu yok\n"
-#: pg_ctl.c:980
+#: pg_ctl.c:1032
#, c-format
msgid "%s: could not send signal %d (PID: %ld): %s\n"
msgstr "%s: %d reload sinyali gönderilemedi (PID: %ld): %s\n"
-#: pg_ctl.c:1014
+#: pg_ctl.c:1066
#, c-format
msgid "%s: could not find own program executable\n"
msgstr "%s:Çalıştırılabilir dosya bulunamadı\n"
-#: pg_ctl.c:1024
+#: pg_ctl.c:1076
#, c-format
msgid "%s: could not find postgres program executable\n"
msgstr "%s: çalıştırılabilir postgres programı bulunamadı\n"
-#: pg_ctl.c:1082
-#: pg_ctl.c:1114
+#: pg_ctl.c:1138
+#: pg_ctl.c:1170
#, c-format
msgid "%s: could not open service manager\n"
msgstr "%s: servis yöneticisi açılamadı\n"
-#: pg_ctl.c:1088
+#: pg_ctl.c:1144
#, c-format
msgid "%s: service \"%s\" already registered\n"
msgstr "%s: \"%s\" servisi daha önce kaydedilmiştir\n"
-#: pg_ctl.c:1099
+#: pg_ctl.c:1155
#, c-format
msgid "%s: could not register service \"%s\": error code %d\n"
msgstr "%s: \"%s\" servisi kaydedilemedi: Hata kodu %d\n"
-#: pg_ctl.c:1120
+#: pg_ctl.c:1176
#, c-format
msgid "%s: service \"%s\" not registered\n"
msgstr "%s: \"%s\" servisi kayıtlı değil\n"
-#: pg_ctl.c:1127
+#: pg_ctl.c:1183
#, c-format
msgid "%s: could not open service \"%s\": error code %d\n"
msgstr "%s: \"%s\" servisi açılamadı: Hata kodu %d\n"
-#: pg_ctl.c:1134
+#: pg_ctl.c:1190
#, c-format
msgid "%s: could not unregister service \"%s\": error code %d\n"
msgstr "%s: \"%s\" servisi kaydedilemedi: Hata kodu %d\n"
-#: pg_ctl.c:1220
+#: pg_ctl.c:1276
msgid "Waiting for server startup...\n"
msgstr "Sunucunun başlaması bekleniyor...\n"
-#: pg_ctl.c:1223
+#: pg_ctl.c:1279
msgid "Timed out waiting for server startup\n"
msgstr "Sunucu başlarken zaman aşımı oldu\n"
-#: pg_ctl.c:1227
+#: pg_ctl.c:1283
msgid "Server started and accepting connections\n"
msgstr "Sunucu başladı ve bağlantı kabul ediyor\n"
-#: pg_ctl.c:1277
+#: pg_ctl.c:1333
#, c-format
msgid "%s: could not start service \"%s\": error code %d\n"
msgstr "%s: \"%s\" servisi başlatılamadı: Hata kodu %d\n"
-#: pg_ctl.c:1509
+#: pg_ctl.c:1568
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "Daha fazla bilgi için \"%s --help\" komutunu kullanabilirsiniz.\n"
-#: pg_ctl.c:1517
+#: pg_ctl.c:1576
#, c-format
msgid ""
"%s is a utility to start, stop, restart, reload configuration files,\n"
@@ -301,44 +301,49 @@ msgstr ""
"PostgreSQL sunucusunun durumunu bildirmek, ya da PostgreSQL sürecini öldürmek için bir yardımcı programdır\n"
"\n"
-#: pg_ctl.c:1519
+#: pg_ctl.c:1578
#, c-format
msgid "Usage:\n"
msgstr "Kullanımı:\n"
-#: pg_ctl.c:1520
+#: pg_ctl.c:1579
+#, c-format
+msgid " %s init[db] [-D DATADIR] [-s] [-o \"OPTIONS\"]\n"
+msgstr " %s init[db] [-D VERİ_DİZİNİ] [-s] [-o \"SEÇENEKLER\"]\n"
+
+#: pg_ctl.c:1580
#, c-format
msgid " %s start [-w] [-t SECS] [-D DATADIR] [-s] [-l FILENAME] [-o \"OPTIONS\"]\n"
msgstr " %s start [-w] [-t saniye] [-D VERİ_DİZİNİ] [-s] [-l DOSYA_ADI] [-o \"SEÇENEKLER\"]\n"
-#: pg_ctl.c:1521
+#: pg_ctl.c:1581
#, c-format
msgid " %s stop [-W] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
msgstr " %s stop [-W] [-t saniye] [-D veri dizini] [-s] [-m kapatma modu]\n"
-#: pg_ctl.c:1522
+#: pg_ctl.c:1582
#, c-format
msgid ""
" %s restart [-w] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
" [-o \"OPTIONS\"]\n"
msgstr " %s restart [-w] [-t saniye] [-D veri dizini] [-s] [-m kapatma modu] [-o \"seçenekler\"]\n"
-#: pg_ctl.c:1524
+#: pg_ctl.c:1584
#, c-format
msgid " %s reload [-D DATADIR] [-s]\n"
msgstr " %s reload [-D VERİ_DİZİNİ] [-s]\n"
-#: pg_ctl.c:1525
+#: pg_ctl.c:1585
#, c-format
msgid " %s status [-D DATADIR]\n"
msgstr " %s status [-D VERİ_DİZİNİ]\n"
-#: pg_ctl.c:1526
+#: pg_ctl.c:1586
#, c-format
msgid " %s kill SIGNALNAME PID\n"
msgstr " %s kill SİNYAL_ADI SÜREÇ_NUMARASI\n"
-#: pg_ctl.c:1528
+#: pg_ctl.c:1588
#, c-format
msgid ""
" %s register [-N SERVICENAME] [-U USERNAME] [-P PASSWORD] [-D DATADIR]\n"
@@ -347,12 +352,12 @@ msgstr ""
" %s register [-N servis adı] [-U kullanıcı adı] [-P şifre] [-D veri dizini]\n"
" [-w] ]-t saniye] [-o \"seçenekler\"]\n"
-#: pg_ctl.c:1530
+#: pg_ctl.c:1590
#, c-format
msgid " %s unregister [-N SERVICENAME]\n"
msgstr " %s unregister [-N SERVİS_ADI]\n"
-#: pg_ctl.c:1533
+#: pg_ctl.c:1593
#, c-format
msgid ""
"\n"
@@ -361,42 +366,42 @@ msgstr ""
"\n"
"Ortak seçenekler:\n"
-#: pg_ctl.c:1534
+#: pg_ctl.c:1594
#, c-format
msgid " -D, --pgdata DATADIR location of the database storage area\n"
msgstr " -D, --pgdata VERİ_DİZİNİ verinin tutulacağı alan\n"
-#: pg_ctl.c:1535
+#: pg_ctl.c:1595
#, c-format
msgid " -s, --silent only print errors, no informational messages\n"
msgstr " -s, --silent sadece hataları yazar, hiç bir bilgi mesajı yazmaz\n"
-#: pg_ctl.c:1536
+#: pg_ctl.c:1596
#, c-format
msgid " -t SECS seconds to wait when using -w option\n"
msgstr " -t SECS -w seçeneğini kullanırken beklenecek süre\n"
-#: pg_ctl.c:1537
+#: pg_ctl.c:1597
#, c-format
msgid " -w wait until operation completes\n"
msgstr " -w işlem bitene kadar bekle\n"
-#: pg_ctl.c:1538
+#: pg_ctl.c:1598
#, c-format
msgid " -W do not wait until operation completes\n"
msgstr " -W işlem bitene kadar bekleme\n"
-#: pg_ctl.c:1539
+#: pg_ctl.c:1599
#, c-format
msgid " --help show this help, then exit\n"
msgstr " --help Bu yardımı göster ve çık\n"
-#: pg_ctl.c:1540
+#: pg_ctl.c:1600
#, c-format
msgid " --version output version information, then exit\n"
msgstr " --version sürüm numarasını yazar ve çıkar\n"
-#: pg_ctl.c:1541
+#: pg_ctl.c:1601
#, c-format
msgid ""
"(The default is to wait for shutdown, but not for start or restart.)\n"
@@ -405,12 +410,12 @@ msgstr ""
"(Ön tanımlı işlem kapanmak için beklemektir; başlamak ya da yeniden başlamak değildir.)\n"
"\n"
-#: pg_ctl.c:1542
+#: pg_ctl.c:1602
#, c-format
msgid "If the -D option is omitted, the environment variable PGDATA is used.\n"
msgstr "Eğer -D seçeneği gözardı edilirse, PGDATA çevresel değişkeni kullanılacaktır.\n"
-#: pg_ctl.c:1544
+#: pg_ctl.c:1604
#, c-format
msgid ""
"\n"
@@ -419,36 +424,36 @@ msgstr ""
"\n"
"Başlamak ya da yeniden başlamak için seçenekler:\n"
-#: pg_ctl.c:1546
+#: pg_ctl.c:1606
#, c-format
msgid " -c, --core-files allow postgres to produce core files\n"
msgstr " -c, --core-files postgres'in core dosyaları oluşturmasına izin ver\n"
-#: pg_ctl.c:1548
+#: pg_ctl.c:1608
#, c-format
msgid " -c, --core-files not applicable on this platform\n"
msgstr " -c, --core-files bu platformda uygulanmaz\n"
-#: pg_ctl.c:1550
+#: pg_ctl.c:1610
#, c-format
msgid " -l, --log FILENAME write (or append) server log to FILENAME\n"
msgstr " -l, --log DOSYA_ADI Sunucu loglarını DOSYA_ADI dosyasına yaz (ya da dosyanın sonuna ekle).\n"
-#: pg_ctl.c:1551
+#: pg_ctl.c:1611
#, c-format
msgid ""
" -o OPTIONS command line options to pass to postgres\n"
-" (PostgreSQL server executable)\n"
+" (PostgreSQL server executable) or initdb\n"
msgstr ""
-" -o SEÇENEKLER postmaster'a geçilecek komut satırı seçenekleri\n"
-" (PostgreSQL sunucusu çalıştırılabilir dosyası)\n"
+" -o SEÇENEKLER postgres'e (PostgreSQL sunucusu çalıştırılabilir dosyası)\n"
+" ya da initdb'ye geçilecek komut satırı seçenekleri\n"
-#: pg_ctl.c:1553
+#: pg_ctl.c:1613
#, c-format
msgid " -p PATH-TO-POSTGRES normally not necessary\n"
msgstr " -p PATH-TO-POSTGRES normalde gerekli değildir\n"
-#: pg_ctl.c:1554
+#: pg_ctl.c:1614
#, c-format
msgid ""
"\n"
@@ -457,12 +462,12 @@ msgstr ""
"\n"
"Başlatmak ya da yeniden başlatmak için seçenekler:\n"
-#: pg_ctl.c:1555
+#: pg_ctl.c:1615
#, c-format
msgid " -m SHUTDOWN-MODE can be \"smart\", \"fast\", or \"immediate\"\n"
msgstr " -m KAPANMA-MODU \"smart\", \"fast\", veya \"immediate\" olabilir\n"
-#: pg_ctl.c:1557
+#: pg_ctl.c:1617
#, c-format
msgid ""
"\n"
@@ -471,22 +476,22 @@ msgstr ""
"\n"
"Kapatma modları:\n"
-#: pg_ctl.c:1558
+#: pg_ctl.c:1618
#, c-format
msgid " smart quit after all clients have disconnected\n"
msgstr " smart tüm istemciler bağlantılarını kestikten sonra dur\n"
-#: pg_ctl.c:1559
+#: pg_ctl.c:1619
#, c-format
msgid " fast quit directly, with proper shutdown\n"
msgstr " fast düzgünce kapanmadan direk olarak dur\n"
-#: pg_ctl.c:1560
+#: pg_ctl.c:1620
#, c-format
msgid " immediate quit without complete shutdown; will lead to recovery on restart\n"
msgstr " immediate tam bir kapanma gerçekleşmeden dur; yeniden başladığında kurtarma modunda açılır\n"
-#: pg_ctl.c:1562
+#: pg_ctl.c:1622
#, c-format
msgid ""
"\n"
@@ -495,7 +500,7 @@ msgstr ""
"\n"
"kill için izin verilen sinyal adları:\n"
-#: pg_ctl.c:1566
+#: pg_ctl.c:1626
#, c-format
msgid ""
"\n"
@@ -504,22 +509,22 @@ msgstr ""
"\n"
"Kaydetmek ya da kaydı silmek için seçenekler:\n"
-#: pg_ctl.c:1567
+#: pg_ctl.c:1627
#, c-format
msgid " -N SERVICENAME service name with which to register PostgreSQL server\n"
msgstr " -N SERVICENAME PostgreSQL sunucusunu kaydedeceğiniz servis adı\n"
-#: pg_ctl.c:1568
+#: pg_ctl.c:1628
#, c-format
msgid " -P PASSWORD password of account to register PostgreSQL server\n"
msgstr " -P PASSWORD PostgreSQL sunucusunu kaydetmek için hesabın şifresi\n"
-#: pg_ctl.c:1569
+#: pg_ctl.c:1629
#, c-format
msgid " -U USERNAME user name of account to register PostgreSQL server\n"
msgstr " -U USERNAME PostgreSQL sunucusunu kaydetmek için gerekli kullanıcı adı\n"
-#: pg_ctl.c:1572
+#: pg_ctl.c:1632
#, c-format
msgid ""
"\n"
@@ -528,17 +533,17 @@ msgstr ""
"\n"
"Hataları <pgsql-bugs@postgresql.org> adresine bildiriniz.\n"
-#: pg_ctl.c:1597
+#: pg_ctl.c:1657
#, c-format
msgid "%s: unrecognized shutdown mode \"%s\"\n"
msgstr "%s: geçersiz kapanma modu \"%s\"\n"
-#: pg_ctl.c:1630
+#: pg_ctl.c:1690
#, c-format
msgid "%s: unrecognized signal name \"%s\"\n"
msgstr "%s: geçersiz sinyal adı \"%s\"\n"
-#: pg_ctl.c:1695
+#: pg_ctl.c:1755
#, c-format
msgid ""
"%s: cannot be run as root\n"
@@ -549,86 +554,88 @@ msgstr ""
"Lütfen (yani \"su\" kullanarak) sunucu sürecine sahip olacak (yetkisiz) kullanıcı\n"
"ile sisteme giriş yapınız.\n"
-#: pg_ctl.c:1804
+#: pg_ctl.c:1864
#, c-format
msgid "%s: too many command-line arguments (first is \"%s\")\n"
msgstr "%s: çok fazla komut satırı argümanı (ilki : \"%s\")\n"
-#: pg_ctl.c:1823
+#: pg_ctl.c:1886
#, c-format
msgid "%s: missing arguments for kill mode\n"
msgstr "%s: kill modu için eksik argümanlar\n"
-#: pg_ctl.c:1841
+#: pg_ctl.c:1904
#, c-format
msgid "%s: unrecognized operation mode \"%s\"\n"
msgstr "%s: geçersiz işlem modu \"%s\"\n"
-#: pg_ctl.c:1851
+#: pg_ctl.c:1914
#, c-format
msgid "%s: no operation specified\n"
msgstr "%s: hiçbir işlem belirtilmedi\n"
-#: pg_ctl.c:1867
+#: pg_ctl.c:1930
#, c-format
msgid "%s: no database directory specified and environment variable PGDATA unset\n"
msgstr "%s: Hiçbir veritabanı dizini belirtilmemiş ve PGDATA çevresel değişkeni boş\n"
-#: ../../port/exec.c:195
-#: ../../port/exec.c:309
-#: ../../port/exec.c:352
+#: ../../port/exec.c:125
+#: ../../port/exec.c:239
+#: ../../port/exec.c:282
#, c-format
msgid "could not identify current directory: %s"
msgstr "geçerli dizin tespit edilemedi: %s"
-#: ../../port/exec.c:214
+#: ../../port/exec.c:144
#, c-format
msgid "invalid binary \"%s\""
msgstr "geçersiz ikili (binary) \"%s\""
-#: ../../port/exec.c:263
+#: ../../port/exec.c:193
#, c-format
msgid "could not read binary \"%s\""
msgstr "\"%s\" ikili (binary) dosyası okunamadı"
-#: ../../port/exec.c:270
+#: ../../port/exec.c:200
#, c-format
msgid "could not find a \"%s\" to execute"
msgstr "\"%s\" çalıştırmak için bulunamadı"
-#: ../../port/exec.c:325
-#: ../../port/exec.c:361
+#: ../../port/exec.c:255
+#: ../../port/exec.c:291
#, c-format
msgid "could not change directory to \"%s\""
msgstr "çalışma dizini \"%s\" olarak değiştirilemedi"
-#: ../../port/exec.c:340
+#: ../../port/exec.c:270
#, c-format
msgid "could not read symbolic link \"%s\""
msgstr "symbolic link \"%s\" okuma hatası"
-#: ../../port/exec.c:586
+#: ../../port/exec.c:516
#, c-format
msgid "child process exited with exit code %d"
msgstr "alt süreç %d çıkış koduyla sonuçlandırılmıştır"
-#: ../../port/exec.c:590
+#: ../../port/exec.c:520
#, c-format
msgid "child process was terminated by exception 0x%X"
msgstr "alt süreç 0x%X exception tarafından sonlandırılmıştır"
-#: ../../port/exec.c:599
+#: ../../port/exec.c:529
#, c-format
msgid "child process was terminated by signal %s"
msgstr "alt süreç %s sinyali tarafından sonlandırılmıştır"
-#: ../../port/exec.c:602
+#: ../../port/exec.c:532
#, c-format
msgid "child process was terminated by signal %d"
msgstr "alt süreç %d sinyali tarafından sonlandırılmıştır"
-#: ../../port/exec.c:606
+#: ../../port/exec.c:536
#, c-format
msgid "child process exited with unrecognized status %d"
msgstr "alt süreç %d bilinmeyen durumu ile sonlandırılmıştır"
+#~ msgid "could not start server\n"
+#~ msgstr "sunucu başlatılamadı\n"
diff --git a/src/bin/pg_ctl/po/zh_CN.po b/src/bin/pg_ctl/po/zh_CN.po
index df1bff8812..7cf6bff1aa 100644
--- a/src/bin/pg_ctl/po/zh_CN.po
+++ b/src/bin/pg_ctl/po/zh_CN.po
@@ -4,658 +4,653 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: PostgreSQL 8.0\n"
+"Project-Id-Version: pg_ctl (PostgreSQL 9.0)\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-02-19 01:59+0000\n"
-"PO-Revision-Date: 2010-03-30 14:02+0800\n"
+"POT-Creation-Date: 2010-10-01 14:41+0000\n"
+"PO-Revision-Date: 2010-10-01 12:49+0800\n"
"Last-Translator: Weibin <ssmei_2000@yahoo.com>\n"
-"Language-Team: Weiping He <laser@imsi.cn>\n"
+"Language-Team: Chinese (Simplified)\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=GB2312\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: pg_ctl.c:223
-#: pg_ctl.c:238
-#: pg_ctl.c:1778
+#: pg_ctl.c:226 pg_ctl.c:241 pg_ctl.c:1851
#, c-format
msgid "%s: out of memory\n"
-msgstr "%s: ڴ\n"
+msgstr "%s: 内存溢出\n"
-#: pg_ctl.c:272
+#: pg_ctl.c:275
#, c-format
msgid "%s: could not open PID file \"%s\": %s\n"
-msgstr "%s: ޷ PID ļ \"%s\": %s\n"
+msgstr "%s: 无法打开 PID 文件 \"%s\": %s\n"
-#: pg_ctl.c:279
+#: pg_ctl.c:282
#, c-format
msgid "%s: invalid data in PID file \"%s\"\n"
-msgstr "%s: PIDļ \"%s\" дЧ\n"
+msgstr "%s: PID文件 \"%s\" 中存在无效数据\n"
-#: pg_ctl.c:555
+#: pg_ctl.c:558
#, c-format
msgid "%s: cannot set core file size limit; disallowed by hard limit\n"
-msgstr "%s: úļС;޶\n"
+msgstr "%s: 不能设置核心文件大小的限制;磁盘限额不允许\n"
-#: pg_ctl.c:580
+#: pg_ctl.c:583
#, c-format
msgid "%s: could not read file \"%s\"\n"
-msgstr "%s: ޷ȡļ \"%s\"\n"
+msgstr "%s: 无法读取文件 \"%s\"\n"
-#: pg_ctl.c:585
+#: pg_ctl.c:588
#, c-format
msgid "%s: option file \"%s\" must have exactly one line\n"
-msgstr "%s: ѡļ \"%s\" ֻһ\n"
+msgstr "%s: 选项文件 \"%s\" 只能有一行\n"
-#: pg_ctl.c:628
-#, c-format
-msgid "%s: another server might be running; trying to start server anyway\n"
-msgstr "%s: ̿; \n"
-
-#: pg_ctl.c:655
+#: pg_ctl.c:636
#, c-format
msgid ""
-"The program \"postgres\" is needed by %s but was not found in the\n"
+"The program \"%s\" is needed by %s but was not found in the\n"
"same directory as \"%s\".\n"
"Check your installation.\n"
msgstr ""
-"%s Ҫ \"postgres\", ͬһĿ¼ \"%s\" ûҵ.\n"
+"%2$s需要程序\"%1$s\", 但是在同一个目录\"%3$s\"中没找到.\n"
"\n"
-"İװ.\n"
+"请检查您的安装.\n"
-#: pg_ctl.c:661
+#: pg_ctl.c:642
#, c-format
msgid ""
-"The program \"postgres\" was found by \"%s\"\n"
+"The program \"%s\" was found by \"%s\"\n"
"but was not the same version as %s.\n"
"Check your installation.\n"
msgstr ""
-"%s ҵ \"postgres\", ǺͰ汾 \"%s\" һ.\n"
+"\"%2$s\"找到程序 \"%1$s\", 但是和版本 \"%3$s\" 不一致.\n"
"\n"
-"İװ.\n"
+"检查您的安装.\n"
+
+#: pg_ctl.c:675
+#, c-format
+msgid "%s: database system initialization failed\n"
+msgstr "%s: 数据库系统初始化失败\n"
-#: pg_ctl.c:678
+#: pg_ctl.c:691
+#, c-format
+msgid "%s: another server might be running; trying to start server anyway\n"
+msgstr "%s: 其他服务器进程可能正在运行; 尝试启动服务器进程\n"
+
+#: pg_ctl.c:728
#, c-format
msgid "%s: could not start server: exit code was %d\n"
-msgstr "%s: ޷: ˳Ϊ %d\n"
+msgstr "%s: 无法启动服务器进程: 退出码为 %d\n"
-#: pg_ctl.c:689
+#: pg_ctl.c:739 pg_ctl.c:752
#, c-format
msgid ""
"%s: could not start server\n"
"Examine the log output.\n"
msgstr ""
-"%s: ޷\n"
-"־.\n"
+"%s: 无法启动服务器进程\n"
+"检查日志输出.\n"
-#: pg_ctl.c:698
+#: pg_ctl.c:748
msgid "waiting for server to start..."
-msgstr "ȴ ..."
+msgstr "等待服务器进程启动 ..."
-#: pg_ctl.c:702
-#, c-format
-msgid "could not start server\n"
-msgstr "޷\n"
-
-#: pg_ctl.c:707
-#: pg_ctl.c:780
-#: pg_ctl.c:860
+#: pg_ctl.c:759 pg_ctl.c:840 pg_ctl.c:928
msgid " done\n"
-msgstr " \n"
+msgstr " 完成\n"
-#: pg_ctl.c:708
+#: pg_ctl.c:760
msgid "server started\n"
-msgstr "Ѿ\n"
+msgstr "服务器进程已经启动\n"
-#: pg_ctl.c:712
+#: pg_ctl.c:764
msgid "server starting\n"
-msgstr "\n"
+msgstr "正在启动服务器进程\n"
-#: pg_ctl.c:727
-#: pg_ctl.c:802
-#: pg_ctl.c:882
+#: pg_ctl.c:779 pg_ctl.c:862 pg_ctl.c:950
#, c-format
msgid "%s: PID file \"%s\" does not exist\n"
-msgstr "%s: PID ļ \"%s\" \n"
+msgstr "%s: PID 文件 \"%s\" 不存在\n"
-#: pg_ctl.c:728
-#: pg_ctl.c:804
-#: pg_ctl.c:883
+#: pg_ctl.c:780 pg_ctl.c:864 pg_ctl.c:951
msgid "Is server running?\n"
-msgstr "Ƿ?\n"
+msgstr "服务器进程是否正在运行?\n"
-#: pg_ctl.c:734
+#: pg_ctl.c:786
#, c-format
msgid "%s: cannot stop server; single-user server is running (PID: %ld)\n"
-msgstr "%s: ޷ֹͣ; ûģʽ(PID: %ld)\n"
+msgstr "%s: 无法停止服务器进程; 正在运行 单用户模式服务器进程(PID: %ld)\n"
-#: pg_ctl.c:742
-#: pg_ctl.c:826
+#: pg_ctl.c:794 pg_ctl.c:886
#, c-format
msgid "%s: could not send stop signal (PID: %ld): %s\n"
-msgstr "%s: ޷ֹͣź (PID: %ld): %s\n"
+msgstr "%s: 无法发送停止信号 (PID: %ld): %s\n"
-#: pg_ctl.c:749
+#: pg_ctl.c:801
msgid "server shutting down\n"
-msgstr "ڹرշ\n"
+msgstr "正在关闭服务器进程\n"
-#: pg_ctl.c:756
-#: pg_ctl.c:833
+#: pg_ctl.c:816 pg_ctl.c:901
msgid ""
"WARNING: online backup mode is active\n"
"Shutdown will not complete until pg_stop_backup() is called.\n"
"\n"
msgstr ""
-": ߱ģʽڼ״̬\n"
-"رɣֱpg_stop_backup().\n"
+"警告: 在线备份模式处于激活状态\n"
+"关闭命令将不会完成,直到调用了pg_stop_backup().\n"
-#: pg_ctl.c:760
-#: pg_ctl.c:837
+#: pg_ctl.c:820 pg_ctl.c:905
msgid "waiting for server to shut down..."
-msgstr "ȴ̹ر ..."
+msgstr "等待服务器进程关闭 ..."
-#: pg_ctl.c:775
-#: pg_ctl.c:854
+#: pg_ctl.c:835 pg_ctl.c:922
msgid " failed\n"
-msgstr " ʧ\n"
+msgstr " 失败\n"
-#: pg_ctl.c:777
-#: pg_ctl.c:856
+#: pg_ctl.c:837 pg_ctl.c:924
#, c-format
msgid "%s: server does not shut down\n"
-msgstr "%s: serverûйر\n"
+msgstr "%s: server进程没有关闭\n"
-#: pg_ctl.c:782
-#: pg_ctl.c:861
-#, c-format
+#: pg_ctl.c:842 pg_ctl.c:929
msgid "server stopped\n"
-msgstr "Ѿر\n"
+msgstr "服务器进程已经关闭\n"
-#: pg_ctl.c:805
-#: pg_ctl.c:867
+#: pg_ctl.c:865 pg_ctl.c:935
msgid "starting server anyway\n"
-msgstr "\n"
+msgstr "正在启动服务器进程\n"
-#: pg_ctl.c:814
+#: pg_ctl.c:874
#, c-format
msgid "%s: cannot restart server; single-user server is running (PID: %ld)\n"
-msgstr "%s: ޷; ûģʽ (PID: %ld)\n"
+msgstr "%s: 无法重启服务器进程; 单用户模式服务器进程正在运行 (PID: %ld)\n"
-#: pg_ctl.c:817
-#: pg_ctl.c:892
+#: pg_ctl.c:877 pg_ctl.c:960
msgid "Please terminate the single-user server and try again.\n"
-msgstr "ֹûģʽ̣Ȼ.\n"
+msgstr "请终止单用户模式服务器进程,然后再重试.\n"
-#: pg_ctl.c:865
+#: pg_ctl.c:933
#, c-format
msgid "%s: old server process (PID: %ld) seems to be gone\n"
-msgstr "%s: ԭеĽ(PID: %ld)Ѿ\n"
+msgstr "%s: 原有的进程(PID: %ld)可能已经不存在了\n"
-#: pg_ctl.c:889
+#: pg_ctl.c:957
#, c-format
msgid "%s: cannot reload server; single-user server is running (PID: %ld)\n"
-msgstr "%s: ޷¼ط̣еûģʽķ (PID: %ld)\n"
+msgstr ""
+"%s: 无法重新加载服务器进程;正在运行单用户模式的服务器进程 (PID: %ld)\n"
-#: pg_ctl.c:898
+#: pg_ctl.c:966
#, c-format
msgid "%s: could not send reload signal (PID: %ld): %s\n"
-msgstr "%s: ޷ź (PID: %ld): %s\n"
+msgstr "%s: 无法发送重载信号 (PID: %ld): %s\n"
-#: pg_ctl.c:903
+#: pg_ctl.c:971
msgid "server signaled\n"
-msgstr "̷ź\n"
+msgstr "服务器进程发出信号\n"
-#: pg_ctl.c:947
+#: pg_ctl.c:1015
#, c-format
msgid "%s: single-user server is running (PID: %ld)\n"
-msgstr "%s: еûģʽ (PID: %ld)\n"
+msgstr "%s: 正在运行单用户模式服务器进程 (PID: %ld)\n"
-#: pg_ctl.c:959
+#: pg_ctl.c:1027
#, c-format
msgid "%s: server is running (PID: %ld)\n"
-msgstr "%s: з(PID: %ld)\n"
+msgstr "%s: 正在运行服务器进程(PID: %ld)\n"
-#: pg_ctl.c:970
+#: pg_ctl.c:1038
#, c-format
msgid "%s: no server running\n"
-msgstr "%s:ûз\n"
+msgstr "%s:没有服务器进程正在运行\n"
-#: pg_ctl.c:981
+#: pg_ctl.c:1049
#, c-format
msgid "%s: could not send signal %d (PID: %ld): %s\n"
-msgstr "%s: ޷ź %d (PID: %ld): %s\n"
+msgstr "%s: 无法发送信号 %d (PID: %ld): %s\n"
-#: pg_ctl.c:1015
+#: pg_ctl.c:1083
#, c-format
msgid "%s: could not find own program executable\n"
-msgstr "%s: ޷ҵִļ\n"
+msgstr "%s: 无法找到执行文件\n"
-#: pg_ctl.c:1025
+#: pg_ctl.c:1093
#, c-format
msgid "%s: could not find postgres program executable\n"
-msgstr "%s: ޷ҵpostgresִļ\n"
+msgstr "%s: 无法找到postgres程序的执行文件\n"
-#: pg_ctl.c:1083
-#: pg_ctl.c:1115
+#: pg_ctl.c:1155 pg_ctl.c:1187
#, c-format
msgid "%s: could not open service manager\n"
-msgstr "%s: ޷򿪷\n"
+msgstr "%s: 无法打开服务管理器\n"
-#: pg_ctl.c:1089
+#: pg_ctl.c:1161
#, c-format
msgid "%s: service \"%s\" already registered\n"
-msgstr "%s: \"%s\" Ѿע\n"
+msgstr "%s: 服务 \"%s\" 已经注册了\n"
-#: pg_ctl.c:1100
+#: pg_ctl.c:1172
#, c-format
msgid "%s: could not register service \"%s\": error code %d\n"
-msgstr "%s: ޷ע \"%s\": %d\n"
+msgstr "%s: 无法注册服务 \"%s\": 错误码 %d\n"
-#: pg_ctl.c:1121
+#: pg_ctl.c:1193
#, c-format
msgid "%s: service \"%s\" not registered\n"
-msgstr "%s: \"%s\" ûע\n"
+msgstr "%s: 服务 \"%s\" 没有注册\n"
-#: pg_ctl.c:1128
+#: pg_ctl.c:1200
#, c-format
msgid "%s: could not open service \"%s\": error code %d\n"
-msgstr "%s: ޷򿪷 \"%s\": %d\n"
+msgstr "%s: 无法打开服务 \"%s\": 错误码 %d\n"
-#: pg_ctl.c:1135
+#: pg_ctl.c:1207
#, c-format
msgid "%s: could not unregister service \"%s\": error code %d\n"
-msgstr "%s: ޷ע \"%s\": %d\n"
+msgstr "%s: 无法注销服务 \"%s\": 错误码 %d\n"
-#: pg_ctl.c:1221
+#: pg_ctl.c:1293
msgid "Waiting for server startup...\n"
-msgstr "ȴ ...\n"
+msgstr "等待服务器进程启动 ...\n"
-#: pg_ctl.c:1224
+#: pg_ctl.c:1296
msgid "Timed out waiting for server startup\n"
-msgstr "ڵȴʱʱ\n"
+msgstr "在等待服务器启动时超时\n"
-#: pg_ctl.c:1228
+#: pg_ctl.c:1300
msgid "Server started and accepting connections\n"
-msgstr "ҽ\n"
+msgstr "服务器进程已启动并且接受连接\n"
-#: pg_ctl.c:1278
+#: pg_ctl.c:1350
#, c-format
msgid "%s: could not start service \"%s\": error code %d\n"
-msgstr "%s: ޷ \"%s\": %d\n"
+msgstr "%s: 无法启动服务 \"%s\": 错误码 %d\n"
-#: pg_ctl.c:1513
+#: pg_ctl.c:1585
#, c-format
msgid "Try \"%s --help\" for more information.\n"
-msgstr " \"%s --help\" ȡϢ.\n"
+msgstr "试用 \"%s --help\" 获取更多的信息.\n"
-#: pg_ctl.c:1521
+#: pg_ctl.c:1593
#, c-format
msgid ""
"%s is a utility to start, stop, restart, reload configuration files,\n"
"report the status of a PostgreSQL server, or signal a PostgreSQL process.\n"
"\n"
msgstr ""
-"%s һ, ֹͣ, , ļ, PostgreSQL ״̬,\n"
-"ɱ PostgreSQL ̵Ĺ\n"
+"%s 是一个启动, 停止, 重启, 重载配置文件, 报告 PostgreSQL 服务器状态,\n"
+"或者杀掉 PostgreSQL 进程的工具\n"
"\n"
-#: pg_ctl.c:1523
+#: pg_ctl.c:1595
#, c-format
msgid "Usage:\n"
-msgstr "ʹ÷:\n"
+msgstr "使用方法:\n"
-#: pg_ctl.c:1524
+#: pg_ctl.c:1596
#, c-format
-msgid " %s start [-w] [-t SECS] [-D DATADIR] [-s] [-l FILENAME] [-o \"OPTIONS\"]\n"
-msgstr " %s start [-w] [-t ] [-D Ŀ¼] [-s] [-l ļ] [-o \"ѡ\"]\n"
+msgid " %s init[db] [-D DATADIR] [-s] [-o \"OPTIONS\"]\n"
+msgstr " %s init[db] [-D 数据目录] [-s] [-o \"选项\"]\n"
-#: pg_ctl.c:1525
+#: pg_ctl.c:1597
+#, c-format
+msgid ""
+" %s start [-w] [-t SECS] [-D DATADIR] [-s] [-l FILENAME] [-o \"OPTIONS"
+"\"]\n"
+msgstr ""
+" %s start [-w] [-t 秒数] [-D 数据目录] [-s] [-l 文件名] [-o \"选项\"]\n"
+
+#: pg_ctl.c:1598
#, c-format
msgid " %s stop [-W] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
-msgstr " %s stop [-w] [-t ] [-D Ŀ¼] [-s] [-m رģʽ]\n"
+msgstr " %s stop [-w] [-t 秒数] [-D 数据目录] [-s] [-m 关闭模式]\n"
-#: pg_ctl.c:1526
+#: pg_ctl.c:1599
#, c-format
msgid ""
" %s restart [-w] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
" [-o \"OPTIONS\"]\n"
msgstr ""
-" %s restart [-w] [-t ] [-D Ŀ¼] [-s] [-m رģʽ]\n"
-" [-o \"ѡ\"]\n"
+" %s restart [-w] [-t 秒数] [-D 数据目录] [-s] [-m 关闭模式]\n"
+" [-o \"选项\"]\n"
-#: pg_ctl.c:1528
+#: pg_ctl.c:1601
#, c-format
msgid " %s reload [-D DATADIR] [-s]\n"
-msgstr " %s reload [-D Ŀ¼] [-s]\n"
+msgstr " %s reload [-D 数据目录] [-s]\n"
-#: pg_ctl.c:1529
+#: pg_ctl.c:1602
#, c-format
msgid " %s status [-D DATADIR]\n"
-msgstr " %s status [-D Ŀ¼]\n"
+msgstr " %s status [-D 数据目录]\n"
-#: pg_ctl.c:1530
+#: pg_ctl.c:1603
#, c-format
msgid " %s kill SIGNALNAME PID\n"
-msgstr " %s kill ź ̺\n"
+msgstr " %s kill 信号名称 进程号\n"
-#: pg_ctl.c:1532
+#: pg_ctl.c:1605
#, c-format
msgid ""
" %s register [-N SERVICENAME] [-U USERNAME] [-P PASSWORD] [-D DATADIR]\n"
" [-w] [-t SECS] [-o \"OPTIONS\"]\n"
msgstr ""
-" %s register [-N ] [-U û] [-P ] [-D Ŀ¼]\n"
-" [-w] [-t ] [-o \"ѡ\"]\n"
+" %s register [-N 服务名称] [-U 用户名] [-P 口令] [-D 数据目录]\n"
+" [-w] [-t 秒数] [-o \"选项\"]\n"
-#: pg_ctl.c:1534
+#: pg_ctl.c:1607
#, c-format
msgid " %s unregister [-N SERVICENAME]\n"
-msgstr " %s unregister [-N ]\n"
+msgstr " %s unregister [-N 服务名称]\n"
-#: pg_ctl.c:1537
+#: pg_ctl.c:1610
#, c-format
msgid ""
"\n"
"Common options:\n"
msgstr ""
"\n"
-"ͨѡ:\n"
+"普通选项:\n"
-#: pg_ctl.c:1538
+#: pg_ctl.c:1611
#, c-format
msgid " -D, --pgdata DATADIR location of the database storage area\n"
-msgstr " -D, --pgdata Ŀ¼ ݴ洢λ\n"
+msgstr " -D, --pgdata 数据目录 数据存储的位置\n"
-#: pg_ctl.c:1539
+#: pg_ctl.c:1612
#, c-format
msgid " -s, --silent only print errors, no informational messages\n"
-msgstr " -s, --silent ֻӡϢ, ûϢ\n"
+msgstr " -s, --silent 只打印错误信息, 没有其他信息\n"
-#: pg_ctl.c:1540
+#: pg_ctl.c:1613
#, c-format
msgid " -t SECS seconds to wait when using -w option\n"
-msgstr " -t SECS ʹ-w ѡʱҪȴ\n"
+msgstr " -t SECS 当使用-w 选项时需要等待的秒数\n"
-#: pg_ctl.c:1541
+#: pg_ctl.c:1614
#, c-format
msgid " -w wait until operation completes\n"
-msgstr " -w ȴֱ\n"
+msgstr " -w 等待直到操作完成\n"
-#: pg_ctl.c:1542
+#: pg_ctl.c:1615
#, c-format
msgid " -W do not wait until operation completes\n"
-msgstr " -W õȴ\n"
+msgstr " -W 不用等待操作完成\n"
-#: pg_ctl.c:1543
+#: pg_ctl.c:1616
#, c-format
msgid " --help show this help, then exit\n"
-msgstr " --help ʾ˰Ϣ, Ȼ˳\n"
+msgstr " --help 显示此帮助信息, 然后退出\n"
-#: pg_ctl.c:1544
+#: pg_ctl.c:1617
#, c-format
msgid " --version output version information, then exit\n"
-msgstr " --version ʾ汾Ϣ, Ȼ˳\n"
+msgstr " --version 显示版本信息, 然后退出\n"
-#: pg_ctl.c:1545
+#: pg_ctl.c:1618
#, c-format
msgid ""
"(The default is to wait for shutdown, but not for start or restart.)\n"
"\n"
msgstr ""
-"(ĬΪرյȴ, .)\n"
+"(默认为关闭等待, 但不是启动或重启.)\n"
"\n"
-#: pg_ctl.c:1546
+#: pg_ctl.c:1619
#, c-format
msgid "If the -D option is omitted, the environment variable PGDATA is used.\n"
-msgstr "ʡ -D ѡ, ʹ PGDATA .\n"
+msgstr "如果省略了 -D 选项, 将使用 PGDATA 环境变量.\n"
-#: pg_ctl.c:1548
+#: pg_ctl.c:1621
#, c-format
msgid ""
"\n"
"Options for start or restart:\n"
msgstr ""
"\n"
-"ѡ:\n"
+"启动或重启的选项:\n"
-#: pg_ctl.c:1550
+#: pg_ctl.c:1623
#, c-format
msgid " -c, --core-files allow postgres to produce core files\n"
-msgstr " -c, --core-files postgres̲ļ\n"
+msgstr " -c, --core-files 允许postgres进程产生核心文件\n"
-#: pg_ctl.c:1552
+#: pg_ctl.c:1625
#, c-format
msgid " -c, --core-files not applicable on this platform\n"
-msgstr " -c, --core-files ƽ̨ϲ\n"
+msgstr " -c, --core-files 在这种平台上不可用\n"
-#: pg_ctl.c:1554
+#: pg_ctl.c:1627
#, c-format
msgid " -l, --log FILENAME write (or append) server log to FILENAME\n"
-msgstr " -l, --log FILENAME д (׷) ־ļ FILENAME\n"
+msgstr " -l, --log FILENAME 写入 (或追加) 服务器日志到文件 FILENAME\n"
-#: pg_ctl.c:1555
+#: pg_ctl.c:1628
#, c-format
msgid ""
" -o OPTIONS command line options to pass to postgres\n"
-" (PostgreSQL server executable)\n"
+" (PostgreSQL server executable) or initdb\n"
msgstr ""
-" -o OPTIONS ݸ postmaster ѡ\n"
-" (PostgreSQL ִļ)\n"
+" -o OPTIONS 传递给postgres的命令行选项\n"
+" (PostgreSQL 服务器执行文件)或initdb\n"
-#: pg_ctl.c:1557
+#: pg_ctl.c:1630
#, c-format
msgid " -p PATH-TO-POSTGRES normally not necessary\n"
-msgstr " -p PATH-TO-POSTMASTER Ҫ\n"
+msgstr " -p PATH-TO-POSTMASTER 正常情况不必要\n"
-#: pg_ctl.c:1558
+#: pg_ctl.c:1631
#, c-format
msgid ""
"\n"
"Options for stop or restart:\n"
msgstr ""
"\n"
-"ֹͣѡ:\n"
+"停止或重启的选项:\n"
-#: pg_ctl.c:1559
+#: pg_ctl.c:1632
#, c-format
msgid " -m SHUTDOWN-MODE can be \"smart\", \"fast\", or \"immediate\"\n"
-msgstr " -m SHUTDOWN-MODE \"smart\", \"fast\", \"immediate\"\n"
+msgstr " -m SHUTDOWN-MODE 可以是 \"smart\", \"fast\", 或者 \"immediate\"\n"
-#: pg_ctl.c:1561
+#: pg_ctl.c:1634
#, c-format
msgid ""
"\n"
"Shutdown modes are:\n"
msgstr ""
"\n"
-"رģʽ¼:\n"
+"关闭模式有如下几种:\n"
-#: pg_ctl.c:1562
+#: pg_ctl.c:1635
#, c-format
msgid " smart quit after all clients have disconnected\n"
-msgstr " smart пͻ˶ϿӺ˳\n"
+msgstr " smart 所有客户端断开连接后退出\n"
-#: pg_ctl.c:1563
+#: pg_ctl.c:1636
#, c-format
msgid " fast quit directly, with proper shutdown\n"
-msgstr " fast ֱ˳, ȷĹر\n"
+msgstr " fast 直接退出, 正确的关闭\n"
-#: pg_ctl.c:1564
+#: pg_ctl.c:1637
#, c-format
-msgid " immediate quit without complete shutdown; will lead to recovery on restart\n"
-msgstr " immediate ȫĹر˳; ָ\n"
+msgid ""
+" immediate quit without complete shutdown; will lead to recovery on "
+"restart\n"
+msgstr " immediate 不完全的关闭退出; 重启后恢复\n"
-#: pg_ctl.c:1566
+#: pg_ctl.c:1639
#, c-format
msgid ""
"\n"
"Allowed signal names for kill:\n"
msgstr ""
"\n"
-"رյź:\n"
+"允许关闭的信号名称:\n"
-#: pg_ctl.c:1570
+#: pg_ctl.c:1643
#, c-format
msgid ""
"\n"
"Options for register and unregister:\n"
msgstr ""
"\n"
-"עעѡ:\n"
+"注册或注销的选项:\n"
-#: pg_ctl.c:1571
+#: pg_ctl.c:1644
#, c-format
-msgid " -N SERVICENAME service name with which to register PostgreSQL server\n"
-msgstr " -N עᵽ PostgreSQL ķ\n"
+msgid ""
+" -N SERVICENAME service name with which to register PostgreSQL server\n"
+msgstr " -N 服务名称 注册到 PostgreSQL 服务器的服务名称\n"
-#: pg_ctl.c:1572
+#: pg_ctl.c:1645
#, c-format
msgid " -P PASSWORD password of account to register PostgreSQL server\n"
-msgstr " -P עᵽ PostgreSQL ʻĿ\n"
+msgstr " -P 口令 注册到 PostgreSQL 服务器帐户的口令\n"
-#: pg_ctl.c:1573
+#: pg_ctl.c:1646
#, c-format
msgid " -U USERNAME user name of account to register PostgreSQL server\n"
-msgstr " -U û עᵽ PostgreSQL ʻû\n"
+msgstr " -U 用户名 注册到 PostgreSQL 服务器帐户的用户名\n"
-#: pg_ctl.c:1576
+#: pg_ctl.c:1649
#, c-format
msgid ""
"\n"
"Report bugs to <pgsql-bugs@postgresql.org>.\n"
msgstr ""
"\n"
-"汨 <pgsql-bugs@postgresql.org>.\n"
+"臭虫报告至 <pgsql-bugs@postgresql.org>.\n"
-#: pg_ctl.c:1601
+#: pg_ctl.c:1674
#, c-format
msgid "%s: unrecognized shutdown mode \"%s\"\n"
-msgstr "%s: ЧĹرģʽ \"%s\"\n"
+msgstr "%s: 无效的关闭模式 \"%s\"\n"
-#: pg_ctl.c:1634
+#: pg_ctl.c:1707
#, c-format
msgid "%s: unrecognized signal name \"%s\"\n"
-msgstr "%s: Чź \"%s\"\n"
+msgstr "%s: 无效信号名称 \"%s\"\n"
-#: pg_ctl.c:1699
+#: pg_ctl.c:1772
#, c-format
msgid ""
"%s: cannot be run as root\n"
"Please log in (using, e.g., \"su\") as the (unprivileged) user that will\n"
"own the server process.\n"
msgstr ""
-"%s: ޷ root û\n"
-"Էû (Ȩû) ¼ (ʹ \"su\")\n"
+"%s: 无法以 root 用户运行\n"
+"请以服务器进程所属用户 (非特权用户) 登录 (或使用 \"su\")\n"
"\n"
-#: pg_ctl.c:1808
+#: pg_ctl.c:1881
#, c-format
msgid "%s: too many command-line arguments (first is \"%s\")\n"
-msgstr "%s: в̫ (һ \"%s\")\n"
+msgstr "%s: 命令行参数太多 (第一个是 \"%s\")\n"
-#: pg_ctl.c:1827
+#: pg_ctl.c:1903
#, c-format
msgid "%s: missing arguments for kill mode\n"
-msgstr "%s: ȱ kill ģʽ\n"
+msgstr "%s: 缺少 kill 模式参数\n"
-#: pg_ctl.c:1845
+#: pg_ctl.c:1921
#, c-format
msgid "%s: unrecognized operation mode \"%s\"\n"
-msgstr "%s: ЧIJģʽ \"%s\"\n"
+msgstr "%s: 无效的操作模式 \"%s\"\n"
-#: pg_ctl.c:1855
+#: pg_ctl.c:1931
#, c-format
msgid "%s: no operation specified\n"
-msgstr "%s: ûָ\n"
+msgstr "%s: 没有指定操作\n"
-#: pg_ctl.c:1871
+#: pg_ctl.c:1947
#, c-format
-msgid "%s: no database directory specified and environment variable PGDATA unset\n"
-msgstr "%s: ûָĿ¼, û PGDATA \n"
+msgid ""
+"%s: no database directory specified and environment variable PGDATA unset\n"
+msgstr "%s: 没有指定数据目录, 并且没有设置 PGDATA 环境变量\n"
-#: ../../port/exec.c:195
-#: ../../port/exec.c:309
-#: ../../port/exec.c:352
+#: ../../port/exec.c:125 ../../port/exec.c:239 ../../port/exec.c:282
#, c-format
msgid "could not identify current directory: %s"
-msgstr "޷ȷϵǰĿ¼: %s"
+msgstr "无法确认当前目录: %s"
# command.c:122
-#: ../../port/exec.c:214
+#: ../../port/exec.c:144
#, c-format
msgid "invalid binary \"%s\""
-msgstr "ЧĶ \"%s\""
+msgstr "无效的二进制码 \"%s\""
# command.c:1103
-#: ../../port/exec.c:263
+#: ../../port/exec.c:193
#, c-format
msgid "could not read binary \"%s\""
-msgstr "޷ȡ \"%s\""
+msgstr "无法读取二进制码 \"%s\""
-#: ../../port/exec.c:270
+#: ../../port/exec.c:200
#, c-format
msgid "could not find a \"%s\" to execute"
-msgstr "δҵһ \"%s\" ִ"
+msgstr "未能找到一个 \"%s\" 来执行"
-#: ../../port/exec.c:325
-#: ../../port/exec.c:361
+#: ../../port/exec.c:255 ../../port/exec.c:291
#, c-format
msgid "could not change directory to \"%s\""
-msgstr "޷Ŀ¼ \"%s\""
+msgstr "无法进入目录 \"%s\""
-#: ../../port/exec.c:340
+#: ../../port/exec.c:270
#, c-format
msgid "could not read symbolic link \"%s\""
-msgstr "޷ȡ \"%s\""
+msgstr "无法读取符号链结 \"%s\""
-#: ../../port/exec.c:586
+#: ../../port/exec.c:516
#, c-format
msgid "child process exited with exit code %d"
-msgstr "ӽ˳, ˳Ϊ %d"
+msgstr "子进程已退出, 退出码为 %d"
-#: ../../port/exec.c:590
+#: ../../port/exec.c:520
#, c-format
msgid "child process was terminated by exception 0x%X"
-msgstr "ӽ̱(exception) 0x%X ֹ"
+msgstr "子进程被例外(exception) 0x%X 终止"
-#: ../../port/exec.c:599
+#: ../../port/exec.c:529
#, c-format
msgid "child process was terminated by signal %s"
-msgstr "ӽ̱ź %s ֹ"
+msgstr "子进程被信号 %s 终止"
-#: ../../port/exec.c:602
+#: ../../port/exec.c:532
#, c-format
msgid "child process was terminated by signal %d"
-msgstr "ӽ̱ź %d ֹ"
+msgstr "子进程被信号 %d 终止"
-#: ../../port/exec.c:606
+#: ../../port/exec.c:536
#, c-format
msgid "child process exited with unrecognized status %d"
-msgstr "ӽ˳, δ֪״̬ %d"
+msgstr "子进程已退出, 未知状态 %d"
+
+#~ msgid "could not start server\n"
+#~ msgstr "无法启动服务器进程\n"
#~ msgid ""
#~ "The program \"postmaster\" is needed by %s but was not found in the\n"
#~ "same directory as \"%s\".\n"
#~ "Check your installation.\n"
#~ msgstr ""
-#~ " \"postmaster\" %s Ҫ, ûͬһĿ¼ \"%s\" .\n"
+#~ "程序 \"postmaster\" 是 %s 需要的, 但没有在同一个目录 \"%s\" 发现.\n"
#~ "\n"
-#~ "İװ.\n"
+#~ "检查您的安装.\n"
#~ msgid ""
#~ "The program \"postmaster\" was found by