Merge commit 'b5bce6c1ec6061c8a4f730d927e162db7e2ce365'

14 files changed, 3184 insertions, 2384 deletions

diff --git a/src/bin/initdb/Makefile b/src/bin/initdb/Makefile
index d4797880dd..094c8945c9 100644
--- a/src/bin/initdb/Makefile
+++ b/src/bin/initdb/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for src/bin/initdb
 #
-# Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
+# Portions Copyright (c) 1996-2016, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
 # src/bin/initdb/Makefile
diff --git a/src/bin/initdb/findtimezone.c b/src/bin/initdb/findtimezone.c
index bdc3b99611..5a443131ee 100644
--- a/src/bin/initdb/findtimezone.c
+++ b/src/bin/initdb/findtimezone.c
@@ -3,7 +3,7 @@
  * findtimezone.c
  *	  Functions for determining the default timezone to use.
  *
- * Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2016, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/bin/initdb/findtimezone.c
@@ -99,15 +99,15 @@ pg_load_tz(const char *name)
 	 */
 	if (strcmp(name, "GMT") == 0)
 	{
-		if (tzparse(name, &tz.state, TRUE) != 0)
+		if (!tzparse(name, &tz.state, true))
 		{
 			/* This really, really should not happen ... */
 			return NULL;
 		}
 	}
-	else if (tzload(name, NULL, &tz.state, TRUE) != 0)
+	else if (tzload(name, NULL, &tz.state, true) != 0)
 	{
-		if (name[0] == ':' || tzparse(name, &tz.state, FALSE) != 0)
+		if (name[0] == ':' || !tzparse(name, &tz.state, false))
 		{
 			return NULL;		/* unknown timezone */
 		}
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index 2ab3cb5386..3580c15543 100644
--- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
@@ -39,8 +39,7 @@
  * This code is released under the terms of the PostgreSQL License.
  *
  * Portions Copyright (c) 2012-2014, TransLattice, Inc.
- * Portions Copyright (c) 1996-2012, PostgreSQL Global Development Group
- * Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2016, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/bin/initdb/initdb.c
@@ -81,7 +80,8 @@
 /* Ideally this would be in a .h file, but it hardly seems worth the trouble */
 extern const char *select_default_timezone(const char *share_path);
 
-static const char *auth_methods_host[] = {"trust", "reject", "md5", "password", "ident", "radius",
+static const char *const auth_methods_host[] = {
+	"trust", "reject", "md5", "password", "ident", "radius",
 #ifdef ENABLE_GSS
 	"gss",
 #endif
@@ -91,21 +91,30 @@ static const char *auth_methods_host[] = {"trust", "reject", "md5", "password",
 #ifdef USE_PAM
 	"pam", "pam ",
 #endif
+#ifdef USE_BSD_AUTH
+	"bsd",
+#endif
 #ifdef USE_LDAP
 	"ldap",
 #endif
 #ifdef USE_SSL
 	"cert",
 #endif
-NULL};
-static const char *auth_methods_local[] = {"trust", "reject", "md5", "password", "peer", "radius",
+	NULL
+};
+static const char *const auth_methods_local[] = {
+	"trust", "reject", "md5", "password", "peer", "radius",
 #ifdef USE_PAM
 	"pam", "pam ",
 #endif
+#ifdef USE_BSD_AUTH
+	"bsd",
+#endif
 #ifdef USE_LDAP
 	"ldap",
 #endif
-NULL};
+	NULL
+};
 
 /*
  * these values are passed in by makefile defines
@@ -197,11 +206,10 @@ static const char *backend_options = "--single "
 #ifdef PGXC
 	                                 "--localxid "
 #endif
-	                                 "-F -O -c search_path=pg_catalog -c exit_on_error=true";
+									 "-F -O -j -c search_path=pg_catalog -c exit_on_error=true";
 
-static const char *subdirs[] = {
+static const char *const subdirs[] = {
 	"global",
-	"pg_xlog",
 	"pg_xlog/archive_status",
 	"pg_clog",
 	"pg_commit_ts",
@@ -211,6 +219,7 @@ static const char *subdirs[] = {
 	"pg_snapshots",
 	"pg_subtrans",
 	"pg_twophase",
+	"pg_multixact",
 	"pg_multixact/members",
 	"pg_multixact/offsets",
 	"base",
@@ -248,7 +257,6 @@ static FILE *popen_check(const char *command, const char *mode);
 static void exit_nicely(void);
 static char *get_id(void);
 static char *get_encoding_id(char *encoding_name);
-static bool mkdatadir(const char *subdir);
 static void set_input(char **dest, char *filename);
 static void check_input(char *path);
 static void write_version_file(char *extrapath);
@@ -256,24 +264,24 @@ static void set_null_conf(void);
 static void test_config_settings(void);
 static void setup_config(void);
 static void bootstrap_template1(void);
-static void setup_auth(void);
-static void get_set_pwd(void);
-static void setup_depend(void);
-static void setup_sysviews(void);
+static void setup_auth(FILE *cmdfd);
+static void get_set_pwd(FILE *cmdfd);
+static void setup_depend(FILE *cmdfd);
+static void setup_sysviews(FILE *cmdfd);
 #ifdef PGXC
 static void setup_nodeself(void);
 #endif
-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);
+static void setup_description(FILE *cmdfd);
+static void setup_collation(FILE *cmdfd);
+static void setup_conversion(FILE *cmdfd);
+static void setup_dictionary(FILE *cmdfd);
+static void setup_privileges(FILE *cmdfd);
 static void set_info_version(void);
-static void setup_schema(void);
-static void load_plpgsql(void);
-static void vacuum_db(void);
-static void make_template0(void);
-static void make_postgres(void);
+static void setup_schema(FILE *cmdfd);
+static void load_plpgsql(FILE *cmdfd);
+static void vacuum_db(FILE *cmdfd);
+static void make_template0(FILE *cmdfd);
+static void make_postgres(FILE *cmdfd);
 static void fsync_pgdata(void);
 static void trapsig(int signum);
 static void check_ok(void);
@@ -291,7 +299,7 @@ void		setup_locale_encoding(void);
 void		setup_signals(void);
 void		setup_text_search(void);
 void		create_data_directory(void);
-void		create_xlog_symlink(void);
+void		create_xlog_or_symlink(void);
 void		warn_on_mount_point(int error);
 void		initialize_data_directory(void);
 
@@ -940,29 +948,6 @@ find_matching_ts_config(const char *lc_type)
 
 
 /*
- * make the data directory (or one of its subdirectories if subdir is not NULL)
- */
-static bool
-mkdatadir(const char *subdir)
-{
-	char	   *path;
-
-	if (subdir)
-		path = psprintf("%s/%s", pg_data, subdir);
-	else
-		path = pg_strdup(pg_data);
-
-	if (pg_mkdir_p(path, S_IRWXU) == 0)
-		return true;
-
-	fprintf(stderr, _("%s: could not create directory \"%s\": %s\n"),
-			progname, path, strerror(errno));
-
-	return false;
-}
-
-
-/*
  * set name of given input file variable under data directory
  */
 static void
@@ -1477,7 +1462,7 @@ bootstrap_template1(void)
 	char		headerline[MAXPGPATH];
 	char		buf[64];
 
-	printf(_("creating template1 database in %s/base/1 ... "), pg_data);
+	printf(_("running bootstrap script ... "));
 	fflush(stdout);
 
 	if (debug)
@@ -1567,45 +1552,28 @@ bootstrap_template1(void)
  * set up the shadow password table
  */
 static void
-setup_auth(void)
+setup_auth(FILE *cmdfd)
 {
-	PG_CMD_DECL;
-	const char **line;
-	static const char *pg_authid_setup[] = {
+	const char *const * line;
+	static const char *const pg_authid_setup[] = {
 		/*
 		 * The authid table shouldn't be readable except through views, to
 		 * ensure passwords are not publicly visible.
 		 */
-		"REVOKE ALL on pg_authid FROM public;\n",
+		"REVOKE ALL on pg_authid FROM public;\n\n",
 		NULL
 	};
 
-	fputs(_("initializing pg_authid ... "), stdout);
-	fflush(stdout);
-
-	snprintf(cmd, sizeof(cmd),
-			 "\"%s\" %s template1 >%s",
-			 backend_exec, backend_options,
-			 DEVNULL);
-
-	PG_CMD_OPEN;
-
 	for (line = pg_authid_setup; *line != NULL; line++)
 		PG_CMD_PUTS(*line);
-
-	PG_CMD_CLOSE;
-
-	check_ok();
 }
 
 /*
  * get the superuser password if required, and call postgres to set it
  */
 static void
-get_set_pwd(void)
+get_set_pwd(FILE *cmdfd)
 {
-	PG_CMD_DECL;
-
 	char	   *pwd1,
 			   *pwd2;
 
@@ -1662,36 +1630,21 @@ get_set_pwd(void)
 		pwd1 = pg_strdup(pwdbuf);
 
 	}
-	printf(_("setting password ... "));
-	fflush(stdout);
-
-	snprintf(cmd, sizeof(cmd),
-			 "\"%s\" %s template1 >%s",
-			 backend_exec, backend_options,
-			 DEVNULL);
 
-	PG_CMD_OPEN;
-
-	PG_CMD_PRINTF2("ALTER USER \"%s\" WITH PASSWORD E'%s';\n",
+	PG_CMD_PRINTF2("ALTER USER \"%s\" WITH PASSWORD E'%s';\n\n",
 				   username, escape_quotes(pwd1));
 
-	/* MM: pwd1 is no longer needed, freeing it */
 	free(pwd1);
-
-	PG_CMD_CLOSE;
-
-	check_ok();
 }
 
 /*
  * set up pg_depend
  */
 static void
-setup_depend(void)
+setup_depend(FILE *cmdfd)
 {
-	PG_CMD_DECL;
-	const char **line;
-	static const char *pg_depend_setup[] = {
+	const char *const * line;
+	static const char *const pg_depend_setup[] = {
 		/*
 		 * Make PIN entries in pg_depend for all objects made so far in the
 		 * tables that the dependency code handles.  This is overkill (the
@@ -1706,116 +1659,86 @@ setup_depend(void)
 		 * First delete any already-made entries; PINs override all else, and
 		 * must be the only entries for their objects.
 		 */
-		"DELETE FROM pg_depend;\n",
-		"VACUUM pg_depend;\n",
-		"DELETE FROM pg_shdepend;\n",
-		"VACUUM pg_shdepend;\n",
+		"DELETE FROM pg_depend;\n\n",
+		"VACUUM pg_depend;\n\n",
+		"DELETE FROM pg_shdepend;\n\n",
+		"VACUUM pg_shdepend;\n\n",
 
 		"INSERT INTO pg_depend SELECT 0,0,0, tableoid,oid,0, 'p' "
-		" FROM pg_class;\n",
+		" FROM pg_class;\n\n",
+		"INSERT INTO pg_depend SELECT 0,0,0, tableoid,oid,0, 'p' "
+		" FROM pg_proc;\n\n",
 		"INSERT INTO pg_depend SELECT 0,0,0, tableoid,oid,0, 'p' "
-		" FROM pg_proc;\n",
+		" FROM pg_type;\n\n",
 		"INSERT INTO pg_depend SELECT 0,0,0, tableoid,oid,0, 'p' "
-		" FROM pg_type;\n",
+		" FROM pg_cast;\n\n",
 		"INSERT INTO pg_depend SELECT 0,0,0, tableoid,oid,0, 'p' "
-		" FROM pg_cast;\n",
+		" FROM pg_constraint;\n\n",
 		"INSERT INTO pg_depend SELECT 0,0,0, tableoid,oid,0, 'p' "
-		" FROM pg_constraint;\n",
+		" FROM pg_attrdef;\n\n",
 		"INSERT INTO pg_depend SELECT 0,0,0, tableoid,oid,0, 'p' "
-		" FROM pg_attrdef;\n",
+		" FROM pg_language;\n\n",
 		"INSERT INTO pg_depend SELECT 0,0,0, tableoid,oid,0, 'p' "
-		" FROM pg_language;\n",
+		" FROM pg_operator;\n\n",
 		"INSERT INTO pg_depend SELECT 0,0,0, tableoid,oid,0, 'p' "
-		" FROM pg_operator;\n",
+		" FROM pg_opclass;\n\n",
 		"INSERT INTO pg_depend SELECT 0,0,0, tableoid,oid,0, 'p' "
-		" FROM pg_opclass;\n",
+		" FROM pg_opfamily;\n\n",
 		"INSERT INTO pg_depend SELECT 0,0,0, tableoid,oid,0, 'p' "
-		" FROM pg_opfamily;\n",
+		" FROM pg_am;\n\n",
 		"INSERT INTO pg_depend SELECT 0,0,0, tableoid,oid,0, 'p' "
-		" FROM pg_amop;\n",
+		" FROM pg_amop;\n\n",
 		"INSERT INTO pg_depend SELECT 0,0,0, tableoid,oid,0, 'p' "
-		" FROM pg_amproc;\n",
+		" FROM pg_amproc;\n\n",
 		"INSERT INTO pg_depend SELECT 0,0,0, tableoid,oid,0, 'p' "
-		" FROM pg_rewrite;\n",
+		" FROM pg_rewrite;\n\n",
 		"INSERT INTO pg_depend SELECT 0,0,0, tableoid,oid,0, 'p' "
-		" FROM pg_trigger;\n",
+		" FROM pg_trigger;\n\n",
 
 		/*
 		 * restriction here to avoid pinning the public namespace
 		 */
 		"INSERT INTO pg_depend SELECT 0,0,0, tableoid,oid,0, 'p' "
 		" FROM pg_namespace "
-		"    WHERE nspname LIKE 'pg%';\n",
+		"    WHERE nspname LIKE 'pg%';\n\n",
 
 		"INSERT INTO pg_depend SELECT 0,0,0, tableoid,oid,0, 'p' "
-		" FROM pg_ts_parser;\n",
+		" FROM pg_ts_parser;\n\n",
 		"INSERT INTO pg_depend SELECT 0,0,0, tableoid,oid,0, 'p' "
-		" FROM pg_ts_dict;\n",
+		" FROM pg_ts_dict;\n\n",
 		"INSERT INTO pg_depend SELECT 0,0,0, tableoid,oid,0, 'p' "
-		" FROM pg_ts_template;\n",
+		" FROM pg_ts_template;\n\n",
 		"INSERT INTO pg_depend SELECT 0,0,0, tableoid,oid,0, 'p' "
-		" FROM pg_ts_config;\n",
+		" FROM pg_ts_config;\n\n",
 		"INSERT INTO pg_depend SELECT 0,0,0, tableoid,oid,0, 'p' "
-		" FROM pg_collation;\n",
+		" FROM pg_collation;\n\n",
 		"INSERT INTO pg_shdepend SELECT 0,0,0,0, tableoid,oid, 'p' "
-		" FROM pg_authid;\n",
+		" FROM pg_authid;\n\n",
 		NULL
 	};
 
-	fputs(_("initializing dependencies ... "), stdout);
-	fflush(stdout);
-
-	snprintf(cmd, sizeof(cmd),
-			 "\"%s\" %s template1 >%s",
-			 backend_exec, backend_options,
-			 DEVNULL);
-
-	PG_CMD_OPEN;
-
 	for (line = pg_depend_setup; *line != NULL; line++)
 		PG_CMD_PUTS(*line);
-
-	PG_CMD_CLOSE;
-
-	check_ok();
 }
 
 /*
  * set up system views
  */
 static void
-setup_sysviews(void)
+setup_sysviews(FILE *cmdfd)
 {
-	PG_CMD_DECL;
 	char	  **line;
 	char	  **sysviews_setup;
 
-	fputs(_("creating system views ... "), stdout);
-	fflush(stdout);
-
 	sysviews_setup = readfile(system_views_file);
 
-	/*
-	 * We use -j here to avoid backslashing stuff in system_views.sql
-	 */
-	snprintf(cmd, sizeof(cmd),
-			 "\"%s\" %s -j template1 >%s",
-			 backend_exec, backend_options,
-			 DEVNULL);
-
-	PG_CMD_OPEN;
-
 	for (line = sysviews_setup; *line != NULL; line++)
 	{
 		PG_CMD_PUTS(*line);
 		free(*line);
 	}
 
-	PG_CMD_CLOSE;
-
 	free(sysviews_setup);
-
-	check_ok();
 }
 
 #ifdef PGXC
@@ -1851,40 +1774,28 @@ setup_nodeself(void)
  * load description data
  */
 static void
-setup_description(void)
+setup_description(FILE *cmdfd)
 {
-	PG_CMD_DECL;
-
-	fputs(_("loading system objects' descriptions ... "), stdout);
-	fflush(stdout);
-
-	snprintf(cmd, sizeof(cmd),
-			 "\"%s\" %s template1 >%s",
-			 backend_exec, backend_options,
-			 DEVNULL);
-
-	PG_CMD_OPEN;
-
 	PG_CMD_PUTS("CREATE TEMP TABLE tmp_pg_description ( "
 				"	objoid oid, "
 				"	classname name, "
 				"	objsubid int4, "
-				"	description text) WITHOUT OIDS;\n");
+				"	description text) WITHOUT OIDS;\n\n");
 
-	PG_CMD_PRINTF1("COPY tmp_pg_description FROM E'%s';\n",
+	PG_CMD_PRINTF1("COPY tmp_pg_description FROM E'%s';\n\n",
 				   escape_quotes(desc_file));
 
 	PG_CMD_PUTS("INSERT INTO pg_description "
 				" SELECT t.objoid, c.oid, t.objsubid, t.description "
 				"  FROM tmp_pg_description t, pg_class c "
-				"    WHERE c.relname = t.classname;\n");
+				"    WHERE c.relname = t.classname;\n\n");
 
 	PG_CMD_PUTS("CREATE TEMP TABLE tmp_pg_shdescription ( "
 				" objoid oid, "
 				" classname name, "
-				" description text) WITHOUT OIDS;\n");
+				" description text) WITHOUT OIDS;\n\n");
 
-	PG_CMD_PRINTF1("COPY tmp_pg_shdescription FROM E'%s';\n",
+	PG_CMD_PRINTF1("COPY tmp_pg_shdescription FROM E'%s';\n\n",
 				   escape_quotes(shdesc_file));
 
 #ifdef XCP
@@ -1894,7 +1805,7 @@ setup_description(void)
 #endif
 				" SELECT t.objoid, c.oid, t.description "
 				"  FROM tmp_pg_shdescription t, pg_class c "
-				"   WHERE c.relname = t.classname;\n");
+				"   WHERE c.relname = t.classname;\n\n");
 
 	/* Create default descriptions for operator implementation functions */
 	PG_CMD_PUTS("WITH funcdescs AS ( "
@@ -1907,11 +1818,14 @@ setup_description(void)
 				"  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;
+		"    WHERE objoid = p_oid AND classoid = 'pg_proc'::regclass);\n\n");
 
-	check_ok();
+	/*
+	 * Even though the tables are temp, drop them explicitly so they don't get
+	 * copied into template0/postgres databases.
+	 */
+	PG_CMD_PUTS("DROP TABLE tmp_pg_description;\n\n");
+	PG_CMD_PUTS("DROP TABLE tmp_pg_shdescription;\n\n");
 }
 
 #ifdef HAVE_LOCALE_T
@@ -1954,7 +1868,7 @@ normalize_locale_name(char *new, const char *old)
  * populate pg_collation
  */
 static void
-setup_collation(void)
+setup_collation(FILE *cmdfd)
 {
 #if defined(HAVE_LOCALE_T) && !defined(WIN32)
 	int			i;
@@ -1962,28 +1876,14 @@ setup_collation(void)
 	char		localebuf[NAMEDATALEN]; /* we assume ASCII so this is fine */
 	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");
+				"	encoding int) WITHOUT OIDS;\n\n");
 
 	while (fgets(localebuf, sizeof(localebuf), locale_a_handle))
 	{
@@ -2043,7 +1943,7 @@ setup_collation(void)
 
 		quoted_locale = escape_quotes(localebuf);
 
-		PG_CMD_PRINTF3("INSERT INTO tmp_pg_collation VALUES (E'%s', E'%s', %d);\n",
+		PG_CMD_PRINTF3("INSERT INTO tmp_pg_collation VALUES (E'%s', E'%s', %d);\n\n",
 					   quoted_locale, quoted_locale, enc);
 
 		/*
@@ -2055,7 +1955,7 @@ setup_collation(void)
 		{
 			char	   *quoted_alias = escape_quotes(alias);
 
-			PG_CMD_PRINTF3("INSERT INTO tmp_pg_collation VALUES (E'%s', E'%s', %d);\n",
+			PG_CMD_PRINTF3("INSERT INTO tmp_pg_collation VALUES (E'%s', E'%s', %d);\n\n",
 						   quoted_alias, quoted_locale, enc);
 			free(quoted_alias);
 		}
@@ -2063,7 +1963,7 @@ setup_collation(void)
 	}
 
 	/* Add an SQL-standard name */
-	PG_CMD_PRINTF1("INSERT INTO tmp_pg_collation VALUES ('ucs_basic', 'C', %d);\n", PG_UTF8);
+	PG_CMD_PRINTF1("INSERT INTO tmp_pg_collation VALUES ('ucs_basic', 'C', %d);\n\n", PG_UTF8);
 
 	/*
 	 * When copying collations to the final location, eliminate aliases that
@@ -2084,20 +1984,21 @@ setup_collation(void)
 				"   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");
+	 "  ORDER BY collname, encoding, (collname = locale) DESC, locale;\n\n");
+
+	/*
+	 * Even though the table is temp, drop it explicitly so it doesn't get
+	 * copied into template0/postgres databases.
+	 */
+	PG_CMD_PUTS("DROP TABLE tmp_pg_collation;\n\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 */
 }
 
@@ -2105,22 +2006,11 @@ setup_collation(void)
  * load conversion functions
  */
 static void
-setup_conversion(void)
+setup_conversion(FILE *cmdfd)
 {
-	PG_CMD_DECL;
 	char	  **line;
 	char	  **conv_lines;
 
-	fputs(_("creating conversions ... "), stdout);
-	fflush(stdout);
-
-	snprintf(cmd, sizeof(cmd),
-			 "\"%s\" %s template1 >%s",
-			 backend_exec, backend_options,
-			 DEVNULL);
-
-	PG_CMD_OPEN;
-
 	conv_lines = readfile(conversion_file);
 	for (line = conv_lines; *line != NULL; line++)
 	{
@@ -2130,35 +2020,17 @@ setup_conversion(void)
 	}
 
 	free(conv_lines);
-
-	PG_CMD_CLOSE;
-
-	check_ok();
 }
 
 /*
  * load extra dictionaries (Snowball stemmers)
  */
 static void
-setup_dictionary(void)
+setup_dictionary(FILE *cmdfd)
 {
-	PG_CMD_DECL;
 	char	  **line;
 	char	  **conv_lines;
 
-	fputs(_("creating dictionaries ... "), stdout);
-	fflush(stdout);
-
-	/*
-	 * We use -j here to avoid backslashing stuff
-	 */
-	snprintf(cmd, sizeof(cmd),
-			 "\"%s\" %s -j template1 >%s",
-			 backend_exec, backend_options,
-			 DEVNULL);
-
-	PG_CMD_OPEN;
-
 	conv_lines = readfile(dictionary_file);
 	for (line = conv_lines; *line != NULL; line++)
 	{
@@ -2167,10 +2039,6 @@ setup_dictionary(void)
 	}
 
 	free(conv_lines);
-
-	PG_CMD_CLOSE;
-
-	check_ok();
 }
 
 /*
@@ -2183,44 +2051,155 @@ setup_dictionary(void)
  * Some objects may require different permissions by default, so we
  * make sure we don't overwrite privilege sets that have already been
  * set (NOT NULL).
+ *
+ * Also populate pg_init_privs to save what the privileges are at init
+ * time.  This is used by pg_dump to allow users to change privileges
+ * on catalog objects and to have those privilege changes preserved
+ * across dump/reload and pg_upgrade.
+ *
+ * Note that pg_init_privs is only for per-database objects and therefore
+ * we don't include databases or tablespaces.
  */
 static void
-setup_privileges(void)
+setup_privileges(FILE *cmdfd)
 {
-	PG_CMD_DECL;
 	char	  **line;
 	char	  **priv_lines;
 	static char *privileges_setup[] = {
 		"UPDATE pg_class "
-		"  SET relacl = E'{\"=r/\\\\\"$POSTGRES_SUPERUSERNAME\\\\\"\"}' "
-		"  WHERE relkind IN ('r', 'v', 'm', 'S') AND relacl IS NULL;\n",
-		"GRANT USAGE ON SCHEMA pg_catalog TO PUBLIC;\n",
-		"GRANT CREATE, USAGE ON SCHEMA public TO PUBLIC;\n",
+		"  SET relacl = (SELECT array_agg(a.acl) FROM "
+		" (SELECT E'=r/\"$POSTGRES_SUPERUSERNAME\"' as acl "
+		"  UNION SELECT unnest(pg_catalog.acldefault("
+		"    CASE WHEN relkind = 'S' THEN 's' ELSE 'r' END::\"char\",10::oid))"
+		" ) as a) "
+		"  WHERE relkind IN ('r', 'v', 'm', 'S') AND relacl IS NULL;\n\n",
+		"GRANT USAGE ON SCHEMA pg_catalog TO PUBLIC;\n\n",
+		"GRANT CREATE, USAGE ON SCHEMA public TO PUBLIC;\n\n",
 #ifdef XCP
         "GRANT USAGE ON SCHEMA storm_catalog TO PUBLIC;\n",
 #endif
-		"REVOKE ALL ON pg_largeobject FROM PUBLIC;\n",
+		"REVOKE ALL ON pg_largeobject FROM PUBLIC;\n\n",
+		"INSERT INTO pg_init_privs "
+		"  (objoid, classoid, objsubid, initprivs, privtype)"
+		"    SELECT"
+		"        oid,"
+		"        (SELECT oid FROM pg_class WHERE relname = 'pg_class'),"
+		"        0,"
+		"        relacl,"
+		"        'i'"
+		"    FROM"
+		"        pg_class"
+		"    WHERE"
+		"        relacl IS NOT NULL"
+		"        AND relkind IN ('r', 'v', 'm', 'S');",
+		"INSERT INTO pg_init_privs "
+		"  (objoid, classoid, objsubid, initprivs, privtype)"
+		"    SELECT"
+		"        pg_class.oid,"
+		"        (SELECT oid FROM pg_class WHERE relname = 'pg_class'),"
+		"        pg_attribute.attnum,"
+		"        pg_attribute.attacl,"
+		"        'i'"
+		"    FROM"
+		"        pg_class"
+		"        JOIN pg_attribute ON (pg_class.oid = pg_attribute.attrelid)"
+		"    WHERE"
+		"        pg_attribute.attacl IS NOT NULL"
+		"        AND pg_class.relkind IN ('r', 'v', 'm', 'S');",
+		"INSERT INTO pg_init_privs "
+		"  (objoid, classoid, objsubid, initprivs, privtype)"
+		"    SELECT"
+		"        oid,"
+		"        (SELECT oid FROM pg_class WHERE relname = 'pg_proc'),"
+		"        0,"
+		"        proacl,"
+		"        'i'"
+		"    FROM"
+		"        pg_proc"
+		"    WHERE"
+		"        proacl IS NOT NULL;",
+		"INSERT INTO pg_init_privs "
+		"  (objoid, classoid, objsubid, initprivs, privtype)"
+		"    SELECT"
+		"        oid,"
+		"        (SELECT oid FROM pg_class WHERE relname = 'pg_type'),"
+		"        0,"
+		"        typacl,"
+		"        'i'"
+		"    FROM"
+		"        pg_type"
+		"    WHERE"
+		"        typacl IS NOT NULL;",
+		"INSERT INTO pg_init_privs "
+		"  (objoid, classoid, objsubid, initprivs, privtype)"
+		"    SELECT"
+		"        oid,"
+		"        (SELECT oid FROM pg_class WHERE relname = 'pg_language'),"
+		"        0,"
+		"        lanacl,"
+		"        'i'"
+		"    FROM"
+		"        pg_language"
+		"    WHERE"
+		"        lanacl IS NOT NULL;",
+		"INSERT INTO pg_init_privs "
+		"  (objoid, classoid, objsubid, initprivs, privtype)"
+		"    SELECT"
+		"        oid,"
+		"        (SELECT oid FROM pg_class WHERE "
+		"		  relname = 'pg_largeobject_metadata'),"
+		"        0,"
+		"        lomacl,"
+		"        'i'"
+		"    FROM"
+		"        pg_largeobject_metadata"
+		"    WHERE"
+		"        lomacl IS NOT NULL;",
+		"INSERT INTO pg_init_privs "
+		"  (objoid, classoid, objsubid, initprivs, privtype)"
+		"    SELECT"
+		"        oid,"
+		"        (SELECT oid FROM pg_class WHERE relname = 'pg_namespace'),"
+		"        0,"
+		"        nspacl,"
+		"        'i'"
+		"    FROM"
+		"        pg_namespace"
+		"    WHERE"
+		"        nspacl IS NOT NULL;",
+		"INSERT INTO pg_init_privs "
+		"  (objoid, classoid, objsubid, initprivs, privtype)"
+		"    SELECT"
+		"        oid,"
+		"        (SELECT oid FROM pg_class WHERE "
+		"		  relname = 'pg_foreign_data_wrapper'),"
+		"        0,"
+		"        fdwacl,"
+		"        'i'"
+		"    FROM"
+		"        pg_foreign_data_wrapper"
+		"    WHERE"
+		"        fdwacl IS NOT NULL;",
+		"INSERT INTO pg_init_privs "
+		"  (objoid, classoid, objsubid, initprivs, privtype)"
+		"    SELECT"
+		"        oid,"
+		"        (SELECT oid FROM pg_class "
+		"		  WHERE relname = 'pg_foreign_server'),"
+		"        0,"
+		"        srvacl,"
+		"        'i'"
+		"    FROM"
+		"        pg_foreign_server"
+		"    WHERE"
+		"        srvacl IS NOT NULL;",
 		NULL
 	};
 
-	fputs(_("setting privileges on built-in objects ... "), stdout);
-	fflush(stdout);
-
-	snprintf(cmd, sizeof(cmd),
-			 "\"%s\" %s template1 >%s",
-			 backend_exec, backend_options,
-			 DEVNULL);
-
-	PG_CMD_OPEN;
-
 	priv_lines = replace_token(privileges_setup, "$POSTGRES_SUPERUSERNAME",
 							   escape_quotes(username));
 	for (line = priv_lines; *line != NULL; line++)
 		PG_CMD_PUTS(*line);
-
-	PG_CMD_CLOSE;
-
-	check_ok();
 }
 
 /*
@@ -2255,27 +2234,13 @@ set_info_version(void)
  * load info schema and populate from features file
  */
 static void
-setup_schema(void)
+setup_schema(FILE *cmdfd)
 {
-	PG_CMD_DECL;
 	char	  **line;
 	char	  **lines;
 
-	fputs(_("creating information schema ... "), stdout);
-	fflush(stdout);
-
 	lines = readfile(info_schema_file);
 
-	/*
-	 * We use -j here to avoid backslashing stuff in information_schema.sql
-	 */
-	snprintf(cmd, sizeof(cmd),
-			 "\"%s\" %s -j template1 >%s",
-			 backend_exec, backend_options,
-			 DEVNULL);
-
-	PG_CMD_OPEN;
-
 	for (line = lines; *line != NULL; line++)
 	{
 		PG_CMD_PUTS(*line);
@@ -2284,54 +2249,25 @@ setup_schema(void)
 
 	free(lines);
 
-	PG_CMD_CLOSE;
-
-	snprintf(cmd, sizeof(cmd),
-			 "\"%s\" %s template1 >%s",
-			 backend_exec, backend_options,
-			 DEVNULL);
-
-	PG_CMD_OPEN;
-
 	PG_CMD_PRINTF1("UPDATE information_schema.sql_implementation_info "
 				   "  SET character_value = '%s' "
-				   "  WHERE implementation_info_name = 'DBMS VERSION';\n",
+				   "  WHERE implementation_info_name = 'DBMS VERSION';\n\n",
 				   infoversion);
 
 	PG_CMD_PRINTF1("COPY information_schema.sql_features "
 				   "  (feature_id, feature_name, sub_feature_id, "
 				   "  sub_feature_name, is_supported, comments) "
-				   " FROM E'%s';\n",
+				   " FROM E'%s';\n\n",
 				   escape_quotes(features_file));
-
-	PG_CMD_CLOSE;
-
-	check_ok();
 }
 
 /*
  * load PL/pgsql server-side language
  */
 static void
-load_plpgsql(void)
+load_plpgsql(FILE *cmdfd)
 {
-	PG_CMD_DECL;
-
-	fputs(_("loading PL/pgSQL server-side language ... "), stdout);
-	fflush(stdout);
-
-	snprintf(cmd, sizeof(cmd),
-			 "\"%s\" %s template1 >%s",
-			 backend_exec, backend_options,
-			 DEVNULL);
-
-	PG_CMD_OPEN;
-
-	PG_CMD_PUTS("CREATE EXTENSION plpgsql;\n");
-
-	PG_CMD_CLOSE;
-
-	check_ok();
+	PG_CMD_PUTS("CREATE EXTENSION plpgsql;\n\n");
 }
 
 #ifdef PGXC
@@ -2368,38 +2304,21 @@ vacuumfreeze(char *dbname)
  * clean everything up in template1
  */
 static void
-vacuum_db(void)
+vacuum_db(FILE *cmdfd)
 {
-	PG_CMD_DECL;
-
-	fputs(_("vacuuming database template1 ... "), stdout);
-	fflush(stdout);
-
-	snprintf(cmd, sizeof(cmd),
-			 "\"%s\" %s template1 >%s",
-			 backend_exec, backend_options,
-			 DEVNULL);
-
-	PG_CMD_OPEN;
-
 	/* Run analyze before VACUUM so the statistics are frozen. */
-	PG_CMD_PUTS("ANALYZE;\nVACUUM FREEZE;\n");
-
-	PG_CMD_CLOSE;
-
-	check_ok();
+	PG_CMD_PUTS("ANALYZE;\n\nVACUUM FREEZE;\n\n");
 }
 
 /*
  * copy template1 to template0
  */
 static void
-make_template0(void)
+make_template0(FILE *cmdfd)
 {
-	PG_CMD_DECL;
-	const char **line;
-	static const char *template0_setup[] = {
-		"CREATE DATABASE template0 IS_TEMPLATE = true ALLOW_CONNECTIONS = false;\n",
+	const char *const * line;
+	static const char *const template0_setup[] = {
+		"CREATE DATABASE template0 IS_TEMPLATE = true ALLOW_CONNECTIONS = false;\n\n",
 
 		/*
 		 * We use the OID of template0 to determine lastsysoid
@@ -2411,77 +2330,48 @@ make_template0(void)
 		"UPDATE pg_database SET datlastsysoid = "
 		"    (SELECT oid FROM pg_database "
 #endif
-		"    WHERE datname = 'template0');\n",
+		"    WHERE datname = 'template0');\n\n",
 
 		/*
 		 * Explicitly revoke public create-schema and create-temp-table
 		 * privileges in template1 and template0; else the latter would be on
 		 * by default
 		 */
-		"REVOKE CREATE,TEMPORARY ON DATABASE template1 FROM public;\n",
-		"REVOKE CREATE,TEMPORARY ON DATABASE template0 FROM public;\n",
+		"REVOKE CREATE,TEMPORARY ON DATABASE template1 FROM public;\n\n",
+		"REVOKE CREATE,TEMPORARY ON DATABASE template0 FROM public;\n\n",
 
-		"COMMENT ON DATABASE template0 IS 'unmodifiable empty database';\n",
+		"COMMENT ON DATABASE template0 IS 'unmodifiable empty database';\n\n",
 
 		/*
 		 * Finally vacuum to clean up dead rows in pg_database
 		 */
 #ifdef XCP
-		"VACUUM FULL pg_catalog.pg_database;\n",
+		"VACUUM pg_catalog.pg_database;\n",
 #else
-		"VACUUM FULL pg_database;\n",
+		"VACUUM pg_database;\n\n",
 #endif
 		NULL
 	};
 
-	fputs(_("copying template1 to template0 ... "), stdout);
-	fflush(stdout);
-
-	snprintf(cmd, sizeof(cmd),
-			 "\"%s\" %s template1 >%s",
-			 backend_exec, backend_options,
-			 DEVNULL);
-
-	PG_CMD_OPEN;
-
 	for (line = template0_setup; *line; line++)
 		PG_CMD_PUTS(*line);
-
-	PG_CMD_CLOSE;
-
-	check_ok();
 }
 
 /*
  * copy template1 to postgres
  */
 static void
-make_postgres(void)
+make_postgres(FILE *cmdfd)
 {
-	PG_CMD_DECL;
-	const char **line;
-	static const char *postgres_setup[] = {
-		"CREATE DATABASE postgres;\n",
-		"COMMENT ON DATABASE postgres IS 'default administrative connection database';\n",
+	const char *const * line;
+	static const char *const postgres_setup[] = {
+		"CREATE DATABASE postgres;\n\n",
+		"COMMENT ON DATABASE postgres IS 'default administrative connection database';\n\n",
 		NULL
 	};
 
-	fputs(_("copying template1 to postgres ... "), stdout);
-	fflush(stdout);
-
-	snprintf(cmd, sizeof(cmd),
-			 "\"%s\" %s template1 >%s",
-			 backend_exec, backend_options,
-			 DEVNULL);
-
-	PG_CMD_OPEN;
-
 	for (line = postgres_setup; *line; line++)
 		PG_CMD_PUTS(*line);
-
-	PG_CMD_CLOSE;
-
-	check_ok();
 }
 
 /*
@@ -2894,9 +2784,9 @@ check_authmethod_unspecified(const char **authmethod)
 }
 
 static void
-check_authmethod_valid(const char *authmethod, const char **valid_methods, const char *conntype)
+check_authmethod_valid(const char *authmethod, const char *const * valid_methods, const char *conntype)
 {
-	const char **p;
+	const char *const * p;
 
 	for (p = valid_methods; *p; p++)
 	{
@@ -3240,8 +3130,12 @@ create_data_directory(void)
 				   pg_data);
 			fflush(stdout);
 
-			if (!mkdatadir(NULL))
+			if (pg_mkdir_p(pg_data, S_IRWXU) != 0)
+			{
+				fprintf(stderr, _("%s: could not create directory \"%s\": %s\n"),
+						progname, pg_data, strerror(errno));
 				exit_nicely();
+			}
 			else
 				check_ok();
 
@@ -3292,13 +3186,17 @@ create_data_directory(void)
 }
 
 
+/* Create transaction log directory, and symlink if required */
 void
-create_xlog_symlink(void)
+create_xlog_or_symlink(void)
 {
-	/* Create transaction log symlink, if required */
+	char	   *subdirloc;
+
+	/* form name of the place for the subdirectory or symlink */
+	subdirloc = psprintf("%s/pg_xlog", pg_data);
+
 	if (strcmp(xlog_dir, "") != 0)
 	{
-		char	   *linkloc;
 		int			ret;
 
 		/* clean up xlog directory name, check it's absolute */
@@ -3371,22 +3269,30 @@ create_xlog_symlink(void)
 				exit_nicely();
 		}
 
-		/* form name of the place where the symlink must go */
-		linkloc = psprintf("%s/pg_xlog", pg_data);
-
 #ifdef HAVE_SYMLINK
-		if (symlink(xlog_dir, linkloc) != 0)
+		if (symlink(xlog_dir, subdirloc) != 0)
 		{
 			fprintf(stderr, _("%s: could not create symbolic link \"%s\": %s\n"),
-					progname, linkloc, strerror(errno));
+					progname, subdirloc, strerror(errno));
 			exit_nicely();
 		}
 #else
 		fprintf(stderr, _("%s: symlinks are not supported on this platform"));
 		exit_nicely();
 #endif
-		free(linkloc);
 	}
+	else
+	{
+		/* Without -X option, just make the subdirectory normally */
+		if (mkdir(subdirloc, S_IRWXU) < 0)
+		{
+			fprintf(stderr, _("%s: could not create directory \"%s\": %s\n"),
+					progname, subdirloc, strerror(errno));
+			exit_nicely();
+		}
+	}
+
+	free(subdirloc);
 }
 
 
@@ -3409,6 +3315,7 @@ warn_on_mount_point(int error)
 void
 initialize_data_directory(void)
 {
+	PG_CMD_DECL;
 	int			i;
 
 	setup_signals();
@@ -3417,16 +3324,30 @@ initialize_data_directory(void)
 
 	create_data_directory();
 
-	create_xlog_symlink();
+	create_xlog_or_symlink();
 
-	/* Create required subdirectories */
+	/* Create required subdirectories (other than pg_xlog) */
 	printf(_("creating subdirectories ... "));
 	fflush(stdout);
 
-	for (i = 0; i < (sizeof(subdirs) / sizeof(char *)); i++)
+	for (i = 0; i < lengthof(subdirs); i++)
 	{
-		if (!mkdatadir(subdirs[i]))
+		char	   *path;
+
+		path = psprintf("%s/%s", pg_data, subdirs[i]);
+
+		/*
+		 * The parent directory already exists, so we only need mkdir() not
+		 * pg_mkdir_p() here, which avoids some failure modes; cf bug #13853.
+		 */
+		if (mkdir(path, S_IRWXU) < 0)
+		{
+			fprintf(stderr, _("%s: could not create directory \"%s\": %s\n"),
+					progname, path, strerror(errno));
 			exit_nicely();
+		}
+
+		free(path);
 	}
 
 	check_ok();
@@ -3449,34 +3370,45 @@ initialize_data_directory(void)
 	 */
 	write_version_file("base/1");
 
-	/* Create the stuff we don't need to use bootstrap mode for */
+	/*
+	 * Create the stuff we don't need to use bootstrap mode for, using a
+	 * backend running in simple standalone mode.
+	 */
+	fputs(_("performing post-bootstrap initialization ... "), stdout);
+	fflush(stdout);
+
+	snprintf(cmd, sizeof(cmd),
+			 "\"%s\" %s template1 >%s",
+			 backend_exec, backend_options,
+			 DEVNULL);
+
+	PG_CMD_OPEN;
 
-	setup_auth();
+	setup_auth(cmdfd);
 	if (pwprompt || pwfilename)
-		get_set_pwd();
+		get_set_pwd(cmdfd);
 
-	setup_depend();
+	setup_depend(cmdfd);
 
-	setup_sysviews();
+	setup_sysviews(cmdfd);
 
 #ifdef PGXC
 	/* Initialize catalog information about the node self */
 	setup_nodeself();
 #endif
+	setup_description(cmdfd);
 
-	setup_description();
-
-	setup_collation();
+	setup_collation(cmdfd);
 
-	setup_conversion();
+	setup_conversion(cmdfd);
 
-	setup_dictionary();
+	setup_dictionary(cmdfd);
 
-	setup_privileges();
+	setup_privileges(cmdfd);
 
-	setup_schema();
+	setup_schema(cmdfd);
 
-	load_plpgsql();
+	load_plpgsql(cmdfd);
 
 #ifdef XCP
 #ifdef NOT_USED
@@ -3484,11 +3416,15 @@ initialize_data_directory(void)
 #endif
 #endif
 
-	vacuum_db();
+	vacuum_db(cmdfd);
 
-	make_template0();
+	make_template0(cmdfd);
 
-	make_postgres();
+	make_postgres(cmdfd);
+
+	PG_CMD_CLOSE;
+
+	check_ok();
 }
 
 
@@ -3740,6 +3676,12 @@ main(int argc, char *argv[])
 	if (strlen(username) == 0)
 		username = effective_user;
 
+	if (strncmp(username, "pg_", 3) == 0)
+	{
+		fprintf(stderr, _("%s: superuser name \"%s\" is disallowed; role names cannot begin with \"pg_\"\n"), progname, username);
+		exit(1);
+	}
+
 	printf(_("The files belonging to this database system will be owned "
 			 "by user \"%s\".\n"
 			 "This user must also own the server process.\n\n"),
diff --git a/src/bin/initdb/nls.mk b/src/bin/initdb/nls.mk
index 3482c5d159..0d5368304e 100644
--- a/src/bin/initdb/nls.mk
+++ b/src/bin/initdb/nls.mk
@@ -1,5 +1,5 @@
 # src/bin/initdb/nls.mk
 CATALOG_NAME     = initdb
-AVAIL_LANGUAGES  = cs de es fr it ja pl pt_BR ru sv zh_CN
+AVAIL_LANGUAGES  = cs de es fr it ja ko pl pt_BR ru sv zh_CN
 GETTEXT_FILES    = findtimezone.c initdb.c ../../common/exec.c ../../common/fe_memutils.c ../../common/pgfnames.c ../../common/restricted_token.c ../../common/rmtree.c ../../common/username.c ../../common/wait_error.c ../../port/dirmod.c
 GETTEXT_TRIGGERS = simple_prompt
diff --git a/src/bin/initdb/po/de.po b/src/bin/initdb/po/de.po
index cf76391559..f73558ca30 100644
--- a/src/bin/initdb/po/de.po
+++ b/src/bin/initdb/po/de.po
@@ -1,14 +1,14 @@
 # German message translation file for initdb.
-# Peter Eisentraut <peter_e@gmx.net>, 2003 - 2015.
+# Peter Eisentraut <peter_e@gmx.net>, 2003 - 2016.
 #
-# Use these quotes: „%s“
+# Use these quotes: »%s«
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9.5\n"
+"Project-Id-Version: PostgreSQL 9.6\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-05-19 00:43+0000\n"
-"PO-Revision-Date: 2015-05-18 20:57-0400\n"
+"POT-Creation-Date: 2016-05-22 02:44+0000\n"
+"PO-Revision-Date: 2016-05-22 20:55-0400\n"
 "Last-Translator: Peter Eisentraut <peter_e@gmx.net>\n"
 "Language-Team: Peter Eisentraut <peter_e@gmx.net>\n"
 "Language: de\n"
@@ -24,27 +24,27 @@ msgstr "konnte aktuelles Verzeichnis nicht ermitteln: %s"
 #: ../../common/exec.c:146
 #, c-format
 msgid "invalid binary \"%s\""
-msgstr "ungültige Programmdatei „%s“"
+msgstr "ungültige Programmdatei »%s«"
 
 #: ../../common/exec.c:195
 #, c-format
 msgid "could not read binary \"%s\""
-msgstr "konnte Programmdatei „%s“ nicht lesen"
+msgstr "konnte Programmdatei »%s« nicht lesen"
 
 #: ../../common/exec.c:202
 #, c-format
 msgid "could not find a \"%s\" to execute"
-msgstr "konnte kein „%s“ zum Ausführen finden"
+msgstr "konnte kein »%s« zum Ausführen finden"
 
 #: ../../common/exec.c:257 ../../common/exec.c:293
 #, c-format
 msgid "could not change directory to \"%s\": %s"
-msgstr "konnte nicht in Verzeichnis „%s“ wechseln: %s"
+msgstr "konnte nicht in Verzeichnis »%s« wechseln: %s"
 
 #: ../../common/exec.c:272
 #, c-format
 msgid "could not read symbolic link \"%s\""
-msgstr "konnte symbolische Verknüpfung „%s“ nicht lesen"
+msgstr "konnte symbolische Verknüpfung »%s« nicht lesen"
 
 #: ../../common/exec.c:523
 #, c-format
@@ -65,22 +65,22 @@ msgstr "kann NULL-Zeiger nicht kopieren (interner Fehler)\n"
 #: ../../common/pgfnames.c:45
 #, c-format
 msgid "could not open directory \"%s\": %s\n"
-msgstr "konnte Verzeichnis „%s“ nicht öffnen: %s\n"
+msgstr "konnte Verzeichnis »%s« nicht öffnen: %s\n"
 
 #: ../../common/pgfnames.c:72
 #, c-format
 msgid "could not read directory \"%s\": %s\n"
-msgstr "konnte Verzeichnis „%s“ nicht lesen: %s\n"
+msgstr "konnte Verzeichnis »%s« nicht lesen: %s\n"
 
 #: ../../common/pgfnames.c:84
 #, c-format
 msgid "could not close directory \"%s\": %s\n"
-msgstr "konnte Verzeichnis „%s“ nicht schließen: %s\n"
+msgstr "konnte Verzeichnis »%s« nicht schließen: %s\n"
 
 #: ../../common/restricted_token.c:68
 #, c-format
 msgid "%s: WARNING: cannot create restricted tokens on this platform\n"
-msgstr "%s: WARNUNG: auf dieser Platform können keine beschränkten Token erzeugt werden\n"
+msgstr "%s: WARNUNG: auf dieser Plattform können keine beschränkten Token erzeugt werden\n"
 
 #: ../../common/restricted_token.c:77
 #, c-format
@@ -100,7 +100,7 @@ msgstr "%s: konnte beschränktes Token nicht erzeugen: Fehlercode %lu\n"
 #: ../../common/restricted_token.c:132
 #, c-format
 msgid "%s: could not start process for command \"%s\": error code %lu\n"
-msgstr "%s: konnte Prozess für Befehl „%s“ nicht starten: Fehlercode %lu\n"
+msgstr "%s: konnte Prozess für Befehl »%s« nicht starten: Fehlercode %lu\n"
 
 #: ../../common/restricted_token.c:170
 #, c-format
@@ -115,12 +115,12 @@ msgstr "%s: konnte Statuscode des Subprozesses nicht ermitteln: Fehlercode %lu\n
 #: ../../common/rmtree.c:77
 #, 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"
+msgstr "konnte »stat« für Datei oder Verzeichnis »%s« nicht ausführen: %s\n"
 
 #: ../../common/rmtree.c:104 ../../common/rmtree.c:121
 #, c-format
 msgid "could not remove file or directory \"%s\": %s\n"
-msgstr "konnte Datei oder Verzeichnis „%s“ nicht entfernen: %s\n"
+msgstr "konnte Datei oder Verzeichnis »%s« nicht entfernen: %s\n"
 
 #: ../../common/username.c:45
 #, c-format
@@ -171,122 +171,117 @@ msgstr "Kindprozess wurde von Signal %d beendet"
 msgid "child process exited with unrecognized status %d"
 msgstr "Kindprozess hat mit unbekanntem Status %d beendet"
 
-#: ../../port/dirmod.c:219
+#: ../../port/dirmod.c:221
 #, c-format
 msgid "could not set junction for \"%s\": %s\n"
-msgstr "konnte Junction für „%s“ nicht erzeugen: %s\n"
+msgstr "konnte Junction für »%s« nicht erzeugen: %s\n"
 
-#: ../../port/dirmod.c:294
+#: ../../port/dirmod.c:298
 #, c-format
 msgid "could not get junction for \"%s\": %s\n"
-msgstr "konnte Junction für „%s“ nicht ermitteln: %s\n"
+msgstr "konnte Junction für »%s« nicht ermitteln: %s\n"
 
-#: initdb.c:329
+#: initdb.c:349
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: Speicher aufgebraucht\n"
 
-#: initdb.c:439 initdb.c:1651
+#: initdb.c:459 initdb.c:1589
 #, c-format
 msgid "%s: could not open file \"%s\" for reading: %s\n"
-msgstr "%s: konnte Datei „%s“ nicht zum Lesen öffnen: %s\n"
+msgstr "%s: konnte Datei »%s« nicht zum Lesen öffnen: %s\n"
 
-#: initdb.c:495 initdb.c:1047 initdb.c:1075
+#: initdb.c:515 initdb.c:1002 initdb.c:1030
 #, c-format
 msgid "%s: could not open file \"%s\" for writing: %s\n"
-msgstr "%s: konnte Datei „%s“ nicht zum Schreiben öffnen: %s\n"
+msgstr "%s: konnte Datei »%s« nicht zum Schreiben öffnen: %s\n"
 
-#: initdb.c:503 initdb.c:511 initdb.c:1054 initdb.c:1081
+#: initdb.c:523 initdb.c:531 initdb.c:1009 initdb.c:1036
 #, c-format
 msgid "%s: could not write file \"%s\": %s\n"
-msgstr "%s: konnte Datei „%s“ nicht schreiben: %s\n"
+msgstr "%s: konnte Datei »%s« nicht schreiben: %s\n"
 
-#: initdb.c:533 initdb.c:600
+#: initdb.c:562
 #, c-format
 msgid "%s: could not open directory \"%s\": %s\n"
-msgstr "%s: konnte Verzeichnis „%s“ nicht öffnen: %s\n"
+msgstr "%s: konnte Verzeichnis »%s« nicht öffnen: %s\n"
 
-#: initdb.c:550
+#: initdb.c:586 initdb.c:2336
 #, c-format
 msgid "%s: could not stat file \"%s\": %s\n"
-msgstr "%s: konnte „stat“ für Datei „%s“ nicht ausführen: %s\n"
+msgstr "%s: konnte »stat« für Datei »%s« nicht ausführen: %s\n"
 
-#: initdb.c:563 initdb.c:620
+#: initdb.c:598
 #, c-format
 msgid "%s: could not read directory \"%s\": %s\n"
-msgstr "%s: konnte Verzeichnis „%s“ nicht lesen: %s\n"
+msgstr "%s: konnte Verzeichnis »%s« nicht lesen: %s\n"
 
-#: initdb.c:570 initdb.c:627
-#, c-format
-msgid "%s: could not close directory \"%s\": %s\n"
-msgstr "%s: konnte Verzeichnis „%s“ nicht schließen: %s\n"
-
-#: initdb.c:654 initdb.c:706
+#: initdb.c:631 initdb.c:690
 #, c-format
 msgid "%s: could not open file \"%s\": %s\n"
-msgstr "%s: konnte Datei „%s“ nicht öffnen: %s\n"
+msgstr "%s: konnte Datei »%s« nicht öffnen: %s\n"
 
-#: initdb.c:722
+#: initdb.c:702
 #, c-format
 msgid "%s: could not fsync file \"%s\": %s\n"
-msgstr "%s: konnte Datei „%s“ nicht fsyncen: %s\n"
+msgstr "%s: konnte Datei »%s« nicht fsyncen: %s\n"
 
-#: initdb.c:743
+#: initdb.c:721
 #, c-format
 msgid "%s: could not execute command \"%s\": %s\n"
-msgstr "%s: konnte Befehl „%s“ nicht ausführen: %s\n"
+msgstr "%s: konnte Befehl »%s« nicht ausführen: %s\n"
 
-#: initdb.c:759
+#: initdb.c:737
 #, c-format
 msgid "%s: removing data directory \"%s\"\n"
-msgstr "%s: entferne Datenverzeichnis „%s“\n"
+msgstr "%s: entferne Datenverzeichnis »%s«\n"
 
-#: initdb.c:762
+#: initdb.c:740
 #, c-format
 msgid "%s: failed to remove data directory\n"
 msgstr "%s: konnte Datenverzeichnis nicht entfernen\n"
 
-#: initdb.c:768
+#: initdb.c:746
 #, c-format
 msgid "%s: removing contents of data directory \"%s\"\n"
-msgstr "%s: entferne Inhalt des Datenverzeichnisses „%s“\n"
+msgstr "%s: entferne Inhalt des Datenverzeichnisses »%s«\n"
 
-#: initdb.c:771
+#: initdb.c:749
 #, c-format
 msgid "%s: failed to remove contents of data directory\n"
 msgstr "%s: konnte Inhalt des Datenverzeichnisses nicht entfernen\n"
 
-#: initdb.c:777
+#: initdb.c:755
 #, c-format
 msgid "%s: removing transaction log directory \"%s\"\n"
-msgstr "%s: entferne Transaktionslogverzeichnis „%s“\n"
+msgstr "%s: entferne Transaktionslogverzeichnis »%s«\n"
 
-#: initdb.c:780
+#: initdb.c:758
 #, c-format
 msgid "%s: failed to remove transaction log directory\n"
 msgstr "%s: konnte Transaktionslogverzeichnis nicht entfernen\n"
 
-#: initdb.c:786
+#: initdb.c:764
 #, c-format
 msgid "%s: removing contents of transaction log directory \"%s\"\n"
-msgstr "%s: entferne Inhalt des Transaktionslogverzeichnisses „%s“\n"
+msgstr "%s: entferne Inhalt des Transaktionslogverzeichnisses »%s«\n"
 
-#: initdb.c:789
+#: initdb.c:767
 #, c-format
 msgid "%s: failed to remove contents of transaction log directory\n"
 msgstr "%s: konnte Inhalt des Transaktionslogverzeichnisses nicht entfernen\n"
 
-#: initdb.c:798
+#: initdb.c:776
 #, c-format
 msgid "%s: data directory \"%s\" not removed at user's request\n"
-msgstr "%s: Datenverzeichnis „%s“ wurde auf Anwenderwunsch nicht entfernt\n"
+msgstr "%s: Datenverzeichnis »%s« wurde auf Anwenderwunsch nicht entfernt\n"
 
-#: initdb.c:803
+#: initdb.c:781
 #, 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"
+msgstr "%s: Transaktionslogverzeichnis »%s« wurde auf Anwenderwunsch nicht entfernt\n"
 
-#: initdb.c:824
+#: initdb.c:802
 #, c-format
 msgid ""
 "%s: cannot be run as root\n"
@@ -294,25 +289,20 @@ msgid ""
 "own the server process.\n"
 msgstr ""
 "%s: kann nicht als root ausgeführt werden\n"
-"Bitte loggen Sie sich (z.B. mit „su“) als der (unprivilegierte) Benutzer\n"
+"Bitte loggen Sie sich (z.B. mit »su«) als der (unprivilegierte) Benutzer\n"
 "ein, der Eigentümer des Serverprozesses sein soll.\n"
 
-#: initdb.c:860
+#: initdb.c:838
 #, c-format
 msgid "%s: \"%s\" is not a valid server encoding name\n"
-msgstr "%s: „%s“ ist keine gültige Serverkodierung\n"
-
-#: initdb.c:974 initdb.c:3225
-#, c-format
-msgid "%s: could not create directory \"%s\": %s\n"
-msgstr "%s: konnte Verzeichnis „%s“ nicht erzeugen: %s\n"
+msgstr "%s: »%s« ist keine gültige Serverkodierung\n"
 
-#: initdb.c:1003
+#: initdb.c:958
 #, c-format
 msgid "%s: file \"%s\" does not exist\n"
-msgstr "%s: Datei „%s“ existiert nicht\n"
+msgstr "%s: Datei »%s« existiert nicht\n"
 
-#: initdb.c:1005 initdb.c:1014 initdb.c:1024
+#: initdb.c:960 initdb.c:969 initdb.c:979
 #, c-format
 msgid ""
 "This might mean you have a corrupted installation or identified\n"
@@ -321,205 +311,143 @@ msgstr ""
 "Das könnte bedeuten, dass Ihre Installation fehlerhaft ist oder dass Sie das\n"
 "falsche Verzeichnis mit der Kommandozeilenoption -L angegeben haben.\n"
 
-#: initdb.c:1011
+#: initdb.c:966
 #, c-format
 msgid "%s: could not access file \"%s\": %s\n"
-msgstr "%s: konnte nicht auf Datei „%s“ zugreifen: %s\n"
+msgstr "%s: konnte nicht auf Datei »%s« zugreifen: %s\n"
 
-#: initdb.c:1022
+#: initdb.c:977
 #, c-format
 msgid "%s: file \"%s\" is not a regular file\n"
-msgstr "%s: Datei „%s“ ist keine normale Datei\n"
+msgstr "%s: Datei »%s« ist keine normale Datei\n"
 
-#: initdb.c:1167
+#: initdb.c:1122
 #, c-format
 msgid "selecting default max_connections ... "
 msgstr "wähle Vorgabewert für max_connections ... "
 
-#: initdb.c:1197
+#: initdb.c:1152
 #, c-format
 msgid "selecting default shared_buffers ... "
 msgstr "wähle Vorgabewert für shared_buffers ... "
 
-#: initdb.c:1230
+#: initdb.c:1185
 #, c-format
 msgid "selecting dynamic shared memory implementation ... "
 msgstr "wähle Implementierung von dynamischem Shared Memory ... "
 
-#: initdb.c:1248
+#: initdb.c:1203
 msgid "creating configuration files ... "
 msgstr "erzeuge Konfigurationsdateien ... "
 
-#: initdb.c:1345 initdb.c:1365 initdb.c:1449 initdb.c:1465
+#: initdb.c:1300 initdb.c:1320 initdb.c:1404 initdb.c:1420
 #, c-format
 msgid "%s: could not change permissions of \"%s\": %s\n"
-msgstr "%s: konnte Zugriffsrechte von „%s“ nicht ändern: %s\n"
+msgstr "%s: konnte Zugriffsrechte von »%s« nicht ändern: %s\n"
 
-#: initdb.c:1489
+#: initdb.c:1444
 #, c-format
-msgid "creating template1 database in %s/base/1 ... "
-msgstr "erzeuge Datenbank template1 in %s/base/1 ... "
+msgid "running bootstrap script ... "
+msgstr "führe Bootstrap-Skript aus ... "
 
-#: initdb.c:1505
+#: initdb.c:1460
 #, 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: Eingabedatei „%s“ gehört nicht zu PostgreSQL %s\n"
+"%s: Eingabedatei »%s« gehört nicht zu PostgreSQL %s\n"
 "Prüfen Sie Ihre Installation oder geben Sie den korrekten Pfad mit der\n"
 "Option -L an.\n"
 
-#: initdb.c:1592
-msgid "initializing pg_authid ... "
-msgstr "initialisiere pg_authid ... "
-
-#: initdb.c:1626
+#: initdb.c:1564
 msgid "Enter new superuser password: "
 msgstr "Geben Sie das neue Superuser-Passwort ein: "
 
-#: initdb.c:1627
+#: initdb.c:1565
 msgid "Enter it again: "
 msgstr "Geben Sie es noch einmal ein: "
 
-#: initdb.c:1630
+#: initdb.c:1568
 #, c-format
 msgid "Passwords didn't match.\n"
 msgstr "Passwörter stimmten nicht überein.\n"
 
-#: initdb.c:1658
+#: initdb.c:1596
 #, c-format
 msgid "%s: could not read password from file \"%s\": %s\n"
-msgstr "%s: konnte Passwort nicht aus Datei „%s“ lesen: %s\n"
+msgstr "%s: konnte Passwort nicht aus Datei »%s« lesen: %s\n"
 
-#: initdb.c:1661
+#: initdb.c:1599
 #, c-format
 msgid "%s: password file \"%s\" is empty\n"
-msgstr "%s: Passwortdatei „%s“ ist leer\n"
-
-#: initdb.c:1674
-#, c-format
-msgid "setting password ... "
-msgstr "setze das Passwort ... "
-
-#: initdb.c:1774
-msgid "initializing dependencies ... "
-msgstr "initialisiere Abhängigkeiten ... "
+msgstr "%s: Passwortdatei »%s« ist leer\n"
 
-#: initdb.c:1802
-msgid "creating system views ... "
-msgstr "erzeuge Systemsichten ... "
-
-#: initdb.c:1838
-msgid "loading system objects' descriptions ... "
-msgstr "lade Systemobjektbeschreibungen ... "
-
-#: initdb.c:1944
-msgid "creating collations ... "
-msgstr "erzeuge Sortierfolgen ... "
-
-#: initdb.c:1977
+#: initdb.c:1847
 #, c-format
 msgid "%s: locale name too long, skipped: \"%s\"\n"
-msgstr "%s: Locale-Name zu lang, wird ausgelassen: „%s“\n"
+msgstr "%s: Locale-Name zu lang, wird ausgelassen: »%s«\n"
 
-#: initdb.c:2002
+#: initdb.c:1872
 #, 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"
+msgstr "%s: Locale-Name hat Nicht-ASCII-Zeichen, wird ausgelassen: »%s«\n"
 
-#: initdb.c:2071
+#: initdb.c:1945
 #, c-format
 msgid "No usable system locales were found.\n"
 msgstr "Es wurden keine brauchbaren System-Locales gefunden.\n"
 
-#: initdb.c:2072
+#: initdb.c:1946
 #, c-format
 msgid "Use the option \"--debug\" to see details.\n"
-msgstr "Verwenden Sie die Option „--debug“, um Einzelheiten zu sehen.\n"
-
-#: initdb.c:2075
-#, c-format
-msgid "not supported on this platform\n"
-msgstr "auf dieser Plattform nicht unterstützt\n"
-
-#: initdb.c:2090
-msgid "creating conversions ... "
-msgstr "erzeuge Konversionen ... "
-
-#: initdb.c:2125
-msgid "creating dictionaries ... "
-msgstr "erzeuge Wörterbücher ... "
-
-#: initdb.c:2179
-msgid "setting privileges on built-in objects ... "
-msgstr "setze Privilegien der eingebauten Objekte ... "
-
-#: initdb.c:2237
-msgid "creating information schema ... "
-msgstr "erzeuge Informationsschema ... "
+msgstr "Verwenden Sie die Option »--debug«, um Einzelheiten zu sehen.\n"
 
-#: initdb.c:2293
-msgid "loading PL/pgSQL server-side language ... "
-msgstr "lade Serversprache PL/pgSQL ... "
-
-#: initdb.c:2318
-msgid "vacuuming database template1 ... "
-msgstr "führe Vacuum in Datenbank template1 durch ... "
-
-#: initdb.c:2371
-msgid "copying template1 to template0 ... "
-msgstr "kopiere template1 nach template0 ... "
-
-#: initdb.c:2403
-msgid "copying template1 to postgres ... "
-msgstr "kopiere template1 nach postgres ... "
-
-#: initdb.c:2430
+#: initdb.c:2319
 msgid "syncing data to disk ... "
 msgstr "synchronisiere Daten auf Festplatte ... "
 
-#: initdb.c:2509
+#: initdb.c:2413
 #, c-format
 msgid "caught signal\n"
 msgstr "Signal abgefangen\n"
 
-#: initdb.c:2515
+#: initdb.c:2419
 #, c-format
 msgid "could not write to child process: %s\n"
 msgstr "konnte nicht an Kindprozess schreiben: %s\n"
 
-#: initdb.c:2523
+#: initdb.c:2427
 #, c-format
 msgid "ok\n"
 msgstr "ok\n"
 
-#: initdb.c:2613
+#: initdb.c:2517
 #, c-format
 msgid "%s: setlocale() failed\n"
 msgstr "%s: setlocale() fehlgeschlagen\n"
 
-#: initdb.c:2631
+#: initdb.c:2535
 #, c-format
 msgid "%s: failed to restore old locale \"%s\"\n"
-msgstr "%s: konnte alte Locale „%s“ nicht wiederherstellen\n"
+msgstr "%s: konnte alte Locale »%s« nicht wiederherstellen\n"
 
-#: initdb.c:2641
+#: initdb.c:2545
 #, c-format
 msgid "%s: invalid locale name \"%s\"\n"
-msgstr "%s: ungültiger Locale-Name „%s“\n"
+msgstr "%s: ungültiger Locale-Name »%s«\n"
 
-#: initdb.c:2653
+#: initdb.c:2557
 #, c-format
 msgid "%s: invalid locale settings; check LANG and LC_* environment variables\n"
 msgstr "%s: ungültige Locale-Einstellungen; prüfen Sie die Umgebungsvariablen LANG und LC_*\n"
 
-#: initdb.c:2681
+#: initdb.c:2585
 #, c-format
 msgid "%s: encoding mismatch\n"
 msgstr "%s: unpassende Kodierungen\n"
 
-#: initdb.c:2683
+#: initdb.c:2587
 #, c-format
 msgid ""
 "The encoding you selected (%s) and the encoding that the\n"
@@ -534,7 +462,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:2755
+#: initdb.c:2659
 #, c-format
 msgid ""
 "%s initializes a PostgreSQL database cluster.\n"
@@ -543,17 +471,17 @@ msgstr ""
 "%s initialisiert einen PostgreSQL-Datenbankcluster.\n"
 "\n"
 
-#: initdb.c:2756
+#: initdb.c:2660
 #, c-format
 msgid "Usage:\n"
 msgstr "Aufruf:\n"
 
-#: initdb.c:2757
+#: initdb.c:2661
 #, c-format
 msgid "  %s [OPTION]... [DATADIR]\n"
 msgstr "  %s [OPTION]... [DATENVERZEICHNIS]\n"
 
-#: initdb.c:2758
+#: initdb.c:2662
 #, c-format
 msgid ""
 "\n"
@@ -562,41 +490,41 @@ msgstr ""
 "\n"
 "Optionen:\n"
 
-#: initdb.c:2759
+#: initdb.c:2663
 #, c-format
 msgid "  -A, --auth=METHOD         default authentication method for local connections\n"
 msgstr "  -A, --auth=METHODE        vorgegebene Authentifizierungsmethode für lokale Verbindungen\n"
 
-#: initdb.c:2760
+#: initdb.c:2664
 #, c-format
 msgid "      --auth-host=METHOD    default authentication method for local TCP/IP connections\n"
 msgstr ""
 "      --auth-host=METHODE   vorgegebene Authentifizierungsmethode für lokale\n"
 "                            TCP/IP-Verbindungen\n"
 
-#: initdb.c:2761
+#: initdb.c:2665
 #, c-format
 msgid "      --auth-local=METHOD   default authentication method for local-socket connections\n"
 msgstr ""
 "      --auth-local=METHODE  vorgegebene Authentifizierungsmethode für Verbindungen\n"
 "                            auf lokalen Sockets\n"
 
-#: initdb.c:2762
+#: initdb.c:2666
 #, c-format
 msgid " [-D, --pgdata=]DATADIR     location for this database cluster\n"
 msgstr " [-D, --pgdata=]DATENVERZ   Datenverzeichnis für diesen Datenbankcluster\n"
 
-#: initdb.c:2763
+#: initdb.c:2667
 #, 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:2764
+#: initdb.c:2668
 #, c-format
 msgid "      --locale=LOCALE       set default locale for new databases\n"
 msgstr "      --locale=LOCALE       setze Standardlocale für neue Datenbanken\n"
 
-#: initdb.c:2765
+#: initdb.c:2669
 #, c-format
 msgid ""
 "      --lc-collate=, --lc-ctype=, --lc-messages=LOCALE\n"
@@ -610,17 +538,17 @@ msgstr ""
 "                            für neue Datenbanken (Voreinstellung aus der\n"
 "                            Umgebung entnommen)\n"
 
-#: initdb.c:2769
+#: initdb.c:2673
 #, c-format
 msgid "      --no-locale           equivalent to --locale=C\n"
 msgstr "      --no-locale           entspricht --locale=C\n"
 
-#: initdb.c:2770
+#: initdb.c:2674
 #, 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:2771
+#: initdb.c:2675
 #, c-format
 msgid ""
 "  -T, --text-search-config=CFG\n"
@@ -629,22 +557,22 @@ msgstr ""
 "  -T, --text-search-config=KFG\n"
 "                            Standardtextsuchekonfiguration\n"
 
-#: initdb.c:2773
+#: initdb.c:2677
 #, c-format
 msgid "  -U, --username=NAME       database superuser name\n"
 msgstr "  -U, --username=NAME       Datenbank-Superusername\n"
 
-#: initdb.c:2774
+#: initdb.c:2678
 #, 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:2775
+#: initdb.c:2679
 #, c-format
 msgid "  -X, --xlogdir=XLOGDIR     location for the transaction log directory\n"
 msgstr "  -X, --xlogdir=XLOGVERZ    Verzeichnis für das Transaktionslog\n"
 
-#: initdb.c:2776
+#: initdb.c:2680
 #, c-format
 msgid ""
 "\n"
@@ -653,44 +581,44 @@ msgstr ""
 "\n"
 "Weniger häufig verwendete Optionen:\n"
 
-#: initdb.c:2777
+#: initdb.c:2681
 #, c-format
 msgid "  -d, --debug               generate lots of debugging output\n"
 msgstr "  -d, --debug               erzeuge eine Menge Debug-Ausgaben\n"
 
-#: initdb.c:2778
+#: initdb.c:2682
 #, c-format
 msgid "  -k, --data-checksums      use data page checksums\n"
 msgstr "  -k, --data-checksums      Datenseitenprüfsummen verwenden\n"
 
-#: initdb.c:2779
+#: initdb.c:2683
 #, c-format
 msgid "  -L DIRECTORY              where to find the input files\n"
 msgstr "  -L VERZEICHNIS            wo sind die Eingabedateien zu finden\n"
 
-#: initdb.c:2780
+#: initdb.c:2684
 #, c-format
 msgid "  -n, --noclean             do not clean up after errors\n"
 msgstr "  -n, --noclean             nach Fehlern nicht aufräumen\n"
 
-#: initdb.c:2781
+#: initdb.c:2685
 #, c-format
 msgid "  -N, --nosync              do not wait for changes to be written safely to disk\n"
 msgstr ""
 "  -N, --nosync              nicht warten, bis Änderungen sicher auf Festplatte\n"
 "                            geschrieben sind\n"
 
-#: initdb.c:2782
+#: initdb.c:2686
 #, c-format
 msgid "  -s, --show                show internal settings\n"
 msgstr "  -s, --show                zeige interne Einstellungen\n"
 
-#: initdb.c:2783
+#: initdb.c:2687
 #, c-format
 msgid "  -S, --sync-only           only sync data directory\n"
 msgstr "  -S, --sync-only           nur Datenverzeichnis synchronisieren\n"
 
-#: initdb.c:2784
+#: initdb.c:2688
 #, c-format
 msgid ""
 "\n"
@@ -699,17 +627,17 @@ msgstr ""
 "\n"
 "Weitere Optionen:\n"
 
-#: initdb.c:2785
+#: initdb.c:2689
 #, c-format
 msgid "  -V, --version             output version information, then exit\n"
 msgstr "  -V, --version             Versionsinformationen anzeigen, dann beenden\n"
 
-#: initdb.c:2786
+#: initdb.c:2690
 #, c-format
 msgid "  -?, --help                show this help, then exit\n"
 msgstr "  -?, --help                diese Hilfe anzeigen, dann beenden\n"
 
-#: initdb.c:2787
+#: initdb.c:2691
 #, c-format
 msgid ""
 "\n"
@@ -720,7 +648,7 @@ msgstr ""
 "Wenn kein Datenverzeichnis angegeben ist, dann wird die Umgebungsvariable\n"
 "PGDATA verwendet.\n"
 
-#: initdb.c:2789
+#: initdb.c:2693
 #, c-format
 msgid ""
 "\n"
@@ -729,7 +657,7 @@ msgstr ""
 "\n"
 "Berichten Sie Fehler an <pgsql-bugs@postgresql.org>.\n"
 
-#: initdb.c:2797
+#: initdb.c:2701
 msgid ""
 "\n"
 "WARNING: enabling \"trust\" authentication for local connections\n"
@@ -737,22 +665,22 @@ msgid ""
 "--auth-local and --auth-host, the next time you run initdb.\n"
 msgstr ""
 "\n"
-"WARNUNG: Authentifizierung für lokale Verbindungen auf „trust“ gesetzt\n"
+"WARNUNG: Authentifizierung für lokale Verbindungen auf »trust« gesetzt\n"
 "Sie können dies ändern, indem Sie pg_hba.conf bearbeiten oder beim\n"
 "nächsten Aufruf von initdb die Option -A, oder --auth-local und\n"
 "--auth-host, verwenden.\n"
 
-#: initdb.c:2819
+#: initdb.c:2723
 #, c-format
 msgid "%s: invalid authentication method \"%s\" for \"%s\" connections\n"
-msgstr "%s: ungültige Authentifizierungsmethode „%s“ für „%s“-Verbindungen\n"
+msgstr "%s: ungültige Authentifizierungsmethode »%s« für »%s«-Verbindungen\n"
 
-#: initdb.c:2833
+#: initdb.c:2737
 #, c-format
 msgid "%s: must specify a password for the superuser to enable %s authentication\n"
 msgstr "%s: Superuser-Passwort muss angegeben werden um %s-Authentifizierung einzuschalten\n"
 
-#: initdb.c:2860
+#: initdb.c:2764
 #, c-format
 msgid ""
 "%s: no data directory specified\n"
@@ -765,39 +693,39 @@ msgstr ""
 "werden soll. Machen Sie dies entweder mit der Kommandozeilenoption -D\n"
 "oder mit der Umgebungsvariable PGDATA.\n"
 
-#: initdb.c:2898
+#: initdb.c:2802
 #, 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 ""
-"Das Programm „postgres“ wird von %s benötigt, aber wurde nicht im\n"
-"selben Verzeichnis wie „%s“ gefunden.\n"
+"Das Programm »postgres« wird von %s benötigt, aber wurde nicht im\n"
+"selben Verzeichnis wie »%s« gefunden.\n"
 "Prüfen Sie Ihre Installation.\n"
 
-#: initdb.c:2905
+#: initdb.c:2809
 #, 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 ""
-"Das Programm „postgres“ wurde von %s gefunden,\n"
+"Das Programm »postgres« wurde von %s gefunden,\n"
 "aber es hatte nicht die gleiche Version wie %s.\n"
 "Prüfen Sie Ihre Installation.\n"
 
-#: initdb.c:2924
+#: initdb.c:2828
 #, c-format
 msgid "%s: input file location must be an absolute path\n"
 msgstr "%s: Eingabedatei muss absoluten Pfad haben\n"
 
-#: initdb.c:2943
+#: initdb.c:2847
 #, c-format
 msgid "The database cluster will be initialized with locale \"%s\".\n"
-msgstr "Der Datenbankcluster wird mit der Locale „%s“ initialisiert werden.\n"
+msgstr "Der Datenbankcluster wird mit der Locale »%s« initialisiert werden.\n"
 
-#: initdb.c:2946
+#: initdb.c:2850
 #, c-format
 msgid ""
 "The database cluster will be initialized with locales\n"
@@ -816,90 +744,95 @@ msgstr ""
 "  NUMERIC:  %s\n"
 "  TIME:     %s\n"
 
-#: initdb.c:2970
+#: initdb.c:2874
 #, 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"
+msgstr "%s: konnte keine passende Kodierung für Locale »%s« finden\n"
 
-#: initdb.c:2972
+#: initdb.c:2876
 #, c-format
 msgid "Rerun %s with the -E option.\n"
 msgstr "Führen Sie %s erneut mit der Option -E aus.\n"
 
-#: initdb.c:2973 initdb.c:3549 initdb.c:3570
+#: initdb.c:2877 initdb.c:3500 initdb.c:3521
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
-msgstr "Versuchen Sie „%s --help“ für weitere Informationen.\n"
+msgstr "Versuchen Sie »%s --help« für weitere Informationen.\n"
 
-#: initdb.c:2985
+#: initdb.c:2889
 #, 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"
+"Die von der Locale gesetzte Kodierung »%s« ist nicht als serverseitige Kodierung erlaubt.\n"
+"Die Standarddatenbankkodierung wird stattdessen auf »%s« gesetzt.\n"
 
-#: initdb.c:2993
+#: initdb.c:2897
 #, c-format
 msgid "%s: locale \"%s\" requires unsupported encoding \"%s\"\n"
-msgstr "%s: Locale „%s“ benötigt nicht unterstützte Kodierung „%s“\n"
+msgstr "%s: Locale »%s« benötigt nicht unterstützte Kodierung »%s«\n"
 
-#: initdb.c:2996
+#: initdb.c:2900
 #, c-format
 msgid ""
 "Encoding \"%s\" is not allowed as a server-side encoding.\n"
 "Rerun %s with a different locale selection.\n"
 msgstr ""
-"Kodierung „%s“ ist nicht als serverseitige Kodierung erlaubt.\n"
+"Kodierung »%s« ist nicht als serverseitige Kodierung erlaubt.\n"
 "Starten Sie %s erneut mit einer anderen Locale-Wahl.\n"
 
-#: initdb.c:3005
+#: initdb.c:2909
 #, c-format
 msgid "The default database encoding has accordingly been set to \"%s\".\n"
-msgstr "Die Standarddatenbankkodierung wurde entsprechend auf „%s“ gesetzt.\n"
+msgstr "Die Standarddatenbankkodierung wurde entsprechend auf »%s« gesetzt.\n"
 
-#: initdb.c:3076
+#: initdb.c:2980
 #, 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"
+msgstr "%s: konnte keine passende Textsuchekonfiguration für Locale »%s« finden\n"
 
-#: initdb.c:3087
+#: initdb.c:2991
 #, 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"
+msgstr "%s: Warnung: passende Textsuchekonfiguration für Locale »%s« ist unbekannt\n"
 
-#: initdb.c:3092
+#: initdb.c:2996
 #, c-format
 msgid "%s: warning: specified text search configuration \"%s\" might not match locale \"%s\"\n"
-msgstr "%s: Warnung: angegebene Textsuchekonfiguration „%s“ passt möglicherweise nicht zur Locale „%s“\n"
+msgstr "%s: Warnung: angegebene Textsuchekonfiguration »%s« passt möglicherweise nicht zur Locale »%s«\n"
 
-#: initdb.c:3097
+#: initdb.c:3001
 #, c-format
 msgid "The default text search configuration will be set to \"%s\".\n"
-msgstr "Die Standardtextsuchekonfiguration wird auf „%s“ gesetzt.\n"
+msgstr "Die Standardtextsuchekonfiguration wird auf »%s« gesetzt.\n"
 
-#: initdb.c:3141 initdb.c:3219
+#: initdb.c:3045 initdb.c:3131
 #, c-format
 msgid "creating directory %s ... "
 msgstr "erzeuge Verzeichnis %s ... "
 
-#: initdb.c:3155 initdb.c:3237
+#: initdb.c:3051 initdb.c:3137 initdb.c:3205 initdb.c:3261
+#, c-format
+msgid "%s: could not create directory \"%s\": %s\n"
+msgstr "%s: konnte Verzeichnis »%s« nicht erzeugen: %s\n"
+
+#: initdb.c:3063 initdb.c:3149
 #, c-format
 msgid "fixing permissions on existing directory %s ... "
 msgstr "berichtige Zugriffsrechte des bestehenden Verzeichnisses %s ... "
 
-#: initdb.c:3161 initdb.c:3243
+#: initdb.c:3069 initdb.c:3155
 #, c-format
 msgid "%s: could not change permissions of directory \"%s\": %s\n"
-msgstr "%s: konnte Rechte des Verzeichnisses „%s“ nicht ändern: %s\n"
+msgstr "%s: konnte Rechte des Verzeichnisses »%s« nicht ändern: %s\n"
 
-#: initdb.c:3176 initdb.c:3258
+#: initdb.c:3084 initdb.c:3170
 #, c-format
 msgid "%s: directory \"%s\" exists but is not empty\n"
-msgstr "%s: Verzeichnis „%s“ existiert aber ist nicht leer\n"
+msgstr "%s: Verzeichnis »%s« existiert aber ist nicht leer\n"
 
-#: initdb.c:3182
+#: initdb.c:3090
 #, c-format
 msgid ""
 "If you want to create a new database system, either remove or empty\n"
@@ -907,49 +840,49 @@ msgid ""
 "with an argument other than \"%s\".\n"
 msgstr ""
 "Wenn Sie ein neues Datenbanksystem erzeugen wollen, entfernen oder leeren\n"
-"Sie das Verzeichnis „%s“ or führen Sie %s\n"
-"mit einem anderen Argument als „%s“ aus.\n"
+"Sie das Verzeichnis »%s« or führen Sie %s\n"
+"mit einem anderen Argument als »%s« aus.\n"
 
-#: initdb.c:3190 initdb.c:3271
+#: initdb.c:3098 initdb.c:3183 initdb.c:3534
 #, c-format
 msgid "%s: could not access directory \"%s\": %s\n"
-msgstr "%s: konnte nicht auf Verzeichnis „%s“ zugreifen: %s\n"
+msgstr "%s: konnte nicht auf Verzeichnis »%s« zugreifen: %s\n"
 
-#: initdb.c:3210
+#: initdb.c:3122
 #, c-format
 msgid "%s: transaction log directory location must be an absolute path\n"
 msgstr "%s: Transaktionslogverzeichnis muss absoluten Pfad haben\n"
 
-#: initdb.c:3264
+#: initdb.c:3176
 #, c-format
 msgid ""
 "If you want to store the transaction log there, either\n"
 "remove or empty the directory \"%s\".\n"
 msgstr ""
 "Wenn Sie dort den Transaktionslog ablegen wollen, entfernen oder leeren\n"
-"Sie das Verzeichnis „%s“.\n"
+"Sie das Verzeichnis »%s«.\n"
 
-#: initdb.c:3282
+#: initdb.c:3191
 #, c-format
 msgid "%s: could not create symbolic link \"%s\": %s\n"
-msgstr "%s: konnte symbolische Verknüpfung „%s“ nicht erzeugen: %s\n"
+msgstr "%s: konnte symbolische Verknüpfung »%s« nicht erzeugen: %s\n"
 
-#: initdb.c:3287
+#: initdb.c:3196
 #, 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:3300
+#: initdb.c:3220
 #, c-format
 msgid "It contains a dot-prefixed/invisible file, perhaps due to it being a mount point.\n"
 msgstr "Es enthält eine unsichtbare Datei (beginnt mit Punkt), vielleicht weil es ein Einhängepunkt ist.\n"
 
-#: initdb.c:3303
+#: initdb.c:3223
 #, c-format
 msgid "It contains a lost+found directory, perhaps due to it being a mount point.\n"
-msgstr "Es enthält ein Verzeichnis „lost+found“, vielleicht weil es ein Einhängepunkt ist.\n"
+msgstr "Es enthält ein Verzeichnis »lost+found«, vielleicht weil es ein Einhängepunkt ist.\n"
 
-#: initdb.c:3306
+#: initdb.c:3226
 #, c-format
 msgid ""
 "Using a mount point directly as the data directory is not recommended.\n"
@@ -958,32 +891,41 @@ msgstr ""
 "Einen Einhängepunkt direkt als Datenverzeichnis zu verwenden wird nicht empfohlen.\n"
 "Erzeugen Sie ein Unterverzeichnis unter dem Einhängepunkt.\n"
 
-#: initdb.c:3325
+#: initdb.c:3246
 #, c-format
 msgid "creating subdirectories ... "
 msgstr "erzeuge Unterverzeichnisse ... "
 
-#: initdb.c:3493
+#: initdb.c:3293
+msgid "performing post-bootstrap initialization ... "
+msgstr "führe Post-Bootstrap-Initialisierung durch ... "
+
+#: initdb.c:3444
 #, c-format
 msgid "Running in debug mode.\n"
 msgstr "Debug-Modus ist an.\n"
 
-#: initdb.c:3497
+#: initdb.c:3448
 #, 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:3568
+#: initdb.c:3519
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
-msgstr "%s: zu viele Kommandozeilenargumente (das erste ist „%s“)\n"
+msgstr "%s: zu viele Kommandozeilenargumente (das erste ist »%s«)\n"
 
-#: initdb.c:3585
+#: initdb.c:3545
 #, 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:3607
+#: initdb.c:3569
+#, c-format
+msgid "%s: superuser name \"%s\" is disallowed; role names cannot begin with \"pg_\"\n"
+msgstr "%s: Superuser-Name »%s« nicht erlaubt; Rollennamen können nicht mit »pg_« anfangen\n"
+
+#: initdb.c:3573
 #, c-format
 msgid ""
 "The files belonging to this database system will be owned by user \"%s\".\n"
@@ -991,20 +933,20 @@ msgid ""
 "\n"
 msgstr ""
 "Die Dateien, die zu diesem Datenbanksystem gehören, werden dem Benutzer\n"
-"„%s“ gehören. Diesem Benutzer muss auch der Serverprozess gehören.\n"
+"»%s« gehören. Diesem Benutzer muss auch der Serverprozess gehören.\n"
 "\n"
 
-#: initdb.c:3623
+#: initdb.c:3589
 #, c-format
 msgid "Data page checksums are enabled.\n"
 msgstr "Datenseitenprüfsummen sind eingeschaltet.\n"
 
-#: initdb.c:3625
+#: initdb.c:3591
 #, c-format
 msgid "Data page checksums are disabled.\n"
 msgstr "Datenseitenprüfsummen sind ausgeschaltet.\n"
 
-#: initdb.c:3634
+#: initdb.c:3600
 #, c-format
 msgid ""
 "\n"
@@ -1015,7 +957,7 @@ msgstr ""
 "Synchronisation auf Festplatte übersprungen.\n"
 "Das Datenverzeichnis könnte verfälscht werden, falls das Betriebssystem abstürzt.\n"
 
-#: initdb.c:3643
+#: initdb.c:3609
 #, c-format
 msgid ""
 "\n"
diff --git a/src/bin/initdb/po/es.po b/src/bin/initdb/po/es.po
index afcd1d9ed8..c187b8f5b6 100644
--- a/src/bin/initdb/po/es.po
+++ b/src/bin/initdb/po/es.po
@@ -8,17 +8,17 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: initdb (PostgreSQL 9.4)\n"
+"Project-Id-Version: initdb (PostgreSQL 9.6)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2014-12-15 05:42+0000\n"
-"PO-Revision-Date: 2014-12-15 14:49-0300\n"
+"POT-Creation-Date: 2016-05-02 20:14+0000\n"
+"PO-Revision-Date: 2016-05-24 10:42-0500\n"
 "Last-Translator: Carlos Chapi <carlos.chapi@2ndquadrant.com>\n"
 "Language-Team: PgSQL-es-Ayuda <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"
-"X-Generator: Poedit 1.7.1\n"
+"X-Generator: Poedit 1.8.7\n"
 
 #: ../../common/exec.c:127 ../../common/exec.c:241 ../../common/exec.c:284
 #, c-format
@@ -55,13 +55,13 @@ msgstr "no se pudo leer el enlace simbólico «%s»"
 msgid "pclose failed: %s"
 msgstr "pclose falló: %s"
 
-#: ../../common/fe_memutils.c:33 ../../common/fe_memutils.c:60
-#: ../../common/fe_memutils.c:83
+#: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
+#: ../../common/fe_memutils.c:98
 #, c-format
 msgid "out of memory\n"
 msgstr "memoria agotada\n"
 
-#: ../../common/fe_memutils.c:77
+#: ../../common/fe_memutils.c:92
 #, c-format
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "no se puede duplicar un puntero nulo (error interno)\n"
@@ -81,6 +81,41 @@ msgstr "no se pudo leer el directorio «%s»: %s\n"
 msgid "could not close directory \"%s\": %s\n"
 msgstr "no se pudo cerrar el directorio «%s»: %s\n"
 
+#: ../../common/restricted_token.c:68
+#, c-format
+msgid "%s: WARNING: cannot create restricted tokens on this platform\n"
+msgstr "%s: ATENCIÓN: no se pueden crear tokens restrigidos en esta plataforma\n"
+
+#: ../../common/restricted_token.c:77
+#, c-format
+msgid "%s: could not open process token: error code %lu\n"
+msgstr "%s: no se pudo abrir el token de proceso: código de error %lu\n"
+
+#: ../../common/restricted_token.c:90
+#, c-format
+msgid "%s: could not allocate SIDs: error code %lu\n"
+msgstr "%s: no se pudo emplazar los SIDs: código de error %lu\n"
+
+#: ../../common/restricted_token.c:110
+#, c-format
+msgid "%s: could not create restricted token: error code %lu\n"
+msgstr "%s: no se pudo crear el token restringido: código de error %lu\n"
+
+#: ../../common/restricted_token.c:132
+#, c-format
+msgid "%s: could not start process for command \"%s\": error code %lu\n"
+msgstr "%s: no se pudo iniciar el proceso para la orden «%s»: código de error %lu\n"
+
+#: ../../common/restricted_token.c:170
+#, c-format
+msgid "%s: could not re-execute with restricted token: error code %lu\n"
+msgstr "%s: no se pudo re-ejecutar con el token restringido: código de error %lu\n"
+
+#: ../../common/restricted_token.c:186
+#, c-format
+msgid "%s: could not get exit code from subprocess: error code %lu\n"
+msgstr "%s: no se pudo obtener el código de salida del subproceso»: código de error %lu\n"
+
 #: ../../common/rmtree.c:77
 #, c-format
 msgid "could not stat file or directory \"%s\": %s\n"
@@ -100,10 +135,10 @@ msgstr "no se pudo buscar el ID de usuario efectivo %ld: %s"
 msgid "user does not exist"
 msgstr "el usuario no existe"
 
-#: ../../common/username.c:61
+#: ../../common/username.c:62
 #, c-format
-msgid "user name lookup failure: %s"
-msgstr "ocurrió una falla en la búsqueda de nombre de usuario: %s"
+msgid "user name lookup failure: error code %lu"
+msgstr "fallo en la búsqueda de nombre de usuario: código de error %lu"
 
 #: ../../common/wait_error.c:47
 #, c-format
@@ -140,124 +175,119 @@ msgstr "el proceso hijo fue terminado por una señal %d"
 msgid "child process exited with unrecognized status %d"
 msgstr "el proceso hijo terminó con código no reconocido %d"
 
-#: ../../port/dirmod.c:219
+#: ../../port/dirmod.c:221
 #, 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:294
+#: ../../port/dirmod.c:298
 #, c-format
 msgid "could not get junction for \"%s\": %s\n"
 msgstr "no se pudo obtener junction para «%s»: %s\n"
 
-#: initdb.c:337
+#: initdb.c:349
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: memoria agotada\n"
 
-#: initdb.c:447 initdb.c:1653
+#: initdb.c:459 initdb.c:1589
 #, 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:503 initdb.c:1055 initdb.c:1083
+#: initdb.c:515 initdb.c:1002 initdb.c:1030
 #, 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:511 initdb.c:519 initdb.c:1062 initdb.c:1089
+#: initdb.c:523 initdb.c:531 initdb.c:1009 initdb.c:1036
 #, c-format
 msgid "%s: could not write file \"%s\": %s\n"
 msgstr "%s: no se pudo escribir el archivo «%s»: %s\n"
 
-#: initdb.c:541 initdb.c:608
+#: initdb.c:562
 #, c-format
 msgid "%s: could not open directory \"%s\": %s\n"
 msgstr "%s: no se pudo abrir el directorio «%s»: %s\n"
 
-#: initdb.c:558
+#: initdb.c:586 initdb.c:2334
 #, c-format
 msgid "%s: could not stat file \"%s\": %s\n"
 msgstr "%s: no se pudo hacer stat del archivo «%s»: %s\n"
 
-#: initdb.c:571 initdb.c:628
+#: initdb.c:598
 #, c-format
 msgid "%s: could not read directory \"%s\": %s\n"
 msgstr "%s: no se pudo leer el directorio «%s»: %s\n"
 
-#: initdb.c:578 initdb.c:635
-#, c-format
-msgid "%s: could not close directory \"%s\": %s\n"
-msgstr "%s: no se pudo cerrar el directorio «%s»: %s\n"
-
-#: initdb.c:662 initdb.c:714
+#: initdb.c:631 initdb.c:690
 #, c-format
 msgid "%s: could not open file \"%s\": %s\n"
 msgstr "%s: no se pudo abrir el archivo «%s»: %s\n"
 
-#: initdb.c:730
+#: initdb.c:702
 #, c-format
 msgid "%s: could not fsync file \"%s\": %s\n"
 msgstr "%s: no se pudo sincronizar (fsync) el archivo «%s»: %s\n"
 
-#: initdb.c:751
+#: initdb.c:721
 #, c-format
 msgid "%s: could not execute command \"%s\": %s\n"
 msgstr "%s: no se pudo ejecutar la orden «%s»: %s\n"
 
-#: initdb.c:767
+#: initdb.c:737
 #, c-format
 msgid "%s: removing data directory \"%s\"\n"
 msgstr "%s: eliminando el directorio de datos «%s»\n"
 
-#: initdb.c:770
+#: initdb.c:740
 #, c-format
 msgid "%s: failed to remove data directory\n"
 msgstr "%s: no se pudo eliminar el directorio de datos\n"
 
-#: initdb.c:776
+#: initdb.c:746
 #, c-format
 msgid "%s: removing contents of data directory \"%s\"\n"
 msgstr "%s: eliminando el contenido del directorio «%s»\n"
 
-#: initdb.c:779
+#: initdb.c:749
 #, 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:785
+#: initdb.c:755
 #, c-format
 msgid "%s: removing transaction log directory \"%s\"\n"
 msgstr "%s: eliminando el directorio de registro de transacciones «%s»\n"
 
-#: initdb.c:788
+#: initdb.c:758
 #, 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:794
+#: initdb.c:764
 #, 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:797
+#: initdb.c:767
 #, 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:806
+#: initdb.c:776
 #, 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:811
+#: initdb.c:781
 #, 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:832
+#: initdb.c:802
 #, c-format
 msgid ""
 "%s: cannot be run as root\n"
@@ -268,22 +298,17 @@ msgstr ""
 "Por favor conéctese (usando, por ejemplo, «su») con un usuario no privilegiado,\n"
 "quien ejecutará el proceso servidor.\n"
 
-#: initdb.c:868
+#: initdb.c:838
 #, 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:982 initdb.c:3386
-#, c-format
-msgid "%s: could not create directory \"%s\": %s\n"
-msgstr "%s: no se pudo crear el directorio «%s»: %s\n"
-
-#: initdb.c:1011
+#: initdb.c:958
 #, c-format
 msgid "%s: file \"%s\" does not exist\n"
 msgstr "%s: el archivo «%s» no existe\n"
 
-#: initdb.c:1013 initdb.c:1022 initdb.c:1032
+#: initdb.c:960 initdb.c:969 initdb.c:979
 #, c-format
 msgid ""
 "This might mean you have a corrupted installation or identified\n"
@@ -292,46 +317,46 @@ 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:1019
+#: initdb.c:966
 #, c-format
 msgid "%s: could not access file \"%s\": %s\n"
 msgstr "%s: no se pudo acceder al archivo «%s»: %s\n"
 
-#: initdb.c:1030
+#: initdb.c:977
 #, 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:1175
+#: initdb.c:1122
 #, c-format
 msgid "selecting default max_connections ... "
 msgstr "seleccionando el valor para max_connections ... "
 
-#: initdb.c:1205
+#: initdb.c:1152
 #, c-format
 msgid "selecting default shared_buffers ... "
 msgstr "seleccionando el valor para shared_buffers ... "
 
-#: initdb.c:1238
+#: initdb.c:1185
 #, c-format
 msgid "selecting dynamic shared memory implementation ... "
 msgstr "seleccionando implementación de memoria compartida dinámica ..."
 
-#: initdb.c:1256
+#: initdb.c:1203
 msgid "creating configuration files ... "
 msgstr "creando archivos de configuración ... "
 
-#: initdb.c:1347 initdb.c:1367 initdb.c:1451 initdb.c:1467
+#: initdb.c:1300 initdb.c:1320 initdb.c:1404 initdb.c:1420
 #, c-format
 msgid "%s: could not change permissions of \"%s\": %s\n"
 msgstr "%s: no se pudo cambiar los permisos de «%s»: %s\n"
 
-#: initdb.c:1491
+#: initdb.c:1444
 #, c-format
-msgid "creating template1 database in %s/base/1 ... "
-msgstr "creando base de datos template1 en %s/base/1 ... "
+msgid "running bootstrap script ... "
+msgstr "ejecutando script de inicio (bootstrap) ... "
 
-#: initdb.c:1507
+#: initdb.c:1460
 #, c-format
 msgid ""
 "%s: input file \"%s\" does not belong to PostgreSQL %s\n"
@@ -340,156 +365,94 @@ msgstr ""
 "%s: el archivo de entrada «%s» no pertenece a PostgreSQL %s\n"
 "Verifique su instalación o especifique la ruta correcta usando la opción -L.\n"
 
-#: initdb.c:1594
-msgid "initializing pg_authid ... "
-msgstr "inicializando pg_authid ... "
-
-#: initdb.c:1628
+#: initdb.c:1564
 msgid "Enter new superuser password: "
 msgstr "Ingrese la nueva contraseña del superusuario: "
 
-#: initdb.c:1629
+#: initdb.c:1565
 msgid "Enter it again: "
 msgstr "Ingrésela nuevamente: "
 
-#: initdb.c:1632
+#: initdb.c:1568
 #, c-format
 msgid "Passwords didn't match.\n"
 msgstr "Las constraseñas no coinciden.\n"
 
-#: initdb.c:1660
+#: initdb.c:1596
 #, 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:1663
+#: initdb.c:1599
 #, c-format
 msgid "%s: password file \"%s\" is empty\n"
 msgstr "%s: el archivo de contraseña «%s» está vacío\n"
 
-#: initdb.c:1676
-#, c-format
-msgid "setting password ... "
-msgstr "estableciendo contraseña ... "
-
-#: initdb.c:1776
-msgid "initializing dependencies ... "
-msgstr "inicializando dependencias ... "
-
-#: initdb.c:1804
-msgid "creating system views ... "
-msgstr "creando las vistas de sistema ... "
-
-#: initdb.c:1840
-msgid "loading system objects' descriptions ... "
-msgstr "cargando las descripciones de los objetos del sistema ... "
-
-#: initdb.c:1946
-msgid "creating collations ... "
-msgstr "creando algoritmos de ordenamiento ... "
-
-#: initdb.c:1979
+#: initdb.c:1845
 #, c-format
 msgid "%s: locale name too long, skipped: \"%s\"\n"
 msgstr "%s: nombre de configuración regional demasiado largo, saltando: «%s»\n"
 
-#: initdb.c:2004
+#: initdb.c:1870
 #, c-format
 msgid "%s: locale name has non-ASCII characters, skipped: \"%s\"\n"
 msgstr "%s: nombre de configuración regional tiene caracteres no ASCII, saltando: «%s»\n"
 
-#: initdb.c:2073
+#: initdb.c:1943
 #, c-format
 msgid "No usable system locales were found.\n"
 msgstr "No se encontraron configuraciones regionales utilizables.\n"
 
-#: initdb.c:2074
+#: initdb.c:1944
 #, c-format
 msgid "Use the option \"--debug\" to see details.\n"
 msgstr "Use la opción «--debug» para ver detalles.\n"
 
-#: initdb.c:2077
-#, c-format
-msgid "not supported on this platform\n"
-msgstr "no está soportado en esta plataforma\n"
-
-#: initdb.c:2092
-msgid "creating conversions ... "
-msgstr "creando conversiones ... "
-
-#: initdb.c:2127
-msgid "creating dictionaries ... "
-msgstr "creando diccionarios ... "
-
-#: initdb.c:2181
-msgid "setting privileges on built-in objects ... "
-msgstr "estableciendo privilegios en objetos predefinidos ... "
-
-#: initdb.c:2239
-msgid "creating information schema ... "
-msgstr "creando el esquema de información ... "
-
-#: initdb.c:2295
-msgid "loading PL/pgSQL server-side language ... "
-msgstr "instalando el lenguaje PL/pgSQL ... "
-
-#: initdb.c:2320
-msgid "vacuuming database template1 ... "
-msgstr "haciendo vacuum a la base de datos template1 ... "
-
-#: initdb.c:2376
-msgid "copying template1 to template0 ... "
-msgstr "copiando template1 a template0 ... "
-
-#: initdb.c:2408
-msgid "copying template1 to postgres ... "
-msgstr "copiando template1 a postgres ... "
-
-#: initdb.c:2435
+#: initdb.c:2317
 msgid "syncing data to disk ... "
 msgstr "sincronizando los datos a disco ... "
 
-#: initdb.c:2514
+#: initdb.c:2411
 #, c-format
 msgid "caught signal\n"
 msgstr "se ha capturado una señal\n"
 
-#: initdb.c:2520
+#: initdb.c:2417
 #, c-format
 msgid "could not write to child process: %s\n"
 msgstr "no se pudo escribir al proceso hijo: %s\n"
 
-#: initdb.c:2528
+#: initdb.c:2425
 #, c-format
 msgid "ok\n"
 msgstr "hecho\n"
 
-#: initdb.c:2618
+#: initdb.c:2515
 #, c-format
 msgid "%s: setlocale() failed\n"
 msgstr "%s: setlocale() falló\n"
 
-#: initdb.c:2636
+#: initdb.c:2533
 #, c-format
 msgid "%s: failed to restore old locale \"%s\"\n"
 msgstr "%s: no se pudo restaurar la configuración regional anterior «%s»\n"
 
-#: initdb.c:2646
+#: initdb.c:2543
 #, c-format
 msgid "%s: invalid locale name \"%s\"\n"
 msgstr "%s: nombre de configuración regional «%s» no es válido\n"
 
-#: initdb.c:2658
+#: initdb.c:2555
 #, c-format
 msgid "%s: invalid locale settings; check LANG and LC_* environment variables\n"
 msgstr "%s: configuración regional inválida; revise las variables de entorno LANG y LC_*\n"
 
-#: initdb.c:2686
+#: initdb.c:2583
 #, c-format
 msgid "%s: encoding mismatch\n"
 msgstr "%s: codificaciones no coinciden\n"
 
-#: initdb.c:2688
+#: initdb.c:2585
 #, c-format
 msgid ""
 "The encoding you selected (%s) and the encoding that the\n"
@@ -504,32 +467,7 @@ msgstr ""
 "Ejecute %s nuevamente y no especifique una codificación, o bien especifique\n"
 "una combinación adecuada.\n"
 
-#: initdb.c:2793
-#, c-format
-msgid "%s: WARNING: cannot create restricted tokens on this platform\n"
-msgstr "%s: ATENCIÓN: no se pueden crear tokens restrigidos en esta plataforma\n"
-
-#: initdb.c:2802
-#, c-format
-msgid "%s: could not open process token: error code %lu\n"
-msgstr "%s: no se pudo abrir el token de proceso: código de error %lu\n"
-
-#: initdb.c:2815
-#, c-format
-msgid "%s: could not to allocate SIDs: error code %lu\n"
-msgstr "%s: no se pudo emplazar los SIDs: código de error %lu\n"
-
-#: initdb.c:2834
-#, c-format
-msgid "%s: could not create restricted token: error code %lu\n"
-msgstr "%s: no se pudo crear el token restringido: código de error %lu\n"
-
-#: initdb.c:2855
-#, c-format
-msgid "%s: could not start process for command \"%s\": error code %lu\n"
-msgstr "%s: no se pudo iniciar el proceso para la orden «%s»: código de error %lu\n"
-
-#: initdb.c:2869
+#: initdb.c:2657
 #, c-format
 msgid ""
 "%s initializes a PostgreSQL database cluster.\n"
@@ -538,17 +476,17 @@ msgstr ""
 "%s inicializa un cluster de base de datos PostgreSQL.\n"
 "\n"
 
-#: initdb.c:2870
+#: initdb.c:2658
 #, c-format
 msgid "Usage:\n"
 msgstr "Empleo:\n"
 
-#: initdb.c:2871
+#: initdb.c:2659
 #, c-format
 msgid "  %s [OPTION]... [DATADIR]\n"
 msgstr "  %s [OPCIÓN]... [DATADIR]\n"
 
-#: initdb.c:2872
+#: initdb.c:2660
 #, c-format
 msgid ""
 "\n"
@@ -557,45 +495,45 @@ msgstr ""
 "\n"
 "Opciones:\n"
 
-#: initdb.c:2873
+#: initdb.c:2661
 #, c-format
 msgid "  -A, --auth=METHOD         default authentication method for local connections\n"
 msgstr ""
 "  -A, --auth=MÉTODO         método de autentificación por omisión para\n"
 "                            conexiones locales\n"
 
-#: initdb.c:2874
+#: initdb.c:2662
 #, c-format
 msgid "      --auth-host=METHOD    default authentication method for local TCP/IP connections\n"
 msgstr ""
 "  --auth-host=MÉTODO        método de autentificación por omisión para\n"
 "                            conexiones locales TCP/IP\n"
 
-#: initdb.c:2875
+#: initdb.c:2663
 #, c-format
 msgid "      --auth-local=METHOD   default authentication method for local-socket connections\n"
 msgstr ""
 "  --auth-local=MÉTODO       método de autentificación por omisión para\n"
 "                            conexiones de socket local\n"
 
-#: initdb.c:2876
+#: initdb.c:2664
 #, 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:2877
+#: initdb.c:2665
 #, 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:2878
+#: initdb.c:2666
 #, 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:2879
+#: initdb.c:2667
 #, c-format
 msgid ""
 "      --lc-collate=, --lc-ctype=, --lc-messages=LOCALE\n"
@@ -609,17 +547,17 @@ msgstr ""
 "                            en la categoría respectiva (el valor por omisión\n"
 "                            es tomado de variables de ambiente)\n"
 
-#: initdb.c:2883
+#: initdb.c:2671
 #, c-format
 msgid "      --no-locale           equivalent to --locale=C\n"
 msgstr "      --no-locale           equivalente a --locale=C\n"
 
-#: initdb.c:2884
+#: initdb.c:2672
 #, c-format
 msgid "      --pwfile=FILE         read password for the new superuser from file\n"
 msgstr "      --pwfile=ARCHIVO      leer contraseña del nuevo superusuario del archivo\n"
 
-#: initdb.c:2885
+#: initdb.c:2673
 #, c-format
 msgid ""
 "  -T, --text-search-config=CFG\n"
@@ -628,24 +566,24 @@ msgstr ""
 "  -T, --text-search-config=CONF\n"
 "                            configuración de búsqueda en texto por omisión\n"
 
-#: initdb.c:2887
+#: initdb.c:2675
 #, c-format
 msgid "  -U, --username=NAME       database superuser name\n"
 msgstr "  -U, --username=USUARIO    nombre del superusuario del cluster\n"
 
-#: initdb.c:2888
+#: initdb.c:2676
 #, 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:2889
+#: initdb.c:2677
 #, c-format
 msgid "  -X, --xlogdir=XLOGDIR     location for the transaction log directory\n"
 msgstr ""
 "  -X, --xlogdir=XLOGDIR     ubicación del directorio del registro de\n"
 "                            transacciones\n"
 
-#: initdb.c:2890
+#: initdb.c:2678
 #, c-format
 msgid ""
 "\n"
@@ -654,42 +592,42 @@ msgstr ""
 "\n"
 "Opciones menos usadas:\n"
 
-#: initdb.c:2891
+#: initdb.c:2679
 #, c-format
 msgid "  -d, --debug               generate lots of debugging output\n"
 msgstr "  -d, --debug               genera mucha salida de depuración\n"
 
-#: initdb.c:2892
+#: initdb.c:2680
 #, c-format
 msgid "  -k, --data-checksums      use data page checksums\n"
 msgstr "  -k, --data-checksums      activar sumas de verificación en páginas de datos\n"
 
-#: initdb.c:2893
+#: initdb.c:2681
 #, c-format
 msgid "  -L DIRECTORY              where to find the input files\n"
 msgstr "  -L DIRECTORIO             donde encontrar los archivos de entrada\n"
 
-#: initdb.c:2894
+#: initdb.c:2682
 #, c-format
 msgid "  -n, --noclean             do not clean up after errors\n"
 msgstr "  -n, --noclean             no limpiar después de errores\n"
 
-#: initdb.c:2895
+#: initdb.c:2683
 #, c-format
 msgid "  -N, --nosync              do not wait for changes to be written safely to disk\n"
 msgstr "  -N, --nosync              no esperar que los cambios se sincronicen a disco\n"
 
-#: initdb.c:2896
+#: initdb.c:2684
 #, c-format
 msgid "  -s, --show                show internal settings\n"
 msgstr "  -s, --show                muestra variables internas\n"
 
-#: initdb.c:2897
+#: initdb.c:2685
 #, c-format
 msgid "  -S, --sync-only           only sync data directory\n"
 msgstr "  -S, --sync-only           sólo sincronizar el directorio de datos\n"
 
-#: initdb.c:2898
+#: initdb.c:2686
 #, c-format
 msgid ""
 "\n"
@@ -698,17 +636,17 @@ msgstr ""
 "\n"
 "Otras opciones:\n"
 
-#: initdb.c:2899
+#: initdb.c:2687
 #, c-format
 msgid "  -V, --version             output version information, then exit\n"
 msgstr "  -V, --version             mostrar información de version y salir\n"
 
-#: initdb.c:2900
+#: initdb.c:2688
 #, c-format
 msgid "  -?, --help                show this help, then exit\n"
 msgstr "  -?, --help                mostrar esta ayuda y salir\n"
 
-#: initdb.c:2901
+#: initdb.c:2689
 #, c-format
 msgid ""
 "\n"
@@ -719,7 +657,7 @@ msgstr ""
 "Si el directorio de datos no es especificado, se usa la variable de\n"
 "ambiente PGDATA.\n"
 
-#: initdb.c:2903
+#: initdb.c:2691
 #, c-format
 msgid ""
 "\n"
@@ -728,7 +666,7 @@ msgstr ""
 "\n"
 "Reporte errores a <pgsql-bugs@postgresql.org>.\n"
 
-#: initdb.c:2911
+#: initdb.c:2699
 msgid ""
 "\n"
 "WARNING: enabling \"trust\" authentication for local connections\n"
@@ -740,29 +678,19 @@ msgstr ""
 "Puede cambiar esto editando pg_hba.conf o usando el parámetro -A,\n"
 "o --auth-local y --auth-host la próxima vez que ejecute initdb.\n"
 
-#: initdb.c:2933
+#: initdb.c:2721
 #, c-format
 msgid "%s: invalid authentication method \"%s\" for \"%s\" connections\n"
 msgstr "%s: método de autentificación «%s» no válido para conexiones «%s»\n"
 
-#: initdb.c:2947
+#: initdb.c:2735
 #, c-format
 msgid "%s: must specify a password for the superuser to enable %s authentication\n"
 msgstr ""
 "%s: debe especificar una contraseña al superusuario para activar\n"
 "autentificación %s\n"
 
-#: initdb.c:2980
-#, c-format
-msgid "%s: could not re-execute with restricted token: error code %lu\n"
-msgstr "%s: no se pudo re-ejecutar con el token restringido: código de error %lu\n"
-
-#: initdb.c:2995
-#, c-format
-msgid "%s: could not get exit code from subprocess: error code %lu\n"
-msgstr "%s: no se pudo obtener el código de salida del subproceso»: código de error %lu\n"
-
-#: initdb.c:3021
+#: initdb.c:2762
 #, c-format
 msgid ""
 "%s: no data directory specified\n"
@@ -774,7 +702,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:3059
+#: initdb.c:2800
 #, c-format
 msgid ""
 "The program \"postgres\" is needed by %s but was not found in the\n"
@@ -785,7 +713,7 @@ msgstr ""
 "directorio que «%s».\n"
 "Verifique su instalación.\n"
 
-#: initdb.c:3066
+#: initdb.c:2807
 #, c-format
 msgid ""
 "The program \"postgres\" was found by \"%s\"\n"
@@ -796,17 +724,17 @@ msgstr ""
 "de la misma versión que «%s».\n"
 "Verifique su instalación.\n"
 
-#: initdb.c:3085
+#: initdb.c:2826
 #, 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:3104
+#: initdb.c:2845
 #, c-format
 msgid "The database cluster will be initialized with locale \"%s\".\n"
 msgstr "El cluster será inicializado con configuración regional «%s».\n"
 
-#: initdb.c:3107
+#: initdb.c:2848
 #, c-format
 msgid ""
 "The database cluster will be initialized with locales\n"
@@ -825,24 +753,24 @@ msgstr ""
 "  NUMERIC:  %s\n"
 "  TIME:     %s\n"
 
-#: initdb.c:3131
+#: initdb.c:2872
 #, 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 regional «%s»\n"
 
-#: initdb.c:3133
+#: initdb.c:2874
 #, c-format
 msgid "Rerun %s with the -E option.\n"
 msgstr "Ejecute %s con la opción -E.\n"
 
-#: initdb.c:3134 initdb.c:3710 initdb.c:3731
+#: initdb.c:2875 initdb.c:3498 initdb.c:3519
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Use «%s --help» para obtener mayor información.\n"
 
-#: initdb.c:3146
+#: initdb.c:2887
 #, c-format
 msgid ""
 "Encoding \"%s\" implied by locale is not allowed as a server-side encoding.\n"
@@ -852,12 +780,12 @@ msgstr ""
 "no puede ser usada como codificación del lado del servidor.\n"
 "La codificación por omisión será «%s».\n"
 
-#: initdb.c:3154
+#: initdb.c:2895
 #, c-format
 msgid "%s: locale \"%s\" requires unsupported encoding \"%s\"\n"
 msgstr "%s: la configuración regional «%s» requiere la codificación no soportada «%s»\n"
 
-#: initdb.c:3157
+#: initdb.c:2898
 #, c-format
 msgid ""
 "Encoding \"%s\" is not allowed as a server-side encoding.\n"
@@ -867,58 +795,63 @@ msgstr ""
 "del servidor.\n"
 "Ejecute %s nuevamente con una selección de configuración regional diferente.\n"
 
-#: initdb.c:3166
+#: initdb.c:2907
 #, 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:3237
+#: initdb.c:2978
 #, 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 regional «%s»\n"
 
-#: initdb.c:3248
+#: initdb.c:2989
 #, c-format
 msgid "%s: warning: suitable text search configuration for locale \"%s\" is unknown\n"
 msgstr ""
 "%s: atención: la configuración de búsqueda en texto apropiada para\n"
 "la configuración regional «%s» es desconocida\n"
 
-#: initdb.c:3253
+#: initdb.c:2994
 #, c-format
 msgid "%s: warning: specified text search configuration \"%s\" might not match locale \"%s\"\n"
 msgstr ""
 "%s: atención: la configuración de búsqueda en texto «%s» especificada\n"
 "podría no coincidir con la configuración regional «%s»\n"
 
-#: initdb.c:3258
+#: initdb.c:2999
 #, 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:3302 initdb.c:3380
+#: initdb.c:3043 initdb.c:3129
 #, c-format
 msgid "creating directory %s ... "
 msgstr "creando el directorio %s ... "
 
-#: initdb.c:3316 initdb.c:3398
+#: initdb.c:3049 initdb.c:3135 initdb.c:3203 initdb.c:3259
+#, c-format
+msgid "%s: could not create directory \"%s\": %s\n"
+msgstr "%s: no se pudo crear el directorio «%s»: %s\n"
+
+#: initdb.c:3061 initdb.c:3147
 #, c-format
 msgid "fixing permissions on existing directory %s ... "
 msgstr "corrigiendo permisos en el directorio existente %s ... "
 
-#: initdb.c:3322 initdb.c:3404
+#: initdb.c:3067 initdb.c:3153
 #, 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:3337 initdb.c:3419
+#: initdb.c:3082 initdb.c:3168
 #, c-format
 msgid "%s: directory \"%s\" exists but is not empty\n"
 msgstr "%s: el directorio «%s» no está vacío\n"
 
-#: initdb.c:3343
+#: initdb.c:3088
 #, c-format
 msgid ""
 "If you want to create a new database system, either remove or empty\n"
@@ -929,17 +862,17 @@ msgstr ""
 "el directorio «%s», o ejecute %s\n"
 "con un argumento distinto de «%s».\n"
 
-#: initdb.c:3351 initdb.c:3432
+#: initdb.c:3096 initdb.c:3181 initdb.c:3532
 #, c-format
 msgid "%s: could not access directory \"%s\": %s\n"
 msgstr "%s: no se pudo acceder al directorio «%s»: %s\n"
 
-#: initdb.c:3371
+#: initdb.c:3120
 #, 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"
 
-#: initdb.c:3425
+#: initdb.c:3174
 #, c-format
 msgid ""
 "If you want to store the transaction log there, either\n"
@@ -948,27 +881,27 @@ msgstr ""
 "Si quiere almacenar el directorio de registro de transacciones ahí,\n"
 "elimine o vacíe el directorio «%s».\n"
 
-#: initdb.c:3443
+#: initdb.c:3189
 #, 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:3448
+#: initdb.c:3194
 #, 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:3461
+#: initdb.c:3218
 #, c-format
 msgid "It contains a dot-prefixed/invisible file, perhaps due to it being a mount point.\n"
 msgstr "Contiene un archivo invisible, quizás por ser un punto de montaje.\n"
 
-#: initdb.c:3464
+#: initdb.c:3221
 #, c-format
 msgid "It contains a lost+found directory, perhaps due to it being a mount point.\n"
 msgstr "Contiene un directorio lost+found, quizás por ser un punto de montaje.\n"
 
-#: initdb.c:3467
+#: initdb.c:3224
 #, c-format
 msgid ""
 "Using a mount point directly as the data directory is not recommended.\n"
@@ -977,34 +910,38 @@ msgstr ""
 "Usar un punto de montaje directamente como directorio de datos no es\n"
 "recomendado.  Cree un subdirectorio bajo el punto de montaje.\n"
 
-#: initdb.c:3486
+#: initdb.c:3244
 #, c-format
 msgid "creating subdirectories ... "
 msgstr "creando subdirectorios ... "
 
-#: initdb.c:3654
+#: initdb.c:3291
+msgid "performing post-bootstrap initialization ... "
+msgstr "realizando inicialización post-bootstrap ... "
+
+#: initdb.c:3442
 #, c-format
 msgid "Running in debug mode.\n"
 msgstr "Ejecutando en modo de depuración.\n"
 
-#: initdb.c:3658
+#: initdb.c:3446
 #, 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:3729
+#: initdb.c:3517
 #, 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:3746
+#: initdb.c:3543
 #, 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:3768
+#: initdb.c:3565
 #, c-format
 msgid ""
 "The files belonging to this database system will be owned by user \"%s\".\n"
@@ -1015,17 +952,17 @@ msgstr ""
 "Este usuario también debe ser quien ejecute el proceso servidor.\n"
 "\n"
 
-#: initdb.c:3784
+#: initdb.c:3581
 #, c-format
 msgid "Data page checksums are enabled.\n"
 msgstr "Las sumas de verificación en páginas de datos han sido activadas.\n"
 
-#: initdb.c:3786
+#: initdb.c:3583
 #, c-format
 msgid "Data page checksums are disabled.\n"
 msgstr "Las sumas de verificación en páginas de datos han sido desactivadas.\n"
 
-#: initdb.c:3795
+#: initdb.c:3592
 #, c-format
 msgid ""
 "\n"
@@ -1037,21 +974,65 @@ msgstr ""
 "El directorio de datos podría corromperse si el sistema operativo sufre\n"
 "una caída.\n"
 
-#: initdb.c:3804
+#: initdb.c:3601
 #, 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"
-"Completado. Puede iniciar el servidor de bases de datos usando:\n"
+"Completado. Ahora puede iniciar el servidor de bases de datos usando:\n"
 "\n"
-"    %s%s%spostgres%s -D %s%s%s\n"
-"o\n"
-"    %s%s%spg_ctl%s -D %s%s%s -l archivo_de_registro start\n"
+"    %s%s%spg_ctl%s -D %s%s%s -l archivo_de_log start\n"
 "\n"
+
+#~ msgid "copying template1 to postgres ... "
+#~ msgstr "copiando template1 a postgres ... "
+
+#~ msgid "copying template1 to template0 ... "
+#~ msgstr "copiando template1 a template0 ... "
+
+#~ msgid "vacuuming database template1 ... "
+#~ msgstr "haciendo vacuum a la base de datos template1 ... "
+
+#~ msgid "loading PL/pgSQL server-side language ... "
+#~ msgstr "instalando el lenguaje PL/pgSQL ... "
+
+#~ msgid "creating information schema ... "
+#~ msgstr "creando el esquema de información ... "
+
+#~ msgid "setting privileges on built-in objects ... "
+#~ msgstr "estableciendo privilegios en objetos predefinidos ... "
+
+#~ msgid "creating dictionaries ... "
+#~ msgstr "creando diccionarios ... "
+
+#~ msgid "creating conversions ... "
+#~ msgstr "creando conversiones ... "
+
+#~ msgid "not supported on this platform\n"
+#~ msgstr "no está soportado en esta plataforma\n"
+
+#~ msgid "creating collations ... "
+#~ msgstr "creando algoritmos de ordenamiento ... "
+
+#~ msgid "loading system objects' descriptions ... "
+#~ msgstr "cargando las descripciones de los objetos del sistema ... "
+
+#~ msgid "creating system views ... "
+#~ msgstr "creando las vistas de sistema ... "
+
+#~ msgid "initializing dependencies ... "
+#~ msgstr "inicializando dependencias ... "
+
+#~ msgid "setting password ... "
+#~ msgstr "estableciendo contraseña ... "
+
+#~ msgid "initializing pg_authid ... "
+#~ msgstr "inicializando pg_authid ... "
+
+#~ msgid "creating template1 database in %s/base/1 ... "
+#~ msgstr "creando base de datos template1 en %s/base/1 ... "
diff --git a/src/bin/initdb/po/fr.po b/src/bin/initdb/po/fr.po
index ed0e48f075..120d119fb3 100644
--- a/src/bin/initdb/po/fr.po
+++ b/src/bin/initdb/po/fr.po
@@ -7,17 +7,17 @@
 # St�phane Schildknecht <stephane.schildknecht@dalibo.com>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 8.4\n"
+"Project-Id-Version: PostgreSQL 9.6\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-02-08 09:12+0000\n"
-"PO-Revision-Date: 2015-02-08 11:06+0100\n"
+"POT-Creation-Date: 2016-05-08 21:14+0000\n"
+"PO-Revision-Date: 2016-05-09 10:17+0200\n"
 "Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
 "Language-Team: PostgreSQLfr <pgsql-fr-generale@postgresql.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.7.3\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #: ../../common/exec.c:127 ../../common/exec.c:241 ../../common/exec.c:284
 #, c-format
@@ -54,13 +54,13 @@ msgstr "n'a pas pu lire le lien symbolique � %s �"
 msgid "pclose failed: %s"
 msgstr "�chec de pclose : %s"
 
-#: ../../common/fe_memutils.c:33 ../../common/fe_memutils.c:60
-#: ../../common/fe_memutils.c:83
+#: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
+#: ../../common/fe_memutils.c:98
 #, c-format
 msgid "out of memory\n"
 msgstr "m�moire �puis�e\n"
 
-#: ../../common/fe_memutils.c:77
+#: ../../common/fe_memutils.c:92
 #, c-format
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "ne peut pas dupliquer un pointeur nul (erreur interne)\n"
@@ -80,6 +80,41 @@ msgstr "n'a pas pu lire le r�pertoire � %s � : %s\n"
 msgid "could not close directory \"%s\": %s\n"
 msgstr "n'a pas pu fermer le r�pertoire � %s � : %s\n"
 
+#: ../../common/restricted_token.c:68
+#, c-format
+msgid "%s: WARNING: cannot create restricted tokens on this platform\n"
+msgstr "%s : ATTENTION : ne peut pas cr�r les jetons restreints sur cette plateforme\n"
+
+#: ../../common/restricted_token.c:77
+#, c-format
+msgid "%s: could not open process token: error code %lu\n"
+msgstr "%s : n'a pas pu ouvrir le jeton du processus : code d'erreur %lu\n"
+
+#: ../../common/restricted_token.c:90
+#, c-format
+msgid "%s: could not allocate SIDs: error code %lu\n"
+msgstr "%s : n'a pas pu allouer les SID : code d'erreur %lu\n"
+
+#: ../../common/restricted_token.c:110
+#, c-format
+msgid "%s: could not create restricted token: error code %lu\n"
+msgstr "%s : n'a pas pu cr�er le jeton restreint : code d'erreur %lu\n"
+
+#: ../../common/restricted_token.c:132
+#, c-format
+msgid "%s: could not start process for command \"%s\": error code %lu\n"
+msgstr "%s : n'a pas pu d�marrer le processus pour la commande � %s � : code d'erreur %lu\n"
+
+#: ../../common/restricted_token.c:170
+#, c-format
+msgid "%s: could not re-execute with restricted token: error code %lu\n"
+msgstr "%s : n'a pas pu r�-ex�cuter le jeton restreint : code d'erreur %lu\n"
+
+#: ../../common/restricted_token.c:186
+#, c-format
+msgid "%s: could not get exit code from subprocess: error code %lu\n"
+msgstr "%s : n'a pas pu r�cup�rer le code de statut du sous-processus : code d'erreur %lu\n"
+
 #: ../../common/rmtree.c:77
 #, c-format
 msgid "could not stat file or directory \"%s\": %s\n"
@@ -141,124 +176,119 @@ msgstr "le processus fils a �t� termin� par le signal %d"
 msgid "child process exited with unrecognized status %d"
 msgstr "le processus fils a quitt� avec un statut %d non reconnu"
 
-#: ../../port/dirmod.c:219
+#: ../../port/dirmod.c:221
 #, c-format
 msgid "could not set junction for \"%s\": %s\n"
 msgstr "n'a pas pu configurer la jonction pour � %s � : %s\n"
 
-#: ../../port/dirmod.c:294
+#: ../../port/dirmod.c:298
 #, c-format
 msgid "could not get junction for \"%s\": %s\n"
 msgstr "n'a pas pu obtenir la jonction pour � %s � : %s\n"
 
-#: initdb.c:337
+#: initdb.c:349
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s : m�moire �puis�e\n"
 
-#: initdb.c:447 initdb.c:1653
+#: initdb.c:459 initdb.c:1589
 #, c-format
 msgid "%s: could not open file \"%s\" for reading: %s\n"
 msgstr "%s : n'a pas pu ouvrir le fichier � %s � en lecture : %s\n"
 
-#: initdb.c:503 initdb.c:1055 initdb.c:1083
+#: initdb.c:515 initdb.c:1002 initdb.c:1030
 #, c-format
 msgid "%s: could not open file \"%s\" for writing: %s\n"
 msgstr "%s : n'a pas pu ouvrir le fichier � %s � en �criture : %s\n"
 
-#: initdb.c:511 initdb.c:519 initdb.c:1062 initdb.c:1089
+#: initdb.c:523 initdb.c:531 initdb.c:1009 initdb.c:1036
 #, c-format
 msgid "%s: could not write file \"%s\": %s\n"
 msgstr "%s : n'a pas pu �crire le fichier � %s � : %s\n"
 
-#: initdb.c:541 initdb.c:608
+#: initdb.c:562
 #, c-format
 msgid "%s: could not open directory \"%s\": %s\n"
 msgstr "%s : n'a pas pu ouvrir le r�pertoire � %s � : %s\n"
 
-#: initdb.c:558
+#: initdb.c:586 initdb.c:2334
 #, c-format
 msgid "%s: could not stat file \"%s\": %s\n"
 msgstr "%s : n'a pas pu r�cup�rer les informations sur le fichier � %s � : %s\n"
 
-#: initdb.c:571 initdb.c:628
+#: initdb.c:598
 #, c-format
 msgid "%s: could not read directory \"%s\": %s\n"
 msgstr "%s : n'a pas pu lire le r�pertoire � %s � : %s\n"
 
-#: initdb.c:578 initdb.c:635
-#, c-format
-msgid "%s: could not close directory \"%s\": %s\n"
-msgstr "%s : n'a pas pu fermer le r�pertoire � %s � : %s\n"
-
-#: initdb.c:662 initdb.c:714
+#: initdb.c:631 initdb.c:690
 #, c-format
 msgid "%s: could not open file \"%s\": %s\n"
 msgstr "%s : n'a pas pu ouvrir le fichier � %s � : %s\n"
 
-#: initdb.c:730
+#: initdb.c:702
 #, c-format
 msgid "%s: could not fsync file \"%s\": %s\n"
 msgstr "%s : n'a pas pu synchroniser sur disque le fichier � %s � : %s\n"
 
-#: initdb.c:751
+#: initdb.c:721
 #, c-format
 msgid "%s: could not execute command \"%s\": %s\n"
 msgstr "%s : n'a pas pu ex�cuter la commande � %s � : %s\n"
 
-#: initdb.c:767
+#: initdb.c:737
 #, c-format
 msgid "%s: removing data directory \"%s\"\n"
 msgstr "%s : suppression du r�pertoire des donn�es � %s �\n"
 
-#: initdb.c:770
+#: initdb.c:740
 #, c-format
 msgid "%s: failed to remove data directory\n"
 msgstr "%s : �chec de la suppression du r�pertoire des donn�es\n"
 
-#: initdb.c:776
+#: initdb.c:746
 #, c-format
 msgid "%s: removing contents of data directory \"%s\"\n"
 msgstr "%s : suppression du contenu du r�pertoire des donn�es � %s �\n"
 
-#: initdb.c:779
+#: initdb.c:749
 #, c-format
 msgid "%s: failed to remove contents of data directory\n"
 msgstr "%s : �chec de la suppression du contenu du r�pertoire des donn�es\n"
 
-#: initdb.c:785
+#: initdb.c:755
 #, c-format
 msgid "%s: removing transaction log directory \"%s\"\n"
 msgstr "%s : suppression du r�pertoire des journaux de transaction � %s �\n"
 
-#: initdb.c:788
+#: initdb.c:758
 #, c-format
 msgid "%s: failed to remove transaction log directory\n"
 msgstr "%s : �chec de la suppression du r�pertoire des journaux de transaction\n"
 
-#: initdb.c:794
+#: initdb.c:764
 #, c-format
 msgid "%s: removing contents of transaction log directory \"%s\"\n"
 msgstr "%s : suppression du contenu du r�pertoire des journaux de transaction � %s �\n"
 
-#: initdb.c:797
+#: initdb.c:767
 #, c-format
 msgid "%s: failed to remove contents of transaction log directory\n"
 msgstr "%s : �chec de la suppression du contenu du r�pertoire des journaux de transaction\n"
 
-#: initdb.c:806
+#: initdb.c:776
 #, c-format
 msgid "%s: data directory \"%s\" not removed at user's request\n"
 msgstr "%s : r�pertoire des donn�es � %s � non supprim� � la demande de l'utilisateur\n"
 
-#: initdb.c:811
+#: initdb.c:781
 #, c-format
 msgid "%s: transaction log directory \"%s\" not removed at user's request\n"
 msgstr ""
 "%s : r�pertoire des journaux de transaction � %s � non supprim� � la demande\n"
 "de l'utilisateur\n"
 
-#: initdb.c:832
+#: initdb.c:802
 #, c-format
 msgid ""
 "%s: cannot be run as root\n"
@@ -269,22 +299,17 @@ msgstr ""
 "Connectez-vous (par exemple en utilisant � su �) sous l'utilisateur (non\n"
 " privil�gi�) qui sera propri�taire du processus serveur.\n"
 
-#: initdb.c:868
+#: initdb.c:838
 #, c-format
 msgid "%s: \"%s\" is not a valid server encoding name\n"
 msgstr "%s : � %s � n'est pas un nom d'encodage serveur valide\n"
 
-#: initdb.c:982 initdb.c:3387
-#, c-format
-msgid "%s: could not create directory \"%s\": %s\n"
-msgstr "%s : n'a pas pu cr�er le r�pertoire � %s � : %s\n"
-
-#: initdb.c:1011
+#: initdb.c:958
 #, c-format
 msgid "%s: file \"%s\" does not exist\n"
 msgstr "%s : le fichier � %s � n'existe pas\n"
 
-#: initdb.c:1013 initdb.c:1022 initdb.c:1032
+#: initdb.c:960 initdb.c:969 initdb.c:979
 #, c-format
 msgid ""
 "This might mean you have a corrupted installation or identified\n"
@@ -293,46 +318,46 @@ msgstr ""
 "Cela peut signifier que votre installation est corrompue ou que vous avez\n"
 "identifi� le mauvais r�pertoire avec l'option -L.\n"
 
-#: initdb.c:1019
+#: initdb.c:966
 #, c-format
 msgid "%s: could not access file \"%s\": %s\n"
 msgstr "%s : n'a pas pu acc�der au fichier � %s � : %s\n"
 
-#: initdb.c:1030
+#: initdb.c:977
 #, c-format
 msgid "%s: file \"%s\" is not a regular file\n"
 msgstr "%s : � %s � n'est pas un fichier\n"
 
-#: initdb.c:1175
+#: initdb.c:1122
 #, c-format
 msgid "selecting default max_connections ... "
 msgstr "s�lection de la valeur par d�faut de max_connections... "
 
-#: initdb.c:1205
+#: initdb.c:1152
 #, c-format
 msgid "selecting default shared_buffers ... "
 msgstr "s�lection de la valeur par d�faut pour shared_buffers... "
 
-#: initdb.c:1238
+#: initdb.c:1185
 #, c-format
 msgid "selecting dynamic shared memory implementation ... "
 msgstr "s�lection de l'impl�mentation de la m�moire partag�e dynamique..."
 
-#: initdb.c:1256
+#: initdb.c:1203
 msgid "creating configuration files ... "
 msgstr "cr�ation des fichiers de configuration... "
 
-#: initdb.c:1347 initdb.c:1367 initdb.c:1451 initdb.c:1467
+#: initdb.c:1300 initdb.c:1320 initdb.c:1404 initdb.c:1420
 #, c-format
 msgid "%s: could not change permissions of \"%s\": %s\n"
 msgstr "%s : n'a pas pu modifier les droits de � %s � : %s\n"
 
-#: initdb.c:1491
+#: initdb.c:1444
 #, c-format
-msgid "creating template1 database in %s/base/1 ... "
-msgstr "cr�ation de la base de donn�es template1 dans %s/base/1... "
+msgid "running bootstrap script ... "
+msgstr "lancement du script bootstrap..."
 
-#: initdb.c:1507
+#: initdb.c:1460
 #, c-format
 msgid ""
 "%s: input file \"%s\" does not belong to PostgreSQL %s\n"
@@ -341,156 +366,94 @@ msgstr ""
 "%s : le fichier � %s � n'appartient pas � PostgreSQL %s\n"
 "V�rifiez votre installation ou indiquez le bon chemin avec l'option -L.\n"
 
-#: initdb.c:1594
-msgid "initializing pg_authid ... "
-msgstr "initialisation de pg_authid... "
-
-#: initdb.c:1628
+#: initdb.c:1564
 msgid "Enter new superuser password: "
 msgstr "Saisissez le nouveau mot de passe du super-utilisateur : "
 
-#: initdb.c:1629
+#: initdb.c:1565
 msgid "Enter it again: "
 msgstr "Saisissez-le � nouveau : "
 
-#: initdb.c:1632
+#: initdb.c:1568
 #, c-format
 msgid "Passwords didn't match.\n"
 msgstr "Les mots de passe ne sont pas identiques.\n"
 
-#: initdb.c:1660
+#: initdb.c:1596
 #, c-format
 msgid "%s: could not read password from file \"%s\": %s\n"
 msgstr "%s : n'a pas pu lire le mot de passe � partir du fichier � %s � : %s\n"
 
-#: initdb.c:1663
+#: initdb.c:1599
 #, c-format
 msgid "%s: password file \"%s\" is empty\n"
 msgstr "%s : le fichier de mots de passe � %s � est vide\n"
 
-#: initdb.c:1676
-#, c-format
-msgid "setting password ... "
-msgstr "initialisation du mot de passe... "
-
-#: initdb.c:1776
-msgid "initializing dependencies ... "
-msgstr "initialisation des d�pendances... "
-
-#: initdb.c:1804
-msgid "creating system views ... "
-msgstr "cr�ation des vues syst�me... "
-
-#: initdb.c:1840
-msgid "loading system objects' descriptions ... "
-msgstr "chargement de la description des objets syst�me... "
-
-#: initdb.c:1946
-msgid "creating collations ... "
-msgstr "cr�ation des collationnements... "
-
-#: initdb.c:1979
+#: initdb.c:1845
 #, c-format
 msgid "%s: locale name too long, skipped: \"%s\"\n"
 msgstr "%s : nom de locale trop long, ignor� : � %s �\n"
 
-#: initdb.c:2004
+#: initdb.c:1870
 #, c-format
 msgid "%s: locale name has non-ASCII characters, skipped: \"%s\"\n"
 msgstr "%s : le nom de la locale contient des caract�res non ASCII, ignor� : � %s �\n"
 
-#: initdb.c:2073
+#: initdb.c:1943
 #, c-format
 msgid "No usable system locales were found.\n"
 msgstr "Aucune locale syst�me utilisable n'a �t� trouv�e.\n"
 
-#: initdb.c:2074
+#: initdb.c:1944
 #, c-format
 msgid "Use the option \"--debug\" to see details.\n"
 msgstr "Utilisez l'option � --debug � pour voir le d�tail.\n"
 
-#: initdb.c:2077
-#, c-format
-msgid "not supported on this platform\n"
-msgstr "non support� sur cette plateforme\n"
-
-#: initdb.c:2092
-msgid "creating conversions ... "
-msgstr "cr�ation des conversions... "
-
-#: initdb.c:2127
-msgid "creating dictionaries ... "
-msgstr "cr�ation des dictionnaires... "
-
-#: initdb.c:2181
-msgid "setting privileges on built-in objects ... "
-msgstr "initialisation des droits sur les objets internes... "
-
-#: initdb.c:2239
-msgid "creating information schema ... "
-msgstr "cr�ation du sch�ma d'informations... "
-
-#: initdb.c:2295
-msgid "loading PL/pgSQL server-side language ... "
-msgstr "chargement du langage PL/pgSQL... "
-
-#: initdb.c:2320
-msgid "vacuuming database template1 ... "
-msgstr "lancement du vacuum sur la base de donn�es template1... "
-
-#: initdb.c:2376
-msgid "copying template1 to template0 ... "
-msgstr "copie de template1 vers template0... "
-
-#: initdb.c:2408
-msgid "copying template1 to postgres ... "
-msgstr "copie de template1 vers postgres... "
-
-#: initdb.c:2435
+#: initdb.c:2317
 msgid "syncing data to disk ... "
 msgstr "synchronisation des donn�es sur disque"
 
-#: initdb.c:2514
+#: initdb.c:2411
 #, c-format
 msgid "caught signal\n"
 msgstr "signal re�u\n"
 
-#: initdb.c:2520
+#: initdb.c:2417
 #, c-format
 msgid "could not write to child process: %s\n"
 msgstr "n'a pas pu �crire au processus fils : %s\n"
 
-#: initdb.c:2528
+#: initdb.c:2425
 #, c-format
 msgid "ok\n"
 msgstr "ok\n"
 
-#: initdb.c:2618
+#: initdb.c:2515
 #, c-format
 msgid "%s: setlocale() failed\n"
 msgstr "%s : �chec de setlocale\n"
 
-#: initdb.c:2636
+#: initdb.c:2533
 #, c-format
 msgid "%s: failed to restore old locale \"%s\"\n"
 msgstr "%s : n'a pas pu restaurer l'ancienne locale � %s �\n"
 
-#: initdb.c:2646
+#: initdb.c:2543
 #, c-format
 msgid "%s: invalid locale name \"%s\"\n"
 msgstr "%s : nom de locale invalide (� %s �)\n"
 
-#: initdb.c:2658
+#: initdb.c:2555
 #, c-format
 msgid "%s: invalid locale settings; check LANG and LC_* environment variables\n"
 msgstr "%s : configuration invalide de la locale ; v�rifiez les variables d'environnement LANG et LC_*\n"
 
-#: initdb.c:2686
+#: initdb.c:2583
 #, c-format
 msgid "%s: encoding mismatch\n"
 msgstr "%s : diff�rence d'encodage\n"
 
-#: initdb.c:2688
+#: initdb.c:2585
 #, c-format
 msgid ""
 "The encoding you selected (%s) and the encoding that the\n"
@@ -505,32 +468,7 @@ msgstr ""
 "R�-ex�cutez %s sans pr�ciser d'encodage, ou en choisissant une combinaison\n"
 "compatible.\n"
 
-#: initdb.c:2793
-#, c-format
-msgid "%s: WARNING: cannot create restricted tokens on this platform\n"
-msgstr "%s : ATTENTION : ne peut pas cr�r les jetons restreints sur cette plateforme\n"
-
-#: initdb.c:2802
-#, c-format
-msgid "%s: could not open process token: error code %lu\n"
-msgstr "%s : n'a pas pu ouvrir le jeton du processus : code d'erreur %lu\n"
-
-#: initdb.c:2815
-#, c-format
-msgid "%s: could not allocate SIDs: error code %lu\n"
-msgstr "%s : n'a pas pu allouer les SID : code d'erreur %lu\n"
-
-#: initdb.c:2835
-#, c-format
-msgid "%s: could not create restricted token: error code %lu\n"
-msgstr "%s : n'a pas pu cr�er le jeton restreint : code d'erreur %lu\n"
-
-#: initdb.c:2856
-#, c-format
-msgid "%s: could not start process for command \"%s\": error code %lu\n"
-msgstr "%s : n'a pas pu d�marrer le processus pour la commande � %s � : code d'erreur %lu\n"
-
-#: initdb.c:2870
+#: initdb.c:2657
 #, c-format
 msgid ""
 "%s initializes a PostgreSQL database cluster.\n"
@@ -539,17 +477,17 @@ msgstr ""
 "%s initialise un cluster PostgreSQL.\n"
 "\n"
 
-#: initdb.c:2871
+#: initdb.c:2658
 #, c-format
 msgid "Usage:\n"
 msgstr "Usage :\n"
 
-#: initdb.c:2872
+#: initdb.c:2659
 #, c-format
 msgid "  %s [OPTION]... [DATADIR]\n"
 msgstr "  %s [OPTION]... [R�P_DONN�ES]\n"
 
-#: initdb.c:2873
+#: initdb.c:2660
 #, c-format
 msgid ""
 "\n"
@@ -558,47 +496,47 @@ msgstr ""
 "\n"
 "Options :\n"
 
-#: initdb.c:2874
+#: initdb.c:2661
 #, c-format
 msgid "  -A, --auth=METHOD         default authentication method for local connections\n"
 msgstr ""
 "  -A, --auth=M�THODE         m�thode d'authentification par d�faut pour les\n"
 "                             connexions locales\n"
 
-#: initdb.c:2875
+#: initdb.c:2662
 #, c-format
 msgid "      --auth-host=METHOD    default authentication method for local TCP/IP connections\n"
 msgstr ""
 "      --auth-host=M�THODE    m�thode d'authentification par d�faut pour les\n"
 "                             connexions locales TCP/IP\n"
 
-#: initdb.c:2876
+#: initdb.c:2663
 #, c-format
 msgid "      --auth-local=METHOD   default authentication method for local-socket connections\n"
 msgstr ""
 "      --auth-local=M�THODE   m�thode d'authentification par d�faut pour les\n"
 "                             connexions locales socket\n"
 
-#: initdb.c:2877
+#: initdb.c:2664
 #, c-format
 msgid " [-D, --pgdata=]DATADIR     location for this database cluster\n"
 msgstr " [-D, --pgdata=]R�P_DONN�ES  emplacement du cluster\n"
 
-#: initdb.c:2878
+#: initdb.c:2665
 #, c-format
 msgid "  -E, --encoding=ENCODING   set default encoding for new databases\n"
 msgstr ""
 "  -E, --encoding=ENCODAGE    initialise l'encodage par d�faut des nouvelles\n"
 "                             bases de donn�es\n"
 
-#: initdb.c:2879
+#: initdb.c:2666
 #, c-format
 msgid "      --locale=LOCALE       set default locale for new databases\n"
 msgstr ""
 "      --locale=LOCALE        initialise la locale par d�faut pour les\n"
 "                             nouvelles bases de donn�es\n"
 
-#: initdb.c:2880
+#: initdb.c:2667
 #, c-format
 msgid ""
 "      --lc-collate=, --lc-ctype=, --lc-messages=LOCALE\n"
@@ -613,19 +551,19 @@ msgstr ""
 "                             de donn�es (les valeurs par d�faut sont prises\n"
 "                             dans l'environnement)\n"
 
-#: initdb.c:2884
+#: initdb.c:2671
 #, c-format
 msgid "      --no-locale           equivalent to --locale=C\n"
 msgstr "      --no-locale            �quivalent � --locale=C\n"
 
-#: initdb.c:2885
+#: initdb.c:2672
 #, c-format
 msgid "      --pwfile=FILE         read password for the new superuser from file\n"
 msgstr ""
 "      --pwfile=NOMFICHIER    lit le mot de passe du nouveau\n"
 "                             super-utilisateur � partir de ce fichier\n"
 
-#: initdb.c:2886
+#: initdb.c:2673
 #, c-format
 msgid ""
 "  -T, --text-search-config=CFG\n"
@@ -635,24 +573,24 @@ msgstr ""
 "                             configuration par d�faut de la recherche plein\n"
 "                             texte\n"
 
-#: initdb.c:2888
+#: initdb.c:2675
 #, c-format
 msgid "  -U, --username=NAME       database superuser name\n"
 msgstr "  -U, --username=NOM         nom du super-utilisateur de la base de donn�es\n"
 
-#: initdb.c:2889
+#: initdb.c:2676
 #, c-format
 msgid "  -W, --pwprompt            prompt for a password for the new superuser\n"
 msgstr ""
 "  -W, --pwprompt             demande un mot de passe pour le nouveau\n"
 "                             super-utilisateur\n"
 
-#: initdb.c:2890
+#: initdb.c:2677
 #, c-format
 msgid "  -X, --xlogdir=XLOGDIR     location for the transaction log directory\n"
 msgstr "  -X, --xlogdir=R�P_XLOG     emplacement du r�pertoire des transactions\n"
 
-#: initdb.c:2891
+#: initdb.c:2678
 #, c-format
 msgid ""
 "\n"
@@ -661,44 +599,44 @@ msgstr ""
 "\n"
 "Options moins utilis�es :\n"
 
-#: initdb.c:2892
+#: initdb.c:2679
 #, c-format
 msgid "  -d, --debug               generate lots of debugging output\n"
 msgstr "  -d, --debug                engendre un grand nombre de traces de d�bogage\n"
 
-#: initdb.c:2893
+#: initdb.c:2680
 #, c-format
 msgid "  -k, --data-checksums      use data page checksums\n"
 msgstr "      -k, --data-checksums utilise les sommes de contr�les pour les pages de donn�es\n"
 
-#: initdb.c:2894
+#: initdb.c:2681
 #, c-format
 msgid "  -L DIRECTORY              where to find the input files\n"
 msgstr ""
 "  -L R�PERTOIRE              indique o� trouver les fichiers servant � la\n"
 "                             cr�ation du cluster\n"
 
-#: initdb.c:2895
+#: initdb.c:2682
 #, c-format
 msgid "  -n, --noclean             do not clean up after errors\n"
 msgstr "  -n, --noclean              ne nettoie pas en cas d'erreur\n"
 
-#: initdb.c:2896
+#: initdb.c:2683
 #, c-format
 msgid "  -N, --nosync              do not wait for changes to be written safely to disk\n"
 msgstr "      -N, --nosync        n'attend pas que les modifications sont proprement �crites sur disque\n"
 
-#: initdb.c:2897
+#: initdb.c:2684
 #, c-format
 msgid "  -s, --show                show internal settings\n"
 msgstr "  -s, --show                 affiche la configuration interne\n"
 
-#: initdb.c:2898
+#: initdb.c:2685
 #, c-format
 msgid "  -S, --sync-only           only sync data directory\n"
 msgstr "      -S, --sync-only     synchronise uniquement le r�pertoire des donn�es\n"
 
-#: initdb.c:2899
+#: initdb.c:2686
 #, c-format
 msgid ""
 "\n"
@@ -707,17 +645,17 @@ msgstr ""
 "\n"
 "Autres options :\n"
 
-#: initdb.c:2900
+#: initdb.c:2687
 #, c-format
 msgid "  -V, --version             output version information, then exit\n"
 msgstr "  -V, --version              affiche la version puis quitte\n"
 
-#: initdb.c:2901
+#: initdb.c:2688
 #, c-format
 msgid "  -?, --help                show this help, then exit\n"
 msgstr "  -?, --help                 affiche cette aide puis quitte\n"
 
-#: initdb.c:2902
+#: initdb.c:2689
 #, c-format
 msgid ""
 "\n"
@@ -728,7 +666,7 @@ msgstr ""
 "Si le r�pertoire des donn�es n'est pas indiqu�, la variable d'environnement\n"
 "PGDATA est utilis�e.\n"
 
-#: initdb.c:2904
+#: initdb.c:2691
 #, c-format
 msgid ""
 "\n"
@@ -737,7 +675,7 @@ msgstr ""
 "\n"
 "Rapporter les bogues � <pgsql-bugs@postgresql.org>.\n"
 
-#: initdb.c:2912
+#: initdb.c:2699
 msgid ""
 "\n"
 "WARNING: enabling \"trust\" authentication for local connections\n"
@@ -751,29 +689,19 @@ msgstr ""
 "ou en utilisant l'option -A, ou --auth-local et --auth-host au prochain\n"
 "lancement d'initdb.\n"
 
-#: initdb.c:2934
+#: initdb.c:2721
 #, c-format
 msgid "%s: invalid authentication method \"%s\" for \"%s\" connections\n"
 msgstr "%s : m�thode d'authentification � %s � invalide pour � %s �\n"
 
-#: initdb.c:2948
+#: initdb.c:2735
 #, c-format
 msgid "%s: must specify a password for the superuser to enable %s authentication\n"
 msgstr ""
 "%s : vous devez indiquer un mot de passe pour le super-utilisateur pour\n"
 "activer l'authentification %s\n"
 
-#: initdb.c:2981
-#, c-format
-msgid "%s: could not re-execute with restricted token: error code %lu\n"
-msgstr "%s : n'a pas pu r�-ex�cuter le jeton restreint : code d'erreur %lu\n"
-
-#: initdb.c:2996
-#, c-format
-msgid "%s: could not get exit code from subprocess: error code %lu\n"
-msgstr "%s : n'a pas pu r�cup�rer le code de statut du sous-processus : code d'erreur %lu\n"
-
-#: initdb.c:3022
+#: initdb.c:2762
 #, c-format
 msgid ""
 "%s: no data directory specified\n"
@@ -786,7 +714,7 @@ msgstr ""
 "syst�me de bases de donn�es. Faites-le soit avec l'option -D soit en\n"
 "initialisant la variable d'environnement PGDATA.\n"
 
-#: initdb.c:3060
+#: initdb.c:2800
 #, c-format
 msgid ""
 "The program \"postgres\" is needed by %s but was not found in the\n"
@@ -797,7 +725,7 @@ msgstr ""
 "le m�me r�pertoire que � %s �.\n"
 "V�rifiez votre installation.\n"
 
-#: initdb.c:3067
+#: initdb.c:2807
 #, c-format
 msgid ""
 "The program \"postgres\" was found by \"%s\"\n"
@@ -808,19 +736,19 @@ msgstr ""
 "version que � %s �.\n"
 "V�rifiez votre installation.\n"
 
-#: initdb.c:3086
+#: initdb.c:2826
 #, c-format
 msgid "%s: input file location must be an absolute path\n"
 msgstr ""
 "%s : l'emplacement du fichier d'entr�es doit �tre indiqu� avec un chemin\n"
 "absolu\n"
 
-#: initdb.c:3105
+#: initdb.c:2845
 #, c-format
 msgid "The database cluster will be initialized with locale \"%s\".\n"
 msgstr "L'instance sera initialis�e avec la locale � %s �.\n"
 
-#: initdb.c:3108
+#: initdb.c:2848
 #, c-format
 msgid ""
 "The database cluster will be initialized with locales\n"
@@ -839,22 +767,22 @@ msgstr ""
 "  NUMERIC:  %s\n"
 "  TIME:     %s\n"
 
-#: initdb.c:3132
+#: initdb.c:2872
 #, c-format
 msgid "%s: could not find suitable encoding for locale \"%s\"\n"
 msgstr "%s : n'a pas pu trouver un encodage ad�quat pour la locale � %s �\n"
 
-#: initdb.c:3134
+#: initdb.c:2874
 #, c-format
 msgid "Rerun %s with the -E option.\n"
 msgstr "Relancez %s avec l'option -E.\n"
 
-#: initdb.c:3135 initdb.c:3711 initdb.c:3732
+#: initdb.c:2875 initdb.c:3498 initdb.c:3519
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Essayer � %s --help � pour plus d'informations.\n"
 
-#: initdb.c:3147
+#: initdb.c:2887
 #, c-format
 msgid ""
 "Encoding \"%s\" implied by locale is not allowed as a server-side encoding.\n"
@@ -863,12 +791,12 @@ msgstr ""
 "L'encodage � %s � d�duit de la locale n'est pas autoris� en tant qu'encodage serveur.\n"
 "L'encodage par d�faut des bases de donn�es sera configur� � � %s �.\n"
 
-#: initdb.c:3155
+#: initdb.c:2895
 #, c-format
 msgid "%s: locale \"%s\" requires unsupported encoding \"%s\"\n"
 msgstr "%s : la locale � %s � n�cessite l'encodage � %s � non support�\n"
 
-#: initdb.c:3158
+#: initdb.c:2898
 #, c-format
 msgid ""
 "Encoding \"%s\" is not allowed as a server-side encoding.\n"
@@ -877,60 +805,65 @@ msgstr ""
 "L'encodage � %s � n'est pas autoris� en tant qu'encodage serveur.\n"
 "R�-ex�cuter %s avec une locale diff�rente.\n"
 
-#: initdb.c:3167
+#: initdb.c:2907
 #, c-format
 msgid "The default database encoding has accordingly been set to \"%s\".\n"
 msgstr ""
 "L'encodage par d�faut des bases de donn�es a �t� configur� en cons�quence\n"
 "avec � %s �.\n"
 
-#: initdb.c:3238
+#: initdb.c:2978
 #, c-format
 msgid "%s: could not find suitable text search configuration for locale \"%s\"\n"
 msgstr ""
 "%s : n'a pas pu trouver la configuration de la recherche plein texte en\n"
 " ad�quation avec la locale � %s �\n"
 
-#: initdb.c:3249
+#: initdb.c:2989
 #, c-format
 msgid "%s: warning: suitable text search configuration for locale \"%s\" is unknown\n"
 msgstr ""
 "%s : attention : pas de configuration de la recherche plein texte connue\n"
 "pour la locale � %s �\n"
 
-#: initdb.c:3254
+#: initdb.c:2994
 #, c-format
 msgid "%s: warning: specified text search configuration \"%s\" might not match locale \"%s\"\n"
 msgstr ""
 "%s : attention : la configuration indiqu�e pour la recherche plein texte,\n"
 "� %s �, pourrait ne pas correspondre � la locale � %s �\n"
 
-#: initdb.c:3259
+#: initdb.c:2999
 #, c-format
 msgid "The default text search configuration will be set to \"%s\".\n"
 msgstr "La configuration de la recherche plein texte a �t� initialis�e � � %s �.\n"
 
-#: initdb.c:3303 initdb.c:3381
+#: initdb.c:3043 initdb.c:3129
 #, c-format
 msgid "creating directory %s ... "
 msgstr "cr�ation du r�pertoire %s... "
 
-#: initdb.c:3317 initdb.c:3399
+#: initdb.c:3049 initdb.c:3135 initdb.c:3203 initdb.c:3259
+#, c-format
+msgid "%s: could not create directory \"%s\": %s\n"
+msgstr "%s : n'a pas pu cr�er le r�pertoire � %s � : %s\n"
+
+#: initdb.c:3061 initdb.c:3147
 #, c-format
 msgid "fixing permissions on existing directory %s ... "
 msgstr "correction des droits sur le r�pertoire existant %s... "
 
-#: initdb.c:3323 initdb.c:3405
+#: initdb.c:3067 initdb.c:3153
 #, c-format
 msgid "%s: could not change permissions of directory \"%s\": %s\n"
 msgstr "%s : n'a pas pu modifier les droits du r�pertoire � %s � : %s\n"
 
-#: initdb.c:3338 initdb.c:3420
+#: initdb.c:3082 initdb.c:3168
 #, c-format
 msgid "%s: directory \"%s\" exists but is not empty\n"
 msgstr "%s : le r�pertoire � %s � existe mais n'est pas vide\n"
 
-#: initdb.c:3344
+#: initdb.c:3088
 #, c-format
 msgid ""
 "If you want to create a new database system, either remove or empty\n"
@@ -941,19 +874,19 @@ msgstr ""
 "videz le r�pertoire � %s �.\n"
 "Vous pouvez aussi ex�cuter %s avec un argument autre que � %s �.\n"
 
-#: initdb.c:3352 initdb.c:3433
+#: initdb.c:3096 initdb.c:3181 initdb.c:3532
 #, c-format
 msgid "%s: could not access directory \"%s\": %s\n"
 msgstr "%s : n'a pas pu acc�der au r�pertoire � %s � : %s\n"
 
-#: initdb.c:3372
+#: initdb.c:3120
 #, c-format
 msgid "%s: transaction log directory location must be an absolute path\n"
 msgstr ""
 "%s : l'emplacement du r�pertoire des journaux de transactions doit �tre\n"
 "indiqu� avec un chemin absolu\n"
 
-#: initdb.c:3426
+#: initdb.c:3174
 #, c-format
 msgid ""
 "If you want to store the transaction log there, either\n"
@@ -962,27 +895,27 @@ msgstr ""
 "Si vous voulez enregistrer ici le journal des transactions, supprimez ou\n"
 "videz le r�pertoire � %s �.\n"
 
-#: initdb.c:3444
+#: initdb.c:3189
 #, c-format
 msgid "%s: could not create symbolic link \"%s\": %s\n"
 msgstr "%s : n'a pas pu cr�er le lien symbolique � %s � : %s\n"
 
-#: initdb.c:3449
+#: initdb.c:3194
 #, c-format
 msgid "%s: symlinks are not supported on this platform"
 msgstr "%s : les liens symboliques ne sont pas support�s sur cette plateforme"
 
-#: initdb.c:3462
+#: initdb.c:3218
 #, c-format
 msgid "It contains a dot-prefixed/invisible file, perhaps due to it being a mount point.\n"
 msgstr "Il contient un fichier invisible, peut-�tre parce qu'il s'agit d'un point de montage.\n"
 
-#: initdb.c:3465
+#: initdb.c:3221
 #, c-format
 msgid "It contains a lost+found directory, perhaps due to it being a mount point.\n"
 msgstr "Il contient un r�pertoire lost+found, peut-�tre parce qu'il s'agit d'un point de montage.\n"
 
-#: initdb.c:3468
+#: initdb.c:3224
 #, c-format
 msgid ""
 "Using a mount point directly as the data directory is not recommended.\n"
@@ -991,34 +924,43 @@ msgstr ""
 "Utiliser un point de montage comme r�pertoire de donn�es n'est pas recommand�.\n"
 "Cr�ez un sous-r�pertoire sous le point de montage.\n"
 
-#: initdb.c:3487
+#: initdb.c:3244
 #, c-format
 msgid "creating subdirectories ... "
 msgstr "cr�ation des sous-r�pertoires... "
 
-#: initdb.c:3655
+#: initdb.c:3291
+msgid "performing post-bootstrap initialization ... "
+msgstr "ex�cution de l'initialisation apr�s bootstrap..."
+
+#: initdb.c:3442
 #, c-format
 msgid "Running in debug mode.\n"
 msgstr "Lanc� en mode d�bogage.\n"
 
-#: initdb.c:3659
+#: initdb.c:3446
 #, c-format
 msgid "Running in noclean mode.  Mistakes will not be cleaned up.\n"
 msgstr "Lanc� en mode � sans nettoyage �. Les erreurs ne seront pas supprim�es.\n"
 
-#: initdb.c:3730
+#: initdb.c:3517
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s : trop d'arguments en ligne de commande (le premier �tant � %s �)\n"
 
-#: initdb.c:3747
+#: initdb.c:3543
 #, c-format
 msgid "%s: password prompt and password file cannot be specified together\n"
 msgstr ""
 "%s : les options d'invite du mot de passe et le fichier de mots de passe ne\n"
 " peuvent pas �tre indiqu�es simultan�ment\n"
 
-#: initdb.c:3769
+#: initdb.c:3567
+#, c-format
+msgid "%s: superuser name \"%s\" is disallowed; role names cannot begin with \"pg_\"\n"
+msgstr "%s : le nom de superutilisateur � %s � est non autoris� ; les noms de r�le ne peuvent pas commencer avec � pg_ �\n"
+
+#: initdb.c:3571
 #, c-format
 msgid ""
 "The files belonging to this database system will be owned by user \"%s\".\n"
@@ -1029,17 +971,17 @@ msgstr ""
 "Le processus serveur doit �galement lui appartenir.\n"
 "\n"
 
-#: initdb.c:3785
+#: initdb.c:3587
 #, c-format
 msgid "Data page checksums are enabled.\n"
 msgstr "Les sommes de contr�les des pages de donn�es sont activ�es.\n"
 
-#: initdb.c:3787
+#: initdb.c:3589
 #, c-format
 msgid "Data page checksums are disabled.\n"
 msgstr "Les sommes de contr�les des pages de donn�es sont d�sactiv�es.\n"
 
-#: initdb.c:3796
+#: initdb.c:3598
 #, c-format
 msgid ""
 "\n"
@@ -1050,25 +992,24 @@ msgstr ""
 "Synchronisation sur disque ignor�e.\n"
 "Le r�pertoire des donn�es pourrait �tre corrompu si le syst�me d'exploitation s'arr�tait brutalement.\n"
 
-#: initdb.c:3805
+#: initdb.c:3607
 #, 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"
-"Succ�s. Vous pouvez maintenant lancer le serveur de bases de donn�es par :\n"
+"Succ�s. Vous pouvez maintenant lancer le serveur de bases de donn�es en utilisant :\n"
 "\n"
-"    %s%s%spostgres%s -D %s%s%s\n"
-"ou\n"
 "    %s%s%spg_ctl%s -D %s%s%s -l journal_applicatif start\n"
 "\n"
 
+#~ msgid "%s: could not close directory \"%s\": %s\n"
+#~ msgstr "%s : n'a pas pu fermer le r�pertoire � %s � : %s\n"
+
 #~ msgid "%s: could not obtain information about current user: %s\n"
 #~ msgstr "%s : n'a pas pu obtenir d'informations sur l'utilisateur courant : %s\n"
 
@@ -1091,3 +1032,51 @@ msgstr ""
 
 #~ msgid "%s: could not to allocate SIDs: error code %lu\n"
 #~ msgstr "%s : n'a pas pu allouer les SID : code d'erreur %lu\n"
+
+#~ msgid "copying template1 to postgres ... "
+#~ msgstr "copie de template1 vers postgres... "
+
+#~ msgid "copying template1 to template0 ... "
+#~ msgstr "copie de template1 vers template0... "
+
+#~ msgid "vacuuming database template1 ... "
+#~ msgstr "lancement du vacuum sur la base de donn�es template1... "
+
+#~ msgid "loading PL/pgSQL server-side language ... "
+#~ msgstr "chargement du langage PL/pgSQL... "
+
+#~ msgid "creating information schema ... "
+#~ msgstr "cr�ation du sch�ma d'informations... "
+
+#~ msgid "setting privileges on built-in objects ... "
+#~ msgstr "initialisation des droits sur les objets internes... "
+
+#~ msgid "creating dictionaries ... "
+#~ msgstr "cr�ation des dictionnaires... "
+
+#~ msgid "creating conversions ... "
+#~ msgstr "cr�ation des conversions... "
+
+#~ msgid "not supported on this platform\n"
+#~ msgstr "non support� sur cette plateforme\n"
+
+#~ msgid "creating collations ... "
+#~ msgstr "cr�ation des collationnements... "
+
+#~ msgid "loading system objects' descriptions ... "
+#~ msgstr "chargement de la description des objets syst�me... "
+
+#~ msgid "creating system views ... "
+#~ msgstr "cr�ation des vues syst�me... "
+
+#~ msgid "initializing dependencies ... "
+#~ msgstr "initialisation des d�pendances... "
+
+#~ msgid "setting password ... "
+#~ msgstr "initialisation du mot de passe... "
+
+#~ msgid "initializing pg_authid ... "
+#~ msgstr "initialisation de pg_authid... "
+
+#~ msgid "creating template1 database in %s/base/1 ... "
+#~ msgstr "cr�ation de la base de donn�es template1 dans %s/base/1... "
diff --git a/src/bin/initdb/po/it.po b/src/bin/initdb/po/it.po
index 90ff0abdb8..c6c824f3f6 100644
--- a/src/bin/initdb/po/it.po
+++ b/src/bin/initdb/po/it.po
@@ -22,10 +22,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: initdb (PostgreSQL) 9.4\n"
+"Project-Id-Version: initdb (PostgreSQL) 9.6\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2014-12-06 18:12+0000\n"
-"PO-Revision-Date: 2014-12-06 18:31+0100\n"
+"POT-Creation-Date: 2016-04-17 00:14+0000\n"
+"PO-Revision-Date: 2016-04-17 21:10+0100\n"
 "Last-Translator: Daniele Varrazzo <daniele.varrazzo@gmail.com>\n"
 "Language-Team: Gruppo traduzioni ITPUG <traduzioni@itpug.org>\n"
 "Language: it\n"
@@ -33,6 +33,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-SourceCharset: utf-8\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Poedit 1.5.4\n"
 
 #: ../../common/exec.c:127 ../../common/exec.c:241 ../../common/exec.c:284
@@ -70,13 +71,13 @@ msgstr "lettura del link simbolico \"%s\" fallita"
 msgid "pclose failed: %s"
 msgstr "pclose fallita: %s"
 
-#: ../../common/fe_memutils.c:33 ../../common/fe_memutils.c:60
-#: ../../common/fe_memutils.c:83
+#: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
+#: ../../common/fe_memutils.c:98
 #, c-format
 msgid "out of memory\n"
 msgstr "memoria esaurita\n"
 
-#: ../../common/fe_memutils.c:77
+#: ../../common/fe_memutils.c:92
 #, c-format
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "impossibile duplicare il puntatore nullo (errore interno)\n"
@@ -96,6 +97,41 @@ msgstr "lettura della directory \"%s\" fallita: %s\n"
 msgid "could not close directory \"%s\": %s\n"
 msgstr "chiusura della directory \"%s\" fallita: %s\n"
 
+#: ../../common/restricted_token.c:68
+#, c-format
+msgid "%s: WARNING: cannot create restricted tokens on this platform\n"
+msgstr "%s: ATTENZIONE: non è possibile creare token ristretti su questa piattaforma\n"
+
+#: ../../common/restricted_token.c:77
+#, c-format
+msgid "%s: could not open process token: error code %lu\n"
+msgstr "%s: apertura del token di processo fallita: codice errore %lu\n"
+
+#: ../../common/restricted_token.c:90
+#, c-format
+msgid "%s: could not allocate SIDs: error code %lu\n"
+msgstr "%s: allocazione dei SID fallita: codice errore %lu\n"
+
+#: ../../common/restricted_token.c:110
+#, c-format
+msgid "%s: could not create restricted token: error code %lu\n"
+msgstr "%s: creazione del token ristretto fallita: codice errore %lu\n"
+
+#: ../../common/restricted_token.c:132
+#, c-format
+msgid "%s: could not start process for command \"%s\": error code %lu\n"
+msgstr "%s: errore nell'avvio del processo per il comando \"%s\": codice errore %lu\n"
+
+#: ../../common/restricted_token.c:170
+#, c-format
+msgid "%s: could not re-execute with restricted token: error code %lu\n"
+msgstr "%s: ri-eseguire con token ristretto fallita: codice errore %lu\n"
+
+#: ../../common/restricted_token.c:186
+#, c-format
+msgid "%s: could not get exit code from subprocess: error code %lu\n"
+msgstr "%s: lettura del codice di uscita del processo figlio fallita: codice errore %lu\n"
+
 #: ../../common/rmtree.c:77
 #, c-format
 msgid "could not stat file or directory \"%s\": %s\n"
@@ -115,10 +151,10 @@ msgstr "ID utente effettivo %ld non trovato: %s"
 msgid "user does not exist"
 msgstr "l'utente non esiste"
 
-#: ../../common/username.c:61
+#: ../../common/username.c:62
 #, c-format
-msgid "user name lookup failure: %s"
-msgstr "errore nella ricerca del nome: %s"
+msgid "user name lookup failure: error code %lu"
+msgstr "ricerca del nome utente fallita: codice di errore %lu"
 
 #: ../../common/wait_error.c:47
 #, c-format
@@ -155,122 +191,117 @@ msgstr "processo figlio terminato da segnale %d"
 msgid "child process exited with unrecognized status %d"
 msgstr "processo figlio uscito con stato non riconosciuto %d"
 
-#: ../../port/dirmod.c:219
+#: ../../port/dirmod.c:221
 #, c-format
 msgid "could not set junction for \"%s\": %s\n"
 msgstr "non è stato possibile impostare la giunzione per \"%s\": %s\n"
 
-#: ../../port/dirmod.c:294
+#: ../../port/dirmod.c:298
 #, c-format
 msgid "could not get junction for \"%s\": %s\n"
 msgstr "non è stato possibile ottenere la giunzione per \"%s\": %s\n"
 
-#: initdb.c:337
+#: initdb.c:349
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: memoria esaurita\n"
 
-#: initdb.c:447 initdb.c:1653
+#: initdb.c:459 initdb.c:1589
 #, c-format
 msgid "%s: could not open file \"%s\" for reading: %s\n"
 msgstr "%s: errore nell'apertura del file \"%s\" per la lettura: %s\n"
 
-#: initdb.c:503 initdb.c:1055 initdb.c:1083
+#: initdb.c:515 initdb.c:1002 initdb.c:1030
 #, c-format
 msgid "%s: could not open file \"%s\" for writing: %s\n"
 msgstr "%s: errore nell'apertura del file \"%s\" per la scrittura: %s\n"
 
-#: initdb.c:511 initdb.c:519 initdb.c:1062 initdb.c:1089
+#: initdb.c:523 initdb.c:531 initdb.c:1009 initdb.c:1036
 #, c-format
 msgid "%s: could not write file \"%s\": %s\n"
 msgstr "%s: errore nella scrittura del file \"%s\": %s\n"
 
-#: initdb.c:541 initdb.c:608
+#: initdb.c:562
 #, c-format
 msgid "%s: could not open directory \"%s\": %s\n"
 msgstr "%s: apertura della directory \"%s\" fallita: %s\n"
 
-#: initdb.c:558
+#: initdb.c:586 initdb.c:2334
 #, c-format
 msgid "%s: could not stat file \"%s\": %s\n"
 msgstr "%s: non è stato possibile ottenere informazioni sul file \"%s\": %s\n"
 
-#: initdb.c:571 initdb.c:628
+#: initdb.c:598
 #, c-format
 msgid "%s: could not read directory \"%s\": %s\n"
 msgstr "%s: lettura della directory \"%s\" fallita: %s\n"
 
-#: initdb.c:578 initdb.c:635
-#, c-format
-msgid "%s: could not close directory \"%s\": %s\n"
-msgstr "%s: chiusura della directory \"%s\" fallita: %s\n"
-
-#: initdb.c:662 initdb.c:714
+#: initdb.c:631 initdb.c:690
 #, c-format
 msgid "%s: could not open file \"%s\": %s\n"
 msgstr "%s: apertura del file \"%s\" fallita: %s\n"
 
-#: initdb.c:730
+#: initdb.c:702
 #, c-format
 msgid "%s: could not fsync file \"%s\": %s\n"
 msgstr "%s: fsync del file \"%s\" fallito: %s\n"
 
-#: initdb.c:751
+#: initdb.c:721
 #, c-format
 msgid "%s: could not execute command \"%s\": %s\n"
 msgstr "%s: esecuzione del comando \"%s\" fallita: %s\n"
 
-#: initdb.c:767
+#: initdb.c:737
 #, c-format
 msgid "%s: removing data directory \"%s\"\n"
 msgstr "%s: rimozione della directory dati \"%s\"\n"
 
-#: initdb.c:770
+#: initdb.c:740
 #, c-format
 msgid "%s: failed to remove data directory\n"
 msgstr "%s: rimozione della directory dati fallita\n"
 
-#: initdb.c:776
+#: initdb.c:746
 #, c-format
 msgid "%s: removing contents of data directory \"%s\"\n"
 msgstr "%s: rimozione dei contenuti della directory dati \"%s\"\n"
 
-#: initdb.c:779
+#: initdb.c:749
 #, c-format
 msgid "%s: failed to remove contents of data directory\n"
 msgstr "%s: rimozione dei contenuti dalla directory dati fallita\n"
 
-#: initdb.c:785
+#: initdb.c:755
 #, c-format
 msgid "%s: removing transaction log directory \"%s\"\n"
 msgstr "%s: rimozione della directory dei log delle transazioni \"%s\"\n"
 
-#: initdb.c:788
+#: initdb.c:758
 #, c-format
 msgid "%s: failed to remove transaction log directory\n"
 msgstr "%s: rimozione della directory dei log delle transazioni fallita\n"
 
-#: initdb.c:794
+#: initdb.c:764
 #, c-format
 msgid "%s: removing contents of transaction log directory \"%s\"\n"
 msgstr "%s: rimozione dei contenuti della directory dei log delle transazioni \"%s\"\n"
 
-#: initdb.c:797
+#: initdb.c:767
 #, c-format
 msgid "%s: failed to remove contents of transaction log directory\n"
 msgstr "%s: rimozione dei contenuti della directory dei log delle transazioni fallita\n"
 
-#: initdb.c:806
+#: initdb.c:776
 #, c-format
 msgid "%s: data directory \"%s\" not removed at user's request\n"
 msgstr "%s: directory dati \"%s\" non rimossa su richiesta dell'utente\n"
 
-#: initdb.c:811
+#: initdb.c:781
 #, c-format
 msgid "%s: transaction log directory \"%s\" not removed at user's request\n"
 msgstr "%s: directory dei log delle transazioni \"%s\" non rimossa su richiesta dell'utente\n"
 
-#: initdb.c:832
+#: initdb.c:802
 #, c-format
 msgid ""
 "%s: cannot be run as root\n"
@@ -281,22 +312,17 @@ msgstr ""
 "Effettua il login (usando per esempio \"su\") con l'utente\n"
 "(non privilegiato) che controllerà il processo server.\n"
 
-#: initdb.c:868
+#: initdb.c:838
 #, c-format
 msgid "%s: \"%s\" is not a valid server encoding name\n"
 msgstr "%s: \"%s\" non è un nome di codifica per il server valido\n"
 
-#: initdb.c:982 initdb.c:3386
-#, c-format
-msgid "%s: could not create directory \"%s\": %s\n"
-msgstr "%s: creazione della directory \"%s\" fallita: %s\n"
-
-#: initdb.c:1011
+#: initdb.c:958
 #, c-format
 msgid "%s: file \"%s\" does not exist\n"
 msgstr "%s: il file \"%s\" non esiste\n"
 
-#: initdb.c:1013 initdb.c:1022 initdb.c:1032
+#: initdb.c:960 initdb.c:969 initdb.c:979
 #, c-format
 msgid ""
 "This might mean you have a corrupted installation or identified\n"
@@ -305,46 +331,46 @@ msgstr ""
 "Questo potrebbe indica una installazione corrotta oppure\n"
 "hai indicato la directory errata con l'opzione -L.\n"
 
-#: initdb.c:1019
+#: initdb.c:966
 #, c-format
 msgid "%s: could not access file \"%s\": %s\n"
 msgstr "%s: accesso al file \"%s\" fallito: %s\n"
 
-#: initdb.c:1030
+#: initdb.c:977
 #, c-format
 msgid "%s: file \"%s\" is not a regular file\n"
 msgstr "%s: il file \"%s\" non è un file regolare\n"
 
-#: initdb.c:1175
+#: initdb.c:1122
 #, c-format
 msgid "selecting default max_connections ... "
 msgstr "selezione del parametro max_connections predefinito ... "
 
-#: initdb.c:1205
+#: initdb.c:1152
 #, c-format
 msgid "selecting default shared_buffers ... "
 msgstr "selezione di shared_buffers predefinito ... "
 
-#: initdb.c:1238
+#: initdb.c:1185
 #, c-format
 msgid "selecting dynamic shared memory implementation ... "
 msgstr "selezione dell'implementazione della memoria dinamica ... "
 
-#: initdb.c:1256
+#: initdb.c:1203
 msgid "creating configuration files ... "
 msgstr "creazione dei file di configurazione ... "
 
-#: initdb.c:1347 initdb.c:1367 initdb.c:1451 initdb.c:1467
+#: initdb.c:1300 initdb.c:1320 initdb.c:1404 initdb.c:1420
 #, c-format
 msgid "%s: could not change permissions of \"%s\": %s\n"
 msgstr "%s: cambio di permesso di \"%s\" fallito: %s\n"
 
-#: initdb.c:1491
+#: initdb.c:1444
 #, c-format
-msgid "creating template1 database in %s/base/1 ... "
-msgstr "creazione del database template1 in in %s/base/1 ... "
+msgid "running bootstrap script ... "
+msgstr "esecuzione dello script di bootstrap ... "
 
-#: initdb.c:1507
+#: initdb.c:1460
 #, c-format
 msgid ""
 "%s: input file \"%s\" does not belong to PostgreSQL %s\n"
@@ -354,156 +380,94 @@ msgstr ""
 "Controlla la correttezza dell'installazione oppure specifica\n"
 "il percorso corretto con l'opzione -L.\n"
 
-#: initdb.c:1594
-msgid "initializing pg_authid ... "
-msgstr "inizializzazione di pg_authid ... "
-
-#: initdb.c:1628
+#: initdb.c:1564
 msgid "Enter new superuser password: "
 msgstr "Inserisci la nuova password del superutente: "
 
-#: initdb.c:1629
+#: initdb.c:1565
 msgid "Enter it again: "
 msgstr "Conferma password: "
 
-#: initdb.c:1632
+#: initdb.c:1568
 #, c-format
 msgid "Passwords didn't match.\n"
 msgstr "Le password non corrispondono.\n"
 
-#: initdb.c:1660
+#: initdb.c:1596
 #, c-format
 msgid "%s: could not read password from file \"%s\": %s\n"
 msgstr "%s: lettura del file delle password \"%s\" fallita: %s\n"
 
-#: initdb.c:1663
+#: initdb.c:1599
 #, c-format
 msgid "%s: password file \"%s\" is empty\n"
 msgstr "%s: il file delle password \"%s\" è vuoto\n"
 
-#: initdb.c:1676
-#, c-format
-msgid "setting password ... "
-msgstr "impostazione password ... "
-
-#: initdb.c:1776
-msgid "initializing dependencies ... "
-msgstr "inizializzazione delle dipendenze ... "
-
-#: initdb.c:1804
-msgid "creating system views ... "
-msgstr "creazione delle viste di sistema ... "
-
-#: initdb.c:1840
-msgid "loading system objects' descriptions ... "
-msgstr "caricamento delle descrizioni degli oggetti di sistema ... "
-
-#: initdb.c:1946
-msgid "creating collations ... "
-msgstr "creazione degli ordinamenti alfabetici ... "
-
-#: initdb.c:1979
+#: initdb.c:1845
 #, c-format
 msgid "%s: locale name too long, skipped: \"%s\"\n"
 msgstr "%s: nome locale troppo lungo, saltato: \"%s\"\n"
 
-#: initdb.c:2004
+#: initdb.c:1870
 #, c-format
 msgid "%s: locale name has non-ASCII characters, skipped: \"%s\"\n"
 msgstr "%s: nome locale contiene caratteri non ASCII, saltato: \"%s\"\n"
 
-#: initdb.c:2073
+#: initdb.c:1943
 #, c-format
 msgid "No usable system locales were found.\n"
 msgstr "Nessun locale di sistema trovato.\n"
 
-#: initdb.c:2074
+#: initdb.c:1944
 #, c-format
 msgid "Use the option \"--debug\" to see details.\n"
 msgstr "Usa l'opzione \"--debug\" per vedere i dettagli.\n"
 
-#: initdb.c:2077
-#, c-format
-msgid "not supported on this platform\n"
-msgstr "non supportato su questa piattaforma\n"
-
-#: initdb.c:2092
-msgid "creating conversions ... "
-msgstr "creazione delle conversioni ... "
-
-#: initdb.c:2127
-msgid "creating dictionaries ... "
-msgstr "creazione dizionari ... "
-
-#: initdb.c:2181
-msgid "setting privileges on built-in objects ... "
-msgstr "impostazione dei privilegi per gli oggetti predefiniti ... "
-
-#: initdb.c:2239
-msgid "creating information schema ... "
-msgstr "creazione dello schema informazioni ... "
-
-#: initdb.c:2295
-msgid "loading PL/pgSQL server-side language ... "
-msgstr "caricamento del linguaggio lato server PL/pgSQL ... "
-
-#: initdb.c:2320
-msgid "vacuuming database template1 ... "
-msgstr "vacuum del database template1 ... "
-
-#: initdb.c:2376
-msgid "copying template1 to template0 ... "
-msgstr "copia di template1 a template0 ... "
-
-#: initdb.c:2408
-msgid "copying template1 to postgres ... "
-msgstr "copia di template1 a postgres ... "
-
-#: initdb.c:2435
+#: initdb.c:2317
 msgid "syncing data to disk ... "
 msgstr "sincronizzazione dati sul disco ... "
 
-#: initdb.c:2514
+#: initdb.c:2411
 #, c-format
 msgid "caught signal\n"
 msgstr "intercettato segnale\n"
 
-#: initdb.c:2520
+#: initdb.c:2417
 #, c-format
 msgid "could not write to child process: %s\n"
 msgstr "scrittura verso il processo figlio fallita: %s\n"
 
-#: initdb.c:2528
+#: initdb.c:2425
 #, c-format
 msgid "ok\n"
 msgstr "ok\n"
 
-#: initdb.c:2618
+#: initdb.c:2515
 #, c-format
 msgid "%s: setlocale() failed\n"
 msgstr "%s: setlocale() fallito\n"
 
-#: initdb.c:2636
+#: initdb.c:2533
 #, c-format
 msgid "%s: failed to restore old locale \"%s\"\n"
 msgstr "%s: ripristino del locale precedente \"%s\" fallito\n"
 
-#: initdb.c:2646
+#: initdb.c:2543
 #, c-format
 msgid "%s: invalid locale name \"%s\"\n"
 msgstr "%s: nome locale non valido \"%s\"\n"
 
-#: initdb.c:2658
+#: initdb.c:2555
 #, c-format
 msgid "%s: invalid locale settings; check LANG and LC_* environment variables\n"
 msgstr "%s: impostazione locale non valida; controlla le variabili d'ambiente LANG e LC_*\n"
 
-#: initdb.c:2686
+#: initdb.c:2583
 #, c-format
 msgid "%s: encoding mismatch\n"
 msgstr "%s: mancata corrispondenza di codifica\n"
 
-#: initdb.c:2688
+#: initdb.c:2585
 #, c-format
 msgid ""
 "The encoding you selected (%s) and the encoding that the\n"
@@ -518,32 +482,7 @@ msgstr ""
 "Esegui di nuovo %s senza specificare una codifica esplicitamente\n"
 "oppure seleziona una combinazione corretta.\n"
 
-#: initdb.c:2793
-#, c-format
-msgid "%s: WARNING: cannot create restricted tokens on this platform\n"
-msgstr "%s: ATTENZIONE: non è possibile creare token ristretti su questa piattaforma\n"
-
-#: initdb.c:2802
-#, c-format
-msgid "%s: could not open process token: error code %lu\n"
-msgstr "%s: apertura del token di processo fallita: codice errore %lu\n"
-
-#: initdb.c:2815
-#, c-format
-msgid "%s: could not to allocate SIDs: error code %lu\n"
-msgstr "%s: allocazione dei SID fallita: codice errore %lu\n"
-
-#: initdb.c:2834
-#, c-format
-msgid "%s: could not create restricted token: error code %lu\n"
-msgstr "%s: creazione del token ristretto fallita: codice errore %lu\n"
-
-#: initdb.c:2855
-#, c-format
-msgid "%s: could not start process for command \"%s\": error code %lu\n"
-msgstr "%s: errore nell'avvio del processo per il comando \"%s\": codice errore %lu\n"
-
-#: initdb.c:2869
+#: initdb.c:2657
 #, c-format
 msgid ""
 "%s initializes a PostgreSQL database cluster.\n"
@@ -552,17 +491,17 @@ msgstr ""
 "%s inizializza un cluster di database PostgreSQL.\n"
 "\n"
 
-#: initdb.c:2870
+#: initdb.c:2658
 #, c-format
 msgid "Usage:\n"
 msgstr "Utilizzo:\n"
 
-#: initdb.c:2871
+#: initdb.c:2659
 #, c-format
 msgid "  %s [OPTION]... [DATADIR]\n"
 msgstr "  %s [OPZIONE]... [DATADIR]\n"
 
-#: initdb.c:2872
+#: initdb.c:2660
 #, c-format
 msgid ""
 "\n"
@@ -571,47 +510,47 @@ msgstr ""
 "\n"
 "Opzioni:\n"
 
-#: initdb.c:2873
+#: initdb.c:2661
 #, c-format
 msgid "  -A, --auth=METHOD         default authentication method for local connections\n"
 msgstr ""
 "  -A, --auth=METODO         metodo di autenticazione predefinito per le\n"
 "                            connessioni locali\n"
 
-#: initdb.c:2874
+#: initdb.c:2662
 #, c-format
 msgid "      --auth-host=METHOD    default authentication method for local TCP/IP connections\n"
 msgstr ""
 "      --auth-host=METODO    metodo di autenticazione predefinito per le\n"
 "                            connessioni TCP/IP\n"
 
-#: initdb.c:2875
+#: initdb.c:2663
 #, c-format
 msgid "      --auth-local=METHOD   default authentication method for local-socket connections\n"
 msgstr ""
 "      --auth-local=METODO   metodo di autenticazione predefinito per le\n"
 "                            connessioni locali\n"
 
-#: initdb.c:2876
+#: initdb.c:2664
 #, c-format
 msgid " [-D, --pgdata=]DATADIR     location for this database cluster\n"
 msgstr " [-D, --pgdata=]DATADIR     dove creare questo cluster di database\n"
 
-#: initdb.c:2877
+#: initdb.c:2665
 #, c-format
 msgid "  -E, --encoding=ENCODING   set default encoding for new databases\n"
 msgstr ""
 "  -E, --encoding=ENCODING   imposta la codifica predefinita per i nuovi\n"
 "                            database\n"
 
-#: initdb.c:2878
+#: initdb.c:2666
 #, c-format
 msgid "      --locale=LOCALE       set default locale for new databases\n"
 msgstr ""
 "      --locale=LOCALE       imposta il locale predefinito per i nuovi\n"
 "                            database\n"
 
-#: initdb.c:2879
+#: initdb.c:2667
 #, c-format
 msgid ""
 "      --lc-collate=, --lc-ctype=, --lc-messages=LOCALE\n"
@@ -626,17 +565,17 @@ msgstr ""
 "                            Il valore predefinito viene preso dalle variabili\n"
 "                            d'ambiente\n"
 
-#: initdb.c:2883
+#: initdb.c:2671
 #, c-format
 msgid "      --no-locale           equivalent to --locale=C\n"
 msgstr "      --no-locale           equivalente a --locale=C\n"
 
-#: initdb.c:2884
+#: initdb.c:2672
 #, c-format
 msgid "      --pwfile=FILE         read password for the new superuser from file\n"
 msgstr "      --pwfile=FILE         leggi la password per il nuovo superutente dal file\n"
 
-#: initdb.c:2885
+#: initdb.c:2673
 #, c-format
 msgid ""
 "  -T, --text-search-config=CFG\n"
@@ -645,24 +584,24 @@ msgstr ""
 "  -T, --text-search-config=CFG\n"
 "                            configurazione predefinita per la ricerca di testo\n"
 
-#: initdb.c:2887
+#: initdb.c:2675
 #, c-format
 msgid "  -U, --username=NAME       database superuser name\n"
 msgstr "  -U, --username=NOME       nome del superutente del database\n"
 
-#: initdb.c:2888
+#: initdb.c:2676
 #, c-format
 msgid "  -W, --pwprompt            prompt for a password for the new superuser\n"
 msgstr "  -W, --pwprompt            richiedi la password per il nuovo superutente\n"
 
-#: initdb.c:2889
+#: initdb.c:2677
 #, c-format
 msgid "  -X, --xlogdir=XLOGDIR     location for the transaction log directory\n"
 msgstr ""
 "  -X, --xlogdir=XLOGDIR     posizione della directory contenente i log\n"
 "                            delle transazioni\n"
 
-#: initdb.c:2890
+#: initdb.c:2678
 #, c-format
 msgid ""
 "\n"
@@ -671,44 +610,44 @@ msgstr ""
 "\n"
 "Opzioni utilizzate meno frequentemente:\n"
 
-#: initdb.c:2891
+#: initdb.c:2679
 #, c-format
 msgid "  -d, --debug               generate lots of debugging output\n"
 msgstr "  -d, --debug               genera molto output di debug\n"
 
-#: initdb.c:2892
+#: initdb.c:2680
 #, c-format
 msgid "  -k, --data-checksums      use data page checksums\n"
 msgstr "  -k, --data-checksums      usa i checksum delle pagine dati\n"
 
-#: initdb.c:2893
+#: initdb.c:2681
 #, c-format
 msgid "  -L DIRECTORY              where to find the input files\n"
 msgstr "  -L DIRECTORY              dove trovare i file di input\n"
 
-#: initdb.c:2894
+#: initdb.c:2682
 #, c-format
 msgid "  -n, --noclean             do not clean up after errors\n"
 msgstr "  -n, --noclean             non ripulire dopo gli errori\n"
 
-#: initdb.c:2895
+#: initdb.c:2683
 #, c-format
 msgid "  -N, --nosync              do not wait for changes to be written safely to disk\n"
 msgstr ""
 "  -N, --nosync              non attendere che i cambiamenti siano stati\n"
 "                            scritti in sicurezza sul disco\n"
 
-#: initdb.c:2896
+#: initdb.c:2684
 #, c-format
 msgid "  -s, --show                show internal settings\n"
 msgstr "  -s, --show                mostra le impostazioni interne\n"
 
-#: initdb.c:2897
+#: initdb.c:2685
 #, c-format
 msgid "  -S, --sync-only           only sync data directory\n"
 msgstr "  -S, --sync-only           sincronizza solo la directory dei dati\n"
 
-#: initdb.c:2898
+#: initdb.c:2686
 #, c-format
 msgid ""
 "\n"
@@ -717,17 +656,17 @@ msgstr ""
 "\n"
 "Altre opzioni:\n"
 
-#: initdb.c:2899
+#: initdb.c:2687
 #, c-format
 msgid "  -V, --version             output version information, then exit\n"
 msgstr "  -V, --version             mostra informazioni sulla versione ed esci\n"
 
-#: initdb.c:2900
+#: initdb.c:2688
 #, c-format
 msgid "  -?, --help                show this help, then exit\n"
 msgstr "  -?, --help                mostra questo aiuto ed esci\n"
 
-#: initdb.c:2901
+#: initdb.c:2689
 #, c-format
 msgid ""
 "\n"
@@ -738,7 +677,7 @@ msgstr ""
 "Se la directory dati non è specificata, viene usata la variabile\n"
 "d'ambiente PGDATA.\n"
 
-#: initdb.c:2903
+#: initdb.c:2691
 #, c-format
 msgid ""
 "\n"
@@ -747,7 +686,7 @@ msgstr ""
 "\n"
 "Puoi segnalare eventuali bug a <pgsql-bugs@postgresql.org>.\n"
 
-#: initdb.c:2911
+#: initdb.c:2699
 msgid ""
 "\n"
 "WARNING: enabling \"trust\" authentication for local connections\n"
@@ -760,27 +699,17 @@ msgstr ""
 "pg_hba.conf o utilizzando l'opzione -A oppure --auth-local and --auth-host\n"
 "alla prossima esecuzione di initdb.\n"
 
-#: initdb.c:2933
+#: initdb.c:2721
 #, c-format
 msgid "%s: invalid authentication method \"%s\" for \"%s\" connections\n"
 msgstr "%s: metodo di autenticazione \"%s\" non valido per connessioni \"%s\"\n"
 
-#: initdb.c:2947
+#: initdb.c:2735
 #, c-format
 msgid "%s: must specify a password for the superuser to enable %s authentication\n"
 msgstr "%s: occorre specificare una password per il superutente per abilitare l'autenticazione %s\n"
 
-#: initdb.c:2980
-#, c-format
-msgid "%s: could not re-execute with restricted token: error code %lu\n"
-msgstr "%s: ri-eseguire con token ristretto fallita: codice errore %lu\n"
-
-#: initdb.c:2995
-#, c-format
-msgid "%s: could not get exit code from subprocess: error code %lu\n"
-msgstr "%s: lettura del codice di uscita del processo figlio fallita: codice errore %lu\n"
-
-#: initdb.c:3021
+#: initdb.c:2762
 #, c-format
 msgid ""
 "%s: no data directory specified\n"
@@ -793,7 +722,7 @@ msgstr ""
 "database. Puoi farlo usando l'opzione -D oppure la variabile globale\n"
 "PGDATA.\n"
 
-#: initdb.c:3059
+#: initdb.c:2800
 #, c-format
 msgid ""
 "The program \"postgres\" is needed by %s but was not found in the\n"
@@ -804,7 +733,7 @@ msgstr ""
 "nella stessa directory \"%s\".\n"
 "Verifica la correttezza dell'installazione.\n"
 
-#: initdb.c:3066
+#: initdb.c:2807
 #, c-format
 msgid ""
 "The program \"postgres\" was found by \"%s\"\n"
@@ -815,17 +744,17 @@ msgstr ""
 "ma non ha la stessa versione di %s.\n"
 "Verifica la correttezza dell'installazione.\n"
 
-#: initdb.c:3085
+#: initdb.c:2826
 #, c-format
 msgid "%s: input file location must be an absolute path\n"
 msgstr "%s: la posizione del file di input deve essere un percorso assoluto\n"
 
-#: initdb.c:3104
+#: initdb.c:2845
 #, c-format
 msgid "The database cluster will be initialized with locale \"%s\".\n"
 msgstr "Il cluster di database sarà inizializzato con il locale \"%s\".\n"
 
-#: initdb.c:3107
+#: initdb.c:2848
 #, c-format
 msgid ""
 "The database cluster will be initialized with locales\n"
@@ -844,22 +773,22 @@ msgstr ""
 "  NUMERIC:  %s\n"
 "  TIME:     %s\n"
 
-#: initdb.c:3131
+#: initdb.c:2872
 #, c-format
 msgid "%s: could not find suitable encoding for locale \"%s\"\n"
 msgstr "%s: nessuna codifica adeguata trovata per il locale \"%s\"\n"
 
-#: initdb.c:3133
+#: initdb.c:2874
 #, c-format
 msgid "Rerun %s with the -E option.\n"
 msgstr "Esegui di nuovo %s con l'opzione -E.\n"
 
-#: initdb.c:3134 initdb.c:3710 initdb.c:3731
+#: initdb.c:2875 initdb.c:3498 initdb.c:3519
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Prova \"%s --help\" per maggiori informazioni.\n"
 
-#: initdb.c:3146
+#: initdb.c:2887
 #, c-format
 msgid ""
 "Encoding \"%s\" implied by locale is not allowed as a server-side encoding.\n"
@@ -868,12 +797,12 @@ msgstr ""
 "La codifica \"%s\" implicata dal locale non è consentita come codifica lato server.\n"
 "La codifica predefinita dei database sarà impostata invece a \"%s\".\n"
 
-#: initdb.c:3154
+#: initdb.c:2895
 #, c-format
 msgid "%s: locale \"%s\" requires unsupported encoding \"%s\"\n"
 msgstr "%s: il locale \"%s\" richiede la codifica non supportata \"%s\"\n"
 
-#: initdb.c:3157
+#: initdb.c:2898
 #, c-format
 msgid ""
 "Encoding \"%s\" is not allowed as a server-side encoding.\n"
@@ -882,54 +811,59 @@ msgstr ""
 "La codifica \"%s\" non è disponibile come codifica lato server.\n"
 "Esegui di nuovo %s con un locale diverso.\n"
 
-#: initdb.c:3166
+#: initdb.c:2907
 #, c-format
 msgid "The default database encoding has accordingly been set to \"%s\".\n"
 msgstr "La codifica predefinita del database è stata impostata a \"%s\".\n"
 
-#: initdb.c:3237
+#: initdb.c:2978
 #, c-format
 msgid "%s: could not find suitable text search configuration for locale \"%s\"\n"
 msgstr "%s: nessuna configurazione per la ricerca testo adeguata al locale \"%s\"\n"
 
-#: initdb.c:3248
+#: initdb.c:2989
 #, c-format
 msgid "%s: warning: suitable text search configuration for locale \"%s\" is unknown\n"
 msgstr "%s: attenzione: non si conosce una configurazione per la ricerca testo adeguata al locale \"%s\"\n"
 
-#: initdb.c:3253
+#: initdb.c:2994
 #, c-format
 msgid "%s: warning: specified text search configuration \"%s\" might not match locale \"%s\"\n"
 msgstr ""
 "%s: attenzione: la configurazione specificata per la ricerca testo \"%s\"\n"
 "potrebbe non corrispondere al locale \"%s\"\n"
 
-#: initdb.c:3258
+#: initdb.c:2999
 #, c-format
 msgid "The default text search configuration will be set to \"%s\".\n"
 msgstr "La configurazione predefinita di ricerca testo sarà impostata a \"%s\".\n"
 
-#: initdb.c:3302 initdb.c:3380
+#: initdb.c:3043 initdb.c:3129
 #, c-format
 msgid "creating directory %s ... "
 msgstr "creazione della directory %s ... "
 
-#: initdb.c:3316 initdb.c:3398
+#: initdb.c:3049 initdb.c:3135 initdb.c:3203 initdb.c:3259
+#, c-format
+msgid "%s: could not create directory \"%s\": %s\n"
+msgstr "%s: creazione della directory \"%s\" fallita: %s\n"
+
+#: initdb.c:3061 initdb.c:3147
 #, c-format
 msgid "fixing permissions on existing directory %s ... "
 msgstr "correzione dei permessi sulla directory esistente %s ... "
 
-#: initdb.c:3322 initdb.c:3404
+#: initdb.c:3067 initdb.c:3153
 #, c-format
 msgid "%s: could not change permissions of directory \"%s\": %s\n"
 msgstr "%s: modifica dei permessi della directory \"%s\" fallita: %s\n"
 
-#: initdb.c:3337 initdb.c:3419
+#: initdb.c:3082 initdb.c:3168
 #, c-format
 msgid "%s: directory \"%s\" exists but is not empty\n"
 msgstr "%s: la directory \"%s\" esiste ma non è vuota\n"
 
-#: initdb.c:3343
+#: initdb.c:3088
 #, c-format
 msgid ""
 "If you want to create a new database system, either remove or empty\n"
@@ -940,17 +874,17 @@ msgstr ""
 "la directory \"%s\" oppure esegui %s\n"
 "con un argomento diverso da \"%s\".\n"
 
-#: initdb.c:3351 initdb.c:3432
+#: initdb.c:3096 initdb.c:3181 initdb.c:3532
 #, c-format
 msgid "%s: could not access directory \"%s\": %s\n"
 msgstr "%s: accesso alla directory \"%s\" fallito: %s\n"
 
-#: initdb.c:3371
+#: initdb.c:3120
 #, c-format
 msgid "%s: transaction log directory location must be an absolute path\n"
 msgstr "%s: la directory dei log delle transazioni deve essere un percorso assoluto\n"
 
-#: initdb.c:3425
+#: initdb.c:3174
 #, c-format
 msgid ""
 "If you want to store the transaction log there, either\n"
@@ -959,27 +893,27 @@ msgstr ""
 "Se vuoi salvare lì i log delle transazioni,\n"
 "elimina oppure svuota la directory \"%s\".\n"
 
-#: initdb.c:3443
+#: initdb.c:3189
 #, c-format
 msgid "%s: could not create symbolic link \"%s\": %s\n"
 msgstr "%s: creazione del link simbolico \"%s\" fallita: %s\n"
 
-#: initdb.c:3448
+#: initdb.c:3194
 #, c-format
 msgid "%s: symlinks are not supported on this platform"
 msgstr "%s: i link simbolici non sono supportati su questa piattaforma"
 
-#: initdb.c:3461
+#: initdb.c:3218
 #, c-format
 msgid "It contains a dot-prefixed/invisible file, perhaps due to it being a mount point.\n"
 msgstr "Contiene un file prefissato con punto o invisibile, forse perché è un punto di montaggio.\n"
 
-#: initdb.c:3464
+#: initdb.c:3221
 #, c-format
 msgid "It contains a lost+found directory, perhaps due to it being a mount point.\n"
 msgstr "Contiene una directory lost+found, forse perché è un punto di montaggio.\n"
 
-#: initdb.c:3467
+#: initdb.c:3224
 #, c-format
 msgid ""
 "Using a mount point directly as the data directory is not recommended.\n"
@@ -988,34 +922,38 @@ msgstr ""
 "Usare un punto di montaggio direttamente come directory dati non è\n"
 "consigliato. Crea una sottodirectory sotto il punto di montaggio.\n"
 
-#: initdb.c:3486
+#: initdb.c:3244
 #, c-format
 msgid "creating subdirectories ... "
 msgstr "creazione delle sottodirectory ... "
 
-#: initdb.c:3654
+#: initdb.c:3291
+msgid "performing post-bootstrap initialization ... "
+msgstr "esecuzione dell'inizializzazione successiva al bootstrap ... "
+
+#: initdb.c:3442
 #, c-format
 msgid "Running in debug mode.\n"
 msgstr "Esecuzione in modalità debug\n"
 
-#: initdb.c:3658
+#: initdb.c:3446
 #, c-format
 msgid "Running in noclean mode.  Mistakes will not be cleaned up.\n"
 msgstr "Esecuzione in modalità noclean. Gli errori non verranno ripuliti.\n"
 
-#: initdb.c:3729
+#: initdb.c:3517
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: troppi argomenti nella riga di comando (il primo è \"%s\")\n"
 
-#: initdb.c:3746
+#: initdb.c:3543
 #, c-format
 msgid "%s: password prompt and password file cannot be specified together\n"
 msgstr ""
 "%s: il prompt della password ed un file contenente la password non\n"
 "possono essere specificati contemporaneamente\n"
 
-#: initdb.c:3768
+#: initdb.c:3565
 #, c-format
 msgid ""
 "The files belonging to this database system will be owned by user \"%s\".\n"
@@ -1026,17 +964,17 @@ msgstr ""
 "Questo utente deve inoltre possedere il processo server.\n"
 "\n"
 
-#: initdb.c:3784
+#: initdb.c:3581
 #, c-format
 msgid "Data page checksums are enabled.\n"
 msgstr "La somma di controllo dei dati delle pagine è abilitata.\n"
 
-#: initdb.c:3786
+#: initdb.c:3583
 #, c-format
 msgid "Data page checksums are disabled.\n"
 msgstr "La somma di controllo dei dati delle pagine è disabilitata.\n"
 
-#: initdb.c:3795
+#: initdb.c:3592
 #, c-format
 msgid ""
 "\n"
@@ -1047,21 +985,17 @@ msgstr ""
 "Sync sul disco saltato.\n"
 "La directory dei dati potrebbe diventare corrotta in caso di crash del sistema operativo.\n"
 
-#: initdb.c:3804
+#: initdb.c:3601
 #, 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"
 "Successo. Ora puoi avviare il server database con:\n"
 "\n"
-"    %s%s%spostgres%s -D %s%s%s\n"
-"oppure\n"
 "    %s%s%spg_ctl%s -D %s%s%s -l logfile start\n"
 "\n"
diff --git a/src/bin/initdb/po/ko.po b/src/bin/initdb/po/ko.po
new file mode 100644
index 0000000000..bd2078ff06
--- /dev/null
+++ b/src/bin/initdb/po/ko.po
@@ -0,0 +1,1043 @@
+# Korean message translation file for PostgreSQL initdb
+# Ioseph Kim <ioseph@uri.sarang.net>, 2004.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 9.5\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2015-12-22 17:10+0900\n"
+"PO-Revision-Date: 2015-12-23 13:19+0900\n"
+"Last-Translator: Ioseph Kim <ioseph@uri.sarang.net>\n"
+"Language-Team: Korean <pgsql-kr@postgresql.kr>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../../common/exec.c:127 ../../common/exec.c:241 ../../common/exec.c:284
+#, c-format
+msgid "could not identify current directory: %s"
+msgstr "현재 디렉터리를 알 수 없음: %s"
+
+#: ../../common/exec.c:146
+#, c-format
+msgid "invalid binary \"%s\""
+msgstr "\"%s\" 파일은 잘못된 바이너리 파일입니다"
+
+#: ../../common/exec.c:195
+#, c-format
+msgid "could not read binary \"%s\""
+msgstr "\"%s\" 바이너리 파일을 읽을 수 없음"
+
+#: ../../common/exec.c:202
+#, c-format
+msgid "could not find a \"%s\" to execute"
+msgstr "\"%s\" 실행 파일을 찾을 수 없음"
+
+#: ../../common/exec.c:257 ../../common/exec.c:293
+#, c-format
+msgid "could not change directory to \"%s\": %s"
+msgstr "\"%s\" 디렉터리로 바꿀 수 없음: %s"
+
+#: ../../common/exec.c:272
+#, c-format
+msgid "could not read symbolic link \"%s\""
+msgstr "\"%s\" 심벌릭 링크를 읽을 수 없음"
+
+#: ../../common/exec.c:523
+#, c-format
+msgid "pclose failed: %s"
+msgstr "pclose 실패: %s"
+
+#: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
+#: ../../common/fe_memutils.c:98
+#, c-format
+msgid "out of memory\n"
+msgstr "메모리 부족\n"
+
+#: ../../common/fe_memutils.c:92
+#, c-format
+msgid "cannot duplicate null pointer (internal error)\n"
+msgstr "null 포인터를 중복할 수 없음 (내부 오류)\n"
+
+#: ../../common/pgfnames.c:45
+#, c-format
+msgid "could not open directory \"%s\": %s\n"
+msgstr "\"%s\" 디렉터리를 열 수 없음: %s\n"
+
+#: ../../common/pgfnames.c:72
+#, c-format
+msgid "could not read directory \"%s\": %s\n"
+msgstr "\"%s\" 디렉터리를 읽을 수 없음: %s\n"
+
+#: ../../common/pgfnames.c:84
+#, c-format
+msgid "could not close directory \"%s\": %s\n"
+msgstr "\"%s\" 디렉터리를 닫을 수 없음: %s\n"
+
+#: ../../common/restricted_token.c:68
+#, c-format
+msgid "%s: WARNING: cannot create restricted tokens on this platform\n"
+msgstr ""
+
+#: ../../common/restricted_token.c:77
+#, c-format
+msgid "%s: could not open process token: error code %lu\n"
+msgstr "%s: 프로세스 토큰을 열 수 없음: 오류 코드 %lu\n"
+
+#: ../../common/restricted_token.c:90
+#, c-format
+msgid "%s: could not allocate SIDs: error code %lu\n"
+msgstr "%s: SID를 할당할 수 없음: 오류 코드 %lu\n"
+
+#: ../../common/restricted_token.c:110
+#, c-format
+msgid "%s: could not create restricted token: error code %lu\n"
+msgstr "%s: 상속된 토큰을 만들 수 없음: 오류 코드 %lu\n"
+
+#: ../../common/restricted_token.c:132
+#, c-format
+msgid "%s: could not start process for command \"%s\": error code %lu\n"
+msgstr "%s: \"%s\" 명령용 프로세스를 시작할 수 없음: 오류 코드 %lu\n"
+
+#: ../../common/restricted_token.c:170
+#, c-format
+msgid "%s: could not re-execute with restricted token: error code %lu\n"
+msgstr "%s: 상속된 토큰으로 재실행할 수 없음: 오류 코드 %lu\n"
+
+#: ../../common/restricted_token.c:186
+#, c-format
+msgid "%s: could not get exit code from subprocess: error code %lu\n"
+msgstr "%s: 하위 프로세스의 종료 코드를 구할 수 없음: 오류 코드 %lu\n"
+
+#: ../../common/rmtree.c:77
+#, c-format
+msgid "could not stat file or directory \"%s\": %s\n"
+msgstr "파일 또는 디렉터리 \"%s\"의 상태를 확인할 수 없음: %s\n"
+
+#: ../../common/rmtree.c:104 ../../common/rmtree.c:121
+#, c-format
+msgid "could not remove file or directory \"%s\": %s\n"
+msgstr "\"%s\" 파일 또는 디렉터리를 지울 수 없음: %s\n"
+
+#: ../../common/username.c:45
+#, c-format
+msgid "could not look up effective user ID %ld: %s"
+msgstr "%ld UID를 찾을 수 없음: %s"
+
+#: ../../common/username.c:47
+msgid "user does not exist"
+msgstr "사용자 없음"
+
+#: ../../common/username.c:62
+#, c-format
+msgid "user name lookup failure: error code %lu"
+msgstr "사용자 이름 찾기 실패: 오류 코드 %lu"
+
+#: ../../common/wait_error.c:47
+#, c-format
+msgid "command not executable"
+msgstr "명령을 실행할 수 없음"
+
+#: ../../common/wait_error.c:51
+#, c-format
+msgid "command not found"
+msgstr "해당 명령어 없음"
+
+#: ../../common/wait_error.c:56
+#, c-format
+msgid "child process exited with exit code %d"
+msgstr "하위 프로세스가 종료되었음, 종료 코드 %d"
+
+#: ../../common/wait_error.c:63
+#, c-format
+msgid "child process was terminated by exception 0x%X"
+msgstr "0x%X 예외로 하위 프로세스가 종료되었음."
+
+#: ../../common/wait_error.c:73
+#, c-format
+msgid "child process was terminated by signal %s"
+msgstr "%s 시그널이 감지되어 하위 프로세스가 종료되었음"
+
+#: ../../common/wait_error.c:77
+#, c-format
+msgid "child process was terminated by signal %d"
+msgstr "하위 프로세스가 종료되었음, 시그널 %d"
+
+#: ../../common/wait_error.c:82
+#, c-format
+msgid "child process exited with unrecognized status %d"
+msgstr "하위 프로세스가 종료되었음, 알수 없는 상태 %d"
+
+#: ../../port/dirmod.c:219
+#, c-format
+msgid "could not set junction for \"%s\": %s\n"
+msgstr "\"%s\" 파일의 연결을 설정할 수 없음: %s\n"
+
+#: ../../port/dirmod.c:294
+#, c-format
+msgid "could not get junction for \"%s\": %s\n"
+msgstr "\"%s\" 파일의 정션을 구할 수 없음: %s\n"
+
+#: initdb.c:340
+#, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: 메모리 부족\n"
+
+#: initdb.c:450 initdb.c:1620
+#, c-format
+msgid "%s: could not open file \"%s\" for reading: %s\n"
+msgstr "%s: \"%s\" 파일 읽기 모드로 열기 실패: %s\n"
+
+#: initdb.c:506 initdb.c:1016 initdb.c:1044
+#, c-format
+msgid "%s: could not open file \"%s\" for writing: %s\n"
+msgstr "%s: \"%s\" 파일을 쓰기 모드로 열기 실패: %s\n"
+
+#: initdb.c:514 initdb.c:522 initdb.c:1023 initdb.c:1050
+#, c-format
+msgid "%s: could not write file \"%s\": %s\n"
+msgstr "%s: \"%s\" 파일 쓰기 실패: %s\n"
+
+#: initdb.c:553
+#, c-format
+msgid "%s: could not open directory \"%s\": %s\n"
+msgstr "%s: \"%s\" 디렉터리 열 수 없음: %s\n"
+
+#: initdb.c:577 initdb.c:2424
+#, c-format
+msgid "%s: could not stat file \"%s\": %s\n"
+msgstr "%s: \"%s\" 파일의 상태를 알 수 없음: %s\n"
+
+#: initdb.c:589
+#, c-format
+msgid "%s: could not read directory \"%s\": %s\n"
+msgstr "%s: \"%s\" 디렉터리를 읽을 수 없음: %s\n"
+
+#: initdb.c:622 initdb.c:681
+#, c-format
+msgid "%s: could not open file \"%s\": %s\n"
+msgstr "%s: \"%s\" 파일 열 수 없음: %s\n"
+
+#: initdb.c:693
+#, c-format
+msgid "%s: could not fsync file \"%s\": %s\n"
+msgstr "%s: \"%s\" 파일에 대한 fsync 작업을 할 수 없음: %s\n"
+
+#: initdb.c:712
+#, c-format
+msgid "%s: could not execute command \"%s\": %s\n"
+msgstr "%s: \"%s\" 명령을 실행할 수 없음: %s\n"
+
+#: initdb.c:728
+#, c-format
+msgid "%s: removing data directory \"%s\"\n"
+msgstr "%s: \"%s\" 데이터 디렉터리를 지우고 있습니다.\n"
+
+#: initdb.c:731
+#, c-format
+msgid "%s: failed to remove data directory\n"
+msgstr "%s: 데이터 디렉터리를 지우는데 실패했습니다\n"
+
+#: initdb.c:737
+#, c-format
+msgid "%s: removing contents of data directory \"%s\"\n"
+msgstr "%s: \"%s\" 데이터 디렉터리 안의 내용을 지우고 있습니다.\n"
+
+#: initdb.c:740
+#, c-format
+msgid "%s: failed to remove contents of data directory\n"
+msgstr "%s: 데이터 디렉터리 내용을 지우는데 실패했습니다\n"
+
+#: initdb.c:746
+#, c-format
+msgid "%s: removing transaction log directory \"%s\"\n"
+msgstr "%s: \"%s\" 트랜잭션 로그 디렉터리를 지우고 있습니다.\n"
+
+#: initdb.c:749
+#, c-format
+msgid "%s: failed to remove transaction log directory\n"
+msgstr "%s: 트랜잭션 로그 디렉터리를 지우는데 실패했습니다\n"
+
+#: initdb.c:755
+#, c-format
+msgid "%s: removing contents of transaction log directory \"%s\"\n"
+msgstr "%s: \"%s\" 트랜잭션 로그 디렉터리 안의 내용을 지우고 있습니다.\n"
+
+#: initdb.c:758
+#, c-format
+msgid "%s: failed to remove contents of transaction log directory\n"
+msgstr "%s: 트랜잭션 로그 디렉터리 내용을 지우는데 실패했습니다\n"
+
+#: initdb.c:767
+#, c-format
+msgid "%s: data directory \"%s\" not removed at user's request\n"
+msgstr "%s: \"%s\" 데이터 디렉터리가 사용자의 요청으로 삭제되지 않았습니다.\n"
+
+#: initdb.c:772
+#, c-format
+msgid "%s: transaction log directory \"%s\" not removed at user's request\n"
+msgstr ""
+"%s: \"%s\" 트랜잭션 로그 디렉터리가 사용자의 요청으로 삭제되지 않았습니다.\n"
+
+#: initdb.c:793
+#, 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:829
+#, c-format
+msgid "%s: \"%s\" is not a valid server encoding name\n"
+msgstr "%s: \"%s\" 인코딩은 서버 인코딩 이름을 사용할 수 없습니다.\n"
+
+#: initdb.c:943 initdb.c:3217
+#, c-format
+msgid "%s: could not create directory \"%s\": %s\n"
+msgstr "%s: \"%s\" 디렉터리 만들 수 없음: %s\n"
+
+#: initdb.c:972
+#, c-format
+msgid "%s: file \"%s\" does not exist\n"
+msgstr "%s: \"%s\" 파일이 없음\n"
+
+#: initdb.c:974 initdb.c:983 initdb.c:993
+#, 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:980
+#, c-format
+msgid "%s: could not access file \"%s\": %s\n"
+msgstr "%s: \"%s\" 파일에 액세스할 수 없음: %s\n"
+
+#: initdb.c:991
+#, c-format
+msgid "%s: file \"%s\" is not a regular file\n"
+msgstr "%s: \"%s\" 파일은 일반 파일이 아님\n"
+
+#: initdb.c:1136
+#, c-format
+msgid "selecting default max_connections ... "
+msgstr "max_connections 초기값을 선택하는 중 ..."
+
+#: initdb.c:1166
+#, c-format
+msgid "selecting default shared_buffers ... "
+msgstr "기본 shared_buffers를 선택하는 중... "
+
+#: initdb.c:1199
+#, c-format
+msgid "selecting dynamic shared memory implementation ... "
+msgstr ""
+
+#: initdb.c:1217
+msgid "creating configuration files ... "
+msgstr "환경설정 파일을 만드는 중 ..."
+
+#: initdb.c:1314 initdb.c:1334 initdb.c:1418 initdb.c:1434
+#, c-format
+msgid "%s: could not change permissions of \"%s\": %s\n"
+msgstr "%s: \"%s\" 접근 권한을 바꿀 수 없음: %s\n"
+
+#: initdb.c:1458
+#, c-format
+msgid "creating template1 database in %s/base/1 ... "
+msgstr "%s/base/1 안에 template1 데이터베이스를 만드는 중 ..."
+
+#: initdb.c:1474
+#, 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:1561
+msgid "initializing pg_authid ... "
+msgstr "pg_authid 초기화 중 ..."
+
+#: initdb.c:1595
+msgid "Enter new superuser password: "
+msgstr "새 superuser 암호를 입력하십시오:"
+
+#: initdb.c:1596
+msgid "Enter it again: "
+msgstr "암호 확인:"
+
+#: initdb.c:1599
+#, c-format
+msgid "Passwords didn't match.\n"
+msgstr "암호가 서로 틀립니다.\n"
+
+#: initdb.c:1627
+#, c-format
+msgid "%s: could not read password from file \"%s\": %s\n"
+msgstr "%s: file \"%s\" 파일에서 암호를 읽을 수 없습니다: %s\n"
+
+#: initdb.c:1630
+#, c-format
+msgid "%s: password file \"%s\" is empty\n"
+msgstr "%s: \"%s\" 패스워드 파일이 비어있음\n"
+
+#: initdb.c:1643
+#, c-format
+msgid "setting password ... "
+msgstr "암호 설정 중 ..."
+
+#: initdb.c:1743
+msgid "initializing dependencies ... "
+msgstr "의존성 정보 초기화 중 ..."
+
+#: initdb.c:1771
+msgid "creating system views ... "
+msgstr "시스템 뷰들을 만드는 중 ... "
+
+#: initdb.c:1807
+msgid "loading system objects' descriptions ... "
+msgstr "시스템 개체들 설명 자료 입력 중 ..."
+
+#: initdb.c:1913
+msgid "creating collations ... "
+msgstr "collation 만드는 중 ... "
+
+#: initdb.c:1946
+#, c-format
+msgid "%s: locale name too long, skipped: \"%s\"\n"
+msgstr "%s: 로케일 이름이 너무 길어 무시함: \"%s\"\n"
+
+#: initdb.c:1971
+#, c-format
+msgid "%s: locale name has non-ASCII characters, skipped: \"%s\"\n"
+msgstr "%s: 로케일 이름이 ASCII 문자로 되어있지 않아 무시함: \"%s\"\n"
+
+#: initdb.c:2040
+#, c-format
+msgid "No usable system locales were found.\n"
+msgstr "사용 가능한 시스템 로케일이 없음.\n"
+
+#: initdb.c:2041
+#, c-format
+msgid "Use the option \"--debug\" to see details.\n"
+msgstr ""
+
+#: initdb.c:2044
+#, c-format
+msgid "not supported on this platform\n"
+msgstr "이 플랫폼에서 지원되지 않음\n"
+
+#: initdb.c:2059
+msgid "creating conversions ... "
+msgstr "인코딩 변환규칙(conversion)들을 만드는 중 ..."
+
+#: initdb.c:2094
+msgid "creating dictionaries ... "
+msgstr "사전을 만드는 중... "
+
+#: initdb.c:2148
+msgid "setting privileges on built-in objects ... "
+msgstr "내장개체들의 액세스 권한을 설정 중 ... "
+
+#: initdb.c:2206
+msgid "creating information schema ... "
+msgstr "information schema 만드는 중 ..."
+
+#: initdb.c:2262
+msgid "loading PL/pgSQL server-side language ... "
+msgstr "서버측 언어인 PL/pgSqL 불러오는 중 ... "
+
+#: initdb.c:2287
+msgid "vacuuming database template1 ... "
+msgstr "template1 데이터베이스 청소 중 ..."
+
+#: initdb.c:2340
+msgid "copying template1 to template0 ... "
+msgstr "template1 데이터베이스를 template0 데이터베이스로 복사 중 ..."
+
+#: initdb.c:2372
+msgid "copying template1 to postgres ... "
+msgstr "template1 데이터베이스를 postgres 데이터베이스로 복사 중 ..."
+
+#: initdb.c:2407
+msgid "syncing data to disk ... "
+msgstr ""
+
+#: initdb.c:2501
+#, c-format
+msgid "caught signal\n"
+msgstr "시스템의 간섭 신호(signal) 받았음\n"
+
+#: initdb.c:2507
+#, c-format
+msgid "could not write to child process: %s\n"
+msgstr "하위 프로세스에 쓸 수 없음: %s\n"
+
+#: initdb.c:2515
+#, c-format
+msgid "ok\n"
+msgstr "완료\n"
+
+# # search5 끝
+# # advance 부분
+#: initdb.c:2605
+#, c-format
+msgid "%s: setlocale() failed\n"
+msgstr "%s: setlocale() 실패\n"
+
+#: initdb.c:2623
+#, c-format
+msgid "%s: failed to restore old locale \"%s\"\n"
+msgstr "%s: \"%s\" 옛 로케일로 복원하지 못했음\n"
+
+#: initdb.c:2633
+#, c-format
+msgid "%s: invalid locale name \"%s\"\n"
+msgstr "%s: 잘못된 로캘 이름 \"%s\"\n"
+
+#: initdb.c:2645
+#, c-format
+msgid ""
+"%s: invalid locale settings; check LANG and LC_* environment variables\n"
+msgstr ""
+
+#: initdb.c:2673
+#, c-format
+msgid "%s: encoding mismatch\n"
+msgstr "%s: 인코딩 불일치\n"
+
+#: initdb.c:2675
+#, 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:2747
+#, c-format
+msgid ""
+"%s initializes a PostgreSQL database cluster.\n"
+"\n"
+msgstr ""
+"%s PostgreSQL 데이터베이스 클러스터를 초기화 하는 프로그램.\n"
+"\n"
+
+#: initdb.c:2748
+#, c-format
+msgid "Usage:\n"
+msgstr "사용법:\n"
+
+#: initdb.c:2749
+#, c-format
+msgid "  %s [OPTION]... [DATADIR]\n"
+msgstr "  %s [옵션]... [DATADIR]\n"
+
+#: initdb.c:2750
+#, c-format
+msgid ""
+"\n"
+"Options:\n"
+msgstr ""
+"\n"
+"옵션들:\n"
+
+#: initdb.c:2751
+#, c-format
+msgid ""
+"  -A, --auth=METHOD         default authentication method for local "
+"connections\n"
+msgstr "  -A, --auth=METHOD         로컬 연결의 기본 인증 방법\n"
+
+#: initdb.c:2752
+#, c-format
+msgid ""
+"      --auth-host=METHOD    default authentication method for local TCP/IP "
+"connections\n"
+msgstr ""
+"      --auth-host=METHOD    local TCP/IP 연결에 대한 기본 인증 방법\n"
+
+#: initdb.c:2753
+#, c-format
+msgid ""
+"      --auth-local=METHOD   default authentication method for local-socket "
+"connections\n"
+msgstr ""
+"      --auth-local=METHOD   local-socket 연결에 대한 기본 인증 방법\n"
+
+#: initdb.c:2754
+#, c-format
+msgid " [-D, --pgdata=]DATADIR     location for this database cluster\n"
+msgstr " [-D, --pgdata=]DATADIR     새 데이터베이스 클러스터를 만들 디렉터리\n"
+
+#: initdb.c:2755
+#, c-format
+msgid "  -E, --encoding=ENCODING   set default encoding for new databases\n"
+msgstr "  -E, --encoding=ENCODING   새 데이터베이스의 기본 인코딩\n"
+
+#: initdb.c:2756
+#, c-format
+msgid "      --locale=LOCALE       set default locale for new databases\n"
+msgstr "      --locale=LOCALE       새 데이터베이스의 기본 로캘 설정\n"
+
+#: initdb.c:2757
+#, 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:2761
+#, c-format
+msgid "      --no-locale           equivalent to --locale=C\n"
+msgstr "      --no-locale           -locale=C와 같음\n"
+
+#: initdb.c:2762
+#, c-format
+msgid ""
+"      --pwfile=FILE         read password for the new superuser from file\n"
+msgstr "      --pwfile=FILE         파일에서 새 superuser의 암호 읽기\n"
+
+#: initdb.c:2763
+#, c-format
+msgid ""
+"  -T, --text-search-config=CFG\n"
+"                            default text search configuration\n"
+msgstr ""
+"  -T, --text-search-config=CFG\n"
+"                            기본 텍스트 검색 구성\n"
+
+#: initdb.c:2765
+#, c-format
+msgid "  -U, --username=NAME       database superuser name\n"
+msgstr "  -U, --username=NAME       데이터베이스 superuser 이름\n"
+
+#: initdb.c:2766
+#, c-format
+msgid ""
+"  -W, --pwprompt            prompt for a password for the new superuser\n"
+msgstr "  -W, --pwprompt            새 superuser 암호를 입력 받음\n"
+
+#: initdb.c:2767
+#, c-format
+msgid ""
+"  -X, --xlogdir=XLOGDIR     location for the transaction log directory\n"
+msgstr "  -X, --xlogdir=XLOGDIR     트랜잭션 로그 디렉터리 위치\n"
+
+#: initdb.c:2768
+#, c-format
+msgid ""
+"\n"
+"Less commonly used options:\n"
+msgstr ""
+"\n"
+"덜 일반적으로 사용되는 옵션들:\n"
+
+#: initdb.c:2769
+#, c-format
+msgid "  -d, --debug               generate lots of debugging output\n"
+msgstr "  -d, --debug               디버깅에 필요한 정보들도 함께 출력함\n"
+
+#: initdb.c:2770
+#, c-format
+msgid "  -k, --data-checksums      use data page checksums\n"
+msgstr ""
+
+#: initdb.c:2771
+#, c-format
+msgid "  -L DIRECTORY              where to find the input files\n"
+msgstr "  -L DIRECTORY              입력파일들이 있는 디렉터리\n"
+
+#: initdb.c:2772
+#, c-format
+msgid "  -n, --noclean             do not clean up after errors\n"
+msgstr "  -n, --noclean             오류가 발생되었을 경우 그대로 둠\n"
+
+#: initdb.c:2773
+#, c-format
+msgid ""
+"  -N, --nosync              do not wait for changes to be written safely to "
+"disk\n"
+msgstr ""
+"  -N, --nosync              작업 완료 뒤 디스크 동기화 작업을 하지 않음\n"
+
+#: initdb.c:2774
+#, c-format
+msgid "  -s, --show                show internal settings\n"
+msgstr "  -s, --show                내부 설정값들을 보여줌\n"
+
+#: initdb.c:2775
+#, c-format
+msgid "  -S, --sync-only           only sync data directory\n"
+msgstr "  -S, --sync-only           데이터 디렉터리만 동기화\n"
+
+#: initdb.c:2776
+#, c-format
+msgid ""
+"\n"
+"Other options:\n"
+msgstr ""
+"\n"
+"기타 옵션:\n"
+
+#: initdb.c:2777
+#, c-format
+msgid "  -V, --version             output version information, then exit\n"
+msgstr "  -V, --version             버전 정보를 보여주고 마침\n"
+
+#: initdb.c:2778
+#, c-format
+msgid "  -?, --help                show this help, then exit\n"
+msgstr "  -?, --help                이 도움말을 보여주고 마침\n"
+
+#: initdb.c:2779
+#, 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:2781
+#, c-format
+msgid ""
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr ""
+"\n"
+"오류보고: <pgsql-bugs@postgresql.org>.\n"
+
+#: initdb.c:2789
+msgid ""
+"\n"
+"WARNING: enabling \"trust\" authentication for local connections\n"
+"You can change this by editing pg_hba.conf or using the option -A, or\n"
+"--auth-local and --auth-host, the next time you run initdb.\n"
+msgstr ""
+"\n"
+"경고: 로컬 연결의 인증 방법으로 \"trust\" 방식을 지정했습니다.\n"
+"이 값을 바꾸려면, pg_hba.conf 파일을 수정하든지,\n"
+"다음번 initdb 명령을 사용할 때, -A 옵션 또는 --auth-local,\n"
+"--auth-host 옵션을 사용해서 인증 방법을 지정할 수 있습니다.\n"
+
+#: initdb.c:2811
+#, c-format
+msgid "%s: invalid authentication method \"%s\" for \"%s\" connections\n"
+msgstr "%s: \"%s\" 인증 방법은 \"%s\" 연결에서는 사용할 수 없습니다.\n"
+
+#: initdb.c:2825
+#, c-format
+msgid ""
+"%s: must specify a password for the superuser to enable %s authentication\n"
+msgstr ""
+"%s: %s 인증방식을 사용하려면, 반드시 superuser의 암호를 지정해야합니다.\n"
+
+#: initdb.c:2852
+#, 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:2890
+#, 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:2897
+#, 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:2916
+#, c-format
+msgid "%s: input file location must be an absolute path\n"
+msgstr "%s: 입력 파일 위치는 반드시 절대경로여야합니다.\n"
+
+#: initdb.c:2935
+#, c-format
+msgid "The database cluster will be initialized with locale \"%s\".\n"
+msgstr "데이터베이스 클러스터는 \"%s\" 로케일으로 초기화될 것입니다.\n"
+
+#: initdb.c:2938
+#, 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:2962
+#, c-format
+msgid "%s: could not find suitable encoding for locale \"%s\"\n"
+msgstr "%s: \"%s\" 로캘에 알맞은 인코딩을 찾을 수 없음\n"
+
+#: initdb.c:2964
+#, c-format
+msgid "Rerun %s with the -E option.\n"
+msgstr "-E 옵션으로 %s 지정해 주십시오.\n"
+
+#: initdb.c:2965 initdb.c:3541 initdb.c:3562
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "보다 자세한 정보를 보려면 \"%s --help\" 옵션을 사용하십시오.\n"
+
+#: initdb.c:2977
+#, 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:2985
+#, c-format
+msgid "%s: locale \"%s\" requires unsupported encoding \"%s\"\n"
+msgstr "%s: \"%s\" 로케일은 지원하지 않는 \"%s\" 인코딩을 필요로 함\n"
+
+#: initdb.c:2988
+#, 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:2997
+#, c-format
+msgid "The default database encoding has accordingly been set to \"%s\".\n"
+msgstr "기본 데이터베이스 인코딩은 \"%s\" 인코딩으로 설정되었습니다.\n"
+
+#: initdb.c:3068
+#, c-format
+msgid ""
+"%s: could not find suitable text search configuration for locale \"%s\"\n"
+msgstr "%s: \"%s\" 로케일에 알맞은 전문검색 설정을 찾을 수 없음\n"
+
+#: initdb.c:3079
+#, c-format
+msgid ""
+"%s: warning: suitable text search configuration for locale \"%s\" is "
+"unknown\n"
+msgstr "%s: 경고: \"%s\" 로캘에 알맞은 전문검색 설정을 알 수 없음\n"
+
+#: initdb.c:3084
+#, c-format
+msgid ""
+"%s: warning: specified text search configuration \"%s\" might not match "
+"locale \"%s\"\n"
+msgstr ""
+"%s: 경고: 지정한 \"%s\" 전문검색 설정은 \"%s\" 로케일과 일치하지 않음\n"
+
+#: initdb.c:3089
+#, c-format
+msgid "The default text search configuration will be set to \"%s\".\n"
+msgstr "기본 텍스트 검색 구성이 \"%s\"(으)로 설정됩니다.\n"
+
+#: initdb.c:3133 initdb.c:3211
+#, c-format
+msgid "creating directory %s ... "
+msgstr "%s 디렉터리 만드는 중 ..."
+
+#: initdb.c:3147 initdb.c:3229
+#, c-format
+msgid "fixing permissions on existing directory %s ... "
+msgstr "이미 있는 %s 디렉터리의 액세스 권한을 고치는 중 ..."
+
+#: initdb.c:3153 initdb.c:3235
+#, c-format
+msgid "%s: could not change permissions of directory \"%s\": %s\n"
+msgstr "%s: \"%s\" 디렉터리의 액세스 권한을 바꿀 수 없습니다: %s\n"
+
+#: initdb.c:3168 initdb.c:3250
+#, c-format
+msgid "%s: directory \"%s\" exists but is not empty\n"
+msgstr "%s: \"%s\" 디렉터리가 있지만 비어 있지 않음\n"
+
+#: initdb.c:3174
+#, 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:3182 initdb.c:3263 initdb.c:3575
+#, c-format
+msgid "%s: could not access directory \"%s\": %s\n"
+msgstr "%s: \"%s\" 디렉터리에 액세스할 수 없음: %s\n"
+
+#: initdb.c:3202
+#, c-format
+msgid "%s: transaction log directory location must be an absolute path\n"
+msgstr "%s: 트랜잭션 로그 디렉터리 위치는 절대 경로여야 함\n"
+
+#: initdb.c:3256
+#, 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:3274
+#, c-format
+msgid "%s: could not create symbolic link \"%s\": %s\n"
+msgstr "%s: \"%s\" 심벌릭 링크를 만들 수 없음: %s\n"
+
+#: initdb.c:3279
+#, c-format
+msgid "%s: symlinks are not supported on this platform"
+msgstr "%s: 이 플랫폼에서는 심볼 링크가 지원되지 않음"
+
+#: initdb.c:3292
+#, c-format
+msgid ""
+"It contains a dot-prefixed/invisible file, perhaps due to it being a mount "
+"point.\n"
+msgstr ""
+
+#: initdb.c:3295
+#, c-format
+msgid ""
+"It contains a lost+found directory, perhaps due to it being a mount point.\n"
+msgstr ""
+
+#: initdb.c:3298
+#, c-format
+msgid ""
+"Using a mount point directly as the data directory is not recommended.\n"
+"Create a subdirectory under the mount point.\n"
+msgstr ""
+
+#: initdb.c:3317
+#, c-format
+msgid "creating subdirectories ... "
+msgstr "하위 디렉터리 만드는 중 ..."
+
+#: initdb.c:3485
+#, c-format
+msgid "Running in debug mode.\n"
+msgstr "디버그 모드로 실행 중.\n"
+
+#: initdb.c:3489
+#, c-format
+msgid "Running in noclean mode.  Mistakes will not be cleaned up.\n"
+msgstr "지저분 모드로 실행 중.  오류가 발생되어도 뒷정리를 안합니다.\n"
+
+#: initdb.c:3560
+#, c-format
+msgid "%s: too many command-line arguments (first is \"%s\")\n"
+msgstr "%s: 너무 많은 명령행 인수를 지정했습니다. (처음 \"%s\")\n"
+
+#: initdb.c:3586
+#, c-format
+msgid "%s: password prompt and password file cannot be specified together\n"
+msgstr ""
+"%s: 암호를 입력받는 옵션과 암호를 파일에서 가져오는 옵션은 동시에 사용될 수 "
+"없습니다\n"
+
+#: initdb.c:3608
+#, 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:3624
+#, c-format
+msgid "Data page checksums are enabled.\n"
+msgstr ""
+
+#: initdb.c:3626
+#, c-format
+msgid "Data page checksums are disabled.\n"
+msgstr ""
+
+#: initdb.c:3635
+#, c-format
+msgid ""
+"\n"
+"Sync to disk skipped.\n"
+"The data directory might become corrupt if the operating system crashes.\n"
+msgstr ""
+
+#: initdb.c:3644
+#, c-format
+msgid ""
+"\n"
+"Success. You can now start the database server using:\n"
+"\n"
+"    %s%s%spg_ctl%s -D %s%s%s -l logfile start\n"
+"\n"
+msgstr ""
+"\n"
+"작업완료. 이제 다음 명령을 이용해서 서버를 가동 할 수 있습니다:\n"
+"\n"
+"    %s%s%spg_ctl%s -D %s%s%s -l 로그파일 start\n"
+"\n"
diff --git a/src/bin/initdb/po/pl.po b/src/bin/initdb/po/pl.po
index da697422a8..3e3c6341bc 100644
--- a/src/bin/initdb/po/pl.po
+++ b/src/bin/initdb/po/pl.po
@@ -2,13 +2,13 @@
 # Copyright (c) 2005 toczek, xxxtoczekxxx@wp.pl
 # Distributed under the same licensing terms as PostgreSQL itself.
 # Begina Felicysym <begina.felicysym@wp.eu>, 2011, 2012, 2013.
-# grzegorz <begina.felicysym@wp.eu>, 2014.
+# grzegorz <begina.felicysym@wp.eu>, 2014, 2015, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: initdb (PostgreSQL 9.1)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2014-11-10 20:42+0000\n"
-"PO-Revision-Date: 2014-11-10 23:24+0200\n"
+"POT-Creation-Date: 2016-07-03 03:14+0000\n"
+"PO-Revision-Date: 2016-07-03 17:28+0200\n"
 "Last-Translator: grzegorz <begina.felicysym@wp.eu>\n"
 "Language-Team: begina.felicysym@wp.eu\n"
 "Language: pl\n"
@@ -54,13 +54,13 @@ msgstr "nie można odczytać odwołania symbolicznego  \"%s\""
 msgid "pclose failed: %s"
 msgstr "pclose nie powiodło się: %s"
 
-#: ../../common/fe_memutils.c:33 ../../common/fe_memutils.c:60
-#: ../../common/fe_memutils.c:83
+#: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
+#: ../../common/fe_memutils.c:98
 #, c-format
 msgid "out of memory\n"
 msgstr "brak pamięci\n"
 
-#: ../../common/fe_memutils.c:77
+#: ../../common/fe_memutils.c:92
 #, c-format
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "nie można powielić pustego wskazania (błąd wewnętrzny)\n"
@@ -80,6 +80,41 @@ msgstr "nie można czytać katalogu \"%s\": %s\n"
 msgid "could not close directory \"%s\": %s\n"
 msgstr "nie można zamknąć katalogu \"%s\": %s\n"
 
+#: ../../common/restricted_token.c:68
+#, c-format
+msgid "%s: WARNING: cannot create restricted tokens on this platform\n"
+msgstr "%s: OSTRZEŻENIE: nie można tworzyć ograniczonych tokenów na tej platformie\n"
+
+#: ../../common/restricted_token.c:77
+#, c-format
+msgid "%s: could not open process token: error code %lu\n"
+msgstr "%s: nie można otworzyć tokenu procesu: kod błędu %lu\n"
+
+#: ../../common/restricted_token.c:90
+#, c-format
+msgid "%s: could not allocate SIDs: error code %lu\n"
+msgstr "%s: nie udało się przydzielić SIDów: kod błędu %lu\n"
+
+#: ../../common/restricted_token.c:110
+#, c-format
+msgid "%s: could not create restricted token: error code %lu\n"
+msgstr "%s: nie udało się utworzyć ograniczonego tokena: kod błędu %lu\n"
+
+#: ../../common/restricted_token.c:132
+#, c-format
+msgid "%s: could not start process for command \"%s\": error code %lu\n"
+msgstr "%s: nie udało się uruchomić procesu dla polecenia \"%s\": kod błędu %lu\n"
+
+#: ../../common/restricted_token.c:170
+#, c-format
+msgid "%s: could not re-execute with restricted token: error code %lu\n"
+msgstr "%s: nie udało się ponownie wykonać ograniczonego tokena: %lu\n"
+
+#: ../../common/restricted_token.c:186
+#, c-format
+msgid "%s: could not get exit code from subprocess: error code %lu\n"
+msgstr "%s: nie udało uzyskać kodu wyjścia z usługi podrzędnej: kod błędu %lu\n"
+
 #: ../../common/rmtree.c:77
 #, c-format
 msgid "could not stat file or directory \"%s\": %s\n"
@@ -92,19 +127,17 @@ msgstr "nie można usunąć pliku lub katalogu \"%s\": %s\n"
 
 #: ../../common/username.c:45
 #, c-format
-#| msgid "could not load private key file \"%s\": %s"
 msgid "could not look up effective user ID %ld: %s"
 msgstr "nie udało się odnaleźć efektywnego ID użytkownika %ld: %s"
 
 #: ../../common/username.c:47
-#| msgid "server \"%s\" does not exist"
 msgid "user does not exist"
 msgstr "użytkownik nie istnieje"
 
-#: ../../common/username.c:61
+#: ../../common/username.c:62
 #, c-format
-msgid "user name lookup failure: %s"
-msgstr "niepowodzenie wyszukiwania nazwy użytkownika: %s"
+msgid "user name lookup failure: error code %lu"
+msgstr "niepowodzenie wyszukiwania nazwy użytkownika: kod błędu %lu"
 
 #: ../../common/wait_error.c:47
 #, c-format
@@ -141,122 +174,117 @@ msgstr "proces potomny został zatrzymany przez sygnał %d"
 msgid "child process exited with unrecognized status %d"
 msgstr "proces potomny zakończył działanie z nieznanym stanem %d"
 
-#: ../../port/dirmod.c:219
+#: ../../port/dirmod.c:221
 #, c-format
 msgid "could not set junction for \"%s\": %s\n"
 msgstr "nie można ustanowić złączenia dla \"%s\": %s\n"
 
-#: ../../port/dirmod.c:294
+#: ../../port/dirmod.c:298
 #, c-format
 msgid "could not get junction for \"%s\": %s\n"
 msgstr "nie można pobrać złączenia dla \"%s\": %s\n"
 
-#: initdb.c:335
+#: initdb.c:349
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: brak pamięci\n"
 
-#: initdb.c:445 initdb.c:1602
+#: initdb.c:459 initdb.c:1589
 #, c-format
 msgid "%s: could not open file \"%s\" for reading: %s\n"
 msgstr "%s: nie można otworzyć pliku \"%s\" do odczytu: %s\n"
 
-#: initdb.c:501 initdb.c:1004 initdb.c:1032
+#: initdb.c:515 initdb.c:1002 initdb.c:1030
 #, c-format
 msgid "%s: could not open file \"%s\" for writing: %s\n"
 msgstr "%s: nie można otworzyć pliku \"%s\" do zapisu: %s\n"
 
-#: initdb.c:509 initdb.c:517 initdb.c:1011 initdb.c:1038
+#: initdb.c:523 initdb.c:531 initdb.c:1009 initdb.c:1036
 #, c-format
 msgid "%s: could not write file \"%s\": %s\n"
 msgstr "%s: nie można zapisać pliku \"%s\": %s\n"
 
-#: initdb.c:539
+#: initdb.c:562
 #, c-format
 msgid "%s: could not open directory \"%s\": %s\n"
 msgstr "%s: nie można otworzyć katalogu \"%s\": %s\n"
 
-#: initdb.c:556
+#: initdb.c:586 initdb.c:2336
 #, c-format
 msgid "%s: could not stat file \"%s\": %s\n"
 msgstr "%s: nie można wykonać stat na pliku \"%s\": %s\n"
 
-#: initdb.c:569
+#: initdb.c:598
 #, c-format
 msgid "%s: could not read directory \"%s\": %s\n"
 msgstr "%s: nie można odczytać katalogu \"%s\": %s\n"
 
-#: initdb.c:576
-#, c-format
-msgid "%s: could not close directory \"%s\": %s\n"
-msgstr "%s: nie można zamknąć katalogu \"%s\": %s\n"
-
-#: initdb.c:611 initdb.c:663
+#: initdb.c:631 initdb.c:690
 #, c-format
 msgid "%s: could not open file \"%s\": %s\n"
 msgstr "%s: nie można otworzyć pliku \"%s\": %s\n"
 
-#: initdb.c:679
+#: initdb.c:702
 #, c-format
 msgid "%s: could not fsync file \"%s\": %s\n"
 msgstr "%s: nie można wykonać fsync na pliku \"%s\": %s\n"
 
-#: initdb.c:700
+#: initdb.c:721
 #, c-format
 msgid "%s: could not execute command \"%s\": %s\n"
 msgstr "%s: nie można wykonać komendy \"%s\": %s\n"
 
-#: initdb.c:716
+#: initdb.c:737
 #, c-format
 msgid "%s: removing data directory \"%s\"\n"
 msgstr "%s: usuwanie katalogu danych \"%s\"\n"
 
-#: initdb.c:719
+#: initdb.c:740
 #, c-format
 msgid "%s: failed to remove data directory\n"
 msgstr "%s: nie udało się usunięcie katalogu danych\n"
 
-#: initdb.c:725
+#: initdb.c:746
 #, c-format
 msgid "%s: removing contents of data directory \"%s\"\n"
 msgstr "%s: usuwanie zawartości w katalogu danych \"%s\"\n"
 
-#: initdb.c:728
+#: initdb.c:749
 #, c-format
 msgid "%s: failed to remove contents of data directory\n"
 msgstr "%s: nie udało się usunąć zawartości w katalogu danych\n"
 
-#: initdb.c:734
+#: initdb.c:755
 #, c-format
 msgid "%s: removing transaction log directory \"%s\"\n"
 msgstr "%s: usuwanie katalogu dziennika transakcji \"%s\"\n"
 
-#: initdb.c:737
+#: initdb.c:758
 #, c-format
 msgid "%s: failed to remove transaction log directory\n"
 msgstr "%s: nie udało się usunięcie katalogu dziennika transakcji\n"
 
-#: initdb.c:743
+#: initdb.c:764
 #, c-format
 msgid "%s: removing contents of transaction log directory \"%s\"\n"
 msgstr "%s: usuwanie zawartości katalogu dziennika transakcji \"%s\"\n"
 
-#: initdb.c:746
+#: initdb.c:767
 #, c-format
 msgid "%s: failed to remove contents of transaction log directory\n"
 msgstr "%s: nie udało się usunąć zawartości w katalogu dziennika transakcji\n"
 
-#: initdb.c:755
+#: initdb.c:776
 #, c-format
 msgid "%s: data directory \"%s\" not removed at user's request\n"
 msgstr "%s: katalog \"%s\" nie został usunięty na żądanie użytkownika\n"
 
-#: initdb.c:760
+#: initdb.c:781
 #, c-format
 msgid "%s: transaction log directory \"%s\" not removed at user's request\n"
 msgstr "%s: katalog \"%s\" nie został usunięty na żądanie użytkownika\n"
 
-#: initdb.c:781
+#: initdb.c:802
 #, c-format
 msgid ""
 "%s: cannot be run as root\n"
@@ -267,22 +295,17 @@ msgstr ""
 "Proszę zalogować się (używając np: \"su\") na (nieuprzywilejowanego) użytkownika, który\n"
 "będzie właścicielem procesu.\n"
 
-#: initdb.c:817
+#: initdb.c:838
 #, c-format
 msgid "%s: \"%s\" is not a valid server encoding name\n"
 msgstr "%s: \"%s\" nie jest poprawną nazwą kodowania\n"
 
-#: initdb.c:931 initdb.c:3323
-#, c-format
-msgid "%s: could not create directory \"%s\": %s\n"
-msgstr "%s: nie można utworzyć katalogu \"%s\": %s\n"
-
-#: initdb.c:960
+#: initdb.c:958
 #, c-format
 msgid "%s: file \"%s\" does not exist\n"
 msgstr "%s: plik \"%s\" nie istnieje\n"
 
-#: initdb.c:962 initdb.c:971 initdb.c:981
+#: initdb.c:960 initdb.c:969 initdb.c:979
 #, c-format
 msgid ""
 "This might mean you have a corrupted installation or identified\n"
@@ -291,47 +314,46 @@ msgstr ""
 "Oznacza to iż posiadasz uszkodzoną instalację lub wskazałeś\n"
 "zły katalog przy użyciu opcji -L.\n"
 
-#: initdb.c:968
+#: initdb.c:966
 #, c-format
 msgid "%s: could not access file \"%s\": %s\n"
 msgstr "%s: nie można uzyskać dostępu do pliku \"%s\": %s\n"
 
-#: initdb.c:979
+#: initdb.c:977
 #, c-format
 msgid "%s: file \"%s\" is not a regular file\n"
 msgstr "%s: plik \"%s\" nie jest zwykłym plikiem\n"
 
-#: initdb.c:1124
+#: initdb.c:1122
 #, c-format
 msgid "selecting default max_connections ... "
 msgstr "wybieranie domyślnej wartości max_connections ... "
 
-#: initdb.c:1154
+#: initdb.c:1152
 #, c-format
 msgid "selecting default shared_buffers ... "
 msgstr "wybieranie domyślnej wartości shared_buffers ... "
 
-#: initdb.c:1187
+#: initdb.c:1185
 #, c-format
 msgid "selecting dynamic shared memory implementation ... "
 msgstr "wybór implementacji dynamicznej pamięci współdzielonej ... "
 
-#: initdb.c:1205
+#: initdb.c:1203
 msgid "creating configuration files ... "
 msgstr "tworzenie plików konfiguracyjnych ... "
 
-#: initdb.c:1296 initdb.c:1316 initdb.c:1400 initdb.c:1416
+#: initdb.c:1300 initdb.c:1320 initdb.c:1404 initdb.c:1420
 #, c-format
-#| msgid "%s: could not change permissions of directory \"%s\": %s\n"
 msgid "%s: could not change permissions of \"%s\": %s\n"
 msgstr "%s: nie można zmienić uprawnień do \"%s\": %s\n"
 
-#: initdb.c:1440
+#: initdb.c:1444
 #, c-format
-msgid "creating template1 database in %s/base/1 ... "
-msgstr "tworzenie bazy template1 w folderze %s/base/1 ... "
+msgid "running bootstrap script ... "
+msgstr "wykonywanie skryptu ładowania wstępnego ... "
 
-#: initdb.c:1456
+#: initdb.c:1460
 #, c-format
 msgid ""
 "%s: input file \"%s\" does not belong to PostgreSQL %s\n"
@@ -340,153 +362,94 @@ msgstr ""
 "%s: plik wejściowy \"%s\" nie należy do bazy danych PostgreSQL %s\n"
 "Sprawdź swoją instalację lub podaj poprawą ścieżkę przy pomocy zmiennej -L.\n"
 
-#: initdb.c:1543
-msgid "initializing pg_authid ... "
-msgstr "inicjowanie pg_authid ... "
-
-#: initdb.c:1577
+#: initdb.c:1564
 msgid "Enter new superuser password: "
 msgstr "Podaj hasło superużytkownika: "
 
-#: initdb.c:1578
+#: initdb.c:1565
 msgid "Enter it again: "
 msgstr "Powtórz podane hasło: "
 
-#: initdb.c:1581
+#: initdb.c:1568
 #, c-format
 msgid "Passwords didn't match.\n"
 msgstr "Podane hasła różnią się.\n"
 
-#: initdb.c:1608
+#: initdb.c:1596
 #, c-format
 msgid "%s: could not read password from file \"%s\": %s\n"
 msgstr "%s: nie można odczytać hasła z pliku \"%s\": %s\n"
 
-#: initdb.c:1621
+#: initdb.c:1599
 #, c-format
-msgid "setting password ... "
-msgstr "ustawianie hasła ... "
-
-#: initdb.c:1721
-msgid "initializing dependencies ... "
-msgstr "inicjowanie powiązań ... "
-
-#: initdb.c:1749
-msgid "creating system views ... "
-msgstr "tworzenie widoków systemowych ... "
+msgid "%s: password file \"%s\" is empty\n"
+msgstr "%s: plik hasła \"%s\" jest pusty\n"
 
-#: initdb.c:1785
-msgid "loading system objects' descriptions ... "
-msgstr "wczytywanie opisów obiektów systemowych ... "
-
-#: initdb.c:1891
-msgid "creating collations ... "
-msgstr "tworzenie porównań ... "
-
-#: initdb.c:1924
+#: initdb.c:1847
 #, c-format
 msgid "%s: locale name too long, skipped: \"%s\"\n"
 msgstr "%s: nazwa lokalizacji zbyt długa, pominięto: \"%s\"\n"
 
-#: initdb.c:1949
+#: initdb.c:1872
 #, c-format
 msgid "%s: locale name has non-ASCII characters, skipped: \"%s\"\n"
 msgstr "%s: nazwa lokalizacji zawiera znak spoza ASCII, pominięto: \"%s\"\n"
 
-#: initdb.c:2018
+#: initdb.c:1945
 #, c-format
 msgid "No usable system locales were found.\n"
 msgstr "Nie znaleziono lokalizacji systemowej nadającej się do wykorzystania.\n"
 
-#: initdb.c:2019
+#: initdb.c:1946
 #, c-format
 msgid "Use the option \"--debug\" to see details.\n"
 msgstr "Użyj opcji \"--debug\" by zobaczyć szczegóły.\n"
 
-#: initdb.c:2022
-#, c-format
-msgid "not supported on this platform\n"
-msgstr "nieobsługiwane na tej platformie\n"
-
-#: initdb.c:2037
-msgid "creating conversions ... "
-msgstr "tworzenie konwersji ... "
-
-#: initdb.c:2072
-msgid "creating dictionaries ... "
-msgstr "tworzenie słowników ... "
-
-#: initdb.c:2126
-msgid "setting privileges on built-in objects ... "
-msgstr "ustawianie uprawnień dla wbudowanych obiektów ... "
-
-#: initdb.c:2184
-msgid "creating information schema ... "
-msgstr "tworzenie schematu informacyjnego ... "
-
-#: initdb.c:2240
-msgid "loading PL/pgSQL server-side language ... "
-msgstr "pobieranie języka PL/pgSQL używanego po stronie serwera ... "
-
-#: initdb.c:2265
-msgid "vacuuming database template1 ... "
-msgstr "odkurzanie bazy template1 ... "
-
-#: initdb.c:2321
-msgid "copying template1 to template0 ... "
-msgstr "kopiowanie bazy template1 do bazy template0 ... "
-
-#: initdb.c:2353
-msgid "copying template1 to postgres ... "
-msgstr "kopiowanie bazy template1 do bazy postgres ... "
-
-#: initdb.c:2379
+#: initdb.c:2319
 msgid "syncing data to disk ... "
 msgstr "synchronizacja danych na dysk ... "
 
-#: initdb.c:2451
+#: initdb.c:2413
 #, c-format
 msgid "caught signal\n"
 msgstr "sygnał otrzymany\n"
 
-#: initdb.c:2457
+#: initdb.c:2419
 #, c-format
 msgid "could not write to child process: %s\n"
 msgstr "nie można zapisać do procesu potomnego: %s\n"
 
-#: initdb.c:2465
+#: initdb.c:2427
 #, c-format
 msgid "ok\n"
 msgstr "ok\n"
 
-#: initdb.c:2555
+#: initdb.c:2517
 #, c-format
-#| msgid "%s: select() failed: %s\n"
 msgid "%s: setlocale() failed\n"
 msgstr "%s: setlocale() nie powiodła się\n"
 
-#: initdb.c:2573
+#: initdb.c:2535
 #, c-format
 msgid "%s: failed to restore old locale \"%s\"\n"
 msgstr "%s: nie udało się odtworzyć poprzedniej lokalizacji \"%s\"\n"
 
-#: initdb.c:2583
+#: initdb.c:2545
 #, c-format
 msgid "%s: invalid locale name \"%s\"\n"
 msgstr "%s: błędna nazwa lokalizacji \"%s\"\n"
 
-#: initdb.c:2595
+#: initdb.c:2557
 #, c-format
 msgid "%s: invalid locale settings; check LANG and LC_* environment variables\n"
-msgstr "%s: nieprawidłowe ustawienia regionalne; sprawdź zmienne środowiskowe LANG i "
-"LC_*\n"
+msgstr "%s: nieprawidłowe ustawienia regionalne; sprawdź zmienne środowiskowe LANG i LC_*\n"
 
-#: initdb.c:2623
+#: initdb.c:2585
 #, c-format
 msgid "%s: encoding mismatch\n"
 msgstr "%s: niezgodność kodowania\n"
 
-#: initdb.c:2625
+#: initdb.c:2587
 #, c-format
 msgid ""
 "The encoding you selected (%s) and the encoding that the\n"
@@ -501,32 +464,7 @@ msgstr ""
 "Aby poprawić ten błąd uruchom ponownie %s i albo nie ustawiaj kodowania\n"
 "albo wybierz pasującą kombinację.\n"
 
-#: initdb.c:2730
-#, c-format
-msgid "%s: WARNING: cannot create restricted tokens on this platform\n"
-msgstr "%s: OSTRZEŻENIE nie można tworzyć ograniczonych tokenów na tej platformie\n"
-
-#: initdb.c:2739
-#, c-format
-msgid "%s: could not open process token: error code %lu\n"
-msgstr "%s: nie można otworzyć tokenu procesu: kod błędu %lu\n"
-
-#: initdb.c:2752
-#, c-format
-msgid "%s: could not to allocate SIDs: error code %lu\n"
-msgstr "%s: nie udało się przydzielić SIDów: kod błędu %lu\n"
-
-#: initdb.c:2771
-#, c-format
-msgid "%s: could not create restricted token: error code %lu\n"
-msgstr "%s: nie udało się utworzyć ograniczonego tokena: kod błędu %lu\n"
-
-#: initdb.c:2792
-#, c-format
-msgid "%s: could not start process for command \"%s\": error code %lu\n"
-msgstr "%s: nie udało się uruchomić procesu dla polecenia \"%s\": kod błędu %lu\n"
-
-#: initdb.c:2806
+#: initdb.c:2659
 #, c-format
 msgid ""
 "%s initializes a PostgreSQL database cluster.\n"
@@ -535,17 +473,17 @@ msgstr ""
 "%s inicjuje klaster bazy danych PostgreSQL.\n"
 "\n"
 
-#: initdb.c:2807
+#: initdb.c:2660
 #, c-format
 msgid "Usage:\n"
 msgstr "Składnia:\n"
 
-#: initdb.c:2808
+#: initdb.c:2661
 #, c-format
 msgid "  %s [OPTION]... [DATADIR]\n"
 msgstr "  %s [OPCJA]... [KATALOG-DOCELOWY]\n"
 
-#: initdb.c:2809
+#: initdb.c:2662
 #, c-format
 msgid ""
 "\n"
@@ -554,37 +492,37 @@ msgstr ""
 "\n"
 "Opcje:\n"
 
-#: initdb.c:2810
+#: initdb.c:2663
 #, c-format
 msgid "  -A, --auth=METHOD         default authentication method for local connections\n"
 msgstr "  -A, --auth=METODA         podstawowa metoda autoryzacji dla lokalnych połączeń\n"
 
-#: initdb.c:2811
+#: initdb.c:2664
 #, c-format
 msgid "      --auth-host=METHOD    default authentication method for local TCP/IP connections\n"
 msgstr "      --auth-host=METODA    podstawowa metoda autoryzacji dla lokalnych połączeń TCP/IP\n"
 
-#: initdb.c:2812
+#: initdb.c:2665
 #, c-format
 msgid "      --auth-local=METHOD   default authentication method for local-socket connections\n"
 msgstr "      --auth-local=METODA   podstawowa metoda autoryzacji dla lokalnych gniazd połączeń\n"
 
-#: initdb.c:2813
+#: initdb.c:2666
 #, c-format
 msgid " [-D, --pgdata=]DATADIR     location for this database cluster\n"
 msgstr " [-D, --pgdata=]KATALOG-DOCELOWY lokalizacja klastra bazy danych\n"
 
-#: initdb.c:2814
+#: initdb.c:2667
 #, c-format
 msgid "  -E, --encoding=ENCODING   set default encoding for new databases\n"
 msgstr "  -E, --encoding=KODOWANIE       ustawia podstawowe kodowanie dla nowej bazy\n"
 
-#: initdb.c:2815
+#: initdb.c:2668
 #, c-format
 msgid "      --locale=LOCALE       set default locale for new databases\n"
 msgstr "      --locale=LOKALIZACJA       ustawia domyślną lokalizację dla nowych baz danych\n"
 
-#: initdb.c:2816
+#: initdb.c:2669
 #, c-format
 msgid ""
 "      --lc-collate=, --lc-ctype=, --lc-messages=LOCALE\n"
@@ -597,17 +535,17 @@ msgstr ""
 "                            ustawia domyślną lokalizację w odpowiedniej kategorii\n"
 "                            dla nowych baz danych (domyślnie pobierana ze środowiska)\n"
 
-#: initdb.c:2820
+#: initdb.c:2673
 #, c-format
 msgid "      --no-locale           equivalent to --locale=C\n"
 msgstr "      --no-locale           równoważna z opcją --locale=C\n"
 
-#: initdb.c:2821
+#: initdb.c:2674
 #, c-format
 msgid "      --pwfile=FILE         read password for the new superuser from file\n"
 msgstr "      --pwfile=PLIK         czyta hasło dla właściciela bazy z pliku\n"
 
-#: initdb.c:2822
+#: initdb.c:2675
 #, c-format
 msgid ""
 "  -T, --text-search-config=CFG\n"
@@ -616,22 +554,22 @@ msgstr ""
 "  -T, --text-search-config=CFG\n"
 "                            domyślna konfiguracja wyszukiwania tekstowego\n"
 
-#: initdb.c:2824
+#: initdb.c:2677
 #, c-format
 msgid "  -U, --username=NAME       database superuser name\n"
 msgstr "  -U, --username=NAZWA      superużytkownik bazy danych\n"
 
-#: initdb.c:2825
+#: initdb.c:2678
 #, c-format
 msgid "  -W, --pwprompt            prompt for a password for the new superuser\n"
 msgstr "  -W, --pwprompt            proś o hasło dla nowego superużytkownika\n"
 
-#: initdb.c:2826
+#: initdb.c:2679
 #, c-format
 msgid "  -X, --xlogdir=XLOGDIR     location for the transaction log directory\n"
 msgstr "  -X, --xlogdir=XLOGDIR     umiejscowienie folderu dziennika transakcji\n"
 
-#: initdb.c:2827
+#: initdb.c:2680
 #, c-format
 msgid ""
 "\n"
@@ -640,42 +578,42 @@ msgstr ""
 "\n"
 "Rzadziej używane opcje:\n"
 
-#: initdb.c:2828
+#: initdb.c:2681
 #, c-format
 msgid "  -d, --debug               generate lots of debugging output\n"
 msgstr "  -d, --debug               wyświetlanie informacji debugger'a\n"
 
-#: initdb.c:2829
+#: initdb.c:2682
 #, c-format
 msgid "  -k, --data-checksums      use data page checksums\n"
 msgstr "  -k, --data-checksums      użycie sum kontrolnych danych stron\n"
 
-#: initdb.c:2830
+#: initdb.c:2683
 #, c-format
 msgid "  -L DIRECTORY              where to find the input files\n"
 msgstr "  -L KATALOG                gdzie szukać plików wejściowych\n"
 
-#: initdb.c:2831
+#: initdb.c:2684
 #, c-format
 msgid "  -n, --noclean             do not clean up after errors\n"
 msgstr "  -n, --noclean             błędy nie będą porządkowane\n"
 
-#: initdb.c:2832
+#: initdb.c:2685
 #, c-format
 msgid "  -N, --nosync              do not wait for changes to be written safely to disk\n"
 msgstr "  -N, --nosync              nie czekać aż zmiany zostaną bezpiecznie zapisane na dysk\n"
 
-#: initdb.c:2833
+#: initdb.c:2686
 #, c-format
 msgid "  -s, --show                show internal settings\n"
 msgstr "  -s, --show                 pokaż wewnętrzne ustawienia\n"
 
-#: initdb.c:2834
+#: initdb.c:2687
 #, c-format
 msgid "  -S, --sync-only           only sync data directory\n"
 msgstr "  -S, --sync-only           synchronizować tylko katalog danych\n"
 
-#: initdb.c:2835
+#: initdb.c:2688
 #, c-format
 msgid ""
 "\n"
@@ -684,17 +622,17 @@ msgstr ""
 "\n"
 "Pozostałe opcje:\n"
 
-#: initdb.c:2836
+#: initdb.c:2689
 #, c-format
 msgid "  -V, --version             output version information, then exit\n"
 msgstr "  -V, --version             pokaż informacje o wersji i zakończ\n"
 
-#: initdb.c:2837
+#: initdb.c:2690
 #, c-format
 msgid "  -?, --help                show this help, then exit\n"
 msgstr "  -?, --help                pokaż tą pomoc i zakończ działanie\n"
 
-#: initdb.c:2838
+#: initdb.c:2691
 #, c-format
 msgid ""
 "\n"
@@ -705,7 +643,7 @@ msgstr ""
 "Jeśli katalog nie jest wskazany wtedy używana jest zmienna PGDATA\n"
 "do określenia tegoż katalogu.\n"
 
-#: initdb.c:2840
+#: initdb.c:2693
 #, c-format
 msgid ""
 "\n"
@@ -714,7 +652,7 @@ msgstr ""
 "\n"
 "Błędy proszę przesyłać na adres <pgsql-bugs@postgresql.org>.\n"
 
-#: initdb.c:2848
+#: initdb.c:2701
 msgid ""
 "\n"
 "WARNING: enabling \"trust\" authentication for local connections\n"
@@ -722,31 +660,21 @@ msgid ""
 "--auth-local and --auth-host, the next time you run initdb.\n"
 msgstr ""
 "\n"
-"UWAGA: metoda autoryzacji ustawiona jako \"trust\" dla połączeń lokalnych\n"
-"Można to zmienić edytując plik pg_hba.conf, używając opcji -A,\n"
-"--auth-local lub --auth-host przy kolejnym uruchomieniu initdb.\n"
+"OSTRZEŻENIE: metoda autoryzacji ustawiona jako \"trust\" dla połączeń lokalnych\n"
+"Można to zmienić edytując plik pg_hba.conf, używając opcji -A, lub\n"
+"--auth-local oraz --auth-host przy kolejnym uruchomieniu initdb.\n"
 
-#: initdb.c:2870
+#: initdb.c:2723
 #, c-format
 msgid "%s: invalid authentication method \"%s\" for \"%s\" connections\n"
 msgstr "%s: niepoprawna metoda autoryzacji \"%s\" dla połączeń \"%s\"\n"
 
-#: initdb.c:2884
+#: initdb.c:2737
 #, c-format
 msgid "%s: must specify a password for the superuser to enable %s authentication\n"
 msgstr "%s: musisz podać hasło superużytkownika aby aktywować %s autoryzację\n"
 
-#: initdb.c:2917
-#, c-format
-msgid "%s: could not re-execute with restricted token: error code %lu\n"
-msgstr "%s: nie udało się ponownie wykonać ograniczonego tokena: %lu\n"
-
-#: initdb.c:2932
-#, c-format
-msgid "%s: could not get exit code from subprocess: error code %lu\n"
-msgstr "%s: nie udało uzyskać kodu wyjścia z usługi podrzędnej: kod błędu %lu\n"
-
-#: initdb.c:2958
+#: initdb.c:2764
 #, c-format
 msgid ""
 "%s: no data directory specified\n"
@@ -754,12 +682,12 @@ msgid ""
 "will reside.  Do this with either the invocation option -D or the\n"
 "environment variable PGDATA.\n"
 msgstr ""
-"%s: nie ustawiony katalog danych\n"
-"Musisz podać katalog gdzie dane bazy danych będą przechowywane.\n"
-"Możesz tego dokonać używając opcję -D lub przy pomocy\n"
+"%s: nieustawiony katalog danych\n"
+"Musisz podać katalog gdzie będą przechowywane dane bazy danych.\n"
+"Możesz tego dokonać używając opcji -D lub przy pomocy\n"
 "zmiennej środowiskowej PGDATA.\n"
 
-#: initdb.c:2996
+#: initdb.c:2802
 #, c-format
 msgid ""
 "The program \"postgres\" is needed by %s but was not found in the\n"
@@ -770,7 +698,7 @@ msgstr ""
 "w tym samym folderze co \"%s\".\n"
 "Sprawdź instalację.\n"
 
-#: initdb.c:3003
+#: initdb.c:2809
 #, c-format
 msgid ""
 "The program \"postgres\" was found by \"%s\"\n"
@@ -781,17 +709,17 @@ msgstr ""
 "ale nie jest w tej samej wersji co %s.\n"
 "Sprawdź instalację.\n"
 
-#: initdb.c:3022
+#: initdb.c:2828
 #, c-format
 msgid "%s: input file location must be an absolute path\n"
 msgstr "%s: położenie plików wejściowych musi być ścieżką bezwzględną\n"
 
-#: initdb.c:3041
+#: initdb.c:2847
 #, c-format
 msgid "The database cluster will be initialized with locale \"%s\".\n"
 msgstr "Klaster bazy zostanie utworzony z zestawem reguł językowych \"%s\".\n"
 
-#: initdb.c:3044
+#: initdb.c:2850
 #, c-format
 msgid ""
 "The database cluster will be initialized with locales\n"
@@ -810,22 +738,22 @@ msgstr ""
 "  NUMERIC:  %s\n"
 "  TIME:     %s\n"
 
-#: initdb.c:3068
+#: initdb.c:2874
 #, c-format
 msgid "%s: could not find suitable encoding for locale \"%s\"\n"
 msgstr "%s: nie można znaleźć odpowiedniego kodowania dla lokalizacji \"%s\"\n"
 
-#: initdb.c:3070
+#: initdb.c:2876
 #, c-format
 msgid "Rerun %s with the -E option.\n"
 msgstr "Włącz polecenie %s ponownie z opcją -E.\n"
 
-#: initdb.c:3071 initdb.c:3647 initdb.c:3668
+#: initdb.c:2877 initdb.c:3500 initdb.c:3521
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Spróbuj \"%s --help\" aby uzyskać więcej informacji.\n"
 
-#: initdb.c:3083
+#: initdb.c:2889
 #, c-format
 msgid ""
 "Encoding \"%s\" implied by locale is not allowed as a server-side encoding.\n"
@@ -834,12 +762,12 @@ msgstr ""
 "Kodowanie \"%s\" określone przez lokalizację jest niedozwolone jako kodowanie po stronie serwera.\n"
 "Kodowanie bazy danych będzie zamiast tego ustawiona na \"%s\".\n"
 
-#: initdb.c:3091
+#: initdb.c:2897
 #, c-format
 msgid "%s: locale \"%s\" requires unsupported encoding \"%s\"\n"
 msgstr "%s: lokalizacja \"%s\" wymaga nie wspieranego kodowania \"%s\"\n"
 
-#: initdb.c:3094
+#: initdb.c:2900
 #, c-format
 msgid ""
 "Encoding \"%s\" is not allowed as a server-side encoding.\n"
@@ -848,73 +776,78 @@ msgstr ""
 "Kodowanie \"%s\" jest niedozwolone jako kodowanie po stronie serwera.\n"
 "Uruchom ponownie %s z wybraną inną lokalizacją.\n"
 
-#: initdb.c:3103
+#: initdb.c:2909
 #, c-format
 msgid "The default database encoding has accordingly been set to \"%s\".\n"
 msgstr "Podstawowe kodowanie bazy danych zostało ustawione jako \"%s\".\n"
 
-#: initdb.c:3174
+#: initdb.c:2980
 #, c-format
 msgid "%s: could not find suitable text search configuration for locale \"%s\"\n"
 msgstr "%s: nie można znaleźć odpowiedniej konfiguracji wyszukiwania tekstowego dla lokalizacji \"%s\"\n"
 
-#: initdb.c:3185
+#: initdb.c:2991
 #, c-format
 msgid "%s: warning: suitable text search configuration for locale \"%s\" is unknown\n"
 msgstr "%s: ostrzeżenie: nie jest znana odpowiednia konfiguracja wyszukiwania tekstowego dla lokalizacji \"%s\"\n"
 
-#: initdb.c:3190
+#: initdb.c:2996
 #, c-format
 msgid "%s: warning: specified text search configuration \"%s\" might not match locale \"%s\"\n"
 msgstr "%s: ostrzeżenie: wskazana konfiguracja wyszukiwania tekstu \"%s\" może nie pasować do lokalizacji \"%s\"\n"
 
-#: initdb.c:3195
+#: initdb.c:3001
 #, c-format
 msgid "The default text search configuration will be set to \"%s\".\n"
 msgstr "Domyślna konfiguracja wyszukiwania tekstowego zostanie ustawiona na \"%s\".\n"
 
-#: initdb.c:3239 initdb.c:3317
+#: initdb.c:3045 initdb.c:3131
 #, c-format
 msgid "creating directory %s ... "
 msgstr "tworzenie katalogu %s ... "
 
-#: initdb.c:3253 initdb.c:3335
+#: initdb.c:3051 initdb.c:3137 initdb.c:3205 initdb.c:3261
+#, c-format
+msgid "%s: could not create directory \"%s\": %s\n"
+msgstr "%s: nie można utworzyć katalogu \"%s\": %s\n"
+
+#: initdb.c:3063 initdb.c:3149
 #, c-format
 msgid "fixing permissions on existing directory %s ... "
 msgstr "ustalanie uprawnień katalogu %s ... "
 
-#: initdb.c:3259 initdb.c:3341
+#: initdb.c:3069 initdb.c:3155
 #, c-format
 msgid "%s: could not change permissions of directory \"%s\": %s\n"
 msgstr "%s: nie można zmienić uprawnień katalogu \"%s\": %s\n"
 
-#: initdb.c:3274 initdb.c:3356
+#: initdb.c:3084 initdb.c:3170
 #, c-format
 msgid "%s: directory \"%s\" exists but is not empty\n"
 msgstr "%s: folder \"%s\" nie jest pusty\n"
 
-#: initdb.c:3280
+#: initdb.c:3090
 #, 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 ""
-"Jeśli chcesz utworzyć nową bazę danych usuń lub wyczyść,\n"
+"Jeśli chcesz utworzyć nową bazę danych, usuń lub wyczyść\n"
 "katalog \"%s\" lub uruchom program %s\n"
 "z argumentem wskazującym katalog innym niż \"%s\".\n"
 
-#: initdb.c:3288 initdb.c:3369
+#: initdb.c:3098 initdb.c:3183 initdb.c:3534
 #, c-format
 msgid "%s: could not access directory \"%s\": %s\n"
 msgstr "%s: brak dostępu do katalogu \"%s\": %s\n"
 
-#: initdb.c:3308
+#: initdb.c:3122
 #, c-format
 msgid "%s: transaction log directory location must be an absolute path\n"
 msgstr "%s: położenie folderu dziennika transakcji musi być ścieżką bezwzględną\n"
 
-#: initdb.c:3362
+#: initdb.c:3176
 #, c-format
 msgid ""
 "If you want to store the transaction log there, either\n"
@@ -923,27 +856,27 @@ msgstr ""
 "Jeśli chcesz tam przechowywać dziennik transakcji, albo\n"
 "usuń albo wyczyść zawartość folderu \"%s\".\n"
 
-#: initdb.c:3380
+#: initdb.c:3191
 #, c-format
 msgid "%s: could not create symbolic link \"%s\": %s\n"
 msgstr "%s: nie można utworzyć linku symbolicznego \"%s\": %s\n"
 
-#: initdb.c:3385
+#: initdb.c:3196
 #, c-format
 msgid "%s: symlinks are not supported on this platform"
 msgstr "%s: linki symb. nie są obsługiwane na tej platformie"
 
-#: initdb.c:3398
+#: initdb.c:3220
 #, c-format
 msgid "It contains a dot-prefixed/invisible file, perhaps due to it being a mount point.\n"
 msgstr "Zawiera on tylko zaczynający się kropką/niewidoczny plik, być może dlatego, że był to punkt podłączenia.\n"
 
-#: initdb.c:3401
+#: initdb.c:3223
 #, c-format
 msgid "It contains a lost+found directory, perhaps due to it being a mount point.\n"
 msgstr "Zawiera on folder lost+found, być może dlatego, że był to punkt podłączenia.\n"
 
-#: initdb.c:3404
+#: initdb.c:3226
 #, c-format
 msgid ""
 "Using a mount point directly as the data directory is not recommended.\n"
@@ -952,32 +885,42 @@ msgstr ""
 "Użycie punktu zamontowania bezpośrednio jako folderu danych nie jest zalecane.\n"
 "Lepiej utworzyć podfolder punktu montowania.\n"
 
-#: initdb.c:3423
+#: initdb.c:3246
 #, c-format
 msgid "creating subdirectories ... "
 msgstr "tworzenie podkatalogów ... "
 
-#: initdb.c:3591
+#: initdb.c:3293
+msgid "performing post-bootstrap initialization ... "
+msgstr "wykonywanie inicjacji po ładowaniu wstępnym ... "
+
+#: initdb.c:3444
 #, c-format
 msgid "Running in debug mode.\n"
 msgstr "Działanie w trybie debug.\n"
 
-#: initdb.c:3595
+#: initdb.c:3448
 #, c-format
 msgid "Running in noclean mode.  Mistakes will not be cleaned up.\n"
 msgstr "Działanie w trybie nonclean. Błędy nie będą porządkowane.\n"
 
-#: initdb.c:3666
+#: initdb.c:3519
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: za duża ilość parametrów (pierwszy to \"%s\")\n"
 
-#: initdb.c:3683
+#: initdb.c:3545
 #, c-format
 msgid "%s: password prompt and password file cannot be specified together\n"
 msgstr "%s: prośba o hasło i plik hasła nie mogą być podane jednocześnie\n"
 
-#: initdb.c:3705
+#: initdb.c:3569
+#, c-format
+msgid "%s: superuser name \"%s\" is disallowed; role names cannot begin with \"pg_\"\n"
+msgstr "%s: nazwa superużytkownika \"%s\" jest zabroniona; nazwy ról nie mogą zaczynać "
+"się od \"pg_\"\n"
+
+#: initdb.c:3573
 #, c-format
 msgid ""
 "The files belonging to this database system will be owned by user \"%s\".\n"
@@ -988,17 +931,17 @@ msgstr ""
 "Ten użytkownik musi jednocześnie być właścicielem procesu serwera.\n"
 "\n"
 
-#: initdb.c:3721
+#: initdb.c:3589
 #, c-format
 msgid "Data page checksums are enabled.\n"
 msgstr "Sumy kontrolne stron danych są włączone.\n"
 
-#: initdb.c:3723
+#: initdb.c:3591
 #, c-format
 msgid "Data page checksums are disabled.\n"
 msgstr "Sumy kontrolne stron danych są zablokowane.\n"
 
-#: initdb.c:3732
+#: initdb.c:3600
 #, c-format
 msgid ""
 "\n"
@@ -1009,25 +952,27 @@ msgstr ""
 "Pominięto synchronizację na dysk.\n"
 "Folder danych może zostać uszkodzona jeśli system operacyjny ulegnie awarii.\n"
 
-#: initdb.c:3741
+#: initdb.c:3609
 #, 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"
 "Sukces. Teraz możesz uruchomić serwer bazy danych używając:\n"
 "\n"
-"    %s%s%spostgres%s -D %s%s%s\n"
-"lub\n"
 "    %s%s%s%spg_ctl -D %s%s%s -l plik_z_logami start\n"
 "\n"
 
+#~ msgid "%s: could not close directory \"%s\": %s\n"
+#~ msgstr "%s: nie można zamknąć katalogu \"%s\": %s\n"
+
+#~ msgid "%s: could not to allocate SIDs: error code %lu\n"
+#~ msgstr "%s: nie udało się przydzielić SIDów: kod błędu %lu\n"
+
 #~ msgid "could not change directory to \"%s\""
 #~ msgstr "nie można zmienić katalogu na \"%s\""
 
@@ -1039,3 +984,51 @@ msgstr ""
 
 #~ msgid "%s: could not obtain information about current user: %s\n"
 #~ msgstr "%s: nie można otrzymać informacji o bieżącym użytkowniku: %s\n"
+
+#~ msgid "copying template1 to postgres ... "
+#~ msgstr "kopiowanie bazy template1 do bazy postgres ... "
+
+#~ msgid "copying template1 to template0 ... "
+#~ msgstr "kopiowanie bazy template1 do bazy template0 ... "
+
+#~ msgid "vacuuming database template1 ... "
+#~ msgstr "odkurzanie bazy template1 ... "
+
+#~ msgid "loading PL/pgSQL server-side language ... "
+#~ msgstr "pobieranie języka PL/pgSQL używanego po stronie serwera ... "
+
+#~ msgid "creating information schema ... "
+#~ msgstr "tworzenie schematu informacyjnego ... "
+
+#~ msgid "setting privileges on built-in objects ... "
+#~ msgstr "ustawianie uprawnień dla wbudowanych obiektów ... "
+
+#~ msgid "creating dictionaries ... "
+#~ msgstr "tworzenie słowników ... "
+
+#~ msgid "creating conversions ... "
+#~ msgstr "tworzenie konwersji ... "
+
+#~ msgid "not supported on this platform\n"
+#~ msgstr "nieobsługiwane na tej platformie\n"
+
+#~ msgid "creating collations ... "
+#~ msgstr "tworzenie porównań ... "
+
+#~ msgid "loading system objects' descriptions ... "
+#~ msgstr "wczytywanie opisów obiektów systemowych ... "
+
+#~ msgid "creating system views ... "
+#~ msgstr "tworzenie widoków systemowych ... "
+
+#~ msgid "initializing dependencies ... "
+#~ msgstr "inicjowanie powiązań ... "
+
+#~ msgid "setting password ... "
+#~ msgstr "ustawianie hasła ... "
+
+#~ msgid "initializing pg_authid ... "
+#~ msgstr "inicjowanie pg_authid ... "
+
+#~ msgid "creating template1 database in %s/base/1 ... "
+#~ msgstr "tworzenie bazy template1 w folderze %s/base/1 ... "
diff --git a/src/bin/initdb/po/pt_BR.po b/src/bin/initdb/po/pt_BR.po
index 2322dab54c..14603f7b1a 100644
--- a/src/bin/initdb/po/pt_BR.po
+++ b/src/bin/initdb/po/pt_BR.po
@@ -1,13 +1,13 @@
 # Brazilian Portuguese message translation file for initdb
 # Copyright (C) 2009 PostgreSQL Global Development Group
 # This file is distributed under the same license as the PostgreSQL package.
-# Euler Taveira de Oliveira <euler@timbira.com>, 2003-2014.
+# Euler Taveira de Oliveira <euler@timbira.com>, 2003-2015.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 9.4\n"
+"Project-Id-Version: PostgreSQL 9.5\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2014-12-09 12:23-0300\n"
+"POT-Creation-Date: 2015-09-17 22:32-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"
@@ -51,13 +51,13 @@ msgstr "não pôde ler link simbólico \"%s\""
 msgid "pclose failed: %s"
 msgstr "pclose falhou: %s"
 
-#: ../../common/fe_memutils.c:33 ../../common/fe_memutils.c:60
-#: ../../common/fe_memutils.c:83
+#: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
+#: ../../common/fe_memutils.c:98
 #, c-format
 msgid "out of memory\n"
 msgstr "sem memória\n"
 
-#: ../../common/fe_memutils.c:77
+#: ../../common/fe_memutils.c:92
 #, c-format
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "não pode duplicar ponteiro nulo (erro interno)\n"
@@ -77,6 +77,41 @@ msgstr "não pôde ler diretório \"%s\": %s\n"
 msgid "could not close directory \"%s\": %s\n"
 msgstr "não pôde fechar diretório \"%s\": %s\n"
 
+#: ../../common/restricted_token.c:68
+#, c-format
+msgid "%s: WARNING: cannot create restricted tokens on this platform\n"
+msgstr "%s: AVISO: não pode criar informações restritas nessa plataforma\n"
+
+#: ../../common/restricted_token.c:77
+#, c-format
+msgid "%s: could not open process token: error code %lu\n"
+msgstr "%s: não pôde abrir informação sobre processo: código de erro %lu\n"
+
+#: ../../common/restricted_token.c:90
+#, c-format
+msgid "%s: could not allocate SIDs: error code %lu\n"
+msgstr "%s: não pôde alocar SIDs: código de erro %lu\n"
+
+#: ../../common/restricted_token.c:110
+#, c-format
+msgid "%s: could not create restricted token: error code %lu\n"
+msgstr "%s: não pôde criar informação restrita: código de erro %lu\n"
+
+#: ../../common/restricted_token.c:132
+#, c-format
+msgid "%s: could not start process for command \"%s\": error code %lu\n"
+msgstr "%s: não pôde iniciar processo para comando \"%s\": código de erro %lu\n"
+
+#: ../../common/restricted_token.c:170
+#, c-format
+msgid "%s: could not re-execute with restricted token: error code %lu\n"
+msgstr "%s: não pôde executar novamente com informação restrita: código de erro %lu\n"
+
+#: ../../common/restricted_token.c:186
+#, c-format
+msgid "%s: could not get exit code from subprocess: error code %lu\n"
+msgstr "%s: não pôde obter código de saída de subprocesso: código de erro %lu\n"
+
 #: ../../common/rmtree.c:77
 #, c-format
 msgid "could not stat file or directory \"%s\": %s\n"
@@ -96,10 +131,10 @@ msgstr "não pôde encontrar ID de usuário efetivo %ld: %s"
 msgid "user does not exist"
 msgstr "usuário não existe"
 
-#: ../../common/username.c:61
+#: ../../common/username.c:62
 #, c-format
-msgid "user name lookup failure: %s"
-msgstr "falhou ao pesquisar nome de usuário: %s"
+msgid "user name lookup failure: error code %lu"
+msgstr "falhou ao pesquisar nome de usuário: código de erro %lu"
 
 #: ../../common/wait_error.c:47
 #, c-format
@@ -146,112 +181,107 @@ msgstr "não pôde definir junção para \"%s\": %s\n"
 msgid "could not get junction for \"%s\": %s\n"
 msgstr "não pôde obter junção para \"%s\": %s\n"
 
-#: initdb.c:337
+#: initdb.c:340
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: sem memória\n"
 
-#: initdb.c:447 initdb.c:1653
+#: initdb.c:450 initdb.c:1620
 #, c-format
 msgid "%s: could not open file \"%s\" for reading: %s\n"
 msgstr "%s: não pôde abrir arquivo \"%s\" para leitura: %s\n"
 
-#: initdb.c:503 initdb.c:1055 initdb.c:1083
+#: initdb.c:506 initdb.c:1016 initdb.c:1044
 #, c-format
 msgid "%s: could not open file \"%s\" for writing: %s\n"
 msgstr "%s: não pôde abrir arquivo \"%s\" para escrita: %s\n"
 
-#: initdb.c:511 initdb.c:519 initdb.c:1062 initdb.c:1089
+#: initdb.c:514 initdb.c:522 initdb.c:1023 initdb.c:1050
 #, c-format
 msgid "%s: could not write file \"%s\": %s\n"
 msgstr "%s: não pôde escrever arquivo \"%s\": %s\n"
 
-#: initdb.c:541 initdb.c:608
+#: initdb.c:553
 #, c-format
 msgid "%s: could not open directory \"%s\": %s\n"
 msgstr "%s: não pôde abrir diretório \"%s\": %s\n"
 
-#: initdb.c:558
+#: initdb.c:577 initdb.c:2424
 #, c-format
 msgid "%s: could not stat file \"%s\": %s\n"
 msgstr "%s: não pôde executar stat no arquivo \"%s\": %s\n"
 
-#: initdb.c:571 initdb.c:628
+#: initdb.c:589
 #, c-format
 msgid "%s: could not read directory \"%s\": %s\n"
 msgstr "%s: não pôde ler diretório \"%s\": %s\n"
 
-#: initdb.c:578 initdb.c:635
-#, c-format
-msgid "%s: could not close directory \"%s\": %s\n"
-msgstr "%s: não pôde fechar diretório \"%s\": %s\n"
-
-#: initdb.c:662 initdb.c:714
+#: initdb.c:622 initdb.c:681
 #, c-format
 msgid "%s: could not open file \"%s\": %s\n"
 msgstr "%s: não pôde abrir arquivo \"%s\": %s\n"
 
-#: initdb.c:730
+#: initdb.c:693
 #, c-format
 msgid "%s: could not fsync file \"%s\": %s\n"
 msgstr "%s: não pôde executar fsync no arquivo \"%s\": %s\n"
 
-#: initdb.c:751
+#: initdb.c:712
 #, c-format
 msgid "%s: could not execute command \"%s\": %s\n"
 msgstr "%s: não pôde executar comando \"%s\": %s\n"
 
-#: initdb.c:767
+#: initdb.c:728
 #, c-format
 msgid "%s: removing data directory \"%s\"\n"
 msgstr "%s: removendo diretório de dados \"%s\"\n"
 
-#: initdb.c:770
+#: initdb.c:731
 #, c-format
 msgid "%s: failed to remove data directory\n"
 msgstr "%s: falhou ao remover diretório de dados\n"
 
-#: initdb.c:776
+#: initdb.c:737
 #, c-format
 msgid "%s: removing contents of data directory \"%s\"\n"
 msgstr "%s: removendo conteúdo do diretório de dados \"%s\"\n"
 
-#: initdb.c:779
+#: initdb.c:740
 #, c-format
 msgid "%s: failed to remove contents of data directory\n"
 msgstr "%s: falhou ao remover conteúdo do diretório de dados\n"
 
-#: initdb.c:785
+#: initdb.c:746
 #, c-format
 msgid "%s: removing transaction log directory \"%s\"\n"
 msgstr "%s: removendo diretório do log de transação \"%s\"\n"
 
-#: initdb.c:788
+#: initdb.c:749
 #, c-format
 msgid "%s: failed to remove transaction log directory\n"
 msgstr "%s: falhou ao remover diretório do log de transação\n"
 
-#: initdb.c:794
+#: initdb.c:755
 #, c-format
 msgid "%s: removing contents of transaction log directory \"%s\"\n"
 msgstr "%s: removendo conteúdo do diretório do log de transação \"%s\"\n"
 
-#: initdb.c:797
+#: initdb.c:758
 #, c-format
 msgid "%s: failed to remove contents of transaction log directory\n"
 msgstr "%s: falhou ao remover conteúdo do diretório do log de transação\n"
 
-#: initdb.c:806
+#: initdb.c:767
 #, c-format
 msgid "%s: data directory \"%s\" not removed at user's request\n"
 msgstr "%s: diretório de dados \"%s\" não foi removido a pedido do usuário\n"
 
-#: initdb.c:811
+#: initdb.c:772
 #, c-format
 msgid "%s: transaction log directory \"%s\" not removed at user's request\n"
 msgstr "%s: diretório do log de transação \"%s\" não foi removido a pedido do usuário\n"
 
-#: initdb.c:832
+#: initdb.c:793
 #, c-format
 msgid ""
 "%s: cannot be run as root\n"
@@ -262,22 +292,22 @@ msgstr ""
 "Por favor entre (utilizando, i.e., \"su\") como usuário (sem privilégios) que será\n"
 "o dono do processo do servidor.\n"
 
-#: initdb.c:868
+#: initdb.c:829
 #, c-format
 msgid "%s: \"%s\" is not a valid server encoding name\n"
 msgstr "%s: \"%s\" não é um nome de codificação do servidor válido\n"
 
-#: initdb.c:982 initdb.c:3386
+#: initdb.c:943 initdb.c:3217
 #, c-format
 msgid "%s: could not create directory \"%s\": %s\n"
 msgstr "%s: não pôde criar diretório \"%s\": %s\n"
 
-#: initdb.c:1011
+#: initdb.c:972
 #, c-format
 msgid "%s: file \"%s\" does not exist\n"
 msgstr "%s: arquivo \"%s\" não existe\n"
 
-#: initdb.c:1013 initdb.c:1022 initdb.c:1032
+#: initdb.c:974 initdb.c:983 initdb.c:993
 #, c-format
 msgid ""
 "This might mean you have a corrupted installation or identified\n"
@@ -286,46 +316,46 @@ msgstr ""
 "Isso significa que você tem uma instalação corrompida ou especificou\n"
 "o diretório errado com a invocação da opção -L.\n"
 
-#: initdb.c:1019
+#: initdb.c:980
 #, c-format
 msgid "%s: could not access file \"%s\": %s\n"
 msgstr "%s: não pôde acessar arquivo \"%s\": %s\n"
 
-#: initdb.c:1030
+#: initdb.c:991
 #, c-format
 msgid "%s: file \"%s\" is not a regular file\n"
 msgstr "%s: arquivo \"%s\" não é um arquivo regular\n"
 
-#: initdb.c:1175
+#: initdb.c:1136
 #, c-format
 msgid "selecting default max_connections ... "
 msgstr "selecionando max_connections padrão ... "
 
-#: initdb.c:1205
+#: initdb.c:1166
 #, c-format
 msgid "selecting default shared_buffers ... "
 msgstr "selecionando shared_buffers padrão ... "
 
-#: initdb.c:1238
+#: initdb.c:1199
 #, c-format
 msgid "selecting dynamic shared memory implementation ... "
 msgstr "selecionando implementação de memória compartilhada dinâmica ... "
 
-#: initdb.c:1256
+#: initdb.c:1217
 msgid "creating configuration files ... "
 msgstr "criando arquivos de configuração ... "
 
-#: initdb.c:1347 initdb.c:1367 initdb.c:1451 initdb.c:1467
+#: initdb.c:1314 initdb.c:1334 initdb.c:1418 initdb.c:1434
 #, c-format
 msgid "%s: could not change permissions of \"%s\": %s\n"
 msgstr "%s: não pôde mudar permissões de \"%s\": %s\n"
 
-#: initdb.c:1491
+#: initdb.c:1458
 #, c-format
 msgid "creating template1 database in %s/base/1 ... "
 msgstr "criando banco de dados template1 em %s/base/1 ... "
 
-#: initdb.c:1507
+#: initdb.c:1474
 #, c-format
 msgid ""
 "%s: input file \"%s\" does not belong to PostgreSQL %s\n"
@@ -334,156 +364,156 @@ msgstr ""
 "%s: arquivo de entrada \"%s\" não pertence ao PostgreSQL %s\n"
 "Verifique sua instalação ou especifique o caminho correto utilizando a opção -L.\n"
 
-#: initdb.c:1594
+#: initdb.c:1561
 msgid "initializing pg_authid ... "
 msgstr "inicializando pg_authid ... "
 
-#: initdb.c:1628
+#: initdb.c:1595
 msgid "Enter new superuser password: "
 msgstr "Digite nova senha de super-usuário: "
 
-#: initdb.c:1629
+#: initdb.c:1596
 msgid "Enter it again: "
 msgstr "Digite-a novamente: "
 
-#: initdb.c:1632
+#: initdb.c:1599
 #, c-format
 msgid "Passwords didn't match.\n"
 msgstr "Senhas não correspondem.\n"
 
-#: initdb.c:1660
+#: initdb.c:1627
 #, c-format
 msgid "%s: could not read password from file \"%s\": %s\n"
 msgstr "%s: não pôde ler senha do arquivo \"%s\": %s\n"
 
-#: initdb.c:1663
+#: initdb.c:1630
 #, c-format
 msgid "%s: password file \"%s\" is empty\n"
 msgstr "%s: arquivo de senhas \"%s\" está vazio\n"
 
-#: initdb.c:1676
+#: initdb.c:1643
 #, c-format
 msgid "setting password ... "
 msgstr "definindo senha ... "
 
-#: initdb.c:1776
+#: initdb.c:1743
 msgid "initializing dependencies ... "
 msgstr "inicializando dependências ... "
 
-#: initdb.c:1804
+#: initdb.c:1771
 msgid "creating system views ... "
 msgstr "criando visões do sistema ... "
 
-#: initdb.c:1840
+#: initdb.c:1807
 msgid "loading system objects' descriptions ... "
 msgstr "carregando descrições de objetos do sistema ... "
 
-#: initdb.c:1946
+#: initdb.c:1913
 msgid "creating collations ... "
 msgstr "criando ordenações ... "
 
-#: initdb.c:1979
+#: initdb.c:1946
 #, c-format
 msgid "%s: locale name too long, skipped: \"%s\"\n"
 msgstr "%s: nome de configuração regional muito longo, ignorado: \"%s\"\n"
 
-#: initdb.c:2004
+#: initdb.c:1971
 #, c-format
 msgid "%s: locale name has non-ASCII characters, skipped: \"%s\"\n"
 msgstr "%s: nome de configuração regional tem caracteres não-ASCII, ignorado: \"%s\"\n"
 
-#: initdb.c:2073
+#: initdb.c:2040
 #, c-format
 msgid "No usable system locales were found.\n"
 msgstr "Nenhuma configuração regional do sistema utilizável foi encontrada.\n"
 
-#: initdb.c:2074
+#: initdb.c:2041
 #, c-format
 msgid "Use the option \"--debug\" to see details.\n"
 msgstr "Utilize a opção \"--debug\" para obter detalhes.\n"
 
-#: initdb.c:2077
+#: initdb.c:2044
 #, c-format
 msgid "not supported on this platform\n"
 msgstr "não é suportado nessa plataforma\n"
 
-#: initdb.c:2092
+#: initdb.c:2059
 msgid "creating conversions ... "
 msgstr "criando conversões ... "
 
-#: initdb.c:2127
+#: initdb.c:2094
 msgid "creating dictionaries ... "
 msgstr "criando dicionários ... "
 
-#: initdb.c:2181
+#: initdb.c:2148
 msgid "setting privileges on built-in objects ... "
 msgstr "definindo privilégios dos objetos embutidos ... "
 
-#: initdb.c:2239
+#: initdb.c:2206
 msgid "creating information schema ... "
 msgstr "criando esquema informação ... "
 
-#: initdb.c:2295
+#: initdb.c:2262
 msgid "loading PL/pgSQL server-side language ... "
 msgstr "carregando linguagem PL/pgSQL ... "
 
-#: initdb.c:2320
+#: initdb.c:2287
 msgid "vacuuming database template1 ... "
 msgstr "limpando banco de dados template1 ... "
 
-#: initdb.c:2376
+#: initdb.c:2340
 msgid "copying template1 to template0 ... "
 msgstr "copiando template1 para template0 ... "
 
-#: initdb.c:2408
+#: initdb.c:2372
 msgid "copying template1 to postgres ... "
 msgstr "copiando template1 para postgres ... "
 
-#: initdb.c:2435
+#: initdb.c:2407
 msgid "syncing data to disk ... "
 msgstr "sincronizando dados no disco ... "
 
-#: initdb.c:2514
+#: initdb.c:2501
 #, c-format
 msgid "caught signal\n"
 msgstr "sinal foi recebido\n"
 
-#: initdb.c:2520
+#: initdb.c:2507
 #, c-format
 msgid "could not write to child process: %s\n"
 msgstr "não pôde escrever em processo filho: %s\n"
 
-#: initdb.c:2528
+#: initdb.c:2515
 #, c-format
 msgid "ok\n"
 msgstr "ok\n"
 
-#: initdb.c:2618
+#: initdb.c:2605
 #, c-format
 msgid "%s: setlocale() failed\n"
 msgstr "%s: setlocale() falhou\n"
 
-#: initdb.c:2636
+#: initdb.c:2623
 #, c-format
 msgid "%s: failed to restore old locale \"%s\"\n"
 msgstr "%s: falhou ao restaurar configuração regional antiga \"%s\"\n"
 
-#: initdb.c:2646
+#: initdb.c:2633
 #, c-format
 msgid "%s: invalid locale name \"%s\"\n"
 msgstr "%s: nome de configuração regional \"%s\" é inválido\n"
 
-#: initdb.c:2658
+#: initdb.c:2645
 #, c-format
 msgid "%s: invalid locale settings; check LANG and LC_* environment variables\n"
 msgstr "%s: definições de configuração regional inválidas; verifique as variáveis de ambiente LANG e LC_*\n"
 
-#: initdb.c:2686
+#: initdb.c:2673
 #, c-format
 msgid "%s: encoding mismatch\n"
 msgstr "%s: codificação não corresponde\n"
 
-#: initdb.c:2688
+#: initdb.c:2675
 #, c-format
 msgid ""
 "The encoding you selected (%s) and the encoding that the\n"
@@ -498,32 +528,7 @@ msgstr ""
 "Execute novamente o %s e não especifique uma codificação explicitamente\n"
 "ou escolha uma outra combinação.\n"
 
-#: initdb.c:2793
-#, c-format
-msgid "%s: WARNING: cannot create restricted tokens on this platform\n"
-msgstr "%s: AVISO: não pode criar informações restritas nessa plataforma\n"
-
-#: initdb.c:2802
-#, c-format
-msgid "%s: could not open process token: error code %lu\n"
-msgstr "%s: não pôde abrir informação sobre processo: código de erro %lu\n"
-
-#: initdb.c:2815
-#, c-format
-msgid "%s: could not to allocate SIDs: error code %lu\n"
-msgstr "%s: não pôde alocar SIDs: código de erro %lu\n"
-
-#: initdb.c:2834
-#, c-format
-msgid "%s: could not create restricted token: error code %lu\n"
-msgstr "%s: não pôde criar informação restrita: código de erro %lu\n"
-
-#: initdb.c:2855
-#, c-format
-msgid "%s: could not start process for command \"%s\": error code %lu\n"
-msgstr "%s: não pôde iniciar processo para comando \"%s\": código de erro %lu\n"
-
-#: initdb.c:2869
+#: initdb.c:2747
 #, c-format
 msgid ""
 "%s initializes a PostgreSQL database cluster.\n"
@@ -532,17 +537,17 @@ msgstr ""
 "%s inicializa um agrupamento de banco de dados PostgreSQL.\n"
 "\n"
 
-#: initdb.c:2870
+#: initdb.c:2748
 #, c-format
 msgid "Usage:\n"
 msgstr "Uso:\n"
 
-#: initdb.c:2871
+#: initdb.c:2749
 #, c-format
 msgid "  %s [OPTION]... [DATADIR]\n"
 msgstr "  %s [OPÇÃO]... [DIRDADOS]\n"
 
-#: initdb.c:2872
+#: initdb.c:2750
 #, c-format
 msgid ""
 "\n"
@@ -551,37 +556,37 @@ msgstr ""
 "\n"
 "Opções:\n"
 
-#: initdb.c:2873
+#: initdb.c:2751
 #, c-format
 msgid "  -A, --auth=METHOD         default authentication method for local connections\n"
 msgstr "  -A, --auth=MÉTODO            método de autenticação padrão para conexões locais\n"
 
-#: initdb.c:2874
+#: initdb.c:2752
 #, c-format
 msgid "      --auth-host=METHOD    default authentication method for local TCP/IP connections\n"
 msgstr "      --auth-host=MÉTODO       método de autenticação padrão para conexões TCP/IP locais\n"
 
-#: initdb.c:2875
+#: initdb.c:2753
 #, c-format
 msgid "      --auth-local=METHOD   default authentication method for local-socket connections\n"
 msgstr "      --auth-local=MÉTODO      método de autenticação padrão para conexões de soquete locais\n"
 
-#: initdb.c:2876
+#: initdb.c:2754
 #, c-format
 msgid " [-D, --pgdata=]DATADIR     location for this database cluster\n"
 msgstr " [-D, --pgdata=]DIRDADOS       local do agrupamento de banco de dados\n"
 
-#: initdb.c:2877
+#: initdb.c:2755
 #, c-format
 msgid "  -E, --encoding=ENCODING   set default encoding for new databases\n"
 msgstr "  -E, --encoding=CODIFICAÇÃO   ajusta a codificação padrão para novos bancos de dados\n"
 
-#: initdb.c:2878
+#: initdb.c:2756
 #, c-format
 msgid "      --locale=LOCALE       set default locale for new databases\n"
 msgstr "     --locale=LOCALE           ajusta configuração regional padrão para novos bancos de dados\n"
 
-#: initdb.c:2879
+#: initdb.c:2757
 #, c-format
 msgid ""
 "      --lc-collate=, --lc-ctype=, --lc-messages=LOCALE\n"
@@ -594,17 +599,17 @@ msgstr ""
 "                               ajusta configuração regional padrão na respectiva categoria\n"
 "                               para novos bancos de dados (o ambiente é assumido como padrão)\n"
 
-#: initdb.c:2883
+#: initdb.c:2761
 #, c-format
 msgid "      --no-locale           equivalent to --locale=C\n"
 msgstr "      --no-locale              equivalente a --locale=C\n"
 
-#: initdb.c:2884
+#: initdb.c:2762
 #, c-format
 msgid "      --pwfile=FILE         read password for the new superuser from file\n"
 msgstr "      --pwfile=ARQUIVO         lê senha do novo super-usuário a partir do arquivo\n"
 
-#: initdb.c:2885
+#: initdb.c:2763
 #, c-format
 msgid ""
 "  -T, --text-search-config=CFG\n"
@@ -613,22 +618,22 @@ msgstr ""
 "  -T, --text-search-config=CFG\n"
 "                               configuração de busca textual padrão\n"
 
-#: initdb.c:2887
+#: initdb.c:2765
 #, c-format
 msgid "  -U, --username=NAME       database superuser name\n"
 msgstr "  -U, --username=NOME          nome do super-usuário do banco de dados\n"
 
-#: initdb.c:2888
+#: initdb.c:2766
 #, c-format
 msgid "  -W, --pwprompt            prompt for a password for the new superuser\n"
 msgstr "  -W, --pwprompt               pergunta senha do novo super-usuário\n"
 
-#: initdb.c:2889
+#: initdb.c:2767
 #, c-format
 msgid "  -X, --xlogdir=XLOGDIR     location for the transaction log directory\n"
 msgstr "  -X, --xlogdir=DIRXLOG        local do log de transação\n"
 
-#: initdb.c:2890
+#: initdb.c:2768
 #, c-format
 msgid ""
 "\n"
@@ -637,42 +642,42 @@ msgstr ""
 "\n"
 "Opções utilizadas com menos frequência:\n"
 
-#: initdb.c:2891
+#: initdb.c:2769
 #, c-format
 msgid "  -d, --debug               generate lots of debugging output\n"
 msgstr "  -d, --debug                  mostra saída da depuração\n"
 
-#: initdb.c:2892
+#: initdb.c:2770
 #, c-format
 msgid "  -k, --data-checksums      use data page checksums\n"
 msgstr "  -k, --data-checksums         verificações de páginas de dados\n"
 
-#: initdb.c:2893
+#: initdb.c:2771
 #, c-format
 msgid "  -L DIRECTORY              where to find the input files\n"
 msgstr "  -L DIRETÓRIO                 onde encontrar os arquivos de entrada\n"
 
-#: initdb.c:2894
+#: initdb.c:2772
 #, c-format
 msgid "  -n, --noclean             do not clean up after errors\n"
 msgstr "  -n, --noclean                não remove após erros\n"
 
-#: initdb.c:2895
+#: initdb.c:2773
 #, c-format
 msgid "  -N, --nosync              do not wait for changes to be written safely to disk\n"
 msgstr "  -N, --nosync                 não espera mudanças serem escritas com segurança no disco\n"
 
-#: initdb.c:2896
+#: initdb.c:2774
 #, c-format
 msgid "  -s, --show                show internal settings\n"
 msgstr "  -s, --show                   mostra definições internas\n"
 
-#: initdb.c:2897
+#: initdb.c:2775
 #, c-format
 msgid "  -S, --sync-only           only sync data directory\n"
 msgstr "  -S, --sync-only              sincroniza somente o diretório de dados\n"
 
-#: initdb.c:2898
+#: initdb.c:2776
 #, c-format
 msgid ""
 "\n"
@@ -681,17 +686,17 @@ msgstr ""
 "\n"
 "Outras opções:\n"
 
-#: initdb.c:2899
+#: initdb.c:2777
 #, c-format
 msgid "  -V, --version             output version information, then exit\n"
 msgstr "  -V, --version                mostra informação sobre a versão e termina\n"
 
-#: initdb.c:2900
+#: initdb.c:2778
 #, c-format
 msgid "  -?, --help                show this help, then exit\n"
 msgstr "  -?, --help                   mostra essa ajuda e termina\n"
 
-#: initdb.c:2901
+#: initdb.c:2779
 #, c-format
 msgid ""
 "\n"
@@ -702,7 +707,7 @@ msgstr ""
 "Se o diretório de dados não for especificado, a variável de ambiente PGDATA\n"
 "é utilizada.\n"
 
-#: initdb.c:2903
+#: initdb.c:2781
 #, c-format
 msgid ""
 "\n"
@@ -711,7 +716,7 @@ msgstr ""
 "\n"
 "Relate erros a <pgsql-bugs@postgresql.org>.\n"
 
-#: initdb.c:2911
+#: initdb.c:2789
 msgid ""
 "\n"
 "WARNING: enabling \"trust\" authentication for local connections\n"
@@ -723,27 +728,17 @@ msgstr ""
 "Você pode mudá-lo editando o pg_hba.conf ou utilizando a opção -A, ou\n"
 "--auth-local e --auth-host, na próxima vez que você executar o initdb.\n"
 
-#: initdb.c:2933
+#: initdb.c:2811
 #, c-format
 msgid "%s: invalid authentication method \"%s\" for \"%s\" connections\n"
 msgstr "%s: método de autenticação \"%s\" é inválido para conexões \"%s\"\n"
 
-#: initdb.c:2947
+#: initdb.c:2825
 #, c-format
 msgid "%s: must specify a password for the superuser to enable %s authentication\n"
 msgstr "%s: você precisa especificar uma senha para o super-usuário para habilitar a autenticação %s\n"
 
-#: initdb.c:2980
-#, c-format
-msgid "%s: could not re-execute with restricted token: error code %lu\n"
-msgstr "%s: não pôde executar novamente com informação restrita: código de erro %lu\n"
-
-#: initdb.c:2995
-#, c-format
-msgid "%s: could not get exit code from subprocess: error code %lu\n"
-msgstr "%s: não pôde obter código de saída de subprocesso: código de erro %lu\n"
-
-#: initdb.c:3021
+#: initdb.c:2852
 #, c-format
 msgid ""
 "%s: no data directory specified\n"
@@ -756,7 +751,7 @@ msgstr ""
 "irá residir. Faça isso com o invocação da opção -D ou a\n"
 "variável de ambiente PGDATA.\n"
 
-#: initdb.c:3059
+#: initdb.c:2890
 #, c-format
 msgid ""
 "The program \"postgres\" is needed by %s but was not found in the\n"
@@ -767,7 +762,7 @@ msgstr ""
 "mesmo diretório que \"%s\".\n"
 "Verifique sua instalação.\n"
 
-#: initdb.c:3066
+#: initdb.c:2897
 #, c-format
 msgid ""
 "The program \"postgres\" was found by \"%s\"\n"
@@ -778,17 +773,17 @@ msgstr ""
 "mas não tem a mesma versão que %s.\n"
 "Verifique sua instalação.\n"
 
-#: initdb.c:3085
+#: initdb.c:2916
 #, c-format
 msgid "%s: input file location must be an absolute path\n"
 msgstr "%s: local do arquivo de entrada deve ser um caminho absoluto\n"
 
-#: initdb.c:3104
+#: initdb.c:2935
 #, c-format
 msgid "The database cluster will be initialized with locale \"%s\".\n"
 msgstr "O agrupamento de banco de dados será inicializado com configuração regional \"%s\".\n"
 
-#: initdb.c:3107
+#: initdb.c:2938
 #, c-format
 msgid ""
 "The database cluster will be initialized with locales\n"
@@ -807,22 +802,22 @@ msgstr ""
 "  NUMERIC:  %s\n"
 "  TIME:     %s\n"
 
-#: initdb.c:3131
+#: initdb.c:2962
 #, c-format
 msgid "%s: could not find suitable encoding for locale \"%s\"\n"
 msgstr "%s: não pôde encontrar codificação ideal para configuração regional \"%s\"\n"
 
-#: initdb.c:3133
+#: initdb.c:2964
 #, c-format
 msgid "Rerun %s with the -E option.\n"
 msgstr "Execute novamente %s com a opção -E.\n"
 
-#: initdb.c:3134 initdb.c:3710 initdb.c:3731
+#: initdb.c:2965 initdb.c:3541 initdb.c:3562
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Tente \"%s --help\" para obter informações adicionais.\n"
 
-#: initdb.c:3146
+#: initdb.c:2977
 #, c-format
 msgid ""
 "Encoding \"%s\" implied by locale is not allowed as a server-side encoding.\n"
@@ -831,12 +826,12 @@ msgstr ""
 "Codificação \"%s\" sugerida pela configuração regional não é permitida como uma codificação do servidor.\n"
 "A codificação do banco de dados padrão será definida como \"%s\".\n"
 
-#: initdb.c:3154
+#: initdb.c:2985
 #, c-format
 msgid "%s: locale \"%s\" requires unsupported encoding \"%s\"\n"
 msgstr "%s: configuração regional \"%s\" requer codificação \"%s\" que não é suportada\n"
 
-#: initdb.c:3157
+#: initdb.c:2988
 #, c-format
 msgid ""
 "Encoding \"%s\" is not allowed as a server-side encoding.\n"
@@ -845,52 +840,52 @@ msgstr ""
 "Codificação \"%s\" não é permitida como  uma codificação do servidor.\n"
 "Execute %s novamente com uma seleção de configuração regional diferente.\n"
 
-#: initdb.c:3166
+#: initdb.c:2997
 #, c-format
 msgid "The default database encoding has accordingly been set to \"%s\".\n"
 msgstr "A codificação padrão do banco de dados foi definida para \"%s\".\n"
 
-#: initdb.c:3237
+#: initdb.c:3068
 #, c-format
 msgid "%s: could not find suitable text search configuration for locale \"%s\"\n"
 msgstr "%s: não pôde encontrar configuração de busca textual ideal para configuração regional \"%s\"\n"
 
-#: initdb.c:3248
+#: initdb.c:3079
 #, c-format
 msgid "%s: warning: suitable text search configuration for locale \"%s\" is unknown\n"
 msgstr "%s: aviso: configuração de busca textual ideal para configuração regional \"%s\" é desconhecida\n"
 
-#: initdb.c:3253
+#: initdb.c:3084
 #, c-format
 msgid "%s: warning: specified text search configuration \"%s\" might not match locale \"%s\"\n"
 msgstr "%s: aviso: configuração de busca textual especificada \"%s\" pode não corresponder a configuração regional \"%s\"\n"
 
-#: initdb.c:3258
+#: initdb.c:3089
 #, c-format
 msgid "The default text search configuration will be set to \"%s\".\n"
 msgstr "A configuração de busca textual padrão será definida como \"%s\".\n"
 
-#: initdb.c:3302 initdb.c:3380
+#: initdb.c:3133 initdb.c:3211
 #, c-format
 msgid "creating directory %s ... "
 msgstr "criando diretório %s ... "
 
-#: initdb.c:3316 initdb.c:3398
+#: initdb.c:3147 initdb.c:3229
 #, c-format
 msgid "fixing permissions on existing directory %s ... "
 msgstr "alterando permissões no diretório existente %s ... "
 
-#: initdb.c:3322 initdb.c:3404
+#: initdb.c:3153 initdb.c:3235
 #, c-format
 msgid "%s: could not change permissions of directory \"%s\": %s\n"
 msgstr "%s: não pôde mudar permissões do diretório \"%s\": %s\n"
 
-#: initdb.c:3337 initdb.c:3419
+#: initdb.c:3168 initdb.c:3250
 #, c-format
 msgid "%s: directory \"%s\" exists but is not empty\n"
 msgstr "%s: diretório \"%s\" existe mas não está vazio\n"
 
-#: initdb.c:3343
+#: initdb.c:3174
 #, c-format
 msgid ""
 "If you want to create a new database system, either remove or empty\n"
@@ -901,17 +896,17 @@ msgstr ""
 "o diretório \"%s\" ou execute %s\n"
 "com um argumento ao invés de \"%s\".\n"
 
-#: initdb.c:3351 initdb.c:3432
+#: initdb.c:3182 initdb.c:3263 initdb.c:3575
 #, c-format
 msgid "%s: could not access directory \"%s\": %s\n"
 msgstr "%s: não pôde acessar diretório \"%s\": %s\n"
 
-#: initdb.c:3371
+#: initdb.c:3202
 #, c-format
 msgid "%s: transaction log directory location must be an absolute path\n"
 msgstr "%s: diretório do log de transação deve ter um caminho absoluto\n"
 
-#: initdb.c:3425
+#: initdb.c:3256
 #, c-format
 msgid ""
 "If you want to store the transaction log there, either\n"
@@ -920,27 +915,27 @@ msgstr ""
 "Se você quer armazenar o log de transação no mesmo, \n"
 "remova ou esvazie o diretório \"%s\".\n"
 
-#: initdb.c:3443
+#: initdb.c:3274
 #, c-format
 msgid "%s: could not create symbolic link \"%s\": %s\n"
 msgstr "%s: não pôde criar link simbólico \"%s\": %s\n"
 
-#: initdb.c:3448
+#: initdb.c:3279
 #, c-format
 msgid "%s: symlinks are not supported on this platform"
 msgstr "%s: links simbólicos não são suportados nessa plataforma"
 
-#: initdb.c:3461
+#: initdb.c:3292
 #, c-format
 msgid "It contains a dot-prefixed/invisible file, perhaps due to it being a mount point.\n"
 msgstr "Ele contém um arquivo iniciado por ponto/invisível, talvez por ser um ponto de montagem.\n"
 
-#: initdb.c:3464
+#: initdb.c:3295
 #, c-format
 msgid "It contains a lost+found directory, perhaps due to it being a mount point.\n"
 msgstr "Ele contém um diretório lost+found, talvez por ser um ponto de montagem.\n"
 
-#: initdb.c:3467
+#: initdb.c:3298
 #, c-format
 msgid ""
 "Using a mount point directly as the data directory is not recommended.\n"
@@ -949,32 +944,32 @@ msgstr ""
 "Utilizar um ponto de montagem diretamente como diretório de dados não é recomendado.\n"
 "Crie um subdiretório no ponto de montagem.\n"
 
-#: initdb.c:3486
+#: initdb.c:3317
 #, c-format
 msgid "creating subdirectories ... "
 msgstr "criando subdiretórios ... "
 
-#: initdb.c:3654
+#: initdb.c:3485
 #, c-format
 msgid "Running in debug mode.\n"
 msgstr "Executando no modo de depuração.\n"
 
-#: initdb.c:3658
+#: initdb.c:3489
 #, c-format
 msgid "Running in noclean mode.  Mistakes will not be cleaned up.\n"
 msgstr "Executando no modo sem limpeza. Erros não serão removidos.\n"
 
-#: initdb.c:3729
+#: initdb.c:3560
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: muitos argumentos de linha de comando (primeiro é \"%s\")\n"
 
-#: initdb.c:3746
+#: initdb.c:3586
 #, c-format
 msgid "%s: password prompt and password file cannot be specified together\n"
 msgstr "%s: opção para perguntar a senha e um arquivo de senhas não podem ser especificados juntos\n"
 
-#: initdb.c:3768
+#: initdb.c:3608
 #, c-format
 msgid ""
 "The files belonging to this database system will be owned by user \"%s\".\n"
@@ -985,17 +980,17 @@ msgstr ""
 "Esse usuário deve ser o dono do processo do servidor também.\n"
 "\n"
 
-#: initdb.c:3784
+#: initdb.c:3624
 #, c-format
 msgid "Data page checksums are enabled.\n"
 msgstr "Verificações de páginas de dados estão habilitadas.\n"
 
-#: initdb.c:3786
+#: initdb.c:3626
 #, c-format
 msgid "Data page checksums are disabled.\n"
 msgstr "Verificações de páginas de dados estão desabilitadas.\n"
 
-#: initdb.c:3795
+#: initdb.c:3635
 #, c-format
 msgid ""
 "\n"
@@ -1006,21 +1001,17 @@ msgstr ""
 "Sincronização com o disco foi ignorada.\n"
 "O diretório de dados pode ser danificado se houver uma queda do sistema operacional.\n"
 
-#: initdb.c:3804
+#: initdb.c:3644
 #, 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"
 "Sucesso. Você pode iniciar o servidor de banco de dados utilizando:\n"
 "\n"
-"    %s%s%spostgres%s -D %s%s%s\n"
-"ou\n"
 "    %s%s%spg_ctl%s -D %s%s%s -l logfile start\n"
 "\n"
diff --git a/src/bin/initdb/po/ru.po b/src/bin/initdb/po/ru.po
index bc531c2dfc..470fea5a14 100644
--- a/src/bin/initdb/po/ru.po
+++ b/src/bin/initdb/po/ru.po
@@ -27,8 +27,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 9 current\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2015-01-13 05:12+0000\n"
-"PO-Revision-Date: 2015-01-13 08:35+0300\n"
+"POT-Creation-Date: 2016-05-27 16:14+0000\n"
+"PO-Revision-Date: 2015-07-27 22:16+0300\n"
 "Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
 "Language-Team: Russian <pgtranslation-translators@pgfoundry.org>\n"
 "Language: ru\n"
@@ -77,13 +77,13 @@ msgstr "не удалось прочитать символическую ссы
 msgid "pclose failed: %s"
 msgstr "ошибка pclose: %s"
 
-#: ../../common/fe_memutils.c:33 ../../common/fe_memutils.c:60
-#: ../../common/fe_memutils.c:83
+#: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
+#: ../../common/fe_memutils.c:98
 #, c-format
 msgid "out of memory\n"
 msgstr "нехватка памяти\n"
 
-#: ../../common/fe_memutils.c:77
+#: ../../common/fe_memutils.c:92
 #, c-format
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "попытка дублирования нулевого указателя (внутренняя ошибка)\n"
@@ -103,6 +103,43 @@ msgstr "не удалось прочитать каталог \"%s\": %s\n"
 msgid "could not close directory \"%s\": %s\n"
 msgstr "не удалось закрыть каталог \"%s\": %s\n"
 
+#: ../../common/restricted_token.c:68
+#, c-format
+msgid "%s: WARNING: cannot create restricted tokens on this platform\n"
+msgstr "%s: ПРЕДУПРЕЖДЕНИЕ: в этой ОС нельзя создавать ограниченные маркеры\n"
+
+#: ../../common/restricted_token.c:77
+#, c-format
+msgid "%s: could not open process token: error code %lu\n"
+msgstr "%s: не удалось открыть маркер процесса (код ошибки: %lu)\n"
+
+#: ../../common/restricted_token.c:90
+#, c-format
+msgid "%s: could not allocate SIDs: error code %lu\n"
+msgstr "%s: не удалось подготовить структуры SID (код ошибки: %lu)\n"
+
+#: ../../common/restricted_token.c:110
+#, c-format
+msgid "%s: could not create restricted token: error code %lu\n"
+msgstr "%s: не удалось создать ограниченный маркер (код ошибки: %lu)\n"
+
+#: ../../common/restricted_token.c:132
+#, c-format
+msgid "%s: could not start process for command \"%s\": error code %lu\n"
+msgstr ""
+"%s: не удалось запустить процесс для команды \"%s\" (код ошибки: %lu)\n"
+
+#: ../../common/restricted_token.c:170
+#, c-format
+msgid "%s: could not re-execute with restricted token: error code %lu\n"
+msgstr ""
+"%s: не удалось перезапуститься с ограниченным маркером (код ошибки: %lu)\n"
+
+#: ../../common/restricted_token.c:186
+#, c-format
+msgid "%s: could not get exit code from subprocess: error code %lu\n"
+msgstr "%s: не удалось получить код выхода от подпроцесса (код ошибки: %lu)\n"
+
 #: ../../common/rmtree.c:77
 #, c-format
 msgid "could not stat file or directory \"%s\": %s\n"
@@ -125,7 +162,7 @@ msgstr "пользователь не существует"
 #: ../../common/username.c:62
 #, c-format
 msgid "user name lookup failure: error code %lu"
-msgstr "распознать имя пользователя не удалось: код ошибки %lu"
+msgstr "распознать имя пользователя не удалось (код ошибки: %lu)"
 
 #: ../../common/wait_error.c:47
 #, c-format
@@ -162,123 +199,118 @@ msgstr "дочерний процесс завершён по сигналу %d"
 msgid "child process exited with unrecognized status %d"
 msgstr "дочерний процесс завершился с нераспознанным состоянием %d"
 
-#: ../../port/dirmod.c:219
+#: ../../port/dirmod.c:221
 #, c-format
 msgid "could not set junction for \"%s\": %s\n"
 msgstr "не удалось создать связь для каталога \"%s\": %s\n"
 
-#: ../../port/dirmod.c:294
+#: ../../port/dirmod.c:298
 #, c-format
 msgid "could not get junction for \"%s\": %s\n"
 msgstr "не удалось получить связь для каталога \"%s\": %s\n"
 
-#: initdb.c:337
+#: initdb.c:349
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: нехватка памяти\n"
 
-#: initdb.c:447 initdb.c:1653
+#: initdb.c:459 initdb.c:1589
 #, c-format
 msgid "%s: could not open file \"%s\" for reading: %s\n"
 msgstr "%s: не удалось открыть файл \"%s\" для чтения: %s\n"
 
-#: initdb.c:503 initdb.c:1055 initdb.c:1083
+#: initdb.c:515 initdb.c:1002 initdb.c:1030
 #, c-format
 msgid "%s: could not open file \"%s\" for writing: %s\n"
 msgstr "%s: не удалось открыть файл \"%s\" для записи: %s\n"
 
-#: initdb.c:511 initdb.c:519 initdb.c:1062 initdb.c:1089
+#: initdb.c:523 initdb.c:531 initdb.c:1009 initdb.c:1036
 #, c-format
 msgid "%s: could not write file \"%s\": %s\n"
 msgstr "%s: не удалось записать файл \"%s\": %s\n"
 
-#: initdb.c:541 initdb.c:608
+#: initdb.c:562
 #, c-format
 msgid "%s: could not open directory \"%s\": %s\n"
 msgstr "%s: не удалось открыть каталог \"%s\": %s\n"
 
-#: initdb.c:558
+#: initdb.c:586 initdb.c:2336
 #, c-format
 msgid "%s: could not stat file \"%s\": %s\n"
 msgstr "%s: не удалось получить информацию о файле \"%s\": %s\n"
 
-#: initdb.c:571 initdb.c:628
+#: initdb.c:598
 #, c-format
 msgid "%s: could not read directory \"%s\": %s\n"
 msgstr "%s: не удалось прочитать каталог \"%s\": %s\n"
 
-#: initdb.c:578 initdb.c:635
-#, c-format
-msgid "%s: could not close directory \"%s\": %s\n"
-msgstr "%s: не удалось закрыть каталог \"%s\": %s\n"
-
-#: initdb.c:662 initdb.c:714
+#: initdb.c:631 initdb.c:690
 #, c-format
 msgid "%s: could not open file \"%s\": %s\n"
 msgstr "%s: не удалось открыть файл \"%s\": %s\n"
 
-#: initdb.c:730
+#: initdb.c:702
 #, c-format
 msgid "%s: could not fsync file \"%s\": %s\n"
 msgstr "%s: не удалось синхронизировать с ФС файл \"%s\": %s\n"
 
-#: initdb.c:751
+#: initdb.c:721
 #, c-format
 msgid "%s: could not execute command \"%s\": %s\n"
 msgstr "%s: не удалось выполнить команду \"%s\": %s\n"
 
-#: initdb.c:767
+#: initdb.c:737
 #, c-format
 msgid "%s: removing data directory \"%s\"\n"
 msgstr "%s: удаление каталога данных \"%s\"\n"
 
-#: initdb.c:770
+#: initdb.c:740
 #, c-format
 msgid "%s: failed to remove data directory\n"
 msgstr "%s: ошибка при удалении каталога данных\n"
 
-#: initdb.c:776
+#: initdb.c:746
 #, c-format
 msgid "%s: removing contents of data directory \"%s\"\n"
 msgstr "%s: удаление содержимого каталога данных \"%s\"\n"
 
-#: initdb.c:779
+#: initdb.c:749
 #, c-format
 msgid "%s: failed to remove contents of data directory\n"
 msgstr "%s: ошибка при удалении содержимого каталога данных\n"
 
-#: initdb.c:785
+#: initdb.c:755
 #, c-format
 msgid "%s: removing transaction log directory \"%s\"\n"
 msgstr "%s: удаление каталога журнала транзакций \"%s\"\n"
 
-#: initdb.c:788
+#: initdb.c:758
 #, c-format
 msgid "%s: failed to remove transaction log directory\n"
 msgstr "%s: ошибка при удалении каталога журнала транзакций\n"
 
-#: initdb.c:794
+#: initdb.c:764
 #, c-format
 msgid "%s: removing contents of transaction log directory \"%s\"\n"
 msgstr "%s: очистка каталога журнала транзакций \"%s\"\n"
 
-#: initdb.c:797
+#: initdb.c:767
 #, c-format
 msgid "%s: failed to remove contents of transaction log directory\n"
 msgstr "%s: ошибка при очистке каталога журнала транзакций\n"
 
-#: initdb.c:806
+#: initdb.c:776
 #, c-format
 msgid "%s: data directory \"%s\" not removed at user's request\n"
 msgstr "%s: каталог данных \"%s\" не был удалён по запросу пользователя\n"
 
-#: initdb.c:811
+#: initdb.c:781
 #, c-format
 msgid "%s: transaction log directory \"%s\" not removed at user's request\n"
 msgstr ""
 "%s: каталог журнала транзакций \"%s\" не был удалён по запросу пользователя\n"
 
-#: initdb.c:832
+#: initdb.c:802
 #, c-format
 msgid ""
 "%s: cannot be run as root\n"
@@ -289,22 +321,17 @@ msgstr ""
 "Пожалуйста, переключитесь на обычного пользователя (например,\n"
 "используя \"su\"), который будет запускать серверный процесс.\n"
 
-#: initdb.c:868
+#: initdb.c:838
 #, c-format
 msgid "%s: \"%s\" is not a valid server encoding name\n"
 msgstr "%s: \"%s\" - неверное имя серверной кодировки\n"
 
-#: initdb.c:982 initdb.c:3387
-#, c-format
-msgid "%s: could not create directory \"%s\": %s\n"
-msgstr "%s: не удалось создать каталог \"%s\": %s\n"
-
-#: initdb.c:1011
+#: initdb.c:958
 #, c-format
 msgid "%s: file \"%s\" does not exist\n"
 msgstr "%s: файл \"%s\" не существует\n"
 
-#: initdb.c:1013 initdb.c:1022 initdb.c:1032
+#: initdb.c:960 initdb.c:969 initdb.c:979
 #, c-format
 msgid ""
 "This might mean you have a corrupted installation or identified\n"
@@ -313,46 +340,46 @@ msgstr ""
 "Это означает, что ваша установка PostgreSQL испорчена или в параметре -L\n"
 "задан неправильный каталог.\n"
 
-#: initdb.c:1019
+#: initdb.c:966
 #, c-format
 msgid "%s: could not access file \"%s\": %s\n"
 msgstr "%s: нет доступа к файлу \"%s\": %s\n"
 
-#: initdb.c:1030
+#: initdb.c:977
 #, c-format
 msgid "%s: file \"%s\" is not a regular file\n"
 msgstr "%s: \"%s\" - не обычный файл\n"
 
-#: initdb.c:1175
+#: initdb.c:1122
 #, c-format
 msgid "selecting default max_connections ... "
 msgstr "выбирается значение max_connections... "
 
-#: initdb.c:1205
+#: initdb.c:1152
 #, c-format
 msgid "selecting default shared_buffers ... "
 msgstr "выбирается значение shared_buffers... "
 
-#: initdb.c:1238
+#: initdb.c:1185
 #, c-format
 msgid "selecting dynamic shared memory implementation ... "
 msgstr "выбор реализации динамической разделяемой памяти ... "
 
-#: initdb.c:1256
+#: initdb.c:1203
 msgid "creating configuration files ... "
 msgstr "создание конфигурационных файлов... "
 
-#: initdb.c:1347 initdb.c:1367 initdb.c:1451 initdb.c:1467
+#: initdb.c:1300 initdb.c:1320 initdb.c:1404 initdb.c:1420
 #, c-format
 msgid "%s: could not change permissions of \"%s\": %s\n"
 msgstr "%s: не удалось поменять права для \"%s\": %s\n"
 
-#: initdb.c:1491
+#: initdb.c:1444
 #, c-format
-msgid "creating template1 database in %s/base/1 ... "
-msgstr "создание базы template1 в %s/base/1... "
+msgid "running bootstrap script ... "
+msgstr "выполняется подготовительный скрипт ... "
 
-#: initdb.c:1507
+#: initdb.c:1460
 #, c-format
 msgid ""
 "%s: input file \"%s\" does not belong to PostgreSQL %s\n"
@@ -361,158 +388,96 @@ msgstr ""
 "%s: входной файл \"%s\" не принадлежит PostgreSQL %s\n"
 "Проверьте вашу установку или укажите правильный путь в параметре -L.\n"
 
-#: initdb.c:1594
-msgid "initializing pg_authid ... "
-msgstr "инициализация pg_authid... "
-
-#: initdb.c:1628
+#: initdb.c:1564
 msgid "Enter new superuser password: "
 msgstr "Введите новый пароль суперпользователя: "
 
-#: initdb.c:1629
+#: initdb.c:1565
 msgid "Enter it again: "
 msgstr "Повторите его: "
 
-#: initdb.c:1632
+#: initdb.c:1568
 #, c-format
 msgid "Passwords didn't match.\n"
 msgstr "Пароли не совпадают.\n"
 
-#: initdb.c:1660
+#: initdb.c:1596
 #, c-format
 msgid "%s: could not read password from file \"%s\": %s\n"
 msgstr "%s: не удалось прочитать пароль из файла \"%s\": %s\n"
 
-#: initdb.c:1663
+#: initdb.c:1599
 #, c-format
 msgid "%s: password file \"%s\" is empty\n"
 msgstr "%s: файл пароля \"%s\" пуст\n"
 
-#: initdb.c:1676
-#, c-format
-msgid "setting password ... "
-msgstr "установка пароля... "
-
-#: initdb.c:1776
-msgid "initializing dependencies ... "
-msgstr "инициализация зависимостей... "
-
-#: initdb.c:1804
-msgid "creating system views ... "
-msgstr "создание системных представлений... "
-
-#: initdb.c:1840
-msgid "loading system objects' descriptions ... "
-msgstr "загрузка описаний системных объектов... "
-
-#: initdb.c:1946
-msgid "creating collations ... "
-msgstr "создание правил сортировки... "
-
-#: initdb.c:1979
+#: initdb.c:1847
 #, c-format
 msgid "%s: locale name too long, skipped: \"%s\"\n"
 msgstr "%s: слишком длинное имя локали, пропущено: \"%s\"\n"
 
-#: initdb.c:2004
+#: initdb.c:1872
 #, c-format
 msgid "%s: locale name has non-ASCII characters, skipped: \"%s\"\n"
 msgstr "%s: имя локали содержит не ASCII-символы, пропущено: \"%s\"\n"
 
-#: initdb.c:2073
+#: initdb.c:1945
 #, c-format
 msgid "No usable system locales were found.\n"
 msgstr "Пригодные локали в системе не найдены.\n"
 
-#: initdb.c:2074
+#: initdb.c:1946
 #, c-format
 msgid "Use the option \"--debug\" to see details.\n"
 msgstr "Добавьте параметр \"--debug\", чтобы узнать подробности.\n"
 
-#: initdb.c:2077
-#, c-format
-msgid "not supported on this platform\n"
-msgstr "не поддерживается в этой ОС\n"
-
-#: initdb.c:2092
-msgid "creating conversions ... "
-msgstr "создание преобразований... "
-
-#: initdb.c:2127
-msgid "creating dictionaries ... "
-msgstr "создание словарей... "
-
-#: initdb.c:2181
-msgid "setting privileges on built-in objects ... "
-msgstr "установка прав для встроенных объектов... "
-
-#: initdb.c:2239
-msgid "creating information schema ... "
-msgstr "создание информационной схемы... "
-
-#: initdb.c:2295
-msgid "loading PL/pgSQL server-side language ... "
-msgstr "загрузка серверного языка PL/pgSQL... "
-
-#: initdb.c:2320
-msgid "vacuuming database template1 ... "
-msgstr "очистка базы данных template1... "
-
-#: initdb.c:2376
-msgid "copying template1 to template0 ... "
-msgstr "копирование template1 в template0... "
-
-#: initdb.c:2408
-msgid "copying template1 to postgres ... "
-msgstr "копирование template1 в postgres... "
-
-#: initdb.c:2435
+#: initdb.c:2319
 msgid "syncing data to disk ... "
 msgstr "сохранение данных на диске... "
 
-#: initdb.c:2514
+#: initdb.c:2413
 #, c-format
 msgid "caught signal\n"
 msgstr "получен сигнал\n"
 
-#: initdb.c:2520
+#: initdb.c:2419
 #, c-format
 msgid "could not write to child process: %s\n"
 msgstr "не удалось записать в поток дочернего процесса: %s\n"
 
-#: initdb.c:2528
+#: initdb.c:2427
 #, c-format
 msgid "ok\n"
 msgstr "ок\n"
 
-#: initdb.c:2618
+#: initdb.c:2517
 #, c-format
 msgid "%s: setlocale() failed\n"
 msgstr "%s: ошибка в setlocale()\n"
 
-#: initdb.c:2636
+#: initdb.c:2535
 #, c-format
 msgid "%s: failed to restore old locale \"%s\"\n"
 msgstr "%s: не удалось восстановить старую локаль \"%s\"\n"
 
-#: initdb.c:2646
+#: initdb.c:2545
 #, c-format
 msgid "%s: invalid locale name \"%s\"\n"
 msgstr "%s: ошибочное имя локали \"%s\"\n"
 
-#: initdb.c:2658
+#: initdb.c:2557
 #, c-format
 msgid ""
 "%s: invalid locale settings; check LANG and LC_* environment variables\n"
 msgstr ""
 "%s: неверные настройки локали; проверьте переменные окружения LANG и LC_*\n"
 
-#: initdb.c:2686
+#: initdb.c:2585
 #, c-format
 msgid "%s: encoding mismatch\n"
 msgstr "%s: несоответствие кодировки\n"
 
-#: initdb.c:2688
+#: initdb.c:2587
 #, c-format
 msgid ""
 "The encoding you selected (%s) and the encoding that the\n"
@@ -527,32 +492,7 @@ msgstr ""
 "Для исправления перезапустите %s, не указывая кодировку явно, \n"
 "либо выберите подходящее сочетание параметров локализации.\n"
 
-#: initdb.c:2793
-#, c-format
-msgid "%s: WARNING: cannot create restricted tokens on this platform\n"
-msgstr "%s: ПРЕДУПРЕЖДЕНИЕ: в этой ОС нельзя создавать ограниченные маркеры\n"
-
-#: initdb.c:2802
-#, c-format
-msgid "%s: could not open process token: error code %lu\n"
-msgstr "%s: не удалось открыть маркер процесса: код ошибки %lu\n"
-
-#: initdb.c:2815
-#, c-format
-msgid "%s: could not allocate SIDs: error code %lu\n"
-msgstr "%s: не удалось подготовить структуры SID: код ошибки: %lu\n"
-
-#: initdb.c:2835
-#, c-format
-msgid "%s: could not create restricted token: error code %lu\n"
-msgstr "%s: не удалось создать ограниченный маркер: код ошибки: %lu\n"
-
-#: initdb.c:2856
-#, c-format
-msgid "%s: could not start process for command \"%s\": error code %lu\n"
-msgstr "%s: не удалось запустить процесс для команды \"%s\": код ошибки: %lu\n"
-
-#: initdb.c:2870
+#: initdb.c:2659
 #, c-format
 msgid ""
 "%s initializes a PostgreSQL database cluster.\n"
@@ -561,17 +501,17 @@ msgstr ""
 "%s инициализирует кластер PostgreSQL.\n"
 "\n"
 
-#: initdb.c:2871
+#: initdb.c:2660
 #, c-format
 msgid "Usage:\n"
 msgstr "Использование:\n"
 
-#: initdb.c:2872
+#: initdb.c:2661
 #, c-format
 msgid "  %s [OPTION]... [DATADIR]\n"
 msgstr "  %s [ПАРАМЕТР]... [КАТАЛОГ]\n"
 
-#: initdb.c:2873
+#: initdb.c:2662
 #, c-format
 msgid ""
 "\n"
@@ -580,7 +520,7 @@ msgstr ""
 "\n"
 "Параметры:\n"
 
-#: initdb.c:2874
+#: initdb.c:2663
 #, c-format
 msgid ""
 "  -A, --auth=METHOD         default authentication method for local "
@@ -589,7 +529,7 @@ msgstr ""
 "  -A, --auth=МЕТОД          метод проверки подлинности по умолчанию\n"
 "                            для локальных подключений\n"
 
-#: initdb.c:2875
+#: initdb.c:2664
 #, c-format
 msgid ""
 "      --auth-host=METHOD    default authentication method for local TCP/IP "
@@ -598,7 +538,7 @@ msgstr ""
 "      --auth-host=МЕТОД     метод проверки подлинности по умолчанию\n"
 "                            для локальных TCP/IP-подключений\n"
 
-#: initdb.c:2876
+#: initdb.c:2665
 #, c-format
 msgid ""
 "      --auth-local=METHOD   default authentication method for local-socket "
@@ -607,22 +547,22 @@ msgstr ""
 "      --auth-local=МЕТОД    метод проверки подлинности по умолчанию\n"
 "                            для локальных подключений через сокет\n"
 
-#: initdb.c:2877
+#: initdb.c:2666
 #, c-format
 msgid " [-D, --pgdata=]DATADIR     location for this database cluster\n"
 msgstr " [-D, --pgdata=]КАТАЛОГ     расположение данных этого кластера БД\n"
 
-#: initdb.c:2878
+#: initdb.c:2667
 #, c-format
 msgid "  -E, --encoding=ENCODING   set default encoding for new databases\n"
 msgstr "  -E, --encoding=КОДИРОВКА  кодировка по умолчанию для новых баз\n"
 
-#: initdb.c:2879
+#: initdb.c:2668
 #, c-format
 msgid "      --locale=LOCALE       set default locale for new databases\n"
 msgstr "      --locale=ЛОКАЛЬ       локаль по умолчанию для новых баз\n"
 
-#: initdb.c:2880
+#: initdb.c:2669
 #, c-format
 msgid ""
 "      --lc-collate=, --lc-ctype=, --lc-messages=LOCALE\n"
@@ -636,19 +576,19 @@ msgstr ""
 "                            установить соответствующий параметр локали\n"
 "                            для новых баз (вместо значения из окружения)\n"
 
-#: initdb.c:2884
+#: initdb.c:2673
 #, c-format
 msgid "      --no-locale           equivalent to --locale=C\n"
 msgstr "      --no-locale           эквивалентно --locale=C\n"
 
-#: initdb.c:2885
+#: initdb.c:2674
 #, c-format
 msgid ""
 "      --pwfile=FILE         read password for the new superuser from file\n"
 msgstr ""
 "      --pwfile=ФАЙЛ         прочитать пароль суперпользователя из файла\n"
 
-#: initdb.c:2886
+#: initdb.c:2675
 #, c-format
 msgid ""
 "  -T, --text-search-config=CFG\n"
@@ -657,24 +597,24 @@ msgstr ""
 "  -T, --text-search-config=КОНФИГУРАЦИЯ\n"
 "                            конфигурация текстового поиска по умолчанию\n"
 
-#: initdb.c:2888
+#: initdb.c:2677
 #, c-format
 msgid "  -U, --username=NAME       database superuser name\n"
 msgstr "  -U, --username=ИМЯ        имя суперпользователя БД\n"
 
-#: initdb.c:2889
+#: initdb.c:2678
 #, c-format
 msgid ""
 "  -W, --pwprompt            prompt for a password for the new superuser\n"
 msgstr "  -W, --pwprompt            запросить пароль суперпользователя\n"
 
-#: initdb.c:2890
+#: initdb.c:2679
 #, c-format
 msgid ""
 "  -X, --xlogdir=XLOGDIR     location for the transaction log directory\n"
 msgstr "  -X, --xlogdir=КАТАЛОГ     расположение журнала транзакций\n"
 
-#: initdb.c:2891
+#: initdb.c:2680
 #, c-format
 msgid ""
 "\n"
@@ -683,27 +623,27 @@ msgstr ""
 "\n"
 "Редко используемые параметры:\n"
 
-#: initdb.c:2892
+#: initdb.c:2681
 #, c-format
 msgid "  -d, --debug               generate lots of debugging output\n"
 msgstr "  -d, --debug               выдавать много отладочных сообщений\n"
 
-#: initdb.c:2893
+#: initdb.c:2682
 #, c-format
 msgid "  -k, --data-checksums      use data page checksums\n"
 msgstr "  -k, --data-checksums      включить контроль целостности страниц\n"
 
-#: initdb.c:2894
+#: initdb.c:2683
 #, c-format
 msgid "  -L DIRECTORY              where to find the input files\n"
 msgstr "  -L КАТАЛОГ                расположение входных файлов\n"
 
-#: initdb.c:2895
+#: initdb.c:2684
 #, c-format
 msgid "  -n, --noclean             do not clean up after errors\n"
 msgstr "  -n, --noclean             не очищать после ошибок\n"
 
-#: initdb.c:2896
+#: initdb.c:2685
 #, c-format
 msgid ""
 "  -N, --nosync              do not wait for changes to be written safely to "
@@ -711,18 +651,18 @@ msgid ""
 msgstr ""
 "  -N, --nosync              не ждать завершения сохранения данных на диске\n"
 
-#: initdb.c:2897
+#: initdb.c:2686
 #, c-format
 msgid "  -s, --show                show internal settings\n"
 msgstr "  -s, --show                показать внутренние настройки\n"
 
-#: initdb.c:2898
+#: initdb.c:2687
 #, c-format
 msgid "  -S, --sync-only           only sync data directory\n"
 msgstr ""
 "  -S, --sync-only           только синхронизировать с ФС каталог данных\n"
 
-#: initdb.c:2899
+#: initdb.c:2688
 #, c-format
 msgid ""
 "\n"
@@ -731,17 +671,17 @@ msgstr ""
 "\n"
 "Другие параметры:\n"
 
-#: initdb.c:2900
+#: initdb.c:2689
 #, c-format
 msgid "  -V, --version             output version information, then exit\n"
 msgstr "  -V, --version             показать версию и выйти\n"
 
-#: initdb.c:2901
+#: initdb.c:2690
 #, c-format
 msgid "  -?, --help                show this help, then exit\n"
 msgstr "  -?, --help                показать эту справку и выйти\n"
 
-#: initdb.c:2902
+#: initdb.c:2691
 #, c-format
 msgid ""
 "\n"
@@ -751,7 +691,7 @@ msgstr ""
 "\n"
 "Если каталог данных не указан, используется переменная окружения PGDATA.\n"
 
-#: initdb.c:2904
+#: initdb.c:2693
 #, c-format
 msgid ""
 "\n"
@@ -760,7 +700,7 @@ msgstr ""
 "\n"
 "Об ошибках сообщайте по адресу <pgsql-bugs@postgresql.org>.\n"
 
-#: initdb.c:2912
+#: initdb.c:2701
 msgid ""
 "\n"
 "WARNING: enabling \"trust\" authentication for local connections\n"
@@ -768,37 +708,26 @@ msgid ""
 "--auth-local and --auth-host, the next time you run initdb.\n"
 msgstr ""
 "\n"
-"ВНИМАНИЕ: используется проверка подлинности \"trust\" для локальных "
+"ПРЕДУПРЕЖДЕНИЕ: используется проверка подлинности \"trust\" для локальных "
 "подключений.\n"
 "Другой метод можно выбрать, отредактировав pg_hba.conf или используя ключи -"
 "A,\n"
 "--auth-local или --auth-host при следующем выполнении initdb.\n"
 
-#: initdb.c:2934
+#: initdb.c:2723
 #, c-format
 msgid "%s: invalid authentication method \"%s\" for \"%s\" connections\n"
 msgstr ""
 "%s: нераспознанный метод проверки подлинности \"%s\" для подключений \"%s\"\n"
 
-#: initdb.c:2948
+#: initdb.c:2737
 #, c-format
 msgid ""
 "%s: must specify a password for the superuser to enable %s authentication\n"
 msgstr ""
 "%s: для применения метода %s необходимо указать пароль суперпользователя\n"
 
-#: initdb.c:2981
-#, c-format
-msgid "%s: could not re-execute with restricted token: error code %lu\n"
-msgstr ""
-"%s: не удалось перезапуститься с ограниченным маркером: код ошибки: %lu\n"
-
-#: initdb.c:2996
-#, c-format
-msgid "%s: could not get exit code from subprocess: error code %lu\n"
-msgstr "%s: не удалось получить код выхода от подпроцесса: код ошибки %lu\n"
-
-#: initdb.c:3022
+#: initdb.c:2764
 #, c-format
 msgid ""
 "%s: no data directory specified\n"
@@ -811,7 +740,7 @@ msgstr ""
 "Это можно сделать, добавив ключ -D или установив переменную\n"
 "окружения PGDATA.\n"
 
-#: initdb.c:3060
+#: initdb.c:2802
 #, c-format
 msgid ""
 "The program \"postgres\" is needed by %s but was not found in the\n"
@@ -822,7 +751,7 @@ msgstr ""
 "в каталоге \"%s\".\n"
 "Проверьте вашу установку PostgreSQL.\n"
 
-#: initdb.c:3067
+#: initdb.c:2809
 #, c-format
 msgid ""
 "The program \"postgres\" was found by \"%s\"\n"
@@ -833,17 +762,17 @@ msgstr ""
 "но её версия отличается от версии %s.\n"
 "Проверьте вашу установку PostgreSQL.\n"
 
-#: initdb.c:3086
+#: initdb.c:2828
 #, c-format
 msgid "%s: input file location must be an absolute path\n"
 msgstr "%s: расположение входных файлов должно задаваться абсолютным путём\n"
 
-#: initdb.c:3105
+#: initdb.c:2847
 #, c-format
 msgid "The database cluster will be initialized with locale \"%s\".\n"
 msgstr "Кластер баз данных будет инициализирован с локалью \"%s\".\n"
 
-#: initdb.c:3108
+#: initdb.c:2850
 #, c-format
 msgid ""
 "The database cluster will be initialized with locales\n"
@@ -862,22 +791,22 @@ msgstr ""
 "  NUMERIC:  %s\n"
 "  TIME:     %s\n"
 
-#: initdb.c:3132
+#: initdb.c:2874
 #, c-format
 msgid "%s: could not find suitable encoding for locale \"%s\"\n"
 msgstr "%s: не удалось найти подходящую кодировку для локали \"%s\"\n"
 
-#: initdb.c:3134
+#: initdb.c:2876
 #, c-format
 msgid "Rerun %s with the -E option.\n"
 msgstr "Перезапустите %s с параметром -E.\n"
 
-#: initdb.c:3135 initdb.c:3711 initdb.c:3732
+#: initdb.c:2877 initdb.c:3500 initdb.c:3521
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Для дополнительной информации попробуйте \"%s --help\".\n"
 
-#: initdb.c:3147
+#: initdb.c:2889
 #, c-format
 msgid ""
 "Encoding \"%s\" implied by locale is not allowed as a server-side encoding.\n"
@@ -886,12 +815,12 @@ msgstr ""
 "Кодировка \"%s\", подразумеваемая локалью, не годится для сервера.\n"
 "Вместо неё в качестве кодировки БД по умолчанию будет выбрана \"%s\".\n"
 
-#: initdb.c:3155
+#: initdb.c:2897
 #, c-format
 msgid "%s: locale \"%s\" requires unsupported encoding \"%s\"\n"
 msgstr "%s: для локали \"%s\" требуется неподдерживаемая кодировка \"%s\"\n"
 
-#: initdb.c:3158
+#: initdb.c:2900
 #, c-format
 msgid ""
 "Encoding \"%s\" is not allowed as a server-side encoding.\n"
@@ -900,13 +829,13 @@ msgstr ""
 "Кодировка \"%s\" недопустима в качестве кодировки сервера.\n"
 "Перезапустите %s, выбрав другую локаль.\n"
 
-#: initdb.c:3167
+#: initdb.c:2909
 #, c-format
 msgid "The default database encoding has accordingly been set to \"%s\".\n"
 msgstr ""
 "Кодировка БД по умолчанию, выбранная в соответствии с настройками: \"%s\".\n"
 
-#: initdb.c:3238
+#: initdb.c:2980
 #, c-format
 msgid ""
 "%s: could not find suitable text search configuration for locale \"%s\"\n"
@@ -914,7 +843,7 @@ msgstr ""
 "%s: не удалось найти подходящую конфигурацию текстового поиска для локали "
 "\"%s\"\n"
 
-#: initdb.c:3249
+#: initdb.c:2991
 #, c-format
 msgid ""
 "%s: warning: suitable text search configuration for locale \"%s\" is "
@@ -923,7 +852,7 @@ msgstr ""
 "%s: внимание: для локали \"%s\" нет известной конфигурации текстового "
 "поиска\n"
 
-#: initdb.c:3254
+#: initdb.c:2996
 #, c-format
 msgid ""
 "%s: warning: specified text search configuration \"%s\" might not match "
@@ -932,32 +861,37 @@ msgstr ""
 "%s: внимание: указанная конфигурация текстового поиска \"%s\" может не "
 "соответствовать локали \"%s\"\n"
 
-#: initdb.c:3259
+#: initdb.c:3001
 #, c-format
 msgid "The default text search configuration will be set to \"%s\".\n"
 msgstr "Выбрана конфигурация текстового поиска по умолчанию \"%s\".\n"
 
-#: initdb.c:3303 initdb.c:3381
+#: initdb.c:3045 initdb.c:3131
 #, c-format
 msgid "creating directory %s ... "
 msgstr "создание каталога %s... "
 
-#: initdb.c:3317 initdb.c:3399
+#: initdb.c:3051 initdb.c:3137 initdb.c:3205 initdb.c:3261
+#, c-format
+msgid "%s: could not create directory \"%s\": %s\n"
+msgstr "%s: не удалось создать каталог \"%s\": %s\n"
+
+#: initdb.c:3063 initdb.c:3149
 #, c-format
 msgid "fixing permissions on existing directory %s ... "
 msgstr "исправление прав для существующего каталога %s... "
 
-#: initdb.c:3323 initdb.c:3405
+#: initdb.c:3069 initdb.c:3155
 #, c-format
 msgid "%s: could not change permissions of directory \"%s\": %s\n"
 msgstr "%s: не удалось поменять права для каталога \"%s\": %s\n"
 
-#: initdb.c:3338 initdb.c:3420
+#: initdb.c:3084 initdb.c:3170
 #, c-format
 msgid "%s: directory \"%s\" exists but is not empty\n"
 msgstr "%s: каталог \"%s\" существует, но он не пуст\n"
 
-#: initdb.c:3344
+#: initdb.c:3090
 #, c-format
 msgid ""
 "If you want to create a new database system, either remove or empty\n"
@@ -968,19 +902,19 @@ msgstr ""
 "удалите или очистите каталог \"%s\",\n"
 "либо при запуске %s в качестве пути укажите не \"%s\".\n"
 
-#: initdb.c:3352 initdb.c:3433
+#: initdb.c:3098 initdb.c:3183 initdb.c:3534
 #, c-format
 msgid "%s: could not access directory \"%s\": %s\n"
 msgstr "%s: нет доступа к каталогу \"%s\": %s\n"
 
-#: initdb.c:3372
+#: initdb.c:3122
 #, c-format
 msgid "%s: transaction log directory location must be an absolute path\n"
 msgstr ""
 "%s: расположение каталога журнала транзакций должно определяться абсолютным "
 "путём\n"
 
-#: initdb.c:3426
+#: initdb.c:3176
 #, c-format
 msgid ""
 "If you want to store the transaction log there, either\n"
@@ -989,17 +923,17 @@ msgstr ""
 "Если вы хотите хранить журнал транзакций здесь,\n"
 "удалите или очистите каталог \"%s\".\n"
 
-#: initdb.c:3444
+#: initdb.c:3191
 #, c-format
 msgid "%s: could not create symbolic link \"%s\": %s\n"
 msgstr "%s: не удалось создать символическую ссылку \"%s\": %s\n"
 
-#: initdb.c:3449
+#: initdb.c:3196
 #, c-format
 msgid "%s: symlinks are not supported on this platform"
 msgstr "%s: символические ссылки не поддерживаются в этой ОС"
 
-#: initdb.c:3462
+#: initdb.c:3220
 #, c-format
 msgid ""
 "It contains a dot-prefixed/invisible file, perhaps due to it being a mount "
@@ -1007,13 +941,13 @@ msgid ""
 msgstr ""
 "Он содержит файл с точкой (невидимый), возможно это точка монтирования.\n"
 
-#: initdb.c:3465
+#: initdb.c:3223
 #, c-format
 msgid ""
 "It contains a lost+found directory, perhaps due to it being a mount point.\n"
 msgstr "Он содержит подкаталог lost+found, возможно это точка монтирования.\n"
 
-#: initdb.c:3468
+#: initdb.c:3226
 #, c-format
 msgid ""
 "Using a mount point directly as the data directory is not recommended.\n"
@@ -1023,34 +957,47 @@ msgstr ""
 "рекомендуется.\n"
 "Создайте в монтируемом ресурсе подкаталог и используйте его.\n"
 
-#: initdb.c:3487
+#: initdb.c:3246
 #, c-format
 msgid "creating subdirectories ... "
 msgstr "создание подкаталогов... "
 
-#: initdb.c:3655
+#: initdb.c:3293
+msgid "performing post-bootstrap initialization ... "
+msgstr "выполняется заключительная инициализация ... "
+
+#: initdb.c:3444
 #, c-format
 msgid "Running in debug mode.\n"
 msgstr "Программа запущена в режиме отладки.\n"
 
-#: initdb.c:3659
+#: initdb.c:3448
 #, c-format
 msgid "Running in noclean mode.  Mistakes will not be cleaned up.\n"
 msgstr ""
 "Программа запущена в режим 'noclean' - очистки и исправления ошибок не "
 "будет.\n"
 
-#: initdb.c:3730
+#: initdb.c:3519
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: слишком много аргументов командной строки (первый: \"%s\")\n"
 
-#: initdb.c:3747
+#: initdb.c:3545
 #, c-format
 msgid "%s: password prompt and password file cannot be specified together\n"
 msgstr "%s: нельзя одновременно запросить пароль и прочитать пароль из файла\n"
 
-#: initdb.c:3769
+#: initdb.c:3569
+#, c-format
+msgid ""
+"%s: superuser name \"%s\" is disallowed; role names cannot begin with \"pg_"
+"\"\n"
+msgstr ""
+"%s: имя \"%s\" для суперпользователя не допускается; имена ролей не могут "
+"начинаться с \"pg_\"\n"
+
+#: initdb.c:3573
 #, c-format
 msgid ""
 "The files belonging to this database system will be owned by user \"%s\".\n"
@@ -1061,17 +1008,17 @@ msgstr ""
 "От его имени также будет запускаться процесс сервера.\n"
 "\n"
 
-#: initdb.c:3785
+#: initdb.c:3589
 #, c-format
 msgid "Data page checksums are enabled.\n"
 msgstr "Контроль целостности страниц данных включен.\n"
 
-#: initdb.c:3787
+#: initdb.c:3591
 #, c-format
 msgid "Data page checksums are disabled.\n"
 msgstr "Контроль целостности страниц данных отключен.\n"
 
-#: initdb.c:3796
+#: initdb.c:3600
 #, c-format
 msgid ""
 "\n"
@@ -1082,25 +1029,72 @@ msgstr ""
 "Сохранение данных на диск пропускается.\n"
 "Каталог данных может повредиться при сбое операционной системы.\n"
 
-#: initdb.c:3805
+#: initdb.c:3609
 #, 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"
 
+#~ msgid "creating template1 database in %s/base/1 ... "
+#~ msgstr "создание базы template1 в %s/base/1... "
+
+#~ msgid "initializing pg_authid ... "
+#~ msgstr "инициализация pg_authid... "
+
+#~ msgid "setting password ... "
+#~ msgstr "установка пароля... "
+
+#~ msgid "initializing dependencies ... "
+#~ msgstr "инициализация зависимостей... "
+
+#~ msgid "creating system views ... "
+#~ msgstr "создание системных представлений... "
+
+#~ msgid "loading system objects' descriptions ... "
+#~ msgstr "загрузка описаний системных объектов... "
+
+#~ msgid "creating collations ... "
+#~ msgstr "создание правил сортировки... "
+
+#~ msgid "not supported on this platform\n"
+#~ msgstr "не поддерживается в этой ОС\n"
+
+#~ msgid "creating conversions ... "
+#~ msgstr "создание преобразований... "
+
+#~ msgid "creating dictionaries ... "
+#~ msgstr "создание словарей... "
+
+#~ msgid "setting privileges on built-in objects ... "
+#~ msgstr "установка прав для встроенных объектов... "
+
+#~ msgid "creating information schema ... "
+#~ msgstr "создание информационной схемы... "
+
+#~ msgid "loading PL/pgSQL server-side language ... "
+#~ msgstr "загрузка серверного языка PL/pgSQL... "
+
+#~ msgid "vacuuming database template1 ... "
+#~ msgstr "очистка базы данных template1... "
+
+#~ msgid "copying template1 to template0 ... "
+#~ msgstr "копирование template1 в template0... "
+
+#~ msgid "copying template1 to postgres ... "
+#~ msgstr "копирование template1 в postgres... "
+
+#~ msgid "%s: could not close directory \"%s\": %s\n"
+#~ msgstr "%s: не удалось закрыть каталог \"%s\": %s\n"
+
 #~ msgid "%s: could not obtain information about current user: %s\n"
 #~ msgstr "%s: не удалось получить информацию о текущем пользователе: %s\n"
 
diff --git a/src/bin/initdb/po/zh_CN.po b/src/bin/initdb/po/zh_CN.po
index 3986eab28f..3c131633dc 100644
--- a/src/bin/initdb/po/zh_CN.po
+++ b/src/bin/initdb/po/zh_CN.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: initdb (PostgreSQL 9.0)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2014-11-22 21:12+0000\n"
-"PO-Revision-Date: 2014-12-06 13:06+0800\n"
-"Last-Translator: Xiong He <iihero@qq.com>\n"
-"Language-Team: Chinese (Simplified)\n"
+"POT-Creation-Date: 2016-04-18 04:44+0000\n"
+"PO-Revision-Date: 2016-05-19 20:39+0800\n"
+"Last-Translator: Yuwei Peng <ywpeng@whu.edu.cn>\n"
+"Language-Team: Chinese (Simplified) <ywpeng@whu.edu.cn>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.5.7\n"
 
 #: ../../common/exec.c:127 ../../common/exec.c:241 ../../common/exec.c:284
 #, c-format
@@ -53,14 +53,14 @@ msgstr "无法读取符号链结 \"%s\""
 msgid "pclose failed: %s"
 msgstr "pclose调用失败: %s"
 
-#: ../../common/fe_memutils.c:33 ../../common/fe_memutils.c:60
-#: ../../common/fe_memutils.c:83
+#: ../../common/fe_memutils.c:35 ../../common/fe_memutils.c:75
+#: ../../common/fe_memutils.c:98
 #, c-format
 msgid "out of memory\n"
 msgstr "内存溢出\n"
 
 # common.c:78
-#: ../../common/fe_memutils.c:77
+#: ../../common/fe_memutils.c:92
 #, c-format
 msgid "cannot duplicate null pointer (internal error)\n"
 msgstr "无法复制空指针 (内部错误)\n"
@@ -77,10 +77,44 @@ msgstr "无法读取目录 \"%s\": %s\n"
 
 #: ../../common/pgfnames.c:84
 #, c-format
-#| msgid "could not open directory \"%s\": %s\n"
 msgid "could not close directory \"%s\": %s\n"
 msgstr "无法关闭目录 \"%s\": %s\n"
 
+#: ../../common/restricted_token.c:68
+#, c-format
+msgid "%s: WARNING: cannot create restricted tokens on this platform\n"
+msgstr "%s: WARNING: 无法为该平台创建受限制的令牌\n"
+
+#: ../../common/restricted_token.c:77
+#, c-format
+msgid "%s: could not open process token: error code %lu\n"
+msgstr "%s:无法打开进程令牌 (token): 错误码 %lu\n"
+
+#: ../../common/restricted_token.c:90
+#, c-format
+msgid "%s: could not allocate SIDs: error code %lu\n"
+msgstr "%s: 无法分配SID: 错误码 %lu\n"
+
+#: ../../common/restricted_token.c:110
+#, c-format
+msgid "%s: could not create restricted token: error code %lu\n"
+msgstr "%s: 无法创建受限令牌: 错误码为 %lu\n"
+
+#: ../../common/restricted_token.c:132
+#, c-format
+msgid "%s: could not start process for command \"%s\": error code %lu\n"
+msgstr "%s: 无法为命令 \"%s\"创建进程: 错误码 %lu\n"
+
+#: ../../common/restricted_token.c:170
+#, c-format
+msgid "%s: could not re-execute with restricted token: error code %lu\n"
+msgstr "%s: 无法使用受限令牌再次执行: 错误码 %lu\n"
+
+#: ../../common/restricted_token.c:186
+#, c-format
+msgid "%s: could not get exit code from subprocess: error code %lu\n"
+msgstr "%s: 无法从子进程得到退出码: 错误码 %lu\n"
+
 #: ../../common/rmtree.c:77
 #, c-format
 msgid "could not stat file or directory \"%s\": %s\n"
@@ -93,19 +127,17 @@ msgstr "无法删除文件或目录 \"%s\": %s\n"
 
 #: ../../common/username.c:45
 #, c-format
-#| msgid "could not load private key file \"%s\": %s"
 msgid "could not look up effective user ID %ld: %s"
 msgstr "无法找到有效的用户ID %ld: %s"
 
 #: ../../common/username.c:47
-#| msgid "server \"%s\" does not exist"
 msgid "user does not exist"
 msgstr "用户不存在"
 
-#: ../../common/username.c:61
+#: ../../common/username.c:62
 #, c-format
-msgid "user name lookup failure: %s"
-msgstr "用户名查找失败: %s"
+msgid "user name lookup failure: error code %lu"
+msgstr "用户名查找失败：错误代码%lu"
 
 #: ../../common/wait_error.c:47
 #, c-format
@@ -142,123 +174,117 @@ msgstr "子进程被信号 %d 终止"
 msgid "child process exited with unrecognized status %d"
 msgstr "子进程已退出, 未知状态 %d"
 
-#: ../../port/dirmod.c:219
+#: ../../port/dirmod.c:221
 #, c-format
 msgid "could not set junction for \"%s\": %s\n"
 msgstr "无法为 \"%s\"设置连接: %s\n"
 
-#: ../../port/dirmod.c:294
+#: ../../port/dirmod.c:298
 #, c-format
 msgid "could not get junction for \"%s\": %s\n"
 msgstr "无法为\"%s\"得到连接: %s\n"
 
-#: initdb.c:337
+#: initdb.c:349
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: 内存溢出\n"
 
-#: initdb.c:447 initdb.c:1653
+#: initdb.c:459 initdb.c:1589
 #, c-format
 msgid "%s: could not open file \"%s\" for reading: %s\n"
 msgstr "%s: 为了读取, 无法打开文件 \"%s\": %s\n"
 
-#: initdb.c:503 initdb.c:1055 initdb.c:1083
+#: initdb.c:515 initdb.c:1002 initdb.c:1030
 #, c-format
 msgid "%s: could not open file \"%s\" for writing: %s\n"
 msgstr "%s: 为了写, 无法打开文件 \"%s\": %s\n"
 
-#: initdb.c:511 initdb.c:519 initdb.c:1062 initdb.c:1089
+#: initdb.c:523 initdb.c:531 initdb.c:1009 initdb.c:1036
 #, c-format
 msgid "%s: could not write file \"%s\": %s\n"
 msgstr "%s: 无法写文件 \"%s\": %s\n"
 
-#: initdb.c:541 initdb.c:608
+#: initdb.c:562
 #, c-format
 msgid "%s: could not open directory \"%s\": %s\n"
 msgstr "%s: 无法打开目录 \"%s\": %s\n"
 
-#: initdb.c:558
+#: initdb.c:586 initdb.c:2334
 #, c-format
 msgid "%s: could not stat file \"%s\": %s\n"
 msgstr "%s: 无法统计文件: \"%s\": %s\n"
 
-#: initdb.c:571 initdb.c:628
+#: initdb.c:598
 #, c-format
 msgid "%s: could not read directory \"%s\": %s\n"
 msgstr "%s: 无法读取目录 \"%s\": %s\n"
 
-#: initdb.c:578 initdb.c:635
-#, c-format
-#| msgid "%s: could not open directory \"%s\": %s\n"
-msgid "%s: could not close directory \"%s\": %s\n"
-msgstr "%s: 无法关闭目录 \"%s\": %s\n"
-
-#: initdb.c:662 initdb.c:714
+#: initdb.c:631 initdb.c:690
 #, c-format
 msgid "%s: could not open file \"%s\": %s\n"
 msgstr "%s: 无法打开文件 \"%s\": %s\n"
 
-#: initdb.c:730
+#: initdb.c:702
 #, c-format
 msgid "%s: could not fsync file \"%s\": %s\n"
 msgstr "%s: 无法对文件 \"%s\"进行fsync同步: %s\n"
 
-#: initdb.c:751
+#: initdb.c:721
 #, c-format
 msgid "%s: could not execute command \"%s\": %s\n"
 msgstr "%s: 无法执行命令 \"%s\": %s\n"
 
-#: initdb.c:767
+#: initdb.c:737
 #, c-format
 msgid "%s: removing data directory \"%s\"\n"
 msgstr "%s: 删除数据目录 \"%s\"\n"
 
-#: initdb.c:770
+#: initdb.c:740
 #, c-format
 msgid "%s: failed to remove data directory\n"
 msgstr "%s: 删除数据目录失败\n"
 
-#: initdb.c:776
+#: initdb.c:746
 #, c-format
 msgid "%s: removing contents of data directory \"%s\"\n"
 msgstr "%s: 删除数据目录 \"%s\" 的内容\n"
 
-#: initdb.c:779
+#: initdb.c:749
 #, c-format
 msgid "%s: failed to remove contents of data directory\n"
 msgstr "%s: 删除数据目录内容失败\n"
 
-#: initdb.c:785
+#: initdb.c:755
 #, c-format
 msgid "%s: removing transaction log directory \"%s\"\n"
 msgstr "%s: 正在删除事务日志文件目录 \"%s\"\n"
 
-#: initdb.c:788
+#: initdb.c:758
 #, c-format
 msgid "%s: failed to remove transaction log directory\n"
 msgstr "%s: 删除数据目录失败\n"
 
-#: initdb.c:794
+#: initdb.c:764
 #, c-format
 msgid "%s: removing contents of transaction log directory \"%s\"\n"
 msgstr "%s: 删除事务日志目录 \"%s\" 的内容\n"
 
-#: initdb.c:797
+#: initdb.c:767
 #, c-format
 msgid "%s: failed to remove contents of transaction log directory\n"
 msgstr "%s: 删除事务日志目录的内容失败\n"
 
-#: initdb.c:806
+#: initdb.c:776
 #, c-format
 msgid "%s: data directory \"%s\" not removed at user's request\n"
 msgstr "%s: 在用户的要求下数据库目录 \"%s\" 不被删除\n"
 
-#: initdb.c:811
+#: initdb.c:781
 #, c-format
 msgid "%s: transaction log directory \"%s\" not removed at user's request\n"
 msgstr "%s: 在用户的要求下不删除事务日志目录 \"%s\"\n"
 
-#: initdb.c:832
+#: initdb.c:802
 #, c-format
 msgid ""
 "%s: cannot be run as root\n"
@@ -269,22 +295,17 @@ msgstr ""
 "请以服务器进程所有者的用户 (无特权) 身份\n"
 "登陆 (使用, e.g., \"su\").\n"
 
-#: initdb.c:868
+#: initdb.c:838
 #, c-format
 msgid "%s: \"%s\" is not a valid server encoding name\n"
 msgstr "%s: \"%s\" 不是一个有效的服务器编码名字\n"
 
-#: initdb.c:982 initdb.c:3382
-#, c-format
-msgid "%s: could not create directory \"%s\": %s\n"
-msgstr "%s: 无法创建目录 \"%s\": %s\n"
-
-#: initdb.c:1011
+#: initdb.c:958
 #, c-format
 msgid "%s: file \"%s\" does not exist\n"
 msgstr "%s: 文件 \"%s\" 不存在\n"
 
-#: initdb.c:1013 initdb.c:1022 initdb.c:1032
+#: initdb.c:960 initdb.c:969 initdb.c:979
 #, c-format
 msgid ""
 "This might mean you have a corrupted installation or identified\n"
@@ -293,47 +314,46 @@ msgstr ""
 "这意味着您的安装发生了错误或\n"
 "使用 -L 选项指定了错误的路径.\n"
 
-#: initdb.c:1019
+#: initdb.c:966
 #, c-format
 msgid "%s: could not access file \"%s\": %s\n"
 msgstr "%s: 无法访问文件 \"%s\": %s\n"
 
-#: initdb.c:1030
+#: initdb.c:977
 #, c-format
 msgid "%s: file \"%s\" is not a regular file\n"
 msgstr "%s: 文件 \"%s\" 不是常规文件\n"
 
-#: initdb.c:1175
+#: initdb.c:1122
 #, c-format
 msgid "selecting default max_connections ... "
 msgstr "选择默认最大联接数 (max_connections) ... "
 
-#: initdb.c:1205
+#: initdb.c:1152
 #, c-format
 msgid "selecting default shared_buffers ... "
 msgstr "选择默认共享缓冲区大小 (shared_buffers) ... "
 
-#: initdb.c:1238
+#: initdb.c:1185
 #, c-format
 msgid "selecting dynamic shared memory implementation ... "
 msgstr "选择动态共享内存实现 ......"
 
-#: initdb.c:1256
+#: initdb.c:1203
 msgid "creating configuration files ... "
 msgstr "创建配置文件 ... "
 
-#: initdb.c:1347 initdb.c:1367 initdb.c:1451 initdb.c:1467
+#: initdb.c:1300 initdb.c:1320 initdb.c:1404 initdb.c:1420
 #, c-format
-#| msgid "%s: could not change permissions of directory \"%s\": %s\n"
 msgid "%s: could not change permissions of \"%s\": %s\n"
 msgstr "%s: 无法改变\"%s\"的权限:%s\n"
 
-#: initdb.c:1491
+#: initdb.c:1444
 #, c-format
-msgid "creating template1 database in %s/base/1 ... "
-msgstr "在 %s/base/1 中创建 template1 数据库 ... "
+msgid "running bootstrap script ... "
+msgstr "正在运行自举脚本 ..."
 
-#: initdb.c:1507
+#: initdb.c:1460
 #, c-format
 msgid ""
 "%s: input file \"%s\" does not belong to PostgreSQL %s\n"
@@ -342,154 +362,96 @@ msgstr ""
 "%s: 输入文件 \"%s\" 不属于 PostgreSQL %s\n"
 "检查你的安装或使用 -L 选项指定正确的路径.\n"
 
-#: initdb.c:1594
-msgid "initializing pg_authid ... "
-msgstr "初始化 pg_authid ...  "
-
-#: initdb.c:1628
+#: initdb.c:1564
 msgid "Enter new superuser password: "
 msgstr "输入新的超级用户口令: "
 
-#: initdb.c:1629
+#: initdb.c:1565
 msgid "Enter it again: "
 msgstr "再输入一遍: "
 
-#: initdb.c:1632
+#: initdb.c:1568
 #, c-format
 msgid "Passwords didn't match.\n"
 msgstr "口令不匹配.\n"
 
-#: initdb.c:1659
+#: initdb.c:1596
 #, c-format
 msgid "%s: could not read password from file \"%s\": %s\n"
 msgstr "%s: 无法从文件 \"%s\" 读取口令: %s\n"
 
-#: initdb.c:1672
+#: initdb.c:1599
 #, c-format
-msgid "setting password ... "
-msgstr "设置口令 ... "
-
-#: initdb.c:1772
-msgid "initializing dependencies ... "
-msgstr "初始化dependencies ... "
+msgid "%s: password file \"%s\" is empty\n"
+msgstr "%s：口令文件\"%s\"为空\n"
 
-#: initdb.c:1800
-msgid "creating system views ... "
-msgstr "创建系统视图 ... "
-
-#: initdb.c:1836
-msgid "loading system objects' descriptions ... "
-msgstr "正在加载系统对象描述 ..."
-
-#: initdb.c:1942
-msgid "creating collations ... "
-msgstr "创建(字符集)校对规则 ... "
-
-#: initdb.c:1975
+#: initdb.c:1845
 #, c-format
 msgid "%s: locale name too long, skipped: \"%s\"\n"
 msgstr "%s: 本地化名称太长, 跳过: \"%s\"\n"
 
-#: initdb.c:2000
+#: initdb.c:1870
 #, c-format
 msgid "%s: locale name has non-ASCII characters, skipped: \"%s\"\n"
 msgstr "%s: 本地化名称带有非ASCII字符, 跳过: \"%s\"\n"
 
 # describe.c:1542
-#: initdb.c:2069
+#: initdb.c:1943
 #, c-format
 msgid "No usable system locales were found.\n"
 msgstr "没有找到可用的系统本地化名称.\n"
 
-#: initdb.c:2070
+#: initdb.c:1944
 #, c-format
 msgid "Use the option \"--debug\" to see details.\n"
 msgstr "使用选项 \"--debug\" 获取细节.\n"
 
-#: initdb.c:2073
-#, c-format
-msgid "not supported on this platform\n"
-msgstr "在此平台上不支持\n"
-
-#: initdb.c:2088
-msgid "creating conversions ... "
-msgstr "创建字符集转换 ... "
-
-#: initdb.c:2123
-msgid "creating dictionaries ... "
-msgstr "正在创建字典 ... "
-
-#: initdb.c:2177
-msgid "setting privileges on built-in objects ... "
-msgstr "对内建对象设置权限 ... "
-
-#: initdb.c:2235
-msgid "creating information schema ... "
-msgstr "创建信息模式 ... "
-
-#: initdb.c:2291
-msgid "loading PL/pgSQL server-side language ... "
-msgstr "正在装载PL/pgSQL服务器端编程语言..."
-
-#: initdb.c:2316
-msgid "vacuuming database template1 ... "
-msgstr "清理数据库 template1 ... "
-
-#: initdb.c:2372
-msgid "copying template1 to template0 ... "
-msgstr "拷贝 template1 到 template0 ... "
-
-#: initdb.c:2404
-msgid "copying template1 to postgres ... "
-msgstr "拷贝 template1 到 template0 ... "
-
-#: initdb.c:2431
+#: initdb.c:2317
 msgid "syncing data to disk ... "
 msgstr "同步数据到磁盘..."
 
-#: initdb.c:2510
+#: initdb.c:2411
 #, c-format
 msgid "caught signal\n"
 msgstr "捕获信号\n"
 
-#: initdb.c:2516
+#: initdb.c:2417
 #, c-format
 msgid "could not write to child process: %s\n"
 msgstr "无法写到子进程: %s\n"
 
-#: initdb.c:2524
+#: initdb.c:2425
 #, c-format
 msgid "ok\n"
 msgstr "成功\n"
 
-#: initdb.c:2614
+#: initdb.c:2515
 #, c-format
-#| msgid "%s: select() failed: %s\n"
 msgid "%s: setlocale() failed\n"
 msgstr "%s:setlocale()调用失败\n"
 
-#: initdb.c:2632
+#: initdb.c:2533
 #, c-format
 msgid "%s: failed to restore old locale \"%s\"\n"
 msgstr "%s: 无法恢复旧的本地化文件 \"%s\"\n"
 
-#: initdb.c:2642
+#: initdb.c:2543
 #, c-format
 msgid "%s: invalid locale name \"%s\"\n"
 msgstr "%s: 无效的 locale 名字 \"%s\"\n"
 
-#: initdb.c:2654
+#: initdb.c:2555
 #, c-format
 msgid ""
 "%s: invalid locale settings; check LANG and LC_* environment variables\n"
 msgstr "%s:无效的本地化设置; 请检查环境变量LANG和LC_*的值\n"
 
-#: initdb.c:2682
+#: initdb.c:2583
 #, c-format
 msgid "%s: encoding mismatch\n"
 msgstr "%s: 警告: 编码不匹配\n"
 
-#: initdb.c:2684
+#: initdb.c:2585
 #, c-format
 msgid ""
 "The encoding you selected (%s) and the encoding that the\n"
@@ -504,32 +466,7 @@ msgstr ""
 "组合类型.\n"
 "\n"
 
-#: initdb.c:2789
-#, c-format
-msgid "%s: WARNING: cannot create restricted tokens on this platform\n"
-msgstr "%s: WARNING: 无法为该平台创建受限制的令牌\n"
-
-#: initdb.c:2798
-#, c-format
-msgid "%s: could not open process token: error code %lu\n"
-msgstr "%s:无法打开进程令牌 (token): 错误码 %lu\n"
-
-#: initdb.c:2811
-#, c-format
-msgid "%s: could not to allocate SIDs: error code %lu\n"
-msgstr "%s: 无法分配SID: 错误码为 %lu\n"
-
-#: initdb.c:2830
-#, c-format
-msgid "%s: could not create restricted token: error code %lu\n"
-msgstr "%s: 无法创建受限令牌: 错误码为 %lu\n"
-
-#: initdb.c:2851
-#, c-format
-msgid "%s: could not start process for command \"%s\": error code %lu\n"
-msgstr "%s: 无法为命令 \"%s\"创建进程: 错误码 %lu\n"
-
-#: initdb.c:2865
+#: initdb.c:2657
 #, c-format
 msgid ""
 "%s initializes a PostgreSQL database cluster.\n"
@@ -538,17 +475,17 @@ msgstr ""
 "%s 初始化一个 PostgreSQL 数据库簇.\n"
 "\n"
 
-#: initdb.c:2866
+#: initdb.c:2658
 #, c-format
 msgid "Usage:\n"
 msgstr "使用方法:\n"
 
-#: initdb.c:2867
+#: initdb.c:2659
 #, c-format
 msgid "  %s [OPTION]... [DATADIR]\n"
 msgstr "  %s [选项]... [DATADIR]\n"
 
-#: initdb.c:2868
+#: initdb.c:2660
 #, c-format
 msgid ""
 "\n"
@@ -557,43 +494,43 @@ msgstr ""
 "\n"
 "选项:\n"
 
-#: initdb.c:2869
+#: initdb.c:2661
 #, c-format
 msgid ""
 "  -A, --auth=METHOD         default authentication method for local "
 "connections\n"
 msgstr "  -A, --auth=METHOD         本地连接的默认认证方法\n"
 
-#: initdb.c:2870
+#: initdb.c:2662
 #, c-format
 msgid ""
 "      --auth-host=METHOD    default authentication method for local TCP/IP "
 "connections\n"
 msgstr "      --auth-host=METHOD   本地的TCP/IP连接的默认认证方法\n"
 
-#: initdb.c:2871
+#: initdb.c:2663
 #, c-format
 msgid ""
 "      --auth-local=METHOD   default authentication method for local-socket "
 "connections\n"
 msgstr "      --auth-local=METHOD   本地socket连接的默认认证方法\n"
 
-#: initdb.c:2872
+#: initdb.c:2664
 #, c-format
 msgid " [-D, --pgdata=]DATADIR     location for this database cluster\n"
 msgstr "  -D, --pgdata=DATADIR      当前数据库簇的位置\n"
 
-#: initdb.c:2873
+#: initdb.c:2665
 #, c-format
 msgid "  -E, --encoding=ENCODING   set default encoding for new databases\n"
 msgstr "  -E, --encoding=ENCODING   为新数据库设置默认编码\n"
 
-#: initdb.c:2874
+#: initdb.c:2666
 #, c-format
 msgid "      --locale=LOCALE       set default locale for new databases\n"
 msgstr "      --locale=LOCALE      为新数据库设置默认语言环境\n"
 
-#: initdb.c:2875
+#: initdb.c:2667
 #, c-format
 msgid ""
 "      --lc-collate=, --lc-ctype=, --lc-messages=LOCALE\n"
@@ -608,18 +545,18 @@ msgstr ""
 "                   设定缺省语言环境（默认使用环境变\n"
 "                   量)\n"
 
-#: initdb.c:2879
+#: initdb.c:2671
 #, c-format
 msgid "      --no-locale           equivalent to --locale=C\n"
 msgstr "  --no-locale               等同于 --locale=C\n"
 
-#: initdb.c:2880
+#: initdb.c:2672
 #, c-format
 msgid ""
 "      --pwfile=FILE         read password for the new superuser from file\n"
 msgstr "  --pwfile=文件名           对于新的超级用户从文件读取口令\n"
 
-#: initdb.c:2881
+#: initdb.c:2673
 #, c-format
 msgid ""
 "  -T, --text-search-config=CFG\n"
@@ -628,24 +565,24 @@ msgstr ""
 "  -T, --text-search-config=CFG\n"
 "                   缺省的文本搜索配置\n"
 
-#: initdb.c:2883
+#: initdb.c:2675
 #, c-format
 msgid "  -U, --username=NAME       database superuser name\n"
 msgstr "  -U, --username=NAME       数据库超级用户名\n"
 
-#: initdb.c:2884
+#: initdb.c:2676
 #, c-format
 msgid ""
 "  -W, --pwprompt            prompt for a password for the new superuser\n"
 msgstr "  -W, --pwprompt            对于新的超级用户提示输入口令\n"
 
-#: initdb.c:2885
+#: initdb.c:2677
 #, c-format
 msgid ""
 "  -X, --xlogdir=XLOGDIR     location for the transaction log directory\n"
 msgstr "  -X, --xlogdir=XLOGDIR          当前事务日志目录的位置\n"
 
-#: initdb.c:2886
+#: initdb.c:2678
 #, c-format
 msgid ""
 "\n"
@@ -654,44 +591,44 @@ msgstr ""
 "\n"
 "非普通使用选项:\n"
 
-#: initdb.c:2887
+#: initdb.c:2679
 #, c-format
 msgid "  -d, --debug               generate lots of debugging output\n"
 msgstr "  -d, --debug               产生大量的除错信息\n"
 
-#: initdb.c:2888
+#: initdb.c:2680
 #, c-format
 msgid "  -k, --data-checksums      use data page checksums\n"
 msgstr " -k, --data-checksums    使用数据页产生效验和\n"
 
-#: initdb.c:2889
+#: initdb.c:2681
 #, c-format
 msgid "  -L DIRECTORY              where to find the input files\n"
 msgstr "  -L DIRECTORY              输入文件的位置\n"
 
-#: initdb.c:2890
+#: initdb.c:2682
 #, c-format
 msgid "  -n, --noclean             do not clean up after errors\n"
 msgstr "  -n, --noclean             出错后不清理\n"
 
-#: initdb.c:2891
+#: initdb.c:2683
 #, c-format
 msgid ""
 "  -N, --nosync              do not wait for changes to be written safely to "
 "disk\n"
 msgstr "  -N, --nosync             不用等待变化安全写入磁盘\n"
 
-#: initdb.c:2892
+#: initdb.c:2684
 #, c-format
 msgid "  -s, --show                show internal settings\n"
 msgstr "  -s, --show                显示内部设置\n"
 
-#: initdb.c:2893
+#: initdb.c:2685
 #, c-format
 msgid "  -S, --sync-only           only sync data directory\n"
 msgstr "  -S, --sync-only          只同步数据目录\n"
 
-#: initdb.c:2894
+#: initdb.c:2686
 #, c-format
 msgid ""
 "\n"
@@ -700,17 +637,17 @@ msgstr ""
 "\n"
 "其它选项:\n"
 
-#: initdb.c:2895
+#: initdb.c:2687
 #, c-format
 msgid "  -V, --version             output version information, then exit\n"
 msgstr "  -V, --version             输出版本信息, 然后退出\n"
 
-#: initdb.c:2896
+#: initdb.c:2688
 #, c-format
 msgid "  -?, --help                show this help, then exit\n"
 msgstr "  -?, --help                显示此帮助, 然后退出\n"
 
-#: initdb.c:2897
+#: initdb.c:2689
 #, c-format
 msgid ""
 "\n"
@@ -720,7 +657,7 @@ msgstr ""
 "\n"
 "如果没有指定数据目录, 将使用环境变量 PGDATA\n"
 
-#: initdb.c:2899
+#: initdb.c:2691
 #, c-format
 msgid ""
 "\n"
@@ -729,7 +666,7 @@ msgstr ""
 "\n"
 "报告错误至 <pgql-bugs@postgresql.org>.\n"
 
-#: initdb.c:2907
+#: initdb.c:2699
 msgid ""
 "\n"
 "WARNING: enabling \"trust\" authentication for local connections\n"
@@ -741,28 +678,18 @@ msgstr ""
 "你可以通过编辑 pg_hba.conf 更改或你下次\n"
 "行 initdb 时使用 -A或者--auth-local和--auth-host选项.\n"
 
-#: initdb.c:2929
+#: initdb.c:2721
 #, c-format
 msgid "%s: invalid authentication method \"%s\" for \"%s\" connections\n"
 msgstr "%s: 无效认证方法 \"%s\" 用于 \"%s\" 连接\n"
 
-#: initdb.c:2943
+#: initdb.c:2735
 #, c-format
 msgid ""
 "%s: must specify a password for the superuser to enable %s authentication\n"
 msgstr "%s: 为了启动 %s 认证, 你需要为超级用户指定一个口令\n"
 
-#: initdb.c:2976
-#, c-format
-msgid "%s: could not re-execute with restricted token: error code %lu\n"
-msgstr "%s: 无法使用受限令牌再次执行: 错误码 %lu\n"
-
-#: initdb.c:2991
-#, c-format
-msgid "%s: could not get exit code from subprocess: error code %lu\n"
-msgstr "%s: 无法从子进程得到退出码: 错误码 %lu\n"
-
-#: initdb.c:3017
+#: initdb.c:2762
 #, c-format
 msgid ""
 "%s: no data directory specified\n"
@@ -775,7 +702,7 @@ msgstr ""
 "存在. 使用 -D 选项或者\n"
 "环境变量 PGDATA.\n"
 
-#: initdb.c:3055
+#: initdb.c:2800
 #, c-format
 msgid ""
 "The program \"postgres\" is needed by %s but was not found in the\n"
@@ -786,7 +713,7 @@ msgstr ""
 "\n"
 "检查您的安装.\n"
 
-#: initdb.c:3062
+#: initdb.c:2807
 #, c-format
 msgid ""
 "The program \"postgres\" was found by \"%s\"\n"
@@ -797,17 +724,17 @@ msgstr ""
 "\n"
 "检查您的安装.\n"
 
-#: initdb.c:3081
+#: initdb.c:2826
 #, c-format
 msgid "%s: input file location must be an absolute path\n"
 msgstr "%s: 输入文件位置必须为绝对路径\n"
 
-#: initdb.c:3100
+#: initdb.c:2845
 #, c-format
 msgid "The database cluster will be initialized with locale \"%s\".\n"
 msgstr "数据库簇将使用本地化语言 \"%s\"进行初始化.\n"
 
-#: initdb.c:3103
+#: initdb.c:2848
 #, c-format
 msgid ""
 "The database cluster will be initialized with locales\n"
@@ -826,22 +753,22 @@ msgstr ""
 "  NUMERIC:  %s\n"
 "  TIME:     %s\n"
 
-#: initdb.c:3127
+#: initdb.c:2872
 #, c-format
 msgid "%s: could not find suitable encoding for locale \"%s\"\n"
 msgstr "%s: 无法为locale(本地化语言)\"%s\"找到合适的编码\n"
 
-#: initdb.c:3129
+#: initdb.c:2874
 #, c-format
 msgid "Rerun %s with the -E option.\n"
 msgstr "带 -E 选项重新运行 %s.\n"
 
-#: initdb.c:3130 initdb.c:3706 initdb.c:3727
+#: initdb.c:2875 initdb.c:3498 initdb.c:3519
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "请用 \"%s --help\" 获取更多的信息.\n"
 
-#: initdb.c:3142
+#: initdb.c:2887
 #, c-format
 msgid ""
 "Encoding \"%s\" implied by locale is not allowed as a server-side encoding.\n"
@@ -850,12 +777,12 @@ msgstr ""
 "本地化隐含的编码 \"%s\" 不允许作为服务器端的编码.\n"
 "默认的数据库编码将采用 \"%s\" 作为代替.\n"
 
-#: initdb.c:3150
+#: initdb.c:2895
 #, c-format
 msgid "%s: locale \"%s\" requires unsupported encoding \"%s\"\n"
 msgstr "%s: 本地化语言环境 \"%s\"要求使用不支持的编码\"%s\"\n"
 
-#: initdb.c:3153
+#: initdb.c:2898
 #, c-format
 msgid ""
 "Encoding \"%s\" is not allowed as a server-side encoding.\n"
@@ -864,57 +791,62 @@ msgstr ""
 "不允许将编码\"%s\"作为服务器端编码.\n"
 "使用一个不同的本地化语言环境重新运行%s.\n"
 
-#: initdb.c:3162
+#: initdb.c:2907
 #, c-format
 msgid "The default database encoding has accordingly been set to \"%s\".\n"
 msgstr "默认的数据库编码已经相应的设置为 \"%s\".\n"
 
-#: initdb.c:3233
+#: initdb.c:2978
 #, c-format
 msgid ""
 "%s: could not find suitable text search configuration for locale \"%s\"\n"
 msgstr "%s: 无法为本地化语言环境\"%s\"找到合适的文本搜索配置\n"
 
-#: initdb.c:3244
+#: initdb.c:2989
 #, c-format
 msgid ""
 "%s: warning: suitable text search configuration for locale \"%s\" is "
 "unknown\n"
 msgstr "%s: 警告: 对于本地化语言环境\"%s\"合适的文本搜索配置未知\n"
 
-#: initdb.c:3249
+#: initdb.c:2994
 #, c-format
 msgid ""
 "%s: warning: specified text search configuration \"%s\" might not match "
 "locale \"%s\"\n"
 msgstr "%s: 警告: 所指定的文本搜索配置\"%s\"可能与本地语言环境\"%s\"不匹配\n"
 
-#: initdb.c:3254
+#: initdb.c:2999
 #, c-format
 msgid "The default text search configuration will be set to \"%s\".\n"
 msgstr "缺省的文本搜索配置将会被设置到\"%s\"\n"
 
-#: initdb.c:3298 initdb.c:3376
+#: initdb.c:3043 initdb.c:3129
 #, c-format
 msgid "creating directory %s ... "
 msgstr "创建目录 %s ... "
 
-#: initdb.c:3312 initdb.c:3394
+#: initdb.c:3049 initdb.c:3135 initdb.c:3203 initdb.c:3259
+#, c-format
+msgid "%s: could not create directory \"%s\": %s\n"
+msgstr "%s: 无法创建目录 \"%s\": %s\n"
+
+#: initdb.c:3061 initdb.c:3147
 #, c-format
 msgid "fixing permissions on existing directory %s ... "
 msgstr "修复已存在目录 %s 的权限 ... "
 
-#: initdb.c:3318 initdb.c:3400
+#: initdb.c:3067 initdb.c:3153
 #, c-format
 msgid "%s: could not change permissions of directory \"%s\": %s\n"
 msgstr "%s: 无法改变目录 \"%s\" 的权限: %s\n"
 
-#: initdb.c:3333 initdb.c:3415
+#: initdb.c:3082 initdb.c:3168
 #, c-format
 msgid "%s: directory \"%s\" exists but is not empty\n"
 msgstr "%s: 目录\"%s\"已存在，但不是空的\n"
 
-#: initdb.c:3339
+#: initdb.c:3088
 #, c-format
 msgid ""
 "If you want to create a new database system, either remove or empty\n"
@@ -925,47 +857,47 @@ msgstr ""
 "目录 \"%s\" 或者运行带参数的 %s\n"
 "而不是 \"%s\".\n"
 
-#: initdb.c:3347 initdb.c:3428
+#: initdb.c:3096 initdb.c:3181 initdb.c:3532
 #, c-format
 msgid "%s: could not access directory \"%s\": %s\n"
 msgstr "%s: 无法访问目录 \"%s\": %s\n"
 
-#: initdb.c:3367
+#: initdb.c:3120
 #, c-format
 msgid "%s: transaction log directory location must be an absolute path\n"
 msgstr "%s: 事务日志目录的位置必须为绝对路径\n"
 
-#: initdb.c:3421
+#: initdb.c:3174
 #, c-format
 msgid ""
 "If you want to store the transaction log there, either\n"
 "remove or empty the directory \"%s\".\n"
 msgstr "如果您要存储事务日志，需要删除或者清空目录\"%s\".\n"
 
-#: initdb.c:3439
+#: initdb.c:3189
 #, c-format
 msgid "%s: could not create symbolic link \"%s\": %s\n"
 msgstr "%s: 无法创建符号链接 \"%s\": %s\n"
 
-#: initdb.c:3444
+#: initdb.c:3194
 #, c-format
 msgid "%s: symlinks are not supported on this platform"
 msgstr "%s: 在这个平台上不支持使用符号链接"
 
-#: initdb.c:3457
+#: initdb.c:3218
 #, c-format
 msgid ""
 "It contains a dot-prefixed/invisible file, perhaps due to it being a mount "
 "point.\n"
 msgstr "它包含一个不可见的带固定点的文件，可能因为它是一个装载点。\n"
 
-#: initdb.c:3460
+#: initdb.c:3221
 #, c-format
 msgid ""
 "It contains a lost+found directory, perhaps due to it being a mount point.\n"
 msgstr "它包含名为lost+found的目录，可能因为它是一个加载点.\n"
 
-#: initdb.c:3463
+#: initdb.c:3224
 #, c-format
 msgid ""
 "Using a mount point directly as the data directory is not recommended.\n"
@@ -974,32 +906,36 @@ msgstr ""
 "不推荐将加载点作为数据目录.\n"
 "通常在加载点下边创建一个子目录.\n"
 
-#: initdb.c:3482
+#: initdb.c:3244
 #, c-format
 msgid "creating subdirectories ... "
 msgstr "正在创建子目录 ... "
 
-#: initdb.c:3650
+#: initdb.c:3291
+msgid "performing post-bootstrap initialization ... "
+msgstr "正在执行自举后初始化 ..."
+
+#: initdb.c:3442
 #, c-format
 msgid "Running in debug mode.\n"
 msgstr "运行在除错模式中. \n"
 
-#: initdb.c:3654
+#: initdb.c:3446
 #, c-format
 msgid "Running in noclean mode.  Mistakes will not be cleaned up.\n"
 msgstr "运行在 noclean 模式中. 错误将不被清理.\n"
 
-#: initdb.c:3725
+#: initdb.c:3517
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: 命令行参数太多 (第一个是 \"%s\")\n"
 
-#: initdb.c:3742
+#: initdb.c:3543
 #, c-format
 msgid "%s: password prompt and password file cannot be specified together\n"
 msgstr "%s: 口令提示和口令文件不能同时都指定\n"
 
-#: initdb.c:3764
+#: initdb.c:3565
 #, c-format
 msgid ""
 "The files belonging to this database system will be owned by user \"%s\".\n"
@@ -1009,17 +945,17 @@ msgstr ""
 "属于此数据库系统的文件宿主为用户 \"%s\".\n"
 "此用户也必须为服务器进程的宿主.\n"
 
-#: initdb.c:3780
+#: initdb.c:3581
 #, c-format
 msgid "Data page checksums are enabled.\n"
 msgstr "允许生成数据页校验和.\n"
 
-#: initdb.c:3782
+#: initdb.c:3583
 #, c-format
 msgid "Data page checksums are disabled.\n"
 msgstr "禁止为数据页生成校验和.\n"
 
-#: initdb.c:3791
+#: initdb.c:3592
 #, c-format
 msgid ""
 "\n"
@@ -1030,25 +966,27 @@ msgstr ""
 "跳过同步到磁盘操作.\n"
 "如果操作系统宕机，数据目录可能会毁坏.\n"
 
-#: initdb.c:3800
+#: initdb.c:3601
 #, 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"
 "\n"
-"    %s%s%s%spostmaster -D %s%s%s\n"
-"或者\n"
-"    %s%s%s%spg_ctl -D %s%s%s -l logfile start\n"
+"    %s%s%spg_ctl%s -D %s%s%s -l logfile start\n"
 "\n"
 
+#~ msgid "user name lookup failure: %s"
+#~ msgstr "用户名查找失败: %s"
+
+#~ msgid "%s: could not to allocate SIDs: error code %lu\n"
+#~ msgstr "%s: 无法分配SID: 错误码为 %lu\n"
+
 #~ msgid "could not change directory to \"%s\""
 #~ msgstr "无法进入目录 \"%s\""
 
@@ -1078,3 +1016,51 @@ msgstr ""
 
 #~ msgid "%s: could not obtain information about current user: %s\n"
 #~ msgstr "%s: 无法获得当前用户的信息: %s\n"
+
+#~ msgid "copying template1 to postgres ... "
+#~ msgstr "拷贝 template1 到 template0 ... "
+
+#~ msgid "copying template1 to template0 ... "
+#~ msgstr "拷贝 template1 到 template0 ... "
+
+#~ msgid "vacuuming database template1 ... "
+#~ msgstr "清理数据库 template1 ... "
+
+#~ msgid "loading PL/pgSQL server-side language ... "
+#~ msgstr "正在装载PL/pgSQL服务器端编程语言..."
+
+#~ msgid "creating information schema ... "
+#~ msgstr "创建信息模式 ... "
+
+#~ msgid "setting privileges on built-in objects ... "
+#~ msgstr "对内建对象设置权限 ... "
+
+#~ msgid "creating dictionaries ... "
+#~ msgstr "正在创建字典 ... "
+
+#~ msgid "creating conversions ... "
+#~ msgstr "创建字符集转换 ... "
+
+#~ msgid "not supported on this platform\n"
+#~ msgstr "在此平台上不支持\n"
+
+#~ msgid "creating collations ... "
+#~ msgstr "创建(字符集)校对规则 ... "
+
+#~ msgid "loading system objects' descriptions ... "
+#~ msgstr "正在加载系统对象描述 ..."
+
+#~ msgid "creating system views ... "
+#~ msgstr "创建系统视图 ... "
+
+#~ msgid "initializing dependencies ... "
+#~ msgstr "初始化dependencies ... "
+
+#~ msgid "setting password ... "
+#~ msgstr "设置口令 ... "
+
+#~ msgid "initializing pg_authid ... "
+#~ msgstr "初始化 pg_authid ...  "
+
+#~ msgid "creating template1 database in %s/base/1 ... "
+#~ msgstr "在 %s/base/1 中创建 template1 数据库 ... "
diff --git a/src/bin/initdb/t/001_initdb.pl b/src/bin/initdb/t/001_initdb.pl
index 299dcf5b3b..372865d3f7 100644
--- a/src/bin/initdb/t/001_initdb.pl
+++ b/src/bin/initdb/t/001_initdb.pl
@@ -4,8 +4,9 @@
 
 use strict;
 use warnings;
+use PostgresNode;
 use TestLib;
-use Test::More tests => 14;
+use Test::More tests => 15;
 
 my $tempdir = TestLib::tempdir;
 my $xlogdir = "$tempdir/pgxlog";
@@ -28,6 +29,10 @@ command_fails(
 	[ 'initdb', '-X', 'pgxlog', $datadir ],
 	'relative xlog directory not allowed');
 
+command_fails(
+	[ 'initdb', '-U', 'pg_test', $datadir ],
+	'role names cannot begin with "pg_"');
+
 mkdir $datadir;
 command_ok([ 'initdb', '-N', '-T', 'german', '-X', $xlogdir, $datadir ],
 	'successful creation');